Date: Tue, 26 Jul 2022 19:30:49 GMT From: Marcin Wojtas <mw@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 963a1b06d9b7 - stable/13 - ena: Move reset completion logging to the reset function Message-ID: <202207261930.26QJUnbG029059@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=963a1b06d9b758c75a62b1e3f20723548572dc50 commit 963a1b06d9b758c75a62b1e3f20723548572dc50 Author: Dawid Gorecki <dgr@semihalf.com> AuthorDate: 2022-06-10 09:17:53 +0000 Commit: Marcin Wojtas <mw@FreeBSD.org> 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(); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207261930.26QJUnbG029059>