Skip to content

Commit a85d6ff

Browse files
torvaldstorvalds
committed
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley: "Usual driver updates (ufs, lpfc, fnic, target, mpi3mr). The substantive core changes are adding a 'serial' sysfs attribute and getting sd to support > PAGE_SIZE sectors" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (98 commits) scsi: target: Don't validate ignored fields in PROUT PREEMPT scsi: qla2xxx: Use nr_cpu_ids instead of NR_CPUS for qp_cpu_map allocation scsi: ufs: core: Disable timestamp for Kioxia THGJFJT0E25BAIP scsi: mpi3mr: Fix typo scsi: sd: fix missing put_disk() when device_add(&disk_dev) fails scsi: libsas: Delete unused to_dom_device() and to_dev_attr() scsi: storvsc: Handle PERSISTENT_RESERVE_IN truncation for Hyper-V vFC scsi: iscsi_tcp: Remove unneeded selections of CRYPTO and CRYPTO_MD5 scsi: lpfc: Update lpfc version to 15.0.0.0 scsi: lpfc: Add PCI ID support for LPe42100 series adapters scsi: lpfc: Introduce 128G link speed selection and support scsi: lpfc: Check ASIC_ID register to aid diagnostics during failed fw updates scsi: lpfc: Update construction of SGL when XPSGL is enabled scsi: lpfc: Remove deprecated PBDE feature scsi: lpfc: Add REG_VFI mailbox cmd error handling scsi: lpfc: Log MCQE contents for mbox commands with no context scsi: lpfc: Select mailbox rq_create cmd version based on SLI4 if_type scsi: lpfc: Break out of IRQ affinity assignment when mask reaches nr_cpu_ids scsi: ufs: core: Make the header files self-contained scsi: ufs: core: Remove an include directive from ufshcd-crypto.h ...
2 parents 6e28694 + 070ec6f commit a85d6ff

101 files changed

Lines changed: 4075 additions & 821 deletions

File tree

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-driver-ufs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,3 +1768,26 @@ Description:
17681768
==================== ===========================
17691769

17701770
The attribute is read only.
1771+
1772+
What: /sys/bus/platform/drivers/ufshcd/*/dme_qos_notification
1773+
What: /sys/bus/platform/devices/*.ufs/dme_qos_notification
1774+
Date: March 2026
1775+
Contact: Can Guo <can.guo@oss.qualcomm.com>
1776+
Description:
1777+
This attribute reports and clears pending DME (Device Management
1778+
Entity) Quality of Service (QoS) notifications. This attribute
1779+
is a bitfield with the following bit assignments:
1780+
1781+
Bit Description
1782+
=== ======================================
1783+
0 DME QoS Monitor has been reset by host
1784+
1 QoS from TX is detected
1785+
2 QoS from RX is detected
1786+
3 QoS from PA_INIT is detected
1787+
1788+
Reading this attribute returns the pending DME QoS notification
1789+
bits. Writing '0' to this attribute clears pending DME QoS
1790+
notification bits. Writing any non-zero value is invalid and
1791+
will be rejected.
1792+
1793+
The attribute is read/write.

‎Documentation/devicetree/bindings/ufs/qcom,sc7180-ufshc.yaml‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ select:
1515
compatible:
1616
contains:
1717
enum:
18+
- qcom,milos-ufshc
1819
- qcom,msm8998-ufshc
1920
- qcom,qcs8300-ufshc
2021
- qcom,sa8775p-ufshc
@@ -31,21 +32,28 @@ select:
3132

3233
properties:
3334
compatible:
34-
items:
35-
- enum:
36-
- qcom,msm8998-ufshc
37-
- qcom,qcs8300-ufshc
38-
- qcom,sa8775p-ufshc
39-
- qcom,sc7180-ufshc
40-
- qcom,sc7280-ufshc
41-
- qcom,sc8180x-ufshc
42-
- qcom,sc8280xp-ufshc
43-
- qcom,sm8250-ufshc
44-
- qcom,sm8350-ufshc
45-
- qcom,sm8450-ufshc
46-
- qcom,sm8550-ufshc
47-
- const: qcom,ufshc
48-
- const: jedec,ufs-2.0
35+
oneOf:
36+
- items:
37+
- enum:
38+
- qcom,x1e80100-ufshc
39+
- const: qcom,sm8550-ufshc
40+
- const: qcom,ufshc
41+
- items:
42+
- enum:
43+
- qcom,milos-ufshc
44+
- qcom,msm8998-ufshc
45+
- qcom,qcs8300-ufshc
46+
- qcom,sa8775p-ufshc
47+
- qcom,sc7180-ufshc
48+
- qcom,sc7280-ufshc
49+
- qcom,sc8180x-ufshc
50+
- qcom,sc8280xp-ufshc
51+
- qcom,sm8250-ufshc
52+
- qcom,sm8350-ufshc
53+
- qcom,sm8450-ufshc
54+
- qcom,sm8550-ufshc
55+
- const: qcom,ufshc
56+
- const: jedec,ufs-2.0
4957

5058
reg:
5159
maxItems: 1

‎Documentation/devicetree/bindings/ufs/qcom,sm8650-ufshc.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ select:
1515
compatible:
1616
contains:
1717
enum:
18+
- qcom,eliza-ufshc
1819
- qcom,kaanapali-ufshc
1920
- qcom,sm8650-ufshc
2021
- qcom,sm8750-ufshc
@@ -25,6 +26,7 @@ properties:
2526
compatible:
2627
items:
2728
- enum:
29+
- qcom,eliza-ufshc
2830
- qcom,kaanapali-ufshc
2931
- qcom,sm8650-ufshc
3032
- qcom,sm8750-ufshc
@@ -66,6 +68,18 @@ required:
6668

6769
allOf:
6870
- $ref: qcom,ufs-common.yaml
71+
- if:
72+
properties:
73+
compatible:
74+
contains:
75+
enum:
76+
- qcom,eliza-ufshc
77+
then:
78+
properties:
79+
reg:
80+
minItems: 2
81+
reg-names:
82+
minItems: 2
6983

7084
unevaluatedProperties: false
7185

‎Documentation/devicetree/bindings/ufs/rockchip,rk3576-ufshc.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,15 @@ properties:
4141
maxItems: 1
4242

4343
resets:
44-
maxItems: 4
44+
maxItems: 5
4545

4646
reset-names:
4747
items:
4848
- const: biu
4949
- const: sys
5050
- const: ufs
5151
- const: grf
52+
- const: mphy
5253

5354
reset-gpios:
5455
maxItems: 1
@@ -98,8 +99,8 @@ examples:
9899
interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;
99100
power-domains = <&power RK3576_PD_USB>;
100101
resets = <&cru SRST_A_UFS_BIU>, <&cru SRST_A_UFS_SYS>, <&cru SRST_A_UFS>,
101-
<&cru SRST_P_UFS_GRF>;
102-
reset-names = "biu", "sys", "ufs", "grf";
102+
<&cru SRST_P_UFS_GRF>, <&cru SRST_MPHY_INIT>;
103+
reset-names = "biu", "sys", "ufs", "grf", "mphy";
103104
reset-gpios = <&gpio4 RK_PD0 GPIO_ACTIVE_LOW>;
104105
};
105106
};

‎drivers/infiniband/ulp/srpt/ib_srpt.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3925,6 +3925,7 @@ static const struct target_core_fabric_ops srpt_template = {
39253925
.tfc_wwn_attrs = srpt_wwn_attrs,
39263926
.tfc_tpg_attrib_attrs = srpt_tpg_attrib_attrs,
39273927

3928+
.default_compl_type = TARGET_QUEUE_COMPL,
39283929
.default_submit_type = TARGET_DIRECT_SUBMIT,
39293930
.direct_submit_supp = 1,
39303931
};

‎drivers/scsi/BusLogic.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,8 +1632,8 @@ static bool __init blogic_rdconfig(struct blogic_adapter *adapter)
16321632
/*
16331633
Initialize the Host Adapter Full Model Name from the Model Name.
16341634
*/
1635-
strcpy(adapter->full_model, "BusLogic ");
1636-
strcat(adapter->full_model, adapter->model);
1635+
scnprintf(adapter->full_model, sizeof(adapter->full_model),
1636+
"BusLogic %s", adapter->model);
16371637
/*
16381638
Select an appropriate value for the Tagged Queue Depth either from a
16391639
BusLogic Driver Options specification, or based on whether this Host

‎drivers/scsi/Kconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ config ISCSI_TCP
304304
tristate "iSCSI Initiator over TCP/IP"
305305
depends on SCSI && INET
306306
select CRC32
307-
select CRYPTO
308-
select CRYPTO_MD5
309307
select SCSI_ISCSI_ATTRS
310308
help
311309
The iSCSI Driver provides a host with the ability to access storage
@@ -1151,6 +1149,7 @@ config SCSI_LPFC
11511149
depends on NVME_TARGET_FC || NVME_TARGET_FC=n
11521150
depends on NVME_FC || NVME_FC=n
11531151
select CRC_T10DIF
1152+
select CRC32
11541153
select IRQ_POLL
11551154
help
11561155
This lpfc driver supports the Emulex LightPulse

‎drivers/scsi/aic7xxx/aicasm/aicasm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ extern int src_mode;
8282
extern int dst_mode;
8383
struct symbol;
8484

85-
void stop(const char *errstring, int err_code);
85+
void __attribute__((noreturn)) stop(const char *errstring, int err_code);
8686
void include_file(char *file_name, include_type type);
8787
void expand_macro(struct symbol *macro_symbol);
8888
struct instruction *seq_alloc(void);

‎drivers/scsi/aic7xxx/aicasm/aicasm_gram.y‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ conditional:
11041104
last_scope = TAILQ_LAST(&scope_context->inner_scope,
11051105
scope_tailq);
11061106
if (last_scope == NULL
1107-
|| last_scope->type == T_ELSE) {
1107+
|| last_scope->type == (int)T_ELSE) {
11081108

11091109
stop("'else if' without leading 'if'", EX_DATAERR);
11101110
/* NOTREACHED */

‎drivers/scsi/aic7xxx/aicasm/aicasm_scan.l‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ nop { return T_NOP; }
389389
char c;
390390

391391
yptr = yytext;
392-
while (c = *yptr++) {
392+
while ((c = *yptr++)) {
393393
/*
394394
* Strip carriage returns.
395395
*/

0 commit comments

Comments
 (0)