Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91236ecc authored by Jiang Liu's avatar Jiang Liu Committed by Rafael J. Wysocki
Browse files

ACPI/PCI: Enhance ACPI core to support sparse IO space 



Enhance ACPI resource parsing interfaces to support sparse IO space,
which will be used to share common code between x86 and IA64 later.

Tested-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Reviewed-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 25cb62b7

drivers/acpi/resource.c

+6 −3
Original line number Diff line number Diff line
@@ -119,7 +119,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)

				      u8 io_decode, u8 translation_type)

{

	res->flags = IORESOURCE_IO;
@@ -131,6 +131,8 @@ static void acpi_dev_ioresource_flags(struct resource *res, u64 len, 


	if (io_decode == ACPI_DECODE_16)

		res->flags |= IORESOURCE_IO_16BIT_ADDR;

	if (translation_type == ACPI_SPARSE_TRANSLATION)

		res->flags |= IORESOURCE_IO_SPARSE;

}



static void acpi_dev_get_ioresource(struct resource *res, u64 start, u64 len,
@@ -138,7 +140,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);

	acpi_dev_ioresource_flags(res, len, io_decode, 0);

}



/**
@@ -231,7 +233,8 @@ static bool acpi_decode_space(struct resource_win *win, 
		acpi_dev_memresource_flags(res, len, wp);

		break;

	case ACPI_IO_RANGE:

		acpi_dev_ioresource_flags(res, len, iodec);

		acpi_dev_ioresource_flags(res, len, iodec,

					  addr->info.io.translation_type);

		break;

	case ACPI_BUS_NUMBER_RANGE:

		res->flags = IORESOURCE_BUS;

include/linux/ioport.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ struct resource { 
/* PnP I/O specific bits (IORESOURCE_BITS) */

#define IORESOURCE_IO_16BIT_ADDR	(1<<0)

#define IORESOURCE_IO_FIXED		(1<<1)

#define IORESOURCE_IO_SPARSE		(1<<2)



/* PCI ROM control bits (IORESOURCE_BITS) */

#define IORESOURCE_ROM_ENABLE		(1<<0)	/* ROM is enabled, same as PCI_ROM_ADDRESS_ENABLE */