lkml.org 
[lkml]   [2013]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 01/11] PCI, acpiphp: Add is_hotplug_bridge detection
    Date
    When system support hotplug bridge with children hotplug slots, we need
    to make sure that parent bridge get preallocated resource so later when
    device is plugged into children slot, those children devices will get
    resource allocated.

    We do not meet this problem, because for pcie hotplug card, when acpiphp
    is used, pci_scan_bridge will set that for us when detect hotplug bit in
    slot cap.

    Reported-and-tested-by: Jason Baron <jbaron@redhat.com>
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: Jason Baron <jbaron@redhat.com>
    Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    ---
    drivers/pci/hotplug/acpiphp_glue.c | 27 ++++++++++++++++++++++++++-
    1 file changed, 26 insertions(+), 1 deletion(-)

    diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
    index 22006f2..79db296 100644
    --- a/drivers/pci/hotplug/acpiphp_glue.c
    +++ b/drivers/pci/hotplug/acpiphp_glue.c
    @@ -797,6 +797,29 @@ static void acpiphp_set_acpi_region(struct acpiphp_slot *slot)
    }
    }

    +static void check_hotplug_bridge(struct acpiphp_slot *slot, struct pci_dev *dev)
    +{
    + struct acpiphp_func *func;
    +
    + if (!dev->subordinate)
    + return;
    +
    + /* quirk, or pcie could set it already */
    + if (dev->is_hotplug_bridge)
    + return;
    +
    + if (PCI_SLOT(dev->devfn) != slot->device)
    + return;
    +
    + list_for_each_entry(func, &slot->funcs, sibling) {
    + if (PCI_FUNC(dev->devfn) == func->function) {
    + /* check if this bridge has ejectable slots */
    + if ((detect_ejectable_slots(func->handle) > 0))
    + dev->is_hotplug_bridge = 1;
    + break;
    + }
    + }
    +}
    /**
    * enable_device - enable, configure a slot
    * @slot: slot to be enabled
    @@ -831,8 +854,10 @@ static int __ref enable_device(struct acpiphp_slot *slot)
    if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
    dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
    max = pci_scan_bridge(bus, dev, max, pass);
    - if (pass && dev->subordinate)
    + if (pass && dev->subordinate) {
    + check_hotplug_bridge(slot, dev);
    pci_bus_size_bridges(dev->subordinate);
    + }
    }
    }
    }
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-01-18 09:43    [W:6.290 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site