From nobody Fri May 2 15:45:02 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 4ZpwGl03pfz5tcsr; Fri, 02 May 2025 15:45:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpwGk6VSWz3lN8; Fri, 02 May 2025 15:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746200702; 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=w7SnYcGcjrdb/VukbJsPE3RTUSo75ME4v8FoqSrMlSE=; b=iEoZa4QId1l9AcnUh2VT9qT+3djUA6Aqbs8OZqMkF6/m9GXymtThBcw6GHFwTxsCpe2dWs dqt/JI3gDrNcg4t+iRa8Ge+Y4UemxyKrIwNLMx/ljiWyDUUWuPK1pCTXJFJmB8S0SPfNvO HUSPWQmLcvaihWw6UrQl3kM2jqIQVpxWY7p06pU0eSqePNA9GUe/xTm3sRtFVyhXoNyFE9 63RvKy4jYgQ3weNz6FzeJvR2wp8z0LE584ZipBgP1rOZr08bxs1Kw/vpOzXNJ0u+09M9cx 5nNDpsQsYWpgUF40H11N2d+6Lo2sd3VQsPwEWnY97bKnMplXto9Lxg+DBsDRhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746200702; 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=w7SnYcGcjrdb/VukbJsPE3RTUSo75ME4v8FoqSrMlSE=; b=K47bEWzPHCseilzDsm2Uifv36TPLD3LqMPYZKZn2UtkEn4PDnuuASGyRuxn9d/ZuIyAI9l 0dN5lYX6x3coznATSdqN7CA7C6i++Wxr6DCZfEOdLEJi/nn8JrHljNm+rUIgS8jT+D/XTb M1c8TYLFXmIEf+I4siiO+Q+2+Hm8XupkXJLjIV+dX0QdINOk7nBUiMeMykXe939gbsPoas TLYeDVr/XMqfhVgWGHytAp/yYISH4C7Yzf9csllz6/nSm3iEw6WQMC/EZqN77zfv9poah3 I4iFgrm5m+qwETjKppIQJ2TnK4pWEkD7AMXLsn+wy9nS4tYC9rsMFumkcP4VsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746200702; a=rsa-sha256; cv=none; b=a8gWZE4XNasP2uVxDEXRa87SHEn91zGMUnrwwCVZaHIX2Jr4hQmPRqTO6GlFM1KxXY8yqL VvBzfFM/tFRL8aulJOSW+EQsgGvaLpckqJVTHPLcoxbY2GYVjNDm2p+bB8i4ljmCAW0Ti+ UgOTxAnAYMqvHXFNEQ03A/5z1fjLS6+HNjchRLbwcC2DnwoEZ9FeRaOkkeKDdVImHh7JU9 ayKGx2AfmRWn2zs/0BWdwr94jkEJ/YTm1iuH4CLiI7zjlc18P61ffa9EFbAXKS+KG7ZrTE /hE/W2UvSmrDwJoP1kcCs3Mbvyd1jNrKFLv3Wc7O+FjUnXZtsf2BBaJ84sxhjw== 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 4ZpwGk60KMz1J27; Fri, 02 May 2025 15:45:02 +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 542Fj2PV097588; Fri, 2 May 2025 15:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 542Fj2Pc097585; Fri, 2 May 2025 15:45:02 GMT (envelope-from git) Date: Fri, 2 May 2025 15:45:02 GMT Message-Id: <202505021545.542Fj2Pc097585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 3dae01840d99 - main - arm/freescale: Stop using devmap_ptov 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dae01840d99bab646d39b9487adca44ab96ba22 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3dae01840d99bab646d39b9487adca44ab96ba22 commit 3dae01840d99bab646d39b9487adca44ab96ba22 Author: Andrew Turner AuthorDate: 2025-05-02 15:33:38 +0000 Commit: Andrew Turner CommitDate: 2025-05-02 15:39:04 +0000 arm/freescale: Stop using devmap_ptov Call pmap_mapdev directly. If it can allocate this memory using the static device map via devmap_ptov it will so there is no need to call it directly. Reviewed by: mhorne Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50014 --- sys/arm/freescale/imx/imx6_machdep.c | 4 +++- sys/arm/freescale/imx/imx_machdep.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c index 9cfae5b9c802..cc23b33f4f92 100644 --- a/sys/arm/freescale/imx/imx6_machdep.c +++ b/sys/arm/freescale/imx/imx6_machdep.c @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -310,12 +311,13 @@ imx_soc_type(void) IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT; /*printf("digprog = 0x%08x\n", digprog);*/ if (hwsoc == HWSOC_MX6DL) { - pcr = devmap_ptov(SCU_CONFIG_PHYSADDR, 4); + pcr = pmap_mapdev(SCU_CONFIG_PHYSADDR, 4); if (pcr != NULL) { /*printf("scu config = 0x%08x\n", *pcr);*/ if ((*pcr & 0x03) == 0) { hwsoc = HWSOC_MX6SOLO; } + pmap_unmapdev(pcr, 4); } } } diff --git a/sys/arm/freescale/imx/imx_machdep.c b/sys/arm/freescale/imx/imx_machdep.c index e5d3dc4811b9..b3f347cebc78 100644 --- a/sys/arm/freescale/imx/imx_machdep.c +++ b/sys/arm/freescale/imx/imx_machdep.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include @@ -66,7 +65,7 @@ imx_wdog_cpu_reset(vm_offset_t wdcr_physaddr) { volatile uint16_t cr, *pcr; - if ((pcr = devmap_ptov(wdcr_physaddr, sizeof(*pcr))) == NULL) { + if ((pcr = pmap_mapdev(wdcr_physaddr, sizeof(*pcr))) == NULL) { printf("imx_wdog_cpu_reset(): " "cannot find control register... locking up now."); for (;;) @@ -116,7 +115,7 @@ imx_wdog_init_last_reset(vm_offset_t wdsr_phys) { volatile uint16_t * psr; - if ((psr = devmap_ptov(wdsr_phys, sizeof(*psr))) == NULL) + if ((psr = pmap_mapdev(wdsr_phys, sizeof(*psr))) == NULL) return; last_reset_status = *psr; if (last_reset_status & WDOG_RSR_SFTW) { @@ -126,4 +125,5 @@ imx_wdog_init_last_reset(vm_offset_t wdsr_phys) } else if (last_reset_status & WDOG_RSR_POR) { sysctl___hw_imx_last_reset_reason.oid_arg1 = "PowerOnReset"; } + pmap_unmapdev((void *)(uintptr_t)psr, sizeof(*psr)); }