netdev - Re: [PATCH] sh_eth: fix typo in RX descriptor bit name

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 3 Nov 2015 22:30:58 +0300
From:	Denis Kirjanov <kda@...ux-powerpc.org>
To:	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
Cc:	netdev@...r.kernel.org, linux-sh@...r.kernel.org
Subject: Re: [PATCH] sh_eth: fix typo in RX descriptor bit name

On 11/3/15, Sergei Shtylyov <sergei.shtylyov@...entembedded.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@...entembedded.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@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html