From patchwork Thu Nov 3 09:13:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 14770 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp409491wru; Thu, 3 Nov 2022 02:15:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7pdcRElc/O5W0v4egUK9R5/2Lgf5yf83Yw/pWoWflRUSfwQd/0N0KuBc+GAqlG8k1Pt4wg X-Received: by 2002:a17:90a:708e:b0:213:6876:330 with SMTP id g14-20020a17090a708e00b0021368760330mr43366691pjk.167.1667466933572; Thu, 03 Nov 2022 02:15:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667466933; cv=none; d=google.com; s=arc-20160816; b=z/mljfPwIwpdoa5i6/OjVvL7KJpaEOTs5SDJJ6vMU1o6hj/pk3z+Gu0TERzc+TAtGH es+GymxQwxVIPC0+5B5J0JY/a8ka5wsIXOgbtgJ06B9aPMdB32PfEonIbKEOOu8CBnql 1IAxINf3uDat3VRFI9pw9Vzqb3dnQ7mEe3GyrzSMhqemVJ/TZI7cfe6DNNJQH1Suaf00 o+F6f9FrQt6fX5vuCMBn10cuXnBWO/Y587679j0FwlAALnWqa9LRvEp/kWDcWCG8WNh6 EgOYvA0kjbRnFdwIH0J8ugvyLcJdZv8QuN3OBvFOFe8Xw9i7Eca8o95W6E8ANtEdpuTp eaaQ== 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 :message-id:date:subject:cc:to:from; bh=wnKQtVAmP8FHdPAWvcLOem7jkq5DMe3XWqk20YIPzhE=; b=t+7aSRse7+8E4Q9bQZ0I3ayd+b5Nq4eHKLOA1hYQaMqBgz/v3t2Jj9iU6d3cBbxE5F DTwz5H7YUWOGkXf+5C61vKmD6SikEAXaD5hvrBpjcMQ25FGCCJ96O+UBKkWJRQ5rEenP 0WvD+40nHaMlpOm0c2BGDKTC6uQaf+YzY9zf5NooTk2dbG6UjYKMN6CD8HIYNfgQcH1B Ze1dg7hHVfe4++ewBJuoj+Se7ikzme+g1atQy5Ps4Gzg0nHDYJvGy/5zcXdDNFhY8hMi Ybv5MTtGg9WO+2zosRKHfMs8szbIg+eTpzizCBEaLIIVLItGlBdtWkwXE3AIMn1GKqot 6fnQ== 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 f6-20020a655906000000b0046fcf7e2482si483060pgu.729.2022.11.03.02.15.21; Thu, 03 Nov 2022 02:15:33 -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 S231490AbiKCJOd (ORCPT + 99 others); Thu, 3 Nov 2022 05:14:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230231AbiKCJNs (ORCPT ); Thu, 3 Nov 2022 05:13:48 -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 39237E014 for ; Thu, 3 Nov 2022 02:13:17 -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 1oqWHa-0004jI-CN; Thu, 03 Nov 2022 10:13:06 +0100 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 1oqWHY-0022Wt-Od; Thu, 03 Nov 2022 10:13:03 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oqWHX-0076Tw-7h; Thu, 03 Nov 2022 10:13:03 +0100 From: Oleksij Rempel To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Arun.Ramadoss@microchip.com Subject: [PATCH net-next v1 1/1] net: dsa: microchip: ksz8: add MTU configuration support Date: Thu, 3 Nov 2022 10:13:02 +0100 Message-Id: <20221103091302.1693161-1-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 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 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?1748465807155717547?= X-GMAIL-MSGID: =?utf-8?q?1748465807155717547?= Make MTU configurable on KSZ87xx and KSZ88xx series of switches. Before this patch, pre-configured behavior was different on different switch series, due to opposite meaning of the same bit: - KSZ87xx: Reg 4, Bit 1 - if 1, max frame size is 1532; if 0 - 1514 - KSZ88xx: Reg 4, Bit 1 - if 1, max frame size is 1514; if 0 - 1532 Since the code was telling "... SW_LEGAL_PACKET_DISABLE, true)", I assume, the idea was to set max frame size to 1532. With this patch, by setting MTU size 1500, both switch series will be configured to the 1532 frame limit. This patch was tested on KSZ8873. Signed-off-by: Oleksij Rempel --- drivers/net/dsa/microchip/ksz8.h | 2 + drivers/net/dsa/microchip/ksz8795.c | 74 ++++++++++++++++++++++++- drivers/net/dsa/microchip/ksz8795_reg.h | 9 +++ drivers/net/dsa/microchip/ksz_common.c | 2 + 4 files changed, 85 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8.h b/drivers/net/dsa/microchip/ksz8.h index 8582b4b67d98..027b92f5fa73 100644 --- a/drivers/net/dsa/microchip/ksz8.h +++ b/drivers/net/dsa/microchip/ksz8.h @@ -57,5 +57,7 @@ int ksz8_reset_switch(struct ksz_device *dev); 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); +int ksz8_max_mtu(struct ksz_device *dev, int port); #endif diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index bd3b133e7085..fd2539aabb2c 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -76,6 +76,78 @@ int ksz8_reset_switch(struct ksz_device *dev) return 0; } +static int ksz8863_change_mtu(struct ksz_device *dev, int port, int max_frame) +{ + u8 ctrl2 = 0; + + if (max_frame <= KSZ8863_LEGAL_PACKET_SIZE) + ctrl2 |= KSZ8863_LEGAL_PACKET_ENABLE; + else if (max_frame > KSZ8863_NORMAL_PACKET_SIZE) + ctrl2 |= KSZ8863_HUGE_PACKET_ENABLE; + + return regmap_update_bits(dev->regmap[0], REG_SW_CTRL_2, + KSZ8863_LEGAL_PACKET_ENABLE + | KSZ8863_HUGE_PACKET_ENABLE, ctrl2); +} + +static int ksz8795_change_mtu(struct ksz_device *dev, int port, int max_frame) +{ + u8 ctrl1 = 0, ctrl2 = 0; + int ret; + + if (max_frame > KSZ8863_LEGAL_PACKET_SIZE) + ctrl2 |= SW_LEGAL_PACKET_DISABLE; + else if (max_frame > KSZ8863_NORMAL_PACKET_SIZE) + ctrl1 |= SW_HUGE_PACKET; + + ret = regmap_update_bits(dev->regmap[0], REG_SW_CTRL_1, + SW_HUGE_PACKET, ctrl1); + if (ret) + return ret; + + return regmap_update_bits(dev->regmap[0], REG_SW_CTRL_2, + SW_LEGAL_PACKET_DISABLE, ctrl2); +} + +int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu) +{ + u16 frame_size, max_frame = 0; + int i; + + frame_size = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN; + + /* Cache the per-port MTU setting */ + dev->ports[port].max_frame = frame_size; + + for (i = 0; i < dev->info->port_cnt; i++) + max_frame = max(max_frame, dev->ports[i].max_frame); + + switch (dev->chip_id) { + case KSZ8795_CHIP_ID: + case KSZ8794_CHIP_ID: + case KSZ8765_CHIP_ID: + return ksz8795_change_mtu(dev, port, max_frame); + case KSZ8830_CHIP_ID: + return ksz8863_change_mtu(dev, port, max_frame); + } + + return -EOPNOTSUPP; +} + +int ksz8_max_mtu(struct ksz_device *dev, int port) +{ + switch (dev->chip_id) { + case KSZ8795_CHIP_ID: + case KSZ8794_CHIP_ID: + case KSZ8765_CHIP_ID: + return KSZ8795_HUGE_PACKET_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN; + case KSZ8830_CHIP_ID: + return KSZ8863_HUGE_PACKET_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN; + } + + return -EOPNOTSUPP; +} + static void ksz8795_set_prio_queue(struct ksz_device *dev, int port, int queue) { u8 hi, lo; @@ -1233,8 +1305,6 @@ void ksz8_config_cpu_port(struct dsa_switch *ds) masks = dev->info->masks; regs = dev->info->regs; - /* Switch marks the maximum frame with extra byte as oversize. */ - ksz_cfg(dev, REG_SW_CTRL_2, SW_LEGAL_PACKET_DISABLE, true); ksz_cfg(dev, regs[S_TAIL_TAG_CTRL], masks[SW_TAIL_TAG_ENABLE], true); p = &dev->ports[dev->cpu_port]; diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h b/drivers/net/dsa/microchip/ksz8795_reg.h index 77487d611824..1419091ef622 100644 --- a/drivers/net/dsa/microchip/ksz8795_reg.h +++ b/drivers/net/dsa/microchip/ksz8795_reg.h @@ -48,6 +48,15 @@ #define NO_EXC_COLLISION_DROP BIT(3) #define SW_LEGAL_PACKET_DISABLE BIT(1) +#define KSZ8863_HUGE_PACKET_ENABLE BIT(2) +#define KSZ8863_LEGAL_PACKET_ENABLE BIT(1) + +#define KSZ8795_HUGE_PACKET_SIZE 2000 + +#define KSZ8863_HUGE_PACKET_SIZE 1916 +#define KSZ8863_NORMAL_PACKET_SIZE 1536 +#define KSZ8863_LEGAL_PACKET_SIZE 1518 + #define REG_SW_CTRL_3 0x05 #define WEIGHTED_FAIR_QUEUE_ENABLE BIT(3) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index d612181b3226..40fd78951bf8 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -171,6 +171,8 @@ static const struct ksz_dev_ops ksz8_dev_ops = { .reset = ksz8_reset_switch, .init = ksz8_switch_init, .exit = ksz8_switch_exit, + .change_mtu = ksz8_change_mtu, + .max_mtu = ksz8_max_mtu, }; static void ksz9477_phylink_mac_link_up(struct ksz_device *dev, int port,