Skip to contentSkip to conversation

ahci_xgene: Fixes related to APM X-Gene SATA host controller driver.

PATCH Superseded Suman Tripathi 4 participants 5 messages Aug 8, 2014 – Aug 16, 2014 1 message not in the archive

Subsystems (3)

v6 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

v6 cover ahci_xgene: Fixes related to APM X-Gene SATA host controller driver.

This patch set contains a couple of fixes related to APM X-Gene SATA controller driver.

v2 Change:
1. Drop the Link down retry patch from this patch set.

v4 Change:
1. Drop the patch to fix the csr-mask in dts for PHY clock node of SATA Host Controller 1.
2. Add the patch to correct the OOB tunning parameters for the COMINIT/COMWAKE parameters.
3. Add the patch to remove the NCQ support from the APM X-Gene AHCI SATA Host controller driver.
4. Add the patch to remove the clock and PHY reference nodes from the APM X-Gene Host controller dts node.

v5 Change :
1. All the patches are based on 3.16.0-rc6/for-3.17 kernel.
2. Drop the patch to remove the clock and PHY reference nodes from the APM X-Gene Host controller dts node as it breaks with old firmware.
3. Add the patch to skip phy and clock initialisation if already done in the firmware.
4. Add the patch to fix the csr-mask in dts for PHY clock node of SATA Host Controller 1.
5. Add the patch to remove the NCQ support from the APM X-Gene AHCI SATA Host controller driver based on 3.16.0-rc6/ for-3.17 kernel.
6. Drop the patch to correct the OOB tunning parameters for the COMINIT/COMWAKE parameters as it is already applied to 3.16/for-3.17 branch by the maintainer.
7. Drop the patch to fix the watermark threshold as it is already applied to 3.16/for-3.17 branch by the maintainer.

v6 change :
1. Drop the patch to skip phy and clock initialisation if already done in the firmware.
2. Drop the patch to fix the csr-mask in dts for PHY clock node of SATA Host Controller 1.
3. Add the remove the clock and PHY node patch as it fixes the dropped patches together. This patch works with old and new firmware as well.

---

Suman Tripathi (2):
ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI SATA
Host Controller driver.
arm64: Remove the clock and PHY reference from the APM X-Gene SoC AHCI
SATA Host controller dts node.

 .../devicetree/bindings/ata/apm-xgene.txt          | 10 +--
 arch/arm64/boot/dts/apm-storm.dtsi                 | 93 ----------------------
 drivers/ata/ahci_xgene.c                           |  4 +-
 3 files changed, 7 insertions(+), 100 deletions(-)

--
1.8.2.1

#1 lore raw

PATCH v6 1/2 ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI SATA Host Controller driver.

This patch removes the NCQ support from the APM X-Gene SoC AHCI Host Controller driver as it doesn't support it.

---
 drivers/ata/ahci_xgene.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ata/ahci_xgene.c +2 -2
index 1cfbdca..f416495 100644
@@ -344,7 +344,7 @@ static struct ata_port_operations xgene_ahci_ops = {
 };
 
 static const struct ata_port_info xgene_ahci_port_info = {
-	.flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
+	.flags = AHCI_FLAG_COMMON,
 	.pio_mask = ATA_PIO4,
 	.udma_mask = ATA_UDMA6,
 	.port_ops = &xgene_ahci_ops,
@@ -481,7 +481,7 @@ static int xgene_ahci_probe(struct platform_device *pdev)
 	/* Configure the host controller */
 	xgene_ahci_hw_init(hpriv);
 
-	hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ;
+	hflags = AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ;
 
 	rc = ahci_platform_init_host(pdev, hpriv, &xgene_ahci_port_info,
 				     hflags, 0, 0);

--
1.8.2.1

Applied
#2 lore raw

PATCH v6 1/2 ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI SATA Host Controller driver.

Quoted 5 lines · Suman Tripathi

This patch removes the NCQ support from the APM X-Gene SoC AHCI Host Controller driver as it doesn't support it.

Applied to libata/for-3.17-fixes w/ stable cc'd.

Thanks.

Signature · 1 line
tejun

A message that is not in the archive (sent off-list or not yet received): 1407514466-25312-1-git-send-email-stripathi-qTEPVZfXA3Y@public.gmane.org

#4 lore raw

PATCH v6 2/2 arm64: Remove the clock and PHY reference from the APM X-Gene SoC AHCI SATA Host controller dts node.

This patch removes all clocks and PHY references from the APM X-Gene SoC AHCI SATA host controller and PHY DTS nodes. The clock and PHY are no longer needed as they are handled by the firmware. By removing only the reference is not enough as any un-used clock entry will get disabled by the clock framework. This patch also updates the APM X-Gene SOC AHCI SATA Host controller clock and PHY bindings as optional properties.

---
 .../devicetree/bindings/ata/apm-xgene.txt          | 10 +--
 arch/arm64/boot/dts/apm-storm.dtsi                 | 93 ----------------------
 2 files changed, 5 insertions(+), 98 deletions(-)
Documentation/devicetree/bindings/ata/apm-xgene.txt +5 -5
index a668f0e..4cd32c2 100644
@@ -17,16 +17,16 @@ Required properties:
 			  5th optional memory resource shall be the host
 			  controller MUX memory resource if required.
 - interrupts		: Interrupt-specifier for SATA host controller IRQ.
-- clocks		: Reference to the clock entry.
-- phys			: A list of phandles + phy-specifiers, one for each
-			  entry in phy-names.
-- phy-names		: Should contain:
-  * "sata-phy" for the SATA 6.0Gbps PHY
 
 Optional properties:
 - dma-coherent		: Present if dma operations are coherent
 - status		: Shall be "ok" if enabled or "disabled" if disabled.
 			  Default is "ok".
+- clocks		: Reference to the clock entry.
+- phys			: A list of phandles + phy-specifiers, one for each
+			  entry in phy-names.
+- phy-names		: Should contain:
+  * "sata-phy" for the SATA 6.0Gbps PHY
 
 Example:
 		sataclk: sataclk {
arch/arm64/boot/dts/apm-storm.dtsi +0 -93

135 lines not on this page · raw message

--
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw

PATCH v6 2/2 arm64: Remove the clock and PHY reference from the APM X-Gene SoC AHCI SATA Host controller dts node.

Quoted 8 lines · Suman Tripathi

This patch removes all clocks and PHY references from the APM X-Gene SoC AHCI SATA host controller and PHY DTS nodes. The clock and PHY are no longer needed as they are handled by the firmware. By removing only the reference is not enough as any un-used clock entry will get disabled by the clock framework. This patch also updates the APM X-Gene SOC AHCI SATA Host controller clock and PHY bindings as optional properties.

Quoted 7 lines
---
 .../devicetree/bindings/ata/apm-xgene.txt          | 10 +--
 arch/arm64/boot/dts/apm-storm.dtsi                 | 93 ----------------------
 2 files changed, 5 insertions(+), 98 deletions(-)

What is the upgrade path here? It sounds like this will still break new kernels running on old firmware if you also upgrade the dtb file. You write in the introductory email that this will work with old firmware as well, but I don't understand how.

How about modifying the dtb at boot time by the firmware according to the requirements of the firmware itself?

Arnd