From nobody Thu Jun 30 16:15:31 2022 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 314FC8A3AA0; Thu, 30 Jun 2022 16:15:32 +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 4LYk2X0T2Xz3QQF; Thu, 30 Jun 2022 16:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605732; 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=a/rFAFubtyK2YK80ksCsPSvM2jUNvAc1BejxI/7w714=; b=FFtz5qP3b35j0h/mo7zaR7m/71AdECUjsOP5NhYLY3DvcPu6GM741sqJK0hPYekMypEg/O cNtVb8FiKoq6rdkN55p7lG041QgYl1BfuhhTdypOcbIUJPWdZntEZissLjxE+cXMaqzE3k m0AYSeIhziinJpeskmHAnc/guunbP4xW/Vytc62bPVTqK0EN3x9cbriHkf9Mc3xkUppQa+ HUjAKjlbTsuZCqL5oieOxOeRie5gx30xMjEQExVVmQI61zGsaexrCDzuIwBxyDj9A+UcmF QhjXfaJN+Ckd2pw5dNdCM+u73VzOd7GvQ8Rq+SyPWlXVcJYz/Y7EIxjFC5DsTg== 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 DF77214ED; Thu, 30 Jun 2022 16:15:31 +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 25UGFVr0014721; Thu, 30 Jun 2022 16:15:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UGFV46014720; Thu, 30 Jun 2022 16:15:31 GMT (envelope-from git) Date: Thu, 30 Jun 2022 16:15:31 GMT Message-Id: <202206301615.25UGFV46014720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: d209ffee155d - main - ena: Move reset completion logging to the reset function 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d209ffee155dd5e505f174a356c8f50c96ebf57e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656605732; 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=a/rFAFubtyK2YK80ksCsPSvM2jUNvAc1BejxI/7w714=; b=EHr32jTK5Dp/2kldaSjUtXS1NOUsT0rUCiETw9ji/8C8MjryjJyvnyxLOBcCyXtMJ858ZG 7FrtUgAm4IgqZCBp5L78g88QHewK+Umy7NNsuH95eVmm1nCuZAT5diK0iVRrMlywOVEg8B xGFWmyrDB/59yok5bP1mPejPWjl0FPPG0jw5Hyx2rRCeD1Xo4YhqsY1KrygZkwRFSkvZcT hCPoWBbQiTebrTLIrKeyogfbHsNk/Y4Q25XBxT7GY6htNYg6JvlL6HpMdYkkwXdjCu/2FM HJ6EqhVxWshWUa2xChnYr+FJGMDveGhBW2W6Hi3SWQ6MaN0vgGqKO4F9Is6+2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656605732; a=rsa-sha256; cv=none; b=bwDjkq9HLmfBpXIoRM4EAAPMNOgWxeS+5xPoNTJE7Sm+Cdut/ovZI1Isdota34vdk2DEPx vWvlMQ9zC86WffHk5j12rCcNhcsWj5pVovH+d/7xyz25+HZ6xcocrsvFVTqSdqq7cW2a/f poQO74IbQsk+5C6BJtEOhv9wHxpZNNcRopV7fBjsLKzClmxEaAwsZEQlo9OTepgpjBf1BK j1kEI6GGj3x8c1XO7aPW4Dsm9HknISjexSOWmcJREolWu4AoYK8pIx9XItmpUT3S2/aGgf Wzh9dQqghkC7YeLb26zo+fPw5vLrCJUea0t52RwR6tYtuDDQ35Tmc2J8txzptg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=d209ffee155dd5e505f174a356c8f50c96ebf57e commit d209ffee155dd5e505f174a356c8f50c96ebf57e Author: Dawid Gorecki AuthorDate: 2022-06-10 09:17:53 +0000 Commit: Marcin Wojtas CommitDate: 2022-06-30 15:31:23 +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. --- 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 61a5ff95262c..4527d2e2f298 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(); }