Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750983AbaKXBF5 (ORCPT ); Sun, 23 Nov 2014 20:05:57 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:60689 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750783AbaKXBFy (ORCPT ); Sun, 23 Nov 2014 20:05:54 -0500 From: "Rafael J. Wysocki" To: Hanjun Guo Cc: Catalin Marinas , Mark Rutland , Olof Johansson , Grant Likely , Will Deacon , Graeme Gregory , Arnd Bergmann , Sudeep Holla , Jon Masters , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Rob Herring , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles.Garcia-Tobin@arm.com, Kangkang.Shen@huawei.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Ashwin Chaugule , Tomasz Nowicki Subject: Re: [PATCH v5 02/18] ACPI / table: Add new function to get table entries Date: Mon, 24 Nov 2014 02:27:04 +0100 Message-ID: <2764417.DLFalXXngC@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1413553034-20956-3-git-send-email-hanjun.guo@linaro.org> References: <1413553034-20956-1-git-send-email-hanjun.guo@linaro.org> <1413553034-20956-3-git-send-email-hanjun.guo@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday, October 17, 2014 09:36:58 PM Hanjun Guo wrote: > From: Ashwin Chaugule > > The acpi_table_parse() function has a callback that > passes a pointer to a table_header. Add a new function > which takes this pointer and parses its entries. This > eliminates the need to re-traverse all the tables for > each call. e.g. as in acpi_table_parse_madt() which is > normally called after acpi_table_parse(). > > Acked-by: Grant Likely > Signed-off-by: Ashwin Chaugule > Signed-off-by: Tomasz Nowicki > Signed-off-by: Hanjun Guo > --- > drivers/acpi/tables.c | 67 ++++++++++++++++++++++++++++++++++--------------- > include/linux/acpi.h | 4 +++ > 2 files changed, 51 insertions(+), 20 deletions(-) > > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c > index 6d5a6cd..21ae521 100644 > --- a/drivers/acpi/tables.c > +++ b/drivers/acpi/tables.c > @@ -192,17 +192,14 @@ void 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_tbl_entry_handler handler, > - unsigned int max_entries) > +acpi_parse_entries(unsigned long table_size, > + acpi_tbl_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; > - unsigned int count = 0; > + int count = 0; > unsigned long table_end; > - acpi_size tbl_size; > > if (acpi_disabled) > return -ENODEV; > @@ -210,13 +207,11 @@ acpi_table_parse_entries(char *id, > if (!handler) > return -EINVAL; > > - if (strncmp(id, ACPI_SIG_MADT, 4) == 0) > - acpi_get_table_with_size(id, acpi_apic_instance, &table_header, &tbl_size); > - else > - acpi_get_table_with_size(id, 0, &table_header, &tbl_size); > + if (!table_size) > + return -EINVAL; > > if (!table_header) { > - pr_warn("%4.4s not present\n", id); > + pr_warn("Table header not present\n"); The message doesn't make sense any more if the table signature is not printed. > return -ENODEV; > } > > @@ -232,30 +227,62 @@ acpi_table_parse_entries(char *id, > if (entry->type == entry_id > && (!max_entries || count++ < max_entries)) > if (handler(entry, table_end)) > - goto err; > + return -EINVAL; > > /* > * If entry->length is 0, break from this loop to avoid > * infinite loop. > */ > if (entry->length == 0) { > - pr_err("[%4.4s:0x%02x] Invalid zero length\n", id, entry_id); > - goto err; > + pr_err("[0x%02x] Invalid zero length\n", entry_id); Same here. > + return -EINVAL; > } > > entry = (struct acpi_subtable_header *) > ((unsigned long)entry + entry->length); > } > + > if (max_entries && count > max_entries) { > pr_warn("[%4.4s:0x%02x] ignored %i entries of %i found\n", > - id, entry_id, count - max_entries, count); > + table_header->signature, entry_id, count - max_entries, > + count); > } > > - early_acpi_os_unmap_memory((char *)table_header, tbl_size); > return count; > -err: > +} > + > +int __init > +acpi_table_parse_entries(char *id, > + unsigned long table_size, > + int entry_id, > + acpi_tbl_entry_handler handler, > + unsigned int max_entries) > +{ > + struct acpi_table_header *table_header = NULL; > + acpi_size tbl_size; > + int count; > + > + if (acpi_disabled) > + return -ENODEV; > + > + if (!handler) > + return -EINVAL; > + > + if (strncmp(id, ACPI_SIG_MADT, 4) == 0) > + acpi_get_table_with_size(id, acpi_apic_instance, &table_header, &tbl_size); > + else > + acpi_get_table_with_size(id, 0, &table_header, &tbl_size); u32 instance = 0; if (!strncmp(id, ACPI_SIG_MADT, 4)) instance = acpi_apic_instance; acpi_get_table_with_size(id, instance, &table_header, &tbl_size); Pretty please. > + > + if (!table_header) { > + pr_warn("%4.4s not present\n", id); > + return -ENODEV; > + } > + > + count = acpi_parse_entries(table_size, handler, table_header, > + entry_id, max_entries); > + > early_acpi_os_unmap_memory((char *)table_header, tbl_size); > - return -EINVAL; > + return count; > } > > int __init > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 807cbc4..36d5012 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -123,6 +123,10 @@ int acpi_numa_init (void); > > int acpi_table_init (void); > int acpi_table_parse(char *id, acpi_tbl_table_handler handler); > +int __init acpi_parse_entries(unsigned long table_size, > + acpi_tbl_entry_handler handler, > + struct acpi_table_header *table_header, > + int entry_id, unsigned int max_entries); > int __init acpi_table_parse_entries(char *id, unsigned long table_size, > int entry_id, > acpi_tbl_entry_handler handler, > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/