patches for DPDK stable branches
 help / color / Atom feed
From: Ye Xiaolong <xiaolong.ye@intel.com>
To: Xiao Zhang <xiao.zhang@intel.com>
Cc: dev@dpdk.org, wenzhuo.lu@intel.com, stable@dpdk.org
Subject: Re: [dpdk-stable] [dpdk-dev] net/e1000: correct mb function
Date: Wed, 11 Sep 2019 17:30:27 +0800
Message-ID: <20190911093027.GB45267@intel.com> (raw)
In-Reply-To: <1568137278-10066-1-git-send-email-xiao.zhang@intel.com>

On 09/11, Xiao Zhang wrote:
>Use rte_cio_wmb instead of rte_wmb when writing TX descriptor since it's
>CIO memory.
>Replace rte_io_wmb and E1000_PCI_REG_WRITE_RELAXED with
>E1000_PCI_REG_WRITE since it has rte_io_wmb inside, which will be more
>clear.
>
>Fixes: 1fc9701238ed ("net/e1000: fix i219 hang on reset/close")
>Cc: stable@dpdk.org
>
>Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
>---
> drivers/net/e1000/em_rxtx.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
>index 5925e49..49c5371 100644
>--- a/drivers/net/e1000/em_rxtx.c
>+++ b/drivers/net/e1000/em_rxtx.c
>@@ -2049,13 +2049,12 @@ e1000_flush_tx_ring(struct rte_eth_dev *dev)
> 		tx_desc->lower.data = rte_cpu_to_le_32(txd_lower | size);
> 		tx_desc->upper.data = 0;
> 
>-		rte_wmb();
>+		rte_cio_wmb();
> 		txq->tx_tail++;
> 		if (txq->tx_tail == txq->nb_tx_desc)
> 			txq->tx_tail = 0;
>-		rte_io_wmb();
> 		tdt_reg_addr = E1000_PCI_REG_ADDR(hw, E1000_TDT(i));
>-		E1000_PCI_REG_WRITE_RELAXED(tdt_reg_addr, txq->tx_tail);
>+		E1000_PCI_REG_WRITE(tdt_reg_addr, txq->tx_tail);
> 		usec_delay(250);
> 	}
> }
>-- 
>2.7.4
>

Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>

Applied to dpdk-next-net-intel with Gavin's reviewed-by tag.

      parent reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-10 17:41 [dpdk-stable] " Xiao Zhang
2019-09-11  3:21 ` [dpdk-stable] [dpdk-dev] " Gavin Hu (Arm Technology China)
2019-09-11  9:30 ` Ye Xiaolong [this message]

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190911093027.GB45267@intel.com \
    --to=xiaolong.ye@intel.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    --cc=wenzhuo.lu@intel.com \
    --cc=xiao.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox