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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 F14BFC282C7 for ; Sat, 26 Jan 2019 09:37:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C114A218F0 for ; Sat, 26 Jan 2019 09:37:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cAk1LyS2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728024AbfAZJhC (ORCPT ); Sat, 26 Jan 2019 04:37:02 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35572 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726895AbfAZJhA (ORCPT ); Sat, 26 Jan 2019 04:37:00 -0500 Received: by mail-wr1-f66.google.com with SMTP id 96so12735789wrb.2 for ; Sat, 26 Jan 2019 01:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=KQvC+FZJv+TWibo2NO4rn7LLaDSSdMU3r6DGd4F8ZRU=; b=cAk1LyS2EYv/ERXkIoH55FHz1ROZta7SrfWYSWHH229mOLDLul+tVAnFSpbaNfwGko 1damFTwNZScecUuKHh1KJXHl0yL5CDHecX8EtDSgkROcSsMUbt5eYHVb1GHLgJr42q6U rMqYIsoks1jqhv9G12KLNcrynPvGAD4LtbgwSnbkcnZ9EfIT5Uv62l/DiclnxiKZ/5AC C8Vo1OR7Dm+VF9BBY2kjajDl6KA0fZ0A51aCLPEou1GAIM6izEqN1hfC+WSSsH4t3uLH J49qO/5Uh1Woz3F5577mP+dsfLfqOhOQVcVbO/NbnizQtCk/BlVz+6R52ePLfXvltopQ 1nPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=KQvC+FZJv+TWibo2NO4rn7LLaDSSdMU3r6DGd4F8ZRU=; b=sAOQyW9mJSB5IV+ovNGozY64O7Kcs7I2M4D67/ra47jyP179Moj+kw1f1/9Njj9914 NQt7895/39i4955ZfkpZWRk/mPT5W8C/itRCRC1LAxa0aXZMHMmVE/o0GLZzfQ3b+3HC 5wgdt3fulv5rbAJ7lnHZ98pNoNbWa7l34oILJbrPQd5hfaaVWn6ZWyEwAnSw8QV/8LJb fK5ylBpwoz9j1rkc20Vh/66fe4XSxokpSBZkZ5yKDG2e5nro1XV68AJ1Jr6pnz8Q0YA+ OEwKqs8GFTR8pxtzf6deyHor20EeXOA5FUwlA/kB80DJYLC2WcsDGIm+ECXFn2UpCcC3 wIuw== X-Gm-Message-State: AJcUukciidVrwQv8cBdvShb9kNJ7qqDiNIPVjsd03Xi3gZL2OdcoQiTU zPIrAagtu6Hbvsw9TOcyouwvcQsd X-Google-Smtp-Source: ALg8bN7DI2Rp79gTlItP4Fq3P8VbQTKFK8hgCWzBvmwUw0rjXF5sIdcAnH3xzMpJPZtcDChR0n0P5g== X-Received: by 2002:a5d:4e0b:: with SMTP id p11mr15773270wrt.227.1548495418498; Sat, 26 Jan 2019 01:36:58 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e416:5520:9c93:d4eb? (p200300EA8BF1E200E41655209C93D4EB.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e416:5520:9c93:d4eb]) by smtp.googlemail.com with ESMTPSA id y13sm76121941wrw.85.2019.01.26.01.36.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Jan 2019 01:36:57 -0800 (PST) Subject: [PATCH net-next 2/2] r8169: enable EEE per default on RTL8168f From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: <55d17caf-5ff9-e888-b1af-dacc195b0eae@gmail.com> Message-ID: <9c60bea6-4843-dd14-7447-240b06cba111@gmail.com> Date: Sat, 26 Jan 2019 10:36:35 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <55d17caf-5ff9-e888-b1af-dacc195b0eae@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Enable EEE per default on RTL8168f. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 35 ++-------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 4572de170..3e650bd9e 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -3388,23 +3388,7 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp) rtl_writephy(tp, 0x1f, 0x0000); rtl8168f_config_eee_phy(tp); - - /* EEE setting */ - rtl_w0w1_eri(tp, 0x1b0, ERIAR_MASK_1111, 0x0003, 0x0000, ERIAR_EXGMAC); - rtl_writephy(tp, 0x1f, 0x0005); - rtl_writephy(tp, 0x05, 0x8b85); - rtl_w0w1_phy(tp, 0x06, 0x2000, 0x0000); - rtl_writephy(tp, 0x1f, 0x0004); - rtl_writephy(tp, 0x1f, 0x0007); - rtl_writephy(tp, 0x1e, 0x0020); - rtl_w0w1_phy(tp, 0x15, 0x0100, 0x0000); - rtl_writephy(tp, 0x1f, 0x0002); - rtl_writephy(tp, 0x1f, 0x0000); - rtl_writephy(tp, 0x0d, 0x0007); - rtl_writephy(tp, 0x0e, 0x003c); - rtl_writephy(tp, 0x0d, 0x4007); - rtl_writephy(tp, 0x0e, 0x0006); - rtl_writephy(tp, 0x0d, 0x0000); + rtl_enable_eee(tp); /* Green feature */ rtl_writephy(tp, 0x1f, 0x0003); @@ -3441,6 +3425,7 @@ static void rtl8168f_hw_phy_config(struct rtl8169_private *tp) rtl_writephy(tp, 0x1f, 0x0000); rtl8168f_config_eee_phy(tp); + rtl_enable_eee(tp); } static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp) @@ -3574,22 +3559,6 @@ static void rtl8411_hw_phy_config(struct rtl8169_private *tp) rtl_w0w1_phy(tp, 0x06, 0x8000, 0x0000); rtl_writephy(tp, 0x1f, 0x0000); - /* eee setting */ - rtl_w0w1_eri(tp, 0x1b0, ERIAR_MASK_0001, 0x00, 0x03, ERIAR_EXGMAC); - rtl_writephy(tp, 0x1f, 0x0005); - rtl_writephy(tp, 0x05, 0x8b85); - rtl_w0w1_phy(tp, 0x06, 0x0000, 0x2000); - rtl_writephy(tp, 0x1f, 0x0004); - rtl_writephy(tp, 0x1f, 0x0007); - rtl_writephy(tp, 0x1e, 0x0020); - rtl_w0w1_phy(tp, 0x15, 0x0000, 0x0100); - rtl_writephy(tp, 0x1f, 0x0000); - rtl_writephy(tp, 0x0d, 0x0007); - rtl_writephy(tp, 0x0e, 0x003c); - rtl_writephy(tp, 0x0d, 0x4007); - rtl_writephy(tp, 0x0e, 0x0000); - rtl_writephy(tp, 0x0d, 0x0000); - /* Green feature */ rtl_writephy(tp, 0x1f, 0x0003); rtl_w0w1_phy(tp, 0x19, 0x0000, 0x0001); -- 2.20.1