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

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

Pull SCSI fixes from James Bottomley:
 "Twenty fixes all in drivers except the one zone storage revalidation
  fix to sd.

  The megaraid_sas fixes are more on the level of a driver update
  (enabling crash dump and increasing lun number) but I thought you
  could let this slide on -rc1 and the next most extensive update is a
  load of fixes to mpi3mr"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: sd: Fix wrong zone_write_granularity value during revalidate
  scsi: storvsc: Handle BlockSize change in Hyper-V VHD/VHDX file
  scsi: megaraid_sas: Driver version update to 07.725.01.00-rc1
  scsi: megaraid_sas: Add crash dump mode capability bit in MFI capabilities
  scsi: megaraid_sas: Update max supported LD IDs to 240
  scsi: mpi3mr: Bad drive in topology results kernel crash
  scsi: mpi3mr: NVMe command size greater than 8K fails
  scsi: mpi3mr: Return proper values for failures in firmware init path
  scsi: mpi3mr: Wait for diagnostic save during controller init
  scsi: mpi3mr: Driver unload crashes host when enhanced logging is enabled
  scsi: mpi3mr: ioctl timeout when disabling/enabling interrupt
  scsi: lpfc: Avoid usage of list iterator variable after loop
  scsi: lpfc: Check kzalloc() in lpfc_sli4_cgn_params_read()
  scsi: ufs: mcq: qcom: Clean the return path of ufs_qcom_mcq_config_resource()
  scsi: ufs: mcq: qcom: Fix passing zero to PTR_ERR
  scsi: ufs: ufs-qcom: Remove impossible check
  scsi: ufs: core: Add soft dependency on governor_simpleondemand
  scsi: hisi_sas: Check devm_add_action() return value
  scsi: qla2xxx: Add option to disable FC2 Target support
  scsi: target: iscsi: Fix an error message in iscsi_check_key()
parents 40f879bd 288b3271

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −2
Original line number Diff line number Diff line
@@ -2495,8 +2495,7 @@ static int interrupt_preinit_v3_hw(struct hisi_hba *hisi_hba) 
	hisi_hba->cq_nvecs = vectors - BASE_VECTORS_V3_HW;

	shost->nr_hw_queues = hisi_hba->cq_nvecs;



	devm_add_action(&pdev->dev, hisi_sas_v3_free_vectors, pdev);

	return 0;

	return devm_add_action(&pdev->dev, hisi_sas_v3_free_vectors, pdev);

}



static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)

drivers/scsi/lpfc/lpfc_init.c

+2 −0
Original line number Diff line number Diff line
@@ -7291,6 +7291,8 @@ lpfc_sli4_cgn_params_read(struct lpfc_hba *phba) 
	/* Find out if the FW has a new set of congestion parameters. */

	len = sizeof(struct lpfc_cgn_param);

	pdata = kzalloc(len, GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;

	ret = lpfc_read_object(phba, (char *)LPFC_PORT_CFG_NAME,

			       pdata, len);

drivers/scsi/lpfc/lpfc_sli.c

+4 −8
Original line number Diff line number Diff line
@@ -21899,20 +21899,20 @@ lpfc_get_io_buf_from_private_pool(struct lpfc_hba *phba, 
static struct lpfc_io_buf *

lpfc_get_io_buf_from_expedite_pool(struct lpfc_hba *phba)

{

	struct lpfc_io_buf *lpfc_ncmd;

	struct lpfc_io_buf *lpfc_ncmd = NULL, *iter;

	struct lpfc_io_buf *lpfc_ncmd_next;

	unsigned long iflag;

	struct lpfc_epd_pool *epd_pool;









	epd_pool = &phba->epd_pool;









	lpfc_ncmd = NULL;

















	spin_lock_irqsave(&epd_pool->lock, iflag);









	if (epd_pool->count > 0) {









		list_for_each_entry_safe(lpfc_ncmd, lpfc_ncmd_next,









		list_for_each_entry_safe(iter, lpfc_ncmd_next,









					 &epd_pool->list, list) {









			list_del(&lpfc_ncmd->list);









			list_del(&iter->list);









			epd_pool->count--;









			lpfc_ncmd = iter;









			break;









		}









	}








@@ -22109,10 +22109,6 @@ lpfc_read_object(struct lpfc_hba *phba, char *rdobject, uint32_t *datap,







	struct lpfc_dmabuf *pcmd;









	u32 rd_object_name[LPFC_MBX_OBJECT_NAME_LEN_DW] = {0};

















	/* sanity check on queue memory */









	if (!datap)









		return -ENODEV;

















	mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);









	if (!mbox)









		return -ENOMEM;

























drivers/scsi/megaraid/megaraid_sas.h



+8
−4






























Original line number
Diff line number
Diff line







@@ -23,8 +23,8 @@







/*









 * MegaRAID SAS Driver meta data









 */









#define MEGASAS_VERSION				"07.719.03.00-rc1"









#define MEGASAS_RELDATE				"Sep 29, 2021"









#define MEGASAS_VERSION				"07.725.01.00-rc1"









#define MEGASAS_RELDATE				"Mar 2, 2023"



















#define MEGASAS_MSIX_NAME_LEN			32


















@@ -1519,6 +1519,8 @@ struct megasas_ctrl_info {







#define MEGASAS_MAX_LD_IDS			(MEGASAS_MAX_LD_CHANNELS * \









						MEGASAS_MAX_DEV_PER_CHANNEL)



















#define MEGASAS_MAX_SUPPORTED_LD_IDS		240



















#define MEGASAS_MAX_SECTORS                    (2*1024)









#define MEGASAS_MAX_SECTORS_IEEE		(2*128)









#define MEGASAS_DBG_LVL				1








@@ -1758,7 +1760,8 @@ union megasas_sgl_frame {







typedef union _MFI_CAPABILITIES {









	struct {









#if   defined(__BIG_ENDIAN_BITFIELD)









	u32     reserved:16;









	u32     reserved:15;









	u32	support_memdump:1;









	u32	support_fw_exposed_dev_list:1;









	u32	support_nvme_passthru:1;









	u32     support_64bit_mode:1;








@@ -1792,7 +1795,8 @@ typedef union _MFI_CAPABILITIES {







	u32     support_64bit_mode:1;









	u32	support_nvme_passthru:1;









	u32	support_fw_exposed_dev_list:1;









	u32     reserved:16;









	u32	support_memdump:1;









	u32     reserved:15;









#endif









	} mfi_capabilities;









	__le32		reg;
































drivers/scsi/megaraid/megaraid_sas_fp.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -358,7 +358,7 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id)







		ld = MR_TargetIdToLdGet(i, drv_map);



















		/* For non existing VDs, iterate to next VD*/









		if (ld >= (MAX_LOGICAL_DRIVES_EXT - 1))









		if (ld >= MEGASAS_MAX_SUPPORTED_LD_IDS)









			continue;



















		raid = MR_LdRaidGet(ld, drv_map);