* [PATCH v2 0/3] Add support for Nuvoton MA35D1 GMAC
@ 2024-11-13 5:18 Joey Lu
2024-11-13 5:18 ` [PATCH v2 1/3] dt-bindings: net: nuvoton: Add schema for MA35 family GMAC Joey Lu
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Joey Lu @ 2024-11-13 5:18 UTC (permalink / raw)
To: andrew+netdev, davem, edumazet, kuba, pabeni, robh, krzk+dt,
conor+dt, mcoquelin.stm32, richardcochran
Cc: alexandre.torgue, joabreu, ychuang3, schung, yclu4,
linux-arm-kernel, netdev, devicetree, linux-kernel, openbmc,
linux-stm32, Joey Lu
This patch series is submitted to add GMAC support for Nuvoton MA35D1
SoC platform. This work involves implementing a GMAC driver glue layer
based on Synopsys DWMAC driver framework to leverage MA35D1's dual GMAC
interface capabilities.
Overview:
1. Added a GMAC driver glue layer for MA35D1 SoC, providing support for
the platform's two GMAC interfaces.
2. Added device tree settings, with specific configurations for our
development boards:
a. SOM board: Configured for two RGMII interfaces.
b. IoT board: Configured with one RGMII and one RMII interface.
3. Added dt-bindings for the GMAC interfaces.
v2:
- Update nuvoton,ma35d1-dwmac.yaml
- Rename file to align with the compatible property.
- Add an argument to syscon to replace mac-id,
with corresponding descriptions.
- Use tx-internal-delay-ps and rx-internal-delay-ps properties for
configurable path delay with corresponding descriptions,
allowing selection between GMAC internal and PHY.
- Add all supported phy-mode options.
- Remove unused properties.
- Update dtsi
- Modify syscon configuration to include an argument for
GMAC interface selection.
- Update dwmac-nuvoton driver
- Remove redundant device information print statements.
- Remove non-global parameters.
- Retrieve GMAC interface selection from the syscon argument.
- Parse Tx and Rx path delays by correct properties.
- Update configurations to support Wake-on-LAN.
Joey Lu (3):
dt-bindings: net: nuvoton: Add schema for MA35 family GMAC
arm64: dts: nuvoton: Add Ethernet nodes
net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family
.../bindings/net/nuvoton,ma35d1-dwmac.yaml | 170 +++++++++++++++++
.../boot/dts/nuvoton/ma35d1-iot-512m.dts | 12 ++
.../boot/dts/nuvoton/ma35d1-som-256m.dts | 10 +
arch/arm64/boot/dts/nuvoton/ma35d1.dtsi | 52 +++++
drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 ++
drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
.../ethernet/stmicro/stmmac/dwmac-nuvoton.c | 179 ++++++++++++++++++
7 files changed, 435 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml
create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c
--
2.34.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 1/3] dt-bindings: net: nuvoton: Add schema for MA35 family GMAC
2024-11-13 5:18 [PATCH v2 0/3] Add support for Nuvoton MA35D1 GMAC Joey Lu
@ 2024-11-13 5:18 ` Joey Lu
2024-11-13 6:15 ` Rob Herring (Arm)
2024-11-13 5:18 ` [PATCH v2 2/3] arm64: dts: nuvoton: Add Ethernet nodes Joey Lu
2024-11-13 5:18 ` [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family Joey Lu
2 siblings, 1 reply; 9+ messages in thread
From: Joey Lu @ 2024-11-13 5:18 UTC (permalink / raw)
To: andrew+netdev, davem, edumazet, kuba, pabeni, robh, krzk+dt,
conor+dt, mcoquelin.stm32, richardcochran
Cc: alexandre.torgue, joabreu, ychuang3, schung, yclu4,
linux-arm-kernel, netdev, devicetree, linux-kernel, openbmc,
linux-stm32, Joey Lu
Create initial schema for Nuvoton MA35 family Gigabit MAC.
Signed-off-by: Joey Lu <a0987203069@gmail.com>
---
.../bindings/net/nuvoton,ma35d1-dwmac.yaml | 170 ++++++++++++++++++
1 file changed, 170 insertions(+)
create mode 100644 Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml
diff --git a/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml b/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml
new file mode 100644
index 000000000000..45eaf13467b3
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml
@@ -0,0 +1,170 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/nuvoton,ma35d1-dwmac.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Nuvoton DWMAC glue layer controller
+
+maintainers:
+ - Joey Lu <yclu4@nuvoton.com>
+
+description:
+ Nuvoton 10/100/1000Mbps Gigabit Ethernet MAC Controller is based on
+ Synopsys DesignWare MAC (version 3.73a).
+
+# We need a select here so we don't match all nodes with 'snps,dwmac'
+select:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - nuvoton,ma35d1-dwmac
+ required:
+ - compatible
+
+allOf:
+ - $ref: snps,dwmac.yaml#
+
+properties:
+ compatible:
+ - items:
+ - enum:
+ - nuvoton,ma35d1-dwmac
+ - const: snps,dwmac-3.70a
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ minItems: 2
+ items:
+ - description: MAC clock
+ - description: PTP clock
+
+ clock-names:
+ minItems: 2
+ items:
+ - const: stmmaceth
+ - const: ptp_ref
+
+ nuvoton,sys:
+ $ref: /schemas/types.yaml#/definitions/phandle-array
+ items:
+ - items:
+ - description: phandle to access syscon registers.
+ - description: GMAC interface ID.
+ enum: [0, 1]
+ description:
+ A phandle to the syscon with one argument that configures system registers
+ for MA35D1's two GMACs. The argument specifies the GMAC interface ID.
+
+ resets:
+ maxItems: 1
+
+ reset-names:
+ items:
+ - const: stmmaceth
+
+ phy-mode:
+ enum:
+ - rmii
+ - rgmii
+ - rgmii-id
+ - rgmii-txid
+ - rgmii-rxid
+
+ phy-handle:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Specifies a reference to a node representing a PHY device.
+
+ tx-internal-delay-ps:
+ enum: [0, 2000]
+ default: 0
+ description:
+ RGMII TX path delay used only when PHY operates in RGMII mode with
+ internal delay (phy-mode is 'rgmii-id' or 'rgmii-txid') in pico-seconds.
+
+ rx-internal-delay-ps:
+ enum: [0, 2000]
+ default: 0
+ description:
+ RGMII RX path delay used only when PHY operates in RGMII mode with
+ internal delay (phy-mode is 'rgmii-id' or 'rgmii-rxid') in pico-seconds.
+
+ mdio:
+ $ref: /schemas/net/mdio.yaml#
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - interrupt-names
+ - clocks
+ - clock-names
+ - nuvoton,sys
+ - resets
+ - reset-names
+ - phy-mode
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/nuvoton,ma35d1-clk.h>
+ #include <dt-bindings/reset/nuvoton,ma35d1-reset.h>
+ //Example 1
+ gmac0: ethernet@40120000 {
+ compatible = "nuvoton,ma35d1-dwmac";
+ reg = <0x0 0x40120000 0x0 0x10000>;
+ interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "macirq";
+ clocks = <&clk EMAC0_GATE>, <&clk EPLL_DIV8>;
+ clock-names = "stmmaceth", "ptp_ref";
+
+ nuvoton,sys = <&sys 0>;
+ resets = <&sys MA35D1_RESET_GMAC0>;
+ reset-names = "stmmaceth";
+
+ phy-mode = "rgmii-id";
+ phy-handle = <ð_phy0>;
+ mdio0 {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ eth_phy0: ethernet-phy@0 {
+ reg = <0>;
+ };
+ };
+ };
+
+ - |
+ //Example 2
+ gmac1: ethernet@40130000 {
+ compatible = "nuvoton,ma35d1-dwmac";
+ reg = <0x0 0x40130000 0x0 0x10000>;
+ interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "macirq";
+ clocks = <&clk EMAC1_GATE>, <&clk EPLL_DIV8>;
+ clock-names = "stmmaceth", "ptp_ref";
+
+ nuvoton,sys = <&sys 1>;
+ resets = <&sys MA35D1_RESET_GMAC1>;
+ reset-names = "stmmaceth";
+
+ phy-mode = "rmii";
+ phy-handle = <ð_phy1>;
+ mdio1 {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ eth_phy1: ethernet-phy@1 {
+ reg = <1>;
+ };
+ };
+ };
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/3] arm64: dts: nuvoton: Add Ethernet nodes
2024-11-13 5:18 [PATCH v2 0/3] Add support for Nuvoton MA35D1 GMAC Joey Lu
2024-11-13 5:18 ` [PATCH v2 1/3] dt-bindings: net: nuvoton: Add schema for MA35 family GMAC Joey Lu
@ 2024-11-13 5:18 ` Joey Lu
2024-11-13 5:18 ` [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family Joey Lu
2 siblings, 0 replies; 9+ messages in thread
From: Joey Lu @ 2024-11-13 5:18 UTC (permalink / raw)
To: andrew+netdev, davem, edumazet, kuba, pabeni, robh, krzk+dt,
conor+dt, mcoquelin.stm32, richardcochran
Cc: alexandre.torgue, joabreu, ychuang3, schung, yclu4,
linux-arm-kernel, netdev, devicetree, linux-kernel, openbmc,
linux-stm32, Joey Lu
Add GMAC nodes for our MA35D1 development boards:
two RGMII interfaces for SOM board, and one RGMII and one RMII
interface for IoT board.
Signed-off-by: Joey Lu <a0987203069@gmail.com>
---
.../boot/dts/nuvoton/ma35d1-iot-512m.dts | 12 +++++
.../boot/dts/nuvoton/ma35d1-som-256m.dts | 10 ++++
arch/arm64/boot/dts/nuvoton/ma35d1.dtsi | 52 +++++++++++++++++++
3 files changed, 74 insertions(+)
diff --git a/arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts b/arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts
index 9482bec1aa57..5cc712ae92d8 100644
--- a/arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts
+++ b/arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts
@@ -18,6 +18,8 @@ aliases {
serial12 = &uart12;
serial13 = &uart13;
serial14 = &uart14;
+ ethernet0 = &gmac0;
+ ethernet1 = &gmac1;
};
chosen {
@@ -126,3 +128,13 @@ &uart14 {
pinctrl-0 = <&pinctrl_uart14>;
status = "okay";
};
+
+&gmac0 {
+ phy-mode = "rgmii-id";
+ status = "okay";
+};
+
+&gmac1 {
+ phy-mode = "rmii";
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts b/arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts
index f6f20a17e501..08f5a7b5b507 100644
--- a/arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts
+++ b/arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts
@@ -18,6 +18,8 @@ aliases {
serial12 = &uart12;
serial14 = &uart14;
serial16 = &uart16;
+ ethernet0 = ð0;
+ ethernet1 = ð1;
};
chosen {
@@ -129,3 +131,11 @@ &uart16 {
pinctrl-0 = <&pinctrl_uart16>;
status = "okay";
};
+
+&gmac0 {
+ status = "okay";
+};
+
+&gmac1 {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/nuvoton/ma35d1.dtsi b/arch/arm64/boot/dts/nuvoton/ma35d1.dtsi
index e51b98f5bdce..7f7c7f8b7ad3 100644
--- a/arch/arm64/boot/dts/nuvoton/ma35d1.dtsi
+++ b/arch/arm64/boot/dts/nuvoton/ma35d1.dtsi
@@ -379,5 +379,57 @@ uart16: serial@40880000 {
clocks = <&clk UART16_GATE>;
status = "disabled";
};
+
+ gmac0: ethernet@40120000 {
+ compatible = "nuvoton,ma35d1-dwmac";
+ reg = <0x0 0x40120000 0x0 0x10000>;
+ interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "macirq";
+ clocks = <&clk EMAC0_GATE>, <&clk EPLL_DIV8>;
+ clock-names = "stmmaceth", "ptp_ref";
+
+ nuvoton,sys = <&sys 0>;
+ resets = <&sys MA35D1_RESET_GMAC0>;
+ reset-names = "stmmaceth";
+ status = "disabled";
+
+ phy-mode = "rgmii-id";
+ phy-handle = <ð_phy0>;
+ mdio0 {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ eth_phy0: ethernet-phy@0 {
+ reg = <0>;
+ };
+ };
+ };
+
+ gmac1: ethernet@40130000 {
+ compatible = "nuvoton,ma35d1-dwmac";
+ reg = <0x0 0x40130000 0x0 0x10000>;
+ interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "macirq";
+ clocks = <&clk EMAC1_GATE>, <&clk EPLL_DIV8>;
+ clock-names = "stmmaceth", "ptp_ref";
+
+ nuvoton,sys = <&sys 1>;
+ resets = <&sys MA35D1_RESET_GMAC1>;
+ reset-names = "stmmaceth";
+ status = "disabled";
+
+ phy-mode = "rgmii-id";
+ phy-handle = <ð_phy1>;
+ mdio1 {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ eth_phy1: ethernet-phy@1 {
+ reg = <1>;
+ };
+ };
+ };
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family
2024-11-13 5:18 [PATCH v2 0/3] Add support for Nuvoton MA35D1 GMAC Joey Lu
2024-11-13 5:18 ` [PATCH v2 1/3] dt-bindings: net: nuvoton: Add schema for MA35 family GMAC Joey Lu
2024-11-13 5:18 ` [PATCH v2 2/3] arm64: dts: nuvoton: Add Ethernet nodes Joey Lu
@ 2024-11-13 5:18 ` Joey Lu
2024-11-13 11:58 ` kernel test robot
2024-11-14 2:56 ` Andrew Lunn
2 siblings, 2 replies; 9+ messages in thread
From: Joey Lu @ 2024-11-13 5:18 UTC (permalink / raw)
To: andrew+netdev, davem, edumazet, kuba, pabeni, robh, krzk+dt,
conor+dt, mcoquelin.stm32, richardcochran
Cc: alexandre.torgue, joabreu, ychuang3, schung, yclu4,
linux-arm-kernel, netdev, devicetree, linux-kernel, openbmc,
linux-stm32, Joey Lu
Add support for Gigabit Ethernet on Nuvoton MA35 series using dwmac driver.
Signed-off-by: Joey Lu <a0987203069@gmail.com>
---
drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 ++
drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
.../ethernet/stmicro/stmmac/dwmac-nuvoton.c | 179 ++++++++++++++++++
3 files changed, 191 insertions(+)
create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 05cc07b8f48c..55d94f669be3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -121,6 +121,17 @@ config DWMAC_MESON
the stmmac device driver. This driver is used for Meson6,
Meson8, Meson8b and GXBB SoCs.
+config DWMAC_NUVOTON
+ tristate "Nuvoton MA35 dwmac support"
+ default ARCH_MA35
+ depends on OF && (ARCH_MA35 || COMPILE_TEST)
+ select MFD_SYSCON
+ help
+ Support for Ethernet controller on Nuvoton MA35 series SoC.
+
+ This selects the Nuvoton MA35 series SoC glue layer support
+ for the stmmac device driver.
+
config DWMAC_QCOM_ETHQOS
tristate "Qualcomm ETHQOS support"
default ARCH_QCOM
diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
index c2f0e91f6bf8..c08fcfdd7b31 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Makefile
+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_DWMAC_IPQ806X) += dwmac-ipq806x.o
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_NUVOTON) += dwmac-nuvoton.o
obj-$(CONFIG_DWMAC_QCOM_ETHQOS) += dwmac-qcom-ethqos.o
obj-$(CONFIG_DWMAC_ROCKCHIP) += dwmac-rk.o
obj-$(CONFIG_DWMAC_RZN1) += dwmac-rzn1.o
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c
new file mode 100644
index 000000000000..68c71d2b46f4
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c
@@ -0,0 +1,179 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/**
+ * dwmac-nuvoton.c - Nuvoton MA35 series DWMAC specific glue layer
+ *
+ * Copyright (C) 2024 Nuvoton Technology Corp.
+ *
+ * Author: Joey Lu <yclu4@nuvoton.com>
+ */
+
+#include <linux/mfd/syscon.h>
+#include <linux/of_device.h>
+#include <linux/of_net.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/stmmac.h>
+
+#include "stmmac.h"
+#include "stmmac_platform.h"
+
+#define PATHDLY_DEC 134
+#define TXDLY_OFST 16
+#define TXDLY_MSK GENMASK(19, 16)
+#define RXDLY_OFST 20
+#define RXDLY_MSK GENMASK(23, 20)
+
+#define REG_SYS_GMAC0MISCR 0x108
+#define REG_SYS_GMAC1MISCR 0x10C
+
+#define MISCR_RMII BIT(0)
+
+struct nvt_priv_data {
+ struct platform_device *pdev;
+ struct regmap *regmap;
+};
+
+static struct nvt_priv_data *
+nuvoton_gmac_setup(struct platform_device *pdev, struct plat_stmmacenet_data *plat)
+{
+ struct device *dev = &pdev->dev;
+ struct nvt_priv_data *bsp_priv;
+ phy_interface_t phy_mode;
+ u32 tx_delay, rx_delay;
+ u32 macid, arg, reg;
+
+ bsp_priv = devm_kzalloc(dev, sizeof(*bsp_priv), GFP_KERNEL);
+ if (!bsp_priv)
+ return ERR_PTR(-ENOMEM);
+
+ bsp_priv->regmap =
+ syscon_regmap_lookup_by_phandle_args(dev->of_node, "nuvoton,sys", 1, &macid);
+ if (IS_ERR(bsp_priv->regmap)) {
+ dev_err(dev, "Failed to get sys register\n");
+ return ERR_PTR(-ENODEV);
+ }
+ if (macid > 1) {
+ dev_err(dev, "Invalid sys arguments\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ if (of_property_read_u32(dev->of_node, "tx-internal-delay-ps", &arg)) {
+ tx_delay = 0; /* Default value is 0 */
+ } else {
+ if (arg > 0 && arg <= 2000) {
+ tx_delay = (arg == 2000) ? 0xF : (arg / PATHDLY_DEC);
+ dev_dbg(dev, "Set Tx path delay to 0x%x\n", tx_delay);
+ } else {
+ tx_delay = 0;
+ dev_err(dev, "Invalid Tx path delay argument. Setting to default.\n");
+ }
+ }
+ if (of_property_read_u32(dev->of_node, "rx-internal-delay-ps", &arg)) {
+ rx_delay = 0; /* Default value is 0 */
+ } else {
+ if (arg > 0 && arg <= 2000) {
+ rx_delay = (arg == 2000) ? 0xF : (arg / PATHDLY_DEC);
+ dev_dbg(dev, "Set Rx path delay to 0x%x\n", rx_delay);
+ } else {
+ rx_delay = 0;
+ dev_err(dev, "Invalid Rx path delay argument. Setting to default.\n");
+ }
+ }
+
+ regmap_read(bsp_priv->regmap,
+ macid == 0 ? REG_SYS_GMAC0MISCR : REG_SYS_GMAC1MISCR, ®);
+ reg &= ~(TXDLY_MSK | RXDLY_MSK);
+
+ if (of_get_phy_mode(pdev->dev.of_node, &phy_mode)) {
+ dev_err(dev, "missing phy mode property\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ switch (phy_mode) {
+ case PHY_INTERFACE_MODE_RGMII:
+ case PHY_INTERFACE_MODE_RGMII_ID:
+ case PHY_INTERFACE_MODE_RGMII_RXID:
+ case PHY_INTERFACE_MODE_RGMII_TXID:
+ reg &= ~MISCR_RMII;
+ break;
+ case PHY_INTERFACE_MODE_RMII:
+ reg |= MISCR_RMII;
+ break;
+ default:
+ dev_err(dev, "Unsupported phy-mode (%d)\n", phy_mode);
+ return ERR_PTR(-EINVAL);
+ }
+
+ if (!(reg & MISCR_RMII)) {
+ reg |= tx_delay << TXDLY_OFST;
+ reg |= rx_delay << RXDLY_OFST;
+ }
+
+ regmap_write(bsp_priv->regmap,
+ macid == 0 ? REG_SYS_GMAC0MISCR : REG_SYS_GMAC1MISCR, reg);
+
+ bsp_priv->pdev = pdev;
+
+ return bsp_priv;
+}
+
+static int nuvoton_gmac_probe(struct platform_device *pdev)
+{
+ struct plat_stmmacenet_data *plat_dat;
+ struct stmmac_resources stmmac_res;
+ int ret;
+
+ ret = stmmac_get_platform_resources(pdev, &stmmac_res);
+ if (ret)
+ return ret;
+
+ plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);
+ if (IS_ERR(plat_dat))
+ return PTR_ERR(plat_dat);
+
+ /* Nuvoton DWMAC configs */
+ plat_dat->has_gmac = 1;
+ plat_dat->tx_fifo_size = 2048;
+ plat_dat->rx_fifo_size = 4096;
+ plat_dat->multicast_filter_bins = 0;
+ plat_dat->unicast_filter_entries = 8;
+ plat_dat->flags &= ~STMMAC_FLAG_USE_PHY_WOL;
+
+ plat_dat->bsp_priv = nuvoton_gmac_setup(pdev, plat_dat);
+ if (IS_ERR(plat_dat->bsp_priv)) {
+ ret = PTR_ERR(plat_dat->bsp_priv);
+ return ret;
+ }
+
+ ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+ if (ret)
+ return ret;
+
+ /* We support WoL by magic packet, override pmt to make it work! */
+ plat_dat->pmt = 1;
+ dev_info(&pdev->dev, "Wake-Up On Lan supported\n");
+ device_set_wakeup_capable(&pdev->dev, 1);
+
+ return 0;
+}
+
+static const struct of_device_id nuvoton_dwmac_match[] = {
+ { .compatible = "nuvoton,ma35d1-dwmac"},
+ { }
+};
+MODULE_DEVICE_TABLE(of, nuvoton_dwmac_match);
+
+static struct platform_driver nuvoton_dwmac_driver = {
+ .probe = nuvoton_gmac_probe,
+ .remove_new = stmmac_pltfr_remove,
+ .driver = {
+ .name = "nuvoton-dwmac",
+ .pm = &stmmac_pltfr_pm_ops,
+ .of_match_table = nuvoton_dwmac_match,
+ },
+};
+module_platform_driver(nuvoton_dwmac_driver);
+
+MODULE_AUTHOR("Joey Lu <yclu4@nuvoton.com>");
+MODULE_DESCRIPTION("Nuvoton DWMAC specific glue layer");
+MODULE_LICENSE("GPL v2");
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: net: nuvoton: Add schema for MA35 family GMAC
2024-11-13 5:18 ` [PATCH v2 1/3] dt-bindings: net: nuvoton: Add schema for MA35 family GMAC Joey Lu
@ 2024-11-13 6:15 ` Rob Herring (Arm)
2024-11-14 9:43 ` Joey Lu
0 siblings, 1 reply; 9+ messages in thread
From: Rob Herring (Arm) @ 2024-11-13 6:15 UTC (permalink / raw)
To: Joey Lu
Cc: krzk+dt, mcoquelin.stm32, davem, conor+dt, pabeni, richardcochran,
devicetree, joabreu, edumazet, linux-kernel, kuba, schung, yclu4,
ychuang3, linux-stm32, openbmc, linux-arm-kernel,
alexandre.torgue, netdev, andrew+netdev
On Wed, 13 Nov 2024 13:18:55 +0800, Joey Lu wrote:
> Create initial schema for Nuvoton MA35 family Gigabit MAC.
>
> Signed-off-by: Joey Lu <a0987203069@gmail.com>
> ---
> .../bindings/net/nuvoton,ma35d1-dwmac.yaml | 170 ++++++++++++++++++
> 1 file changed, 170 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml
>
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: ignoring, error in schema: properties: compatible
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: properties:compatible: [{'items': [{'enum': ['nuvoton,ma35d1-dwmac']}, {'const': 'snps,dwmac-3.70a'}]}] is not of type 'object', 'boolean'
from schema $id: http://json-schema.org/draft-07/schema#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: properties:compatible: [{'items': [{'enum': ['nuvoton,ma35d1-dwmac']}, {'const': 'snps,dwmac-3.70a'}]}] is not of type 'object', 'boolean'
from schema $id: http://devicetree.org/meta-schemas/keywords.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: properties:clock-names: 'oneOf' conditional failed, one must be fixed:
[{'const': 'stmmaceth'}, {'const': 'ptp_ref'}] is too long
[{'const': 'stmmaceth'}, {'const': 'ptp_ref'}] is too short
False schema does not allow 2
1 was expected
hint: "minItems" is only needed if less than the "items" list length
from schema $id: http://devicetree.org/meta-schemas/items.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: properties:clocks: 'oneOf' conditional failed, one must be fixed:
[{'description': 'MAC clock'}, {'description': 'PTP clock'}] is too long
[{'description': 'MAC clock'}, {'description': 'PTP clock'}] is too short
False schema does not allow 2
1 was expected
hint: "minItems" is only needed if less than the "items" list length
from schema $id: http://devicetree.org/meta-schemas/items.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: 'oneOf' conditional failed, one must be fixed:
'unevaluatedProperties' is a required property
'additionalProperties' is a required property
hint: Either unevaluatedProperties or additionalProperties must be present
from schema $id: http://devicetree.org/meta-schemas/core.yaml#
Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.example.dtb: /example-0/ethernet@40120000: failed to match any schema with compatible: ['nuvoton,ma35d1-dwmac']
Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.example.dtb: /example-1/ethernet@40130000: failed to match any schema with compatible: ['nuvoton,ma35d1-dwmac']
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20241113051857.12732-2-a0987203069@gmail.com
The base for the series is generally the latest rc1. A different dependency
should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note
that DT_SCHEMA_FILES can be set to your schema file to speed up checking
your schema. However, it must be unset to test all examples with your schema.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family
2024-11-13 5:18 ` [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family Joey Lu
@ 2024-11-13 11:58 ` kernel test robot
2024-11-14 2:56 ` Andrew Lunn
1 sibling, 0 replies; 9+ messages in thread
From: kernel test robot @ 2024-11-13 11:58 UTC (permalink / raw)
To: Joey Lu, andrew+netdev, davem, edumazet, kuba, pabeni, robh,
krzk+dt, conor+dt, mcoquelin.stm32, richardcochran
Cc: oe-kbuild-all, alexandre.torgue, joabreu, ychuang3, schung, yclu4,
linux-arm-kernel, netdev, devicetree, linux-kernel, openbmc,
linux-stm32, Joey Lu
Hi Joey,
kernel test robot noticed the following build warnings:
[auto build test WARNING on robh/for-next]
[also build test WARNING on net-next/main net/main linus/master v6.12-rc7 next-20241113]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Joey-Lu/dt-bindings-net-nuvoton-Add-schema-for-MA35-family-GMAC/20241113-132300
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link: https://lore.kernel.org/r/20241113051857.12732-4-a0987203069%40gmail.com
patch subject: [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family
config: m68k-allmodconfig (https://download.01.org/0day-ci/archive/20241113/202411131946.ozq1D0f2-lkp@intel.com/config)
compiler: m68k-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241113/202411131946.ozq1D0f2-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202411131946.ozq1D0f2-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c:20: warning: expecting prototype for dwmac(). Prototype was for PATHDLY_DEC() instead
Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for GET_FREE_REGION
Depends on [n]: SPARSEMEM [=n]
Selected by [m]:
- RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m]
vim +20 drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c
19
> 20 #define PATHDLY_DEC 134
21 #define TXDLY_OFST 16
22 #define TXDLY_MSK GENMASK(19, 16)
23 #define RXDLY_OFST 20
24 #define RXDLY_MSK GENMASK(23, 20)
25
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family
2024-11-13 5:18 ` [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family Joey Lu
2024-11-13 11:58 ` kernel test robot
@ 2024-11-14 2:56 ` Andrew Lunn
2024-11-14 9:49 ` Joey Lu
1 sibling, 1 reply; 9+ messages in thread
From: Andrew Lunn @ 2024-11-14 2:56 UTC (permalink / raw)
To: Joey Lu
Cc: andrew+netdev, davem, edumazet, kuba, pabeni, robh, krzk+dt,
conor+dt, mcoquelin.stm32, richardcochran, alexandre.torgue,
joabreu, ychuang3, schung, yclu4, linux-arm-kernel, netdev,
devicetree, linux-kernel, openbmc, linux-stm32
> + if (of_property_read_u32(dev->of_node, "tx-internal-delay-ps", &arg)) {
> + tx_delay = 0; /* Default value is 0 */
> + } else {
> + if (arg > 0 && arg <= 2000) {
> + tx_delay = (arg == 2000) ? 0xF : (arg / PATHDLY_DEC);
> + dev_dbg(dev, "Set Tx path delay to 0x%x\n", tx_delay);
> + } else {
> + tx_delay = 0;
> + dev_err(dev, "Invalid Tx path delay argument. Setting to default.\n");
> + }
> + }
The device tree binding says that only [0, 2000] are valid. You should
enforce this here, return -EINVAL of any other value.
Andrew
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: net: nuvoton: Add schema for MA35 family GMAC
2024-11-13 6:15 ` Rob Herring (Arm)
@ 2024-11-14 9:43 ` Joey Lu
0 siblings, 0 replies; 9+ messages in thread
From: Joey Lu @ 2024-11-14 9:43 UTC (permalink / raw)
To: Rob Herring (Arm)
Cc: krzk+dt, mcoquelin.stm32, davem, conor+dt, pabeni, richardcochran,
devicetree, joabreu, edumazet, linux-kernel, kuba, schung, yclu4,
ychuang3, linux-stm32, openbmc, linux-arm-kernel,
alexandre.torgue, netdev, andrew+netdev
Dear Rob,
Thank you for your reply.
On 11/13/24 14:15, Rob Herring (Arm) wrote:
> On Wed, 13 Nov 2024 13:18:55 +0800, Joey Lu wrote:
>> Create initial schema for Nuvoton MA35 family Gigabit MAC.
>>
>> Signed-off-by: Joey Lu <a0987203069@gmail.com>
>> ---
>> .../bindings/net/nuvoton,ma35d1-dwmac.yaml | 170 ++++++++++++++++++
>> 1 file changed, 170 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml
>>
> My bot found errors running 'make dt_binding_check' on your patch:
>
> yamllint warnings/errors:
>
> dtschema/dtc warnings/errors:
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: ignoring, error in schema: properties: compatible
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: properties:compatible: [{'items': [{'enum': ['nuvoton,ma35d1-dwmac']}, {'const': 'snps,dwmac-3.70a'}]}] is not of type 'object', 'boolean'
> from schema $id: http://json-schema.org/draft-07/schema#
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: properties:compatible: [{'items': [{'enum': ['nuvoton,ma35d1-dwmac']}, {'const': 'snps,dwmac-3.70a'}]}] is not of type 'object', 'boolean'
> from schema $id: http://devicetree.org/meta-schemas/keywords.yaml#
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: properties:clock-names: 'oneOf' conditional failed, one must be fixed:
> [{'const': 'stmmaceth'}, {'const': 'ptp_ref'}] is too long
> [{'const': 'stmmaceth'}, {'const': 'ptp_ref'}] is too short
> False schema does not allow 2
> 1 was expected
> hint: "minItems" is only needed if less than the "items" list length
> from schema $id: http://devicetree.org/meta-schemas/items.yaml#
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: properties:clocks: 'oneOf' conditional failed, one must be fixed:
> [{'description': 'MAC clock'}, {'description': 'PTP clock'}] is too long
> [{'description': 'MAC clock'}, {'description': 'PTP clock'}] is too short
> False schema does not allow 2
> 1 was expected
> hint: "minItems" is only needed if less than the "items" list length
> from schema $id: http://devicetree.org/meta-schemas/items.yaml#
> /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml: 'oneOf' conditional failed, one must be fixed:
> 'unevaluatedProperties' is a required property
> 'additionalProperties' is a required property
> hint: Either unevaluatedProperties or additionalProperties must be present
> from schema $id: http://devicetree.org/meta-schemas/core.yaml#
> Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.example.dtb: /example-0/ethernet@40120000: failed to match any schema with compatible: ['nuvoton,ma35d1-dwmac']
> Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.example.dtb: /example-1/ethernet@40130000: failed to match any schema with compatible: ['nuvoton,ma35d1-dwmac']
>
> doc reference errors (make refcheckdocs):
>
> See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20241113051857.12732-2-a0987203069@gmail.com
>
> The base for the series is generally the latest rc1. A different dependency
> should be noted in *this* patch.
>
> If you already ran 'make dt_binding_check' and didn't see the above
> error(s), then make sure 'yamllint' is installed and dt-schema is up to
> date:
>
> pip3 install dtschema --upgrade
>
> Please check and re-submit after running the above command yourself. Note
> that DT_SCHEMA_FILES can be set to your schema file to speed up checking
> your schema. However, it must be unset to test all examples with your schema.
>
These warnings/errors will be fixed in next patch.
Thanks!
BR,
Joey
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family
2024-11-14 2:56 ` Andrew Lunn
@ 2024-11-14 9:49 ` Joey Lu
0 siblings, 0 replies; 9+ messages in thread
From: Joey Lu @ 2024-11-14 9:49 UTC (permalink / raw)
To: Andrew Lunn
Cc: andrew+netdev, davem, edumazet, kuba, pabeni, robh, krzk+dt,
conor+dt, mcoquelin.stm32, richardcochran, alexandre.torgue,
joabreu, ychuang3, schung, yclu4, linux-arm-kernel, netdev,
devicetree, linux-kernel, openbmc, linux-stm32
Dear Andrew,
Thank you for your reply.
On 11/14/24 10:56, Andrew Lunn wrote:
>> + if (of_property_read_u32(dev->of_node, "tx-internal-delay-ps", &arg)) {
>> + tx_delay = 0; /* Default value is 0 */
>> + } else {
>> + if (arg > 0 && arg <= 2000) {
>> + tx_delay = (arg == 2000) ? 0xF : (arg / PATHDLY_DEC);
>> + dev_dbg(dev, "Set Tx path delay to 0x%x\n", tx_delay);
>> + } else {
>> + tx_delay = 0;
>> + dev_err(dev, "Invalid Tx path delay argument. Setting to default.\n");
>> + }
>> + }
> The device tree binding says that only [0, 2000] are valid. You should
> enforce this here, return -EINVAL of any other value.
>
> Andrew
This will be fixed in the next version. And I will correct error messages.
Thanks!
BR,
Joey
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-11-14 9:51 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-13 5:18 [PATCH v2 0/3] Add support for Nuvoton MA35D1 GMAC Joey Lu
2024-11-13 5:18 ` [PATCH v2 1/3] dt-bindings: net: nuvoton: Add schema for MA35 family GMAC Joey Lu
2024-11-13 6:15 ` Rob Herring (Arm)
2024-11-14 9:43 ` Joey Lu
2024-11-13 5:18 ` [PATCH v2 2/3] arm64: dts: nuvoton: Add Ethernet nodes Joey Lu
2024-11-13 5:18 ` [PATCH v2 3/3] net: stmmac: dwmac-nuvoton: Add dwmac support for MA35 family Joey Lu
2024-11-13 11:58 ` kernel test robot
2024-11-14 2:56 ` Andrew Lunn
2024-11-14 9:49 ` Joey Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).