From nobody Tue Aug 5 16:29:11 2025 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 4bxJlq3zBqz63QnQ; Tue, 05 Aug 2025 16:29:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxJlq3HNtz3WkR; Tue, 05 Aug 2025 16:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754411351; 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=NCEA/dfXVVGt4yA2Pl+fGVZpIT7v4H7nWZakq0/lyjA=; b=RlK+l/tj3XeyQGxruJNDetwiYetOs6uH08X0siCTJevRgj/l2A2PJrmeToPK6WKa4cU2Ng foXrBDPSS5q3IGDMgvX/UYvBvJoaJuAUAm5aKcx1AuMAhFIoDcRuPUjkU43lPtmfDA4feI 7IxjuMM6HI33VF/KZMYhqLG996ZgNeBlZjLQlmvhT4VPCzxSTvhgLwL/I4XJE0hg/gp8fN 5+Lek6CVYGbLc7rWzgBy3UNJhAFWJMTP0ietL8pFIq0n6qNS1DnDGD4og7LH4DVEEj9cCc dqBP1qDtodCxK8L9FwvrGtGhejcFNu0ilIY+UJyvOOUipgZM94DkKcBNvFN0gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754411351; 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=NCEA/dfXVVGt4yA2Pl+fGVZpIT7v4H7nWZakq0/lyjA=; b=DiKvaptZx4gQnG37oSvKJo8/R5QpyiFBhWrQUG4TSKchCCulEi+0JoX86Tsk6DPW4Rj8tQ rROTh3luDFwsfy8ivTnXUONUl+EVh9OMnyl50GtVrmrLXI1FihgnNTThNtZ9uKdaLmUIMd sXR0YWz7qjXLV/0wsRiiylnuiHq8qLVD2icBFWmCh4FqTvkoHtuJ25SvnDS+bM7tQaQ40r PqCqOhl26Y1hVdIBxQhMjsi1+qU3fAzxOIpx3YK6Jv/fbLbGayypVAEyqQXFCNg+CX1Lpb zVhVPjp6+fKh22mcjoTlOxHjnuPks0Dttib1pdU6VKo6vdhVcDeugO9Z/ndouQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754411351; a=rsa-sha256; cv=none; b=l1LDw9MhDj8mhePIgWFOdRKd/7a3OqrteTfY9NJV+F7+2boQ/8I0RuZSvW9SffdwqFtcVy rNPgd+X/7DLqZwED5XF7+oFQCzfwwaK8+ATGr7rOQh8XV917LdkrBXNJG2wsg0cg7eld6Z ks9aVi3mSDRMeilkdbhredEPX+cJtzejtscGYYGNuio8n7OgIwt2s+XXK6M+Y2bA5Aswge ddhYCsZVDod+ZnYrO7mBv3P/DjsyEa6HrfS8ljI4yG3++fZblZagVjSdlECSf5Vz4XmdG6 M4k7o3xqp94rZ4Z4CC1k8qbzMZu7VO1sJeqnI1p9IsvaTdWwf7u6okic4MnQyw== 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 4bxJlq2GT3zjh7; Tue, 05 Aug 2025 16:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 575GTB40035921; Tue, 5 Aug 2025 16:29:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 575GTBYK035918; Tue, 5 Aug 2025 16:29:11 GMT (envelope-from git) Date: Tue, 5 Aug 2025 16:29:11 GMT Message-Id: <202508051629.575GTBYK035918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 6eb503116e88 - main - sdio: don't use CAM_PRIORITY_NONE for queued CCB-s 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6eb503116e88cc430c2c9f01f48aa979fb0a7e1b Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=6eb503116e88cc430c2c9f01f48aa979fb0a7e1b commit 6eb503116e88cc430c2c9f01f48aa979fb0a7e1b Author: Andriy Gapon AuthorDate: 2025-08-05 14:40:21 +0000 Commit: Andriy Gapon CommitDate: 2025-08-05 16:27:12 +0000 sdio: don't use CAM_PRIORITY_NONE for queued CCB-s This is similar to changes done in other CAM drivers and fixes a panic because of a sanity check added in b4b166b8c46b. While here, remove unneeded ccb setup in sdiobdiscover. It's possible that ccb allocation in that function is not needed as well, but I wasn't sure about that. MFC after: 1 week --- sys/dev/sdio/sdiob.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/sdio/sdiob.c b/sys/dev/sdio/sdiob.c index 4ec2058fa2e4..cb2cc0da6b77 100644 --- a/sys/dev/sdio/sdiob.c +++ b/sys/dev/sdio/sdiob.c @@ -150,7 +150,7 @@ sdiob_rw_direct_sc(struct sdiob_softc *sc, uint8_t fn, uint32_t addr, bool wr, sc->ccb = xpt_alloc_ccb(); else memset(sc->ccb, 0, sizeof(*sc->ccb)); - xpt_setup_ccb(&sc->ccb->ccb_h, sc->periph->path, CAM_PRIORITY_NONE); + xpt_setup_ccb(&sc->ccb->ccb_h, sc->periph->path, CAM_PRIORITY_NORMAL); CAM_DEBUG(sc->ccb->ccb_h.path, CAM_DEBUG_TRACE, ("%s(fn=%d, addr=%#02x, wr=%d, *val=%#02x)\n", __func__, fn, addr, wr, *val)); @@ -250,7 +250,7 @@ sdiob_rw_extended_cam(struct sdiob_softc *sc, uint8_t fn, uint32_t addr, sc->ccb = xpt_alloc_ccb(); else memset(sc->ccb, 0, sizeof(*sc->ccb)); - xpt_setup_ccb(&sc->ccb->ccb_h, sc->periph->path, CAM_PRIORITY_NONE); + xpt_setup_ccb(&sc->ccb->ccb_h, sc->periph->path, CAM_PRIORITY_NORMAL); CAM_DEBUG(sc->ccb->ccb_h.path, CAM_DEBUG_TRACE, ("%s(fn=%d addr=%#0x wr=%d b_count=%u blksz=%u buf=%p incr=%d)\n", __func__, fn, addr, wr, b_count, blksz, buffer, incaddr)); @@ -977,9 +977,6 @@ sdiobdiscover(void *context, int pending) if (sc->ccb == NULL) sc->ccb = xpt_alloc_ccb(); - else - memset(sc->ccb, 0, sizeof(*sc->ccb)); - xpt_setup_ccb(&sc->ccb->ccb_h, periph->path, CAM_PRIORITY_NONE); /* * Read CCCR and FBR of each function, get manufacturer and device IDs,