From nobody Wed Aug 06 06:04:56 2025 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 4bxfs53NxXz64F9Y; Wed, 06 Aug 2025 06:04:57 +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 4bxfs44qjyz3vk6; Wed, 06 Aug 2025 06:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754460296; 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=U8IhG0iNLNrkfsaCs1VlhGErD+yunbBtex8zgJcVjs8=; b=R6S9NC+iUUNi/XIiY0V7Y/E8XFtstq3QBjc7RukRQIN3qRk4Bnrhe89wcWMgw6HXPH0DZH rKWkfm47ap4mAeDviWVsdULp/Q/ifhcsJt927qe4Q+b/Xy2+p0XAVeLHiz/CtbBq4iX4Fg NIz7Vg2V4T/uqcjpn3GP0WA6rLyJTg8vFDgfJdchCriuvKELKUmwmWna5+GnydCELUK1ho ZtszAk3yK5nMVoABBgMCiGJpmd1kGjSTwUptGGTvNal3dy+ZjMtp101e4lEP4CiPm3QoDq 9rzIH6sTvnaBX/SjjVQ69aptJkgJBOq+l3d6qxq/27sbB19tFUJR94MKq9Z8SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754460296; 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=U8IhG0iNLNrkfsaCs1VlhGErD+yunbBtex8zgJcVjs8=; b=genZuBBW5MrmWf1fUAhaS/Iz7x79MCFOWyKIvarK8k/VQNWRGonBomtGM7axGyTQDEdQqV f+hEcfmOQtrT/5uZSoo+/zC2/+O8TxqO2NYPrBsayOtnuR0RoRF58+K6G9DgAMLqHM0aLK yVejafP1TkQAnZgGKIb+NckWSjborNyL8LMRHfIaJpeacE2bKdmIZ6etAWZgI55mN2tSK7 FgDGHa3SkDsLQjebCMd0xkb/e59XlFZnV/1DQGx1Xnlc4CSB4YWiO457A60VKcCbJjAXPg ZRXPPULgyMbS94OhBeE3R50Zjgfs6rYYLJurOhTirZItF4oi/opOM4/oBS/eqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754460296; a=rsa-sha256; cv=none; b=vNzCLyFlp8l+Uuvt7vRFYWAmZByqWsZRj2WY3rwn83ayBtK2Fi/qoyFmJdkb/9cNtunc+X u0vTd1/N2wtNqNpIfUcKmtUstUcKV5eTH5z3Qr+uG4TNEua6175uxzRrWcTaileIXFI42N 0HeuAMFcKeOZr2+qJRgzlIcKKFOngyTeOVVuKSEr8GbSxYTIPYapY/aX4cEocKAK8xjxqL RI8BqKFlrCvL9FcTcRpdNVvqJXF3DEXYD5K7lnRFN4JEJDyiQgINHOPsF6/rSFmHuM6UED yuJ6uDMm5/9rGjqHXQ0n2/RUx7DOOoFo81xJK7foXiPM0ru4FX5bwQoHTZzc0Q== 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 4bxfs4474Lz17KK; Wed, 06 Aug 2025 06:04:56 +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 57664ueN077730; Wed, 6 Aug 2025 06:04:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57664uXI077727; Wed, 6 Aug 2025 06:04:56 GMT (envelope-from git) Date: Wed, 6 Aug 2025 06:04:56 GMT Message-Id: <202508060604.57664uXI077727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: aadc10e7ce1a - stable/13 - cam_fill_mmcio: initialize cmd.error sub-field 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: aadc10e7ce1a8bb47cd628a2111b71fac3684915 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=aadc10e7ce1a8bb47cd628a2111b71fac3684915 commit aadc10e7ce1a8bb47cd628a2111b71fac3684915 Author: Andriy Gapon AuthorDate: 2025-06-23 21:30:23 +0000 Commit: Andriy Gapon CommitDate: 2025-08-06 06:04:36 +0000 cam_fill_mmcio: initialize cmd.error sub-field For me, this fixes a problem with using eMMC storage in MMCCAM configuration with dwmmc driver (on Rock64). The problem appeared after commit 07da3bb5d56c85 "mmc: support for SPI bus type". The problem was caused by the said commit changing the layout of struct mmc_ios which is embedded into struct ccb_trans_settings_mmc with the latter being embedded into struct ccb_trans_settings, a member of union ccb. The layout mattered for two reasons: 1. dwmmc sets cmd.error only in case of an error; 2. mmc_da's sdda_start_init uses the same ccb for different transaction types without explicitly clearing the object between transactions. As a result, cmd.error could start out with a non-zero value and dwmmc would keep that value which would then be interpreted as a failure. Such a failure happened in mmc_set_timing resulting in incorrect timing settings and subsequent complete failure to communicate with the eMMC module. Reviewed by: pkelsey (cherry picked from commit 10db2ad8614adc544292856c693503ca8e9c9fd9) --- sys/cam/cam_ccb.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index cccebbfeb199..9a3cc5fcbbb1 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -1480,6 +1480,7 @@ cam_fill_mmcio(struct ccb_mmcio *mmcio, uint32_t retries, mmcio->cmd.opcode = mmc_opcode; mmcio->cmd.arg = mmc_arg; mmcio->cmd.flags = mmc_flags; + mmcio->cmd.error = 0; mmcio->stop.opcode = 0; mmcio->stop.arg = 0; mmcio->stop.flags = 0;