patch 'net/hns3: simplify queue DMA address arithmetic' has been queued to stable release 19.11.11

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Tue Nov 30 17:35:31 CET 2021


Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/eba0dc77635f4120d9bfcb3bd7391842f1a42171

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From eba0dc77635f4120d9bfcb3bd7391842f1a42171 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Sat, 6 Nov 2021 09:42:58 +0800
Subject: [PATCH] net/hns3: simplify queue DMA address arithmetic

[ upstream commit f658f415814add688ade5783200143d14eefc51a ]

The patch obtains the upper 32 bits of the Rx/Tx queue DMA address in one
step instead of two steps.

Fixes: bba636698316 ("net/hns3: support Rx/Tx and related operations")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
---
 drivers/net/hns3/hns3_rxtx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index bc1806c0e7..c538c98725 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -294,7 +294,7 @@ hns3_init_rx_queue_hw(struct hns3_rx_queue *rxq)
 
 	hns3_write_dev(rxq, HNS3_RING_RX_BASEADDR_L_REG, (uint32_t)dma_addr);
 	hns3_write_dev(rxq, HNS3_RING_RX_BASEADDR_H_REG,
-		       (uint32_t)((dma_addr >> 31) >> 1));
+		       (uint32_t)(dma_addr >> 32));
 
 	hns3_write_dev(rxq, HNS3_RING_RX_BD_LEN_REG,
 		       hns3_buf_size2type(rx_buf_len));
@@ -309,7 +309,7 @@ hns3_init_tx_queue_hw(struct hns3_tx_queue *txq)
 
 	hns3_write_dev(txq, HNS3_RING_TX_BASEADDR_L_REG, (uint32_t)dma_addr);
 	hns3_write_dev(txq, HNS3_RING_TX_BASEADDR_H_REG,
-		       (uint32_t)((dma_addr >> 31) >> 1));
+		       (uint32_t)(dma_addr >> 32));
 
 	hns3_write_dev(txq, HNS3_RING_TX_BD_NUM_REG,
 		       HNS3_CFG_DESC_NUM(txq->nb_tx_desc));
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:13.337670674 +0100
+++ 0127-net-hns3-simplify-queue-DMA-address-arithmetic.patch	2021-11-30 16:50:05.962874792 +0100
@@ -1 +1 @@
-From f658f415814add688ade5783200143d14eefc51a Mon Sep 17 00:00:00 2001
+From eba0dc77635f4120d9bfcb3bd7391842f1a42171 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f658f415814add688ade5783200143d14eefc51a ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index ceb98025f8..00af73c850 100644
+index bc1806c0e7..c538c98725 100644
@@ -22 +23 @@
-@@ -322,7 +322,7 @@ hns3_init_rx_queue_hw(struct hns3_rx_queue *rxq)
+@@ -294,7 +294,7 @@ hns3_init_rx_queue_hw(struct hns3_rx_queue *rxq)
@@ -31 +32 @@
-@@ -337,7 +337,7 @@ hns3_init_tx_queue_hw(struct hns3_tx_queue *txq)
+@@ -309,7 +309,7 @@ hns3_init_tx_queue_hw(struct hns3_tx_queue *txq)


More information about the stable mailing list