Skip to content

Commit 494c55a

Browse files
ronakj89michalsimek
authored andcommitted
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]>
1 parent fcf544a commit 494c55a

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

drivers/firmware/xilinx/zynqmp.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
/* IOCTL/QUERY feature payload size */
4242
#define FEATURE_PAYLOAD_SIZE 2
4343

44-
/* Firmware feature check version mask */
45-
#define FIRMWARE_VERSION_MASK GENMASK(15, 0)
46-
4744
static bool feature_check_enabled;
4845
static DEFINE_HASHTABLE(pm_api_features_map, PM_API_FEATURE_CHECK_MAX_ORDER);
4946
static u32 ioctl_features[FEATURE_PAYLOAD_SIZE];

drivers/soc/xilinx/xlnx_event_manager.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ static int event_manager_availability = -EACCES;
3636

3737
#define MAX_BITS (32U) /* Number of bits available for error mask */
3838

39-
#define FIRMWARE_VERSION_MASK (0xFFFFU)
4039
#define REGISTER_NOTIFIER_FIRMWARE_VERSION (2U)
4140

4241
static DEFINE_HASHTABLE(reg_driver_map, REGISTERED_DRIVER_MAX_ORDER);

include/linux/firmware/xlnx-zynqmp.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
#define API_ID_MASK GENMASK(7, 0)
5353
#define MODULE_ID_MASK GENMASK(11, 8)
5454

55+
/* Firmware feature check version mask */
56+
#define FIRMWARE_VERSION_MASK 0xFFFFU
57+
5558
/* ATF only commands */
5659
#define TF_A_PM_REGISTER_SGI 0xa04
5760
#define PM_GET_TRUSTZONE_VERSION 0xa03

0 commit comments

Comments
 (0)