On 3 May 2018 at 07:45, Shunyong Yang <shunyong.yang@xxxxxxxxxxxxxxxx> wrote:
> It means firmware attempts to immediately process or launch the capsule
> when reset flags in capsule header are not set. Moreover, reset is not
> needed in this case. The current code will output log to indicate reset.
>
> This patch adds a branch to avoid reset log output when the flags are not
> set.
>
> Cc: Joey Zheng <yu.zheng@xxxxxxxxxxxxxxxx>
> Signed-off-by: Shunyong Yang <shunyong.yang@xxxxxxxxxxxxxxxx>
Queued in efi/next
Thanks.
> ---
>
> Changes in v2:
> *Add EFI_CAPSULE_PERSIST_ACROSS_RESET check according to Ard's
> suggestion.
>
> ---
> 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..344785ef8539 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 & EFI_CAPSULE_PERSIST_ACROSS_RESET)
> + 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
