From mboxrd@z Thu Jan 1 00:00:00 1970 From: Parth Dixit Subject: [PATCH v2 16/41] acpi : Introduce acpi_parse_entries Date: Mon, 18 May 2015 01:33:43 +0530 Message-ID: <1431893048-5214-17-git-send-email-parth.dixit@linaro.org> References: <1431893048-5214-1-git-send-email-parth.dixit@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1431893048-5214-1-git-send-email-parth.dixit@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: keir@xen.org, ian.campbell@citrix.com, andrew.cooper3@citrix.com, tim@xen.org, julien.grall@citrix.com, stefano.stabellini@citrix.com, jbeulich@suse.com, parth.dixit@linaro.org, christoffer.dall@linaro.org List-Id: xen-devel@lists.xenproject.org add new function acpi_parse_entries which takes acpi table as argument. This will avoid fetching table everytime in acpi_table_parse_entries. Signed-off-by: Naresh Bhat Signed-off-by: Parth Dixit --- xen/drivers/acpi/tables.c | 60 +++++++++++++++++++++++++++++++++-------------- xen/include/xen/acpi.h | 3 +++ 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 684d8c9..c4c4256 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -237,31 +237,29 @@ void __init acpi_table_print_madt_entry(struct acpi_subtable_header *header) } } - int __init -acpi_table_parse_entries(char *id, - unsigned long table_size, - int entry_id, - acpi_table_entry_handler handler, - unsigned int max_entries) +acpi_parse_entries(char *id, + unsigned long table_size, + acpi_table_entry_handler handler, + struct acpi_table_header *table_header, + int entry_id, + unsigned int max_entries) { - struct acpi_table_header *table_header = NULL; - struct acpi_subtable_header *entry; + struct acpi_subtable_header *entry; unsigned int count = 0; unsigned long table_end; - if (!handler) - return -EINVAL; + if ( !handler ) + return -EINVAL; - if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table(id, acpi_apic_instance, &table_header); - else - acpi_get_table(id, 0, &table_header); + if ( !table_size ) + return -EINVAL; - if (!table_header) { - printk(KERN_WARNING PREFIX "%4.4s not present\n", id); - return -ENODEV; - } + if ( !table_header ) + { + printk("Table header not present\n"); + return -ENODEV; + } table_end = (unsigned long)table_header + table_header->length; @@ -292,6 +290,32 @@ acpi_table_parse_entries(char *id, } return count; + +} +int __init +acpi_table_parse_entries(char *id, + unsigned long table_size, + int entry_id, + acpi_table_entry_handler handler, + unsigned int max_entries) +{ + struct acpi_table_header *table_header = NULL; + + if (!handler) + return -EINVAL; + + if (strncmp(id, ACPI_SIG_MADT, 4) == 0) + acpi_get_table(id, acpi_apic_instance, &table_header); + else + acpi_get_table(id, 0, &table_header); + + if (!table_header) { + printk(KERN_WARNING PREFIX "%4.4s not present\n", id); + return -ENODEV; + } + + return acpi_parse_entries(id, table_size, handler, table_header, + entry_id, max_entries); } int __init diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index ee6a5ea..3eafd1f 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -74,6 +74,9 @@ int acpi_table_init (void); int acpi_table_parse(char *id, acpi_table_handler handler); int acpi_table_parse_entries(char *id, unsigned long table_size, int entry_id, acpi_table_entry_handler handler, unsigned int max_entries); +int acpi_parse_entries(char *id, unsigned long table_size, + acpi_table_entry_handler handler, struct acpi_table_header *table_header, + int entry_id, unsigned int max_entries); int acpi_table_parse_madt(enum acpi_madt_type id, acpi_table_entry_handler handler, unsigned int max_entries); int acpi_table_parse_srat(int id, acpi_madt_entry_handler handler, unsigned int max_entries); -- 1.9.1