Commit dd9e11d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull more SCSI updates from James Bottomley:
 "Six late arriving patches for the merge window. Five are minor
  assorted fixes and updates.

  The IPR driver change removes SATA support, which will now allow a
  major cleanup in the ATA subsystem because it was the only driver
  still using the old attachment mechanism. The driver is only used on
  power systems and SATA was used to support a DVD device, which has
  long been moved to a different hba. IBM chose this route instead of
  porting ipr to the newer SATA interfaces"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qedi: Fix use after free bug in qedi_remove()
  scsi: ufs: core: mcq: Fix &hwq->cq_lock deadlock issue
  scsi: ipr: Remove several unused variables
  scsi: pm80xx: Log device registration
  scsi: ipr: Remove SATA support
  scsi: scsi_debug: Abort commands from scsi_debug_device_reset()
parents a3b111b0 c5749639

drivers/scsi/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -971,8 +971,7 @@ config SCSI_SYM53C8XX_MMIO 


config SCSI_IPR

	tristate "IBM Power Linux RAID adapter support"

	depends on PCI && SCSI && ATA

	select SATA_HOST

	depends on PCI && SCSI

	select FW_LOADER

	select IRQ_POLL

	select SGL_ALLOC

drivers/scsi/ipr.c

+10 −778

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/ipr.h

+0 −64
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <asm/unaligned.h>

#include <linux/types.h>

#include <linux/completion.h>

#include <linux/libata.h>

#include <linux/list.h>

#include <linux/kref.h>

#include <linux/irq_poll.h>
@@ -35,7 +34,6 @@ 
 *	This can be adjusted at runtime through sysfs device attributes.

 */

#define IPR_MAX_CMD_PER_LUN				6

#define IPR_MAX_CMD_PER_ATA_LUN			1



/*

 * IPR_NUM_BASE_CMD_BLKS: This defines the maximum number of
@@ -197,7 +195,6 @@ 
#define	IPR_LUN_RESET					0x40

#define	IPR_TARGET_RESET					0x20

#define	IPR_BUS_RESET					0x10

#define	IPR_ATA_PHY_RESET					0x80

#define IPR_ID_HOST_RR_Q				0xC4

#define IPR_QUERY_IOA_CONFIG				0xC5

#define IPR_CANCEL_ALL_REQUESTS			0xCE
@@ -521,7 +518,6 @@ struct ipr_cmd_pkt { 
#define IPR_RQTYPE_SCSICDB		0x00

#define IPR_RQTYPE_IOACMD		0x01

#define IPR_RQTYPE_HCAM			0x02

#define IPR_RQTYPE_ATA_PASSTHRU	0x04

#define IPR_RQTYPE_PIPE			0x05



	u8 reserved2;
@@ -546,30 +542,6 @@ struct ipr_cmd_pkt { 
	__be16 timeout;

}__attribute__ ((packed, aligned(4)));



struct ipr_ioarcb_ata_regs {	/* 22 bytes */

	u8 flags;

#define IPR_ATA_FLAG_PACKET_CMD			0x80

#define IPR_ATA_FLAG_XFER_TYPE_DMA			0x40

#define IPR_ATA_FLAG_STATUS_ON_GOOD_COMPLETION	0x20

	u8 reserved[3];



	__be16 data;

	u8 feature;

	u8 nsect;

	u8 lbal;

	u8 lbam;

	u8 lbah;

	u8 device;

	u8 command;

	u8 reserved2[3];

	u8 hob_feature;

	u8 hob_nsect;

	u8 hob_lbal;

	u8 hob_lbam;

	u8 hob_lbah;

	u8 ctl;

}__attribute__ ((packed, aligned(2)));



struct ipr_ioadl_desc {

	__be32 flags_and_data_len;

#define IPR_IOADL_FLAGS_MASK		0xff000000
@@ -591,15 +563,8 @@ struct ipr_ioadl64_desc { 
	__be64 address;

}__attribute__((packed, aligned (16)));



struct ipr_ata64_ioadl {

	struct ipr_ioarcb_ata_regs regs;

	u16 reserved[5];

	struct ipr_ioadl64_desc ioadl64[IPR_NUM_IOADL_ENTRIES];

}__attribute__((packed, aligned (16)));



struct ipr_ioarcb_add_data {

	union {

		struct ipr_ioarcb_ata_regs regs;

		struct ipr_ioadl_desc ioadl[5];

		__be32 add_cmd_parms[10];

	} u;
@@ -665,21 +630,6 @@ struct ipr_ioasa_gpdd { 
	__be32 ioa_data[2];

}__attribute__((packed, aligned (4)));



struct ipr_ioasa_gata {

	u8 error;

	u8 nsect;		/* Interrupt reason */

	u8 lbal;

	u8 lbam;

	u8 lbah;

	u8 device;

	u8 status;

	u8 alt_status;	/* ATA CTL */

	u8 hob_nsect;

	u8 hob_lbal;

	u8 hob_lbam;

	u8 hob_lbah;

}__attribute__((packed, aligned (4)));



struct ipr_auto_sense {

	__be16 auto_sense_len;

	__be16 ioa_data_len;
@@ -713,7 +663,6 @@ struct ipr_ioasa_hdr { 
	__be32 ioasc_specific;	/* status code specific field */

#define IPR_ADDITIONAL_STATUS_FMT		0x80000000

#define IPR_AUTOSENSE_VALID			0x40000000

#define IPR_ATA_DEVICE_WAS_RESET		0x20000000

#define IPR_IOASC_SPECIFIC_MASK		0x00ffffff

#define IPR_FIELD_POINTER_VALID		(0x80000000 >> 8)

#define IPR_FIELD_POINTER_MASK		0x0000ffff
@@ -727,7 +676,6 @@ struct ipr_ioasa { 
		struct ipr_ioasa_vset vset;

		struct ipr_ioasa_af_dasd dasd;

		struct ipr_ioasa_gpdd gpdd;

		struct ipr_ioasa_gata gata;

	} u;



	struct ipr_auto_sense auto_sense;
@@ -741,7 +689,6 @@ struct ipr_ioasa64 { 
		struct ipr_ioasa_vset vset;

		struct ipr_ioasa_af_dasd dasd;

		struct ipr_ioasa_gpdd gpdd;

		struct ipr_ioasa_gata gata;

	} u;



	struct ipr_auto_sense auto_sense;
@@ -1279,13 +1226,6 @@ struct ipr_bus_attributes { 
	u32 max_xfer_rate;

};



struct ipr_sata_port {

	struct ipr_ioa_cfg *ioa_cfg;

	struct ata_port *ap;

	struct ipr_resource_entry *res;

	struct ipr_ioasa_gata ioasa;

};



struct ipr_resource_entry {

	u8 needs_sync_complete:1;

	u8 in_erp:1;
@@ -1323,7 +1263,6 @@ struct ipr_resource_entry { 


	struct ipr_ioa_cfg *ioa_cfg;

	struct scsi_device *sdev;

	struct ipr_sata_port *sata_port;

	struct list_head queue;

}; /* struct ipr_resource_entry */
@@ -1582,7 +1521,6 @@ struct ipr_ioa_cfg { 
	struct ipr_cmnd *reset_cmd;

	int (*reset) (struct ipr_cmnd *);



	struct ata_host ata_host;

	char ipr_cmd_label[8];

#define IPR_CMD_LABEL		"ipr_cmd"

	u32 max_cmds;
@@ -1604,7 +1542,6 @@ struct ipr_cmnd { 
	union {

		struct ipr_ioadl_desc ioadl[IPR_NUM_IOADL_ENTRIES];

		struct ipr_ioadl64_desc ioadl64[IPR_NUM_IOADL_ENTRIES];

		struct ipr_ata64_ioadl ata_ioadl;

	} i;

	union {

		struct ipr_ioasa ioasa;
@@ -1612,7 +1549,6 @@ struct ipr_cmnd { 
	} s;

	struct list_head queue;

	struct scsi_cmnd *scsi_cmd;

	struct ata_queued_cmd *qc;

	struct completion completion;

	struct timer_list timer;

	struct work_struct work;

drivers/scsi/pm8001/pm8001_hwi.c

+4 −3
Original line number Diff line number Diff line
@@ -3362,8 +3362,9 @@ int pm8001_mpi_reg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) 
	pm8001_dev = ccb->device;

	status = le32_to_cpu(registerRespPayload->status);

	device_id = le32_to_cpu(registerRespPayload->device_id);

	pm8001_dbg(pm8001_ha, MSG, " register device is status = %d\n",

		   status);

	pm8001_dbg(pm8001_ha, INIT,

		   "register device status %d phy_id 0x%x device_id %d\n",

		   status, pm8001_dev->attached_phy, device_id);

	switch (status) {

	case DEVREG_SUCCESS:

		pm8001_dbg(pm8001_ha, MSG, "DEVREG_SUCCESS\n");
@@ -4278,7 +4279,7 @@ int pm8001_chip_dereg_dev_req(struct pm8001_hba_info *pm8001_ha, 
	memset(&payload, 0, sizeof(payload));

	payload.tag = cpu_to_le32(1);

	payload.device_id = cpu_to_le32(device_id);

	pm8001_dbg(pm8001_ha, MSG, "unregister device device_id = %d\n",

	pm8001_dbg(pm8001_ha, INIT, "unregister device device_id %d\n",

		   device_id);



	return pm8001_mpi_build_cmd(pm8001_ha, 0, opc, &payload,

drivers/scsi/qedi/qedi_main.c

+3 −0
Original line number Diff line number Diff line
@@ -2450,6 +2450,9 @@ static void __qedi_remove(struct pci_dev *pdev, int mode) 
		qedi_ops->ll2->stop(qedi->cdev);

	}



	cancel_delayed_work_sync(&qedi->recovery_work);

	cancel_delayed_work_sync(&qedi->board_disable_work);



	qedi_free_iscsi_pf_param(qedi);



	rval = qedi_ops->common->update_drv_state(qedi->cdev, false);