Commit 166fdb4d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-misc', 'acpi-video' and 'acpi-prm' 

* acpi-misc:
  ACPI: AMBA: Fix resource name in /proc/iomem

* acpi-video:
  ACPI: video: Add quirk for the Dell Vostro 3350

* acpi-prm:
  ACPI: Do not singal PRM support if not enabled
  ACPI: Correct \_SB._OSC bit definition for PRM
  ACPI: Kconfig: Provide help text for the ACPI_PRMT option
parents 7b167c4c 77186294 9249c32e 392ed6a7

drivers/acpi/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -548,3 +548,13 @@ config ACPI_PRMT 
	bool "Platform Runtime Mechanism Support"

	bool "Platform Runtime Mechanism Support"

	depends on EFI && X86_64

	depends on EFI && X86_64

	default y

	default y

	help

	  Platform Runtime Mechanism (PRM) is a firmware interface exposing a

	  set of binary executables that can be called from the AML interpreter

	  or directly from device drivers.



	  Say Y to enable the AML interpreter to execute the PRM code.



	  While this feature is optional in principle, leaving it out may

	  substantially increase computational overhead related to the

	  initialization of some server systems.

drivers/acpi/acpi_amba.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,7 @@ static int amba_handler_attach(struct acpi_device *adev, 
		case IORESOURCE_MEM:

		case IORESOURCE_MEM:

			if (!address_found) {

			if (!address_found) {

				dev->res = *rentry->res;

				dev->res = *rentry->res;

				dev->res.name = dev_name(&dev->dev);

				address_found = true;

				address_found = true;

			}

			}

			break;

			break;

drivers/acpi/acpi_video.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -540,6 +540,15 @@ static const struct dmi_system_id video_dmi_table[] = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"),

		},

		},

	},

	},

	{

	 .callback = video_set_report_key_events,

	 .driver_data = (void *)((uintptr_t)REPORT_BRIGHTNESS_KEY_EVENTS),

	 .ident = "Dell Vostro 3350",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

		DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3350"),

		},

	},

	/*

	/*

	 * Some machines change the brightness themselves when a brightness

	 * Some machines change the brightness themselves when a brightness

	 * hotkey gets pressed, despite us telling them not to. In this case

	 * hotkey gets pressed, despite us telling them not to. In this case

drivers/acpi/bus.c

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




	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT;

	if (IS_ENABLED(CONFIG_ACPI_PRMT))

		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PRM_SUPPORT;

		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PRM_SUPPORT;





#ifdef CONFIG_ARM64

#ifdef CONFIG_ARM64

include/linux/acpi.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -551,8 +551,8 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); 
#define OSC_SB_OSLPI_SUPPORT			0x00000100

#define OSC_SB_OSLPI_SUPPORT			0x00000100

#define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT		0x00001000

#define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT		0x00001000

#define OSC_SB_GENERIC_INITIATOR_SUPPORT	0x00002000

#define OSC_SB_GENERIC_INITIATOR_SUPPORT	0x00002000

#define OSC_SB_PRM_SUPPORT			0x00020000

#define OSC_SB_NATIVE_USB4_SUPPORT		0x00040000

#define OSC_SB_NATIVE_USB4_SUPPORT		0x00040000

#define OSC_SB_PRM_SUPPORT			0x00200000





extern bool osc_sb_apei_support_acked;

extern bool osc_sb_apei_support_acked;

extern bool osc_pc_lpi_support_confirmed;

extern bool osc_pc_lpi_support_confirmed;