From patchwork Mon Oct 24 11:30:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp441417wru; Mon, 24 Oct 2022 06:05:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM77WJxgB2xSbp1VWW17qLa+c7X5ObbP/rOGgpceHGBqOvnXPbg4Iuk8e7B5lFgyUdm3tnkp X-Received: by 2002:a63:d845:0:b0:44b:d074:97d with SMTP id k5-20020a63d845000000b0044bd074097dmr28655579pgj.32.1666616753344; Mon, 24 Oct 2022 06:05:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616753; cv=none; d=google.com; s=arc-20160816; b=Ss1ICUNfGq3O81jcfrCYYuziuLLtLzi1xcpSDMDSis94jgeVXhVE+YaRXcl1+DnlT7 LTHUieS+Sqk9JuQNRS1hWEhOVgZrIMZU8ByY6ediIxRlqjMXfgI3w3jUo0D7hebNc/Km BYfbkd/J2m1eF9vq8s0GgrqE1dPBR9GX/xB0U3kLBGfsGzkuR16UeGaUWmFX1aj0+i2A 2TLb02Vlc5SZswxljcuz3kfwb70HhDi0OSV+X6JE9mmoqXbLgQzqF+SSPOmWogk7WKKL Xdt97x+LE4YnB4qz5YK95fxkCIQhIrtGpF/eeNbDyRkn9oVlqAwUzaA7swAuGqVm7Dvx AnEQ== 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=cYrSvltH2yTZNaRkugwmHf6xUxP2z6XKXvfql4CvoKo=; b=PZNRpya6KCimBafacFyl21aJq33DZJMyhXBj4KpC4KtAPWVtjmNw+WnpdYrP49bDxP EvTeBYs9yU2duUDyiCL1ZhQNIer6atmPx9dmg7cG93uV2TzBSB6yjt4DFBaHPWUiRlhy hqYMSWA9ma2DGly7GWt3V+0HQShQ3dsihTJTacI/zpi8IcRnHADo8fJVNNfT/2t4asbi MeCeeShwVxwelKE5u3KMTMdKF6FIXO3AvzuPIyqU1ETbyxnMj7K0SximCMLl/SRV9JdY HA8kbS5e3dPm4vcCI0TcOYDqn1MEdLqMd+YOF7PdmEhwgTrNv0RGf15xjMPRgZYwUXmP UTyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uQWxKS8n; 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 h13-20020a056a00230d00b0053652e1c0b6si39651211pfh.12.2022.10.24.06.05.04; Mon, 24 Oct 2022 06:05:53 -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=uQWxKS8n; 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 S235282AbiJXNEJ (ORCPT + 99 others); Mon, 24 Oct 2022 09:04:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235384AbiJXNAF (ORCPT ); Mon, 24 Oct 2022 09:00:05 -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 544681144; Mon, 24 Oct 2022 05:19:25 -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 DAB0061278; Mon, 24 Oct 2022 12:10:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFD60C433C1; Mon, 24 Oct 2022 12:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613453; bh=MAndz8nMfGWumzgeumXtIyvQC0YhR+/u+DyUw+CVihY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uQWxKS8n1+Wdr2zTYwZkCDkXSVCCpKErzGADoctbWtkmSVWB+HbJqE+D95F4WKmYC 76MAXkqXHfpJ/RhK3OqgJP46SrwpKuCGTM9YmeJiYbXHw4axyULF2xzIDg6yVHyaVe FycBnh3+dOTvoKReGKCPCyI87HEd/50S9DPqO42Q= 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.4 142/255] ata: fix ata_id_has_devslp() Date: Mon, 24 Oct 2022 13:30:52 +0200 Message-Id: <20221024113007.321825699@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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?1747574328972445864?= X-GMAIL-MSGID: =?utf-8?q?1747574328972445864?= 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 734cc646ce35..8b884cd3a232 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))