diff for duplicates of <20180112023716.9963-2-benh@kernel.crashing.org> diff --git a/a/1.txt b/N1/1.txt index 7d3d754..4a0c87e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -89,8 +89,8 @@ index cd21c891be9e..87f814e81e7d 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; @@ -128,14 +128,14 @@ index cd21c891be9e..87f814e81e7d 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; @@ -160,7 +160,7 @@ index cd21c891be9e..87f814e81e7d 100644 * If the source doesn't already have an IPI, allocate * one and get the corresponding data @@ -1762,6 +1776,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(); @@ -195,8 +195,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; @@ -204,7 +204,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 a3f9354..1ac3498 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,10 @@ "ref\020180112023716.9963-1-benh@kernel.crashing.org\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0[PATCH v4 2/6] powerpc/kvm/xive: Enable use of the new \"single escalation\" feature\0" - "Date\0Fri, 12 Jan 2018 02:37:12 +0000\0" + "Date\0Fri, 12 Jan 2018 13:37:12 +1100\0" "To\0linuxppc-dev@lists.ozlabs.org" kvm-ppc@vger.kernel.org " kvm@vger.kernel.org\0" - "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "\00:1\0" "b\0" "That feature, provided by Power9 DDD2.0 and later, when supported\n" @@ -99,8 +98,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" @@ -138,14 +137,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" @@ -170,7 +169,7 @@ " \t * If the source doesn't already have an IPI, allocate\n" " \t * one and get the corresponding data\n" "@@ -1762,6 +1776,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" @@ -205,8 +204,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" @@ -214,7 +213,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" @@ -275,4 +274,4 @@ "-- \n" 2.14.3 -fa6c723de567555141c9220e8ee7cec42aeff037067bf2cf7b532d1c9a2f9ca4 +36bd9df10e29e380613d35a60282c39535397321828ea677581ee3a99e47cc48
diff --git a/a/1.txt b/N2/1.txt index 7d3d754..4a0c87e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -89,8 +89,8 @@ index cd21c891be9e..87f814e81e7d 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; @@ -128,14 +128,14 @@ index cd21c891be9e..87f814e81e7d 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; @@ -160,7 +160,7 @@ index cd21c891be9e..87f814e81e7d 100644 * If the source doesn't already have an IPI, allocate * one and get the corresponding data @@ -1762,6 +1776,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(); @@ -195,8 +195,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; @@ -204,7 +204,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/N2/content_digest index a3f9354..87cc71c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020180112023716.9963-1-benh@kernel.crashing.org\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0[PATCH v4 2/6] powerpc/kvm/xive: Enable use of the new \"single escalation\" feature\0" - "Date\0Fri, 12 Jan 2018 02:37:12 +0000\0" + "Date\0Fri, 12 Jan 2018 13:37:12 +1100\0" "To\0linuxppc-dev@lists.ozlabs.org" kvm-ppc@vger.kernel.org " kvm@vger.kernel.org\0" @@ -99,8 +99,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" @@ -138,14 +138,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" @@ -170,7 +170,7 @@ " \t * If the source doesn't already have an IPI, allocate\n" " \t * one and get the corresponding data\n" "@@ -1762,6 +1776,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" @@ -205,8 +205,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" @@ -214,7 +214,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" @@ -275,4 +275,4 @@ "-- \n" 2.14.3 -fa6c723de567555141c9220e8ee7cec42aeff037067bf2cf7b532d1c9a2f9ca4 +c211d2a4b1b8dc183564293c7bbc4b1ca091c2b8f8db0b5d14a12208b8d91787
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.