net: dwc_eth_qos: Add glue driver for Intel MAC
Subsystems (5)
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
PATCH RESEND 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
@@ -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
Re: [RESEND PATCH v2 1/5] x86: provide mb() macro
Hi Philip,
Quoted 19 lines · Philip Oberfichtner
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 ManualSigned-off-by Philip Oberfichtner <[email protected]>--- arch/x86/include/asm/io.h | 1 + 1 file changed, 1 insertion(+)arch/x86/include/asm/io.h +0
-0
arch/x86/include/asm/io.h static inline void sync(void)
Quoted 8 lines
arch/x86/include/asm/io.h +1
-1@@ -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() --
This exists in arch/x86/include/asm/cpu.h so can you please remove that one as well, in this patch?
Regards,
Simon
Quoted 2 lines
2.39.2
Re: [RESEND PATCH v2 1/5] x86: provide mb() macro
Hi Simon,
Quoted 29 lines · Simon Glass
Hi Philip,
Quoted 26 lines · Philip Oberfichtner
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 ManualSigned-off-by Philip Oberfichtner <[email protected]>--- arch/x86/include/asm/io.h | 1 + 1 file changed, 1 insertion(+)arch/x86/include/asm/io.h +1
-0@@ -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()
Quoted 4 lines
Quoted 1 line
--
This exists in
arch/x86/include/asm/cpu.hso can you please remove that one as well, in this patch?
Thanks for the hint. I'll include it in V3.
(Assuming I got you correctly, to remove mfence() occurrences and replace them with the new mb() macro).
Best regards,
Philip
Quoted 6 lines
Regards,
SimonQuoted 2 lines
2.39.2
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-22 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH RESEND v2 2/5 net: dwc_eth_qos: Fix header to be self-contained
In reply to Philip OberfichtnerBefore 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
@@ -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
Re: [RESEND PATCH v2 2/5] net: dwc_eth_qos: Fix header to be self-contained
Quoted 4 lines · Philip Oberfichtner
Before this commit, usage of this header relied on a specific include order. Fix it by including all dependencies.
Signed-off-by Philip Oberfichtner <[email protected]>
PATCH RESEND v2 3/5 net: dwc_eth_qos: Adapt probe() for PCI devices
In reply to Philip OberfichtnerPCI 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Re: [RESEND PATCH v2 3/5] net: dwc_eth_qos: Adapt probe() for PCI devices
Quoted 57 lines · Philip Oberfichtner
PCI devices do not necessarily use a device tree. In that case, the driver currently fails to find
eqos->configandeqos->regs.This commit factors out the respective functionality. Device tree usage remains default, but board specific implementations will be possible as well.
Signed-off-by Philip Oberfichtner <[email protected]>--- 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 +21
-2@@ -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 ; + } +
drivers/net/dwc_eth_qos.c static int eqos_probe(struct udevice *dev) · line 1417
Quoted 10 lines
drivers/net/dwc_eth_qos.c +3
-1+ 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 );
Could you factor out the entirety of:
eqos->regs = dev_read_addr(dev);
if (eqos->regs == FDT_ADDR_T_NONE) {
pr_err("dev_read_addr() failed\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);
eqos->tegra186_regs = (void *)(eqos->regs + EQOS_TEGRA186_REGS_BASE);
into some common function, like eqos_get_base_addr_dt() , and call it from .eqos_probe_resources callback instead ? That way you wouldn't have to add new callback specifically for register address.
Re: [RESEND PATCH v2 3/5] net: dwc_eth_qos: Adapt probe() for PCI devices
Hi Marek,
Thank you for the review!
Quoted 77 lines · Marek Vasut
Quoted 54 lines · Philip Oberfichtner
PCI devices do not necessarily use a device tree. In that case, the driver currently fails to find
eqos->configandeqos->regs.This commit factors out the respective functionality. Device tree usage remains default, but board specific implementations will be possible as well.
Signed-off-by Philip Oberfichtner <[email protected]>--- 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 +21
-2@@ -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 ; + } +drivers/net/dwc_eth_qos.c static int eqos_probe(struct udevice *dev) · line 1415
Quoted 10 lines
drivers/net/dwc_eth_qos.c +3
-1+ 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 );Could you factor out the entirety of:
eqos->regs = dev_read_addr(dev); if (eqos->regs == FDT_ADDR_T_NONE) { pr_err("dev_read_addr() failed\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); eqos->tegra186_regs = (void *)(eqos->regs +
Quoted 5 lines
EQOS_TEGRA186_REGS_BASE);into some common function, like
eqos_get_base_addr_dt(), and call it from .eqos_probe_resources callback instead ? That way you wouldn't have to add new callback specifically for register address.
Good point. I'll include it in V3.
Best regards,
Philip
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-22 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH RESEND v2 4/5 net: dwc_eth_qos: Implement bind() for PCI devices
In reply to Philip OberfichtnerPCI 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
@@ -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
PATCH RESEND v2 5/5 net: dwc_eth_qos: Add glue driver for Intel MAC
In reply to Philip OberfichtnerAdd 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
@@ -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
@@ -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
@@ -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
drivers/net/dwc_eth_qos_intel.c line 6
Quoted 8 lines · Philip Oberfichtner
+++
b/drivers/net/dwc_eth_qos_intel.cdrivers/net/dwc_eth_qos_intel.c new file +6
-0@@ -0,0 +1,446 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2023 DENX Software Engineering GmbH +* Philip Oberfichtner <[email protected]> +* +* Based on linux v6.1.38, especially drivers/net/ethernet/stmicro/stmmac
It is 2024 now , also you might want to update this to match Linux 6.6.y which is the current LTS .
Quoted 28 lines
drivers/net/dwc_eth_qos_intel.c new file +28
-0+*/ + +#include <asm/io.h> +#include <dm.h> +#include <linux/delay.h> +#include <miiphy.h> +#include <net.h> +#include <pci.h> + +#include "dwc_eth_qos.h" +#include "dwc_eth_qos_intel.h" + +static struct pci_device_id intel_pci_ids[] = { + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_RGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_SGMII1 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_SGMII2G5 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII2G5 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII2G5 ) }, + {} +}; + +static int __pci_config (struct udevice *dev) +{ +u32 val;
drivers/net/dwc_eth_qos_intel.c line 44
Quoted 10 lines
drivers/net/dwc_eth_qos_intel.c new file +10
-0+ +/* Try to enable I/O accesses and bus-mastering */ +dm_pci_read_config32 (dev,PCI_COMMAND , &val); + val |=PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ; +dm_pci_write_config32 (dev,PCI_COMMAND , val); + +/* Make sure it worked */ +dm_pci_read_config32 (dev,PCI_COMMAND , &val); +if (!(val &PCI_COMMAND_MEMORY )) { +pr_err ("%s: Can't enable I/O memory\n" , __func__);
dev_err() please
drivers/net/dwc_eth_qos_intel.c line 49
Quoted 5 lines
drivers/net/dwc_eth_qos_intel.c new file +5
-0+return -ENOSPC ; + } + +if (!(val &PCI_COMMAND_MASTER )) { +pr_err ("%s: Can't enable bus-mastering\n" , __func__);
dev_err() , fix globally.
drivers/net/dwc_eth_qos_intel.c line 56
Quoted 7 lines
drivers/net/dwc_eth_qos_intel.c new file +7
-0+return -EPERM ; + } + +return 0 ; +} + +static void __limit_fifo_size (struct udevice *dev)
Please drop the leading __ from function names .
Quoted 16 lines
drivers/net/dwc_eth_qos_intel.c new file +16
-0+{ +/* +* As described in Intel Erratum EHL22, Document Number: 636674-2.1, +* the PSE GbE Controllers advertise a wrong RX and TX fifo size. +* Software should limit this value to 64KB. +*/ +struct eqos_priv *eqos =dev_get_priv (dev); + + eqos->tx_fifo_sz =0x8000 ; + eqos->rx_fifo_sz =0x8000 ; +} + +static int __serdes_status_poll (struct udevice *dev, +unsigned char phyaddr,unsigned char phyreg, +unsigned short mask,unsigned short val) +{
drivers/net/dwc_eth_qos_intel.c line 82
Quoted 10 lines
drivers/net/dwc_eth_qos_intel.c new file +10
-0+struct eqos_priv *eqos =dev_get_priv (dev); +unsigned int retries =10 ; +unsigned short val_rd; + +do { +miiphy_read (eqos->mii->name, phyaddr, phyreg, &val_rd); +if ((val_rd & mask) == (val & mask)) +return 0 ; +udelay (POLL_DELAY_US ); + }while (--retries);
Is this some implementation of phy_read_mmd_poll_timeout() ?
Quoted 31 lines
drivers/net/dwc_eth_qos_intel.c new file +31
-0+return -ETIMEDOUT ; +} + +/* Returns -ve if MAC is unknown and 0 on success */ +static int __mac_check_pse (const struct udevice *dev,bool *is_pse) +{ +struct pci_child_plat *plat =dev_get_parent_plat (dev); + +if (!plat || plat->vendor !=PCI_VENDOR_ID_INTEL ) +return -ENXIO ; + +switch (plat->device) { +case PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII2G5 : +case PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII2G5 : + *is_pse =1 ; +return 0 ; + +case PCI_DEVICE_ID_INTEL_EHL_RGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_SGMII1 : +case PCI_DEVICE_ID_INTEL_EHL_SGMII2G5 : + *is_pse =0 ; +return 0 ; + }; + +return -ENXIO ; +} +
drivers/net/dwc_eth_qos_intel.c line 124
Quoted 10 lines
drivers/net/dwc_eth_qos_intel.c new file +10
-0+/* Check if we're in 2G5 mode */ +static bool __serdes_link_mode_2500 (struct udevice *dev) +{ +const unsigned char phyad =INTEL_MGBE_ADHOC_ADDR ; +struct eqos_priv *eqos =dev_get_priv (dev); +unsigned short data; + +miiphy_read (eqos->mii->name, phyad,SERDES_GCR , &data); +if (((data &SERDES_LINK_MODE_MASK ) >>SERDES_LINK_MODE_SHIFT ) == +SERDES_LINK_MODE_2G5 )
Use FIELD_PREP() and FIELD_GET() to simplify this bitfield extraction.
Quoted 24 lines
drivers/net/dwc_eth_qos_intel.c new file +24
-0+return true; + +return false; +} + +static int __serdes_powerup (struct udevice *dev) +{ +/* Based on linux/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c */ + +const unsigned char phyad =INTEL_MGBE_ADHOC_ADDR ; +struct eqos_priv *eqos =dev_get_priv (dev); +unsigned short data; +int ret; +bool is_pse; + +/* Set the serdes rate and the PCLK rate */ +miiphy_read (eqos->mii->name, phyad,SERDES_GCR0 , &data); + + data &= ~SERDES_RATE_MASK ; + data &= ~SERDES_PCLK_MASK ; + +if (__serdes_link_mode_2500 (dev)) + data |=SERDES_RATE_PCIE_GEN2 <<SERDES_RATE_PCIE_SHIFT | + SERDES_PCLK_37p5MHZ <<SERDES_PCLK_SHIFT ;
drivers/net/dwc_eth_qos_intel.c line 158
Quoted 10 lines
drivers/net/dwc_eth_qos_intel.c new file +10
-0+else + data |=SERDES_RATE_PCIE_GEN1 <<SERDES_RATE_PCIE_SHIFT | +SERDES_PCLK_70MHZ <<SERDES_PCLK_SHIFT ; + +miiphy_write (eqos->mii->name, phyad,SERDES_GCR0 , data); + +/* assert clk_req */ +miiphy_read (eqos->mii->name, phyad,SERDES_GCR0 , &data); + data |=SERDES_PLL_CLK ; +miiphy_write (eqos->mii->name, phyad,SERDES_GCR0 , data);
Could this use phy_modify() ?
[...]
Hi Marek,
Quoted 14 lines · Marek Vasut
drivers/net/dwc_eth_qos_intel.c line 6
Quoted 8 lines · Philip Oberfichtner
+++
b/drivers/net/dwc_eth_qos_intel.cdrivers/net/dwc_eth_qos_intel.c new file +6
-0@@ -0,0 +1,446 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2023 DENX Software Engineering GmbH +* Philip Oberfichtner <[email protected]> +* +* Based on linux v6.1.38, especially drivers/net/ethernet/stmicro/stmmac It is 2024 now , also you might want to update this to match Linux 6.6.y which is the current LTS .
Ack for V3.
Quoted 41 lines
Quoted 28 lines
drivers/net/dwc_eth_qos_intel.c new file +28
-0+*/ + +#include <asm/io.h> +#include <dm.h> +#include <linux/delay.h> +#include <miiphy.h> +#include <net.h> +#include <pci.h> + +#include "dwc_eth_qos.h" +#include "dwc_eth_qos_intel.h" + +static struct pci_device_id intel_pci_ids[] = { + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_RGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_SGMII1 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_SGMII2G5 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII2G5 ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G ) }, + {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII2G5 ) }, + {} +}; + +static int __pci_config (struct udevice *dev) +{ +u32 val;drivers/net/dwc_eth_qos_intel.c line 44
Quoted 10 lines
drivers/net/dwc_eth_qos_intel.c new file +10
-0+ +/* Try to enable I/O accesses and bus-mastering */ +dm_pci_read_config32 (dev,PCI_COMMAND , &val); + val |=PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ; +dm_pci_write_config32 (dev,PCI_COMMAND , val); + +/* Make sure it worked */ +dm_pci_read_config32 (dev,PCI_COMMAND , &val); +if (!(val &PCI_COMMAND_MEMORY )) { +pr_err ("%s: Can't enable I/O memory\n" , __func__);
dev_err()please
Quoted 8 lines
drivers/net/dwc_eth_qos_intel.c line 49
Quoted 5 lines
drivers/net/dwc_eth_qos_intel.c new file +5
-0+return -ENOSPC ; + } + +if (!(val &PCI_COMMAND_MASTER )) { +pr_err ("%s: Can't enable bus-mastering\n" , __func__);
dev_err(), fix globally.
Ack for V3.
Quoted 10 lines
drivers/net/dwc_eth_qos_intel.c line 56
Quoted 7 lines
drivers/net/dwc_eth_qos_intel.c new file +7
-0+return -EPERM ; + } + +return 0 ; +} + +static void __limit_fifo_size (struct udevice *dev)Please drop the leading __ from function names .
Ack for V3.
Quoted 20 lines
Quoted 20 lines
drivers/net/dwc_eth_qos_intel.c new file +20
-0+{ +/* +* As described in Intel Erratum EHL22, Document Number: 636674-2.1, +* the PSE GbE Controllers advertise a wrong RX and TX fifo size. +* Software should limit this value to 64KB. +*/ +struct eqos_priv *eqos =dev_get_priv (dev); + + eqos->tx_fifo_sz =0x8000 ; + eqos->rx_fifo_sz =0x8000 ; +} + +static int __serdes_status_poll (struct udevice *dev, +unsigned char phyaddr,unsigned char phyreg, +unsigned short mask,unsigned short val) +{ +struct eqos_priv *eqos =dev_get_priv (dev); +unsigned int retries =10 ; +unsigned short val_rd; +
Quoted 9 lines
drivers/net/dwc_eth_qos_intel.c line 82
Quoted 6 lines
drivers/net/dwc_eth_qos_intel.c new file +6
-0+do { +miiphy_read (eqos->mii->name, phyaddr, phyreg, &val_rd); +if ((val_rd & mask) == (val & mask)) +return 0 ; +udelay (POLL_DELAY_US ); + }while (--retries);Is this some implementation of
phy_read_mmd_poll_timeout()?
Well ... sort of, but see below.
Quoted 35 lines
Quoted 35 lines
drivers/net/dwc_eth_qos_intel.c new file +35
-0+return -ETIMEDOUT ; +} + +/* Returns -ve if MAC is unknown and 0 on success */ +static int __mac_check_pse (const struct udevice *dev,bool *is_pse) +{ +struct pci_child_plat *plat =dev_get_parent_plat (dev); + +if (!plat || plat->vendor !=PCI_VENDOR_ID_INTEL ) +return -ENXIO ; + +switch (plat->device) { +case PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII2G5 : +case PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII2G5 : + *is_pse =1 ; +return 0 ; + +case PCI_DEVICE_ID_INTEL_EHL_RGMII1G : +case PCI_DEVICE_ID_INTEL_EHL_SGMII1 : +case PCI_DEVICE_ID_INTEL_EHL_SGMII2G5 : + *is_pse =0 ; +return 0 ; + }; + +return -ENXIO ; +} + +/* Check if we're in 2G5 mode */ +static bool __serdes_link_mode_2500 (struct udevice *dev) +{ +const unsigned char phyad =INTEL_MGBE_ADHOC_ADDR ;
Quoted 9 lines
drivers/net/dwc_eth_qos_intel.c line 124
Quoted 6 lines
drivers/net/dwc_eth_qos_intel.c new file +6
-0+struct eqos_priv *eqos =dev_get_priv (dev); +unsigned short data; + +miiphy_read (eqos->mii->name, phyad,SERDES_GCR , &data); +if (((data &SERDES_LINK_MODE_MASK ) >>SERDES_LINK_MODE_SHIFT ) == +SERDES_LINK_MODE_2G5 )Use
FIELD_PREP()andFIELD_GET()to simplify this bitfield extraction.
Ack for V3.
Quoted 28 lines
Quoted 28 lines
drivers/net/dwc_eth_qos_intel.c new file +28
-0+return true; + +return false; +} + +static int __serdes_powerup (struct udevice *dev) +{ +/* Based on linux/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c */ + +const unsigned char phyad =INTEL_MGBE_ADHOC_ADDR ; +struct eqos_priv *eqos =dev_get_priv (dev); +unsigned short data; +int ret; +bool is_pse; + +/* Set the serdes rate and the PCLK rate */ +miiphy_read (eqos->mii->name, phyad,SERDES_GCR0 , &data); + + data &= ~SERDES_RATE_MASK ; + data &= ~SERDES_PCLK_MASK ; + +if (__serdes_link_mode_2500 (dev)) + data |=SERDES_RATE_PCIE_GEN2 <<SERDES_RATE_PCIE_SHIFT | + SERDES_PCLK_37p5MHZ <<SERDES_PCLK_SHIFT ; +else + data |=SERDES_RATE_PCIE_GEN1 <<SERDES_RATE_PCIE_SHIFT | +SERDES_PCLK_70MHZ <<SERDES_PCLK_SHIFT ; +
Quoted 9 lines
drivers/net/dwc_eth_qos_intel.c line 158
Quoted 6 lines
drivers/net/dwc_eth_qos_intel.c new file +6
-0+miiphy_write (eqos->mii->name, phyad,SERDES_GCR0 , data); + +/* assert clk_req */ +miiphy_read (eqos->mii->name, phyad,SERDES_GCR0 , &data); + data |=SERDES_PLL_CLK ; +miiphy_write (eqos->mii->name, phyad,SERDES_GCR0 , data);Could this use
phy_modify()?
I do agree using the phy_read()-API all over the place would be nice. But I currently cannot do so, as I do not have a struct phy_device. I am not accessing an actual PHY here, but a MAC-internal submodule.
Please also refer to my comment in the xpcs_access() function below, which suffers from the same problem.
Any advice on how to make this integrate more smoothly with the standard API is very welcome.
Best regards,
Philip
Quoted 1 line
[...]
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-22 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
Quoted 1 line · Philip Oberfichtner
Hi Marek,
Hi,
Quoted 34 lines
Quoted 23 lines
Quoted 23 lines
drivers/net/dwc_eth_qos_intel.c new file +23
-0+static int __serdes_powerup (struct udevice *dev) +{ +/* Based on linux/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c */ + +const unsigned char phyad =INTEL_MGBE_ADHOC_ADDR ; +struct eqos_priv *eqos =dev_get_priv (dev); +unsigned short data; +int ret; +bool is_pse; + +/* Set the serdes rate and the PCLK rate */ +miiphy_read (eqos->mii->name, phyad,SERDES_GCR0 , &data); + + data &= ~SERDES_RATE_MASK ; + data &= ~SERDES_PCLK_MASK ; + +if (__serdes_link_mode_2500 (dev)) + data |=SERDES_RATE_PCIE_GEN2 <<SERDES_RATE_PCIE_SHIFT | + SERDES_PCLK_37p5MHZ <<SERDES_PCLK_SHIFT ; +else + data |=SERDES_RATE_PCIE_GEN1 <<SERDES_RATE_PCIE_SHIFT | +SERDES_PCLK_70MHZ <<SERDES_PCLK_SHIFT ; +Quoted 9 lines
drivers/net/dwc_eth_qos_intel.c line 158
Quoted 6 lines
drivers/net/dwc_eth_qos_intel.c new file +6
-0+miiphy_write (eqos->mii->name, phyad,SERDES_GCR0 , data); + +/* assert clk_req */ +miiphy_read (eqos->mii->name, phyad,SERDES_GCR0 , &data); + data |=SERDES_PLL_CLK ; +miiphy_write (eqos->mii->name, phyad,SERDES_GCR0 , data);Could this use
phy_modify()?
Quoted 3 lines
I do agree using the phy_read()-API all over the place would be nice. But I currently cannot do so, as I do not have a struct
phy_device. I am not accessing an actual PHY here, but a MAC-internal submodule.
Oh ok, then miiphy_write() is fine. Thanks for clarifying.