Commit f1e2a3da authored by Armin Wolf's avatar Armin Wolf Committed by Xiongfeng Wang
Browse files

ACPI: bus: Indicate support for IRQ ResourceSource thru _OSC 

mainline inclusion
from mainline-v6.10-rc1
commit 403ad17c06509794fdf6e4d4b3070bd5b56e2a8e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB8X0F

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=403ad17c06509794fdf6e4d4b3070bd5b56e2a8e



--------------------------------

The ACPI IRQ mapping code supports parsing of ResourceSource,
but this is not reported thru _OSC.

Fix this by setting bit 13 ("Interrupt ResourceSource support")
when evaluating _OSC.

Fixes: d44fa3d4 ("ACPI: Add support for ResourceSource/IRQ domain mapping")
Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>

Conflicts:
	drivers/acpi/bus.c
	include/linux/acpi.h
[wangxiongfeng: fix context conflicts]
Signed-off-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
parent 38c1bf84

drivers/acpi/bus.c

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ static void acpi_bus_osc_support(void) 


	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_IRQ_RESOURCE_SOURCE_SUPPORT;

	if (IS_ENABLED(CONFIG_ACPI_PRMT))

		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PRM_SUPPORT;

include/linux/acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); 
#define OSC_SB_PCLPI_SUPPORT			0x00000080

#define OSC_SB_OSLPI_SUPPORT			0x00000100

#define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT		0x00001000

#define OSC_SB_IRQ_RESOURCE_SOURCE_SUPPORT	0x00002000

#define OSC_SB_GENERIC_INITIATOR_SUPPORT	0x00020000

#define OSC_SB_PRM_SUPPORT			0x00200000