From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2D531A0C41 for ; Tue, 30 Nov 2021 17:42:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26DCA410F7; Tue, 30 Nov 2021 17:42:45 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id F30B6410F7 for ; Tue, 30 Nov 2021 17:42:43 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id D413840009 for ; Tue, 30 Nov 2021 16:42:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290563; bh=N43WqSu8k6UirlKP2CBzdONay7ipI7+FrBa70QbyPs4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TFrMMpxX9k5Mn3K0vs2i8CbO+C9H/RG7WCeIV5XKiwE7SkokzQgcGmjlZ4xeeKsw5 FiV1SoEaBCNalNDpuNuuBe0phimZ/HAI8yqV1vzUjjO9jzBy9bIcQ6lfc5GffiIggT W7e1EokZKOPTulSa4cLyXqLJ1+Lcx65/LmciAemROraoBdJys/XfMEvYaNEwkbhimE V3ClREohfY0dftSn0TT7iRgws11nYHWJWjk0psuwvkDgrTA8jTMR2vTPjBQPKf9K/b 68gKskAly2YM7AR17CinoFoizQ9rFC8EyRG23n2t+BeAFQn7RWhZspdWucPY/tWYVU y8w26o+rd8IqQ== Received: by mail-ed1-f71.google.com with SMTP id p4-20020aa7d304000000b003e7ef120a37so17408922edq.16 for ; Tue, 30 Nov 2021 08:42:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N43WqSu8k6UirlKP2CBzdONay7ipI7+FrBa70QbyPs4=; b=eDTO2b5mq3NBd/N+B+Oj8r6aXIye66r7apX41Dg9514Y4saF7mEcCnWM6g3ScjSNTS 3TCrd+DIWFJqI2NUvJ6r4EYFfMGAglrQrhB88NjuGiTj17vWvn++Q1P95Zssm7nZ3rmD 3ZHNdBKdfZv02drkMkEX5AjAig33MR3Me6LA5RRe6p0C+D4m91+1zoyaXwXYycYjsaG0 wC6ITxcDj7AFPU7Lv3b3Me6zflMnTWL/AqUtbjT4Q5cT2v/NiX2mvvvTH4nglDpEpKPB lSzTZGmK7I0bjqCSYOC1qwtI+wsublwBIW9bYPx9lVA22hFvRQXDXf9hF5PQhp7V+2bM 44JQ== X-Gm-Message-State: AOAM531eYBDQvKaaLI3/wf1fMk3PzRpduS9AI3HYN2ml5dSSFEslUQ3j xUvoSPX22F90Ic3zLNfm01V12BIY3iX5H8kVFRYoLvVEpVeY8wWLoSHtkM2aZjnwssmibJF9x7A GKWNrgf6JfvrIH5+RfVvYwi46 X-Received: by 2002:a05:6402:40c7:: with SMTP id z7mr48603edb.255.1638290562823; Tue, 30 Nov 2021 08:42:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/Lh03UfXF0mmYwXxhruR2vyCA70SPo706bXQSzSoSjfQr5Y5Hy1n9oqCBg6+dpyfquB6onw== X-Received: by 2002:a05:6402:40c7:: with SMTP id z7mr48590edb.255.1638290562710; Tue, 30 Nov 2021 08:42:42 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id bd12sm11541754edb.11.2021.11.30.08.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:42:42 -0800 (PST) From: christian.ehrhardt@canonical.com To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: simplify queue DMA address arithmetic' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:31 +0100 Message-Id: <20211130163605.2460997-127-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 --- >From eba0dc77635f4120d9bfcb3bd7391842f1a42171 Mon Sep 17 00:00:00 2001 From: Huisong Li 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 Signed-off-by: Min Hu (Connor) --- 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@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)