From patchwork Tue Jun 11 18:51:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonard Crestez X-Patchwork-Id: 1114181 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kehDAFJT"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45NfHt3ZQqz9s9y for ; Wed, 12 Jun 2019 04:52:10 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=WlDt24ZaOi5OnEVHbxMQjWufFDGOkDonPHfw5nnTSgQ=; b=keh DAFJTeS+RutVA8q5RDl8PyVocRFpMIRHNMkdBv4ckohGRaJ1hWyEvErxoXCDKRUsPH0sQsKrnCZe8 1QLY3gd+s6sauNhXfla49lympZQdj1U3cnVd4xj53O3xc/Fwy9zAkqBRsiL91IlgxJJrqHggPudDL J3HEAYrUIvIzXtGNJZtId8T7DI9f5d78UeBS4pG8kiSGu6GL993BxuWYENzhWoPCbq60homjGQ6f5 ag8GUo5naDD+w6zrFKVu9VVAFb0Mnx6gcWxacjdWkRYFnyq3JpMflN1f9as/aoJ8fQjsGfULyu79Q 6bLRG3QMzltUp+ntxxAS6ZNHT+lXbkw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1halsN-0008Q0-TK; Tue, 11 Jun 2019 18:52:07 +0000 Received: from inva021.nxp.com ([92.121.34.21]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1halsK-0008PT-IF for linux-arm-kernel@lists.infradead.org; Tue, 11 Jun 2019 18:52:06 +0000 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id C6827200AB9; Tue, 11 Jun 2019 20:52:00 +0200 (CEST) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id B8826200105; Tue, 11 Jun 2019 20:52:00 +0200 (CEST) Received: from fsr-ub1864-112.ea.freescale.net (gw_auto.ea.freescale.net [10.171.94.100]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id 4582A20600; Tue, 11 Jun 2019 20:52:00 +0200 (CEST) From: Leonard Crestez To: =?utf-8?q?Guido_G=C3=BCnther?= , Shawn Guo , Dong Aisheng Subject: [PATCH] soc: imx: Move imx_get_soc_revision from mach-imx Date: Tue, 11 Jun 2019 21:51:57 +0300 Message-Id: <084f934192b7d245034ddd507f348fa13ae840ac.1560279028.git.leonard.crestez@nxp.com> X-Mailer: git-send-email 2.17.1 X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190611_115204_880144_D60868AA X-CRM114-Status: GOOD ( 13.79 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [92.121.34.21 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Abel Vesa , Anson Huang , linux-imx@nxp.com, kernel@pengutronix.de, Fabio Estevam , linux-arm-kernel@lists.infradead.org, Lucas Stach MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org There are a few drivers which call imx_get_soc_revision in order to enable errata workarounds but this is only available on 32-bit arm. Move the current globals to drivers/soc/imx/revision.c so that they're also accessible on all imx8 with same name and semantics. Signed-off-by: Leonard Crestez Reviewed-by: Dong Aisheng --- This is not very pretty. arch/arm/mach-imx/common.h | 1 - arch/arm/mach-imx/cpu.c | 17 ++++------------- drivers/soc/imx/Makefile | 1 + drivers/soc/imx/revision.c | 19 +++++++++++++++++++ drivers/soc/imx/soc-imx-scu.c | 2 ++ drivers/soc/imx/soc-imx8.c | 5 ++++- include/soc/imx/revision.h | 1 + 7 files changed, 31 insertions(+), 15 deletions(-) create mode 100644 drivers/soc/imx/revision.c diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index c51764a85fd7..5c06224986f4 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -49,11 +49,10 @@ void mxc_restart(enum reboot_mode, const char *); void mxc_arch_reset_init(void __iomem *); void imx1_reset_init(void __iomem *); void imx_set_aips(void __iomem *); void imx_aips_allow_unprivileged_access(const char *compat); int mxc_device_init(void); -void imx_set_soc_revision(unsigned int rev); void imx_init_revision_from_anatop(void); struct device *imx_soc_device_init(void); void imx6_enable_rbc(bool enable); void imx_gpc_check_dt(void); void imx_gpc_set_arm_power_in_lpm(bool power_off); diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 0b137eeffb61..bfc84f5a1312 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -9,27 +9,16 @@ #include "hardware.h" #include "common.h" unsigned int __mxc_cpu_type; -static unsigned int imx_soc_revision; void mxc_set_cpu_type(unsigned int type) { __mxc_cpu_type = type; } -void imx_set_soc_revision(unsigned int rev) -{ - imx_soc_revision = rev; -} - -unsigned int imx_get_soc_revision(void) -{ - return imx_soc_revision; -} - void imx_print_silicon_rev(const char *cpu, int srev) { if (srev == IMX_CHIP_REVISION_UNKNOWN) pr_info("CPU identified as %s, unknown revision\n", cpu); else @@ -77,10 +66,11 @@ struct device * __init imx_soc_device_init(void) { struct soc_device_attribute *soc_dev_attr; struct soc_device *soc_dev; struct device_node *root; const char *soc_id; + int soc_rev; int ret; soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); if (!soc_dev_attr) return NULL; @@ -151,13 +141,14 @@ struct device * __init imx_soc_device_init(void) default: soc_id = "Unknown"; } soc_dev_attr->soc_id = soc_id; + soc_rev = imx_get_soc_revision(); soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d.%d", - (imx_soc_revision >> 4) & 0xf, - imx_soc_revision & 0xf); + (soc_rev >> 4) & 0xf, + soc_rev & 0xf); if (!soc_dev_attr->revision) goto free_soc; soc_dev = soc_device_register(soc_dev_attr); if (IS_ERR(soc_dev)) diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile index cf9ca42ff739..293a771127dd 100644 --- a/drivers/soc/imx/Makefile +++ b/drivers/soc/imx/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-y += revision.o obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o obj-$(CONFIG_ARCH_MXC) += soc-imx8.o obj-$(CONFIG_IMX_SCU_SOC) += soc-imx-scu.o diff --git a/drivers/soc/imx/revision.c b/drivers/soc/imx/revision.c new file mode 100644 index 000000000000..fc4cea2f25bd --- /dev/null +++ b/drivers/soc/imx/revision.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 NXP. + */ +#include +#include + +static unsigned int imx_soc_revision = IMX_CHIP_REVISION_UNKNOWN; + +void imx_set_soc_revision(unsigned int rev) +{ + imx_soc_revision = rev; +} + +unsigned int imx_get_soc_revision(void) +{ + return imx_soc_revision; +} +EXPORT_SYMBOL(imx_get_soc_revision); diff --git a/drivers/soc/imx/soc-imx-scu.c b/drivers/soc/imx/soc-imx-scu.c index 676f612f6488..7c4106ff3e0f 100644 --- a/drivers/soc/imx/soc-imx-scu.c +++ b/drivers/soc/imx/soc-imx-scu.c @@ -7,10 +7,11 @@ #include #include #include #include #include +#include #define IMX_SCU_SOC_DRIVER_NAME "imx-scu-soc" static struct imx_sc_ipc *soc_ipc_handle; @@ -85,10 +86,11 @@ static int imx_scu_soc_probe(struct platform_device *pdev) return -ENOMEM; /* format revision value passed from SCU firmware */ val = (id >> 5) & 0xf; val = (((val >> 2) + 1) << 4) | (val & 0x3); + imx_set_soc_revision(val); soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d.%d", (val >> 4) & 0xf, val & 0xf); if (!soc_dev_attr->revision) { diff --git a/drivers/soc/imx/soc-imx8.c b/drivers/soc/imx/soc-imx8.c index 3842d096daf0..465d2c6c6905 100644 --- a/drivers/soc/imx/soc-imx8.c +++ b/drivers/soc/imx/soc-imx8.c @@ -8,10 +8,11 @@ #include #include #include #include #include +#include #define REV_B1 0x21 #define IMX8MQ_SW_INFO_B1 0x40 #define IMX8MQ_SW_MAGIC_B1 0xff0055aa @@ -118,12 +119,14 @@ static int __init imx8_soc_init(void) } data = id->data; if (data) { soc_dev_attr->soc_id = data->name; - if (data->soc_revision) + if (data->soc_revision) { soc_rev = data->soc_revision(); + imx_set_soc_revision(soc_rev & 0xFF); + } } soc_dev_attr->revision = imx8_revision(soc_rev); if (!soc_dev_attr->revision) { ret = -ENOMEM; diff --git a/include/soc/imx/revision.h b/include/soc/imx/revision.h index 9ea346924c35..5e7e2aea10ff 100644 --- a/include/soc/imx/revision.h +++ b/include/soc/imx/revision.h @@ -30,8 +30,9 @@ int mx31_revision(void); int mx35_revision(void); int mx51_revision(void); int mx53_revision(void); unsigned int imx_get_soc_revision(void); +void imx_set_soc_revision(unsigned int rev); void imx_print_silicon_rev(const char *cpu, int srev); #endif /* __SOC_IMX_REVISION_H__ */