Received: by 10.192.165.148 with SMTP id m20csp316226imm; Wed, 2 May 2018 00:19:57 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqk0jhfrIuMRbShGzyhMSgVSi4ZH2KgSn/1JwBeH3xvwY0KoBrzM+nyX02SCbWcuO6S6Aqa X-Received: by 10.98.65.93 with SMTP id o90mr18544106pfa.140.1525245597435; Wed, 02 May 2018 00:19:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525245597; cv=none; d=google.com; s=arc-20160816; b=qqz1fs1etVC90gxnZY6ZMUq53BTovr551pqgZag1g9eviI7J1p7VlK6eK5W4Ltc0ai 9uBDQzJ55cG87iJ192UinrzkUJmv/nWX/91koI/B7OwzbzcorsZAXYyNPLKJOSN2waFd 4qYeGsheYOSs26AbksEg3RUv6f+BgEaf88hxRWBotnW3/lo/DU7c340NS73mcZlzUh+l DwXQ6+rjufToL1w9V13+xBCRL/DAhwoI59DBX1ROcHscw9YqDsG/4jDK/UfeUdL+QSSE vSxKuPHA6+vvUCp/zBpfqf/lfYm2xe22cGSxcY8MBozFlc2uSufTQ/LGNTR3fYIvcgNz AN6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:dkim-signature :arc-authentication-results; bh=XHuk0zZ1GxEPjTv7dIN0BpqMpj728ibdqUkCrAZ0En0=; b=Ivww8LkeokWKX6C7YvAru7XuasvLKDu4dzp3rJmg0iWu5fKLiEYMghF19zny+Ib1av MsAqMeSrvUNiOQ/vfezRiZd0B2FZCJ+3IW0IkFOizutNIhZITuhH/h77F3F3k9U/tGGs 9ajVyeDp6NiWmcFyEb/L64xOfkDEArEvq1yAUso8cVUyYRNBmr01NUeWS6vqVCvfybkB KkpF/Ag5QuhDWtX15rz94n6y71oiMbACbLlaVupfmTL37Bq1qR9aj37C5bwpoudPoZs4 2vbuLXKKN2mzstghnwlUGMIRjtKmJUwMUKEQOapp1f6zV853bdSztniDFb+zRcR3T4bV avwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A0bfPDY/; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q8-v6si9349911pgf.293.2018.05.02.00.19.43; Wed, 02 May 2018 00:19:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A0bfPDY/; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751185AbeEBHTf (ORCPT + 99 others); Wed, 2 May 2018 03:19:35 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:50269 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751021AbeEBHTd (ORCPT ); Wed, 2 May 2018 03:19:33 -0400 Received: by mail-it0-f66.google.com with SMTP id p3-v6so16341404itc.0 for ; Wed, 02 May 2018 00:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=XHuk0zZ1GxEPjTv7dIN0BpqMpj728ibdqUkCrAZ0En0=; b=A0bfPDY/Q/yESn7wmx7tDiiZr88TeyFRwJeexPzHzXZIErtwCj0ttokaklkHxWRAw6 e3My4JCtQDmNoFaTTphMBFNanhoXbTlpP7ukENmv6gb0w07cadWQ5glZLCgRGmYD7X87 4v/iMH5o3wIrTZM477En5fCaqLoWTYCcK2FTQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=XHuk0zZ1GxEPjTv7dIN0BpqMpj728ibdqUkCrAZ0En0=; b=EQugQwMYYbpSJ5GsILtj8i+HnoR1MU455H/GyMYrCZ2EfmfjBiHxhPypmgzFD8/iIu 6oZYJcEPgAITFe+AUf/2uQJw7yIazZjdoNywctC927ghbCdSd/wacRSJ5ryjnLjRVmWX clCgKBBxY+UHy+kQBWk1TyX4sKgVlfKK+2GQWfBdVIRuYv1IortIwBjLddDfVkJ/CHLO LJCTdd1iml8ejZSxAq95Rc9E0893d+X8qV10Ees5oPobJWw46VFrV9oZTJy6SsGn/H3d lW2V8AqCMANF5KvOpc7XpSwaW8kMCbWNlULpxvqf2mKxe8vbtn/9JZIgjMejPq6iuSly 6Log== X-Gm-Message-State: ALQs6tBeCyukOPTZXe7J17Lb1BXbCRTjzbCm747f30dFSh9LHhOtz/C8 lMjJqiOhilhbEFthDQMmzZwoKkM3g0Dh8qoi02V6HxVB X-Received: by 2002:a24:534e:: with SMTP id n75-v6mr8353745itb.138.1525245572588; Wed, 02 May 2018 00:19:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.187.134 with HTTP; Wed, 2 May 2018 00:19:32 -0700 (PDT) In-Reply-To: <1525224594.2901.4.camel@hxt-semitech.com> References: <1524625806-23133-1-git-send-email-shunyong.yang@hxt-semitech.com> <1525224594.2901.4.camel@hxt-semitech.com> From: Ard Biesheuvel Date: Wed, 2 May 2018 09:19:32 +0200 Message-ID: Subject: Re: [PATCH] efi/capsule-loader: Don't output reset log when header flags is not set To: "Yang, Shunyong" Cc: "linux-efi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Zheng, Joey" Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2 May 2018 at 03:29, Yang, Shunyong wrote: > Hi, Ard, > > On Tue, 2018-05-01 at 11:54 +0200, Ard Biesheuvel wrote: >> On 25 April 2018 at 05:10, Shunyong Yang > 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 >> > Signed-off-by: Shunyong Yang >> > --- >> > 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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html