firmware: xilinx: Move FIRMWARE_VERSION_MASK to xlnx-zynqmp.h

Move FIRMWARE_VERSION_MASK macro to xlnx-zynqmp.h so that other
drivers can use it for verifying the supported firmware version.

Signed-off-by: Ronak Jain <[email protected]>
Signed-off-by: Anand Ashok Dumbre <[email protected]>
Signed-off-by: Radhey Shyam Pandey <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Michal Simek <[email protected]>

diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
index 9bc45357e1a803aed2a60b7c5b98b429aed2a79e..add8acf66a9c7c9e9ecc39650a1aa1a1371fecf7 100644 (file)
--- a/drivers/firmware/xilinx/zynqmp.c
+++ b/drivers/firmware/xilinx/zynqmp.c
@@ -41,9 +41,6 @@
 /* IOCTL/QUERY feature payload size */
 #define FEATURE_PAYLOAD_SIZE           2
 
-/* Firmware feature check version mask */
-#define FIRMWARE_VERSION_MASK          GENMASK(15, 0)
-
 static bool feature_check_enabled;
 static DEFINE_HASHTABLE(pm_api_features_map, PM_API_FEATURE_CHECK_MAX_ORDER);
 static u32 ioctl_features[FEATURE_PAYLOAD_SIZE];

diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/xlnx_event_manager.c
index 366018f6a0ee0529d42027401a77a6a81b1665a8..f529e1346247cce1507200dcb10fd794ab06ce6c 100644 (file)
--- a/drivers/soc/xilinx/xlnx_event_manager.c
+++ b/drivers/soc/xilinx/xlnx_event_manager.c
@@ -36,7 +36,6 @@ static int event_manager_availability = -EACCES;
 
 #define MAX_BITS       (32U) /* Number of bits available for error mask */
 
-#define FIRMWARE_VERSION_MASK                  (0xFFFFU)
 #define REGISTER_NOTIFIER_FIRMWARE_VERSION     (2U)
 
 static DEFINE_HASHTABLE(reg_driver_map, REGISTERED_DRIVER_MAX_ORDER);

diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h
index 1a069a56c961b6a96c0bf283507551ca7916a7fc..d7d07afc0532d70efc45fb8dbb6c7575357f7312 100644 (file)
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -52,6 +52,9 @@
 #define API_ID_MASK            GENMASK(7, 0)
 #define MODULE_ID_MASK         GENMASK(11, 8)
 
+/* Firmware feature check version mask */
+#define FIRMWARE_VERSION_MASK          0xFFFFU
+
 /* ATF only commands */
 #define TF_A_PM_REGISTER_SGI           0xa04
 #define PM_GET_TRUSTZONE_VERSION       0xa03