drivers: firmware: xilinx: Add unique family code for all platforms

The family code is currently derived from the PMC_TAP_IDCODE register
value, but there are issues where Versal, Versal NET, and future
platforms share the same family code. Additionally for some platforms
have identical subfamily code, making it challenging to differentiate
between platforms based on the family and subfamily codes. To resolve
this, a new family code member is added to the platform data, initialized
with unique values. This change enables better platform distinction via
the compatible string.

Signed-off-by: Jay Buddhabhatti <jay.buddhabhatti@amd.com>
Link: https://lore.kernel.org/r/20250701123851.1314531-3-jay.buddhabhatti@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 53b8c88b4178b010584a2d37397bdf6ae5bd438a..2d250a16d3ddcbcd64ea52567fb4f101d9eceb7a 100644 (file)
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -72,6 +72,15 @@ struct pm_api_feature_data {
        struct hlist_node hentry;
 };
 
+struct platform_fw_data {
+       /*
+        * Family code for platform.
+        */
+       const u32 family_code;
+};
+
+static struct platform_fw_data *active_platform_fw_data;
+
 static const struct mfd_cell firmware_devs[] = {
        {
                .name = "zynqmp_power_controller",
@@ -2052,6 +2061,11 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
+       /* Get platform-specific firmware data from device tree match */
+       active_platform_fw_data = (struct platform_fw_data *)device_get_match_data(dev);
+       if (!active_platform_fw_data)
+               return -EINVAL;
+
        /* Get SiP SVC version number */
        ret = zynqmp_pm_get_sip_svc_version(&sip_svc_version);
        if (ret)
@@ -2152,10 +2166,22 @@ static void zynqmp_firmware_sync_state(struct device *dev)
                dev_warn(dev, "failed to release power management to firmware\n");
 }
 
+static const struct platform_fw_data platform_fw_data_versal = {
+       .family_code = PM_VERSAL_FAMILY_CODE,
+};
+
+static const struct platform_fw_data platform_fw_data_versal_net = {
+       .family_code = PM_VERSAL_NET_FAMILY_CODE,
+};
+
+static const struct platform_fw_data platform_fw_data_zynqmp = {
+       .family_code = PM_ZYNQMP_FAMILY_CODE,
+};
+
 static const struct of_device_id zynqmp_firmware_of_match[] = {
-       {.compatible = "xlnx,zynqmp-firmware"},
-       {.compatible = "xlnx,versal-firmware"},
-       {.compatible = "xlnx,versal-net-firmware"},
+       {.compatible = "xlnx,zynqmp-firmware", .data = &platform_fw_data_zynqmp},
+       {.compatible = "xlnx,versal-firmware", .data = &platform_fw_data_versal},
+       {.compatible = "xlnx,versal-net-firmware", .data = &platform_fw_data_versal_net},
        {},
 };
 MODULE_DEVICE_TABLE(of, zynqmp_firmware_of_match);

diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index 4699f50465f2392d3b683d3f512a1fb2b309231a..6458ef4e04e29880ce2c98469c1feff7dfbfcd68 100644 (file)
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -54,6 +54,11 @@
 #define ZYNQMP_FAMILY_CODE 0x23
 #define VERSAL_FAMILY_CODE 0x26
 
+/* Family codes */
+#define PM_ZYNQMP_FAMILY_CODE 0x1 /* ZynqMP family code */
+#define PM_VERSAL_FAMILY_CODE 0x2 /* Versal family code */
+#define PM_VERSAL_NET_FAMILY_CODE 0x3 /* Versal NET family code */
+
 /* When all subfamily of platform need to support */
 #define ALL_SUB_FAMILY_CODE            0x00
 #define VERSAL_SUB_FAMILY_CODE         0x01