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;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Michal Kubecek <mkubecek@suse.cz>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Rui Sousa <rui.sousa@nxp.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Pranavi Somisetty <pranavi.somisetty@amd.com>,
        Harini Katakam <harini.katakam@amd.com>,
        Colin Foster <colin.foster@in-advantage.com>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH v3 net-next 03/12] docs: ethtool-netlink: document interface for MAC Merge layer
Date:   Tue, 17 Jan 2023 10:59:38 +0200
Message-Id: <20230117085947.2176464-4-vladimir.oltean@nxp.com>
In-Reply-To: <20230117085947.2176464-1-vladimir.oltean@nxp.com>
References: <20230117085947.2176464-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?N7uJp7BLOBh6+vnocTh7Ig15MKDoLdjLJHWMYJoKgadbHXH600owiRCmlX4a?=
 =?us-ascii?Q?tQTlIxNbnJJCAhS2uH1g01EqIBPukyP7wQGe2NCL3nFeFJLHrCndvj9MRLoo?=
 =?us-ascii?Q?lEqQdMoAS+zwRxGM770ouh0iZo+Dr/WOQaRVc3grgthf/2FfUmwdQ5h8hYuy?=
 =?us-ascii?Q?JGF68kghrXulV9vIY/2Y/Fp/dlTQe8DsLq+G+EbrRWCZl2reDdkmioQcXtvv?=
 =?us-ascii?Q?BQocfLujtBoeJ6EnAbgavdwnKH00PyR0VdQDldHxs+ADSLJ6r4q/6RWZq0gD?=
 =?us-ascii?Q?kR6x2pvt53EPqmp+rFNpNek+FIecvFBpxLOZoj0D1ee4dnFUz8bz1xcZhSzH?=
 =?us-ascii?Q?2W9OOaX4Yn87OywqtUy5co9lele7gLUU1MP9G+Yt9GZOJqiL11xNmYFkt2RF?=
 =?us-ascii?Q?tvFvq5XWrFQy71hKKrJydeIkyUKrRyF8H8jupTTb5iHstwV2cPMeY72AeXc0?=
 =?us-ascii?Q?+xABrqsUafPDLmTLmRIceX8QTohejy/eze51nvBA3LjCwfyejUfEQdsK08v2?=
 =?us-ascii?Q?eu3L4u7Xd6Ok6pDh2BEjdhxNjXB5uMEfHjp0owP53Fwmc36dOA4ZpbFPUxNO?=
 =?us-ascii?Q?l6pELmh6ERkV98S4IfzI5GmDpFPZeKOh8HAhM5aDCLKP0CLtyG5XbFMsE1eC?=
 =?us-ascii?Q?xLGAtj9LgTiyHjzgTkdJrPvuolLVWoilDAHwSaVDPkipdPkiMj7gjGL4IpiR?=
 =?us-ascii?Q?ITfY7MdVJaX+UWiRX/FBnlJsiXT2nRQ1o4hN4SDOZb6NL9mRKuOWLg3dQfqM?=
 =?us-ascii?Q?VWupCGfTixL/gN1LHSlOouqcSVYim4+mnl+6pVi9rGo5bGJhx4ABajeYYu5E?=
 =?us-ascii?Q?cbjvI6T9ODG77gdvtObm1rJE/camAVFTvuLuU9HBaXVwr/teBYOd7YcL8vW3?=
 =?us-ascii?Q?GqwQMXx8QMj22vKZvqJVqyJoz6fhH/NRdI0+zGt2Ryf6F0hqzuR8pMxpl1/T?=
 =?us-ascii?Q?ujK6t/nrc8jtn6aX21aEZ9/XIvGgh6t2TaQDp69yayKpXjn02aSP4Aum09BX?=
 =?us-ascii?Q?MpFfoYI3okwJU+x4VoVWIdPgerIMl3w+X6HudXzdBsIEaGdEbJteGsXLhW3A?=
 =?us-ascii?Q?B4m+k870z+EyYz79EC8aJNqz76/tvLkv1nk5vJrAFN3mTi9zaHvOpdiWmNCM?=
 =?us-ascii?Q?p5V/uwU3Ioj/Nd8hFEmXJ0Ipa+mjZg0/TLJ7bl1OFz/8yEIISBSaSWPIK4bq?=
 =?us-ascii?Q?Vc9Rjd5ugqcT32uAFKA5g5Tjg0aB6ZSxgVkf/ZbZQLst3LUuv6Lgim0+6MXG?=
 =?us-ascii?Q?SypSDyz/XozIx9sS3HwY1bkqxBRHC+CLC4r/MhlqBxjxC1hSQWB/zK2jxp1c?=
 =?us-ascii?Q?TnOxdlIDCdZzh/GXvClnDxMs1/DCCZDlisg9UfJWMZ0qR2IUlGi/OeW+D34B?=
 =?us-ascii?Q?bgGdnYK3NvzquaEetdRsNMHEE0XL5QV0UoTPAxXlyf7uC8fQHePKQFR1c1Xb?=
 =?us-ascii?Q?LHkud7i7/FxFPrdSmLf1YyyHFsgI7Dw4Wai2CGLx0QVUCdpJoLf9fuQpHqSV?=
 =?us-ascii?Q?i7xHwmOHwalRGjaOLuTZ7Z5r1FCC/0knWFRxzBGgJnCaS7lso9XKS1voiotz?=
 =?us-ascii?Q?gbmauXWrbQK8AsrTmv3I7fym8gZerI+4qrJ4mZN9mO9o1g7JoLvIT6GQ3sOY?=
 =?us-ascii?Q?YQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a1449309-91b6-46df-a042-08daf86938ca
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 09:00:03.6748
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jq3A3KFPygPuuh7/J56VcG0pSLvYXHjAT02WnOJju3gmXeG/xmep7QePaXh6+MNghAPSAx08sr/R9RmuC0TH4g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9304
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Show details about the structures passed back and forth related to MAC
Merge layer configuration, state and statistics. The rendered htmldocs
will be much more verbose due to the kerneldoc references.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v2->v3:
- reformat tables
- delete obsolete netlink attributes and document new ones
v1->v2: patch is new

 Documentation/networking/ethtool-netlink.rst | 89 ++++++++++++++++++++
 Documentation/networking/statistics.rst      |  1 +
 2 files changed, 90 insertions(+)

diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst
index d345f5df248e..31413535dce5 100644
--- a/Documentation/networking/ethtool-netlink.rst
+++ b/Documentation/networking/ethtool-netlink.rst
@@ -223,6 +223,8 @@ Userspace to kernel:
   ``ETHTOOL_MSG_PSE_SET``               set PSE parameters
   ``ETHTOOL_MSG_PSE_GET``               get PSE parameters
   ``ETHTOOL_MSG_RSS_GET``               get RSS settings
+  ``ETHTOOL_MSG_MM_GET``                get MAC merge layer state
+  ``ETHTOOL_MSG_MM_SET``                set MAC merge layer parameters
   ===================================== =================================
 
 Kernel to userspace:
@@ -265,6 +267,7 @@ Kernel to userspace:
   ``ETHTOOL_MSG_MODULE_GET_REPLY``         transceiver module parameters
   ``ETHTOOL_MSG_PSE_GET_REPLY``            PSE parameters
   ``ETHTOOL_MSG_RSS_GET_REPLY``            RSS settings
+  ``ETHTOOL_MSG_MM_GET_REPLY``             MAC merge layer status
   ======================================== =================================
 
 ``GET`` requests are sent by userspace applications to retrieve device
@@ -1868,6 +1871,90 @@ When set, the ``ETHTOOL_A_PLCA_STATUS`` attribute indicates whether the node is
 detecting the presence of the BEACON on the network. This flag is
 corresponding to ``IEEE 802.3cg-2019`` 30.16.1.1.2 aPLCAStatus.
 
+MM_GET
+======
+
+Retrieve 802.3 MAC Merge parameters.
+
+Request contents:
+
+  ====================================  ======  ==========================
+  ``ETHTOOL_A_MM_HEADER``               nested  request header
+  ====================================  ======  ==========================
+
+Kernel response contents:
+
+  =================================  ======  ===================================
+  ``ETHTOOL_A_MM_HEADER``            nested  request header
+  ``ETHTOOL_A_MM_PMAC_ENABLED``      bool    set if RX of preemptible and SMD-V
+                                             frames is enabled
+  ``ETHTOOL_A_MM_TX_ENABLED``        bool    set if TX of preemptible frames is
+                                             administratively enabled (might be
+                                             inactive if verification failed)
+  ``ETHTOOL_A_MM_TX_ACTIVE``         bool    set if TX of preemptible frames is
+                                             operationally enabled
+  ``ETHTOOL_A_MM_TX_MIN_FRAG_SIZE``  u32     minimum size of transmitted
+                                             non-final fragments, in octets
+  ``ETHTOOL_A_MM_RX_MIN_FRAG_SIZE``  u32     minimum size of received non-final
+                                             fragments, in octets
+  ``ETHTOOL_A_MM_VERIFY_ENABLED``    bool    set if TX of SMD-V frames is
+                                             administratively enabled
+  ``ETHTOOL_A_MM_VERIFY_STATUS``     u8      state of the verification function
+  ``ETHTOOL_A_MM_VERIFY_TIME``       u32     delay between verification attempts
+  ``ETHTOOL_A_MM_MAX_VERIFY_TIME```  u32     maximum verification interval
+                                             supported by device
+  ``ETHTOOL_A_MM_STATS``             nested  IEEE 802.3-2018 subclause 30.14.1
+                                             oMACMergeEntity statistics counters
+  =================================  ======  ===================================
+
+The attributes are populated by the device driver through the following
+structure:
+
+.. kernel-doc:: include/linux/ethtool.h
+    :identifiers: ethtool_mm_state
+
+The ``ETHTOOL_A_MM_VERIFY_STATUS`` will report one of the values from
+
+.. kernel-doc:: include/uapi/linux/ethtool.h
+    :identifiers: ethtool_mm_verify_status
+
+If ``ETHTOOL_A_MM_VERIFY_ENABLED`` was passed as false in the ``MM_SET``
+command, ``ETHTOOL_A_MM_VERIFY_STATUS`` will report either
+``ETHTOOL_MM_VERIFY_STATUS_INITIAL`` or ``ETHTOOL_MM_VERIFY_STATUS_DISABLED``,
+otherwise it should report one of the other states.
+
+It is recommended that drivers start with the pMAC disabled, and enable it upon
+user space request. It is also recommended that user space does not depend upon
+the default values from ``ETHTOOL_MSG_MM_GET`` requests.
+
+``ETHTOOL_A_MM_STATS`` are reported if ``ETHTOOL_FLAG_STATS`` was set in
+``ETHTOOL_A_HEADER_FLAGS``. The attribute will be empty if driver did not
+report any statistics. Drivers fill in the statistics in the following
+structure:
+
+.. kernel-doc:: include/linux/ethtool.h
+    :identifiers: ethtool_mm_stats
+
+MM_SET
+======
+
+Modifies the configuration of the 802.3 MAC Merge layer.
+
+Request contents:
+
+  =================================  ======  ==========================
+  ``ETHTOOL_A_MM_VERIFY_TIME``       u32     see MM_GET description
+  ``ETHTOOL_A_MM_VERIFY_ENABLED``    bool    see MM_GET description
+  ``ETHTOOL_A_MM_TX_ENABLED``        bool    see MM_GET description
+  ``ETHTOOL_A_MM_PMAC_ENABLED``      bool    see MM_GET description
+  ``ETHTOOL_A_MM_TX_MIN_FRAG_SIZE``  u32     see MM_GET description
+  =================================  ======  ==========================
+
+The attributes are propagated to the driver through the following structure:
+
+.. kernel-doc:: include/linux/ethtool.h
+    :identifiers: ethtool_mm_cfg
+
 Request translation
 ===================
 
@@ -1972,4 +2059,6 @@ are netlink only.
   n/a                                 ``ETHTOOL_MSG_PLCA_GET_CFG``
   n/a                                 ``ETHTOOL_MSG_PLCA_SET_CFG``
   n/a                                 ``ETHTOOL_MSG_PLCA_GET_STATUS``
+  n/a                                 ``ETHTOOL_MSG_MM_GET``
+  n/a                                 ``ETHTOOL_MSG_MM_SET``
   =================================== =====================================
diff --git a/Documentation/networking/statistics.rst b/Documentation/networking/statistics.rst
index c9aeb70dafa2..551b3cc29a41 100644
--- a/Documentation/networking/statistics.rst
+++ b/Documentation/networking/statistics.rst
@@ -171,6 +171,7 @@ statistics are supported in the following commands:
 
   - `ETHTOOL_MSG_PAUSE_GET`
   - `ETHTOOL_MSG_FEC_GET`
+  - `ETHTOOL_MSG_MM_GET`
 
 debugfs
 -------
-- 
2.34.1