Received-SPF: pass (google.com: domain of linux-kernel+bounces-169023-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240504183333.2031860-1-masahiroy@kernel.org> <20240504183333.2031860-10-masahiroy@kernel.org>
In-Reply-To: <20240504183333.2031860-10-masahiroy@kernel.org>
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Mon, 6 May 2024 00:01:50 +0900
Message-ID: <CAK7LNARNC0ma5FP8WJ23RP-8K2iEz3vDhoB7mhqaFyLP85zgpw@mail.gmail.com>
Subject: Re: [PATCH 10/10] kconfig: turn defaults and additional prompt for
 choice members into error
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Sun, May 5, 2024 at 3:34=E2=80=AFAM Masahiro Yamada <masahiroy@kernel.or=
g> wrote:
>
> menu_finalize() warns default properties for choice members and prompts
> outside the choice block. These should be hard errors.
>
> While I was here, I moved the checks to slim down menu_finalize().
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
>  scripts/kconfig/menu.c   | 10 ----------
>  scripts/kconfig/parser.y | 39 +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 39 insertions(+), 10 deletions(-)
>
> diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
> index a9b1e451dfe7..bee96c9964fd 100644
> --- a/scripts/kconfig/menu.c
> +++ b/scripts/kconfig/menu.c
> @@ -507,16 +507,6 @@ static void _menu_finalize(struct menu *parent, bool=
 inside_choice)
>                     menu->sym && !sym_is_choice_value(menu->sym)) {
>                         current_entry =3D menu;
>                         menu->sym->flags |=3D SYMBOL_CHOICEVAL;
> -                       for (prop =3D menu->sym->prop; prop; prop =3D pro=
p->next) {
> -                               if (prop->type =3D=3D P_DEFAULT)
> -                                       prop_warn(prop, "defaults for cho=
ice "
> -                                                 "values not supported")=
;
> -                               if (prop->menu =3D=3D menu)
> -                                       continue;
> -                               if (prop->type =3D=3D P_PROMPT &&
> -                                   prop->menu->parent->sym !=3D sym)
> -                                       prop_warn(prop, "choice value use=
d outside its choice group");
> -                       }
>                         /* Non-tristate choice values of tristate choices=
 must
>                          * depend on the choice being set to Y. The choic=
e
>                          * values' dependencies were propagated to their
> diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
> index ed86869e5ed0..0a9e249b5dcc 100644
> --- a/scripts/kconfig/parser.y
> +++ b/scripts/kconfig/parser.y
> @@ -476,6 +476,37 @@ assign_val:
>
>  %%
>
> +/**
> + * choice_check_sanity - check sanity of a choice member
> + *
> + * @menu: menu of the choice member
> + *
> + * Return: -1 if an error is found, 0 otherwise.
> + */
> +static int choice_check_sanity(struct menu *menu)
> +{
> +       struct property *prop;
> +       int ret =3D 0;
> +
> +       for (prop =3D menu->sym->prop; prop; prop =3D prop->next) {
> +               if (prop->type =3D=3D P_DEFAULT) {
> +                       fprintf(stderr, "%s:%d: error: %s",
> +                               prop->filename, prop->lineno,
> +                               "defaults for choice values not supported=
\n");
> +                       ret =3D -1;
> +               }
> +
> +               if (prop->menu !=3D menu && prop->type =3D=3D P_PROMPT) {
> +                       fprintf(stderr, "%s:%d: error: %s",
> +                               prop->filename, prop->lineno,
> +                               "choice value has a prompt outside its ch=
oice group\n");
> +                       ret =3D -1;
> +               }
> +       }
> +
> +       return ret;
> +}
> +


I observed an error in powerpc.

I will fix up this as follows:


diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
index 0a9e249b5dcc..ff709001b1f0 100644
--- a/scripts/kconfig/parser.y
+++ b/scripts/kconfig/parser.y
@@ -496,7 +496,8 @@ static int choice_check_sanity(struct menu *menu)
                        ret =3D -1;
                }

-               if (prop->menu !=3D menu && prop->type =3D=3D P_PROMPT) {
+               if (prop->menu !=3D menu && prop->type =3D=3D P_PROMPT &&
+                   prop->menu->parent !=3D menu->parent) {
                        fprintf(stderr, "%s:%d: error: %s",
                                prop->filename, prop->lineno,
                                "choice value has a prompt outside its
choice group\n");


--=20
Best Regards
Masahiro Yamada