From: Jiang Liu <jiang.liu@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Thomas Gleixner <tglx@linutronix.de>,
Bjorn Helgaas <bhelgaas@google.com>,
Yinghai Lu <yinghai@kernel.org>, Borislav Petkov <bp@alien8.de>,
Lv Zheng <lv.zheng@intel.com>, Len Brown <lenb@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org,
Jiang Liu <jiang.liu@linux.intel.com>
Subject: [Patch v2 07/23] ACPI: Move the window flag logic to the combined parser
Date: Mon, 2 Feb 2015 10:42:52 +0800 [thread overview]
Message-ID: <1422844988-13854-8-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1422844988-13854-1-git-send-email-jiang.liu@linux.intel.com>
From: Thomas Gleixner <tglx@linutronix.de>
Normal memory and io resources have window always set to false. Move
the flag logic to the unified address space parser.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
drivers/acpi/resource.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 99903d196024..15d17937c431 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -53,7 +53,7 @@ static bool acpi_dev_resource_len_valid(u64 start, u64 end, u64 len, bool io)
}
static void acpi_dev_memresource_flags(struct resource *res, u64 len,
- u8 write_protect, bool window)
+ u8 write_protect)
{
res->flags = IORESOURCE_MEM;
@@ -62,9 +62,6 @@ static void acpi_dev_memresource_flags(struct resource *res, u64 len,
if (write_protect == ACPI_READ_WRITE_MEMORY)
res->flags |= IORESOURCE_MEM_WRITEABLE;
-
- if (window)
- res->flags |= IORESOURCE_WINDOW;
}
static void acpi_dev_get_memresource(struct resource *res, u64 start, u64 len,
@@ -72,7 +69,7 @@ static void acpi_dev_get_memresource(struct resource *res, u64 start, u64 len,
{
res->start = start;
res->end = start + len - 1;
- acpi_dev_memresource_flags(res, len, write_protect, false);
+ acpi_dev_memresource_flags(res, len, write_protect);
}
/**
@@ -118,7 +115,7 @@ bool acpi_dev_resource_memory(struct acpi_resource *ares, struct resource *res)
EXPORT_SYMBOL_GPL(acpi_dev_resource_memory);
static void acpi_dev_ioresource_flags(struct resource *res, u64 len,
- u8 io_decode, bool window)
+ u8 io_decode)
{
res->flags = IORESOURCE_IO;
@@ -130,9 +127,6 @@ static void acpi_dev_ioresource_flags(struct resource *res, u64 len,
if (io_decode == ACPI_DECODE_16)
res->flags |= IORESOURCE_IO_16BIT_ADDR;
-
- if (window)
- res->flags |= IORESOURCE_WINDOW;
}
static void acpi_dev_get_ioresource(struct resource *res, u64 start, u64 len,
@@ -140,7 +134,7 @@ static void acpi_dev_get_ioresource(struct resource *res, u64 start, u64 len,
{
res->start = start;
res->end = start + len - 1;
- acpi_dev_ioresource_flags(res, len, io_decode, false);
+ acpi_dev_ioresource_flags(res, len, io_decode);
}
/**
@@ -183,7 +177,6 @@ static bool acpi_decode_space(struct resource *res,
struct acpi_address64_attribute *attr)
{
u8 iodec = attr->granularity == 0xfff ? ACPI_DECODE_10 : ACPI_DECODE_16;
- bool window = addr->producer_consumer == ACPI_PRODUCER;
bool wp = addr->info.mem.write_protect;
u64 len = attr->address_length;
@@ -192,10 +185,10 @@ static bool acpi_decode_space(struct resource *res,
switch (addr->resource_type) {
case ACPI_MEMORY_RANGE:
- acpi_dev_memresource_flags(res, len, wp, window);
+ acpi_dev_memresource_flags(res, len, wp);
break;
case ACPI_IO_RANGE:
- acpi_dev_ioresource_flags(res, len, iodec, window);
+ acpi_dev_ioresource_flags(res, len, iodec);
break;
case ACPI_BUS_NUMBER_RANGE:
res->flags = IORESOURCE_BUS;
@@ -204,6 +197,9 @@ static bool acpi_decode_space(struct resource *res,
return false;
}
+ if (addr->producer_consumer == ACPI_PRODUCER)
+ res->flags |= IORESOURCE_WINDOW;
+
return !(res->flags & IORESOURCE_DISABLED);
}
--
1.7.10.4
next prev parent reply other threads:[~2015-02-02 2:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-02 2:42 [Patch v2 00/23] Improve ACPI resource parsing interfaces and enable IOAPIC hotplug Jiang Liu
2015-02-02 2:42 ` [Patch v2 01/23] ACPICA: Resources: Provide common part for struct acpi_resource_address structures Jiang Liu
2015-02-02 2:42 ` [Patch v2 02/23] ACPI: Remove redundant check in function acpi_dev_resource_address_space() Jiang Liu
2015-02-02 2:42 ` [Patch v2 03/23] ACPI: Implement proper length checks for mem resources Jiang Liu
2015-02-02 2:42 ` [Patch v2 04/23] ACPI: Use the length check for io resources as well Jiang Liu
2015-02-02 2:42 ` [Patch v2 05/23] ACPI: Let the parser return false for disabled resources Jiang Liu
2015-02-02 2:42 ` [Patch v2 06/23] ACPI: Unify the parsing of address_space and ext_address_space Jiang Liu
2015-02-02 2:42 ` Jiang Liu [this message]
2015-02-02 2:42 ` [Patch v2 08/23] ACPI: Add prefetch decoding to the address space parser Jiang Liu
2015-02-02 2:42 ` [Patch v2 09/23] ACPI: Fix a bug in parsing ACPI Memory24 resource Jiang Liu
2015-02-02 2:42 ` [Patch v2 10/23] ACPI: Normalize return value of resource parser functions Jiang Liu
2015-02-02 2:42 ` [Patch v2 11/23] ACPI: Set flag IORESOURCE_UNSET for unassigned resources Jiang Liu
2015-02-02 2:42 ` [Patch v2 12/23] ACPI: Enforce stricter checks for address space descriptors Jiang Liu
2015-02-02 2:42 ` [Patch v2 13/23] ACPI: Return translation offset when parsing ACPI address space resources Jiang Liu
2015-02-02 2:42 ` [Patch v2 14/23] ACPI: Translate resource into master side address for bridge window resources Jiang Liu
2015-02-02 2:43 ` [Patch v2 15/23] ACPI: Add field offset to struct resource_list_entry Jiang Liu
2015-02-02 2:43 ` [Patch v2 16/23] ACPI: Introduce helper function acpi_dev_filter_resource_type() Jiang Liu
2015-02-02 2:43 ` [Patch v2 17/23] resources: Move struct resource_list_entry from ACPI into resource core Jiang Liu
2015-02-02 2:43 ` [Patch v2 18/23] PCI: Use common resource list management code instead of private implementation Jiang Liu
2015-02-02 2:43 ` [Patch v2 19/23] x86/PCI: Fix the range check for IO resources Jiang Liu
2015-02-02 2:43 ` [Patch v2 20/23] x86/PCI/ACPI: Use common ACPI resource interfaces to simplify implementation Jiang Liu
2015-02-02 2:43 ` [Patch v2 21/23] x86/PCI: Refine the way to release PCI IRQ resources Jiang Liu
2015-02-03 21:57 ` Rafael J. Wysocki
2015-02-04 8:35 ` [Patch v3] " Jiang Liu
2015-02-04 13:26 ` Rafael J. Wysocki
2015-02-02 2:43 ` [Patch v2 22/23] ACPI: Add interfaces to parse IOAPIC ID for IOAPIC hotplug Jiang Liu
2015-02-02 2:43 ` [Patch v2 23/23] x86/irq, ACPI: Implement ACPI driver to support " Jiang Liu
2015-02-02 3:15 ` [Patch v2 00/23] Improve ACPI resource parsing interfaces and enable " Jiang Liu
2015-02-03 21:54 ` Rafael J. Wysocki
2015-02-04 5:32 ` Jiang Liu
2015-02-04 13:30 ` 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=1422844988-13854-8-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/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).