diff for duplicates of <1473383336.30217.96.camel@buserror.net> diff --git a/a/1.txt b/N1/1.txt index 3733f1a..e05bf9e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,36 +1,36 @@ On Fri, 2016-08-26 at 13:40 +0100, Marc Zyngier wrote: > On Thu, 7 Jul 2016 02:46:11 -0500 -> Scott Wood <oss@buserror.net> wrote: +> Scott Wood <oss-fOR+EgIDQEHk1uMJSBkQmQ@public.gmane.org> wrote: > > (+Mark) > > > -> > ?static __always_inline -> > ?u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg) -> > ?{ +> > static __always_inline +> > u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg) +> > { > > @@ -66,19 +102,19 @@ u32 arch_timer_reg_read_cp15(int access, enum > > arch_timer_reg reg) -> > ? if (access == ARCH_TIMER_PHYS_ACCESS) { -> > ? switch (reg) { -> > ? case ARCH_TIMER_REG_CTRL: -> > - asm volatile("mrs %0,??cntp_ctl_el0" : "=r" +> > if (access == ARCH_TIMER_PHYS_ACCESS) { +> > switch (reg) { +> > case ARCH_TIMER_REG_CTRL: +> > - asm volatile("mrs %0, cntp_ctl_el0" : "=r" > > (val)); > > + asm volatile("mrs %0, cntp_ctl_el0" : "=r" > > (val)); > Spurious change? > > > -> > ? break; -> > ? case ARCH_TIMER_REG_TVAL: +> > break; +> > case ARCH_TIMER_REG_TVAL: > > - asm volatile("mrs %0, cntp_tval_el0" : "=r" > > (val)); > > + val = _arch_timer_get_ptval(); -> > ? break; -> > ? } -> > ? } else if (access == ARCH_TIMER_VIRT_ACCESS) { -> > ? switch (reg) { -> > ? case ARCH_TIMER_REG_CTRL: -> > - asm volatile("mrs %0,??cntv_ctl_el0" : "=r" +> > break; +> > } +> > } else if (access == ARCH_TIMER_VIRT_ACCESS) { +> > switch (reg) { +> > case ARCH_TIMER_REG_CTRL: +> > - asm volatile("mrs %0, cntv_ctl_el0" : "=r" > > (val)); > > + asm volatile("mrs %0, cntv_ctl_el0" : "=r" > > (val)); @@ -38,11 +38,11 @@ On Fri, 2016-08-26 at 13:40 +0100, Marc Zyngier wrote: No, it's not spurious. -I answered this in?http://lists.infradead.org/pipermail/linux-arm-kernel/2016- +I answered this in http://lists.infradead.org/pipermail/linux-arm-kernel/2016- June/438310.html The extra spacing seemed to be an attempt to get things to line up between the -CTRL and TVAL asm statements.??When the TVAL case was converted to a function +CTRL and TVAL asm statements. When the TVAL case was converted to a function call, there was nothing for the above to line up with, so I moved it back to normal spacing. @@ -55,8 +55,13 @@ normal spacing. > "clocksource.arm_arch_timer.fsl-a008585=1", which would enable the > workaround. -OK, I'll respin with a command line argument to use for now. ?Mike Caraman has +OK, I'll respin with a command line argument to use for now. Mike Caraman has said he plans to do a better solution for KVM -- Mike, have you had a chance to look at this? -Scott + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 22f4a3b..e453c30 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,45 +1,54 @@ "ref\01467877572-10817-1-git-send-email-oss@buserror.net\0" "ref\01467877572-10817-3-git-send-email-oss@buserror.net\0" "ref\020160826134004.7e86e798@arm.com\0" - "From\0oss@buserror.net (Scott Wood)\0" - "Subject\0[PATCH v4 3/4] arm64: arch_timer: Work around QorIQ Erratum A-008585\0" + "ref\020160826134004.7e86e798-5wv7dgnIgG8@public.gmane.org\0" + "From\0Scott Wood <oss-fOR+EgIDQEHk1uMJSBkQmQ@public.gmane.org>\0" + "Subject\0Re: [PATCH v4 3/4] arm64: arch_timer: Work around QorIQ Erratum A-008585\0" "Date\0Thu, 08 Sep 2016 20:08:56 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Marc Zyngier <marc.zyngier-5wv7dgnIgG8@public.gmane.org>\0" + "Cc\0Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>" + Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + stuart.yoder-3arQi8VN3Tc@public.gmane.org + Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> + Mark Rutland <Mark.Rutland-5wv7dgnIgG8@public.gmane.org> + " mike.caraman-3arQi8VN3Tc@public.gmane.org\0" "\00:1\0" "b\0" "On Fri, 2016-08-26 at 13:40 +0100, Marc Zyngier wrote:\n" "> On Thu, 7 Jul 2016 02:46:11 -0500\n" - "> Scott Wood <oss@buserror.net> wrote:\n" + "> Scott Wood <oss-fOR+EgIDQEHk1uMJSBkQmQ@public.gmane.org> wrote:\n" "> \n" "> (+Mark)\n" "> \n" "> > \n" - "> > ?static __always_inline\n" - "> > ?u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg)\n" - "> > ?{\n" + "> > \302\240static __always_inline\n" + "> > \302\240u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg)\n" + "> > \302\240{\n" "> > @@ -66,19 +102,19 @@ u32 arch_timer_reg_read_cp15(int access, enum\n" "> > arch_timer_reg reg)\n" - "> > ?\tif (access == ARCH_TIMER_PHYS_ACCESS) {\n" - "> > ?\t\tswitch (reg) {\n" - "> > ?\t\tcase ARCH_TIMER_REG_CTRL:\n" - "> > -\t\t\tasm volatile(\"mrs %0,??cntp_ctl_el0\" : \"=r\"\n" + "> > \302\240\tif (access == ARCH_TIMER_PHYS_ACCESS) {\n" + "> > \302\240\t\tswitch (reg) {\n" + "> > \302\240\t\tcase ARCH_TIMER_REG_CTRL:\n" + "> > -\t\t\tasm volatile(\"mrs %0,\302\240\302\240cntp_ctl_el0\" : \"=r\"\n" "> > (val));\n" "> > +\t\t\tasm volatile(\"mrs %0, cntp_ctl_el0\" : \"=r\"\n" "> > (val));\n" "> Spurious change?\n" "> \n" "> > \n" - "> > ?\t\t\tbreak;\n" - "> > ?\t\tcase ARCH_TIMER_REG_TVAL:\n" + "> > \302\240\t\t\tbreak;\n" + "> > \302\240\t\tcase ARCH_TIMER_REG_TVAL:\n" "> > -\t\t\tasm volatile(\"mrs %0, cntp_tval_el0\" : \"=r\"\n" "> > (val));\n" "> > +\t\t\tval = _arch_timer_get_ptval();\n" - "> > ?\t\t\tbreak;\n" - "> > ?\t\t}\n" - "> > ?\t} else if (access == ARCH_TIMER_VIRT_ACCESS) {\n" - "> > ?\t\tswitch (reg) {\n" - "> > ?\t\tcase ARCH_TIMER_REG_CTRL:\n" - "> > -\t\t\tasm volatile(\"mrs %0,??cntv_ctl_el0\" : \"=r\"\n" + "> > \302\240\t\t\tbreak;\n" + "> > \302\240\t\t}\n" + "> > \302\240\t} else if (access == ARCH_TIMER_VIRT_ACCESS) {\n" + "> > \302\240\t\tswitch (reg) {\n" + "> > \302\240\t\tcase ARCH_TIMER_REG_CTRL:\n" + "> > -\t\t\tasm volatile(\"mrs %0,\302\240\302\240cntv_ctl_el0\" : \"=r\"\n" "> > (val));\n" "> > +\t\t\tasm volatile(\"mrs %0, cntv_ctl_el0\" : \"=r\"\n" "> > (val));\n" @@ -47,11 +56,11 @@ "\n" "No, it's not spurious.\n" "\n" - "I answered this in?http://lists.infradead.org/pipermail/linux-arm-kernel/2016-\n" + "I answered this in\302\240http://lists.infradead.org/pipermail/linux-arm-kernel/2016-\n" "June/438310.html\n" "\n" "The extra spacing seemed to be an attempt to get things to line up between the\n" - "CTRL and TVAL asm statements.??When the TVAL case was converted to a function\n" + "CTRL and TVAL asm statements.\302\240\302\240When the TVAL case was converted to a function\n" "call, there was nothing for the above to line up with, so I moved it back to\n" "normal spacing.\n" "\n" @@ -64,10 +73,15 @@ "> \"clocksource.arm_arch_timer.fsl-a008585=1\", which would enable the\n" "> workaround.\n" "\n" - "OK, I'll respin with a command line argument to use for now. ?Mike Caraman has\n" + "OK, I'll respin with a command line argument to use for now. \302\240Mike Caraman has\n" "said he plans to do a better solution for KVM -- Mike, have you had a chance\n" "to look at this?\n" "\n" - -Scott + "-Scott\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -6f8db9b1ab2529e8f8ce60c1b5abd87c85d3feecbfc743f7030f497878bc21a5 +07697e6a28a47e0b8a4afd3add65cb8d400f39c3d563f087710c615fa521976a
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.