diff for duplicates of <1511236663.2466.4.camel@kernel.crashing.org> diff --git a/a/1.txt b/N1/1.txt index 199d3cc..277eb8a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> To test, you need a DD2.x chip and this series applied to your skiboot firmware: -https://patchwork.ozlabs.org/project/skiboot/list/?series\x14500 +https://patchwork.ozlabs.org/project/skiboot/list/?series=14500 arch/powerpc/include/asm/opal-api.h | 1 + arch/powerpc/include/asm/xive.h | 3 ++- @@ -95,8 +95,8 @@ index 6cff5bdfd6b7..a102efeabf05 100644 if (!vcpu->arch.xive_vcpu) continue; rc = xive_provision_queue(vcpu, prio); -- if (rc = 0) -+ if (rc = 0 && !xive->single_escalation) +- if (rc == 0) ++ if (rc == 0 && !xive->single_escalation) xive_attach_escalation(vcpu, prio); if (rc) return rc; @@ -134,14 +134,14 @@ index 6cff5bdfd6b7..a102efeabf05 100644 struct xive_q *q = &xc->queues[i]; + /* Single escalation, no queue 7 */ -+ if (i = 7 && xive->single_escalation) ++ if (i == 7 && xive->single_escalation) + break; + /* Is queue already enabled ? Provision it */ if (xive->qmap & (1 << i)) { r = xive_provision_queue(vcpu, i); -- if (r = 0) -+ if (r = 0 && !xive->single_escalation) +- if (r == 0) ++ if (r == 0 && !xive->single_escalation) xive_attach_escalation(vcpu, i); if (r) goto bail; @@ -166,7 +166,7 @@ index 6cff5bdfd6b7..a102efeabf05 100644 * If the source doesn't already have an IPI, allocate * one and get the corresponding data @@ -1761,6 +1775,8 @@ static int kvmppc_xive_create(struct kvm_device *dev, u32 type) - if (xive->vp_base = XIVE_INVALID_VP) + if (xive->vp_base == XIVE_INVALID_VP) ret = -ENOMEM; + xive->single_escalation = xive_native_has_single_escalation(); @@ -201,8 +201,8 @@ index 6ba63f8e8a61..a08ae6fd4c51 100644 */ static inline u8 xive_prio_from_guest(u8 prio) { -- if (prio = 0xff || prio < 8) -+ if (prio = 0xff || prio < 6) +- if (prio == 0xff || prio < 8) ++ if (prio == 0xff || prio < 6) return prio; - return 7; + return 6; @@ -210,7 +210,7 @@ index 6ba63f8e8a61..a08ae6fd4c51 100644 static inline u8 xive_prio_to_guest(u8 prio) { -- if (prio = 0xff || prio < 7) +- if (prio == 0xff || prio < 7) - return prio; - return 0xb; + return prio; diff --git a/a/content_digest b/N1/content_digest index 3566960..e4763df 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0[PATCH] powerpc/kvm/xive: Enable use of the new \"single escalation\" feature\0" - "Date\0Tue, 21 Nov 2017 03:57:43 +0000\0" + "Date\0Tue, 21 Nov 2017 14:57:43 +1100\0" "To\0Paul Mackerras <paulus@ozlabs.org>\0" "Cc\0kvm@vger.kernel.org" " kvm-ppc@vger.kernel.org\0" @@ -23,7 +23,7 @@ "To test, you need a DD2.x chip and this series applied to\n" "your skiboot firmware:\n" "\n" - "https://patchwork.ozlabs.org/project/skiboot/list/?series\024500\n" + "https://patchwork.ozlabs.org/project/skiboot/list/?series=14500\n" "\n" " arch/powerpc/include/asm/opal-api.h | 1 +\n" " arch/powerpc/include/asm/xive.h | 3 ++-\n" @@ -103,8 +103,8 @@ " \t\tif (!vcpu->arch.xive_vcpu)\n" " \t\t\tcontinue;\n" " \t\trc = xive_provision_queue(vcpu, prio);\n" - "-\t\tif (rc = 0)\n" - "+\t\tif (rc = 0 && !xive->single_escalation)\n" + "-\t\tif (rc == 0)\n" + "+\t\tif (rc == 0 && !xive->single_escalation)\n" " \t\t\txive_attach_escalation(vcpu, prio);\n" " \t\tif (rc)\n" " \t\t\treturn rc;\n" @@ -142,14 +142,14 @@ " \t\tstruct xive_q *q = &xc->queues[i];\n" " \n" "+\t\t/* Single escalation, no queue 7 */\n" - "+\t\tif (i = 7 && xive->single_escalation)\n" + "+\t\tif (i == 7 && xive->single_escalation)\n" "+\t\t\tbreak;\n" "+\n" " \t\t/* Is queue already enabled ? Provision it */\n" " \t\tif (xive->qmap & (1 << i)) {\n" " \t\t\tr = xive_provision_queue(vcpu, i);\n" - "-\t\t\tif (r = 0)\n" - "+\t\t\tif (r = 0 && !xive->single_escalation)\n" + "-\t\t\tif (r == 0)\n" + "+\t\t\tif (r == 0 && !xive->single_escalation)\n" " \t\t\t\txive_attach_escalation(vcpu, i);\n" " \t\t\tif (r)\n" " \t\t\t\tgoto bail;\n" @@ -174,7 +174,7 @@ " \t * If the source doesn't already have an IPI, allocate\n" " \t * one and get the corresponding data\n" "@@ -1761,6 +1775,8 @@ static int kvmppc_xive_create(struct kvm_device *dev, u32 type)\n" - " \tif (xive->vp_base = XIVE_INVALID_VP)\n" + " \tif (xive->vp_base == XIVE_INVALID_VP)\n" " \t\tret = -ENOMEM;\n" " \n" "+\txive->single_escalation = xive_native_has_single_escalation();\n" @@ -209,8 +209,8 @@ " */\n" " static inline u8 xive_prio_from_guest(u8 prio)\n" " {\n" - "-\tif (prio = 0xff || prio < 8)\n" - "+\tif (prio = 0xff || prio < 6)\n" + "-\tif (prio == 0xff || prio < 8)\n" + "+\tif (prio == 0xff || prio < 6)\n" " \t\treturn prio;\n" "-\treturn 7;\n" "+\treturn 6;\n" @@ -218,7 +218,7 @@ " \n" " static inline u8 xive_prio_to_guest(u8 prio)\n" " {\n" - "-\tif (prio = 0xff || prio < 7)\n" + "-\tif (prio == 0xff || prio < 7)\n" "-\t\treturn prio;\n" "-\treturn 0xb;\n" "+\treturn prio;\n" @@ -277,4 +277,4 @@ "+}\n" +EXPORT_SYMBOL_GPL(xive_native_has_single_escalation); -d6df07b198b912a8e426202565a5cc1466b1771d353fb80ad6c67d3d53c32a8e +145f2b465bc8e2c90e69860dfd864576f7a6a1294f49e4ba95c03d9aabec49fd
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.