| Message ID | 20240425095913.919390-1-ronak.jain@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | firmware: xilinx: Move FIRMWARE_VERSION_MASK to xlnx-zynqmp.h | expand |
On 4/25/24 11:59, Ronak Jain wrote: > 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 <ronak.jain@amd.com> > Signed-off-by: Anand Ashok Dumbre <anand.ashok.dumbre@amd.com> > Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> > --- > drivers/firmware/xilinx/zynqmp.c | 3 --- > drivers/soc/xilinx/xlnx_event_manager.c | 1 - > include/linux/firmware/xlnx-zynqmp.h | 3 +++ > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c > index 9bc45357e1a8..add8acf66a9c 100644 > --- 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 253299e4214d..9d89b5a40f97 100644 > --- a/drivers/soc/xilinx/xlnx_event_manager.c > +++ b/drivers/soc/xilinx/xlnx_event_manager.c > @@ -35,7 +35,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 1a069a56c961..d7d07afc0532 100644 > --- 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 Applied. M
diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c index 9bc45357e1a8..add8acf66a9c 100644 --- 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 253299e4214d..9d89b5a40f97 100644 --- a/drivers/soc/xilinx/xlnx_event_manager.c +++ b/drivers/soc/xilinx/xlnx_event_manager.c @@ -35,7 +35,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 1a069a56c961..d7d07afc0532 100644 --- 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