Ignore:
Timestamp:
Mar 15, 2017, 2:42:58 AM (6 weeks ago)
Author:
brainslayer
Message:

use new squashfs in all kernels

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/linux/universal/linux-4.9/drivers/pci/hotplug/pnv_php.c

    r31632 r31662  
    8383{
    8484
    85         if (WARN_ON(!php_slot))
     85        if (!php_slot)
    8686                return;
    8787
     
    437437                return ret;
    438438
    439         /* Proceed if there have nothing behind the slot */
    440         if (presence == OPAL_PCI_SLOT_EMPTY)
     439        /*
     440         * Proceed if there have nothing behind the slot. However,
     441         * we should leave the slot in registered state at the
     442         * beginning. Otherwise, the PCI devices inserted afterwards
     443         * won't be probed and populated.
     444         */
     445        if (presence == OPAL_PCI_SLOT_EMPTY) {
     446                if (!php_slot->power_state_check) {
     447                        php_slot->power_state_check = true;
     448
     449                        return 0;
     450                }
     451
    441452                goto scan;
     453        }
    442454
    443455        /*
     
    714726        } else if (sts & PCI_EXP_SLTSTA_PDC) {
    715727                ret = pnv_pci_get_presence_state(php_slot->id, &presence);
    716                 if (!ret)
     728                if (ret) {
     729                        dev_warn(&pdev->dev, "PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n",
     730                                 php_slot->name, ret, sts);
    717731                        return IRQ_HANDLED;
     732                }
     733
    718734                added = !!(presence == OPAL_PCI_SLOT_PRESENT);
    719735        } else {
     
    800816        int irq, ret;
    801817
     818        /*
     819         * The MSI/MSIx interrupt might have been occupied by other
     820         * drivers. Don't populate the surprise hotplug capability
     821         * in that case.
     822         */
     823        if (pci_dev_msi_enabled(pdev))
     824                return;
     825
    802826        ret = pci_enable_device(pdev);
    803827        if (ret) {
Note: See TracChangeset for help on using the changeset viewer.