Skip to contentSkip to conversation

net: dwc_eth_qos: Add glue driver for Intel MAC

PATCH Superseded Philip Oberfichtner 1 participant 6 messages Jun 6, 2024

Subsystems (5)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover net: dwc_eth_qos: Add glue driver for Intel MAC

This patch series implements the dwc_eth_qos glue driver for Intel SOCs. Before doing that, a few general adaptions to the dwc_eth_qos.c main driver are required. Most notably, the preparation for PCI based driver instances, which do not necessarily use a device tree.

This patch series depends on: "net: dwc_eth_qos: mdio: Implement clause 45":
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

Changes in V2: Improve coding-style in PATCH 5/5

Philip Oberfichtner (5):
x86: provide mb() macro
net: dwc_eth_qos: Fix header to be self-contained
net: dwc_eth_qos: Adapt probe() for PCI devices
net: dwc_eth_qos: Implement bind() for PCI devices
net: dwc_eth_qos: Add glue driver for Intel MAC

 arch/x86/include/asm/io.h          |   1 +
 drivers/net/Kconfig                |   7 +
 drivers/net/Makefile               |   1 +
 drivers/net/dwc_eth_qos.c          |  44 ++-
 drivers/net/dwc_eth_qos.h          |   8 +-
 drivers/net/dwc_eth_qos_imx.c      |   1 +
 drivers/net/dwc_eth_qos_intel.c    | 446 +++++++++++++++++++++++++++++
 drivers/net/dwc_eth_qos_intel.h    |  58 ++++
 drivers/net/dwc_eth_qos_qcom.c     |   1 +
 drivers/net/dwc_eth_qos_rockchip.c |   1 +
 drivers/net/dwc_eth_qos_starfive.c |   1 +
 drivers/net/dwc_eth_qos_stm32.c    |   1 +
 include/pci_ids.h                  |   9 +
 13 files changed, 575 insertions(+), 4 deletions(-)
 create mode 100644 drivers/net/dwc_eth_qos_intel.c
 create mode 100644 drivers/net/dwc_eth_qos_intel.h
Signature · 1 line
2.39.2
#1 lore raw

PATCH v2 1/5 x86: provide mb() macro

Implement memory barrier using mfence. Linux does it equivalently [1].

"The MFENCE instruction establishes a memory fence for both loads and stores" [2].

[1] linux/arch/x86/include/asm/barrier.h
[2] Intel® 64 and IA-32 Architectures Software Developer’s Manual

---
 arch/x86/include/asm/io.h | 1 +
 1 file changed, 1 insertion(+)
arch/x86/include/asm/io.h +1 -0
index 5efb2e1b21..936ad6f588 100644
@@ -244,6 +244,7 @@ static inline void sync(void)
  * have some advantages to use them instead of the simple one here.
  */
 #define dmb()		__asm__ __volatile__ ("" : : : "memory")
+#define mb()		__asm__ __volatile__ ("mfence" : : : "memory")
 #define __iormb()	dmb()
 #define __iowmb()	dmb()
 
Signature · 1 line
2.39.2
#2 lore raw

PATCH v2 2/5 net: dwc_eth_qos: Fix header to be self-contained

In reply to Philip Oberfichtner

Before this commit, usage of this header relied on a specific include order. Fix it by including all dependencies.

---
 drivers/net/dwc_eth_qos.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/dwc_eth_qos.h +4 -1
index a06390a698..c7d3e23ab7 100644
@@ -3,8 +3,11 @@
  * Copyright 2022 NXP
  */
 
-#include <phy_interface.h>
+#include <asm/gpio.h>
+#include <clk.h>
 #include <linux/bitops.h>
+#include <phy_interface.h>
+#include <reset.h>
 
 /* Core registers */
 
Signature · 1 line
2.39.2
#3 lore raw

PATCH v2 3/5 net: dwc_eth_qos: Adapt probe() for PCI devices

In reply to Philip Oberfichtner

PCI devices do not necessarily use a device tree. In that case, the driver currently fails to find eqos->config and eqos->regs.

This commit factors out the respective functionality. Device tree usage remains default, but board specific implementations will be possible as well.

---
 drivers/net/dwc_eth_qos.c          | 28 +++++++++++++++++++++++++---
 drivers/net/dwc_eth_qos.h          |  3 +++
 drivers/net/dwc_eth_qos_imx.c      |  1 +
 drivers/net/dwc_eth_qos_qcom.c     |  1 +
 drivers/net/dwc_eth_qos_rockchip.c |  1 +
 drivers/net/dwc_eth_qos_starfive.c |  1 +
 drivers/net/dwc_eth_qos_stm32.c    |  1 +
 7 files changed, 33 insertions(+), 3 deletions(-)
drivers/net/dwc_eth_qos.c +25 -3
index b87634f1f5..34e29301cc 100644
@@ -1376,6 +1376,21 @@ static int eqos_remove_resources_tegra186(struct udevice *dev)
 	return 0;
 }
 
+/*
+ * Get driver data based on the device tree. Boards not using a device tree can
+ * overwrite this function.
+ */
+__weak void *eqos_get_driver_data(struct udevice *dev)
+{
+	return (void *)dev_get_driver_data(dev);
+}
+
+/* Function to get base address, useable for all boards having a device tree. */
+fdt_addr_t eqos_get_base_addr_dt(struct udevice *dev)
+{
+	return dev_read_addr(dev);
+}
+
 static int eqos_probe(struct udevice *dev)
 {
 	struct eqos_priv *eqos = dev_get_priv(dev);
@@ -1384,13 +1399,19 @@ static int eqos_probe(struct udevice *dev)
 	debug("%s(dev=%p):\n", __func__, dev);
 
 	eqos->dev = dev;
-	eqos->config = (void *)dev_get_driver_data(dev);
 
-	eqos->regs = dev_read_addr(dev);
+	eqos->config = eqos_get_driver_data(dev);
+	if (!eqos->config) {
+		pr_err("Failed to get driver data.\n");
+		return -ENODEV;
+	}
+
+	eqos->regs = eqos->config->ops->eqos_get_base_addr(dev);
 	if (eqos->regs == FDT_ADDR_T_NONE) {
-		pr_err("dev_read_addr() failed\n");
+		pr_err("Failed to get device address.\n");
 		return -ENODEV;
 	}
+
 	eqos->mac_regs = (void *)(eqos->regs + EQOS_MAC_REGS_BASE);
 	eqos->mtl_regs = (void *)(eqos->regs + EQOS_MTL_REGS_BASE);
 	eqos->dma_regs = (void *)(eqos->regs + EQOS_DMA_REGS_BASE);
@@ -1497,6 +1518,7 @@ static struct eqos_ops eqos_tegra186_ops = {
 	.eqos_flush_buffer = eqos_flush_buffer_tegra186,
 	.eqos_probe_resources = eqos_probe_resources_tegra186,
 	.eqos_remove_resources = eqos_remove_resources_tegra186,
+	.eqos_get_base_addr = eqos_get_base_addr_dt,
 	.eqos_stop_resets = eqos_stop_resets_tegra186,
 	.eqos_start_resets = eqos_start_resets_tegra186,
 	.eqos_stop_clks = eqos_stop_clks_tegra186,
drivers/net/dwc_eth_qos.h +3 -0
index c7d3e23ab7..829eb0a565 100644
@@ -239,6 +239,7 @@ struct eqos_ops {
 	void (*eqos_flush_buffer)(void *buf, size_t size);
 	int (*eqos_probe_resources)(struct udevice *dev);
 	int (*eqos_remove_resources)(struct udevice *dev);
+	fdt_addr_t (*eqos_get_base_addr)(struct udevice *dev);
 	int (*eqos_stop_resets)(struct udevice *dev);
 	int (*eqos_start_resets)(struct udevice *dev);
 	int (*eqos_stop_clks)(struct udevice *dev);
@@ -290,6 +291,8 @@ void eqos_flush_desc_generic(void *desc);
 void eqos_inval_buffer_generic(void *buf, size_t size);
 void eqos_flush_buffer_generic(void *buf, size_t size);
 int eqos_null_ops(struct udevice *dev);
+void *eqos_get_driver_data(struct udevice *dev);
+fdt_addr_t eqos_get_base_addr_dt(struct udevice *dev);
 
 extern struct eqos_config eqos_imx_config;
 extern struct eqos_config eqos_rockchip_config;
drivers/net/dwc_eth_qos_imx.c +1 -0
index 9c4e390441..21dbf45a22 100644
@@ -218,6 +218,7 @@ static struct eqos_ops eqos_imx_ops = {
 	.eqos_flush_buffer = eqos_flush_buffer_generic,
 	.eqos_probe_resources = eqos_probe_resources_imx,
 	.eqos_remove_resources = eqos_remove_resources_imx,
+	.eqos_get_base_addr = eqos_get_base_addr_dt,
 	.eqos_stop_resets = eqos_null_ops,
 	.eqos_start_resets = eqos_null_ops,
 	.eqos_stop_clks = eqos_stop_clks_imx,
drivers/net/dwc_eth_qos_qcom.c +1 -0
index 8178138fc6..78213e5ca0 100644
@@ -589,6 +589,7 @@ static struct eqos_ops eqos_qcom_ops = {
 	.eqos_flush_buffer = eqos_flush_buffer_generic,
 	.eqos_probe_resources = eqos_probe_resources_qcom,
 	.eqos_remove_resources = eqos_remove_resources_qcom,
+	.eqos_get_base_addr = eqos_get_base_addr_dt,
 	.eqos_stop_resets = eqos_null_ops,
 	.eqos_start_resets = eqos_start_resets_qcom,
 	.eqos_stop_clks = eqos_stop_clks_qcom,
drivers/net/dwc_eth_qos_rockchip.c +1 -0
index fa9e513fae..2c67753ec9 100644
@@ -504,6 +504,7 @@ static struct eqos_ops eqos_rockchip_ops = {
 	.eqos_flush_buffer = eqos_flush_buffer_generic,
 	.eqos_probe_resources = eqos_probe_resources_rk,
 	.eqos_remove_resources = eqos_remove_resources_rk,
+	.eqos_get_base_addr = eqos_get_base_addr_dt,
 	.eqos_stop_resets = eqos_stop_resets_rk,
 	.eqos_start_resets = eqos_start_resets_rk,
 	.eqos_stop_clks = eqos_stop_clks_rk,
drivers/net/dwc_eth_qos_starfive.c +1 -0
index 5be8ac0f1a..341fd2b946 100644
@@ -219,6 +219,7 @@ static struct eqos_ops eqos_jh7110_ops = {
 	.eqos_flush_buffer = eqos_flush_buffer_generic,
 	.eqos_probe_resources = eqos_probe_resources_jh7110,
 	.eqos_remove_resources = eqos_remove_resources_jh7110,
+	.eqos_get_base_addr = eqos_get_base_addr_dt,
 	.eqos_stop_resets = eqos_stop_resets_jh7110,
 	.eqos_start_resets = eqos_start_resets_jh7110,
 	.eqos_stop_clks = eqos_stop_clks_jh7110,
drivers/net/dwc_eth_qos_stm32.c +1 -0
index fbc08bba1d..2c18896b59 100644
@@ -291,6 +291,7 @@ static struct eqos_ops eqos_stm32_ops = {
 	.eqos_flush_buffer = eqos_flush_buffer_generic,
 	.eqos_probe_resources = eqos_probe_resources_stm32,
 	.eqos_remove_resources = eqos_remove_resources_stm32,
+	.eqos_get_base_addr = eqos_get_base_addr_dt,
 	.eqos_stop_resets = eqos_null_ops,
 	.eqos_start_resets = eqos_null_ops,
 	.eqos_stop_clks = eqos_stop_clks_stm32,
Signature · 1 line
2.39.2
#4 lore raw

PATCH v2 4/5 net: dwc_eth_qos: Implement bind() for PCI devices

In reply to Philip Oberfichtner

PCI devices do not necessarily use a device tree. Implement a bind() function to assign unique device names in that case.

---
 drivers/net/dwc_eth_qos.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/net/dwc_eth_qos.c +16 -0
index 34e29301cc..2eeaccc800 100644
@@ -1376,6 +1376,21 @@ static int eqos_remove_resources_tegra186(struct udevice *dev)
 	return 0;
 }
 
+static int eqos_bind(struct udevice *dev)
+{
+	static int dev_num;
+	const size_t name_sz = 16;
+	char name[name_sz];
+
+	/* Device name defaults to DT node name. */
+	if (ofnode_valid(dev_ofnode(dev)))
+		return 0;
+
+	/* Assign unique names in case there is no DT node. */
+	snprintf(name, name_sz, "eth_eqos#%d", dev_num++);
+	return device_set_name(dev, name);
+}
+
 /*
  * Get driver data based on the device tree. Boards not using a device tree can
  * overwrite this function.
@@ -1597,6 +1612,7 @@ U_BOOT_DRIVER(eth_eqos) = {
 	.name = "eth_eqos",
 	.id = UCLASS_ETH,
 	.of_match = of_match_ptr(eqos_ids),
+	.bind	= eqos_bind,
 	.probe = eqos_probe,
 	.remove = eqos_remove,
 	.ops = &eqos_ops,
Signature · 1 line
2.39.2
#5 lore raw

PATCH v2 5/5 net: dwc_eth_qos: Add glue driver for Intel MAC

In reply to Philip Oberfichtner

Add dwc_eth_qos glue driver for the Intel Elkhart-Lake SOC.

---

Notes:
Changes in V2:
- Remove 'struct eqos_intel_config' from dwc_eth_qos.h
- Improve some comments
- Remove duplicate MAC reset

 drivers/net/Kconfig             |   7 +
 drivers/net/Makefile            |   1 +
 drivers/net/dwc_eth_qos_intel.c | 446 ++++++++++++++++++++++++++++++++
 drivers/net/dwc_eth_qos_intel.h |  58 +++++
 include/pci_ids.h               |   9 +
 5 files changed, 521 insertions(+)
 create mode 100644 drivers/net/dwc_eth_qos_intel.c
 create mode 100644 drivers/net/dwc_eth_qos_intel.h
drivers/net/Kconfig +7 -0
index b2d7b49976..b23fe55792 100644
@@ -225,6 +225,13 @@ config DWC_ETH_QOS_IMX
 	  The Synopsys Designware Ethernet QOS IP block with the specific
 	  configuration used in IMX soc.
 
+config DWC_ETH_QOS_INTEL
+	bool "Synopsys DWC Ethernet QOS device support for Intel"
+	depends on DWC_ETH_QOS
+	help
+	  The Synopsys Designware Ethernet QOS IP block with the specific
+	  configuration used in the Intel Elkhart-Lake soc.
+
 config DWC_ETH_QOS_ROCKCHIP
 	bool "Synopsys DWC Ethernet QOS device support for Rockchip SoCs"
 	depends on DWC_ETH_QOS
drivers/net/Makefile +1 -0
index dc3404519d..bd62c65dd5 100644
@@ -20,6 +20,7 @@ obj-$(CONFIG_DRIVER_DM9000) += dm9000x.o
 obj-$(CONFIG_DSA_SANDBOX) += dsa_sandbox.o
 obj-$(CONFIG_DWC_ETH_QOS) += dwc_eth_qos.o
 obj-$(CONFIG_DWC_ETH_QOS_IMX) += dwc_eth_qos_imx.o
+obj-$(CONFIG_DWC_ETH_QOS_INTEL) += dwc_eth_qos_intel.o
 obj-$(CONFIG_DWC_ETH_QOS_ROCKCHIP) += dwc_eth_qos_rockchip.o
 obj-$(CONFIG_DWC_ETH_QOS_QCOM) += dwc_eth_qos_qcom.o
 obj-$(CONFIG_DWC_ETH_QOS_STARFIVE) += dwc_eth_qos_starfive.o
drivers/net/dwc_eth_qos_intel.c new file +446 -0

446 lines not on this page · raw message

drivers/net/dwc_eth_qos_intel.h new file +58 -0

58 lines not on this page · raw message

include/pci_ids.h +9 -0
index f1886c3a75..14acb77d2d 100644
@@ -2601,6 +2601,15 @@
 #define PCI_DEVICE_ID_DCI_PCCOM2	0x0004
 
 #define PCI_VENDOR_ID_INTEL		0x8086
+#define PCI_DEVICE_ID_INTEL_EHL_RGMII1G       0x4b30
+#define PCI_DEVICE_ID_INTEL_EHL_SGMII1        0x4b31
+#define PCI_DEVICE_ID_INTEL_EHL_SGMII2G5      0x4b32
+#define PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G  0x4ba0
+#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G  0x4ba1
+#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII2G5 0x4ba2
+#define PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G  0x4bb0
+#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G  0x4bb1
+#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII2G5 0x4bb2
 #define PCI_DEVICE_ID_INTEL_EESSC	0x0008
 #define PCI_DEVICE_ID_INTEL_SNB_IMC	0x0100
 #define PCI_DEVICE_ID_INTEL_IVB_IMC	0x0154
Signature · 1 line
2.39.2