From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7C672A04DD for ; Wed, 28 Oct 2020 11:51:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7475BCA06; Wed, 28 Oct 2020 11:51:25 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by dpdk.org (Postfix) with ESMTP id 44EAEC9F6 for ; Wed, 28 Oct 2020 11:51:23 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id a72so4083779wme.5 for ; Wed, 28 Oct 2020 03:51:23 -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=TBKC9bEtmdWtODQCrsQBVOxaz/VR+djv55MuYc2Qynk=; b=W2qhNxUryinmOWpQMJth9GPMbAfw2orlbEpwPlnYBhf2NfQjJ3N7ChN/dLRXCgWYxV t5P3ksvddDtmYWTuiYBiAMclxMpJ01AOTl0iM8D5kRPJX7tJ4NFVZRL5kSqabcN59HmP RLcAKmV9K7bK4rtj1h2K3afcqbCjln6MxiLiwwFFD1NMSsbkCMr2bGr4km44u2ScUSua 4C1FpWohOOirYYhyQHPSUl6P+XXOTMVmJmsvm8nZeoglRaJ9S/E+2RksWJXZLDEz4egY Yz8XgnIRf+9UZVjf5HVXkl0RwxZ12eL+qK+jYuOk9hmtKeRoU1t44caJPwvq1mSOrKhd QWMQ== 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=TBKC9bEtmdWtODQCrsQBVOxaz/VR+djv55MuYc2Qynk=; b=H5q2vnra2mT7L2DsPNCbpNpgTAvmRZyUQp+ofzKoLPmAwsEolEjqjmmcJatylMhxaV e/SHEQN/KQZzIHeVKtfYHvWcHLr/XNMc2WhEE1Uaif7gjVkLEOXw1eJoWyKkOZ+OjiQV ovUHEt7YOVgXtp8UfjLRLyX8+B7palAb6UJP4tu+GxTsxA6b4OLgA5yjjsu2RhegIzIH 2yfRuCBV/6TF5YEPq4BdGdDLlJfAOCPKONqzYI41aOwOyuiV9lvq5ALQvSeg6o5owb58 i852DCRQSuwoOLCSeP5gXBery8EmtTJZlqfX0xU/7aXKSZj5QdBKdivAvOBGwBKRDofM Qk9w== X-Gm-Message-State: AOAM532JFSYA4pDxset7jEo0s8778+KLcIazogXEk+0HB5yuFkJrx5Wz EJ77NLf0l7Nbhma5GM58P9w= X-Google-Smtp-Source: ABdhPJyluewo1t86L5+XKRATcyQwCIvRQN6Uj4mJHD57HuxLZAB2GR9xPFZC3sk/4uH4A7T8mcLXRQ== X-Received: by 2002:a05:600c:2256:: with SMTP id a22mr7515926wmm.138.1603882282044; Wed, 28 Oct 2020 03:51:22 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f5sm5613524wmh.16.2020.10.28.03.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Maxime Coquelin Cc: Brandon Lo , David Marchand , dpdk stable Date: Wed, 28 Oct 2020 10:44:18 +0000 Message-Id: <20201028104606.3504127-99-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vdpa/ifc: fix build with recent kernels' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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. Thanks. Luca Boccassi --- >From b0cad9cfe65a03af49b7506a16127a8d5b24961e Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 2 Oct 2020 09:54:00 +0200 Subject: [PATCH] vdpa/ifc: fix build with recent kernels [ upstream commit 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a ] VIRTIO_F_IOMMU_PLATFORM is now defined in recent kernel headers, causing build issue. Let's define it in the IFC vDPA driver only if it wasn't already. Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver") Reported-by: Brandon Lo Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- drivers/net/ifc/base/ifcvf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifc/base/ifcvf.h index 9be2770fea..3f7497bd02 100644 --- a/drivers/net/ifc/base/ifcvf.h +++ b/drivers/net/ifc/base/ifcvf.h @@ -13,7 +13,10 @@ #define IFCVF_SUBSYS_DEVICE_ID 0x001A #define IFCVF_MAX_QUEUES 1 + +#ifndef VIRTIO_F_IOMMU_PLATFORM #define VIRTIO_F_IOMMU_PLATFORM 33 +#endif /* Common configuration */ #define IFCVF_PCI_CAP_COMMON_CFG 1 -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.858988377 +0000 +++ 0099-vdpa-ifc-fix-build-with-recent-kernels.patch 2020-10-28 10:35:11.652832202 +0000 @@ -1,27 +1,28 @@ -From 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a Mon Sep 17 00:00:00 2001 +From b0cad9cfe65a03af49b7506a16127a8d5b24961e Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 2 Oct 2020 09:54:00 +0200 Subject: [PATCH] vdpa/ifc: fix build with recent kernels +[ upstream commit 4e1b5092ad1ce3e3bd66eb20a9976d027e424b0a ] + VIRTIO_F_IOMMU_PLATFORM is now defined in recent kernel headers, causing build issue. Let's define it in the IFC vDPA driver only if it wasn't already. Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver") -Cc: stable@dpdk.org Reported-by: Brandon Lo Signed-off-by: Maxime Coquelin Acked-by: David Marchand --- - drivers/vdpa/ifc/base/ifcvf.h | 3 +++ + drivers/net/ifc/base/ifcvf.h | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h -index a288ce57dc..573a35ffb4 100644 ---- a/drivers/vdpa/ifc/base/ifcvf.h -+++ b/drivers/vdpa/ifc/base/ifcvf.h +diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifc/base/ifcvf.h +index 9be2770fea..3f7497bd02 100644 +--- a/drivers/net/ifc/base/ifcvf.h ++++ b/drivers/net/ifc/base/ifcvf.h @@ -13,7 +13,10 @@ #define IFCVF_SUBSYS_DEVICE_ID 0x001A