Commit 6352f347 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-video', 'acpi-pci' and 'acpi-docs' 

Merge ACPI backlight driver changes, ACPI changes related to PCI and
ACPI documentation changes for v5.20-rc1:

 - Use native backlight on Dell Inspiron N4010 (Hans de Goede).

 - Use native backlight on some TongFang devices (Werner Sembach).

 - Drop X86 dependency from the ACPI backlight driver Kconfig (Riwen
   Lu).

 - Shorten the quirk list in the ACPI backlight driver by identifying
   Clevo by board_name only (Werner Sembach).

 - Remove useless NULL pointer checks from 2 ACPI PCI link management
   functions (Andrey Strachuk).

 - Fix obsolete example in the ACPI EINJ documentation (Qifu Zhang).

 - Update links and references to _DSD-related documents (Sudeep Holla).

* acpi-video:
  ACPI: video: Use native backlight on Dell Inspiron N4010
  ACPI: video: Shortening quirk list by identifying Clevo by board_name only
  ACPI: video: Force backlight native for some TongFang devices
  ACPI: video: Drop X86 dependency from Kconfig

* acpi-pci:
  ACPI/PCI: Remove useless NULL pointer checks

* acpi-docs:
  Documentation: ACPI: EINJ: Fix obsolete example
  Documentation: ACPI: Update links and references to DSD related docs
parents 59fa06cd 03c440a2 2c65e312 9066e151

Documentation/firmware-guide/acpi/DSD-properties-rules.rst

+7 −4
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ specific type) associated with it. 


In the ACPI _DSD context it is an element of the sub-package following the

generic Device Properties UUID in the _DSD return package as specified in the

Device Properties UUID definition document [1]_.

section titled "Well-Known _DSD UUIDs and Data Structure Formats" sub-section

"Device Properties UUID" in _DSD (Device Specific Data) Implementation Guide

document [1]_.



It also may be regarded as the definition of a key and the associated data type

that can be returned by _DSD in the Device Properties UUID sub-package for a
@@ -36,7 +38,9 @@ Property subsets are nested collections of properties. Each of them is 
associated with an additional key (name) allowing the subset to be referred

to as a whole (and to be treated as a separate entity).  The canonical

representation of property subsets is via the mechanism specified in the

Hierarchical Properties Extension UUID definition document [2]_.

section titled "Well-Known _DSD UUIDs and Data Structure Formats" sub-section

"Hierarchical Data Extension UUID" in _DSD (Device Specific Data)

Implementation Guide document [1]_.



Property sets may be hierarchical.  That is, a property set may contain

multiple property subsets that each may contain property subsets of its
@@ -96,5 +100,4 @@ contents. 
References

==========



.. [1] https://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf

.. [2] https://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf
 
.. [1] https://github.com/UEFI/DSD-Guide

Documentation/firmware-guide/acpi/apei/einj.rst

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ An error injection example:: 
  0x00000008	Memory Correctable

  0x00000010	Memory Uncorrectable non-fatal

  # echo 0x12345000 > param1		# Set memory address for injection

  # echo $((-1 << 12)) > param2		# Mask 0xfffffffffffff000 - anywhere in this page

  # echo 0xfffffffffffff000 > param2		# Mask - anywhere in this page

  # echo 0x8 > error_type			# Choose correctable memory error

  # echo 1 > error_inject			# Inject now

drivers/acpi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ config ACPI_TINY_POWER_BUTTON_SIGNAL 


config ACPI_VIDEO

	tristate "Video"

	depends on X86 && BACKLIGHT_CLASS_DEVICE

	depends on BACKLIGHT_CLASS_DEVICE

	depends on INPUT

	select THERMAL

	help

drivers/acpi/pci_link.c

+4 −4
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static acpi_status acpi_pci_link_check_possible(struct acpi_resource *resource, 
	case ACPI_RESOURCE_TYPE_IRQ:

		{

			struct acpi_resource_irq *p = &resource->data.irq;

			if (!p || !p->interrupt_count) {

			if (!p->interrupt_count) {

				acpi_handle_debug(handle,

						  "Blank _PRS IRQ resource\n");

				return AE_OK;
@@ -121,7 +121,7 @@ static acpi_status acpi_pci_link_check_possible(struct acpi_resource *resource, 
		{

			struct acpi_resource_extended_irq *p =

			    &resource->data.extended_irq;

			if (!p || !p->interrupt_count) {

			if (!p->interrupt_count) {

				acpi_handle_debug(handle,

						  "Blank _PRS EXT IRQ resource\n");

				return AE_OK;
@@ -182,7 +182,7 @@ static acpi_status acpi_pci_link_check_current(struct acpi_resource *resource, 
	case ACPI_RESOURCE_TYPE_IRQ:

		{

			struct acpi_resource_irq *p = &resource->data.irq;

			if (!p || !p->interrupt_count) {

			if (!p->interrupt_count) {

				/*

				 * IRQ descriptors may have no IRQ# bits set,

				 * particularly those w/ _STA disabled
@@ -197,7 +197,7 @@ static acpi_status acpi_pci_link_check_current(struct acpi_resource *resource, 
		{

			struct acpi_resource_extended_irq *p =

			    &resource->data.extended_irq;

			if (!p || !p->interrupt_count) {

			if (!p->interrupt_count) {

				/*

				 * extended IRQ descriptors must

				 * return at least 1 IRQ

drivers/acpi/video_detect.c

+43 −20
Original line number Diff line number Diff line
@@ -347,6 +347,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro12,1"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* Dell Inspiron N4010 */

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

		DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron N4010"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* Dell Vostro V131 */
@@ -430,7 +438,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),

		},

	},
@@ -438,59 +445,75 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "AURA1501"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.ident = "Clevo NL5xNU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "AURA1501"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),

		},

	},

	/*

	 * The TongFang PF5PU1G, PF4NU1F, PF5NU1G, and PF5LUXG/TUXEDO BA15 Gen10,

	 * Pulse 14/15 Gen1, and Pulse 15 Gen2 have the same problem as the Clevo

	 * NL5xRU and NL5xNU/TUXEDO Aura 15 Gen1 and Gen2. See the description

	 * above.

	 */

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.ident = "TongFang PF5PU1G",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"),

		DMI_MATCH(DMI_BOARD_NAME, "PF5PU1G"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xNU",

	.ident = "TongFang PF4NU1F",

	.matches = {

		DMI_MATCH(DMI_BOARD_NAME, "PF4NU1F"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "TongFang PF4NU1F",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),

		DMI_MATCH(DMI_BOARD_NAME, "PULSE1401"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xNU",

	.ident = "TongFang PF5NU1G",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),

		DMI_MATCH(DMI_BOARD_NAME, "PF5NU1G"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xNU",

	.ident = "TongFang PF5NU1G",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "PULSE1501"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "TongFang PF5LUXG",

	.matches = {

		DMI_MATCH(DMI_BOARD_NAME, "PF5LUXG"),

		},

	},



	/*

	 * Desktops which falsely report a backlight and which our heuristics

	 * for this do not catch.