tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'ata-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

Pull ata updates from Niklas Cassel:

- Add DT binding for the Eswin EIC7700 SoC SATA Controller (Yulin Lu)

- Allow 'iommus' property in the Synopsys DWC AHCI SATA controller DT
binding (Rob Herring)

- Replace deprecated strcpy with strscpy in the pata_it821x driver
(Thorsten Blum)

- Add Iomega Clik! PCMCIA ATA/ATAPI Adapter PCMCIA ID to the
pata_pcmcia driver (René Rebe)

- Add ATA_QUIRK_NOLPM quirk for two Silicon Motion SSDs with broken LPM
support (me)

- Add flag WQ_PERCPU to the workqueue in the libata-sff helper library
to explicitly request the use of the per-CPU behavior (Marco
Crivellari)

* tag 'ata-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
ata: libata-core: Disable LPM on Silicon Motion MD619{H,G}XCLDE3TC
ata: pata_pcmcia: Add Iomega Clik! PCMCIA ATA/ATAPI Adapter
ata: libata-sff: add WQ_PERCPU to alloc_workqueue users
dt-bindings: ata: snps,dwc-ahci: Allow 'iommus' property
ata: pata_it821x: Replace deprecated strcpy with strscpy in it821x_display_disk
dt-bindings: ata: eswin: Document for EIC7700 SoC ahci

Linus Torvalds 16460bf9 bc69ed97

+93 -3
+79
Documentation/devicetree/bindings/ata/eswin,eic7700-ahci.yaml
··· 1 + # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/ata/eswin,eic7700-ahci.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: Eswin EIC7700 SoC SATA Controller 8 + 9 + maintainers: 10 + - Yulin Lu <luyulin@eswincomputing.com> 11 + - Huan He <hehuan1@eswincomputing.com> 12 + 13 + description: 14 + AHCI SATA controller embedded into the EIC7700 SoC is based on the DWC AHCI 15 + SATA v5.00a IP core. 16 + 17 + select: 18 + properties: 19 + compatible: 20 + const: eswin,eic7700-ahci 21 + required: 22 + - compatible 23 + 24 + allOf: 25 + - $ref: snps,dwc-ahci-common.yaml# 26 + 27 + properties: 28 + compatible: 29 + items: 30 + - const: eswin,eic7700-ahci 31 + - const: snps,dwc-ahci 32 + 33 + clocks: 34 + minItems: 2 35 + maxItems: 2 36 + 37 + clock-names: 38 + items: 39 + - const: pclk 40 + - const: aclk 41 + 42 + resets: 43 + maxItems: 1 44 + 45 + reset-names: 46 + const: arst 47 + 48 + ports-implemented: 49 + const: 1 50 + 51 + required: 52 + - compatible 53 + - reg 54 + - interrupts 55 + - clocks 56 + - clock-names 57 + - resets 58 + - reset-names 59 + - phys 60 + - phy-names 61 + - ports-implemented 62 + 63 + unevaluatedProperties: false 64 + 65 + examples: 66 + - | 67 + sata@50420000 { 68 + compatible = "eswin,eic7700-ahci", "snps,dwc-ahci"; 69 + reg = <0x50420000 0x10000>; 70 + interrupt-parent = <&plic>; 71 + interrupts = <58>; 72 + clocks = <&clock 171>, <&clock 186>; 73 + clock-names = "pclk", "aclk"; 74 + phys = <&sata_phy>; 75 + phy-names = "sata-phy"; 76 + ports-implemented = <0x1>; 77 + resets = <&reset 96>; 78 + reset-names = "arst"; 79 + };
+4
Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml
··· 33 33 - description: SPEAr1340 AHCI SATA device 34 34 const: snps,spear-ahci 35 35 36 + iommus: 37 + minItems: 1 38 + maxItems: 3 39 + 36 40 patternProperties: 37 41 "^sata-port@[0-9a-e]$": 38 42 $ref: /schemas/ata/snps,dwc-ahci-common.yaml#/$defs/dwc-ahci-port
+4
drivers/ata/libata-core.c
··· 4216 4216 /* Apacer models with LPM issues */ 4217 4217 { "Apacer AS340*", NULL, ATA_QUIRK_NOLPM }, 4218 4218 4219 + /* Silicon Motion models with LPM issues */ 4220 + { "MD619HXCLDE3TC", "TCVAID", ATA_QUIRK_NOLPM }, 4221 + { "MD619GXCLDE3TC", "TCV35D", ATA_QUIRK_NOLPM }, 4222 + 4219 4223 /* These specific Samsung models/firmware-revs do not handle LPM well */ 4220 4224 { "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_QUIRK_NOLPM }, 4221 4225 { "SAMSUNG SSD PM830 mSATA *", "CXM13D1Q", ATA_QUIRK_NOLPM },
+2 -1
drivers/ata/libata-sff.c
··· 3191 3191 3192 3192 int __init ata_sff_init(void) 3193 3193 { 3194 - ata_sff_wq = alloc_workqueue("ata_sff", WQ_MEM_RECLAIM, WQ_MAX_ACTIVE); 3194 + ata_sff_wq = alloc_workqueue("ata_sff", WQ_MEM_RECLAIM | WQ_PERCPU, 3195 + WQ_MAX_ACTIVE); 3195 3196 if (!ata_sff_wq) 3196 3197 return -ENOMEM; 3197 3198
+3 -2
drivers/ata/pata_it821x.c
··· 75 75 #include <linux/blkdev.h> 76 76 #include <linux/delay.h> 77 77 #include <linux/slab.h> 78 + #include <linux/string.h> 78 79 #include <scsi/scsi_host.h> 79 80 #include <linux/libata.h> 80 81 ··· 633 632 cbl = ""; 634 633 635 634 if (mode) 636 - snprintf(mbuf, 8, "%5s%d", mtype, mode - 1); 635 + snprintf(mbuf, sizeof(mbuf), "%5s%d", mtype, mode - 1); 637 636 else 638 - strcpy(mbuf, "PIO"); 637 + strscpy(mbuf, "PIO"); 639 638 if (buf[52] == 4) 640 639 ata_port_info(ap, "%d: %-6s %-8s %s %s\n", 641 640 n, mbuf, types[buf[52]], id, cbl);
+1
drivers/ata/pata_pcmcia.c
··· 344 344 PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), 345 345 PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), 346 346 PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), 347 + PCMCIA_DEVICE_PROD_ID2("PCMCIA ATA/ATAPI Adapter", 0x888d7b73), 347 348 PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), 348 349 PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), 349 350 PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),