Commit 58edf8b9 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

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: 6ff265fc ("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: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 679062c6 e2cb6e8d

drivers/ufs/core/ufs_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -70,9 +70,9 @@ static int ufs_bsg_exec_advanced_rpmb_req(struct ufs_hba *hba, struct bsg_job *j 
	struct ufs_rpmb_reply *rpmb_reply = job->reply;

	struct bsg_buffer *payload = NULL;

	enum dma_data_direction dir;

	struct scatterlist *sg_list;

	struct scatterlist *sg_list = NULL;

	int rpmb_req_type;

	int sg_cnt;

	int sg_cnt = 0;

	int ret;

	int data_len;

include/uapi/scsi/scsi_bsg_ufs.h

+6 −6
Original line number Diff line number Diff line
@@ -97,18 +97,18 @@ struct utp_upiu_req { 
};



struct ufs_arpmb_meta {

	__u16	req_resp_type;

	__be16	req_resp_type;

	__u8	nonce[16];

	__u32	write_counter;

	__u16	addr_lun;

	__u16	block_count;

	__u16	result;

	__be32	write_counter;

	__be16	addr_lun;

	__be16	block_count;

	__be16	result;

} __attribute__((__packed__));



struct ufs_ehs {

	__u8	length;

	__u8	ehs_type;

	__u16	ehssub_type;

	__be16	ehssub_type;

	struct ufs_arpmb_meta meta;

	__u8	mac_key[32];

} __attribute__((__packed__));

include/ufs/ufshcd.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/blk-mq.h>

#include <linux/devfreq.h>

#include <linux/pm_runtime.h>

#include <linux/dma-direction.h>

#include <scsi/scsi_device.h>

#include <ufs/unipro.h>

#include <ufs/ufs.h>