From: Baoquan He <bhe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de,
christophe.leroy@csgroup.eu, hch@lst.de, rppt@kernel.org,
willy@infradead.org, agordeev@linux.ibm.com,
wangkefeng.wang@huawei.com, schnelle@linux.ibm.com,
David.Laight@ACULAB.COM, shorne@gmail.com, deller@gmx.de,
Baoquan He <bhe@redhat.com>
Subject: [PATCH v6 04/19] mm/ioremap: Define generic_ioremap_prot() and generic_iounmap()
Date: Fri, 9 Jun 2023 15:55:13 +0800 [thread overview]
Message-ID: <20230609075528.9390-5-bhe@redhat.com> (raw)
In-Reply-To: <20230609075528.9390-1-bhe@redhat.com>
From: Christophe Leroy <christophe.leroy@csgroup.eu>
Define a generic version of ioremap_prot() and iounmap() that
architectures can call after they have performed the necessary
alteration to parameters and/or necessary verifications.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Baoquan He <bhe@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
include/asm-generic/io.h | 4 ++++
mm/ioremap.c | 22 ++++++++++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 587e7e9b9a37..a7ca2099ba19 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -1073,9 +1073,13 @@ static inline bool iounmap_allowed(void *addr)
}
#endif
+void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
+ pgprot_t prot);
+
void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
unsigned long prot);
void iounmap(volatile void __iomem *addr);
+void generic_iounmap(volatile void __iomem *addr);
static inline void __iomem *ioremap(phys_addr_t addr, size_t size)
{
diff --git a/mm/ioremap.c b/mm/ioremap.c
index 8652426282cc..db6234b9db59 100644
--- a/mm/ioremap.c
+++ b/mm/ioremap.c
@@ -11,8 +11,8 @@
#include <linux/io.h>
#include <linux/export.h>
-void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
- unsigned long prot)
+void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
+ pgprot_t prot)
{
unsigned long offset, vaddr;
phys_addr_t last_addr;
@@ -28,7 +28,7 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
phys_addr -= offset;
size = PAGE_ALIGN(size + offset);
- if (!ioremap_allowed(phys_addr, size, prot))
+ if (!ioremap_allowed(phys_addr, size, pgprot_val(prot)))
return NULL;
area = get_vm_area_caller(size, VM_IOREMAP,
@@ -38,17 +38,22 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
vaddr = (unsigned long)area->addr;
area->phys_addr = phys_addr;
- if (ioremap_page_range(vaddr, vaddr + size, phys_addr,
- __pgprot(prot))) {
+ if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
free_vm_area(area);
return NULL;
}
return (void __iomem *)(vaddr + offset);
}
+
+void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
+ unsigned long prot)
+{
+ return generic_ioremap_prot(phys_addr, size, __pgprot(prot));
+}
EXPORT_SYMBOL(ioremap_prot);
-void iounmap(volatile void __iomem *addr)
+void generic_iounmap(volatile void __iomem *addr)
{
void *vaddr = (void *)((unsigned long)addr & PAGE_MASK);
@@ -58,4 +63,9 @@ void iounmap(volatile void __iomem *addr)
if (is_vmalloc_addr(vaddr))
vunmap(vaddr);
}
+
+void iounmap(volatile void __iomem *addr)
+{
+ generic_iounmap(addr);
+}
EXPORT_SYMBOL(iounmap);
--
2.34.1
next prev parent reply other threads:[~2023-06-09 7:56 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 7:55 [PATCH v6 00/19] mm: ioremap: Convert architectures to take GENERIC_IOREMAP way Baoquan He
2023-06-09 7:55 ` [PATCH v6 01/19] asm-generic/iomap.h: remove ARCH_HAS_IOREMAP_xx macros Baoquan He
2023-06-09 7:55 ` [PATCH v6 02/19] hexagon: mm: Convert to GENERIC_IOREMAP Baoquan He
2023-06-09 11:09 ` kernel test robot
2023-06-10 8:26 ` Baoquan He
2023-06-11 5:40 ` Mike Rapoport
2023-06-11 7:57 ` Baoquan He
2023-06-12 16:02 ` Nathan Chancellor
2023-06-16 12:46 ` Baoquan He
2023-06-09 7:55 ` [PATCH v6 03/19] openrisc: mm: remove unneeded early ioremap code Baoquan He
2023-06-10 6:24 ` Christoph Hellwig
2023-06-11 5:44 ` Mike Rapoport
2023-06-09 7:55 ` Baoquan He [this message]
2023-06-10 6:24 ` [PATCH v6 04/19] mm/ioremap: Define generic_ioremap_prot() and generic_iounmap() Christoph Hellwig
2023-06-09 7:55 ` [PATCH v6 05/19] mm: ioremap: allow ARCH to have its own ioremap method definition Baoquan He
2023-06-09 7:55 ` [PATCH v6 06/19] mm/ioremap: add slab availability checking in ioremap_prot Baoquan He
2023-06-09 7:55 ` [PATCH v6 07/19] arc: mm: Convert to GENERIC_IOREMAP Baoquan He
2023-06-09 7:55 ` [PATCH v6 08/19] ia64: " Baoquan He
2023-06-09 7:55 ` [PATCH v6 09/19] openrisc: " Baoquan He
2023-06-10 6:25 ` Christoph Hellwig
2023-06-11 5:46 ` Mike Rapoport
2023-06-09 7:55 ` [PATCH v6 10/19] s390: " Baoquan He
2023-06-09 15:41 ` kernel test robot
2023-06-09 17:42 ` kernel test robot
2023-06-09 17:42 ` kernel test robot
2023-06-11 11:10 ` Baoquan He
2023-06-21 14:53 ` Alexander Gordeev
2023-06-09 7:55 ` [PATCH v6 11/19] sh: add <asm-generic/io.h> including Baoquan He
2023-06-09 8:10 ` John Paul Adrian Glaubitz
2023-06-09 8:34 ` Baoquan He
2023-06-09 7:55 ` [PATCH v6 12/19] sh: mm: Convert to GENERIC_IOREMAP Baoquan He
2023-06-09 7:55 ` [PATCH v6 13/19] xtensa: " Baoquan He
2023-06-09 7:55 ` [PATCH v6 14/19] parisc: " Baoquan He
2023-06-19 5:47 ` Helge Deller
2023-06-09 7:55 ` [PATCH v6 15/19] mm/ioremap: Consider IOREMAP space in generic ioremap Baoquan He
2023-06-10 6:26 ` Christoph Hellwig
2023-06-09 7:55 ` [PATCH v6 16/19] mm: move is_ioremap_addr() into new header file Baoquan He
2023-06-09 7:55 ` [PATCH v6 17/19] powerpc: mm: Convert to GENERIC_IOREMAP Baoquan He
2023-06-09 7:55 ` [PATCH v6 18/19] arm64 : mm: add wrapper function ioremap_prot() Baoquan He
2023-06-14 15:14 ` Catalin Marinas
2023-06-09 7:55 ` [PATCH v6 19/19] mm: ioremap: remove unneeded ioremap_allowed and iounmap_allowed Baoquan He
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230609075528.9390-5-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=David.Laight@ACULAB.COM \
--cc=agordeev@linux.ibm.com \
--cc=arnd@arndb.de \
--cc=christophe.leroy@csgroup.eu \
--cc=deller@gmx.de \
--cc=hch@lst.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rppt@kernel.org \
--cc=schnelle@linux.ibm.com \
--cc=shorne@gmail.com \
--cc=wangkefeng.wang@huawei.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).