Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753362AbYCMFpp (ORCPT ); Thu, 13 Mar 2008 01:45:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752773AbYCMFpd (ORCPT ); Thu, 13 Mar 2008 01:45:33 -0400 Received: from pentafluge.infradead.org ([213.146.154.40]:46300 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752682AbYCMFpc (ORCPT ); Thu, 13 Mar 2008 01:45:32 -0400 Date: Wed, 12 Mar 2008 22:44:00 -0700 From: Greg KH To: Linus Torvalds Cc: "Rafael J. Wysocki" , Jeff Garzik , LKML , Adrian Bunk , Andrew Morton , Natalie Protasevich , Ingo Molnar , Len Brown , Guennadi Liakhovetski Subject: Re: pcibios_scanned needs to be set in ACPI? (was Re: 2.6.25-rc5: Reported regressions from 2.6.24) Message-ID: <20080313054400.GA17102@kroah.com> References: <47D6D61F.4050805@garzik.org> <200803112341.42517.rjw@sisk.pl> <20080312203205.GB17187@kroah.com> <20080312212704.GA16836@kroah.com> <20080312213826.GA17101@kroah.com> <20080312225421.GA24449@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2722 Lines: 80 On Wed, Mar 12, 2008 at 04:09:17PM -0700, Linus Torvalds wrote: > > > On Wed, 12 Mar 2008, Greg KH wrote: > > > > I can't get a box here to produce both of those PCI: messages myself, > > and neither can Len, so something is really odd here. Ok, stupid me, this was my fault. I was assuming that pci busses would never be registered multiple times with the pci core. Obviously this isn't true. The previous patch I proposed was only paying attention to the PCI devices, and that logic is just fine (it's already protected when it is attempted to be registered multiple times.) So, the patch below fixes the issue for me, and reboot seems to work as well. Guennadi, can you test this out on your machine? thanks for your patience, greg k-h From: Greg Kroah-Hartman Subject: PCI: fix issue with busses registering multiple times in sysfs PCI busses can be registered multiple times, so we need to detect if we have registered our bus structure in sysfs already. If so, don't do it again. Thanks to Guennadi Liakhovetski for reporting the problem, and to Linus for poking me to get me to believe that it was a real problem. Cc: Linus Torvalds Cc: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman --- drivers/pci/bus.c | 6 +++++- include/linux/pci.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -143,14 +143,18 @@ void pci_bus_add_devices(struct pci_bus /* register the bus with sysfs as the parent is now * properly registered. */ child_bus = dev->subordinate; + if (child_bus->is_added) + continue; child_bus->dev.parent = child_bus->bridge; retval = device_register(&child_bus->dev); if (retval) dev_err(&dev->dev, "Error registering pci_bus," " continuing...\n"); - else + else { + child_bus->is_added = 1; retval = device_create_file(&child_bus->dev, &dev_attr_cpuaffinity); + } if (retval) dev_err(&dev->dev, "Error creating cpuaffinity" " file, continuing...\n"); --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -278,6 +278,7 @@ struct pci_bus { struct device dev; struct bin_attribute *legacy_io; /* legacy I/O for this bus */ struct bin_attribute *legacy_mem; /* legacy mem */ + unsigned int is_added:1; }; #define pci_bus_b(n) list_entry(n, struct pci_bus, node) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/