From nobody Mon Feb 05 22:46:28 2024 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 4TTM1d1q95z59BMG; Mon, 5 Feb 2024 22:46:29 +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 4TTM1d1J98z3x43; Mon, 5 Feb 2024 22:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707173189; 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=c652tQscMEcvtTwllRJ8NSCn+XRpgx/qeXGVOKYLgJw=; b=U/lb+imm62LMrPQC7I3tSsdgtM8K+WieSlp/88J6C+NHEQxMoNbR8TJAZtMAtJ78uHSVDq veSYZgUMfZ+3R4IdvfEWYZrXxZjnlllJr7eK/Dze2amMW0oXlyiXWqItyqsPu1lpkJ3F3O TOO3YLafMz0isCNzGRhNAiAfNR8O6yKBbkXP1bKTWKEjj9pqK3LTBHM12uYBrKZnQOWPOX D9j6hlA4MwSaweb1YV5AX19tazNAtv4IHqXrWd1Dn5d+PUnC+kUSdB9KaQC+6yclGmch7b YO5ahe68WOephiPeIQmebpm2XbLR/S362vxcPTzZYx72TGapGuRgjprMW4o57w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707173189; 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=c652tQscMEcvtTwllRJ8NSCn+XRpgx/qeXGVOKYLgJw=; b=GdCIGU2Qjek20BdhA7IldZO2vCaFy1sYoijO43MPWths+0uyIGOXjUDLK+53kR68j2nWA2 zyf/RITFnGPwdSLPGxt3hIviBF7vi02oxF00pEBeoGiFh5crkIIM74ENU7FKYlUR7Qsl67 rt4JBzKkBk5iaSuEsDSQOT7G3JaUOWlILOAUTcThzBvIZTzeDBeT1q6rtkm2wUNuoyvCNk mb4dFNa8JMMAOchwy6NO4n10IgXnh5kFH1C3L8bVCs6h5TRnesNGjahO5+YI7dHnmQ3zwE 5zyO0I848zhLIPiZA9z90xmYuZq0+C9d8CTHj9X7+foHTCpdtmumd0zxF/zVPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707173189; a=rsa-sha256; cv=none; b=al5+TlAqMceIrXQevjBncFJrvJDTyBAJqUEkoXavRHrMQBFFZErxNmouaaR2WtJN/SzzTe MIk2YEFgUpP+smP4h+u43wAnD3ewHLxs73epQTMWJpz/Z00ouCvZHmKJvXCiraY6EIuz02 Un2eEyg9ewBf3aDAjstKrmPkG2UrQc+QmTIM5mpI3wzQaBjBfodwR/PE7rZVAW6lzHN6s0 sE3IB+2FWDW1Jh4j4PJNsfRhIsKOKG5G8OYVQmGKU8FK3TCdmch0kSuMgTXY2Xc9FGeSmx A5yJC24Fp797hfUVWAxZSe1IM1GN/7w4oTk2kArSuOT5ffof7jE6DtxFmxr14Q== 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 4TTM1d0Ms3zysZ; Mon, 5 Feb 2024 22:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 415MkSvA086947; Mon, 5 Feb 2024 22:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415MkSG1086944; Mon, 5 Feb 2024 22:46:28 GMT (envelope-from git) Date: Mon, 5 Feb 2024 22:46:28 GMT Message-Id: <202402052246.415MkSG1086944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 069c6ac2c698 - main - sdhci_fsl_fdt(4): Actually use modified SDHCI capabilities 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 069c6ac2c698db68983efd17198e9c202c976d25 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=069c6ac2c698db68983efd17198e9c202c976d25 commit 069c6ac2c698db68983efd17198e9c202c976d25 Author: Marius Strobl AuthorDate: 2024-02-05 19:08:33 +0000 Commit: Marius Strobl CommitDate: 2024-02-05 22:43:48 +0000 sdhci_fsl_fdt(4): Actually use modified SDHCI capabilities SDHCI_QUIRK_MISSING_CAPS needs to be set unconditionally so sdhci(4) adheres to the slot caps and caps2 set by sdhci_fsl_fdt(4). However, so far this bug didn't have an impact as the front-end only filters SDHCI_CAN_DO_SUSPEND, which in turn isn't used, yet. --- sys/dev/sdhci/sdhci_fsl_fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sdhci/sdhci_fsl_fdt.c b/sys/dev/sdhci/sdhci_fsl_fdt.c index c04bdefb1382..3220f00f277d 100644 --- a/sys/dev/sdhci/sdhci_fsl_fdt.c +++ b/sys/dev/sdhci/sdhci_fsl_fdt.c @@ -818,6 +818,7 @@ sdhci_fsl_fdt_of_parse(device_t dev) /* Call mmc_fdt_parse in order to get mmc related properties. */ mmc_fdt_parse(dev, node, &sc->fdt_helper, &sc->slot.host); + sc->slot.quirks |= SDHCI_QUIRK_MISSING_CAPS; sc->slot.caps = sdhci_fsl_fdt_read_4(dev, &sc->slot, SDHCI_CAPABILITIES) & ~(SDHCI_CAN_DO_SUSPEND); sc->slot.caps2 = sdhci_fsl_fdt_read_4(dev, &sc->slot, @@ -837,7 +838,6 @@ sdhci_fsl_fdt_of_parse(device_t dev) (vdd_mask != (sc->slot.caps & SDHCI_FSL_CAN_VDD_MASK))) { sc->slot.caps &= ~(SDHCI_FSL_CAN_VDD_MASK); sc->slot.caps |= vdd_mask; - sc->slot.quirks |= SDHCI_QUIRK_MISSING_CAPS; } }