From nobody Fri Jun 27 07:21:46 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 4bT6SC29fvz60PLX; Fri, 27 Jun 2025 07:21:47 +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 4bT6SB6L4Yz3qVp; Fri, 27 Jun 2025 07:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751008906; 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=bKfW0WURftCAWhkbahGuD2EhFHjhNAB1KhO/zXeObw8=; b=h+15KHHmKWPIBWkCB6bNphw5DSLZsA5aXMDk3ycM2lKabAe/vQmcgX7of2kt+4JgTRMJzm //S4d67achZnoAO8jwFYMwomTZnC/7owXZKhpnqmprzXWE+WiO1tmxpMLadGrbb9jEyZSx kPe1H8EA/Lp7v3xxTm5MbHiYc/VS2owgJTniXYCndAbKTQ1WJTC8F6Y9qrP6rprVmX1r+o bw4TZycYxavvVpwywVDEVTWel/csXpcHiAKqONn1V/YwIZa/569gpSkCgVs2xJNggcCk4x Gf+2UxIBgU7cWNXBCvwhp/UgoPU/Kr2X1f16ZXafVda3UCdqIA4t0vCpOwvD6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751008906; 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=bKfW0WURftCAWhkbahGuD2EhFHjhNAB1KhO/zXeObw8=; b=tWWnU5gnKKotYU7QLLw7b3gK1kQOtyQSAzIfBiW9PIpAon2YPc8bZRSsInz0911W7Ij9ts lftmWjjpIPTNdUVVjUhB7sIpKMR6mZ1HDNAsZ8ST8P68qUFW4PpKlWLe3jn+UQl4oMADsd xHRgK3eAlW6B1JMjrH1YrP/sYm10cZ+4crNKTwnkZFS7cynt0PWxxlj3Ew4Dyh56o+CE+u ROZG0HT1qnX1zk1BKCN0ZYqOcXeD1z5cICjipAteVyfD2mGh1YNz6Oe8vFhD+FfGlgfmOc u8dtrUVZ3KyXs4IC5hk9cNKM6Ps5DgvL2Tk9JDfRrAB+G+PLQL6anAp7dz1Gpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751008906; a=rsa-sha256; cv=none; b=dQDTUZwja3vZUcNKtNwpyrBQnYphu7ZSJmXyTdNRpNzsT+MzfoPIwWIJKVsadkJ4uYPNyn A9MtXrVZel+3A3qJpOKzctNHfNJpQtnosjTekD12/tgJT7mCbpEGmTMD1ozD1Th/Nos0t7 ue6RSudFhZcoU1Sl7MaKr3d7b/kv/IvP6zOtnw7FdBLty8f02Kh9hHEEoKphaIt+bupuav bQhd4q4GSiUzxVD7tjojXNWM9FQHQhKf24ca2T676qjOQZL/DNV0TpbKp1y8yhKOTz4fgs 7y+UfSdJGhfUC8RUhDVbXonInN5Qr7BRBHc1vPgfrQARcx8QG61Xi2fE/OHZ/Q== 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 4bT6SB5wDPzfr4; Fri, 27 Jun 2025 07:21:46 +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 55R7LksT067191; Fri, 27 Jun 2025 07:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55R7Lkx3067188; Fri, 27 Jun 2025 07:21:46 GMT (envelope-from git) Date: Fri, 27 Jun 2025 07:21:46 GMT Message-Id: <202506270721.55R7Lkx3067188@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: 10db2ad8614a - main - cam_fill_mmcio: initialize cmd.error sub-field 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: 10db2ad8614adc544292856c693503ca8e9c9fd9 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=10db2ad8614adc544292856c693503ca8e9c9fd9 commit 10db2ad8614adc544292856c693503ca8e9c9fd9 Author: Andriy Gapon AuthorDate: 2025-06-23 21:30:23 +0000 Commit: Andriy Gapon CommitDate: 2025-06-27 07:12:40 +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 MFC after: 2 weeks --- 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 da98b98ba7d1..1f110686a658 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -1524,6 +1524,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;