Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp3497424pxb; Mon, 4 Apr 2022 18:53:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHDMRllvCFI3R7ltxSQGtX/wUz2Y3xYit6HxI0rohPSS08zMtnR3wGlLxWa5iPRJ+P9RVN X-Received: by 2002:a05:6a00:1391:b0:4fb:607d:4453 with SMTP id t17-20020a056a00139100b004fb607d4453mr1291687pfg.4.1649123620113; Mon, 04 Apr 2022 18:53:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649123620; cv=none; d=google.com; s=arc-20160816; b=tW6JtJcKqAtSNNGpiBGldAcqK1OXgxxSLaASXXkuNAdEFRZwgWIxGNhjZaWaQT74qX 9d0OFqQzHL/ois6bCLcUvaLc067zaXY6nhQuNjBEg8xgqAwnv8MOhjDDVw8OGGwNrh6s cDhYc+eAeJABttbS3KTW3KoQkjdPKNJn1+ENsIZ2yVkRaeMlC6OAh2M4WmKqFVS50ydc 4pSpKtc6/UZa8TL1O3IFeG0HC09lIIS6G4tbO7RO9HsOaenMQHQmyzEv8TwaA9tJ5IH3 md2TNDgxCKFO3o4mm+9aIVDpqWHuvyQmdrCI2rxM9aEhv85iRcu2GvlOBECgjiNOyhhl V2ug== 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=q611uaWtRCgD2JjOu/zISXFDgFAFSf/CPFvodEc8ONk=; b=M722Fd+cq2ekdbfV4Ifdwd4WrD2mmtsW9VcJNv04HpeilWqVuXGBmsdmZ8kXORmTk/ ZTMMMZJ31p+Ki7N6sC9FK+KZ9TI77dmPzFq6l27iQZr+21jzdWVh3k+LL5Kf7cYqavaH 7LxYrQRrH3jX6DrvNSu3JPdvIkmiXEjohPYKhju8Np8MUxkpZn9sXPGGEbaxgzBsfeLU yAxIo2oouK8OZX4TLirkXqM919QxE7u343rdEjrLAX67REf608teskwTp7b00d3jWdsV qYiPm9takpflcMQYPze0BHk01g4sVO0xFiK3UmbVPW0l2uzTV5q+RxbmnB17a5eT9TI4 UzWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=NXeKp71C; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id t38-20020a056a0013a600b004fa3a8e0006si13264480pfg.189.2022.04.04.18.53.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 18:53:40 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=NXeKp71C; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4A199318739; Mon, 4 Apr 2022 17:56:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348998AbiDDNGI (ORCPT + 99 others); Mon, 4 Apr 2022 09:06:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348845AbiDDNGD (ORCPT ); Mon, 4 Apr 2022 09:06:03 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 822F33E5C2; Mon, 4 Apr 2022 06:04:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1649077447; x=1680613447; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=s4YbeJjstt/yKOMGM1Xu3rmFy5geRTn14sYFJKh3pmw=; b=NXeKp71C8XltyR0Ba03VZ3UzSRkzjA2rIjL7hOnNrGHk/fjpnyaRVn1f tIMgfJTbmaTaYSVVzRWKPLhuBnro/8AJz17NxCzZ58Kj0r66UOg5sXbQj xOKz5IPS+lBY8ujpPGKpUKPbp3BtCZ+35EkqpgEP1h6RvDdGPAn/Y8n4b oEyvr+DfyM3bF1AEeA64HRX1WxxJaqWa7hqzGuwGcItWErweiYXyGerRz +c6QU7eCNGQOGK9oWdhHFXvru8fzg8Iv/gNHZlBipikiFIQISfV0WmD1q ZhDb4jif6yvEub6ycQpSJHepsGeDlivIChD5gWOr2YY4KmV1rufv4XIUo A==; X-IronPort-AV: E=Sophos;i="5.90,234,1643698800"; d="scan'208";a="154281326" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 04 Apr 2022 06:04:06 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Mon, 4 Apr 2022 06:04:06 -0700 Received: from soft-dev3-1.microsemi.net (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Mon, 4 Apr 2022 06:04:04 -0700 From: Horatiu Vultur To: , CC: , , , , , Horatiu Vultur Subject: [PATCH net-next v3 4/4] net: lan966x: Update FDMA to change MTU. Date: Mon, 4 Apr 2022 15:06:55 +0200 Message-ID: <20220404130655.4004204-5-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220404130655.4004204-1-horatiu.vultur@microchip.com> References: <20220404130655.4004204-1-horatiu.vultur@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 When changing the MTU, it is required to change also the size of the DBs. In case those frames will arrive to CPU. Signed-off-by: Horatiu Vultur --- .../ethernet/microchip/lan966x/lan966x_fdma.c | 95 +++++++++++++++++++ .../ethernet/microchip/lan966x/lan966x_main.c | 2 +- .../ethernet/microchip/lan966x/lan966x_main.h | 1 + 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c b/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c index 9cccb5f5f8e5..68bc53344326 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c @@ -633,6 +633,101 @@ int lan966x_fdma_xmit(struct sk_buff *skb, __be32 *ifh, struct net_device *dev) return err; } +static int lan966x_fdma_get_max_mtu(struct lan966x *lan966x) +{ + int max_mtu = 0; + int i; + + for (i = 0; i < lan966x->num_phys_ports; ++i) { + int mtu; + + if (!lan966x->ports[i]) + continue; + + mtu = lan966x->ports[i]->dev->mtu; + if (mtu > max_mtu) + max_mtu = mtu; + } + + return max_mtu; +} + +static int lan966x_qsys_sw_status(struct lan966x *lan966x) +{ + return lan_rd(lan966x, QSYS_SW_STATUS(CPU_PORT)); +} + +static void lan966x_fdma_reload(struct lan966x *lan966x, int new_mtu) +{ + void *rx_dcb, *tx_dcb, *tx_dcb_buf; + dma_addr_t rx_dma, tx_dma; + unsigned long flags; + u32 size; + + /* Store these for later to free them */ + rx_dma = lan966x->rx.dma; + tx_dma = lan966x->tx.dma; + rx_dcb = lan966x->rx.dcbs; + tx_dcb = lan966x->tx.dcbs; + tx_dcb_buf = lan966x->tx.dcbs_buf; + + lan966x_fdma_rx_disable(&lan966x->rx); + lan966x_fdma_rx_free_skbs(&lan966x->rx); + lan966x->rx.page_order = round_up(new_mtu, PAGE_SIZE) / PAGE_SIZE - 1; + lan966x_fdma_rx_alloc(&lan966x->rx); + lan966x_fdma_rx_start(&lan966x->rx); + + spin_lock_irqsave(&lan966x->tx_lock, flags); + lan966x_fdma_tx_disable(&lan966x->tx); + lan966x_fdma_tx_alloc(&lan966x->tx); + spin_unlock_irqrestore(&lan966x->tx_lock, flags); + + /* Now it is possible to clean */ + size = sizeof(struct lan966x_tx_dcb) * FDMA_DCB_MAX; + size = ALIGN(size, PAGE_SIZE); + dma_free_coherent(lan966x->dev, size, tx_dcb, tx_dma); + + kfree(tx_dcb_buf); + + size = sizeof(struct lan966x_rx_dcb) * FDMA_DCB_MAX; + size = ALIGN(size, PAGE_SIZE); + dma_free_coherent(lan966x->dev, size, rx_dcb, rx_dma); +} + +int lan966x_fdma_change_mtu(struct lan966x *lan966x) +{ + int max_mtu; + u32 val; + + max_mtu = lan966x_fdma_get_max_mtu(lan966x); + if (round_up(max_mtu, PAGE_SIZE) / PAGE_SIZE - 1 == + lan966x->rx.page_order) + return 0; + + /* Disable the CPU port */ + lan_rmw(QSYS_SW_PORT_MODE_PORT_ENA_SET(0), + QSYS_SW_PORT_MODE_PORT_ENA, + lan966x, QSYS_SW_PORT_MODE(CPU_PORT)); + + /* Flush the CPU queues */ + readx_poll_timeout(lan966x_qsys_sw_status, lan966x, + val, !(QSYS_SW_STATUS_EQ_AVAIL_GET(val)), + READL_SLEEP_US, READL_TIMEOUT_US); + + /* Add a sleep in case there are frames between the queues and the CPU + * port + */ + usleep_range(1000, 2000); + + lan966x_fdma_reload(lan966x, max_mtu); + + /* Enable back the CPU port */ + lan_rmw(QSYS_SW_PORT_MODE_PORT_ENA_SET(1), + QSYS_SW_PORT_MODE_PORT_ENA, + lan966x, QSYS_SW_PORT_MODE(CPU_PORT)); + return 0; +} + void lan966x_fdma_netdev_init(struct lan966x *lan966x, struct net_device *dev) { if (lan966x->fdma_ndev) diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c index 245cf4168de0..ca1cef79b83f 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c @@ -359,7 +359,7 @@ static int lan966x_port_change_mtu(struct net_device *dev, int new_mtu) lan966x, DEV_MAC_MAXLEN_CFG(port->chip_port)); dev->mtu = new_mtu; - return 0; + return !lan966x->fdma ? 0 : lan966x_fdma_change_mtu(lan966x); } static int lan966x_mc_unsync(struct net_device *dev, const unsigned char *addr) diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h index 47f42087b78d..e6642083ab9e 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.h +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.h @@ -398,6 +398,7 @@ void lan966x_ptp_txtstamp_release(struct lan966x_port *port, irqreturn_t lan966x_ptp_irq_handler(int irq, void *args); int lan966x_fdma_xmit(struct sk_buff *skb, __be32 *ifh, struct net_device *dev); +int lan966x_fdma_change_mtu(struct lan966x *lan966x); void lan966x_fdma_netdev_init(struct lan966x *lan966x, struct net_device *dev); void lan966x_fdma_netdev_deinit(struct lan966x *lan966x, struct net_device *dev); int lan966x_fdma_init(struct lan966x *lan966x); -- 2.33.0