From nobody Fri Sep 20 03:32:03 2024 X-Original-To: dev-commits-src-main@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 4X8ycM6Bj2z5Wgr2; Fri, 20 Sep 2024 03:32:03 +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 4X8ycM4zmRz4NMw; Fri, 20 Sep 2024 03:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726803123; 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=te+jYGQkURTOvZZL1WyykuIKfiuoqDoCs5uT3o44QMs=; b=I9gvDImO7jbkHj/E6Z15eKyjRzyeYN8bVJv2M+PaTC1Cu+2wgkLEUEnWZcfI3fPMf0xEAC g+aQIGdoARSmuhPDceloJF1a3sBYj4yb6X/ulipPICIUKvDpi13Ng4p2MU06RMq2tj6dvx xcxPqCgSEIVa5UKwdx28jF8y2PuBYJEIDwthrBtKeTL0aJ8oK2geut90kp7Rqn1mYoh9RR BmVkil9IizkvO4hQr5m/oWWrl+FDsb+Pd7JpHXMAU5KBu7MJCuubGByO0J90qMjY/aHxaS MQ+k30TXRUgyfOb9xTvjiy6t5A9PlzQR4uU1e8NSI9nKZcKurGCwS+vvftnKjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726803123; a=rsa-sha256; cv=none; b=jpRdLM5oDZBiwwesnJpfBajy4dpg2g69XP25EE3nbsa7b+C/tvqLgv46qGETNclmZ2eicl I8KKVrjHcSuo0FLdvyPdFPownXiCBkY7r0EU3VghGKfcNlW8vmGwv6qyar2RIAuelFYSTj Dp0NNr7a/qe94DdF0rNu+JAhXc6Wg/SVidW9YolGMNeTpyu7aCvAgSrqKQvXc+eECdsIbL AEJRK6SMN7EAHIq69/KD0hndl6+AQjZFOW0PtWyjUf92Anbboj2wwjGxQ4YQS7p2tNF9bF lx4BOX5iwmjj9/zamf3DymTi6r9T43nKAHrcXxF8STtJ3Py1N6XdcrOt+02dFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726803123; 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=te+jYGQkURTOvZZL1WyykuIKfiuoqDoCs5uT3o44QMs=; b=rlT9Poyk/bGJubz4krHnFaUtTVCrUIw6N8goqUh5sZtUBKaQg9pJL6GYoVZ/6qZ/oOT9d8 DEhkeDID9YdceHB6SriNY63GvUJbaGEshKG5Ew8A8+DGVZWhKN32SacjlT8SDaq4Cidven ThvTOfFcyVvf3DsbU2YC+IqsE8wYO48f/ErQ6GwuTTyNrtOTibQ8rw0BdpCUIKG77R2K1y 0puNDgetI7S/CzfpvqLutbzqUEBt3BntyBu6hj9ym7MRrzUIYCvXmX7DP03hifYDdX43I6 EWnFoxst9cIV4DZS4kD05sFQAQbJwFczYNM2Fht7a8ROOsEL2UWTEIf6bojjmQ== 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 4X8ycM4bCzzYVd; Fri, 20 Sep 2024 03:32:03 +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 48K3W3hW081218; Fri, 20 Sep 2024 03:32:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48K3W33B081215; Fri, 20 Sep 2024 03:32:03 GMT (envelope-from git) Date: Fri, 20 Sep 2024 03:32:03 GMT Message-Id: <202409200332.48K3W33B081215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: cc9944183187 - main - ixgbe: improve Atom C3000 SWFW semaphore acq List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cc9944183187308a71489651b11342d293aac7d1 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=cc9944183187308a71489651b11342d293aac7d1 commit cc9944183187308a71489651b11342d293aac7d1 Author: Barbara Skobiej AuthorDate: 2024-09-20 03:29:36 +0000 Commit: Kevin Bowling CommitDate: 2024-09-20 03:31:18 +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) MFC after: 1 week --- 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;