From patchwork Thu Aug 3 22:12:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Baicar X-Patchwork-Id: 9879957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DA85560360 for ; Thu, 3 Aug 2017 22:12:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4C162896E for ; Thu, 3 Aug 2017 22:12:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B98BA28974; Thu, 3 Aug 2017 22:12:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49C2F28982 for ; Thu, 3 Aug 2017 22:12:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751891AbdHCWMh (ORCPT ); Thu, 3 Aug 2017 18:12:37 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:60622 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751884AbdHCWMg (ORCPT ); Thu, 3 Aug 2017 18:12:36 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D015060722; Thu, 3 Aug 2017 22:12:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1501798355; bh=rSgCavxosnbQOvk0NzBd91Lkniuan6I2c6FrFRb+Fr4=; h=From:To:Cc:Subject:Date:From; b=J1bM/gGwJTzplyeCYhm1pBWWxt65w5EpHFslJ0aG2/6tUpEdKboi0icEJBcrlDq3Z Pz5l4AJEfexrdub9gsjImN59ki/Z7ZDKBGNmLwYecBIce+XZL7mIzIUpYIjFBUQapr ZPMzZn7BW1F/L0aBFSbxoOTkBz8ex0lwW4oAuwDE= Received: from tbaicar-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: tbaicar@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 0155560131; Thu, 3 Aug 2017 22:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1501798355; bh=rSgCavxosnbQOvk0NzBd91Lkniuan6I2c6FrFRb+Fr4=; h=From:To:Cc:Subject:Date:From; b=J1bM/gGwJTzplyeCYhm1pBWWxt65w5EpHFslJ0aG2/6tUpEdKboi0icEJBcrlDq3Z Pz5l4AJEfexrdub9gsjImN59ki/Z7ZDKBGNmLwYecBIce+XZL7mIzIUpYIjFBUQapr ZPMzZn7BW1F/L0aBFSbxoOTkBz8ex0lwW4oAuwDE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 0155560131 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=tbaicar@codeaurora.org From: Tyler Baicar To: rjw@rjwysocki.net, lenb@kernel.org, will.deacon@arm.com, james.morse@arm.com, bp@suse.de, shiju.jose@huawei.com, geliangtang@gmail.com, andriy.shevchenko@linux.intel.com, tony.luck@intel.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, austinwc@codeaurora.org Cc: Tyler Baicar Subject: [PATCH V2] acpi: apei: clear error status before acknowledging the error Date: Thu, 3 Aug 2017 16:12:31 -0600 Message-Id: <1501798351-10337-1-git-send-email-tbaicar@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently we acknowledge errors before clearing the error status. This could cause a new error to be populated by firmware in-between the error acknowledgment and the error status clearing which would cause the second error's status to be cleared without being handled. So, clear the error status before acknowledging the errors. Also, make sure to acknowledge the error if the error status read fails. V2: Only send error ack if there was an error populated Remove curly braces that are no longer needed Signed-off-by: Tyler Baicar --- drivers/acpi/apei/ghes.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index d661d45..cda4a4f 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -743,17 +743,14 @@ static int ghes_proc(struct ghes *ghes) } ghes_do_proc(ghes, ghes->estatus); +out: + ghes_clear_estatus(ghes); /* * GHESv2 type HEST entries introduce support for error acknowledgment, * so only acknowledge the error if this support is present. */ - if (is_hest_type_generic_v2(ghes)) { + if (is_hest_type_generic_v2(ghes) && rc != -ENOENT) rc = ghes_ack_error(ghes->generic_v2); - if (rc) - return rc; - } -out: - ghes_clear_estatus(ghes); return rc; }