Commit 55e0500e 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:
 "The usual driver updates (ufs, qla2xxx, tcmu, ibmvfc, lpfc, smartpqi,
  hisi_sas, qedi, qedf, mpt3sas) and minor bug fixes.

  There are only three core changes: adding sense codes, cleaning up
  noretry and adding an option for limitless retries"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (226 commits)
  scsi: hisi_sas: Recover PHY state according to the status before reset
  scsi: hisi_sas: Filter out new PHY up events during suspend
  scsi: hisi_sas: Add device link between SCSI devices and hisi_hba
  scsi: hisi_sas: Add check for methods _PS0 and _PR0
  scsi: hisi_sas: Add controller runtime PM support for v3 hw
  scsi: hisi_sas: Switch to new framework to support suspend and resume
  scsi: hisi_sas: Use hisi_hba->cq_nvecs for calling calling synchronize_irq()
  scsi: qedf: Remove redundant assignment to variable 'rc'
  scsi: lpfc: Remove unneeded variable 'status' in lpfc_fcp_cpu_map_store()
  scsi: snic: Convert to use DEFINE_SEQ_ATTRIBUTE macro
  scsi: qla4xxx: Delete unneeded variable 'status' in qla4xxx_process_ddb_changed
  scsi: sun_esp: Use module_platform_driver to simplify the code
  scsi: sun3x_esp: Use module_platform_driver to simplify the code
  scsi: sni_53c710: Use module_platform_driver to simplify the code
  scsi: qlogicpti: Use module_platform_driver to simplify the code
  scsi: mac_esp: Use module_platform_driver to simplify the code
  scsi: jazz_esp: Use module_platform_driver to simplify the code
  scsi: mvumi: Fix error return in mvumi_io_attach()
  scsi: lpfc: Drop nodelist reference on error in lpfc_gen_req()
  scsi: be2iscsi: Fix a theoretical leak in beiscsi_create_eqs()
  ...
parents 4815519e 69f4ec1e

Documentation/devicetree/bindings/ufs/ufs-mediatek.txt

+3 −1
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ contain a phandle reference to UFS M-PHY node. 
Required properties for UFS nodes:

- compatible         : Compatible list, contains the following controller:

                       "mediatek,mt8183-ufshci" for MediaTek UFS host controller

                       present on MT81xx chipsets.

                       present on MT8183 chipsets.

                       "mediatek,mt8192-ufshci" for MediaTek UFS host controller

                       present on MT8192 chipsets.

- reg                : Address and length of the UFS register set.

- phys               : phandle to m-phy.

- clocks             : List of phandle and clock specifier pairs.

Documentation/scsi/scsi_mid_low_api.rst

+0 −6
Original line number Diff line number Diff line
@@ -271,12 +271,6 @@ Conventions 
First, Linus Torvalds's thoughts on C coding style can be found in the

Documentation/process/coding-style.rst file.



Next, there is a movement to "outlaw" typedefs introducing synonyms for

struct tags. Both can be still found in the SCSI subsystem, but

the typedefs have been moved to a single file, scsi_typedefs.h to

make their future removal easier, for example:

"typedef struct scsi_cmnd Scsi_Cmnd;"



Also, most C99 enhancements are encouraged to the extent they are supported

by the relevant gcc compilers. So C99 style structure and array

initializers are encouraged where appropriate. Don't go too far,

Documentation/scsi/smartpqi.rst

+7 −7
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



=====================================

SMARTPQI - Microsemi Smart PQI Driver

=====================================

==============================================

SMARTPQI - Microchip Smart Storage SCSI driver

==============================================



This file describes the smartpqi SCSI driver for Microsemi

(http://www.microsemi.com) PQI controllers. The smartpqi driver

is the next generation SCSI driver for Microsemi Corp. The smartpqi

This file describes the smartpqi SCSI driver for Microchip

(http://www.microchip.com) PQI controllers. The smartpqi driver

is the next generation SCSI driver for Microchip Corp. The smartpqi

driver is the first SCSI driver to implement the PQI queuing model.



The smartpqi driver will replace the aacraid driver for Adaptec Series 9
@@ -14,7 +14,7 @@ controllers. Customers running an older kernel (Pre-4.9) using an Adaptec 
Series 9 controller will have to configure the smartpqi driver or their

volumes will not be added to the OS.



For Microsemi smartpqi controller support, enable the smartpqi driver

For Microchip smartpqi controller support, enable the smartpqi driver

when configuring the kernel.



For more information on the PQI Queuing Interface, please see:

MAINTAINERS

+19 −9
Original line number Diff line number Diff line
@@ -3520,13 +3520,17 @@ F: drivers/net/ethernet/broadcom/bnx2.* 
F:	drivers/net/ethernet/broadcom/bnx2_*









BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER









M:	QLogic-Storage-Upstream@qlogic.com









M:	Saurav Kashyap <skashyap@marvell.com>









M:	Javed Hasan <jhasan@marvell.com>









M:	GR-QLogic-Storage-Upstream@marvell.com









L:	linux-scsi@vger.kernel.org









S:	Supported









F:	drivers/scsi/bnx2fc/

















BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER









M:	QLogic-Storage-Upstream@qlogic.com









M:	Nilesh Javali <njavali@marvell.com>









M:	Manish Rangankar <mrangankar@marvell.com>









M:	GR-QLogic-Storage-Upstream@marvell.com









L:	linux-scsi@vger.kernel.org









S:	Supported









F:	drivers/scsi/bnx2i/








@@ -7747,8 +7751,8 @@ F:	Documentation/watchdog/hpwdt.rst







F:	drivers/watchdog/hpwdt.c

















HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)









M:	Don Brace <don.brace@microsemi.com>









L:	esc.storagedev@microsemi.com









M:	Don Brace <don.brace@microchip.com>









L:	storagedev@microchip.com









L:	linux-scsi@vger.kernel.org









S:	Supported









F:	Documentation/scsi/hpsa.rst








@@ -11546,8 +11550,8 @@ F:	arch/mips/configs/generic/board-ocelot.config







F:	arch/mips/generic/board-ocelot.c

















MICROSEMI SMART ARRAY SMARTPQI DRIVER (smartpqi)









M:	Don Brace <don.brace@microsemi.com>









L:	esc.storagedev@microsemi.com









M:	Don Brace <don.brace@microchip.com>









L:	storagedev@microchip.com









L:	linux-scsi@vger.kernel.org









S:	Supported









F:	Documentation/scsi/smartpqi.rst








@@ -14208,13 +14212,17 @@ S:	Supported







F:	drivers/infiniband/hw/qib/

















QLOGIC QL41xxx FCOE DRIVER









M:	QLogic-Storage-Upstream@cavium.com









M:	Saurav Kashyap <skashyap@marvell.com>









M:	Javed Hasan <jhasan@marvell.com>









M:	GR-QLogic-Storage-Upstream@marvell.com









L:	linux-scsi@vger.kernel.org









S:	Supported









F:	drivers/scsi/qedf/

















QLOGIC QL41xxx ISCSI DRIVER









M:	QLogic-Storage-Upstream@cavium.com









M:	Nilesh Javali <njavali@marvell.com>









M:	Manish Rangankar <mrangankar@marvell.com>









M:	GR-QLogic-Storage-Upstream@marvell.com









L:	linux-scsi@vger.kernel.org









S:	Supported









F:	drivers/scsi/qedi/








@@ -14258,7 +14266,9 @@ F:	Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx







F:	drivers/net/ethernet/qlogic/qla3xxx.*

















QLOGIC QLA4XXX iSCSI DRIVER









M:	QLogic-Storage-Upstream@qlogic.com









M:	Nilesh Javali <njavali@marvell.com>









M:	Manish Rangankar <mrangankar@marvell.com>









M:	GR-QLogic-Storage-Upstream@marvell.com









L:	linux-scsi@vger.kernel.org









S:	Supported









F:	Documentation/scsi/LICENSE.qla4xxx
































drivers/message/fusion/mptctl.c



+2
−3






























Original line number
Diff line number
Diff line







@@ -2593,7 +2593,7 @@ mptctl_hp_targetinfo(MPT_ADAPTER *ioc, unsigned long arg)







       /* Get the data transfer speeds









        */









	data_sz = ioc->spi_data.sdp0length * 4;









	pg0_alloc = (SCSIDevicePage0_t *) pci_alloc_consistent(ioc->pcidev, data_sz, &page_dma);









	pg0_alloc = pci_alloc_consistent(ioc->pcidev, data_sz, &page_dma);









	if (pg0_alloc) {









		hdr.PageVersion = ioc->spi_data.sdp0version;









		hdr.PageLength = data_sz;








@@ -2657,8 +2657,7 @@ mptctl_hp_targetinfo(MPT_ADAPTER *ioc, unsigned long arg)







		/* Issue the second config page request */









		cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;









		data_sz = (int) cfg.cfghdr.hdr->PageLength * 4;









		pg3_alloc = (SCSIDevicePage3_t *) pci_alloc_consistent(









							ioc->pcidev, data_sz, &page_dma);









		pg3_alloc = pci_alloc_consistent(ioc->pcidev, data_sz, &page_dma);









		if (pg3_alloc) {









			cfg.physAddr = page_dma;









			cfg.pageAddr = (karg.hdr.channel << 8) | karg.hdr.id;








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE