Re: [PATCH v4] kconfig/symbol.c: handle choice_values that depend on 'm' symbols

[Dirk Gouders <dirk@gouders.net>]

Bin Liu <binmlist@gmail.com> writes:

> All,
>
> On Mon, Nov 18, 2013 at 12:08 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>> Dirk, All,
>>
>> On 2013-11-07 15:05 +0100, Dirk Gouders spake thusly:
>>> If choices consist of choice_values that depend on symbols set to 'm',
>>> those choice_values are not set to 'n' if the choice is changed from
>>> 'm' to 'y' (in which case only one active choice_value is allowed).
>>> Those values are also written to the config file causing modules to be
>>> built when they should not.
>>>
>>> The following config can be used to reproduce and examine the problem;
>>> with the frontend of your choice set "Choice 0" and "Choice 1" to 'm',
>>> then set "Tristate Choice" to 'y' and save the configuration:
>>>
>>> config modules
>>>       boolean modules
>>>       default y
>>>       option modules
>>>
>>> config dependency
>>>       tristate "Dependency"
>>>       default m
>>>
>>> choice
>>>       prompt "Tristate Choice"
>>>       default choice0
>>>
>>> config choice0
>>>       tristate "Choice 0"
>>>
>>> config choice1
>>>       tristate "Choice 1"
>>>       depends on dependency
>>>
>>> endchoice
>>>
>>> This patch sets choice_values' visibility that depend on symbols set
>>> to 'm' to 'n' if the corresponding choice is set to 'y'.  This makes
>>> them disappear from the choice list and will also cause the
>>> choice_values' value set to 'n' in sym_calc_value() and as a result
>>> they are written as "not set" to the resulting .config file.
>>>
>>> Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>>> Signed-off-by: Dirk Gouders <dirk@gouders.net>
>>> Tested-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>>
>> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>>
>> It will be in my tree soon. Thanks!
>
> I don't see this patch in 3.16 but 3.16 does not have the issue any
> more. Anyone has an idea how the issue got fixed? I am trying to find
> the right patch to backport.

With the above sample kconfig I still see the issue.  How did you
notice the issue got fixed?

Dirk

>
> Thanks,
> -Bin.
>
>>
>> Regards,
>> Yann E. MORIN.
>>
>>> ---
>>>  scripts/kconfig/symbol.c | 11 +++++++++++
>>>  1 file changed, 11 insertions(+)
>>>
>>> diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
>>> index c9a6775..06d96c9 100644
>>> --- a/scripts/kconfig/symbol.c
>>> +++ b/scripts/kconfig/symbol.c
>>> @@ -189,12 +189,23 @@ static void sym_validate_range(struct symbol *sym)
>>>  static void sym_calc_visibility(struct symbol *sym)
>>>  {
>>>       struct property *prop;
>>> +     struct symbol *choice_sym = NULL;
>>>       tristate tri;
>>>
>>>       /* any prompt visible? */
>>>       tri = no;
>>> +
>>> +     if (sym_is_choice_value(sym))
>>> +             choice_sym = prop_get_symbol(sym_get_choice_prop(sym));
>>> +
>>>       for_all_prompts(sym, prop) {
>>>               prop->visible.tri = expr_calc_value(prop->visible.expr);
>>> +             /*
>>> +              * choice_values with visibility 'mod' are not visible if the
>>> +              * corresponding choice's value is 'yes'.
>>> +              */
>>> +             if (prop->visible.tri == mod && (choice_sym && choice_sym->curr.tri == yes))
>>> +                     prop->visible.tri = no;
>>>               tri = EXPR_OR(tri, prop->visible.tri);
>>>       }
>>>       if (tri == mod && (sym->type != S_TRISTATE || modules_val == no))
>>> --
>>> 1.8.4
>>>
>>
>> --
>> .-----------------.--------------------.------------------.--------------------.
>> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
>> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
>> | +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
>> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
>> '------------------------------^-------^------------------^--------------------'
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html