From patchwork Wed Nov 25 08:27:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 7696441 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6C3D4BF90C for ; Wed, 25 Nov 2015 08:27:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 501EE208D1 for ; Wed, 25 Nov 2015 08:27:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2618C208D7 for ; Wed, 25 Nov 2015 08:27:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754330AbbKYI1a (ORCPT ); Wed, 25 Nov 2015 03:27:30 -0500 Received: from mga09.intel.com ([134.134.136.24]:4502 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754054AbbKYI13 (ORCPT ); Wed, 25 Nov 2015 03:27:29 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 25 Nov 2015 00:27:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,341,1444719600"; d="scan'208,223";a="828611962" Received: from jliu23-mobl.ccr.corp.intel.com (HELO [10.238.131.109]) ([10.238.131.109]) by orsmga001.jf.intel.com with ESMTP; 25 Nov 2015 00:27:19 -0800 Subject: Re: [Bugfix] x86/PCI: Fix regression caused by commit 4d6b4e69a245 To: Arthur Marsh , Keith Busch , "Rafael J. Wysocki" References: <1447648057-13644-1-git-send-email-jiang.liu@linux.intel.com> <20151124164907.GA24819@localhost> <20151124230413.GA11608@localhost.localdomain> <5655019C.7070700@internode.on.net> Cc: Bjorn Helgaas , "Rafael J . Wysocki" , Bjorn Helgaas , Linux Kernel Mailing List , Linux PCI , ACPI Devel Maling List , x86@kernel.org From: Jiang Liu Organization: Intel Message-ID: <565570E5.5080906@linux.intel.com> Date: Wed, 25 Nov 2015 16:27:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <5655019C.7070700@internode.on.net> 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, 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 On 2015/11/25 8:32, Arthur Marsh wrote: > Keith Busch wrote on 25/11/15 09:34: >> On Tue, Nov 24, 2015 at 11:19:34PM +0100, Rafael J. Wysocki wrote: >>> Quite frankly, I'm more likely to revert the offending commit at this >>> point as that's not the only regression reported against it and the >>> fix only helps in one case (out of three known to me). >> >> Using 4.4-rc1 and can confirm the patch fixes my regression report. The >> revert also fixes it, so either way is good for me! >> > > To re-cap, all was fine for me until: > > 4d6b4e69a245e9df4b84dba387596086cb66887d is the first bad commit > commit 4d6b4e69a245e9df4b84dba387596086cb66887d > Author: Jiang Liu > Date: Wed Oct 14 14:29:41 2015 +0800 > > x86/PCI/ACPI: Use common interface to support PCI host bridge > > Use common interface to simplify ACPI PCI host bridge implementation. > > Signed-off-by: Jiang Liu > Reviewed-by: Hanjun Guo > Acked-by: Bjorn Helgaas > Signed-off-by: Rafael J. Wysocki > > :040000 040000 a3447eea376b5a3e6f57deb35cf064c5481b45e3 > f64d8e49fd87b776933dfa3dfefcb33509004d3f M arch > > From the boot-up I get the message as shown in the images at: > http://www.users.on.net/~arthur.marsh/20151107601.jpg and > http://www.users.on.net/~arthur.marsh/20151107602.jpg > > The boot-up suggests trying rebooting with pci=alloc but that didn't help. > > The errors shown include > "BAR 0: trying firmware assignment [io size 0x0020]" > "BAR 0: [io size 0x0020] conflicts with PCI Bus #00 [io 0x0000-0xffff] > "BAR 0: failed to assign [io size 0x0020] > > Applying the following patch on top of the patch above from 14 October > 2015 worked for me: > > > 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(+) > > 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; > > @@ -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; > > ### > > The patch postd by Jian Liu on 16 November 2015 "[Bugfix] x86/PCI: Fix > regression caused by commit 4d6b4e69a245" had *not* been seen or tested > by me before being posted to the linux-acpi list and when I did test it > (after removing the patch above from 9 November 2015), things broke: > http://www.users.on.net/~arthur.marsh/20151116611.jpg > > So if "commit 4d6b4e69a245e9df4b84dba387596086cb66887d > x86/PCI/ACPI: Use common interface to support PCI host bridge" stays, > then the patch "16 November 2015 [Bugfix] x86/PCI: Fix regression caused > by commit 4d6b4e69a245" would need to go and the patch above from 9 > November 2015 would need to be accepted into the mainline for my machine > to boot from the mainline code. Hi Arthur, Thanks for reminder again! It's a little strange, the formal patch "[Bugfix] x86/PCI: Fix regression caused by commit 4d6b4e69a245" is based on the debug patch I sent to you at 9 November 2015. Could you please help to try the attached patch again? Thanks, Gerry > > Arthur. From 2f82bcfb3f8804197512e55259b57e6fbed6a913 Mon Sep 17 00:00:00 2001 From: Liu Jiang Date: Mon, 9 Nov 2015 13:36:48 +0800 Subject: [PATCH] x86/PCI: Fix regression caused by commit 4d6b4e69a245 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 | 13 ++----------- drivers/acpi/pci_root.c | 7 +++++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c index 7bcf06a7cd12..6eb3c8af96e2 100644 --- a/arch/x86/pci/bus_numa.c +++ b/arch/x86/pci/bus_numa.c @@ -50,18 +50,9 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources) 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, -- 1.7.10.4