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 F0F2FC43381 for ; Fri, 22 Mar 2019 12:12:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BFA5021929 for ; Fri, 22 Mar 2019 12:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256768; bh=qxFAZj5Uw8gYZnM/EK0ZgoHYzY2CHJQowmlq0b9NuQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=N4DwQwq1vxGqeVNrWHcW+E7svgWYHXq4lXALlUCTjrnul9kT/NxTeOhwctUBJHCzC 8oOK9XiQOEzy/Y8QiIGPD9wutsvx3nXIZyAWg3+Yn5BcnCkTzHYETY9dmhnX7WX7AL iuAkVI9d7DCJtaZ8DeZdq3IiPOhgP9sbCA/82ZOI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389654AbfCVMMq (ORCPT ); Fri, 22 Mar 2019 08:12:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:50912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389646AbfCVMMn (ORCPT ); Fri, 22 Mar 2019 08:12:43 -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 7D9202082C; Fri, 22 Mar 2019 12:12:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256763; bh=qxFAZj5Uw8gYZnM/EK0ZgoHYzY2CHJQowmlq0b9NuQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dM3JPOQxyA3C+iHHcVaMZVFYKVO/uu5RIbANjuifwI97cLv+K/ejVdmKg6wS8XAMZ LwrlHR8v6JVa47fuj3frkv9xXRTh8agi2xYuQvXj2bPUUrobI9rznwYAWqwOCa9CA7 E8RqqnbBspAzsTHAfTXF6jdLmk+PQrVLFE1KbDss= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Erwin Tsaur , Toshi Kani , Dan Williams Subject: [PATCH 5.0 030/238] nfit/ars: Attempt short-ARS even in the no_init_ars case Date: Fri, 22 Mar 2019 12:14:09 +0100 Message-Id: <20190322111300.030389561@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 fa3ed4d981b1fc19acdd07fcb152a4bd3706892b upstream. The no_init_ars option is meant to prevent long-ARS, but short-ARS should be allowed to grab any immediate results. Fixes: bc6ba8085842 ("nfit, address-range-scrub: rework and simplify ARS...") Cc: Reported-by: Erwin Tsaur Reviewed-by: Toshi Kani Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/nfit/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3013,11 +3013,12 @@ static int ars_register(struct acpi_nfit { int rc; - if (no_init_ars || test_bit(ARS_FAILED, &nfit_spa->ars_state)) + if (test_bit(ARS_FAILED, &nfit_spa->ars_state)) return acpi_nfit_register_region(acpi_desc, nfit_spa); set_bit(ARS_REQ_SHORT, &nfit_spa->ars_state); - set_bit(ARS_REQ_LONG, &nfit_spa->ars_state); + if (!no_init_ars) + set_bit(ARS_REQ_LONG, &nfit_spa->ars_state); switch (acpi_nfit_query_poison(acpi_desc)) { case 0: