From nobody Tue Dec 20 01:54:16 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 4Nbfkw3hwcz1GkmL; Tue, 20 Dec 2022 01:54:16 +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 4Nbfkw37Ggz3xjX; Tue, 20 Dec 2022 01:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671501256; 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=Ejh5fdH7AKtd6MgvgTxc8PvLY6xbHDUKvKzyFeSnktQ=; b=nkWPxx52NqoYfBvVHXlZLhzjxy8E7OMcEWE+Yobq3pgZTI7gx6QdeJwZ7T5tmDAeG2mtC7 8CD9sRyYjLyUngN9hB8gYavplEXacSbVQYJ+xEuoJeLyudQwgzxqTgWaZJpsaeek1zTxX1 HPUmOks+E56UiPHcPdyMcAZOhcu+OfDWEDsoiZpH7nfWP5RfkctNtdyZjr5cT3RSOBIqq6 369I9UcDK3RGwgaEh+JoF7Zh6yj/Tf/wjr9e2kPzRWPbov1gtsyPYoQVdSgnWOPY7QuwVt ekJgXBTSJzhh2hP6Xht9ptTgDDpj+3Yk+prY1CEFZYsbEllA6GNUAI412hkMnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671501256; 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=Ejh5fdH7AKtd6MgvgTxc8PvLY6xbHDUKvKzyFeSnktQ=; b=A9eRPf+SRJJgEQZy10dN5IvZDHIfHGIOIoezwkiElOgi6+KVyc+eED2ah81Mpo0gaeKnOL bUFNPUq4P+wXZK85vTryudChRG5ixTRYbHKTM2uDcZipcevTXHam5qTxvWAOfaM60mPZ68 z10kiZc099UJ5iQuBv26cgDzrTgEVsTUb6811u7erR5dhn35bQWuDOc0092UFtFkcPsXpr uPY7fV6XRg06Szq68CBnHpvyVMLEbcZ7Hic8dBtuRulgnWzHgfRub/nkkd32jYtQhFs/WE P9NH7HCoX1zmtuKRQGv0jeEq6E9awkXMdiZwvX2COgLw+qjqgqhj7hap6YDXtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671501256; a=rsa-sha256; cv=none; b=u52cksuq5nnk+or1TFHMXG96rr+WFNhzRkp8zvG/q+Sm9J10CQ+jBXdAi5JTfMHrsU0I9z 10OrvRc7AMHXHKvMy1kbOU1MHenLsCobd8l69B+VnTOO78JAopcLz/fTNLpDb+m/yR5/jS 3munIqOtCUT0NBE59zdJLgklHAfEWH1gtxSC0DK1sPP8D5Sb24lpaNI5+X6NycXCIw5An+ O0KamHCaIBiHbXgm6nuwC/qa+h6HArCB8ato2EWcDuqAh1iWy+CiDz/hzarAImm0g9Xbr8 +Rh+bsyvPM/TXcaGCpVRqcZkvdudXeisoFifuOs5kQzcLubaN1TObV+P5agbiw== 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 4Nbfkw27k3zJ6p; Tue, 20 Dec 2022 01:54:16 +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 2BK1sGNd072182; Tue, 20 Dec 2022 01:54:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BK1sGbw072181; Tue, 20 Dec 2022 01:54:16 GMT (envelope-from git) Date: Tue, 20 Dec 2022 01:54:16 GMT Message-Id: <202212200154.2BK1sGbw072181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 9a5acf365db3 - main - nvme: Clear the notify flag if the consumer rejects the controller. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a5acf365db3b94338220bd354041727dffcb77c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9a5acf365db3b94338220bd354041727dffcb77c commit 9a5acf365db3b94338220bd354041727dffcb77c Author: Dag-Erling Smørgrav AuthorDate: 2022-12-20 01:50:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-12-20 01:53:38 +0000 nvme: Clear the notify flag if the consumer rejects the controller. While here, fix some type mismatch warnings. Reviewed by: imp Sponsored by: Netapp, Inc. Sponsored by: Klara, Inc. MFC after: 1 week --- sys/dev/nvme/nvme.c | 4 +++- sys/dev/nvme/nvme.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c index fc491eb72f1c..b75d558a36d5 100644 --- a/sys/dev/nvme/nvme.c +++ b/sys/dev/nvme/nvme.c @@ -177,8 +177,10 @@ nvme_notify(struct nvme_consumer *cons, ctrlr->cons_cookie[cons->id] = ctrlr_cookie; /* ctrlr_fn has failed. Nothing to notify here any more. */ - if (ctrlr_cookie == NULL) + if (ctrlr_cookie == NULL) { + (void)atomic_cmpset_32(&ctrlr->notification_sent, 1, 0); return; + } if (ctrlr->is_failed) { ctrlr->cons_cookie[cons->id] = NULL; diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index ccc980a7c6ec..196d6f0b35c2 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -2052,7 +2052,7 @@ void nvme_resv_status_swapbytes(struct nvme_resv_status *s __unused, size_t size __unused) { #if _BYTE_ORDER != _LITTLE_ENDIAN - u_int i, n; + size_t i, n; s->gen = le32toh(s->gen); n = (s->regctl[1] << 8) | s->regctl[0]; @@ -2070,7 +2070,7 @@ void nvme_resv_status_ext_swapbytes(struct nvme_resv_status_ext *s __unused, size_t size __unused) { #if _BYTE_ORDER != _LITTLE_ENDIAN - u_int i, n; + size_t i, n; s->gen = le32toh(s->gen); n = (s->regctl[1] << 8) | s->regctl[0];