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>, Ingo Molnar <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
Tony Luck <tony.luck@intel.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
linux-acpi@vger.kernel.org
Subject: [Patch v2 19/23] x86/PCI: Fix the range check for IO resources
Date: Mon, 2 Feb 2015 10:43:04 +0800 [thread overview]
Message-ID: <1422844988-13854-20-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1422844988-13854-1-git-send-email-jiang.liu@linux.intel.com>
The range check in setup_res() checks the IO range against
iomem_resource. That's just wrong.
Reworked based on Thomas original patch.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
arch/x86/pci/acpi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index bb98afd0591e..1d725d99963d 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -283,7 +283,7 @@ static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data)
struct acpi_resource_address64 addr;
acpi_status status;
unsigned long flags;
- u64 start, orig_end, end;
+ u64 start, orig_end, end, res_end;
status = resource_to_addr(acpi_res, &addr);
if (!ACPI_SUCCESS(status))
@@ -293,8 +293,10 @@ static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data)
flags = IORESOURCE_MEM;
if (addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
flags |= IORESOURCE_PREFETCH;
+ res_end = (u64)iomem_resource.end;
} else if (addr.resource_type == ACPI_IO_RANGE) {
flags = IORESOURCE_IO;
+ res_end = (u64)ioport_resource.end;
} else
return AE_OK;
@@ -302,7 +304,7 @@ static acpi_status setup_resource(struct acpi_resource *acpi_res, void *data)
orig_end = end = addr.address.maximum + addr.address.translation_offset;
/* Exclude non-addressable range or non-addressable portion of range */
- end = min(end, (u64)iomem_resource.end);
+ end = min(end, res_end);
if (end <= start) {
dev_info(&info->bridge->dev,
"host bridge window [%#llx-%#llx] "
--
1.7.10.4
next prev parent reply other threads:[~2015-02-02 2:42 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 ` [Patch v2 07/23] ACPI: Move the window flag logic to the combined parser Jiang Liu
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 ` Jiang Liu [this message]
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-20-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=mingo@redhat.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).