* [PATCH] sh_eth: fix typo in RX descriptor bit name
@ 2015-11-03 19:20 Sergei Shtylyov
2015-11-03 19:30 ` Denis Kirjanov
0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2015-11-03 19:20 UTC (permalink / raw)
To: netdev; +Cc: linux-sh
Commit 7d7355f58ba4 ("sh_eth: Ensure proper ordering of descriptor active
bit write/read") did the right thing but used too "heavy" barriers while
there were already "lighter" DMA barriers exactly for this case...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
The patch is against DaveM's 'net-next.git' repo.
drivers/net/ethernet/renesas/sh_eth.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net-next/drivers/net/ethernet/renesas/sh_eth.c
@@ -1416,7 +1416,7 @@ static int sh_eth_txfree(struct net_devi
if (txdesc->status & cpu_to_edmac(mdp, TD_TACT))
break;
/* TACT bit must be checked before all the following reads */
- rmb();
+ dma_rmb();
netif_info(mdp, tx_done, ndev,
"tx entry %d status 0x%08x\n",
entry, edmac_to_cpu(mdp, txdesc->status));
@@ -1458,7 +1458,7 @@ static int sh_eth_rx(struct net_device *
rxdesc = &mdp->rx_ring[entry];
while (!(rxdesc->status & cpu_to_edmac(mdp, RD_RACT))) {
/* RACT bit must be checked before all the following reads */
- rmb();
+ dma_rmb();
desc_status = edmac_to_cpu(mdp, rxdesc->status);
pkt_len = rxdesc->frame_length;
@@ -1544,7 +1544,7 @@ static int sh_eth_rx(struct net_device *
skb_checksum_none_assert(skb);
rxdesc->addr = dma_addr;
}
- wmb(); /* RACT bit must be set after all the above writes */
+ dma_wmb(); /* RACT bit must be set after all the above writes */
if (entry >= mdp->num_rx_ring - 1)
rxdesc->status |=
cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDLE);
@@ -2403,7 +2403,7 @@ static int sh_eth_start_xmit(struct sk_b
}
txdesc->buffer_length = skb->len;
- wmb(); /* TACT bit must be set after all the above writes */
+ dma_wmb(); /* TACT bit must be set after all the above writes */
if (entry >= mdp->num_tx_ring - 1)
txdesc->status |= cpu_to_edmac(mdp, TD_TACT | TD_TDLE);
else
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] sh_eth: fix typo in RX descriptor bit name
2015-11-03 19:20 [PATCH] sh_eth: fix typo in RX descriptor bit name Sergei Shtylyov
@ 2015-11-03 19:30 ` Denis Kirjanov
2015-11-03 19:35 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Denis Kirjanov @ 2015-11-03 19:30 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: netdev, linux-sh
On 11/3/15, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote:
> Commit 7d7355f58ba4 ("sh_eth: Ensure proper ordering of descriptor active
> bit write/read") did the right thing but used too "heavy" barriers while
> there were already "lighter" DMA barriers exactly for this case...
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Fix the subject line...
>
> ---
> The patch is against DaveM's 'net-next.git' repo.
>
> drivers/net/ethernet/renesas/sh_eth.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
> ===================================================================
> --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
> +++ net-next/drivers/net/ethernet/renesas/sh_eth.c
> @@ -1416,7 +1416,7 @@ static int sh_eth_txfree(struct net_devi
> if (txdesc->status & cpu_to_edmac(mdp, TD_TACT))
> break;
> /* TACT bit must be checked before all the following reads */
> - rmb();
> + dma_rmb();
> netif_info(mdp, tx_done, ndev,
> "tx entry %d status 0x%08x\n",
> entry, edmac_to_cpu(mdp, txdesc->status));
> @@ -1458,7 +1458,7 @@ static int sh_eth_rx(struct net_device *
> rxdesc = &mdp->rx_ring[entry];
> while (!(rxdesc->status & cpu_to_edmac(mdp, RD_RACT))) {
> /* RACT bit must be checked before all the following reads */
> - rmb();
> + dma_rmb();
> desc_status = edmac_to_cpu(mdp, rxdesc->status);
> pkt_len = rxdesc->frame_length;
>
> @@ -1544,7 +1544,7 @@ static int sh_eth_rx(struct net_device *
> skb_checksum_none_assert(skb);
> rxdesc->addr = dma_addr;
> }
> - wmb(); /* RACT bit must be set after all the above writes */
> + dma_wmb(); /* RACT bit must be set after all the above writes */
> if (entry >= mdp->num_rx_ring - 1)
> rxdesc->status |=
> cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDLE);
> @@ -2403,7 +2403,7 @@ static int sh_eth_start_xmit(struct sk_b
> }
> txdesc->buffer_length = skb->len;
>
> - wmb(); /* TACT bit must be set after all the above writes */
> + dma_wmb(); /* TACT bit must be set after all the above writes */
> if (entry >= mdp->num_tx_ring - 1)
> txdesc->status |= cpu_to_edmac(mdp, TD_TACT | TD_TDLE);
> else
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] sh_eth: fix typo in RX descriptor bit name
2015-11-03 19:30 ` Denis Kirjanov
@ 2015-11-03 19:35 ` Sergei Shtylyov
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2015-11-03 19:35 UTC (permalink / raw)
To: Denis Kirjanov; +Cc: netdev, linux-sh
Hello.
On 11/03/2015 10:30 PM, Denis Kirjanov wrote:
>> Commit 7d7355f58ba4 ("sh_eth: Ensure proper ordering of descriptor active
>> bit write/read") did the right thing but used too "heavy" barriers while
>> there were already "lighter" DMA barriers exactly for this case...
>>
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>
> Fix the subject line...
Oops! Will fix in a jiffy...
(I thought at first that you're commenting on the already applied patch. :-))
MBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] sh_eth: fix typo in RX descriptor bit name
@ 2015-11-02 22:28 Sergei Shtylyov
2015-11-03 4:01 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2015-11-02 22:28 UTC (permalink / raw)
To: netdev, linux-sh
The correct name of the RX descriptor 0 bit 30 is RDLE (receive descriptor
list end), not RDEL.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
The patch is against the Dave Miller's 'net-next.git' repo.
drivers/net/ethernet/renesas/sh_eth.c | 4 ++--
drivers/net/ethernet/renesas/sh_eth.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net-next/drivers/net/ethernet/renesas/sh_eth.c
@@ -1173,7 +1173,7 @@ static void sh_eth_ring_format(struct ne
mdp->dirty_rx = (u32) (i - mdp->num_rx_ring);
/* Mark the last entry as wrapping the ring. */
- rxdesc->status |= cpu_to_edmac(mdp, RD_RDEL);
+ rxdesc->status |= cpu_to_edmac(mdp, RD_RDLE);
memset(mdp->tx_ring, 0, tx_ringsize);
@@ -1547,7 +1547,7 @@ static int sh_eth_rx(struct net_device *
wmb(); /* RACT bit must be set after all the above writes */
if (entry >= mdp->num_rx_ring - 1)
rxdesc->status |=
- cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDEL);
+ cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDLE);
else
rxdesc->status |=
cpu_to_edmac(mdp, RD_RACT | RD_RFP);
Index: net-next/drivers/net/ethernet/renesas/sh_eth.h
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h
+++ net-next/drivers/net/ethernet/renesas/sh_eth.h
@@ -285,7 +285,7 @@ enum DMAC_IM_BIT {
/* Receive descriptor bit */
enum RD_STS_BIT {
- RD_RACT = 0x80000000, RD_RDEL = 0x40000000,
+ RD_RACT = 0x80000000, RD_RDLE = 0x40000000,
RD_RFP1 = 0x20000000, RD_RFP0 = 0x10000000,
RD_RFE = 0x08000000, RD_RFS10 = 0x00000200,
RD_RFS9 = 0x00000100, RD_RFS8 = 0x00000080,
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] sh_eth: fix typo in RX descriptor bit name
2015-11-02 22:28 Sergei Shtylyov
@ 2015-11-03 4:01 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2015-11-03 4:01 UTC (permalink / raw)
To: sergei.shtylyov; +Cc: netdev, linux-sh
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Tue, 03 Nov 2015 01:28:07 +0300
> The correct name of the RX descriptor 0 bit 30 is RDLE (receive descriptor
> list end), not RDEL.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>
> ---
> The patch is against the Dave Miller's 'net-next.git' repo.
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-11-03 19:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-03 19:20 [PATCH] sh_eth: fix typo in RX descriptor bit name Sergei Shtylyov
2015-11-03 19:30 ` Denis Kirjanov
2015-11-03 19:35 ` Sergei Shtylyov
-- strict thread matches above, loose matches on Subject: below --
2015-11-02 22:28 Sergei Shtylyov
2015-11-03 4:01 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).