net: stmmac: Only enable enhanced addressing mode when needed
Subsystems (5)
PATCH v2 1/2 net: stmmac: Only enable enhanced addressing mode when needed
From: Thierry Reding <[email protected]>
Enhanced addressing mode is only required when more than 32 bits need to be addressed. Add a DMA configuration parameter to enable this mode only when needed.
--- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 5 ++++- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 ++++++ include/linux/stmmac.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c +4 -1
@@ -27,7 +27,10 @@ static void dwxgmac2_dma_init(void __iomem *ioaddr,if (dma_cfg->aal) value |=XGMAC_AAL ; -writel (value |XGMAC_EAME , ioaddr +XGMAC_DMA_SYSBUS_MODE ); +if (dma_cfg->eame) + value |=XGMAC_EAME ; + +writel (value, ioaddr +XGMAC_DMA_SYSBUS_MODE ); } static void dwxgmac2_dma_init_chan(void __iomem *ioaddr,
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +6 -0
@@ -4497,6 +4497,12 @@ int stmmac_dvr_probe(struct device *device,if (!ret) {dev_info (priv->device,"Using %d bits DMA width\n" , priv->dma_cap.addr64); + +/* +* If more than 32 bits can be addressed, make sure to +* enable enhanced addressing mode. +*/ + priv->plat->dma_cfg->eame = true; }else { ret =dma_set_mask_and_coherent (device,DMA_BIT_MASK (32 ));if (ret) {
include/linux/stmmac.h +1 -0
@@ -92,6 +92,7 @@ struct stmmac_dma_cfg {int fixed_burst;int mixed_burst;bool aal; +bool eame; };#define AXI_BLEN 7
Signature · 1 line
2.23.0
PATCH v2 2/2 net: stmmac: Support enhanced addressing mode for DWMAC 4.10
From: Thierry Reding <[email protected]>
The address width of the controller can be read from hardware feature registers much like on XGMAC. Add support for parsing the ADDR64 field so that the DMA mask can be set accordingly.
This avoids getting swiotlb involved for DMA on Tegra186 and later.
Also make sure that the upper 32 bits of the DMA address are written to the DMA descriptors when enhanced addressing mode is used. Similarily, for each channel, the upper 32 bits of the DMA descriptor ring's base address also need to be programmed to make sure the correct memory can be fetched when the DMA descriptor ring is located beyond the 32-bit boundary.
---
Changes in v2:
- also program the upper 32 bits of the DMA descriptor base address for each channel
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 + .../ethernet/stmicro/stmmac/dwmac4_descs.c | 4 +-- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 28 +++++++++++++++++++ .../net/ethernet/stmicro/stmmac/dwmac4_dma.h | 3 ++ 4 files changed, 34 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1 -0
@@ -183,6 +183,7 @@ enum power_event {#define GMAC_HW_HASH_TB_SZ GENMASK(25, 24)#define GMAC_HW_FEAT_AVSEL BIT(20)#define GMAC_HW_TSOEN BIT(18) +#define GMAC_HW_ADDR64 GENMASK(15, 14)#define GMAC_HW_TXFIFOSIZE GENMASK(10, 6)#define GMAC_HW_RXFIFOSIZE GENMASK(4, 0)
drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +2 -2
@@ -431,8 +431,8 @@ static void dwmac4_get_addr(struct dma_desc *p, unsigned int *addr)static void dwmac4_set_addr (struct dma_desc *p,dma_addr_t addr) { - p->des0 =cpu_to_le32 (addr); - p->des1 =0 ; + p->des0 =cpu_to_le32 (lower_32_bits (addr)); + p->des1 =cpu_to_le32 (upper_32_bits (addr)); }static void dwmac4_clear (struct dma_desc *p)
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +28 -0
@@ -79,6 +79,10 @@ static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, value = value | (rxpbl <<DMA_BUS_MODE_RPBL_SHIFT );writel (value, ioaddr +DMA_CHAN_RX_CONTROL (chan)); +if (dma_cfg->eame) +writel (upper_32_bits (dma_rx_phy), + ioaddr +DMA_CHAN_RX_BASE_ADDR_HI (chan)); +writel (lower_32_bits (dma_rx_phy), ioaddr +DMA_CHAN_RX_BASE_ADDR (chan)); }
@@ -97,6 +101,10 @@ static void dwmac4_dma_init_tx_chan(void __iomem *ioaddr,writel (value, ioaddr +DMA_CHAN_TX_CONTROL (chan)); +if (dma_cfg->eame) +writel (upper_32_bits (dma_tx_phy), + ioaddr +DMA_CHAN_TX_BASE_ADDR_HI (chan)); +writel (lower_32_bits (dma_tx_phy), ioaddr +DMA_CHAN_TX_BASE_ADDR (chan)); }
@@ -132,6 +140,9 @@ static void dwmac4_dma_init(void __iomem *ioaddr,if (dma_cfg->aal) value |=DMA_SYS_BUS_AAL ; +if (dma_cfg->eame) + value |=DMA_SYS_BUS_EAME ; +writel (value, ioaddr +DMA_SYS_BUS_MODE ); }
@@ -354,6 +365,23 @@ static void dwmac4_get_hw_feature(void __iomem *ioaddr, dma_cap->hash_tb_sz = (hw_cap &GMAC_HW_HASH_TB_SZ ) >>24 ; dma_cap->av = (hw_cap &GMAC_HW_FEAT_AVSEL ) >>20 ; dma_cap->tsoen = (hw_cap &GMAC_HW_TSOEN ) >>18 ; + + dma_cap->addr64 = (hw_cap &GMAC_HW_ADDR64 ) >>14 ; +switch (dma_cap->addr64) { +case 0 : + dma_cap->addr64 =32 ; +break ; +case 1 : + dma_cap->addr64 =40 ; +break ; +case 2 : + dma_cap->addr64 =48 ; +break ; +default : + dma_cap->addr64 =32 ; +break ; + } +/* RX and TX FIFO sizes are encoded as log2(n / 128). Undo that by * shifting and store the sizes in bytes. */
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h +3 -0
@@ -65,6 +65,7 @@#define DMA_SYS_BUS_MB BIT(14)#define DMA_AXI_1KBBE BIT(13)#define DMA_SYS_BUS_AAL BIT(12) +#define DMA_SYS_BUS_EAME BIT(11)#define DMA_AXI_BLEN256 BIT(7)#define DMA_AXI_BLEN128 BIT(6)#define DMA_AXI_BLEN64 BIT(5)
@@ -91,7 +92,9 @@#define DMA_CHAN_CONTROL (x) DMA_CHANX_BASE_ADDR(x)#define DMA_CHAN_TX_CONTROL (x) (DMA_CHANX_BASE_ADDR(x) + 0x4)#define DMA_CHAN_RX_CONTROL (x) (DMA_CHANX_BASE_ADDR(x) + 0x8) +#define DMA_CHAN_TX_BASE_ADDR_HI (x) (DMA_CHANX_BASE_ADDR(x) + 0x10)#define DMA_CHAN_TX_BASE_ADDR (x) (DMA_CHANX_BASE_ADDR(x) + 0x14) +#define DMA_CHAN_RX_BASE_ADDR_HI (x) (DMA_CHANX_BASE_ADDR(x) + 0x18)#define DMA_CHAN_RX_BASE_ADDR (x) (DMA_CHANX_BASE_ADDR(x) + 0x1c)#define DMA_CHAN_TX_END_ADDR (x) (DMA_CHANX_BASE_ADDR(x) + 0x20)#define DMA_CHAN_RX_END_ADDR (x) (DMA_CHANX_BASE_ADDR(x) + 0x28)
Signature · 1 line
2.23.0
RE: [PATCH net-next v2 2/2] net: stmmac: Support enhanced addressing mode for DWMAC 4.10
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:46 (UTC+00:00)
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, · line 82
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +1
-0@@ -79,6 +79,10 @@ static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, value = value | (rxpbl <<DMA_BUS_MODE_RPBL_SHIFT );writel (value, ioaddr +DMA_CHAN_RX_CONTROL (chan)); +if (dma_cfg->eame)
There is no need for this check. If EAME is not enabled then upper 32 bits will be zero.
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c static void dwmac4_dma_init_tx_chan(void __iomem *ioaddr, · line 104
Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +4
-0+writel (upper_32_bits (dma_rx_phy), + ioaddr +DMA_CHAN_RX_BASE_ADDR_HI (chan)); +writel (lower_32_bits (dma_rx_phy), ioaddr +DMA_CHAN_RX_BASE_ADDR (chan)); }@@ -97,6 +101,10 @@ static void dwmac4_dma_init_tx_chan(void __iomem *ioaddr,writel (value, ioaddr +DMA_CHAN_TX_CONTROL (chan)); +if (dma_cfg->eame)
Same here.
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c static void dwmac4_dma_init_tx_chan(void __iomem *ioaddr, · line 109
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +3
-0+writel (upper_32_bits (dma_tx_phy), + ioaddr +DMA_CHAN_TX_BASE_ADDR_HI (chan)); +writel (lower_32_bits (dma_tx_phy), ioaddr +DMA_CHAN_TX_BASE_ADDR (chan)); }
Also, please provide a cover letter in next submission.
---
Thanks,
Jose Miguel Abreu
Re: [PATCH net-next v2 2/2] net: stmmac: Support enhanced addressing mode for DWMAC 4.10
Quoted 11 lines · Jose Abreu
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:46 (UTC+00:00)drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, · line 82
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +1
-0@@ -79,6 +79,10 @@ static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, value = value | (rxpbl <<DMA_BUS_MODE_RPBL_SHIFT );writel (value, ioaddr +DMA_CHAN_RX_CONTROL (chan)); +if (dma_cfg->eame)There is no need for this check. If EAME is not enabled then upper 32 bits will be zero.
The idea here was to potentially guard against this register not being available on some revisions. Having the check here would avoid access to the register if the device doesn't support enhanced addressing.
Quoted 15 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c static void dwmac4_dma_init_tx_chan(void __iomem *ioaddr, · line 104
Quoted 12 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +4
-0+writel (upper_32_bits (dma_rx_phy), + ioaddr +DMA_CHAN_RX_BASE_ADDR_HI (chan)); +writel (lower_32_bits (dma_rx_phy), ioaddr +DMA_CHAN_RX_BASE_ADDR (chan)); }@@ -97,6 +101,10 @@ static void dwmac4_dma_init_tx_chan(void __iomem *ioaddr,writel (value, ioaddr +DMA_CHAN_TX_CONTROL (chan)); +if (dma_cfg->eame)Same here.
Quoted 7 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c static void dwmac4_dma_init_tx_chan(void __iomem *ioaddr, · line 109
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +3
-0+writel (upper_32_bits (dma_tx_phy), + ioaddr +DMA_CHAN_TX_BASE_ADDR_HI (chan)); +writel (lower_32_bits (dma_tx_phy), ioaddr +DMA_CHAN_TX_BASE_ADDR (chan)); }Also, please provide a cover letter in next submission.
Alright, will do.
Thierry
RE: [PATCH net-next v2 2/2] net: stmmac: Support enhanced addressing mode for DWMAC 4.10
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 20:13:29 (UTC+00:00)
Quoted 8 lines · Jose Abreu
Quoted 7 lines
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:46 (UTC+00:00)Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +0
-0@@ -79,6 +79,10 @@ static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, value = value | (rxpbl <<DMA_BUS_MODE_RPBL_SHIFT );writel (value, ioaddr +DMA_CHAN_RX_CONTROL (chan));
Quoted 8 lines
Quoted 4 lines
Review static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, · line 82
Quoted 1 line
(quoted diff) +1
-0+ if (dma_cfg->eame)There is no need for this check. If EAME is not enabled then upper 32 bits will be zero.
The idea here was to potentially guard against this register not being available on some revisions. Having the check here would avoid access to the register if the device doesn't support enhanced addressing.
I see your point but I don't think there will be any problems unless you have some strange system that doesn't handle the write accesses to unimplemented features properly ...
---
Thanks,
Jose Miguel Abreu
Re: [PATCH net-next v2 2/2] net: stmmac: Support enhanced addressing mode for DWMAC 4.10
Quoted 16 lines · Jose Abreu
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 20:13:29 (UTC+00:00)Quoted 13 lines · Jose Abreu
Quoted 11 lines
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:46 (UTC+00:00)drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, · line 82
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +1
-0@@ -79,6 +79,10 @@ static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, value = value | (rxpbl <<DMA_BUS_MODE_RPBL_SHIFT );writel (value, ioaddr +DMA_CHAN_RX_CONTROL (chan)); +if (dma_cfg->eame)There is no need for this check. If EAME is not enabled then upper 32 bits will be zero.
Quoted 7 lines
Quoted 3 lines
The idea here was to potentially guard against this register not being available on some revisions. Having the check here would avoid access to the register if the device doesn't support enhanced addressing.
I see your point but I don't think there will be any problems unless you have some strange system that doesn't handle the write accesses to unimplemented features properly ...
Is not it then just safer to not do the write to a register that you do not know how the implementation is going to respond to with one of a target abort, timeout, decoding error, just dead lock?
Also, would it make sense to consider adding an #ifdef CONFIG_PHYS_ADDR_T_64BIT plus the conditional check so that you can be slightly more optimal in the hot-path here?
Signature · 1 line
Florian
RE: [PATCH net-next v2 2/2] net: stmmac: Support enhanced addressing mode for DWMAC 4.10
From: Florian Fainelli <[email protected]>
Date: Sep/10/2019, 20:01:01 (UTC+00:00)
Quoted 21 lines · Jose Abreu
Quoted 20 lines
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 20:13:29 (UTC+00:00)Quoted 16 lines · Jose Abreu
Quoted 11 lines
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:46 (UTC+00:00)drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, · line 82
Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +1
-0@@ -79,6 +79,10 @@ static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, value = value | (rxpbl <<DMA_BUS_MODE_RPBL_SHIFT );writel (value, ioaddr +DMA_CHAN_RX_CONTROL (chan)); +if (dma_cfg->eame)There is no need for this check. If EAME is not enabled then upper 32 bits will be zero.
The idea here was to potentially guard against this register not being available on some revisions. Having the check here would avoid access to the register if the device doesn't support enhanced addressing.
Quoted 7 lines
Quoted 3 lines
I see your point but I don't think there will be any problems unless you have some strange system that doesn't handle the write accesses to unimplemented features properly ...
Is not it then just safer to not do the write to a register that you do not know how the implementation is going to respond to with one of a target abort, timeout, decoding error, just dead lock?
I don't think any of these will ever happen. Notice that this is already been done for a long time in some registers that may not exist in some random HW config and there is also the point that this is a write operation so Slave Error would only get triggered if we did a read.
Quoted 3 lines
Also, would it make sense to consider adding an #ifdef
CONFIG_PHYS_ADDR_T_64BITplus the conditional check so that you can be slightly more optimal in the hot-path here?
Well, this is not hot-path. It's only done in HW open sequence. The hot-path would be set_{rx/tx}_tail_ptr() but that's 32 bits only.
---
Thanks,
Jose Miguel Abreu
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:45 (UTC+00:00)
include/linux/stmmac.h struct stmmac_dma_cfg { · line 95
Quoted 5 lines
include/linux/stmmac.h +1
-0@@ -92,6 +92,7 @@ struct stmmac_dma_cfg {int fixed_burst;int mixed_burst;bool aal; +bool eame;
bools should not be used in struct's, please change to int.
---
Thanks,
Jose Miguel Abreu
Quoted 10 lines · Jose Abreu
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:45 (UTC+00:00)include/linux/stmmac.h struct stmmac_dma_cfg { · line 95
Quoted 5 lines
include/linux/stmmac.h +1
-0@@ -92,6 +92,7 @@ struct stmmac_dma_cfg {int fixed_burst;int mixed_burst;bool aal; +bool eame;bools should not be used in struct's, please change to int.
Huh? Since when? "aal" right above it is also bool. Can you provide a specific rationale for why we shouldn't use bool in structs?
Thierry
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 20:11:27 (UTC+00:00)
Quoted 12 lines · Jose Abreu
Quoted 10 lines
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:45 (UTC+00:00)include/linux/stmmac.h struct stmmac_dma_cfg { · line 95
Quoted 5 lines
include/linux/stmmac.h +1
-0@@ -92,6 +92,7 @@ struct stmmac_dma_cfg {int fixed_burst;int mixed_burst;bool aal; +bool eame;bools should not be used in struct's, please change to int.
Quoted 2 lines
Huh? Since when? "aal" right above it is also bool. Can you provide a specific rationale for why we shouldn't use bool in structs?
Please see https://lkml.org/lkml/2017/11/21/384.
---
Thanks,
Jose
Miguel Abreu
Quoted 15 lines · Jose Abreu
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 20:11:27 (UTC+00:00)Quoted 12 lines · Jose Abreu
Quoted 10 lines
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:45 (UTC+00:00)include/linux/stmmac.h struct stmmac_dma_cfg { · line 95
Quoted 5 lines
include/linux/stmmac.h +1
-0@@ -92,6 +92,7 @@ struct stmmac_dma_cfg {int fixed_burst;int mixed_burst;bool aal; +bool eame;bools should not be used in struct's, please change to int.
Quoted 4 lines
Quoted 2 lines
Huh? Since when? "aal" right above it is also bool. Can you provide a specific rationale for why we shouldn't use bool in structs?
Please see https://lkml.org/lkml/2017/11/21/384.
The context is slightly different here. stmmac_dma_cfg exists once for each of these ethernet devices in the system, and I would assume that in the vast majority of cases there's exactly one such device in the system so the potential size increase is very small. On the other hand, there are potentially very many struct sched_dl_entity, so the size impact is multiplied.
Anyway, if you insist I'll rewrite this to use an unsigned int bitfield.
Thierry
From: Thierry Reding <[email protected]>
Date: Sep/10/2019, 14:54:27 (UTC+00:00)
Quoted 21 lines · Jose Abreu
Quoted 15 lines
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 20:11:27 (UTC+00:00)Quoted 12 lines · Jose Abreu
Quoted 10 lines
From: Thierry Reding <[email protected]>
Date: Sep/09/2019, 16:25:45 (UTC+00:00)include/linux/stmmac.h struct stmmac_dma_cfg { · line 95
Quoted 5 lines
include/linux/stmmac.h +1
-0@@ -92,6 +92,7 @@ struct stmmac_dma_cfg {int fixed_burst;int mixed_burst;bool aal; +bool eame;bools should not be used in struct's, please change to int.
Quoted 4 lines
Quoted 2 lines
Huh? Since when? "aal" right above it is also bool. Can you provide a specific rationale for why we shouldn't use bool in structs?
Please see https://lkml.org/lkml/2017/11/21/384.
Quoted 8 lines
The context is slightly different here.
stmmac_dma_cfgexists once for each of these ethernet devices in the system, and I would assume that in the vast majority of cases there's exactly one such device in the system so the potential size increase is very small. On the other hand, there are potentially very many structsched_dl_entity, so the size impact is multiplied.Anyway, if you insist I'll rewrite this to use an unsigned int bitfield.
For new code I would rather prefer "int" but I guess it's up to David to decide this. I'm okay with both options as the check for this usage was removed in checkpatch:
https://lkml.org/lkml/2019/1/10/975
---
Thanks,
Jose Miguel
Abreu