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 v2 net-next 07/12] net: ethtool: add helpers for MM addFragSize translation
Date:   Wed, 11 Jan 2023 18:17:01 +0200
Message-Id: <20230111161706.1465242-8-vladimir.oltean@nxp.com>
In-Reply-To: <20230111161706.1465242-1-vladimir.oltean@nxp.com>
References: <20230111161706.1465242-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?SDeHSY7Gb4qd4vQmyjSG3O3BfZjAe8ik3qq7iPT6+7hscdTnkmqpSFs/8yrY?=
 =?us-ascii?Q?06/jjKskfrQGiJvyGcGc+m0hm+zVxZBvZBcLPCEF7lb4iGn1KivZbBk2Ekeu?=
 =?us-ascii?Q?LJrYf/INo5NUq3vNDdj777fmQYaoL8PaMSxJNkWjN07PvTTa5IVlI1a7XvuM?=
 =?us-ascii?Q?CwHr8aHbjWD9gpq4P6a+VjwznaclgYfEunvo+vtnBENNdxUoV/EGTM0zZshf?=
 =?us-ascii?Q?b/RXJ0Nck+HI2T0i5T7JnG//yV3gdS4VY2Y0GUpMqLMw6MuA1TGh63QYNOaz?=
 =?us-ascii?Q?i2wpAzs4j5q6GlSuG4vGvV2VCIW6rPbomhgMySgFdGA6m5wGsRcpN1ODNGg5?=
 =?us-ascii?Q?Fke5etSRf2Ihubci4wPfuCv6bxav9EeELrpWydeVRiyVXy559KBVpH2Lax/p?=
 =?us-ascii?Q?Ig0KJ2VO5HOXbngoBbPcjt9eJlCx9yAi0ia8SRWp+w14vujbA81b3zdFNdDO?=
 =?us-ascii?Q?i7Bxg65Y+oR6uyymgVRMDZD4yhyNZdHYzQZGHM66CVV5jrxyzjFjzBt6Z+Sx?=
 =?us-ascii?Q?D1xt6hvpAoySZg9/J5KWs0EQZdnhn+jzK7o2IMY5WgJPrjrcpOYwS0mDMczI?=
 =?us-ascii?Q?FRTmUeIvM5nHrlkL1nxm+zMtGmUvkkQJv4JRCad0kJh5xmFDQkeDG9c7Hmau?=
 =?us-ascii?Q?+os2gqzUhb9OU/UTKePmtBybBirYfQqg+KU5uSR9a5yEI3WT+Sphcf2GIMG9?=
 =?us-ascii?Q?c8E3eEpCW7fIjzi7k0+ZsQTxCDIsZG8A2AhNoyg5H2tjRFQAe9VIaaSPvBJQ?=
 =?us-ascii?Q?g38LLHmXDJHPLqZg4SPvChrflP3rsUOInnAFe7JAENguOqk0bjDMQYc+uJjK?=
 =?us-ascii?Q?XTlqiYGvOc3BPcvDTtx2LsdiAr5lGucvpVfcG7KStumvUPSsNicSKFp5sKda?=
 =?us-ascii?Q?Ca+RbVAK01WhUY3JQV6DQhzuL6OGBzCxsnRhKpEkqQzKQ7Kz9VFOgvzw4fiP?=
 =?us-ascii?Q?mrf97tUEO5jmcVOHGeikK3RfUL2T7IMx1q3iWJP9z+AV6XuQ8T44Fd2yyhOT?=
 =?us-ascii?Q?mntWoBl5S3L2XNYNnl5evXrBpAVD/uLWv/dyJGgbR4CfmtssttF7sdeRE7Hz?=
 =?us-ascii?Q?pfQjs1HEekvML78zYNT15NdOWzJJtMjXHwFbAbMKY/nwkE0GEhXR8ly0iaq1?=
 =?us-ascii?Q?3ipayjBGU9MfiD3yePj2f+4T0OpN6r4RAXD5YcHs/xaVJ68YWcDjyQclCwJS?=
 =?us-ascii?Q?fNpgtDN8P4rVdZfULMf1cb52B/dr0YmCUTSlRbZC7VW3mWo2nh5Z9eb3btpb?=
 =?us-ascii?Q?BQb+d7uJrT7gQC39PtNNql/fsCa6D4H77dLms3ZvBOlsTpb0lZh5Uhv30K5h?=
 =?us-ascii?Q?ahG08egjmBzahZg8QVgAhDALGguQ0TtrPX5abXYHjU/gEPL2BXXYJovXojDd?=
 =?us-ascii?Q?emdPAGN4IdAC0SCPmRa2QYyh0OwrqmFEl7ICkUVl4x30jk48d0PI6jfUdCeA?=
 =?us-ascii?Q?VjXy8mcCQpzdNgkmT/NpzWcWkzcnXgr0zWQ3juVtAYbjwKODtBxxoBmjHzlb?=
 =?us-ascii?Q?fqyHHa2eggGKc62yYx+U2xTxh2myOvnPdzVCN/dqMh3jqRa/lxW6T1MoNJCm?=
 =?us-ascii?Q?dE+n5uQ74B6zBRj205hLS/x1bimXrfd039/zsi93BHOFrTiTsAQNy6Lvl8ru?=
 =?us-ascii?Q?1Q=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 378872e5-d9b0-4872-cc4f-08daf3ef5492
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2023 16:17:27.0173
 (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: p4UEgL0Z2UsSEg4mDtG7UZRhXAB6ipSAStSKEuflEo7ShP3/OF559UgFsOfV8iNhBd1AtRYarliC18MFuchWHA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8462
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

We deliberately make the Linux UAPI pass the additional fragment size in
octets, even though IEEE 802.3 defines it as discrete values, and
addFragSize is just the multiplier. This is because there is nothing
impossible in operating with an in-between value for the fragment size
of non-final preempted fragments, and there may even appear hardware
which supports the in-between sizes.

For the hardware which just understands addFragSize as being a
multiplier, create two helpers which translate back and forth the values
passed in octets.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v1->v2: patch is new

 include/linux/ethtool.h | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 01b1e34dc30e..1c3e8fc53609 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -979,6 +979,45 @@ void ethtool_aggregate_pause_stats(struct net_device *dev,
 void ethtool_aggregate_rmon_stats(struct net_device *dev,
 				  struct ethtool_rmon_stats *rmon_stats);
 
+/**
+ * ethtool_mm_add_frag_size_std_to_oct - Translate standard add_frag_size into
+ *	value in octets
+ * @val_std: Value of addFragSize variable in octets
+ */
+static inline u32 ethtool_mm_add_frag_size_std_to_oct(u32 val_std)
+{
+	return 64 * (1 + val_std) - 4;
+}
+
+/**
+ * ethtool_mm_add_frag_size_oct_to_std - Translate add_frag_size into
+ *	standard value
+ * @val_oct: Value of addFragSize variable in octets
+ * @val_std: Pointer where the standard addFragSize value is to be returned
+ * @extack: Netlink extended ack
+ *
+ * Translate a value in octets to one of 0, 1, 2, 3 according to the reverse
+ * application of the 802.3 formula 64 * (1 + addFragSize) - 4. To be called
+ * by drivers which do not support programming addFragSize to a continuous
+ * range. Returns error on other fragment length values.
+ */
+static inline int ethtool_mm_add_frag_size_oct_to_std(u32 val_oct, u32 *val_std,
+						      struct netlink_ext_ack *extack)
+{
+	u32 add_frag_size;
+
+	for (add_frag_size = 0; add_frag_size < 4; add_frag_size++) {
+		if (ethtool_mm_add_frag_size_std_to_oct(add_frag_size) == val_oct) {
+			*val_std = add_frag_size;
+			return 0;
+		}
+	}
+
+	NL_SET_ERR_MSG_MOD(extack,
+			   "addFragSize required to be one of 60, 124, 188 or 252");
+	return -EINVAL;
+}
+
 /**
  * ethtool_sprintf - Write formatted string to ethtool string data
  * @data: Pointer to start of string to update
-- 
2.34.1