Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a829a844 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:
 "This update includes the usual round of major driver updates (ncr5380,
  lpfc, hisi_sas, megaraid_sas, ufs, ibmvscsis, mpt3sas).

  There's also an assortment of minor fixes, mostly in error legs or
  other not very user visible stuff. The major change is the
  pci_alloc_irq_vectors replacement for the old pci_msix_.. calls; this
  effectively makes IRQ mapping generic for the drivers and allows
  blk_mq to use the information"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (256 commits)
  scsi: qla4xxx: switch to pci_alloc_irq_vectors
  scsi: hisi_sas: support deferred probe for v2 hw
  scsi: megaraid_sas: switch to pci_alloc_irq_vectors
  scsi: scsi_devinfo: remove synchronous ALUA for NETAPP devices
  scsi: be2iscsi: set errno on error path
  scsi: be2iscsi: set errno on error path
  scsi: hpsa: fallback to use legacy REPORT PHYS command
  scsi: scsi_dh_alua: Fix RCU annotations
  scsi: hpsa: use %phN for short hex dumps
  scsi: hisi_sas: fix free'ing in probe and remove
  scsi: isci: switch to pci_alloc_irq_vectors
  scsi: ipr: Fix runaway IRQs when falling back from MSI to LSI
  scsi: dpt_i2o: double free on error path
  scsi: cxlflash: Migrate scsi command pointer to AFU command
  scsi: cxlflash: Migrate IOARRIN specific routines to function pointers
  scsi: cxlflash: Cleanup queuecommand()
  scsi: cxlflash: Cleanup send_tmf()
  scsi: cxlflash: Remove AFU command lock
  scsi: cxlflash: Wait for active AFU commands to timeout upon tear down
  scsi: cxlflash: Remove private command pool
  ...
parents 84b60791 f5b893c9

Documentation/devicetree/bindings/scsi/hisilicon-sas.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Main node required properties: 
  - compatible : value should be as follows:

	(a) "hisilicon,hip05-sas-v1" for v1 hw in hip05 chipset

	(b) "hisilicon,hip06-sas-v2" for v2 hw in hip06 chipset

	(c) "hisilicon,hip07-sas-v2" for v2 hw in hip07 chipset

  - sas-addr : array of 8 bytes for host SAS address

  - reg : Address and length of the SAS register

  - hisilicon,sas-syscon: phandle of syscon used for sas control

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

+5 −2
Original line number Diff line number Diff line
@@ -7,8 +7,11 @@ To bind UFS PHY with UFS host controller, the controller node should 
contain a phandle reference to UFS PHY node.



Required properties:

- compatible        : compatible list, contains "qcom,ufs-phy-qmp-20nm"

		      or "qcom,ufs-phy-qmp-14nm" according to the relevant phy in use.

- compatible        : compatible list, contains one of the following -

			"qcom,ufs-phy-qmp-20nm" for 20nm ufs phy,

			"qcom,ufs-phy-qmp-14nm" for legacy 14nm ufs phy,

			"qcom,msm8996-ufs-phy-qmp-14nm" for 14nm ufs phy

			 present on MSM8996 chipset.

- reg               : should contain PHY register address space (mandatory),

- reg-names         : indicates various resources passed to driver (via reg proptery) by name.

                      Required "reg-names" is "phy_mem".

MAINTAINERS

+15 −17
Original line number Diff line number Diff line
@@ -3192,15 +3192,15 @@ S: Supported 
F:	drivers/clocksource



CISCO FCOE HBA DRIVER

M:	Hiral Patel <hiralpat@cisco.com>

M:	Suma Ramars <sramars@cisco.com>

M:	Brian Uchino <buchino@cisco.com>

M:	Satish Kharat <satishkh@cisco.com>

M:	Sesidhar Baddela <sebaddel@cisco.com>

M:	Karan Tilak Kumar <kartilak@cisco.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/fnic/



CISCO SCSI HBA DRIVER

M:	Narsimhulu Musini <nmusini@cisco.com>

M:	Karan Tilak Kumar <kartilak@cisco.com>

M:	Sesidhar Baddela <sebaddel@cisco.com>

L:	linux-scsi@vger.kernel.org

S:	Supported
@@ -4787,11 +4787,11 @@ M: David Woodhouse <dwmw2@infradead.org> 
L:	linux-embedded@vger.kernel.org

S:	Maintained



EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER

M:	James Smart <james.smart@avagotech.com>

M:	Dick Kennedy <dick.kennedy@avagotech.com>

EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER

M:	James Smart <james.smart@broadcom.com>

M:	Dick Kennedy <dick.kennedy@broadcom.com>

L:	linux-scsi@vger.kernel.org

W:	http://www.avagotech.com

W:	http://www.broadcom.com

S:	Supported

F:	drivers/scsi/lpfc/
@@ -5717,7 +5717,6 @@ F: drivers/watchdog/hpwdt.c 


HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)

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

L:	iss_storagedev@hp.com

L:	esc.storagedev@microsemi.com

L:	linux-scsi@vger.kernel.org

S:	Supported
@@ -5728,7 +5727,6 @@ F: include/uapi/linux/cciss*.h 


HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)

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

L:	iss_storagedev@hp.com

L:	esc.storagedev@microsemi.com

L:	linux-scsi@vger.kernel.org

S:	Supported
@@ -7968,12 +7966,12 @@ S: Maintained 
F:	drivers/net/wireless/mediatek/mt7601u/



MEGARAID SCSI/SAS DRIVERS

M:	Kashyap Desai <kashyap.desai@avagotech.com>

M:	Sumit Saxena <sumit.saxena@avagotech.com>

M:	Uday Lingala <uday.lingala@avagotech.com>

L:	megaraidlinux.pdl@avagotech.com

M:	Kashyap Desai <kashyap.desai@broadcom.com>

M:	Sumit Saxena <sumit.saxena@broadcom.com>

M:	Shivasharan S <shivasharan.srikanteshwara@broadcom.com>

L:	megaraidlinux.pdl@broadcom.com

L:	linux-scsi@vger.kernel.org

W:	http://www.lsi.com

W:	http://www.avagotech.com/support/

S:	Maintained

F:	Documentation/scsi/megaraid.txt

F:	drivers/scsi/megaraid.*
@@ -8453,7 +8451,6 @@ F: drivers/scsi/arm/oak.c 
F:	drivers/scsi/atari_scsi.*

F:	drivers/scsi/dmx3191d.c

F:	drivers/scsi/g_NCR5380.*

F:	drivers/scsi/g_NCR5380_mmio.c

F:	drivers/scsi/mac_scsi.*

F:	drivers/scsi/sun3_scsi.*

F:	drivers/scsi/sun3_scsi_vme.c
@@ -12547,7 +12544,8 @@ F: Documentation/scsi/ufs.txt 
F:	drivers/scsi/ufs/



UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS

M:	Joao Pinto <Joao.Pinto@synopsys.com>

M:	Manjunath M Bettegowda <manjumb@synopsys.com>

M:	Prabu Thangamuthu <prabut@synopsys.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/ufs/*dwc*

block/blk-mq-cpumap.c

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ int blk_mq_map_queues(struct blk_mq_tag_set *set) 
	free_cpumask_var(cpus);

	return 0;

}

EXPORT_SYMBOL_GPL(blk_mq_map_queues);



/*

 * We have no quick way of doing reverse lookups. This is only used at

block/blk-mq.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ void blk_mq_disable_hotplug(void); 
/*

 * CPU -> queue mappings

 */

int blk_mq_map_queues(struct blk_mq_tag_set *set);

extern int blk_mq_hw_queue_to_node(unsigned int *map, unsigned int);



static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q,