From patchwork Wed Jan 29 18:17:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3553391 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA88D9F382 for ; Wed, 29 Jan 2014 18:18:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C68B201BA for ; Wed, 29 Jan 2014 18:18:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3AAF0201B9 for ; Wed, 29 Jan 2014 18:18:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753047AbaA2SR4 (ORCPT ); Wed, 29 Jan 2014 13:17:56 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:50018 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753033AbaA2SRw (ORCPT ); Wed, 29 Jan 2014 13:17:52 -0500 Received: by mail-ie0-f181.google.com with SMTP id to1so2455726ieb.12 for ; Wed, 29 Jan 2014 10:17:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=8rBVn7/tDciGqk6MAD+BQPy10yT6anHJR405agFsYxA=; b=efxNIEnVtGhlZxACJz3pT4ceBYHhUi20MNR6iRnWBtfd/0A6YDiw1/vHPviR7Qs+/h pDIK1X7WH/RsqmgVVaYwKaOR7khiFkFLxyKHIxjg2mZ/YH8L4O0EiZ0ldwRk44We5DGd op4zR/YeV0b+ZwmrmxnHFCfBefs8VM8/V/KX4iDUQS/Ega3KAObc2bBJsI8UYZgvO7Cj c7VnblS5bvUCpe0xpkHVC6txVexTVhQMgxXjOCvSD6mA6tzfuckMIw+CP63XBpcGGVZk RFSJJZZp/4He1NFekxIHtcxP0iubZy3ERxXbFto7ylfBGdOxW09t6CSFcF92xcEZci6q yksg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=8rBVn7/tDciGqk6MAD+BQPy10yT6anHJR405agFsYxA=; b=eb4vcLWh3KFbyeZy4E4QYTYz6CCuzuqd7cCtsPQxToppnMiP25I3cZoTzKcAX8RZpz lrQNXSvHP6yZ2F3zZmL5erbku2l40fV4vw+/psb3Dz8XRhuXpk2o/T1aHva8AICFTreP 23JjFQBqfwGKl/J731CzXgUYCS0825EcwBu63RRAnpqarG0AeTHaat6RbAbZM0+NnpzC jVMA88BuEMVnOqHLusSZtAGhxXkQueocEhagKfg8PnIp9cGku1li3dpSDuH0P0cq7tJU 7SmfiihVPW8SwkNMnnBAM4kkCb/Ke+FvFgczelYyoc8dBhy8puruZ79DHlsc2Tk3wf8w bQeQ== X-Gm-Message-State: ALoCoQmuSjIey0lVq+A1upRjcWiNzV/HtQepR2Zhkq2jFAIUUA/3quMcVFKXbypr3vfkzXlATGrL6idtiS7Al6Qb5g7LZ4QVILL+SvD5ytT90h+TSsE9sFMDty5jB3Ddlo3DHGHOgLNC4YQxQM9TEYOURclinIAHOgM7jF7cFLtkPLeOa2fhlqVSkz95UK0PvI0UHVWZlryQWz6Am14V7anIBz1Yb0jv2Q== X-Received: by 10.43.129.70 with SMTP id hh6mr2211291icc.68.1391019471612; Wed, 29 Jan 2014 10:17:51 -0800 (PST) Received: from localhost ([172.29.123.160]) by mx.google.com with ESMTPSA id f15sm11173922igd.3.2014.01.29.10.17.50 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 10:17:50 -0800 (PST) Subject: [PATCH 03/17] x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_on_node() To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: linux-acpi@vger.kernel.org, x86@kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 29 Jan 2014 11:17:49 -0700 Message-ID: <20140129181749.15476.64115.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140129174106.15476.7075.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140129174106.15476.7075.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pcibios_scan_root() looks up the bus's NUMA node, then calls pci_scan_bus_on_node(). This uses pcibios_scan_root() directly and drops the node lookup in the callers. Signed-off-by: Bjorn Helgaas --- arch/x86/pci/irq.c | 4 +--- arch/x86/pci/legacy.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 372e9b8989b3..8658874165c2 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -136,11 +136,9 @@ static void __init pirq_peer_trick(void) busmap[e->bus] = 1; } for (i = 1; i < 256; i++) { - int node; if (!busmap[i] || pci_find_bus(0, i)) continue; - node = get_mp_bus_to_node(i); - if (pci_scan_bus_on_node(i, &pci_root_ops, node)) + if (pcibios_scan_root(i)) printk(KERN_INFO "PCI: Discovered primary peer " "bus %02x [IRQ]\n", i); } diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index 4db96fb1c232..5b662c0faf8c 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c @@ -37,19 +37,17 @@ int __init pci_legacy_init(void) void pcibios_scan_specific_bus(int busn) { int devfn; - long node; u32 l; if (pci_find_bus(0, busn)) return; - node = get_mp_bus_to_node(busn); for (devfn = 0; devfn < 256; devfn += 8) { if (!raw_pci_read(0, busn, devfn, PCI_VENDOR_ID, 2, &l) && l != 0x0000 && l != 0xffff) { DBG("Found device at %02x:%02x [%04x]\n", busn, devfn, l); printk(KERN_INFO "PCI: Discovered peer bus %02x\n", busn); - pci_scan_bus_on_node(busn, &pci_root_ops, node); + pcibios_scan_root(busn); return; } }