Skip to content

Commit db1da2f

Browse files
rafaeljwrafaeljw
committed
Merge branches 'acpi-mm', 'acpi-tables', 'acpi-apei' and 'acpi-misc'
* acpi-mm: ACPI: OSL: Clean up the removal of unused memory mappings ACPI: OSL: Use deferred unmapping in acpi_os_unmap_iomem() ACPI: OSL: Use deferred unmapping in acpi_os_unmap_generic_address() ACPICA: Preserve memory opregion mappings ACPI: OSL: Implement deferred unmapping of ACPI memory * acpi-tables: ACPI: NUMA: Remove the useless 'node >= MAX_NUMNODES' check ACPI: NUMA: Remove the useless sub table pointer check ACPI: tables: Remove the duplicated checks for acpi_parse_entries_array() ACPI: tables: avoid relocations for table signature array * acpi-apei: ACPI: APEI: remove redundant assignment to variable rc * acpi-misc: ACPI: Replace HTTP links with HTTPS ones ACPI: Use valid link to the ACPI specification ACPI: Use fallthrough pseudo-keyword
5 parents 3fa5faf + 5003ad7 + 5b1e802 + eb27e5a + 4ce7796 commit db1da2f

File tree

26 files changed

+139
-115
lines changed

26 files changed

+139
-115
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,5 @@ contents.
9696
References
9797
==========
9898

99-
.. [1] http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf
100-
.. [2] http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf
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

‎Documentation/firmware-guide/acpi/dsd/data-node-references.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ References
8585
==========
8686

8787
[1] Hierarchical Data Extension UUID For _DSD.
88-
<http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
88+
<https://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
8989
referenced 2018-07-17.
9090

9191
[2] Device Properties UUID For _DSD.
92-
<http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf>,
92+
<https://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf>,
9393
referenced 2016-10-04.

‎Documentation/firmware-guide/acpi/dsd/graph.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,23 +154,23 @@ References
154154
==========
155155

156156
[1] _DSD (Device Specific Data) Implementation Guide.
157-
http://www.uefi.org/sites/default/files/resources/_DSD-implementation-guide-toplevel-1_1.htm,
157+
https://www.uefi.org/sites/default/files/resources/_DSD-implementation-guide-toplevel-1_1.htm,
158158
referenced 2016-10-03.
159159

160-
[2] Devicetree. http://www.devicetree.org, referenced 2016-10-03.
160+
[2] Devicetree. https://www.devicetree.org, referenced 2016-10-03.
161161

162162
[3] Documentation/devicetree/bindings/graph.txt
163163

164164
[4] Device Properties UUID For _DSD.
165-
http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf,
165+
https://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf,
166166
referenced 2016-10-04.
167167

168168
[5] Hierarchical Data Extension UUID For _DSD.
169-
http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf,
169+
https://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf,
170170
referenced 2016-10-04.
171171

172172
[6] Advanced Configuration and Power Interface Specification.
173-
http://www.uefi.org/sites/default/files/resources/ACPI_6_1.pdf,
173+
https://www.uefi.org/sites/default/files/resources/ACPI_6_1.pdf,
174174
referenced 2016-10-04.
175175

176176
[7] _DSD Device Properties Usage Rules.

‎Documentation/firmware-guide/acpi/dsd/leds.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ where
9090
References
9191
==========
9292

93-
[1] Device tree. <URL:http://www.devicetree.org>, referenced 2019-02-21.
93+
[1] Device tree. <URL:https://www.devicetree.org>, referenced 2019-02-21.
9494

9595
[2] Advanced Configuration and Power Interface Specification.
9696
<URL:https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf>,
@@ -101,11 +101,11 @@ References
101101
[4] Documentation/devicetree/bindings/media/video-interfaces.txt
102102

103103
[5] Device Properties UUID For _DSD.
104-
<URL:http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf>,
104+
<URL:https://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf>,
105105
referenced 2019-02-21.
106106

107107
[6] Hierarchical Data Extension UUID For _DSD.
108-
<URL:http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
108+
<URL:https://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
109109
referenced 2019-02-21.
110110

111111
[7] Documentation/firmware-guide/acpi/dsd/data-node-references.rst

‎Documentation/firmware-guide/acpi/lpit.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Low Power Idle Table (LPIT)
77
To enumerate platform Low Power Idle states, Intel platforms are using
88
“Low Power Idle Table” (LPIT). More details about this table can be
99
downloaded from:
10-
http://www.uefi.org/sites/default/files/resources/Intel_ACPI_Low_Power_S0_Idle.pdf
10+
https://www.uefi.org/sites/default/files/resources/Intel_ACPI_Low_Power_S0_Idle.pdf
1111

1212
Residencies for each low power state can be read via FFH
1313
(Function fixed hardware) or a memory mapped interface.

‎Documentation/hwmon/acpi_power_meter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Supported systems:
99

1010
Prefix: 'power_meter'
1111

12-
Datasheet: http://acpi.info/, section 10.4.
12+
Datasheet: https://uefi.org/specifications, section 10.4.
1313

1414
Author: Darrick J. Wong
1515

‎drivers/acpi/Kconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ menuconfig ACPI
3232
Linux support for ACPI is based on Intel Corporation's ACPI
3333
Component Architecture (ACPI CA). For more information on the
3434
ACPI CA, see:
35-
<http://acpica.org/>
35+
<https://acpica.org/>
3636

3737
ACPI is an open industry specification originally co-developed by
3838
Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba. Currently,
3939
it is developed by the ACPI Specification Working Group (ASWG) under
4040
the UEFI Forum and any UEFI member can join the ASWG and contribute
4141
to the ACPI specification.
4242
The specification is available at:
43-
<http://www.acpi.info>
44-
<http://www.uefi.org/acpi/specs>
43+
<https://uefi.org/specifications>
4544

4645
if ACPI
4746

‎drivers/acpi/ac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)
155155
default:
156156
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
157157
"Unsupported event [0x%x]\n", event));
158-
/* fall through */
158+
fallthrough;
159159
case ACPI_AC_NOTIFY_STATUS:
160160
case ACPI_NOTIFY_BUS_CHECK:
161161
case ACPI_NOTIFY_DEVICE_CHECK:

‎drivers/acpi/acpi_processor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
7979
* PIIX4 models.
8080
*/
8181
errata.piix4.throttle = 1;
82-
/* fall through*/
82+
fallthrough;
8383

8484
case 2: /* PIIX4E */
8585
case 3: /* PIIX4M */

‎drivers/acpi/acpica/evrgnini.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
3838
union acpi_operand_object *region_desc =
3939
(union acpi_operand_object *)handle;
4040
struct acpi_mem_space_context *local_region_context;
41+
struct acpi_mem_mapping *mm;
4142

4243
ACPI_FUNCTION_TRACE(ev_system_memory_region_setup);
4344

@@ -46,13 +47,14 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
4647
local_region_context =
4748
(struct acpi_mem_space_context *)*region_context;
4849

49-
/* Delete a cached mapping if present */
50+
/* Delete memory mappings if present */
5051

51-
if (local_region_context->mapped_length) {
52-
acpi_os_unmap_memory(local_region_context->
53-
mapped_logical_address,
54-
local_region_context->
55-
mapped_length);
52+
while (local_region_context->first_mm) {
53+
mm = local_region_context->first_mm;
54+
local_region_context->first_mm = mm->next_mm;
55+
acpi_os_unmap_memory(mm->logical_address,
56+
mm->length);
57+
ACPI_FREE(mm);
5658
}
5759
ACPI_FREE(local_region_context);
5860
*region_context = NULL;

0 commit comments

Comments
 (0)