diff for duplicates of <1366761846.5825.21@snotra> diff --git a/a/1.txt b/N1/1.txt index 034085e..18f5afa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,19 +1,19 @@ On 04/19/2013 05:47:45 AM, Zhao Chenhui wrote: > From: Chen-Hui Zhao <chenhui.zhao@freescale.com> ->=20 +> > For e6500, two threads in one core share one time base. Just need > to do time base sync on first thread of one core, and skip it on > the other thread. ->=20 +> > Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> > Signed-off-by: Li Yang <leoli@freescale.com> > Signed-off-by: Andy Fleming <afleming@freescale.com> > --- -> arch/powerpc/platforms/85xx/smp.c | 52 =20 +> arch/powerpc/platforms/85xx/smp.c | 52 > +++++++++++++++++++++++++++++++----- > 1 files changed, 44 insertions(+), 8 deletions(-) ->=20 -> diff --git a/arch/powerpc/platforms/85xx/smp.c =20 +> +> diff --git a/arch/powerpc/platforms/85xx/smp.c > b/arch/powerpc/platforms/85xx/smp.c > index 74d8cde..5f3eee3 100644 > --- a/arch/powerpc/platforms/85xx/smp.c @@ -23,7 +23,7 @@ On 04/19/2013 05:47:45 AM, Zhao Chenhui wrote: > #include <asm/dbell.h> > #include <asm/fsl_guts.h> > +#include <asm/cputhreads.h> ->=20 +> > #include <sysdev/fsl_soc.h> > #include <sysdev/mpic.h> > @@ -45,6 +46,7 @@ static u64 timebase; @@ -31,32 +31,32 @@ On 04/19/2013 05:47:45 AM, Zhao Chenhui wrote: > static int tb_valid; > static u32 cur_booting_core; > +static bool rcpmv2; ->=20 +> > #ifdef CONFIG_PPC_E500MC > /* get a physical mask of online cores and booting core */ > @@ -53,26 +55,40 @@ static inline u32 get_phy_cpu_mask(void) > u32 mask; > int cpu; ->=20 -> - mask =3D 1 << cur_booting_core; +> +> - mask = 1 << cur_booting_core; > - for_each_online_cpu(cpu) -> - mask |=3D 1 << get_hard_smp_processor_id(cpu); +> - mask |= 1 << get_hard_smp_processor_id(cpu); > + if (smt_capable()) { > + /* two threads in one core share one time base */ -> + mask =3D 1 << cpu_core_index_of_thread(cur_booting_core); +> + mask = 1 << cpu_core_index_of_thread(cur_booting_core); > + for_each_online_cpu(cpu) -> + mask |=3D 1 << cpu_core_index_of_thread( +> + mask |= 1 << cpu_core_index_of_thread( > + get_hard_smp_processor_id(cpu)); > + } else { -> + mask =3D 1 << cur_booting_core; +> + mask = 1 << cur_booting_core; > + for_each_online_cpu(cpu) -> + mask |=3D 1 << get_hard_smp_processor_id(cpu); +> + mask |= 1 << get_hard_smp_processor_id(cpu); > + } -Where is smt_capable defined()? I assume somewhere in the patchset but =20 +Where is smt_capable defined()? I assume somewhere in the patchset but it's a pain to search 12 patches... -Is this really about whether we're SMT-capable or whether we have rcpm =20 +Is this really about whether we're SMT-capable or whether we have rcpm v2? --Scott= +-Scott diff --git a/a/content_digest b/N1/content_digest index 8e86e03..47e772d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,26 +4,26 @@ "Subject\0Re: [PATCH v2 12/15] powerpc/85xx: add time base sync support for e6500\0" "Date\0Tue, 23 Apr 2013 19:04:06 -0500\0" "To\0Zhao Chenhui <chenhui.zhao@freescale.com>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" - " linux-kernel@vger.kernel.org\0" + "Cc\0<linuxppc-dev@lists.ozlabs.org>" + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On 04/19/2013 05:47:45 AM, Zhao Chenhui wrote:\n" "> From: Chen-Hui Zhao <chenhui.zhao@freescale.com>\n" - ">=20\n" + "> \n" "> For e6500, two threads in one core share one time base. Just need\n" "> to do time base sync on first thread of one core, and skip it on\n" "> the other thread.\n" - ">=20\n" + "> \n" "> Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>\n" "> Signed-off-by: Li Yang <leoli@freescale.com>\n" "> Signed-off-by: Andy Fleming <afleming@freescale.com>\n" "> ---\n" - "> arch/powerpc/platforms/85xx/smp.c | 52 =20\n" + "> arch/powerpc/platforms/85xx/smp.c | 52 \n" "> +++++++++++++++++++++++++++++++-----\n" "> 1 files changed, 44 insertions(+), 8 deletions(-)\n" - ">=20\n" - "> diff --git a/arch/powerpc/platforms/85xx/smp.c =20\n" + "> \n" + "> diff --git a/arch/powerpc/platforms/85xx/smp.c \n" "> b/arch/powerpc/platforms/85xx/smp.c\n" "> index 74d8cde..5f3eee3 100644\n" "> --- a/arch/powerpc/platforms/85xx/smp.c\n" @@ -33,7 +33,7 @@ "> #include <asm/dbell.h>\n" "> #include <asm/fsl_guts.h>\n" "> +#include <asm/cputhreads.h>\n" - ">=20\n" + "> \n" "> #include <sysdev/fsl_soc.h>\n" "> #include <sysdev/mpic.h>\n" "> @@ -45,6 +46,7 @@ static u64 timebase;\n" @@ -41,34 +41,34 @@ "> static int tb_valid;\n" "> static u32 cur_booting_core;\n" "> +static bool rcpmv2;\n" - ">=20\n" + "> \n" "> #ifdef CONFIG_PPC_E500MC\n" "> /* get a physical mask of online cores and booting core */\n" "> @@ -53,26 +55,40 @@ static inline u32 get_phy_cpu_mask(void)\n" "> \tu32 mask;\n" "> \tint cpu;\n" - ">=20\n" - "> -\tmask =3D 1 << cur_booting_core;\n" + "> \n" + "> -\tmask = 1 << cur_booting_core;\n" "> -\tfor_each_online_cpu(cpu)\n" - "> -\t\tmask |=3D 1 << get_hard_smp_processor_id(cpu);\n" + "> -\t\tmask |= 1 << get_hard_smp_processor_id(cpu);\n" "> +\tif (smt_capable()) {\n" "> +\t\t/* two threads in one core share one time base */\n" - "> +\t\tmask =3D 1 << cpu_core_index_of_thread(cur_booting_core);\n" + "> +\t\tmask = 1 << cpu_core_index_of_thread(cur_booting_core);\n" "> +\t\tfor_each_online_cpu(cpu)\n" - "> +\t\t\tmask |=3D 1 << cpu_core_index_of_thread(\n" + "> +\t\t\tmask |= 1 << cpu_core_index_of_thread(\n" "> +\t\t\t\t\tget_hard_smp_processor_id(cpu));\n" "> +\t} else {\n" - "> +\t\tmask =3D 1 << cur_booting_core;\n" + "> +\t\tmask = 1 << cur_booting_core;\n" "> +\t\tfor_each_online_cpu(cpu)\n" - "> +\t\t\tmask |=3D 1 << get_hard_smp_processor_id(cpu);\n" + "> +\t\t\tmask |= 1 << get_hard_smp_processor_id(cpu);\n" "> +\t}\n" "\n" - "Where is smt_capable defined()? I assume somewhere in the patchset but =20\n" + "Where is smt_capable defined()? I assume somewhere in the patchset but \n" "it's a pain to search 12 patches...\n" "\n" - "Is this really about whether we're SMT-capable or whether we have rcpm =20\n" + "Is this really about whether we're SMT-capable or whether we have rcpm \n" "v2?\n" "\n" - -Scott= + -Scott -dc652cc535e36cc36109aa633df9997652b55f9d6ba1b9f01a884ce2c02f355c +d5468181732ff32b9be30443990ac77b3fbd6904caf2f9c4154b2f30cf48abcc
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.