Commit 0534af01 authored by WANG Chao's avatar WANG Chao Committed by H. Peter Anvin

x86, calgary: Use 8M TCE table size by default

New kexec-tools wants to pass kdump kernel needed memmap via E820
directly, instead of memmap=exactmap. This makes saved_max_pfn not
be passed down to 2nd kernel. To keep 1st kernel and 2nd kernel using
the same TCE table size, Muli suggest to hard code the size to max (8M).

We can't get rid of saved_max_pfn this time, for backward compatibility
with old first kernel and new second kernel. However new first kernel
and old second kernel can not work unfortunately.

v2->v1:
- retain saved_max_pfn so new 2nd kernel can work with old 1st kernel
  from Vivek
Signed-off-by: default avatarWANG Chao <chaowang@redhat.com>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Acked-by: default avatarMuli Ben-Yehuda <mulix@mulix.org>
Acked-by: default avatarJon Mason <jdmason@kudzu.us>
Link: http://lkml.kernel.org/r/1394463120-26999-1-git-send-email-chaowang@redhat.comSigned-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent c71ef7b3
...@@ -1207,23 +1207,31 @@ static int __init calgary_init(void) ...@@ -1207,23 +1207,31 @@ static int __init calgary_init(void)
return ret; return ret;
} }
static inline int __init determine_tce_table_size(u64 ram) static inline int __init determine_tce_table_size(void)
{ {
int ret; int ret;
if (specified_table_size != TCE_TABLE_SIZE_UNSPECIFIED) if (specified_table_size != TCE_TABLE_SIZE_UNSPECIFIED)
return specified_table_size; return specified_table_size;
/* if (is_kdump_kernel() && saved_max_pfn) {
* Table sizes are from 0 to 7 (TCE_TABLE_SIZE_64K to /*
* TCE_TABLE_SIZE_8M). Table size 0 has 8K entries and each * Table sizes are from 0 to 7 (TCE_TABLE_SIZE_64K to
* larger table size has twice as many entries, so shift the * TCE_TABLE_SIZE_8M). Table size 0 has 8K entries and each
* max ram address by 13 to divide by 8K and then look at the * larger table size has twice as many entries, so shift the
* order of the result to choose between 0-7. * max ram address by 13 to divide by 8K and then look at the
*/ * order of the result to choose between 0-7.
ret = get_order(ram >> 13); */
if (ret > TCE_TABLE_SIZE_8M) ret = get_order((saved_max_pfn * PAGE_SIZE) >> 13);
if (ret > TCE_TABLE_SIZE_8M)
ret = TCE_TABLE_SIZE_8M;
} else {
/*
* Use 8M by default (suggested by Muli) if it's not
* kdump kernel and saved_max_pfn isn't set.
*/
ret = TCE_TABLE_SIZE_8M; ret = TCE_TABLE_SIZE_8M;
}
return ret; return ret;
} }
...@@ -1418,8 +1426,7 @@ int __init detect_calgary(void) ...@@ -1418,8 +1426,7 @@ int __init detect_calgary(void)
return -ENOMEM; return -ENOMEM;
} }
specified_table_size = determine_tce_table_size((is_kdump_kernel() ? specified_table_size = determine_tce_table_size();
saved_max_pfn : max_pfn) * PAGE_SIZE);
for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) { for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) {
struct calgary_bus_info *info = &bus_info[bus]; struct calgary_bus_info *info = &bus_info[bus];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment