diff for duplicates of <7e579de3-cab2-0677-a3d0-d150ee72f839@arm.com> diff --git a/a/1.txt b/N1/1.txt index 146f540..9ca5701 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,38 +13,38 @@ On 25/05/18 11:00, Suzuki K Poulose wrote: >> applied immediately after we detect the CPU features of the boot CPU. >> >> Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org> ->> [julien.thierry at arm.com: rename to fit new cpufeature framework better, ->> ???????????? apply BOOT_SCOPE feature early in boot] +>> [julien.thierry@arm.com: rename to fit new cpufeature framework better, +>> apply BOOT_SCOPE feature early in boot] >> Signed-off-by: Julien Thierry <julien.thierry@arm.com> >> Cc: Catalin Marinas <catalin.marinas@arm.com> >> Cc: Will Deacon <will.deacon@arm.com> >> Cc: Christoffer Dall <christoffer.dall@linaro.org> >> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> >> --- ->> ? arch/arm64/include/asm/alternative.h |? 3 +-- ->> ? arch/arm64/include/asm/cpufeature.h? |? 2 ++ ->> ? arch/arm64/kernel/alternative.c????? | 30 +>> arch/arm64/include/asm/alternative.h | 3 +-- +>> arch/arm64/include/asm/cpufeature.h | 2 ++ +>> arch/arm64/kernel/alternative.c | 30 >> +++++++++++++++++++++++++++--- ->> ? arch/arm64/kernel/cpufeature.c?????? |? 5 +++++ ->> ? arch/arm64/kernel/smp.c????????????? |? 7 +++++++ ->> ? 5 files changed, 42 insertions(+), 5 deletions(-) +>> arch/arm64/kernel/cpufeature.c | 5 +++++ +>> arch/arm64/kernel/smp.c | 7 +++++++ +>> 5 files changed, 42 insertions(+), 5 deletions(-) >> > > ... > >> +unsigned long boot_capabilities; >> + ->> ? /* ->> ?? * Flag to indicate if we have computed the system wide ->> ?? * capabilities based on the boot time active CPUs. This +>> /* +>> * Flag to indicate if we have computed the system wide +>> * capabilities based on the boot time active CPUs. This >> @@ -1370,6 +1372,9 @@ static void __update_cpu_capabilities(const >> struct arm64_cpu_capabilities *caps, ->> ????????? if (!cpus_have_cap(caps->capability) && caps->desc) ->> ????????????? pr_info("%s %s\n", info, caps->desc); ->> ????????? cpus_set_cap(caps->capability); +>> if (!cpus_have_cap(caps->capability) && caps->desc) +>> pr_info("%s %s\n", info, caps->desc); +>> cpus_set_cap(caps->capability); >> + ->> +??????? if (scope_mask & SCOPE_BOOT_CPU) ->> +??????????? __set_bit(caps->capability, &boot_capabilities); +>> + if (scope_mask & SCOPE_BOOT_CPU) +>> + __set_bit(caps->capability, &boot_capabilities); > > Julien > @@ -56,7 +56,7 @@ On 25/05/18 11:00, Suzuki K Poulose wrote: > a "local" CPU erratum, which is not intended. You may change the above > check to : > -> ????if (caps->type & SCOPE_BOOT_CPU) +> if (caps->type & SCOPE_BOOT_CPU) > > to make sure you check the "capability" has the SCOPE_BOOT_CPU set. > diff --git a/a/content_digest b/N1/content_digest index c0e649c..1c1e15d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,21 @@ "ref\01527241772-48007-1-git-send-email-julien.thierry@arm.com\0" "ref\01527241772-48007-5-git-send-email-julien.thierry@arm.com\0" "ref\089769f8d-2ed0-1eb7-0373-09fc25f8071a@arm.com\0" - "From\0julien.thierry@arm.com (Julien Thierry)\0" - "Subject\0[PATCH v4 04/26] arm64: alternative: Apply alternatives early in boot process\0" + "From\0Julien Thierry <julien.thierry@arm.com>\0" + "Subject\0Re: [PATCH v4 04/26] arm64: alternative: Apply alternatives early in boot process\0" "Date\0Fri, 25 May 2018 11:25:34 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Suzuki K Poulose <Suzuki.Poulose@arm.com>" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0linux-kernel@vger.kernel.org" + daniel.thompson@linaro.org + joel@joelfernandes.org + marc.zyngier@arm.com + mark.rutland@arm.com + christoffer.dall@arm.com + james.morse@arm.com + catalin.marinas@arm.com + will.deacon@arm.com + " Christoffer Dall <christoffer.dall@linaro.org>\0" "\00:1\0" "b\0" "\n" @@ -22,38 +33,38 @@ ">> applied immediately after we detect the CPU features of the boot CPU.\n" ">>\n" ">> Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>\n" - ">> [julien.thierry at arm.com: rename to fit new cpufeature framework better,\n" - ">> ???????????? apply BOOT_SCOPE feature early in boot]\n" + ">> [julien.thierry@arm.com: rename to fit new cpufeature framework better,\n" + ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 apply BOOT_SCOPE feature early in boot]\n" ">> Signed-off-by: Julien Thierry <julien.thierry@arm.com>\n" ">> Cc: Catalin Marinas <catalin.marinas@arm.com>\n" ">> Cc: Will Deacon <will.deacon@arm.com>\n" ">> Cc: Christoffer Dall <christoffer.dall@linaro.org>\n" ">> Cc: Suzuki K Poulose <suzuki.poulose@arm.com>\n" ">> ---\n" - ">> ? arch/arm64/include/asm/alternative.h |? 3 +--\n" - ">> ? arch/arm64/include/asm/cpufeature.h? |? 2 ++\n" - ">> ? arch/arm64/kernel/alternative.c????? | 30 \n" + ">> \302\240 arch/arm64/include/asm/alternative.h |\302\240 3 +--\n" + ">> \302\240 arch/arm64/include/asm/cpufeature.h\302\240 |\302\240 2 ++\n" + ">> \302\240 arch/arm64/kernel/alternative.c\302\240\302\240\302\240\302\240\302\240 | 30 \n" ">> +++++++++++++++++++++++++++---\n" - ">> ? arch/arm64/kernel/cpufeature.c?????? |? 5 +++++\n" - ">> ? arch/arm64/kernel/smp.c????????????? |? 7 +++++++\n" - ">> ? 5 files changed, 42 insertions(+), 5 deletions(-)\n" + ">> \302\240 arch/arm64/kernel/cpufeature.c\302\240\302\240\302\240\302\240\302\240\302\240 |\302\240 5 +++++\n" + ">> \302\240 arch/arm64/kernel/smp.c\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 |\302\240 7 +++++++\n" + ">> \302\240 5 files changed, 42 insertions(+), 5 deletions(-)\n" ">>\n" "> \n" "> ...\n" "> \n" ">> +unsigned long boot_capabilities;\n" ">> +\n" - ">> ? /*\n" - ">> ?? * Flag to indicate if we have computed the system wide\n" - ">> ?? * capabilities based on the boot time active CPUs. This\n" + ">> \302\240 /*\n" + ">> \302\240\302\240 * Flag to indicate if we have computed the system wide\n" + ">> \302\240\302\240 * capabilities based on the boot time active CPUs. This\n" ">> @@ -1370,6 +1372,9 @@ static void __update_cpu_capabilities(const \n" ">> struct arm64_cpu_capabilities *caps,\n" - ">> ????????? if (!cpus_have_cap(caps->capability) && caps->desc)\n" - ">> ????????????? pr_info(\"%s %s\\n\", info, caps->desc);\n" - ">> ????????? cpus_set_cap(caps->capability);\n" + ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (!cpus_have_cap(caps->capability) && caps->desc)\n" + ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pr_info(\"%s %s\\n\", info, caps->desc);\n" + ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 cpus_set_cap(caps->capability);\n" ">> +\n" - ">> +??????? if (scope_mask & SCOPE_BOOT_CPU)\n" - ">> +??????????? __set_bit(caps->capability, &boot_capabilities);\n" + ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (scope_mask & SCOPE_BOOT_CPU)\n" + ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 __set_bit(caps->capability, &boot_capabilities);\n" "> \n" "> Julien\n" "> \n" @@ -65,7 +76,7 @@ "> a \"local\" CPU erratum, which is not intended. You may change the above \n" "> check to :\n" "> \n" - "> ????if (caps->type & SCOPE_BOOT_CPU)\n" + "> \302\240\302\240\302\240\302\240if (caps->type & SCOPE_BOOT_CPU)\n" "> \n" "> to make sure you check the \"capability\" has the SCOPE_BOOT_CPU set.\n" "> \n" @@ -77,4 +88,4 @@ "-- \n" Julien Thierry -47961d7028a46b93dce65e701f88fa5eb857e2721a49793b498a9dffd0579aac +15cb3b9324dc10edb864126e3e70b91ad96eba615b516a2ad718c00631c3863d
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.