From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Lv Zheng <lv.zheng@intel.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <len.brown@intel.com>,
Robert Moore <robert.moore@intel.com>,
"David E. Box" <david.e.box@intel.com>,
Lv Zheng <zetalog@gmail.com>,
linux-acpi@vger.kernel.org, devel@acpica.org
Subject: Re: [RFC PATCH] ACPICA: Resources: Provide common part for struct acpi_resource_address structures.
Date: Thu, 22 Jan 2015 23:50:17 +0100 [thread overview]
Message-ID: <1829383.GqIMIsbMR3@vostro.rjw.lan> (raw)
In-Reply-To: <568a2ece839d4fc1df6f466494c5ff110112eee0.1421894417.git.lv.zheng@intel.com>
On Thursday, January 22, 2015 10:46:00 AM Lv Zheng wrote:
> struct acpi_resource_address and struct acpi_resource_extended_address64 share substracts
> just at different offsets. To unify the parsing functions, OSPMs like Linux
> need a new ACPI_ADDRESS64_ATTRIBUTE as their substructs, so they can
> extract the shared data.
Looks OK to me.
> Original-by: Thomas Gleixner <tglx@linutronix.de>
> Original-by: Jiang Liu <jiang.liu@linux.intel.com>
> Signed-off-by: Lv Zheng <lv.zheng@intel.com>
> ---
> drivers/acpi/acpica/rsaddr.c | 9 +++---
> drivers/acpi/acpica/rsdumpinfo.c | 59 +++++++++++++++++++-------------------
> drivers/acpi/acpica/rsxface.c | 10 +++----
> include/acpi/acrestyp.h | 40 +++++++++++++++-----------
> 4 files changed, 64 insertions(+), 54 deletions(-)
>
> diff --git a/drivers/acpi/acpica/rsaddr.c b/drivers/acpi/acpica/rsaddr.c
> index 916fd09..94a3a05 100644
> --- a/drivers/acpi/acpica/rsaddr.c
> +++ b/drivers/acpi/acpica/rsaddr.c
> @@ -74,7 +74,7 @@ struct acpi_rsconvert_info acpi_rs_convert_address16[5] = {
> * Address Translation Offset
> * Address Length
> */
> - {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.address16.granularity),
> + {ACPI_RSC_MOVE16, ACPI_RS_OFFSET(data.address16.address.granularity),
> AML_OFFSET(address16.granularity),
> 5},
>
> @@ -112,7 +112,7 @@ struct acpi_rsconvert_info acpi_rs_convert_address32[5] = {
> * Address Translation Offset
> * Address Length
> */
> - {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.address32.granularity),
> + {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.address32.address.granularity),
> AML_OFFSET(address32.granularity),
> 5},
>
> @@ -150,7 +150,7 @@ struct acpi_rsconvert_info acpi_rs_convert_address64[5] = {
> * Address Translation Offset
> * Address Length
> */
> - {ACPI_RSC_MOVE64, ACPI_RS_OFFSET(data.address64.granularity),
> + {ACPI_RSC_MOVE64, ACPI_RS_OFFSET(data.address64.address.granularity),
> AML_OFFSET(address64.granularity),
> 5},
>
> @@ -194,7 +194,8 @@ struct acpi_rsconvert_info acpi_rs_convert_ext_address64[5] = {
> * Address Length
> * Type-Specific Attribute
> */
> - {ACPI_RSC_MOVE64, ACPI_RS_OFFSET(data.ext_address64.granularity),
> + {ACPI_RSC_MOVE64,
> + ACPI_RS_OFFSET(data.ext_address64.address.granularity),
> AML_OFFSET(ext_address64.granularity),
> 6}
> };
> diff --git a/drivers/acpi/acpica/rsdumpinfo.c b/drivers/acpi/acpica/rsdumpinfo.c
> index 2f9332d..6ba7ad5 100644
> --- a/drivers/acpi/acpica/rsdumpinfo.c
> +++ b/drivers/acpi/acpica/rsdumpinfo.c
> @@ -183,15 +183,15 @@ struct acpi_rsdump_info acpi_rs_dump_address16[8] = {
> {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_address16),
> "16-Bit WORD Address Space", NULL},
> {ACPI_RSD_ADDRESS, 0, NULL, NULL},
> - {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.granularity), "Granularity",
> - NULL},
> - {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.minimum), "Address Minimum",
> - NULL},
> - {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.maximum), "Address Maximum",
> - NULL},
> - {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.translation_offset),
> + {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.address.granularity),
> + "Granularity", NULL},
> + {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.address.minimum),
> + "Address Minimum", NULL},
> + {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.address.maximum),
> + "Address Maximum", NULL},
> + {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.address.translation_offset),
> "Translation Offset", NULL},
> - {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.address_length),
> + {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(address16.address.address_length),
> "Address Length", NULL},
> {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(address16.resource_source), NULL, NULL}
> };
> @@ -200,15 +200,15 @@ struct acpi_rsdump_info acpi_rs_dump_address32[8] = {
> {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_address32),
> "32-Bit DWORD Address Space", NULL},
> {ACPI_RSD_ADDRESS, 0, NULL, NULL},
> - {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.granularity), "Granularity",
> - NULL},
> - {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.minimum), "Address Minimum",
> - NULL},
> - {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.maximum), "Address Maximum",
> - NULL},
> - {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.translation_offset),
> + {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.address.granularity),
> + "Granularity", NULL},
> + {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.address.minimum),
> + "Address Minimum", NULL},
> + {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.address.maximum),
> + "Address Maximum", NULL},
> + {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.address.translation_offset),
> "Translation Offset", NULL},
> - {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.address_length),
> + {ACPI_RSD_UINT32, ACPI_RSD_OFFSET(address32.address.address_length),
> "Address Length", NULL},
> {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(address32.resource_source), NULL, NULL}
> };
> @@ -217,15 +217,15 @@ struct acpi_rsdump_info acpi_rs_dump_address64[8] = {
> {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_address64),
> "64-Bit QWORD Address Space", NULL},
> {ACPI_RSD_ADDRESS, 0, NULL, NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.granularity), "Granularity",
> - NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.minimum), "Address Minimum",
> - NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.maximum), "Address Maximum",
> - NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.translation_offset),
> + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.address.granularity),
> + "Granularity", NULL},
> + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.address.minimum),
> + "Address Minimum", NULL},
> + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.address.maximum),
> + "Address Maximum", NULL},
> + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.address.translation_offset),
> "Translation Offset", NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.address_length),
> + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(address64.address.address_length),
> "Address Length", NULL},
> {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(address64.resource_source), NULL, NULL}
> };
> @@ -234,15 +234,16 @@ struct acpi_rsdump_info acpi_rs_dump_ext_address64[8] = {
> {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_ext_address64),
> "64-Bit Extended Address Space", NULL},
> {ACPI_RSD_ADDRESS, 0, NULL, NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.granularity),
> + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.address.granularity),
> "Granularity", NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.minimum),
> + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.address.minimum),
> "Address Minimum", NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.maximum),
> + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.address.maximum),
> "Address Maximum", NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.translation_offset),
> + {ACPI_RSD_UINT64,
> + ACPI_RSD_OFFSET(ext_address64.address.translation_offset),
> "Translation Offset", NULL},
> - {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.address_length),
> + {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.address.address_length),
> "Address Length", NULL},
> {ACPI_RSD_UINT64, ACPI_RSD_OFFSET(ext_address64.type_specific),
> "Type-Specific Attribute", NULL}
> diff --git a/drivers/acpi/acpica/rsxface.c b/drivers/acpi/acpica/rsxface.c
> index 877ab92..2952878 100644
> --- a/drivers/acpi/acpica/rsxface.c
> +++ b/drivers/acpi/acpica/rsxface.c
> @@ -60,11 +60,11 @@ ACPI_MODULE_NAME("rsxface")
> ACPI_COPY_FIELD(out, in, min_address_fixed); \
> ACPI_COPY_FIELD(out, in, max_address_fixed); \
> ACPI_COPY_FIELD(out, in, info); \
> - ACPI_COPY_FIELD(out, in, granularity); \
> - ACPI_COPY_FIELD(out, in, minimum); \
> - ACPI_COPY_FIELD(out, in, maximum); \
> - ACPI_COPY_FIELD(out, in, translation_offset); \
> - ACPI_COPY_FIELD(out, in, address_length); \
> + ACPI_COPY_FIELD(out, in, address.granularity); \
> + ACPI_COPY_FIELD(out, in, address.minimum); \
> + ACPI_COPY_FIELD(out, in, address.maximum); \
> + ACPI_COPY_FIELD(out, in, address.translation_offset); \
> + ACPI_COPY_FIELD(out, in, address.address_length); \
> ACPI_COPY_FIELD(out, in, resource_source);
> /* Local prototypes */
> static acpi_status
> diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
> index eb760ca..023959d 100644
> --- a/include/acpi/acrestyp.h
> +++ b/include/acpi/acrestyp.h
> @@ -305,43 +305,51 @@ struct acpi_resource_source {
> u8 max_address_fixed; \
> union acpi_resource_attribute info;
>
> -struct acpi_resource_address {
> -ACPI_RESOURCE_ADDRESS_COMMON};
> -
> -struct acpi_resource_address16 {
> - ACPI_RESOURCE_ADDRESS_COMMON u16 granularity;
> +struct acpi_address16_attribute {
> + u16 granularity;
> u16 minimum;
> u16 maximum;
> u16 translation_offset;
> u16 address_length;
> - struct acpi_resource_source resource_source;
> };
>
> -struct acpi_resource_address32 {
> - ACPI_RESOURCE_ADDRESS_COMMON u32 granularity;
> +struct acpi_address32_attribute {
> + u32 granularity;
> u32 minimum;
> u32 maximum;
> u32 translation_offset;
> u32 address_length;
> - struct acpi_resource_source resource_source;
> };
>
> -struct acpi_resource_address64 {
> - ACPI_RESOURCE_ADDRESS_COMMON u64 granularity;
> +struct acpi_address64_attribute {
> + u64 granularity;
> u64 minimum;
> u64 maximum;
> u64 translation_offset;
> u64 address_length;
> +};
> +
> +struct acpi_resource_address {
> +ACPI_RESOURCE_ADDRESS_COMMON};
> +
> +struct acpi_resource_address16 {
> + ACPI_RESOURCE_ADDRESS_COMMON ACPI_ADDRESS16_ATTRIBUTE address;
> + struct acpi_resource_source resource_source;
> +};
> +
> +struct acpi_resource_address32 {
> + ACPI_RESOURCE_ADDRESS_COMMON ACPI_ADDRESS32_ATTRIBUTE address;
> + struct acpi_resource_source resource_source;
> +};
> +
> +struct acpi_resource_address64 {
> + ACPI_RESOURCE_ADDRESS_COMMON ACPI_ADDRESS64_ATTRIBUTE address;
> struct acpi_resource_source resource_source;
> };
>
> struct acpi_resource_extended_address64 {
> ACPI_RESOURCE_ADDRESS_COMMON u8 revision_ID;
> - u64 granularity;
> - u64 minimum;
> - u64 maximum;
> - u64 translation_offset;
> - u64 address_length;
> + ACPI_ADDRESS64_ATTRIBUTE address;
> u64 type_specific;
> };
>
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
next prev parent reply other threads:[~2015-01-22 22:27 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-08 2:32 [RFC Patch 00/19] Improve ACPI resource parsing interfaces and data structures Jiang Liu
2015-01-08 2:32 ` [RFC Patch 01/19] ACPI: Remove redundant check in function acpi_dev_resource_address_space() Jiang Liu
2015-01-08 2:32 ` [RFC Patch 02/19] ACPI: Implement proper length checks for mem resources Jiang Liu
2015-01-08 2:32 ` [RFC Patch 03/19] ACPI: Use the length check for io resources as well Jiang Liu
2015-01-08 2:32 ` [RFC Patch 04/19] ACPI: Let the parser return false for disabled resources Jiang Liu
2015-01-08 2:32 ` [RFC Patch 05/19] ACPI: Provide union for address_space64 and ext_address_space64 Jiang Liu
2015-01-21 0:32 ` Rafael J. Wysocki
2015-01-22 2:32 ` Zheng, Lv
2015-01-22 2:33 ` [Devel] " Zheng, Lv
2015-01-22 2:57 ` Jiang Liu
2015-01-22 3:24 ` Zheng, Lv
2015-01-22 3:25 ` [Devel] " Zheng, Lv
2015-01-22 10:38 ` Thomas Gleixner
2015-01-08 2:32 ` [RFC Patch 06/19] ACPI: Unify the parsing of address_space and ext_address_space Jiang Liu
2015-01-08 2:32 ` [RFC Patch 07/19] ACPI: Move the window flag logic to the combined parser Jiang Liu
2015-01-08 2:32 ` [RFC Patch 08/19] ACPI: Add prefetch decoding to the address space parser Jiang Liu
2015-01-21 0:35 ` Rafael J. Wysocki
2015-01-21 5:26 ` Jiang Liu
2015-01-21 14:48 ` Rafael J. Wysocki
2015-01-08 2:32 ` [RFC Patch 09/19] ACPI: Fix a bug in parsing ACPI Memroy24 resource Jiang Liu
2015-01-21 0:42 ` Rafael J. Wysocki
2015-01-21 2:15 ` Jiang Liu
2015-01-21 2:59 ` Rafael J. Wysocki
2015-01-21 2:48 ` Jiang Liu
2015-01-08 2:32 ` [RFC Patch 10/19] ACPI: Normalize return value of resource parser functions Jiang Liu
2015-01-08 2:32 ` [RFC Patch 11/19] ACPI: Set flag IORESOURCE_UNSET for unassigned resources Jiang Liu
2015-01-08 2:32 ` [RFC Patch 12/19] ACPI: Enforce stricter checks for address space descriptors Jiang Liu
2015-01-21 0:45 ` Rafael J. Wysocki
2015-01-21 2:18 ` Jiang Liu
2015-01-21 3:01 ` Rafael J. Wysocki
2015-01-08 2:33 ` [RFC Patch 13/19] ACPI: Return translation offset when parsing ACPI address space resources Jiang Liu
2015-01-08 2:33 ` [RFC Patch 14/19] ACPI: Translate resource into master side address for bridge window resources Jiang Liu
2015-01-21 0:50 ` Rafael J. Wysocki
2015-01-21 5:36 ` Jiang Liu
2015-01-21 14:48 ` Rafael J. Wysocki
2015-01-08 2:33 ` [RFC Patch 15/19] ACPI: Add field offset to struct resource_list_entry Jiang Liu
2015-01-21 0:53 ` Rafael J. Wysocki
2015-01-21 5:37 ` Jiang Liu
2015-01-21 14:47 ` Rafael J. Wysocki
2015-01-21 15:01 ` Jiang Liu
2015-01-08 2:33 ` [RFC Patch 16/19] ACPI: Introduce helper function acpi_dev_filter_resource_type() Jiang Liu
2015-01-15 21:30 ` Thomas Gleixner
2015-01-16 0:58 ` Jiang Liu
2015-01-08 2:33 ` [RFC Patch 17/19] resources: Move struct resource_list_entry from ACPI into resource core Jiang Liu
2015-01-21 1:10 ` Rafael J. Wysocki
2015-01-21 6:37 ` Jiang Liu
2015-01-21 9:43 ` Thomas Gleixner
2015-01-21 12:32 ` Jiang Liu
2015-01-08 2:33 ` [RFC Patch 18/19] PCI: Use common resource list management code instead of private implementation Jiang Liu
2015-01-08 2:33 ` Jiang Liu
2015-01-08 2:33 ` [RFC Patch 19/19] x86/PCI/ACPI: Use common ACPI resource interfaces to simplify implementation Jiang Liu
2015-01-11 22:38 ` [RFC Patch 00/19] Improve ACPI resource parsing interfaces and data structures Rafael J. Wysocki
2015-01-19 14:26 ` Jiang Liu
2015-01-19 15:06 ` Rafael J. Wysocki
2015-01-22 2:46 ` [Devel] [RFC PATCH] ACPICA: Resources: Provide common part for struct acpi_resource_address structures Lv Zheng
2015-01-22 2:46 ` Lv Zheng
2015-01-22 22:50 ` Rafael J. Wysocki [this message]
2015-01-23 2:21 ` Zheng, Lv
2015-01-23 2:21 ` [Devel] " Zheng, Lv
2015-01-23 15:21 ` Rafael J. Wysocki
2015-01-26 1:35 ` Zheng, Lv
2015-01-26 1:35 ` [Devel] " Zheng, Lv
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=1829383.GqIMIsbMR3@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=david.e.box@intel.com \
--cc=devel@acpica.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=robert.moore@intel.com \
--cc=zetalog@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.