From: Niklas Cassel <redacted>
The dwmac4 IP can synthesized with 1-8 number of tx queues.
On an IP synthesized with DWC_EQOS_NUM_TXQ > 1, all txqueues are disabled
by default. For these IPs, the bitfield TXQEN is R/W.
Always enable tx queue 0. The write will have no effect on IPs synthesized
with DWC_EQOS_NUM_TXQ == 1.
The driver does still not utilize more than one tx queue in the IP.
Signed-off-by: Niklas Cassel <redacted>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 +++
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
@@ -213,7 +213,17 @@ static void dwmac4_dma_chan_op_mode(void __iomem *ioaddr, int txmode,elsemtl_tx_op|=MTL_OP_MODE_TTC_512;}-+/* For an IP with DWC_EQOS_NUM_TXQ == 1, the fields TXQEN and TQS are RO+*withresetvalues:TXQENon,TQS==DWC_EQOS_TXFIFO_SIZE.+*ForanIPwithDWC_EQOS_NUM_TXQ>1,thefieldsTXQENandTQSareR/W+*withresetvalues:TXQENoff,TQS256bytes.+*+*Writethebitsinbothcases,sinceitwillhavenoeffectwhenRO.+*ForDWC_EQOS_NUM_TXQ>1,thetopbitsinMTL_OP_MODE_TQS_MASKmight+*beRO,however,writingthewholeTQSfieldwillresultinavalue+*equaltoDWC_EQOS_TXFIFO_SIZE,justlikeforDWC_EQOS_NUM_TXQ==1.+*/+mtl_tx_op|=MTL_OP_MODE_TXQEN|MTL_OP_MODE_TQS_MASK;writel(mtl_tx_op,ioaddr+MTL_CHAN_TX_OP_MODE(channel));mtl_rx_op=readl(ioaddr+MTL_CHAN_RX_OP_MODE(channel));
Hi Niklas,
On 11/24/2016 03:36 PM, Niklas Cassel wrote:
quoted hunk
From: Niklas Cassel <redacted>
The dwmac4 IP can synthesized with 1-8 number of tx queues.
On an IP synthesized with DWC_EQOS_NUM_TXQ > 1, all txqueues are disabled
by default. For these IPs, the bitfield TXQEN is R/W.
Always enable tx queue 0. The write will have no effect on IPs synthesized
with DWC_EQOS_NUM_TXQ == 1.
The driver does still not utilize more than one tx queue in the IP.
Signed-off-by: Niklas Cassel <redacted>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 +++
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
@@ -213,7 +213,17 @@ static void dwmac4_dma_chan_op_mode(void __iomem *ioaddr, int txmode,elsemtl_tx_op|=MTL_OP_MODE_TTC_512;}-+/* For an IP with DWC_EQOS_NUM_TXQ == 1, the fields TXQEN and TQS are RO+*withresetvalues:TXQENon,TQS==DWC_EQOS_TXFIFO_SIZE.+*ForanIPwithDWC_EQOS_NUM_TXQ>1,thefieldsTXQENandTQSareR/W+*withresetvalues:TXQENoff,TQS256bytes.+*+*Writethebitsinbothcases,sinceitwillhavenoeffectwhenRO.+*ForDWC_EQOS_NUM_TXQ>1,thetopbitsinMTL_OP_MODE_TQS_MASKmight+*beRO,however,writingthewholeTQSfieldwillresultinavalue+*equaltoDWC_EQOS_TXFIFO_SIZE,justlikeforDWC_EQOS_NUM_TXQ==1.+*/+mtl_tx_op|=MTL_OP_MODE_TXQEN|MTL_OP_MODE_TQS_MASK;
Your patch sounds good. Just one question:
In synopsys databook I use, I see that MTL_OP_MODE_TXQEN for channel 2
can take several values "disabled / enabled / Enabled in AV mode":
Transmit Queue Enable
This field is used to enable/disable the transmit queue 1. 00 R/W
■ 2'b00 - Not enabled
■ 2'b01 - Enable in AV mode (Reserved when Enable Audio Video
Bridging is not selected while configuring the core)
■ 2'b10 - Enabled
■ 2'b11 - Reserved
Do you plan to manage av mode in a future patch ?
Regards
Alex
From: Niklas Cassel <redacted>
The dwmac4 IP can synthesized with 1-8 number of tx queues.
On an IP synthesized with DWC_EQOS_NUM_TXQ > 1, all txqueues are disabled
by default. For these IPs, the bitfield TXQEN is R/W.
Always enable tx queue 0. The write will have no effect on IPs synthesized
with DWC_EQOS_NUM_TXQ == 1.
The driver does still not utilize more than one tx queue in the IP.
Signed-off-by: Niklas Cassel <redacted>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 +++
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
@@ -213,7 +213,17 @@ static void dwmac4_dma_chan_op_mode(void __iomem *ioaddr, int txmode,elsemtl_tx_op|=MTL_OP_MODE_TTC_512;}-+/* For an IP with DWC_EQOS_NUM_TXQ == 1, the fields TXQEN and TQS are RO+*withresetvalues:TXQENon,TQS==DWC_EQOS_TXFIFO_SIZE.+*ForanIPwithDWC_EQOS_NUM_TXQ>1,thefieldsTXQENandTQSareR/W+*withresetvalues:TXQENoff,TQS256bytes.+*+*Writethebitsinbothcases,sinceitwillhavenoeffectwhenRO.+*ForDWC_EQOS_NUM_TXQ>1,thetopbitsinMTL_OP_MODE_TQS_MASKmight+*beRO,however,writingthewholeTQSfieldwillresultinavalue+*equaltoDWC_EQOS_TXFIFO_SIZE,justlikeforDWC_EQOS_NUM_TXQ==1.+*/+mtl_tx_op|=MTL_OP_MODE_TXQEN|MTL_OP_MODE_TQS_MASK;
Your patch sounds good. Just one question:
In synopsys databook I use, I see that MTL_OP_MODE_TXQEN for channel 2 can take several values "disabled / enabled / Enabled in AV mode":
Transmit Queue Enable
This field is used to enable/disable the transmit queue 1. 00 R/W
■ 2'b00 - Not enabled
■ 2'b01 - Enable in AV mode (Reserved when Enable Audio Video
Bridging is not selected while configuring the core)
■ 2'b10 - Enabled
■ 2'b11 - Reserved
Do you plan to manage av mode in a future patch ?
We are not planning on using the AV mode.
We will probably not use TXQ1 at all.
I noticed that the MAC_HW_Feature2 Register actually has a TXQCNT field.
It is currently saved in priv->dma_cap.number_tx_channel.
If you prefer, I could do a patch V2 where we only set the bits if
priv->dma_cap.number_tx_channel > 1
However, I don't think the current patch is too bad either, since the bits
are RO when number_tx_channel == 1.
From: Niklas Cassel <redacted>
The dwmac4 IP can synthesized with 1-8 number of tx queues.
On an IP synthesized with DWC_EQOS_NUM_TXQ > 1, all txqueues are disabled
by default. For these IPs, the bitfield TXQEN is R/W.
Always enable tx queue 0. The write will have no effect on IPs synthesized
with DWC_EQOS_NUM_TXQ == 1.
The driver does still not utilize more than one tx queue in the IP.
Signed-off-by: Niklas Cassel <redacted>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 +++
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
@@ -213,7 +213,17 @@ static void dwmac4_dma_chan_op_mode(void __iomem *ioaddr, int txmode,elsemtl_tx_op|=MTL_OP_MODE_TTC_512;}-+/* For an IP with DWC_EQOS_NUM_TXQ == 1, the fields TXQEN and TQS are RO+*withresetvalues:TXQENon,TQS==DWC_EQOS_TXFIFO_SIZE.+*ForanIPwithDWC_EQOS_NUM_TXQ>1,thefieldsTXQENandTQSareR/W+*withresetvalues:TXQENoff,TQS256bytes.+*+*Writethebitsinbothcases,sinceitwillhavenoeffectwhenRO.+*ForDWC_EQOS_NUM_TXQ>1,thetopbitsinMTL_OP_MODE_TQS_MASKmight+*beRO,however,writingthewholeTQSfieldwillresultinavalue+*equaltoDWC_EQOS_TXFIFO_SIZE,justlikeforDWC_EQOS_NUM_TXQ==1.+*/+mtl_tx_op|=MTL_OP_MODE_TXQEN|MTL_OP_MODE_TQS_MASK;
Your patch sounds good. Just one question:
In synopsys databook I use, I see that MTL_OP_MODE_TXQEN for channel 2 can take several values "disabled / enabled / Enabled in AV mode":
Transmit Queue Enable
This field is used to enable/disable the transmit queue 1. 00 R/W
■ 2'b00 - Not enabled
■ 2'b01 - Enable in AV mode (Reserved when Enable Audio Video
Bridging is not selected while configuring the core)
■ 2'b10 - Enabled
■ 2'b11 - Reserved
Do you plan to manage av mode in a future patch ?
We are not planning on using the AV mode.
We will probably not use TXQ1 at all.
I noticed that the MAC_HW_Feature2 Register actually has a TXQCNT field.
It is currently saved in priv->dma_cap.number_tx_channel.
If you prefer, I could do a patch V2 where we only set the bits if
priv->dma_cap.number_tx_channel > 1
Oh, sorry, that was number of tx _channels_,
not number of tx _queues_.
However, we could add a number_tx_queue to struct dma_features,
if you would prefer that.
However, I don't think the current patch is too bad either, since the bits
are RO when number_tx_channel == 1.
Hi Niklas
On 11/25/2016 01:14 PM, Niklas Cassel wrote:
On 11/25/2016 01:10 PM, Niklas Cassel wrote:
quoted
On 11/24/2016 07:11 PM, Alexandre Torgue wrote:
quoted
Hi Niklas,
Hello Alexandre
quoted
On 11/24/2016 03:36 PM, Niklas Cassel wrote:
quoted
From: Niklas Cassel <redacted>
The dwmac4 IP can synthesized with 1-8 number of tx queues.
On an IP synthesized with DWC_EQOS_NUM_TXQ > 1, all txqueues are disabled
by default. For these IPs, the bitfield TXQEN is R/W.
Always enable tx queue 0. The write will have no effect on IPs synthesized
with DWC_EQOS_NUM_TXQ == 1.
The driver does still not utilize more than one tx queue in the IP.
Signed-off-by: Niklas Cassel <redacted>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 +++
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
@@ -213,7 +213,17 @@ static void dwmac4_dma_chan_op_mode(void __iomem *ioaddr, int txmode,elsemtl_tx_op|=MTL_OP_MODE_TTC_512;}-+/* For an IP with DWC_EQOS_NUM_TXQ == 1, the fields TXQEN and TQS are RO+*withresetvalues:TXQENon,TQS==DWC_EQOS_TXFIFO_SIZE.+*ForanIPwithDWC_EQOS_NUM_TXQ>1,thefieldsTXQENandTQSareR/W+*withresetvalues:TXQENoff,TQS256bytes.+*+*Writethebitsinbothcases,sinceitwillhavenoeffectwhenRO.+*ForDWC_EQOS_NUM_TXQ>1,thetopbitsinMTL_OP_MODE_TQS_MASKmight+*beRO,however,writingthewholeTQSfieldwillresultinavalue+*equaltoDWC_EQOS_TXFIFO_SIZE,justlikeforDWC_EQOS_NUM_TXQ==1.+*/+mtl_tx_op|=MTL_OP_MODE_TXQEN|MTL_OP_MODE_TQS_MASK;
Your patch sounds good. Just one question:
In synopsys databook I use, I see that MTL_OP_MODE_TXQEN for channel 2 can take several values "disabled / enabled / Enabled in AV mode":
Transmit Queue Enable
This field is used to enable/disable the transmit queue 1. 00 R/W
■ 2'b00 - Not enabled
■ 2'b01 - Enable in AV mode (Reserved when Enable Audio Video
Bridging is not selected while configuring the core)
■ 2'b10 - Enabled
■ 2'b11 - Reserved
Do you plan to manage av mode in a future patch ?
We are not planning on using the AV mode.
We will probably not use TXQ1 at all.
I noticed that the MAC_HW_Feature2 Register actually has a TXQCNT field.
It is currently saved in priv->dma_cap.number_tx_channel.
If you prefer, I could do a patch V2 where we only set the bits if
priv->dma_cap.number_tx_channel > 1
Oh, sorry, that was number of tx _channels_,
not number of tx _queues_.
However, we could add a number_tx_queue to struct dma_features,
if you would prefer that.
I agree your patch is good. It will work even if we use several tx
channels. We will see in the future for AV mode.
regards
alex
quoted
However, I don't think the current patch is too bad either, since the bits
are RO when number_tx_channel == 1.
Hi Niklas
On 11/25/2016 01:14 PM, Niklas Cassel wrote:
quoted
On 11/25/2016 01:10 PM, Niklas Cassel wrote:
quoted
On 11/24/2016 07:11 PM, Alexandre Torgue wrote:
quoted
Hi Niklas,
Hello Alexandre
quoted
On 11/24/2016 03:36 PM, Niklas Cassel wrote:
quoted
From: Niklas Cassel <redacted>
The dwmac4 IP can synthesized with 1-8 number of tx queues.
On an IP synthesized with DWC_EQOS_NUM_TXQ > 1, all txqueues are disabled
by default. For these IPs, the bitfield TXQEN is R/W.
Always enable tx queue 0. The write will have no effect on IPs synthesized
with DWC_EQOS_NUM_TXQ == 1.
The driver does still not utilize more than one tx queue in the IP.
Signed-off-by: Niklas Cassel <redacted>
---
drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 +++
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 12 +++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
@@ -213,7 +213,17 @@ static void dwmac4_dma_chan_op_mode(void __iomem *ioaddr, int txmode,elsemtl_tx_op|=MTL_OP_MODE_TTC_512;}-+/* For an IP with DWC_EQOS_NUM_TXQ == 1, the fields TXQEN and TQS are RO+*withresetvalues:TXQENon,TQS==DWC_EQOS_TXFIFO_SIZE.+*ForanIPwithDWC_EQOS_NUM_TXQ>1,thefieldsTXQENandTQSareR/W+*withresetvalues:TXQENoff,TQS256bytes.+*+*Writethebitsinbothcases,sinceitwillhavenoeffectwhenRO.+*ForDWC_EQOS_NUM_TXQ>1,thetopbitsinMTL_OP_MODE_TQS_MASKmight+*beRO,however,writingthewholeTQSfieldwillresultinavalue+*equaltoDWC_EQOS_TXFIFO_SIZE,justlikeforDWC_EQOS_NUM_TXQ==1.+*/+mtl_tx_op|=MTL_OP_MODE_TXQEN|MTL_OP_MODE_TQS_MASK;
Your patch sounds good. Just one question:
In synopsys databook I use, I see that MTL_OP_MODE_TXQEN for channel 2 can take several values "disabled / enabled / Enabled in AV mode":
Transmit Queue Enable
This field is used to enable/disable the transmit queue 1. 00 R/W
■ 2'b00 - Not enabled
■ 2'b01 - Enable in AV mode (Reserved when Enable Audio Video
Bridging is not selected while configuring the core)
■ 2'b10 - Enabled
■ 2'b11 - Reserved
Do you plan to manage av mode in a future patch ?
We are not planning on using the AV mode.
We will probably not use TXQ1 at all.
I noticed that the MAC_HW_Feature2 Register actually has a TXQCNT field.
It is currently saved in priv->dma_cap.number_tx_channel.
If you prefer, I could do a patch V2 where we only set the bits if
priv->dma_cap.number_tx_channel > 1
Oh, sorry, that was number of tx _channels_,
not number of tx _queues_.
However, we could add a number_tx_queue to struct dma_features,
if you would prefer that.
I agree your patch is good. It will work even if we use several tx channels. We will see in the future for AV mode.
Excellent :)
Can I convert that into an Acked-by?
regards
alex
quoted
quoted
However, I don't think the current patch is too bad either, since the bits
are RO when number_tx_channel == 1.
From: Niklas Cassel <redacted>
The dwmac4 IP can synthesized with 1-8 number of tx queues.
On an IP synthesized with DWC_EQOS_NUM_TXQ > 1, all txqueues are disabled
by default. For these IPs, the bitfield TXQEN is R/W.
Always enable tx queue 0. The write will have no effect on IPs synthesized
with DWC_EQOS_NUM_TXQ == 1.
The driver does still not utilize more than one tx queue in the IP.
Signed-off-by: Niklas Cassel <redacted>
Alexandre, we are still waiting for your implicit/explicit ACK on this
change.
Thank you.
From: Niklas Cassel <redacted>
The dwmac4 IP can synthesized with 1-8 number of tx queues.
On an IP synthesized with DWC_EQOS_NUM_TXQ > 1, all txqueues are disabled
by default. For these IPs, the bitfield TXQEN is R/W.
Always enable tx queue 0. The write will have no effect on IPs synthesized
with DWC_EQOS_NUM_TXQ == 1.
The driver does still not utilize more than one tx queue in the IP.
Signed-off-by: Niklas Cassel <redacted>
From: Niklas Cassel <redacted>
The dwmac4 IP can synthesized with 1-8 number of tx queues.
On an IP synthesized with DWC_EQOS_NUM_TXQ > 1, all txqueues are disabled
by default. For these IPs, the bitfield TXQEN is R/W.
Always enable tx queue 0. The write will have no effect on IPs synthesized
with DWC_EQOS_NUM_TXQ == 1.
The driver does still not utilize more than one tx queue in the IP.
Signed-off-by: Niklas Cassel <redacted>
Alexandre, we are still waiting for your implicit/explicit ACK on this
change.
Yes you could add my Acked-by but it is already merged. My fault.
Sorry for my late answer :(