From patchwork Tue Aug 6 15:51:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nevo Hed X-Patchwork-Id: 1142899 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=starry.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=starry.com header.i=@starry.com header.b="mHnaJIOq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 462zgy6N0Fz9s7T for ; Wed, 7 Aug 2019 01:53:34 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 69803C21EE7; Tue, 6 Aug 2019 15:52:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 25ADCC21EE8; Tue, 6 Aug 2019 15:52:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8E99AC21EF1; Tue, 6 Aug 2019 15:52:02 +0000 (UTC) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by lists.denx.de (Postfix) with ESMTPS id DE507C21ED6 for ; Tue, 6 Aug 2019 15:52:01 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id 201so63213806qkm.9 for ; Tue, 06 Aug 2019 08:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=starry.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f4sVssmBRrqEsuU23fpUpEdDMV2IcxIo2E/QN5Ejfbg=; b=mHnaJIOqN9eh8lcjCmgcaz22bsmJfMN6Xk/XHzL/bDNwqVfpUa5h4GA4qsSXtUvc/B NLHeiwceey+WZo28yXPPA/h+eKFjAjXc4sAtXlOsRsl/JW+ZiPzd7dnmJDrzP2UVwaJH 30kXdVnsV5eBw+x0I9HQz2QzfGmOCBB0LKViY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f4sVssmBRrqEsuU23fpUpEdDMV2IcxIo2E/QN5Ejfbg=; b=aEQAaO1Ju3fFZbRIEuCJ1P1pa/OfKeqwNYoYpEXqG1dnLwCaNknLAm4nabhKzvgmD5 28ZVMOdbIS7HqDs+3vCha+KM6C1/gVe8FfU1A8S4Ji11P2tNjweKkPv8RJkUdwzFUose fjRAesYxWHdtLWtxKFmw4/OsuNhOWFuJPHAYJQMvAqH20jbN2FDFoqE208IKJBMxVdvG Xgk48gYy/EHCi3wOk1t6+UproCYzAAPKNLW1peUwVesz/1EbVWcrrGx9NRZVCh0fJT/Z qFTBkl0v03u6IJMDAmrOVrtRrqk2BWosP1L6fvJC00mItqBgOAcsN/r39/M/RXcGT/qP dU/A== X-Gm-Message-State: APjAAAW7fgeDH4Do8knx4mrbm0NTUylwY+a+Q5nvO1EiuHOu1TEraNK5 YRovdfcd94UGzhNw15qMRisIhw== X-Google-Smtp-Source: APXvYqzM2p7HhxiUVbYieaooWYNaN2Sku1QdUntE8kbEEHm89R8n2veXuHWipVCK9XXCgFGd4gzdDg== X-Received: by 2002:ae9:c310:: with SMTP id n16mr3965951qkg.438.1565106720849; Tue, 06 Aug 2019 08:52:00 -0700 (PDT) Received: from nhed-lt1 (205-201-16-55.starry-inc.net. [205.201.16.55]) by smtp.gmail.com with ESMTPSA id n5sm48079716qta.29.2019.08.06.08.52.00 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Aug 2019 08:52:00 -0700 (PDT) From: nhed+uboot@starry.com To: u-boot@lists.denx.de Date: Tue, 6 Aug 2019 11:51:38 -0400 Message-Id: <20190806155144.19301-2-nhed+uboot@starry.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190806155144.19301-1-nhed+uboot@starry.com> References: <20190806155144.19301-1-nhed+uboot@starry.com> MIME-Version: 1.0 Cc: make@marvell.com Subject: [U-Boot] [PATCH v3 1/7] net: mvpp2x: fix traffic stuck after PHY start error X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Chulski Issue: - Network stuck if autonegotion fails. Issue root cause: - When autonegotiation fails during port open procedure, the packet processor configuration does not finish and open procedure exits with error. - However, this doesn't prevent u-boot network framework from calling send and receive procedures. - Using transmit and receive functions of misconfigured packet processor will cause traffic to get stuck. Fix: - Continue packet processor configuration even if autonegotiation fails. Only error message is triggered in this case. - Exit transmit and receive functions if there is no PHY link indication. - U-boot network framework now calls open procedure again during next transmit initiation. Signed-off-by: Stefan Chulski Reviewed-by: Igal Liberman Tested-by: Igal Liberman Reviewed-By: Ramon Fried Acked-by: Joe Hershberger --- drivers/net/mvpp2.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index bd89725e77..f36c8236b1 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -4494,7 +4494,7 @@ static void mvpp2_stop_dev(struct mvpp2_port *port) gop_port_enable(port, 0); } -static int mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port) +static void mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port) { struct phy_device *phy_dev; @@ -4504,7 +4504,7 @@ static int mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port) port->phy_dev = phy_dev; if (!phy_dev) { netdev_err(port->dev, "cannot connect to phy\n"); - return -ENODEV; + return; } phy_dev->supported &= PHY_GBIT_FEATURES; phy_dev->advertising = phy_dev->supported; @@ -4516,18 +4516,14 @@ static int mvpp2_phy_connect(struct udevice *dev, struct mvpp2_port *port) phy_config(phy_dev); phy_startup(phy_dev); - if (!phy_dev->link) { + if (!phy_dev->link) printf("%s: No link\n", phy_dev->dev->name); - return -1; - } - - port->init = 1; + else + port->init = 1; } else { mvpp2_egress_enable(port); mvpp2_ingress_enable(port); } - - return 0; } static int mvpp2_open(struct udevice *dev, struct mvpp2_port *port) @@ -4567,10 +4563,7 @@ static int mvpp2_open(struct udevice *dev, struct mvpp2_port *port) } if (port->phy_node) { - err = mvpp2_phy_connect(dev, port); - if (err < 0) - return err; - + mvpp2_phy_connect(dev, port); mvpp2_link_event(port); } else { mvpp2_egress_enable(port); @@ -5175,6 +5168,10 @@ static int mvpp2_recv(struct udevice *dev, int flags, uchar **packetp) struct mvpp2_rx_queue *rxq; u8 *data; + if (port->phy_node) + if (!port->phy_dev->link) + return 0; + /* Process RX packets */ rxq = port->rxqs[0]; @@ -5240,6 +5237,10 @@ static int mvpp2_send(struct udevice *dev, void *packet, int length) int tx_done; int timeout; + if (port->phy_node) + if (!port->phy_dev->link) + return 0; + txq = port->txqs[0]; aggr_txq = &port->priv->aggr_txqs[smp_processor_id()];