Add EMAC3 support for sa8540p-ride
Subsystems (8)
v3 cover Add EMAC3 support for sa8540p-ride
This is a forward port / upstream refactor of code delivered downstream by Qualcomm over at [0] to enable the DWMAC5 based implementation called EMAC3 on the sa8540p-ride dev board.
From what I can tell with the board schematic in hand, as well as the code delivered, the main changes needed are:
1. A new address space layout for /dwmac5/EMAC3 MTL/DMA regs
2. A new programming sequence required for the EMAC3 base platforms
This series makes the change for 1 above as well as other housekeeping items such as converting dt-bindings to yaml, etc.
As requested[1], it has been split up by compile time / maintainer tree. I will post a link to the associated devicetree changes that together with this series get the hardware functioning.
[0] https://git.codelinaro.org/clo/la/kernel/ark-5.14/-/commit/510235ad02d7f0df478146fb00d7a4ba74821b17
[1] https://lore.kernel.org/netdev/[email protected]/
v2: https://lore.kernel.org/netdev/[email protected]/
v1: https://lore.kernel.org/netdev/[email protected]/
Thanks,
Andrew
Andrew Halaney (9):
dt-bindings: net: qcom,ethqos: Add Qualcomm sc8280xp compatibles
net: stmmac: Remove unnecessary if statement brackets
net: stmmac: Fix DMA typo
net: stmmac: Remove some unnecessary void pointers
net: stmmac: Pass stmmac_priv in some callbacks
net: stmmac: dwmac4: Allow platforms to specify some DMA/MTL offsets
net: stmmac: dwmac-qcom-ethqos: Respect phy-mode and TX delay
net: stmmac: dwmac-qcom-ethqos: Use loopback_en for all speeds
net: stmmac: dwmac-qcom-ethqos: Add EMAC3 support
Bhupesh Sharma (3):
dt-bindings: net: snps,dwmac: Update interrupt-names
dt-bindings: net: snps,dwmac: Add Qualcomm Ethernet ETHQOS compatibles
dt-bindings: net: qcom,ethqos: Convert bindings to yaml
.../devicetree/bindings/net/qcom,ethqos.txt | 66 ------ .../devicetree/bindings/net/qcom,ethqos.yaml | 111 ++++++++++ .../devicetree/bindings/net/snps,dwmac.yaml | 9 +- MAINTAINERS | 2 +- .../net/ethernet/stmicro/stmmac/chain_mode.c | 10 +- drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- .../stmicro/stmmac/dwmac-qcom-ethqos.c | 177 +++++++++++---- .../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 36 ++-- .../ethernet/stmicro/stmmac/dwmac1000_core.c | 3 +- .../ethernet/stmicro/stmmac/dwmac1000_dma.c | 19 +- .../ethernet/stmicro/stmmac/dwmac100_dma.c | 14 +- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 91 ++++++-- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 50 +++-- .../ethernet/stmicro/stmmac/dwmac4_descs.c | 8 +- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 201 +++++++++++------- .../net/ethernet/stmicro/stmmac/dwmac4_dma.h | 89 +++++--- .../net/ethernet/stmicro/stmmac/dwmac4_lib.c | 105 +++++---- .../net/ethernet/stmicro/stmmac/dwmac_dma.h | 22 +- .../net/ethernet/stmicro/stmmac/dwmac_lib.c | 18 +- .../ethernet/stmicro/stmmac/dwxgmac2_core.c | 9 +- .../ethernet/stmicro/stmmac/dwxgmac2_descs.c | 6 +- .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 71 ++++--- .../net/ethernet/stmicro/stmmac/enh_desc.c | 11 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 176 ++++++++------- .../net/ethernet/stmicro/stmmac/norm_desc.c | 8 +- .../net/ethernet/stmicro/stmmac/ring_mode.c | 10 +- .../net/ethernet/stmicro/stmmac/stmmac_mdio.c | 3 +- include/linux/stmmac.h | 19 ++ 28 files changed, 871 insertions(+), 475 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.txt create mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.yaml
Signature · 1 line
2.39.2
PATCH v3 1/12 dt-bindings: net: snps,dwmac: Update interrupt-names
From: Bhupesh Sharma <[email protected]>
As commit fc191af1bb0d ("net: stmmac: platform: Fix misleading interrupt error msg") noted, not every stmmac based platform makes use of the 'eth_wake_irq' or 'eth_lpi' interrupts.
So, update the 'interrupt-names' inside 'snps,dwmac' YAML bindings to reflect the same.
---
Changes since v2:
* Add Krzysztof's Reviewed-by tag
Changes since v1:
* Dropped Krzysztof's Acked-by since changes requested
* Changed interrupt-names items per Krzysztof
Documentation/devicetree/bindings/net/snps,dwmac.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/net/snps,dwmac.yaml +1 -1
@@ -105,7 +105,7 @@ properties: minItems: 1 items: - const: macirq - - const: eth_wake_irq + - enum: [eth_wake_irq, eth_lpi] - const: eth_lpi clocks:
Signature · 1 line
2.39.2
PATCH v3 2/12 dt-bindings: net: snps,dwmac: Add Qualcomm Ethernet ETHQOS compatibles
In reply to Andrew HalaneyFrom: Bhupesh Sharma <[email protected]>
Add Qualcomm Ethernet ETHQOS compatible checks
in snps,dwmac YAML binding document.
---
Changes since v1 and v2:
* None
Documentation/devicetree/bindings/net/snps,dwmac.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/net/snps,dwmac.yaml +4 -0
@@ -65,6 +65,8 @@ properties: - ingenic,x2000-mac - loongson,ls2k-dwmac - loongson,ls7a-dwmac + - qcom,qcs404-ethqos + - qcom,sm8150-ethqos - renesas,r9a06g032-gmac - renesas,rzn1-gmac - rockchip,px30-gmac
@@ -625,6 +627,8 @@ allOf: - ingenic,x1600-mac - ingenic,x1830-mac - ingenic,x2000-mac + - qcom,qcs404-ethqos + - qcom,sm8150-ethqos - snps,dwmac-4.00 - snps,dwmac-4.10a - snps,dwmac-4.20a
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 3/12 dt-bindings: net: qcom,ethqos: Convert bindings to yaml
In reply to Andrew HalaneyFrom: Bhupesh Sharma <[email protected]>
Convert Qualcomm ETHQOS Ethernet devicetree binding to YAML. In doing so add a new property for iommus since newer platforms support using one, and without such make dtbs_check fails on them.
While at it, also update the MAINTAINERS file to point to the yaml version of the bindings.
---
Changes since v2:
* Add Krzysztof's Reviewed-by tag
Changes since v1:
* Drop redundant wording in binding description (Krzysztof)
* Document iommus addition explicitly in commit message (Krzysztof)
.../devicetree/bindings/net/qcom,ethqos.txt | 66 ----------- .../devicetree/bindings/net/qcom,ethqos.yaml | 110 ++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 111 insertions(+), 67 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.txt create mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.yaml
Documentation/devicetree/bindings/net/qcom,ethqos.txt deleted +0 -66
@@ -1,66 +0,0 @@ -Qualcomm Ethernet ETHQOS device - -This documents dwmmac based ethernet device which supports Gigabit -ethernet for version v2.3.0 onwards. - -This device has following properties: - -Required properties: - -- compatible: Should be one of: - "qcom,qcs404-ethqos" - "qcom,sm8150-ethqos" - -- reg: Address and length of the register set for the device - -- reg-names: Should contain register names "stmmaceth", "rgmii" - -- clocks: Should contain phandle to clocks - -- clock-names: Should contain clock names "stmmaceth", "pclk", - "ptp_ref", "rgmii" - -- interrupts: Should contain phandle to interrupts - -- interrupt-names: Should contain interrupt names "macirq", "eth_lpi" - -Rest of the properties are defined in stmmac.txt file in same directory - - -Example: - -ethernet: ethernet@7a80000 { - compatible = "qcom,qcs404-ethqos"; - reg = <0x07a80000 0x10000>, - <0x07a96000 0x100>; - reg-names = "stmmaceth", "rgmii"; - clock-names = "stmmaceth", "pclk", "ptp_ref", "rgmii"; - clocks = <&gcc GCC_ETH_AXI_CLK>, - <&gcc GCC_ETH_SLAVE_AHB_CLK>, - <&gcc GCC_ETH_PTP_CLK>, - <&gcc GCC_ETH_RGMII_CLK>; - interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "macirq", "eth_lpi"; - snps,reset-gpio = <&tlmm 60 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - - snps,txpbl = <8>; - snps,rxpbl = <2>; - snps,aal; - snps,tso; - - phy-handle = <&phy1>; - phy-mode = "rgmii"; - - mdio { - #address-cells = <0x1>; - #size-cells = <0x0>; - compatible = "snps,dwmac-mdio"; - phy1: phy@4 { - device_type = "ethernet-phy"; - reg = <0x4>; - }; - }; - -};
Documentation/devicetree/bindings/net/qcom,ethqos.yaml new file +110 -0
110 lines not on this page · raw message
MAINTAINERS +1 -1
@@ -17294,7 +17294,7 @@ M: Vinod Koul <[email protected]> R: Bhupesh Sharma <[email protected]> L: [email protected] S: Maintained -F: Documentation/devicetree/bindings/net/qcom,ethqos.txt +F: Documentation/devicetree/bindings/net/qcom,ethqos.yaml F: drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c QUALCOMM FASTRPC DRIVER
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 4/12 dt-bindings: net: qcom,ethqos: Add Qualcomm sc8280xp compatibles
In reply to Andrew HalaneyThe sc8280xp has a new version of the ETHQOS hardware in it, EMAC v3. Add a compatible for this.
---
Changes since v2:
* *Really* alphabetical sorting (sorry Krzysztof!)
Changes since v1:
* Alphabetical sorting (Krzysztof)
Documentation/devicetree/bindings/net/qcom,ethqos.yaml | 1 + Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++ 2 files changed, 4 insertions(+)
Documentation/devicetree/bindings/net/qcom,ethqos.yaml +1 -0
@@ -20,6 +20,7 @@ properties: compatible: enum: - qcom,qcs404-ethqos + - qcom,sc8280xp-ethqos - qcom,sm8150-ethqos reg:
Documentation/devicetree/bindings/net/snps,dwmac.yaml +3 -0
@@ -66,6 +66,7 @@ properties: - loongson,ls2k-dwmac - loongson,ls7a-dwmac - qcom,qcs404-ethqos + - qcom,sc8280xp-ethqos - qcom,sm8150-ethqos - renesas,r9a06g032-gmac - renesas,rzn1-gmac
@@ -574,6 +575,7 @@ allOf: - ingenic,x1600-mac - ingenic,x1830-mac - ingenic,x2000-mac + - qcom,sc8280xp-ethqos - snps,dwmac-3.50a - snps,dwmac-4.10a - snps,dwmac-4.20a
@@ -628,6 +630,7 @@ allOf: - ingenic,x1830-mac - ingenic,x2000-mac - qcom,qcs404-ethqos + - qcom,sc8280xp-ethqos - qcom,sm8150-ethqos - snps,dwmac-4.00 - snps,dwmac-4.10a
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH net-next v3 04/12] dt-bindings: net: qcom,ethqos: Add Qualcomm sc8280xp compatibles
Quoted 4 lines · Andrew Halaney
The sc8280xp has a new version of the ETHQOS hardware in it, EMAC v3. Add a compatible for this.
Signed-off-by Andrew Halaney <[email protected]>
Best regards,
Krzysztof
PATCH v3 5/12 net: stmmac: Remove unnecessary if statement brackets
In reply to Andrew HalaneyThe brackets are unnecessary, remove them to match the coding style used in the kernel.
---
Changes since v2:
* None
Changes since v1:
* This patch is split from the next patch since it is a logically different change (Andrew Lunn)
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +1 -2
@@ -281,9 +281,8 @@ static int stmmac_mdio_read_c22(struct mii_bus *bus, int phyaddr, int phyreg) value |= (phyreg << priv->hw->mii.reg_shift) & priv->hw->mii.reg_mask; value |= (priv->clk_csr << priv->hw->mii.clk_csr_shift) & priv->hw->mii.clk_csr_mask; -if (priv->plat->has_gmac4) { +if (priv->plat->has_gmac4) value |=MII_GMAC4_READ ; - } data =stmmac_mdio_read (priv, data, value);
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 6/12 net: stmmac: Fix DMA typo
In reply to Andrew HalaneyDAM is supposed to be DMA. Fix it to improve readability.
---
Changes since v2:
* New patch, stumbled into this typo when refactoring
drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/common.h +1 -1
@@ -242,7 +242,7 @@ struct stmmac_safety_stats {#define SF_DMA_MODE 1/* DMA STORE-AND-FORWARD Operation Mode */ -/* DAM HW feature register fields */ +/* DMA HW feature register fields */ #define DMA_HW_FEAT_MIISEL 0x00000001/* 10/100 Mbps Support */ #define DMA_HW_FEAT_GMIISEL 0x00000002/* 1000 Mbps Support */ #define DMA_HW_FEAT_HDSEL 0x00000004/* Half-Duplex Support */
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 7/12 net: stmmac: Remove some unnecessary void pointers
In reply to Andrew HalaneyThere's a few spots in the hardware interface where a void pointer is used, but what's passed in and later cast out is always the same type.
Just use the proper type directly.
---
Changes since v2:
* New patch. In later patches refactoring hwif.h I touched these in their first form (which was later dropped) and changed this as part of that. But I thought the change was still good overall, so I left this improvement in the series.
.../net/ethernet/stmicro/stmmac/chain_mode.c | 10 +++---- .../ethernet/stmicro/stmmac/dwmac100_dma.c | 4 +-- .../ethernet/stmicro/stmmac/dwmac4_descs.c | 8 ++--- .../ethernet/stmicro/stmmac/dwxgmac2_descs.c | 6 ++-- .../net/ethernet/stmicro/stmmac/enh_desc.c | 11 +++---- drivers/net/ethernet/stmicro/stmmac/hwif.h | 30 ++++++++++++------- .../net/ethernet/stmicro/stmmac/norm_desc.c | 8 ++--- .../net/ethernet/stmicro/stmmac/ring_mode.c | 10 +++---- 8 files changed, 47 insertions(+), 40 deletions(-)
drivers/net/ethernet/stmicro/stmmac/chain_mode.c +4 -6
@@ -14,9 +14,9 @@#include "stmmac.h" -static int jumbo_frm (void *p,struct sk_buff *skb,int csum) +static int jumbo_frm (struct stmmac_tx_queue *tx_q,struct sk_buff *skb, +int csum) { -struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)p;unsigned int nopaged_len =skb_headlen (skb);struct stmmac_priv *priv = tx_q->priv_data;unsigned int entry = tx_q->cur_tx;
@@ -125,9 +125,8 @@ static void init_dma_chain(void *des, dma_addr_t phy_addr, } } -static void refill_desc3 (void *priv_ptr,struct dma_desc *p) +static void refill_desc3 (struct stmmac_rx_queue *rx_q,struct dma_desc *p) { -struct stmmac_rx_queue *rx_q = (struct stmmac_rx_queue *)priv_ptr;struct stmmac_priv *priv = rx_q->priv_data;if (priv->hwts_rx_en && !priv->extend_desc)
@@ -141,9 +140,8 @@ static void refill_desc3(void *priv_ptr, struct dma_desc *p) sizeof(struct dma_desc))); } -static void clean_desc3 (void *priv_ptr,struct dma_desc *p) +static void clean_desc3 (struct stmmac_tx_queue *tx_q,struct dma_desc *p) { -struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)priv_ptr;struct stmmac_priv *priv = tx_q->priv_data;unsigned int entry = tx_q->dirty_tx;
drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c +2 -2
@@ -80,10 +80,10 @@ static void dwmac100_dump_dma_regs(void __iomem *ioaddr, u32 *reg_space) }/* DMA controller has two counters to track the number of the missed frames. */ -static void dwmac100_dma_diagnostic_fr (void *data,struct stmmac_extra_stats *x, +static void dwmac100_dma_diagnostic_fr (struct net_device_stats *stats, +struct stmmac_extra_stats *x,void __iomem *ioaddr) { -struct net_device_stats *stats = (struct net_device_stats *)data;u32 csr8 =readl (ioaddr +DMA_MISSED_FRAME_CTR );if (unlikely (csr8)) {
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +4 -4
@@ -13,11 +13,11 @@#include "dwmac4.h" #include "dwmac4_descs.h" -static int dwmac4_wrback_get_tx_status (void *data,struct stmmac_extra_stats *x, +static int dwmac4_wrback_get_tx_status (struct net_device_stats *stats, +struct stmmac_extra_stats *x,struct dma_desc *p,void __iomem *ioaddr) { -struct net_device_stats *stats = (struct net_device_stats *)data;unsigned int tdes3;int ret = tx_done;
@@ -73,10 +73,10 @@ static int dwmac4_wrback_get_tx_status(void *data, struct stmmac_extra_stats *x,return ret; } -static int dwmac4_wrback_get_rx_status (void *data,struct stmmac_extra_stats *x, +static int dwmac4_wrback_get_rx_status (struct net_device_stats *stats, +struct stmmac_extra_stats *x,struct dma_desc *p) { -struct net_device_stats *stats = (struct net_device_stats *)data;unsigned int rdes1 =le32_to_cpu (p->des1);unsigned int rdes2 =le32_to_cpu (p->des2);unsigned int rdes3 =le32_to_cpu (p->des3);
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c +4 -2
@@ -8,7 +8,8 @@#include "common.h" #include "dwxgmac2.h" -static int dwxgmac2_get_tx_status (void *data,struct stmmac_extra_stats *x, +static int dwxgmac2_get_tx_status (struct net_device_stats *stats, +struct stmmac_extra_stats *x,struct dma_desc *p,void __iomem *ioaddr) {unsigned int tdes3 =le32_to_cpu (p->des3);
@@ -22,7 +23,8 @@ static int dwxgmac2_get_tx_status(void *data, struct stmmac_extra_stats *x,return ret; } -static int dwxgmac2_get_rx_status (void *data,struct stmmac_extra_stats *x, +static int dwxgmac2_get_rx_status (struct net_device_stats *stats, +struct stmmac_extra_stats *x,struct dma_desc *p) {unsigned int rdes3 =le32_to_cpu (p->des3);
drivers/net/ethernet/stmicro/stmmac/enh_desc.c +6 -5
@@ -12,10 +12,10 @@#include "common.h" #include "descs_com.h" -static int enh_desc_get_tx_status (void *data,struct stmmac_extra_stats *x, +static int enh_desc_get_tx_status (struct net_device_stats *stats, +struct stmmac_extra_stats *x,struct dma_desc *p,void __iomem *ioaddr) { -struct net_device_stats *stats = (struct net_device_stats *)data;unsigned int tdes0 =le32_to_cpu (p->des0);int ret = tx_done;
@@ -117,7 +117,8 @@ static int enh_desc_coe_rdes0(int ipc_err, int type, int payload_err)return ret; } -static void enh_desc_get_ext_status (void *data,struct stmmac_extra_stats *x, +static void enh_desc_get_ext_status (struct net_device_stats *stats, +struct stmmac_extra_stats *x,struct dma_extended_desc *p) {unsigned int rdes0 =le32_to_cpu (p->basic.des0);
@@ -181,10 +182,10 @@ static void enh_desc_get_ext_status(void *data, struct stmmac_extra_stats *x, } } -static int enh_desc_get_rx_status (void *data,struct stmmac_extra_stats *x, +static int enh_desc_get_rx_status (struct net_device_stats *stats, +struct stmmac_extra_stats *x,struct dma_desc *p) { -struct net_device_stats *stats = (struct net_device_stats *)data;unsigned int rdes0 =le32_to_cpu (p->des0);int ret = good_frame;
drivers/net/ethernet/stmicro/stmmac/hwif.h +19 -11
@@ -56,8 +56,9 @@ struct stmmac_desc_ops {/* Last tx segment reports the transmit status */ int (*get_tx_ls)(struct dma_desc *p);/* Return the transmit status looking at the TDES1 */ -int (*tx_status)(void *data,struct stmmac_extra_stats *x, -struct dma_desc *p,void __iomem *ioaddr); +int (*tx_status)(struct net_device_stats *stats, +struct stmmac_extra_stats *x, +struct dma_desc *p,void __iomem *ioaddr);/* Get the buffer size from the descriptor */ int (*get_tx_len)(struct dma_desc *p);/* Handle extra events on specific interrupts hw dependent */
@@ -65,10 +66,12 @@ struct stmmac_desc_ops {/* Get the receive frame size */ int (*get_rx_frame_len)(struct dma_desc *p,int rx_coe_type);/* Return the reception status looking at the RDES1 */ -int (*rx_status)(void *data,struct stmmac_extra_stats *x, -struct dma_desc *p); -void (*rx_extended_status)(void *data,struct stmmac_extra_stats *x, -struct dma_extended_desc *p); +int (*rx_status)(struct net_device_stats *stats, +struct stmmac_extra_stats *x, +struct dma_desc *p); +void (*rx_extended_status)(struct net_device_stats *stats, +struct stmmac_extra_stats *x, +struct dma_extended_desc *p);/* Set tx timestamp enable bit */ void (*enable_tx_timestamp) (struct dma_desc *p);/* get tx timestamp status */
@@ -185,8 +188,9 @@ struct stmmac_dma_ops {void (*dma_tx_mode)(void __iomem *ioaddr,int mode,u32 channel,int fifosz,u8 qmode);/* To track extra statistic (if supported) */ -void (*dma_diagnostic_fr) (void *data,struct stmmac_extra_stats *x, -void __iomem *ioaddr); +void (*dma_diagnostic_fr)(struct net_device_stats *stats, +struct stmmac_extra_stats *x, +void __iomem *ioaddr);void (*enable_dma_transmission) (void __iomem *ioaddr);void (*enable_dma_irq)(void __iomem *ioaddr,u32 chan,bool rx,bool tx);
@@ -535,16 +539,20 @@ struct stmmac_hwtimestamp { #define stmmac_timestamp_interrupt(__priv, __args...) \ stmmac_do_void_callback(__priv, ptp, timestamp_interrupt, __args) +struct stmmac_tx_queue ; +struct stmmac_rx_queue ; +/* Helpers to manage the descriptors for chain and ring modes */ struct stmmac_mode_ops {void (*init) (void *des,dma_addr_t phy_addr,unsigned int size,unsigned int extend_desc);unsigned int (*is_jumbo_frm) (int len,int ehn_desc); -int (*jumbo_frm)(void *priv,struct sk_buff *skb,int csum); +int (*jumbo_frm)(struct stmmac_tx_queue *tx_q,struct sk_buff *skb, +int csum);int (*set_16kib_bfsize)(int mtu);void (*init_desc3)(struct dma_desc *p); -void (*refill_desc3) (void *priv,struct dma_desc *p); -void (*clean_desc3) (void *priv,struct dma_desc *p); +void (*refill_desc3)(struct stmmac_rx_queue *rx_q,struct dma_desc *p); +void (*clean_desc3)(struct stmmac_tx_queue *tx_q,struct dma_desc *p); }; #define stmmac_mode_init(__priv, __args...) \
drivers/net/ethernet/stmicro/stmmac/norm_desc.c +4 -4
@@ -12,10 +12,10 @@#include "common.h" #include "descs_com.h" -static int ndesc_get_tx_status (void *data,struct stmmac_extra_stats *x, +static int ndesc_get_tx_status (struct net_device_stats *stats, +struct stmmac_extra_stats *x,struct dma_desc *p,void __iomem *ioaddr) { -struct net_device_stats *stats = (struct net_device_stats *)data;unsigned int tdes0 =le32_to_cpu (p->des0);unsigned int tdes1 =le32_to_cpu (p->des1);int ret = tx_done;
@@ -70,12 +70,12 @@ static int ndesc_get_tx_len(struct dma_desc *p)* and, if required, updates the multicast statistics. * In case of success, it returns good_frame because the GMAC device * is supposed to be able to compute the csum in HW. */ -static int ndesc_get_rx_status (void *data,struct stmmac_extra_stats *x, +static int ndesc_get_rx_status (struct net_device_stats *stats, +struct stmmac_extra_stats *x,struct dma_desc *p) {int ret = good_frame;unsigned int rdes0 =le32_to_cpu (p->des0); -struct net_device_stats *stats = (struct net_device_stats *)data;if (unlikely (rdes0 &RDES0_OWN ))return dma_own;
drivers/net/ethernet/stmicro/stmmac/ring_mode.c +4 -6
@@ -14,9 +14,9 @@#include "stmmac.h" -static int jumbo_frm (void *p,struct sk_buff *skb,int csum) +static int jumbo_frm (struct stmmac_tx_queue *tx_q,struct sk_buff *skb, +int csum) { -struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)p;unsigned int nopaged_len =skb_headlen (skb);struct stmmac_priv *priv = tx_q->priv_data;unsigned int entry = tx_q->cur_tx;
@@ -101,9 +101,8 @@ static unsigned int is_jumbo_frm(int len, int enh_desc)return ret; } -static void refill_desc3 (void *priv_ptr,struct dma_desc *p) +static void refill_desc3 (struct stmmac_rx_queue *rx_q,struct dma_desc *p) { -struct stmmac_rx_queue *rx_q = priv_ptr;struct stmmac_priv *priv = rx_q->priv_data;/* Fill DES3 in case of RING mode */
@@ -117,9 +116,8 @@ static void init_desc3(struct dma_desc *p) p->des3 =cpu_to_le32 (le32_to_cpu (p->des2) + BUF_SIZE_8KiB); } -static void clean_desc3 (void *priv_ptr,struct dma_desc *p) +static void clean_desc3 (struct stmmac_tx_queue *tx_q,struct dma_desc *p) { -struct stmmac_tx_queue *tx_q = (struct stmmac_tx_queue *)priv_ptr;struct stmmac_priv *priv = tx_q->priv_data;unsigned int entry = tx_q->dirty_tx;
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH net-next v3 07/12] net: stmmac: Remove some unnecessary void pointers
Quoted 5 lines · Andrew Halaney
There's a few spots in the hardware interface where a void pointer is used, but what's passed in and later cast out is always the same type.
Just use the proper type directly.
Quoted 8 lines
Signed-off-by Andrew Halaney <[email protected]>---
Changes since v2:
* New patch. In later patches refactoringhwif.hI touched these in their first form (which was later dropped) and changed this as part of that. But I thought the change was still good overall, so I left this improvement in the series.
FWIIW, I am very pleased to see this kind of change.
PATCH v3 8/12 net: stmmac: Pass stmmac_priv in some callbacks
In reply to Andrew HalaneyPassing stmmac_priv to some of the callbacks allows hwif implementations to grab some data that platforms can customize. Adjust the callbacks accordingly in preparation of such a platform customization.
---
This patch (and the following patch) are replacements for
https://lore.kernel.org/netdev/[email protected]/
as was requested. Hopefully I was understanding the intent correctly :)
Changes since v2:
* New, replacing old wrapper approach
.../net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 36 +++-- .../ethernet/stmicro/stmmac/dwmac1000_core.c | 3 +- .../ethernet/stmicro/stmmac/dwmac1000_dma.c | 19 ++- .../ethernet/stmicro/stmmac/dwmac100_dma.c | 10 +- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 14 +- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 44 ++++-- .../net/ethernet/stmicro/stmmac/dwmac4_dma.h | 38 +++-- .../net/ethernet/stmicro/stmmac/dwmac4_lib.c | 38 +++-- .../net/ethernet/stmicro/stmmac/dwmac_dma.h | 22 ++- .../net/ethernet/stmicro/stmmac/dwmac_lib.c | 18 ++- .../ethernet/stmicro/stmmac/dwxgmac2_core.c | 9 +- .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 71 ++++++--- drivers/net/ethernet/stmicro/stmmac/hwif.h | 146 ++++++++++-------- 13 files changed, 291 insertions(+), 177 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +24 -12
@@ -304,7 +304,8 @@ static void sun8i_dwmac_dma_init(void __iomem *ioaddr,writel (0x1FFFFFF , ioaddr +EMAC_INT_STA ); } -static void sun8i_dwmac_dma_init_rx (void __iomem *ioaddr, +static void sun8i_dwmac_dma_init_rx (struct stmmac_priv *priv, +void __iomem *ioaddr,struct stmmac_dma_cfg *dma_cfg,dma_addr_t dma_rx_phy,u32 chan) {
@@ -312,7 +313,8 @@ static void sun8i_dwmac_dma_init_rx(void __iomem *ioaddr,writel (lower_32_bits (dma_rx_phy), ioaddr +EMAC_RX_DESC_LIST ); } -static void sun8i_dwmac_dma_init_tx (void __iomem *ioaddr, +static void sun8i_dwmac_dma_init_tx (struct stmmac_priv *priv, +void __iomem *ioaddr,struct stmmac_dma_cfg *dma_cfg,dma_addr_t dma_tx_phy,u32 chan) {
@@ -324,7 +326,8 @@ static void sun8i_dwmac_dma_init_tx(void __iomem *ioaddr,* Called from stmmac_dma_ops->dump_regs * Used for ethtool */ -static void sun8i_dwmac_dump_regs (void __iomem *ioaddr,u32 *reg_space) +static void sun8i_dwmac_dump_regs (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 *reg_space) {int i;
@@ -352,7 +355,8 @@ static void sun8i_dwmac_dump_mac_regs(struct mac_device_info *hw, } } -static void sun8i_dwmac_enable_dma_irq (void __iomem *ioaddr,u32 chan, +static void sun8i_dwmac_enable_dma_irq (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 chan,bool rx,bool tx) {u32 value =readl (ioaddr +EMAC_INT_EN );
@@ -365,7 +369,8 @@ static void sun8i_dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan,writel (value, ioaddr +EMAC_INT_EN ); } -static void sun8i_dwmac_disable_dma_irq (void __iomem *ioaddr,u32 chan, +static void sun8i_dwmac_disable_dma_irq (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 chan,bool rx,bool tx) {u32 value =readl (ioaddr +EMAC_INT_EN );
@@ -378,7 +383,8 @@ static void sun8i_dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan,writel (value, ioaddr +EMAC_INT_EN ); } -static void sun8i_dwmac_dma_start_tx (void __iomem *ioaddr,u32 chan) +static void sun8i_dwmac_dma_start_tx (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 chan) {u32 v;
@@ -398,7 +404,8 @@ static void sun8i_dwmac_enable_dma_transmission(void __iomem *ioaddr)writel (v, ioaddr +EMAC_TX_CTL1 ); } -static void sun8i_dwmac_dma_stop_tx (void __iomem *ioaddr,u32 chan) +static void sun8i_dwmac_dma_stop_tx (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 chan) {u32 v;
@@ -407,7 +414,8 @@ static void sun8i_dwmac_dma_stop_tx(void __iomem *ioaddr, u32 chan)writel (v, ioaddr +EMAC_TX_CTL1 ); } -static void sun8i_dwmac_dma_start_rx (void __iomem *ioaddr,u32 chan) +static void sun8i_dwmac_dma_start_rx (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 chan) {u32 v;
@@ -417,7 +425,8 @@ static void sun8i_dwmac_dma_start_rx(void __iomem *ioaddr, u32 chan)writel (v, ioaddr +EMAC_RX_CTL1 ); } -static void sun8i_dwmac_dma_stop_rx (void __iomem *ioaddr,u32 chan) +static void sun8i_dwmac_dma_stop_rx (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 chan) {u32 v;
@@ -426,7 +435,8 @@ static void sun8i_dwmac_dma_stop_rx(void __iomem *ioaddr, u32 chan)writel (v, ioaddr +EMAC_RX_CTL1 ); } -static int sun8i_dwmac_dma_interrupt (void __iomem *ioaddr, +static int sun8i_dwmac_dma_interrupt (struct stmmac_priv *priv, +void __iomem *ioaddr,struct stmmac_extra_stats *x,u32 chan,u32 dir) {
@@ -492,7 +502,8 @@ static int sun8i_dwmac_dma_interrupt(void __iomem *ioaddr,return ret; } -static void sun8i_dwmac_dma_operation_mode_rx (void __iomem *ioaddr,int mode, +static void sun8i_dwmac_dma_operation_mode_rx (struct stmmac_priv *priv, +void __iomem *ioaddr,int mode,u32 channel,int fifosz,u8 qmode) {u32 v;
@@ -515,7 +526,8 @@ static void sun8i_dwmac_dma_operation_mode_rx(void __iomem *ioaddr, int mode,writel (v, ioaddr +EMAC_RX_CTL1 ); } -static void sun8i_dwmac_dma_operation_mode_tx (void __iomem *ioaddr,int mode, +static void sun8i_dwmac_dma_operation_mode_tx (struct stmmac_priv *priv, +void __iomem *ioaddr,int mode,u32 channel,int fifosz,u8 qmode) {u32 v;
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +2 -1
@@ -414,7 +414,8 @@ static void dwmac1000_get_adv_lp(void __iomem *ioaddr, struct rgmii_adv *adv)dwmac_get_adv_lp (ioaddr,GMAC_PCS_BASE , adv); } -static void dwmac1000_debug (void __iomem *ioaddr,struct stmmac_extra_stats *x, +static void dwmac1000_debug (struct stmmac_priv *priv,void __iomem *ioaddr, +struct stmmac_extra_stats *x,u32 rx_queues,u32 tx_queues) {u32 value =readl (ioaddr +GMAC_DEBUG );
drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +12 -7
@@ -110,7 +110,8 @@ static void dwmac1000_dma_init(void __iomem *ioaddr,writel (DMA_INTR_DEFAULT_MASK , ioaddr +DMA_INTR_ENA ); } -static void dwmac1000_dma_init_rx (void __iomem *ioaddr, +static void dwmac1000_dma_init_rx (struct stmmac_priv *priv, +void __iomem *ioaddr,struct stmmac_dma_cfg *dma_cfg,dma_addr_t dma_rx_phy,u32 chan) {
@@ -118,7 +119,8 @@ static void dwmac1000_dma_init_rx(void __iomem *ioaddr,writel (lower_32_bits (dma_rx_phy), ioaddr +DMA_RCV_BASE_ADDR ); } -static void dwmac1000_dma_init_tx (void __iomem *ioaddr, +static void dwmac1000_dma_init_tx (struct stmmac_priv *priv, +void __iomem *ioaddr,struct stmmac_dma_cfg *dma_cfg,dma_addr_t dma_tx_phy,u32 chan) {
@@ -147,7 +149,8 @@ static u32 dwmac1000_configure_fc(u32 csr6, int rxfifosz)return csr6; } -static void dwmac1000_dma_operation_mode_rx (void __iomem *ioaddr,int mode, +static void dwmac1000_dma_operation_mode_rx (struct stmmac_priv *priv, +void __iomem *ioaddr,int mode,u32 channel,int fifosz,u8 qmode) {u32 csr6 =readl (ioaddr +DMA_CONTROL );
@@ -175,7 +178,8 @@ static void dwmac1000_dma_operation_mode_rx(void __iomem *ioaddr, int mode,writel (csr6, ioaddr +DMA_CONTROL ); } -static void dwmac1000_dma_operation_mode_tx (void __iomem *ioaddr,int mode, +static void dwmac1000_dma_operation_mode_tx (struct stmmac_priv *priv, +void __iomem *ioaddr,int mode,u32 channel,int fifosz,u8 qmode) {u32 csr6 =readl (ioaddr +DMA_CONTROL );
@@ -208,7 +212,8 @@ static void dwmac1000_dma_operation_mode_tx(void __iomem *ioaddr, int mode,writel (csr6, ioaddr +DMA_CONTROL ); } -static void dwmac1000_dump_dma_regs (void __iomem *ioaddr,u32 *reg_space) +static void dwmac1000_dump_dma_regs (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 *reg_space) {int i;
@@ -263,8 +268,8 @@ static int dwmac1000_get_hw_feature(void __iomem *ioaddr,return 0 ; } -static void dwmac1000_rx_watchdog (void __iomem *ioaddr,u32 riwt, -u32 queue) +static void dwmac1000_rx_watchdog (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 riwt,u32 queue) {writel (riwt, ioaddr +DMA_RX_WATCHDOG ); }
drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c +6 -4
@@ -29,7 +29,7 @@ static void dwmac100_dma_init(void __iomem *ioaddr,writel (DMA_INTR_DEFAULT_MASK , ioaddr +DMA_INTR_ENA ); } -static void dwmac100_dma_init_rx (void __iomem *ioaddr, +static void dwmac100_dma_init_rx (struct stmmac_priv *priv,void __iomem *ioaddr,struct stmmac_dma_cfg *dma_cfg,dma_addr_t dma_rx_phy,u32 chan) {
@@ -37,7 +37,7 @@ static void dwmac100_dma_init_rx(void __iomem *ioaddr,writel (lower_32_bits (dma_rx_phy), ioaddr +DMA_RCV_BASE_ADDR ); } -static void dwmac100_dma_init_tx (void __iomem *ioaddr, +static void dwmac100_dma_init_tx (struct stmmac_priv *priv,void __iomem *ioaddr,struct stmmac_dma_cfg *dma_cfg,dma_addr_t dma_tx_phy,u32 chan) {
@@ -50,7 +50,8 @@ static void dwmac100_dma_init_tx(void __iomem *ioaddr,* The transmit threshold can be programmed by setting the TTC bits in the DMA * control register. */ -static void dwmac100_dma_operation_mode_tx (void __iomem *ioaddr,int mode, +static void dwmac100_dma_operation_mode_tx (struct stmmac_priv *priv, +void __iomem *ioaddr,int mode,u32 channel,int fifosz,u8 qmode) {u32 csr6 =readl (ioaddr +DMA_CONTROL );
@@ -65,7 +66,8 @@ static void dwmac100_dma_operation_mode_tx(void __iomem *ioaddr, int mode,writel (csr6, ioaddr +DMA_CONTROL ); } -static void dwmac100_dump_dma_regs (void __iomem *ioaddr,u32 *reg_space) +static void dwmac100_dump_dma_regs (struct stmmac_priv *priv, +void __iomem *ioaddr,u32 *reg_space) {int i;
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +9 -5
@@ -198,7 +198,8 @@ static void dwmac4_prog_mtl_tx_algorithms(struct mac_device_info *hw,writel (value, ioaddr +MTL_OPERATION_MODE ); } -static void dwmac4_set_mtl_tx_queue_weight (struct mac_device_info *hw, +static void dwmac4_set_mtl_tx_queue_weight (struct stmmac_priv *priv, +struct mac_device_info *hw,u32 weight,u32 queue) {void __iomem *ioaddr = hw->pcsr;
@@ -227,7 +228,8 @@ static void dwmac4_map_mtl_dma(struct mac_device_info *hw, u32 queue, u32 chan) } } -static void dwmac4_config_cbs (struct mac_device_info *hw, +static void dwmac4_config_cbs (struct stmmac_priv *priv, +struct mac_device_info *hw,u32 send_slope,u32 idle_slope,u32 high_credit,u32 low_credit,u32 queue) {
@@ -253,7 +255,7 @@ static void dwmac4_config_cbs(struct mac_device_info *hw,writel (value, ioaddr +MTL_SEND_SLP_CREDX_BASE_ADDR (queue));/* configure idle slope (same register as tx weight) */ -dwmac4_set_mtl_tx_queue_weight (hw, idle_slope, queue); +dwmac4_set_mtl_tx_queue_weight (priv, hw, idle_slope, queue);/* configure high credit */ value =readl (ioaddr +MTL_HIGH_CREDX_BASE_ADDR (queue));
@@ -759,7 +761,8 @@ static void dwmac4_phystatus(void __iomem *ioaddr, struct stmmac_extra_stats *x) } } -static int dwmac4_irq_mtl_status (struct mac_device_info *hw,u32 chan) +static int dwmac4_irq_mtl_status (struct stmmac_priv *priv, +struct mac_device_info *hw,u32 chan) {void __iomem *ioaddr = hw->pcsr;u32 mtl_int_qx_status;
@@ -833,7 +836,8 @@ static int dwmac4_irq_status(struct mac_device_info *hw,return ret; } -static void dwmac4_debug (void __iomem *ioaddr,struct stmmac_extra_stats *x, +static void dwmac4_debug (struct stmmac_priv *priv,void __iomem *ioaddr, +struct stmmac_extra_stats *x,u32 rx_queues,u32 tx_queues) {u32 value;
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +29 -15
126 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h +25 -13
@@ -220,19 +220,31 @@#define DMA_CHAN0_DBG_STAT_RPS_SHIFT 8int dwmac4_dma_reset (void __iomem *ioaddr); -void dwmac4_enable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx); -void dwmac410_enable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx); -void dwmac4_disable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx); -void dwmac410_disable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx); -void dwmac4_dma_start_tx (void __iomem *ioaddr,u32 chan); -void dwmac4_dma_stop_tx (void __iomem *ioaddr,u32 chan); -void dwmac4_dma_start_rx (void __iomem *ioaddr,u32 chan); -void dwmac4_dma_stop_rx (void __iomem *ioaddr,u32 chan); -int dwmac4_dma_interrupt (void __iomem *ioaddr, +void dwmac4_enable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx); +void dwmac410_enable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx); +void dwmac4_disable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx); +void dwmac410_disable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx); +void dwmac4_dma_start_tx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan); +void dwmac4_dma_stop_tx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan); +void dwmac4_dma_start_rx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan); +void dwmac4_dma_stop_rx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan); +int dwmac4_dma_interrupt (struct stmmac_priv *priv,void __iomem *ioaddr,struct stmmac_extra_stats *x,u32 chan,u32 dir); -void dwmac4_set_rx_ring_len (void __iomem *ioaddr,u32 len,u32 chan); -void dwmac4_set_tx_ring_len (void __iomem *ioaddr,u32 len,u32 chan); -void dwmac4_set_rx_tail_ptr (void __iomem *ioaddr,u32 tail_ptr,u32 chan); -void dwmac4_set_tx_tail_ptr (void __iomem *ioaddr,u32 tail_ptr,u32 chan); +void dwmac4_set_rx_ring_len (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 len,u32 chan); +void dwmac4_set_tx_ring_len (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 len,u32 chan); +void dwmac4_set_rx_tail_ptr (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 tail_ptr,u32 chan); +void dwmac4_set_tx_tail_ptr (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 tail_ptr,u32 chan);#endif /* __DWMAC4_DMA_H__ */
drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c +25 -13
@@ -25,17 +25,20 @@ int dwmac4_dma_reset(void __iomem *ioaddr) 10000, 1000000); } -void dwmac4_set_rx_tail_ptr (void __iomem *ioaddr,u32 tail_ptr,u32 chan) +void dwmac4_set_rx_tail_ptr (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 tail_ptr,u32 chan) {writel (tail_ptr, ioaddr +DMA_CHAN_RX_END_ADDR (chan)); } -void dwmac4_set_tx_tail_ptr (void __iomem *ioaddr,u32 tail_ptr,u32 chan) +void dwmac4_set_tx_tail_ptr (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 tail_ptr,u32 chan) {writel (tail_ptr, ioaddr +DMA_CHAN_TX_END_ADDR (chan)); } -void dwmac4_dma_start_tx (void __iomem *ioaddr,u32 chan) +void dwmac4_dma_start_tx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan) {u32 value =readl (ioaddr +DMA_CHAN_TX_CONTROL (chan));
@@ -47,7 +50,8 @@ void dwmac4_dma_start_tx(void __iomem *ioaddr, u32 chan)writel (value, ioaddr +GMAC_CONFIG ); } -void dwmac4_dma_stop_tx (void __iomem *ioaddr,u32 chan) +void dwmac4_dma_stop_tx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan) {u32 value =readl (ioaddr +DMA_CHAN_TX_CONTROL (chan));
@@ -55,7 +59,8 @@ void dwmac4_dma_stop_tx(void __iomem *ioaddr, u32 chan)writel (value, ioaddr +DMA_CHAN_TX_CONTROL (chan)); } -void dwmac4_dma_start_rx (void __iomem *ioaddr,u32 chan) +void dwmac4_dma_start_rx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan) {u32 value =readl (ioaddr +DMA_CHAN_RX_CONTROL (chan));
@@ -68,7 +73,8 @@ void dwmac4_dma_start_rx(void __iomem *ioaddr, u32 chan)writel (value, ioaddr +GMAC_CONFIG ); } -void dwmac4_dma_stop_rx (void __iomem *ioaddr,u32 chan) +void dwmac4_dma_stop_rx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan) {u32 value =readl (ioaddr +DMA_CHAN_RX_CONTROL (chan));
@@ -76,17 +82,20 @@ void dwmac4_dma_stop_rx(void __iomem *ioaddr, u32 chan)writel (value, ioaddr +DMA_CHAN_RX_CONTROL (chan)); } -void dwmac4_set_tx_ring_len (void __iomem *ioaddr,u32 len,u32 chan) +void dwmac4_set_tx_ring_len (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 len,u32 chan) {writel (len, ioaddr +DMA_CHAN_TX_RING_LEN (chan)); } -void dwmac4_set_rx_ring_len (void __iomem *ioaddr,u32 len,u32 chan) +void dwmac4_set_rx_ring_len (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 len,u32 chan) {writel (len, ioaddr +DMA_CHAN_RX_RING_LEN (chan)); } -void dwmac4_enable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx) +void dwmac4_enable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx) {u32 value =readl (ioaddr +DMA_CHAN_INTR_ENA (chan));
@@ -98,7 +107,8 @@ void dwmac4_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)writel (value, ioaddr +DMA_CHAN_INTR_ENA (chan)); } -void dwmac410_enable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx) +void dwmac410_enable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx) {u32 value =readl (ioaddr +DMA_CHAN_INTR_ENA (chan));
@@ -110,7 +120,8 @@ void dwmac410_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)writel (value, ioaddr +DMA_CHAN_INTR_ENA (chan)); } -void dwmac4_disable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx) +void dwmac4_disable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx) {u32 value =readl (ioaddr +DMA_CHAN_INTR_ENA (chan));
@@ -122,7 +133,8 @@ void dwmac4_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)writel (value, ioaddr +DMA_CHAN_INTR_ENA (chan)); } -void dwmac410_disable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx) +void dwmac410_disable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx) {u32 value =readl (ioaddr +DMA_CHAN_INTR_ENA (chan));
@@ -134,7 +146,7 @@ void dwmac410_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)writel (value, ioaddr +DMA_CHAN_INTR_ENA (chan)); } -int dwmac4_dma_interrupt (void __iomem *ioaddr, +int dwmac4_dma_interrupt (struct stmmac_priv *priv,void __iomem *ioaddr,struct stmmac_extra_stats *x,u32 chan,u32 dir) {u32 intr_status =readl (ioaddr +DMA_CHAN_STATUS (chan));
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +14 -8
@@ -153,14 +153,20 @@#define NUM_DWMAC4_DMA_REGS 27void dwmac_enable_dma_transmission (void __iomem *ioaddr); -void dwmac_enable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx); -void dwmac_disable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx); -void dwmac_dma_start_tx (void __iomem *ioaddr,u32 chan); -void dwmac_dma_stop_tx (void __iomem *ioaddr,u32 chan); -void dwmac_dma_start_rx (void __iomem *ioaddr,u32 chan); -void dwmac_dma_stop_rx (void __iomem *ioaddr,u32 chan); -int dwmac_dma_interrupt (void __iomem *ioaddr,struct stmmac_extra_stats *x, -u32 chan,u32 dir); +void dwmac_enable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx); +void dwmac_disable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx); +void dwmac_dma_start_tx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan); +void dwmac_dma_stop_tx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan); +void dwmac_dma_start_rx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan); +void dwmac_dma_stop_rx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan); +int dwmac_dma_interrupt (struct stmmac_priv *priv,void __iomem *ioaddr, +struct stmmac_extra_stats *x,u32 chan,u32 dir);int dwmac_dma_reset (void __iomem *ioaddr);#endif /* __DWMAC_DMA_H__ */
drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c +11 -7
@@ -32,7 +32,8 @@ void dwmac_enable_dma_transmission(void __iomem *ioaddr)writel (1 , ioaddr +DMA_XMT_POLL_DEMAND ); } -void dwmac_enable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx) +void dwmac_enable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx) {u32 value =readl (ioaddr +DMA_INTR_ENA );
@@ -44,7 +45,8 @@ void dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)writel (value, ioaddr +DMA_INTR_ENA ); } -void dwmac_disable_dma_irq (void __iomem *ioaddr,u32 chan,bool rx,bool tx) +void dwmac_disable_dma_irq (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan,bool rx,bool tx) {u32 value =readl (ioaddr +DMA_INTR_ENA );
@@ -56,28 +58,30 @@ void dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)writel (value, ioaddr +DMA_INTR_ENA ); } -void dwmac_dma_start_tx (void __iomem *ioaddr,u32 chan) +void dwmac_dma_start_tx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan) {u32 value =readl (ioaddr +DMA_CONTROL ); value |=DMA_CONTROL_ST ;writel (value, ioaddr +DMA_CONTROL ); } -void dwmac_dma_stop_tx (void __iomem *ioaddr,u32 chan) +void dwmac_dma_stop_tx (struct stmmac_priv *priv,void __iomem *ioaddr,u32 chan) {u32 value =readl (ioaddr +DMA_CONTROL ); value &= ~DMA_CONTROL_ST ;writel (value, ioaddr +DMA_CONTROL ); } -void dwmac_dma_start_rx (void __iomem *ioaddr,u32 chan) +void dwmac_dma_start_rx (struct stmmac_priv *priv,void __iomem *ioaddr, +u32 chan) {u32 value =readl (ioaddr +DMA_CONTROL ); value |=DMA_CONTROL_SR ;writel (value, ioaddr +DMA_CONTROL ); } -void dwmac_dma_stop_rx (void __iomem *ioaddr,u32 chan) +void dwmac_dma_stop_rx (struct stmmac_priv *priv,void __iomem *ioaddr,u32 chan) {u32 value =readl (ioaddr +DMA_CONTROL ); value &= ~DMA_CONTROL_SR ;
@@ -154,7 +158,7 @@ static void show_rx_process_state(unsigned int status) }#endif -int dwmac_dma_interrupt (void __iomem *ioaddr, +int dwmac_dma_interrupt (struct stmmac_priv *priv,void __iomem *ioaddr,struct stmmac_extra_stats *x,u32 chan,u32 dir) {int ret =0 ;
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +6 -3
@@ -187,7 +187,8 @@ static void dwxgmac2_prog_mtl_tx_algorithms(struct mac_device_info *hw, } } -static void dwxgmac2_set_mtl_tx_queue_weight (struct mac_device_info *hw, +static void dwxgmac2_set_mtl_tx_queue_weight (struct stmmac_priv *priv, +struct mac_device_info *hw,u32 weight,u32 queue) {void __iomem *ioaddr = hw->pcsr;
@@ -212,7 +213,8 @@ static void dwxgmac2_map_mtl_to_dma(struct mac_device_info *hw, u32 queue,writel (value, ioaddr + reg); } -static void dwxgmac2_config_cbs (struct mac_device_info *hw, +static void dwxgmac2_config_cbs (struct stmmac_priv *priv, +struct mac_device_info *hw,u32 send_slope,u32 idle_slope,u32 high_credit,u32 low_credit,u32 queue) {
@@ -276,7 +278,8 @@ static int dwxgmac2_host_irq_status(struct mac_device_info *hw,return ret; } -static int dwxgmac2_host_mtl_irq_status (struct mac_device_info *hw,u32 chan) +static int dwxgmac2_host_mtl_irq_status (struct stmmac_priv *priv, +struct mac_device_info *hw,u32 chan) {void __iomem *ioaddr = hw->pcsr;int ret =0 ;
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +46 -25
199 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/hwif.h +82 -64
263 lines not on this page · raw message
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH net-next v3 08/12] net: stmmac: Pass stmmac_priv in some callbacks
Quoted 5 lines · Andrew Halaney
Passing
stmmac_privto some of the callbacks allows hwif implementations to grab some data that platforms can customize. Adjust the callbacks accordingly in preparation of such a platform customization.Signed-off-by Andrew Halaney <[email protected]>
...
drivers/net/ethernet/stmicro/stmmac/hwif.h struct stmmac_dma_ops { · line 243
Quoted 7 lines
#define
stmmac_reset(__priv, __args...)\drivers/net/ethernet/stmicro/stmmac/hwif.h +1
-1@@ -223,59 +240,59 @@ struct stmmac_dma_ops { #define stmmac_dma_init(__priv, __args...) \ stmmac_do_void_callback(__priv, dma, init, __args) #define stmmac_init_chan(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, init_chan, __args) + stmmac_do_void_callback(__priv, dma, init_chan, __priv, __args)
Hi Andrew,
Rather than maintaining these macros can we just get rid of them? I'd be surprised if things aren't nicer with functions in their place [1].
f.e., we now have (__priv, ..., __priv, ...) due to a generalisation
that seems to take a lot more than it gives.
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Quoted 118 lines
drivers/net/ethernet/stmicro/stmmac/hwif.h +32
-29#define stmmac_init_rx_chan(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, init_rx_chan, __args) + stmmac_do_void_callback(__priv, dma, init_rx_chan, __priv, __args) #define stmmac_init_tx_chan(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, init_tx_chan, __args) + stmmac_do_void_callback(__priv, dma, init_tx_chan, __priv, __args) #define stmmac_axi(__priv, __args...) \ stmmac_do_void_callback(__priv, dma, axi, __args) #define stmmac_dump_dma_regs(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, dump_regs, __args) + stmmac_do_void_callback(__priv, dma, dump_regs, __priv, __args) #define stmmac_dma_rx_mode(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, dma_rx_mode, __args) + stmmac_do_void_callback(__priv, dma, dma_rx_mode, __priv, __args) #define stmmac_dma_tx_mode(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, dma_tx_mode, __args) + stmmac_do_void_callback(__priv, dma, dma_tx_mode, __priv, __args) #define stmmac_dma_diagnostic_fr(__priv, __args...) \ stmmac_do_void_callback(__priv, dma, dma_diagnostic_fr, __args) #define stmmac_enable_dma_transmission(__priv, __args...) \ stmmac_do_void_callback(__priv, dma, enable_dma_transmission, __args) #define stmmac_enable_dma_irq(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, enable_dma_irq, __args) + stmmac_do_void_callback(__priv, dma, enable_dma_irq, __priv, __args) #define stmmac_disable_dma_irq(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, disable_dma_irq, __args) + stmmac_do_void_callback(__priv, dma, disable_dma_irq, __priv, __args) #define stmmac_start_tx(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, start_tx, __args) + stmmac_do_void_callback(__priv, dma, start_tx, __priv, __args) #define stmmac_stop_tx(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, stop_tx, __args) + stmmac_do_void_callback(__priv, dma, stop_tx, __priv, __args) #define stmmac_start_rx(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, start_rx, __args) + stmmac_do_void_callback(__priv, dma, start_rx, __priv, __args) #define stmmac_stop_rx(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, stop_rx, __args) + stmmac_do_void_callback(__priv, dma, stop_rx, __priv, __args) #define stmmac_dma_interrupt_status(__priv, __args...) \ - stmmac_do_callback(__priv, dma, dma_interrupt, __args) + stmmac_do_callback(__priv, dma, dma_interrupt, __priv, __args) #define stmmac_get_hw_feature(__priv, __args...) \ stmmac_do_callback(__priv, dma, get_hw_feature, __args) #define stmmac_rx_watchdog(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, rx_watchdog, __args) + stmmac_do_void_callback(__priv, dma, rx_watchdog, __priv, __args) #define stmmac_set_tx_ring_len(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, set_tx_ring_len, __args) + stmmac_do_void_callback(__priv, dma, set_tx_ring_len, __priv, __args) #define stmmac_set_rx_ring_len(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, set_rx_ring_len, __args) + stmmac_do_void_callback(__priv, dma, set_rx_ring_len, __priv, __args) #define stmmac_set_rx_tail_ptr(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, set_rx_tail_ptr, __args) + stmmac_do_void_callback(__priv, dma, set_rx_tail_ptr, __priv, __args) #define stmmac_set_tx_tail_ptr(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, set_tx_tail_ptr, __args) + stmmac_do_void_callback(__priv, dma, set_tx_tail_ptr, __priv, __args) #define stmmac_enable_tso(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, enable_tso, __args) + stmmac_do_void_callback(__priv, dma, enable_tso, __priv, __args) #define stmmac_dma_qmode(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, qmode, __args) + stmmac_do_void_callback(__priv, dma, qmode, __priv, __args) #define stmmac_set_dma_bfsize(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, set_bfsize, __args) + stmmac_do_void_callback(__priv, dma, set_bfsize, __priv, __args) #define stmmac_enable_sph(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, enable_sph, __args) + stmmac_do_void_callback(__priv, dma, enable_sph, __priv, __args) #define stmmac_enable_tbs(__priv, __args...) \ - stmmac_do_callback(__priv, dma, enable_tbs, __args) + stmmac_do_callback(__priv, dma, enable_tbs, __priv, __args)struct mac_device_info ;struct net_device ;@@ -307,21 +324,23 @@ struct stmmac_ops {/* Program TX Algorithms */ void (*prog_mtl_tx_algorithms)(struct mac_device_info *hw,u32 tx_alg);/* Set MTL TX queues weight */ -void (*set_mtl_tx_queue_weight)(struct mac_device_info *hw, +void (*set_mtl_tx_queue_weight)(struct stmmac_priv *priv, +struct mac_device_info *hw,u32 weight,u32 queue);/* RX MTL queue to RX dma mapping */ void (*map_mtl_to_dma)(struct mac_device_info *hw,u32 queue,u32 chan);/* Configure AV Algorithm */ -void (*config_cbs)(struct mac_device_info *hw,u32 send_slope, -u32 idle_slope,u32 high_credit,u32 low_credit, -u32 queue); +void (*config_cbs)(struct stmmac_priv *priv,struct mac_device_info *hw, +u32 send_slope,u32 idle_slope,u32 high_credit, +u32 low_credit,u32 queue);/* Dump MAC registers */ void (*dump_regs)(struct mac_device_info *hw,u32 *reg_space);/* Handle extra events on specific interrupts hw dependent */ int (*host_irq_status)(struct mac_device_info *hw,struct stmmac_extra_stats *x);/* Handle MTL interrupts */ -int (*host_mtl_irq_status)(struct mac_device_info *hw,u32 chan); +int (*host_mtl_irq_status)(struct stmmac_priv *priv, +struct mac_device_info *hw,u32 chan);/* Multicast filter setting */ void (*set_filter)(struct mac_device_info *hw,struct net_device *dev);/* Flow control setting */ @@ -341,8 +360,9 @@ struct stmmac_ops {void (*set_eee_lpi_entry_timer)(struct mac_device_info *hw,int et);void (*set_eee_timer)(struct mac_device_info *hw,int ls,int tw);void (*set_eee_pls)(struct mac_device_info *hw,int link); -void (*debug)(void __iomem *ioaddr,struct stmmac_extra_stats *x, -u32 rx_queues,u32 tx_queues); +void (*debug)(struct stmmac_priv *priv,void __iomem *ioaddr, +struct stmmac_extra_stats *x,u32 rx_queues, +u32 tx_queues);/* PCS calls */ void (*pcs_ctrl_ane)(void __iomem *ioaddr,bool ane,bool srgmi_ral,bool loopback);
...
Quoted 38 lines
drivers/net/ethernet/stmicro/stmmac/hwif.h +5
-5@@ -422,17 +442,17 @@ struct stmmac_ops { #define stmmac_prog_mtl_tx_algorithms(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, prog_mtl_tx_algorithms, __args) #define stmmac_set_mtl_tx_queue_weight(__priv, __args...) \ - stmmac_do_void_callback(__priv, mac, set_mtl_tx_queue_weight, __args) + stmmac_do_void_callback(__priv, mac, set_mtl_tx_queue_weight, __priv, __args) #define stmmac_map_mtl_to_dma(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, map_mtl_to_dma, __args) #define stmmac_config_cbs(__priv, __args...) \ - stmmac_do_void_callback(__priv, mac, config_cbs, __args) + stmmac_do_void_callback(__priv, mac, config_cbs, __priv, __args) #define stmmac_dump_mac_regs(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, dump_regs, __args) #define stmmac_host_irq_status(__priv, __args...) \ stmmac_do_callback(__priv, mac, host_irq_status, __args) #define stmmac_host_mtl_irq_status(__priv, __args...) \ - stmmac_do_callback(__priv, mac, host_mtl_irq_status, __args) + stmmac_do_callback(__priv, mac, host_mtl_irq_status, __priv, __args) #define stmmac_set_filter(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, set_filter, __args) #define stmmac_flow_ctrl(__priv, __args...) \@@ -454,11 +474,11 @@ struct stmmac_ops { #define stmmac_set_eee_pls(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, set_eee_pls, __args) #define stmmac_mac_debug(__priv, __args...) \ - stmmac_do_void_callback(__priv, mac, debug, __args) + stmmac_do_void_callback(__priv, mac, debug, __priv, __args) #define stmmac_pcs_ctrl_ane(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, pcs_ctrl_ane, __args) #define stmmac_pcs_rane(__priv, __args...) \ - stmmac_do_void_callback(__priv, mac, pcs_rane, __args) + stmmac_do_void_callback(__priv, mac, pcs_rane, __priv, __args) #define stmmac_pcs_get_adv_lp(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, pcs_get_adv_lp, __args) #define stmmac_safety_feat_config(__priv, __args...) \@@ -506,8 +526,6 @@ struct stmmac_ops { #define stmmac_fpe_irq_status(__priv, __args...) \ stmmac_do_callback(__priv, mac, fpe_irq_status, __args)
Re: [PATCH net-next v3 08/12] net: stmmac: Pass stmmac_priv in some callbacks
Quoted 19 lines · Simon Horman
Quoted 5 lines · Andrew Halaney
Passing
stmmac_privto some of the callbacks allows hwif implementations to grab some data that platforms can customize. Adjust the callbacks accordingly in preparation of such a platform customization.Signed-off-by Andrew Halaney <[email protected]>...
drivers/net/ethernet/stmicro/stmmac/hwif.h struct stmmac_dma_ops { · line 243
Quoted 7 lines
#define
stmmac_reset(__priv, __args...)\drivers/net/ethernet/stmicro/stmmac/hwif.h +1
-1@@ -223,59 +240,59 @@ struct stmmac_dma_ops { #define stmmac_dma_init(__priv, __args...) \ stmmac_do_void_callback(__priv, dma, init, __args) #define stmmac_init_chan(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, init_chan, __args) + stmmac_do_void_callback(__priv, dma, init_chan, __priv, __args)Hi Andrew,
Quoted 8 lines
Rather than maintaining these macros can we just get rid of them? I'd be surprised if things aren't nicer with functions in their place [1].
f.e., we now have (
__priv, ...,__priv, ...) due to a generalisation
that seems to take a lot more than it gives.[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Thanks for the pointer. I think that makes sense, I'll take that approach for these functions (and maybe in a follow-up series I'll tackle all of them just because the lack of consistency will eat me up).
Sorry for the delay, had some issues around the house that became urgent.
Thanks,
Andrew
Re: [PATCH net-next v3 08/12] net: stmmac: Pass stmmac_priv in some callbacks
Quoted 26 lines · Andrew Halaney
Quoted 25 lines · Simon Horman
Quoted 5 lines · Andrew Halaney
Passing
stmmac_privto some of the callbacks allows hwif implementations to grab some data that platforms can customize. Adjust the callbacks accordingly in preparation of such a platform customization.Signed-off-by Andrew Halaney <[email protected]>...
drivers/net/ethernet/stmicro/stmmac/hwif.h struct stmmac_dma_ops { · line 243
Quoted 7 lines
#define
stmmac_reset(__priv, __args...)\drivers/net/ethernet/stmicro/stmmac/hwif.h +1
-1@@ -223,59 +240,59 @@ struct stmmac_dma_ops { #define stmmac_dma_init(__priv, __args...) \ stmmac_do_void_callback(__priv, dma, init, __args) #define stmmac_init_chan(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, init_chan, __args) + stmmac_do_void_callback(__priv, dma, init_chan, __priv, __args)Hi Andrew,
Rather than maintaining these macros can we just get rid of them? I'd be surprised if things aren't nicer with functions in their place [1].
f.e., we now have (
__priv, ...,__priv, ...) due to a generalisation
that seems to take a lot more than it gives.
Quoted 7 lines
Quoted 2 lines
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Thanks for the pointer. I think that makes sense, I'll take that approach for these functions (and maybe in a follow-up series I'll tackle all of them just because the lack of consistency will eat me up).
I tried taking this approach for a spin, and I'm not so sure about it now!
1. Implementing the functions as static inline requires us to know about stmmac_priv, but that's getting into circular dependency land
2. You could define them in hwif.c, but then they're not inlined
3. There's still a good bit of boilerplate that's repeated all over with the approach. Ignoring 1 above, you get something like this:
static inline int stmmac_init_chan(struct stmmac_priv *priv,
void __iomem *ioaddr,
struct stmmac_dma_cfg *dma_cfg, u32 chan)
{
if (priv->hw->dma && priv->hw->dma->init_chan) {
priv->hw->dma->init_chan(priv, ioaddr, dma_cfg, chan);
return 0;
}
return -EINVAL;
}that is then repeated for every function... which is making me actually appreciate the macros some for reducing boilerplate.
Am I suffering from a case of holiday brain, and 1-3 above are silly points with obvious answers, or do they make you reconsider continuing with the current approach in hwif.h?
Thanks,
Andrew
Re: [PATCH net-next v3 08/12] net: stmmac: Pass stmmac_priv in some callbacks
Quoted 55 lines · Andrew Halaney
Quoted 26 lines · Andrew Halaney
Quoted 25 lines · Simon Horman
Quoted 5 lines · Andrew Halaney
Passing
stmmac_privto some of the callbacks allows hwif implementations to grab some data that platforms can customize. Adjust the callbacks accordingly in preparation of such a platform customization.Signed-off-by Andrew Halaney <[email protected]>...
drivers/net/ethernet/stmicro/stmmac/hwif.h struct stmmac_dma_ops { · line 243
Quoted 7 lines
#define
stmmac_reset(__priv, __args...)\drivers/net/ethernet/stmicro/stmmac/hwif.h +1
-1@@ -223,59 +240,59 @@ struct stmmac_dma_ops { #define stmmac_dma_init(__priv, __args...) \ stmmac_do_void_callback(__priv, dma, init, __args) #define stmmac_init_chan(__priv, __args...) \ - stmmac_do_void_callback(__priv, dma, init_chan, __args) + stmmac_do_void_callback(__priv, dma, init_chan, __priv, __args)Hi Andrew,
Rather than maintaining these macros can we just get rid of them? I'd be surprised if things aren't nicer with functions in their place [1].
f.e., we now have (
__priv, ...,__priv, ...) due to a generalisation
that seems to take a lot more than it gives.Quoted 7 lines
Quoted 2 lines
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Thanks for the pointer. I think that makes sense, I'll take that approach for these functions (and maybe in a follow-up series I'll tackle all of them just because the lack of consistency will eat me up).
I tried taking this approach for a spin, and I'm not so sure about it now!
1. Implementing the functions as static inline requires us to know about
stmmac_priv, but that's getting into circular dependency land
2. You could define them inhwif.c, but then they're not inlined
3. There's still a good bit of boilerplate that's repeated all over with the approach. Ignoring 1 above, you get something like this:static inline int stmmac_init_chan(struct
stmmac_priv*priv,
void__iomem*ioaddr,
structstmmac_dma_cfg*dma_cfg, u32 chan){ if (priv->hw->dma && priv->hw->dma->init_chan) { priv->hw->dma->init_chan(priv, ioaddr, dma_cfg, chan); return 0; } return -EINVAL; }
Quoted 6 lines
that is then repeated for every function... which is making me actually appreciate the macros some for reducing boilerplate.
Am I suffering from a case of holiday brain, and 1-3 above are silly points with obvious answers, or do they make you reconsider continuing with the current approach in
hwif.h?
I'm about to embark to the holiday brain zone.
But before I do I wanted to acknowledge your concerns and that, yes, it may be easier said than done.
PATCH v3 9/12 net: stmmac: dwmac4: Allow platforms to specify some DMA/MTL offsets
In reply to Andrew HalaneySome platforms have dwmac4 implementations that have a different address space layout than the default, resulting in the need to define their own DMA/MTL offsets.
Extend the functions to allow a platform driver to indicate what its addresses are, overriding the defaults.
---
This patch (and the prior patch) are replacements for
https://lore.kernel.org/netdev/[email protected]/
as was requested. Hopefully I was understanding the intent correctly :)
I'm pretty sure further refinement will be requested for this one, but it is the best I could come up with myself! Specifically some of the naming, dealing with spacing in some older spots of dwmac4, where the addresses should live in the structure hierarchy, etc are things I would not be surprised to have to rework if this is still preferred over the wrapper approach.
Changes since v2:
* New, replacing old wrapper approach
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 91 ++++++++-- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 36 ++-- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 157 ++++++++++-------- .../net/ethernet/stmicro/stmmac/dwmac4_dma.h | 51 +++--- .../net/ethernet/stmicro/stmmac/dwmac4_lib.c | 67 +++++--- include/linux/stmmac.h | 19 +++ 6 files changed, 279 insertions(+), 142 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +73 -18
@@ -336,14 +336,23 @@ enum power_event {#define MTL_CHAN_BASE_ADDR 0x00000d00#define MTL_CHAN_BASE_OFFSET 0x40 -#define MTL_CHANX_BASE_ADDR (x) (MTL_CHAN_BASE_ADDR + \ - (x * MTL_CHAN_BASE_OFFSET)) - -#define MTL_CHAN_TX_OP_MODE (x) MTL_CHANX_BASE_ADDR(x) -#define MTL_CHAN_TX_DEBUG (x) (MTL_CHANX_BASE_ADDR(x) + 0x8) -#define MTL_CHAN_INT_CTRL (x) (MTL_CHANX_BASE_ADDR(x) + 0x2c) -#define MTL_CHAN_RX_OP_MODE (x) (MTL_CHANX_BASE_ADDR(x) + 0x30) -#define MTL_CHAN_RX_DEBUG (x) (MTL_CHANX_BASE_ADDR(x) + 0x38) +#define MTL_CHANX_BASE_ADDR (addrs, x) \ +({ \ + const struct dwmac4_addrs *__addrs = addrs; \ + const u32 __x = x; \ + u32 __addr; \ + if (__addrs) \ + __addr = __addrs->mtl_chan + (__x * __addrs->mtl_chan_offset); \ + else \ + __addr = MTL_CHAN_BASE_ADDR + (__x * MTL_CHAN_BASE_OFFSET); \ + __addr; \ +}) + +#define MTL_CHAN_TX_OP_MODE (addrs, x) MTL_CHANX_BASE_ADDR(addrs, x) +#define MTL_CHAN_TX_DEBUG (addrs, x) (MTL_CHANX_BASE_ADDR(addrs, x) + 0x8) +#define MTL_CHAN_INT_CTRL (addrs, x) (MTL_CHANX_BASE_ADDR(addrs, x) + 0x2c) +#define MTL_CHAN_RX_OP_MODE (addrs, x) (MTL_CHANX_BASE_ADDR(addrs, x) + 0x30) +#define MTL_CHAN_RX_DEBUG (addrs, x) (MTL_CHANX_BASE_ADDR(addrs, x) + 0x38)#define MTL_OP_MODE_RSF BIT(5)#define MTL_OP_MODE_TXQEN_MASK GENMASK(3, 2)
@@ -388,8 +397,17 @@ enum power_event {/* MTL ETS Control register */ #define MTL_ETS_CTRL_BASE_ADDR 0x00000d10#define MTL_ETS_CTRL_BASE_OFFSET 0x40 -#define MTL_ETSX_CTRL_BASE_ADDR (x) (MTL_ETS_CTRL_BASE_ADDR + \ - ((x) * MTL_ETS_CTRL_BASE_OFFSET)) +#define MTL_ETSX_CTRL_BASE_ADDR (addrs, x) \ +({ \ + const struct dwmac4_addrs *__addrs = addrs; \ + const u32 __x = x; \ + u32 __addr; \ + if (__addrs) \ + __addr = __addrs->mtl_ets_ctrl + (__x * __addrs->mtl_ets_ctrl_offset); \ + else \ + __addr = MTL_ETS_CTRL_BASE_ADDR + (__x * MTL_ETS_CTRL_BASE_OFFSET); \ + __addr; \ +})#define MTL_ETS_CTRL_CC BIT(3)#define MTL_ETS_CTRL_AVALG BIT(2)
@@ -397,31 +415,68 @@ enum power_event {/* MTL Queue Quantum Weight */ #define MTL_TXQ_WEIGHT_BASE_ADDR 0x00000d18#define MTL_TXQ_WEIGHT_BASE_OFFSET 0x40 -#define MTL_TXQX_WEIGHT_BASE_ADDR (x) (MTL_TXQ_WEIGHT_BASE_ADDR + \ - ((x) * MTL_TXQ_WEIGHT_BASE_OFFSET)) +#define MTL_TXQX_WEIGHT_BASE_ADDR (addrs, x) \ +({ \ + const struct dwmac4_addrs *__addrs = addrs; \ + const u32 __x = x; \ + u32 __addr; \ + if (__addrs) \ + __addr = __addrs->mtl_txq_weight + (__x * __addrs->mtl_txq_weight_offset); \ + else \ + __addr = MTL_TXQ_WEIGHT_BASE_ADDR + (__x * MTL_TXQ_WEIGHT_BASE_OFFSET); \ + __addr; \ +}) +#define MTL_TXQ_WEIGHT_ISCQW_MASK GENMASK(20, 0)/* MTL sendSlopeCredit register */ #define MTL_SEND_SLP_CRED_BASE_ADDR 0x00000d1c#define MTL_SEND_SLP_CRED_OFFSET 0x40 -#define MTL_SEND_SLP_CREDX_BASE_ADDR (x) (MTL_SEND_SLP_CRED_BASE_ADDR + \ - ((x) * MTL_SEND_SLP_CRED_OFFSET)) +#define MTL_SEND_SLP_CREDX_BASE_ADDR (addrs, x) \ +({ \ + const struct dwmac4_addrs *__addrs = addrs; \ + const u32 __x = x; \ + u32 __addr; \ + if (__addrs) \ + __addr = __addrs->mtl_send_slp_cred + (__x * __addrs->mtl_send_slp_cred_offset); \ + else \ + __addr = MTL_SEND_SLP_CRED_BASE_ADDR + (__x * MTL_SEND_SLP_CRED_OFFSET); \ + __addr; \ +})#define MTL_SEND_SLP_CRED_SSC_MASK GENMASK(13, 0)/* MTL hiCredit register */ #define MTL_HIGH_CRED_BASE_ADDR 0x00000d20#define MTL_HIGH_CRED_OFFSET 0x40 -#define MTL_HIGH_CREDX_BASE_ADDR (x) (MTL_HIGH_CRED_BASE_ADDR + \ - ((x) * MTL_HIGH_CRED_OFFSET)) +#define MTL_HIGH_CREDX_BASE_ADDR (addrs, x) \ +({ \ + const struct dwmac4_addrs *__addrs = addrs; \ + const u32 __x = x; \ + u32 __addr; \ + if (__addrs) \ + __addr = __addrs->mtl_high_cred + (__x * __addrs->mtl_high_cred_offset); \ + else \ + __addr = MTL_HIGH_CRED_BASE_ADDR + (__x * MTL_HIGH_CRED_OFFSET); \ + __addr; \ +})#define MTL_HIGH_CRED_HC_MASK GENMASK(28, 0)/* MTL loCredit register */ #define MTL_LOW_CRED_BASE_ADDR 0x00000d24#define MTL_LOW_CRED_OFFSET 0x40 -#define MTL_LOW_CREDX_BASE_ADDR (x) (MTL_LOW_CRED_BASE_ADDR + \ - ((x) * MTL_LOW_CRED_OFFSET)) +#define MTL_LOW_CREDX_BASE_ADDR (addrs, x) \ +({ \ + const struct dwmac4_addrs *__addrs = addrs; \ + const u32 __x = x; \ + u32 __addr; \ + if (__addrs) \ + __addr = __addrs->mtl_low_cred + (__x * __addrs->mtl_low_cred_offset); \ + else \ + __addr = MTL_LOW_CRED_BASE_ADDR + (__x * MTL_LOW_CRED_OFFSET); \ + __addr; \ +})#define MTL_HIGH_CRED_LC_MASK GENMASK(28, 0)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +22 -14
@@ -202,12 +202,14 @@ static void dwmac4_set_mtl_tx_queue_weight(struct stmmac_priv *priv,struct mac_device_info *hw, u32 weight, u32 queue) { + const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;void __iomem *ioaddr = hw->pcsr; -u32 value =readl (ioaddr +MTL_TXQX_WEIGHT_BASE_ADDR (queue)); +u32 value =readl (ioaddr +MTL_TXQX_WEIGHT_BASE_ADDR (dwmac4_addrs, + queue)); value &= ~MTL_TXQ_WEIGHT_ISCQW_MASK ; value |= weight &MTL_TXQ_WEIGHT_ISCQW_MASK ; -writel (value, ioaddr +MTL_TXQX_WEIGHT_BASE_ADDR (queue)); +writel (value, ioaddr +MTL_TXQX_WEIGHT_BASE_ADDR (dwmac4_addrs, queue)); }static void dwmac4_map_mtl_dma (struct mac_device_info *hw,u32 queue,u32 chan)
@@ -233,6 +235,7 @@ static void dwmac4_config_cbs(struct stmmac_priv *priv, u32 send_slope, u32 idle_slope, u32 high_credit, u32 low_credit, u32 queue) { + const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;void __iomem *ioaddr = hw->pcsr;u32 value;
@@ -243,31 +246,33 @@ static void dwmac4_config_cbs(struct stmmac_priv *priv,pr_debug ("\tlow_credit: 0x%08x\n" , low_credit);/* enable AV algorithm */ - value =readl (ioaddr +MTL_ETSX_CTRL_BASE_ADDR (queue)); + value =readl (ioaddr +MTL_ETSX_CTRL_BASE_ADDR (dwmac4_addrs, queue)); value |=MTL_ETS_CTRL_AVALG ; value |=MTL_ETS_CTRL_CC ; -writel (value, ioaddr +MTL_ETSX_CTRL_BASE_ADDR (queue)); +writel (value, ioaddr +MTL_ETSX_CTRL_BASE_ADDR (dwmac4_addrs, queue));/* configure send slope */ - value =readl (ioaddr +MTL_SEND_SLP_CREDX_BASE_ADDR (queue)); + value =readl (ioaddr +MTL_SEND_SLP_CREDX_BASE_ADDR (dwmac4_addrs, + queue)); value &= ~MTL_SEND_SLP_CRED_SSC_MASK ; value |= send_slope &MTL_SEND_SLP_CRED_SSC_MASK ; -writel (value, ioaddr +MTL_SEND_SLP_CREDX_BASE_ADDR (queue)); +writel (value, ioaddr +MTL_SEND_SLP_CREDX_BASE_ADDR (dwmac4_addrs, + queue));/* configure idle slope (same register as tx weight) */ dwmac4_set_mtl_tx_queue_weight (priv, hw, idle_slope, queue);/* configure high credit */ - value =readl (ioaddr +MTL_HIGH_CREDX_BASE_ADDR (queue)); + value =readl (ioaddr +MTL_HIGH_CREDX_BASE_ADDR (dwmac4_addrs, queue)); value &= ~MTL_HIGH_CRED_HC_MASK ; value |= high_credit &MTL_HIGH_CRED_HC_MASK ; -writel (value, ioaddr +MTL_HIGH_CREDX_BASE_ADDR (queue)); +writel (value, ioaddr +MTL_HIGH_CREDX_BASE_ADDR (dwmac4_addrs, queue));/* configure high credit */ - value =readl (ioaddr +MTL_LOW_CREDX_BASE_ADDR (queue)); + value =readl (ioaddr +MTL_LOW_CREDX_BASE_ADDR (dwmac4_addrs, queue)); value &= ~MTL_HIGH_CRED_LC_MASK ; value |= low_credit &MTL_HIGH_CRED_LC_MASK ; -writel (value, ioaddr +MTL_LOW_CREDX_BASE_ADDR (queue)); +writel (value, ioaddr +MTL_LOW_CREDX_BASE_ADDR (dwmac4_addrs, queue)); }static void dwmac4_dump_regs (struct mac_device_info *hw,u32 *reg_space)
@@ -764,6 +769,7 @@ static void dwmac4_phystatus(void __iomem *ioaddr, struct stmmac_extra_stats *x)static int dwmac4_irq_mtl_status (struct stmmac_priv *priv,struct mac_device_info *hw,u32 chan) { +const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;void __iomem *ioaddr = hw->pcsr;u32 mtl_int_qx_status;int ret =0 ;
@@ -773,12 +779,13 @@ static int dwmac4_irq_mtl_status(struct stmmac_priv *priv,/* Check MTL Interrupt */ if (mtl_int_qx_status &MTL_INT_QX (chan)) {/* read Queue x Interrupt status */ -u32 status =readl (ioaddr +MTL_CHAN_INT_CTRL (chan)); +u32 status =readl (ioaddr +MTL_CHAN_INT_CTRL (dwmac4_addrs, + chan));if (status &MTL_RX_OVERFLOW_INT ) {/* clear Interrupt */ writel (status |MTL_RX_OVERFLOW_INT , - ioaddr +MTL_CHAN_INT_CTRL (chan)); + ioaddr +MTL_CHAN_INT_CTRL (dwmac4_addrs, chan)); ret =CORE_IRQ_MTL_RX_OVERFLOW ; } }
@@ -840,11 +847,12 @@ static void dwmac4_debug(struct stmmac_priv *priv, void __iomem *ioaddr,struct stmmac_extra_stats *x, u32 rx_queues, u32 tx_queues) { + const struct dwmac4_addrs *dwmac4_addrs = priv->plat->dwmac4_addrs;u32 value;u32 queue;for (queue =0 ; queue < tx_queues; queue++) { - value =readl (ioaddr +MTL_CHAN_TX_DEBUG (queue)); + value =readl (ioaddr +MTL_CHAN_TX_DEBUG (dwmac4_addrs, queue));if (value &MTL_DEBUG_TXSTSFSTS ) x->mtl_tx_status_fifo_full++;
@@ -869,7 +877,7 @@ static void dwmac4_debug(struct stmmac_priv *priv, void __iomem *ioaddr, }for (queue =0 ; queue < rx_queues; queue++) { - value =readl (ioaddr +MTL_CHAN_RX_DEBUG (queue)); + value =readl (ioaddr +MTL_CHAN_RX_DEBUG (dwmac4_addrs, queue));if (value &MTL_DEBUG_RXFSTS_MASK ) {u32 rxfsts = (value &MTL_DEBUG_RXFSTS_MASK )
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +91 -66
325 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h +30 -21
59 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c +44 -23
180 lines not on this page · raw message
include/linux/stmmac.h +19 -0
@@ -186,6 +186,24 @@ struct stmmac_safety_feature_cfg {u32 tmouten; }; +/* Addresses that may be customized by a platform */ +struct dwmac4_addrs { +u32 dma_chan; +u32 dma_chan_offset; +u32 mtl_chan; +u32 mtl_chan_offset; +u32 mtl_ets_ctrl; +u32 mtl_ets_ctrl_offset; +u32 mtl_txq_weight; +u32 mtl_txq_weight_offset; +u32 mtl_send_slp_cred; +u32 mtl_send_slp_cred_offset; +u32 mtl_high_cred; +u32 mtl_high_cred_offset; +u32 mtl_low_cred; +u32 mtl_low_cred_offset; +}; +struct plat_stmmacenet_data {int bus_id;int phy_addr;
@@ -273,5 +291,6 @@ struct plat_stmmacenet_data {bool use_phy_wol;bool sph_disable;bool serdes_up_after_phy_linkup; + const struct dwmac4_addrs *dwmac4_addrs; };#endif
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH net-next v3 09/12] net: stmmac: dwmac4: Allow platforms to specify some DMA/MTL offsets
Quoted 49 lines · Andrew Halaney
Some platforms have dwmac4 implementations that have a different address space layout than the default, resulting in the need to define their own DMA/MTL offsets.
Extend the functions to allow a platform driver to indicate what its addresses are, overriding the defaults.
Signed-off-by Andrew Halaney <[email protected]>---
This patch (and the prior patch) are replacements for
https://lore.kernel.org/netdev/[email protected]/
as was requested. Hopefully I was understanding the intent correctly :)I'm pretty sure further refinement will be requested for this one, but it is the best I could come up with myself! Specifically some of the naming, dealing with spacing in some older spots of dwmac4, where the addresses should live in the structure hierarchy, etc are things I would not be surprised to have to rework if this is still preferred over the wrapper approach.
Changes since v2:
* New, replacing old wrapper approachdrivers/net/ethernet/stmicro/stmmac/dwmac4.h | 91 ++++++++-- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 36 ++-- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 157 ++++++++++-------- .../net/ethernet/stmicro/stmmac/dwmac4_dma.h | 51 +++--- .../net/ethernet/stmicro/stmmac/dwmac4_lib.c | 67 +++++--- include/linux/stmmac.h | 19 +++ 6 files changed, 279 insertions(+), 142 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1
-8@@ -336,14 +336,23 @@ enum power_event {#define MTL_CHAN_BASE_ADDR 0x00000d00#define MTL_CHAN_BASE_OFFSET 0x40 -#define MTL_CHANX_BASE_ADDR (x) (MTL_CHAN_BASE_ADDR + \ - (x * MTL_CHAN_BASE_OFFSET)) - -#define MTL_CHAN_TX_OP_MODE (x) MTL_CHANX_BASE_ADDR(x) -#define MTL_CHAN_TX_DEBUG (x) (MTL_CHANX_BASE_ADDR(x) + 0x8) -#define MTL_CHAN_INT_CTRL (x) (MTL_CHANX_BASE_ADDR(x) + 0x2c) -#define MTL_CHAN_RX_OP_MODE (x) (MTL_CHANX_BASE_ADDR(x) + 0x30) -#define MTL_CHAN_RX_DEBUG (x) (MTL_CHANX_BASE_ADDR(x) + 0x38) +#define MTL_CHANX_BASE_ADDR (addrs, x) \
drivers/net/ethernet/stmicro/stmmac/dwmac4.h enum power_event { · line 349
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +10
-0+({ \ +const struct dwmac4_addrs *__addrs = addrs; \ +const u32 __x = x; \ +u32 __addr; \ +if (__addrs) \ + __addr = __addrs->mtl_chan + (__x * __addrs->mtl_chan_offset); \ +else \ + __addr =MTL_CHAN_BASE_ADDR + (__x *MTL_CHAN_BASE_OFFSET ); \ + __addr; \ +})
Could this and similar macros added by this patch be functions? From my pov a benefit would be slightly more type safety. And as a bonus there wouldn't be any need to handle aliasing of input.
Re: [PATCH net-next v3 09/12] net: stmmac: dwmac4: Allow platforms to specify some DMA/MTL offsets
Quoted 56 lines · Simon Horman
Quoted 55 lines · Andrew Halaney
Some platforms have dwmac4 implementations that have a different address space layout than the default, resulting in the need to define their own DMA/MTL offsets.
Extend the functions to allow a platform driver to indicate what its addresses are, overriding the defaults.
Signed-off-by Andrew Halaney <[email protected]>---
This patch (and the prior patch) are replacements for
https://lore.kernel.org/netdev/[email protected]/
as was requested. Hopefully I was understanding the intent correctly :)I'm pretty sure further refinement will be requested for this one, but it is the best I could come up with myself! Specifically some of the naming, dealing with spacing in some older spots of dwmac4, where the addresses should live in the structure hierarchy, etc are things I would not be surprised to have to rework if this is still preferred over the wrapper approach.
Changes since v2:
* New, replacing old wrapper approachdrivers/net/ethernet/stmicro/stmmac/dwmac4.h | 91 ++++++++-- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 36 ++-- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 157 ++++++++++-------- .../net/ethernet/stmicro/stmmac/dwmac4_dma.h | 51 +++--- .../net/ethernet/stmicro/stmmac/dwmac4_lib.c | 67 +++++--- include/linux/stmmac.h | 19 +++ 6 files changed, 279 insertions(+), 142 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac4.h +7
-8@@ -336,14 +336,23 @@ enum power_event {#define MTL_CHAN_BASE_ADDR 0x00000d00#define MTL_CHAN_BASE_OFFSET 0x40 -#define MTL_CHANX_BASE_ADDR (x) (MTL_CHAN_BASE_ADDR + \ - (x * MTL_CHAN_BASE_OFFSET)) - -#define MTL_CHAN_TX_OP_MODE (x) MTL_CHANX_BASE_ADDR(x) -#define MTL_CHAN_TX_DEBUG (x) (MTL_CHANX_BASE_ADDR(x) + 0x8) -#define MTL_CHAN_INT_CTRL (x) (MTL_CHANX_BASE_ADDR(x) + 0x2c) -#define MTL_CHAN_RX_OP_MODE (x) (MTL_CHANX_BASE_ADDR(x) + 0x30) -#define MTL_CHAN_RX_DEBUG (x) (MTL_CHANX_BASE_ADDR(x) + 0x38) +#define MTL_CHANX_BASE_ADDR (addrs, x) \ +({ \ + const struct dwmac4_addrs *__addrs = addrs; \ + const u32 __x = x; \ + u32 __addr; \ + if (__addrs) \ + __addr = __addrs->mtl_chan + (__x * __addrs->mtl_chan_offset); \
Quoted 9 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4.h enum power_event { · line 349
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +4
-0+else \ + __addr =MTL_CHAN_BASE_ADDR + (__x *MTL_CHAN_BASE_OFFSET ); \ + __addr; \ +})Could this and similar macros added by this patch be functions? From my pov a benefit would be slightly more type safety. And as a bonus there wouldn't be any need to handle aliasing of input.
Sure, to be honest I'll be much more comfortable coding that up anyways. I don't do a ton of macro programming and had to refamiliarize myself of the pitfalls that comes with it when doing this.
Thanks,
Andrew
PATCH v3 10/12 net: stmmac: dwmac-qcom-ethqos: Respect phy-mode and TX delay
In reply to Andrew HalaneyThe driver currently sets a MAC TX delay of 2 ns no matter what the phy-mode is. If the phy-mode indicates the phy is in charge of the TX delay (rgmii-txid, rgmii-id), don't do it in the MAC.
---
Changes since v2:
* Fix spacing, reverse xmas tree (Jakub)
Changes since v1:
* Use a consistent subject prefix with other stmmac changes in series (myself)
.../stmicro/stmmac/dwmac-qcom-ethqos.c | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +15 -5
@@ -279,6 +279,17 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)static int ethqos_rgmii_macro_init (struct qcom_ethqos *ethqos) { +int phase_shift; +int phy_mode; + +/* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */ + phy_mode =device_get_phy_mode (ðqos->pdev->dev); +if (phy_mode ==PHY_INTERFACE_MODE_RGMII_ID || + phy_mode ==PHY_INTERFACE_MODE_RGMII_TXID ) + phase_shift =0 ; +else + phase_shift =RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN ; +/* Disable loopback mode */ rgmii_updatel (ethqos,RGMII_CONFIG2_TX_TO_RX_LOOPBACK_EN ,0 ,RGMII_IO_MACRO_CONFIG2 );
@@ -300,9 +311,9 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) RGMII_CONFIG_PROG_SWAP, RGMII_IO_MACRO_CONFIG);rgmii_updatel (ethqos,RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL ,0 ,RGMII_IO_MACRO_CONFIG2 ); +rgmii_updatel (ethqos,RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN , -RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN , -RGMII_IO_MACRO_CONFIG2 ); + phase_shift,RGMII_IO_MACRO_CONFIG2 );rgmii_updatel (ethqos,RGMII_CONFIG2_RSVD_CONFIG15 ,0 ,RGMII_IO_MACRO_CONFIG2 ); rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP,
@@ -336,8 +347,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)rgmii_updatel (ethqos,RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL ,0 ,RGMII_IO_MACRO_CONFIG2 );rgmii_updatel (ethqos,RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN , -RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN , -RGMII_IO_MACRO_CONFIG2 ); + phase_shift,RGMII_IO_MACRO_CONFIG2 );rgmii_updatel (ethqos,RGMII_CONFIG_MAX_SPD_PRG_2 ,BIT (6 ),RGMII_IO_MACRO_CONFIG ); rgmii_updatel(ethqos, RGMII_CONFIG2_RSVD_CONFIG15,
@@ -375,7 +385,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)rgmii_updatel (ethqos,RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL ,0 ,RGMII_IO_MACRO_CONFIG2 );rgmii_updatel (ethqos,RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN , -0 ,RGMII_IO_MACRO_CONFIG2 ); + phase_shift,RGMII_IO_MACRO_CONFIG2 );rgmii_updatel (ethqos,RGMII_CONFIG_MAX_SPD_PRG_9 ,BIT (12 ) |GENMASK (9 ,8 ),RGMII_IO_MACRO_CONFIG );
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 11/12 net: stmmac: dwmac-qcom-ethqos: Use loopback_en for all speeds
In reply to Andrew HalaneyIt seems that this variable should be used for all speeds, not just 1000/100.
While at it refactor it slightly to be more readable, including fixing the typo in the variable name.
---
Changes since v2:
* None
Changes since v1:
* Use a consistent subject prefix with other stmmac changes in series (myself)
.../stmicro/stmmac/dwmac-qcom-ethqos.c | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +17 -19
@@ -78,7 +78,7 @@ struct ethqos_emac_por {struct ethqos_emac_driver_data {const struct ethqos_emac_por *por;unsigned int num_por; -bool rgmii_config_looback_en; +bool rgmii_config_loopback_en; };struct qcom_ethqos {
@@ -91,7 +91,7 @@ struct qcom_ethqos {const struct ethqos_emac_por *por;unsigned int num_por; -bool rgmii_config_looback_en; +bool rgmii_config_loopback_en; };static int rgmii_readl (struct qcom_ethqos *ethqos,unsigned int offset)
@@ -183,7 +183,7 @@ static const struct ethqos_emac_por emac_v2_3_0_por[] = {static const struct ethqos_emac_driver_data emac_v2_3_0_data = { .por = emac_v2_3_0_por, .num_por =ARRAY_SIZE (emac_v2_3_0_por), - .rgmii_config_looback_en = true, + .rgmii_config_loopback_en = true, };static const struct ethqos_emac_por emac_v2_1_0_por[] = {
@@ -198,7 +198,7 @@ static const struct ethqos_emac_por emac_v2_1_0_por[] = {static const struct ethqos_emac_driver_data emac_v2_1_0_data = { .por = emac_v2_1_0_por, .num_por =ARRAY_SIZE (emac_v2_1_0_por), - .rgmii_config_looback_en = false, + .rgmii_config_loopback_en = false, };static int ethqos_dll_configure (struct qcom_ethqos *ethqos)
@@ -281,6 +281,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) {int phase_shift;int phy_mode; +int loopback;/* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */ phy_mode =device_get_phy_mode (ðqos->pdev->dev);
@@ -294,6 +295,12 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)rgmii_updatel (ethqos,RGMII_CONFIG2_TX_TO_RX_LOOPBACK_EN ,0 ,RGMII_IO_MACRO_CONFIG2 ); +/* Determine if this platform wants loopback enabled after programming */ +if (ethqos->rgmii_config_loopback_en) + loopback =RGMII_CONFIG_LOOPBACK_EN ; +else + loopback =0 ; +/* Select RGMII, write 0 to interface select */ rgmii_updatel (ethqos,RGMII_CONFIG_INTF_SEL ,0 ,RGMII_IO_MACRO_CONFIG );
@@ -326,12 +333,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)rgmii_updatel (ethqos,SDCC_DDR_CONFIG_PRG_DLY_EN ,SDCC_DDR_CONFIG_PRG_DLY_EN ,SDCC_HC_REG_DDR_CONFIG ); -if (ethqos->rgmii_config_looback_en) -rgmii_updatel (ethqos,RGMII_CONFIG_LOOPBACK_EN , -RGMII_CONFIG_LOOPBACK_EN ,RGMII_IO_MACRO_CONFIG ); -else -rgmii_updatel (ethqos,RGMII_CONFIG_LOOPBACK_EN , -0 ,RGMII_IO_MACRO_CONFIG ); +rgmii_updatel (ethqos,RGMII_CONFIG_LOOPBACK_EN , + loopback,RGMII_IO_MACRO_CONFIG );break ;case SPEED_100 :
@@ -363,13 +366,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)rgmii_updatel (ethqos,SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN ,SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN ,SDCC_HC_REG_DDR_CONFIG ); -if (ethqos->rgmii_config_looback_en) -rgmii_updatel (ethqos,RGMII_CONFIG_LOOPBACK_EN , -RGMII_CONFIG_LOOPBACK_EN ,RGMII_IO_MACRO_CONFIG ); -else -rgmii_updatel (ethqos,RGMII_CONFIG_LOOPBACK_EN , -0 ,RGMII_IO_MACRO_CONFIG ); - +rgmii_updatel (ethqos,RGMII_CONFIG_LOOPBACK_EN , + loopback,RGMII_IO_MACRO_CONFIG );break ;case SPEED_10 :
@@ -403,7 +401,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN , SDCC_HC_REG_DDR_CONFIG);rgmii_updatel (ethqos,RGMII_CONFIG_LOOPBACK_EN , -RGMII_CONFIG_LOOPBACK_EN ,RGMII_IO_MACRO_CONFIG ); + loopback,RGMII_IO_MACRO_CONFIG );break ;default : dev_err(ðqos->pdev->dev,
@@ -548,7 +546,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) data =of_device_get_match_data (&pdev->dev); ethqos->por = data->por; ethqos->num_por = data->num_por; - ethqos->rgmii_config_looback_en = data->rgmii_config_looback_en; + ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en; ethqos->rgmii_clk =devm_clk_get (&pdev->dev,"rgmii" );if (IS_ERR (ethqos->rgmii_clk)) {
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 10 lines · Andrew Halaney
This is a forward port / upstream refactor of code delivered downstream by Qualcomm over at [0] to enable the DWMAC5 based implementation called EMAC3 on the sa8540p-ride dev board.
From what I can tell with the board schematic in hand, as well as the code delivered, the main changes needed are:
1. A new address space layout for /dwmac5/EMAC3 MTL/DMA regs
2. A new programming sequence required for the EMAC3 base platforms
Quoted 6 lines
This series makes the change for 1 above as well as other housekeeping items such as converting dt-bindings to yaml, etc.
As requested[1], it has been split up by compile time / maintainer tree. I will post a link to the associated devicetree changes that together with this series get the hardware functioning.
As promised: https://lore.kernel.org/netdev/[email protected]/T/#t
Thanks in advance for any reviews!
- Andrew
Jakub Kicinski
maintainerQuoted 1 line · On Fri, 31 Mar 2023 17:06:13 -0500 Andrew Halaney wrote:
As promised: https://lore.kernel.org/netdev/[email protected]/T/#t
Patch 12 never made it to netdev or lore :(
Quoted 5 lines · Jakub Kicinski
Quoted 1 line · On Fri, 31 Mar 2023 17:06:13 -0500 Andrew Halaney wrote:
As promised: https://lore.kernel.org/netdev/[email protected]/T/#t
Patch 12 never made it to netdev or lore :(
Well, that's no good as I definitely want some eyes on that one :(
I've already gotten _some_ reviews on the earlier patches in v3, I am going to absorb anything super quick into a v4 today, then send that out, maybe copy pasting larger questions I have yet to respond to? Seems like an ok approach.. not having the full solution in hand is crummy for review. Let me know if you think that's a bad call and just a resend is better.
Sorry, not sure where I messed that up Friday evening when writing changelogs etc.
PATCH v3 12/12 net: stmmac: dwmac-qcom-ethqos: Add EMAC3 support
In reply to Andrew HalaneyAdd the new programming sequence needed for EMAC3 based platforms such as the sc8280xp family.
---
This originally did not make it to the list somehow, but was intended to. Apologies in advance if appending it like this is inappropriate, but after thinking about it more I think that works better than doing a RESEND (and making current comments difficult to track) or spinning a v4, without addressing comments in this version entirely. I'm eager to get some feedback on this, and I've got some property damage at home to deal with so I'm sending it this way instead of waiting for further advice on how to deal with me dropping it on accident.
I know the Qualcomm team has looked at earlier versions of this offlist, but I'd appreciate any feedback I can get (good or bad) for this patch since it is a lot of programming that I took entirely from downstream after modifying to be more upstream appropriate (i.e., I do not have documentation for the IP, be it this implementation or the generic docs).
Thanks in advance and sorry again about it getting dropped from the original submission!
Changes since v2:
* Adjust to the new method of defining the MTL/DMA offsets in the platform glue
Changes since v1:
* None
.../stmicro/stmmac/dwmac-qcom-ethqos.c | 121 +++++++++++++++--- 1 file changed, 100 insertions(+), 21 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +100 -21
@@ -11,6 +11,7 @@#define RGMII_IO_MACRO_CONFIG 0x0#define SDCC_HC_REG_DLL_CONFIG 0x4 +#define SDCC_TEST_CTL 0x8#define SDCC_HC_REG_DDR_CONFIG 0xC#define SDCC_HC_REG_DLL_CONFIG2 0x10#define SDC4_STATUS 0x14
@@ -49,6 +50,7 @@#define SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY GENMASK(26, 21)#define SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE GENMASK(29, 27)#define SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN BIT(30) +#define SDCC_DDR_CONFIG_TCXO_CYCLES_CNT GENMASK(11, 9)#define SDCC_DDR_CONFIG_PRG_RCLK_DLY GENMASK(8, 0)/* SDCC_HC_REG_DLL_CONFIG2 fields */
@@ -79,6 +81,8 @@ struct ethqos_emac_driver_data {const struct ethqos_emac_por *por;unsigned int num_por;bool rgmii_config_loopback_en; +bool has_emac3; +struct dwmac4_addrs dwmac4_addrs; };struct qcom_ethqos {
@@ -92,6 +96,7 @@ struct qcom_ethqos {const struct ethqos_emac_por *por;unsigned int num_por;bool rgmii_config_loopback_en; +bool has_emac3; };static int rgmii_readl (struct qcom_ethqos *ethqos,unsigned int offset)
@@ -184,6 +189,7 @@ static const struct ethqos_emac_driver_data emac_v2_3_0_data = { .por = emac_v2_3_0_por, .num_por = ARRAY_SIZE(emac_v2_3_0_por), .rgmii_config_loopback_en = true, + .has_emac3 = false, };static const struct ethqos_emac_por emac_v2_1_0_por[] = {
@@ -199,6 +205,39 @@ static const struct ethqos_emac_driver_data emac_v2_1_0_data = { .por = emac_v2_1_0_por, .num_por = ARRAY_SIZE(emac_v2_1_0_por), .rgmii_config_loopback_en = false, + .has_emac3 = false, +}; + +static const struct ethqos_emac_por emac_v3_0_0_por[] = { + { .offset =RGMII_IO_MACRO_CONFIG , .value =0x40c01343 }, + { .offset =SDCC_HC_REG_DLL_CONFIG , .value =0x2004642c }, + { .offset =SDCC_HC_REG_DDR_CONFIG , .value =0x80040800 }, + { .offset =SDCC_HC_REG_DLL_CONFIG2 , .value =0x00200000 }, + { .offset =SDCC_USR_CTL , .value =0x00010800 }, + { .offset =RGMII_IO_MACRO_CONFIG2 , .value =0x00002060 }, +}; + +static const struct ethqos_emac_driver_data emac_v3_0_0_data = { + .por = emac_v3_0_0_por, + .num_por =ARRAY_SIZE (emac_v3_0_0_por), + .rgmii_config_loopback_en = false, + .has_emac3 = true, + .dwmac4_addrs = { + .dma_chan =0x00008100 , + .dma_chan_offset =0x1000 , + .mtl_chan =0x00008000 , + .mtl_chan_offset =0x1000 , + .mtl_ets_ctrl =0x00008010 , + .mtl_ets_ctrl_offset =0x1000 , + .mtl_txq_weight =0x00008018 , + .mtl_txq_weight_offset =0x1000 , + .mtl_send_slp_cred =0x0000801c , + .mtl_send_slp_cred_offset =0x1000 , + .mtl_high_cred =0x00008020 , + .mtl_high_cred_offset =0x1000 , + .mtl_low_cred =0x00008024 , + .mtl_low_cred_offset =0x1000 , + }, };static int ethqos_dll_configure (struct qcom_ethqos *ethqos)
@@ -222,11 +261,13 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)rgmii_updatel (ethqos,SDCC_DLL_CONFIG_DLL_EN ,SDCC_DLL_CONFIG_DLL_EN ,SDCC_HC_REG_DLL_CONFIG ); -rgmii_updatel (ethqos,SDCC_DLL_MCLK_GATING_EN , -0 ,SDCC_HC_REG_DLL_CONFIG ); +if (!ethqos->has_emac3) { +rgmii_updatel (ethqos,SDCC_DLL_MCLK_GATING_EN , +0 ,SDCC_HC_REG_DLL_CONFIG ); -rgmii_updatel (ethqos,SDCC_DLL_CDR_FINE_PHASE , -0 ,SDCC_HC_REG_DLL_CONFIG ); +rgmii_updatel (ethqos,SDCC_DLL_CDR_FINE_PHASE , +0 ,SDCC_HC_REG_DLL_CONFIG ); + }/* Wait for CK_OUT_EN clear */ do {
@@ -261,18 +302,20 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)rgmii_updatel (ethqos,SDCC_DLL_CONFIG2_DDR_CAL_EN ,SDCC_DLL_CONFIG2_DDR_CAL_EN ,SDCC_HC_REG_DLL_CONFIG2 ); -rgmii_updatel (ethqos,SDCC_DLL_CONFIG2_DLL_CLOCK_DIS , -0 ,SDCC_HC_REG_DLL_CONFIG2 ); +if (!ethqos->has_emac3) { +rgmii_updatel (ethqos,SDCC_DLL_CONFIG2_DLL_CLOCK_DIS , +0 ,SDCC_HC_REG_DLL_CONFIG2 ); -rgmii_updatel (ethqos,SDCC_DLL_CONFIG2_MCLK_FREQ_CALC , -0x1A <<10 ,SDCC_HC_REG_DLL_CONFIG2 ); +rgmii_updatel (ethqos,SDCC_DLL_CONFIG2_MCLK_FREQ_CALC , +0x1A <<10 ,SDCC_HC_REG_DLL_CONFIG2 ); -rgmii_updatel (ethqos,SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SEL , -BIT (2 ),SDCC_HC_REG_DLL_CONFIG2 ); +rgmii_updatel (ethqos,SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SEL , +BIT (2 ),SDCC_HC_REG_DLL_CONFIG2 ); -rgmii_updatel (ethqos,SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SW , -SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SW , -SDCC_HC_REG_DLL_CONFIG2 ); +rgmii_updatel (ethqos,SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SW , +SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SW , +SDCC_HC_REG_DLL_CONFIG2 ); + }return 0 ; }
@@ -327,9 +370,17 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)RGMII_CONFIG2_RX_PROG_SWAP , RGMII_IO_MACRO_CONFIG2); -/* Set PRG_RCLK_DLY to 57 for 1.8 ns delay */ -rgmii_updatel (ethqos,SDCC_DDR_CONFIG_PRG_RCLK_DLY , -57 ,SDCC_HC_REG_DDR_CONFIG ); +/* PRG_RCLK_DLY = TCXO period * TCXO_CYCLES_CNT / 2 * RX delay ns, +* in practice this becomes PRG_RCLK_DLY = 52 * 4 / 2 * RX delay ns +*/ +if (ethqos->has_emac3) +/* 0.9 ns */ +rgmii_updatel (ethqos,SDCC_DDR_CONFIG_PRG_RCLK_DLY , +115 ,SDCC_HC_REG_DDR_CONFIG ); +else +/* 1.8 ns */ +rgmii_updatel (ethqos,SDCC_DDR_CONFIG_PRG_RCLK_DLY , +57 ,SDCC_HC_REG_DDR_CONFIG );rgmii_updatel (ethqos,SDCC_DDR_CONFIG_PRG_DLY_EN ,SDCC_DDR_CONFIG_PRG_DLY_EN ,SDCC_HC_REG_DDR_CONFIG );
@@ -355,8 +406,15 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) BIT(6), RGMII_IO_MACRO_CONFIG);rgmii_updatel (ethqos,RGMII_CONFIG2_RSVD_CONFIG15 ,0 ,RGMII_IO_MACRO_CONFIG2 ); -rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , -0 ,RGMII_IO_MACRO_CONFIG2 ); + +if (ethqos->has_emac3) +rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , +RGMII_CONFIG2_RX_PROG_SWAP , +RGMII_IO_MACRO_CONFIG2 ); +else +rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , +0 ,RGMII_IO_MACRO_CONFIG2 ); +/* Write 0x5 to PRG_RCLK_DLY_CODE */ rgmii_updatel (ethqos,SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE , (BIT (29 ) |BIT (27 )),SDCC_HC_REG_DDR_CONFIG );
@@ -389,8 +447,13 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) RGMII_IO_MACRO_CONFIG);rgmii_updatel (ethqos,RGMII_CONFIG2_RSVD_CONFIG15 ,0 ,RGMII_IO_MACRO_CONFIG2 ); -rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , -0 ,RGMII_IO_MACRO_CONFIG2 ); +if (ethqos->has_emac3) +rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , +RGMII_CONFIG2_RX_PROG_SWAP , +RGMII_IO_MACRO_CONFIG2 ); +else +rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , +0 ,RGMII_IO_MACRO_CONFIG2 );/* Write 0x5 to PRG_RCLK_DLY_CODE */ rgmii_updatel (ethqos,SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE , (BIT (29 ) |BIT (27 )),SDCC_HC_REG_DDR_CONFIG );
@@ -433,6 +496,17 @@ static int ethqos_configure(struct qcom_ethqos *ethqos)rgmii_updatel (ethqos,SDCC_DLL_CONFIG_PDN ,SDCC_DLL_CONFIG_PDN ,SDCC_HC_REG_DLL_CONFIG ); +if (ethqos->has_emac3) { +if (ethqos->speed ==SPEED_1000 ) { +rgmii_writel (ethqos,0x1800000 ,SDCC_TEST_CTL ); +rgmii_writel (ethqos,0x2C010800 ,SDCC_USR_CTL ); +rgmii_writel (ethqos,0xA001 ,SDCC_HC_REG_DLL_CONFIG2 ); + }else { +rgmii_writel (ethqos,0x40010800 ,SDCC_USR_CTL ); +rgmii_writel (ethqos,0xA001 ,SDCC_HC_REG_DLL_CONFIG2 ); + } + } +/* Clear DLL_RST */ rgmii_updatel (ethqos,SDCC_DLL_CONFIG_DLL_RST ,0 ,SDCC_HC_REG_DLL_CONFIG );
@@ -452,7 +526,9 @@ static int ethqos_configure(struct qcom_ethqos *ethqos) SDCC_HC_REG_DLL_CONFIG);/* Set USR_CTL bit 26 with mask of 3 bits */ -rgmii_updatel (ethqos,GENMASK (26 ,24 ),BIT (26 ),SDCC_USR_CTL ); +if (!ethqos->has_emac3) +rgmii_updatel (ethqos,GENMASK (26 ,24 ),BIT (26 ), +SDCC_USR_CTL );/* wait for DLL LOCK */ do {
@@ -547,6 +623,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ethqos->por = data->por; ethqos->num_por = data->num_por; ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en; + ethqos->has_emac3 = data->has_emac3; ethqos->rgmii_clk =devm_clk_get (&pdev->dev,"rgmii" );if (IS_ERR (ethqos->rgmii_clk)) {
@@ -566,6 +643,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat->fix_mac_speed = ethqos_fix_mac_speed; plat_dat->dump_debug_regs = rgmii_dump; plat_dat->has_gmac4 =1 ; + plat_dat->dwmac4_addrs = &data->dwmac4_addrs; plat_dat->pmt =1 ; plat_dat->tso_en =of_property_read_bool (np,"snps,tso" );if (of_device_is_compatible (np,"qcom,qcs404-ethqos" ))
@@ -603,6 +681,7 @@ static int qcom_ethqos_remove(struct platform_device *pdev)static const struct of_device_id qcom_ethqos_match[] = { { .compatible ="qcom,qcs404-ethqos" , .data = &emac_v2_3_0_data}, + { .compatible ="qcom,sc8280xp-ethqos" , .data = &emac_v3_0_0_data}, { .compatible ="qcom,sm8150-ethqos" , .data = &emac_v2_1_0_data}, { } };
Signature · 1 line
2.39.2
Paolo Abeni
maintainerRe: [PATCH net-next v3 12/12] net: stmmac: dwmac-qcom-ethqos: Add EMAC3 support
Hi,
Quoted 8 lines · Andrew Halaney
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +1
-3@@ -327,9 +370,17 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)RGMII_CONFIG2_RX_PROG_SWAP , RGMII_IO_MACRO_CONFIG2); -/* Set PRG_RCLK_DLY to 57 for 1.8 ns delay */ -rgmii_updatel (ethqos,SDCC_DDR_CONFIG_PRG_RCLK_DLY , -57 ,SDCC_HC_REG_DDR_CONFIG ); +/* PRG_RCLK_DLY = TCXO period * TCXO_CYCLES_CNT / 2 * RX delay ns,
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) · line 383
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +10
-0+* in practice this becomes PRG_RCLK_DLY = 52 * 4 / 2 * RX delay ns +*/ +if (ethqos->has_emac3) +/* 0.9 ns */ +rgmii_updatel (ethqos,SDCC_DDR_CONFIG_PRG_RCLK_DLY , +115 ,SDCC_HC_REG_DDR_CONFIG ); +else +/* 1.8 ns */ +rgmii_updatel (ethqos,SDCC_DDR_CONFIG_PRG_RCLK_DLY , +57 ,SDCC_HC_REG_DDR_CONFIG );
The only (very minor) comment I have is that AFAIK the preferred style for the above block is:
if (ethqos->has_emac3) {
/* 0.9 ns */
rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY,
115, SDCC_HC_REG_DDR_CONFIG);
} else {
...due to the comment presence this should be threaded as a multi-line statement. (even if checkpatch does not complain).
Cheers,
Paolo
Quoted 88 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +33
-5SDCC_HC_REG_DDR_CONFIG);@@ -355,8 +406,15 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) BIT(6), RGMII_IO_MACRO_CONFIG);rgmii_updatel (ethqos,RGMII_CONFIG2_RSVD_CONFIG15 ,0 ,RGMII_IO_MACRO_CONFIG2 ); -rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , -0 ,RGMII_IO_MACRO_CONFIG2 ); + +if (ethqos->has_emac3) +rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , +RGMII_CONFIG2_RX_PROG_SWAP , +RGMII_IO_MACRO_CONFIG2 ); +else +rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , +0 ,RGMII_IO_MACRO_CONFIG2 ); +/* Write 0x5 to PRG_RCLK_DLY_CODE */ rgmii_updatel (ethqos,SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE , (BIT (29 ) |BIT (27 )),SDCC_HC_REG_DDR_CONFIG );@@ -389,8 +447,13 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) RGMII_IO_MACRO_CONFIG);rgmii_updatel (ethqos,RGMII_CONFIG2_RSVD_CONFIG15 ,0 ,RGMII_IO_MACRO_CONFIG2 ); -rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , -0 ,RGMII_IO_MACRO_CONFIG2 ); +if (ethqos->has_emac3) +rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , +RGMII_CONFIG2_RX_PROG_SWAP , +RGMII_IO_MACRO_CONFIG2 ); +else +rgmii_updatel (ethqos,RGMII_CONFIG2_RX_PROG_SWAP , +0 ,RGMII_IO_MACRO_CONFIG2 );/* Write 0x5 to PRG_RCLK_DLY_CODE */ rgmii_updatel (ethqos,SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE , (BIT (29 ) |BIT (27 )),SDCC_HC_REG_DDR_CONFIG );@@ -433,6 +496,17 @@ static int ethqos_configure(struct qcom_ethqos *ethqos)rgmii_updatel (ethqos,SDCC_DLL_CONFIG_PDN ,SDCC_DLL_CONFIG_PDN ,SDCC_HC_REG_DLL_CONFIG ); +if (ethqos->has_emac3) { +if (ethqos->speed ==SPEED_1000 ) { +rgmii_writel (ethqos,0x1800000 ,SDCC_TEST_CTL ); +rgmii_writel (ethqos,0x2C010800 ,SDCC_USR_CTL ); +rgmii_writel (ethqos,0xA001 ,SDCC_HC_REG_DLL_CONFIG2 ); + }else { +rgmii_writel (ethqos,0x40010800 ,SDCC_USR_CTL ); +rgmii_writel (ethqos,0xA001 ,SDCC_HC_REG_DLL_CONFIG2 ); + } + } +/* Clear DLL_RST */ rgmii_updatel (ethqos,SDCC_DLL_CONFIG_DLL_RST ,0 ,SDCC_HC_REG_DLL_CONFIG );@@ -452,7 +526,9 @@ static int ethqos_configure(struct qcom_ethqos *ethqos) SDCC_HC_REG_DLL_CONFIG);/* Set USR_CTL bit 26 with mask of 3 bits */ -rgmii_updatel (ethqos,GENMASK (26 ,24 ),BIT (26 ),SDCC_USR_CTL ); +if (!ethqos->has_emac3) +rgmii_updatel (ethqos,GENMASK (26 ,24 ),BIT (26 ), +SDCC_USR_CTL );/* wait for DLL LOCK */ do {@@ -547,6 +623,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ethqos->por = data->por; ethqos->num_por = data->num_por; ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en; + ethqos->has_emac3 = data->has_emac3; ethqos->rgmii_clk =devm_clk_get (&pdev->dev,"rgmii" );if (IS_ERR (ethqos->rgmii_clk)) {@@ -566,6 +643,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat->fix_mac_speed = ethqos_fix_mac_speed; plat_dat->dump_debug_regs = rgmii_dump; plat_dat->has_gmac4 =1 ; + plat_dat->dwmac4_addrs = &data->dwmac4_addrs; plat_dat->pmt =1 ; plat_dat->tso_en =of_property_read_bool (np,"snps,tso" );if (of_device_is_compatible (np,"qcom,qcs404-ethqos" ))@@ -603,6 +681,7 @@ static int qcom_ethqos_remove(struct platform_device *pdev)static const struct of_device_id qcom_ethqos_match[] = { { .compatible ="qcom,qcs404-ethqos" , .data = &emac_v2_3_0_data}, + { .compatible ="qcom,sc8280xp-ethqos" , .data = &emac_v3_0_0_data}, { .compatible ="qcom,sm8150-ethqos" , .data = &emac_v2_1_0_data}, { } };