From patchwork Mon Nov 18 16:24:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 1196845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uVBUjeoK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47GvTF2Bbrz9sQp for ; Tue, 19 Nov 2019 03:25:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726216AbfKRQZv (ORCPT ); Mon, 18 Nov 2019 11:25:51 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:33097 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726423AbfKRQZv (ORCPT ); Mon, 18 Nov 2019 11:25:51 -0500 Received: by mail-lj1-f195.google.com with SMTP id t5so19680263ljk.0 for ; Mon, 18 Nov 2019 08:25:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4TVHdsh6uMDAICqoT24b2/6XPX4sUgMiPeLBGaxMIqk=; b=uVBUjeoKKR3jnHKbH7ON1xhSJKJD9gFypu3UXegeRUWzOpT/AyJLiGgzn9o/xkuaNP sE+0EvfVf2MkHezLmaXpMmC4laaWSrj3NRLjtAEkn2qKyqysJMhm5h1uQ9YFj3wTiY9+ dr5Kc6ZRNb0tgVrJaGk28sKHAw6PU4sH7y4WZplSiK9qEhc21SqRsKOQLSRj23ZjNGLq af1JPBzhU5vNjOLy9u8HfNZHE6zob1nwrIFZ+mqHqGRzHDaPwGwezAxsJnCECQ347plR 59HGhxlNuvW3BQo64kX5PgVT/4/RUXes/2JXQlyAsWFUlW22jv0qBtiJqgussB/bTN0i E5Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4TVHdsh6uMDAICqoT24b2/6XPX4sUgMiPeLBGaxMIqk=; b=ea5fmmg705d2sGXbqz9sgLmFnxMdMTJKIDSB5b7pisCXgSmru2OaFBzaAk2OOsDS/F O2ucS2c7bHiH3Pr6rUAZBVOsMTxMRqtXXdK8zT/+Q+n1pTizvjCXnWqVmmLJnxfGOA9V 4PFMML/9RvQD4uqyuMQZ48kRfpsNkzEjqGiYT3AXs7XuSkCfDFt4IFrSLC6W6J09xchT Y+2XT2l6RzuXs3h9BLAazrjzmSXFKbb2PruMlfmAdg4L3dI1NMu0HCwXndDAGa8JrLHU HRjBc53gideq7nASefZF34Q0XWI3FG89P6Eph/w92X4ZE/5LyXaTMTYx1x+afGpvRzWe IduA== X-Gm-Message-State: APjAAAWlg9f7gk3LAvu/1wJaO8CyF1PmTn+r0uqEHyKWubnTsrbtYWTw UVE6EpaDwljESGIlRY46Gvk= X-Google-Smtp-Source: APXvYqx52yY3UKrhdYJZ0VuCsLjgozmvvM7askg7VB0qguTNvFrFbX22k6UknEyBoe4egzwb6ntVug== X-Received: by 2002:a05:651c:1109:: with SMTP id d9mr209026ljo.192.1574094347971; Mon, 18 Nov 2019 08:25:47 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id d24sm8582872ljg.73.2019.11.18.08.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 08:25:47 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Cc: linux-tegra@vger.kernel.org Subject: [PATCH v3 1/4] soc/tegra: fuse: Cache values of straps and Chip ID registers Date: Mon, 18 Nov 2019 19:24:57 +0300 Message-Id: <20191118162500.6651-2-digetx@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191118162500.6651-1-digetx@gmail.com> References: <20191118162500.6651-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org There is no need to re-read Chip ID and HW straps out from hardware each time, it is a bit nicer to cache the values in memory. Signed-off-by: Dmitry Osipenko --- drivers/soc/tegra/fuse/tegra-apbmisc.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c index df76778af601..54aeea1b4500 100644 --- a/drivers/soc/tegra/fuse/tegra-apbmisc.c +++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c @@ -21,18 +21,15 @@ #define PMC_STRAPPING_OPT_A_RAM_CODE_MASK_SHORT \ (0x3 << PMC_STRAPPING_OPT_A_RAM_CODE_SHIFT) -static void __iomem *apbmisc_base; -static void __iomem *strapping_base; static bool long_ram_code; +static u32 strapping; +static u32 chipid; u32 tegra_read_chipid(void) { - if (!apbmisc_base) { - WARN(1, "Tegra Chip ID not yet available\n"); - return 0; - } + WARN(!chipid, "Tegra Chip ID not yet available\n"); - return readl_relaxed(apbmisc_base + 4); + return chipid; } u8 tegra_get_chip_id(void) @@ -42,10 +39,7 @@ u8 tegra_get_chip_id(void) u32 tegra_read_straps(void) { - if (strapping_base) - return readl_relaxed(strapping_base); - else - return 0; + return strapping; } u32 tegra_read_ram_code(void) @@ -103,6 +97,7 @@ void __init tegra_init_revision(void) void __init tegra_init_apbmisc(void) { + void __iomem *apbmisc_base, *strapping_base; struct resource apbmisc, straps; struct device_node *np; @@ -162,10 +157,14 @@ void __init tegra_init_apbmisc(void) apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc)); if (!apbmisc_base) pr_err("failed to map APBMISC registers\n"); + else + chipid = readl_relaxed(apbmisc_base + 4); strapping_base = ioremap_nocache(straps.start, resource_size(&straps)); if (!strapping_base) pr_err("failed to map strapping options registers\n"); + else + strapping = readl_relaxed(strapping_base); long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code"); } From patchwork Mon Nov 18 16:24:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 1196844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fVwyyBu9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47GvTD5ZGyz9sPj for ; Tue, 19 Nov 2019 03:25:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726695AbfKRQZv (ORCPT ); Mon, 18 Nov 2019 11:25:51 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:33841 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726216AbfKRQZu (ORCPT ); Mon, 18 Nov 2019 11:25:50 -0500 Received: by mail-lj1-f195.google.com with SMTP id 139so19672000ljf.1 for ; Mon, 18 Nov 2019 08:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O1Nw0vEzgAGqkBGVXXYW2HyLesWf5OqF6+ALQmKG8ew=; b=fVwyyBu9xpmgqQHY6PjvUFa3xz4yh4a3FWSC/QncsygIygP15jaNX8DIlMq1+MzRlR lNd+jxZjUGpfLrx+HWbrC36Y3I3KDwIBnGHaJfUv/TGQyg7i471PgpzTEzSUs3Nsi0XS PtcSoAxXI8GpqwF0WySVXted1VBi7z0G2T9xfzcj9M/jk9htzRjMP1FplSFehRf4KBL9 djvILAgRPFp9WpOixda2MyUpRnoXaWF4z1UAirdW1g8ylKjlvNCExoIgfFrk3Q2hhTKJ d7Dm4kvr7z3A8DFM4G6ShyvJNZvZjcJZdIQGB2wEdaofngRiZaBk4ch+lEk/tykqcObk 82aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O1Nw0vEzgAGqkBGVXXYW2HyLesWf5OqF6+ALQmKG8ew=; b=COd1sL7ecKUE28SgC4tPWzMjK9OZnk8zwFa//q+pRnYFMQUGYd8GEnC8ukxsfOcK0W xgG1wQDzKaKM6tlKtoeY5pFaPPTUoBXOTixw0nDV+wkTvzQVMgzcBwEySO+f+6EsWmoR sL3IQcU6ZfzUbnci6cxdCy6lkLS8ynOMfmfSaG52xmv96DaYkEeV3tCVU+rA875eq0fH oHLpUTpmGKtF2/mCjsep0g3BGRXEvXIuMTdsW+7z/UmFO0a9oea3PZPbW1wwvqWVp16V 54ak7N6bkXTPuvkIsA/hcCtiZ9htTyJCTLtS8UiIvfD+l/NJP9yuii+y7UKcxjaXOTPK aJrw== X-Gm-Message-State: APjAAAU+sJ0xziVPcB+rE0GjRqghd4BAF+7YkpUwxqF806fHX/zPW/wg w1zjFKa31/1VCfip+MJIgeo= X-Google-Smtp-Source: APXvYqwI60bDKAIeu2vp4aeKsTRMoUuKN+SwPo4O0LrPoBe4Rz+KKH3ij0viT6CR9sye1YnvUbq5MQ== X-Received: by 2002:a2e:8855:: with SMTP id z21mr217062ljj.212.1574094348897; Mon, 18 Nov 2019 08:25:48 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id d24sm8582872ljg.73.2019.11.18.08.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 08:25:48 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Cc: linux-tegra@vger.kernel.org Subject: [PATCH v3 2/4] soc/tegra: fuse: Warn if straps are not ready Date: Mon, 18 Nov 2019 19:24:58 +0300 Message-Id: <20191118162500.6651-3-digetx@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191118162500.6651-1-digetx@gmail.com> References: <20191118162500.6651-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Now both Chip ID and HW straps are becoming available at the same time, thus we could simply check the availability of the ID in order to check the availability of the straps. We couldn't check straps for 0x0 because it could be a correct value. This change didn't uncover any problems, but anyways it is nicer to have straps verified for consistency with the Chip ID verification. Signed-off-by: Dmitry Osipenko --- drivers/soc/tegra/fuse/tegra-apbmisc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c index 54aeea1b4500..f580b3116bea 100644 --- a/drivers/soc/tegra/fuse/tegra-apbmisc.c +++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c @@ -27,7 +27,7 @@ static u32 chipid; u32 tegra_read_chipid(void) { - WARN(!chipid, "Tegra Chip ID not yet available\n"); + WARN(!chipid, "Tegra ABP MISC not yet available\n"); return chipid; } @@ -39,6 +39,8 @@ u8 tegra_get_chip_id(void) u32 tegra_read_straps(void) { + WARN(!chipid, "Tegra ABP MISC not yet available\n"); + return strapping; } From patchwork Mon Nov 18 16:24:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 1196846 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j1XNfzZW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47GvTF5fSrz9sPT for ; Tue, 19 Nov 2019 03:25:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726706AbfKRQZw (ORCPT ); Mon, 18 Nov 2019 11:25:52 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:39876 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726654AbfKRQZv (ORCPT ); Mon, 18 Nov 2019 11:25:51 -0500 Received: by mail-lf1-f66.google.com with SMTP id f18so1987592lfj.6 for ; Mon, 18 Nov 2019 08:25:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h3HT9SF2wrMJkzuNPVnE64pREUnWzAqPVZJ/lAHHyXc=; b=j1XNfzZWZXDQHY4knm6t8YT8oSqFcApLAesz2GIvnlvJsxVoaPVPTuW8vRZQ1/nAll Q/TuOW98FRRT7RomrItlqhBOsB7mPdtZQ8P+AmrMmh/gAkszkShEIaofeQJ1zV9AshTN uYDsiPuJm6kMs2hG+j+Yy530CYvTsL0Xj78lLagt7dvg4MANnQpMr44Kgv7/MW0GRgQE 7bi7KOlxCKUfLpud0RkvmBc24oi+AEqhHwi5ZXBHZXYYr8grfFpCgQw3bTsPnDQnVh6Z L/DRXbowcuTi06Bhdr31jQoUgnOf7A5iZqcWvg1svYB/mDidNEMR11n3fYl4VCfyi/hn gw+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h3HT9SF2wrMJkzuNPVnE64pREUnWzAqPVZJ/lAHHyXc=; b=SLvODpZzJUuIhOvv3N6KnKA69ARC5CvneqWw3sbcJ0eUhh25oYQ+pqZthrJGCPx8cJ NQpBNOeSC7rQF08M4njswLD3TIehcGbt4/Rll6RLtwh5a+67dJRjhJpBTswGSYZ5Qnj1 RpEZNLNc8y+Jacc41xevuJfB+lUKD/wTjr7Yszqp2Vvi9vgVsF10fvQxOZu944d0FE3J CO9+WsMTC8fpbuSmjXX0ph5SzEW3tBH2tbtkIumEkR8aDb/mrfvvIh6Vgih7HBkBT+z/ lMqTOFwivTGTwHHLTk7MYoVI1TszcTdsdM2I6TYKivbfgxElP71PuVHNy5hKvPsSmPsb 7utQ== X-Gm-Message-State: APjAAAVaO/2iUzzyqyFoMqgM60J9U6AE1ZuHXA8T3R38s42to6WsuNlX KpSX99GdS+4QlX7JPHqilUF5icGQ X-Google-Smtp-Source: APXvYqwjE8vKwFUV9RQ9brPNfrQP6lD2VUiz4Go4DIiRgbHVtiHgAu6+7OmIAJ9KDZCFQ88eEkR8wA== X-Received: by 2002:a19:ca1b:: with SMTP id a27mr177154lfg.93.1574094349841; Mon, 18 Nov 2019 08:25:49 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id d24sm8582872ljg.73.2019.11.18.08.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 08:25:49 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Cc: linux-tegra@vger.kernel.org Subject: [PATCH v3 3/4] soc/tegra: fuse: Correct straps' address for older Tegra124 device trees Date: Mon, 18 Nov 2019 19:24:59 +0300 Message-Id: <20191118162500.6651-4-digetx@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191118162500.6651-1-digetx@gmail.com> References: <20191118162500.6651-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Trying to read out Chip ID before APBMISC registers are mapped won't succeed, in a result Tegra124 gets a wrong address for the HW straps register if machine uses an old outdated device tree. Fixes: 297c4f3dcbff ("soc/tegra: fuse: Restrict legacy code to 32-bit ARM") Signed-off-by: Dmitry Osipenko --- drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c index f580b3116bea..d4fff96d8407 100644 --- a/drivers/soc/tegra/fuse/tegra-apbmisc.c +++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c @@ -120,7 +120,7 @@ void __init tegra_init_apbmisc(void) apbmisc.flags = IORESOURCE_MEM; /* strapping options */ - if (tegra_get_chip_id() == TEGRA124) { + if (of_machine_is_compatible("nvidia,tegra124")) { straps.start = 0x7000e864; straps.end = 0x7000e867; } else { From patchwork Mon Nov 18 16:25:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 1196847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YO9V7JZ7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47GvTG1WGCz9sPj for ; Tue, 19 Nov 2019 03:25:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726654AbfKRQZx (ORCPT ); Mon, 18 Nov 2019 11:25:53 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:35195 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726423AbfKRQZw (ORCPT ); Mon, 18 Nov 2019 11:25:52 -0500 Received: by mail-lj1-f196.google.com with SMTP id r7so19671960ljg.2 for ; Mon, 18 Nov 2019 08:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SVKfdrKQEvYzk1y5WDH8pdDsahD2iy38wDYDrd4fUZ0=; b=YO9V7JZ7n36XhVfMH99FLLdzzdDtNwjI3erX03+dY2CF0GulErLoHLfNrkHxow+HI2 2idvL7F2elQ/cTQZ99VGsNMUc1Ue+3fYUGW5Uji7w2zHhPID26aT7icGzN0fw3asklsb 1EpxjpzdQOzzPJgu/DF4TaNlBihnJoKyZeueydXPBTdOLXFeO5WMx+Fq+lsJXiWTu2z1 hbX899gARBV6VMcBHyJPdt170hnLc4X2dV0A76RK2D7nUX6lGpV5NOph9CPaCKwUtNzd eLDHqKak0OVf7LzZ4bXfx1dG1s0B/1S6O45TaK+QXTVGnkptXqvI3LhpjM5tkcOCplZs BT3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SVKfdrKQEvYzk1y5WDH8pdDsahD2iy38wDYDrd4fUZ0=; b=BHR8IU88En1ZdaGjnJoUe5kuSIQHX5EeHSVgpzOFXbslnRxSC3o8MIrHy+PQiu5J7E 3+7lwAg8ZXj+rBGeijwjISjvmlKux64CJIsRtQDF5XKOHRsLNiwfCaBueApGCFSF/mXm ZvfVjUBxF+VniG2NHbKplPCSl200KiholyJOuMTwqjhCOt+B9wF/zV18HLUGUmVhKWCb kcFeLijF3iHkw5J8Y03ariS+DFp75nOE4OPGItQPw+jPm2jMaexCY2V7DyZ0iZW3+ocs jKDecVWvN+gbWB/Nq7ffaY5i0LbYrzQ3aopexaVfgyQACEoI5uv+LLaxM781Z8Uxqi1H 45kA== X-Gm-Message-State: APjAAAW3EhGcpxc9GZr6NMYwjtKM6kiTxJMpLz2vpqyor0fQB4bREC6d G1Zj89UnwfFoxfNCd8rBepw= X-Google-Smtp-Source: APXvYqwjM2y9BLfsfHrt1CQBGKr604hbbTaBGOOq045WoSKd7gacGc/h6WCbtFu4ELWoxBv/GOMBYw== X-Received: by 2002:a05:651c:1066:: with SMTP id y6mr230989ljm.96.1574094350805; Mon, 18 Nov 2019 08:25:50 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id d24sm8582872ljg.73.2019.11.18.08.25.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 08:25:50 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Cc: linux-tegra@vger.kernel.org Subject: [PATCH v3 4/4] soc/tegra: fuse: Unmap registers once they are not needed anymore Date: Mon, 18 Nov 2019 19:25:00 +0300 Message-Id: <20191118162500.6651-5-digetx@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191118162500.6651-1-digetx@gmail.com> References: <20191118162500.6651-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Both Chip ID and strapping registers are now read out during of APB MISC initialization, the registers' mapping isn't needed anymore once registers are read. Hence let's unmap registers once they are not needed anymore, for consistency. Suggested-by: Michał Mirosław Signed-off-by: Dmitry Osipenko --- drivers/soc/tegra/fuse/tegra-apbmisc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/soc/tegra/fuse/tegra-apbmisc.c b/drivers/soc/tegra/fuse/tegra-apbmisc.c index d4fff96d8407..eaa260526c68 100644 --- a/drivers/soc/tegra/fuse/tegra-apbmisc.c +++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c @@ -157,16 +157,20 @@ void __init tegra_init_apbmisc(void) } apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc)); - if (!apbmisc_base) + if (!apbmisc_base) { pr_err("failed to map APBMISC registers\n"); - else + } else { chipid = readl_relaxed(apbmisc_base + 4); + iounmap(apbmisc_base); + } strapping_base = ioremap_nocache(straps.start, resource_size(&straps)); - if (!strapping_base) + if (!strapping_base) { pr_err("failed to map strapping options registers\n"); - else + } else { strapping = readl_relaxed(strapping_base); + iounmap(strapping_base); + } long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code"); }