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

Commit 72f02ba6 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 is mostly updates to the usual drivers: mpt3sas, lpfc, qla2xxx,
  hisi_sas, smartpqi, megaraid_sas, arcmsr.

  In addition, with the continuing absence of Nic we have target updates
  for tcmu and target core (all with reviews and acks).

  The biggest observable change is going to be that we're (again) trying
  to switch to mulitqueue as the default (a user can still override the
  setting on the kernel command line).

  Other major core stuff is the removal of the remaining Microchannel
  drivers, an update of the internal timers and some reworks of
  completion and result handling"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (203 commits)
  scsi: core: use blk_mq_run_hw_queues in scsi_kick_queue
  scsi: ufs: remove unnecessary query(DM) UPIU trace
  scsi: qla2xxx: Fix issue reported by static checker for qla2x00_els_dcmd2_sp_done()
  scsi: aacraid: Spelling fix in comment
  scsi: mpt3sas: Fix calltrace observed while running IO & reset
  scsi: aic94xx: fix an error code in aic94xx_init()
  scsi: st: remove redundant pointer STbuffer
  scsi: qla2xxx: Update driver version to 10.00.00.08-k
  scsi: qla2xxx: Migrate NVME N2N handling into state machine
  scsi: qla2xxx: Save frame payload size from ICB
  scsi: qla2xxx: Fix stalled relogin
  scsi: qla2xxx: Fix race between switch cmd completion and timeout
  scsi: qla2xxx: Fix Management Server NPort handle reservation logic
  scsi: qla2xxx: Flush mailbox commands on chip reset
  scsi: qla2xxx: Fix unintended Logout
  scsi: qla2xxx: Fix session state stuck in Get Port DB
  scsi: qla2xxx: Fix redundant fc_rport registration
  scsi: qla2xxx: Silent erroneous message
  scsi: qla2xxx: Prevent sysfs access when chip is down
  scsi: qla2xxx: Add longer window for chip reset
  ...
parents db06f826 51372570

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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
* Hisilicon Universal Flash Storage (UFS) Host Controller



UFS nodes are defined to describe on-chip UFS hardware macro.

Each UFS Host Controller should have its own node.



Required properties:

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

					"hisilicon,hi3660-ufs", "jedec,ufs-1.1" for hisi ufs

					host controller present on Hi36xx chipset.

- reg               : should contain UFS register address space & UFS SYS CTRL register address,

- interrupt-parent  : interrupt device

- interrupts        : interrupt number

- clocks	        : List of phandle and clock specifier pairs

- clock-names       : List of clock input name strings sorted in the same

					order as the clocks property. "ref_clk", "phy_clk" is optional

- freq-table-hz     : Array of <min max> operating frequencies stored in the same

                      order as the clocks property. If this property is not

                      defined or a value in the array is "0" then it is assumed

                      that the frequency is set by the parent clock or a

                      fixed rate clock source.

- resets            : describe reset node register

- reset-names       : reset node register, the "rst" corresponds to reset the whole UFS IP.



Example:



	ufs: ufs@ff3b0000 {

		compatible = "hisilicon,hi3660-ufs", "jedec,ufs-1.1";

		/* 0: HCI standard */

		/* 1: UFS SYS CTRL */

		reg = <0x0 0xff3b0000 0x0 0x1000>,

			<0x0 0xff3b1000 0x0 0x1000>;

		interrupt-parent = <&gic>;

		interrupts = <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&crg_ctrl HI3660_CLK_GATE_UFSIO_REF>,

			<&crg_ctrl HI3660_CLK_GATE_UFSPHY_CFG>;

		clock-names = "ref_clk", "phy_clk";

		freq-table-hz = <0 0>, <0 0>;

		/* offset: 0x84; bit: 12  */

		resets = <&crg_rst 0x84 12>;

		reset-names = "rst";

	};

Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt

+7 −3
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ Optional properties: 
-lanes-per-direction	: number of lanes available per direction - either 1 or 2.

			  Note that it is assume same number of lanes is used both

			  directions at once. If not specified, default is 2 lanes per direction.

- resets            : reset node register

- reset-names       : describe reset node register, the "rst" corresponds to reset the whole UFS IP.



Note: If above properties are not defined it can be assumed that the supply

regulators or clocks are always on.
@@ -61,9 +63,11 @@ Example: 
		vccq-max-microamp = 200000;

		vccq2-max-microamp = 200000;



		clocks = <&core 0>, <&ref 0>, <&iface 0>;

		clock-names = "core_clk", "ref_clk", "iface_clk";

		freq-table-hz = <100000000 200000000>, <0 0>, <0 0>;

		clocks = <&core 0>, <&ref 0>, <&phy 0>, <&iface 0>;

		clock-names = "core_clk", "ref_clk", "phy_clk", "iface_clk";

		freq-table-hz = <100000000 200000000>, <0 0>, <0 0>, <0 0>;

		resets = <&reset 0 1>;

		reset-names = "rst";

		phys = <&ufsphy1>;

		phy-names = "ufsphy";

	};

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -9847,12 +9847,6 @@ F: drivers/scsi/mac_scsi.* 
F:	drivers/scsi/sun3_scsi.*

F:	drivers/scsi/sun3_scsi_vme.c



NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)

M:	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>

L:	linux-scsi@vger.kernel.org

S:	Maintained

F:	drivers/scsi/NCR_D700.*



NCSI LIBRARY:

M:	Samuel Mendoza-Jonas <sam@mendozajonas.com>

S:	Maintained

arch/arm64/boot/dts/hisilicon/hi3660.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -1000,6 +1000,24 @@ 
			reset-gpios = <&gpio11 1 0 >;

		};



		/* UFS */

		ufs: ufs@ff3b0000 {

			compatible = "hisilicon,hi3660-ufs", "jedec,ufs-1.1";

			/* 0: HCI standard */

			/* 1: UFS SYS CTRL */

			reg = <0x0 0xff3b0000 0x0 0x1000>,

				<0x0 0xff3b1000 0x0 0x1000>;

			interrupt-parent = <&gic>;

			interrupts = <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&crg_ctrl HI3660_CLK_GATE_UFSIO_REF>,

				<&crg_ctrl HI3660_CLK_GATE_UFSPHY_CFG>;

			clock-names = "ref_clk", "phy_clk";

			freq-table-hz = <0 0>, <0 0>;

			/* offset: 0x84; bit: 12 */

			resets = <&crg_rst 0x84 12>;

			reset-names = "rst";

		};



		/* SD */

		dwmmc1: dwmmc1@ff37f000 {

			#address-cells = <1>;

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ CONFIG_SCSI_HISI_SAS=y 
CONFIG_SCSI_HISI_SAS_PCI=y

CONFIG_SCSI_UFSHCD=m

CONFIG_SCSI_UFSHCD_PLATFORM=m

CONFIG_SCSI_UFS_HISI=y

CONFIG_SCSI_UFS_QCOM=m

CONFIG_ATA=y

CONFIG_SATA_AHCI=y