Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge patch series "Several compilation warnings fixes for UFS Advanced RPMB"
Bean Huo <beanhuo@iokpp.de> says:
These patches are to fix several compilation warnings introduced by my
commit: 6ff265fc5ef6 ("scsi: ufs: core: bsg: Add advanced RPMB support
in ufs_bsg"), please consider this patch series for the next your
merge window. Apologies for this!!
Link: https://lore.kernel.org/r/20230108224057.354438-1-beanhuo@iokpp.de
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+9
-8
+2
-2
drivers/ufs/core/ufs_bsg.c
+2
-2
drivers/ufs/core/ufs_bsg.c
···
70
70
struct ufs_rpmb_reply *rpmb_reply = job->reply;
71
71
struct bsg_buffer *payload = NULL;
72
72
enum dma_data_direction dir;
73
-
struct scatterlist *sg_list;
73
+
struct scatterlist *sg_list = NULL;
74
74
int rpmb_req_type;
75
-
int sg_cnt;
75
+
int sg_cnt = 0;
76
76
int ret;
77
77
int data_len;
78
78
+6
-6
include/uapi/scsi/scsi_bsg_ufs.h
+6
-6
include/uapi/scsi/scsi_bsg_ufs.h
···
97
97
};
98
98
99
99
struct ufs_arpmb_meta {
100
-
__u16 req_resp_type;
100
+
__be16 req_resp_type;
101
101
__u8 nonce[16];
102
-
__u32 write_counter;
103
-
__u16 addr_lun;
104
-
__u16 block_count;
105
-
__u16 result;
102
+
__be32 write_counter;
103
+
__be16 addr_lun;
104
+
__be16 block_count;
105
+
__be16 result;
106
106
} __attribute__((__packed__));
107
107
108
108
struct ufs_ehs {
109
109
__u8 length;
110
110
__u8 ehs_type;
111
-
__u16 ehssub_type;
111
+
__be16 ehssub_type;
112
112
struct ufs_arpmb_meta meta;
113
113
__u8 mac_key[32];
114
114
} __attribute__((__packed__));