lkml.org 
[lkml]   [2005]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 2.6.13-rc2] pci: restore BAR values from pci_set_power_state for D3hot->D0
    Some PCI devices lose all configuration (including BARs) when
    transitioning from D3hot->D0. This leaves such a device in an
    inaccessible state. The patch below causes the BARs to be restored
    when enabling such a device, so that its driver will be able to
    access it.

    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    ---
    Some firmware leaves devices in D3hot after a (re)boot. Most drivers
    call pci_enable_device very early, so devices left in D3hot that lose
    configuration during the D3hot->D0 transition will be inaccessible to
    their drivers.

    Drivers could be modified to account for this, but it would
    be difficult to know which drivers need modification. This is
    especially true since often many devices are covered by the same
    driver. It likely would be necessary to replicate code across dozens
    of drivers.

    The patch below should trigger only when transitioning from D3hot->D0
    (or at boot), and only for devices that have the "no soft reset" bit
    cleared in the PM control register. I believe it is safe to include as
    part of the PCI infrastructure.

    The cleanest implementation of pci_restore_bars was to call
    pci_update_resource. Unfortunately, that does not currently exist
    for the sparc64 architecture. The patch below includes a stub
    implemenation of pci_update_resource for sparc64.

    arch/sparc64/kernel/pci.c | 6 +++++
    drivers/pci/pci.c | 52 ++++++++++++++++++++++++++++++++++++++++++----
    drivers/pci/setup-res.c | 2 -
    include/linux/pci.h | 2 +
    4 files changed, 57 insertions(+), 5 deletions(-)

    diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
    --- a/arch/sparc64/kernel/pci.c
    +++ b/arch/sparc64/kernel/pci.c
    @@ -413,6 +413,12 @@ static int pci_assign_bus_resource(const
    return -EBUSY;
    }

    +void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
    +{
    + /* Not implemented for sparc64... */
    + BUG();
    +}
    +
    int pci_assign_resource(struct pci_dev *pdev, int resource)
    {
    struct pcidev_cookie *pcp = pdev->sysdata;
    diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
    --- a/drivers/pci/pci.c
    +++ b/drivers/pci/pci.c
    @@ -222,6 +222,37 @@ pci_find_parent_resource(const struct pc
    }

    /**
    + * pci_restore_bars - restore a devices BAR values (e.g. after wake-up)
    + * @dev: PCI device to have its BARs restored
    + *
    + * Restore the BAR values for a given device, so as to make it
    + * accessible by its driver.
    + */
    +static void
    +pci_restore_bars(struct pci_dev *dev)
    +{
    + int i, numres;
    +
    + switch (dev->hdr_type) {
    + case PCI_HEADER_TYPE_NORMAL:
    + numres = 6;
    + break;
    + case PCI_HEADER_TYPE_BRIDGE:
    + numres = 2;
    + break;
    + case PCI_HEADER_TYPE_CARDBUS:
    + numres = 1;
    + break;
    + default:
    + /* Should never get here, but just in case... */
    + return;
    + }
    +
    + for (i = 0; i < numres; i ++)
    + pci_update_resource(dev, &dev->resource[i], i);
    +}
    +
    +/**
    * pci_set_power_state - Set the power state of a PCI device
    * @dev: PCI device to be suspended
    * @state: PCI power state (D0, D1, D2, D3hot, D3cold) we're entering
    @@ -239,7 +270,7 @@ pci_find_parent_resource(const struct pc
    int
    pci_set_power_state(struct pci_dev *dev, pci_power_t state)
    {
    - int pm;
    + int pm, need_restore = 0;
    u16 pmcsr, pmc;

    /* bound the state we're entering */
    @@ -278,14 +309,17 @@ pci_set_power_state(struct pci_dev *dev,
    return -EIO;
    }

    + pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr);
    +
    /* If we're in D3, force entire word to 0.
    * This doesn't affect PME_Status, disables PME_En, and
    * sets PowerState to 0.
    */
    - if (dev->current_state >= PCI_D3hot)
    + if (dev->current_state >= PCI_D3hot) {
    + if (!(pmcsr & PCI_PM_CTRL_NO_SOFT_RESET))
    + need_restore = 1;
    pmcsr = 0;
    - else {
    - pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr);
    + } else {
    pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
    pmcsr |= state;
    }
    @@ -301,6 +335,16 @@ pci_set_power_state(struct pci_dev *dev,
    udelay(200);
    dev->current_state = state;

    + /* According to section 5.4.1 of the "PCI BUS POWER MANAGEMENT
    + * INTERFACE SPECIFICATION, REV. 1.2", a device transitioning
    + * from D3hot to D0 _may_ perform an internal reset, thereby
    + * going to "D0 Uninitialized" rather than "D0 Initialized".
    + * In that case, we need to restore at least the BARs so that
    + * the device will be accessible to its driver.
    + */
    + if (need_restore)
    + pci_restore_bars(dev);
    +
    return 0;
    }

    diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
    --- a/drivers/pci/setup-res.c
    +++ b/drivers/pci/setup-res.c
    @@ -26,7 +26,7 @@
    #include "pci.h"


    -static void
    +void
    pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
    {
    struct pci_bus_region region;
    diff --git a/include/linux/pci.h b/include/linux/pci.h
    --- a/include/linux/pci.h
    +++ b/include/linux/pci.h
    @@ -225,6 +225,7 @@
    #define PCI_PM_CAP_PME_D3cold 0x8000 /* PME# from D3 (cold) */
    #define PCI_PM_CTRL 4 /* PM control and status register */
    #define PCI_PM_CTRL_STATE_MASK 0x0003 /* Current power state (D0 to D3) */
    +#define PCI_PM_CTRL_NO_SOFT_RESET 0x0004 /* No reset for D3hot->D0 */
    #define PCI_PM_CTRL_PME_ENABLE 0x0100 /* PME pin enable */
    #define PCI_PM_CTRL_DATA_SEL_MASK 0x1e00 /* Data select (??) */
    #define PCI_PM_CTRL_DATA_SCALE_MASK 0x6000 /* Data scale (??) */
    @@ -816,6 +817,7 @@ int pci_set_mwi(struct pci_dev *dev);
    void pci_clear_mwi(struct pci_dev *dev);
    int pci_set_dma_mask(struct pci_dev *dev, u64 mask);
    int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
    +void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);
    int pci_assign_resource(struct pci_dev *dev, int i);

    /* ROM control related routines */
    --
    John W. Linville
    linville@tuxdriver.com
    -
    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-07-08 20:38    [W:0.062 / U:155.076 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site