From nobody Wed Apr 8 10:04:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EBEEECAAA1 for ; Fri, 9 Sep 2022 19:38:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231886AbiIITiR (ORCPT ); Fri, 9 Sep 2022 15:38:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231538AbiIIThM (ORCPT ); Fri, 9 Sep 2022 15:37:12 -0400 Received: from mail.baikalelectronics.com (mail.baikalelectronics.com [87.245.175.230]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3660C11B037; Fri, 9 Sep 2022 12:36:46 -0700 (PDT) Received: from mail (mail.baikal.int [192.168.51.25]) by mail.baikalelectronics.com (Postfix) with ESMTP id BD46DDBE; Fri, 9 Sep 2022 22:40:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.baikalelectronics.com BD46DDBE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baikalelectronics.ru; s=mail; t=1662752427; bh=lR+XuoZ5OpBeN2gxrD/crsk4SZmx3KT/fJ296KmTZDU=; h=From:To:CC:Subject:Date:In-Reply-To:References:From; b=dkQ7x92rwf4ZFGPkITL4+WyM0/2sdRRqBOD8LTdLfDPJFUUgk3LyPApiRqFDlQSoF RyHGPCSvDKXnSxJmZdwaQQQnCcCP/hNo87eg2bFrQZa+AkcwQbgBO37yQyPcU10op4 fRYZi0qr6UvIg/HtJARYcugtNHtU/B6wE+38R5fM= Received: from localhost (192.168.168.10) by mail (192.168.51.25) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 9 Sep 2022 22:36:39 +0300 From: Serge Semin To: Damien Le Moal , Hans de Goede , Jens Axboe , Hannes Reinecke CC: Serge Semin , Serge Semin , Alexey Malahov , Pavel Parkhomenko , Rob Herring , Krzysztof Kozlowski , , , Subject: [PATCH v8 12/23] ata: libahci: Extend port-cmd flags set with port capabilities Date: Fri, 9 Sep 2022 22:36:10 +0300 Message-ID: <20220909193621.17380-13-Sergey.Semin@baikalelectronics.ru> In-Reply-To: <20220909193621.17380-1-Sergey.Semin@baikalelectronics.ru> References: <20220909193621.17380-1-Sergey.Semin@baikalelectronics.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MAIL.baikal.int (192.168.51.25) To mail (192.168.51.25) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently not all of the Port-specific capabilities listed in the PORT_CMD-enumeration. Let's extend that set with the Cold Presence Detection and Mechanical Presence Switch attached to the Port flags [1] so to closeup the set of the platform-specific port-capabilities flags. Note these flags are supposed to be set by the platform firmware if there is one. Alternatively as we are about to do they can be set by means of the OF properties. While at it replace PORT_IRQ_DEV_ILCK with PORT_IRQ_DMPS and fix the comment there. In accordance with [2] that IRQ flag is supposed to indicate the state of the signal coming from the Mechanical Presence Switch. [1] Serial ATA AHCI 1.3.1 Specification, p.27 [2] Serial ATA AHCI 1.3.1 Specification, p.24, p.88 Signed-off-by: Serge Semin Reviewed-by: Hannes Reinecke --- Changelog v4: - Fix the DMPS macros name in the patch log. (@Sergei Shtylyov) Changelog v5: - Add a comment regarding the PORT_CMD_CAP enum entity purpose. (@Damien) --- drivers/ata/ahci.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 7d834deefeb9..27cab4e909a5 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -138,7 +138,7 @@ enum { PORT_IRQ_BAD_PMP =3D (1 << 23), /* incorrect port multiplier */ =20 PORT_IRQ_PHYRDY =3D (1 << 22), /* PhyRdy changed */ - PORT_IRQ_DEV_ILCK =3D (1 << 7), /* device interlock */ + PORT_IRQ_DMPS =3D (1 << 7), /* mechanical presence status */ PORT_IRQ_CONNECT =3D (1 << 6), /* port connect change status */ PORT_IRQ_SG_DONE =3D (1 << 5), /* descriptor processed */ PORT_IRQ_UNK_FIS =3D (1 << 4), /* unknown FIS rx'd */ @@ -166,6 +166,8 @@ enum { PORT_CMD_ATAPI =3D (1 << 24), /* Device is ATAPI */ PORT_CMD_FBSCP =3D (1 << 22), /* FBS Capable Port */ PORT_CMD_ESP =3D (1 << 21), /* External Sata Port */ + PORT_CMD_CPD =3D (1 << 20), /* Cold Presence Detection */ + PORT_CMD_MPSP =3D (1 << 19), /* Mechanical Presence Switch */ PORT_CMD_HPCP =3D (1 << 18), /* HotPlug Capable Port */ PORT_CMD_PMP =3D (1 << 17), /* PMP attached */ PORT_CMD_LIST_ON =3D (1 << 15), /* cmd list DMA engine running */ @@ -181,6 +183,10 @@ enum { PORT_CMD_ICC_PARTIAL =3D (0x2 << 28), /* Put i/f in partial state */ PORT_CMD_ICC_SLUMBER =3D (0x6 << 28), /* Put i/f in slumber state */ =20 + /* PORT_CMD capabilities mask */ + PORT_CMD_CAP =3D PORT_CMD_HPCP | PORT_CMD_MPSP | + PORT_CMD_CPD | PORT_CMD_ESP | PORT_CMD_FBSCP, + /* PORT_FBS bits */ PORT_FBS_DWE_OFFSET =3D 16, /* FBS device with error offset */ PORT_FBS_ADO_OFFSET =3D 12, /* FBS active dev optimization offset */ --=20 2.37.2