mirror of https://gitee.com/openkylin/linux.git
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
This commit is contained in:
Rafael J. Wysocki
commit
db1da2f52e
|
|
@ -96,5 +96,5 @@ contents.
|
|||
References
|
||||
==========
|
||||
|
||||
.. [1] http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf
|
||||
.. [2] http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf
|
||||
.. [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
|
||||
|
|
|
|||
|
|
@ -85,9 +85,9 @@ References
|
|||
==========
|
||||
|
||||
[1] Hierarchical Data Extension UUID For _DSD.
|
||||
<http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
|
||||
<https://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
|
||||
referenced 2018-07-17.
|
||||
|
||||
[2] Device Properties UUID For _DSD.
|
||||
<http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf>,
|
||||
<https://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf>,
|
||||
referenced 2016-10-04.
|
||||
|
|
|
|||
|
|
@ -154,23 +154,23 @@ References
|
|||
==========
|
||||
|
||||
[1] _DSD (Device Specific Data) Implementation Guide.
|
||||
http://www.uefi.org/sites/default/files/resources/_DSD-implementation-guide-toplevel-1_1.htm,
|
||||
https://www.uefi.org/sites/default/files/resources/_DSD-implementation-guide-toplevel-1_1.htm,
|
||||
referenced 2016-10-03.
|
||||
|
||||
[2] Devicetree. http://www.devicetree.org, referenced 2016-10-03.
|
||||
[2] Devicetree. https://www.devicetree.org, referenced 2016-10-03.
|
||||
|
||||
[3] Documentation/devicetree/bindings/graph.txt
|
||||
|
||||
[4] Device Properties UUID For _DSD.
|
||||
http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf,
|
||||
https://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf,
|
||||
referenced 2016-10-04.
|
||||
|
||||
[5] Hierarchical Data Extension UUID For _DSD.
|
||||
http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf,
|
||||
https://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf,
|
||||
referenced 2016-10-04.
|
||||
|
||||
[6] Advanced Configuration and Power Interface Specification.
|
||||
http://www.uefi.org/sites/default/files/resources/ACPI_6_1.pdf,
|
||||
https://www.uefi.org/sites/default/files/resources/ACPI_6_1.pdf,
|
||||
referenced 2016-10-04.
|
||||
|
||||
[7] _DSD Device Properties Usage Rules.
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ where
|
|||
References
|
||||
==========
|
||||
|
||||
[1] Device tree. <URL:http://www.devicetree.org>, referenced 2019-02-21.
|
||||
[1] Device tree. <URL:https://www.devicetree.org>, referenced 2019-02-21.
|
||||
|
||||
[2] Advanced Configuration and Power Interface Specification.
|
||||
<URL:https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf>,
|
||||
|
|
@ -101,11 +101,11 @@ References
|
|||
[4] Documentation/devicetree/bindings/media/video-interfaces.txt
|
||||
|
||||
[5] Device Properties UUID For _DSD.
|
||||
<URL:http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf>,
|
||||
<URL:https://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf>,
|
||||
referenced 2019-02-21.
|
||||
|
||||
[6] Hierarchical Data Extension UUID For _DSD.
|
||||
<URL:http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
|
||||
<URL:https://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
|
||||
referenced 2019-02-21.
|
||||
|
||||
[7] Documentation/firmware-guide/acpi/dsd/data-node-references.rst
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Low Power Idle Table (LPIT)
|
|||
To enumerate platform Low Power Idle states, Intel platforms are using
|
||||
“Low Power Idle Table” (LPIT). More details about this table can be
|
||||
downloaded from:
|
||||
http://www.uefi.org/sites/default/files/resources/Intel_ACPI_Low_Power_S0_Idle.pdf
|
||||
https://www.uefi.org/sites/default/files/resources/Intel_ACPI_Low_Power_S0_Idle.pdf
|
||||
|
||||
Residencies for each low power state can be read via FFH
|
||||
(Function fixed hardware) or a memory mapped interface.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ Supported systems:
|
|||
|
||||
Prefix: 'power_meter'
|
||||
|
||||
Datasheet: http://acpi.info/, section 10.4.
|
||||
Datasheet: https://uefi.org/specifications, section 10.4.
|
||||
|
||||
Author: Darrick J. Wong
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ menuconfig ACPI
|
|||
Linux support for ACPI is based on Intel Corporation's ACPI
|
||||
Component Architecture (ACPI CA). For more information on the
|
||||
ACPI CA, see:
|
||||
<http://acpica.org/>
|
||||
<https://acpica.org/>
|
||||
|
||||
ACPI is an open industry specification originally co-developed by
|
||||
Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba. Currently,
|
||||
|
|
@ -40,8 +40,7 @@ menuconfig ACPI
|
|||
the UEFI Forum and any UEFI member can join the ASWG and contribute
|
||||
to the ACPI specification.
|
||||
The specification is available at:
|
||||
<http://www.acpi.info>
|
||||
<http://www.uefi.org/acpi/specs>
|
||||
<https://uefi.org/specifications>
|
||||
|
||||
if ACPI
|
||||
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)
|
|||
default:
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
||||
"Unsupported event [0x%x]\n", event));
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
case ACPI_AC_NOTIFY_STATUS:
|
||||
case ACPI_NOTIFY_BUS_CHECK:
|
||||
case ACPI_NOTIFY_DEVICE_CHECK:
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
|
|||
* PIIX4 models.
|
||||
*/
|
||||
errata.piix4.throttle = 1;
|
||||
/* fall through*/
|
||||
fallthrough;
|
||||
|
||||
case 2: /* PIIX4E */
|
||||
case 3: /* PIIX4M */
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
|
|||
union acpi_operand_object *region_desc =
|
||||
(union acpi_operand_object *)handle;
|
||||
struct acpi_mem_space_context *local_region_context;
|
||||
struct acpi_mem_mapping *mm;
|
||||
|
||||
ACPI_FUNCTION_TRACE(ev_system_memory_region_setup);
|
||||
|
||||
|
|
@ -46,13 +47,14 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
|
|||
local_region_context =
|
||||
(struct acpi_mem_space_context *)*region_context;
|
||||
|
||||
/* Delete a cached mapping if present */
|
||||
/* Delete memory mappings if present */
|
||||
|
||||
if (local_region_context->mapped_length) {
|
||||
acpi_os_unmap_memory(local_region_context->
|
||||
mapped_logical_address,
|
||||
local_region_context->
|
||||
mapped_length);
|
||||
while (local_region_context->first_mm) {
|
||||
mm = local_region_context->first_mm;
|
||||
local_region_context->first_mm = mm->next_mm;
|
||||
acpi_os_unmap_memory(mm->logical_address,
|
||||
mm->length);
|
||||
ACPI_FREE(mm);
|
||||
}
|
||||
ACPI_FREE(local_region_context);
|
||||
*region_context = NULL;
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ acpi_ex_system_memory_space_handler(u32 function,
|
|||
acpi_status status = AE_OK;
|
||||
void *logical_addr_ptr = NULL;
|
||||
struct acpi_mem_space_context *mem_info = region_context;
|
||||
struct acpi_mem_mapping *mm = mem_info->cur_mm;
|
||||
u32 length;
|
||||
acpi_size map_length;
|
||||
acpi_size page_boundary_map_length;
|
||||
|
|
@ -96,20 +97,37 @@ acpi_ex_system_memory_space_handler(u32 function,
|
|||
* Is 1) Address below the current mapping? OR
|
||||
* 2) Address beyond the current mapping?
|
||||
*/
|
||||
if ((address < mem_info->mapped_physical_address) ||
|
||||
(((u64) address + length) > ((u64)
|
||||
mem_info->mapped_physical_address +
|
||||
mem_info->mapped_length))) {
|
||||
if (!mm || (address < mm->physical_address) ||
|
||||
((u64) address + length > (u64) mm->physical_address + mm->length)) {
|
||||
/*
|
||||
* The request cannot be resolved by the current memory mapping;
|
||||
* Delete the existing mapping and create a new one.
|
||||
* The request cannot be resolved by the current memory mapping.
|
||||
*
|
||||
* Look for an existing saved mapping covering the address range
|
||||
* at hand. If found, save it as the current one and carry out
|
||||
* the access.
|
||||
*/
|
||||
if (mem_info->mapped_length) {
|
||||
for (mm = mem_info->first_mm; mm; mm = mm->next_mm) {
|
||||
if (mm == mem_info->cur_mm)
|
||||
continue;
|
||||
|
||||
/* Valid mapping, delete it */
|
||||
if (address < mm->physical_address)
|
||||
continue;
|
||||
|
||||
acpi_os_unmap_memory(mem_info->mapped_logical_address,
|
||||
mem_info->mapped_length);
|
||||
if ((u64) address + length >
|
||||
(u64) mm->physical_address + mm->length)
|
||||
continue;
|
||||
|
||||
mem_info->cur_mm = mm;
|
||||
goto access;
|
||||
}
|
||||
|
||||
/* Create a new mappings list entry */
|
||||
mm = ACPI_ALLOCATE_ZEROED(sizeof(*mm));
|
||||
if (!mm) {
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Unable to save memory mapping at 0x%8.8X%8.8X, size %u",
|
||||
ACPI_FORMAT_UINT64(address), length));
|
||||
return_ACPI_STATUS(AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -143,29 +161,39 @@ acpi_ex_system_memory_space_handler(u32 function,
|
|||
|
||||
/* Create a new mapping starting at the address given */
|
||||
|
||||
mem_info->mapped_logical_address =
|
||||
acpi_os_map_memory(address, map_length);
|
||||
if (!mem_info->mapped_logical_address) {
|
||||
logical_addr_ptr = acpi_os_map_memory(address, map_length);
|
||||
if (!logical_addr_ptr) {
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Could not map memory at 0x%8.8X%8.8X, size %u",
|
||||
ACPI_FORMAT_UINT64(address),
|
||||
(u32)map_length));
|
||||
mem_info->mapped_length = 0;
|
||||
ACPI_FREE(mm);
|
||||
return_ACPI_STATUS(AE_NO_MEMORY);
|
||||
}
|
||||
|
||||
/* Save the physical address and mapping size */
|
||||
|
||||
mem_info->mapped_physical_address = address;
|
||||
mem_info->mapped_length = map_length;
|
||||
mm->logical_address = logical_addr_ptr;
|
||||
mm->physical_address = address;
|
||||
mm->length = map_length;
|
||||
|
||||
/*
|
||||
* Add the new entry to the mappigs list and save it as the
|
||||
* current mapping.
|
||||
*/
|
||||
mm->next_mm = mem_info->first_mm;
|
||||
mem_info->first_mm = mm;
|
||||
|
||||
mem_info->cur_mm = mm;
|
||||
}
|
||||
|
||||
access:
|
||||
/*
|
||||
* Generate a logical pointer corresponding to the address we want to
|
||||
* access
|
||||
*/
|
||||
logical_addr_ptr = mem_info->mapped_logical_address +
|
||||
((u64) address - (u64) mem_info->mapped_physical_address);
|
||||
logical_addr_ptr = mm->logical_address +
|
||||
((u64) address - (u64) mm->physical_address);
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
||||
"System-Memory (width %u) R/W %u Address=%8.8X%8.8X\n",
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ __setup("hest_disable", setup_hest_disable);
|
|||
void __init acpi_hest_init(void)
|
||||
{
|
||||
acpi_status status;
|
||||
int rc = -ENODEV;
|
||||
int rc;
|
||||
unsigned int ghes_count = 0;
|
||||
|
||||
if (hest_disable) {
|
||||
|
|
|
|||
|
|
@ -405,7 +405,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
|
|||
switch (event) {
|
||||
case ACPI_FIXED_HARDWARE_EVENT:
|
||||
event = ACPI_BUTTON_NOTIFY_STATUS;
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
case ACPI_BUTTON_NOTIFY_STATUS:
|
||||
input = button->input;
|
||||
if (button->type == ACPI_BUTTON_TYPE_LID) {
|
||||
|
|
|
|||
|
|
@ -469,7 +469,7 @@ int dock_notify(struct acpi_device *adev, u32 event)
|
|||
surprise_removal = 1;
|
||||
event = ACPI_NOTIFY_EJECT_REQUEST;
|
||||
/* Fall back */
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
case ACPI_NOTIFY_EJECT_REQUEST:
|
||||
begin_undock(ds);
|
||||
if ((immediate_undock && !(ds->flags & DOCK_IS_ATA))
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares,
|
|||
|
||||
if (ACPI_SUCCESS(acpi_get_handle(handle, ev_name, &evt_handle)))
|
||||
break;
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
default:
|
||||
if (ACPI_SUCCESS(acpi_get_handle(handle, "_EVT", &evt_handle)))
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
/* ACPI 6.1 */
|
||||
#define UUID_NFIT_BUS "2f10e7a4-9e91-11e4-89d3-123b93f75cba"
|
||||
|
||||
/* http://pmem.io/documents/NVDIMM_DSM_Interface-V1.6.pdf */
|
||||
/* https://pmem.io/documents/NVDIMM_DSM_Interface-V1.6.pdf */
|
||||
#define UUID_NFIT_DIMM "4309ac30-0d11-11e4-9191-0800200c9a66"
|
||||
|
||||
/* https://github.com/HewlettPackard/hpe-nvm/blob/master/Documentation/ */
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
|
|||
pxm &= 0xff;
|
||||
|
||||
node = acpi_map_pxm_to_node(pxm);
|
||||
if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) {
|
||||
if (node == NUMA_NO_NODE) {
|
||||
pr_err("SRAT: Too many proximity domains.\n");
|
||||
goto out_err_bad_srat;
|
||||
}
|
||||
|
|
@ -291,8 +291,6 @@ acpi_parse_x2apic_affinity(union acpi_subtable_headers *header,
|
|||
struct acpi_srat_x2apic_cpu_affinity *processor_affinity;
|
||||
|
||||
processor_affinity = (struct acpi_srat_x2apic_cpu_affinity *)header;
|
||||
if (!processor_affinity)
|
||||
return -EINVAL;
|
||||
|
||||
acpi_table_print_srat_entry(&header->common);
|
||||
|
||||
|
|
@ -309,8 +307,6 @@ acpi_parse_processor_affinity(union acpi_subtable_headers *header,
|
|||
struct acpi_srat_cpu_affinity *processor_affinity;
|
||||
|
||||
processor_affinity = (struct acpi_srat_cpu_affinity *)header;
|
||||
if (!processor_affinity)
|
||||
return -EINVAL;
|
||||
|
||||
acpi_table_print_srat_entry(&header->common);
|
||||
|
||||
|
|
@ -327,8 +323,6 @@ acpi_parse_gicc_affinity(union acpi_subtable_headers *header,
|
|||
struct acpi_srat_gicc_affinity *processor_affinity;
|
||||
|
||||
processor_affinity = (struct acpi_srat_gicc_affinity *)header;
|
||||
if (!processor_affinity)
|
||||
return -EINVAL;
|
||||
|
||||
acpi_table_print_srat_entry(&header->common);
|
||||
|
||||
|
|
@ -347,8 +341,6 @@ acpi_parse_memory_affinity(union acpi_subtable_headers * header,
|
|||
struct acpi_srat_mem_affinity *memory_affinity;
|
||||
|
||||
memory_affinity = (struct acpi_srat_mem_affinity *)header;
|
||||
if (!memory_affinity)
|
||||
return -EINVAL;
|
||||
|
||||
acpi_table_print_srat_entry(&header->common);
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,10 @@ struct acpi_ioremap {
|
|||
void __iomem *virt;
|
||||
acpi_physical_address phys;
|
||||
acpi_size size;
|
||||
union {
|
||||
unsigned long refcount;
|
||||
struct rcu_work rwork;
|
||||
} track;
|
||||
};
|
||||
|
||||
static LIST_HEAD(acpi_ioremaps);
|
||||
|
|
@ -250,7 +253,7 @@ void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size)
|
|||
map = acpi_map_lookup(phys, size);
|
||||
if (map) {
|
||||
virt = map->virt + (phys - map->phys);
|
||||
map->refcount++;
|
||||
map->track.refcount++;
|
||||
}
|
||||
mutex_unlock(&acpi_ioremap_lock);
|
||||
return virt;
|
||||
|
|
@ -335,7 +338,7 @@ void __iomem __ref
|
|||
/* Check if there's a suitable mapping already. */
|
||||
map = acpi_map_lookup(phys, size);
|
||||
if (map) {
|
||||
map->refcount++;
|
||||
map->track.refcount++;
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
@ -358,7 +361,7 @@ void __iomem __ref
|
|||
map->virt = virt;
|
||||
map->phys = pg_off;
|
||||
map->size = pg_sz;
|
||||
map->refcount = 1;
|
||||
map->track.refcount = 1;
|
||||
|
||||
list_add_tail_rcu(&map->list, &acpi_ioremaps);
|
||||
|
||||
|
|
@ -374,31 +377,36 @@ void *__ref acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_os_map_memory);
|
||||
|
||||
/* Must be called with mutex_lock(&acpi_ioremap_lock) */
|
||||
static unsigned long acpi_os_drop_map_ref(struct acpi_ioremap *map)
|
||||
static void acpi_os_map_remove(struct work_struct *work)
|
||||
{
|
||||
unsigned long refcount = --map->refcount;
|
||||
struct acpi_ioremap *map = container_of(to_rcu_work(work),
|
||||
struct acpi_ioremap,
|
||||
track.rwork);
|
||||
|
||||
if (!refcount)
|
||||
list_del_rcu(&map->list);
|
||||
return refcount;
|
||||
}
|
||||
|
||||
static void acpi_os_map_cleanup(struct acpi_ioremap *map)
|
||||
{
|
||||
synchronize_rcu_expedited();
|
||||
acpi_unmap(map->phys, map->virt);
|
||||
kfree(map);
|
||||
}
|
||||
|
||||
/* Must be called with mutex_lock(&acpi_ioremap_lock) */
|
||||
static void acpi_os_drop_map_ref(struct acpi_ioremap *map)
|
||||
{
|
||||
if (--map->track.refcount)
|
||||
return;
|
||||
|
||||
list_del_rcu(&map->list);
|
||||
|
||||
INIT_RCU_WORK(&map->track.rwork, acpi_os_map_remove);
|
||||
queue_rcu_work(system_wq, &map->track.rwork);
|
||||
}
|
||||
|
||||
/**
|
||||
* acpi_os_unmap_iomem - Drop a memory mapping reference.
|
||||
* @virt: Start of the address range to drop a reference to.
|
||||
* @size: Size of the address range to drop a reference to.
|
||||
*
|
||||
* Look up the given virtual address range in the list of existing ACPI memory
|
||||
* mappings, drop a reference to it and unmap it if there are no more active
|
||||
* references to it.
|
||||
* mappings, drop a reference to it and if there are no more active references
|
||||
* to it, queue it up for later removal.
|
||||
*
|
||||
* During early init (when acpi_permanent_mmap has not been set yet) this
|
||||
* routine simply calls __acpi_unmap_table() to get the job done. Since
|
||||
|
|
@ -408,7 +416,6 @@ static void acpi_os_map_cleanup(struct acpi_ioremap *map)
|
|||
void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size)
|
||||
{
|
||||
struct acpi_ioremap *map;
|
||||
unsigned long refcount;
|
||||
|
||||
if (!acpi_permanent_mmap) {
|
||||
__acpi_unmap_table(virt, size);
|
||||
|
|
@ -416,23 +423,27 @@ void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size)
|
|||
}
|
||||
|
||||
mutex_lock(&acpi_ioremap_lock);
|
||||
|
||||
map = acpi_map_lookup_virt(virt, size);
|
||||
if (!map) {
|
||||
mutex_unlock(&acpi_ioremap_lock);
|
||||
WARN(true, PREFIX "%s: bad address %p\n", __func__, virt);
|
||||
return;
|
||||
}
|
||||
refcount = acpi_os_drop_map_ref(map);
|
||||
mutex_unlock(&acpi_ioremap_lock);
|
||||
acpi_os_drop_map_ref(map);
|
||||
|
||||
if (!refcount)
|
||||
acpi_os_map_cleanup(map);
|
||||
mutex_unlock(&acpi_ioremap_lock);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_os_unmap_iomem);
|
||||
|
||||
/**
|
||||
* acpi_os_unmap_memory - Drop a memory mapping reference.
|
||||
* @virt: Start of the address range to drop a reference to.
|
||||
* @size: Size of the address range to drop a reference to.
|
||||
*/
|
||||
void __ref acpi_os_unmap_memory(void *virt, acpi_size size)
|
||||
{
|
||||
return acpi_os_unmap_iomem((void __iomem *)virt, size);
|
||||
acpi_os_unmap_iomem((void __iomem *)virt, size);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_os_unmap_memory);
|
||||
|
||||
|
|
@ -461,7 +472,6 @@ void acpi_os_unmap_generic_address(struct acpi_generic_address *gas)
|
|||
{
|
||||
u64 addr;
|
||||
struct acpi_ioremap *map;
|
||||
unsigned long refcount;
|
||||
|
||||
if (gas->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)
|
||||
return;
|
||||
|
|
@ -472,16 +482,15 @@ void acpi_os_unmap_generic_address(struct acpi_generic_address *gas)
|
|||
return;
|
||||
|
||||
mutex_lock(&acpi_ioremap_lock);
|
||||
|
||||
map = acpi_map_lookup(addr, gas->bit_width / 8);
|
||||
if (!map) {
|
||||
mutex_unlock(&acpi_ioremap_lock);
|
||||
return;
|
||||
}
|
||||
refcount = acpi_os_drop_map_ref(map);
|
||||
mutex_unlock(&acpi_ioremap_lock);
|
||||
acpi_os_drop_map_ref(map);
|
||||
|
||||
if (!refcount)
|
||||
acpi_os_map_cleanup(map);
|
||||
mutex_unlock(&acpi_ioremap_lock);
|
||||
}
|
||||
EXPORT_SYMBOL(acpi_os_unmap_generic_address);
|
||||
|
||||
|
|
|
|||
|
|
@ -203,8 +203,7 @@ static void tsc_check_state(int state)
|
|||
*/
|
||||
if (boot_cpu_has(X86_FEATURE_NONSTOP_TSC))
|
||||
return;
|
||||
|
||||
/*FALL THROUGH*/
|
||||
fallthrough;
|
||||
default:
|
||||
/* TSC could halt in idle, so notify users */
|
||||
if (state > ACPI_STATE_C1)
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity)
|
|||
case ACPI_ACTIVE_BOTH:
|
||||
if (triggering == ACPI_EDGE_SENSITIVE)
|
||||
return IRQ_TYPE_EDGE_BOTH;
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
default:
|
||||
return IRQ_TYPE_NONE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)
|
|||
table->serial_port.access_width))) {
|
||||
default:
|
||||
pr_err("Unexpected SPCR Access Width. Defaulting to byte size\n");
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
case 8:
|
||||
iotype = "mmio";
|
||||
break;
|
||||
|
|
@ -128,7 +128,7 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)
|
|||
switch (table->interface_type) {
|
||||
case ACPI_DBG2_ARM_SBSA_32BIT:
|
||||
iotype = "mmio32";
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
case ACPI_DBG2_ARM_PL011:
|
||||
case ACPI_DBG2_ARM_SBSA_GENERIC:
|
||||
case ACPI_DBG2_BCM2835:
|
||||
|
|
|
|||
|
|
@ -292,20 +292,6 @@ static int __init acpi_parse_entries_array(char *id, unsigned long table_size,
|
|||
int errs = 0;
|
||||
int i;
|
||||
|
||||
if (acpi_disabled)
|
||||
return -ENODEV;
|
||||
|
||||
if (!id)
|
||||
return -EINVAL;
|
||||
|
||||
if (!table_size)
|
||||
return -EINVAL;
|
||||
|
||||
if (!table_header) {
|
||||
pr_warn("%4.4s not present\n", id);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
table_end = (unsigned long)table_header + table_header->length;
|
||||
|
||||
/* Parse all entries looking for a match. */
|
||||
|
|
@ -371,6 +357,9 @@ int __init acpi_table_parse_entries_array(char *id,
|
|||
if (!id)
|
||||
return -EINVAL;
|
||||
|
||||
if (!table_size)
|
||||
return -EINVAL;
|
||||
|
||||
if (!strncmp(id, ACPI_SIG_MADT, 4))
|
||||
instance = acpi_apic_instance;
|
||||
|
||||
|
|
@ -490,7 +479,7 @@ static u8 __init acpi_table_checksum(u8 *buffer, u32 length)
|
|||
}
|
||||
|
||||
/* All but ACPI_SIG_RSDP and ACPI_SIG_FACS: */
|
||||
static const char * const table_sigs[] = {
|
||||
static const char table_sigs[][ACPI_NAMESEG_SIZE] __initconst = {
|
||||
ACPI_SIG_BERT, ACPI_SIG_BGRT, ACPI_SIG_CPEP, ACPI_SIG_ECDT,
|
||||
ACPI_SIG_EINJ, ACPI_SIG_ERST, ACPI_SIG_HEST, ACPI_SIG_MADT,
|
||||
ACPI_SIG_MSCT, ACPI_SIG_SBST, ACPI_SIG_SLIT, ACPI_SIG_SRAT,
|
||||
|
|
@ -501,7 +490,7 @@ static const char * const table_sigs[] = {
|
|||
ACPI_SIG_WDDT, ACPI_SIG_WDRT, ACPI_SIG_DSDT, ACPI_SIG_FADT,
|
||||
ACPI_SIG_PSDT, ACPI_SIG_RSDT, ACPI_SIG_XSDT, ACPI_SIG_SSDT,
|
||||
ACPI_SIG_IORT, ACPI_SIG_NFIT, ACPI_SIG_HMAT, ACPI_SIG_PPTT,
|
||||
ACPI_SIG_NHLT, NULL };
|
||||
ACPI_SIG_NHLT };
|
||||
|
||||
#define ACPI_HEADER_SIZE sizeof(struct acpi_table_header)
|
||||
|
||||
|
|
@ -548,11 +537,11 @@ void __init acpi_table_upgrade(void)
|
|||
|
||||
table = file.data;
|
||||
|
||||
for (sig = 0; table_sigs[sig]; sig++)
|
||||
for (sig = 0; sig < ARRAY_SIZE(table_sigs); sig++)
|
||||
if (!memcmp(table->signature, table_sigs[sig], 4))
|
||||
break;
|
||||
|
||||
if (!table_sigs[sig]) {
|
||||
if (sig >= ARRAY_SIZE(table_sigs)) {
|
||||
pr_err("ACPI OVERRIDE: Unknown signature [%s%s]\n",
|
||||
cpio_path, file.name);
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -527,8 +527,8 @@ static void program_hpx_type3_register(struct pci_dev *dev,
|
|||
return;
|
||||
|
||||
break;
|
||||
case HPX_CFG_VEND_CAP: /* Fall through */
|
||||
case HPX_CFG_DVSEC: /* Fall through */
|
||||
case HPX_CFG_VEND_CAP:
|
||||
case HPX_CFG_DVSEC:
|
||||
default:
|
||||
pci_warn(dev, "Encountered _HPX type 3 with unsupported config space location");
|
||||
return;
|
||||
|
|
@ -1001,7 +1001,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
|
|||
error = -EBUSY;
|
||||
break;
|
||||
}
|
||||
/* Fall through */
|
||||
fallthrough;
|
||||
case PCI_D0:
|
||||
case PCI_D1:
|
||||
case PCI_D2:
|
||||
|
|
|
|||
|
|
@ -1201,12 +1201,18 @@ struct acpi_pci_id {
|
|||
u16 function;
|
||||
};
|
||||
|
||||
struct acpi_mem_mapping {
|
||||
acpi_physical_address physical_address;
|
||||
u8 *logical_address;
|
||||
acpi_size length;
|
||||
struct acpi_mem_mapping *next_mm;
|
||||
};
|
||||
|
||||
struct acpi_mem_space_context {
|
||||
u32 length;
|
||||
acpi_physical_address address;
|
||||
acpi_physical_address mapped_physical_address;
|
||||
u8 *mapped_logical_address;
|
||||
acpi_size mapped_length;
|
||||
struct acpi_mem_mapping *cur_mm;
|
||||
struct acpi_mem_mapping *first_mm;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ struct tboot_acpi_generic_address {
|
|||
|
||||
/*
|
||||
* combines Sx info from FADT and FACS tables per ACPI 2.0+ spec
|
||||
* (http://www.acpi.info/)
|
||||
* (https://uefi.org/specifications)
|
||||
*/
|
||||
struct tboot_acpi_sleep_info {
|
||||
struct tboot_acpi_generic_address pm1a_cnt_blk;
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ By default only values of core zero are displayed. How to display settings of
|
|||
other cores is described in the cpupower(1) manpage in the \-\-cpu option
|
||||
section.
|
||||
.SH REFERENCES
|
||||
http://www.acpi.info/spec.htm
|
||||
https://uefi.org/specifications
|
||||
.SH "FILES"
|
||||
.nf
|
||||
\fI/sys/devices/system/cpu/cpu*/cpuidle/state*\fP
|
||||
|
|
|
|||
Loading…
Reference in New Issue