Re: [PATCH] efi/capsule-loader: Don't output reset log when header flags is not set

[Ard Biesheuvel]

On 2 May 2018 at 03:29, Yang, Shunyong <shunyong.yang@xxxxxxxxxxxxxxxx> wrote:
> Hi, Ard,
>
> On Tue, 2018-05-01 at 11:54 +0200, Ard Biesheuvel wrote:
>> On 25 April 2018 at 05:10, Shunyong Yang <shunyong.yang@hxt-semitech.
>> com> wrote:
>> >
>> > It means firmware attempts to immediately process or launch the
>> > capsule
>> > when flags in capsule header is not set. Moreover, reset is not
>> > needed
>> > in this case. Current code will output log to indicate reset.
>> >
>> > This patch adds a branch to avoid reset log output when the flags
>> > is not
>> > set.
>> >
>> > Cc: Joey Zheng <yu.zheng@xxxxxxxxxxxxxxxx>
>> > Signed-off-by: Shunyong Yang <shunyong.yang@xxxxxxxxxxxxxxxx>
>> > ---
>> >  drivers/firmware/efi/capsule-loader.c | 13 +++++++++----
>> >  1 file changed, 9 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/drivers/firmware/efi/capsule-loader.c
>> > b/drivers/firmware/efi/capsule-loader.c
>> > index e456f4602df1..a63b8e5bde23 100644
>> > --- a/drivers/firmware/efi/capsule-loader.c
>> > +++ b/drivers/firmware/efi/capsule-loader.c
>> > @@ -134,10 +134,15 @@ static ssize_t
>> > efi_capsule_submit_update(struct capsule_info *cap_info)
>> >
>> >         /* Indicate capsule binary uploading is done */
>> >         cap_info->index = NO_FURTHER_WRITE_ACTION;
>> > -       pr_info("Successfully upload capsule file with reboot type
>> > '%s'\n",
>> > -               !cap_info->reset_type ? "RESET_COLD" :
>> > -               cap_info->reset_type == 1 ? "RESET_WARM" :
>> > -               "RESET_SHUTDOWN");
>> > +
>> > +       if (cap_info->header.flags)
>> You should check for the relevant flag bits here, because the 16
>> lower
>> bits are platform dependent.
> In current three bits in flags, CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE and
> CAPSULE_FLAGS_INITIATE_RESET are dependent on
> CAPSULE_FLAGS_PERSIST_ACROSS_RESET.
>
> So, maybe I only need to check CAPSULE_FLAGS_PERSIST_ACROSS_RESET?
>

Yes I think that's fine

>>
>> >
>> > +               pr_info("Successfully upload capsule file with
>> > reboot type '%s'\n",
>> > +                       !cap_info->reset_type ? "RESET_COLD" :
>> > +                       cap_info->reset_type == 1 ? "RESET_WARM" :
>> > +                       "RESET_SHUTDOWN");
>> > +       else
>> > +               pr_info("Successfully upload, process and launch
>> > capsule file\n");
>> > +
>> >         return 0;
>> >  }
>> >
>> > --
>> > 1.8.3.1
>> > --
> To unsubscribe from this list: send the line "unsubscribe linux-efi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html