From nobody Tue Jul 26 19:30:49 2022 X-Original-To: dev-commits-src-branches@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 4Lsn7s6QNMz4Wwc2; Tue, 26 Jul 2022 19:30:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lsn7s5nF0z42NK; Tue, 26 Jul 2022 19:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863849; 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=Rr/ARrgas6PMZIpG5pkWpJM2tzdjiXFFZzosHH/9pEo=; b=XS+lwQMfjy12HuIrZdt8QaGSvgMe3kfgrxuAbIURWGb4zZsdHXYaWoDp8/gF60vcafazBs uSFE9eFHL2NIpX6BnZX4BMa+YO9UwKroWWQOzMhsl+T+bWXqopbrYbye5imcd9yfyWrbPE n3mjgd7iXuL+UVmugJBvBDtlBu3BfjH4HfFyO9wT5p99dkYiNPZEpmv76qYJ2Q7pY+Mxbp 4KRRKR1HYqY8XCrDWhbZv1r1I3E+WSW6jQDG0JCCwIBchiCQKFOiDcjjnJt6lVTPHYZ8z4 1Kv4HIx/GzHCGwlIInBC6Za4DyMKrjYUnE0N4v9NGKZ7wSliNSpWbOCv/ns/jA== 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 4Lsn7s4nBKzpGW; Tue, 26 Jul 2022 19:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26QJUn0X029072; Tue, 26 Jul 2022 19:30:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QJUnbG029059; Tue, 26 Jul 2022 19:30:49 GMT (envelope-from git) Date: Tue, 26 Jul 2022 19:30:49 GMT Message-Id: <202207261930.26QJUnbG029059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: 963a1b06d9b7 - stable/13 - ena: Move reset completion logging to the reset function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 963a1b06d9b758c75a62b1e3f20723548572dc50 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863849; 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=Rr/ARrgas6PMZIpG5pkWpJM2tzdjiXFFZzosHH/9pEo=; b=TyO5bOBaier5ODIJwofa3TT3BpQcm49o1rUNS3UGptg2UlUZRgivjNV87DDaO+wmEyov/8 6LQ0LlsDtHEDg/sYrJo/HhG96zMGooBYj+hQXlhgtRalrILgkqwWoX49w269NJX2du52xt sP6YBS3Qa1eqSkkaFMl8yb+owJQFITjEu0v+i4ghB+aFgIatKdMSD+HCn0ZNwu3ip91bQO N30beJjTo7OxyezrgyaXzhNM/Z2AxSIE3g3VsuhO2O5l0gLBgwDkjuM9YVbZ67jydL8xWu h9R/EN4Njyr3nbORK0v4FOhxiAsghS6yGjVlRA3hQY7Z1ZSlLKRVWiQsobumlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658863849; a=rsa-sha256; cv=none; b=qCgfc0xfgMu1uf4RYooadZmfVZjgqxAqmaZE6RnGAVXo8PDBw9t2d8zRXWcML2llgt3uNE fZvDtntmbOoy1jW743EGiLk0FmY19N4IBerYMJrfDc2nb3WIg/SEWPpUKdpeCcsvPJ1Oh3 lEtZ+vX2Wg1oIaSYzzBM34PM8fDHdgTrAqMnRP4Pp92QgihXQohwJsrNz2r8EaJi/FvVJU Lcj1/BGZEX2dQ+6z8c8gM85ComFiRrwTh6O5MPm73zBw0dwrMjjTYFm14L4Dkad0BocC+/ XDqoTSoqD3yJQAk03T2m1gBD3llnldlm9TpIN4H/ed5KiIX5ePkLR5ML0mQ1eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=963a1b06d9b758c75a62b1e3f20723548572dc50 commit 963a1b06d9b758c75a62b1e3f20723548572dc50 Author: Dawid Gorecki AuthorDate: 2022-06-10 09:17:53 +0000 Commit: Marcin Wojtas CommitDate: 2022-07-26 19:30:14 +0000 ena: Move reset completion logging to the reset function While ena_restore_device is called from the reset task, it can also be called from other locations in the driver, for example in netmap specific code. Move the reset completion logging to reset task, so it better represents when the reset actually happened. Obtained from: Semihalf MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit d209ffee155dd5e505f174a356c8f50c96ebf57e) --- sys/dev/ena/ena.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 36aa2802a05f..3e0b7e7a2339 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3455,9 +3455,6 @@ ena_restore_device(struct ena_adapter *adapter) ENA_FLAG_CLEAR_ATOMIC(ENA_FLAG_DEV_UP_BEFORE_RESET, adapter); - ena_log(dev, INFO, - "Device reset completed successfully, Driver info: %s\n", ena_version); - return (rc); err_disable_msix: @@ -3488,6 +3485,10 @@ ena_reset_task(void *arg, int pending) if (likely(ENA_FLAG_ISSET(ENA_FLAG_TRIGGER_RESET, adapter))) { ena_destroy_device(adapter, false); ena_restore_device(adapter); + + ena_log(adapter->pdev, INFO, + "Device reset completed successfully, Driver info: %s\n", + ena_version); } ENA_LOCK_UNLOCK(); }