From: Martin K. Petersen Date: Thu, 12 Aug 2021 02:37:22 +0000 (-0400) Subject: Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=315480209b8e1032e63c70dafc8f4133b3c9a333;p=linux.git Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging Resolve mpt3sas conflict between 5.14/scsi-fixes and 5.15/scsi-staging reported by sfr. Signed-off-by: Martin K. Petersen --- 315480209b8e1032e63c70dafc8f4133b3c9a333 diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c index e7f6fbb282bd7,19b1c0cf5f2a2..2528c4e7b0e01 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@@ -8738,8 -8471,7 +8738,8 @@@ mpt3sas_base_hard_reset_handler(struct _base_pre_reset_handler(ioc); mpt3sas_wait_for_commands_to_complete(ioc); mpt3sas_base_mask_interrupts(ioc); + mpt3sas_base_pause_mq_polling(ioc); - r = _base_make_ioc_ready(ioc, type); + r = mpt3sas_base_make_ioc_ready(ioc, type); if (r) goto out; _base_clear_outstanding_commands(ioc); diff --cc drivers/scsi/mpt3sas/mpt3sas_base.h index 3cf2e4615ff55,0c6c3df0038d5..f87c0911f66ad --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@@ -1755,9 -1730,10 +1755,12 @@@ do { ioc_err(ioc, "In func: %s\n", __fu status, mpi_request, sz); } while (0) int mpt3sas_wait_for_ioc(struct MPT3SAS_ADAPTER *ioc, int wait_count); -int -mpt3sas_base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type); ++int mpt3sas_base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type); + void mpt3sas_base_free_irq(struct MPT3SAS_ADAPTER *ioc); + void mpt3sas_base_disable_msix(struct MPT3SAS_ADAPTER *ioc); +int mpt3sas_blk_mq_poll(struct Scsi_Host *shost, unsigned int queue_num); +void mpt3sas_base_pause_mq_polling(struct MPT3SAS_ADAPTER *ioc); +void mpt3sas_base_resume_mq_polling(struct MPT3SAS_ADAPTER *ioc); /* scsih shared API */ struct scsi_cmnd *mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc,