提交 9048e648 编写于 作者: A Alexander Graf 提交者: Benjamin Herrenschmidt

powerpc: Use 64k io pages when we never see an HEA

When we never get around to seeing an HEA ethernet adapter, there's
no point in restricting ourselves to 4k IO page size.

This speeds up IO maps when CONFIG_IBMEBUS is disabled.

[ Updated the test to also lift the restriction on arch 2.07
  (Power 8) which cannot have an HEA
 -- BenH ]
Signed-off-by: NAlexander Graf <agraf@suse.de>
Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>

foo
上级 00f554fa
...@@ -445,6 +445,24 @@ static void mmu_psize_set_default_penc(void) ...@@ -445,6 +445,24 @@ static void mmu_psize_set_default_penc(void)
mmu_psize_defs[bpsize].penc[apsize] = -1; mmu_psize_defs[bpsize].penc[apsize] = -1;
} }
#ifdef CONFIG_PPC_64K_PAGES
static bool might_have_hea(void)
{
/*
* The HEA ethernet adapter requires awareness of the
* GX bus. Without that awareness we can easily assume
* we will never see an HEA ethernet device.
*/
#ifdef CONFIG_IBMEBUS
return !cpu_has_feature(CPU_FTR_ARCH_207S);
#else
return false;
#endif
}
#endif /* #ifdef CONFIG_PPC_64K_PAGES */
static void __init htab_init_page_sizes(void) static void __init htab_init_page_sizes(void)
{ {
int rc; int rc;
...@@ -499,10 +517,11 @@ static void __init htab_init_page_sizes(void) ...@@ -499,10 +517,11 @@ static void __init htab_init_page_sizes(void)
mmu_linear_psize = MMU_PAGE_64K; mmu_linear_psize = MMU_PAGE_64K;
if (mmu_has_feature(MMU_FTR_CI_LARGE_PAGE)) { if (mmu_has_feature(MMU_FTR_CI_LARGE_PAGE)) {
/* /*
* Don't use 64k pages for ioremap on pSeries, since * When running on pSeries using 64k pages for ioremap
* that would stop us accessing the HEA ethernet. * would stop us accessing the HEA ethernet. So if we
* have the chance of ever seeing one, stay at 4k.
*/ */
if (!machine_is(pseries)) if (!might_have_hea() || !machine_is(pseries))
mmu_io_psize = MMU_PAGE_64K; mmu_io_psize = MMU_PAGE_64K;
} else } else
mmu_ci_restrictions = 1; mmu_ci_restrictions = 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册