From nobody Fri Sep 27 03:36:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XFGN62z7Mz5XQ3g; Fri, 27 Sep 2024 03:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XFGN6252Sz4nhw; Fri, 27 Sep 2024 03:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727408182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DMBBw0cqhkPxr4BgT+G1wOP3XWbPD59DHtfq/jiIZqk=; b=ecKt45Rr5LfaoNDwLh55EGNMPDA3HU6KtxvjwILaTl17LhD81gfTv1/8M694rw6S3Na2DF RBG+4yK5zWKZBukCu2G6OPmCdvGTGVk3PWAHYpFPVLWMpTMIURM0rlVInyFVUrsEEZgSnH l/7+AsWhDOsCSapEjrkFMyMjer7znnhCNOeDs6BgQshHKtxvxIRc5tPo6OCRqmgd93L0fQ ayhi+jNRdGiHsEB7x2prcGiF4qThZy5ror+rA5+9oD614USAPYr6wGn5k8CjRQtcWphQ6A IFOQ+UF93cBW6WY0SQl2uf/jN7rTlg9sGsWGBEluTuzhD8UaFTbC8pJAz5iGJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727408182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DMBBw0cqhkPxr4BgT+G1wOP3XWbPD59DHtfq/jiIZqk=; b=PrR/YN30Q6BhMHkT+/k+57DkaWl/R8YYk9TdN/x5kBKN8kjCu4ZJfOGOU0i8YHWrOffkCg 9LwuV+yBKVEiqyMXmLZ2wFWJkTOTjvWMDwno2RxOUcRQaJiA1KHQ/yhU2gotNDV+zsd6L+ AQjkc/YYuX+wmEYJij/cRNyEciNRu/KPgfTI9A7+F0seNDidA3n/nA+hfWpnlNN6mX1VLn vLce0r8BjbCrJZ5U5bizW/tXsaDCH66TOniMzer8Vaz3SMWwjuIEdt3m8q3FwFSmrvyypL vUU/zmv8KhxH8eUlQGQDoAZuuzoEdQ1CM+j93jZ38tRxyjUCtqRcdTAF/rHjXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727408182; a=rsa-sha256; cv=none; b=LMnUIfV7A9kqIZlXFKzx7jAZEL4Dj9yuR+mjc04ty3li7GDtynNYHVDFf9sPrTReT5/M4Z JuIex/X5LCNGCrsJxQTf1PJyfQqI+zNsQE1oPkeCC3ROJw64ZGoTf7tahBB0GochpUNmVD KNDdbVnZC2xssBjZxk9erlH1YNCtuknyWRL5SYu/mHZv4CrbIGbiaAW0sJDiiO01W7q0dx uFOQ7EbJ7/YIcBNlnhuOXQZb9Os0ewskgxvgNEKZVvzlzP8kVaEgGMaW6N8dHmQRZTu067 NuvZk6ZoDGzoyyQ2zCPKmFNje5YZHv1kRVWrfqc/mR4b9y0UUu85QnzpCs1Gkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XFGN610SFzP5B; Fri, 27 Sep 2024 03:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48R3aMjG039202; Fri, 27 Sep 2024 03:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48R3aMHr039199; Fri, 27 Sep 2024 03:36:22 GMT (envelope-from git) Date: Fri, 27 Sep 2024 03:36:22 GMT Message-Id: <202409270336.48R3aMHr039199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 2bff788d32d1 - stable/14 - ixgbe: improve Atom C3000 SWFW semaphore acq List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2bff788d32d12ceb1e82866234b183aef30dc697 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2bff788d32d12ceb1e82866234b183aef30dc697 commit 2bff788d32d12ceb1e82866234b183aef30dc697 Author: Barbara Skobiej AuthorDate: 2024-09-20 03:29:36 +0000 Commit: Kevin Bowling CommitDate: 2024-09-27 03:34:27 +0000 ixgbe: improve Atom C3000 SWFW semaphore acq DPDK commit message net/ixgbe/base: improve SWFW semaphore acquisition HWSW semaphore acquisition in Atom C3000 NIC is a two stage process. Each time two semaphore acquisitions are required. Each second semaphore failure requires re-acquisition of first semaphore. This patch decouples the two acquisitions preventing potentially hundreds of thousands of unnecessary loop iterations. Signed-off-by: Barbara Skobiej Obtained from: DPDK (99f960c) (cherry picked from commit cc9944183187308a71489651b11342d293aac7d1) --- sys/dev/ixgbe/ixgbe_x550.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_x550.c b/sys/dev/ixgbe/ixgbe_x550.c index 961d5c285e51..ba72b5d1366e 100644 --- a/sys/dev/ixgbe/ixgbe_x550.c +++ b/sys/dev/ixgbe/ixgbe_x550.c @@ -4242,36 +4242,39 @@ static s32 ixgbe_acquire_swfw_sync_X550a(struct ixgbe_hw *hw, u32 mask) DEBUGFUNC("ixgbe_acquire_swfw_sync_X550a"); - while (--retries) { - status = IXGBE_SUCCESS; - if (hmask) - status = ixgbe_acquire_swfw_sync_X540(hw, hmask); - if (status) { - DEBUGOUT1("Could not acquire SWFW semaphore, Status = %d\n", - status); - return status; - } - if (!(mask & IXGBE_GSSR_TOKEN_SM)) - return IXGBE_SUCCESS; + status = IXGBE_SUCCESS; + if (hmask) + status = ixgbe_acquire_swfw_sync_X540(hw, hmask); + + if (status) { + DEBUGOUT1("Could not acquire SWFW semaphore, Status = %d\n", status); + return status; + } + + if (!(mask & IXGBE_GSSR_TOKEN_SM)) + return IXGBE_SUCCESS; + while (--retries) { status = ixgbe_get_phy_token(hw); - if (status == IXGBE_ERR_TOKEN_RETRY) - DEBUGOUT1("Could not acquire PHY token, Status = %d\n", - status); if (status == IXGBE_SUCCESS) return IXGBE_SUCCESS; - if (hmask) - ixgbe_release_swfw_sync_X540(hw, hmask); - if (status != IXGBE_ERR_TOKEN_RETRY) { - DEBUGOUT1("Unable to retry acquiring the PHY token, Status = %d\n", - status); + DEBUGOUT1("Retry acquiring the PHY token failed, Status = %d\n", status); + if (hmask) + ixgbe_release_swfw_sync_X540(hw, hmask); return status; } + + if (status == IXGBE_ERR_TOKEN_RETRY) + DEBUGOUT1("Could not acquire PHY token, Status = %d\n", + status); } + if (hmask) + ixgbe_release_swfw_sync_X540(hw, hmask); + DEBUGOUT1("Semaphore acquisition retries failed!: PHY ID = 0x%08X\n", hw->phy.id); return status;