summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/apei/apei-internal.h
diff options
context:
space:
mode:
authorHuang Ying <ying.huang@intel.com>2011-12-08 11:25:47 +0800
committerLen Brown <len.brown@intel.com>2012-01-17 03:54:38 -0500
commitfdea163d8c17ba08814142259a467ba3e899010d (patch)
treea512e00b3e569a2ce5d5456bcc8ef9a30020075f /drivers/acpi/apei/apei-internal.h
parent76da3fb3575e39fb23b2c072997ccd1187a2ce9d (diff)
downloadlinux-fdea163d8c17ba08814142259a467ba3e899010d.tar.bz2
ACPI, APEI, EINJ, Fix resource conflict on some machine
Some APEI firmware implementation will access injected address specified in param1 to trigger the error when injecting memory error. This will cause resource conflict with RAM. On one of our testing machine, if injecting at memory address 0x10000000, the following error will be reported in dmesg: APEI: Can not request iomem region <0000000010000000-0000000010000008> for GARs. This patch removes the injecting memory address range from trigger table resources to avoid conflict. Signed-off-by: Huang Ying <ying.huang@intel.com> Tested-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/apei/apei-internal.h')
-rw-r--r--drivers/acpi/apei/apei-internal.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
index f57050e7a5e7..d778edd34fba 100644
--- a/drivers/acpi/apei/apei-internal.h
+++ b/drivers/acpi/apei/apei-internal.h
@@ -95,6 +95,9 @@ static inline void apei_resources_init(struct apei_resources *resources)
}
void apei_resources_fini(struct apei_resources *resources);
+int apei_resources_add(struct apei_resources *resources,
+ unsigned long start, unsigned long size,
+ bool iomem);
int apei_resources_sub(struct apei_resources *resources1,
struct apei_resources *resources2);
int apei_resources_request(struct apei_resources *resources,