Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a851b2bd authored by Avri Altman's avatar Avri Altman Committed by Martin K. Petersen
Browse files

scsi: uapi: ufs: Make utp_upiu_req visible to user space 



in preparation to send UPIU requests via bsg.

Signed-off-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarBart Van Assche <Bart.VanAssche@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c6049cd9

drivers/scsi/ufs/ufs.h

+1 −60
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 


#include <linux/mutex.h>

#include <linux/types.h>

#include <uapi/scsi/scsi_bsg_ufs.h>



#define MAX_CDB_SIZE	16

#define GENERAL_UPIU_REQUEST_SIZE 32

#define QUERY_DESC_MAX_SIZE       255

#define QUERY_DESC_MIN_SIZE       2
@@ -432,65 +432,6 @@ enum ufs_dev_pwr_mode { 
	UFS_POWERDOWN_PWR_MODE	= 3,

};



/**

 * struct utp_upiu_header - UPIU header structure

 * @dword_0: UPIU header DW-0

 * @dword_1: UPIU header DW-1

 * @dword_2: UPIU header DW-2

 */

struct utp_upiu_header {

	__be32 dword_0;

	__be32 dword_1;

	__be32 dword_2;

};



/**

 * struct utp_upiu_cmd - Command UPIU structure

 * @data_transfer_len: Data Transfer Length DW-3

 * @cdb: Command Descriptor Block CDB DW-4 to DW-7

 */

struct utp_upiu_cmd {

	__be32 exp_data_transfer_len;

	u8 cdb[MAX_CDB_SIZE];

};



/**

 * struct utp_upiu_query - upiu request buffer structure for

 * query request.

 * @opcode: command to perform B-0

 * @idn: a value that indicates the particular type of data B-1

 * @index: Index to further identify data B-2

 * @selector: Index to further identify data B-3

 * @reserved_osf: spec reserved field B-4,5

 * @length: number of descriptor bytes to read/write B-6,7

 * @value: Attribute value to be written DW-5

 * @reserved: spec reserved DW-6,7

 */

struct utp_upiu_query {

	u8 opcode;

	u8 idn;

	u8 index;

	u8 selector;

	__be16 reserved_osf;

	__be16 length;

	__be32 value;

	__be32 reserved[2];

};



/**

 * struct utp_upiu_req - general upiu request structure

 * @header:UPIU header structure DW-0 to DW-2

 * @sc: fields structure for scsi command DW-3 to DW-7

 * @qr: fields structure for query request DW-3 to DW-7

 */

struct utp_upiu_req {

	struct utp_upiu_header header;

	union {

		struct utp_upiu_cmd sc;

		struct utp_upiu_query qr;

	};

};



/**

 * struct utp_cmd_rsp - Response UPIU structure

 * @residual_transfer_count: Residual transfer count DW-3

drivers/scsi/ufs/ufshcd.c

+3 −3
Original line number Diff line number Diff line
@@ -2241,8 +2241,8 @@ void ufshcd_prepare_utp_scsi_cmd_upiu(struct ufshcd_lrb *lrbp, u32 upiu_flags) 
	ucd_req_ptr->sc.exp_data_transfer_len =

		cpu_to_be32(lrbp->cmd->sdb.length);



	cdb_len = min_t(unsigned short, lrbp->cmd->cmd_len, MAX_CDB_SIZE);

	memset(ucd_req_ptr->sc.cdb, 0, MAX_CDB_SIZE);

	cdb_len = min_t(unsigned short, lrbp->cmd->cmd_len, UFS_CDB_SIZE);

	memset(ucd_req_ptr->sc.cdb, 0, UFS_CDB_SIZE);

	memcpy(ucd_req_ptr->sc.cdb, lrbp->cmd->cmnd, cdb_len);



	memset(lrbp->ucd_rsp_ptr, 0, sizeof(struct utp_upiu_rsp));
@@ -8000,7 +8000,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) 
	host->max_lun = UFS_MAX_LUNS;

	host->max_channel = UFSHCD_MAX_CHANNEL;

	host->unique_id = host->host_no;

	host->max_cmd_len = MAX_CDB_SIZE;

	host->max_cmd_len = UFS_CDB_SIZE;



	hba->max_pwr_info.is_valid = false;

include/uapi/scsi/scsi_bsg_ufs.h

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * UFS Transport SGIO v4 BSG Message Support

 *

 * Copyright (C) 2011-2013 Samsung India Software Operations

 */

#ifndef SCSI_BSG_UFS_H

#define SCSI_BSG_UFS_H



/*

 * This file intended to be included by both kernel and user space

 */



#define UFS_CDB_SIZE	16



/**

 * struct utp_upiu_header - UPIU header structure

 * @dword_0: UPIU header DW-0

 * @dword_1: UPIU header DW-1

 * @dword_2: UPIU header DW-2

 */

struct utp_upiu_header {

	__be32 dword_0;

	__be32 dword_1;

	__be32 dword_2;

};



/**

 * struct utp_upiu_query - upiu request buffer structure for

 * query request.

 * @opcode: command to perform B-0

 * @idn: a value that indicates the particular type of data B-1

 * @index: Index to further identify data B-2

 * @selector: Index to further identify data B-3

 * @reserved_osf: spec reserved field B-4,5

 * @length: number of descriptor bytes to read/write B-6,7

 * @value: Attribute value to be written DW-5

 * @reserved: spec reserved DW-6,7

 */

struct utp_upiu_query {

	__u8 opcode;

	__u8 idn;

	__u8 index;

	__u8 selector;

	__be16 reserved_osf;

	__be16 length;

	__be32 value;

	__be32 reserved[2];

};



/**

 * struct utp_upiu_cmd - Command UPIU structure

 * @data_transfer_len: Data Transfer Length DW-3

 * @cdb: Command Descriptor Block CDB DW-4 to DW-7

 */

struct utp_upiu_cmd {

	__be32 exp_data_transfer_len;

	u8 cdb[UFS_CDB_SIZE];

};



/**

 * struct utp_upiu_req - general upiu request structure

 * @header:UPIU header structure DW-0 to DW-2

 * @sc: fields structure for scsi command DW-3 to DW-7

 * @qr: fields structure for query request DW-3 to DW-7

 */

struct utp_upiu_req {

	struct utp_upiu_header header;

	union {

		struct utp_upiu_cmd		sc;

		struct utp_upiu_query		qr;

	};

};

#endif /* UFS_BSG_H */