Skip to content

Commit bdb39c9

Browse files
committed
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 ...
2 parents 325b764 + d2aacd3 commit bdb39c9

File tree

154 files changed

+5495
-9028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+5495
-9028
lines changed

Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,3 +1161,14 @@ Description: This entry shows the configured size of WriteBooster buffer.
11611161
0400h corresponds to 4GB.
11621162

11631163
The file is read only.
1164+
1165+
What: /sys/bus/platform/drivers/ufshcd/*/wb_on
1166+
Date: January 2021
1167+
Contact: Bean Huo <[email protected]>
1168+
Description: This node is used to set or display whether UFS WriteBooster is
1169+
enabled. Echo 0 to this file to disable UFS WriteBooster or 1 to
1170+
enable it. The WriteBooster is enabled after power-on/reset,
1171+
however, it will be disabled/enable while CLK scaling down/up
1172+
(if the platform supports UFSHCD_CAP_CLK_SCALING). For a
1173+
platform that doesn't support UFSHCD_CAP_CLK_SCALING, we can
1174+
disable/enable WriteBooster through this sysfs node.

Documentation/kbuild/makefiles.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,10 +461,8 @@ more details, with real examples.
461461

462462
# drivers/scsi/Makefile
463463
CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF
464-
CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ \
465-
-DGDTH_STATISTICS
466464

467-
These two lines specify compilation flags for aha152x.o and gdth.o.
465+
This line specify compilation flags for aha152x.o.
468466

469467
$(AFLAGS_$@) is a similar feature for source files in assembly
470468
languages.

Documentation/process/magic-number.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port ``drivers/usb/se
9999
CG_MAGIC 0x00090255 ufs_cylinder_group ``include/linux/ufs_fs.h``
100100
RPORT_MAGIC 0x00525001 r_port ``drivers/char/rocket_int.h``
101101
LSEMAGIC 0x05091998 lse ``drivers/fc4/fc.c``
102-
GDTIOCTL_MAGIC 0x06030f07 gdth_iowr_str ``drivers/scsi/gdth_ioctl.h``
103102
RIEBL_MAGIC 0x09051990 ``drivers/net/atarilance.c``
104103
NBD_REQUEST_MAGIC 0x12560953 nbd_request ``include/linux/nbd.h``
105104
RED_MAGIC2 0x170fc2a5 (any) ``mm/slab.c``
@@ -142,7 +141,6 @@ PWC_MAGIC 0x89DC10AB pwc_device ``drivers/usb/me
142141
NBD_REPLY_MAGIC 0x96744668 nbd_reply ``include/linux/nbd.h``
143142
ENI155_MAGIC 0xa54b872d midway_eprom ``drivers/atm/eni.h``
144143
CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h``
145-
DPMEM_MAGIC 0xc0ffee11 gdt_pci_sram ``drivers/scsi/gdth.h``
146144
YAM_MAGIC 0xF10A7654 yam_port ``drivers/net/hamradio/yam.c``
147145
CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c``
148146
QUEUE_MAGIC_FREE 0xf7e1c9a3 queue_entry ``drivers/scsi/arm/queue.c``

Documentation/scsi/libsas.rst

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,8 @@ num_phys
189189
The event interface::
190190

191191
/* LLDD calls these to notify the class of an event. */
192-
void (*notify_ha_event)(struct sas_ha_struct *, enum ha_event);
193-
void (*notify_port_event)(struct sas_phy *, enum port_event);
194-
void (*notify_phy_event)(struct sas_phy *, enum phy_event);
195-
196-
When sas_register_ha() returns, those are set and can be
197-
called by the LLDD to notify the SAS layer of such events
198-
the SAS layer.
192+
void sas_notify_port_event(struct sas_phy *, enum port_event, gfp_t);
193+
void sas_notify_phy_event(struct sas_phy *, enum phy_event, gfp_t);
199194

200195
The port notification::
201196

Documentation/scsi/scsi-parameters.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ parameters may be changed at runtime by the command
3838
See drivers/scsi/BusLogic.c, comment before function
3939
BusLogic_ParseDriverOptions().
4040

41-
gdth= [HW,SCSI]
42-
See header of drivers/scsi/gdth.c.
43-
4441
gvp11= [HW,SCSI]
4542

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

Documentation/userspace-api/ioctl/ioctl-number.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ Code Seq# Include File Comments
157157
'I' all linux/isdn.h conflict!
158158
'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict!
159159
'I' 40-4F linux/mISDNif.h conflict!
160-
'J' 00-1F drivers/scsi/gdth_ioctl.h
161160
'K' all linux/kd.h
162161
'L' 00-1F linux/loop.h conflict!
163162
'L' 10-1F drivers/scsi/mpt3sas/mpt3sas_ctl.h conflict!

MAINTAINERS

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7363,13 +7363,6 @@ M: Kieran Bingham <[email protected]>
73637363
S: Supported
73647364
F: scripts/gdb/
73657365

7366-
GDT SCSI DISK ARRAY CONTROLLER DRIVER
7367-
M: Achim Leubner <[email protected]>
7368-
7369-
S: Supported
7370-
W: http://www.icp-vortex.com/
7371-
F: drivers/scsi/gdt*
7372-
73737366
GEMTEK FM RADIO RECEIVER DRIVER
73747367
M: Hans Verkuil <[email protected]>
73757368
@@ -8864,7 +8857,6 @@ F: drivers/mfd/intel_pmc_bxt.c
88648857
F: include/linux/mfd/intel_pmc_bxt.h
88658858

88668859
INTEL C600 SERIES SAS CONTROLLER DRIVER
8867-
M: Intel SCU Linux support <[email protected]>
88688860
M: Artur Paszkiewicz <[email protected]>
88698861
88708862
S: Supported

drivers/message/fusion/lsi/mpi_cnfg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313
* define.
314314
* Added BIOS Page 4 structure.
315315
* Added MPI_RAID_PHYS_DISK1_PATH_MAX define for RAID
316-
* Physcial Disk Page 1.
316+
* Physical Disk Page 1.
317317
* 01-15-07 01.05.17 Added additional bit defines for ExtFlags field of
318318
* Manufacturing Page 4.
319319
* Added Solid State Drives Supported bit to IOC Page 6

drivers/message/fusion/lsi/mpi_history.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ mpi_cnfg.h
513513
* define.
514514
* Added BIOS Page 4 structure.
515515
* Added MPI_RAID_PHYS_DISK1_PATH_MAX define for RAID
516-
* Physcial Disk Page 1.
516+
* Physical Disk Page 1.
517517
* 01-15-07 01.05.17 Added additional bit defines for ExtFlags field of
518518
* Manufacturing Page 4.
519519
* Added Solid State Drives Supported bit to IOC Page 6

drivers/s390/scsi/zfcp_fc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ void zfcp_fc_eval_fcp_rsp(struct fcp_resp_with_ext *fcp_rsp,
275275
u32 sense_len, resid;
276276
u8 rsp_flags;
277277

278-
set_msg_byte(scsi, COMMAND_COMPLETE);
279278
scsi->result |= fcp_rsp->resp.fr_status;
280279

281280
rsp_flags = fcp_rsp->resp.fr_flags;

0 commit comments

Comments
 (0)