patches for DPDK stable branches
 help / color / Atom feed
* Re: [dpdk-stable] [dpdk-dev] net/e1000: fix wrong mac type checking
  2019-09-10 17:40 [dpdk-stable] net/e1000: fix wrong mac type checking Xiao Zhang
@ 2019-09-10  9:17 ` " Kevin Traynor
  2019-09-11  9:31 ` Ye Xiaolong
  1 sibling, 0 replies; 3+ messages in thread
From: Kevin Traynor @ 2019-09-10  9:17 UTC (permalink / raw)
  To: Xiao Zhang, dev; +Cc: wenzhuo.lu, stable

On 10/09/2019 18:40, Xiao Zhang wrote:
> The mac types of i219 are e1000_pch_spt and e1000_pch_cnp, correct the
> checking code of mac type when flushing i219 descriptor rings.
> 
> Fixes: 1fc9701238ed ("net/e1000: fix i219 hang on reset/close")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
Reported-by: Kevin Traynor <ktraynor@redhat.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>

> ---
>  drivers/net/e1000/em_ethdev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
> index 20b5406..fd44924 100644
> --- a/drivers/net/e1000/em_ethdev.c
> +++ b/drivers/net/e1000/em_ethdev.c
> @@ -739,7 +739,7 @@ eth_em_stop(struct rte_eth_dev *dev)
>  	e1000_reset_hw(hw);
>  
>  	/* Flush desc rings for i219 */
> -	if (hw->mac.type >= e1000_pch_spt)
> +	if (hw->mac.type == e1000_pch_spt || hw->mac.type == e1000_pch_cnp)
>  		em_flush_desc_rings(dev);
>  
>  	if (hw->mac.type >= e1000_82544)
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [dpdk-stable] net/e1000: fix wrong mac type checking
@ 2019-09-10 17:40 Xiao Zhang
  2019-09-10  9:17 ` [dpdk-stable] [dpdk-dev] " Kevin Traynor
  2019-09-11  9:31 ` Ye Xiaolong
  0 siblings, 2 replies; 3+ messages in thread
From: Xiao Zhang @ 2019-09-10 17:40 UTC (permalink / raw)
  To: dev; +Cc: wenzhuo.lu, Xiao Zhang, stable

The mac types of i219 are e1000_pch_spt and e1000_pch_cnp, correct the
checking code of mac type when flushing i219 descriptor rings.

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_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 20b5406..fd44924 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -739,7 +739,7 @@ eth_em_stop(struct rte_eth_dev *dev)
 	e1000_reset_hw(hw);
 
 	/* Flush desc rings for i219 */
-	if (hw->mac.type >= e1000_pch_spt)
+	if (hw->mac.type == e1000_pch_spt || hw->mac.type == e1000_pch_cnp)
 		em_flush_desc_rings(dev);
 
 	if (hw->mac.type >= e1000_82544)
-- 
2.7.4


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] net/e1000: fix wrong mac type checking
  2019-09-10 17:40 [dpdk-stable] net/e1000: fix wrong mac type checking Xiao Zhang
  2019-09-10  9:17 ` [dpdk-stable] [dpdk-dev] " Kevin Traynor
@ 2019-09-11  9:31 ` Ye Xiaolong
  1 sibling, 0 replies; 3+ messages in thread
From: Ye Xiaolong @ 2019-09-11  9:31 UTC (permalink / raw)
  To: Xiao Zhang; +Cc: dev, wenzhuo.lu, stable

On 09/11, Xiao Zhang wrote:
>The mac types of i219 are e1000_pch_spt and e1000_pch_cnp, correct the
>checking code of mac type when flushing i219 descriptor rings.
>
>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_ethdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
>index 20b5406..fd44924 100644
>--- a/drivers/net/e1000/em_ethdev.c
>+++ b/drivers/net/e1000/em_ethdev.c
>@@ -739,7 +739,7 @@ eth_em_stop(struct rte_eth_dev *dev)
> 	e1000_reset_hw(hw);
> 
> 	/* Flush desc rings for i219 */
>-	if (hw->mac.type >= e1000_pch_spt)
>+	if (hw->mac.type == e1000_pch_spt || hw->mac.type == e1000_pch_cnp)
> 		em_flush_desc_rings(dev);
> 
> 	if (hw->mac.type >= e1000_82544)
>-- 
>2.7.4
>

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

Applied to dpdk-next-net-intel with Kevin's tags.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-10 17:40 [dpdk-stable] net/e1000: fix wrong mac type checking Xiao Zhang
2019-09-10  9:17 ` [dpdk-stable] [dpdk-dev] " Kevin Traynor
2019-09-11  9:31 ` Ye Xiaolong

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