From nobody Wed Aug 21 19:01:10 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 4WpwfH1gKTz5ScJn; Wed, 21 Aug 2024 19:01:11 +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 4WpwfH0nY1z4sjk; Wed, 21 Aug 2024 19:01:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724266871; 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=/Gssd+9V36jpwSUOQrqL+2K3b6CRxdPf8Z9YxJ4w1Zo=; b=KYl2SSEBrYS4B8mChYkQHfm4+OZJE/fO8QcHEEcNhZrra5hO6j1q7N4NESd4fN5P+WxPDT 5nWDXm0KDpiEL6xoBuiscyKv/LtteqqDf9lcvBxHX/hj/eqQNnzSoK+7pccEQNwu1GzTv3 1W7i/HbBj+pA39Q/YK0rKXxLOlSE/OWSa9aU2sNPDvD/EVgwCMT/PIOTtqyBGm/t4E9xP4 vtlcyphEwECBxud5+vvnEgNP5SuHpz0bJ48BeikFCvwI4AHVokt8CM4uvxs+T4QCcvLGUl LeErzjuVs9B1+yC/ljt9HxwKvDxq1/l4GDBzvwIGmtYOjDVYITyrtlDUUYaOKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724266871; a=rsa-sha256; cv=none; b=HDyVmxB30oc6M5ktT7zsussFlxf11UiZ5lUX5qxH0ShhOeYxOixYD6v/gvp72X+VpDZrTX y9/trC6AMo/HWlaWel5v27445BpkswsRsrQOGib9SH6m/y+rVCzUXsUSp4R9HW8Va0vtTZ 6JCZx5hAUCE8Tk2s4kSWsA/BSTtT/JzTJuTWsj66gKP1bxuSgd5K69kuZfVf7OoTRu1+/3 NWwT6mDWFZ/piwyV0Lz2yxpIX1TT1NRw9uZHqMBUQqk6yxM3l8D23krz8hf8Hizh+VyfzY 3GIpF5+ZYAMCBigJ77Hqwo6ywmdNxL+wnOp67VbjBYata55/Kug2boPAR2/7Ag== 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=1724266871; 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=/Gssd+9V36jpwSUOQrqL+2K3b6CRxdPf8Z9YxJ4w1Zo=; b=YlmeVwb4cKFWlZ9hvG0Qddkxg48OwiywsiXqT9j8eHmCzJsD4fTO5ANwKWxZOITjB1ZAGx qm14X1mJEgGShyc/Qs7JLffigwKpAFlwiG9+nBkOilR9NACzAmB6vW6OCU/4ROi7DwOPyc m5+pB0jvvl/OHio/XGUzvyUhWJfwQD98RFeUoYAoYnmp22l7FnrGbS7AhHN9u9Wtg8X+QW C0UAQ2SqvGc9LNIqcEDKG5Dk7Wf6ZvdZuT+ndef5fcoF+XSOplHfMV1HcLIGHsUFz/C1pE v/kWcECi25EOOWSFkXYYnq0cqEV6vNVpfToSH66ykHIUNeFAOKzMDBtfz3Iuig== 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 4WpwfH065nzw3D; Wed, 21 Aug 2024 19:01:11 +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 47LJ1AjM041578; Wed, 21 Aug 2024 19:01:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47LJ1AJG041575; Wed, 21 Aug 2024 19:01:10 GMT (envelope-from git) Date: Wed, 21 Aug 2024 19:01:10 GMT Message-Id: <202408211901.47LJ1AJG041575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: d668a0b0abe4 - main - cxgbe(4): reset routine for general use. 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d668a0b0abe4b079ac2a0d9cd0d7b71bd4a043c6 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=d668a0b0abe4b079ac2a0d9cd0d7b71bd4a043c6 commit d668a0b0abe4b079ac2a0d9cd0d7b71bd4a043c6 Author: Navdeep Parhar AuthorDate: 2024-07-26 22:39:35 +0000 Commit: Navdeep Parhar CommitDate: 2024-08-21 18:47:15 +0000 cxgbe(4): reset routine for general use. Add a reset_adapter wrapper that picks the most suitable reset routine internally. Use it in the fatal error handler as well as the sysctl based reset. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 57c1eeceab22..5fedf10869d2 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -2534,6 +2534,15 @@ reset_adapter_with_pl_rst(struct adapter *sc) return (0); } +static inline int +reset_adapter(struct adapter *sc) +{ + if (vm_guest == 0) + return (reset_adapter_with_pci_bus_reset(sc)); + else + return (reset_adapter_with_pl_rst(sc)); +} + static void reset_adapter_task(void *arg, int pending) { @@ -2544,10 +2553,7 @@ reset_adapter_task(void *arg, int pending) if (pending > 1) CH_ALERT(sc, "%s: pending %d\n", __func__, pending); - if (vm_guest == 0) - rc = reset_adapter_with_pci_bus_reset(sc); - else - rc = reset_adapter_with_pl_rst(sc); + rc = reset_adapter(sc); if (rc != 0) { CH_ERR(sc, "adapter did not reset properly, rc = %d, " "flags 0x%08x -> 0x%08x, err_flags 0x%08x -> 0x%08x.\n", @@ -3650,7 +3656,7 @@ fatal_error_task(void *arg, int pending) if (t4_reset_on_fatal_err) { CH_ALERT(sc, "resetting adapter after fatal error.\n"); - rc = reset_adapter_with_pci_bus_reset(sc); + rc = reset_adapter(sc); if (rc == 0 && t4_panic_on_fatal_err) { CH_ALERT(sc, "reset was successful, " "system will NOT panic.\n");