Skip to content

Commit 6352f34

Browse files
rafaeljwrafaeljw
committed
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
4 parents 59fa06c + 03c440a + 2c65e31 + 9066e15 commit 6352f34

File tree

5 files changed

+56
-30
lines changed

5 files changed

+56
-30
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ specific type) associated with it.
2121

2222
In the ACPI _DSD context it is an element of the sub-package following the
2323
generic Device Properties UUID in the _DSD return package as specified in the
24-
Device Properties UUID definition document [1]_.
24+
section titled "Well-Known _DSD UUIDs and Data Structure Formats" sub-section
25+
"Device Properties UUID" in _DSD (Device Specific Data) Implementation Guide
26+
document [1]_.
2527

2628
It also may be regarded as the definition of a key and the associated data type
2729
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
3638
associated with an additional key (name) allowing the subset to be referred
3739
to as a whole (and to be treated as a separate entity). The canonical
3840
representation of property subsets is via the mechanism specified in the
39-
Hierarchical Properties Extension UUID definition document [2]_.
41+
section titled "Well-Known _DSD UUIDs and Data Structure Formats" sub-section
42+
"Hierarchical Data Extension UUID" in _DSD (Device Specific Data)
43+
Implementation Guide document [1]_.
4044

4145
Property sets may be hierarchical. That is, a property set may contain
4246
multiple property subsets that each may contain property subsets of its
@@ -96,5 +100,4 @@ contents.
96100
References
97101
==========
98102

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ An error injection example::
168168
0x00000008 Memory Correctable
169169
0x00000010 Memory Uncorrectable non-fatal
170170
# echo 0x12345000 > param1 # Set memory address for injection
171-
# echo $((-1 << 12)) > param2 # Mask 0xfffffffffffff000 - anywhere in this page
171+
# echo 0xfffffffffffff000 > param2 # Mask - anywhere in this page
172172
# echo 0x8 > error_type # Choose correctable memory error
173173
# echo 1 > error_inject # Inject now
174174

‎drivers/acpi/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ config ACPI_TINY_POWER_BUTTON_SIGNAL
210210

211211
config ACPI_VIDEO
212212
tristate "Video"
213-
depends on X86 && BACKLIGHT_CLASS_DEVICE
213+
depends on BACKLIGHT_CLASS_DEVICE
214214
depends on INPUT
215215
select THERMAL
216216
help

‎drivers/acpi/pci_link.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static acpi_status acpi_pci_link_check_possible(struct acpi_resource *resource,
9595
case ACPI_RESOURCE_TYPE_IRQ:
9696
{
9797
struct acpi_resource_irq *p = &resource->data.irq;
98-
if (!p || !p->interrupt_count) {
98+
if (!p->interrupt_count) {
9999
acpi_handle_debug(handle,
100100
"Blank _PRS IRQ resource\n");
101101
return AE_OK;
@@ -121,7 +121,7 @@ static acpi_status acpi_pci_link_check_possible(struct acpi_resource *resource,
121121
{
122122
struct acpi_resource_extended_irq *p =
123123
&resource->data.extended_irq;
124-
if (!p || !p->interrupt_count) {
124+
if (!p->interrupt_count) {
125125
acpi_handle_debug(handle,
126126
"Blank _PRS EXT IRQ resource\n");
127127
return AE_OK;
@@ -182,7 +182,7 @@ static acpi_status acpi_pci_link_check_current(struct acpi_resource *resource,
182182
case ACPI_RESOURCE_TYPE_IRQ:
183183
{
184184
struct acpi_resource_irq *p = &resource->data.irq;
185-
if (!p || !p->interrupt_count) {
185+
if (!p->interrupt_count) {
186186
/*
187187
* IRQ descriptors may have no IRQ# bits set,
188188
* particularly those w/ _STA disabled
@@ -197,7 +197,7 @@ static acpi_status acpi_pci_link_check_current(struct acpi_resource *resource,
197197
{
198198
struct acpi_resource_extended_irq *p =
199199
&resource->data.extended_irq;
200-
if (!p || !p->interrupt_count) {
200+
if (!p->interrupt_count) {
201201
/*
202202
* extended IRQ descriptors must
203203
* return at least 1 IRQ

‎drivers/acpi/video_detect.c

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
347347
DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro12,1"),
348348
},
349349
},
350+
{
351+
.callback = video_detect_force_native,
352+
/* Dell Inspiron N4010 */
353+
.matches = {
354+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
355+
DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron N4010"),
356+
},
357+
},
350358
{
351359
.callback = video_detect_force_native,
352360
/* Dell Vostro V131 */
@@ -430,67 +438,82 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
430438
.callback = video_detect_force_native,
431439
.ident = "Clevo NL5xRU",
432440
.matches = {
433-
DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),
434441
DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),
435442
},
436443
},
437444
{
438445
.callback = video_detect_force_native,
439446
.ident = "Clevo NL5xRU",
440447
.matches = {
441-
DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"),
442-
DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),
448+
DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),
449+
DMI_MATCH(DMI_BOARD_NAME, "AURA1501"),
443450
},
444451
},
445452
{
446453
.callback = video_detect_force_native,
447454
.ident = "Clevo NL5xRU",
448455
.matches = {
449-
DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
450-
DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),
456+
DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),
457+
DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"),
451458
},
452459
},
453460
{
454461
.callback = video_detect_force_native,
455-
.ident = "Clevo NL5xRU",
462+
.ident = "Clevo NL5xNU",
456463
.matches = {
457-
DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),
458-
DMI_MATCH(DMI_BOARD_NAME, "AURA1501"),
464+
DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),
459465
},
460466
},
467+
/*
468+
* The TongFang PF5PU1G, PF4NU1F, PF5NU1G, and PF5LUXG/TUXEDO BA15 Gen10,
469+
* Pulse 14/15 Gen1, and Pulse 15 Gen2 have the same problem as the Clevo
470+
* NL5xRU and NL5xNU/TUXEDO Aura 15 Gen1 and Gen2. See the description
471+
* above.
472+
*/
461473
{
462474
.callback = video_detect_force_native,
463-
.ident = "Clevo NL5xRU",
475+
.ident = "TongFang PF5PU1G",
464476
.matches = {
465-
DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),
466-
DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"),
477+
DMI_MATCH(DMI_BOARD_NAME, "PF5PU1G"),
467478
},
468479
},
469480
{
470481
.callback = video_detect_force_native,
471-
.ident = "Clevo NL5xNU",
482+
.ident = "TongFang PF4NU1F",
483+
.matches = {
484+
DMI_MATCH(DMI_BOARD_NAME, "PF4NU1F"),
485+
},
486+
},
487+
{
488+
.callback = video_detect_force_native,
489+
.ident = "TongFang PF4NU1F",
472490
.matches = {
473491
DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),
474-
DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),
492+
DMI_MATCH(DMI_BOARD_NAME, "PULSE1401"),
475493
},
476494
},
477495
{
478496
.callback = video_detect_force_native,
479-
.ident = "Clevo NL5xNU",
497+
.ident = "TongFang PF5NU1G",
480498
.matches = {
481-
DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"),
482-
DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),
499+
DMI_MATCH(DMI_BOARD_NAME, "PF5NU1G"),
483500
},
484501
},
485502
{
486503
.callback = video_detect_force_native,
487-
.ident = "Clevo NL5xNU",
504+
.ident = "TongFang PF5NU1G",
488505
.matches = {
489-
DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),
490-
DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),
506+
DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),
507+
DMI_MATCH(DMI_BOARD_NAME, "PULSE1501"),
508+
},
509+
},
510+
{
511+
.callback = video_detect_force_native,
512+
.ident = "TongFang PF5LUXG",
513+
.matches = {
514+
DMI_MATCH(DMI_BOARD_NAME, "PF5LUXG"),
491515
},
492516
},
493-
494517
/*
495518
* Desktops which falsely report a backlight and which our heuristics
496519
* for this do not catch.

0 commit comments

Comments
 (0)