Skip to contentSkip to conversation

dt-bindings: ahci-fsl-qoriq: add lx2160a chip name to the list

PATCH Applied Peng Ma 3 participants 10 messages Mar 12, 2019 – Apr 11, 2019

Subsystems (3)
lore
Share & tools
lore

Peng Ma

author
#0 lore raw

PATCH v7 1/3 dt-bindings: ahci-fsl-qoriq: add lx2160a chip name to the list

Add lx2160a compatible to bindings documentation.

---
changed for V7:
- add Reviewed by tag.

 .../devicetree/bindings/ata/ahci-fsl-qoriq.txt     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt +1 -1
index 7c3ca0e..9ecc019 100644
@@ -3,7 +3,7 @@ Binding for Freescale QorIQ AHCI SATA Controller
 Required properties:
   - reg: Physical base address and size of the controller's register area.
   - compatible: Compatibility string. Must be 'fsl,<chip>-ahci', where
-    chip could be ls1021a, ls1043a, ls1046a, ls1088a, ls2080a etc.
+    chip could be ls1021a, ls1043a, ls1046a, ls1088a, ls2080a, lx2160a, etc.
   - clocks: Input clock specifier. Refer to common clock bindings.
   - interrupts: Interrupt specifier. Refer to interrupt binding.
 
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH v7 2/3 arm64: dts: lx2160a: add sata node support

Add SATA device nodes for fsl-lx2160a and enable support for QDS and RDB boards.

---
changed for V7:
- no changed

 arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts |   16 +++++++
 arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts |   16 +++++++
 arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi    |   44 +++++++++++++++++++++
 3 files changed, 76 insertions(+), 0 deletions(-)
arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts +16 -0
index 99a22ab..1a5acf6 100644
@@ -95,6 +95,22 @@
 	};
 };
 
+&sata0 {
+	status = "okay";
+};
+
+&sata1 {
+	status = "okay";
+};
+
+&sata2 {
+	status = "okay";
+};
+
+&sata3 {
+	status = "okay";
+};
+
 &uart0 {
 	status = "okay";
 };
arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts +16 -0
index 6481e5f..5b6799e 100644
@@ -102,6 +102,22 @@
 	};
 };
 
+&sata0 {
+	status = "okay";
+};
+
+&sata1 {
+	status = "okay";
+};
+
+&sata2 {
+	status = "okay";
+};
+
+&sata3 {
+	status = "okay";
+};
+
 &uart0 {
 	status = "okay";
 };
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +44 -0

50 lines not on this page · raw message

Signature · 1 line
1.7.1
Applied
#2 lore raw

Re: [v7 2/3] arm64: dts: lx2160a: add sata node support

Quoted 4 lines · Peng Ma

Add SATA device nodes for fsl-lx2160a and enable support for QDS and RDB boards.

Applied, thanks.

author
#3 lore raw

PATCH v7 3/3 ahci: qoriq: add lx2160 platforms support

In reply to Peng Ma

Lx2160a is a new introduced soc which supports ATA3.0

---
changed for V7:
- no changed.

 drivers/ata/ahci_qoriq.c |   52 +++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 17 deletions(-)
drivers/ata/ahci_qoriq.c +35 -17
index ce59253..08dbb86 100644
@@ -58,6 +58,7 @@ enum ahci_qoriq_type {
 	AHCI_LS1046A,
 	AHCI_LS1088A,
 	AHCI_LS2088A,
+	AHCI_LX2160A,
 };
 
 struct ahci_qoriq_priv {
@@ -67,6 +68,8 @@ struct ahci_qoriq_priv {
 	bool is_dmacoherent;
 };
 
+static bool ecc_initialized;
+
 static const struct of_device_id ahci_qoriq_of_match[] = {
 	{ .compatible = "fsl,ls1021a-ahci", .data = (void *)AHCI_LS1021A},
 	{ .compatible = "fsl,ls1043a-ahci", .data = (void *)AHCI_LS1043A},
@@ -74,6 +77,7 @@ struct ahci_qoriq_priv {
 	{ .compatible = "fsl,ls1046a-ahci", .data = (void *)AHCI_LS1046A},
 	{ .compatible = "fsl,ls1088a-ahci", .data = (void *)AHCI_LS1088A},
 	{ .compatible = "fsl,ls2088a-ahci", .data = (void *)AHCI_LS2088A},
+	{ .compatible = "fsl,lx2160a-ahci", .data = (void *)AHCI_LX2160A},
 	{},
 };
 MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);
@@ -165,9 +169,10 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
 
 	switch (qpriv->type) {
 	case AHCI_LS1021A:
-		if (!qpriv->ecc_addr)
+		if (!(qpriv->ecc_addr || ecc_initialized))
 			return -EINVAL;
-		writel(SATA_ECC_DISABLE, qpriv->ecc_addr);
+		else if (qpriv->ecc_addr && !ecc_initialized)
+			writel(SATA_ECC_DISABLE, qpriv->ecc_addr);
 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
 		writel(LS1021A_PORT_PHY2, reg_base + PORT_PHY2);
 		writel(LS1021A_PORT_PHY3, reg_base + PORT_PHY3);
@@ -180,10 +185,12 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
 		break;
 
 	case AHCI_LS1043A:
-		if (!qpriv->ecc_addr)
+		if (!(qpriv->ecc_addr || ecc_initialized))
 			return -EINVAL;
-		writel(readl(qpriv->ecc_addr) | ECC_DIS_ARMV8_CH2,
-				qpriv->ecc_addr);
+		else if (qpriv->ecc_addr && !ecc_initialized)
+			writel(readl(qpriv->ecc_addr) |
+			       ECC_DIS_ARMV8_CH2,
+			       qpriv->ecc_addr);
 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
 		writel(AHCI_PORT_PHY2_CFG, reg_base + PORT_PHY2);
 		writel(AHCI_PORT_PHY3_CFG, reg_base + PORT_PHY3);
@@ -202,10 +209,12 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
 		break;
 
 	case AHCI_LS1046A:
-		if (!qpriv->ecc_addr)
+		if (!(qpriv->ecc_addr || ecc_initialized))
 			return -EINVAL;
-		writel(readl(qpriv->ecc_addr) | ECC_DIS_ARMV8_CH2,
-				qpriv->ecc_addr);
+		else if (qpriv->ecc_addr && !ecc_initialized)
+			writel(readl(qpriv->ecc_addr) |
+			       ECC_DIS_ARMV8_CH2,
+			       qpriv->ecc_addr);
 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
 		writel(AHCI_PORT_PHY2_CFG, reg_base + PORT_PHY2);
 		writel(AHCI_PORT_PHY3_CFG, reg_base + PORT_PHY3);
@@ -215,10 +224,13 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
 		break;
 
 	case AHCI_LS1088A:
-		if (!qpriv->ecc_addr)
+	case AHCI_LX2160A:
+		if (!(qpriv->ecc_addr || ecc_initialized))
 			return -EINVAL;
-		writel(readl(qpriv->ecc_addr) | ECC_DIS_LS1088A,
-		       qpriv->ecc_addr);
+		else if (qpriv->ecc_addr && !ecc_initialized)
+			writel(readl(qpriv->ecc_addr) |
+			       ECC_DIS_LS1088A,
+			       qpriv->ecc_addr);
 		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
 		writel(AHCI_PORT_PHY2_CFG, reg_base + PORT_PHY2);
 		writel(AHCI_PORT_PHY3_CFG, reg_base + PORT_PHY3);
@@ -237,6 +249,7 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
 		break;
 	}
 
+	ecc_initialized = true;
 	return 0;
 }
 
@@ -264,13 +277,18 @@ static int ahci_qoriq_probe(struct platform_device *pdev)
 
 	qoriq_priv->type = (enum ahci_qoriq_type)of_id->data;
 
-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-			"sata-ecc");
-	if (res) {
-		qoriq_priv->ecc_addr = devm_ioremap_resource(dev, res);
-		if (IS_ERR(qoriq_priv->ecc_addr))
-			return PTR_ERR(qoriq_priv->ecc_addr);
+	if (unlikely(!ecc_initialized)) {
+		res = platform_get_resource_byname(pdev,
+						   IORESOURCE_MEM,
+						   "sata-ecc");
+		if (res) {
+			qoriq_priv->ecc_addr =
+				devm_ioremap_resource(dev, res);
+			if (IS_ERR(qoriq_priv->ecc_addr))
+				return PTR_ERR(qoriq_priv->ecc_addr);
+		}
 	}
+
 	qoriq_priv->is_dmacoherent = of_dma_is_coherent(np);
 
 	rc = ahci_platform_enable_resources(hpriv);
Signature · 1 line
1.7.1
author
#4 lore raw

RE: [v7 3/3] ahci: qoriq: add lx2160 platforms support

Hi axboe,

If you have no comments on these paths, please merge. Thank you very much.
Patch link:
http://patchwork.ozlabs.org/patch/1055028/
http://patchwork.ozlabs.org/patch/1054189/

Best Regards,
Peng

Quoted 150 lines

-----Original Message-----
From: Peng Ma <[email protected]>
Sent: 2019年3月12日 9:50
To: [email protected]; [email protected]; [email protected]; [email protected]; Leo Li <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Peng Ma <[email protected]>
Subject: [v7 3/3] ahci: qoriq: add lx2160 platforms support

Lx2160a is a new introduced soc which supports ATA3.0

---
changed for V7:
- no changed.

drivers/ata/ahci_qoriq.c | 52
+++++++++++++++++++++++++++++++---------------

1 files changed, 35 insertions(+), 17 deletions(-)
drivers/ata/ahci_qoriq.c index renamed from drivers/ata/ahci_qoriq.c +0 -0

ce59253..08dbb86 100644

drivers/ata/ahci_qoriq.c +3 -1
@@ -58,6 +58,7 @@ enum ahci_qoriq_type {
 	AHCI_LS1046A,
 	AHCI_LS1088A,
 	AHCI_LS2088A,
+	AHCI_LX2160A,
 };
 
 struct ahci_qoriq_priv {
@@ -67,6 +68,8 @@ struct ahci_qoriq_priv {
 	bool is_dmacoherent;
 };
 
+static bool ecc_initialized;
+
 static const struct of_device_id ahci_qoriq_of_match[] = {
 	{ .compatible = "fsl,ls1021a-ahci", .data = (void *)AHCI_LS1021A},
 	{ .compatible = "fsl,ls1043a-ahci", .data = (void *)AHCI_LS1043A}, @@
-74,6 +77,7 @@ struct ahci_qoriq_priv {
	{ .compatible = "fsl,ls1046a-ahci", .data = (void *)AHCI_LS1046A},
	{ .compatible = "fsl,ls1088a-ahci", .data = (void *)AHCI_LS1088A},
	{ .compatible = "fsl,ls2088a-ahci", .data = (void *)AHCI_LS2088A},
drivers/ata/ahci_qoriq.c +1 -0
+	{ .compatible = "fsl,lx2160a-ahci", .data = (void *)AHCI_LX2160A},
	{},
};

MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match); @@ -165,9 +169,10 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)

	switch (qpriv->type) {
	case AHCI_LS1021A:
drivers/ata/ahci_qoriq.c +1 -1
-		if (!qpriv->ecc_addr)
+		if (!(qpriv->ecc_addr || ecc_initialized))
			return -EINVAL;
drivers/ata/ahci_qoriq.c +2 -1
-		writel(SATA_ECC_DISABLE, qpriv->ecc_addr);
+		else if (qpriv->ecc_addr && !ecc_initialized)
+			writel(SATA_ECC_DISABLE, qpriv->ecc_addr);
		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
		writel(LS1021A_PORT_PHY2, reg_base + PORT_PHY2);
		writel(LS1021A_PORT_PHY3, reg_base + PORT_PHY3); @@ -180,10
+185,12 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
		break;

	case AHCI_LS1043A:
drivers/ata/ahci_qoriq.c +1 -1
-		if (!qpriv->ecc_addr)
+		if (!(qpriv->ecc_addr || ecc_initialized))
			return -EINVAL;
drivers/ata/ahci_qoriq.c +4 -2
-		writel(readl(qpriv->ecc_addr) | ECC_DIS_ARMV8_CH2,
-				qpriv->ecc_addr);
+		else if (qpriv->ecc_addr && !ecc_initialized)
+			writel(readl(qpriv->ecc_addr) |
+			       ECC_DIS_ARMV8_CH2,
+			       qpriv->ecc_addr);
		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
		writel(AHCI_PORT_PHY2_CFG, reg_base + PORT_PHY2);
		writel(AHCI_PORT_PHY3_CFG, reg_base + PORT_PHY3); @@
-202,10 +209,12 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv
*hpriv)
		break;

	case AHCI_LS1046A:
drivers/ata/ahci_qoriq.c +1 -1
-		if (!qpriv->ecc_addr)
+		if (!(qpriv->ecc_addr || ecc_initialized))
			return -EINVAL;
drivers/ata/ahci_qoriq.c +4 -2
-		writel(readl(qpriv->ecc_addr) | ECC_DIS_ARMV8_CH2,
-				qpriv->ecc_addr);
+		else if (qpriv->ecc_addr && !ecc_initialized)
+			writel(readl(qpriv->ecc_addr) |
+			       ECC_DIS_ARMV8_CH2,
+			       qpriv->ecc_addr);
		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
		writel(AHCI_PORT_PHY2_CFG, reg_base + PORT_PHY2);
		writel(AHCI_PORT_PHY3_CFG, reg_base + PORT_PHY3); @@
-215,10 +224,13 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv
*hpriv)
		break;

	case AHCI_LS1088A:
drivers/ata/ahci_qoriq.c +2 -1
-		if (!qpriv->ecc_addr)
+	case AHCI_LX2160A:
+		if (!(qpriv->ecc_addr || ecc_initialized))
			return -EINVAL;
drivers/ata/ahci_qoriq.c +4 -2
-		writel(readl(qpriv->ecc_addr) | ECC_DIS_LS1088A,
-		       qpriv->ecc_addr);
+		else if (qpriv->ecc_addr && !ecc_initialized)
+			writel(readl(qpriv->ecc_addr) |
+			       ECC_DIS_LS1088A,
+			       qpriv->ecc_addr);
		writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
		writel(AHCI_PORT_PHY2_CFG, reg_base + PORT_PHY2);
		writel(AHCI_PORT_PHY3_CFG, reg_base + PORT_PHY3); @@ -237,6
+249,7 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
		break;
	}
drivers/ata/ahci_qoriq.c +1 -0
+	ecc_initialized = true;
	return 0;
}
drivers/ata/ahci_qoriq.c +11 -6
@@ -264,13 +277,18 @@ static int ahci_qoriq_probe(struct platform_device
 *pdev)
 
 	qoriq_priv->type = (enum ahci_qoriq_type)of_id->data;
 
-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-			"sata-ecc");
-	if (res) {
-		qoriq_priv->ecc_addr = devm_ioremap_resource(dev, res);
-		if (IS_ERR(qoriq_priv->ecc_addr))
-			return PTR_ERR(qoriq_priv->ecc_addr);
+	if (unlikely(!ecc_initialized)) {
+		res = platform_get_resource_byname(pdev,
+						   IORESOURCE_MEM,
+						   "sata-ecc");
+		if (res) {
+			qoriq_priv->ecc_addr =
+				devm_ioremap_resource(dev, res);
+			if (IS_ERR(qoriq_priv->ecc_addr))
+				return PTR_ERR(qoriq_priv->ecc_addr);
+		}
 	}
+
 	qoriq_priv->is_dmacoherent = of_dma_is_coherent(np);
 
	rc = ahci_platform_enable_resources(hpriv);

--
1.7.1

author
#6 lore raw

RE: [EXT] Re: [v7 3/3] ahci: qoriq: add lx2160 platforms support

Hi Axboe,

Patch link:

http://patchwork.ozlabs.org/patch/1055028/

http://patchwork.ozlabs.org/patch/1054189/

Best Regards,
Peng

Quoted 42 lines

-----Original Message-----
From: Jens Axboe <[email protected]>
Sent: 2019年4月8日 23:21
To: Peng Ma <[email protected]>; [email protected]; [email protected]; [email protected]; Leo Li <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Andy Tang <[email protected]>
Subject: [EXT] Re: [v7 3/3] ahci: qoriq: add lx2160 platforms support

WARNING: This email was created outside of NXP. DO NOT CLICK links or attachments unless you recognize the sender and know the content is safe.

Quoted 7 lines · Peng Ma

Hi axboe,

If you have no comments on these paths, please merge. Thank you very much.
Patch link:
https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch

work.ozlabs.org%2Fpatch%2F1055028%2F&amp;data=02%7C01%7Cpeng.ma %40nxp.

Quoted 1 line

com%7C40e859676606431ce84908d6bc35bf3d%7C686ea1d3bc2b4c6fa92cd9 9c5c301

Quoted 1 line

635%7C0%7C1%7C636903336364109322&amp;sdata=Q8vElMkaDmHvphhVo 12BtFUvqXp

Quoted 3 lines

T%2BDBrnvdjV%2FFizfs%3D&amp;reserved=0
https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatch

work.ozlabs.org%2Fpatch%2F1054189%2F&amp;data=02%7C01%7Cpeng.ma %40nxp.

Quoted 1 line

com%7C40e859676606431ce84908d6bc35bf3d%7C686ea1d3bc2b4c6fa92cd9 9c5c301

Quoted 1 line

635%7C0%7C1%7C636903336364109322&amp;sdata=HNuiGz%2BhfegcgNQ7 T%2BPqGPI

Quoted 7 lines
Quoted 1 line

bS3ch%2FUqtxmHBfL6MoRo%3D&amp;reserved=0

Can you resend, it's not clear which is which here, and what parts of the series goes where.

--
Jens Axboe

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author
#8 lore raw

RE: [EXT] Re: [v7 3/3] ahci: qoriq: add lx2160 platforms support

Hi Axboe,

Thanks very much.

Best Regards,
Peng

Quoted 38 lines

-----Original Message-----
From: Jens Axboe <[email protected]>
Sent: 2019年4月9日 22:17
To: Peng Ma <[email protected]>; [email protected]; [email protected]; [email protected]; Leo Li <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Andy Tang <[email protected]>; Jianchao Wang <[email protected]>
Subject: Re: [EXT] Re: [v7 3/3] ahci: qoriq: add lx2160 platforms support

WARNING: This email was created outside of NXP. DO NOT CLICK links or attachments unless you recognize the sender and know the content is safe.

Quoted 5 lines · Peng Ma

Hi Axboe,

Patch link:

https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatchwo
rk.ozlabs.org%2Fpatch%2F1055028%2F&amp;data=02%7C01%7Cpeng.ma%40 nxp.com%7Ce76be539c24a4733cf3f08d6bcf618de%7C686ea1d3bc2b4c6fa92 cd99c5c301635%7C0%7C1%7C636904162505501500&amp;sdata=Am7QEJ2Y sqkNLXUtIMXU%2Fs5Mt4QhzYYa1FjbhWaAXiw%3D&amp;reserved=0

Quoted 2 lines

https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatchwo
rk.ozlabs.org%2Fpatch%2F1054189%2F&amp;data=02%7C01%7Cpeng.ma%40 nxp.com%7Ce76be539c24a4733cf3f08d6bcf618de%7C686ea1d3bc2b4c6fa92 cd99c5c301635%7C0%7C1%7C636904162505501500&amp;sdata=ikpNC4M% 2BDq3%2FPYsXLHbPDcDu2KfgIRXs%2BjDDXWtp2jk%3D&amp;reserved=0

Applied, thanks.

--
Jens Axboe