riscv: spacemit: Add ethernet support for K3
Subsystems (9)
Inochi Amaoto
maintainerv3 cover riscv: spacemit: Add ethernet support for K3
Add initial support for ethernet controller of the Spacemit K3 SoC. This ethernet controller is almost a standard Synopsys DesignWare MAC (version 5.40a). This controller require a syscon device to configure some basic features, like interface type and internal delay.
Change from v2:
- https://lore.kernel.org/netdev/[email protected]
patch 1:
1. remove not needed compatible for select
2. drop empty line in "spacemit,apmu" properties
3. add spacemit,apmu properties to required.
patch 3:
1. remove misused phy_fix_phy_mode_for_mac_delays.
2. use local tx clock instead of the clk_tx_i in the dwmac.
Change from v1:
- https://lore.kernel.org/netdev/[email protected]
patch 1:
1. remove phy clock
patch 3:
1. improve comment and include something special about Spacmit K3 dwmac
2. reorder the included file
3. fix wrong delay macro used in spacemit_dwmac_set_delay.
4. add check for maximum supported delay.
5. use DIV_ROUND_CLOSEST to calculate best delay configuration.
6. use assign for the ctrl register initial value.
7. fix input when calling of_property_read_u32().
Inochi Amaoto (3):
dt-bindings: net: Add support for Spacemit K3 dwmac
net: stmmac: platform: Add snps,dwmac-5.40a IP compatible string
net: stmmac: Add glue layer for Spacemit K3 SoC
.../devicetree/bindings/net/snps,dwmac.yaml | 2 + .../bindings/net/spacemit,k3-dwmac.yaml | 103 +++++++++ drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../ethernet/stmicro/stmmac/dwmac-spacemit.c | 218 ++++++++++++++++++ .../ethernet/stmicro/stmmac/stmmac_platform.c | 1 + 6 files changed, 337 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/spacemit,k3-dwmac.yaml create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c
--
2.52.0
Inochi Amaoto
maintainerPATCH v3 1/3 dt-bindings: net: Add support for Spacemit K3 dwmac
The GMAC IP on Spacemit K3 is almost a standard Synopsys DesignWare MAC (version 5.40a) with some extra clock.
Add necessary compatible string for this device.
--- .../devicetree/bindings/net/snps,dwmac.yaml | 2 + .../bindings/net/spacemit,k3-dwmac.yaml | 103 ++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/spacemit,k3-dwmac.yaml
Documentation/devicetree/bindings/net/snps,dwmac.yaml +2 -0
@@ -34,6 +34,7 @@ select: - snps,dwmac-5.10a - snps,dwmac-5.20 - snps,dwmac-5.30a + - snps,dwmac-5.40a - snps,dwxgmac - snps,dwxgmac-2.10
@@ -653,6 +654,7 @@ allOf: - snps,dwmac-5.10a - snps,dwmac-5.20 - snps,dwmac-5.30a + - snps,dwmac-5.40a - snps,dwxgmac - snps,dwxgmac-2.10 - st,spear600-gmac
Documentation/devicetree/bindings/net/spacemit,k3-dwmac.yaml new file +103 -0
103 lines not on this page · raw message
Signature · 1 line
2.52.0
Rob Herring (Arm)
maintainerRe: [PATCH net-next v3 1/3] dt-bindings: net: Add support for Spacemit K3 dwmac
Quoted 12 lines · Inochi Amaoto
The GMAC IP on Spacemit K3 is almost a standard Synopsys DesignWare MAC (version 5.40a) with some extra clock.
Add necessary compatible string for this device.
Signed-off-by Inochi Amaoto <[email protected]>--- .../devicetree/bindings/net/snps,dwmac.yaml | 2 + .../bindings/net/spacemit,k3-dwmac.yaml | 103 ++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/spacemit,k3-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/spacemit,k3-dwmac.example.dtb: ethernet@cac80000 (spacemit,k3-dwmac): compatible: ['spacemit,k3-dwmac', 'snps,dwmac-5.40a'] does not contain items matching the given schema
from schema $id: http://devicetree.org/schemas/net/snps,dwmac.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/spacemit,k3-dwmac.example.dtb: ethernet@cac80000 (spacemit,k3-dwmac): compatible: ['spacemit,k3-dwmac', 'snps,dwmac-5.40a'] does not contain items matching the given schema
from schema $id: http://devicetree.org/schemas/net/spacemit,k3-dwmac.yaml
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/net/spacemit,k3-dwmac.example.dtb: ethernet@cac80000 (spacemit,k3-dwmac): Unevaluated properties are not allowed ('phy-handle', 'phy-mode' were unexpected)
from schema $id: http://devicetree.org/schemas/net/spacemit,k3-dwmac.yaml
doc reference errors (make refcheckdocs):
See https://patchwork.kernel.org/project/devicetree/patch/[email protected]
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.
Inochi Amaoto
maintainerPATCH v3 2/3 net: stmmac: platform: Add snps,dwmac-5.40a IP compatible string
In reply to Inochi AmaotoAdd compatible string for 5.40a version that can avoid to define some platform data in the glue layer.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +1 -0
@@ -396,6 +396,7 @@ static const char * const stmmac_gmac4_compats[] = {"snps,dwmac-5.10a" ,"snps,dwmac-5.20" ,"snps,dwmac-5.30a" , +"snps,dwmac-5.40a" , NULL };
Signature · 1 line
2.52.0
Inochi Amaoto
maintainerPATCH v3 3/3 net: stmmac: Add glue layer for Spacemit K3 SoC
In reply to Inochi AmaotoThe etherenet controller on Spacemit K3 SoC is Synopsys DesignWare MAC (version 5.40a), with the following special point:
1. The rate of the tx clock line is auto changed when the mac speed rate is changed, and no need for changing the input tx clock.
2. This controller require a extra syscon device to configure the interface type, enable wake up interrupt and delay configuration if needed.
Add Spacemit dwmac driver support on the Spacemit K3 SoC.
--- drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../ethernet/stmicro/stmmac/dwmac-spacemit.c | 218 ++++++++++++++++++ 3 files changed, 231 insertions(+) create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c
drivers/net/ethernet/stmicro/stmmac/Kconfig +12 -0
@@ -216,6 +216,18 @@ config DWMAC_SOPHGO for the stmmac device driver. This driver is used for the ethernet controllers on various Sophgo SoCs. +config DWMAC_SPACEMIT + tristate "Spacemit dwmac support" + depends on OF && (ARCH_SPACEMIT || COMPILE_TEST) + select MFD_SYSCON + default m if ARCH_SPACEMIT + help + Support for ethernet controllers on Spacemit RISC-V SoCs + + This selects the Spacemit platform specific glue layer support + for the stmmac device driver. This driver is used for the + Spacemit K3 ethernet controllers. + config DWMAC_STARFIVE tristate "StarFive dwmac support" depends on OF && (ARCH_STARFIVE || COMPILE_TEST)
drivers/net/ethernet/stmicro/stmmac/Makefile +1 -0
@@ -27,6 +27,7 @@ obj-$(CONFIG_DWMAC_RZN1) += dwmac-rzn1.o obj-$(CONFIG_DWMAC_S32) += dwmac-s32.o obj-$(CONFIG_DWMAC_SOCFPGA) += dwmac-altr-socfpga.o obj-$(CONFIG_DWMAC_SOPHGO) += dwmac-sophgo.o +obj-$(CONFIG_DWMAC_SPACEMIT) += dwmac-spacemit.o obj-$(CONFIG_DWMAC_STARFIVE) += dwmac-starfive.o obj-$(CONFIG_DWMAC_STI) += dwmac-sti.o obj-$(CONFIG_DWMAC_STM32) += dwmac-stm32.o
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +218 -0
218 lines not on this page · raw message
Signature · 1 line
2.52.0
Re: [PATCH net-next v3 3/3] net: stmmac: Add glue layer for Spacemit K3 SoC
Hi Inochi,
I have some comments below.
Quoted 1 line · Inochi Amaoto
The etherenet controller on Spacemit K3 SoC is Synopsys DesignWare
Typo: etherenet -> ethernet
Quoted 1 line
MAC (version 5.40a), with the following special point:
Nit: point -> points
Quoted 76 lines
1. The rate of the tx clock line is auto changed when the mac speed rate is changed, and no need for changing the input tx clock.
2. This controller require a extra syscon device to configure the interface type, enable wake up interrupt and delay configuration if needed.Add Spacemit dwmac driver support on the Spacemit K3 SoC.
Signed-off-by Inochi Amaoto <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../ethernet/stmicro/stmmac/dwmac-spacemit.c | 218 ++++++++++++++++++ 3 files changed, 231 insertions(+) create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c[...]
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +58
-0+ +/* dline register bits */ +#define RGMII_RX_DLINE_EN BIT(0) +#define RGMII_RX_DLINE_STEP GENMASK(5, 4) +#define RGMII_RX_DLINE_CODE GENMASK(15, 8) +#define RGMII_TX_DLINE_EN BIT(16) +#define RGMII_TX_DLINE_STEP GENMASK(21, 20) +#define RGMII_TX_DLINE_CODE GENMASK(31, 24) + +#define MAX_DLINE_DELAY_CODE 0xff +#define MAX_WORKED_DELAY 2800 + +/* Note: the delay step value is at 0.1ps */ +static const unsigned int k3_delay_step_10x[4 ] = { +367 ,493 ,559 ,685 +}; + +static int spacemit_dwmac_set_delay (struct regmap *apmu, +unsigned int dline_offset, +unsigned int tx_code,unsigned int tx_config, +unsigned int rx_code,unsigned int rx_config) +{ +unsigned int mask, val; + + mask =RGMII_TX_DLINE_STEP |RGMII_TX_DLINE_CODE |RGMII_TX_DLINE_EN | +RGMII_RX_DLINE_STEP |RGMII_RX_DLINE_CODE |RGMII_RX_DLINE_EN ; + val =FIELD_PREP (RGMII_TX_DLINE_STEP , tx_config) | +FIELD_PREP (RGMII_TX_DLINE_CODE , tx_code) |RGMII_TX_DLINE_EN | +FIELD_PREP (RGMII_RX_DLINE_STEP , rx_config) | +FIELD_PREP (RGMII_RX_DLINE_CODE , rx_code) |RGMII_RX_DLINE_EN ; + +return regmap_update_bits (apmu, dline_offset, mask, val); +} + +static int spacemit_dwmac_detected_delay_value (unsigned int delay, +unsigned int *config) +{ +unsigned int best_delay =0 ; +unsigned int best_config =0 ; +int best_code =0 ; +int i; + +if (delay ==0 ) +return 0 ; + +if (delay >MAX_WORKED_DELAY ) +return -EINVAL ; + +/* +* Note K3 require a specific factor for calculate +* the delay, in this scenario it is 0.9. So the +* formula is code * step / 10 * 0.9 +*/ +for (i =0 ; i <ARRAY_SIZE (k3_delay_step_10x); i++) { +unsigned int step = k3_delay_step_10x[i]; +int code =DIV_ROUND_CLOSEST (delay *10 *10 , step *9 ); +unsigned int tmp = code * step *9 /10 /10 ; +
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c line 93
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +10
-0+if (abs (tmp - delay) <abs (best_delay - delay)) { + best_code = code; + best_delay = tmp; + best_config = i; + } + } + + *config = best_config; + +return best_code;
Is this really necessary? For K1 I just used the smallest step size.
It seems to me you have, for the smallest step size, about 36.7ps * 0.9 = 33ps per step. Theoretically speaking that lets you fine tune the delay to within 1% of the 2ns total required RGMII delay (MAC + PCB + PHY). In practice this number shouldn't be that marginal.
Inochi Amaoto
maintainerRe: [PATCH net-next v3 3/3] net: stmmac: Add glue layer for Spacemit K3 SoC
Quoted 9 lines · Vivian Wang
Hi Inochi,
I have some comments below.
Quoted 1 line · Inochi Amaoto
The etherenet controller on Spacemit K3 SoC is Synopsys DesignWare
Typo: etherenet -> ethernet
Quoted 1 line
MAC (version 5.40a), with the following special point:
Nit: point -> points
Thanks
Quoted 89 lines
Quoted 76 lines
1. The rate of the tx clock line is auto changed when the mac speed rate is changed, and no need for changing the input tx clock.
2. This controller require a extra syscon device to configure the interface type, enable wake up interrupt and delay configuration if needed.Add Spacemit dwmac driver support on the Spacemit K3 SoC.
Signed-off-by Inochi Amaoto <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../ethernet/stmicro/stmmac/dwmac-spacemit.c | 218 ++++++++++++++++++ 3 files changed, 231 insertions(+) create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c[...]
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +58
-0+ +/* dline register bits */ +#define RGMII_RX_DLINE_EN BIT(0) +#define RGMII_RX_DLINE_STEP GENMASK(5, 4) +#define RGMII_RX_DLINE_CODE GENMASK(15, 8) +#define RGMII_TX_DLINE_EN BIT(16) +#define RGMII_TX_DLINE_STEP GENMASK(21, 20) +#define RGMII_TX_DLINE_CODE GENMASK(31, 24) + +#define MAX_DLINE_DELAY_CODE 0xff +#define MAX_WORKED_DELAY 2800 + +/* Note: the delay step value is at 0.1ps */ +static const unsigned int k3_delay_step_10x[4 ] = { +367 ,493 ,559 ,685 +}; + +static int spacemit_dwmac_set_delay (struct regmap *apmu, +unsigned int dline_offset, +unsigned int tx_code,unsigned int tx_config, +unsigned int rx_code,unsigned int rx_config) +{ +unsigned int mask, val; + + mask =RGMII_TX_DLINE_STEP |RGMII_TX_DLINE_CODE |RGMII_TX_DLINE_EN | +RGMII_RX_DLINE_STEP |RGMII_RX_DLINE_CODE |RGMII_RX_DLINE_EN ; + val =FIELD_PREP (RGMII_TX_DLINE_STEP , tx_config) | +FIELD_PREP (RGMII_TX_DLINE_CODE , tx_code) |RGMII_TX_DLINE_EN | +FIELD_PREP (RGMII_RX_DLINE_STEP , rx_config) | +FIELD_PREP (RGMII_RX_DLINE_CODE , rx_code) |RGMII_RX_DLINE_EN ; + +return regmap_update_bits (apmu, dline_offset, mask, val); +} + +static int spacemit_dwmac_detected_delay_value (unsigned int delay, +unsigned int *config) +{ +unsigned int best_delay =0 ; +unsigned int best_config =0 ; +int best_code =0 ; +int i; + +if (delay ==0 ) +return 0 ; + +if (delay >MAX_WORKED_DELAY ) +return -EINVAL ; + +/* +* Note K3 require a specific factor for calculate +* the delay, in this scenario it is 0.9. So the +* formula is code * step / 10 * 0.9 +*/ +for (i =0 ; i <ARRAY_SIZE (k3_delay_step_10x); i++) { +unsigned int step = k3_delay_step_10x[i]; +int code =DIV_ROUND_CLOSEST (delay *10 *10 , step *9 ); +unsigned int tmp = code * step *9 /10 /10 ; +drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c line 93
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +10
-0+if (abs (tmp - delay) <abs (best_delay - delay)) { + best_code = code; + best_delay = tmp; + best_config = i; + } + } + + *config = best_config; + +return best_code;Is this really necessary? For K1 I just used the smallest step size.
Quoted 5 lines
It seems to me you have, for the smallest step size, about 36.7ps * 0.9 = 33ps per step. Theoretically speaking that lets you fine tune the delay to within 1% of the 2ns total required RGMII delay (MAC + PCB + PHY). In practice this number shouldn't be that marginal.
I think it is reasonable, I will take you advice and use the smallest step size.
Regards,
Inochi
Re: [PATCH net-next v3 3/3] net: stmmac: Add glue layer for Spacemit K3 SoC
In reply to Inochi AmaotoQuoted 5 lines · Inochi Amaoto
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +5
-0+#include <linux/clk.h> +#include <linux/math.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/mfd/syscon.h>
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c line 22
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +10
-0+#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/property.h> +#include <linux/regmap.h> + +#include "stmmac_platform.h" + +/* ctrl register bits */ +#define PHY_INTF_RGMII BIT(3) +#define PHY_INTF_MII BIT(4)
Please add a suitable prefix for these.
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c line 25
Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +3
-0+ +#define WAKE_IRQ_EN BIT(9) +#define PHY_IRQ_EN BIT(12)
While you're renaming the PHY_INTF_*, you might wish to also add the same prefix here to identify that they're all part of the same register.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
PATCH 1/2 net: stmmac: thead: avoid conflicts with PHY_INTF_* definitions
Avoid conflicts between stmmac PHY_INTF_* and GMAC_INTF_CTRL register definitions by replacing the PHY_ prefix with GMAC_.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c +5 -5
@@ -37,9 +37,9 @@#define GMAC_GTXCLK_SEL 0x18#define GMAC_GTXCLK_SEL_PLL BIT(0)#define GMAC_INTF_CTRL 0x1c -#define PHY_INTF_MASK BIT(0) -#define PHY_INTF_RGMII FIELD_PREP(PHY_INTF_MASK, 1) -#define PHY_INTF_MII_GMII FIELD_PREP(PHY_INTF_MASK, 0) +#define GMAC_INTF_MASK BIT(0) +#define GMAC_INTF_RGMII FIELD_PREP(GMAC_INTF_MASK, 1) +#define GMAC_INTF_MII_GMII FIELD_PREP(GMAC_INTF_MASK, 0)#define GMAC_TXCLK_OEN 0x20#define TXCLK_DIR_MASK BIT(0)#define TXCLK_DIR_OUTPUT FIELD_PREP(TXCLK_DIR_MASK, 0)
@@ -58,13 +58,13 @@ static int thead_dwmac_set_phy_if(struct plat_stmmacenet_data *plat)switch (plat->phy_interface) {case PHY_INTERFACE_MODE_MII : - phyif =PHY_INTF_MII_GMII ; + phyif =GMAC_INTF_MII_GMII ;break ;case PHY_INTERFACE_MODE_RGMII :case PHY_INTERFACE_MODE_RGMII_ID :case PHY_INTERFACE_MODE_RGMII_TXID :case PHY_INTERFACE_MODE_RGMII_RXID : - phyif =PHY_INTF_RGMII ; + phyif =GMAC_INTF_RGMII ;break ;default : dev_err(dwmac->dev, "unsupported phy interface %s\n",
Signature · 1 line
2.47.3
Re: [PATCH net-next 1/2] net: stmmac: thead: avoid conflicts with PHY_INTF_* definitions
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 7 lines · On Wed, 28 Jan 2026 10:47:59 +0000 you wrote:
Avoid conflicts between stmmac PHY_INTF_* and
GMAC_INTF_CTRLregister definitions by replacing thePHY_prefix withGMAC_.Signed-off-by Russell King (Oracle) <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Here is the summary with links:
- [net-next,1/2] net: stmmac: thead: avoid conflicts with PHY_INTF_* definitions
https://git.kernel.org/netdev/net-next/c/88afa0dd655c
- [net-next,2/2] net: stmmac: report active PHY interface (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
PATCH 2/2 net: stmmac: report active PHY interface
In reply to Russell King (Oracle)Report the active PHY interface from the point of view of the dwmac hardware to the kernel log, where the core supports reading this.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 6 +++ .../ethernet/stmicro/stmmac/dwmac1000_dma.c | 2 + .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 2 + .../net/ethernet/stmicro/stmmac/dwxgmac2.h | 1 + .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 1 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 52 +++++++++++++++++++ 6 files changed, 64 insertions(+)
drivers/net/ethernet/stmicro/stmmac/common.h +6 -0
@@ -323,6 +323,10 @@ struct stmmac_safety_stats {#define PHY_INTF_SEL_SMII 6#define PHY_INTF_SEL_REVMII 7 +/* XGMAC uses a different encoding - from the AgileX5 documentation */ +#define PHY_INTF_GMII 0 +#define PHY_INTF_RGMII 1 +/* MSI defines */ #define STMMAC_MSI_VEC_MAX 32
@@ -512,6 +516,8 @@ struct dma_features {unsigned int dbgmem;/* Number of Policing Counters */ unsigned int pcsel; +/* Active PHY interface, PHY_INTF_SEL_xxx */ +u8 actphyif; };/* RX Buffer size must be multiple of 4/8/16 bytes */
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +2 -0
@@ -239,6 +239,8 @@ static int dwmac1000_get_hw_feature(void __iomem *ioaddr,/* Alternate (enhanced) DESC mode */ dma_cap->enh_desc = (hw_cap &DMA_HW_FEAT_ENHDESSEL ) >>24 ; + dma_cap->actphyif =FIELD_GET (DMA_HW_FEAT_ACTPHYIF , hw_cap); +return 0 ; }
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +2 -0
@@ -382,6 +382,8 @@ static int dwmac4_get_hw_feature(void __iomem *ioaddr, dma_cap->vlins = (hw_cap &GMAC_HW_FEAT_SAVLANINS ) >>27 ; dma_cap->arpoffsel = (hw_cap &GMAC_HW_FEAT_ARPOFFSEL ) >>9 ; + dma_cap->actphyif =FIELD_GET (DMA_HW_FEAT_ACTPHYIF , hw_cap); +/* MAC HW feature1 */ hw_cap =readl (ioaddr +GMAC_HW_FEATURE1 ); dma_cap->l3l4fnum = (hw_cap &GMAC_HW_FEAT_L3L4FNUM ) >>27 ;
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +1 -0
@@ -107,6 +107,7 @@#define XGMAC_HWFEAT_VXN BIT(29)#define XGMAC_HWFEAT_SAVLANINS BIT(27)#define XGMAC_HWFEAT_TSSTSSEL GENMASK(26, 25) +#define XGMAC_HWFEAT_PHYSEL GENMASK(24, 23)#define XGMAC_HWFEAT_ADDMACADRSEL GENMASK(22, 18)#define XGMAC_HWFEAT_RXCOESEL BIT(16)#define XGMAC_HWFEAT_TXCOESEL BIT(14)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +1 -0
@@ -364,6 +364,7 @@ static int dwxgmac2_get_hw_feature(void __iomem *ioaddr, dma_cap->vxn = (hw_cap &XGMAC_HWFEAT_VXN ) >>29 ; dma_cap->vlins = (hw_cap &XGMAC_HWFEAT_SAVLANINS ) >>27 ; dma_cap->tssrc = (hw_cap &XGMAC_HWFEAT_TSSTSSEL ) >>25 ; + dma_cap->actphyif =FIELD_GET (XGMAC_HWFEAT_PHYSEL , hw_cap); dma_cap->multi_addr = (hw_cap &XGMAC_HWFEAT_ADDMACADRSEL ) >>18 ; dma_cap->rx_coe = (hw_cap &XGMAC_HWFEAT_RXCOESEL ) >>16 ; dma_cap->tx_coe = (hw_cap &XGMAC_HWFEAT_TXCOESEL ) >>14 ;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +52 -0
70 lines not on this page · raw message
Signature · 1 line
2.47.3
Inochi Amaoto
maintainerRe: [PATCH net-next v3 3/3] net: stmmac: Add glue layer for Spacemit K3 SoC
In reply to Russell King (Oracle)Quoted 19 lines · Russell King (Oracle)
Quoted 5 lines · Inochi Amaoto
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +5
-0+#include <linux/clk.h> +#include <linux/math.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/mfd/syscon.h> drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c line 22
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +10
-0+#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/property.h> +#include <linux/regmap.h> + +#include "stmmac_platform.h" + +/* ctrl register bits */ +#define PHY_INTF_RGMII BIT(3) +#define PHY_INTF_MII BIT(4)Please add a suitable prefix for these.
Quoted 7 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c line 25
Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c new file +3
-0+ +#define WAKE_IRQ_EN BIT(9) +#define PHY_IRQ_EN BIT(12)While you're renaming the PHY_INTF_*, you might wish to also add the same prefix here to identify that they're all part of the same register.
I think this is good for me. I will add the "CTRL" prefix to identify these are all from ctrl register.
Regards,
Inochi