Skip to contentSkip to conversation

ARM: dts: Freescale: Add ecc addr for sata node

PATCH Superseded Peng Ma 3 participants 6 messages Apr 17, 2019 – May 23, 2019

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Peng Ma

author
#0 lore raw

PATCH v2 1/2 ARM: dts: Freescale: Add ecc addr for sata node

Move the ecc addr from driver to dts.

---
changed for v2:
- Add reg-names to improve driver code.

 arch/arm/dts/fsl-ls1012a.dtsi |    4 +++-
 arch/arm/dts/fsl-ls1043a.dtsi |    4 +++-
 arch/arm/dts/fsl-ls1046a.dtsi |    4 +++-
 arch/arm/dts/fsl-ls1088a.dtsi |    3 +++
 arch/arm/dts/ls1021a.dtsi     |    4 +++-
 5 files changed, 15 insertions(+), 4 deletions(-)
arch/arm/dts/fsl-ls1012a.dtsi +3 -1
index f22cbf4..30af2e1 100644
@@ -136,7 +136,9 @@
 
 		sata: sata at 3200000 {
 			compatible = "fsl,ls1012a-ahci";
-			reg = <0x0 0x3200000 0x0 0x10000>;
+			reg = <0x0 0x3200000 0x0 0x10000	/* ccsr sata base */
+			       0x0 0x20140520 0x0 0x4>;		/* ecc sata addr*/
+			reg-names = "sata-base", "ecc-addr";
 			interrupts = <0 69 4>;
 			clocks = <&clockgen 4 0>;
 			status = "disabled";
arch/arm/dts/fsl-ls1043a.dtsi +3 -1
index bb70992..c7fa9e2 100644
@@ -290,7 +290,9 @@
 
 		sata: sata at 3200000 {
 			compatible = "fsl,ls1043a-ahci";
-			reg = <0x0 0x3200000 0x0 0x10000>;
+			reg = <0x0 0x3200000 0x0 0x10000	/* ccsr sata base */
+			       0x0 0x20140520 0x0 0x4>;		/* ecc sata addr*/
+			reg-names = "sata-base", "ecc-addr";
 			interrupts = <0 69 4>;
 			clocks = <&clockgen 4 0>;
 			status = "disabled";
arch/arm/dts/fsl-ls1046a.dtsi +3 -1
index 5ac10e0..d56ecd6 100644
@@ -294,7 +294,9 @@
 
 		sata: sata at 3200000 {
 			compatible = "fsl,ls1046a-ahci";
-			reg = <0x0 0x3200000 0x0 0x10000>;
+			reg = <0x0 0x3200000 0x0 0x10000	/* ccsr sata base */
+			       0x0 0x20140520 0x0 0x4>;		/* ecc sata addr*/
+			reg-names = "sata-base", "ecc-addr";
 			interrupts = <0 69 4>;
 			clocks = <&clockgen 4 1>;
 			status = "disabled";
arch/arm/dts/fsl-ls1088a.dtsi +3 -0
index 9455e03..7ba0683 100644
@@ -154,6 +154,9 @@
 	sata: sata at 3200000 {
 		compatible = "fsl,ls1088a-ahci";
 		reg = <0x0 0x3200000 0x0 0x10000>;
+		reg = <0x0 0x3200000 0x0 0x10000	/* ccsr sata base */
+		       0x7 0x100520  0x0 0x4>;		/* ecc sata addr*/
+		reg-names = "sata-base", "ecc-addr";
 		interrupts = <0 133 4>;
 		status = "disabled";
 	};
arch/arm/dts/ls1021a.dtsi +3 -1
index 7670a39..cc5d56c 100644
@@ -406,7 +406,9 @@
 
 		sata: sata at 3200000 {
 			compatible = "fsl,ls1021a-ahci";
-			reg = <0x3200000 0x10000>;
+			reg = <0x0 0x3200000 0x0 0x10000	/* ccsr sata base */
+			       0x0 0x20220520 0x0 0x4>;		/* ecc sata addr*/
+			reg-names = "sata-base", "ecc-addr";
 			interrupts = <0 101 4>;
 			status = "disabled";
 		};
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH v2 2/2 scsi: ceva: Clean up the driver code

Distinguish the ecc val by chassis version and move the ecc addr to dts. Add ls1028a soc support.

---
changed for v2:
- Use the reg-names to get secondary reg base
- Return error while some socs not set the ecc address at DT

 drivers/ata/sata_ceva.c |   50 +++++++++++++++++++++++++++++++----------------
 1 files changed, 33 insertions(+), 17 deletions(-)
drivers/ata/sata_ceva.c +33 -17
index 8887be9..2d49630 100644
@@ -8,6 +8,7 @@
 #include <ahci.h>
 #include <scsi.h>
 #include <asm/io.h>
+#include <linux/ioport.h>
 
 /* Vendor Specific Register Offsets */
 #define AHCI_VEND_PCFG  0xA4
@@ -88,20 +89,16 @@
 #define LS1021_CEVA_PHY4_CFG	0x064a080b
 #define LS1021_CEVA_PHY5_CFG	0x2aa86470
 
-/* for ls1088a */
-#define LS1088_ECC_DIS_ADDR_CH2	0x100520
-#define LS1088_ECC_DIS_VAL_CH2	0x40000000
-
-/* ecc addr-val pair */
-#define ECC_DIS_ADDR_CH2	0x20140520
+/* ecc val pair */
+#define ECC_DIS_VAL_CH1		0x00020000
 #define ECC_DIS_VAL_CH2		0x80000000
-#define SATA_ECC_REG_ADDR	0x20220520
-#define SATA_ECC_DISABLE	0x00020000
+#define ECC_DIS_VAL_CH3		0x40000000
 
 enum ceva_soc {
 	CEVA_1V84,
 	CEVA_LS1012A,
 	CEVA_LS1021A,
+	CEVA_LS1028A,
 	CEVA_LS1043A,
 	CEVA_LS1046A,
 	CEVA_LS1088A,
@@ -110,12 +107,14 @@ enum ceva_soc {
 
 struct ceva_sata_priv {
 	ulong base;
+	ulong ecc_base;
 	enum ceva_soc soc;
 	ulong flag;
 };
 
 static int ceva_init_sata(struct ceva_sata_priv *priv)
 {
+	ulong ecc_addr = priv->ecc_base;
 	ulong base = priv->base;
 	ulong tmp;
 
@@ -132,38 +131,42 @@ static int ceva_init_sata(struct ceva_sata_priv *priv)
 		break;
 
 	case CEVA_LS1021A:
-		writel(SATA_ECC_DISABLE, SATA_ECC_REG_ADDR);
+		if (!ecc_addr)
+			return -EINVAL;
+		writel(ECC_DIS_VAL_CH1, ecc_addr);
 		writel(CEVA_PHY1_CFG, base + AHCI_VEND_PPCFG);
 		writel(LS1021_CEVA_PHY2_CFG, base + AHCI_VEND_PP2C);
 		writel(LS1021_CEVA_PHY3_CFG, base + AHCI_VEND_PP3C);
 		writel(LS1021_CEVA_PHY4_CFG, base + AHCI_VEND_PP4C);
 		writel(LS1021_CEVA_PHY5_CFG, base + AHCI_VEND_PP5C);
 		writel(CEVA_TRANS_CFG, base + AHCI_VEND_PTC);
-		if (priv->flag & FLAG_COHERENT)
-			writel(CEVA_AXICC_CFG, base + LS1021_AHCI_VEND_AXICC);
 		break;
 
 	case CEVA_LS1012A:
 	case CEVA_LS1043A:
 	case CEVA_LS1046A:
-		writel(ECC_DIS_VAL_CH2, ECC_DIS_ADDR_CH2);
+		if (!ecc_addr)
+			return -EINVAL;
+		writel(ECC_DIS_VAL_CH2, ecc_addr);
 		/* fallthrough */
 	case CEVA_LS2080A:
 		writel(CEVA_PHY1_CFG, base + AHCI_VEND_PPCFG);
 		writel(CEVA_TRANS_CFG, base + AHCI_VEND_PTC);
-		if (priv->flag & FLAG_COHERENT)
-			writel(CEVA_AXICC_CFG, base + AHCI_VEND_AXICC);
 		break;
 
+	case CEVA_LS1028A:
 	case CEVA_LS1088A:
-		writel(LS1088_ECC_DIS_VAL_CH2, LS1088_ECC_DIS_ADDR_CH2);
+		if (!ecc_addr)
+			return -EINVAL;
+		writel(ECC_DIS_VAL_CH3, ecc_addr);
 		writel(CEVA_PHY1_CFG, base + AHCI_VEND_PPCFG);
 		writel(CEVA_TRANS_CFG, base + AHCI_VEND_PTC);
-		if (priv->flag & FLAG_COHERENT)
-			writel(CEVA_AXICC_CFG, base + AHCI_VEND_AXICC);
 		break;
 	}
 
+	if (priv->flag & FLAG_COHERENT)
+		writel(CEVA_AXICC_CFG, base + AHCI_VEND_AXICC);
+
 	return 0;
 }
 
@@ -187,6 +190,7 @@ static const struct udevice_id sata_ceva_ids[] = {
 	{ .compatible = "ceva,ahci-1v84", .data = CEVA_1V84 },
 	{ .compatible = "fsl,ls1012a-ahci", .data = CEVA_LS1012A },
 	{ .compatible = "fsl,ls1021a-ahci", .data = CEVA_LS1021A },
+	{ .compatible = "fsl,ls1028a-ahci", .data = CEVA_LS1028A },
 	{ .compatible = "fsl,ls1043a-ahci", .data = CEVA_LS1043A },
 	{ .compatible = "fsl,ls1046a-ahci", .data = CEVA_LS1046A },
 	{ .compatible = "fsl,ls1088a-ahci", .data = CEVA_LS1088A },
@@ -197,6 +201,8 @@ static const struct udevice_id sata_ceva_ids[] = {
 static int sata_ceva_ofdata_to_platdata(struct udevice *dev)
 {
 	struct ceva_sata_priv *priv = dev_get_priv(dev);
+	struct resource res_regs;
+	int ret;
 
 	if (dev_read_bool(dev, "dma-coherent"))
 		priv->flag |= FLAG_COHERENT;
@@ -205,8 +211,18 @@ static int sata_ceva_ofdata_to_platdata(struct udevice *dev)
 	if (priv->base == FDT_ADDR_T_NONE)
 		return -EINVAL;
 
+	ret = dev_read_resource_byname(dev, "ecc-addr", &res_regs);
+	if (ret)
+		priv->ecc_base = 0;
+	else
+		priv->ecc_base = res_regs.start;
+
 	priv->soc = dev_get_driver_data(dev);
 
+	debug("ccsr-sata-base %lx\t ecc-base %lx\n",
+	      priv->base,
+	      priv->ecc_base);
+
 	return 0;
 }
 
Signature · 1 line
1.7.1
#2 lore raw

PATCH v2 2/2 scsi: ceva: Clean up the driver code

Quoted 143 lines · Peng Ma

Distinguish the ecc val by chassis version and move the ecc addr to dts. Add ls1028a soc support.

---
changed for v2:
- Use the reg-names to get secondary reg base
- Return error while some socs not set the ecc address at DT

 drivers/ata/sata_ceva.c |   50 +++++++++++++++++++++++++++++++----------------
 1 files changed, 33 insertions(+), 17 deletions(-)
drivers/ata/sata_ceva.c +28 -17
index 8887be9..2d49630 100644
@@ -8,6 +8,7 @@
 #include <ahci.h>
 #include <scsi.h>
 #include <asm/io.h>
+#include <linux/ioport.h>
 
 /* Vendor Specific Register Offsets */
 #define AHCI_VEND_PCFG  0xA4
@@ -88,20 +89,16 @@
 #define LS1021_CEVA_PHY4_CFG	0x064a080b
 #define LS1021_CEVA_PHY5_CFG	0x2aa86470
 
-/* for ls1088a */
-#define LS1088_ECC_DIS_ADDR_CH2	0x100520
-#define LS1088_ECC_DIS_VAL_CH2	0x40000000
-
-/* ecc addr-val pair */
-#define ECC_DIS_ADDR_CH2	0x20140520
+/* ecc val pair */
+#define ECC_DIS_VAL_CH1		0x00020000
 #define ECC_DIS_VAL_CH2		0x80000000
-#define SATA_ECC_REG_ADDR	0x20220520
-#define SATA_ECC_DISABLE	0x00020000
+#define ECC_DIS_VAL_CH3		0x40000000
 
 enum ceva_soc {
 	CEVA_1V84,
 	CEVA_LS1012A,
 	CEVA_LS1021A,
+	CEVA_LS1028A,
 	CEVA_LS1043A,
 	CEVA_LS1046A,
 	CEVA_LS1088A,
@@ -110,12 +107,14 @@ enum ceva_soc {
 
 struct ceva_sata_priv {
 	ulong base;
+	ulong ecc_base;
 	enum ceva_soc soc;
 	ulong flag;
 };
 
 static int ceva_init_sata(struct ceva_sata_priv *priv)
 {
+	ulong ecc_addr = priv->ecc_base;
 	ulong base = priv->base;
 	ulong tmp;
 
@@ -132,38 +131,42 @@ static int ceva_init_sata(struct ceva_sata_priv *priv)
 		break;
 
 	case CEVA_LS1021A:
-		writel(SATA_ECC_DISABLE, SATA_ECC_REG_ADDR);
+		if (!ecc_addr)
+			return -EINVAL;
+		writel(ECC_DIS_VAL_CH1, ecc_addr);
 		writel(CEVA_PHY1_CFG, base + AHCI_VEND_PPCFG);
 		writel(LS1021_CEVA_PHY2_CFG, base + AHCI_VEND_PP2C);
 		writel(LS1021_CEVA_PHY3_CFG, base + AHCI_VEND_PP3C);
 		writel(LS1021_CEVA_PHY4_CFG, base + AHCI_VEND_PP4C);
 		writel(LS1021_CEVA_PHY5_CFG, base + AHCI_VEND_PP5C);
 		writel(CEVA_TRANS_CFG, base + AHCI_VEND_PTC);
-		if (priv->flag & FLAG_COHERENT)
-			writel(CEVA_AXICC_CFG, base + LS1021_AHCI_VEND_AXICC);
 		break;
 
 	case CEVA_LS1012A:
 	case CEVA_LS1043A:
 	case CEVA_LS1046A:
-		writel(ECC_DIS_VAL_CH2, ECC_DIS_ADDR_CH2);
+		if (!ecc_addr)
+			return -EINVAL;
+		writel(ECC_DIS_VAL_CH2, ecc_addr);
 		/* fallthrough */
 	case CEVA_LS2080A:
 		writel(CEVA_PHY1_CFG, base + AHCI_VEND_PPCFG);
 		writel(CEVA_TRANS_CFG, base + AHCI_VEND_PTC);
-		if (priv->flag & FLAG_COHERENT)
-			writel(CEVA_AXICC_CFG, base + AHCI_VEND_AXICC);
 		break;
 
+	case CEVA_LS1028A:
 	case CEVA_LS1088A:
-		writel(LS1088_ECC_DIS_VAL_CH2, LS1088_ECC_DIS_ADDR_CH2);
+		if (!ecc_addr)
+			return -EINVAL;
+		writel(ECC_DIS_VAL_CH3, ecc_addr);
 		writel(CEVA_PHY1_CFG, base + AHCI_VEND_PPCFG);
 		writel(CEVA_TRANS_CFG, base + AHCI_VEND_PTC);
-		if (priv->flag & FLAG_COHERENT)
-			writel(CEVA_AXICC_CFG, base + AHCI_VEND_AXICC);
 		break;
 	}
 
+	if (priv->flag & FLAG_COHERENT)
+		writel(CEVA_AXICC_CFG, base + AHCI_VEND_AXICC);
+
 	return 0;
 }
 
@@ -187,6 +190,7 @@ static const struct udevice_id sata_ceva_ids[] = {
 	{ .compatible = "ceva,ahci-1v84", .data = CEVA_1V84 },
 	{ .compatible = "fsl,ls1012a-ahci", .data = CEVA_LS1012A },
 	{ .compatible = "fsl,ls1021a-ahci", .data = CEVA_LS1021A },
+	{ .compatible = "fsl,ls1028a-ahci", .data = CEVA_LS1028A },
 	{ .compatible = "fsl,ls1043a-ahci", .data = CEVA_LS1043A },
 	{ .compatible = "fsl,ls1046a-ahci", .data = CEVA_LS1046A },
 	{ .compatible = "fsl,ls1088a-ahci", .data = CEVA_LS1088A },
@@ -197,6 +201,8 @@ static const struct udevice_id sata_ceva_ids[] = {
 static int sata_ceva_ofdata_to_platdata(struct udevice *dev)
 {
 	struct ceva_sata_priv *priv = dev_get_priv(dev);
+	struct resource res_regs;
+	int ret;
 
 	if (dev_read_bool(dev, "dma-coherent"))
 		priv->flag |= FLAG_COHERENT;
@@ -205,8 +211,18 @@ static int sata_ceva_ofdata_to_platdata(struct udevice *dev)
 	if (priv->base == FDT_ADDR_T_NONE)
 		return -EINVAL;
 
+	ret = dev_read_resource_byname(dev, "ecc-addr", &res_regs);
+	if (ret)
+		priv->ecc_base = 0;
+	else
+		priv->ecc_base = res_regs.start;

drivers/ata/sata_ceva.c static int sata_ceva_ofdata_to_platdata(struct udevice *dev) · line 228

Quoted 10 lines
drivers/ata/sata_ceva.c +5 -0
+
 	priv->soc = dev_get_driver_data(dev);
 
+	debug("ccsr-sata-base %lx\t ecc-base %lx\n",
+	      priv->base,
+	      priv->ecc_base);
+
 	return 0;
 }
 

Thanks,
Michal

#3 lore raw

PATCH v2 2/2 scsi: ceva: Clean up the driver code

In reply to Peng Ma
Quoted 15 lines

-----Original Message-----
From: Peng Ma <[email protected]>
Sent: Wednesday, April 17, 2019 1:19 PM
To: albert.u.boot at aribaud.net; sjg at chromium.org; Fabio Estevam <[email protected]>; York Sun <[email protected]>; Prabhakar Kushwaha <[email protected]>
Cc: Andy Tang <[email protected]>; Yinbo Zhu <[email protected]>; michal.simek at xilinx.com; u-boot at lists.denx.de; Peng Ma <[email protected]>
Subject: [v2 2/2] scsi: ceva: Clean up the driver code

Distinguish the ecc val by chassis version and move the ecc addr to dts. Add ls1028a soc support.

Quoted 8 lines

---
changed for v2:
- Use the reg-names to get secondary reg base
- Return error while some socs not set the ecc address at DT

 drivers/ata/sata_ceva.c |   50 +++++++++++++++++++++++++++++++--------------

--

This patch has been applied to fsl-qoriq master, awaiting upstream.

--pk

#4 lore raw

PATCH v2 1/2 ARM: dts: Freescale: Add ecc addr for sata node

In reply to Peng Ma
Quoted 12 lines

-----Original Message-----
From: Peng Ma <[email protected]>
Sent: Wednesday, April 17, 2019 1:19 PM
To: albert.u.boot at aribaud.net; sjg at chromium.org; Fabio Estevam <[email protected]>; York Sun <[email protected]>; Prabhakar Kushwaha <[email protected]>
Cc: Andy Tang <[email protected]>; Yinbo Zhu <[email protected]>; michal.simek at xilinx.com; u-boot at lists.denx.de; Peng Ma <[email protected]>
Subject: [v2 1/2] ARM: dts: Freescale: Add ecc addr for sata node

Quoted 7 lines

Move the ecc addr from driver to dts.

---
changed for v2:
- Add reg-names to improve driver code.

fix chechpatch warning i.e. updated subject and applied to fsl-qoriq master, awaiting upstream

Can you send patches for ls2088a and ls1028a also

--pk

author
#5 lore raw

PATCH v2 1/2 ARM: dts: Freescale: Add ecc addr for sata node

Hi prabhakar,

Quoted 31 lines

-----Original Message-----
From: Prabhakar Kushwaha
Sent: 2019年5月22日 20:33
To: Peng Ma <[email protected]>; albert.u.boot at aribaud.net; sjg at chromium.org; Fabio Estevam <[email protected]>; York Sun <[email protected]>
Cc: Andy Tang <[email protected]>; Yinbo Zhu <[email protected]>; michal.simek at xilinx.com; u-boot at lists.denx.de; Peng Ma <[email protected]>
Subject: RE: [v2 1/2] ARM: dts: Freescale: Add ecc addr for sata node

Quoted 11 lines

-----Original Message-----
From: Peng Ma <[email protected]>
Sent: Wednesday, April 17, 2019 1:19 PM
To: albert.u.boot at aribaud.net; sjg at chromium.org; Fabio Estevam <[email protected]>; York Sun <[email protected]>; Prabhakar Kushwaha <[email protected]>
Cc: Andy Tang <[email protected]>; Yinbo Zhu <[email protected]>; michal.simek at xilinx.com; u-boot at lists.denx.de; Peng Ma <[email protected]>
Subject: [v2 1/2] ARM: dts: Freescale: Add ecc addr for sata node

Quoted 7 lines

Move the ecc addr from driver to dts.

---
changed for v2:
- Add reg-names to improve driver code.

Quoted 4 lines

fix chechpatch warning i.e. updated subject and applied to fsl-qoriq master, awaiting upstream

Can you send patches for ls2088a and ls1028a also

[Peng Ma] ls2088a is not need to ecc address, I will add ls1028 patch to upstream.

Best Regards,
Peng

Quoted 2 lines

--pk