Skip to content

Commit 8762069

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: "Updates to the usual drivers (ufs, lpfc, qla2xxx, libsas). The major core change is a rework to remove the two helpers around scsi_execute_cmd and use it as the only submission interface along with other minor fixes and updates" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (142 commits) scsi: ufs: core: Fix an error handling path in ufshcd_read_desc_param() scsi: ufs: core: Fix device management cmd timeout flow scsi: aic94xx: Add missing check for dma_map_single() scsi: smartpqi: Replace one-element array with flexible-array member scsi: mpt3sas: Fix a memory leak scsi: qla2xxx: Remove the unused variable wwn scsi: ufs: core: Fix kernel-doc syntax scsi: ufs: core: Add hibernation callbacks scsi: snic: Fix memory leak with using debugfs_lookup() scsi: ufs: core: Limit DMA alignment check scsi: Documentation: Correct spelling scsi: Documentation: Correct spelling scsi: target: Documentation: Correct spelling scsi: aacraid: Allocate cmd_priv with scsicmd scsi: ufs: qcom: dt-bindings: Add SM8550 compatible string scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW version major 5 scsi: ufs: qcom: fix platform_msi_domain_free_irqs() reference scsi: ufs: core: Enable DMA clustering scsi: ufs: exynos: Fix the maximum segment size scsi: ufs: exynos: Fix DMA alignment for PAGE_SIZE != 4096 ...
2 parents 6861eaf + 833f7d4 commit 8762069

File tree

111 files changed

+4236
-1849
lines changed

Some content is hidden

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

111 files changed

+4236
-1849
lines changed

Documentation/devicetree/bindings/ufs/qcom,ufs.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ properties:
3333
- qcom,sm8250-ufshc
3434
- qcom,sm8350-ufshc
3535
- qcom,sm8450-ufshc
36+
- qcom,sm8550-ufshc
3637
- const: qcom,ufshc
3738
- const: jedec,ufs-2.0
3839

@@ -44,6 +45,8 @@ properties:
4445
minItems: 8
4546
maxItems: 11
4647

48+
dma-coherent: true
49+
4750
interconnects:
4851
minItems: 2
4952
maxItems: 2
@@ -103,6 +106,7 @@ allOf:
103106
- qcom,sm8250-ufshc
104107
- qcom,sm8350-ufshc
105108
- qcom,sm8450-ufshc
109+
- qcom,sm8550-ufshc
106110
then:
107111
properties:
108112
clocks:
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ufs/sprd,ums9620-ufs.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Unisoc Universal Flash Storage (UFS) Controller
8+
9+
maintainers:
10+
- Zhe Wang <[email protected]>
11+
12+
allOf:
13+
- $ref: ufs-common.yaml
14+
15+
properties:
16+
compatible:
17+
const: sprd,ums9620-ufs
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
maxItems: 3
24+
25+
clock-names:
26+
items:
27+
- const: controller_eb
28+
- const: cfg_eb
29+
- const: core
30+
31+
resets:
32+
maxItems: 2
33+
34+
reset-names:
35+
items:
36+
- const: controller
37+
- const: device
38+
39+
vdd-mphy-supply:
40+
description:
41+
Phandle to vdd-mphy supply regulator node.
42+
43+
sprd,ufs-anlg-syscon:
44+
$ref: /schemas/types.yaml#/definitions/phandle
45+
description: phandle of syscon used to control ufs analog regs.
46+
47+
sprd,aon-apb-syscon:
48+
$ref: /schemas/types.yaml#/definitions/phandle
49+
description: phandle of syscon used to control always-on regs.
50+
51+
required:
52+
- compatible
53+
- reg
54+
- clocks
55+
- clock-names
56+
- resets
57+
- reset-names
58+
59+
unevaluatedProperties: false
60+
61+
examples:
62+
- |
63+
#include <dt-bindings/interrupt-controller/arm-gic.h>
64+
65+
ufs: ufs@22000000 {
66+
compatible = "sprd,ums9620-ufs";
67+
reg = <0x22000000 0x3000>;
68+
interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
69+
vcc-supply = <&vddemmccore>;
70+
vdd-mphy-supply = <&vddufs1v2>;
71+
clocks = <&apahb_gate 5>, <&apahb_gate 22>, <&aonapb_clk 52>;
72+
clock-names = "controller_eb", "cfg_eb", "core";
73+
assigned-clocks = <&aonapb_clk 52>;
74+
assigned-clock-parents = <&g5l_pll 12>;
75+
resets = <&apahb_gate 4>, <&aonapb_gate 69>;
76+
reset-names = "controller", "device";
77+
sprd,ufs-anlg-syscon = <&anlg_phy_g12_regs>;
78+
sprd,aon-apb-syscon = <&aon_apb_regs>;
79+
};

Documentation/scsi/ChangeLog.lpfc

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ Changes from 20050201 to 20050208
174174
lpfc_sli_chipset_init static.
175175
* Cleaned up references to list_head->next field in the driver.
176176
* Replaced lpfc_discq_post_event with lpfc_workq_post_event.
177-
* Implmented Christoph Hellwig's review from 2/5: Check for return
177+
* Implemented Christoph Hellwig's review from 2/5: Check for return
178178
values of kmalloc.
179179
* Integrated Christoph Hellwig's patch from 1/30: Protecting
180180
scan_tmo and friends in !FC_TRANSPORT_PATCHES_V2 &&
181181
!USE_SCAN_TARGET.
182182
* Integrated Christoph Hellwig's patch from 1/30: Some fixes in
183183
the evt handling area.
184184
* Integrated Christoph Hellwig's patch from 1/30: Remove usage of
185-
intr_inited variable. The interrupt initilization from OS side
185+
intr_inited variable. The interrupt initialization from OS side
186186
now happens in lpfc_probe_one().
187187
* Integrated Christoph Hellwig's patch from 1/30: remove shim
188188
lpfc_alloc_transport_attr - remove shim lpfc_alloc_shost_attrs -
@@ -389,7 +389,7 @@ Changes from 20041220 to 20041229
389389
moved to kthread. kthread_stop() is not able to wake up thread
390390
waiting on a semaphore and "modprobe -r lpfc" is not always
391391
(most of the times) able to complete. Fix is in not using
392-
semaphore for the interruptable sleep.
392+
semaphore for the interruptible sleep.
393393
* Small Makefile cleanup - Remove remnants of 2.4 vs. 2.6
394394
determination.
395395

@@ -439,8 +439,8 @@ Changes from 20041207 to 20041213
439439
hardware actually found).
440440
* Integrate Christoph Hellwig's patch for 8.0.14: Add missing
441441
__iomem annotations, remove broken casts, mark functions static.
442-
Only major changes is chaning of some offsets from word-based to
443-
byte-based so we cans simply do void pointer arithmetics (gcc
442+
Only major changes is changing of some offsets from word-based to
443+
byte-based so we can simply do void pointer arithmetic (gcc
444444
extension) instead of casting to uint32_t.
445445
* Integrate Christoph Hellwig's patch for 8.0.14: flag is always
446446
LPFC_SLI_ABORT_IMED, aka 0 - remove dead code.
@@ -515,7 +515,7 @@ Changes from 20041018 to 20041123
515515
a result of removing from the txcmpl list item which was already
516516
removed (100100 is a LIST_POISON1 value from the next pointer
517517
and 8 is an offset of the "prev") Driver runs out of iotags and
518-
does not handle that case well. The root of the proble is in the
518+
does not handle that case well. The root of the problem is in the
519519
initialization code in lpfc_sli.c
520520
* Changes to work with proposed linux kernel patch to support
521521
hotplug.
@@ -570,8 +570,8 @@ Changes from 20041018 to 20041123
570570
associated I/Os to complete before returning.
571571
* Fix memset byte count in lpfc_hba_init so that
572572
LP1050 would initialize correctly.
573-
* Backround nodev_timeout processing to DPC This enables us to
574-
unblock (stop dev_loss_tmo) when appopriate.
573+
* Background nodev_timeout processing to DPC. This enables us to
574+
unblock (stop dev_loss_tmo) when appropriate.
575575
* Fix array discovery with multiple luns. The max_luns was 0 at
576576
the time the host structure was initialized. lpfc_cfg_params
577577
then set the max_luns to the correct value afterwards.
@@ -1012,7 +1012,7 @@ Changes from 20040614 to 20040709
10121012
LINK_[UP|DOWN] and RSCN events.
10131013
* Get rid of delay_iodone timer.
10141014
* Remove qfull timers and qfull logic.
1015-
* Convert mbox_tmo, nlp_xri_tmo to 1 argment clock handler
1015+
* Convert mbox_tmo, nlp_xri_tmo to 1 argument clock handler
10161016
* Removed duplicate extern defs of the bind variables.
10171017
* Streamline usage of the defines CLASS2 and CLASS3, removing
10181018
un-necessary checks on config[LPFC_CFG_FCP_CLASS].
@@ -1369,7 +1369,7 @@ Changes from 20040416 to 20040426
13691369
* Removed lpfc_max_target from lpfc_linux_attach
13701370
* Replace references to lpfcDRVR.pHba[] with lpfc_get_phba_by_inst()
13711371
* Change lpfc_param to lpfc-param
1372-
* Partially removed 32 HBA restriction within driver. Incorported
1372+
* Partially removed 32 HBA restriction within driver. Incorporated
13731373
lpfc_instcnt, lpfc_instance[], and pHba[] into lpfcDRVR
13741374
structure Added routines lpfc_get_phba_by_inst()
13751375
lpfc_get_inst_by_phba() lpfc_check_valid_phba()
@@ -1535,7 +1535,7 @@ Changes from 20040326 to 20040402
15351535
* Use Linux list macros for DMABUF_t
15361536
* Break up ioctls into 3 sections, dfc, util, hbaapi
15371537
rearranged code so this could be easily separated into a
1538-
differnet module later All 3 are currently turned on by
1538+
different module later. All 3 are currently turned on by
15391539
defines in lpfc_ioctl.c LPFC_DFC_IOCTL, LPFC_UTIL_IOCTL,
15401540
LPFC_HBAAPI_IOCTL
15411541
* Misc cleanup: some goto's; add comments; clarify function
@@ -1562,15 +1562,15 @@ Changes from 20040326 to 20040402
15621562
* Remove unused log message.
15631563
* Collapse elx_crtn.h and prod_crtn.h into lpfc_crtn.h
15641564
* Ifdef Scheduler specific routines
1565-
* Removed following ununsed ioclt's: ELX_READ_IOCB
1565+
* Removed following unused ioctl's: ELX_READ_IOCB
15661566
ELX_READ_MEMSEG ELX_READ_BINFO ELX_READ_EINVAL ELX_READ_LHBA
15671567
ELX_READ_LXHBA ELX_SET ELX_DBG LPFC_TRACE
15681568
* Removed variable fc_dbg_flg
15691569
* Fixed a bug where HBA_Q_DEPTH was set incorrectly for
15701570
3-digit HBAs. Also changed can_queue so midlayer will only
15711571
send (HBA_Q_DEPTH - 10) cmds.
15721572
* Clean up code in the error path, check condition. Remove
1573-
ununsed sense-related fields in lun structure.
1573+
unused sense-related fields in lun structure.
15741574
* Added code for safety pools for following objects: mbuf/bpl,
15751575
mbox, iocb, ndlp, bind
15761576
* Wrapped '#include <elx_sched.h>' in '#ifdef USE_SCHEDULER'.
@@ -1592,7 +1592,7 @@ Changes from 20040326 to 20040402
15921592
ELX_READ_HBA ELX_INSTANCE ELX_LIP. Also introduced
15931593
attribute "set" to be used in conjunction with the above
15941594
attributes.
1595-
* Removed DLINK, enque and deque declarations now that clock
1595+
* Removed DLINK, enqueue and dequeue declarations now that clock
15961596
doesn't use them anymore
15971597
* Separated install rule so that BUILD_IPFC has to be set when
15981598
make is called in order for the install rule to attempt to
@@ -1662,7 +1662,7 @@ Changes from 20040326 to 20040402
16621662
* Create utility clock function elx_start_timer() and
16631663
elx_stop_timer(). All timeout routines now use these common
16641664
routines.
1665-
* Minor formating changes fix up comments
1665+
* Minor formatting changes fix up comments
16661666
* Minor formatting changes get rid of failover defines for
16671667
syntax checking
16681668
* Minor formatting changes remove ISCSI defines.
@@ -1676,7 +1676,7 @@ Changes from 20040326 to 20040402
16761676
will not exist otherwise.
16771677
* Removed unused malloc counters from lpfcLINUXfcp.c.
16781678
* Remove some unnecessary #includes in lpfcLINUXfcp.c
1679-
* Remove unncessary #includes in elxLINUXfcp.c
1679+
* Remove unnecessary #includes in elxLINUXfcp.c
16801680
* Minor formatting cleanups in Makefile to avoid some
16811681
linewrapping.
16821682
* Removed unused elx_mem_pool data structure.
@@ -1753,7 +1753,7 @@ Changes from 20040319 to 20040326
17531753
elx_str_atox).
17541754
* Replaced DLINK_t and SLINK_t by standard Linux list_head
17551755
* Removed deque macro
1756-
* Replaced ELX_DLINK_t ans ELX_SLINK_t by Linux struct list_head
1756+
* Replaced ELX_DLINK_t and ELX_SLINK_t by Linux struct list_head
17571757
(except for clock)
17581758
* Removed following functions from code: linux_kmalloc linux_kfree
17591759
elx_alloc_bigbuf elx_free_bigbuf
@@ -1801,7 +1801,7 @@ Changes from 20040312 to 20040319
18011801
* Correct Iocbq completion routine for 2.6 kernel case
18021802
* Change void *pOSCmd to Scsi_Smnd *pCmd
18031803
* Change void *pOScmd to struct sk_buff *pCmd
1804-
* Remove data directon code.
1804+
* Remove data direction code.
18051805
* Removed memory pool for buf/bpl buffers and use kmalloc/kfree
18061806
pci_pool_alloc/free directly.
18071807
* Move PPC check for DMA address 0 in scatter-gather list, into

Documentation/scsi/ChangeLog.megaraid

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Older Version : 2.20.4.8 (scsi module), 2.20.2.6 (cmm module)
2222
Customer reported "garbage in file on x86_64 platform".
2323
Root Cause: the driver registered controllers as 64-bit DMA capable
2424
for those which are not support it.
25-
Fix: Made change in the function inserting identification machanism
25+
Fix: Made change in the function inserting identification mechanism
2626
identifying 64-bit DMA capable controllers.
2727

2828
> -----Original Message-----
@@ -82,9 +82,9 @@ Older Version : 2.20.4.8 (scsi module), 2.20.2.6 (cmm module)
8282
Fix: MegaRAID F/W has fixed the problem and being process of release,
8383
soon. Meanwhile, driver will filter out the request.
8484

85-
3. One of member in the data structure of the driver leads unaligne
85+
3. One member in the data structure of the driver leads to unaligned
8686
issue on 64-bit platform.
87-
Customer reporeted "kernel unaligned access addrss" issue when
87+
Customer reported "kernel unaligned access address" issue when
8888
application communicates with MegaRAID HBA driver.
8989
Root Cause: in uioc_t structure, one of member had misaligned and it
9090
led system to display the error message.
@@ -441,7 +441,7 @@ i. When copying the mailbox packets, copy only first 14 bytes (for 32-bit
441441
avoid getting the stale values for busy bit. We want to set the busy
442442
bit just before issuing command to the FW.
443443

444-
ii. In the reset handling, if the reseted command is not owned by the
444+
ii. In the reset handling, if the reset command is not owned by the
445445
driver, do not (wrongly) print information for the "attached" driver
446446
packet.
447447

Documentation/scsi/ChangeLog.megaraid_sas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ i. bios_param entry added in scsi_host_template that returns disk geometry
517517

518518
1. Added new memory management module to support the IOCTL memory allocation. For IOCTL we try to allocate from the memory pool created during driver initialization. If mem pool is empty then we allocate at run time.
519519
2. Added check in megasas_queue_command and dpc/isr routine to see if we have already declared adapter dead
520-
(hw_crit_error=1). If hw_crit_error==1, now we donot accept any processing of pending cmds/accept any cmd from OS
520+
(hw_crit_error=1). If hw_crit_error==1, now we do not accept any processing of pending cmds/accept any cmd from OS
521521

522522
1 Release Date : Mon Oct 02 11:21:32 PDT 2006 - Sumant Patro <[email protected]>
523523
2 Current Version : 00.00.03.05
@@ -562,7 +562,7 @@ vii. Added print : FW now in Ready State during initialization
562562
2 Current Version : 00.00.03.02
563563
3 Older Version : 00.00.03.01
564564

565-
i. Added FW tranistion state for Hotplug scenario
565+
i. Added FW transition state for Hotplug scenario
566566

567567
1 Release Date : Sun May 14 22:49:52 PDT 2006 - Sumant Patro <[email protected]>
568568
2 Current Version : 00.00.03.01

Documentation/scsi/ChangeLog.ncr53c8xx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Sat Nov 21 18:00 1998 Gerard Roudier ([email protected])
230230
- Still a buglet in the tags initial settings that needed to be fixed.
231231
It was not possible to disable TGQ at system startup for devices
232232
that claim TGQ support. The driver used at least 2 for the queue
233-
depth but did'nt keep track of user settings for tags depth lower
233+
depth but didn't keep track of user settings for tags depth lower
234234
than 2.
235235

236236
Wed Nov 11 10:00 1998 Gerard Roudier ([email protected])
@@ -270,7 +270,7 @@ Sun Oct 4 14:00 1998 Gerard Roudier ([email protected])
270270
were due to a SCSI selection problem triggered by a clearly
271271
documented feature that in fact seems not to work: (53C8XX chips
272272
are claimed by the manuals to be able to execute SCSI scripts just
273-
after abitration while the SCSI core is performing SCSI selection).
273+
after arbitration while the SCSI core is performing SCSI selection).
274274
This optimization is broken and has been removed.
275275
- Some broken scsi devices are confused when a negotiation is started
276276
on a LUN that does not correspond to a real device. According to
@@ -347,7 +347,7 @@ Tue Jun 4 23:00 1998 Gerard Roudier ([email protected])
347347
- Code cleanup and simplification:
348348
Remove kernel 1.2.X and 1.3.X support.
349349
Remove the _old_ target capabilities table.
350-
Remove the error recovery code that have'nt been really useful.
350+
Remove the error recovery code that hasn't been really useful.
351351
Use a single alignment boundary (CACHE_LINE_SIZE) for data
352352
structures.
353353
- Several aggressive SCRIPTS optimizations and changes:
@@ -367,8 +367,8 @@ Wed May 13 20:00 1998 Gerard Roudier ([email protected])
367367
- Some simplification for 64 bit arch done ccb address testing.
368368
- Add a check of the MSG_OUT phase after Selection with ATN.
369369
- The new tagged queue stuff seems ok, so some informationnal
370-
message have been conditionned by verbose >= 3.
371-
- Donnot reset if a SBMC interrupt reports the same bus mode.
370+
message have been conditioned by verbose >= 3.
371+
- Do not reset if a SBMC interrupt reports the same bus mode.
372372
- Print out the whole driver set-up. Some options were missing and
373373
the print statement was misplaced for modules.
374374
- Ignore a SCSI parity interrupt if the chip is not connected to
@@ -392,7 +392,7 @@ Sat Apr 25 21:00 1998 Gerard Roudier ([email protected])
392392
context on phase mismatch.
393393
- The above allows now to use the on-chip RAM without requiring
394394
to get access to the on-chip RAM from the C code. This makes
395-
on-chip RAM useable for linux-1.2.13 and for Linux-Alpha for
395+
on-chip RAM usable for linux-1.2.13 and for Linux-Alpha for
396396
instance.
397397
- Some simplifications and cleanups in the SCRIPTS and C code.
398398
- Buglet fixed in parity error recovery SCRIPTS (never tested).
@@ -433,7 +433,7 @@ Sun Mar 29 12:00 1998 Gerard Roudier ([email protected])
433433

434434
Tue Mar 26 23:00 1998 Gerard Roudier ([email protected])
435435
* revision 2.6g
436-
- New done queue. 8 entries by default (6 always useable).
436+
- New done queue. 8 entries by default (6 always usable).
437437
Can be increased if needed.
438438
- Resources management using doubly linked queues.
439439
- New auto-sense and QUEUE FULL handling that does not need to
@@ -464,7 +464,7 @@ Sun Jan 11 22:00 1998 Gerard Roudier ([email protected])
464464
- generalization of the restart of CCB on special condition as
465465
Abort, QUEUE FULL, CHECK CONDITION.
466466
This has been called 'silly scheduler'.
467-
- make all the profiling code conditionned by a config option.
467+
- make all the profiling code conditioned by a config option.
468468
This spare some PCI traffic and C code when this feature is not
469469
needed.
470470
- handle more cleanly the situation where direction is unknown.

0 commit comments

Comments
 (0)