diff options
| author | Huang Ying <ying.huang@intel.com> | 2010-09-29 19:53:55 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-09-29 14:10:09 -0400 |
| commit | 0bbba38a61283a55f2061ab3e0910c572d19f462 (patch) | |
| tree | ae194c65a07b45ecad35b0c9eab9d1f0ca626a56 | |
| parent | 0c827eebfcd5caad24a50bc514ef15476b086e47 (diff) | |
| download | blackbird-op-linux-0bbba38a61283a55f2061ab3e0910c572d19f462.tar.gz blackbird-op-linux-0bbba38a61283a55f2061ab3e0910c572d19f462.zip | |
ACPI, APEI, Fix ERST MOVE_DATA instruction implementation
The src_base and dst_base fields in apei_exec_context are physical
address, so they should be ioremaped before being used in ERST
MOVE_DATA instruction.
Reported-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/apei/erst.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index a4904f1680cf..35bb2a0a8de6 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c @@ -266,13 +266,30 @@ static int erst_exec_move_data(struct apei_exec_context *ctx, { int rc; u64 offset; + void *src, *dst; + + /* ioremap does not work in interrupt context */ + if (in_interrupt()) { + pr_warning(ERST_PFX + "MOVE_DATA can not be used in interrupt context"); + return -EBUSY; + } rc = __apei_exec_read_register(entry, &offset); if (rc) return rc; - memmove((void *)ctx->dst_base + offset, - (void *)ctx->src_base + offset, - ctx->var2); + + src = ioremap(ctx->src_base + offset, ctx->var2); + if (!src) + return -ENOMEM; + dst = ioremap(ctx->dst_base + offset, ctx->var2); + if (!dst) + return -ENOMEM; + + memmove(dst, src, ctx->var2); + + iounmap(src); + iounmap(dst); return 0; } |
