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 8D5D0C61CE8 for ; Sat, 19 Jan 2019 21:07:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C7312084C for ; Sat, 19 Jan 2019 21:07:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dY0Awnol" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729599AbfASVH4 (ORCPT ); Sat, 19 Jan 2019 16:07:56 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41308 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbfASVHw (ORCPT ); Sat, 19 Jan 2019 16:07:52 -0500 Received: by mail-wr1-f66.google.com with SMTP id x10so19012154wrs.8 for ; Sat, 19 Jan 2019 13:07:51 -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=AxthGrMBM/2JuXt5VPIIfZu8GV/psZ+6PkUadhpMAGQ=; b=dY0Awnolf9N3ojH+9ywxW7bbDpY/fJiiY4uAhLc3cmmeQy0HnUj+JK9Y0fgFUHLqgk jiPthtRDThSnNT5HsdM9nIoUyX7aAil8YhDoB8Q43azn775wkYlCEUyDdoUm0mosMKNV C2dUZLiotQxCFNQQdDn0qcfiHTLm6Wf+ld3UvCEmxASd7WyA7xG5Irsd9arGNVTbQLo9 Ojcwmef5gMUHsNOiq6OJagB8Jm2BHsgpaO4rdGJglgs0HQng57qshOb2CrQw3j6UcXDC wFtgcaz7FxAvlxne3WOOEmFw8cz77KoYEhXlDoRqUBIwpFxVnAP9bpYgvwid6ig3BIw1 ydSQ== 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=AxthGrMBM/2JuXt5VPIIfZu8GV/psZ+6PkUadhpMAGQ=; b=qhnYk1vGBnt1EEzfuIH3I/yT6/IFjAUC3elo+OFvzBjmXmoTbjJQgvn04XFORXWlpZ 9k90cfS+r7b7cEuqiP+WmfgF53eMCoakDViuoA7UdjWRqZTNIQ+3djfudefOUvCNVgsQ zJRD4wAuh6P/Hh+9kzNIapaJ5WbASQjesM+zhDO1x57h+9V3uGZlp7dSwACAZk7SWq+4 mKPwcYv+BEAea9uVf0Rr8Gjpv2PCpUyUG/PdEG2ZT5JhruysS0R9MAlOiCeQLErqCtRO UpcJ5TrrDo8ZYWzmBaVGM1XJExYTBv2IA/QxNFP+CvB9CsqCghKZlzpm8l/iaDgVAhQc k5Qg== X-Gm-Message-State: AJcUukdgzfCCzdGdzeT04gYIbJgdlEMOcKL7EaZixTrrU09YH4OrKLFu Alo8I9zugH64ouyPgkEU2lRbMuel X-Google-Smtp-Source: ALg8bN4Y/Gyh3aeYE1A6w7uayNCx38YKDsYL5NJ1TQRwObyXDdCOmi6xYn9ZqDkTWQBDkq1X8/GFYQ== X-Received: by 2002:adf:ef50:: with SMTP id c16mr21568880wrp.198.1547932070486; Sat, 19 Jan 2019 13:07:50 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd? (p200300EA8BF1E200E8778D0CCDF081FD.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e877:8d0c:cdf0:81fd]) by smtp.googlemail.com with ESMTPSA id f130sm43192112wme.41.2019.01.19.13.07.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 13:07:50 -0800 (PST) Subject: [PATCH net-next v2 5/8] r8169: add helpers for locking / unlocking the config registers From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: Message-ID: <884c1ae0-c82e-a3ce-d6f8-ff0ae7cd99e5@gmail.com> Date: Sat, 19 Jan 2019 22:05:48 +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: 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 Add helpers for locking / unlocking the config registers. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 34 ++++++++++++++++++---------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index df3d2633f..a3df61d81 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -745,6 +745,16 @@ static void rtl_unlock_work(struct rtl8169_private *tp) mutex_unlock(&tp->wk.mutex); } +static void rtl_lock_config_regs(struct rtl8169_private *tp) +{ + RTL_W8(tp, Cfg9346, Cfg9346_Lock); +} + +static void rtl_unlock_config_regs(struct rtl8169_private *tp) +{ + RTL_W8(tp, Cfg9346, Cfg9346_Unlock); +} + static void rtl_tx_performance_tweak(struct rtl8169_private *tp, u16 force) { pcie_capability_clear_and_set_word(tp->pci_dev, PCI_EXP_DEVCTL, @@ -1426,7 +1436,7 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) }; u8 options; - RTL_W8(tp, Cfg9346, Cfg9346_Unlock); + rtl_unlock_config_regs(tp); switch (tp->mac_version) { case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_38: @@ -1474,7 +1484,7 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts) break; } - RTL_W8(tp, Cfg9346, Cfg9346_Lock); + rtl_lock_config_regs(tp); device_set_wakeup_enable(tp_to_dev(tp), wolopts); } @@ -4006,7 +4016,7 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) { rtl_lock_work(tp); - RTL_W8(tp, Cfg9346, Cfg9346_Unlock); + rtl_unlock_config_regs(tp); RTL_W32(tp, MAC4, addr[4] | addr[5] << 8); RTL_R32(tp, MAC4); @@ -4017,7 +4027,7 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) if (tp->mac_version == RTL_GIGA_MAC_VER_34) rtl_rar_exgmac_set(tp, addr); - RTL_W8(tp, Cfg9346, Cfg9346_Lock); + rtl_lock_config_regs(tp); rtl_unlock_work(tp); } @@ -4229,18 +4239,18 @@ static void rtl8169_init_ring_indexes(struct rtl8169_private *tp) static void rtl_hw_jumbo_enable(struct rtl8169_private *tp) { if (tp->jumbo_ops.enable) { - RTL_W8(tp, Cfg9346, Cfg9346_Unlock); + rtl_unlock_config_regs(tp); tp->jumbo_ops.enable(tp); - RTL_W8(tp, Cfg9346, Cfg9346_Lock); + rtl_lock_config_regs(tp); } } static void rtl_hw_jumbo_disable(struct rtl8169_private *tp) { if (tp->jumbo_ops.disable) { - RTL_W8(tp, Cfg9346, Cfg9346_Unlock); + rtl_unlock_config_regs(tp); tp->jumbo_ops.disable(tp); - RTL_W8(tp, Cfg9346, Cfg9346_Lock); + rtl_lock_config_regs(tp); } } @@ -4561,13 +4571,13 @@ static void rtl_set_rx_mode(struct net_device *dev) static void rtl_hw_start(struct rtl8169_private *tp) { - RTL_W8(tp, Cfg9346, Cfg9346_Unlock); + rtl_unlock_config_regs(tp); tp->hw_start(tp); rtl_set_rx_max_size(tp); rtl_set_rx_tx_desc_registers(tp); - RTL_W8(tp, Cfg9346, Cfg9346_Lock); + rtl_lock_config_regs(tp); /* Initially a 10 us delay. Turned it into a PCI commit. - FR */ RTL_R8(tp, IntrMask); @@ -6976,9 +6986,9 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) unsigned int flags; if (tp->mac_version <= RTL_GIGA_MAC_VER_06) { - RTL_W8(tp, Cfg9346, Cfg9346_Unlock); + rtl_unlock_config_regs(tp); RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable); - RTL_W8(tp, Cfg9346, Cfg9346_Lock); + rtl_lock_config_regs(tp); flags = PCI_IRQ_LEGACY; } else { flags = PCI_IRQ_ALL_TYPES; -- 2.20.1