lkml.org 
[lkml]   [2005]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 39/42]: ppc64: handle multifunction PCI devices properly
    239-eeh-multifunction-consolidate.patch

    New-style firmware will often place multiple different functions
    under a non-EEH-aware parent. However, tehse devices might share
    a common PE "partition endpoint" and config address, ad thus any
    EEH events will affect all of the devices in common. This patch
    makes the effort to find all of these common devices and handle
    them together.

    Signed-off-by: Linas Vepstas <linas@austin.ibm.com>

    --
    Index: linux-2.6.14-git3/arch/powerpc/platforms/pseries/eeh.c
    ===================================================================
    --- linux-2.6.14-git3.orig/arch/powerpc/platforms/pseries/eeh.c 2005-11-02 14:48:13.093298267 -0600
    +++ linux-2.6.14-git3/arch/powerpc/platforms/pseries/eeh.c 2005-11-02 14:48:44.941831253 -0600
    @@ -223,6 +223,11 @@
    void eeh_mark_slot (struct device_node *dn, int mode_flag)
    {
    dn = find_device_pe (dn);
    +
    + /* Back up one, since config addrs might be shared */
    + if (PCI_DN(dn) && PCI_DN(dn)->eeh_pe_config_addr)
    + dn = dn->parent;
    +
    PCI_DN(dn)->eeh_mode |= mode_flag;
    __eeh_mark_slot (dn->child, mode_flag);
    }
    @@ -244,7 +249,13 @@
    {
    unsigned long flags;
    spin_lock_irqsave(&confirm_error_lock, flags);
    +
    dn = find_device_pe (dn);
    +
    + /* Back up one, since config addrs might be shared */
    + if (PCI_DN(dn) && PCI_DN(dn)->eeh_pe_config_addr)
    + dn = dn->parent;
    +
    PCI_DN(dn)->eeh_mode &= ~mode_flag;
    PCI_DN(dn)->eeh_check_count = 0;
    __eeh_clear_slot (dn->child, mode_flag);
    @@ -609,7 +620,7 @@
    if (!pdn)
    return;

    - if (! pdn->eeh_is_bridge)
    + if ((pdn->eeh_mode & EEH_MODE_SUPPORTED) && (!pdn->eeh_is_bridge))
    __restore_bars (pdn);

    dn = pdn->node->child;
    Index: linux-2.6.14-git3/arch/powerpc/platforms/pseries/eeh_driver.c
    ===================================================================
    --- linux-2.6.14-git3.orig/arch/powerpc/platforms/pseries/eeh_driver.c 2005-11-02 14:48:13.100297285 -0600
    +++ linux-2.6.14-git3/arch/powerpc/platforms/pseries/eeh_driver.c 2005-11-02 14:48:44.950829991 -0600
    @@ -213,9 +213,23 @@
    if (rc)
    return rc;

    - /* Walk over all functions on this device */
    - rtas_configure_bridge(pe_dn);
    - eeh_restore_bars(pe_dn);
    + /* New-style config addrs might be shared across multiple devices,
    + * Walk over all functions on this device */
    + if (pe_dn->eeh_pe_config_addr) {
    + struct device_node *pe = pe_dn->node;
    + pe = pe->parent->child;
    + while (pe) {
    + struct pci_dn *ppe = PCI_DN(pe);
    + if (pe_dn->eeh_pe_config_addr == ppe->eeh_pe_config_addr) {
    + rtas_configure_bridge(ppe);
    + eeh_restore_bars(ppe);
    + }
    + pe = pe->sibling;
    + }
    + } else {
    + rtas_configure_bridge(pe_dn);
    + eeh_restore_bars(pe_dn);
    + }

    /* Give the system 5 seconds to finish running the user-space
    * hotplug shutdown scripts, e.g. ifdown for ethernet. Yes,
    -
    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/
    \
     
     \ /
      Last update: 2005-11-04 02:00    [W:0.034 / U:0.704 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site