From owner-dev-commits-src-main@freebsd.org Tue Apr 27 11:21:18 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E1A365E31FF; Tue, 27 Apr 2021 11:21:18 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FTzq261bCz3qZT; Tue, 27 Apr 2021 11:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C1AC01995E; Tue, 27 Apr 2021 11:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13RBLItm089822; Tue, 27 Apr 2021 11:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13RBLIS9089821; Tue, 27 Apr 2021 11:21:18 GMT (envelope-from git) Date: Tue, 27 Apr 2021 11:21:18 GMT Message-Id: <202104271121.13RBLIS9089821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 4c1ecf5502e1 - main - Consider the broken card detect flag that comes from 'broken-cd; ' dts property. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c1ecf5502e1b4b20553a2f996b73794cc7e6454 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2021 11:21:18 -0000 The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=4c1ecf5502e1b4b20553a2f996b73794cc7e6454 commit 4c1ecf5502e1b4b20553a2f996b73794cc7e6454 Author: Ruslan Bukin AuthorDate: 2021-04-27 11:19:05 +0000 Commit: Ruslan Bukin CommitDate: 2021-04-27 11:19:05 +0000 Consider the broken card detect flag that comes from 'broken-cd;' dts property. This fixes operation on Intel Stratix 10 devices. Tested on Terasic DE10-Pro. Reviewed by: manu Sponsored by: UKRI Differential revision: https://reviews.freebsd.org/D29999 --- sys/dev/mmc/host/dwmmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/mmc/host/dwmmc.c b/sys/dev/mmc/host/dwmmc.c index b31bb0d4e68b..bf494027551a 100644 --- a/sys/dev/mmc/host/dwmmc.c +++ b/sys/dev/mmc/host/dwmmc.c @@ -480,7 +480,8 @@ dwmmc_card_task(void *arg, int pending __unused) #else DWMMC_LOCK(sc); - if (READ4(sc, SDMMC_CDETECT) == 0) { + if (READ4(sc, SDMMC_CDETECT) == 0 || + (sc->mmc_helper.props & MMC_PROP_BROKEN_CD)) { if (sc->child == NULL) { if (bootverbose) device_printf(sc->dev, "Card inserted\n");