From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id 8BC9D1B287 for ; Mon, 30 Oct 2017 16:38:20 +0100 (CET) Received: by mail-wr0-f193.google.com with SMTP id l8so13043293wre.12 for ; Mon, 30 Oct 2017 08:38:20 -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=FTenOGP2jJ+BpD65lq98frmbhYhlmPYdYTqHfm4KrX4=; b=rn0TA1jEfjoC3g18d5UQ2OXJqLJ19SE7N7mBejBy6ptteECxED2VGQzyiC3QTh8CZ8 DQj1dtZgaF9woDYMslU7QEbN4rIpg1FtlyfozeR5I433i1z40bBWQLDcEaXZSCtkCJhf wmUwbG7IkBt5VttKjQ4+ytVpw9mYATTqQk1c8DZ1qztWH3d7BheP02bXNYU4wAS4Qdak X03FEmmOlSS6+LYyAVahD9/KPhC/+i3Y1zkf6NeanXN2eOdTgichyCt8Vgy5R+yuYDr5 ENgYpdY98bIDZ1/TEQtKmKYaAn6Z1k2DOUtPbLpB3MCMaEibEMvkc7NFSu+iyXNwPxkY wDsQ== 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=FTenOGP2jJ+BpD65lq98frmbhYhlmPYdYTqHfm4KrX4=; b=Il9+2pDW0ayFzHq/3a66tznLa4ejcB+ooOLa/ftX1SQvYpa4V1B1Fg6507NKLq44Ry /dohDdwXU4eGOJeP1QPcC3vgsDJtuedQ62bV2YQYhm6eFgyr5oTVUJnzkjUeEzRJRy/X 797+MnHsLB+8ZmkdlBqcvSFmpOzc8TSk2NRjbkESG6IMQx7bpcWdoPzilIuFX9PUWeZf 0+sFoi4JWipQGpjTePvGAark5TKwC6tM4R0OvM5h4WZbhotdxra1mnmUWASYHYfDzSkO PyTjsN/jnGPWHU5R5E7UhPfbF3kIGcMi+7txVu4pKxOuaDGXujn6slrTBrzbu4djvvVM YQ8A== X-Gm-Message-State: AMCzsaVx+V6KQP6HR5o0fa4wbMHVcfWyrBo9xY8kk5o5MiHbCNZlP+4z pWfVtspjolOrkh1ua0OC3jk= X-Google-Smtp-Source: ABhQp+T18I/wsq3BQ5syAtk0+FtH2MNyD1snJQqYMWYGj38aIMCmnt/wM8TpLre8QojUOTrmOLZzSw== X-Received: by 10.223.156.193 with SMTP id h1mr6751856wre.174.1509377900292; Mon, 30 Oct 2017 08:38:20 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id c4sm9180890wre.57.2017.10.30.08.38.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2017 08:38:19 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Nicolas Dichtel , dpdk stable Date: Mon, 30 Oct 2017 15:35:03 +0000 Message-Id: <20171030153511.13322-60-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171030153511.13322-1-luca.boccassi@gmail.com> References: <20171030153511.13322-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'kni: fix ethtool build with kernel 4.11' has been queued to LTS release 16.11.4 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: , X-List-Received-Date: Mon, 30 Oct 2017 15:38:20 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/17. So please shout if anyone has objections. Thanks. Kind regards, Luca Boccassi --- >>From 2639ad2a05ffc6f6636a7a38a8ed9190fbf9c1a9 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 3 May 2017 17:00:16 +0100 Subject: [PATCH] kni: fix ethtool build with kernel 4.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 9fb3cd2c041eeca30b6c46e5d555d857d6096ae7 ] build error: .../lib/librte_eal/linuxapp/kni/igb_main.c:1034:10: error: implicit declaration of function ‘pci_enable_msix’ err = pci_enable_msix(pdev, ^~~~~~~~~~~~~~~ This build error observed when CONFIG_RTE_KNI_KMOD_ETHTOOL config option enabled. Following Linux commit removes the pci_enable_msix() Linux: 4244de1c64de ("PCI: remove pci_enable_msix") Switch to pci_enable_msix_range() for kernel > 4.8 since current Linux igb driver uses this function. Signed-off-by: Ferruh Yigit Acked-by: Nicolas Dichtel --- lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 7 +++++++ lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c index f4dca5a38..acb1a69b4 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c @@ -1031,8 +1031,15 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter, bool msix) for (i = 0; i < numvecs; i++) adapter->msix_entries[i].entry = i; +#ifdef HAVE_PCI_ENABLE_MSIX err = pci_enable_msix(pdev, adapter->msix_entries, numvecs); +#else + err = pci_enable_msix_range(pdev, + adapter->msix_entries, + numvecs, + numvecs); +#endif if (err == 0) break; } diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index 84826b26e..aea253b1c 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3933,4 +3933,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) #define HAVE_VF_VLAN_PROTO #endif /* >= 4.9.0 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) +#define HAVE_PCI_ENABLE_MSIX +#endif + #endif /* _KCOMPAT_H_ */ -- 2.11.0