From patchwork Mon Oct 24 11:30:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp435832wru; Mon, 24 Oct 2022 05:55:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7hpQIUoJ9+rmct3y7w/byJKwy2z5oUZz77QjwkudKbcUZ48GsOKbh2WngpK6gO6JiremCh X-Received: by 2002:a05:6a00:2384:b0:566:813c:ae24 with SMTP id f4-20020a056a00238400b00566813cae24mr33533670pfc.17.1666616139124; Mon, 24 Oct 2022 05:55:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616139; cv=none; d=google.com; s=arc-20160816; b=Leq+j2v8kUO1UZ4loAtrq01kSz6BoyVGrqKMG7/6IVLFzYLe8bD+Khg8++/kfhJ93O w50yS+h27hDdJchzurYMK6ELWb/G0nkHs5GApPAj/I+GXmYRFylK7CGkDmBAAt8nssHb DvDNJfXl3e4yzgXEwk7RKi0FFreJiLUpOL4GV7y7cLxlhsOW+8uiRUe3z0HAYCbABJEk K8iZIyn8YMVJtRtG2T2JeefX+kHOJgZqITseDcL0uJZ+x9xd0AUiBS1HMCbb2lIaYYC4 2Xu8GIZaX5c+U79rO6RtZquDJFte4FCoSZPc3bH7ZDuj56/G1q3e094S2z/Kr+36MT7G +YyA== 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=8SmK+dC9X1WKK6XBB5logJ8chux93+70D0FuD7TFs2E=; b=TdJIKUsESsyHhvfcR59rWQqP9REZ0qouLcSeBo8BP3QE78bV+BHkDhbVXRZj26kbBR MUmJKR3cfCfAVOfHzyU92QRvktpx3nJGfjyMEyE2cy4xWYWxclPa+tvWUeq38K/eamMe dYyXW+3zRUIiCnL0FHsEOtjmpXKm9+5j3fZmqjBvwtFdiLMV+A2XgktjCrcFQycBvRbJ 2w8zOoG4oaxfWnjqiq03BGXak5SUFSFhhe+EkrvLMzTFkbnK+ME/rWN9GcJcHKqNBj2K sSThp7fKMsXb/YDPegWhKtKbpEj52TM3IthtVHRlCtxgNfeKTmCDyrMzCCEi/fDwNFOm NmGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cKiRExH+; 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 y28-20020a63495c000000b0045a73a1790asi35385799pgk.613.2022.10.24.05.55.26; Mon, 24 Oct 2022 05:55:39 -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=cKiRExH+; 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 S234740AbiJXMxa (ORCPT + 99 others); Mon, 24 Oct 2022 08:53:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234574AbiJXMvq (ORCPT ); Mon, 24 Oct 2022 08:51:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B22DF92CF0; Mon, 24 Oct 2022 05:14:04 -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 80A58612B7; Mon, 24 Oct 2022 12:10:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95DDFC433D7; Mon, 24 Oct 2022 12:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613456; bh=xPThxkg/kWjmznk8UoQBVXx8Q5wQiDakS3AeMMjacOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cKiRExH+c8P+GI5RbgRHuDtSnctmsIbHZzNaTjwUX6PvjZns5zzI+wm1D9ILgOxVP q4XwgljO8iB3JREZV9DVnKivfnsjxNyTpdH2CJMUSjrDT6OvrowovxBKvjP7B0AUYS W3Q9zYeGIhnZbfhm2caG+fhpsL1l68iZOOLldhio= 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 143/255] ata: fix ata_id_has_ncq_autosense() Date: Mon, 24 Oct 2022 13:30:53 +0200 Message-Id: <20221024113007.361630001@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?1747573684321985494?= X-GMAIL-MSGID: =?utf-8?q?1747573684321985494?= From: Niklas Cassel [ Upstream commit a5fb6bf853148974dbde092ec1bde553bea5e49f ] 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.) 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: 5b01e4b9efa0 ("libata: Implement NCQ autosense") Signed-off-by: Niklas Cassel Signed-off-by: Damien Le Moal Signed-off-by: Sasha Levin --- include/linux/ata.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/ata.h b/include/linux/ata.h index 8b884cd3a232..94f7872da983 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -569,6 +569,10 @@ struct ata_bmdma_prd { ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ ((id)[ATA_ID_FEATURE_SUPP] & (1 << 8))) +#define ata_id_has_ncq_autosense(id) \ + ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ + ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ + ((id)[ATA_ID_FEATURE_SUPP] & (1 << 7))) #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) \ @@ -581,8 +585,6 @@ struct ata_bmdma_prd { #define ata_id_cdb_intr(id) (((id)[ATA_ID_CONFIG] & 0x60) == 0x20) #define ata_id_has_da(id) ((id)[ATA_ID_SATA_CAPABILITY_2] & (1 << 4)) -#define ata_id_has_ncq_autosense(id) \ - ((id)[ATA_ID_FEATURE_SUPP] & (1 << 7)) static inline bool ata_id_has_hipm(const u16 *id) {