From patchwork Mon Oct 24 11:30:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9601 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp529583wru; Mon, 24 Oct 2022 09:03:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5IUJpTA08SzpTX1JgE298mCeFxcCNGn3jJPR9JMxz2tS7EW2UdiQ403Hw/hWhV3sdbIKJt X-Received: by 2002:a63:5656:0:b0:446:8eb5:a2c5 with SMTP id g22-20020a635656000000b004468eb5a2c5mr29441080pgm.336.1666627430152; Mon, 24 Oct 2022 09:03:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627430; cv=none; d=google.com; s=arc-20160816; b=cgZ4vPZakj14vS1FoUpxMti4UIy9RvawH4nYF/mO/K31fUFrBdT97ldB2Gx3Q8xtbz x0mQmsfc9dZB++S3DrX65jPvo2EWeh+gIfQq//2aMv/NsRjljpFVgb3qFgJHVqmeJbIk RfWhB4/7WC4X0WaE1fs7WhupQfYIhEx9AwbKaBiNgdMKL1xjap/1iJlDIBrlQ7XwgRMu Yfi8EUq7Ebm3PoSu+6Fv8TXOEhv2NYbEVYld8D59KNkQ7k/RUIET7kwpPz4cyWvnhVQu jHCPTuqHUkebupz3nXJLm/U9KhQtt3yZNAe++uOPmYUgld1E6TEBpRkLmCT810M6J5pK +iPg== 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=QOKLZ4ZMSPje3XYsO1BAlLqeRs8O9EAwnpnwqLYpxsA=; b=qeQP5M9/fpgF3GOWgTkK26xWL6RJWYXij6hjuJupJhaVI6DFUFo2ZUJejvZJdy7ttR zLsHvVPWxBnoQERzAR/DEMU19oEZ/Go0obyc496dZ3q2m7Bk33dIR5RSeLour665Nzm9 7OBLnUupYDDVauR6gPk8IcyqpLHqdPWIbb4papqRxdXikWi2eN6k2vgCB38Qy4hfW9ws V5h9lmeJmcvVTglpC8lZkol+mP5IbpLMYXo5aUfUVykRr41CTfCMOQ9Bfx4LL5OzQUQk BZQEJERkUvSALDy1swN+vTicOqO5sr29WhKCu5rug/ypAP6rP3dAFyhwslRaporHwYAJ JZnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="G/saWFEv"; 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 m5-20020a63fd45000000b004561c1f132csi36671417pgj.346.2022.10.24.09.03.36; Mon, 24 Oct 2022 09:03:50 -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="G/saWFEv"; 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 S232660AbiJXQCV (ORCPT + 99 others); Mon, 24 Oct 2022 12:02:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232342AbiJXQAo (ORCPT ); Mon, 24 Oct 2022 12:00:44 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5D3D8991E; Mon, 24 Oct 2022 07:55: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 ams.source.kernel.org (Postfix) with ESMTPS id 80CF7B81181; Mon, 24 Oct 2022 12:27:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3145C433C1; Mon, 24 Oct 2022 12:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614421; bh=xGYjKcOLlvZoNqj94TrqhJyt9N8mS9hRdIcXcQIs8x4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G/saWFEvaDSyI+0kFJPwq3KCw5yFe7T9YEXkmljxyWoccvFvTMAQXi5xgB1beWeNh V0XamzQigfC4lAodl/TZIpGMSkmCBEbm8j0+FkY0h4PEhxpau6iEO5kRUSpm4eXMhm Nc+th26rJra1TD4aDJhXe7kLkV9ozjfrtx4U8WU4= 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 224/390] ata: fix ata_id_sense_reporting_enabled() and ata_id_has_sense_reporting() Date: Mon, 24 Oct 2022 13:30:21 +0200 Message-Id: <20221024113032.311407255@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?1747585524205833430?= X-GMAIL-MSGID: =?utf-8?q?1747585524205833430?= From: Niklas Cassel [ Upstream commit 690aa8c3ae308bc696ec8b1b357b995193927083 ] ACS-5 section 7.13.6.41 Words 85..87, 120: Commands and feature sets supported or enabled states that: If bit 15 of word 86 is set to one, bit 14 of word 119 is set to one, and bit 15 of word 119 is cleared to zero, then word 119 is valid. If bit 15 of word 86 is set to one, bit 14 of word 120 is set to one, and bit 15 of word 120 is cleared to zero, then word 120 is valid. (This text also exists in really old ACS standards, e.g. ACS-3.) Currently, ata_id_sense_reporting_enabled() and ata_id_has_sense_reporting() both check bit 15 of word 86, but neither of them check that bit 14 of word 119 is set to one, or that bit 15 of word 119 is cleared to zero. Additionally, make ata_id_sense_reporting_enabled() return false if !ata_id_has_sense_reporting(), similar to how e.g. ata_id_flush_ext_enabled() returns false if !ata_id_has_flush_ext(). Fixes: e87fd28cf9a2 ("libata: Implement support for sense data reporting") Signed-off-by: Niklas Cassel Signed-off-by: Damien Le Moal Signed-off-by: Sasha Levin --- include/linux/ata.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/linux/ata.h b/include/linux/ata.h index 6e67aded28f8..734cc646ce35 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -770,16 +770,21 @@ static inline bool ata_id_has_read_log_dma_ext(const u16 *id) static inline bool ata_id_has_sense_reporting(const u16 *id) { - if (!(id[ATA_ID_CFS_ENABLE_2] & (1 << 15))) + if (!(id[ATA_ID_CFS_ENABLE_2] & BIT(15))) + return false; + if ((id[ATA_ID_COMMAND_SET_3] & (BIT(15) | BIT(14))) != BIT(14)) return false; - return id[ATA_ID_COMMAND_SET_3] & (1 << 6); + return id[ATA_ID_COMMAND_SET_3] & BIT(6); } static inline bool ata_id_sense_reporting_enabled(const u16 *id) { - if (!(id[ATA_ID_CFS_ENABLE_2] & (1 << 15))) + if (!ata_id_has_sense_reporting(id)) + return false; + /* ata_id_has_sense_reporting() == true, word 86 must have bit 15 set */ + if ((id[ATA_ID_COMMAND_SET_4] & (BIT(15) | BIT(14))) != BIT(14)) return false; - return id[ATA_ID_COMMAND_SET_4] & (1 << 6); + return id[ATA_ID_COMMAND_SET_4] & BIT(6); } /**