From patchwork Sun Jun 28 07:58:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Ma X-Patchwork-Id: 1318497 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49vjgV6H6dz9sQt; Sun, 28 Jun 2020 17:59:01 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jpSDF-0002mb-5W; Sun, 28 Jun 2020 07:58:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jpSDD-0002mV-DV for kernel-team@lists.ubuntu.com; Sun, 28 Jun 2020 07:58:51 +0000 Received: from [222.129.43.254] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jpSDC-0008VH-A4 for kernel-team@lists.ubuntu.com; Sun, 28 Jun 2020 07:58:51 +0000 From: Aaron Ma To: kernel-team@lists.ubuntu.com Subject: [PATCH 0/5][SRU][F] Add r8117 support and fix firmware base issue Date: Sun, 28 Jun 2020 03:58:37 -0400 Message-Id: <20200628075842.771536-1-aaron.ma@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1885072 [Impact] Realtek 8117 is failed to be initialized on 5.4- kernel, even failed to work after loading firmware on 5.5+ kernel. [Fix] Add rtl8117 support for 5.4- kernel. On 5.5+ kernel, firmware should reset ocp_base, but not on r8117. Correct the ocp_base in the driver. Then it works well. [Test] Verified on hardware, link status is OK, iperf test result is good. [Regression Potential] Low. Fixed issue, cherry-picked from linux-next tree. SRU for OEM-5.6/U was already done. this is for focal because of more commits. Bionic kernel set rtl8117 as default r8169. It just works. no need these changes. Backport 0002 patch because of another upstream patch is already merged. Heiner Kallweit (5): r8169: add helper r8168g_phy_param r8169: add support for RTL8117 r8169: load firmware for RTL8168fp/RTL8117 r8169: fix OCP access on RTL8117 r8169: fix firmware not resetting tp->ocp_base drivers/net/ethernet/realtek/r8169_main.c | 445 ++++++++++++---------- 1 file changed, 241 insertions(+), 204 deletions(-) Acked-by: Stefan Bader Acked-by: Colin Ian King Acked-by: Kamal Mostafa