openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI: Use the length check for io resources as well 

Also apply length check to IO resources.

[Jiang] Remove enforcement that resource starting address must be
non-zero.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Thomas Gleixner 2015-02-02 10:42:49 +08:00 committed by Rafael J. Wysocki
parent c420dbd13e
commit 1d0420f1cf
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/acpi/resource.c
View File

@ -117,31 +117,30 @@ bool acpi_dev_resource_memory(struct acpi_resource *ares, struct resource *res)
}
EXPORT_SYMBOL_GPL(acpi_dev_resource_memory);
static unsigned int acpi_dev_ioresource_flags(u64 start, u64 end, u8 io_decode,
bool window)
static void acpi_dev_ioresource_flags(struct resource *res, u64 len,
u8 io_decode, bool window)
{
int flags = IORESOURCE_IO;
res->flags = IORESOURCE_IO;
if (!acpi_dev_resource_len_valid(res->start, res->end, len, true))
res->flags |= IORESOURCE_DISABLED;
if (res->end >= 0x10003)
res->flags |= IORESOURCE_DISABLED;
if (io_decode == ACPI_DECODE_16)
flags |= IORESOURCE_IO_16BIT_ADDR;
if (start > end || end >= 0x10003)
flags |= IORESOURCE_DISABLED;
res->flags |= IORESOURCE_IO_16BIT_ADDR;
if (window)
flags |= IORESOURCE_WINDOW;
return flags;
res->flags |= IORESOURCE_WINDOW;
}
static void acpi_dev_get_ioresource(struct resource *res, u64 start, u64 len,
u8 io_decode)
{
u64 end = start + len - 1;
res->start = start;
res->end = end;
res->flags = acpi_dev_ioresource_flags(start, end, io_decode, false);
res->end = start + len - 1;
acpi_dev_ioresource_flags(res, len, io_decode, false);
}
/**
@ -161,16 +160,12 @@ bool acpi_dev_resource_io(struct acpi_resource *ares, struct resource *res)
switch (ares->type) {
case ACPI_RESOURCE_TYPE_IO:
io = &ares->data.io;
if (!io->minimum && !io->address_length)
return false;
acpi_dev_get_ioresource(res, io->minimum,
io->address_length,
io->io_decode);
break;
case ACPI_RESOURCE_TYPE_FIXED_IO:
fixed_io = &ares->data.fixed_io;
if (!fixed_io->address && !fixed_io->address_length)
return false;
acpi_dev_get_ioresource(res, fixed_io->address,
fixed_io->address_length,
ACPI_DECODE_10);
@ -178,7 +173,8 @@ bool acpi_dev_resource_io(struct acpi_resource *ares, struct resource *res)
default:
return false;
}
return true;
return !(res->flags & IORESOURCE_DISABLED);
}
EXPORT_SYMBOL_GPL(acpi_dev_resource_io);
@ -216,8 +212,7 @@ bool acpi_dev_resource_address_space(struct acpi_resource *ares,
case ACPI_IO_RANGE:
io_decode = addr.address.granularity == 0xfff ?
ACPI_DECODE_10 : ACPI_DECODE_16;
res->flags = acpi_dev_ioresource_flags(addr.address.minimum,
addr.address.maximum,
acpi_dev_ioresource_flags(res, addr.address.address_length,
io_decode, window);
break;
case ACPI_BUS_NUMBER_RANGE:
@ -266,8 +261,7 @@ bool acpi_dev_resource_ext_address_space(struct acpi_resource *ares,
case ACPI_IO_RANGE:
io_decode = ext_addr->address.granularity == 0xfff ?
ACPI_DECODE_10 : ACPI_DECODE_16;
res->flags = acpi_dev_ioresource_flags(ext_addr->address.minimum,
ext_addr->address.maximum,
acpi_dev_ioresource_flags(res, ext_addr->address.address_length,
io_decode, window);
break;
case ACPI_BUS_NUMBER_RANGE: