Commit bdb39c95 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 series consists of the usual driver updates (ufs, ibmvfc,
  qla2xxx, hisi_sas, pm80xx) plus the removal of the gdth driver (which
  is bound to cause conflicts with a trivial change somewhere).

  The only big major rework of note is the one from Hannes trying to
  clean up our result handling code in the drivers to make it
  consistent"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (194 commits)
  scsi: MAINTAINERS: Adjust to reflect gdth scsi driver removal
  scsi: ufs: Give clk scaling min gear a value
  scsi: lpfc: Fix 'physical' typos
  scsi: megaraid_mbox: Fix spelling of 'allocated'
  scsi: qla2xxx: Simplify the calculation of variables
  scsi: message: fusion: Fix 'physical' typos
  scsi: target: core: Change ASCQ for residual write
  scsi: target: core: Signal WRITE residuals
  scsi: target: core: Set residuals for 4Kn devices
  scsi: hisi_sas: Add trace FIFO debugfs support
  scsi: hisi_sas: Flush workqueue in hisi_sas_v3_remove()
  scsi: hisi_sas: Enable debugfs support by default
  scsi: hisi_sas: Don't check .nr_hw_queues in hisi_sas_task_prep()
  scsi: hisi_sas: Remove deferred probe check in hisi_sas_v2_probe()
  scsi: lpfc: Add auto select on IRQ_POLL
  scsi: ncr53c8xx: Fix typos
  scsi: lpfc: Fix ancient double free
  scsi: qla2xxx: Fix some memory corruption
  scsi: qla2xxx: Remove redundant NULL check
  scsi: megaraid: Fix ifnullfree.cocci warnings
  ...
parents 325b7640 d2aacd36

Documentation/ABI/testing/sysfs-driver-ufs

+11 −0
Original line number Diff line number Diff line
@@ -1161,3 +1161,14 @@ Description: This entry shows the configured size of WriteBooster buffer. 
		0400h corresponds to 4GB.



		The file is read only.



What:		/sys/bus/platform/drivers/ufshcd/*/wb_on

Date:		January 2021

Contact:	Bean Huo <beanhuo@micron.com>

Description:	This node is used to set or display whether UFS WriteBooster is

		enabled. Echo 0 to this file to disable UFS WriteBooster or 1 to

		enable it. The WriteBooster is enabled after power-on/reset,

		however, it will be disabled/enable while CLK scaling down/up

		(if the platform supports UFSHCD_CAP_CLK_SCALING). For a

		platform that doesn't support UFSHCD_CAP_CLK_SCALING, we can

		disable/enable WriteBooster through this sysfs node.

Documentation/kbuild/makefiles.rst

+1 −3
Original line number Diff line number Diff line
@@ -461,10 +461,8 @@ more details, with real examples. 


		# drivers/scsi/Makefile

		CFLAGS_aha152x.o =   -DAHA152X_STAT -DAUTOCONF

		CFLAGS_gdth.o    = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ \

				     -DGDTH_STATISTICS



	These two lines specify compilation flags for aha152x.o and gdth.o.

	This line specify compilation flags for aha152x.o.



	$(AFLAGS_$@) is a similar feature for source files in assembly

	languages.

Documentation/process/magic-number.rst

+0 −2
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port ``drivers/usb/se 
CG_MAGIC              0x00090255       ufs_cylinder_group       ``include/linux/ufs_fs.h``

RPORT_MAGIC           0x00525001       r_port                   ``drivers/char/rocket_int.h``

LSEMAGIC              0x05091998       lse                      ``drivers/fc4/fc.c``

GDTIOCTL_MAGIC        0x06030f07       gdth_iowr_str            ``drivers/scsi/gdth_ioctl.h``

RIEBL_MAGIC           0x09051990                                ``drivers/net/atarilance.c``

NBD_REQUEST_MAGIC     0x12560953       nbd_request              ``include/linux/nbd.h``

RED_MAGIC2            0x170fc2a5       (any)                    ``mm/slab.c``
@@ -142,7 +141,6 @@ PWC_MAGIC 0x89DC10AB pwc_device ``drivers/usb/me 
NBD_REPLY_MAGIC       0x96744668       nbd_reply                ``include/linux/nbd.h``

ENI155_MAGIC          0xa54b872d       midway_eprom	        ``drivers/atm/eni.h``

CODA_MAGIC            0xC0DAC0DA       coda_file_info           ``fs/coda/coda_fs_i.h``

DPMEM_MAGIC           0xc0ffee11       gdt_pci_sram             ``drivers/scsi/gdth.h``

YAM_MAGIC             0xF10A7654       yam_port                 ``drivers/net/hamradio/yam.c``

CCB_MAGIC             0xf2691ad2       ccb                      ``drivers/scsi/ncr53c8xx.c``

QUEUE_MAGIC_FREE      0xf7e1c9a3       queue_entry              ``drivers/scsi/arm/queue.c``

Documentation/scsi/libsas.rst

+2 −7
Original line number Diff line number Diff line
@@ -189,13 +189,8 @@ num_phys 
The event interface::



	/* LLDD calls these to notify the class of an event. */

	void (*notify_ha_event)(struct sas_ha_struct *, enum ha_event);

	void (*notify_port_event)(struct sas_phy *, enum port_event);

	void (*notify_phy_event)(struct sas_phy *, enum phy_event);



When sas_register_ha() returns, those are set and can be

called by the LLDD to notify the SAS layer of such events

the SAS layer.

	void sas_notify_port_event(struct sas_phy *, enum port_event, gfp_t);

	void sas_notify_phy_event(struct sas_phy *, enum phy_event, gfp_t);



The port notification::

Documentation/scsi/scsi-parameters.rst

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ parameters may be changed at runtime by the command 
			See drivers/scsi/BusLogic.c, comment before function

			BusLogic_ParseDriverOptions().



	gdth=		[HW,SCSI]

			See header of drivers/scsi/gdth.c.



	gvp11=		[HW,SCSI]



	ips=		[HW,SCSI] Adaptec / IBM ServeRAID controller