From patchwork Sun Oct 29 18:36:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 159391 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1811588vqb; Sun, 29 Oct 2023 11:44:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFM3Tqn4F5g0/mJrzZOSGvbDrpJqBRwNpX+lwWKlcUsfNjj2iZK7QGs1On9POOATMGnx8u X-Received: by 2002:a05:6871:60d:b0:1ef:cedd:5c32 with SMTP id w13-20020a056871060d00b001efcedd5c32mr1825616oan.3.1698605074554; Sun, 29 Oct 2023 11:44:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698605074; cv=none; d=google.com; s=arc-20160816; b=qstjAiJYEgzW4nMscRPO7BmxFmqi93pSYmVpPUqyP1stSzD/O4C5p1mzzhn3Zd4Opa 8QWeyddiAN349zuHo9kl9HfeqvHEK2ikqbX/DwTOyb93RCDwhN/vgvUntQlPaAWmesdh iknQEuw7Gf/HhFyMVbIN2KMlbOWe2N1u5fETYQd2MdslW4OHaJmHPJUPGnolBbW1/MW2 JBZ0pqOeVeeXaMTuyDbeYFDhigJEvB5ffi4wCm/cHEKyHxVO71r8BpX+0cT+kZgcXowI EWosqE5DEFW95n6JAphBW85Z3M66EZAVlFnULO+GIYGYiCFw1eRh++jh+in3SkOiQaOb jVvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=Asl/6IUeLXRnDB289XIVsKuj7d8rg64WKlxgVsYJA7s=; fh=SsNJs69sMYlYTeWQYB3Y6uFVnk1BYEiSEalBcmc5mfg=; b=rPNWZpx5wU/APtWkd//Vth00mA7DY+pHWsPcEFYn8oEHPVqWixU79OqEuKwnpK/r5e xSuSGuLHpPzgVOWRowxg4wRwrbJ2uJaZTfsW+TopsvQJNwsZBDb/+fW0o05IJxyXIskh cT8gB+aJLkiI5Yt56/qScjHho0Fbh5Z0oexqwW6J3qOAntjxFqdze6naUCIcmOr/dCWF f9UxwlfJTwsdLtU9qaQlTBlwGT5E/vwnP3f3Gn7dKl2ygQgxNGe37GITj8bulfa6BYz2 1QaYfX+VMwfcWBdruQ/h6FyuXrc7O/o8CNI8whZnXBS1XLcXQ5L86+0uTEfV/mjT73CI iqwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=I4oglD+g; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=VGwNHyBR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id n5-20020a632705000000b005a073e0cc9asi3994262pgn.803.2023.10.29.11.44.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 11:44:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=I4oglD+g; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=VGwNHyBR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id EB32C80621F9; Sun, 29 Oct 2023 11:44:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230345AbjJ2SoD (ORCPT + 30 others); Sun, 29 Oct 2023 14:44:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230349AbjJ2SoC (ORCPT ); Sun, 29 Oct 2023 14:44:02 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [IPv6:2001:b68:2:2800::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A8D8BD; Sun, 29 Oct 2023 11:43:59 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 16B6860173; Sun, 29 Oct 2023 19:43:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1698605038; bh=kTrKI+RYDHwLvsOjwX6EC4uYyc8dF8fc3KgwnN4pF48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I4oglD+gqpjI8GSCMer9UN+MuG+hXIz8uXZFJJEw3nnWIkPXGyW2n8wjDEb8RgUjx huZ1sKRup2wQgqUoj/BZClV74pLhoxZrxz2PNI0h67YQ3cq42uN5qy2/G8+Kec6TXW rc6LkYoCauAeYpYSERe3YJ34vehPhQvauhbI7UNto+Dpvg+j67Q2neuVMOyCSwYamG FrXZ1HsI+wlpjYeGfRyPAchQMlqG+tIBET+3cdqTBAyw0b9ZOCGWZvDqrr2N55UlhN 4gkdROdFyS2I7DSllbDltaSNFsL9nc4wutWOZtMnKIVGBWgWqqL5YvfqjbJpB1wfeM pmNxhR48JCzjw== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yBSS37-Hzjdw; Sun, 29 Oct 2023 19:43:55 +0100 (CET) Received: from defiant.home (78-3-40-247.adsl.net.t-com.hr [78.3.40.247]) by domac.alu.hr (Postfix) with ESMTPSA id 6A74A60182; Sun, 29 Oct 2023 19:43:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1698605035; bh=kTrKI+RYDHwLvsOjwX6EC4uYyc8dF8fc3KgwnN4pF48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VGwNHyBRNsEywjflWi+92J6548s7A+Jtky6QkTblA5IKLHHu2reR8JaahD3hERPhf 9kYXlgVxy6ZOZhEg4HUckw7qMcxIggx25rgp6A9M+dznlRwgHPwTlleEv5BWcz+UQr 2aGJKQGNe+tB1oR2bGB3u3sHhAfsd9JA4DAv6Gwi3bzy1WM2BV1tDEQmZF5nugXFzx 0dczvI/gF8Oh57W3h7gUBOAL2J2YUMJmEZE0yzSMzkWZhA+oCoVTOqjTh2ayO8AQo3 Z+Tv1RPONMRfgPzYFjuI586MJBmSV5fkZpM8oXZ0DoXsyGntAeVnGbcNpvRb8Gkp9u AIeH/GtHsWUTQ== From: Mirsad Goran Todorovac To: Jason Gunthorpe , Joerg Roedel , Lu Baolu , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Joerg Roedel , Will Deacon , Robin Murphy , Heiner Kallweit , nic_swsd@realtek.com, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Mirsad Goran Todorovac , Marco Elver Subject: [PATCH v5 6/7] r8169: Coalesce mac ocp write and modify for 8125 and 8125B start to reduce spinlocks Date: Sun, 29 Oct 2023 19:36:05 +0100 Message-Id: <20231029183600.451694-6-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231029183600.451694-1-mirsad.todorovac@alu.unizg.hr> References: <20231029183600.451694-1-mirsad.todorovac@alu.unizg.hr> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Sun, 29 Oct 2023 11:44:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781116514604537246 X-GMAIL-MSGID: 1781116514604537246 Repeated calls to r8168_mac_ocp_write() and r8168_mac_ocp_modify() in the startup of 8125 and 8125B involve implicit spin_lock_irqsave() and spin_unlock_irqrestore() on each invocation. Coalesced with the corresponding helpers r8168_mac_ocp_write_seq() and r8168_mac_ocp_modify_seq() into sequential write or modidy with a sinqle pair of spin_lock_irqsave() and spin_unlock_irqrestore(), these calls reduce overall lock contention. Fixes: f1bce4ad2f1ce ("r8169: add support for RTL8125") Fixes: 0439297be9511 ("r8169: add support for RTL8125B") Cc: Heiner Kallweit Cc: Marco Elver Cc: nic_swsd@realtek.com Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Link: https://lore.kernel.org/lkml/20231028005153.2180411-1-mirsad.todorovac@alu.unizg.hr/ Link: https://lore.kernel.org/lkml/20231028110459.2644926-1-mirsad.todorovac@alu.unizg.hr/ Signed-off-by: Mirsad Goran Todorovac --- v5: added unlocked primitives to allow mac ocs modify grouping applied coalescing of mac ocp writes/modifies for 8168ep and 8117 some formatting fixes to please checkpatch.pl v4: fixed complaints as advised by Heiner and checkpatch.pl split the patch into five sections to be more easily manipulated and reviewed introduced r8168_mac_ocp_write_seq() applied coalescing of mac ocp writes/modifies for 8168H, 8125 and 8125B v3: removed register/mask pair array sentinels, so using ARRAY_SIZE(). avoided duplication of RTL_W32() call code as advised by Heiner. drivers/net/ethernet/realtek/r8169_main.c | 75 +++++++++++++---------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 50fbacb05953..0778cd0ba2e0 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3553,6 +3553,28 @@ DECLARE_RTL_COND(rtl_mac_ocp_e00e_cond) static void rtl_hw_start_8125_common(struct rtl8169_private *tp) { + static const struct e_info_regmaskset e_info_8125_common_1[] = { + { 0xd3e2, 0x0fff, 0x03a9 }, + { 0xd3e4, 0x00ff, 0x0000 }, + { 0xe860, 0x0000, 0x0080 }, + }; + + static const struct e_info_regmaskset e_info_8125_common_2[] = { + { 0xc0b4, 0x0000, 0x000c }, + { 0xeb6a, 0x00ff, 0x0033 }, + { 0xeb50, 0x03e0, 0x0040 }, + { 0xe056, 0x00f0, 0x0030 }, + { 0xe040, 0x1000, 0x0000 }, + { 0xea1c, 0x0003, 0x0001 }, + { 0xe0c0, 0x4f0f, 0x4403 }, + { 0xe052, 0x0080, 0x0068 }, + { 0xd430, 0x0fff, 0x047f }, + { 0xea1c, 0x0004, 0x0000 }, + { 0xeb54, 0x0000, 0x0001 }, + }; + + unsigned long flags; + rtl_pcie_state_l2l3_disable(tp); RTL_W16(tp, 0x382, 0x221b); @@ -3560,47 +3582,38 @@ static void rtl_hw_start_8125_common(struct rtl8169_private *tp) RTL_W16(tp, 0x4800, 0); /* disable UPS */ - r8168_mac_ocp_modify(tp, 0xd40a, 0x0010, 0x0000); + + raw_spin_lock_irqsave(&tp->mac_ocp_lock, flags); + __r8168_mac_ocp_modify(tp, 0xd40a, 0x0010, 0x0000); RTL_W8(tp, Config1, RTL_R8(tp, Config1) & ~0x10); - r8168_mac_ocp_write(tp, 0xc140, 0xffff); - r8168_mac_ocp_write(tp, 0xc142, 0xffff); + __r8168_mac_ocp_write(tp, 0xc140, 0xffff); + __r8168_mac_ocp_write(tp, 0xc142, 0xffff); - r8168_mac_ocp_modify(tp, 0xd3e2, 0x0fff, 0x03a9); - r8168_mac_ocp_modify(tp, 0xd3e4, 0x00ff, 0x0000); - r8168_mac_ocp_modify(tp, 0xe860, 0x0000, 0x0080); + __r8168_mac_ocp_modify_seq(tp, e_info_8125_common_1); /* disable new tx descriptor format */ - r8168_mac_ocp_modify(tp, 0xeb58, 0x0001, 0x0000); + __r8168_mac_ocp_modify(tp, 0xeb58, 0x0001, 0x0000); - if (tp->mac_version == RTL_GIGA_MAC_VER_63) - r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200); - else - r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0400); + if (tp->mac_version == RTL_GIGA_MAC_VER_63) { + __r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200); + __r8168_mac_ocp_modify(tp, 0xe63e, 0x0c30, 0x0000); + } else { + __r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0400); + __r8168_mac_ocp_modify(tp, 0xe63e, 0x0c30, 0x0020); + } + + __r8168_mac_ocp_modify_seq(tp, e_info_8125_common_2); + raw_spin_unlock_irqrestore(&tp->mac_ocp_lock, flags); - if (tp->mac_version == RTL_GIGA_MAC_VER_63) - r8168_mac_ocp_modify(tp, 0xe63e, 0x0c30, 0x0000); - else - r8168_mac_ocp_modify(tp, 0xe63e, 0x0c30, 0x0020); - - r8168_mac_ocp_modify(tp, 0xc0b4, 0x0000, 0x000c); - r8168_mac_ocp_modify(tp, 0xeb6a, 0x00ff, 0x0033); - r8168_mac_ocp_modify(tp, 0xeb50, 0x03e0, 0x0040); - r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030); - r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000); - r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001); - r8168_mac_ocp_modify(tp, 0xe0c0, 0x4f0f, 0x4403); - r8168_mac_ocp_modify(tp, 0xe052, 0x0080, 0x0068); - r8168_mac_ocp_modify(tp, 0xd430, 0x0fff, 0x047f); - - r8168_mac_ocp_modify(tp, 0xea1c, 0x0004, 0x0000); - r8168_mac_ocp_modify(tp, 0xeb54, 0x0000, 0x0001); udelay(1); - r8168_mac_ocp_modify(tp, 0xeb54, 0x0001, 0x0000); - RTL_W16(tp, 0x1880, RTL_R16(tp, 0x1880) & ~0x0030); - r8168_mac_ocp_write(tp, 0xe098, 0xc302); + raw_spin_lock_irqsave(&tp->mac_ocp_lock, flags); + __r8168_mac_ocp_modify(tp, 0xeb54, 0x0001, 0x0000); + RTL_W16(tp, 0x1880, RTL_R16(tp, 0x1880) & ~0x0030); + __r8168_mac_ocp_write(tp, 0xe098, 0xc302); + raw_spin_unlock_irqrestore(&tp->mac_ocp_lock, flags); rtl_loop_wait_low(tp, &rtl_mac_ocp_e00e_cond, 1000, 10);