From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f12.google.com (mail-pz2-f12.google.com [74.125.228.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAC8A382F1A for ; Wed, 23 Sep 2026 02:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790130019; cv=none; b=QkBIGRM7B0o2rqE2tSWYXpBUrpyFkqCZUxT+m0hIXjEJ87OBEIHYMgv78zQyBgeYDoK8YdnP0IsjIge8Ci6syAD2NNRIToYklNqiBWTwdBgpq/7nYCgJgO5S8sZ5eSHNaTwtsR6ehhhC16dIWfQk8mF9PwuhPf1c2ekfZ4Zj1FI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790130019; c=relaxed/simple; bh=uV7nskBIpDf7b1+sE//lNQT9qbsMS4sKk4qV93w23WA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AOE1IE3XX0kfmyarJrCIIGGwqwO1fUcmxymM35zgS1YHTa7NpkVLfutxgF3xgDK3iTvPzDD+3QbQaOdw11fehm7/JCrrWMjz0EdTkXzyF5p9024sqy1mCPtaZJ15t1RKzgyybzwG9tTPI15ZmEUNvyWThv9h4XmRcECByUBEf6M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=grFyNKhA; arc=none smtp.client-ip=74.125.228.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="grFyNKhA" Received: by mail-pz2-f12.google.com with SMTP id d2e1a72fcca58-868cfc5c244so200990b3a.3 for ; Tue, 22 Sep 2026 19:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790130017; x=1790734817; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=HRv54spnuBOKi0zqhyEPtOohGBUa24TYUK5n/dGkrGo=; b=grFyNKhAJhe9Ndg+uxNVvQ8Q204vzfb2H3ZdbgREsvyboDlRlBghfvBFbwTSUpa/+O c9uL+qqN6Ou2PV/gQCi3k3un2V7d94cquBlxSxbsImXRLnqiBe+OKgnhms+tm9jMd/Oa Q6bNAnQeVuXeHF67Fyu/2JPJ1tuSJ3bE533kS0bIgdnZc5y34H9Y9oKn3E2UyeWdxCn7 tQNHLIIoHpSnYnfnLKF3vxtCC3ejgauBtjK00MdQEnzpzLOKojQEdH1imax6ajs3/SAg CmQfVpedckpUsLl2ghosKLlFkARec4zs3pS0neuxyzxR6Ausib66SHVKTNqogZKdQinA gFtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790130017; x=1790734817; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=HRv54spnuBOKi0zqhyEPtOohGBUa24TYUK5n/dGkrGo=; b=rsUmx5ZPO9fVmPfumLYXyE7QB7uzuanXQVldsQWPjm0WuowDC4lO7GaMAKVOqJoxZo pqQ4yq/pLSazm12Ha3a9BOUIK/cX2mbUVwyjVmU0+rGiEbVJijQiDVE6xdrVGyRNXmuG Ul1lxE1Wf7OZDOoVgc8Z6TAkQOiSfqUfTC1ZRIQyTAWMJQCjVwWNoDr2sdSisZiq+HTc hO+BSa10Vvu76As9Eut6Ch1wc6TBi6e627z3PrMJZZYu0J5uwS7Iy8Lx6tcCfT6srhFS 2ViIZk6jBbF8uBM9L5vxaMiGXDEBYJtYTgXJDOmXNwilg8m9WvdVK/e5vw7XwBrs7WS4 QJSw== X-Forwarded-Encrypted: i=1; AKwUvBzTV8oGKXco9qHDdAJTxs8s9eQ7au5WtQv7jYgGCq09D0dhHGQEomJw78a+KZnBVplNfgexf6+nOHZ1Sl8=@vger.kernel.org X-Gm-Message-State: AFuF++khGHzYgPFpeVXkTuilmY1RSrDlJZNicoF5Vx0nKIAJXAtprBmT sUaIuArqHug4Yt1vg7hHmq3W6tgojxr57dkq9etBvS31nAQ3YwT92bez X-Gm-Gg: AYBFou01NODRioFnvDjvJL7a2dBjQr4hDW2Uf+DO/jATGG4JHuvXkYFls5GRQ3z4hmv Jg12ldcXMjc0xsZU47kS/yUNwDfx+vGgpzks0BakS8me0XOJGv+k6AjSstBxhSsK6xTTbIdEhrI YQHd/wjVMrk0OJxkgVuqyeEPnyALumotrTzzIkk77sXA1yN/C9xslTAV/jDq5ikwmynqmgXXzhm NKeLjd8lVREM8ctF8u/wa4bLto5V9Hn1LHCQQ9ZQAp6ByqIolsFqj8hbysYczjzWHUUo8HsZ1t4 d0YAC7GOsQvA2N2J0O0AcUYdV2uFdFz+WruxY6WZYlBIiDWw3/u219QTYHtF+xSsCVoWqMQS8zQ kB1OcU2+OWFVeAq7y754SCyzhqb6abOZUkv2POOLPHa17CvcIkrv+xXlV6ykqf2QHPx3XPPfCCF vV9Cp4v6rFG3MHGemJB8ZpKYJVCgZtgh4WZU/b7q2GUc2bJcvt0BQzmnLGPLvEX35e09rIHIE2G xnRMmG47X9SgH1v9RWKqOjGK8rLlvNFB3M= X-Received: by 2002:a05:6a00:35c6:b0:858:b809:6ec0 with SMTP id d2e1a72fcca58-87d1b2b0ccamr1194044b3a.23.1790130017235; Tue, 22 Sep 2026 19:20:17 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac1:76c0:d30::4d0:61]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87d1e0f4fe8sm502924b3a.51.2026.09.22.19.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 19:20:16 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH net-next v4 5/8] net: dsa: motorcomm: Introduce yt921x_speed Date: Wed, 23 Sep 2026 10:19:37 +0800 Message-ID: <20260923021945.2203368-6-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260923021945.2203368-1-mmyangfl@gmail.com> References: <20260923021945.2203368-1-mmyangfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit FIELD_PREP values cannot be used as case labels. Introduce enum for future use. Signed-off-by: David Yang --- drivers/net/dsa/motorcomm/chip.c | 62 ++++---------------------------- drivers/net/dsa/motorcomm/chip.h | 43 ++++++++++++++-------- 2 files changed, 34 insertions(+), 71 deletions(-) diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/chip.c index f22c37e0b5bc..06e2c60b415f 100644 --- a/drivers/net/dsa/motorcomm/chip.c +++ b/drivers/net/dsa/motorcomm/chip.c @@ -3771,29 +3771,15 @@ yt921x_port_up(struct yt921x_priv *priv, int port, unsigned int mode, { const struct yt921x_info *info = priv->info; struct yt921x_port *pp = &priv->ports[port]; + int ps = ethtool_speed_to_yt921x(speed); u32 mask; u32 ctrl; int res; - switch (speed) { - case SPEED_10: - ctrl = YT921X_PORT_SPEED_10; - break; - case SPEED_100: - ctrl = YT921X_PORT_SPEED_100; - break; - case SPEED_1000: - ctrl = YT921X_PORT_SPEED_1000; - break; - case SPEED_2500: - ctrl = YT921X_PORT_SPEED_2500; - break; - case SPEED_10000: - ctrl = YT921X_PORT_SPEED_10000; - break; - default: + if (ps == YT921X_SPEED_INVALID) return -EINVAL; - } + + ctrl = YT921X_PORT_SPEED(ps); if (duplex == DUPLEX_FULL) ctrl |= YT921X_PORT_DUPLEX_FULL; if (tx_pause) @@ -3810,25 +3796,7 @@ yt921x_port_up(struct yt921x_priv *priv, int port, unsigned int mode, if (pp->serdes) { mask = YT921X_SERDES_SPEED_M; - switch (speed) { - case SPEED_10: - ctrl = YT921X_SERDES_SPEED_10; - break; - case SPEED_100: - ctrl = YT921X_SERDES_SPEED_100; - break; - case SPEED_1000: - ctrl = YT921X_SERDES_SPEED_1000; - break; - case SPEED_2500: - ctrl = YT921X_SERDES_SPEED_2500; - break; - case SPEED_10000: - ctrl = YT921X_SERDES_SPEED_10000; - break; - default: - return -EINVAL; - } + ctrl = YT921X_SERDES_SPEED(ps); mask |= YT921X_SERDES_DUPLEX_FULL; if (duplex == DUPLEX_FULL) ctrl |= YT921X_SERDES_DUPLEX_FULL; @@ -3850,25 +3818,7 @@ yt921x_port_up(struct yt921x_priv *priv, int port, unsigned int mode, if (res) return res; - switch (speed) { - case SPEED_10: - ctrl = YT921X_MDIO_POLLING_SPEED_10; - break; - case SPEED_100: - ctrl = YT921X_MDIO_POLLING_SPEED_100; - break; - case SPEED_1000: - ctrl = YT921X_MDIO_POLLING_SPEED_1000; - break; - case SPEED_2500: - ctrl = YT921X_MDIO_POLLING_SPEED_2500; - break; - case SPEED_10000: - ctrl = YT921X_MDIO_POLLING_SPEED_10000; - break; - default: - return -EINVAL; - } + ctrl = YT921X_MDIO_POLLING_SPEED(ps); if (duplex == DUPLEX_FULL) ctrl |= YT921X_MDIO_POLLING_DUPLEX_FULL; ctrl |= YT921X_MDIO_POLLING_LINK; diff --git a/drivers/net/dsa/motorcomm/chip.h b/drivers/net/dsa/motorcomm/chip.h index 3fb0c6a69dd8..30d131eb9844 100644 --- a/drivers/net/dsa/motorcomm/chip.h +++ b/drivers/net/dsa/motorcomm/chip.h @@ -89,11 +89,6 @@ #define YT921X_SERDES_DUPLEX_FULL BIT(3) #define YT921X_SERDES_SPEED_M GENMASK(2, 0) #define YT921X_SERDES_SPEED(x) FIELD_PREP(YT921X_SERDES_SPEED_M, (x)) -#define YT921X_SERDES_SPEED_10 YT921X_SERDES_SPEED(0) -#define YT921X_SERDES_SPEED_100 YT921X_SERDES_SPEED(1) -#define YT921X_SERDES_SPEED_1000 YT921X_SERDES_SPEED(2) -#define YT921X_SERDES_SPEED_10000 YT921X_SERDES_SPEED(3) -#define YT921X_SERDES_SPEED_2500 YT921X_SERDES_SPEED(4) #define YT921X_PORTn_CTRL(port) (0x80100 + 4 * (port)) /* Bit 7-0 shared with PORT_STATUS */ #define YT921X_PORT_CTRL_PAUSE_AN BIT(10) #define YT921X_PORT_CTRL_LINK_AN BIT(9) @@ -107,11 +102,6 @@ #define YT921X_PORT_TX_MAC_EN BIT(3) #define YT921X_PORT_SPEED_M GENMASK(2, 0) #define YT921X_PORT_SPEED(x) FIELD_PREP(YT921X_PORT_SPEED_M, (x)) -#define YT921X_PORT_SPEED_10 YT921X_PORT_SPEED(0) -#define YT921X_PORT_SPEED_100 YT921X_PORT_SPEED(1) -#define YT921X_PORT_SPEED_1000 YT921X_PORT_SPEED(2) -#define YT921X_PORT_SPEED_10000 YT921X_PORT_SPEED(3) -#define YT921X_PORT_SPEED_2500 YT921X_PORT_SPEED(4) #define YT921X_PON_STRAP_FUNC 0x80320 #define YT921X_PON_STRAP_VAL 0x80324 #define YT921X_PON_STRAP_CAP 0x80328 @@ -122,11 +112,16 @@ #define YT921X_MDIO_POLLING_LINK BIT(3) #define YT921X_MDIO_POLLING_SPEED_M GENMASK(2, 0) #define YT921X_MDIO_POLLING_SPEED(x) FIELD_PREP(YT921X_MDIO_POLLING_SPEED_M, (x)) -#define YT921X_MDIO_POLLING_SPEED_10 YT921X_MDIO_POLLING_SPEED(0) -#define YT921X_MDIO_POLLING_SPEED_100 YT921X_MDIO_POLLING_SPEED(1) -#define YT921X_MDIO_POLLING_SPEED_1000 YT921X_MDIO_POLLING_SPEED(2) -#define YT921X_MDIO_POLLING_SPEED_10000 YT921X_MDIO_POLLING_SPEED(3) -#define YT921X_MDIO_POLLING_SPEED_2500 YT921X_MDIO_POLLING_SPEED(4) + +enum yt921x_speed { + YT921X_SPEED_10, + YT921X_SPEED_100, + YT921X_SPEED_1000, + YT921X_SPEED_10000, + YT921X_SPEED_2500, + YT921X_SPEED_INVALID +}; + #define YT921X_SENSOR 0x8036c #define YT921X_SENSOR_TEMP BIT(18) #define YT921X_TEMP 0x80374 @@ -1004,4 +999,22 @@ struct yt921x_priv { struct yt921x_acl_blk *acl_blks[YT921X_ACL_BLK_NUM]; }; +static inline int ethtool_speed_to_yt921x(int speed) +{ + switch (speed) { + case SPEED_10: + return YT921X_SPEED_10; + case SPEED_100: + return YT921X_SPEED_100; + case SPEED_1000: + return YT921X_SPEED_1000; + case SPEED_2500: + return YT921X_SPEED_2500; + case SPEED_10000: + return YT921X_SPEED_10000; + default: + return YT921X_SPEED_INVALID; + } +} + #endif -- 2.53.0