mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Grant Likely <grant.likely@linaro.org>
To: Hanjun Guo <hanjun.guo@linaro.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	Mark Rutland <mark.rutland@arm.com>,
	Olof Johansson <olof@lixom.net>,
	Will Deacon <will.deacon@arm.com>
Cc: Graeme Gregory <graeme.gregory@linaro.org>,
	Arnd Bergmann <arnd@arndb.de>,
	Sudeep Holla <Sudeep.Holla@arm.com>, Jon Masters <jcm@redhat.com>,
	Jason Cooper <jason@lakedaemon.net>,
	Marc Zyngier <marc.zyngier@arm.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Mark Brown <broonie@kernel.org>, Rob Herring <robh@kernel.org>,
	Robert Richter <rric@kernel.org>, Lv Zheng <lv.zheng@intel.com>,
	Robert Moore <robert.moore@intel.com>,
	Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
	Liviu Dudau <Liviu.Dudau@arm.com>,
	Randy Dunlap <rdunlap@infradead.org>,
	Charles.Garcia-Tobin@arm.com, linux-acpi@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org,
	Ashwin Chaugule <ashwin.chaugule@linaro.org>,
	Tomasz Nowicki <tomasz.nowicki@linaro.org>,
	Hanjun Guo <hanjun.guo@linaro.org>
Subject: Re: [PATCH v4 02/18] ACPI / table: Add new function to get table entries
Date: Mon, 15 Sep 2014 09:48:21 -0700	[thread overview]
Message-ID: <20140915164821.8740BC40A26@trevor.secretlab.ca> (raw)
In-Reply-To: <1410530416-30200-3-git-send-email-hanjun.guo@linaro.org>

On Fri, 12 Sep 2014 22:00:00 +0800, Hanjun Guo <hanjun.guo@linaro.org> wrote:
> From: Ashwin Chaugule <ashwin.chaugule@linaro.org>
> 
> 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().
> 
> Signed-off-by: Ashwin Chaugule <ashwin.chaugule@linaro.org>
> Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>

Makes sense.

Acked-by: Grant Likely <grant.likely@linaro.org>

g.

> ---
>  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");
>  		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);
> +			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);
> +
> +	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,
> -- 
> 1.7.9.5
> 


  reply	other threads:[~2014-09-15 16:48 UTC|newest]

Thread overview: 89+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-12 13:59 [PATCH v4 00/18] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2014-09-12 13:59 ` [PATCH v4 01/18] ARM64: Move the init of cpu_logical_map(0) before unflatten_device_tree() Hanjun Guo
2014-09-12 19:34   ` Jon Masters
2014-09-15  6:16   ` Olof Johansson
2014-09-17 16:48     ` Mark Rutland
2014-09-12 14:00 ` [PATCH v4 02/18] ACPI / table: Add new function to get table entries Hanjun Guo
2014-09-15 16:48   ` Grant Likely [this message]
2014-09-12 14:00 ` [PATCH v4 03/18] ACPI / table: Count matched and successfully parsed entries without specifying max entries Hanjun Guo
2014-09-15 16:48   ` Grant Likely
2014-09-12 14:00 ` [PATCH v4 04/18] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 05/18] ARM64 / ACPI: Introduce sleep-arm.c Hanjun Guo
2014-09-12 14:51   ` Catalin Marinas
2014-09-12 15:18     ` Graeme Gregory
2014-09-12 15:49       ` Catalin Marinas
2014-09-12 16:32         ` Graeme Gregory
2014-09-17  1:31         ` Matthew Garrett
2014-09-12 19:43   ` Jon Masters
2014-09-12 20:03     ` Graeme Gregory
2014-09-12 21:10       ` Jon Masters
2014-09-12 14:00 ` [PATCH v4 06/18] ARM64 / ACPI: Introduce early_param for "acpi" Hanjun Guo
2014-09-15  6:28   ` Olof Johansson
2014-09-15 14:51     ` Catalin Marinas
2014-09-15 16:09       ` Olof Johansson
2014-09-15 16:31       ` Jon Masters
2014-09-15 22:55     ` Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 07/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 08/18] ARM64 / ACPI: Make PCI optional for ACPI on ARM64 Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 09/18] ARM64 / ACPI: Parse FADT table to get PSCI flags for PSCI init Hanjun Guo
2014-09-15  6:38   ` Olof Johansson
2014-09-15 14:54     ` Catalin Marinas
2014-09-15 23:24       ` Jon Masters
2014-09-15 23:34     ` Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 10/18] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2014-09-15  6:40   ` Olof Johansson
2014-09-15 14:11     ` Jon Masters
2014-09-15 17:52     ` Grant Likely
2014-09-15 18:01       ` Olof Johansson
2014-09-15 21:55         ` Jon Masters
2014-09-12 14:00 ` [PATCH v4 11/18] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2014-09-12 19:47   ` Jon Masters
2014-09-15 14:56     ` Catalin Marinas
2014-09-15 23:19       ` Jon Masters
2014-09-15  7:00   ` Olof Johansson
2014-09-16  0:01     ` Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 12/18] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2014-09-15  7:05   ` Olof Johansson
2014-09-16  0:11     ` Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 13/18] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 14/18] ARM64 / ACPI: Add GICv2 specific ACPI boot support Hanjun Guo
2014-09-12 19:48   ` Jon Masters
2014-09-15 15:01   ` Catalin Marinas
2014-09-15 16:16     ` Jon Masters
2014-09-15 16:42       ` Catalin Marinas
2014-09-17  7:40         ` Tomasz Nowicki
2014-09-17 15:14           ` Catalin Marinas
2014-09-18  2:25             ` Arnd Bergmann
2014-09-18 16:00               ` Catalin Marinas
2014-09-12 14:00 ` [PATCH v4 15/18] ARM64 / ACPI: Parse GTDT to initialize arch timer Hanjun Guo
2014-09-15  7:13   ` Olof Johansson
2014-09-12 14:00 ` [PATCH v4 16/18] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 17/18] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2014-09-12 14:00 ` [PATCH v4 18/18] Documentation: ACPI for ARM64 Hanjun Guo
2014-09-15  7:33   ` Olof Johansson
2014-09-17  1:44   ` Matthew Garrett
2014-09-17  1:57     ` Matthew Garrett
2014-09-17  8:58     ` Jon Masters
2014-09-17 17:02       ` Mark Brown
2014-09-17 16:05     ` Graeme Gregory
2014-09-17 23:22       ` Arnd Bergmann
2014-09-17 23:40         ` Graeme Gregory
2014-09-18 15:54           ` Catalin Marinas
2014-09-18 23:20           ` Rafael J. Wysocki
2014-09-18 23:59             ` Jon Masters
2014-09-17 19:37     ` Rafael J. Wysocki
2014-09-17 19:22       ` Matthew Garrett
2014-09-17 19:29         ` Jon Masters
2014-09-17 20:11         ` Rafael J. Wysocki
2014-09-17 19:59           ` Matthew Garrett
2014-09-17 23:06           ` Hanjun Guo
2014-09-22 19:48   ` Pavel Machek
2014-09-22 20:31     ` Matthew Garrett
2014-09-22 22:46       ` Rafael J. Wysocki
2014-09-22 22:28         ` Matthew Garrett
2014-09-22 22:34           ` Hanjun Guo
2014-09-22 22:38             ` Matthew Garrett
2014-09-22 23:22             ` Rafael J. Wysocki
2014-09-22 22:55         ` Al Stone
2014-09-22 23:07           ` Matthew Garrett
2014-09-22 22:40     ` Al Stone

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140915164821.8740BC40A26@trevor.secretlab.ca \
    --to=grant.likely@linaro.org \
    --cc=Charles.Garcia-Tobin@arm.com \
    --cc=Liviu.Dudau@arm.com \
    --cc=Lorenzo.Pieralisi@arm.com \
    --cc=Sudeep.Holla@arm.com \
    --cc=arnd@arndb.de \
    --cc=ashwin.chaugule@linaro.org \
    --cc=bhelgaas@google.com \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=graeme.gregory@linaro.org \
    --cc=hanjun.guo@linaro.org \
    --cc=jason@lakedaemon.net \
    --cc=jcm@redhat.com \
    --cc=linaro-acpi@lists.linaro.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lv.zheng@intel.com \
    --cc=marc.zyngier@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=olof@lixom.net \
    --cc=rdunlap@infradead.org \
    --cc=rjw@rjwysocki.net \
    --cc=robert.moore@intel.com \
    --cc=robh@kernel.org \
    --cc=rric@kernel.org \
    --cc=tomasz.nowicki@linaro.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®