From nobody Tue Jul 22 15:08:37 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 4bmgdK5V9lz5pWBn; Tue, 22 Jul 2025 15:08:37 +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 4bmgdK4psmz3n10; Tue, 22 Jul 2025 15:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753196917; 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=OTzDJTFNm0Gda5Ga/Ud33X5+fjyiD/2fauVHQ3uqnKI=; b=HEL+f02PVREuTz8R/6T/ox5935CyGHY0hKyuJ3f3xCLngTKcOM64wBvEVVgnXIaEEjMJJq CKVpSwgxFaRK3J1Fyr6iGC7dbRMxudZiAIpfLmOquxxmGtO6M1voNsMwAVfeVsXKCARwrv Y0VmHVToPHiTtJaASM7h/brrXOp+5Pc+/xusCrujbbdWL41gwnL7cq9qkMqJpYomqCIryL 3OaLIFEO4ZzLqRsIrGBe6DvGmd0rPFqAc1dHKkt/1Z0spyue1Ilyz+7dzVxPtUZ4shfus4 MQF4GQFczh+x+lmOvi+X01a6p6Q8iEdiBvQ7SoexVbO+WLzfYJP6n58yk7+Ouw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753196917; 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=OTzDJTFNm0Gda5Ga/Ud33X5+fjyiD/2fauVHQ3uqnKI=; b=CZPb+v8VLWsKWK1leguWW9hGN1YaJA/yUMiXlGlT7eRqkNGgJnJygZcTriA7IYFSg3gYag Rjb8BPEPV0+DrGQAvvtw/1yOtlCt7uq1xKzUimpcTIqbxQggCtd055Gdn2yHvan6A984jt gAJlqXRnvnL2dY/28ScRYcnotg5UTR/DQs+zf1wVDye68a2bqd/Y1IF2asIJjj64vPmTpL qbOSMh8WhId3VJu8U5z0GjORqp19Fw+VP3sbVgBmRN1budXeADNSJP3PQCDwDdbEAcDbhq 4ENSH3Vg8GvA6VPSIom8r8JcQIzQeNzOkht5MTFNNHQVoydNzmSJei8gCAlzXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753196917; a=rsa-sha256; cv=none; b=plM5wbsrk37/2SXTItkbqRPp4VWguSVuYYXVNdNPoNcXNH29rxN03uZRdaHohA0CpJHkV1 rkQ/N7hfd1/kVRjXj5ukQyp3/QvNuD43xyhx5Wq36xrQY9pkZevoF8IOl8j6ceLHXmBJDU VaAsYDlOrvI0HlXjqLZpovkO24pn1T/ZShHC/2hjruMJBpvcsze0D55Yww6086uJtgB9Z+ kUZJmMGnVO8Wfb8LEfOONIlSnMA+MfHYuRzc8gQChfB8CMkcqo/WnlY6/7sUCRAUwK11N0 cpwNzGMUHonvruZ3Bb7dDMBH5QXh121avD21GmwBEJ/D/07JJm1uvpsSz2b7xQ== 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 4bmgdK4HHGzY7Q; Tue, 22 Jul 2025 15:08:37 +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 56MF8bem085494; Tue, 22 Jul 2025 15:08:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56MF8bAs085491; Tue, 22 Jul 2025 15:08:37 GMT (envelope-from git) Date: Tue, 22 Jul 2025 15:08:37 GMT Message-Id: <202507221508.56MF8bAs085491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 4113280f7547 - main - aw_mmc: changes for Allwinner D1 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4113280f75471abc6509e6ea9ca0b2428529a20d Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4113280f75471abc6509e6ea9ca0b2428529a20d commit 4113280f75471abc6509e6ea9ca0b2428529a20d Author: Julien Cassette AuthorDate: 2025-07-22 14:50:38 +0000 Commit: Mitchell Horne CommitDate: 2025-07-22 15:03:48 +0000 aw_mmc: changes for Allwinner D1 Necessary driver changes to run on the platform: - DMA descriptors need shifting - Add quirk for max-sized transfers - Add compatible string Co-authored-by: br Co-authored-by: mhorne MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51197 --- sys/arm/allwinner/aw_mmc.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c index 6bebf5e5fb5e..a8add957dc74 100644 --- a/sys/arm/allwinner/aw_mmc.c +++ b/sys/arm/allwinner/aw_mmc.c @@ -84,21 +84,26 @@ struct aw_mmc_conf { uint32_t dma_xferlen; + uint32_t dma_desc_shift; bool mask_data0; bool can_calibrate; bool new_timing; + bool zero_is_skip; }; static const struct aw_mmc_conf a10_mmc_conf = { .dma_xferlen = 0x2000, + .dma_desc_shift = 0, }; static const struct aw_mmc_conf a13_mmc_conf = { .dma_xferlen = 0x10000, + .dma_desc_shift = 0, }; static const struct aw_mmc_conf a64_mmc_conf = { .dma_xferlen = 0x10000, + .dma_desc_shift = 0, .mask_data0 = true, .can_calibrate = true, .new_timing = true, @@ -106,13 +111,24 @@ static const struct aw_mmc_conf a64_mmc_conf = { static const struct aw_mmc_conf a64_emmc_conf = { .dma_xferlen = 0x2000, + .dma_desc_shift = 0, .can_calibrate = true, }; +static const struct aw_mmc_conf d1_mmc_conf = { + .dma_xferlen = 0x1000, + .dma_desc_shift = 2, + .mask_data0 = true, + .can_calibrate = true, + .new_timing = true, + .zero_is_skip = true, +}; + static struct ofw_compat_data compat_data[] = { {"allwinner,sun4i-a10-mmc", (uintptr_t)&a10_mmc_conf}, {"allwinner,sun5i-a13-mmc", (uintptr_t)&a13_mmc_conf}, {"allwinner,sun7i-a20-mmc", (uintptr_t)&a13_mmc_conf}, + {"allwinner,sun20i-d1-mmc", (uintptr_t)&d1_mmc_conf}, {"allwinner,sun50i-a64-mmc", (uintptr_t)&a64_mmc_conf}, {"allwinner,sun50i-a64-emmc", (uintptr_t)&a64_emmc_conf}, {NULL, 0} @@ -607,16 +623,18 @@ aw_dma_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int err) dma_desc = sc->aw_dma_desc; for (i = 0; i < nsegs; i++) { - if (segs[i].ds_len == sc->aw_mmc_conf->dma_xferlen) + if ((segs[i].ds_len == sc->aw_mmc_conf->dma_xferlen) && + !sc->aw_mmc_conf->zero_is_skip) dma_desc[i].buf_size = 0; /* Size of 0 indicate max len */ else dma_desc[i].buf_size = segs[i].ds_len; - dma_desc[i].buf_addr = segs[i].ds_addr; + dma_desc[i].buf_addr = segs[i].ds_addr >> + sc->aw_mmc_conf->dma_desc_shift; dma_desc[i].config = AW_MMC_DMA_CONFIG_CH | - AW_MMC_DMA_CONFIG_OWN | AW_MMC_DMA_CONFIG_DIC; - - dma_desc[i].next = sc->aw_dma_desc_phys + - ((i + 1) * sizeof(struct aw_mmc_dma_desc)); + AW_MMC_DMA_CONFIG_OWN | AW_MMC_DMA_CONFIG_DIC; + dma_desc[i].next = (sc->aw_dma_desc_phys + + (i + 1) * sizeof(struct aw_mmc_dma_desc)) >> + sc->aw_mmc_conf->dma_desc_shift; } dma_desc[0].config |= AW_MMC_DMA_CONFIG_FD; @@ -678,7 +696,8 @@ aw_mmc_prepare_dma(struct aw_mmc_softc *sc) AW_MMC_WRITE_4(sc, AW_MMC_IDIE, val); /* Set DMA descritptor list address */ - AW_MMC_WRITE_4(sc, AW_MMC_DLBA, sc->aw_dma_desc_phys); + AW_MMC_WRITE_4(sc, AW_MMC_DLBA, sc->aw_dma_desc_phys >> + sc->aw_mmc_conf->dma_desc_shift); /* FIFO trigger level */ AW_MMC_WRITE_4(sc, AW_MMC_FWLR, AW_MMC_DMA_FTRGLEVEL);