From patchwork Wed Jun 20 20:04:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Drepper X-Patchwork-Id: 166138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B38DEB6FBC for ; Thu, 21 Jun 2012 06:04:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758027Ab2FTUEs (ORCPT ); Wed, 20 Jun 2012 16:04:48 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:37603 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753833Ab2FTUEr (ORCPT ); Wed, 20 Jun 2012 16:04:47 -0400 Received: by qcro28 with SMTP id o28so4427454qcr.19 for ; Wed, 20 Jun 2012 13:04:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=tJWX5zdVy+qjKgDdpP8uoOQmgQdOD8L6hIUntHY/7bQ=; b=RviavaIljNuPnzwcxU+w9hVIvtalDighdpBKn0nedMX6Ib+ghrAVtUGlDVtx7Qy8pl hhDGPwoCRRUTtzga0QZXd0VIdqpGSvDcPGnQ2EKqHyKIeBgbiE0luMIh2WA1TuLPBIV/ yshlh7eEHf5DMjcHW/iPxBfCNA4PZDgo23WOt7Ut7Z8nUmRMzzEPWH+jnvx2gP6V78QP HW1WHZAxNtPpWmz44aw7IqkhQG1buauGU3k6WMZp3gK2OR7W6myGN4SUUvgbBRsP9Jp2 xu07kzT/psve4Zig8PU8/U3XABm/XV9MDPkd8GMS44FNPyuSH0wArpH4kKBUFIFBKaL2 iS4Q== Received: by 10.224.32.5 with SMTP id a5mr42979923qad.87.1340222686516; Wed, 20 Jun 2012 13:04:46 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.30.12 with HTTP; Wed, 20 Jun 2012 13:04:26 -0700 (PDT) In-Reply-To: <20120620193438.GB2248@gmail.com> References: <20120620193438.GB2248@gmail.com> From: Ulrich Drepper Date: Wed, 20 Jun 2012 16:04:26 -0400 Message-ID: Subject: Re: SNB PCI root information To: Ingo Molnar Cc: Yinghai Lu , Bjorn Helgaas , jbarnes@virtuousgeek.org, Linux Kernel Mailing List , lenb@kernel.org, x86@kernel.org, linux-pci@vger.kernel.org Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Wed, Jun 20, 2012 at 3:34 PM, Ingo Molnar wrote: > I mean, if we create a parameter space that tweaks data then why > not make it complete and allow *all* firmware data to be > (optionally) modified, from the kernel boot line? If there is proof that BIOSes get it wrong then just use this small additional patch: Signed-off-by: Ulrich Drepper node = -1; --- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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 fc09c27..7aceb84 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -387,16 +387,16 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) return NULL; } - node = -1; + node = get_mp_bus_to_node(busnum); #ifdef CONFIG_ACPI_NUMA - pxm = acpi_get_pxm(device->handle); - if (pxm >= 0) - node = pxm_to_node(pxm); - if (node != -1) - set_mp_bus_to_node(busnum, node); - else + if (node == -1) { + pxm = acpi_get_pxm(device->handle); + if (pxm >= 0) + node = pxm_to_node(pxm); + if (node != -1) + set_mp_bus_to_node(busnum, node); + } #endif - node = get_mp_bus_to_node(busnum); if (node != -1 && !node_online(node))