All four Xilinx SoC drivers contain identical IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE) conditionals to retrieve the chip ID. Move this logic behind xilinx_pm_get_chipid(), using a weak default implementation for each platform and a common override in firmware-zynqmp.c.
As part of this refactoring, move the ZynqMP weak default implementation to mach-zynqmp/cpu.c to align with the other supported platforms. Also declare xilinx_pm_get_chipid() in sys_proto.h instead of zynqmp_firmware.h, as the SoC drivers no longer require direct dependencies on firmware-specific definitions. Signed-off-by: Akshay Belsare <[email protected]> --- arch/arm/mach-versal-net/cpu.c | 13 +++++++++++ .../mach-versal-net/include/mach/sys_proto.h | 2 ++ arch/arm/mach-versal/cpu.c | 13 +++++++++++ arch/arm/mach-versal/include/mach/sys_proto.h | 2 ++ arch/arm/mach-versal2/cpu.c | 13 +++++++++++ .../arm/mach-versal2/include/mach/sys_proto.h | 2 ++ arch/arm/mach-zynqmp/cpu.c | 8 +++++++ arch/arm/mach-zynqmp/include/mach/sys_proto.h | 2 ++ drivers/firmware/firmware-zynqmp.c | 17 ++++++++++++++ drivers/soc/soc_amd_versal2.c | 23 ++++++------------- drivers/soc/soc_xilinx_versal.c | 23 ++++++------------- drivers/soc/soc_xilinx_versal_net.c | 23 ++++++------------- drivers/soc/soc_xilinx_zynqmp.c | 21 ++++++----------- 13 files changed, 100 insertions(+), 62 deletions(-) diff --git a/arch/arm/mach-versal-net/cpu.c b/arch/arm/mach-versal-net/cpu.c index 7df7c49ac71..54d8496a5e8 100644 --- a/arch/arm/mach-versal-net/cpu.c +++ b/arch/arm/mach-versal-net/cpu.c @@ -11,6 +11,7 @@ #include <malloc.h> #include <time.h> #include <vsprintf.h> +#include <linux/errno.h> #include <asm/armv8/mmu.h> #include <asm/cache.h> #include <asm/global_data.h> @@ -237,6 +238,18 @@ bool soc_detection(void) return true; } +__weak int xilinx_pm_get_chipid(u32 *idcode, u32 *version) +{ + if (idcode) + *idcode = 0; + + *version = readl(PMC_TAP_VERSION); + if (!*version) + return -EINVAL; + + return 0; +} + U_BOOT_DRVINFO(soc_xilinx_versal_net) = { .name = "soc_xilinx_versal_net", }; diff --git a/arch/arm/mach-versal-net/include/mach/sys_proto.h b/arch/arm/mach-versal-net/include/mach/sys_proto.h index 4907dae1108..bfe9df76b0b 100644 --- a/arch/arm/mach-versal-net/include/mach/sys_proto.h +++ b/arch/arm/mach-versal-net/include/mach/sys_proto.h @@ -13,3 +13,5 @@ void versal_net_timer_setup(void); u8 versal_net_get_bootmode(void); /* Direct MMIO read of the bootmode register (EL3 / no-firmware path) */ u32 versal_net_bootmode_reg(void); +/* Overridable chip ID accessor: weak MMIO default, firmware override */ +int xilinx_pm_get_chipid(u32 *idcode, u32 *version); diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c index 7521d45bc1a..15b3303bd1c 100644 --- a/arch/arm/mach-versal/cpu.c +++ b/arch/arm/mach-versal/cpu.c @@ -9,6 +9,7 @@ #include <init.h> #include <log.h> #include <time.h> +#include <linux/errno.h> #include <asm/armv8/mmu.h> #include <asm/cache.h> #include <asm/global_data.h> @@ -178,6 +179,18 @@ u8 __weak versal_get_bootmode(void) return reg & BOOT_MODES_MASK; } +__weak int xilinx_pm_get_chipid(u32 *idcode, u32 *version) +{ + if (idcode) + *idcode = 0; + + *version = readl(VERSAL_PS_PMC_VERSION); + if (!*version) + return -EINVAL; + + return 0; +} + U_BOOT_DRVINFO(soc_xilinx_versal) = { .name = "soc_xilinx_versal", }; diff --git a/arch/arm/mach-versal/include/mach/sys_proto.h b/arch/arm/mach-versal/include/mach/sys_proto.h index cb373e6fad9..bff4659eb8f 100644 --- a/arch/arm/mach-versal/include/mach/sys_proto.h +++ b/arch/arm/mach-versal/include/mach/sys_proto.h @@ -27,5 +27,7 @@ u8 versal_get_bootmode(void); u32 versal_bootmode_reg(void); /* EL3 clock/timer register setup, called from board_early_init_r() */ void versal_timer_setup(void); +/* Overridable chip ID accessor: weak MMIO default, firmware override */ +int xilinx_pm_get_chipid(u32 *idcode, u32 *version); #endif /* _ASM_ARCH_SYS_PROTO_H */ diff --git a/arch/arm/mach-versal2/cpu.c b/arch/arm/mach-versal2/cpu.c index d72f66f4fba..fc7cdbaaa65 100644 --- a/arch/arm/mach-versal2/cpu.c +++ b/arch/arm/mach-versal2/cpu.c @@ -12,6 +12,7 @@ #include <time.h> #include <vsprintf.h> #include <wait_bit.h> +#include <linux/errno.h> #include <asm/armv8/mmu.h> #include <asm/cache.h> #include <asm/global_data.h> @@ -310,6 +311,18 @@ bool soc_detection(void) return true; } +__weak int xilinx_pm_get_chipid(u32 *idcode, u32 *version) +{ + if (idcode) + *idcode = 0; + + *version = readl(PMC_TAP_VERSION); + if (!*version) + return -EINVAL; + + return 0; +} + U_BOOT_DRVINFO(soc_amd_versal2) = { .name = "soc_amd_versal2", }; diff --git a/arch/arm/mach-versal2/include/mach/sys_proto.h b/arch/arm/mach-versal2/include/mach/sys_proto.h index d678adf9c26..1a23f8dd425 100644 --- a/arch/arm/mach-versal2/include/mach/sys_proto.h +++ b/arch/arm/mach-versal2/include/mach/sys_proto.h @@ -21,6 +21,8 @@ u32 versal2_multi_boot_reg(void); u8 versal2_get_bootmode(void); /* EL3 clock/timer register setup, called from board_early_init_r() */ void versal2_timer_setup(void); +/* Overridable chip ID accessor: weak MMIO default, firmware override */ +int xilinx_pm_get_chipid(u32 *idcode, u32 *version); int zynqmp_pm_wait_mphy_tx_rx_config_ready(u32 timeout_us); int zynqmp_pm_wait_sram_init_done(u32 timeout_us); diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c index 088cc962189..c7328970fe5 100644 --- a/arch/arm/mach-zynqmp/cpu.c +++ b/arch/arm/mach-zynqmp/cpu.c @@ -214,6 +214,14 @@ int __weak zynqmp_mmio_read(const u32 address, u32 *value) return -EINVAL; } +__weak int xilinx_pm_get_chipid(u32 *idcode, u32 *version) +{ + if (idcode) + *idcode = 0; + + return zynqmp_mmio_read(ZYNQMP_PS_VERSION, version); +} + void zynqmp_timer_setup(void) { u32 val; diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h index d2bb10ffcbb..e791c2da74f 100644 --- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h +++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h @@ -59,5 +59,7 @@ void zynqmp_timer_setup(void); /* Direct MMIO accessors (EL3/SPL or no-firmware path) */ int zynqmp_mmio_rawread(const u32 address, u32 *value); int zynqmp_mmio_rawwrite(const u32 address, const u32 mask, const u32 value); +/* Overridable chip ID accessor: weak MMIO default, firmware override */ +int xilinx_pm_get_chipid(u32 *idcode, u32 *version); #endif /* _ASM_ARCH_SYS_PROTO_H */ diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c index fae66ccb3d8..ad759849fe4 100644 --- a/drivers/firmware/firmware-zynqmp.c +++ b/drivers/firmware/firmware-zynqmp.c @@ -175,6 +175,23 @@ unsigned int zynqmp_firmware_version(void) return pm_api_version; }; +int xilinx_pm_get_chipid(u32 *idcode, u32 *version) +{ + u32 ret_payload[PAYLOAD_ARG_CNT]; + int ret; + + ret = xilinx_pm_request(PM_GET_CHIPID, 0, 0, 0, 0, 0, 0, ret_payload); + if (ret) + return ret; + + if (idcode) + *idcode = ret_payload[1]; + if (version) + *version = ret_payload[2]; + + return 0; +} + #if defined(CONFIG_ARCH_VERSAL2) /* * Poll the M-PHY TX/RX config-ready status until it settles or @timeout_us diff --git a/drivers/soc/soc_amd_versal2.c b/drivers/soc/soc_amd_versal2.c index 7f06c1e70bc..d31c6deec45 100644 --- a/drivers/soc/soc_amd_versal2.c +++ b/drivers/soc/soc_amd_versal2.c @@ -7,9 +7,8 @@ #include <dm.h> #include <soc.h> -#include <zynqmp_firmware.h> -#include <asm/io.h> #include <asm/arch/hardware.h> +#include <asm/arch/sys_proto.h> #include <linux/bitfield.h> @@ -48,23 +47,15 @@ static const struct soc_ops soc_amd_versal2_ops = { static int soc_amd_versal2_probe(struct udevice *dev) { struct soc_amd_versal2_priv *priv = dev_get_priv(dev); - u32 ret_payload[PAYLOAD_ARG_CNT]; + u32 version; int ret; - priv->family = versal2_family; - - if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) { - ret = xilinx_pm_request(PM_GET_CHIPID, 0, 0, 0, 0, - 0, 0, ret_payload); - if (ret) - return ret; - } else { - ret_payload[2] = readl(PMC_TAP_VERSION); - if (!ret_payload[2]) - return -EINVAL; - } + ret = xilinx_pm_get_chipid(NULL, &version); + if (ret) + return ret; - priv->revision = FIELD_GET(PS_VERSION_MASK, ret_payload[2]); + priv->family = versal2_family; + priv->revision = FIELD_GET(PS_VERSION_MASK, version); return 0; } diff --git a/drivers/soc/soc_xilinx_versal.c b/drivers/soc/soc_xilinx_versal.c index c43a80df1fc..ff6eb873d8a 100644 --- a/drivers/soc/soc_xilinx_versal.c +++ b/drivers/soc/soc_xilinx_versal.c @@ -7,9 +7,8 @@ #include <dm.h> #include <soc.h> -#include <zynqmp_firmware.h> -#include <asm/io.h> #include <asm/arch/hardware.h> +#include <asm/arch/sys_proto.h> /* * v1 -> 0x10 - ES1 @@ -44,23 +43,15 @@ static const struct soc_ops soc_xilinx_versal_ops = { static int soc_xilinx_versal_probe(struct udevice *dev) { struct soc_xilinx_versal_priv *priv = dev_get_priv(dev); - u32 ret_payload[PAYLOAD_ARG_CNT]; + u32 version; int ret; - priv->family = versal_family; - - if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) { - ret = xilinx_pm_request(PM_GET_CHIPID, 0, 0, 0, 0, - 0, 0, ret_payload); - if (ret) - return ret; - } else { - ret_payload[2] = readl(VERSAL_PS_PMC_VERSION); - if (!ret_payload[2]) - return -EINVAL; - } + ret = xilinx_pm_get_chipid(NULL, &version); + if (ret) + return ret; - priv->revision = ret_payload[2] >> VERSAL_PS_VER_SHIFT; + priv->family = versal_family; + priv->revision = version >> VERSAL_PS_VER_SHIFT; return 0; } diff --git a/drivers/soc/soc_xilinx_versal_net.c b/drivers/soc/soc_xilinx_versal_net.c index 210f9f8f8fd..3218cc416f7 100644 --- a/drivers/soc/soc_xilinx_versal_net.c +++ b/drivers/soc/soc_xilinx_versal_net.c @@ -7,9 +7,8 @@ #include <dm.h> #include <soc.h> -#include <zynqmp_firmware.h> -#include <asm/io.h> #include <asm/arch/hardware.h> +#include <asm/arch/sys_proto.h> #include <linux/bitfield.h> @@ -46,23 +45,15 @@ static const struct soc_ops soc_xilinx_versal_net_ops = { static int soc_xilinx_versal_net_probe(struct udevice *dev) { struct soc_xilinx_versal_net_priv *priv = dev_get_priv(dev); - u32 ret_payload[PAYLOAD_ARG_CNT]; + u32 version; int ret; - priv->family = versal_family; - - if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) { - ret = xilinx_pm_request(PM_GET_CHIPID, 0, 0, 0, 0, - 0, 0, ret_payload); - if (ret) - return ret; - } else { - ret_payload[2] = readl(PMC_TAP_VERSION); - if (!ret_payload[2]) - return -EINVAL; - } + ret = xilinx_pm_get_chipid(NULL, &version); + if (ret) + return ret; - priv->revision = FIELD_GET(PS_VERSION_MASK, ret_payload[2]); + priv->family = versal_family; + priv->revision = FIELD_GET(PS_VERSION_MASK, version); return 0; } diff --git a/drivers/soc/soc_xilinx_zynqmp.c b/drivers/soc/soc_xilinx_zynqmp.c index 0e13e230914..1dc0b05a1a3 100644 --- a/drivers/soc/soc_xilinx_zynqmp.c +++ b/drivers/soc/soc_xilinx_zynqmp.c @@ -13,7 +13,6 @@ #include <dm/device_compat.h> #include <asm/cache.h> #include <soc.h> -#include <zynqmp_firmware.h> #include <asm/arch/sys_proto.h> #include <asm/arch/hardware.h> @@ -400,22 +399,17 @@ static const struct soc_ops soc_xilinx_zynqmp_ops = { static int soc_xilinx_zynqmp_probe(struct udevice *dev) { struct soc_xilinx_zynqmp_priv *priv = dev_get_priv(dev); - u32 ret_payload[PAYLOAD_ARG_CNT]; + u32 idcode = 0, version; int ret; - priv->family = zynqmp_family; - - if (!IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) - ret = zynqmp_mmio_read(ZYNQMP_PS_VERSION, &ret_payload[2]); - else - ret = xilinx_pm_request(PM_GET_CHIPID, 0, 0, 0, 0, - 0, 0, ret_payload); + ret = xilinx_pm_get_chipid(&idcode, &version); if (ret < 0) return ret; - priv->revision = ret_payload[2] & ZYNQMP_PS_VER_MASK; + priv->family = zynqmp_family; + priv->revision = version & ZYNQMP_PS_VER_MASK; - if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) { + if (idcode) { /* * Firmware returns: * payload[0][31:0] = status of the operation @@ -424,9 +418,8 @@ static int soc_xilinx_zynqmp_probe(struct udevice *dev) * payload[2][28:20] = EXTENDED_IDCODE * payload[2][29] = PL_INIT */ - u32 idcode = ret_payload[1]; - u32 idcode2 = ret_payload[2] >> - ZYNQMP_CSU_VERSION_EMPTY_SHIFT; + u32 idcode2 = version >> ZYNQMP_CSU_VERSION_EMPTY_SHIFT; + dev_dbg(dev, "IDCODE: 0x%0x, IDCODE2: 0x%0x\n", idcode, idcode2); -- 2.34.1
