summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAubrey Li <aubrey.li@intel.com>2021-07-02 15:03:50 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-07-02 15:59:25 +0200
commit392ed6a789803fbfd49994e95fe99cd07b07eb87 (patch)
tree8b57551074847313e392f0e95979fa68f6987786 /drivers/acpi
parentbd7a94c0fa41dfbea8564556c7a28b05e353c5da (diff)
downloadlinux-392ed6a789803fbfd49994e95fe99cd07b07eb87.tar.gz
linux-392ed6a789803fbfd49994e95fe99cd07b07eb87.tar.bz2
linux-392ed6a789803fbfd49994e95fe99cd07b07eb87.zip
ACPI: Do not singal PRM support if not enabled
If the OS confirms PRM (Platform Runtime Mechanism) support through the \_SB._OSC PRM bit, the BIOS may start relying on the presence of PRM support in the OS, so prevent the PRM bit from being set in the \_SB._OSC capabilities bitmask when PRM support is not built in so as to avoid confusing the BIOS in that case. Fixes: 60faa8f1ac6e ("ACPI: Add \_SB._OSC bit for PRM") Signed-off-by: Aubrey Li <aubrey.li@linux.intel.com> [ rjw: Rewrite subject and changelog, replace #ifdef with if (IS_ENABLED()) ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/bus.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index e8119a9eca28..cba00f079eb4 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -305,7 +305,8 @@ static void acpi_bus_osc_negotiate_platform_control(void)
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT;
- capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PRM_SUPPORT;
+ if (IS_ENABLED(CONFIG_ACPI_PRMT))
+ capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PRM_SUPPORT;
#ifdef CONFIG_ARM64
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_GENERIC_INITIATOR_SUPPORT;