From patchwork Wed Jul 10 09:40:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1130309 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.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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uKW1+7BP"; dkim-atps=neutral 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 45kDh36ktWz9sNC; Wed, 10 Jul 2019 19:40:35 +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 1hl95U-0002Rz-LQ; Wed, 10 Jul 2019 09:40:32 +0000 Received: from mail-pg1-f193.google.com ([209.85.215.193]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1hl95T-0002R2-Rc for kernel-team@lists.ubuntu.com; Wed, 10 Jul 2019 09:40:32 +0000 Received: by mail-pg1-f193.google.com with SMTP id m4so991278pgk.0 for ; Wed, 10 Jul 2019 02:40:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=ZIlvyySaonj/L5Rq1g3rrAYYNQ18W6/RQUdlaEPXBeg=; b=uKW1+7BPQ2RW/2xMfvF8pK/yrnUCx+sTvYlyV4Mu4BTO7wc8zS2DFebjV1DSsgP69K g9dFfE8fImdla66rZj8yGSe5ZQJle1LLSkUK2fSTyLxwCyFHaLuIaDXTTR9Epexx0M0u zGfBce3ITwpZTgJa+ElmL4B2r3cwpLmZOWql3DFdMdF+6axrX7tjysL7y9JK8IJhRG9U 2wPkhSHzmRnsoBSBP9yu9FhPxsNxn50ku45VkQTI1tip3qQQBN34mHXTPTTgq6iXlIgu 93WULWVFp9IoVxLeVh/fVAXlSj+EvbiqiYJ40KQRDx1hGnxp2R16vjSktb69b2mtmetF Gpcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=ZIlvyySaonj/L5Rq1g3rrAYYNQ18W6/RQUdlaEPXBeg=; b=YhMEzpzRTYIrITkjaztNb+C0ZYfMlmt7QwYkEbl8eHcp29Alhy7L3VSjHHs87R1lge 7GzCEXx/iTQtrI9FerOf2flFJ+k2Dn0IzdGL6f21NFvAPKSrtXiJVPhOa9kF296aflpH Sa3F9R0MRzbxKuZIu0/2lBmlq1X64VhNZmCjTP9L0YZq5R+ZTOAJpNVUAsMDOXmPQotW YtEzhQV0igUF58uLBr+yO8n89vU8GAG2FMa4nzMyVqxAYFxFc7LSsw7GmojuKhpsG1sL dHZEsWjgILBqnxldCgVehbInhOsT46nl5qzfwrZSWiYFHc+EP2D3T1WzzeJkcfg60+xU Pc6g== X-Gm-Message-State: APjAAAVGFbTZtDb32bfFg8ttLdWAx8pUrASNW4ZR3He7K5gVV8Oizx8U duPjBY3Nq8NWZzPzNTuLJPOGSONgr8g= X-Google-Smtp-Source: APXvYqzTSHqwXsGtzWsYo33JC8WamY6GggjOMmjHaCAnuRGVKn0HpM7XZkQXm6HZhPvU90gWp72DUg== X-Received: by 2002:a17:90a:17ab:: with SMTP id q40mr5975915pja.106.1562751629989; Wed, 10 Jul 2019 02:40:29 -0700 (PDT) Received: from localhost (114-32-69-186.HINET-IP.hinet.net. [114.32.69.186]) by smtp.gmail.com with ESMTPSA id e13sm1798497pff.45.2019.07.10.02.40.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Jul 2019 02:40:29 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/4][SRU][OEM-OSP1-B] UBUNTU: SAUCE: Revert "r8169: disable ASPM again" Date: Wed, 10 Jul 2019 17:40:14 +0800 Message-Id: <20190710094014.18416-5-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190710094014.18416-1-acelan.kao@canonical.com> References: <20190710094014.18416-1-acelan.kao@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1836030 This reverts commit 8b60fe9c63d2b1dc55412bfbc7e4a899063f61c3. PCI/ASPM have been merged, so we rely on the PCI ASPM setting from BIOS, and don't need to enable/disable ASPM function on r8169 driver. Signed-off-by: AceLan Kao --- drivers/net/ethernet/realtek/r8169.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 365cddbfc684..f294c5c9c206 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -7225,11 +7224,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return rc; } - /* Disable ASPM completely as that cause random device stop working - * problems as well as full system hangs for some PCIe devices users. - */ - pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1); - /* enable device (incl. PCI PM wakeup and hotplug setup) */ rc = pcim_enable_device(pdev); if (rc < 0) {