From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D961435AC3E; Tue, 16 Jun 2026 16:45:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781628328; cv=none; b=L3zyKhLe21ClYuJE5Bz5wLzT7d39coBbq8uz8O6FYnaRdV8wBpGZ7qsAMX/bmUjV9CfQBfZ5BRARWU9D4OOdo2W74pRHaZL2qqdh/KayVxC2kkHedM+I1j+feMK0PI1C+gEnwYkM9cMVt++3mtGJ8Rran9oPZgWL+9ElVEE48MU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781628328; c=relaxed/simple; bh=7PlTOqt8VwFUJkYPZkQNfjdmds5ccbD/ZLOGhNrQ4Ek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rCRHBd91suPLtBLcZEPYzL8XHvsq89UO7UxZjxkuM7+LX0OhZ9ncNVYeIxcFEtsRnHc/CyoAuDCCfU6mr3nRGUMMeDjaaa7NLRn0Es1qHdDVsqQ1n3I2/KXMks7UM7OI+kia+Gw7hxZWEFRJeCDYFMGg4/vAh3d51IfyVb7GeKs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=S0/+tloU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="S0/+tloU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E876F1F00A3A; Tue, 16 Jun 2026 16:45:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781628327; bh=Pqc1d9S6zcO0A0a1+zDWS0QNBkJ4cdgVevZl6xXt17Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S0/+tloUSnmvg3fPCJfNr7NueM5n9PWBpSXMjiv811kksytb3YAj18Zho1pxeSd9Q UmD3ZsKt2hIYB1+v2wYvk9Uz6kL8PTkoqrJGRWrwcl1ynyyBMZ14TKOES+pWuyZQFm Ra2rmxleSpbnLezZ5dMz1D5X/F1x0Db4i/dzxOnQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zeng Heng , Jinjiang Tu , Catalin Marinas , Will Deacon , Xiangyu Chen , Sasha Levin Subject: [PATCH 6.6 073/452] arm64: io: Rename ioremap_prot() to __ioremap_prot() Date: Tue, 16 Jun 2026 20:25:00 +0530 Message-ID: <20260616145121.750265102@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145117.796205997@linuxfoundation.org> References: <20260616145117.796205997@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Will Deacon commit f6bf47ab32e0863df50f5501d207dcdddb7fc507 upstream. Rename our ioremap_prot() implementation to __ioremap_prot() and convert all arch-internal callers over to the new function. ioremap_prot() remains as a #define to __ioremap_prot() for generic_access_phys() and will be subsequently extended to handle user permissions in 'prot'. Cc: Zeng Heng Cc: Jinjiang Tu Cc: Catalin Marinas Reviewed-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Xiangyu Chen Signed-off-by: Sasha Levin --- arch/arm64/include/asm/io.h | 8 +++++--- arch/arm64/kernel/acpi.c | 2 +- arch/arm64/mm/ioremap.c | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 3b694511b98f83..46d9f3f8290828 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -139,14 +139,16 @@ extern void __memset_io(volatile void __iomem *, int, size_t); * I/O memory mapping functions. */ +void __iomem *__ioremap_prot(phys_addr_t phys, size_t size, pgprot_t prot); + #define ioremap_prot ioremap_prot #define _PAGE_IOREMAP PROT_DEVICE_nGnRE #define ioremap_wc(addr, size) \ - ioremap_prot((addr), (size), PROT_NORMAL_NC) + __ioremap_prot((addr), (size), __pgprot(PROT_NORMAL_NC)) #define ioremap_np(addr, size) \ - ioremap_prot((addr), (size), PROT_DEVICE_nGnRnE) + __ioremap_prot((addr), (size), __pgprot(PROT_DEVICE_nGnRnE)) /* * io{read,write}{16,32,64}be() macros @@ -167,7 +169,7 @@ static inline void __iomem *ioremap_cache(phys_addr_t addr, size_t size) if (pfn_is_map_memory(__phys_to_pfn(addr))) return (void __iomem *)__phys_to_virt(addr); - return ioremap_prot(addr, size, PROT_NORMAL); + return __ioremap_prot(addr, size, __pgprot(PROT_NORMAL)); } /* diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index dba8fcec7f33d6..0b06e6c2ebc4de 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -352,7 +352,7 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) prot = __acpi_get_writethrough_mem_attribute(); } } - return ioremap_prot(phys, size, pgprot_val(prot)); + return __ioremap_prot(phys, size, prot); } /* diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c index 269f2f63ab7dc4..49fd31e33c3146 100644 --- a/arch/arm64/mm/ioremap.c +++ b/arch/arm64/mm/ioremap.c @@ -3,8 +3,8 @@ #include #include -void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, - unsigned long prot) +void __iomem *__ioremap_prot(phys_addr_t phys_addr, size_t size, + pgprot_t pgprot) { unsigned long last_addr = phys_addr + size - 1; @@ -16,9 +16,9 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, if (WARN_ON(pfn_is_map_memory(__phys_to_pfn(phys_addr)))) return NULL; - return generic_ioremap_prot(phys_addr, size, __pgprot(prot)); + return generic_ioremap_prot(phys_addr, size, pgprot); } -EXPORT_SYMBOL(ioremap_prot); +EXPORT_SYMBOL(__ioremap_prot); /* * Must be called after early_fixmap_init -- 2.53.0