From nobody Fri Jan 21 02:27:03 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 17DE219691BD; Fri, 21 Jan 2022 02:27:09 +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 4Jg3DV53T2z4p02; Fri, 21 Jan 2022 02:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642732027; 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=iNCN2Ns+OQGjMJ8c8i9C6lYoLAlhYxgQjJb+mFBqVbM=; b=eXBazYUAvHhQCj+FMASII0sJcRku3HtBwWBPBGDgThSrhOKZvTJ//pZqZIFkbWedADkKtg 9JFCdbkot5zopimIOVj/l3YMrPzeYXgRClD/UT+wREAdYEaw2M6hLCb8dceBOoO9Sfkz2j YXXTMzU0XNpV+LSoZwdpCGBAW/uixUViIr4ItRTVH0gIO/Qi470hZY1bh5lXR3aMh4x6Ld icyP/3cP79OKfBYQf5PLwTax/W48Is/BEUUye4FvB/O12dPoSbSFpEgCUCgI3XEDa5vX9u qSnsh/dysojk1QGOx8oRXqTquoAQrKOLoDKPDXyQ3ePRuqu8BJhmfkvIZ1X32w== 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 1174913D07; Fri, 21 Jan 2022 02:27:04 +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 20L2R3Zf001486; Fri, 21 Jan 2022 02:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20L2R3wD001485; Fri, 21 Jan 2022 02:27:03 GMT (envelope-from git) Date: Fri, 21 Jan 2022 02:27:03 GMT Message-Id: <202201210227.20L2R3wD001485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 13b711e8c829 - stable/13 - nvme: Restore hotplug warning 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 13b711e8c82953b729399d6be4f029019f548b4c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642732027; 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=iNCN2Ns+OQGjMJ8c8i9C6lYoLAlhYxgQjJb+mFBqVbM=; b=vNvUFfmW4xLmJhxfdllEBAguvggynednd8q4kW05Ua9BolQOZeIP2zhaFCY4J6qsv7u+nk lW2M6NCAXiPBAAmhGJ7rI0J4Cuy1av+/aL6oTqZRcJ7s96VyEMjWBny77Y0FhNWcWqqExd QOs4HKSZQRC2IN8kgQwAJQcMJ0iF7Pp9IA+StDfyhJnMUD5dpAIIfBMbXdjHFEwS5Ad4Q1 HJ6Z59bKRRMX2+Xnpw7CDUbFHalP8Ek18xPm+RyAg/kRy+0Dz6jyhuiqAajZ5k6Y8WV23H T8cAhEd54MYHKtQq992O8vjciLLZh1rXrHHg2fY7WALiboukJDggQ3fSZews3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642732027; a=rsa-sha256; cv=none; b=mu8AinCI7HzMMLzKpxnOOsT+13YotU5NGngn+gcm/m9u1ksKMoin8YxG/TiLyEMUh8/TPn TBGL49D3udUehQpgLAvlfJjOGXYXEc3pLZRvzl+h14151T65i+oYES6nvQBsym0wJqKRaO 91LrlQYoDeKMe5gG/HbqskwFCAjE/81ZTRWy/FLFSe86p2a5PtpNVxAEqRutFLtWKiLTca uGkh+NO0EmjU0fEX7PnvxbsczP5SoWR+kzMSRgCSWiYRGNtfLUZAWCdR3xNAHHj46mNqjw mWwhYqO2lkYG8Y9YOhlH+oEpR8KO+MJskUYkoLzJzMmTAZ+AwPk+o8oCsWxJ7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=13b711e8c82953b729399d6be4f029019f548b4c commit 13b711e8c82953b729399d6be4f029019f548b4c Author: Warner Losh AuthorDate: 2021-10-12 20:25:16 +0000 Commit: Alexander Motin CommitDate: 2022-01-21 02:07:31 +0000 nvme: Restore hotplug warning Restore hotplug warning in recovery state machine. No functional change other than what message gets printed. Sponsored by: Netflix (cherry picked from commit 18dc12bfd2e23ad2ea97db54cb8ee499f6f014da) --- sys/dev/nvme/nvme_qpair.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 8041731099df..6669eeee6613 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1010,7 +1010,8 @@ again: * controller. */ nvme_printf(ctrlr, "Resetting controller due to a timeout%s.\n", - cfs ? " and fatal error status" : ""); + (csts == 0xffffffff) ? " and possible hot unplug" : + (cfs ? " and fatal error status" : "")); nvme_printf(ctrlr, "RECOVERY_WAITING\n"); qpair->recovery_state = RECOVERY_WAITING; nvme_ctrlr_reset(ctrlr);