Received: by 10.192.165.148 with SMTP id m20csp190776imm; Tue, 24 Apr 2018 20:13:30 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+pTxhb4qQAVBphNMbi2Qwrkf03Wne172w1DFPK8MaKUS8uoSxZ5gDKieQFjVcFuUM20Hkn X-Received: by 10.98.7.152 with SMTP id 24mr26185495pfh.94.1524626010522; Tue, 24 Apr 2018 20:13:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524626010; cv=none; d=google.com; s=arc-20160816; b=GVzC41SzJQ69Ytniv2tS4DUyw1HsvPEyLhHLcGMf3+UEkIa2uoEj9Rrz/gvNwi+cjR cn1EX7OSyybzCN2zs63QN53vskx4sVhbFIJAj9zFgfJdQhZv8USNqjzrjp9BVa2cABLD IRpc/3M+3qZDzVuRuHINNHH/vzPbING1Rq7EzEfijsVhvgVVLY/gN/KTLS4X6QcMmNRD ubFGg1/V9EW/ICQhGBcoNrNv+M/dLbzniudnmhxdlU+euwJ7aLjMVIJr0c3/fLr8te0O fcJlxnAlNaAeLS/nFE7wJQ/kJBBJV8gXRPhlQL91FV5r4RtqJT3J1czKHyAr+Y5dmygY 2tCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=M9Aca2QtwKMJTJA4Bo6TQuEObzl5qLX09FSQQ3xymik=; b=Jud7/d1cdU5WsjPzouYyiZA6wxwlLX+fF4W8uVAh0YSfmExRRIV1iFXvJ/RWTSvbuz 0O0utXlg0ROJQS+iCV/p2SrWXxW124YJZc+r/UdllhtTBlEn4EWSc6rrRfR6TmxqcH6W heqCg3UBt457ovG196Gw53YXA85zNz1b2F3aSGDvfYOsDFyp9QaJ3a840Whv1PPY73lB cr4Z5Q5Gqu5+V+rmcJGRopyZNe4csWDrVQQbYnGBSR6sCB/+zlpXLtW69gLoBsdIi7zR ChxyuoM57FMLIW3yEmZV05pRzXYwsM4fKZ7lW5MicP10wtycfn//ftVhQrBdFnCDDR92 2DrA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 4si3359043pgf.684.2018.04.24.20.13.02; Tue, 24 Apr 2018 20:13:30 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751245AbeDYDLN (ORCPT + 99 others); Tue, 24 Apr 2018 23:11:13 -0400 Received: from mx01.hxt-semitech.com.96.203.223.in-addr.arpa ([223.203.96.7]:58209 "EHLO barracuda.hxt-semitech.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751150AbeDYDLK (ORCPT ); Tue, 24 Apr 2018 23:11:10 -0400 X-ASG-Debug-ID: 1524625867-093b7e10b3114b70001-xx1T2L Received: from HXTBJIDCEMVIW01.hxtcorp.net (localhost [10.128.0.14]) by barracuda.hxt-semitech.com with ESMTP id Am43aDKYJCtaJPmO (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 25 Apr 2018 11:11:07 +0800 (CST) X-Barracuda-Envelope-From: shunyong.yang@hxt-semitech.com Received: from y.localdomain (10.5.21.109) by HXTBJIDCEMVIW01.hxtcorp.net (10.128.0.14) with Microsoft SMTP Server (TLS) id 15.0.847.32; Wed, 25 Apr 2018 11:11:07 +0800 From: Shunyong Yang To: CC: , , Shunyong Yang , Joey Zheng Subject: [PATCH] efi/capsule-loader: Don't output reset log when header flags is not set Date: Wed, 25 Apr 2018 11:10:06 +0800 X-ASG-Orig-Subj: [PATCH] efi/capsule-loader: Don't output reset log when header flags is not set Message-ID: <1524625806-23133-1-git-send-email-shunyong.yang@hxt-semitech.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.5.21.109] X-ClientProxiedBy: HXTBJIDCEMVIW01.hxtcorp.net (10.128.0.14) To HXTBJIDCEMVIW01.hxtcorp.net (10.128.0.14) X-Barracuda-Connect: localhost[10.128.0.14] X-Barracuda-Start-Time: 1524625867 X-Barracuda-Encrypted: ECDHE-RSA-AES256-SHA X-Barracuda-URL: https://192.168.50.101:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at hxt-semitech.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.4863 1.0000 0.0000 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.50256 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) + 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