From patchwork Thu Mar 9 12:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 66839 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp272953wrd; Thu, 9 Mar 2023 04:58:08 -0800 (PST) X-Google-Smtp-Source: AK7set8veAOYXZkejSbn9IbtKmZitYB8O9KC6FQLo9n8Dnw9Z/L6I44Q9iKaPvGbYO3NJ/atxdfe X-Received: by 2002:a17:902:f7c2:b0:19a:b588:6fe2 with SMTP id h2-20020a170902f7c200b0019ab5886fe2mr20262659plw.13.1678366688515; Thu, 09 Mar 2023 04:58:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678366688; cv=none; d=google.com; s=arc-20160816; b=TwO7wF3J2QY/R+oOlqvK03H7hPhYPIZR+7gLaXFwlT3QBmlDuHDjm7UR/Qya43c+2/ 1Gjq/w2zpOUZrrQ9Qi+f1nEKrb3t+bUnAC4XiiTavbKw3jE5R5SWesojtUoXyQcWSuQQ OiMra3111j0K3XoBsLm+/TjMX08abUdDQ03w2o2WX2tvMDg/JFVlMT8ZbpD81R0TLLJM V8vRC7jx6H7yE4MYBiDm8P0avUMfPLdCzEvTzilPOb5sa2UMnyKhm/8JV/yBcN72rojG 5zuFwXXpb67mNYJYi5NtYxEkJRdcalYs63NkIoZn1M4ZJ+V96VITVemzWEWtVoXAiKcx RuoA== 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 :dkim-signature; bh=xNmNmjH4DCoGV9RiVPer+i2QQA4k61osHG4pT21zA8w=; b=Q6+kUFqLksxqerGR5tsUZ3B+HihreAypRrYCaQ9mgcaTNCTcF1GTP8/nrL8HxEuWwo BiVs6HsACN0pltdrWBqaHYTKu6P3dbXCkCGtZILFBZFcmq16jnUJS6VK4NJ8duxtPi9u xKxcjfVmr1wOVJi06vUqj7H0A+sB6CTajJnMoM7IFguZMf/A19OPiuSWZIXatEgzmKc+ vgjz0XrjarwwwYlmNtE4gBpiVK07ULuKg2UJDiwaThJhuJVODfxXWIFa+TimEPalzax2 SkSNqd12R/VASVO6D3XsfU5o2gb1ih3j8v6v4KmExNZT2ZfrWdipprn55utZw8gXT1gX gbVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b=NE05gklU; 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 p16-20020a170902ebd000b0019a86f57ef4si15795162plg.176.2023.03.09.04.57.53; Thu, 09 Mar 2023 04:58:08 -0800 (PST) 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; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b=NE05gklU; 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 S230462AbjCIMzd (ORCPT + 99 others); Thu, 9 Mar 2023 07:55:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbjCIMzM (ORCPT ); Thu, 9 Mar 2023 07:55:12 -0500 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 215B18DCF0; Thu, 9 Mar 2023 04:55:11 -0800 (PST) Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 82C0585EB0; Thu, 9 Mar 2023 13:55:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1678366508; bh=xNmNmjH4DCoGV9RiVPer+i2QQA4k61osHG4pT21zA8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NE05gklUX2YM/e3lSEfPg3sR9qbwD4NAzeyVSFJ0gDPU8EXpgA4LA9b0+iRPdxdiQ h1nYwvc059gMVRGC3b00kjno3MWtEQcpsKzGf489eTrf//zhaNwTJaNY5ekOJQGLIo 42PIhcTkU7mHSitFiIkydj/XSp8L9Kmii1VNQKRgXaKJUQV8hBPdO8jBDE18zmmb9D 6IWKC3ZA/9UajiLyD7/AgYEoOTPpp+jmKr8QB41w5jBXe2viS8pyKh12tw5RTPn8Fu hdKlxoftm4IjmyQHB0MB7tmw66KDilejbTCvicRQCSgYtNGr+oSfQlZUhO09Wi1fvi 1skZzxkqsSyGA== From: Lukasz Majewski To: Andrew Lunn , Vladimir Oltean , Russell King Cc: Eric Dumazet , Florian Fainelli , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Alexander Duyck , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Lukasz Majewski Subject: [PATCH 7/7] dsa: marvell: Modify get max MTU callback to use per switch provided value Date: Thu, 9 Mar 2023 13:54:21 +0100 Message-Id: <20230309125421.3900962-8-lukma@denx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230309125421.3900962-1-lukma@denx.de> References: <20230309125421.3900962-1-lukma@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1759895028992720701?= X-GMAIL-MSGID: =?utf-8?q?1759895028992720701?= After this change the value specified in max_frame_size variable is used to provide information regarding the maximal size of frame supported in the switch. This approach replaces the current detection scheme, which extracts information about max frame size depending on set of provided callbacks. This is wrong, as some switch ICs can have max frame size equal to 1632 or 2048 and both would provide set_max_frame_size callback. Signed-off-by: Lukasz Majewski --- Changes for v5: - New patch --- drivers/net/dsa/mv88e6xxx/chip.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index dbb69787f4ef..6a5acbba381e 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3545,11 +3545,10 @@ static int mv88e6xxx_get_max_mtu(struct dsa_switch *ds, int port) { struct mv88e6xxx_chip *chip = ds->priv; - if (chip->info->ops->port_set_jumbo_size) - return 10240 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN; - else if (chip->info->ops->set_max_frame_size) - return 1632 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN; - return 1522 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN; + WARN_ON_ONCE(!chip->info->max_frame_size); + + return chip->info->max_frame_size - VLAN_ETH_HLEN - EDSA_HLEN + - ETH_FCS_LEN; } static int mv88e6xxx_change_mtu(struct dsa_switch *ds, int port, int new_mtu)