From patchwork Tue Oct 27 08:09:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 56057 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9R8CKM4002916 for ; Tue, 27 Oct 2009 08:12:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932137AbZJ0IMN (ORCPT ); Tue, 27 Oct 2009 04:12:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932138AbZJ0IMM (ORCPT ); Tue, 27 Oct 2009 04:12:12 -0400 Received: from hera.kernel.org ([140.211.167.34]:38018 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932137AbZJ0IMJ (ORCPT ); Tue, 27 Oct 2009 04:12:09 -0400 Received: from [192.168.101.9] (adsl-75-36-253-177.dsl.pltn13.sbcglobal.net [75.36.253.177]) (authenticated bits=0) by hera.kernel.org (8.14.3/8.14.3) with ESMTP id n9R89lUG010363 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 Oct 2009 08:09:58 GMT X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.95.2 at hera.kernel.org Message-ID: <4AE6AABC.5040603@kernel.org> Date: Tue, 27 Oct 2009 01:09:32 -0700 From: Yinghai Lu User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Kenji Kaneshige , Jesse Barnes , Alex Chiang CC: "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , Ivan Kokshaysky , Bjorn Helgaas , "Eric W. Biederman" , Ingo Molnar Subject: [PATCH 1/4] pci: pciehp update the slot bridge res to get big range for pcie devices - v4 References: <4ADEB601.8020200@kernel.org> <4AE52B68.3070501@jp.fujitsu.com> <4AE53883.3070709@kernel.org> <4AE5545E.1020900@jp.fujitsu.com> <4AE55D72.7080202@kernel.org> In-Reply-To: <4AE55D72.7080202@kernel.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Index: linux-2.6/drivers/pci/hotplug/pciehp_pci.c =================================================================== --- linux-2.6.orig/drivers/pci/hotplug/pciehp_pci.c +++ linux-2.6/drivers/pci/hotplug/pciehp_pci.c @@ -53,19 +53,18 @@ static int __ref pciehp_add_bridge(struc busnr = pci_scan_bridge(parent, dev, busnr, pass); if (!dev->subordinate) return -1; - pci_bus_size_bridges(dev->subordinate); - pci_bus_assign_resources(parent); - pci_enable_bridges(parent); - pci_bus_add_devices(parent); + return 0; } int pciehp_configure_device(struct slot *p_slot) { struct pci_dev *dev; - struct pci_bus *parent = p_slot->ctrl->pcie->port->subordinate; + struct pci_dev *bridge = p_slot->ctrl->pcie->port; + struct pci_bus *parent = bridge->subordinate; int num, fn; struct controller *ctrl = p_slot->ctrl; + int retval; dev = pci_get_slot(parent, PCI_DEVFN(0, 0)); if (dev) { @@ -96,12 +95,30 @@ int pciehp_configure_device(struct slot (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) { pciehp_add_bridge(dev); } + pci_dev_put(dev); + } + + pci_bus_size_bridges(parent); + pci_clear_master(bridge); + pci_bridge_assign_resources(bridge); + retval = pci_reenable_device(bridge); + pci_set_master(bridge); + pci_enable_bridges(parent); + + for (fn = 0; fn < 8; fn++) { + dev = pci_get_slot(parent, PCI_DEVFN(0, fn)); + if (!dev) + continue; + if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) { + pci_dev_put(dev); + continue; + } pci_configure_slot(dev); pci_dev_put(dev); } - pci_bus_assign_resources(parent); pci_bus_add_devices(parent); + return 0; } Index: linux-2.6/drivers/pci/setup-bus.c =================================================================== --- linux-2.6.orig/drivers/pci/setup-bus.c +++ linux-2.6/drivers/pci/setup-bus.c @@ -27,6 +27,44 @@ #include #include "pci.h" +static void pdev_assign_resources_sorted(struct pci_dev *dev) +{ + struct resource *res; + struct resource_list head, *list, *tmp; + int idx; + u16 class = dev->class >> 8; + + head.next = NULL; + + /* Don't touch classless devices or host bridges or ioapics. */ + if (class == PCI_CLASS_NOT_DEFINED || + class == PCI_CLASS_BRIDGE_HOST) + return; + + /* Don't touch ioapic devices already enabled by firmware */ + if (class == PCI_CLASS_SYSTEM_PIC) { + u16 command; + pci_read_config_word(dev, PCI_COMMAND, &command); + if (command & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) + return; + } + + pdev_sort_resources(dev, &head); + + for (list = head.next; list;) { + res = list->res; + idx = res - &list->dev->resource[0]; + if (pci_assign_resource(list->dev, idx)) { + res->start = 0; + res->end = 0; + res->flags = 0; + } + tmp = list; + list = list->next; + kfree(tmp); + } +} + static void pbus_assign_resources_sorted(const struct pci_bus *bus) { struct pci_dev *dev; @@ -144,9 +182,6 @@ static void pci_setup_bridge(struct pci_ u32 l, bu, lu, io_upper16; int pref_mem64; - if (pci_is_enabled(bridge)) - return; - dev_info(&bridge->dev, "PCI bridge, secondary bus %04x:%02x\n", pci_domain_nr(bus), bus->number); @@ -550,6 +585,35 @@ void __ref pci_bus_size_bridges(struct p } EXPORT_SYMBOL(pci_bus_size_bridges); +void __ref pci_bridge_assign_resources(const struct pci_dev *bridge) +{ + struct pci_bus *b; + + pdev_assign_resources_sorted((struct pci_dev *)bridge); + + b = bridge->subordinate; + if (!b) + return; + + pci_bus_assign_resources(b); + + switch (bridge->class >> 8) { + case PCI_CLASS_BRIDGE_PCI: + pci_setup_bridge(b); + break; + + case PCI_CLASS_BRIDGE_CARDBUS: + pci_setup_cardbus(b); + break; + + default: + dev_info(&bridge->dev, "not setting up bridge for bus " + "%04x:%02x\n", pci_domain_nr(b), b->number); + break; + } +} +EXPORT_SYMBOL(pci_bridge_assign_resources); + void __ref pci_bus_assign_resources(const struct pci_bus *bus) { struct pci_bus *b; @@ -566,7 +630,8 @@ void __ref pci_bus_assign_resources(cons switch (dev->class >> 8) { case PCI_CLASS_BRIDGE_PCI: - pci_setup_bridge(b); + if (!pci_is_enabled(dev)) + pci_setup_bridge(b); break; case PCI_CLASS_BRIDGE_CARDBUS: Index: linux-2.6/include/linux/pci.h =================================================================== --- linux-2.6.orig/include/linux/pci.h +++ linux-2.6/include/linux/pci.h @@ -756,6 +756,7 @@ ssize_t pci_write_vpd(struct pci_dev *de int pci_vpd_truncate(struct pci_dev *dev, size_t size); /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ +void pci_bridge_assign_resources(const struct pci_dev *bridge); void pci_bus_assign_resources(const struct pci_bus *bus); void pci_bus_size_bridges(struct pci_bus *bus); int pci_claim_resource(struct pci_dev *, int);