From patchwork Sun Oct 29 11:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 159356 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1631313vqb; Sun, 29 Oct 2023 04:13:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEA7rk1qn7bp5xly8WrkONBB39wo/rOQKtjc8NGdL/TSysVzzNDWb2Ly5+nI4+cTo6/F6xL X-Received: by 2002:a05:6602:2b86:b0:7a9:96aa:e01e with SMTP id r6-20020a0566022b8600b007a996aae01emr10715549iov.17.1698578038412; Sun, 29 Oct 2023 04:13:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698578038; cv=none; d=google.com; s=arc-20160816; b=daA+HPICEm7HmNWN6DDAfPCoOH8wDef4LhMSYjxP8ughiqwyLvLGjOYUrXTWSW1DXY hgM2Zy8RvjBkMnQSGp9DefRWAVi5IETa+pQlXeK6dgxgYfj7Cu9D5OhwdJGOi8GC6kH4 Yho/I9PKf5QKMRILlZ7j1jx4f4sdL8mbVxnoDkJnCLqjF3YX36Eb7UzHtVIsBZksfbLe zP4ZhhCqLesYzmtuWsnqYsa+Q1WWRteWVgcORQqzxRwxnxU4zhQzEXIxIdBTkXrGFFzC jX+SxnGxpL4ZCwouVMSC2OjdhWtKmwJZL+jL+tzQcuQQQhbozLiUvKlJX6BqGM+MvjDV 3csQ== 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=A9/kNI9b7RSIN3devPK7PHNaGj0voCSrUyIEM5SF+PU=; fh=SsNJs69sMYlYTeWQYB3Y6uFVnk1BYEiSEalBcmc5mfg=; b=PCKz7S7FQbXTdi9w3V9+VLpulPJjRqssLA6SJP0egYrAU7JMoFbz6EqnKZvMyEP9+4 44xIVjwCZey7HcVJdGDOhfqdWOdKRXCy6s9z28Q8tdljHksFTgWnXlWw6GrYG63Ak1A5 vAqKzYrTU1EgAtsmrK1/tHFrgYqtvx/cfoEF578yblR7fg8J82kH69xgCTbI74BNnrum bzlzD5fiBDRtTbxPsdGgwIk5lGwJWRjMjhjmBDrPXT4k3IOVkrpJTHGJ1nFqCzTTtAgR dkbqz/PuVtVYOtaHmvHp6lsv/FdhHqTmwFMd4Rftn4HH16TfmxOkftF4W/POKlVG2r9O W/+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=SAJiupU5; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=RfercLSu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id k71-20020a62844a000000b006933caa6f03si3557952pfd.165.2023.10.29.04.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 04:13:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=SAJiupU5; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=RfercLSu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 4852D8060CA5; Sun, 29 Oct 2023 04:13:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229790AbjJ2LNi (ORCPT + 30 others); Sun, 29 Oct 2023 07:13:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229529AbjJ2LNh (ORCPT ); Sun, 29 Oct 2023 07:13:37 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [161.53.235.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A6BDC0; Sun, 29 Oct 2023 04:13:35 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id DD1AE60182; Sun, 29 Oct 2023 12:13:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1698578013; bh=NtW5AA3iztqWChPJltkY4/MG+Vbb89cp9gCAty5mC2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SAJiupU5Lqr+a+cpvtLP1Ehji5uY8ahX5H0FXi86cRA8Z1urPmKYJbzGEuB/r9lAe Zq746u6NYHBfc2UlfY0QF73zJQncLb6Z8LZYJqpFj9ofD9sCJtTyI8MKrMamlbuKia SDEJFMk2moW9ksTsC2OQYRryloS5DZkqAYuM4UEcPCBE5/P3pZFRBiBrrZ7aD7g7bM yoSs5aS3f8eV/E4EPAAt0PjIjyNuAtOnG4S5big1qUHCgAmtrgUpiO2SkYz2Psz3AH pl5sEEfmIOvds17Q8LSE9UndM7leaKmcYDnmjLBZLqRniiGyUqO40tk3CMcVeNrmO6 VEOUnpa537J1Q== 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 MUAMGmq2omC4; Sun, 29 Oct 2023 12:13:31 +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 3799A60173; Sun, 29 Oct 2023 12:13:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1698578011; bh=NtW5AA3iztqWChPJltkY4/MG+Vbb89cp9gCAty5mC2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RfercLSu6F5ap+xDowIYoRw/jAzK6gD2ex1MxlxO/NKq6NYR+lj8XgELdp/SPEUzT V7Fdchlm6Ee3xKpUqwh74InU6qzjdRdWIGMUIuUCTXGMy9suAf2u3BYOuSUyOft0PG u/q+tubop6TOZv7qROvXDrAHH5rBenUKvIjg7TzAzGTCSy7CN/2/3+WWsTPK+cQ/te 39XKmlDmAC6koOLY4HZMQy93O46x/4xySgs+0EOAvXwTCW0kmMizOtPDGdjDGWHCSy iy0PCXKZ1bLlKad5Nv7cJcu1Y5WJaVTpg3QbxnodUht9ScvoBwlmLzjQTodhN/CaKE qys2jFnHWuFJg== 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 v4 4/5] r8169: Coalesce mac ocp commands for 8125 and 8125B start to reduce spinlock contention Date: Sun, 29 Oct 2023 12:04:45 +0100 Message-Id: <20231029110442.347448-4-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231029110442.347448-1-mirsad.todorovac@alu.unizg.hr> References: <20231029110442.347448-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 howler.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 (howler.vger.email [0.0.0.0]); Sun, 29 Oct 2023 04:13:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781088165374460774 X-GMAIL-MSGID: 1781088165374460774 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 lock/unlock, 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 Reviewed-by: Jacob Keller --- 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 | 38 ++++++++++++++--------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index cbaac4675bd2..dd65e0384ab3 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3539,6 +3539,27 @@ 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 }, + }; + rtl_pcie_state_l2l3_disable(tp); RTL_W16(tp, 0x382, 0x221b); @@ -3553,9 +3574,7 @@ static void rtl_hw_start_8125_common(struct rtl8169_private *tp) 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); @@ -3570,18 +3589,7 @@ static void rtl_hw_start_8125_common(struct rtl8169_private *tp) 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); + r8168_mac_ocp_modify_seq(tp, e_info_8125_common_2); udelay(1); r8168_mac_ocp_modify(tp, 0xeb54, 0x0001, 0x0000); RTL_W16(tp, 0x1880, RTL_R16(tp, 0x1880) & ~0x0030);