Commit 583891c9 authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen
Browse files

scsi: smartpqi: Align code with oob driver 

Reduce differences between out-of-box driver and kernel.org driver. No
functional changes.

Link: https://lore.kernel.org/r/161549375094.25025.9268879575316758510.stgit@brunhilda


Reviewed-by: default avatarScott Benesh <scott.benesh@microchip.com>
Reviewed-by: default avatarMike McGowen <mike.mcgowen@microchip.com>
Reviewed-by: default avatarScott Teel <scott.teel@microchip.com>
Signed-off-by: default avatarKevin Barnett <kevin.barnett@microchip.com>
Signed-off-by: default avatarDon Brace <don.brace@microchip.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 598bef8d

drivers/scsi/smartpqi/smartpqi.h

+28 −29
Original line number Diff line number Diff line
@@ -281,8 +281,7 @@ struct pqi_raid_path_request { 
	u8	cdb[16];

	u8	reserved6[12];

	__le32	timeout;

	struct pqi_sg_descriptor

		sg_descriptors[PQI_MAX_EMBEDDED_SG_DESCRIPTORS];

	struct pqi_sg_descriptor sg_descriptors[PQI_MAX_EMBEDDED_SG_DESCRIPTORS];

};



struct pqi_aio_path_request {
@@ -309,11 +308,11 @@ struct pqi_aio_path_request { 
	u8	cdb_length;

	u8	lun_number[8];

	u8	reserved4[4];

	struct pqi_sg_descriptor

		sg_descriptors[PQI_MAX_EMBEDDED_SG_DESCRIPTORS];

	struct pqi_sg_descriptor sg_descriptors[PQI_MAX_EMBEDDED_SG_DESCRIPTORS];

};



#define PQI_RAID1_NVME_XFER_LIMIT	(32 * 1024)	/* 32 KiB */



struct pqi_aio_r1_path_request {

	struct pqi_iu_header header;

	__le16	request_id;
@@ -420,7 +419,7 @@ struct pqi_event_config { 


#define PQI_EVENT_OFA_MEMORY_ALLOCATION	0x0

#define PQI_EVENT_OFA_QUIESCE		0x1

#define PQI_EVENT_OFA_CANCELLED		0x2

#define PQI_EVENT_OFA_CANCELED		0x2



struct pqi_event_response {

	struct pqi_iu_header header;
@@ -725,7 +724,7 @@ struct pqi_admin_queues_aligned { 
struct pqi_admin_queues {

	void		*iq_element_array;

	void		*oq_element_array;

	pqi_index_t	*iq_ci;

	pqi_index_t __iomem *iq_ci;

	pqi_index_t __iomem *oq_pi;

	dma_addr_t	iq_element_array_bus_addr;

	dma_addr_t	oq_element_array_bus_addr;
@@ -1032,7 +1031,7 @@ struct pqi_scsi_dev_raid_map_data { 
	u32	num_it_nexus_entries;

	u32	it_nexus[NUM_RAID1_MAP_ENTRIES];



	/* RAID5 RAID6 specific */

	/* RAID 5 / RAID 6 specific */

	u32	p_parity_it_nexus;	/* aio_handle */

	u32	q_parity_it_nexus;	/* aio_handle */

	u8	xor_mult;

drivers/scsi/smartpqi/smartpqi_init.c

+121 −195

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/smartpqi/smartpqi_sas_transport.c

+5 −5
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ static int pqi_sas_port_add_rphy(struct pqi_sas_port *pqi_sas_port, 


static struct sas_rphy *pqi_sas_rphy_alloc(struct pqi_sas_port *pqi_sas_port)

{

	if (pqi_sas_port->device &&

		pqi_sas_port->device->is_expander_smp_device)

	if (pqi_sas_port->device && pqi_sas_port->device->is_expander_smp_device)

		return sas_expander_alloc(pqi_sas_port->port,

				SAS_FANOUT_EXPANDER_DEVICE);
@@ -547,6 +546,7 @@ void pqi_sas_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, 
		goto out;



	reslen = pqi_build_sas_smp_handler_reply(smp_buf, job, &error_info);



out:

	bsg_job_done(job, rc, reslen);

}

drivers/scsi/smartpqi/smartpqi_sis.c

+2 −2

File changed.

Contains only whitespace changes.