From nobody Thu Aug 10 07:22:14 2023 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 4RLyzq14bNz4Tjbb; Thu, 10 Aug 2023 07:22:15 +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 4RLyzq0ZXFz4LxF; Thu, 10 Aug 2023 07:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652135; 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=mBgLhvLhBa5E3wJGef4hhE2PyzYHiOt23UfDwJbQlS0=; b=mtY7PItJuGctiQNO4DqXBbxk2r0lk8R3kfjaohKfNtzRaPeVS1/O/wDfnIKgODfs283yxq Cy4CrdFBTZiU5hMUy14yk+MfZrGaLnnJINaviYB/pVDhO6vcVH2GtctnXRvt+qEKJTFW8z m2A0PTHK83bhTP7t9jR/b1L3TZ1TplEwpBP//HAm21MFSclrou2/wqLqcFNqKpXMWYCKUB HNqRWQEYZXObZo5aGfaafUM4vKJ+d5mOVaI4E7PfdvVnR1Lo7ewS6DV9Is+UAKt8ydEmtK jBdQhIBSFIjjURmntS0thdtDcDaG9Nu4l2w9blpJm4r9QGb1OSNiU+6htq08NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652135; 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=mBgLhvLhBa5E3wJGef4hhE2PyzYHiOt23UfDwJbQlS0=; b=g2DY7rJDhjWpcjAelllpDlo3yyUfA4fxlpDGrE9wZE9NALCVa2IZKWHWm1ZsAGs2n58eVs 2omJi5AWBY9rf0tT6QE6/qViVdFNuxGcZsu5vM9MwTvSxHFdOu1rT6Mnc6mUY8v2fQFQE+ snB2y/TkG/A1Mlb0P18WBPL/LEkZSQlx5+r+mls9UX4psCJPh6vb2/6Wjx0em4WHPAlwBG ppm4sfkhk6Y4M3J5dkLis5Mvm5Gv07LgiJPQ8Ya4Pp6aboUYcC4OQlpr25jnZL3XyS83BS /3SRYFJ6hbldh7iB6dapLZMQwZ+0DSu6+8tm9p7qH7KO3/1JwrJWrWE82a0gYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691652135; a=rsa-sha256; cv=none; b=W3R5XWu42sVNPn0ZtmdK6OHIodd1wqP9HLdB036FJNgjbj0ljUoaQAsJHfyi2lonF94mjo Q2GdCsyCs3knNcbaKcw4RuYE/nUIv9koUHXMkDzEwKz8IR62EQDzRCPZb5fV7d8s4uv7yU Wl/gxuRJiGAEC7/zS3P1YQBnIn1jSAVDcDPwTkQs2yD0KRlW2GHRmjNJJ5FWf/zSViy3P1 bjrqRp0PVByxj/tnkz7Sfkb+VVyHOv6sRTamll8momqaHs+APdpk4cXsq5Z+bQ3ieKSaOY 56qmmQ1b2sr/6SHOLvEAJT70lrkSx9af74RUXFhBvnd0GYB0bYdvL8S9Fcp66g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RLyzp6pF1zpCZ; Thu, 10 Aug 2023 07:22:14 +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 37A7MEWK024259; Thu, 10 Aug 2023 07:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A7MEGQ024256; Thu, 10 Aug 2023 07:22:14 GMT (envelope-from git) Date: Thu, 10 Aug 2023 07:22:14 GMT Message-Id: <202308100722.37A7MEGQ024256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: e758ed2dd535 - main - sdhci: Add support for disable-wp 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e758ed2dd5350b432cf10b6c2c3cbf4c3d570b03 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=e758ed2dd5350b432cf10b6c2c3cbf4c3d570b03 commit e758ed2dd5350b432cf10b6c2c3cbf4c3d570b03 Author: Emmanuel Vadot AuthorDate: 2022-09-29 11:58:08 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-10 07:21:55 +0000 sdhci: Add support for disable-wp Some platform needs it when the WP pin is broken. Sponsored by: Beckhoff Automation GmbH & Co. KG MFC after: 2 weeks --- sys/dev/sdhci/sdhci_fdt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index c6319d49ca65..1890ab3ae6a6 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -143,6 +143,7 @@ struct sdhci_fdt_softc { struct resource *mem_res[MAX_SLOTS]; /* Memory resource */ bool wp_inverted; /* WP pin is inverted */ + bool wp_disabled; /* WP pin is not supported */ bool no_18v; /* No 1.8V support */ clk_t clk_xin; /* xin24m fixed clock */ @@ -433,6 +434,8 @@ sdhci_fdt_get_ro(device_t bus, device_t dev) { struct sdhci_fdt_softc *sc = device_get_softc(bus); + if (sc->wp_disabled) + return (false); return (sdhci_generic_get_ro(bus, dev) ^ sc->wp_inverted); } @@ -554,6 +557,8 @@ sdhci_fdt_probe(device_t dev) sc->no_18v = true; if (OF_hasprop(node, "wp-inverted")) sc->wp_inverted = true; + if (OF_hasprop(node, "disable-wp")) + sc->wp_disabled = true; return (0); }