From nobody Wed Aug 6 06:02:27 2025 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 4bxfpD2rccz64DnK; Wed, 06 Aug 2025 06:02:28 +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 4bxfpC6kGHz3tVK; Wed, 06 Aug 2025 06:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754460148; 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=vnHlmzdhMuKFdu3lKAow+EPEg4ljDRF07KaUr/zWa2o=; b=VTE1NIgXIDmE17dQ2uAy8dZEdSqoNg2g8KqAjFVkfDWlq7xJrSsJaRDM5CGSAtRvhh7JrE Bbqz/J22PEC4vzVsE3Cx/6rUkhVuwbWmtck4jvIapl5RLTgOTGHBWS+ibul1VUeI19fTJG UJa9HVyAwFFZNBl5uZcPa2YsWHmqDI22/zcLmdjKngQInfQwcQl8JTG4q6oGnQ42TMV9gB Ot+jUybPuFdBDENP44lDxUPQZALlzzr3bUI9niHRzeRLGOmP3hbYI+sLzUo1rbiSXAGaSy 4Ivh7rNxwDtZapeU4x6nQ9mVQJn78msg9SZYDHASGBrbKsEGIwKNpbYqG8aFGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754460148; 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=vnHlmzdhMuKFdu3lKAow+EPEg4ljDRF07KaUr/zWa2o=; b=b0yHOi11QdNIwvSpjf1yznu3STnCioZF7F4s3uykGyy1sz3S2LnJPO5mpLTnrXIBrINvNX g0alygsbRNDWtV8uZ0QELGbjcH8HMH7FlRuW6/C7u0pqEWxtqrHx1t49qjx4HiVfPuu5Ov SBBPGPlXPs6KegzCSHLs09VvoOalLZXxfUllKL1HmjTKX8rp+nrz4C1vK/Fr5C8R8SYRmQ 133YqBNyzcnGaeDOnb91k1S5IMI/krvgLsFci1NusBHsmlke64xMOHEZLP7ds9cS+g3olF uSWMqYsG3AjDPNVor+rN+lA0Pl5/aD1HZH1ZJbzy6dGcFR/sk5t6ilBgyKkW/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754460148; a=rsa-sha256; cv=none; b=euyJ2DxV+4Qo0KYTjn9lcVxePOh2SsgXu2lyWw41bvr0iuaZc8hNmMf/kkJK6NzHCPe6MO jGG6mp49aH/RADIRV/8yDUUdruE1dWxj0XWT97y0w6D25IDylEZc0hjo0QxQcWR28AjlEQ aoMyp3CktLjCUxIXY+Sk2WNsy+FKTblNjACr8YsZDxt/LslwhgodJgslFFkZpM1I6bofn4 FEh55cVWX1KAbiYBIdODvSOdXhcTMaJPCzjVJDHPGxGHcQ7cQ4PGE5nrfCjLdg+Ryv5yMd 669MdyI0oFEELTH7pjjNjvGlTD/IzaIkBpnvIjVP9GDWxqtvH/U8SE8N0dN12g== 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 4bxfpC6Khdz17KJ; Wed, 06 Aug 2025 06:02:27 +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 57662RJG076738; Wed, 6 Aug 2025 06:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57662Rn4076735; Wed, 6 Aug 2025 06:02:27 GMT (envelope-from git) Date: Wed, 6 Aug 2025 06:02:27 GMT Message-Id: <202508060602.57662Rn4076735@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: 48bd13dbf900 - stable/14 - cam_fill_mmcio: initialize cmd.error sub-field 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 48bd13dbf90022b0266d419d465160ffb01b8040 Auto-Submitted: auto-generated The branch stable/14 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=48bd13dbf90022b0266d419d465160ffb01b8040 commit 48bd13dbf90022b0266d419d465160ffb01b8040 Author: Andriy Gapon AuthorDate: 2025-06-23 21:30:23 +0000 Commit: Andriy Gapon CommitDate: 2025-08-06 06:00:39 +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 47fb3d09664d..a86e83cfd063 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -1488,6 +1488,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;