From patchwork Mon Nov 16 07:06:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Marsh X-Patchwork-Id: 7621211 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F25E9F392 for ; Mon, 16 Nov 2015 07:09:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B5C0205E4 for ; Mon, 16 Nov 2015 07:09:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 610D1205AA for ; Mon, 16 Nov 2015 07:09:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751301AbbKPHJG (ORCPT ); Mon, 16 Nov 2015 02:09:06 -0500 Received: from ipmail04.adl6.internode.on.net ([150.101.137.141]:48205 "EHLO ipmail04.adl6.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102AbbKPHJF (ORCPT ); Mon, 16 Nov 2015 02:09:05 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2C9BwDIf0lWPIqf0nZeFhIBAQGCPlJTb8BBIYVvAoEtTQEBAQEBAQcBAQEBQT+ENAEBAQQjBBEeIgEQCAMRAwECAwIFFgsCAgkDAgECAScKDAgGAQwGAgKIKQ6pK497AQEBAQEBAQEBAQEBAQEBAQEcgQGFU4R+gUABhjSBRAWHRIsjg2GpbIJ0DRCBaSs0AQEBhUgBAQE Received: from ppp118-210-159-138.lns20.adl6.internode.on.net (HELO localhost) ([118.210.159.138]) by ipmail04.adl6.internode.on.net with ESMTP; 16 Nov 2015 17:38:02 +1030 Received: from localhost ([127.0.0.1]) by localhost with esmtp (Exim 4.86) (envelope-from ) id 1ZyDsD-0001QP-T8; Mon, 16 Nov 2015 17:36:45 +1030 From: Arthur Marsh Subject: Re: [Bugfix] x86/PCI: Fix regression caused by commit 4d6b4e69a245 To: Jiang Liu , "Rafael J . Wysocki" , Bjorn Helgaas References: <1447648057-13644-1-git-send-email-jiang.liu@linux.intel.com> Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, x86@kernel.org, Keith Busch Message-ID: <56498076.7040001@internode.on.net> Date: Mon, 16 Nov 2015 17:36:30 +1030 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Icedove/38.3.0 MIME-Version: 1.0 In-Reply-To: <1447648057-13644-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Jiang Liu wrote on 16/11/15 14:57: > From: Liu Jiang > > Commit 4d6b4e69a245 ("x86/PCI/ACPI: Use common interface to support > PCI host bridge") converted x86 to use the common interface > acpi_pci_root_create, but the conversion missed on code piece in > arch/x86/pci/bus_numa.c, which causes regression on some legacy > AMD platforms as reported by Arthur Marsh . > The root causes is that acpi_pci_root_create() fails to insert > host bridge resources into iomem_resource/ioport_resource because > x86_pci_root_bus_resources() has already inserted those resources. > So change x86_pci_root_bus_resources() to not insert resources into > iomem_resource/ioport_resource. > > Signed-off-by: Jiang Liu > Reported-and-tested-by: Arthur Marsh > Cc: Keith Busch > Cc: Arthur Marsh > --- > arch/x86/pci/bus_numa.c | 16 +++------------- > drivers/acpi/pci_root.c | 7 +++++++ > 2 files changed, 10 insertions(+), 13 deletions(-) > > diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c > index 7bcf06a7cd12..ce53b5b64f51 100644 > --- a/arch/x86/pci/bus_numa.c > +++ b/arch/x86/pci/bus_numa.c > @@ -41,27 +41,17 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources) > bus); > > /* already added by acpi ? */ > - resource_list_for_each_entry(window, resources) > + resource_list_for_each_entry(window, &info->resources) > if (window->res->flags & IORESOURCE_BUS) { > found = true; > break; > } > - > if (!found) > pci_add_resource(resources, &info->busn); > > - list_for_each_entry(root_res, &info->resources, list) { > - struct resource *res; > - struct resource *root; > + list_for_each_entry(root_res, &info->resources, list) > + pci_add_resource(resources, &root_res->res); > > - res = &root_res->res; > - pci_add_resource(resources, res); > - if (res->flags & IORESOURCE_IO) > - root = &ioport_resource; > - else > - root = &iomem_resource; > - insert_resource(root, res); > - } > return; > > default_resources: > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index 850d7bf0c873..ae3fe4e64203 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -768,6 +768,13 @@ static void pci_acpi_root_add_resources(struct acpi_pci_root_info *info) > else > continue; > > + /* > + * Some legacy x86 host bridge drivers use iomem_resource and > + * ioport_resource as default resource pool, skip it. > + */ > + if (res == root) > + continue; > + > conflict = insert_resource_conflict(root, res); > if (conflict) { > dev_info(&info->bridge->dev, > I have not previously seen the patch above and have not been able to successfully boot with it applied against the current Linus' git head. I had booted successfully with a kernel built with the patch below from 9 November 2015, then removed the patch below and applied the patch above from 16 November 2015, and when I booted the resulting kernel, received a lock-up: http://www.users.on.net/~arthur.marsh/20151116611.jpg I'd be happy to test further patches. Arthur. From 02818ba34bfa76d93f2a29c85660da0323b0b457 Mon Sep 17 00:00:00 2001 From: Liu Jiang Date: Mon, 9 Nov 2015 13:36:48 +0800 Subject: [PATCH] Signed-off-by: Liu Jiang --- arch/x86/pci/bus_numa.c | 3 +++ 1 file changed, 3 insertions(+) @@ -61,6 +63,7 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources) else root = &iomem_resource; insert_resource(root, res); +#endif } return; diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c index 7bcf06a7cd12..022d83158cdb 100644 --- a/arch/x86/pci/bus_numa.c +++ b/arch/x86/pci/bus_numa.c @@ -51,6 +51,8 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources) pci_add_resource(resources, &info->busn); list_for_each_entry(root_res, &info->resources, list) { + pci_add_resource(resources, &root_res->res); +#if 0 struct resource *res; struct resource *root;