From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: linux-acpi@vger.kernel.org
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
mathias.nyman@linux.intel.com, linux-kernel@vger.kernel.org,
lenb@kernel.org, rafael.j.wysocki@intel.com,
broonie@opensource.wolfsonmicro.com, grant.likely@secretlab.ca,
linus.walleij@linaro.org, khali@linux-fr.org,
Bjorn Helgaas <bhelgaas@google.com>
Subject: [PATCH 2/3 rev 2] ACPI / platform: Use common ACPI device resource parsing routines
Date: Tue, 13 Nov 2012 21:55:34 +0100 [thread overview]
Message-ID: <4733383.f9kxETzVYn@vostro.rjw.lan> (raw)
In-Reply-To: <5953163.ZajFIHZXph@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Use common routines in drivers/acpi/resource.c to parse ACPI device
resources while creating platform device objects.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/acpi_platform.c | 89 +++++++++----------------------------------
1 file changed, 20 insertions(+), 69 deletions(-)
Index: linux/drivers/acpi/acpi_platform.c
===================================================================
--- linux.orig/drivers/acpi/acpi_platform.c
+++ linux/drivers/acpi/acpi_platform.c
@@ -29,21 +29,20 @@ static acpi_status acpi_platform_count_r
void *data)
{
struct acpi_resource_extended_irq *acpi_xirq;
+ struct acpi_resource_irq *acpi_irq;
struct resource_info *ri = data;
switch (res->type) {
- case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
case ACPI_RESOURCE_TYPE_IRQ:
- ri->n++;
+ acpi_irq = &res->data.irq;
+ ri->n += acpi_irq->interrupt_count;
break;
case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
acpi_xirq = &res->data.extended_irq;
ri->n += acpi_xirq->interrupt_count;
break;
- case ACPI_RESOURCE_TYPE_ADDRESS32:
- if (res->data.address32.resource_type == ACPI_IO_RANGE)
- ri->n++;
- break;
+ default:
+ ri->n++;
}
return AE_OK;
@@ -52,71 +51,26 @@ static acpi_status acpi_platform_count_r
static acpi_status acpi_platform_add_resources(struct acpi_resource *res,
void *data)
{
- struct acpi_resource_fixed_memory32 *acpi_mem;
- struct acpi_resource_address32 *acpi_add32;
- struct acpi_resource_extended_irq *acpi_xirq;
- struct acpi_resource_irq *acpi_irq;
struct resource_info *ri = data;
struct resource *r;
- int irq, i;
-
- switch (res->type) {
- case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
- acpi_mem = &res->data.fixed_memory32;
- r = &ri->res[ri->cur++];
-
- r->start = acpi_mem->address;
- r->end = r->start + acpi_mem->address_length - 1;
- r->flags = IORESOURCE_MEM;
-
- dev_dbg(ri->dev, "Memory32Fixed %pR\n", r);
- break;
-
- case ACPI_RESOURCE_TYPE_ADDRESS32:
- acpi_add32 = &res->data.address32;
- if (acpi_add32->resource_type == ACPI_IO_RANGE) {
- r = &ri->res[ri->cur++];
- r->start = acpi_add32->minimum;
- r->end = r->start + acpi_add32->address_length - 1;
- r->flags = IORESOURCE_IO;
- dev_dbg(ri->dev, "Address32 %pR\n", r);
- }
- break;
-
- case ACPI_RESOURCE_TYPE_IRQ:
- acpi_irq = &res->data.irq;
- r = &ri->res[ri->cur++];
-
- irq = acpi_register_gsi(ri->dev,
- acpi_irq->interrupts[0],
- acpi_irq->triggering,
- acpi_irq->polarity);
-
- r->start = r->end = irq;
- r->flags = IORESOURCE_IRQ;
-
- dev_dbg(ri->dev, "IRQ %pR\n", r);
- break;
-
- case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
- acpi_xirq = &res->data.extended_irq;
-
- for (i = 0; i < acpi_xirq->interrupt_count; i++, ri->cur++) {
- r = &ri->res[ri->cur];
- irq = acpi_register_gsi(ri->dev,
- acpi_xirq->interrupts[i],
- acpi_xirq->triggering,
- acpi_xirq->polarity);
+ r = ri->res + ri->cur;
+ if (acpi_dev_resource_memory(res, r)
+ || acpi_dev_resource_io(res, r)
+ || acpi_dev_resource_address_space(res, r)
+ || acpi_dev_resource_ext_address_space(res, r)) {
+ ri->cur++;
+ return AE_OK;
+ }
+ if (acpi_dev_resource_interrupt(res, 0, r)) {
+ int i;
- r->start = r->end = irq;
- r->flags = IORESOURCE_IRQ;
+ r++;
+ for (i = 1; acpi_dev_resource_interrupt(res, i, r); i++)
+ r++;
- dev_dbg(ri->dev, "Interrupt %pR\n", r);
- }
- break;
+ ri->cur += i;
}
-
return AE_OK;
}
@@ -165,9 +119,6 @@ struct platform_device *acpi_create_plat
goto out;
}
- if (WARN_ON(ri.n != ri.cur))
- goto out;
-
/*
* If the ACPI node has a parent and that parent has a physical device
* attached to it, that physical device should be the parent of the
@@ -189,7 +140,7 @@ struct platform_device *acpi_create_plat
mutex_unlock(&acpi_parent->physical_node_lock);
}
pdev = platform_device_register_resndata(parent, dev_name(&adev->dev),
- -1, ri.res, ri.n, NULL, 0);
+ -1, ri.res, ri.cur, NULL, 0);
if (IS_ERR(pdev)) {
dev_err(&adev->dev, "platform device creation failed: %ld\n",
PTR_ERR(pdev));
next prev parent reply other threads:[~2012-11-13 20:52 UTC|newest]
Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-03 7:46 [PATCH 0/3] ACPI 5 support for GPIO, SPI and I2C Mika Westerberg
2012-11-03 7:46 ` [PATCH 1/3] gpio / ACPI: add ACPI support Mika Westerberg
2012-11-05 11:53 ` Linus Walleij
2012-11-05 12:14 ` Mathias Nyman
2012-11-05 12:46 ` Rafael J. Wysocki
2012-11-05 13:11 ` Linus Walleij
2012-11-05 13:19 ` Rafael J. Wysocki
2012-11-05 13:28 ` Linus Walleij
2012-11-05 13:50 ` Rafael J. Wysocki
2012-11-05 14:40 ` Linus Walleij
2012-11-06 9:39 ` Mika Westerberg
2012-11-06 10:15 ` Linus Walleij
2012-11-07 8:54 ` Mika Westerberg
2012-11-08 15:55 ` Grant Likely
2012-11-08 19:38 ` Mika Westerberg
2012-11-09 14:11 ` Mathias Nyman
2012-11-09 14:18 ` Grant Likely
2012-11-09 15:05 ` Mathias Nyman
2012-11-09 15:46 ` Grant Likely
2012-11-11 9:50 ` Mika Westerberg
2012-11-03 7:46 ` [PATCH 2/3] spi / ACPI: add ACPI enumeration support Mika Westerberg
2012-11-03 19:42 ` Bjorn Helgaas
2012-11-03 20:13 ` Mika Westerberg
2012-11-03 20:59 ` Rafael J. Wysocki
2012-11-05 10:31 ` Rafael J. Wysocki
2012-11-05 10:56 ` Mika Westerberg
2012-11-05 10:56 ` Mark Brown
2012-11-05 12:02 ` Mika Westerberg
2012-11-05 12:23 ` Jean Delvare
2012-11-05 12:59 ` Rafael J. Wysocki
2012-11-05 13:15 ` Mika Westerberg
2012-11-05 13:20 ` Linus Walleij
2012-11-05 13:43 ` Mika Westerberg
2012-11-05 14:03 ` Jean Delvare
2012-11-05 14:19 ` Rafael J. Wysocki
2012-11-05 14:53 ` Mika Westerberg
2012-11-05 15:19 ` Jean Delvare
2012-11-05 17:12 ` Mika Westerberg
2012-11-05 17:43 ` Bjorn Helgaas
2012-11-05 18:08 ` Mika Westerberg
2012-11-05 17:49 ` Jean Delvare
2012-11-05 20:42 ` Linus Walleij
2012-11-06 8:11 ` Mark Brown
2012-11-05 16:54 ` Bjorn Helgaas
2012-11-06 13:43 ` Rafael J. Wysocki
2012-11-06 20:35 ` Bjorn Helgaas
2012-11-06 22:28 ` Rafael J. Wysocki
2012-11-06 22:36 ` Rafael J. Wysocki
2012-11-07 9:58 ` Mika Westerberg
2012-11-07 11:14 ` Rafael J. Wysocki
2012-11-07 13:05 ` Mika Westerberg
2012-11-08 0:46 ` Rafael J. Wysocki
2012-11-08 20:20 ` Mika Westerberg
2012-11-08 20:54 ` Rafael J. Wysocki
2012-11-08 18:05 ` Grant Likely
2012-11-08 21:06 ` Rafael J. Wysocki
2012-11-08 21:34 ` Grant Likely
2012-11-05 10:54 ` Mark Brown
2012-11-03 20:39 ` Rafael J. Wysocki
2012-11-05 16:54 ` Bjorn Helgaas
2012-11-06 13:16 ` Rafael J. Wysocki
2012-11-06 20:53 ` Bjorn Helgaas
2012-11-06 22:18 ` Rafael J. Wysocki
2012-11-07 9:56 ` Mika Westerberg
2012-11-08 19:32 ` Bjorn Helgaas
2012-11-08 20:04 ` Mika Westerberg
2012-11-09 15:11 ` Bjorn Helgaas
2012-11-09 15:45 ` Grant Likely
2012-11-09 16:35 ` Bjorn Helgaas
2012-11-09 16:43 ` Grant Likely
2012-11-09 16:48 ` Mark Brown
2012-11-09 16:53 ` Bjorn Helgaas
2012-11-10 11:10 ` Rafael J. Wysocki
2012-11-10 11:16 ` Grant Likely
2012-11-10 17:14 ` Bjorn Helgaas
2012-11-10 19:40 ` Rafael J. Wysocki
2012-11-05 10:54 ` Mark Brown
2012-11-05 11:03 ` Mika Westerberg
2012-11-05 11:13 ` Mark Brown
2012-11-08 18:48 ` Grant Likely
2012-11-09 3:50 ` Mika Westerberg
2012-11-03 7:46 ` [PATCH 3/3] i2c " Mika Westerberg
2012-11-03 21:52 ` Jean Delvare
2012-11-04 7:23 ` Mika Westerberg
2012-11-04 8:50 ` Jean Delvare
2012-11-04 10:50 ` Mika Westerberg
2012-11-08 18:58 ` Grant Likely
2012-11-09 3:51 ` Mika Westerberg
2012-11-04 18:29 ` [PATCH 0/3] ACPI 5 support for GPIO, SPI and I2C Linus Walleij
2012-11-05 9:23 ` Mika Westerberg
2012-11-12 11:51 ` [PATCH 0/3] Centralized parsing of ACPI device resources (was: Re: [PATCH 0/3] ACPI 5 support for GPIO, SPI and I2C) Rafael J. Wysocki
2012-11-12 12:00 ` [PATCH 1/3] ACPI: Move device resources interpretation code from PNP to ACPI core Rafael J. Wysocki
2012-11-12 13:27 ` Mika Westerberg
2012-11-12 20:25 ` [Update][PATCH " Rafael J. Wysocki
2012-11-12 12:01 ` [PATCH 2/3] ACPI / platform: Use common ACPI device resource parsing routines Rafael J. Wysocki
2012-11-12 12:02 ` [PATCH 3/3] ACPI: Evaluate _CRS while creating device node objects Rafael J. Wysocki
2012-11-12 14:46 ` Mika Westerberg
2012-11-12 21:03 ` Rafael J. Wysocki
2012-11-13 7:12 ` Mika Westerberg
2012-11-13 12:06 ` [Replacement][PATCH 3/3] Rafael J. Wysocki
2012-11-13 14:16 ` Mika Westerberg
2012-11-13 15:15 ` Rafael J. Wysocki
2012-11-13 15:18 ` Mika Westerberg
2012-11-13 15:28 ` Rafael J. Wysocki
2012-11-13 15:37 ` Mika Westerberg
2012-11-13 16:34 ` [PATCH 3/3] ACPI: Evaluate _CRS while creating device node objects Moore, Robert
2012-11-13 20:44 ` Rafael J. Wysocki
2012-11-13 22:06 ` Moore, Robert
2012-11-13 22:56 ` Rafael J. Wysocki
2012-11-14 2:23 ` Moore, Robert
2012-11-14 9:18 ` Rafael J. Wysocki
2012-11-14 9:32 ` Rafael J. Wysocki
2012-11-14 14:20 ` Moore, Robert
2012-11-13 20:51 ` [PATCH 0/3 rev 2] Centralized parsing of ACPI device resources Rafael J. Wysocki
2012-11-13 20:55 ` [PATCH 1/3 rev 2] ACPI: Move device resources interpretation code from PNP to ACPI core Rafael J. Wysocki
2012-11-13 20:55 ` Rafael J. Wysocki [this message]
2012-11-13 20:56 ` [PATCH 3/3 rev 2] ACPI: Centralized processing of ACPI device resources Rafael J. Wysocki
2012-11-14 9:52 ` [PATCH 0/3 rev 2] Centralized parsing " Mika Westerberg
2012-11-14 10:08 ` Rafael J. Wysocki
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=4733383.f9kxETzVYn@vostro.rjw.lan \
--to=rjw@sisk.pl \
--cc=bhelgaas@google.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=grant.likely@secretlab.ca \
--cc=khali@linux-fr.org \
--cc=lenb@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathias.nyman@linux.intel.com \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael.j.wysocki@intel.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;
as well as URLs for NNTP newsgroup(s).