From nobody Sat Apr 29 07:37:35 2023 X-Original-To: dev-commits-src-branches@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 4Q7hC41vfbz48cZv; Sat, 29 Apr 2023 07:37:36 +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 4Q7hC41QhSz3JLS; Sat, 29 Apr 2023 07:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753856; 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=ur04p+fQ0D2eg14Ky57MkkrN71uXwl60GWx/m1ffBqI=; b=v6zTtkG9T7xR0/bYy/P5RdXafLqOVyGuTPf69LbyGo66bNPNX06QfrF462SbpN9+z0I2Mu NzL3G/UTJy+McefB1vl+fUbzSxrkwpIOxf/T0vPPJ6QfCwFmy5ICfHC0kv+hQoFNQoe1TF /HS9spQqu30N7gFMadw09CLOiETAI5uvJOAmSDxCuk3z4rmYkU8v+IYQByKURPWW4FGVCy NRbADv39KC5zfuyfuWJFnpCbYSsAPWuiS/4E/mk1lJ7hlCDPocyn9osTDzh63hWqtqA04o B2QEI+/TAEtGgnS5MHyIPsngZY5/pzMitFCPt6BrUvDlmiSo6HP7nTFklR715w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753856; 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=ur04p+fQ0D2eg14Ky57MkkrN71uXwl60GWx/m1ffBqI=; b=doClwqBC4hxa+2BgbygACu210GZ3JfdIO1Po4zVH/wMQ+Bec2b+yGEmjY7OlTQtilWPXin OH0mZbXAmbdC3AcOcwI2S0c5NmozAMtV08jtz1DZMxCwLJ455vOfo+rcdu9l+IFMRvt7Ts JWvm1TaKJQcbZ8Dxhb3psKebDpttFIIpVW848EvLzDQjmu84V9S6OnocJ+6uXpiowSz2Ji DtSEMk2hlhyw8Bzyu+FQ+G+7mSjPdrmnGZt8e+woJAwCKYzSteQ7fJuJPS2N5R7u0LD+hz nikCh1Bd+fzbhLOvriT8mL66nsjYuY8XGUu8GPPY88/oVXWz9YwtAK3r8ns6Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753856; a=rsa-sha256; cv=none; b=O0tn9we7lJl7Pd0np4Ck+G074sdL2MVrSV1jhdn8ijgkrCpV/5SQdpxpxlvKTcTPT/LbjH BNWEtfcUJPXTMELj1KAF02PN/N2k4OyD1Pydj5QXV2VRM/XeCOO4kBUfYiMfeuD6qTZqJT rvkPvBxSBnoYWTqjVI2sDpOEyN15hgYVG9ZZKvTufdk0dzChs3wwt0jEJPgcinHSU8FLVL WpyBc0NVyTXRaFrVCNXB0dv7w+lJzeAw7YzFelXVcWRFP0YU41XymbEXGexqGGy5u/npos 15BaZ/RsQxPvp14k9GLRZJuULGXpBima0p6bWq7UJV5aTJ00V/S5cJeGgRqChg== 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 4Q7hC40PdXzYR5; Sat, 29 Apr 2023 07:37:36 +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 33T7bZTF064550; Sat, 29 Apr 2023 07:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7bZHx064549; Sat, 29 Apr 2023 07:37:35 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:37:35 GMT Message-Id: <202304290737.33T7bZHx064549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e9e1f2a88e4b - stable/12 - powerpc: fix a few pmap related functions to return correct types List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e9e1f2a88e4bc6db9d6ecc3dcf95f29b4187e80e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e9e1f2a88e4bc6db9d6ecc3dcf95f29b4187e80e commit e9e1f2a88e4bc6db9d6ecc3dcf95f29b4187e80e Author: Dimitry Andric AuthorDate: 2023-04-23 13:22:44 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:35:10 +0000 powerpc: fix a few pmap related functions to return correct types While experimenting with changing boolean_t to another type, I noticed that several powerpc pmap related functions returned the wrong type: boolean_t instead of int. Fix several declarations and definitions to match the actual pmap function types: pmap_dev_direct_mapped_t and pmap_ts_referenced_t. MFC after: 3 days (cherry picked from commit d142601887524fc595ed0f5e6a69419727222f0a) --- sys/powerpc/aim/mmu_oea.c | 4 ++-- sys/powerpc/aim/mmu_oea64.c | 4 ++-- sys/powerpc/booke/pmap.c | 2 +- sys/powerpc/powerpc/pmap_dispatch.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index ea74879eba26..45c5af533926 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -314,7 +314,7 @@ vm_paddr_t moea_kextract(mmu_t, vm_offset_t); void moea_kenter_attr(mmu_t, vm_offset_t, vm_paddr_t, vm_memattr_t); void moea_kenter(mmu_t, vm_offset_t, vm_paddr_t); void moea_page_set_memattr(mmu_t mmu, vm_page_t m, vm_memattr_t ma); -boolean_t moea_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); +int moea_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); static void moea_sync_icache(mmu_t, pmap_t, vm_offset_t, vm_size_t); void moea_dumpsys_map(mmu_t mmu, vm_paddr_t pa, size_t sz, void **va); void moea_scan_init(mmu_t mmu); @@ -2613,7 +2613,7 @@ moea_bat_mapped(int idx, vm_paddr_t pa, vm_size_t size) return (0); } -boolean_t +int moea_dev_direct_mapped(mmu_t mmu, vm_paddr_t pa, vm_size_t size) { int i; diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index e19cac8f314f..0a54e400c941 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -278,7 +278,7 @@ vm_paddr_t moea64_kextract(mmu_t, vm_offset_t); void moea64_page_set_memattr(mmu_t, vm_page_t m, vm_memattr_t ma); void moea64_kenter_attr(mmu_t, vm_offset_t, vm_paddr_t, vm_memattr_t ma); void moea64_kenter(mmu_t, vm_offset_t, vm_paddr_t); -boolean_t moea64_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); +int moea64_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); static void moea64_sync_icache(mmu_t, pmap_t, vm_offset_t, vm_size_t); void moea64_dumpsys_map(mmu_t mmu, vm_paddr_t pa, size_t sz, void **va); @@ -2722,7 +2722,7 @@ moea64_clear_bit(mmu_t mmu, vm_page_t m, u_int64_t ptebit) return (count); } -boolean_t +int moea64_dev_direct_mapped(mmu_t mmu, vm_paddr_t pa, vm_size_t size) { struct pvo_entry *pvo, key; diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index f73c0207027e..79e774b33bf4 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -375,7 +375,7 @@ static vm_paddr_t mmu_booke_kextract(mmu_t, vm_offset_t); static void mmu_booke_kenter(mmu_t, vm_offset_t, vm_paddr_t); static void mmu_booke_kenter_attr(mmu_t, vm_offset_t, vm_paddr_t, vm_memattr_t); static void mmu_booke_kremove(mmu_t, vm_offset_t); -static boolean_t mmu_booke_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); +static int mmu_booke_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); static void mmu_booke_sync_icache(mmu_t, pmap_t, vm_offset_t, vm_size_t); static void mmu_booke_dumpsys_map(mmu_t, vm_paddr_t pa, size_t, diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c index 3cfa741d2ddb..424162a50444 100644 --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -528,7 +528,7 @@ pmap_decode_kernel_ptr(vm_offset_t addr, int *is_user, vm_offset_t *decoded) return (MMU_DECODE_KERNEL_PTR(mmu_obj, addr, is_user, decoded)); } -boolean_t +int pmap_dev_direct_mapped(vm_paddr_t pa, vm_size_t size) {