Skip to content

Commit 746fc76

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, qla2xx, target, lpfc, smartpqi, mpi3mr). The main driver change that might cause issues on down the road is the conversion of some of our oldest surviving drivers to the DMA API (should only affect m68k). The only major core change is the rework of async resume; the rest are either completely trivial or for updating deprecated APIs" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (195 commits) scsi: target: Remove XDWRITEREAD emulated support scsi: megaraid: Remove the static variable initialisation scsi: ch: Do not initialise statics to 0 scsi: ufs: core: Fix spelling mistake "Cannnot" -> "Cannot" scsi: target: iscsi: Do not require target authentication scsi: target: iscsi: Allow AuthMethod=None scsi: target: iscsi: Support base64 in CHAP scsi: target: iscsi: Add support for extended CDB AHS scsi: ufs: dt-bindings: Add SC8280XP binding scsi: target: iscsi: Fix clang -Wformat warnings scsi: ufs: core: Read device property for ref clock scsi: libsas: Resume SAS host for phy reset or enable via sysfs scsi: hisi_sas: Modify v3 HW SATA completion error processing scsi: hisi_sas: Relocate DMA unmap of SMP task scsi: hisi_sas: Remove unnecessary variable to hold DMA map elements scsi: hisi_sas: Call hisi_sas_slave_configure() from slave_configure_v3_hw() scsi: mpi3mr: Delete a stray tab scsi: mpi3mr: Unlock on error path scsi: mpi3mr: Reduce VD queue depth on detecting throttling scsi: mpi3mr: Resource Based Metering ...
2 parents 328141e + 8fcdc23 commit 746fc76

File tree

146 files changed

+4429
-7663
lines changed

Some content is hidden

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

146 files changed

+4429
-7663
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- qcom,msm8994-ufshc
2727
- qcom,msm8996-ufshc
2828
- qcom,msm8998-ufshc
29+
- qcom,sc8280xp-ufshc
2930
- qcom,sdm845-ufshc
3031
- qcom,sm6350-ufshc
3132
- qcom,sm8150-ufshc
@@ -98,6 +99,7 @@ allOf:
9899
contains:
99100
enum:
100101
- qcom,msm8998-ufshc
102+
- qcom,sc8280xp-ufshc
101103
- qcom,sm8250-ufshc
102104
- qcom,sm8350-ufshc
103105
- qcom,sm8450-ufshc
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ufs/renesas,ufs.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas R-Car UFS Host Controller
8+
9+
maintainers:
10+
- Yoshihiro Shimoda <[email protected]>
11+
12+
allOf:
13+
- $ref: ufs-common.yaml
14+
15+
properties:
16+
compatible:
17+
const: renesas,r8a779f0-ufs
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
maxItems: 2
24+
25+
clock-names:
26+
items:
27+
- const: fck
28+
- const: ref_clk
29+
30+
power-domains:
31+
maxItems: 1
32+
33+
resets:
34+
maxItems: 1
35+
36+
required:
37+
- compatible
38+
- reg
39+
- clocks
40+
- clock-names
41+
- power-domains
42+
- resets
43+
44+
unevaluatedProperties: false
45+
46+
examples:
47+
- |
48+
#include <dt-bindings/clock/r8a779f0-cpg-mssr.h>
49+
#include <dt-bindings/interrupt-controller/arm-gic.h>
50+
#include <dt-bindings/power/r8a779f0-sysc.h>
51+
52+
ufs: ufs@e686000 {
53+
compatible = "renesas,r8a779f0-ufs";
54+
reg = <0xe6860000 0x100>;
55+
interrupts = <GIC_SPI 235 IRQ_TYPE_LEVEL_HIGH>;
56+
clocks = <&cpg CPG_MOD 1514>, <&ufs30_clk>;
57+
clock-names = "fck", "ref_clk";
58+
freq-table-hz = <200000000 200000000>, <38400000 38400000>;
59+
power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;
60+
resets = <&cpg 1514>;
61+
};

Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- samsung,exynos7-ufs
2222
- samsung,exynosautov9-ufs
2323
- samsung,exynosautov9-ufs-vh
24+
- tesla,fsd-ufs
2425

2526
reg:
2627
items:

Documentation/scsi/ufs.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Universal Flash Storage
1717
3.2 UTP Transfer requests
1818
3.3 UFS error handling
1919
3.4 SCSI Error handling
20+
4. BSG Support
21+
5. UFS Reference Clock Frequency configuration
2022
2123
2224
1. Overview
@@ -193,3 +195,16 @@ UFS specifications can be found at:
193195

194196
- UFS - http://www.jedec.org/sites/default/files/docs/JESD220.pdf
195197
- UFSHCI - http://www.jedec.org/sites/default/files/docs/JESD223.pdf
198+
199+
5. UFS Reference Clock Frequency configuration
200+
==============================================
201+
202+
Devicetree can define a clock named "ref_clk" under the UFS controller node
203+
to specify the intended reference clock frequency for the UFS storage
204+
parts. ACPI-based system can specify the frequency using ACPI
205+
Device-Specific Data property named "ref-clk-freq". In both ways the value
206+
is interpreted as frequency in Hz and must match one of the values given in
207+
the UFS specification. UFS subsystem will attempt to read the value when
208+
executing common controller initialization. If the value is available, UFS
209+
subsytem will ensure the bRefClkFreq attribute of the UFS storage device is
210+
set accordingly and will modify it if there is a mismatch.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Code Seq# Include File Comments
120120
'C' 01-2F linux/capi.h conflict!
121121
'C' F0-FF drivers/net/wan/cosa.h conflict!
122122
'D' all arch/s390/include/asm/dasd.h
123-
'D' 40-5F drivers/scsi/dpt/dtpi_ioctl.h
123+
'D' 40-5F drivers/scsi/dpt/dtpi_ioctl.h Dead since 2022
124124
'D' 05 drivers/scsi/pmcraid.h
125125
'E' all linux/input.h conflict!
126126
'E' 00-0F xen/evtchn.h conflict!

MAINTAINERS

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5511,7 +5511,7 @@ W: http://www.chelsio.com
55115511
F: drivers/net/ethernet/chelsio/cxgb3/
55125512

55135513
CXGB3 ISCSI DRIVER (CXGB3I)
5514-
M: Karen Xie <kxie@chelsio.com>
5514+
M: Varun Prakash <varun@chelsio.com>
55155515
55165516
S: Supported
55175517
W: http://www.chelsio.com
@@ -5543,7 +5543,7 @@ W: http://www.chelsio.com
55435543
F: drivers/net/ethernet/chelsio/cxgb4/
55445544

55455545
CXGB4 ISCSI DRIVER (CXGB4I)
5546-
M: Karen Xie <kxie@chelsio.com>
5546+
M: Varun Prakash <varun@chelsio.com>
55475547
55485548
S: Supported
55495549
W: http://www.chelsio.com
@@ -6275,14 +6275,6 @@ F: Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-drive
62756275
F: drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
62766276
F: drivers/net/ethernet/freescale/dpaa2/dpsw*
62776277

6278-
DPT_I2O SCSI RAID DRIVER
6279-
M: Adaptec OEM Raid Solutions <[email protected]>
6280-
6281-
S: Maintained
6282-
W: http://www.adaptec.com/
6283-
F: drivers/scsi/dpt*
6284-
F: drivers/scsi/dpt/
6285-
62866278
DRBD DRIVER
62876279
M: Philipp Reisner <[email protected]>
62886280
M: Lars Ellenberg <[email protected]>
@@ -20811,6 +20803,13 @@ L: [email protected] (moderated for non-subscribers)
2081120803
S: Maintained
2081220804
F: drivers/ufs/host/ufs-mediatek*
2081320805

20806+
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER RENESAS HOOKS
20807+
M: Yoshihiro Shimoda <[email protected]>
20808+
20809+
20810+
S: Maintained
20811+
F: drivers/ufs/host/ufs-renesas.c
20812+
2081420813
UNSORTED BLOCK IMAGES (UBI)
2081520814
M: Richard Weinberger <[email protected]>
2081620815

block/bsg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static void bsg_device_release(struct device *dev)
169169
{
170170
struct bsg_device *bd = container_of(dev, struct bsg_device, device);
171171

172-
ida_simple_remove(&bsg_minor_ida, MINOR(bd->device.devt));
172+
ida_free(&bsg_minor_ida, MINOR(bd->device.devt));
173173
kfree(bd);
174174
}
175175

@@ -196,7 +196,7 @@ struct bsg_device *bsg_register_queue(struct request_queue *q,
196196
bd->queue = q;
197197
bd->sg_io_fn = sg_io_fn;
198198

199-
ret = ida_simple_get(&bsg_minor_ida, 0, BSG_MAX_DEVS, GFP_KERNEL);
199+
ret = ida_alloc_max(&bsg_minor_ida, BSG_MAX_DEVS - 1, GFP_KERNEL);
200200
if (ret < 0) {
201201
if (ret == -ENOSPC)
202202
dev_err(parent, "bsg: too many bsg devices\n");

drivers/infiniband/ulp/iser/iscsi_iser.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ static void iscsi_iser_session_destroy(struct iscsi_cls_session *cls_session)
568568
struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);
569569

570570
iscsi_session_teardown(cls_session);
571-
iscsi_host_remove(shost);
571+
iscsi_host_remove(shost, false);
572572
iscsi_host_free(shost);
573573
}
574574

@@ -685,7 +685,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,
685685
return cls_session;
686686

687687
remove_host:
688-
iscsi_host_remove(shost);
688+
iscsi_host_remove(shost, false);
689689
free_host:
690690
iscsi_host_free(shost);
691691
return NULL;

drivers/message/fusion/mptspi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static u8 mptspiInternalCtx = MPT_MAX_PROTOCOL_DRIVERS; /* Used only for interna
101101
* @target: per target private data
102102
* @sdev: SCSI device
103103
*
104-
* Update the target negotiation parameters based on the the Inquiry
104+
* Update the target negotiation parameters based on the Inquiry
105105
* data, adapter capabilities, and NVRAM settings.
106106
**/
107107
static void

drivers/s390/scsi/zfcp_diag.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
* zfcp device driver
44
*
5-
* Definitions for handling diagnostics in the the zfcp device driver.
5+
* Definitions for handling diagnostics in the zfcp device driver.
66
*
77
* Copyright IBM Corp. 2018, 2020
88
*/

0 commit comments

Comments
 (0)