From 07f03d3dc9e9130bcece19f3611f2d56d4cb6b1ed0cd1b0c7191ad09a5933dae Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Thu, 23 Jul 2020 19:42:44 +0000 Subject: [PATCH] Accepting request 822503 from home:lyan:branches:Virtualization Don't disable cap_cfpc on POWER8 by default OBS-URL: https://build.opensuse.org/request/show/822503 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=554 --- bundles.tar.xz | 4 +- ...spapr_caps-Don-t-disable-cap_cfpc-on.patch | 38 +++++++++++++++++++ qemu.changes | 5 +++ qemu.spec | 2 + 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 ppc-spapr_caps-Don-t-disable-cap_cfpc-on.patch diff --git a/bundles.tar.xz b/bundles.tar.xz index f43dc7d..1c6cfc1 100644 --- a/bundles.tar.xz +++ b/bundles.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3100e9fea5e800afc25cff3f405b4645ba98f79cf6ff36e27f120a33c1e8ffc -size 58452 +oid sha256:98bbc84339311458aaa7725097230b2d8b9ab7076f44d830bb2d31a4b277a63a +size 60868 diff --git a/ppc-spapr_caps-Don-t-disable-cap_cfpc-on.patch b/ppc-spapr_caps-Don-t-disable-cap_cfpc-on.patch new file mode 100644 index 0000000..29d3c68 --- /dev/null +++ b/ppc-spapr_caps-Don-t-disable-cap_cfpc-on.patch @@ -0,0 +1,38 @@ +From: Suraj Jitindar Singh +Date: Tue, 12 Jun 2018 15:16:30 +1000 +Subject: ppc/spapr_caps: Don't disable cap_cfpc on POWER8 by default + +Git-commit: b2540203bdf4a390c3489146eae82ce237303653 +References: bsc#1174374 + +In default_caps_with_cpu() we set spapr_cap_cfpc to broken for POWER8 +processors and before. + +Since we no longer require private l1d cache on POWER8 for this cap to +be set to workaround change this to default to broken for POWER7 +processors and before. + +Signed-off-by: Suraj Jitindar Singh +Reviewed-by: David Gibson +Signed-off-by: David Gibson +Signed-off-by: Liang Yan +--- + hw/ppc/spapr_caps.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c +index eb54f9422722f8be922c275c4217..1134f7a1c7cd51be7d0111c6bf85 100644 +--- a/hw/ppc/spapr_caps.c ++++ b/hw/ppc/spapr_caps.c +@@ -643,11 +643,6 @@ static SpaprCapabilities default_caps_with_cpu(SpaprMachineState *spapr, + + caps = smc->default_caps; + +- if (!ppc_type_check_compat(cputype, CPU_POWERPC_LOGICAL_3_00, +- 0, spapr->max_compat_pvr)) { +- caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_OFF; +- } +- + if (!ppc_type_check_compat(cputype, CPU_POWERPC_LOGICAL_2_07, + 0, spapr->max_compat_pvr)) { + caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF; diff --git a/qemu.changes b/qemu.changes index f8f607b..18eac81 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 23 19:26:05 UTC 2020 - Liang Yan + +- Don't disable cap_cfpc on POWER8 by default (bsc#1174374) + ------------------------------------------------------------------- Tue Jul 21 15:58:10 UTC 2020 - Bruce Rogers diff --git a/qemu.spec b/qemu.spec index 3a09ba7..e2c3ce5 100644 --- a/qemu.spec +++ b/qemu.spec @@ -196,6 +196,7 @@ Patch00065: configure-remove-pkgversion-from-CONFIG_.patch Patch00066: gcc10-maybe-uninitialized.patch Patch00067: docs-add-SUSE-support-statements-to-html.patch Patch00068: docs-fix-trace-docs-build-with-sphinx-3..patch +Patch00069: ppc-spapr_caps-Don-t-disable-cap_cfpc-on.patch # Patches applied in roms/seabios/: Patch01000: seabios-use-python2-explicitly-as-needed.patch Patch01001: seabios-switch-to-python3-as-needed.patch @@ -976,6 +977,7 @@ This package provides a service file for starting and stopping KSM. %patch00067 -p1 %endif %patch00068 -p1 +%patch00069 -p1 %patch01000 -p1 %patch01001 -p1 %patch01002 -p1