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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 DF7C3C10F11 for ; Mon, 22 Apr 2019 19:49:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A84BA2075A for ; Mon, 22 Apr 2019 19:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962562; bh=ayQZfYc+DhM/2d39oHzit0L9trySP0JCBcNJALANsmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HhkGAj0nIcvtjKOO/Bj8uSIkIkq8NC1uXDEuKAlKJWk78schqay8UGC3KUSS9PCy6 0kKWRaxI+g7+wosmsbutAXg4DRREPqB4GhIluLwpjstigt6QY7ZoC1UK0NEfTdBqXy Zknw43FcZSuUHP0SFWFe2dwh/XT0dKNP7OsvKuwE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730782AbfDVTtV (ORCPT ); Mon, 22 Apr 2019 15:49:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:53050 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730804AbfDVTtU (ORCPT ); Mon, 22 Apr 2019 15:49:20 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 53919218D3; Mon, 22 Apr 2019 19:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962559; bh=ayQZfYc+DhM/2d39oHzit0L9trySP0JCBcNJALANsmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YWo8cpthm02hxd5rdTIZyIl9ggxG8mKPfka08Gvt+RUtdvWnSADYLUVNmCEknCI0H AOftsbD4IhPfSyRUjdB/n3gXdWLGO/1XUztiZM4SPMgiPJ+7YKTg+SDgBVczx1LmUj Z8QqCaWNvfQUfF2+0tiUnPHS95AmKaDqWt8ErMPY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lukas Wunner , Frank Pavlic , Ben Dooks , Tristram Ha , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 15/29] net: ks8851: Set initial carrier state to down Date: Mon, 22 Apr 2019 15:48:34 -0400 Message-Id: <20190422194848.13049-15-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194848.13049-1-sashal@kernel.org> References: <20190422194848.13049-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lukas Wunner [ Upstream commit 9624bafa5f6418b9ca5b3f66d1f6a6a2e8bf6d4c ] The ks8851 chip's initial carrier state is down. A Link Change Interrupt is signaled once interrupts are enabled if the carrier is up. The ks8851 driver has it backwards by assuming that the initial carrier state is up. The state is therefore misrepresented if the interface is opened with no cable attached. Fix it. The Link Change interrupt is sometimes not signaled unless the P1MBSR register (which contains the Link Status bit) is read on ->ndo_open(). This might be a hardware erratum. Read the register by calling mii_check_link(), which has the desirable side effect of setting the carrier state to down if the cable was detached while the interface was closed. Signed-off-by: Lukas Wunner Cc: Frank Pavlic Cc: Ben Dooks Cc: Tristram Ha Signed-off-by: David S. Miller Signed-off-by: Sasha Levin (Microsoft) --- drivers/net/ethernet/micrel/ks8851.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index ff6cab4f6343..7377dca6eb57 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -870,6 +870,7 @@ static int ks8851_net_open(struct net_device *dev) netif_dbg(ks, ifup, ks->netdev, "network device up\n"); mutex_unlock(&ks->lock); + mii_check_link(&ks->mii); return 0; } @@ -1527,6 +1528,7 @@ static int ks8851_probe(struct spi_device *spi) spi_set_drvdata(spi, ks); + netif_carrier_off(ks->netdev); ndev->if_port = IF_PORT_100BASET; ndev->netdev_ops = &ks8851_netdev_ops; ndev->irq = spi->irq; -- 2.19.1