diff for duplicates of <1467952040.13193.0.camel@neuling.org> diff --git a/a/1.txt b/N1/1.txt index 08c25c8..eaf83bc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,29 +1,28 @@ -> > >=20 +> > > > > > @@ -439,7 +540,18 @@ timebase_resync: -> > > =C2=A0 =C2=A0*/ -> > > =C2=A0 bne cr4,clear_lock -> > > =C2=A0 +> > > */ +> > > bne cr4,clear_lock +> > > > > > - /* Restore per core state */ > > > + /* -> > > + =C2=A0* First thread in the core to wake up and its waking up +> > > + * First thread in the core to wake up and its waking up > > > with -> > > + =C2=A0* complete hypervisor state loss. Restore per core +> > > + * complete hypervisor state loss. Restore per core > > > hypervisor -> > > + =C2=A0* state. -> > > + =C2=A0*/ +> > > + * state. +> > > + */ > > > +BEGIN_FTR_SECTION > > > + ld r4,_PTCR(r1) > > > + mtspr SPRN_PTCR,r4 > > > + ld r4,_RPR(r1) > > > + mtspr SPRN_RPR,r4 -> > RPR looks wrong here.=C2=A0=C2=A0This should be on POWER8 too. -> >=20 -> > This has changed since v6 and not noted in the v7 comments.=C2=A0=C2=A0= -Why are +> > RPR looks wrong here. This should be on POWER8 too. +> > +> > This has changed since v6 and not noted in the v7 comments. Why are > > you > > changing this now? -> >=20 +> > > RPR is a per-core resource in P9. So with this patch, RPR will continue > to be restored per-subcore in P8 and will restored once per core in P9. diff --git a/a/content_digest b/N1/content_digest index 754bfee..bc8f8d4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -16,31 +16,30 @@ "\00:1\0" "b\0" "\n" - "> > >=20\n" + "> > > \n" "> > > @@ -439,7 +540,18 @@ timebase_resync:\n" - "> > > =C2=A0\t=C2=A0*/\n" - "> > > =C2=A0\tbne\tcr4,clear_lock\n" - "> > > =C2=A0\n" + "> > > \302\240\t\302\240*/\n" + "> > > \302\240\tbne\tcr4,clear_lock\n" + "> > > \302\240\n" "> > > -\t/* Restore per core state */\n" "> > > +\t/*\n" - "> > > +\t=C2=A0* First thread in the core to wake up and its waking up\n" + "> > > +\t\302\240* First thread in the core to wake up and its waking up\n" "> > > with\n" - "> > > +\t=C2=A0* complete hypervisor state loss. Restore per core\n" + "> > > +\t\302\240* complete hypervisor state loss. Restore per core\n" "> > > hypervisor\n" - "> > > +\t=C2=A0* state.\n" - "> > > +\t=C2=A0*/\n" + "> > > +\t\302\240* state.\n" + "> > > +\t\302\240*/\n" "> > > +BEGIN_FTR_SECTION\n" "> > > +\tld\tr4,_PTCR(r1)\n" "> > > +\tmtspr\tSPRN_PTCR,r4\n" "> > > +\tld\tr4,_RPR(r1)\n" "> > > +\tmtspr\tSPRN_RPR,r4\n" - "> > RPR looks wrong here.=C2=A0=C2=A0This should be on POWER8 too.\n" - "> >=20\n" - "> > This has changed since v6 and not noted in the v7 comments.=C2=A0=C2=A0=\n" - "Why are\n" + "> > RPR looks wrong here.\302\240\302\240This should be on POWER8 too.\n" + "> > \n" + "> > This has changed since v6 and not noted in the v7 comments.\302\240\302\240Why are\n" "> > you\n" "> > changing this now?\n" - "> >=20\n" + "> > \n" "> RPR is a per-core resource in P9. So with this patch, RPR will continue\n" "> to be restored per-subcore in P8 and will restored once per core in P9.\n" "\n" @@ -48,4 +47,4 @@ "\n" Mikey -78df972c93d1168d8125a87d3a4b873838b590bc3cecb9a47bfe9b3837ab9966 +930488d32e0efdb3faff99d4bcbec1d2a4fa7cbde46e5e9788d07a380d26711f
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.