From patchwork Wed Sep 20 13:54:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 725135 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C2A5CE79D3 for ; Wed, 20 Sep 2023 13:56:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236632AbjITN4Q (ORCPT ); Wed, 20 Sep 2023 09:56:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235538AbjITNzk (ORCPT ); Wed, 20 Sep 2023 09:55:40 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3F0AE5; Wed, 20 Sep 2023 06:55:17 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2E2FC433C7; Wed, 20 Sep 2023 13:55:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695218117; bh=T2LEG7Kqbe7N3J/l42pULaWoAUA0Z37hRfpmcVtttbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XVN3BpfHO6wgMt8PRwXF3JQMgQ9R8ob4ijlSKBbiZ+NhlwSgJC7TKpOQ65egVxdZo Mr/hvCK2mxLsd/2+8/MaVgI5XYAfJqfyo+3vB3XFtem9b2WtrvufQtu15k1r0QE4Ty 4v/EfSbVr2PLv6tTBQr3ad45WKIbJtq4WO9XUL9xnRFWlVfqvF7ubls7rUCDfo2n5T ePn00MCgbEjrnTDSs46AW8/FkSxJ54a8g52+gN6X/pske3RVjKDXs1zuMayCqzXxR4 3zBK6iszTp/QCWMKo7sGrhB+38kWcGGnXvVUrPvr/LUsUk6rAjH7GGzr9ITgLZ/jmR zVisBi0jbkPHA== From: Damien Le Moal To: linux-ide@vger.kernel.org Cc: linux-scsi@vger.kernel.org, "Martin K . Petersen" , John Garry , Rodrigo Vivi , Paul Ausbeck , Kai-Heng Feng , Joe Breuer , Geert Uytterhoeven , Chia-Lin Kao Subject: [PATCH v4 19/23] ata: libata-core: Do not resume runtime suspended ports Date: Wed, 20 Sep 2023 22:54:35 +0900 Message-ID: <20230920135439.929695-20-dlemoal@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230920135439.929695-1-dlemoal@kernel.org> References: <20230920135439.929695-1-dlemoal@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The scsi disk driver does not resume disks that have been runtime suspended by the user. To be consistent with this behavior, do the same for ata ports and skip the PM request in ata_port_pm_resume() if the port was already runtime suspended. With this change, it is no longer necessary to for the PM state of the port to ACTIVE as the PM core code will take care of that when handling runtime resume. Signed-off-by: Damien Le Moal Reviewed-by: Hannes Reinecke Tested-by: Chia-Lin Kao (AceLan) --- drivers/ata/libata-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 35112f9e482d..e0973f5614b0 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -5230,10 +5230,8 @@ static void ata_port_resume(struct ata_port *ap, pm_message_t mesg, static int ata_port_pm_resume(struct device *dev) { - ata_port_resume(to_ata_port(dev), PMSG_RESUME, true); - pm_runtime_disable(dev); - pm_runtime_set_active(dev); - pm_runtime_enable(dev); + if (!pm_runtime_suspended(dev)) + ata_port_resume(to_ata_port(dev), PMSG_RESUME, true); return 0; }