From nobody Mon Feb 9 15:54:33 2026 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 4f8q5C0q1zz6RdB3 for ; Mon, 09 Feb 2026 15:54:39 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8q5B6dzfz3F3m for ; Mon, 09 Feb 2026 15:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770652478; 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=xNAjPdChFfEjnoWHhujA1sYa91NEzPlo7QF8PY+ZRG8=; b=YaeUv8kFGPVXGecRDEtksCJkFLbTMkh1PcFqcE8bsHxMxzDofQtwy3rGQ6bYwqF4lgcLHG ORh/V/q2TTFER0YC1hWCE8BB2xoX7JSRHCuORedlMJ4Dtns5hOoaGFjdobvT01vMClEEMx KU+gQne+gBoqsBKFAK0zUxBZDOkeL40xq1zyaHlOxxkdLh9pxV5NSgcAh5WchQfmZdxy0L p5KI9WR9c2MISEk4KlFnCJ5WlD3OB2GZICc506f3u0sbVDvN11bzFUH6SvuRUWeD3Zts0w ADxkxWXYQflm8kPKzCs5QaVgQqwduRXGYyRwXLy/CEFbNGvd3HYOg09egMwMxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770652479; a=rsa-sha256; cv=none; b=xE1p7EJPSWfSDfgf4WpU9EIANH1O2JZS6Nybgc1OckQaDcZnuqSqU2Tju0OfiH+ebLOkop C4l/sFUtJqFEhxaSWn+iRdEw66mSxthTlP9HjsV5OCxinJ3e4xLcmcMPUM7e0AX1lyYHRD fAMCVMUWhZoSA8t0bM5hVSJnR1hwogky5JAGxR4Guw0vLIxQ3Scq7OsxaMIDu16hP8xeqf j/kJ97zPeav+9F4q4xBhQ9jRFzYYqZjaXvEaZ7xAjiwca7iOn3hyD1BjxWiScS6HZk+Fyo ekEpiPvl0xw5cDpizT/BZXWDv4vf2RdKQp7Q70X53n3spOPlioxXh94iQnwHsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770652478; 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=xNAjPdChFfEjnoWHhujA1sYa91NEzPlo7QF8PY+ZRG8=; b=mBgmZ/nA8Jg4Ximm7NSKn24wqe/eCHRocPdC/hiAOmxVSOVSEZWVbLMI+6pbkhVru2n0fT Co3iNXIAtOokhWmxO+APiqG8rwvf+cIz+e0BUZQfQfW6SzznBIcmc3ghjFAM77KNclEU5s UUz6KMpiRcyKVSJCdwKtOuPK/YTRMEwb6dQY3+M7bCbhoGD2XeEeuGk0FtzE0CK8AioMMg Rdj+S/ZXyjj/+RZNl7a506141PZTflzoYQtl+yuBNZQRaveEZTrlYDubZGgxC3TTei7zlH 7aMsnU1wzAiWYlPYH/MGK7Yooo0p4TauRFfG/UferYe8j7i068uQcNyaZEPEEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8q5B5rYZzfpN for ; Mon, 09 Feb 2026 15:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18d63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 15:54:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: ec5d4664915f - main - aw_mmc: Reset card 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: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec5d4664915f51ae62daec09fa4f9765c969adab Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 15:54:33 +0000 Message-Id: <698a0339.18d63.51e281da@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=ec5d4664915f51ae62daec09fa4f9765c969adab commit ec5d4664915f51ae62daec09fa4f9765c969adab Author: Tom Jones AuthorDate: 2026-02-09 15:48:24 +0000 Commit: Tom Jones CommitDate: 2026-02-09 15:53:29 +0000 aw_mmc: Reset card On H616 (and I think H6, but this isn't verified) we need to reset the card to have a functioning device. With this commit all my pending patches for H616 are in tree. We run well on my test device (Orange Pi Zero3), however there is an uninvestigated issue with ethernet and graphics are an open question. Reviewed by: manu, adrian MFC After: 1 week Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55097 --- sys/arm/allwinner/aw_mmc.c | 8 ++++++++ sys/arm/allwinner/aw_mmc.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c index e10e98aea261..4d85c62279fc 100644 --- a/sys/arm/allwinner/aw_mmc.c +++ b/sys/arm/allwinner/aw_mmc.c @@ -117,6 +117,7 @@ static const struct aw_mmc_conf a64_emmc_conf = { static const struct aw_mmc_conf h616_mmc_conf = { .dma_xferlen = 0x10000, + .dma_desc_shift = 2, .mask_data0 = true, .can_calibrate = true, .new_timing = true, @@ -737,6 +738,13 @@ aw_mmc_reset(struct aw_mmc_softc *sc) if (timeout == 0) return (ETIMEDOUT); + /* + * Assert hardware reset and have the card move to the pre-idle state. + * This is needed on H616 to get the card into a functional state. + */ + AW_MMC_WRITE_4(sc, AW_MMC_HWRST, AW_MMC_HWRST_ASSERT); + AW_MMC_WRITE_4(sc, AW_MMC_HWRST, AW_MMC_HWRST_DEASSERT); + return (0); } diff --git a/sys/arm/allwinner/aw_mmc.h b/sys/arm/allwinner/aw_mmc.h index de15afd6de22..6974ab3bd327 100644 --- a/sys/arm/allwinner/aw_mmc.h +++ b/sys/arm/allwinner/aw_mmc.h @@ -169,6 +169,10 @@ /* AW_MMC_NTSR */ #define AW_MMC_NTSR_MODE_SELECT (1U << 31) +/* AW_MMC_HWRST */ +#define AW_MMC_HWRST_ASSERT (0U << 0) +#define AW_MMC_HWRST_DEASSERT (1U << 0) + /* IDMA CONTROLLER BUS MOD BIT FIELD */ #define AW_MMC_DMAC_IDMAC_SOFT_RST (1U << 0) #define AW_MMC_DMAC_IDMAC_FIX_BURST (1U << 1)