Skip to contentSkip to conversation

net: Add support for Qualcomm ethqos

PATCH Superseded Vinod Koul 3 participants 12 messages Jan 8, 2019 – Jan 17, 2019

Subsystems (9)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Vinod Koul

author
#0 lore raw

v2 cover net: Add support for Qualcomm ethqos

Some Qualcomm SoCs sport a ethqos controller which use DW ip, so add the glue driver which uses stmmac driver along with DT bindings for this device.

This controller supports rgmii mode and doesn't work with existing phy drivers as they do not remove the phy delay delay in this mode, so fix the two phy drivers tested with this.

Changes in v2:
- Fix the example in dt-binding
- Remove DT property for disable the delay and disable delay for RGMII mode in AT803x and QCA8K PHY drivers

Vinod Koul (5):
dt-bindings: net: Add Qualcomm ethqos binding
net: stmmac: Add driver for Qualcomm ethqos
MAINTAINER: Add entry for Qualcomm ETHQOS ethernet driver
net: phy: at803x: Disable phy delay for RGMII mode
net: dsa: qca8k: disable delay for RGMII mode

 .../devicetree/bindings/net/qcom,dwmac.txt    | 129 +++++
 MAINTAINERS                                   |   8 +
 drivers/net/dsa/qca8k.c                       |  16 +-
 drivers/net/ethernet/stmicro/stmmac/Kconfig   |  10 +
 drivers/net/ethernet/stmicro/stmmac/Makefile  |   1 +
 .../stmicro/stmmac/dwmac-qcom-ethqos.c        | 545 ++++++++++++++++++
 drivers/net/phy/at803x.c                      |  21 +
 7 files changed, 718 insertions(+), 12 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/qcom,dwmac.txt
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH v2 1/5 dt-bindings: net: Add Qualcomm ethqos binding

Add support for Qualcomm ethqos found in some SoCs like QCS404.

---
 .../devicetree/bindings/net/qcom,dwmac.txt    | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/qcom,dwmac.txt
Documentation/devicetree/bindings/net/qcom,dwmac.txt new file +129 -0
new file mode 100644
index 000000000000..652d2213c3ac
@@ -0,0 +1,129 @@
+Qualcomm Ethernet ETHQOS device
+
+This device has following properties:
+
+Required properties:
+
+- compatible: Should be qcom,ethqos-qcs404"
+
+- reg: Address and length of the register set for the device
+
+- reg-names: Should contain register names "stmmaceth", "rgmii"
+
+- clocks: Should contain phandle to clocks
+
+- clock-names: Should contain clock names "stmmaceth", "pclk",
+		"ptp_ref", "rgmii"
+
+- interrupts: Should contain phandle to interrupts
+
+- interrupt-names: Should contain interrupt names "macirq", "eth_lpi"
+
+Rest of the properties are defined in stmmac.txt file in same directory
+
+
+Example:
+
+ethernet: ethernet@7a80000 {
+	compatible = "qcom,ethqos-qcs404";
+	reg = <0x07a80000 0x10000>,
+		<0x07a96000 0x100>;
+	reg-names = "stmmaceth", "rgmii";
+	clock-names = "stmmaceth", "pclk", "ptp_ref", "rgmii";
+	clocks = <&gcc GCC_ETH_AXI_CLK>,
+		<&gcc GCC_ETH_SLAVE_AHB_CLK>,
+		<&gcc GCC_ETH_PTP_CLK>,
+		<&gcc GCC_ETH_RGMII_CLK>;
+	interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+	interrupt-names = "macirq", "eth_lpi";
+	snps,reset-gpio = <&tlmm 60 GPIO_ACTIVE_LOW>;
+	snps,reset-active-low;
+	snps,axi-config = <&stmmac_axi_setup>;
+	snps,mtl-rx-config = <&mtl_rx_setup>;
+	snps,mtl-tx-config = <&mtl_tx_setup>;
+
+	snps,txpbl = <8>;
+	snps,rxpbl = <2>;
+	snps,aal;
+	snps,tso;
+
+	phy-handle = <&phy1>;
+	phy-mode = "rgmii";
+
+	stmmac_axi_setup: stmmac-axi-config {
+		snps,wr_osr_lmt = <15>;
+		snps,rd_osr_lmt = <15>;
+		snps,blen = <256 128 64 32 0 0 0>;
+	};
+
+	mtl_rx_setup: rx-queues-config {
+		snps,rx-queues-to-use = <4>;
+		snps,rx-sched-sp;
+		queue0 {
+			snps,dcb-algorithm;
+			snps,map-to-dma-channel = <0x0>;
+			snps,priority = <0x0>;
+		};
+		queue1 {
+			snps,dcb-algorithm;
+			snps,map-to-dma-channel = <0x1>;
+			snps,priority = <0x1>;
+		};
+		queue2 {
+			snps,dcb-algorithm;
+			snps,map-to-dma-channel = <0x2>;
+			snps,priority = <0x1>;
+		};
+		queue3 {
+			snps,dcb-algorithm;
+			snps,map-to-dma-channel = <0x3>;
+			snps,priority = <0x1>;
+		};
+	};
+
+	mtl_tx_setup: tx-queues-config {
+		snps,tx-queues-to-use = <4>;
+		snps,tx-sched-wrr;
+		queue0 {
+			snps,weight = <0x10>;
+			snps,dcb-algorithm;
+			snps,priority = <0x0>;
+		};
+		queue1 {
+			snps,avb-algorithm;
+			snps,send_slope = <0x1000>;
+			snps,idle_slope = <0x1000>;
+			snps,high_credit = <0x3E800>;
+			snps,low_credit = <0xFFC18000>;
+			snps,priority = <0x1>;
+		};
+		queue2 {
+			snps,avb-algorithm;
+			snps,send_slope = <0x1000>;
+			snps,idle_slope = <0x1000>;
+			snps,high_credit = <0x3E800>;
+			snps,low_credit = <0xFFC18000>;
+			snps,priority = <0x1>;
+		};
+		queue3 {
+			snps,avb-algorithm;
+			snps,send_slope = <0x1000>;
+			snps,idle_slope = <0x1000>;
+			snps,high_credit = <0x3E800>;
+			snps,low_credit = <0xFFC18000>;
+			snps,priority = <0x1>;
+		};
+	};
+
+	mdio {
+		#address-cells = <0x1>;
+		#size-cells = <0x0>;
+		compatible = "snps,dwmac-mdio";
+		phy1: phy@4 {
+			device_type = "ethernet-phy";
+			reg = <0x4>;
+		};
+	};
+
+};
Signature · 1 line
2.20.1
maintainer
#2 lore raw

Re: [PATCH v2 1/5] dt-bindings: net: Add Qualcomm ethqos binding

Documentation/devicetree/bindings/net/qcom,dwmac.txt

Quoted 13 lines · Vinod Koul

Add support for Qualcomm ethqos found in some SoCs like QCS404.

---
 .../devicetree/bindings/net/qcom,dwmac.txt    | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/qcom,dwmac.txt
Documentation/devicetree/bindings/net/qcom,dwmac.txt new file +0 -0
new file mode 100644
index 000000000000..652d2213c3ac

qcom,ethqos.txt?

Documentation/devicetree/bindings/net/qcom,dwmac.txt line 2

Quoted 3 lines
Documentation/devicetree/bindings/net/qcom,dwmac.txt new file +2 -0
@@ -0,0 +1,129 @@
+Qualcomm Ethernet ETHQOS device
+

Perhaps some details like speeds and version of IP. There's lots of variants.

Documentation/devicetree/bindings/net/qcom,dwmac.txt line 7

Quoted 5 lines
Documentation/devicetree/bindings/net/qcom,dwmac.txt new file +5 -0
+This device has following properties:
+
+Required properties:
+
+- compatible: Should be qcom,ethqos-qcs404"

qcom,qcs404-ethqos

Quoted 125 lines
Documentation/devicetree/bindings/net/qcom,dwmac.txt new file +122 -0
+
+- reg: Address and length of the register set for the device
+
+- reg-names: Should contain register names "stmmaceth", "rgmii"
+
+- clocks: Should contain phandle to clocks
+
+- clock-names: Should contain clock names "stmmaceth", "pclk",
+		"ptp_ref", "rgmii"
+
+- interrupts: Should contain phandle to interrupts
+
+- interrupt-names: Should contain interrupt names "macirq", "eth_lpi"
+
+Rest of the properties are defined in stmmac.txt file in same directory
+
+
+Example:
+
+ethernet: ethernet@7a80000 {
+	compatible = "qcom,ethqos-qcs404";
+	reg = <0x07a80000 0x10000>,
+		<0x07a96000 0x100>;
+	reg-names = "stmmaceth", "rgmii";
+	clock-names = "stmmaceth", "pclk", "ptp_ref", "rgmii";
+	clocks = <&gcc GCC_ETH_AXI_CLK>,
+		<&gcc GCC_ETH_SLAVE_AHB_CLK>,
+		<&gcc GCC_ETH_PTP_CLK>,
+		<&gcc GCC_ETH_RGMII_CLK>;
+	interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
+			<GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+	interrupt-names = "macirq", "eth_lpi";
+	snps,reset-gpio = <&tlmm 60 GPIO_ACTIVE_LOW>;
+	snps,reset-active-low;
+	snps,axi-config = <&stmmac_axi_setup>;
+	snps,mtl-rx-config = <&mtl_rx_setup>;
+	snps,mtl-tx-config = <&mtl_tx_setup>;
+
+	snps,txpbl = <8>;
+	snps,rxpbl = <2>;
+	snps,aal;
+	snps,tso;
+
+	phy-handle = <&phy1>;
+	phy-mode = "rgmii";
+
+	stmmac_axi_setup: stmmac-axi-config {
+		snps,wr_osr_lmt = <15>;
+		snps,rd_osr_lmt = <15>;
+		snps,blen = <256 128 64 32 0 0 0>;
+	};
+
+	mtl_rx_setup: rx-queues-config {
+		snps,rx-queues-to-use = <4>;
+		snps,rx-sched-sp;
+		queue0 {
+			snps,dcb-algorithm;
+			snps,map-to-dma-channel = <0x0>;
+			snps,priority = <0x0>;
+		};
+		queue1 {
+			snps,dcb-algorithm;
+			snps,map-to-dma-channel = <0x1>;
+			snps,priority = <0x1>;
+		};
+		queue2 {
+			snps,dcb-algorithm;
+			snps,map-to-dma-channel = <0x2>;
+			snps,priority = <0x1>;
+		};
+		queue3 {
+			snps,dcb-algorithm;
+			snps,map-to-dma-channel = <0x3>;
+			snps,priority = <0x1>;
+		};
+	};
+
+	mtl_tx_setup: tx-queues-config {
+		snps,tx-queues-to-use = <4>;
+		snps,tx-sched-wrr;
+		queue0 {
+			snps,weight = <0x10>;
+			snps,dcb-algorithm;
+			snps,priority = <0x0>;
+		};
+		queue1 {
+			snps,avb-algorithm;
+			snps,send_slope = <0x1000>;
+			snps,idle_slope = <0x1000>;
+			snps,high_credit = <0x3E800>;
+			snps,low_credit = <0xFFC18000>;
+			snps,priority = <0x1>;
+		};
+		queue2 {
+			snps,avb-algorithm;
+			snps,send_slope = <0x1000>;
+			snps,idle_slope = <0x1000>;
+			snps,high_credit = <0x3E800>;
+			snps,low_credit = <0xFFC18000>;
+			snps,priority = <0x1>;
+		};
+		queue3 {
+			snps,avb-algorithm;
+			snps,send_slope = <0x1000>;
+			snps,idle_slope = <0x1000>;
+			snps,high_credit = <0x3E800>;
+			snps,low_credit = <0xFFC18000>;
+			snps,priority = <0x1>;
+		};
+	};
+
+	mdio {
+		#address-cells = <0x1>;
+		#size-cells = <0x0>;
+		compatible = "snps,dwmac-mdio";
+		phy1: phy@4 {
+			device_type = "ethernet-phy";
+			reg = <0x4>;
+		};
+	};
+
+};
Signature · 1 line
2.20.1
author
#3 lore raw

Re: [PATCH v2 1/5] dt-bindings: net: Add Qualcomm ethqos binding

Quoted 9 lines · Rob Herring
Quoted 8 lines · Vinod Koul

Add support for Qualcomm ethqos found in some SoCs like QCS404.

---
 .../devicetree/bindings/net/qcom,dwmac.txt    | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/qcom,dwmac.txt
Quoted 7 lines

Documentation/devicetree/bindings/net/qcom,dwmac.txt

Quoted 5 lines
Documentation/devicetree/bindings/net/qcom,dwmac.txt new file +0 -0
new file mode 100644
index 000000000000..652d2213c3ac

qcom,ethqos.txt?

Sure, will update

Quoted 6 lines

Documentation/devicetree/bindings/net/qcom,dwmac.txt line 2

Quoted 3 lines
Documentation/devicetree/bindings/net/qcom,dwmac.txt new file +2 -0
@@ -0,0 +1,129 @@
+Qualcomm Ethernet ETHQOS device
+

Perhaps some details like speeds and version of IP. There's lots of variants.

yeah it does Gigabit, so will update that as well.

Quoted 8 lines

Documentation/devicetree/bindings/net/qcom,dwmac.txt line 7

Quoted 6 lines
Documentation/devicetree/bindings/net/qcom,dwmac.txt new file +5 -0
+This device has following properties:
+
+Required properties:
+
+- compatible: Should be qcom,ethqos-qcs404"

qcom,qcs404-ethqos

Makes sense, thanks

Signature · 1 line
~Vinod
author
#4 lore raw

PATCH v2 2/5 net: stmmac: Add driver for Qualcomm ethqos

In reply to Vinod Koul

Add glue driver to support Qualcomm ETHQOS using stmmac driver.

This is based on downstream driver written by Siddarth Gupta, Sunil Kumar Paidimarri, Rahul Ankushrao Kawadgave, Nisha Menon, Jagadeesh Babu Challagundla, Chaitanya Pratapa, Lakshit Tyagi, Suraj Jaiswal, Sneh Shah and Ventrapragada Ravi Kanth

---
 drivers/net/ethernet/stmicro/stmmac/Kconfig   |  10 +
 drivers/net/ethernet/stmicro/stmmac/Makefile  |   1 +
 .../stmicro/stmmac/dwmac-qcom-ethqos.c        | 545 ++++++++++++++++++
 3 files changed, 556 insertions(+)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
drivers/net/ethernet/stmicro/stmmac/Kconfig +10 -0
index 6209cc1fb305..f194235153f9 100644
@@ -105,6 +105,16 @@ config DWMAC_OXNAS
 	  This selects the Oxford Semiconductor OXNASSoC glue layer support for
 	  the stmmac device driver. This driver is used for OX820.
 
+config DWMAC_QCOM_ETHQOS
+	tristate "Qualcomm ETHQOS support"
+	default ARCH_QCOM
+	depends on OF && (ARCH_QCOM || COMPILE_TEST)
+	help
+	  Support for the Qualcomm ETHQOS core.
+
+	  This selects the Qualcomm ETHQOS glue layer support for the
+	  stmmac device driver.
+
 config DWMAC_ROCKCHIP
 	tristate "Rockchip dwmac support"
 	default ARCH_ROCKCHIP
drivers/net/ethernet/stmicro/stmmac/Makefile +1 -0
index bf09701d2623..c529c21e9bdd 100644
@@ -16,6 +16,7 @@ obj-$(CONFIG_DWMAC_LPC18XX)	+= dwmac-lpc18xx.o
 obj-$(CONFIG_DWMAC_MEDIATEK)	+= dwmac-mediatek.o
 obj-$(CONFIG_DWMAC_MESON)	+= dwmac-meson.o dwmac-meson8b.o
 obj-$(CONFIG_DWMAC_OXNAS)	+= dwmac-oxnas.o
+obj-$(CONFIG_DWMAC_QCOM_ETHQOS)	+= dwmac-qcom-ethqos.o
 obj-$(CONFIG_DWMAC_ROCKCHIP)	+= dwmac-rk.o
 obj-$(CONFIG_DWMAC_SOCFPGA)	+= dwmac-altr-socfpga.o
 obj-$(CONFIG_DWMAC_STI)		+= dwmac-sti.o
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c new file +545 -0

545 lines not on this page · raw message

Signature · 1 line
2.20.1
author
#5 lore raw

PATCH v2 3/5 MAINTAINER: Add entry for Qualcomm ETHQOS ethernet driver

In reply to Vinod Koul

Add myself and Niklas as maintainers for this driver

---
 MAINTAINERS | 8 ++++++++
 1 file changed, 8 insertions(+)
MAINTAINERS +8 -0
index 32d444476a90..b0af43cda327 100644
@@ -12605,6 +12605,14 @@ L:	[email protected]
 S:	Maintained
 F:	drivers/net/ethernet/qualcomm/emac/
 
+QUALCOMM ETHQOS ETHERNET DRIVER
+M:	Vinod Koul <[email protected]>
+M:	Niklas Cassel <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+F:	Documentation/devicetree/bindings/net/qcom,dwmac.txt
+
 QUALCOMM GENERIC INTERFACE I2C DRIVER
 M:	Alok Chauhan <[email protected]>
 M:	Karthikeyan Ramasubramanian <[email protected]>
Signature · 1 line
2.20.1
author
#6 lore raw

PATCH v2 4/5 net: phy: at803x: Disable phy delay for RGMII mode

In reply to Vinod Koul

For RGMII mode, phy delay should be disabled. Add this case along with disable delay routines.

---
 drivers/net/phy/at803x.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
drivers/net/phy/at803x.c +21 -0
index f9432d053a22..e7cf1d5b0514 100644
@@ -122,6 +122,18 @@ static inline int at803x_enable_tx_delay(struct phy_device *phydev)
 					AT803X_DEBUG_TX_CLK_DLY_EN);
 }
 
+static inline int at803x_disable_rx_delay(struct phy_device *phydev)
+{
+	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
+				     AT803X_DEBUG_RX_CLK_DLY_EN, 0);
+}
+
+static inline int at803x_disable_tx_delay(struct phy_device *phydev)
+{
+	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
+				     AT803X_DEBUG_TX_CLK_DLY_EN, 0);
+}
+
 /* save relevant PHY registers to private copy */
 static void at803x_context_save(struct phy_device *phydev,
 				struct at803x_context *context)
@@ -269,6 +281,15 @@ static int at803x_config_init(struct phy_device *phydev)
 			return ret;
 	}
 
+	if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
+		ret = at803x_disable_rx_delay(phydev);
+		if (ret < 0)
+			return ret;
+		ret = at803x_disable_tx_delay(phydev);
+		if (ret < 0)
+			return ret;
+	}
+
 	return 0;
 }
 
Signature · 1 line
2.20.1
#7 lore raw

Re: [PATCH v2 4/5] net: phy: at803x: Disable phy delay for RGMII mode

Quoted 33 lines · Vinod Koul

For RGMII mode, phy delay should be disabled. Add this case along with disable delay routines.

---
 drivers/net/phy/at803x.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
drivers/net/phy/at803x.c +12 -0
index f9432d053a22..e7cf1d5b0514 100644
@@ -122,6 +122,18 @@ static inline int at803x_enable_tx_delay(struct phy_device *phydev)
 					AT803X_DEBUG_TX_CLK_DLY_EN);
 }
 
+static inline int at803x_disable_rx_delay(struct phy_device *phydev)
+{
+	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
+				     AT803X_DEBUG_RX_CLK_DLY_EN, 0);
+}
+
+static inline int at803x_disable_tx_delay(struct phy_device *phydev)
+{
+	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
+				     AT803X_DEBUG_TX_CLK_DLY_EN, 0);
+}
+
 /* save relevant PHY registers to private copy */
 static void at803x_context_save(struct phy_device *phydev,
 				struct at803x_context *context)
@@ -269,6 +281,15 @@ static int at803x_config_init(struct phy_device *phydev)
 			return ret;

drivers/net/phy/at803x.c static int at803x_config_init(struct phy_device *phydev) · line 291

Quoted 10 lines
drivers/net/phy/at803x.c +8 -0
 	}
 
+	if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
+		ret = at803x_disable_rx_delay(phydev);
+		if (ret < 0)
+			return ret;
+		ret = at803x_disable_tx_delay(phydev);
+		if (ret < 0)
+			return ret;
+	}

This looks right in that PHY_INTERFACE_MODE_RGMII from the perspective of the PHY means no TX/RX delays, but you would also have to take care of PHY_INTERFACE_MODE_RGMII_TXID and disable the RX delay in that case, and PHY_INTERFACE_MODE_RGMII_RXID and disabled the TX delay in that case.

Thanks!

Signature · 1 line
Florian
author
#8 lore raw

Re: [PATCH v2 4/5] net: phy: at803x: Disable phy delay for RGMII mode

Hi Florian,

Thanks for a quick review,

Quoted 15 lines · Florian Fainelli

drivers/net/phy/at803x.c static int at803x_config_init(struct phy_device *phydev) · line 291

Quoted 8 lines · Vinod Koul
drivers/net/phy/at803x.c +8 -0
+	if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
+		ret = at803x_disable_rx_delay(phydev);
+		if (ret < 0)
+			return ret;
+		ret = at803x_disable_tx_delay(phydev);
+		if (ret < 0)
+			return ret;
+	}

This looks right in that PHY_INTERFACE_MODE_RGMII from the perspective of the PHY means no TX/RX delays, but you would also have to take care of PHY_INTERFACE_MODE_RGMII_TXID and disable the RX delay in that case, and PHY_INTERFACE_MODE_RGMII_RXID and disabled the TX delay in that case.

Okay and I guess same about the PHY_INTERFACE_MODE_RGMII_ID. Right now driver enables delay for PHY_INTERFACE_MODE_RGMII_ID and PHY_INTERFACE_MODE_RGMII_TXID, PHY_INTERFACE_MODE_RGMII_RXID so I would remove that as well..

Thanks

Signature · 1 line
~Vinod
author
#9 lore raw

PATCH v2 5/5 net: dsa: qca8k: disable delay for RGMII mode

In reply to Vinod Koul

In RGMII mode we should not have any delay in phy, so disable the delay.

---
 drivers/net/dsa/qca8k.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/net/dsa/qca8k.c +4 -12
index 7e97e620bd44..a4b6cda38016 100644
@@ -420,7 +420,7 @@ qca8k_mib_init(struct qca8k_priv *priv)
 static int
 qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode)
 {
-	u32 reg;
+	u32 reg, val;
 
 	switch (port) {
 	case 0:
@@ -439,17 +439,9 @@ qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode)
 	 */
 	switch (mode) {
 	case PHY_INTERFACE_MODE_RGMII:
-		qca8k_write(priv, reg,
-			    QCA8K_PORT_PAD_RGMII_EN |
-			    QCA8K_PORT_PAD_RGMII_TX_DELAY(3) |
-			    QCA8K_PORT_PAD_RGMII_RX_DELAY(3));
-
-		/* According to the datasheet, RGMII delay is enabled through
-		 * PORT5_PAD_CTRL for all ports, rather than individual port
-		 * registers
-		 */
-		qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL,
-			    QCA8K_PORT_PAD_RGMII_RX_DELAY_EN);
+		/* RGMII mode means no delay so don't enable the delay */
+		val = QCA8K_PORT_PAD_RGMII_EN;
+		qca8k_write(priv, reg, val);
 		break;
 	case PHY_INTERFACE_MODE_SGMII:
 		qca8k_write(priv, reg, QCA8K_PORT_PAD_SGMII_EN);
Signature · 1 line
2.20.1
#10 lore raw

Re: [PATCH v2 5/5] net: dsa: qca8k: disable delay for RGMII mode

Quoted 2 lines · Vinod Koul

In RGMII mode we should not have any delay in phy, so disable the delay.

This seems to apply to the port's MAC itself, so the commit message should be mentioning the port's MAC not the PHY, right?

Quoted 41 lines
---
 drivers/net/dsa/qca8k.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/net/dsa/qca8k.c +4 -12
index 7e97e620bd44..a4b6cda38016 100644
@@ -420,7 +420,7 @@ qca8k_mib_init(struct qca8k_priv *priv)
 static int
 qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode)
 {
-	u32 reg;
+	u32 reg, val;
 
 	switch (port) {
 	case 0:
@@ -439,17 +439,9 @@ qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode)
 	 */
 	switch (mode) {
 	case PHY_INTERFACE_MODE_RGMII:
-		qca8k_write(priv, reg,
-			    QCA8K_PORT_PAD_RGMII_EN |
-			    QCA8K_PORT_PAD_RGMII_TX_DELAY(3) |
-			    QCA8K_PORT_PAD_RGMII_RX_DELAY(3));
-
-		/* According to the datasheet, RGMII delay is enabled through
-		 * PORT5_PAD_CTRL for all ports, rather than individual port
-		 * registers
-		 */
-		qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL,
-			    QCA8K_PORT_PAD_RGMII_RX_DELAY_EN);
+		/* RGMII mode means no delay so don't enable the delay */
+		val = QCA8K_PORT_PAD_RGMII_EN;
+		qca8k_write(priv, reg, val);
 		break;
 	case PHY_INTERFACE_MODE_SGMII:
 		qca8k_write(priv, reg, QCA8K_PORT_PAD_SGMII_EN);
Signature · 1 line
Florian
author
#11 lore raw

Re: [PATCH v2 5/5] net: dsa: qca8k: disable delay for RGMII mode

Hi Florian,

Quoted 6 lines · Florian Fainelli
Quoted 2 lines · Vinod Koul

In RGMII mode we should not have any delay in phy, so disable the delay.

This seems to apply to the port's MAC itself, so the commit message should be mentioning the port's MAC not the PHY, right?

Yes will update

Signature · 1 line
~Vinod