From patchwork Mon Oct 24 11:30:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9133 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp457269wru; Mon, 24 Oct 2022 06:35:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4t2buRVj3U+g2A0sRM4KfwDqAxKvv+TrtEzuAPvOGs9T890tw7+a4m0RRP475DpFzPwKRb X-Received: by 2002:a17:902:f78c:b0:17a:ef1:e902 with SMTP id q12-20020a170902f78c00b0017a0ef1e902mr33174692pln.5.1666618543068; Mon, 24 Oct 2022 06:35:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666618543; cv=none; d=google.com; s=arc-20160816; b=cePA1JKoubVnRXnWWeP8/4ZVGk0iF782ILKIPmmXwpoldqnQzfHBqDeKXkNPN8hJ60 enTooE2jfP1TcV1rZdvbN/UwtAE6hQA6e701d1zZcf9et+SmgYStVv4L/iTQAIF9URPs VZgcm4Eave11xn0pg7Rfo8SfjoPjAETivhEP2vrZmjtAeIDGHrtlFT/lb4IbkqBGKKnh rw1HoLJz+m8VcbbCtsmrrA09WE2AYrVY7hp3j8zFDD41gq8i080DWj2oCNKfbcUO898s 4t5xoC8uPdHxCIhrecD3lm+cqonB5ngP9M5ZN1TDMl2i5SIocjdZjRyOd/Qg/cfBpAcM jhYw== 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=endudesdeCslzZM35c/XaU7ehPAwoU3maBwUzSyBauE=; b=cXivj58t6JnzUCOpnrl/aIr7eAT7faRkfLOZ2QH5ksedmzE1WpI9Gv3gpgvBVBFcjg C5MhIEotSUUSwBVaGyiPu3dfGvu7ZogPQV6ByeTMc4v+FQoQaXM+ukCS/DtTUYvGmoUt J0oS0+5um8vf4odX5czB/TIEmaSLKn4TWm4eXW9C6TDEtKuU22LYOLAyuvf0XyXsoU1i OteSEf+ssqfNgwaRbeoWW7KPoCeo1sq2EdkS9IJPxrj+js+ezcSllj70u8HhL5fnqJEd riscQ+tETdfE68JzE3ZidLe/rYN/2CEAXPKTrR8oH54cXZTdhqnKNfWfgKnZjHmn3OBY 6Yug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jAYoqm9r; 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 j12-20020a65428c000000b00460358671dfsi33788253pgp.513.2022.10.24.06.35.27; Mon, 24 Oct 2022 06:35:43 -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=jAYoqm9r; 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 S235886AbiJXNSt (ORCPT + 99 others); Mon, 24 Oct 2022 09:18:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232806AbiJXNRd (ORCPT ); Mon, 24 Oct 2022 09:17:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CB99814EA; Mon, 24 Oct 2022 05:26:05 -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 21061612D1; Mon, 24 Oct 2022 12:25:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3025BC433D6; Mon, 24 Oct 2022 12:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614347; bh=2vgZYrGdBLmeat8hb0agASqFn5UrbCmTTg2/geDVt9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jAYoqm9rPe9vq3bpPNWMw5IKp3B/WaSX0iJkadZ+E0wBytEsv6jgPkChaBhr+L0Pr nfn408zRDVMB5IWYJ00qKmaGLnlMgpTFCNFZ11sMeTYsvDVcFYDkD+F7hu+1CcIe4e 5fW89e/x88sM1Q6P8HXEALJOP+sYp890/Yj/3oWI= 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.10 227/390] ata: fix ata_id_has_dipm() Date: Mon, 24 Oct 2022 13:30:24 +0200 Message-Id: <20221024113032.448471522@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@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?1747576204956091122?= X-GMAIL-MSGID: =?utf-8?q?1747576204956091122?= From: Niklas Cassel [ Upstream commit 630624cb1b5826d753ac8e01a0e42de43d66dedf ] 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.) The problem with ata_id_has_dipm() is that the while it performs a check against 0 and 0xffff, it performs the check against ATA_ID_FEATURE_SUPP (word 78), the same word where the feature bit is stored. Fix this by performing the check against ATA_ID_SATA_CAPABILITY (word 76), like required by the spec. The feature bit check itself is of course still performed against ATA_ID_FEATURE_SUPP (word 78). 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: ca77329fb713 ("[libata] Link power management infrastructure") Signed-off-by: Niklas Cassel Signed-off-by: Damien Le Moal Signed-off-by: Sasha Levin --- include/linux/ata.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/include/linux/ata.h b/include/linux/ata.h index 94f7872da983..6d2d31b03b4d 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -573,6 +573,10 @@ struct ata_bmdma_prd { ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ ((id)[ATA_ID_FEATURE_SUPP] & (1 << 7))) +#define ata_id_has_dipm(id) \ + ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ + ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ + ((id)[ATA_ID_FEATURE_SUPP] & (1 << 3))) #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) \ @@ -596,17 +600,6 @@ static inline bool ata_id_has_hipm(const u16 *id) return val & (1 << 9); } -static inline bool ata_id_has_dipm(const u16 *id) -{ - u16 val = id[ATA_ID_FEATURE_SUPP]; - - if (val == 0 || val == 0xffff) - return false; - - return val & (1 << 3); -} - - static inline bool ata_id_has_fua(const u16 *id) { if ((id[ATA_ID_CFSSE] & 0xC000) != 0x4000)