From patchwork Fri Aug 31 11:29:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 964399 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 421xwQ2BnJz9rvt; Fri, 31 Aug 2018 21:29:42 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fvhcN-0004A8-Hl; Fri, 31 Aug 2018 11:29:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fvhcK-00048o-Kj for kernel-team@lists.ubuntu.com; Fri, 31 Aug 2018 11:29:32 +0000 Received: from mail-ed1-f69.google.com ([209.85.208.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fvhcK-00082M-DF for kernel-team@lists.ubuntu.com; Fri, 31 Aug 2018 11:29:32 +0000 Received: by mail-ed1-f69.google.com with SMTP id c25-v6so4505384edb.12 for ; Fri, 31 Aug 2018 04:29:32 -0700 (PDT) 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; bh=T9NY4m6iAUT5izsmo5Tnx0iuUxaMX7gueQePdwWG+kk=; b=bkIkzu/vbThBQy/acE8JnYzm1OHHjxIAgC+Nw4Q+yyaejnbf1A3Kl4KzmvAbHibWHT 4Fi12ilPQJZxYwJwT9Vc2DKt+e73FwE/RHRG/D58UDcI5cqmqEWUGJAfq/PXqTndseIP /JmoR9vMo0iSRwyjhTIOkK1oinRjdU3Ku5Hxv0TzAr/GvuZSKQ/SH5CrjaUkOzV4BRAE 1ohCFnB+B6ezBMKo1viN04NgYOneOzlOOHL9r8qNk4MeeT6xI3RnJWxkbNDTtM0wwQfp Sfbk5Q5pmv+sMFRtW7Xk6YaC9BZaNo3SMrUGfXEGG6l8y0lJZQ7GZKVDzymjxbF2Myn5 thtg== X-Gm-Message-State: APzg51AU7+A3ttNHNhOVuS47xj+h/zHh8QAITXOdmrRX/brAlfElLKnD p4FQg55quX7fbZXgWHiqm3cxEhG94YlczYWb23hKMiB7xFIivoYTdw7fsLzDAryuahpkiMgtBg1 IdJCflEaiBjMBS/aDk7GSM0VrOvt0MaCh1bDau/FALg== X-Received: by 2002:a50:9a02:: with SMTP id o2-v6mr17779395edb.236.1535714971945; Fri, 31 Aug 2018 04:29:31 -0700 (PDT) X-Google-Smtp-Source: ANB0VdY/I/KqcwuiigHb6+HXNt/EKG09aX2fWsywb3AZNTMFCVF4BHW1Qbogz13gDEbyfwoy6BZtpg== X-Received: by 2002:a50:9a02:: with SMTP id o2-v6mr17779386edb.236.1535714971833; Fri, 31 Aug 2018 04:29:31 -0700 (PDT) Received: from localhost.localdomain ([81.221.205.149]) by smtp.gmail.com with ESMTPSA id o22-v6sm5103688edc.90.2018.08.31.04.29.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Aug 2018 04:29:31 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Trusty][PATCH 3/6] UBUNTU: SAUCE: i40e_bpo: Don't probe for NICs supported by the in-tree driver Date: Fri, 31 Aug 2018 13:29:18 +0200 Message-Id: <20180831112921.20457-4-juergh@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180831112921.20457-1-juergh@canonical.com> References: <20180831112921.20457-1-juergh@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: juergh@canonical.com MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1789215 Only load the i40e_bpo driver for devices that are not supported by the in-tree i40e driver, so remove these device IDs from the i40e_bpo driver's device table. Signed-off-by: Juerg Haefliger --- ubuntu/i40e/i40e_main.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ubuntu/i40e/i40e_main.c b/ubuntu/i40e/i40e_main.c index 0456b9d5d99d..2781df5fb2c4 100644 --- a/ubuntu/i40e/i40e_main.c +++ b/ubuntu/i40e/i40e_main.c @@ -75,13 +75,17 @@ static int i40e_veb_get_bw_info(struct i40e_veb *veb); * Class, Class Mask, private data (not used) } */ static const struct pci_device_id i40e_pci_tbl[] = { - {PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_XL710), 0}, - {PCI_VDEVICE(INTEL, I40E_DEV_ID_QEMU), 0}, - {PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_B), 0}, - {PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_C), 0}, - {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_A), 0}, - {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_B), 0}, - {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0}, +/* + * Exclude the following devices that are supported by the in-kernel driver + * + * {PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_XL710), 0}, + * {PCI_VDEVICE(INTEL, I40E_DEV_ID_QEMU), 0}, + * {PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_B), 0}, + * {PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_C), 0}, + * {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_A), 0}, + * {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_B), 0}, + * {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0}, + */ {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T4), 0}, {PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},