lkml.org 
[lkml]   [2013]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 13/21] x86, acpi: Try to find SRAT in firmware earlier.
On 07/19/2013 12:59 AM, Tang Chen wrote:
> This patch introduce early_acpi_firmware_srat() to find the
> phys addr of SRAT provided by firmware. And call it in
> reserve_hotpluggable_memory().
>
> Since we have initialized acpi_gbl_root_table_list earlier,
> and store all the tables' phys addrs and signatures in it,
> it is easy to find the SRAT.
>
> Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
> ---
> drivers/acpi/acpica/tbxface.c | 34 ++++++++++++++++++++++++++++++++++
> drivers/acpi/osl.c | 24 ++++++++++++++++++++++++
> include/acpi/acpixf.h | 4 ++++
> include/linux/acpi.h | 4 ++++
> mm/memory_hotplug.c | 10 +++++++---
> 5 files changed, 73 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
> index ad11162..95f8d1b 100644
> --- a/drivers/acpi/acpica/tbxface.c
> +++ b/drivers/acpi/acpica/tbxface.c
> @@ -181,6 +181,40 @@ acpi_status acpi_reallocate_root_table(void)
> return_ACPI_STATUS(status);
> }
>
> +/*
> + * acpi_get_table_desc - Get the acpi table descriptor of a specific table.
> + * @signature: The signature of the table to be found.
> + * @out_desc: The out returned descriptor.

The "@out_desc:" line looks funky. Also, I believe changes to this file
need to go in via acpica & probably conform to their commenting standards?

> + *
> + * This function iterates acpi_gbl_root_table_list and find the specified
> + * table's descriptor.
> + *
> + * NOTE: The caller has the responsibility to allocate memory for @out_desc.
> + *
> + * Return AE_OK on success, AE_NOT_FOUND if the table is not found.
> + */
> +acpi_status acpi_get_table_desc(char *signature,
> + struct acpi_table_desc *out_desc)
> +{
> + int pos;
> +
> + for (pos = 0;
> + pos < acpi_gbl_root_table_list.current_table_count;
> + pos++) {
> + if (!ACPI_COMPARE_NAME
> + (&(acpi_gbl_root_table_list.tables[pos].signature),
> + signature))
> + continue;
> +
> + memcpy(out_desc, &acpi_gbl_root_table_list.tables[pos],
> + sizeof(struct acpi_table_desc));
> +
> + return_ACPI_STATUS(AE_OK);
> + }
> +
> + return_ACPI_STATUS(AE_NOT_FOUND);
> +}
> +
> /*******************************************************************************
> *
> * FUNCTION: acpi_get_table_header
> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> index fa6b973..a2e4596 100644
> --- a/drivers/acpi/osl.c
> +++ b/drivers/acpi/osl.c
> @@ -53,6 +53,7 @@
> #include <acpi/acpi.h>
> #include <acpi/acpi_bus.h>
> #include <acpi/processor.h>
> +#include <acpi/acpixf.h>
>
> #define _COMPONENT ACPI_OS_SERVICES
> ACPI_MODULE_NAME("osl");
> @@ -750,6 +751,29 @@ void __init acpi_initrd_override(void *data, size_t size)
> }
> #endif /* CONFIG_ACPI_INITRD_TABLE_OVERRIDE */
>
> +#ifdef CONFIG_ACPI_NUMA
> +#include <asm/numa.h>
> +#include <linux/memblock.h>
> +
> +/*
> + * early_acpi_firmware_srat - Get the phys addr of SRAT provide by firmware.

s/provide/provided/

> + *
> + * This function iterate acpi_gbl_root_table_list, find SRAT and return the

Perhaps: "Iterate over acpi_gbl_root_table_list to find SRAT then return
its phys addr"

Though I wonder if this comment is even needed, as the iteration is done
in acpi_get_table_desc() (added above).

> + * phys addr of SRAT.
> + *
> + * Return the phys addr of SRAT, or 0 on error.



> + */
> +phys_addr_t __init early_acpi_firmware_srat()
> +{
> + struct acpi_table_desc table_desc;
> +
> + if (acpi_get_table_desc(ACPI_SIG_SRAT, &table_desc))
> + return 0;
> +
> + return table_desc.address;
> +}
> +#endif /* CONFIG_ACPI_NUMA */
> +
> static void acpi_table_taint(struct acpi_table_header *table)
> {
> pr_warn(PREFIX

[...]

> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index 066873e..15b11d3 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -106,10 +106,14 @@ void __init reserve_hotpluggable_memory(void)
> {
> phys_addr_t srat_paddr;
>
> - /* Try to find if SRAT is overrided */
> + /* Try to find out if SRAT is overrided */
> srat_paddr = early_acpi_override_srat();
> - if (!srat_paddr)
> - return;
> + if (!srat_paddr) {
> + /* Try to find SRAT from firmware if it wasn't overrided */

s/overrided/overridden/

> + srat_paddr = early_acpi_firmware_srat();
> + if (!srat_paddr)
> + return;
> + }
>
> /* Will reserve hotpluggable memory here */
> }
>



\
 
 \ /
  Last update: 2013-07-24 02:01    [W:0.835 / U:0.284 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site