From patchwork Mon Oct 24 11:30:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9748 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp549055wru; Mon, 24 Oct 2022 09:43:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5l3DMWnJKlJ/xI07UiEkOWddcSnTfAh/nH8ZY346HSvvqXptjhJ9ZHynROVplXc3T/i3iN X-Received: by 2002:a17:902:9888:b0:186:9c32:79ca with SMTP id s8-20020a170902988800b001869c3279camr9063851plp.17.1666629787466; Mon, 24 Oct 2022 09:43:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666629787; cv=none; d=google.com; s=arc-20160816; b=fJ+Cq+0iCbu92xq8++JM/nVhc0m36NQhXywJUFVseIkHSVfTf1X2BTAnF61wQmN0Xb f8+4+XctAJT7W0Sd0f11ITH9u6KZpD5zCYUTofyCfQawflW4jyBEnIhKWilYdPy6XKJX HUGka2I3lgTNG7gIweamo5bkst2XGPpssZe+qQllICjD1ypFPxVeqESplVRLcIiowJSJ EsmrNScyBDl3pM7aOg5I6qwhl59AUS92E3R6pYlQs+3e/sxiEZkR1geHt65B+MOSIGDi ah52xhpSyniNASScRIFC8jgse3vP01FMv6e/SkrmE6R24urJJkrtQ+SuBGRRac1tGpG4 E75w== 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=iz3EymutYL1FLK0gtCJ3PS2Ydz2tYaSD3AyvQgYY3ZMf7KSyvOiA2JkIr0MwxnB0Gr LxJbll1wT130g8MuljyW3ZTu4MpzeJR/sE9R3qovk13jnbYezYqVFcGqhAbB09u6CbG+ C78DUBtvq3qqS8jqon9JtOL48WrgaoK6lY5tk/cb5mnr2PLKgyP/vJ0wF9ReMDq0pfCz zMXNI6iRlgcTYIYir4wxMuTYEaGclpIIaoarUyZNJRFSW160w4pfDa6Dza8il/GMtvEW aF7a7OwmFjrkUDLzlSoIw+h7IQeGnTodQWRio1AbF7qVc8Oyn1hsbyshQCjS2a43G4Ga V20Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LjyNu7Og; 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 t2-20020a632d02000000b004615836deeasi38310527pgt.860.2022.10.24.09.42.54; Mon, 24 Oct 2022 09:43:07 -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=LjyNu7Og; 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 S234451AbiJXQm2 (ORCPT + 99 others); Mon, 24 Oct 2022 12:42:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234434AbiJXQli (ORCPT ); Mon, 24 Oct 2022 12:41:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23D30786E2; Mon, 24 Oct 2022 08:28: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 ams.source.kernel.org (Postfix) with ESMTPS id E3B84B815BE; Mon, 24 Oct 2022 12:10:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FE50C433D6; Mon, 24 Oct 2022 12:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613458; bh=2vgZYrGdBLmeat8hb0agASqFn5UrbCmTTg2/geDVt9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LjyNu7OgkMs1wFPQFFN4OSTPKONi+bVwWP7QUqSwMqzmPELVtDmXtCxmKhGxPGKV8 TeizQRkPdrBjob7o6LMy6bUKKj1SI8HARVy20KTFHTe9HShbC9U/sZ5vxZDKChxy5K XumnNN/RSD2AU4YW0FGCpAMODpZbE8f0CzAzDrGM= 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 144/255] ata: fix ata_id_has_dipm() Date: Mon, 24 Oct 2022 13:30:54 +0200 Message-Id: <20221024113007.408141071@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?1747587995717012884?= X-GMAIL-MSGID: =?utf-8?q?1747587995717012884?= 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)