From patchwork Tue Jul 11 23:25:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Blunck X-Patchwork-Id: 26822 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A0D087CB3; Wed, 12 Jul 2017 01:25:44 +0200 (CEST) Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id E9E442E83 for ; Wed, 12 Jul 2017 01:25:37 +0200 (CEST) Received: by mail-wr0-f193.google.com with SMTP id k67so1741067wrc.1 for ; Tue, 11 Jul 2017 16:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=0LRRfn1Zd41s0y89MubnpVJmKKSeEuJcXn76F+4CNgU=; b=ofhsW/LMlV0kG3fNKi6weJ6heHaTWwADuO0QeaiddwhHvQHQyJ0FIZWDuItWYwXrkD IZAfaQ7xaNVkdLZCGPIBsYfk73rf27bqNJMOaWVGLCGxs65xsEoRMxDyg5Qjd0cTsHrt Idtq23zzitkflj4rBB8JyKcLz8Ji5NboJ0sZEhh4OadyzwD/VdcYUseNI35K52rQuz6H w0GZ4AkxorVO74qjHiYg8aUxQtIoUb5H1cWjPYkeV/xrHJ/oM8TEfIhPVWDk2WNDFWqL Ss8ni8q6/teI4iYCuMYIfoWjMFhU8qaiOtiJLHKmTOuXOwmMXhdDbhsd3U8hZVEqsr/S lyZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=0LRRfn1Zd41s0y89MubnpVJmKKSeEuJcXn76F+4CNgU=; b=myy3NnDihXsh6ZF6m/Ni9KmRzxC8hjRzygHHgaNm8aVCMWHZPoVh2H9Pznm37LhDzu yOGRFanqrl6gml7B77qAprwuFctHJ1AdTFfIEHHFcYIa5BssHgZAaGQCmki0fL3P++Ja 2KBnamH/18JntciTGXsE64j4eil92yMuUH5/RRtXfHaaS/0jgjKGCB9DEuAVpua3OLae Qt+c9D9y9mgrBydGCRSqpYqol6hx1KZtMItQ3MxSMGHGfAdt34YvrrnWivehYx2xU/MI 2Z8ZHKR4wSyiZtg3UwJyU55jEfRdkuHUhVveNS8JeiuTxG/EmcBzXbkhx12zpVaZNiLO rB1g== X-Gm-Message-State: AIVw111KQiwJ//Xp3ZLNwocOBJ+I7cU9H12oBitg/KnwsqdvKw5QVGW6 iTQqrwz0gBCgtvfR X-Received: by 10.80.205.217 with SMTP id h25mr4182435edj.59.1499815537535; Tue, 11 Jul 2017 16:25:37 -0700 (PDT) Received: from localhost.localdomain ([37.228.147.16]) by smtp.gmail.com with ESMTPSA id k45sm311516ede.16.2017.07.11.16.25.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 11 Jul 2017 16:25:36 -0700 (PDT) From: Jan Blunck To: dev@dpdk.org Date: Tue, 11 Jul 2017 19:25:03 -0400 Message-Id: <20170711232512.54641-5-jblunck@infradead.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170711232512.54641-1-jblunck@infradead.org> References: <20170711232512.54641-1-jblunck@infradead.org> Subject: [dpdk-dev] [PATCH 04/13] pci: use scan_mode configuration X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When scanning/probing devices the bus should use its configuration instead of looking at the devargs->type field. Signed-off-by: Jan Blunck --- lib/librte_eal/common/eal_common_pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 72fcc35c2..fb0e29ac4 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -197,8 +197,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr, /* no initialization when blacklisted, return without error */ if (dev->device.devargs != NULL && - dev->device.devargs->type == - RTE_DEVTYPE_BLACKLISTED_PCI) { + rte_pci_bus.bus.conf.scan_mode == RTE_BUS_SCAN_BLACKLIST) { RTE_LOG(INFO, EAL, " Device is blacklisted, not" " initializing\n"); return 1; @@ -404,8 +403,7 @@ rte_pci_probe(void) /* probe all or only whitelisted devices */ if (probe_all) ret = pci_probe_all_drivers(dev); - else if (devargs != NULL && - devargs->type == RTE_DEVTYPE_WHITELISTED_PCI) + else if (devargs != NULL) ret = pci_probe_all_drivers(dev); if (ret < 0) { RTE_LOG(ERR, EAL, "Requested device " PCI_PRI_FMT