From nobody Thu Feb 27 14:16:43 2025 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 4Z3YLM56g4z5qFx6; Thu, 27 Feb 2025 14:16:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3YLM4SYnz3xNs; Thu, 27 Feb 2025 14:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665803; 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=7GD/6UoqZNmPjUUf3P+SutV49Orql6Vqe0pFmiqk5Tg=; b=fZWYKy2XKRqzVaVsq5BzNputUtWkpHhCHOLazp48u1a3LyQNuIs+/b8kDA3XzDN71Eeu0r aSvS1M1JwVqRpti/Chv2Uqv1oOhUrELftCb5DcAIntE+NVkaQA/k8Z3T5pqmhbwqn4UiyY oNq2qQ+x+VR1LUOMGsWsTwQ/ggg4g4VEhZlJ49KH81k/IaXcN0J9s1D9tsWR9iKFPmZzwu r2re3WJ7cnT26KLB62hyDhEWfPHja8yTidJZZJVrdvx/sn+wC+DV9kwqMyy8M6jg8e3JPX bYcKUe1TnxsHnnAVLihUlH0Zzko/4bYbAElwdlyfq6ZqWn9u66amJTE2KV9iXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665803; a=rsa-sha256; cv=none; b=iH6vHu+tS+i8QB7by8B7SAqaMf+qTEG4LaRLFvQiUrESZ8jrETpit30tRDVLCL/fKCQlbj Iy7mR2AWEhCfxrs7IC1ttZiNlrpFeiW+HJwswWEW27hBzuMtDD28V/Cqly77tYsXQA4sD5 lj1ITlMcaRg4j103XVWWf+rSVkhajJ39M9MrgzsDOl8b1BYukyuOmQ5Uv9uqCJ7JMXJk/Y gn7NSO+o7lRgCVLCmoYdIi1M/BmcTZ7GtB6Z3pyvHbJrmSaPOBvkQVUcsdoLdeuYQJcYzR aTZ/Qy49a6hauv7V1lPwENiVF5V3OBU+RfUvczzOiPcjV78S/x7UTdSqy3F/ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665803; 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=7GD/6UoqZNmPjUUf3P+SutV49Orql6Vqe0pFmiqk5Tg=; b=dGMzks+dzYIqQMFlEwRQzpQs9W/TAzThBDuh/SMEVn/MHb67BH6WjW4+shmgL1xk8/I74M X+nnQuqrmR7A13tHpnGbfsqtHO6Ivl5hsSH8gRdmDuWMukU+BFK+aoXNCIsC6D+znoU3Cm NTuIb2fOMg7YaurIAG1Zqn7AgiL4qos9ywRzF3LxVu+q3upXZlaSweGBQkYzdVcBmNPpUP 0yAtmli5HPvwCV4xBRkO4wdVPRwUK02ym7nWqmCMSVFY87lkKtBhQKH+whIT8UFngEJ2ZF HJLajQh2c3ETTYTIwPFdF1upCfqbh5Ls9Sos4rP+ONmBsLBtuyEiS4Or89kUVw== 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 4Z3YLM3zQLzmqM; Thu, 27 Feb 2025 14:16:43 +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 51REGhj6016021; Thu, 27 Feb 2025 14:16:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REGhi3016018; Thu, 27 Feb 2025 14:16:43 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:16:43 GMT Message-Id: <202502271416.51REGhi3016018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 782d09ad298b - stable/14 - powerpc: Fix bus_space_unmap 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 782d09ad298bb9d66099d3f7276cd160f5fcd738 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=782d09ad298bb9d66099d3f7276cd160f5fcd738 commit 782d09ad298bb9d66099d3f7276cd160f5fcd738 Author: John Baldwin AuthorDate: 2024-01-23 17:37:53 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:20 +0000 powerpc: Fix bus_space_unmap Previously it failed to compile since the macro passed too many arguments to the function. Fix by adding the bus handle to the function and adding an implementation that calls pmap_unmapdev. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D43440 (cherry picked from commit a3d6e0de1c89c145b40ed80fe54c6bad1abbf416) --- sys/powerpc/include/bus.h | 2 +- sys/powerpc/powerpc/bus_machdep.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/include/bus.h b/sys/powerpc/include/bus.h index 6e91900c236d..ddb4737d9b76 100644 --- a/sys/powerpc/include/bus.h +++ b/sys/powerpc/include/bus.h @@ -103,7 +103,7 @@ struct bus_space { /* mapping/unmapping */ int (*bs_map)(bus_addr_t, bus_size_t, int, bus_space_handle_t *); - void (*bs_unmap)(bus_size_t); + void (*bs_unmap)(bus_space_handle_t, bus_size_t); int (*bs_subregion)(bus_space_handle_t, bus_size_t, bus_size_t, bus_space_handle_t *); diff --git a/sys/powerpc/powerpc/bus_machdep.c b/sys/powerpc/powerpc/bus_machdep.c index 39096edfc1f7..e908750961d0 100644 --- a/sys/powerpc/powerpc/bus_machdep.c +++ b/sys/powerpc/powerpc/bus_machdep.c @@ -140,8 +140,13 @@ bs_remap_earlyboot(void) } static void -bs_gen_unmap(bus_size_t size __unused) +bs_gen_unmap(bus_space_handle_t bsh, bus_size_t size) { + + if (!pmap_bootstrapped) + return; + + pmap_unmapdev((void *)bsh, size); } static int