Commit a1d1eb2f 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 SCSI updates from James Bottomley:
 "Updates to the usual drivers (ufs, smartpqi, NCR5380, mac_scsi, lpfc,
  mpi3mr).

  There are no user visible core changes and a whole series of minor
  updates and fixes. The largest core change is probably the
  simplification of the workqueue allocation path"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (86 commits)
  scsi: smartpqi: update driver version to 2.1.30-031
  scsi: smartpqi: fix volume size updates
  scsi: smartpqi: fix rare system hang during LUN reset
  scsi: smartpqi: add new controller PCI IDs
  scsi: smartpqi: add counter for parity write stream requests
  scsi: smartpqi: correct stream detection
  scsi: smartpqi: Add fw log to kdump
  scsi: bnx2fc: Remove some unused fields in struct bnx2fc_rport
  scsi: qla2xxx: Remove the unused 'del_list_entry' field in struct fc_port
  scsi: ufs: core: Remove ufshcd_urgent_bkops()
  scsi: core: Remove obsoleted declaration for scsi_driverbyte_string()
  scsi: bnx2i: Remove unused declarations
  scsi: core: Simplify an alloc_workqueue() invocation
  scsi: ufs: Simplify alloc*_workqueue() invocation
  scsi: stex: Simplify an alloc_ordered_workqueue() invocation
  scsi: scsi_transport_fc: Simplify alloc_workqueue() invocations
  scsi: snic: Simplify alloc_workqueue() invocations
  scsi: qedi: Simplify an alloc_workqueue() invocation
  scsi: qedf: Simplify alloc_workqueue() invocations
  scsi: myrs: Simplify an alloc_ordered_workqueue() invocation
  ...
parents 726e2d0c cff06a79

Documentation/ABI/testing/sysfs-driver-ufs

+27 −0
Original line number Diff line number Diff line
@@ -1532,3 +1532,30 @@ Contact: Bean Huo <beanhuo@micron.com> 
Description:

		rtc_update_ms indicates how often the host should synchronize or update the

		UFS RTC. If set to 0, this will disable UFS RTC periodic update.



What:		/sys/devices/platform/.../ufshci_capabilities/version

Date:		August 2024

Contact:	Avri Altman <avri.altman@wdc.com>

Description:

		Host Capabilities register group: UFS version register.

		Symbol - VER.  This file shows the UFSHCD version.

		Example: Version 3.12 would be represented as 0000_0312h.

		The file is read only.



What:		/sys/devices/platform/.../ufshci_capabilities/product_id

Date:		August 2024

Contact:	Avri Altman <avri.altman@wdc.com>

Description:

		Host Capabilities register group: product ID register.

		Symbol - HCPID.  This file shows the UFSHCD product id.

		The content of this register is vendor specific.

		The file is read only.



What:		/sys/devices/platform/.../ufshci_capabilities/man_id

Date:		August 2024

Contact:	Avri Altman <avri.altman@wdc.com>

Description:

		Host Capabilities register group: manufacturer ID register.

		Symbol - HCMID. This file shows the UFSHCD manufacturer id.

		The Manufacturer ID is defined by JEDEC in JEDEC-JEP106.

		The file is read only.

block/blk-core.c

+1 −0
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ void submit_bio_noacct(struct bio *bio) 


	switch (bio_op(bio)) {

	case REQ_OP_READ:

		break;

	case REQ_OP_WRITE:

		if (bio->bi_opf & REQ_ATOMIC) {

			status = blk_validate_atomic_write_op_size(q, bio);

drivers/message/fusion/lsi/mpi_cnfg.h

+6 −54
Original line number Diff line number Diff line
@@ -1018,14 +1018,6 @@ typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL 


#define MPI_IOCPAGE2_FLAG_VOLUME_INACTIVE           (0x08)



/*

 * Host code (drivers, BIOS, utilities, etc.) should leave this define set to

 * one and check Header.PageLength at runtime.

 */

#ifndef MPI_IOC_PAGE_2_RAID_VOLUME_MAX

#define MPI_IOC_PAGE_2_RAID_VOLUME_MAX      (1)

#endif



typedef struct _CONFIG_PAGE_IOC_2

{

    CONFIG_PAGE_HEADER          Header;                              /* 00h */
@@ -1034,7 +1026,7 @@ typedef struct _CONFIG_PAGE_IOC_2 
    U8                          MaxVolumes;                          /* 09h */

    U8                          NumActivePhysDisks;                  /* 0Ah */

    U8                          MaxPhysDisks;                        /* 0Bh */

    CONFIG_PAGE_IOC_2_RAID_VOL  RaidVolume[MPI_IOC_PAGE_2_RAID_VOLUME_MAX];/* 0Ch */

    CONFIG_PAGE_IOC_2_RAID_VOL  RaidVolume[] __counted_by(NumActiveVolumes); /* 0Ch */

} CONFIG_PAGE_IOC_2, MPI_POINTER PTR_CONFIG_PAGE_IOC_2,

  IOCPage2_t, MPI_POINTER pIOCPage2_t;
@@ -1064,21 +1056,13 @@ typedef struct _IOC_3_PHYS_DISK 
} IOC_3_PHYS_DISK, MPI_POINTER PTR_IOC_3_PHYS_DISK,

  Ioc3PhysDisk_t, MPI_POINTER pIoc3PhysDisk_t;



/*

 * Host code (drivers, BIOS, utilities, etc.) should leave this define set to

 * one and check Header.PageLength at runtime.

 */

#ifndef MPI_IOC_PAGE_3_PHYSDISK_MAX

#define MPI_IOC_PAGE_3_PHYSDISK_MAX         (1)

#endif



typedef struct _CONFIG_PAGE_IOC_3

{

    CONFIG_PAGE_HEADER          Header;                                /* 00h */

    U8                          NumPhysDisks;                          /* 04h */

    U8                          Reserved1;                             /* 05h */

    U16                         Reserved2;                             /* 06h */

    IOC_3_PHYS_DISK             PhysDisk[MPI_IOC_PAGE_3_PHYSDISK_MAX]; /* 08h */

    IOC_3_PHYS_DISK             PhysDisk[] __counted_by(NumPhysDisks); /* 08h */

} CONFIG_PAGE_IOC_3, MPI_POINTER PTR_CONFIG_PAGE_IOC_3,

  IOCPage3_t, MPI_POINTER pIOCPage3_t;
@@ -1093,21 +1077,13 @@ typedef struct _IOC_4_SEP 
} IOC_4_SEP, MPI_POINTER PTR_IOC_4_SEP,

  Ioc4Sep_t, MPI_POINTER pIoc4Sep_t;



/*

 * Host code (drivers, BIOS, utilities, etc.) should leave this define set to

 * one and check Header.PageLength at runtime.

 */

#ifndef MPI_IOC_PAGE_4_SEP_MAX

#define MPI_IOC_PAGE_4_SEP_MAX              (1)

#endif



typedef struct _CONFIG_PAGE_IOC_4

{

    CONFIG_PAGE_HEADER          Header;                         /* 00h */

    U8                          ActiveSEP;                      /* 04h */

    U8                          MaxSEP;                         /* 05h */

    U16                         Reserved1;                      /* 06h */

    IOC_4_SEP                   SEP[MPI_IOC_PAGE_4_SEP_MAX];    /* 08h */

    IOC_4_SEP                   SEP[] __counted_by(ActiveSEP);  /* 08h */

} CONFIG_PAGE_IOC_4, MPI_POINTER PTR_CONFIG_PAGE_IOC_4,

  IOCPage4_t, MPI_POINTER pIOCPage4_t;
@@ -2295,14 +2271,6 @@ typedef struct _RAID_VOL0_SETTINGS 
#define MPI_RAID_HOT_SPARE_POOL_6                       (0x40)

#define MPI_RAID_HOT_SPARE_POOL_7                       (0x80)



/*

 * Host code (drivers, BIOS, utilities, etc.) should leave this define set to

 * one and check Header.PageLength at runtime.

 */

#ifndef MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX

#define MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX        (1)

#endif



typedef struct _CONFIG_PAGE_RAID_VOL_0

{

    CONFIG_PAGE_HEADER      Header;         /* 00h */
@@ -2321,7 +2289,7 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0 
    U8                      DataScrubRate;  /* 25h */

    U8                      ResyncRate;     /* 26h */

    U8                      InactiveStatus; /* 27h */

    RAID_VOL0_PHYS_DISK     PhysDisk[MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX];/* 28h */

    RAID_VOL0_PHYS_DISK     PhysDisk[] __counted_by(NumPhysDisks); /* 28h */

} CONFIG_PAGE_RAID_VOL_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_0,

  RaidVolumePage0_t, MPI_POINTER pRaidVolumePage0_t;
@@ -2455,14 +2423,6 @@ typedef struct _RAID_PHYS_DISK1_PATH 
#define MPI_RAID_PHYSDISK1_FLAG_INVALID         (0x0001)





/*

 * Host code (drivers, BIOS, utilities, etc.) should leave this define set to

 * one and check Header.PageLength or NumPhysDiskPaths at runtime.

 */

#ifndef MPI_RAID_PHYS_DISK1_PATH_MAX

#define MPI_RAID_PHYS_DISK1_PATH_MAX    (1)

#endif



typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1

{

    CONFIG_PAGE_HEADER              Header;             /* 00h */
@@ -2470,7 +2430,7 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1 
    U8                              PhysDiskNum;        /* 05h */

    U16                             Reserved2;          /* 06h */

    U32                             Reserved1;          /* 08h */

    RAID_PHYS_DISK1_PATH            Path[MPI_RAID_PHYS_DISK1_PATH_MAX];/* 0Ch */

    RAID_PHYS_DISK1_PATH            Path[] __counted_by(NumPhysDiskPaths);/* 0Ch */

} CONFIG_PAGE_RAID_PHYS_DISK_1, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_1,

  RaidPhysDiskPage1_t, MPI_POINTER pRaidPhysDiskPage1_t;
@@ -2555,14 +2515,6 @@ typedef struct _MPI_SAS_IO_UNIT0_PHY_DATA 
} MPI_SAS_IO_UNIT0_PHY_DATA, MPI_POINTER PTR_MPI_SAS_IO_UNIT0_PHY_DATA,

  SasIOUnit0PhyData, MPI_POINTER pSasIOUnit0PhyData;



/*

 * Host code (drivers, BIOS, utilities, etc.) should leave this define set to

 * one and check Header.PageLength at runtime.

 */

#ifndef MPI_SAS_IOUNIT0_PHY_MAX

#define MPI_SAS_IOUNIT0_PHY_MAX         (1)

#endif



typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0

{

    CONFIG_EXTENDED_PAGE_HEADER     Header;                             /* 00h */
@@ -2571,7 +2523,7 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0 
    U8                              NumPhys;                            /* 0Ch */

    U8                              Reserved2;                          /* 0Dh */

    U16                             Reserved3;                          /* 0Eh */

    MPI_SAS_IO_UNIT0_PHY_DATA       PhyData[MPI_SAS_IOUNIT0_PHY_MAX];   /* 10h */

    MPI_SAS_IO_UNIT0_PHY_DATA       PhyData[] __counted_by(NumPhys);    /* 10h */

} CONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,

  SasIOUnitPage0_t, MPI_POINTER pSasIOUnitPage0_t;

drivers/message/fusion/mptbase.c

+3 −7
Original line number Diff line number Diff line
@@ -1856,10 +1856,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* Initialize workqueue */

	INIT_DELAYED_WORK(&ioc->fault_reset_work, mpt_fault_reset_work);



	snprintf(ioc->reset_work_q_name, MPT_KOBJ_NAME_LEN,

		 "mpt_poll_%d", ioc->id);

	ioc->reset_work_q = alloc_workqueue(ioc->reset_work_q_name,

					    WQ_MEM_RECLAIM, 0);

	ioc->reset_work_q =

		alloc_workqueue("mpt_poll_%d", WQ_MEM_RECLAIM, 0, ioc->id);

	if (!ioc->reset_work_q) {

		printk(MYIOC_s_ERR_FMT "Insufficient memory to add adapter!\n",

		    ioc->name);
@@ -1986,9 +1984,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 


	INIT_LIST_HEAD(&ioc->fw_event_list);

	spin_lock_init(&ioc->fw_event_lock);

	snprintf(ioc->fw_event_q_name, MPT_KOBJ_NAME_LEN, "mpt/%d", ioc->id);

	ioc->fw_event_q = alloc_workqueue(ioc->fw_event_q_name,

					  WQ_MEM_RECLAIM, 0);

	ioc->fw_event_q = alloc_workqueue("mpt/%d", WQ_MEM_RECLAIM, 0, ioc->id);

	if (!ioc->fw_event_q) {

		printk(MYIOC_s_ERR_FMT "Insufficient memory to add adapter!\n",

		    ioc->name);

drivers/message/fusion/mptbase.h

+0 −3
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ typedef struct _MPT_ADAPTER 
	struct list_head	 fw_event_list;

	spinlock_t		 fw_event_lock;

	u8			 fw_events_off; /* if '1', then ignore events */

	char 			 fw_event_q_name[MPT_KOBJ_NAME_LEN];



	struct mutex		 sas_discovery_mutex;

	u8			 sas_discovery_runtime;
@@ -764,7 +763,6 @@ typedef struct _MPT_ADAPTER 
	u8			 fc_link_speed[2];

	spinlock_t		 fc_rescan_work_lock;

	struct work_struct	 fc_rescan_work;

	char			 fc_rescan_work_q_name[MPT_KOBJ_NAME_LEN];

	struct workqueue_struct *fc_rescan_work_q;



	/* driver forced bus resets count */
@@ -778,7 +776,6 @@ typedef struct _MPT_ADAPTER 
	spinlock_t		  scsi_lookup_lock;

	u64			dma_mask;

	u32			  broadcast_aen_busy;

	char			 reset_work_q_name[MPT_KOBJ_NAME_LEN];

	struct workqueue_struct *reset_work_q;

	struct delayed_work	 fault_reset_work;