From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 127C0FA372C for ; Fri, 8 Nov 2019 19:16:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEA7020865 for ; Fri, 8 Nov 2019 19:16:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240584; bh=BW5LGtpYsgo3Aw65GJewEZVruUL09Go2QLUOlLxvtdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lso5piKcQADNWb4GHfyUebzLBmqnZGxoK7Oo1OxuC0Rx0icY+QfoxflsyIgBbx4QS EAr9O7ae1kafLOBfjSmAY0vZh/9F1mAytJMbYqOl8hYr8JBp09tZ4lc6zDdp3BS9Ab FDXeVvee5nQPGB1wjPV43ChTy3ohwWQBxj0DEL7c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390724AbfKHTDO (ORCPT ); Fri, 8 Nov 2019 14:03:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:32856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390717AbfKHTDN (ORCPT ); Fri, 8 Nov 2019 14:03:13 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C1B802067B; Fri, 8 Nov 2019 19:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239793; bh=BW5LGtpYsgo3Aw65GJewEZVruUL09Go2QLUOlLxvtdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sZK2IZw0qbVMy0nYUpR1fPhJ66ZBqtUylB/Mxy72kAF+B/GT5n85nXYJa2KJas+e2 YMA1dXZYnymyuAvAEH/4CP9r+G70UgZwRH3g9+usPAJMsFnQ8iV9ve0ekwv1nhdV/L sbS3HZeaASVwGRw7lAy+vVzDXX7RNlXUSngXpGzw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heiner Kallweit , "David S. Miller" Subject: [PATCH 4.19 62/79] r8169: fix wrong PHY ID issue with RTL8168dp Date: Fri, 8 Nov 2019 19:50:42 +0100 Message-Id: <20191108174820.977499466@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174745.495640141@linuxfoundation.org> References: <20191108174745.495640141@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Heiner Kallweit [ Upstream commit 62bdc8fd1c21d4263ebd18bec57f82532d09249f ] As reported in [0] at least one RTL8168dp version has problems establishing a link. This chip version has an integrated RTL8211b PHY, however the chip seems to report a wrong PHY ID, resulting in a wrong PHY driver (for Generic Realtek PHY) being loaded. Work around this issue by adding a hook to r8168dp_2_mdio_read() for returning the correct PHY ID. [0] https://bbs.archlinux.org/viewtopic.php?id=246508 Fixes: 242cd9b5866a ("r8169: use phy_resume/phy_suspend") Signed-off-by: Heiner Kallweit Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1010,6 +1010,10 @@ static int r8168dp_2_mdio_read(struct rt { int value; + /* Work around issue with chip reporting wrong PHY ID */ + if (reg == MII_PHYSID2) + return 0xc912; + r8168dp_2_mdio_start(tp); value = r8169_mdio_read(tp, reg);