From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4864CC43381 for ; Fri, 22 Mar 2019 12:35:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0FCA32070D for ; Fri, 22 Mar 2019 12:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553258117; bh=XMOr/nwWvPPYB0ePe6L1/SznFDlEkK3XXdLQtmeEX4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mLiNEgB31N+W+vKBsZ70WzAz8S46hdocFXFQWOGz/+lr44Ab0K+LN1tjN+l8HM37c 57KGx2iqzjUATCD0PPmKgXPuLNk4bzgjjpBj4ZYkyymxqV45mD8fWdVjGFLJ+J9PV+ jmSnNdARrrE5KFL1r1l0NvtSd0zKK2yy+RD6vFOw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389341AbfCVMfP (ORCPT ); Fri, 22 Mar 2019 08:35:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:50852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388696AbfCVMMj (ORCPT ); Fri, 22 Mar 2019 08:12:39 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 93E3721929; Fri, 22 Mar 2019 12:12:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256759; bh=XMOr/nwWvPPYB0ePe6L1/SznFDlEkK3XXdLQtmeEX4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nl/bC2Sbmet8OuEDqgcp7Ql+WVUT9xRnmyF2PwSprS8ZMM7yhuQRsQLyQ6ovEUmqg OYFlYQDOjYiFYpYOrzk1u5104Erj8GYzvUAImEJhP/Bq88XHoqePVKhaOeR890ljtu mwMPN/+ir7da3x+C7iiny0+Rd1xq57lIz8izhIbM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Krzysztof Rusocki , Toshi Kani , Dan Williams Subject: [PATCH 5.0 029/238] nfit/ars: Attempt a short-ARS whenever the ARS state is idle at boot Date: Fri, 22 Mar 2019 12:14:08 +0100 Message-Id: <20190322111259.958953093@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111258.383569278@linuxfoundation.org> References: <20190322111258.383569278@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Williams commit c6c5df293bf1b488cf8459aac658aecfdccb13a9 upstream. If query-ARS reports that ARS has stopped and requires continuation attempt to retrieve short-ARS results before continuing the long operation. Fixes: bc6ba8085842 ("nfit, address-range-scrub: rework and simplify ARS...") Cc: Reported-by: Krzysztof Rusocki Reviewed-by: Toshi Kani Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/nfit/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3021,6 +3021,7 @@ static int ars_register(struct acpi_nfit switch (acpi_nfit_query_poison(acpi_desc)) { case 0: + case -ENOSPC: case -EAGAIN: rc = ars_start(acpi_desc, nfit_spa, ARS_REQ_SHORT); /* shouldn't happen, try again later */ @@ -3045,7 +3046,6 @@ static int ars_register(struct acpi_nfit break; case -EBUSY: case -ENOMEM: - case -ENOSPC: /* * BIOS was using ARS, wait for it to complete (or * resources to become available) and then perform our