From patchwork Mon Jun 8 22:02:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 217921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46F5FC433E0 for ; Mon, 8 Jun 2020 22:02:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FBDA20760 for ; Mon, 8 Jun 2020 22:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591653776; bh=tuZCe8/XIL48jxk9PeigHg1u0l02XxI0zls81pAXqZE=; h=From:To:Cc:Subject:Date:List-ID:From; b=Tu08ETT9DjhE5HDTw4v/fS4KCncEx+iBdWkKNRABI61Jsqen7cTTNlx/hRAfqXiRj RPlFRWJgNzHCxai7tcMH+Dg0Rk49KXef4K/2OACcjaOLner4MRGvmm4Lo5Nac12Kmr sg2UqzYhZ/JEMHMil2Gjje5I5I8XtbVFY3VfgNG4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726812AbgFHWCz (ORCPT ); Mon, 8 Jun 2020 18:02:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:35004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726723AbgFHWCy (ORCPT ); Mon, 8 Jun 2020 18:02:54 -0400 Received: from localhost.localdomain.com (unknown [151.48.128.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DD7AF2074B; Mon, 8 Jun 2020 22:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591653774; bh=tuZCe8/XIL48jxk9PeigHg1u0l02XxI0zls81pAXqZE=; h=From:To:Cc:Subject:Date:From; b=NdLXcP7BWOhbfv3BlZ/grBY4WmiluN670TWlxZe/K1pGKiNFjCgAuqgKyMnsWn/YU gAXACiz5Pg3YPqQQ6aQv2A7G6XoZZAYFofbLojLdjDceoGNBnosVKPHGjyhdccVbFb DElordekR/QEQQopSHDPnRH1AUzZN3A1SzmTTuaI= From: Lorenzo Bianconi To: netdev@vger.kernel.org Cc: davem@davemloft.net, thomas.petazzoni@bootlin.com, lorenzo.bianconi@redhat.com, brouer@redhat.com Subject: [PATCH net] net: mvneta: do not redirect frames during reconfiguration Date: Tue, 9 Jun 2020 00:02:39 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Disable frames injection in mvneta_xdp_xmit routine during hw re-configuration in order to avoid hardware hangs Fixes: b0a43db9087a ("net: mvneta: add XDP_TX support") Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/marvell/mvneta.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 4cc9abd61c43..946925bbcb2d 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -452,11 +452,17 @@ struct mvneta_pcpu_port { u32 cause_rx_tx; }; +enum { + __MVNETA_DOWN, +}; + struct mvneta_port { u8 id; struct mvneta_pcpu_port __percpu *ports; struct mvneta_pcpu_stats __percpu *stats; + unsigned long state; + int pkt_size; void __iomem *base; struct mvneta_rx_queue *rxqs; @@ -2113,6 +2119,9 @@ mvneta_xdp_xmit(struct net_device *dev, int num_frame, struct netdev_queue *nq; u32 ret; + if (unlikely(test_bit(__MVNETA_DOWN, &pp->state))) + return -ENETDOWN; + if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK)) return -EINVAL; @@ -3568,12 +3577,16 @@ static void mvneta_start_dev(struct mvneta_port *pp) phylink_start(pp->phylink); netif_tx_start_all_queues(pp->dev); + + clear_bit(__MVNETA_DOWN, &pp->state); } static void mvneta_stop_dev(struct mvneta_port *pp) { unsigned int cpu; + set_bit(__MVNETA_DOWN, &pp->state); + phylink_stop(pp->phylink); if (!pp->neta_armada3700) {