From nobody Tue Feb 22 08:58:48 2022 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 94A2319D82D5; Tue, 22 Feb 2022 08:58:48 +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 4K2tPh3nnZz3q5f; Tue, 22 Feb 2022 08:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645520328; 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=TX9jLdUM0HbDoXaM4xquEpQWBqe5QGVs3sPKQOToikY=; b=bAZakRDCmgpCriD+tE5fbW+DeFx9mVUs2LXY5x+NPNX8zZ+ZfGzVrEEViFUE+No+L4PrW6 M6DUo+OzTSSplp93X+jZMsNiElN6YryiRiVnY0Wj9Ivi69StOjVpPhHjmZK57dim3VXDtn qwPw3hBUJtZA+Qg6ENwNKzggUlTDf3HHYEqn6B0X2QUsuzr13YDNJpaP3oJq5Pk529WhSq 139DcMHG74Qg0xlGxa5mRUDPLfLFBODnETpoBUJoh6lv8a3xO8aTurX4NtdCXLh2zbg4Y3 K7LjX80cIfVbkjRbELKPETJCqLaNef5HUlxwqqvnYLBNkhXaa/iZ/uCcPuK5kA== 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 5DEC4211E4; Tue, 22 Feb 2022 08:58:48 +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 21M8wmLc038112; Tue, 22 Feb 2022 08:58:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21M8wmCH038111; Tue, 22 Feb 2022 08:58:48 GMT (envelope-from git) Date: Tue, 22 Feb 2022 08:58:48 GMT Message-Id: <202202220858.21M8wmCH038111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: a974a7bcdf44 - main - sdhci_fsl_fdt: Fix pulse width errata application 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: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a974a7bcdf44a83e344b19778dbd910298fa0421 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645520328; 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=TX9jLdUM0HbDoXaM4xquEpQWBqe5QGVs3sPKQOToikY=; b=bP9x34B8bKxNV3Q9wLh5A6sWjkr3f3lc5lVRKutozgFgRcUB2LrHbifgA4YUTlijF5Fep4 8vCeEE50zlGmEHN5qxZczqy0861IeILEsvkoK1bbVA0wJD/YjVgrNW6lofIv1Uqo03CfuY UiipeU4Vt6Q8UJjym6C455jqAn746Hr1UZu8MOy/NnKHCvfaL/Ycv1HHhM1j3Jjr3rSf/d 2dcq9yzhYbwfU+liWpXqNFU2xwl1mGmmg3ARPgF68yZ5AeDy6T8pKzjlCcUNjNZjvNWP8q kC03fMA3zpR4WpKleOaUsI4or2/7msRu5upzHgTVuYbbqgGemFhAt73HQBhiUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645520328; a=rsa-sha256; cv=none; b=Q6UYdzCL9zgy+qnBU57salZHTj0inrwITVx5mR1c/omfe+i0ZJCgTAub2e1KeZJm29gP51 NGRnUUn8n3zjuv9TWtYcN7aTxNwxU1WKx4U/PpRQwQRVDCaEQA10VmyU8MlzE9s0AAPhhU YQ7mkWnwwrvKQjKy8VGdIOzJXOVxJbETL1XYqvLksPpPJ5H2GFTetPcwhhHr378qUY+GUK jPUOv/LOSM8sTrGD7aSIjwKPNmrPCNI+w0nP9lJOxvrE2sVPe1mv/WOFYHzSJxXBcYSVzV GTwzF29pcnuLslYq0EmspN5BHYfj6AnamWEO23n+wq6JdGrOjfRMxGLuFN+Nqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=a974a7bcdf44a83e344b19778dbd910298fa0421 commit a974a7bcdf44a83e344b19778dbd910298fa0421 Author: Kornel Duleba AuthorDate: 2022-01-14 11:21:51 +0000 Commit: Wojciech Macek CommitDate: 2022-02-22 08:58:24 +0000 sdhci_fsl_fdt: Fix pulse width errata application The errata has to be applied every time after SDHCI_RESET_ALL is done. Move it from attach to the custom reset routine. Reviewed by: wma, mmel Obtained from: Semihalf Sponsored by: Alstom Group Differential Revision: https://reviews.freebsd.org/D33981 --- sys/dev/sdhci/sdhci_fsl_fdt.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fsl_fdt.c b/sys/dev/sdhci/sdhci_fsl_fdt.c index 41804f6c1a11..5d4052a12a2e 100644 --- a/sys/dev/sdhci/sdhci_fsl_fdt.c +++ b/sys/dev/sdhci/sdhci_fsl_fdt.c @@ -885,16 +885,6 @@ sdhci_fsl_fdt_attach(device_t dev) sc->slot.max_clk = sc->maxclk_hz; sc->gpio = sdhci_fdt_gpio_setup(dev, &sc->slot); - /* - * Pulse width detection is not reliable on some boards. Perform - * workaround by clearing register's bit according to errata. - */ - if (sc->soc_data->errata & SDHCI_FSL_UNRELIABLE_PULSE_DET) { - val = RD4(sc, SDHCI_FSL_DLLCFG1); - val &= ~SDHCI_FSL_DLLCFG1_PULSE_STRETCH; - WR4(sc, SDHCI_FSL_DLLCFG1, val); - } - /* * Set the buffer watermark level to 128 words (512 bytes) for both * read and write. The hardware has a restriction that when the read or @@ -1028,6 +1018,16 @@ sdhci_fsl_fdt_reset(device_t dev, struct sdhci_slot *slot, uint8_t mask) WR4(sc, SDHCI_FSL_TBCTL, val); } + /* + * Pulse width detection is not reliable on some boards. Perform + * workaround by clearing register's bit according to errata. + */ + if (sc->soc_data->errata & SDHCI_FSL_UNRELIABLE_PULSE_DET) { + val = RD4(sc, SDHCI_FSL_DLLCFG1); + val &= ~SDHCI_FSL_DLLCFG1_PULSE_STRETCH; + WR4(sc, SDHCI_FSL_DLLCFG1, val); + } + sc->flags &= ~SDHCI_FSL_HS400_DONE; }