From patchwork Wed Jan 29 18:18:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3553921 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 970F4C02DC for ; Wed, 29 Jan 2014 18:26:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDAEA201BA for ; Wed, 29 Jan 2014 18:26:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E81A0201B4 for ; Wed, 29 Jan 2014 18:26:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752360AbaA2S0W (ORCPT ); Wed, 29 Jan 2014 13:26:22 -0500 Received: from mail-ig0-f177.google.com ([209.85.213.177]:59065 "EHLO mail-ig0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752153AbaA2S0V (ORCPT ); Wed, 29 Jan 2014 13:26:21 -0500 Received: by mail-ig0-f177.google.com with SMTP id k19so5223988igc.4 for ; Wed, 29 Jan 2014 10:26:21 -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=vkgYSEnejtng2SQV4DBjHSXC8pSxFv+imUqsOm2sOew=; b=A1tLc8j9DgfDjtz3zdN+lNhLyAGb/Hj0TgqsSkX3OmRGs1x8FgdLRCrg+qd4R30HZD lHx0IHHjDitInylK33kGgf6xrHENnG8eneHoeLvilqsEOhNNvEYXBDWidE3sYjt+8d3t QbklYZAx7sWWdUzkyHNcY6NVQkrg4C/ii6EFWR6ClotOyfYpwSYHOJHVLKRoMUfDVJgZ w5NDQ8AuqYn4J7PqMhvC9XTs1mt7gbKtAGg8Mi37AmuRWoB3sujxTJNXGBArJDLaYLY6 gDQRJcIwNFtnEcgds66EjNjB3gASHQZU19PN+G7nRlXnqkuEmGMoa4YzxZedv6DD1DB9 NNHg== 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=vkgYSEnejtng2SQV4DBjHSXC8pSxFv+imUqsOm2sOew=; b=MNJN78P7EyYysNr9GCOc+NS1xU132DLkMXcN1eEhYmlNeYRq1lA3pvI451unzF92tq gdILg0l6YEoQgp75Stw4hMuiOyCWyxwoK5OO+x0gSkiNaPAzDEquDSzyXhdT4iVMs0vW NqciflLnkpHs7kdvAsvtTrHlLhFusuegLF/JeZ9jf+iKBk7UoGif9RMRCYhk200eeTcw qAJkluVzhxFt25st00KpDhvaAbOvt5GCBwadn+e3nxv9X6//zjQR2WULLTxJruigBLzN KNIVHJx4ituLNud9OaxMb28Om/yETromeOAzJLP+k+WGSsxLp5jXxeur7YmeGdzhvArU mShw== X-Gm-Message-State: ALoCoQlJPsvXpnxe43IcRlI+9p5IlVWy3ji2Ko9M3v06UpGnb6Rr1px6ePIOV9IqCeyYnEQFy+GND9dqYKR1Vy77ufa58bIwlM9JyDOUCRs1NEAghFkJUC443qe/l2xVA9St1kwmwdZqmcfMp05pQs+FPiXq8x488ZmxTurNlyCwhb3EKyA9+lTXS35J9AQCmRI3oqvfdmHLqq5Q5UFSNDepfxJMafArrQ== X-Received: by 10.50.78.200 with SMTP id d8mr9914513igx.38.1391019530182; Wed, 29 Jan 2014 10:18:50 -0800 (PST) Received: from localhost ([172.29.123.160]) by mx.google.com with ESMTPSA id y7sm10436884igl.8.2014.01.29.10.18.48 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 10:18:49 -0800 (PST) Subject: [PATCH 11/17] x86/PCI: Remove acpi_get_pxm() usage 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:18:48 -0700 Message-ID: <20140129181848.15476.265.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=unavailable 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 The PCI host bridge code doesn't care about _PXM values directly; it only needs to know what NUMA node the hardware is on. This uses acpi_get_node() directly and removes the _PXM stuff. Signed-off-by: Bjorn Helgaas --- arch/x86/pci/acpi.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 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/acpi.c b/arch/x86/pci/acpi.c index 6304ea0f426d..f44a64c74e37 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -480,9 +480,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) struct pci_bus *bus = NULL; struct pci_sysdata *sd; int node; -#ifdef CONFIG_ACPI_NUMA - int pxm; -#endif if (pci_ignore_seg) domain = 0; @@ -494,12 +491,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) return NULL; } - node = NUMA_NO_NODE; -#ifdef CONFIG_ACPI_NUMA - pxm = acpi_get_pxm(device->handle); - if (pxm >= 0) - node = pxm_to_node(pxm); -#endif + node = acpi_get_node(device->handle); if (node == NUMA_NO_NODE) node = x86_pci_root_bus_node(busnum); @@ -570,15 +562,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) pcie_bus_configure_settings(child); } - if (bus && node != NUMA_NO_NODE) { -#ifdef CONFIG_ACPI_NUMA - if (pxm >= 0) - dev_printk(KERN_DEBUG, &bus->dev, - "on NUMA node %d (pxm %d)\n", node, pxm); -#else + if (bus && node != NUMA_NO_NODE) dev_printk(KERN_DEBUG, &bus->dev, "on NUMA node %d\n", node); -#endif - } return bus; }