From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1FD40C7618D for ; Thu, 6 Apr 2023 16:29:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 72C9486073; Thu, 6 Apr 2023 18:29:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="AZgdLHu5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0165F86077; Thu, 6 Apr 2023 18:29:32 +0200 (CEST) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2C36F86020 for ; Thu, 6 Apr 2023 18:29:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=afd@ti.com Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 336GTME0038252; Thu, 6 Apr 2023 11:29:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680798562; bh=t/1FDmfbXOAn2OdzJWr6To/MnU37n8/7bNXfj8uEVMc=; h=Date:Subject:To:CC:References:From:In-Reply-To; b=AZgdLHu5cDik66sRQvsiiNQNALaskHYJEtZESZiAq7Po3hGQayTYNd/CDF6joRCBX ZWLYjvv7QFMalTKIwIQG1GcIkF09jQ+/A4P76qX7IlKwFYrxlkPWBdZbU2WXo6Xh2X S8Re5feUbPxqORGqcJ+YdeYAJFAdvBArs59Kk5pw= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 336GTM9I120761 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 6 Apr 2023 11:29:22 -0500 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 6 Apr 2023 11:29:21 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 6 Apr 2023 11:29:22 -0500 Received: from [10.250.33.184] (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 336GTL8E007007; Thu, 6 Apr 2023 11:29:21 -0500 Message-ID: <30419dfd-e0b1-b7ea-b06e-ac82efa18b85@ti.com> Date: Thu, 6 Apr 2023 11:29:21 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH v3 02/12] arm: mach-k3: Move J721e SoC detection out of common section Content-Language: en-US To: Christian Gmeiner CC: Simon Glass , Tom Rini , References: <20230406141003.17511-1-afd@ti.com> <20230406141003.17511-3-afd@ti.com> From: Andrew Davis In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean On 4/6/23 10:59 AM, Christian Gmeiner wrote: >> >> This belongs in the J721e specific file as it is the only place >> this is used. Any board level users should use the SOC driver. >> >> While here, move the J721e and J7200 SoC IDs out of sys_proto.h >> and into hardware.h. Use a macro borrowed from Rockchip and add >> the rest of the SoC IDs for completeness and later use. >> >> Signed-off-by: Andrew Davis >> --- >> arch/arm/mach-k3/common.c | 20 ------------------ >> arch/arm/mach-k3/common.h | 3 --- >> arch/arm/mach-k3/include/mach/hardware.h | 25 +++++++++++++++++++++++ >> arch/arm/mach-k3/include/mach/sys_proto.h | 3 --- >> 4 files changed, 25 insertions(+), 26 deletions(-) >> >> diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c >> index 6870f13c520..6e084de692c 100644 >> --- a/arch/arm/mach-k3/common.c >> +++ b/arch/arm/mach-k3/common.c >> @@ -488,26 +488,6 @@ int print_cpuinfo(void) >> } >> #endif >> >> -bool soc_is_j721e(void) >> -{ >> - u32 soc; >> - >> - soc = (readl(CTRLMMR_WKUP_JTAG_ID) & >> - JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT; >> - >> - return soc == J721E; >> -} >> - >> -bool soc_is_j7200(void) >> -{ >> - u32 soc; >> - >> - soc = (readl(CTRLMMR_WKUP_JTAG_ID) & >> - JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT; >> - >> - return soc == J7200; >> -} >> - >> #ifdef CONFIG_ARM64 >> void board_prep_linux(struct bootm_headers *images) >> { >> diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h >> index 8f38fcef7f0..531be0be54c 100644 >> --- a/arch/arm/mach-k3/common.h >> +++ b/arch/arm/mach-k3/common.h >> @@ -9,9 +9,6 @@ >> #include >> #include >> >> -#define J721E 0xbb64 >> -#define J7200 0xbb6d >> - >> struct fwl_data { >> const char *name; >> u16 fwl_id; >> diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h >> index 2c60ef85432..4f7bf68f5b6 100644 >> --- a/arch/arm/mach-k3/include/mach/hardware.h >> +++ b/arch/arm/mach-k3/include/mach/hardware.h >> @@ -6,6 +6,8 @@ >> #ifndef _ASM_ARCH_HARDWARE_H_ >> #define _ASM_ARCH_HARDWARE_H_ >> >> +#include >> + >> #ifdef CONFIG_SOC_K3_AM654 >> #include "am6_hardware.h" >> #endif >> @@ -36,6 +38,29 @@ >> #define JTAG_ID_VARIANT_MASK (0xf << 28) >> #define JTAG_ID_PARTNO_SHIFT 12 >> #define JTAG_ID_PARTNO_MASK (0xffff << 12) >> +#define JTAG_ID_PARTNO_AM65X 0xbb5a >> +#define JTAG_ID_PARTNO_J721E 0xbb64 >> +#define JTAG_ID_PARTNO_J7200 0xbb6d >> +#define JTAG_ID_PARTNO_AM64X 0xbb38 >> +#define JTAG_ID_PARTNO_J721S2 0xbb75 >> +#define JTAG_ID_PARTNO_AM62X 0xbb7e >> +#define JTAG_ID_PARTNO_AM62AX 0xbb8d >> + >> +#define K3_SOC_ID(id, ID) \ >> +static inline bool soc_is_##id(void) \ >> +{ \ >> + u32 soc = (readl(CTRLMMR_WKUP_JTAG_ID) & \ >> + JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT; \ >> + return soc == JTAG_ID_PARTNO_J7200; \ > > This is not what you want. Maybe > return soc == JTAG_ID_PARTNO_##ID; \ > Ah, copy/paste error got me 😄 good catch, v4 on the way.. Thanks, Andrew >> +} >> +K3_SOC_ID(am65x, AM65X) >> +K3_SOC_ID(j721e, J721E) >> +K3_SOC_ID(j7200, J7200) >> +K3_SOC_ID(am64x, AM64X) >> +K3_SOC_ID(j721s2, J721S2) >> +K3_SOC_ID(am62x, AM62X) >> +K3_SOC_ID(am62ax, AM62AX) >> + >> #define K3_SEC_MGR_SYS_STATUS 0x44234100 >> #define SYS_STATUS_DEV_TYPE_SHIFT 0 >> #define SYS_STATUS_DEV_TYPE_MASK (0xf) >> diff --git a/arch/arm/mach-k3/include/mach/sys_proto.h b/arch/arm/mach-k3/include/mach/sys_proto.h >> index 0b5d606eaa2..d5d4b787b7d 100644 >> --- a/arch/arm/mach-k3/include/mach/sys_proto.h >> +++ b/arch/arm/mach-k3/include/mach/sys_proto.h >> @@ -15,9 +15,6 @@ int do_board_detect(void); >> void release_resources_for_core_shutdown(void); >> int fdt_disable_node(void *blob, char *node_path); >> >> -bool soc_is_j721e(void); >> -bool soc_is_j7200(void); >> - >> void k3_spl_init(void); >> void k3_mem_init(void); >> bool check_rom_loaded_sysfw(void); >> -- >> 2.39.2 >> > >