[RFC][PATCH 3/6] PCI PM: update pci_set_power_state()

From: Adam Belay (abelay_at_novell.com)
Date: 11/16/05

  • Next message: Adam Belay: "[RFC][PATCH 2/6] PCI PM: capability probing and setup" 
    To: Linux-pm mailing list <linux-pm@lists.osdl.org>, Greg KH <gregkh@suse.de>
Date:	Tue, 15 Nov 2005 22:31:22 -0500

    This patch updates pci_set_power_state() to use "struct pci_dev_pm".

    --- a/drivers/pci/pm.c 2005-11-07 08:14:49.000000000 -0500
    +++ b/drivers/pci/pm.c 2005-11-07 08:13:33.000000000 -0500
    @@ -100,44 +100,32 @@
      */
     int pci_set_power_state(struct pci_dev *dev, pci_power_t state)
     {
    - int pm, need_restore = 0;
    - u16 pmcsr, pmc;
    + int need_restore = 0;
    + struct pci_dev_pm *data = dev->pm;
    + u16 pmcsr;
     
             /* bound the state we're entering */
             if (state > PCI_D3hot)
                     state = PCI_D3hot;
     
    + if (dev->current_state == state)
    + return 0;
    +
    + if (!data)
    + return -EIO;
    +
             /* Validate current state:
              * Can enter D0 from any state, but if we can only go deeper
              * to sleep if we're already in a low power state
              */
             if (state != PCI_D0 && dev->current_state > state)
                     return -EINVAL;
    - else if (dev->current_state == state)
    - return 0; /* we're already there */
    -
    - /* find PCI PM capability in list */
    - pm = pci_find_capability(dev, PCI_CAP_ID_PM);
    -
    - /* abort if the device doesn't support PM capabilities */
    - if (!pm)
    - return -EIO;
    -
    - pci_read_config_word(dev,pm + PCI_PM_PMC,&pmc);
    - if ((pmc & PCI_PM_CAP_VER_MASK) > 3) {
    - printk(KERN_DEBUG
    - "PCI: %s has unsupported PM cap regs version (%u)\n",
    - pci_name(dev), pmc & PCI_PM_CAP_VER_MASK);
    - return -EIO;
    - }
     
             /* check if this device supports the desired state */
    - if (state == PCI_D1 && !(pmc & PCI_PM_CAP_D1))
    - return -EIO;
    - else if (state == PCI_D2 && !(pmc & PCI_PM_CAP_D2))
    + if (!(dev->pm->state_mask & (1 << state)))
                     return -EIO;
     
    - pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr);
    + pci_read_config_word(dev, data->pm_offset + PCI_PM_CTRL, &pmcsr);
     
             /* If we're (effectively) in D3, force entire word to 0.
              * This doesn't affect PME_Status, disables PME_En, and
    @@ -161,7 +149,7 @@
             }
     
             /* enter specified state */
    - pci_write_config_word(dev, pm + PCI_PM_CTRL, pmcsr);
    + pci_write_config_word(dev, data->pm_offset + PCI_PM_CTRL, pmcsr);
     
             /* Mandatory power management transition delays */
             /* see PCI PM 1.1 5.6.1 table 18 */

    -
    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/

  • Next message: Adam Belay: "[RFC][PATCH 2/6] PCI PM: capability probing and setup"