From patchwork Mon Oct 24 11:31:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp403024wru; Mon, 24 Oct 2022 04:51:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7AMxNlyjfOWIppYOEP8AhBYlPjzVfvRIxjC1md02B+1b7777Otk4UaI2czGgYzgiDsKuMR X-Received: by 2002:aa7:864a:0:b0:53f:dcdf:4614 with SMTP id a10-20020aa7864a000000b0053fdcdf4614mr33520278pfo.38.1666612265704; Mon, 24 Oct 2022 04:51:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612265; cv=none; d=google.com; s=arc-20160816; b=PgJ3CJ9cX/gt/b8W/ZEWIOpyOjGawvvnzSPKP0RuJLCCX/usL7MV0zO/glqy+43f56 OZHundvyH+27wxW6R+/wTDf3O65fL8TqVnP8kVYpKrdCevn8Xj36/DC+TG/sjr/X8xcr 2vNpqN5NJU0Q2mDrR0wA4X9qQ6kjB7/XeS4UmIP/yzAmhYiUUwMEnJMxPCpbFdCwvbDO 1UWBlUTTMYbxJMlo/hnPnTNeLpz42Bh6Ir+I0wVuPM3c37W+PFq/a7elUliBJOfCYbFz tSKFFwTS4m4u8HjZxMkLga6e8aj9eFJuN1GlQNoZ/l/C4+3405B1EFwdHlYvfHEi/Y1Q UTIQ== 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=IUgRhL1RNHEodJ2mGvoAfE6vspIEFgS0Djj8ZsqkMGk=; b=hq+0JlfxtgCcRNeKmsRZCsTZuP0NRWenb8TomKSYa5ilBEjrsIYJtVMJ6hJahi9X/W PhBXbBnkRiLlCpUIurbESn+xLQS1vceCIq/Xzt6iZ7jHeDyjoZSYP/C9xaQex1O22aAu D0TUSjJbkOoL5UTQjJZylq6Q1zGB9+hMrqLq8sFX59SqDhrOoKYCnRmO/UASxdMRgu21 FINManMlVlw35bIyPLdGPiHXHLzxLes3IsG3M9BXpQjHoTQVC7jZThymYhZcZ6FvxiRp 7vXvF2vB4Q/jE1DMZe7oyMZRdfE/V+QPgchGsZ3FXx9JcDCr2HICbcjD4pEH9tG0Zqw4 uYVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=MDFlIGO0; 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 d15-20020a170903230f00b0018695bddc4bsi7502099plh.470.2022.10.24.04.50.52; Mon, 24 Oct 2022 04:51:05 -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=MDFlIGO0; 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 S229866AbiJXLuU (ORCPT + 99 others); Mon, 24 Oct 2022 07:50:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231696AbiJXLsL (ORCPT ); Mon, 24 Oct 2022 07:48:11 -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 DAF1F50FB7; Mon, 24 Oct 2022 04:43: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 3061B612B1; Mon, 24 Oct 2022 11:42:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46CA2C433D6; Mon, 24 Oct 2022 11:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611778; bh=DwUTKTBu3Vkn1GKEsjPmURRnRrw+tMBZsDje3CH5GyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MDFlIGO0hjjHDwmAHbb4G8GMHE1FzuYnXXPoqThutOSl7IZWlUIgeQ2K3W9DD270f j5oFppUgW0MiPzZWaW1L2eR64y6bSqVD2wVv/VZ+XoDRvnjo5Ve66P0S7Dk4iYiwyJ OYzTRKYj1DE7001GY5ztNWbmyyWtr9kFRSjD4VjI= 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 4.9 107/159] ata: fix ata_id_has_dipm() Date: Mon, 24 Oct 2022 13:31:01 +0200 Message-Id: <20221024112953.353582488@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747569623146006632?= X-GMAIL-MSGID: =?utf-8?q?1747569623146006632?= 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 33e0786c3c51..33bee000ddab 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -580,6 +580,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) \ @@ -603,17 +607,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)