Re: [PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
On Tue, 31 Jul 2012 13:56:58 -0700 Yinghai Lu wrote: > On Mon, Jul 30, 2012 at 8:20 PM, Len Brown wrote: > > Applied. > > > > thanks, > > Len Brown, Intel Open Source Technology Center > > > > ps. next time, please send to linux-a...@vger.kernel.org list > > also, put comments not for the commit log after the "---" > > > > other two reference need to be changed: > > drivers/iommu/amd_iommu_init.c: status = > acpi_get_table_with_size("IVRS", 0, _base, _size); > drivers/iommu/amd_iommu_init.c: status = > acpi_get_table_with_size("IVRS", 0, _base, _size); Thanks for the reminder! I will send a follow-on patch Thanks, Feng > > > Thanks > > Yinghai -- 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/
Re: [PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
On Mon, Jul 30, 2012 at 8:20 PM, Len Brown wrote: > Applied. > > thanks, > Len Brown, Intel Open Source Technology Center > > ps. next time, please send to linux-a...@vger.kernel.org list > also, put comments not for the commit log after the "---" > other two reference need to be changed: drivers/iommu/amd_iommu_init.c: status = acpi_get_table_with_size("IVRS", 0, _base, _size); drivers/iommu/amd_iommu_init.c: status = acpi_get_table_with_size("IVRS", 0, _base, _size); Thanks Yinghai -- 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/
Re: [PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
On Mon, Jul 30, 2012 at 8:20 PM, Len Brown l...@kernel.org wrote: Applied. thanks, Len Brown, Intel Open Source Technology Center ps. next time, please send to linux-a...@vger.kernel.org list also, put comments not for the commit log after the --- other two reference need to be changed: drivers/iommu/amd_iommu_init.c: status = acpi_get_table_with_size(IVRS, 0, ivrs_base, ivrs_size); drivers/iommu/amd_iommu_init.c: status = acpi_get_table_with_size(IVRS, 0, ivrs_base, ivrs_size); Thanks Yinghai -- 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/
Re: [PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
On Tue, 31 Jul 2012 13:56:58 -0700 Yinghai Lu ying...@kernel.org wrote: On Mon, Jul 30, 2012 at 8:20 PM, Len Brown l...@kernel.org wrote: Applied. thanks, Len Brown, Intel Open Source Technology Center ps. next time, please send to linux-a...@vger.kernel.org list also, put comments not for the commit log after the --- other two reference need to be changed: drivers/iommu/amd_iommu_init.c: status = acpi_get_table_with_size(IVRS, 0, ivrs_base, ivrs_size); drivers/iommu/amd_iommu_init.c: status = acpi_get_table_with_size(IVRS, 0, ivrs_base, ivrs_size); Thanks for the reminder! I will send a follow-on patch Thanks, Feng Thanks Yinghai -- 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/
Re: [PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
Applied. thanks, Len Brown, Intel Open Source Technology Center ps. next time, please send to linux-a...@vger.kernel.org list also, put comments not for the commit log after the "---" -- 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/
Re: [PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
Applied. thanks, Len Brown, Intel Open Source Technology Center ps. next time, please send to linux-a...@vger.kernel.org list also, put comments not for the commit log after the --- -- 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/
Re: [PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
Update the commit log. Thanks, Feng >From 633ba8625e9ae1999b94edac514a11ddbc4176ef Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Thu, 19 Jul 2012 15:10:02 +0800 Subject: [PATCH 1/2] ACPI: Replace acpi_get_table_with_size() with acpi_get_table() This is a preparation for removing the acpi_get_table_with_size(), as this function could be well covered by acpi_get_table(), and there is no need to have both of them to exist. Signed-off-by: Feng Tang Cc: x...@kernel.org --- arch/x86/kernel/apic/es7000_32.c |7 +++ drivers/acpi/tables.c| 21 + drivers/iommu/dmar.c | 14 +++--- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c index 0874799..ae30b39 100644 --- a/arch/x86/kernel/apic/es7000_32.c +++ b/arch/x86/kernel/apic/es7000_32.c @@ -242,19 +242,18 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) { struct acpi_table_header *header = NULL; struct es7000_oem_table *table; - acpi_size tbl_size; acpi_status ret; int i = 0; for (;;) { - ret = acpi_get_table_with_size("OEM1", i++, , _size); + ret = acpi_get_table("OEM1", i++, ); if (!ACPI_SUCCESS(ret)) return -1; if (!memcmp((char *) >oem_id, "UNISYS", 6)) break; - early_acpi_os_unmap_memory(header, tbl_size); + early_acpi_os_unmap_memory(header, header->length); } table = (void *)header; @@ -262,7 +261,7 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) oem_addrX = table->OEMTableAddr; oem_size= table->OEMTableSize; - early_acpi_os_unmap_memory(header, tbl_size); + early_acpi_os_unmap_memory(header, header->length); *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, oem_size); diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index f336bca..5b8b7e0 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -211,7 +211,6 @@ acpi_table_parse_entries(char *id, struct acpi_subtable_header *entry; unsigned int count = 0; unsigned long table_end; - acpi_size tbl_size; if (acpi_disabled) return -ENODEV; @@ -220,9 +219,9 @@ acpi_table_parse_entries(char *id, return -EINVAL; if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table_with_size(id, acpi_apic_instance, _header, _size); + acpi_get_table(id, acpi_apic_instance, _header); else - acpi_get_table_with_size(id, 0, _header, _size); + acpi_get_table(id, 0, _header); if (!table_header) { printk(KERN_WARNING PREFIX "%4.4s not present\n", id); @@ -241,7 +240,7 @@ acpi_table_parse_entries(char *id, if (entry->type == entry_id && (!max_entries || count++ < max_entries)) if (handler(entry, table_end)) { - early_acpi_os_unmap_memory((char *)table_header, tbl_size); + early_acpi_os_unmap_memory((char *)table_header, table_header->length); return -EINVAL; } @@ -253,7 +252,7 @@ acpi_table_parse_entries(char *id, "%i found\n", id, entry_id, count - max_entries, count); } - early_acpi_os_unmap_memory((char *)table_header, tbl_size); + early_acpi_os_unmap_memory((char *)table_header, table_header->length); return count; } @@ -278,7 +277,6 @@ acpi_table_parse_madt(enum acpi_madt_type id, int __init acpi_table_parse(char *id, acpi_table_handler handler) { struct acpi_table_header *table = NULL; - acpi_size tbl_size; if (acpi_disabled) return -ENODEV; @@ -287,13 +285,13 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) return -EINVAL; if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table_with_size(id, acpi_apic_instance, , _size); + acpi_get_table(id, acpi_apic_instance, ); else - acpi_get_table_with_size(id, 0, , _size); + acpi_get_table(id, 0, ); if (table) { handler(table); - early_acpi_os_unmap_memory(table, tbl_size); + early_acpi_os_unmap_memory(table, table->length); return 0; } else return 1; @@ -307,9 +305,8 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) static void __init check_multiple_madt(void) { struct acpi_table_header *table = NULL; - acpi_size tbl_size; - acpi_get_table_with_size(ACPI_SIG_MADT, 2, , _size); +
[PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
--- arch/x86/kernel/apic/es7000_32.c |7 +++ drivers/acpi/tables.c| 21 + drivers/iommu/dmar.c | 14 +++--- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c index db4ab1b..63f92ef 100644 --- a/arch/x86/kernel/apic/es7000_32.c +++ b/arch/x86/kernel/apic/es7000_32.c @@ -242,19 +242,18 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) { struct acpi_table_header *header = NULL; struct es7000_oem_table *table; - acpi_size tbl_size; acpi_status ret; int i = 0; for (;;) { - ret = acpi_get_table_with_size("OEM1", i++, , _size); + ret = acpi_get_table("OEM1", i++, ); if (!ACPI_SUCCESS(ret)) return -1; if (!memcmp((char *) >oem_id, "UNISYS", 6)) break; - early_acpi_os_unmap_memory(header, tbl_size); + early_acpi_os_unmap_memory(header, header->length); } table = (void *)header; @@ -262,7 +261,7 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) oem_addrX = table->OEMTableAddr; oem_size= table->OEMTableSize; - early_acpi_os_unmap_memory(header, tbl_size); + early_acpi_os_unmap_memory(header, header->length); *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, oem_size); diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index f336bca..5b8b7e0 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -211,7 +211,6 @@ acpi_table_parse_entries(char *id, struct acpi_subtable_header *entry; unsigned int count = 0; unsigned long table_end; - acpi_size tbl_size; if (acpi_disabled) return -ENODEV; @@ -220,9 +219,9 @@ acpi_table_parse_entries(char *id, return -EINVAL; if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table_with_size(id, acpi_apic_instance, _header, _size); + acpi_get_table(id, acpi_apic_instance, _header); else - acpi_get_table_with_size(id, 0, _header, _size); + acpi_get_table(id, 0, _header); if (!table_header) { printk(KERN_WARNING PREFIX "%4.4s not present\n", id); @@ -241,7 +240,7 @@ acpi_table_parse_entries(char *id, if (entry->type == entry_id && (!max_entries || count++ < max_entries)) if (handler(entry, table_end)) { - early_acpi_os_unmap_memory((char *)table_header, tbl_size); + early_acpi_os_unmap_memory((char *)table_header, table_header->length); return -EINVAL; } @@ -253,7 +252,7 @@ acpi_table_parse_entries(char *id, "%i found\n", id, entry_id, count - max_entries, count); } - early_acpi_os_unmap_memory((char *)table_header, tbl_size); + early_acpi_os_unmap_memory((char *)table_header, table_header->length); return count; } @@ -278,7 +277,6 @@ acpi_table_parse_madt(enum acpi_madt_type id, int __init acpi_table_parse(char *id, acpi_table_handler handler) { struct acpi_table_header *table = NULL; - acpi_size tbl_size; if (acpi_disabled) return -ENODEV; @@ -287,13 +285,13 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) return -EINVAL; if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table_with_size(id, acpi_apic_instance, , _size); + acpi_get_table(id, acpi_apic_instance, ); else - acpi_get_table_with_size(id, 0, , _size); + acpi_get_table(id, 0, ); if (table) { handler(table); - early_acpi_os_unmap_memory(table, tbl_size); + early_acpi_os_unmap_memory(table, table->length); return 0; } else return 1; @@ -307,9 +305,8 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) static void __init check_multiple_madt(void) { struct acpi_table_header *table = NULL; - acpi_size tbl_size; - acpi_get_table_with_size(ACPI_SIG_MADT, 2, , _size); + acpi_get_table(ACPI_SIG_MADT, 2, ); if (table) { printk(KERN_WARNING PREFIX "BIOS bug: multiple APIC/MADT found," @@ -318,7 +315,7 @@ static void __init check_multiple_madt(void) "If \"acpi_apic_instance=%d\" works better, " "notify linux-a...@vger.kernel.org\n", acpi_apic_instance ? 0 : 2); - early_acpi_os_unmap_memory(table, tbl_size); +
[PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
--- arch/x86/kernel/apic/es7000_32.c |7 +++ drivers/acpi/tables.c| 21 + drivers/iommu/dmar.c | 14 +++--- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c index db4ab1b..63f92ef 100644 --- a/arch/x86/kernel/apic/es7000_32.c +++ b/arch/x86/kernel/apic/es7000_32.c @@ -242,19 +242,18 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) { struct acpi_table_header *header = NULL; struct es7000_oem_table *table; - acpi_size tbl_size; acpi_status ret; int i = 0; for (;;) { - ret = acpi_get_table_with_size(OEM1, i++, header, tbl_size); + ret = acpi_get_table(OEM1, i++, header); if (!ACPI_SUCCESS(ret)) return -1; if (!memcmp((char *) header-oem_id, UNISYS, 6)) break; - early_acpi_os_unmap_memory(header, tbl_size); + early_acpi_os_unmap_memory(header, header-length); } table = (void *)header; @@ -262,7 +261,7 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) oem_addrX = table-OEMTableAddr; oem_size= table-OEMTableSize; - early_acpi_os_unmap_memory(header, tbl_size); + early_acpi_os_unmap_memory(header, header-length); *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, oem_size); diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index f336bca..5b8b7e0 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -211,7 +211,6 @@ acpi_table_parse_entries(char *id, struct acpi_subtable_header *entry; unsigned int count = 0; unsigned long table_end; - acpi_size tbl_size; if (acpi_disabled) return -ENODEV; @@ -220,9 +219,9 @@ acpi_table_parse_entries(char *id, return -EINVAL; if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table_with_size(id, acpi_apic_instance, table_header, tbl_size); + acpi_get_table(id, acpi_apic_instance, table_header); else - acpi_get_table_with_size(id, 0, table_header, tbl_size); + acpi_get_table(id, 0, table_header); if (!table_header) { printk(KERN_WARNING PREFIX %4.4s not present\n, id); @@ -241,7 +240,7 @@ acpi_table_parse_entries(char *id, if (entry-type == entry_id (!max_entries || count++ max_entries)) if (handler(entry, table_end)) { - early_acpi_os_unmap_memory((char *)table_header, tbl_size); + early_acpi_os_unmap_memory((char *)table_header, table_header-length); return -EINVAL; } @@ -253,7 +252,7 @@ acpi_table_parse_entries(char *id, %i found\n, id, entry_id, count - max_entries, count); } - early_acpi_os_unmap_memory((char *)table_header, tbl_size); + early_acpi_os_unmap_memory((char *)table_header, table_header-length); return count; } @@ -278,7 +277,6 @@ acpi_table_parse_madt(enum acpi_madt_type id, int __init acpi_table_parse(char *id, acpi_table_handler handler) { struct acpi_table_header *table = NULL; - acpi_size tbl_size; if (acpi_disabled) return -ENODEV; @@ -287,13 +285,13 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) return -EINVAL; if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table_with_size(id, acpi_apic_instance, table, tbl_size); + acpi_get_table(id, acpi_apic_instance, table); else - acpi_get_table_with_size(id, 0, table, tbl_size); + acpi_get_table(id, 0, table); if (table) { handler(table); - early_acpi_os_unmap_memory(table, tbl_size); + early_acpi_os_unmap_memory(table, table-length); return 0; } else return 1; @@ -307,9 +305,8 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) static void __init check_multiple_madt(void) { struct acpi_table_header *table = NULL; - acpi_size tbl_size; - acpi_get_table_with_size(ACPI_SIG_MADT, 2, table, tbl_size); + acpi_get_table(ACPI_SIG_MADT, 2, table); if (table) { printk(KERN_WARNING PREFIX BIOS bug: multiple APIC/MADT found, @@ -318,7 +315,7 @@ static void __init check_multiple_madt(void) If \acpi_apic_instance=%d\ works better, notify linux-a...@vger.kernel.org\n, acpi_apic_instance ? 0 : 2); -
Re: [PATCH 1/2] ACPI: replace all acpi_get_table_with_size with acpi_get_table
Update the commit log. Thanks, Feng From 633ba8625e9ae1999b94edac514a11ddbc4176ef Mon Sep 17 00:00:00 2001 From: Feng Tang feng.t...@intel.com Date: Thu, 19 Jul 2012 15:10:02 +0800 Subject: [PATCH 1/2] ACPI: Replace acpi_get_table_with_size() with acpi_get_table() This is a preparation for removing the acpi_get_table_with_size(), as this function could be well covered by acpi_get_table(), and there is no need to have both of them to exist. Signed-off-by: Feng Tang feng.t...@intel.com Cc: x...@kernel.org --- arch/x86/kernel/apic/es7000_32.c |7 +++ drivers/acpi/tables.c| 21 + drivers/iommu/dmar.c | 14 +++--- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c index 0874799..ae30b39 100644 --- a/arch/x86/kernel/apic/es7000_32.c +++ b/arch/x86/kernel/apic/es7000_32.c @@ -242,19 +242,18 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) { struct acpi_table_header *header = NULL; struct es7000_oem_table *table; - acpi_size tbl_size; acpi_status ret; int i = 0; for (;;) { - ret = acpi_get_table_with_size(OEM1, i++, header, tbl_size); + ret = acpi_get_table(OEM1, i++, header); if (!ACPI_SUCCESS(ret)) return -1; if (!memcmp((char *) header-oem_id, UNISYS, 6)) break; - early_acpi_os_unmap_memory(header, tbl_size); + early_acpi_os_unmap_memory(header, header-length); } table = (void *)header; @@ -262,7 +261,7 @@ static int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) oem_addrX = table-OEMTableAddr; oem_size= table-OEMTableSize; - early_acpi_os_unmap_memory(header, tbl_size); + early_acpi_os_unmap_memory(header, header-length); *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, oem_size); diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index f336bca..5b8b7e0 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -211,7 +211,6 @@ acpi_table_parse_entries(char *id, struct acpi_subtable_header *entry; unsigned int count = 0; unsigned long table_end; - acpi_size tbl_size; if (acpi_disabled) return -ENODEV; @@ -220,9 +219,9 @@ acpi_table_parse_entries(char *id, return -EINVAL; if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table_with_size(id, acpi_apic_instance, table_header, tbl_size); + acpi_get_table(id, acpi_apic_instance, table_header); else - acpi_get_table_with_size(id, 0, table_header, tbl_size); + acpi_get_table(id, 0, table_header); if (!table_header) { printk(KERN_WARNING PREFIX %4.4s not present\n, id); @@ -241,7 +240,7 @@ acpi_table_parse_entries(char *id, if (entry-type == entry_id (!max_entries || count++ max_entries)) if (handler(entry, table_end)) { - early_acpi_os_unmap_memory((char *)table_header, tbl_size); + early_acpi_os_unmap_memory((char *)table_header, table_header-length); return -EINVAL; } @@ -253,7 +252,7 @@ acpi_table_parse_entries(char *id, %i found\n, id, entry_id, count - max_entries, count); } - early_acpi_os_unmap_memory((char *)table_header, tbl_size); + early_acpi_os_unmap_memory((char *)table_header, table_header-length); return count; } @@ -278,7 +277,6 @@ acpi_table_parse_madt(enum acpi_madt_type id, int __init acpi_table_parse(char *id, acpi_table_handler handler) { struct acpi_table_header *table = NULL; - acpi_size tbl_size; if (acpi_disabled) return -ENODEV; @@ -287,13 +285,13 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) return -EINVAL; if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table_with_size(id, acpi_apic_instance, table, tbl_size); + acpi_get_table(id, acpi_apic_instance, table); else - acpi_get_table_with_size(id, 0, table, tbl_size); + acpi_get_table(id, 0, table); if (table) { handler(table); - early_acpi_os_unmap_memory(table, tbl_size); + early_acpi_os_unmap_memory(table, table-length); return 0; } else return 1; @@ -307,9 +305,8 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) static void __init check_multiple_madt(void) { struct acpi_table_header *table = NULL; - acpi_size tbl_size; -