From patchwork Mon Oct 24 11:30:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9379 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp478059wru; Mon, 24 Oct 2022 07:16:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5WqNL2gkfKB2qPgNs0xWLasTtOh7yIpr5pXo4+Reky3Ni7y2vxwdwMcr6VzYY4b0H+x50/ X-Received: by 2002:a17:907:968b:b0:78d:f5c2:70d8 with SMTP id hd11-20020a170907968b00b0078df5c270d8mr27158498ejc.564.1666621008584; Mon, 24 Oct 2022 07:16:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621008; cv=none; d=google.com; s=arc-20160816; b=W96ldfzGaa+W5iL91Ly7NjMUEA0vcRL5AMS1hwfDUbQnJbdjfyREg49ZjgahG9MPnQ vVrFCSJ9vceGy5h2C7IIIilsZQEPu+SPD2otg0hHNP9bIf9q12OhOdPaz0gnWsrZi2bh DicFbEpx5gfwKVXwv5NEUlMauJbyU3OZnndEz9cg8YDIv8T9D3Mc6L+J4+djS0NZYJfJ Z/y9Ha3notQAJRZCClndQSqLn7EFuvU3mZ22uYdX2+lpuwT7UtPKjT7YpNu2IrnyywHZ qX+bAXKopKIuEkKka8lcDM5QHrzZnfK2yJHkd5MdjrWdWn2yZVJwktEyy7wg3EDwnlFF qTGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Nh/FvG0GklRdmihRgrBJ8bhKMNsOklU3LoQylFxS6hk=; b=ZZHIKtZhvU5E8HP+f8DR8fHGWEEkPn7rns04EqkKOgEx622ADFsHrAlLudBu7b5Hcw hLA80SQKDL5QpNfLQQGDglTzSjKf47reRDali6PxiBfTYacdmTy0H+s4LmUoQYBSCpN/ Ka2sVVKWX+LF5ACM6VocwgKBjBSbZs4IDiR4QLkEvY+Usd4r2fAPX6mv27To/j/P/Gdz ZXOtMc/zs8dQaZKBo79ris+Ic3NteDP6mm2eJRLymB9xZxh4SWrYKNyDFC2JpA23V2LI 243wNg8wtz/D2+oNCc9Znv2lt+AsccBT/dAA8s8DpFx94fj+HkcFl0tH+BChLrt/nrFf d3hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yz7IGvW7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u15-20020a056402064f00b0045c0de4b0e9si24175655edx.170.2022.10.24.07.16.23; Mon, 24 Oct 2022 07:16:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yz7IGvW7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236934AbiJXOAp (ORCPT + 99 others); Mon, 24 Oct 2022 10:00:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237091AbiJXN7S (ORCPT ); Mon, 24 Oct 2022 09:59:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F9308E714; Mon, 24 Oct 2022 05:46:46 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E8F3A6134E; Mon, 24 Oct 2022 12:46:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08151C433D6; Mon, 24 Oct 2022 12:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615602; bh=mJDIde28R+xT2z/Z5fh2ILNWAYM5xqctKfIHU2dVeNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yz7IGvW7QXP3nOpCJ7E/gqQomnR2kS2MD3CWGDt44CtpxD+SIj0Mgb7fgAWMv3byM alErRNdtkJCybSnP+oA8/8I5rWPJOeBAx0nRcRqHzpn2biEVXAOTb20UnchOG5jER3 tNBy/+dA1C1w2XWBR13XYSsilu+Zu4JWiifvwz0k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Niklas Cassel , Damien Le Moal , Sasha Levin Subject: [PATCH 5.15 313/530] ata: fix ata_id_has_devslp() Date: Mon, 24 Oct 2022 13:30:57 +0200 Message-Id: <20221024113059.202975684@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747578790805374253?= X-GMAIL-MSGID: =?utf-8?q?1747578790805374253?= From: Niklas Cassel [ Upstream commit 9c6e09a434e1317e09b78b3b69cd384022ec9a03 ] ACS-5 section 7.13.6.36 Word 78: Serial ATA features supported states that: If word 76 is not 0000h or FFFFh, word 78 reports the features supported by the device. If this word is not supported, the word shall be cleared to zero. (This text also exists in really old ACS standards, e.g. ACS-3.) Additionally, move the macro to the other ATA_ID_FEATURE_SUPP macros (which already have this check), thus making it more likely that the next ATA_ID_FEATURE_SUPP macro that is added will include this check. Fixes: 65fe1f0f66a5 ("ahci: implement aggressive SATA device sleep support") Signed-off-by: Niklas Cassel Signed-off-by: Damien Le Moal Signed-off-by: Sasha Levin --- include/linux/ata.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/ata.h b/include/linux/ata.h index 5d43716e5047..0dab64eb5cbc 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -565,6 +565,10 @@ struct ata_bmdma_prd { ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ ((id)[ATA_ID_FEATURE_SUPP] & (1 << 2))) +#define ata_id_has_devslp(id) \ + ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ + ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ + ((id)[ATA_ID_FEATURE_SUPP] & (1 << 8))) #define ata_id_iordy_disable(id) ((id)[ATA_ID_CAPABILITY] & (1 << 10)) #define ata_id_has_iordy(id) ((id)[ATA_ID_CAPABILITY] & (1 << 11)) #define ata_id_u32(id,n) \ @@ -577,7 +581,6 @@ struct ata_bmdma_prd { #define ata_id_cdb_intr(id) (((id)[ATA_ID_CONFIG] & 0x60) == 0x20) #define ata_id_has_da(id) ((id)[ATA_ID_SATA_CAPABILITY_2] & (1 << 4)) -#define ata_id_has_devslp(id) ((id)[ATA_ID_FEATURE_SUPP] & (1 << 8)) #define ata_id_has_ncq_autosense(id) \ ((id)[ATA_ID_FEATURE_SUPP] & (1 << 7))