From patchwork Thu May 18 09:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 95728 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp358665vqo; Thu, 18 May 2023 02:34:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4OhMdu0ygddRYOwj/IK9oSjQfShuNphUnWlwfpDrdlM5BuFqxNISVAFc2yKgx/hv5W6c4P X-Received: by 2002:a05:6a21:670e:b0:101:2dde:37b7 with SMTP id wh14-20020a056a21670e00b001012dde37b7mr1558775pzb.11.1684402452262; Thu, 18 May 2023 02:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684402452; cv=none; d=google.com; s=arc-20160816; b=JYLyK6tFuRhIHZ+uow12Vh3CPh5Plr+3ebCJ6PgUc/Q+J2fVmuwCSrzpfz09e2CK0O 2zxFeV6o2KUkvVhpKWCb/LdjfHi1iN+FkQYG8Orq/Fu7WNNfhDvkdLyO0LYG/72S3FQf kn0fD75YPLBsGEQdMemzdnAIPocZxtgIrwVGQKx33TWNefYZyt99ksKawPDIOjMv5Idc cB5hKE5S6xVi+Oi9TjpMJjQSqnxav0hrmvY27Y+f8RKK0LzII+cl1+yByau2RYmzJDpc 4v2gfWhGBKfICxuUecH00awfZmbRrr6ahGZ9YACiVwAjbRfZ5UBQo3Y/16b4uO6ZyJ9N J+ow== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=+/o5fpGmJdhpCj0olINtzXPPP+i4TqDF7bX9edf+gF0=; b=R095zHfxH5EGD6Cv4Ytg2ZOFlJSDGiChsUUCMVSAXyHPwNs99w26gfBo/tIIMF+2Z+ iTC9fcMiogCoXTVXvRD+WZnAqptuhJIkr8x9g4fdifwaGlN7GjiwbP/2UEkm04hboemk 6+aCvv4Fv25tL3h2iTkyZDvDkiK0vAXcOQ5QVlAr09Vvog03G6gPU60dj7aBsKN5jbGL oIxqVkJxnxgq5piqg/xCJWJrd3o9APzkzXWHUL3ur0lAOtuxUo7esxH+E9ULA5s2v/VS DMSP5lF4Q+S+wCN1s/kGvczIqJy/KrznArzWa9DCNyn1Dp5o7Sdb+VE3RaixdERKIjJr uq7A== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f3-20020a633803000000b0051854bde329si978331pga.367.2023.05.18.02.33.58; Thu, 18 May 2023 02:34:12 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230236AbjERJ3h (ORCPT + 99 others); Thu, 18 May 2023 05:29:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230122AbjERJ31 (ORCPT ); Thu, 18 May 2023 05:29:27 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7558C211F for ; Thu, 18 May 2023 02:29:26 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pzZwj-00062u-RH; Thu, 18 May 2023 11:29:17 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pzZwi-0013Bs-0i; Thu, 18 May 2023 11:29:16 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pzZwh-0046MU-14; Thu, 18 May 2023 11:29:15 +0200 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss , "Russell King (Oracle)" Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com Subject: [PATCH net-next v3 1/2] net: dsa: microchip: ksz8: Make flow control, speed, and duplex on CPU port configurable Date: Thu, 18 May 2023 11:29:12 +0200 Message-Id: <20230518092913.977705-2-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230518092913.977705-1-o.rempel@pengutronix.de> References: <20230518092913.977705-1-o.rempel@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1766223985693972674?= X-GMAIL-MSGID: =?utf-8?q?1766223985693972674?= Allow flow control, speed, and duplex settings on the CPU port to be configurable. Previously, the speed and duplex relied on default switch values, which limited flexibility. Additionally, flow control was hardcoded and only functional in duplex mode. This update enhances the configurability of these parameters. Signed-off-by: Oleksij Rempel Reviewed-by: Simon Horman --- drivers/net/dsa/microchip/ksz8.h | 4 ++ drivers/net/dsa/microchip/ksz8795.c | 51 +++++++++++++++++++++++++- drivers/net/dsa/microchip/ksz_common.c | 1 + 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8.h b/drivers/net/dsa/microchip/ksz8.h index e68465fdf6b9..ec02baca726f 100644 --- a/drivers/net/dsa/microchip/ksz8.h +++ b/drivers/net/dsa/microchip/ksz8.h @@ -58,5 +58,9 @@ int ksz8_switch_detect(struct ksz_device *dev); int ksz8_switch_init(struct ksz_device *dev); void ksz8_switch_exit(struct ksz_device *dev); int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu); +void ksz8_phylink_mac_link_up(struct ksz_device *dev, int port, + unsigned int mode, phy_interface_t interface, + struct phy_device *phydev, int speed, int duplex, + bool tx_pause, bool rx_pause); #endif diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index f56fca1b1a22..9cfe343d2214 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -1371,6 +1371,55 @@ void ksz8_config_cpu_port(struct dsa_switch *ds) } } +/** + * ksz8_upstream_link_up - Configures the CPU/upstream port of the switch. + * @dev: The KSZ device instance. + * @port: The port number to configure. + * @speed: The desired link speed. + * @duplex: The desired duplex mode. + * @tx_pause: If true, enables transmit pause. + * @rx_pause: If true, enables receive pause. + * + * Description: + * The function configures flow control and speed settings for the CPU/upstream + * port of the switch based on the desired settings, current duplex mode, and + * speed. + */ +static void ksz8_upstream_link_up(struct ksz_device *dev, int port, int speed, + int duplex, bool tx_pause, bool rx_pause) +{ + u8 ctrl = 0; + + /* SW_FLOW_CTRL, SW_HALF_DUPLEX, and SW_10_MBIT bits are bootstrappable. + * They can have different values depending on your board setup. + */ + if (duplex) { + if (tx_pause || rx_pause) + ctrl |= SW_FLOW_CTRL; + } else { + ctrl |= SW_HALF_DUPLEX; + } + + /* This hardware only supports SPEED_10 and SPEED_100. For SPEED_10 + * we need to set the SW_10_MBIT bit. Otherwise, we can leave it 0. + */ + if (speed == SPEED_10) + ctrl |= SW_10_MBIT; + + ksz_rmw8(dev, REG_SW_CTRL_4, SW_HALF_DUPLEX | SW_FLOW_CTRL | + SW_10_MBIT, ctrl); +} + +void ksz8_phylink_mac_link_up(struct ksz_device *dev, int port, + unsigned int mode, phy_interface_t interface, + struct phy_device *phydev, int speed, int duplex, + bool tx_pause, bool rx_pause) +{ + if (dsa_is_upstream_port(dev->ds, port)) + ksz8_upstream_link_up(dev, port, speed, duplex, tx_pause, + rx_pause); +} + static int ksz8_handle_global_errata(struct dsa_switch *ds) { struct ksz_device *dev = ds->priv; @@ -1419,8 +1468,6 @@ int ksz8_setup(struct dsa_switch *ds) */ ds->vlan_filtering_is_global = true; - ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_FLOW_CTRL, true); - /* Enable automatic fast aging when link changed detected. */ ksz_cfg(dev, S_LINK_AGING_CTRL, SW_LINK_AUTO_AGING, true); diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index a4428be5f483..6e19ad70c671 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -210,6 +210,7 @@ static const struct ksz_dev_ops ksz8_dev_ops = { .mirror_add = ksz8_port_mirror_add, .mirror_del = ksz8_port_mirror_del, .get_caps = ksz8_get_caps, + .phylink_mac_link_up = ksz8_phylink_mac_link_up, .config_cpu_port = ksz8_config_cpu_port, .enable_stp_addr = ksz8_enable_stp_addr, .reset = ksz8_reset_switch,