From patchwork Wed Nov 25 00:32:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Marsh X-Patchwork-Id: 7694541 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 67C219F2EC for ; Wed, 25 Nov 2015 00:33:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 803EC20894 for ; Wed, 25 Nov 2015 00:33:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C00FD20891 for ; Wed, 25 Nov 2015 00:33:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932609AbbKYAcn (ORCPT ); Tue, 24 Nov 2015 19:32:43 -0500 Received: from ipmail06.adl6.internode.on.net ([150.101.137.145]:12521 "EHLO ipmail06.adl6.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754793AbbKYAcl (ORCPT ); Tue, 24 Nov 2015 19:32:41 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CYAQAkAFVW/8sNAg4NURaDeG+/WgRZFwqFbgKCEAEBAQEBAYU/AQEBBAEBASQRQAEQCxEDAQIBCRYPCQMCAQIBPQgGAQwGAgKIN6xdkRgBAQEBAQEBAQEBAQEBAQEBAQEbhlSEfoFAAYd4BYdGhw6IAaoKgnQNEIFpXwEBAYUpAQEB Received: from ppp14-2-13-203.lns21.adl2.internode.on.net (HELO [192.168.1.104]) ([14.2.13.203]) by ipmail06.adl6.internode.on.net with ESMTP; 25 Nov 2015 11:02:37 +1030 Subject: Re: [Bugfix] x86/PCI: Fix regression caused by commit 4d6b4e69a245 To: Keith Busch , "Rafael J. Wysocki" References: <1447648057-13644-1-git-send-email-jiang.liu@linux.intel.com> <20151124164907.GA24819@localhost> <20151124230413.GA11608@localhost.localdomain> Cc: Bjorn Helgaas , Jiang Liu , "Rafael J . Wysocki" , Bjorn Helgaas , Linux Kernel Mailing List , Linux PCI , ACPI Devel Maling List , x86@kernel.org Newsgroups: gmane.linux.kernel.pci, gmane.linux.kernel, gmane.linux.acpi.devel From: Arthur Marsh Message-ID: <5655019C.7070700@internode.on.net> Date: Wed, 25 Nov 2015 11:02:28 +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: <20151124230413.GA11608@localhost.localdomain> 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 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(+) @@ -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. 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 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;