From patchwork Wed Nov 25 10:12:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Marsh X-Patchwork-Id: 7696871 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 2DF9EBF90C for ; Wed, 25 Nov 2015 10:13:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A6722082B for ; Wed, 25 Nov 2015 10:13:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AE89208D7 for ; Wed, 25 Nov 2015 10:13:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752185AbbKYKNV (ORCPT ); Wed, 25 Nov 2015 05:13:21 -0500 Received: from ipmail05.adl6.internode.on.net ([150.101.137.143]:54065 "EHLO ipmail05.adl6.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752181AbbKYKNT (ORCPT ); Wed, 25 Nov 2015 05:13:19 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2AbCAAJiVVWXcsNAg5eKAECgj5SwXSDPYJSAoFATQEBAQEBAQdEQIQ1AQEDAScRHiMFCwgDISUPAigKFAYBDAgCiCIHvhABAQEBAQEBAwEBAQEBHoZUhH6BQAGHeAEEllWPDYRBljyCdA0QgWkrhWABAQE Received: from ppp14-2-13-203.lns21.adl2.internode.on.net (HELO localhost) ([14.2.13.203]) by ipmail05.adl6.internode.on.net with ESMTP; 25 Nov 2015 20:42:57 +1030 Received: from localhost ([127.0.0.1]) by localhost with esmtp (Exim 4.86) (envelope-from ) id 1a1X4J-0001ZO-M5; Wed, 25 Nov 2015 20:42:55 +1030 Subject: Re: [Bugfix] x86/PCI: Fix regression caused by commit 4d6b4e69a245 To: Jiang Liu , 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> <565570E5.5080906@linux.intel.com> Cc: Bjorn Helgaas , "Rafael J . Wysocki" , Bjorn Helgaas , Linux Kernel Mailing List , Linux PCI , ACPI Devel Maling List , x86@kernel.org From: Arthur Marsh Message-ID: <565589A7.50104@internode.on.net> Date: Wed, 25 Nov 2015 20:42:55 +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: <565570E5.5080906@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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Jiang Liu wrote on 25/11/15 18:57: > 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 OK, I'm booting alright now with git diff reporting the following (just the patch that Jiang Liu posted in the parent): dev_info(&info->bridge->dev, #### There have been at least two gcc-5 updates on this machine since originally reporting the problem so that may have affected results. Thanks to all for help with this. Arthur. --- 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/bus_numa.c b/arch/x86/pci/bus_numa.c index 7bcf06a..6eb3c8a 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 850d7bf..ae3fe4e 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) {