Commit-ID: 8ec3ffdf3921675aeae8e9c2b42be3c0b700f153
Gitweb: http://git.kernel.org/tip/8ec3ffdf3921675aeae8e9c2b42be3c0b700f153
Author: Yinghai Lu <ying...@kernel.org>
AuthorDate: Thu, 13 Jun 2013 21:02:54 +0800
Committer: H. Peter Anvin <h...@linux.intel.com>
CommitDate: Fri, 14 Jun 2013 14:04:04 -0700
x86, ACPI: Store override acpi tables phys addr in cpio files info array
This patch introduces a file_pos struct to store physaddr. And then changes
acpi_initrd_files[] to file_pos type. Then store physaddr of ACPI tables
in acpi_initrd_files[].
For finding, we will find ACPI tables with physaddr during 32bit flat mode
in head_32.S, because at that time we don't need to setup page table to
access initrd.
For copying, we could use early_ioremap() with physaddr directly before
memory mapping is set.
To keep 32bit and 64bit platforms consistent, use phys_addr for all.
-v2: introduce file_pos to save physaddr instead of abusing cpio_data
which tj is not happy with.
Signed-off-by: Yinghai Lu <ying...@kernel.org>
Link:
http://lkml.kernel.org/r/1371128589-8953-8-git-send-email-tangc...@cn.fujitsu.com
Cc: Rafael J. Wysocki <r...@sisk.pl>
Cc: linux-a...@vger.kernel.org
Tested-by: Thomas Renninger <tr...@suse.de>
Reviewed-by: Tang Chen <tangc...@cn.fujitsu.com>
Tested-by: Tang Chen <tangc...@cn.fujitsu.com>
Signed-off-by: H. Peter Anvin <h...@linux.intel.com>
---
drivers/acpi/osl.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6ab6c54..42f79e3 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -570,7 +570,11 @@ static const char * const table_sigs[] = {
#define ACPI_HEADER_SIZE sizeof(struct acpi_table_header)
#define ACPI_OVERRIDE_TABLES 64
-static struct cpio_data __initdata acpi_initrd_files[ACPI_OVERRIDE_TABLES];
+struct file_pos {
+ phys_addr_t data;
+ phys_addr_t size;
+};
+static struct file_pos __initdata acpi_initrd_files[ACPI_OVERRIDE_TABLES];
void __init acpi_initrd_override_find(void *data, size_t size)
{
@@ -615,7 +619,7 @@ void __init acpi_initrd_override_find(void *data, size_t
size)
table->signature, cpio_path, file.name, table->length);
all_tables_size += table->length;
- acpi_initrd_files[table_nr].data = file.data;
+ acpi_initrd_files[table_nr].data = __pa_nodebug(file.data);
acpi_initrd_files[table_nr].size = file.size;
table_nr++;
}
@@ -624,7 +628,7 @@ void __init acpi_initrd_override_find(void *data, size_t
size)
void __init acpi_initrd_override_copy(void)
{
int no, total_offset = 0;
- char *p;
+ char *p, *q;
if (!all_tables_size)
return;
@@ -659,12 +663,15 @@ void __init acpi_initrd_override_copy(void)
* one by one during copying.
*/
for (no = 0; no < ACPI_OVERRIDE_TABLES; no++) {
+ phys_addr_t addr = acpi_initrd_files[no].data;
phys_addr_t size = acpi_initrd_files[no].size;
if (!size)
break;
+ q = early_ioremap(addr, size);
p = early_ioremap(acpi_tables_addr + total_offset, size);
- memcpy(p, acpi_initrd_files[no].data, size);
+ memcpy(p, q, size);
+ early_iounmap(q, size);
early_iounmap(p, size);
total_offset += size;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
