diff for duplicates of <20250303094022.GA13345@e133081.arm.com> diff --git a/a/1.txt b/N1/1.txt index dd4d77b..33c680b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -62,54 +62,4 @@ On Fri, Feb 28, 2025 at 06:45:38PM -0800, Yang Shi wrote: > > Hi Miko, > > > > I added AmpereOne mdir on top of this patch. I can see BBML2 feature is -> > detected via dmesg. But system_supports_bbml2_noabort() returns false. -> > The warning in the below debug patch is triggered: -> > -> > diff --git a/arch/arm64/kernel/cpufeature.c -> > b/arch/arm64/kernel/cpufeature.c -> > index faa9094d97dd..a70829ae2bd0 100644 -> > --- a/arch/arm64/kernel/cpufeature.c -> > +++ b/arch/arm64/kernel/cpufeature.c -> > @@ -3814,6 +3814,9 @@ void __init setup_system_features(void) -> > { -> > setup_system_capabilities(); -> > -> > + if (!system_supports_bbml2_noabort()) -> > + WARN_ON_ONCE(1); -> > + -> > kpti_install_ng_mappings(); -> > -> > sve_setup(); -> > -> > I thought it may be too early. But it seems other system features work -> > well, for example, MPAM. I didn't figure out why. It is weird. -> -> I just figured out the problem It is because the wrong kconfig name is used -> in cpucaps.h. The code is: -> -> + case ARM64_HAS_BBML2_NOABORT: -> + return IS_ENABLED(CONFIG_ARM64_BBML2_NOABORT); -> -> But the kconfig name actually is: -> -> +config ARM64_ENABLE_BBML2_NOABORT -> -> IMHO, the "ENABLE" in kconfig name sounds unnecessary. -> -> Thanks, -> Yang -> -> - -Hi Yang, - -Thank you for the review, and apologies for the slight delay. - -Thanks again for the spot, I agree that `ENABLE` is probably redundant -(and clearly, caused an issue here). Will remove this. Please let me -know if there are any other issues with rebasing your patches on top of -mine. - --- -Kind regards, -Mikołaj Lenczewski +> > detected via dmesg. But system_supports_bbml2_noabort() returns false diff --git a/a/content_digest b/N1/content_digest index 2317a6c..4179319 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -94,56 +94,6 @@ "> > Hi Miko,\n" "> > \n" "> > I added AmpereOne mdir on top of this patch. I can see BBML2 feature is\n" - "> > detected via dmesg. But system_supports_bbml2_noabort() returns false.\n" - "> > The warning in the below debug patch is triggered:\n" - "> > \n" - "> > diff --git a/arch/arm64/kernel/cpufeature.c\n" - "> > b/arch/arm64/kernel/cpufeature.c\n" - "> > index faa9094d97dd..a70829ae2bd0 100644\n" - "> > --- a/arch/arm64/kernel/cpufeature.c\n" - "> > +++ b/arch/arm64/kernel/cpufeature.c\n" - "> > @@ -3814,6 +3814,9 @@ void __init setup_system_features(void)\n" - "> > \302\240{\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240 setup_system_capabilities();\n" - "> > \n" - "> > +\302\240\302\240\302\240\302\240\302\240\302\240 if (!system_supports_bbml2_noabort())\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\302\240 WARN_ON_ONCE(1);\n" - "> > +\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240 kpti_install_ng_mappings();\n" - "> > \n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240 sve_setup();\n" - "> > \n" - "> > I thought it may be too early. But it seems other system features work\n" - "> > well, for example, MPAM. I didn't figure out why. It is weird.\n" - "> \n" - "> I just figured out the problem It is because the wrong kconfig name is used\n" - "> in cpucaps.h. The code is:\n" - "> \n" - "> +\302\240\302\240\302\240 case ARM64_HAS_BBML2_NOABORT:\n" - "> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 return IS_ENABLED(CONFIG_ARM64_BBML2_NOABORT);\n" - "> \n" - "> But the kconfig name actually is:\n" - "> \n" - "> +config ARM64_ENABLE_BBML2_NOABORT\n" - "> \n" - "> IMHO, the \"ENABLE\" in kconfig name sounds unnecessary.\n" - "> \n" - "> Thanks,\n" - "> Yang\n" - "> \n" - "> \n" - "\n" - "Hi Yang,\n" - "\n" - "Thank you for the review, and apologies for the slight delay.\n" - "\n" - "Thanks again for the spot, I agree that `ENABLE` is probably redundant\n" - "(and clearly, caused an issue here). Will remove this. Please let me\n" - "know if there are any other issues with rebasing your patches on top of\n" - "mine.\n" - "\n" - "-- \n" - "Kind regards,\n" - "Miko\305\202aj Lenczewski" + > > detected via dmesg. But system_supports_bbml2_noabort() returns false -b1b5861dbbc42be108d0724e951303dc649b2af98774a1d8eb4e3556d9d4d482 +e870ab4ad356b9d074d364e0165e53acdd70bd3ac7be0a4be99437f3a0968a07
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox