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 0EB03A0C4C for ; Mon, 12 Jul 2021 15:12:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 091444069E; Mon, 12 Jul 2021 15:12:20 +0200 (CEST) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mails.dpdk.org (Postfix) with ESMTP id 992554069D for ; Mon, 12 Jul 2021 15:12:18 +0200 (CEST) Received: by mail-wr1-f43.google.com with SMTP id i94so25534991wri.4 for ; Mon, 12 Jul 2021 06:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hjdlN2SPQVz20issJzwKP5nwYimb3ieUpdS68AE10Ho=; b=Kj+tcdHB3IzO9abIsGUN57cYwIUMD3r2pWBtMSAes2L6GbPRGnKJPz6WYv+/VVVq/v nTpMxSD8oc3Xy90qPByiM1w3N++1Ea/2nE7BS9UzHeTCh0tzksSiPxEneWrwEl+CIBwY xCgCFsk4MGywCiZ7r17Ta/BOLsramDRJ9TkxofLshfEY2ybT48Fyht6u5767X9aeHX2O ZEqNsyouv0HIVOIC/oyaw2IiNk0QfTWk2pNTYjDdcBrZ7ObUEwzv5ndvXXUYacgmBsx9 KvWtAlDWIydaPqEKHta/wFnyV0NC0nsLzwbenfqCIybyDXsLFI4qUEPgm9472FQKRvMC 8y+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hjdlN2SPQVz20issJzwKP5nwYimb3ieUpdS68AE10Ho=; b=LPTRCHoh3Q/yoXXINFrnhp8uUrS8UKtpRAJso4dtC8dHzg/h4940nMBcOEHEJjrtMq Vx+zh/XNcmqvqyoami/nCaH0l5oF8NaGeCIwn0nozDbiEGx+WUOlTV85CRDy0bvAxnze JFxnnphjGzKQVCpTf3qs6bPplhXNwUWmXPxF0YdHYtFJaUZGuRFRaoUQLc1Amx8yIIrV nothp94bSBOx0nT0VB2vWcD0HXeA+TfuWHfaoMmWbSQgRe9G5d63XcLQKv4Eb6zOoHj9 Jlsj/rLJm9NdyN3SyfxkiyAQZ3cLzeOSlwEdWHuaB1bia3c8TBGownLjIqF0UMKOJw01 h1IA== X-Gm-Message-State: AOAM531JEY1UUWUY/GK/PTnndlgFIxl11sWdj0fmkFYGop53Isc6zXQG Mnl0BeM9Ncbnnn2sT4nSpOA= X-Google-Smtp-Source: ABdhPJwTBjH45EX5DUpiO2XCPdAQ6Nmr6PFbpgkZnI/RCT/iBrh60E2goZwmo3k+LZNtoWNXvSdkmg== X-Received: by 2002:adf:f8cd:: with SMTP id f13mr19475666wrq.328.1626095538412; Mon, 12 Jul 2021 06:12:18 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id h13sm14265518wrs.68.2021.07.12.06.12.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:12:17 -0700 (PDT) From: luca.boccassi@gmail.com To: David Christensen Cc: David Marchand , dpdk stable Date: Mon, 12 Jul 2021 14:04:36 +0100 Message-Id: <20210712130551.2462159-41-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/pci: fix IOVA as VA support for PowerNV' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/00dda0bd97ab56787a5fb714c25a50bcd44cd858 Thanks. Luca Boccassi --- >From 00dda0bd97ab56787a5fb714c25a50bcd44cd858 Mon Sep 17 00:00:00 2001 From: David Christensen Date: Tue, 15 Jun 2021 10:20:27 -0700 Subject: [PATCH] bus/pci: fix IOVA as VA support for PowerNV [ upstream commit cc4219d1f0f0598d4f05ac9e24bafd6532122399 ] Fix the IOMMU detection logic that looks for the "platform" field of /proc/cpuinfo on POWER systems. Fixes: 905215731833 ("bus/pci: support IOVA as VA on PowerNV systems") Signed-off-by: David Christensen Reviewed-by: David Marchand --- drivers/bus/pci/linux/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index 2e1808b902..c5402b9652 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -569,7 +569,7 @@ pci_device_iommu_support_va(__rte_unused const struct rte_pci_device *dev) /* Check for a PowerNV platform */ while (getline(&line, &len, fp) != -1) { - if (strstr(line, "platform") != NULL) + if (strstr(line, "platform") == NULL) continue; if (strstr(line, "PowerNV") != NULL) { -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:38.799602959 +0100 +++ 0041-bus-pci-fix-IOVA-as-VA-support-for-PowerNV.patch 2021-07-12 13:41:36.330119277 +0100 @@ -1 +1 @@ -From cc4219d1f0f0598d4f05ac9e24bafd6532122399 Mon Sep 17 00:00:00 2001 +From 00dda0bd97ab56787a5fb714c25a50bcd44cd858 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cc4219d1f0f0598d4f05ac9e24bafd6532122399 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0dc99e9cb2..edfe430268 100644 +index 2e1808b902..c5402b9652 100644