Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b913100d7304ea9596d8d85ab5f3ae04bd2b0ddb

Authored by David Shaohua Li
Committed by Len Brown
1 parent 0f64474b8f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[ACPI] pci_set_power_state() now calls 

platform_pci_set_power_state()
		and ACPI can answer

http://bugzilla.kernel.org/show_bug.cgi?id=4277

Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

Showing 4 changed files with 36 additions and 3 deletions Side-by-side Diff

... ... @@ -212,6 +212,12 @@
212 212 ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Device is not power manageable\n"));
213 213 return_VALUE(-ENODEV);
214 214 }
  215 + /*
  216 + * Get device's current power state if it's unknown
  217 + * This means device power state isn't initialized or previous setting failed
  218 + */
  219 + if (device->power.state == ACPI_STATE_UNKNOWN)
  220 + acpi_bus_get_power(device->handle, &device->power.state);
215 221 if (state == device->power.state) {
216 222 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n", state));
217 223 return_VALUE(0);
... ... @@ -231,7 +237,7 @@
231 237 * On transitions to a high-powered state we first apply power (via
232 238 * power resources) then evalute _PSx. Conversly for transitions to
233 239 * a lower-powered state.
234   - */
  240 + */
235 241 if (state < device->power.state) {
236 242 if (device->power.flags.power_resources) {
237 243 result = acpi_power_transition(device, state);
drivers/pci/pci-acpi.c
Diff comments   View file @ b913100
... ... @@ -253,6 +253,24 @@
253 253 return -ENODEV;
254 254 }
255 255  
  256 +static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
  257 +{
  258 + acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
  259 + static int state_conv[] = {
  260 + [0] = 0,
  261 + [1] = 1,
  262 + [2] = 2,
  263 + [3] = 3,
  264 + [4] = 3
  265 + };
  266 + int acpi_state = state_conv[(int __force) state];
  267 +
  268 + if (!handle)
  269 + return -ENODEV;
  270 + return acpi_bus_set_power(handle, acpi_state);
  271 +}
  272 +
  273 +
256 274 /* ACPI bus type */
257 275 static int pci_acpi_find_device(struct device *dev, acpi_handle *handle)
258 276 {
... ... @@ -300,6 +318,7 @@
300 318 if (ret)
301 319 return 0;
302 320 platform_pci_choose_state = acpi_pci_choose_state;
  321 + platform_pci_set_power_state = acpi_pci_set_power_state;
303 322 return 0;
304 323 }
305 324 arch_initcall(pci_acpi_init);
... ... @@ -235,7 +235,7 @@
235 235 * -EIO if device does not support PCI PM.
236 236 * 0 if we can successfully change the power state.
237 237 */
238   -
  238 +int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t t) = NULL;
239 239 int
240 240 pci_set_power_state(struct pci_dev *dev, pci_power_t state)
241 241 {
242 242  
... ... @@ -299,8 +299,15 @@
299 299 msleep(10);
300 300 else if (state == PCI_D2 || dev->current_state == PCI_D2)
301 301 udelay(200);
302   - dev->current_state = state;
303 302  
  303 + /*
  304 + * Give firmware a chance to be called, such as ACPI _PRx, _PSx
  305 + * Firmware method after natice method ?
  306 + */
  307 + if (platform_pci_set_power_state)
  308 + platform_pci_set_power_state(dev, state);
  309 +
  310 + dev->current_state = state;
304 311 return 0;
305 312 }
306 313  
... ... @@ -13,6 +13,7 @@
13 13 void *alignf_data);
14 14 /* Firmware callbacks */
15 15 extern int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
  16 +extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state);
16 17  
17 18 /* PCI /proc functions */
18 19 #ifdef CONFIG_PROC_FS