Home Home > GIT Browse > openSUSE-42.2
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-01-11 16:15:06 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-01-11 16:18:15 +0100
commit150934f28dbb7ecb613fb2d1e3693711a9d839d0 (patch)
tree5cee06039a532e5c7ea2513c732427ac0dc692b6
parent46649ed7488fd251e9e75aa86f2e1c7de29aa66c (diff)
Revert "Re-enable fixup detection by CPU type in case hypervisor call
fails." The firmware update is required for the existing instructions to also do the cache flush. suse-commit: dfcad1d78f4ae48faf87f1dd82074bf5c02380b4
-rw-r--r--arch/powerpc/platforms/powernv/setup.c11
-rw-r--r--arch/powerpc/platforms/pseries/setup.c11
2 files changed, 4 insertions, 18 deletions
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index f813b5adfa37..4e04834a458d 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -44,15 +44,8 @@ static void pnv_setup_rfi_flush(void)
enum l1d_flush_type type;
int enable;
- if (pvr_version_is(PVR_POWER7) || pvr_version_is(PVR_POWER7p))
- type = L1D_FLUSH_NONE;
- else if (pvr_version_is(PVR_POWER8E) || pvr_version_is(PVR_POWER8NVL) ||
- pvr_version_is(PVR_POWER8))
- type = L1D_FLUSH_ORI;
- else {
- /* Default to fallback in case fw-features are not available */
- type = L1D_FLUSH_FALLBACK;
- }
+ /* Default to fallback in case fw-features are not available */
+ type = L1D_FLUSH_FALLBACK;
enable = 1;
np = of_find_node_by_name(NULL, "ibm,opal");
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index f703b1ffcb15..5c1d4eda6c8f 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -570,15 +570,8 @@ void pseries_setup_rfi_flush(void)
if (!(behaviour & H_GET_CPU_CHAR_BEHAV_L1_FLUSH_LOW_PRIV))
enable = false;
} else {
- if (pvr_version_is(PVR_POWER7) || pvr_version_is(PVR_POWER7p))
- types = L1D_FLUSH_NONE;
- else if (pvr_version_is(PVR_POWER8E) || pvr_version_is(PVR_POWER8NVL) ||
- pvr_version_is(PVR_POWER8))
- types = L1D_FLUSH_ORI;
- else {
- /* Default to fallback if case hcall is not available */
- types = L1D_FLUSH_FALLBACK;
- }
+ /* Default to fallback if case hcall is not available */
+ types = L1D_FLUSH_FALLBACK;
}
setup_rfi_flush(types, enable);