Skip to content

Commit efe19d3

Browse files
committed
Merge tag 'ata-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
Pull ata updates from Damien Le Moal: - Simplify ata_print_version_once() using dev_dbg_once() (Heiner) - Some cleanups of libata-sata code to simplify the sense data fetching code and use BIT() macro for tag bit handling (Niklas) - Fix variable name spelling in the sata_sx4 driver (Colin) - Improve sense data information field handling for passthrough commands (Igor) - Add Rockchip RK3576 SoC compatible to the Designware AHCI DT bindings (Nicolas) - Add a message to indicate if a port is marked as external or not, to help with debugging potential issues with LPM (Niklas) - Convert DT bindings for "ti,dm816-ahci", "apm,xgene-ahci", "cavium,ebt3000-compact-flash", "marvell,orion-sata", and "arasan,cf-spear1340" to DT schema (Rob) - Cleanup and improve the code and related comments for HIPM and DIPM (host initiated and device initiated power managent) handling. In particular, keep DIPM disabled while modifying the allowed LPM states to avoid races with the device initiating power state changes (Niklas) * tag 'ata-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux: ata: libata-eh: Keep DIPM disabled while modifying the allowed LPM states ata: libata-eh: Rename no_dipm variable to be more clear ata: libata-eh: Rename hipm and dipm variables ata: libata-eh: Add ata_eh_set_lpm() WARN_ON_ONCE ata: libata-eh: Update DIPM comments to reflect reality dt-bindings: ata: Convert arasan,cf-spear1340 to DT schema dt-bindings: ata: Convert marvell,orion-sata to DT schema dt-bindings: ata: Convert cavium,ebt3000-compact-flash to DT schema dt-bindings: ata: Convert apm,xgene-ahci to DT schema dt-bindings: ata: Convert st,ahci to DT schema dt-bindings: ata: Convert ti,dm816-ahci to DT schema ata: libata: Print if port is external on boot dt-bindings: ata: rockchip-dwc-ahci: add RK3576 compatible ata: libata-scsi: Do not set the INFORMATION field twice for ATA PT ata: sata_sx4: Fix spelling mistake "parttern" -> "pattern" ata: libata-sata: Use BIT() macro to convert tag to bit field ata: libata-sata: Simplify sense_valid fetching ata: libata-core: Simplify ata_print_version_once
2 parents 76c21d2 + a374cfb commit efe19d3

20 files changed

+455
-295
lines changed

Documentation/devicetree/bindings/ata/ahci-dm816.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

Documentation/devicetree/bindings/ata/ahci-st.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ata/apm,xgene-ahci.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: APM X-Gene 6.0 Gb/s SATA host controller
8+
9+
maintainers:
10+
- Rob Herring <robh@kernel.org>
11+
12+
allOf:
13+
- $ref: ahci-common.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- apm,xgene-ahci
19+
- apm,xgene-ahci-pcie
20+
21+
reg:
22+
minItems: 4
23+
items:
24+
- description: AHCI memory resource
25+
- description: Host controller core
26+
- description: Host controller diagnostic
27+
- description: Host controller AXI
28+
- description: Host controller MUX
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
clocks:
34+
maxItems: 1
35+
36+
required:
37+
- compatible
38+
- clocks
39+
- phys
40+
- phy-names
41+
42+
unevaluatedProperties: false
43+
44+
examples:
45+
- |
46+
sata@1a400000 {
47+
compatible = "apm,xgene-ahci";
48+
reg = <0x1a400000 0x1000>,
49+
<0x1f220000 0x1000>,
50+
<0x1f22d000 0x1000>,
51+
<0x1f22e000 0x1000>,
52+
<0x1f227000 0x1000>;
53+
clocks = <&sataclk 0>;
54+
dma-coherent;
55+
interrupts = <0x0 0x87 0x4>;
56+
phys = <&phy2 0>;
57+
phy-names = "sata-phy";
58+
};

Documentation/devicetree/bindings/ata/apm-xgene.txt

Lines changed: 0 additions & 77 deletions
This file was deleted.
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ata/arasan,cf-spear1340.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Arasan PATA Compact Flash Controller
8+
9+
maintainers:
10+
- Viresh Kumar <viresh.kumar@linaro.org>
11+
12+
properties:
13+
compatible:
14+
const: arasan,cf-spear1340
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
clocks:
23+
maxItems: 1
24+
25+
arasan,broken-udma:
26+
description: UDMA mode is unusable
27+
type: boolean
28+
29+
arasan,broken-mwdma:
30+
description: MWDMA mode is unusable
31+
type: boolean
32+
33+
arasan,broken-pio:
34+
description: PIO mode is unusable
35+
type: boolean
36+
37+
dmas:
38+
maxItems: 1
39+
40+
dma-names:
41+
items:
42+
- const: data
43+
44+
required:
45+
- compatible
46+
- reg
47+
- interrupts
48+
49+
additionalProperties: false
50+
51+
allOf:
52+
- if:
53+
not:
54+
required:
55+
- arasan,broken-udma
56+
- arasan,broken-mwdma
57+
then:
58+
required:
59+
- dmas
60+
- dma-names
61+
62+
examples:
63+
- |
64+
cf@fc000000 {
65+
compatible = "arasan,cf-spear1340";
66+
reg = <0xfc000000 0x1000>;
67+
interrupts = <12>;
68+
dmas = <&dma 23>;
69+
dma-names = "data";
70+
};
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ata/cavium,ebt3000-compact-flash.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cavium Compact Flash
8+
9+
maintainers:
10+
- Rob Herring <robh@kernel.org>
11+
12+
description:
13+
The Cavium Compact Flash device is connected to the Octeon Boot Bus, and is
14+
thus a child of the Boot Bus device. It can read and write industry standard
15+
compact flash devices.
16+
17+
properties:
18+
compatible:
19+
const: cavium,ebt3000-compact-flash
20+
21+
reg:
22+
description: The base address of the CF chip select banks.
23+
items:
24+
- description: CF chip select bank 0
25+
- description: CF chip select bank 1
26+
27+
cavium,bus-width:
28+
description: The width of the connection to the CF devices.
29+
$ref: /schemas/types.yaml#/definitions/uint32
30+
enum: [8, 16]
31+
32+
cavium,true-ide:
33+
description: True IDE mode when present.
34+
type: boolean
35+
36+
cavium,dma-engine-handle:
37+
description: A phandle for the DMA Engine connected to this device.
38+
$ref: /schemas/types.yaml#/definitions/phandle
39+
40+
required:
41+
- compatible
42+
- reg
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
bus {
49+
#address-cells = <2>;
50+
#size-cells = <1>;
51+
52+
compact-flash@5,0 {
53+
compatible = "cavium,ebt3000-compact-flash";
54+
reg = <5 0 0x10000>, <6 0 0x10000>;
55+
cavium,bus-width = <16>;
56+
cavium,true-ide;
57+
cavium,dma-engine-handle = <&dma0>;
58+
};
59+
};

Documentation/devicetree/bindings/ata/cavium-compact-flash.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)