diff options
| author | Thomas Huth <thuth@redhat.com> | 2016-09-28 13:16:30 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-10-13 12:58:06 +1100 |
| commit | 2e68f28854f0120c9a938a61b64aaf1eaecb162b (patch) | |
| tree | 7cf67971f3172ae234c2bb353daed2c93189eee5 /hw | |
| parent | 45a4f18e2ec40b96893c780c28ab18c246906355 (diff) | |
| download | focaccia-qemu-2e68f28854f0120c9a938a61b64aaf1eaecb162b.tar.gz focaccia-qemu-2e68f28854f0120c9a938a61b64aaf1eaecb162b.zip | |
ppc: Check the availability of transactional memory
KVM-PR currently does not support transactional memory, and the implementation in TCG is just a fake. We should not announce TM support in the ibm,pa-features property when running on such a system, so disable it by default and only enable it if the KVM implementation supports it (i.e. recent versions of KVM-HV). These changes are based on some earlier work from Anton Blanchard (thanks!). Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> (cherry picked from commit bac3bf287ab60e264b636f5f00c116a19b655762)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc/spapr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 9f0d99b438..82723d16cb 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -603,7 +603,7 @@ static void spapr_populate_pa_features(CPUPPCState *env, void *fdt, int offset) 0xf6, 0x1f, 0xc7, 0xc0, 0x80, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, - 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 }; + 0x80, 0x00, 0x80, 0x00, 0x00, 0x00 }; uint8_t *pa_features; size_t pa_size; @@ -632,6 +632,9 @@ static void spapr_populate_pa_features(CPUPPCState *env, void *fdt, int offset) */ pa_features[3] |= 0x20; } + if (kvmppc_has_cap_htm() && pa_size > 24) { + pa_features[24] |= 0x80; /* Transactional memory support */ + } _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", pa_features, pa_size))); } |