From patchwork Mon Oct 24 11:30:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9007 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp440578wru; Mon, 24 Oct 2022 06:04:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4StmrJ8YHmE0aWQPnngAZEZh+zcc2xYjSlZgGkWi9s5bK/6QrqKCgVA4v4RdvWynqxC+l0 X-Received: by 2002:a05:6a00:a96:b0:558:8915:2f0e with SMTP id b22-20020a056a000a9600b0055889152f0emr33393745pfl.38.1666616669182; Mon, 24 Oct 2022 06:04:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616669; cv=none; d=google.com; s=arc-20160816; b=J+YQ86+C82qv75n2FXIIVQp0p5Djg6j51S7Lc0s6M966VW5819+szgOG10yvKYpr4L 0jmslsXuFWmw0AQhq2leCe0bCWKA53jt02RVFd0kXufxzR3WZM99zHo5a9ToKUpTgf1i Qfhqoj3qunD3hFqNOgSwL7uSiFA7A8Jf9skp8RFPtc3+hjMxiWUPDh/LoFGPzc8V2fWz xHuNf6qas+69B2KdwuLO/kcwlCSvHdirJ68vUBfbEoPMDliH6+PUf9eaYG+Rn5b8lhnq mk0/pQIRZOGf0w18+yocchqo/p9JVlh3ZK4W2yKPTiSEyX68nZuM3hrXvciO0qxO2UsF fvnQ== 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=vWKsqQrWUPTNUa58o6p40V9PothRCJuKJSNoOrVEY6s=; b=i/znuBuZMxeWoK3K2dpmdbyjPuDMb8CZI6wcf0nt5+7xQfJkd7RTWCHhpyoQbdGEI9 zykDdX+SEqu2R420ph3XOQbvbbKdD3NQGOXZkWO3dDvAClgjEmDgDIYzqPMmlFTX3iE5 9UX/s7Cgw1XmrMBv3rr7XSinbu5OgQ3/1OPfa1G/snGcTJ/HJoUojdBVaVh2kJearLgw ETbdgbdvZsXIXRZiqLQHxgVEVDytqW6ZLAQnMf4ypBjvElHkYyUWBVSLe+7QWaaTGNGf UKvt/0VStF6EEKB+EHF1BZTiuIPs84iIttiO4/+7q2CeYBS51Y0NW7NIV1z2FoIz/kT7 nkZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D1dQqW7U; 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 c17-20020a637251000000b004344b581925si32891558pgn.879.2022.10.24.06.03.48; Mon, 24 Oct 2022 06:04:29 -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=D1dQqW7U; 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 S235139AbiJXNDT (ORCPT + 99 others); Mon, 24 Oct 2022 09:03:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235259AbiJXM7q (ORCPT ); Mon, 24 Oct 2022 08:59:46 -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 B87519AF87; Mon, 24 Oct 2022 05:19:08 -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 22A97612A8; Mon, 24 Oct 2022 11:52:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39D23C433C1; Mon, 24 Oct 2022 11:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612373; bh=RFao88qSCGW1ebX6z+ZZ3tOEc8Bf9Cja4HoXA8uecJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D1dQqW7U+afV4AWAynKAwNZZzJu9ZUlVkbJoqurmqtbdG+AmJoDlUJcVS/cE3bmce 4dU0kDzWn5XQMW3CRwHV9pjSBzNI+0zvki7ArhiBE+Ut7Ew6sU16WJFshOUyGuT4AV i33FFFxHjcUvEYqdotI9MMEXmfrPWahLcQpuddhQ= 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.14 133/210] ata: fix ata_id_has_dipm() Date: Mon, 24 Oct 2022 13:30:50 +0200 Message-Id: <20221024113001.309825240@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747574240474376224?= X-GMAIL-MSGID: =?utf-8?q?1747574240474376224?= 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 641545929efb..af884beac08d 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -587,6 +587,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) \ @@ -610,17 +614,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)