Re: [PATCH 3/8] ACPI, PCI: PCIe ASPM _OSC support capabilities called when root bridge added

Andrew Patterson
2008-10-29T22:57:46Z

On Wed, 2008-10-29 at 15:06 +0900, Kenji Kaneshige wrote:
> Andrew Patterson wrote:
> > ACPI, PCI: PCIe ASPM _OSC support capabilities called when root bridge added
> >
> > The _OSC capabilities OSC_ACTIVE_STATE_PWR_SUPPORT and
> > OSC_CLOCK_PWR_CAPABILITY_SUPPORT are set when the root bridge is added
> > with pci_acpi_osc_support(), so we no longer need to do it in the
> > ASPM driver.
> > ---
> >
> > drivers/acpi/pci_root.c | 4 ++++
> > drivers/pci/pcie/aspm.c | 22 ----------------------
> > 2 files changed, 4 insertions(+), 22 deletions(-)
> >
> >
> > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
> > index 47df4a8..4d60629 100644
> > --- a/drivers/acpi/pci_root.c
> > +++ b/drivers/acpi/pci_root.c
> > @@ -214,6 +214,10 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
> > pci_acpi_osc_support(device->handle,
> > OSC_EXT_PCI_CONFIG_SUPPORT |
> > OSC_PCI_SEGMENT_GROUPS_SUPPORT |
> > +#ifdef CONFIG_PCIEASPM
> > + OSC_ACTIVE_STATE_PWR_SUPPORT |
> > + OSC_CLOCK_PWR_CAPABILITY_SUPPORT |
> > +#endif
>
> Don't we need to check 'aspm_disabled'?

Added the function pcie_aspm_enabled, which is checked before adding the
ASPM capabilities to the flags. Which also means I can remove the
#ifdef CONFIG_PCIEASPM.

Andrew

>
> Thanks,
> Kenji Kaneshige
>
>