From nobody Tue Jul 26 19:33:20 2022 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 4LsnBm6llQz4WxW9; Tue, 26 Jul 2022 19:33:20 +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 4LsnBm6G55z47N1; Tue, 26 Jul 2022 19:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658864000; 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=iXhQfxFIghdT2Ggn8KwaUKSLUKHdui4o/NB72TcvdCE=; b=xIUv1SSLTs96/sWDmSWkhUA0vHIqVZSGd+nlVU7K1B5+w+Bk4B/gqawuA0vw366vowQA/F p9uUJbqXni8XhmfAofqWz4vNmXOawt4aTP+ddqnixJbYJMAwZi2cO0PVeo6PkeI6iSIPY0 wPVmu+ubQ7AScxlG/7y5kkUbhdDuo/qiOB61757Ypc5hdVH9QFG+PB21xaZC1uLqAKRCXp 3DZlNf+cxOGJmbk37pw7gi43n4K+843fwe+JDoaPwSihm+wQfkCeLv7rp4IXYr6yRGQ8/+ e/Ovjb+UOpaJAS/FXf+LggdZxcp8lugoolmjPI3DvNiuGBLLxDnWhVjjm0xl3w== 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 4LsnBm59ghzpNS; Tue, 26 Jul 2022 19:33:20 +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 26QJXKkM033724; Tue, 26 Jul 2022 19:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QJXKGD033723; Tue, 26 Jul 2022 19:33:20 GMT (envelope-from git) Date: Tue, 26 Jul 2022 19:33:20 GMT Message-Id: <202207261933.26QJXKGD033723@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: 0ee8440d1334 - stable/12 - ena: Move reset completion logging to the reset function 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: 0ee8440d13340b7b6c2fddb9fbaabccd5fc5adc7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658864000; 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=iXhQfxFIghdT2Ggn8KwaUKSLUKHdui4o/NB72TcvdCE=; b=HSqJcazQrhBcTBPYmi4qrjHRs5SUKsljGF0v3U4n+JezKdvkkQ+MJier3smAVz1zELWuWm kV8MiIQR5ziM/z7IkQjeJhFXFMpRem9YDXKCLTVfcBYO5CdLuGv3rjvAE1oXHrnFSkl6/2 bCTXDql5T4nTJOH9usDQMlJIB7DCUWDiD3uYEDaXKS9ljwD7IIK8JR3633hNwZ2ROluClj jkRjKdyKm0SssqjWFpWl7INzMhQ09my6qJyNUH1whulZJXx28g/lSZQahCqg/bz6YlC7VS ubIKLI/UNPfmm91za6anGzis1f6pJ0mClA7dJ2+fHacmCNmRuFAdyOlpnRrsWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658864000; a=rsa-sha256; cv=none; b=M4vUzbDNySZl1vJ7r/hs2tDXF4KXonsm0DHej6pS9lwydfNa9KuBNZt9hCZNQZZbozrTss l0Sp/sJbUSl4DXtncM4zAxKI1uQif0sbFhFfsEIpA14jT/gMxZIcXqrMpk9qUktDlAItZY w6IhasVyU2XAYADe1bkDNaY92r3ey7VQar22Okc4hQ4Dpi+TmJVWYMxm/fXq2pghnb0I/a 1dxEfbdHmFmj/iDPD3uIzf/TCULNgcvN9lyeX+kUz8QQJDvZljpof2wR/6thEA08lMIxtk /ORMraZpBZpy9tYJVmXJG8+5BbLKQQlv/fTuwnid056SDIv67Vg7XxhRCCBBlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee8440d13340b7b6c2fddb9fbaabccd5fc5adc7 commit 0ee8440d13340b7b6c2fddb9fbaabccd5fc5adc7 Author: Dawid Gorecki AuthorDate: 2022-06-10 09:17:53 +0000 Commit: Marcin Wojtas CommitDate: 2022-07-26 19:33:02 +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 9a54d0b41b36..e21f7bbcc2b0 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3459,9 +3459,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: @@ -3492,6 +3489,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(); }