By taking GENERIC_IOREMAP method, the generic ioremap_prot() and
iounmap() are visible and available to arch. This change will
simplify implementation by removing duplicated codes with generic
ioremap_prot() and iounmap(), and has the equivalent functioality.
For hexagon, the current ioremap() and iounmap() are the same as
generic version. After taking GENERIC_IOREMAP way, the old ioremap()
and iounmap() can be completely removed.
Signed-off-by: Baoquan He <[email protected]>
Reviewed-by: Mike Rapoport (IBM) <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Cc: Brian Cain <[email protected]>
Cc: [email protected]
---
arch/hexagon/Kconfig | 1 +
arch/hexagon/include/asm/io.h | 9 +++++--
arch/hexagon/mm/ioremap.c | 44 -----------------------------------
3 files changed, 8 insertions(+), 46 deletions(-)
delete mode 100644 arch/hexagon/mm/ioremap.c
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 54eadf265178..17afffde1a7f 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -25,6 +25,7 @@ config HEXAGON
select NEED_SG_DMA_LENGTH
select NO_IOPORT_MAP
select GENERIC_IOMAP
+ select GENERIC_IOREMAP
select GENERIC_SMP_IDLE_THREAD
select STACKTRACE_SUPPORT
select GENERIC_CLOCKEVENTS_BROADCAST
diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h
index 46a099de85b7..dcd9cbbf5934 100644
--- a/arch/hexagon/include/asm/io.h
+++ b/arch/hexagon/include/asm/io.h
@@ -170,8 +170,13 @@ static inline void writel(u32 data, volatile void __iomem *addr)
#define writew_relaxed __raw_writew
#define writel_relaxed __raw_writel
-void __iomem *ioremap(unsigned long phys_addr, unsigned long size);
-#define ioremap_uc(X, Y) ioremap((X), (Y))
+/*
+ * I/O memory mapping functions.
+ */
+#define _PAGE_IOREMAP (_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
+ (__HEXAGON_C_DEV << 6))
+
+#define ioremap_uc(addr, size) ioremap((addr), (size))
#define __raw_writel writel
diff --git a/arch/hexagon/mm/ioremap.c b/arch/hexagon/mm/ioremap.c
deleted file mode 100644
index 255c5b1ee1a7..000000000000
--- a/arch/hexagon/mm/ioremap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * I/O remap functions for Hexagon
- *
- * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
- */
-
-#include <linux/io.h>
-#include <linux/vmalloc.h>
-#include <linux/mm.h>
-
-void __iomem *ioremap(unsigned long phys_addr, unsigned long size)
-{
- unsigned long last_addr, addr;
- unsigned long offset = phys_addr & ~PAGE_MASK;
- struct vm_struct *area;
-
- pgprot_t prot = __pgprot(_PAGE_PRESENT|_PAGE_READ|_PAGE_WRITE
- |(__HEXAGON_C_DEV << 6));
-
- last_addr = phys_addr + size - 1;
-
- /* Wrapping not allowed */
- if (!size || (last_addr < phys_addr))
- return NULL;
-
- /* Rounds up to next page size, including whole-page offset */
- size = PAGE_ALIGN(offset + size);
-
- area = get_vm_area(size, VM_IOREMAP);
- addr = (unsigned long)area->addr;
-
- if (ioremap_page_range(addr, addr+size, phys_addr, prot)) {
- vunmap((void *)addr);
- return NULL;
- }
-
- return (void __iomem *) (offset + addr);
-}
-
-void iounmap(const volatile void __iomem *addr)
-{
- vunmap((void *) ((unsigned long) addr & PAGE_MASK));
-}
--
2.34.1
Hi Baoquan,
kernel test robot noticed the following build errors:
[auto build test ERROR on akpm-mm/mm-everything]
url: https://github.com/intel-lab-lkp/linux/commits/Baoquan-He/asm-generic-iomap-h-remove-ARCH_HAS_IOREMAP_xx-macros/20230609-160014
base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
patch link: https://lore.kernel.org/r/20230609075528.9390-3-bhe%40redhat.com
patch subject: [PATCH v6 02/19] hexagon: mm: Convert to GENERIC_IOREMAP
config: hexagon-randconfig-r041-20230608 (https://download.01.org/0day-ci/archive/20230609/[email protected]/config)
compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a)
reproduce (this is a W=1 build):
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
git remote add akpm-mm https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git
git fetch akpm-mm mm-everything
git checkout akpm-mm/mm-everything
b4 shazam https://lore.kernel.org/r/[email protected]
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon prepare
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from arch/hexagon/kernel/asm-offsets.c:15:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:11:
In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1:
In file included from include/asm-generic/hardirq.h:17:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/hexagon/include/asm/io.h:339:
include/asm-generic/io.h:547:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
547 | val = __raw_readb(PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:560:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
560 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu'
37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
| ^
In file included from arch/hexagon/kernel/asm-offsets.c:15:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:11:
In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1:
In file included from include/asm-generic/hardirq.h:17:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/hexagon/include/asm/io.h:339:
include/asm-generic/io.h:573:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
573 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu'
35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
| ^
In file included from arch/hexagon/kernel/asm-offsets.c:15:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:11:
In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1:
In file included from include/asm-generic/hardirq.h:17:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/hexagon/include/asm/io.h:339:
include/asm-generic/io.h:584:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
584 | __raw_writeb(value, PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:594:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
594 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:604:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
604 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
>> include/asm-generic/io.h:1078:6: error: conflicting types for 'iounmap'
1078 | void iounmap(volatile void __iomem *addr);
| ^
arch/hexagon/include/asm/io.h:30:13: note: previous declaration is here
30 | extern void iounmap(const volatile void __iomem *addr);
| ^
6 warnings and 1 error generated.
make[2]: *** [scripts/Makefile.build:114: arch/hexagon/kernel/asm-offsets.s] Error 1 shuffle=2830738586
make[2]: Target 'prepare' not remade because of errors.
make[1]: *** [Makefile:1287: prepare0] Error 2 shuffle=2830738586
make[1]: Target 'prepare' not remade because of errors.
make: *** [Makefile:226: __sub-make] Error 2 shuffle=2830738586
make: Target 'prepare' not remade because of errors.
vim +/iounmap +1078 include/asm-generic/io.h
18e780b4e6ab89 Kefeng Wang 2022-06-07 1075
abc5992b9dd0ba Kefeng Wang 2022-06-07 1076 void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
abc5992b9dd0ba Kefeng Wang 2022-06-07 1077 unsigned long prot);
80b0ca98f91ddb Christoph Hellwig 2019-08-13 @1078 void iounmap(volatile void __iomem *addr);
80b0ca98f91ddb Christoph Hellwig 2019-08-13 1079
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On 06/09/23 at 07:09pm, kernel test robot wrote:
> Hi Baoquan,
>
> kernel test robot noticed the following build errors:
>
> [auto build test ERROR on akpm-mm/mm-everything]
>
> url: https://github.com/intel-lab-lkp/linux/commits/Baoquan-He/asm-generic-iomap-h-remove-ARCH_HAS_IOREMAP_xx-macros/20230609-160014
> base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
> patch link: https://lore.kernel.org/r/20230609075528.9390-3-bhe%40redhat.com
> patch subject: [PATCH v6 02/19] hexagon: mm: Convert to GENERIC_IOREMAP
> config: hexagon-randconfig-r041-20230608 (https://download.01.org/0day-ci/archive/20230609/[email protected]/config)
> compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a)
> reproduce (this is a W=1 build):
> mkdir -p ~/bin
> wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> git remote add akpm-mm https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git
> git fetch akpm-mm mm-everything
> git checkout akpm-mm/mm-everything
> b4 shazam https://lore.kernel.org/r/[email protected]
> # save the config file
> mkdir build_dir && cp config build_dir/.config
> COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon olddefconfig
> COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon prepare
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <[email protected]>
> | Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Thanks for reporting. I reproduced them on my local machine. Below patch
can fix them. And by the way, I also saw the clone3 warning, and have to
made change in scripts/checksyscalls.sh to mute it, wondering how you
handle it in your testing.
------
stdin>:1520:2: warning: syscall clone3 not implemented [-W#warnings]
1520 | #warning syscall clone3 not implemented
| ^
1 warning generated.
------
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index 1e5d2eeb726d..3a369b78edb7 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -148,6 +148,7 @@ cat << EOF
#define __IGNORE_nanosleep
#define __IGNORE_io_getevents
#define __IGNORE_recvmmsg
+#define __IGNORE_clone3
#endif
From 6a86f4360a61a2b7b4d71172e5c03be554367553 Mon Sep 17 00:00:00 2001
From: root <[email protected]>
Date: Fri, 9 Jun 2023 21:21:36 -0400
Subject: [PATCH] hexagon: mm: fix warning in asm/io.h
Content-type: text/plain
Remove the old iounmap() declaration which is not consistent with the
standard one in asm-generic/io.h, let's use the standard one.
And also add macro definition of inb/w/l and outb/w/l to override
the definition of them in asm-generic/io.h.
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Baoquan He <[email protected]>
---
arch/hexagon/include/asm/io.h | 8 ++++++--
scripts/checksyscalls.sh | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h
index dcd9cbbf5934..efe9cb00ebf8 100644
--- a/arch/hexagon/include/asm/io.h
+++ b/arch/hexagon/include/asm/io.h
@@ -27,8 +27,6 @@
extern int remap_area_pages(unsigned long start, unsigned long phys_addr,
unsigned long end, unsigned long flags);
-extern void iounmap(const volatile void __iomem *addr);
-
/* Defined in lib/io.c, needed for smc91x driver. */
extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen);
extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen);
@@ -207,16 +205,19 @@ static inline void memset_io(volatile void __iomem *addr, int value,
*
* Operates on "I/O bus I/O space"
*/
+#define inb inb
static inline u8 inb(unsigned long port)
{
return readb(_IO_BASE + (port & IO_SPACE_LIMIT));
}
+#define inw inw
static inline u16 inw(unsigned long port)
{
return readw(_IO_BASE + (port & IO_SPACE_LIMIT));
}
+#define inl inl
static inline u32 inl(unsigned long port)
{
return readl(_IO_BASE + (port & IO_SPACE_LIMIT));
@@ -227,16 +228,19 @@ static inline u32 inl(unsigned long port)
* @data: data to write to
* @addr: address in I/O space
*/
+#define outb outb
static inline void outb(u8 data, unsigned long port)
{
writeb(data, _IO_BASE + (port & IO_SPACE_LIMIT));
}
+#define outw outw
static inline void outw(u16 data, unsigned long port)
{
writew(data, _IO_BASE + (port & IO_SPACE_LIMIT));
}
+#define outl outl
static inline void outl(u32 data, unsigned long port)
{
writel(data, _IO_BASE + (port & IO_SPACE_LIMIT));
Hi Baoquan,
On Sat, Jun 10, 2023 at 04:26:21PM +0800, Baoquan He wrote:
> On 06/09/23 at 07:09pm, kernel test robot wrote:
> > Hi Baoquan,
> >
> > kernel test robot noticed the following build errors:
> >
> > [auto build test ERROR on akpm-mm/mm-everything]
> >
> > url: https://github.com/intel-lab-lkp/linux/commits/Baoquan-He/asm-generic-iomap-h-remove-ARCH_HAS_IOREMAP_xx-macros/20230609-160014
> > base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
> > patch link: https://lore.kernel.org/r/20230609075528.9390-3-bhe%40redhat.com
> > patch subject: [PATCH v6 02/19] hexagon: mm: Convert to GENERIC_IOREMAP
> > config: hexagon-randconfig-r041-20230608 (https://download.01.org/0day-ci/archive/20230609/[email protected]/config)
> > compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a)
> > reproduce (this is a W=1 build):
> > mkdir -p ~/bin
> > wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> > chmod +x ~/bin/make.cross
> > git remote add akpm-mm https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git
> > git fetch akpm-mm mm-everything
> > git checkout akpm-mm/mm-everything
> > b4 shazam https://lore.kernel.org/r/[email protected]
> > # save the config file
> > mkdir build_dir && cp config build_dir/.config
> > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon olddefconfig
> > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon prepare
> >
> > If you fix the issue in a separate patch/commit (i.e. not just a new version of
> > the same patch/commit), kindly add following tags
> > | Reported-by: kernel test robot <[email protected]>
> > | Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
>
> Thanks for reporting. I reproduced them on my local machine. Below patch
> can fix them. And by the way, I also saw the clone3 warning, and have to
> made change in scripts/checksyscalls.sh to mute it, wondering how you
> handle it in your testing.
I think the warning kbuild reported is rather this one:
>> include/asm-generic/io.h:1078:6: error: conflicting types for 'iounmap'
1078 | void iounmap(volatile void __iomem *addr);
| ^
> ------
> stdin>:1520:2: warning: syscall clone3 not implemented [-W#warnings]
> 1520 | #warning syscall clone3 not implemented
> | ^
> 1 warning generated.
>
> ------
> diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
> index 1e5d2eeb726d..3a369b78edb7 100755
> --- a/scripts/checksyscalls.sh
> +++ b/scripts/checksyscalls.sh
> @@ -148,6 +148,7 @@ cat << EOF
> #define __IGNORE_nanosleep
> #define __IGNORE_io_getevents
> #define __IGNORE_recvmmsg
> +#define __IGNORE_clone3
> #endif
>
>
> From 6a86f4360a61a2b7b4d71172e5c03be554367553 Mon Sep 17 00:00:00 2001
> From: root <[email protected]>
> Date: Fri, 9 Jun 2023 21:21:36 -0400
> Subject: [PATCH] hexagon: mm: fix warning in asm/io.h
> Content-type: text/plain
>
> Remove the old iounmap() declaration which is not consistent with the
> standard one in asm-generic/io.h, let's use the standard one.
>
> And also add macro definition of inb/w/l and outb/w/l to override
> the definition of them in asm-generic/io.h.
>
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Baoquan He <[email protected]>
> ---
> arch/hexagon/include/asm/io.h | 8 ++++++--
> scripts/checksyscalls.sh | 1 +
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h
> index dcd9cbbf5934..efe9cb00ebf8 100644
> --- a/arch/hexagon/include/asm/io.h
> +++ b/arch/hexagon/include/asm/io.h
> @@ -27,8 +27,6 @@
> extern int remap_area_pages(unsigned long start, unsigned long phys_addr,
> unsigned long end, unsigned long flags);
>
> -extern void iounmap(const volatile void __iomem *addr);
> -
> /* Defined in lib/io.c, needed for smc91x driver. */
> extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen);
> extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen);
> @@ -207,16 +205,19 @@ static inline void memset_io(volatile void __iomem *addr, int value,
> *
> * Operates on "I/O bus I/O space"
> */
> +#define inb inb
> static inline u8 inb(unsigned long port)
> {
> return readb(_IO_BASE + (port & IO_SPACE_LIMIT));
> }
>
> +#define inw inw
> static inline u16 inw(unsigned long port)
> {
> return readw(_IO_BASE + (port & IO_SPACE_LIMIT));
> }
>
> +#define inl inl
> static inline u32 inl(unsigned long port)
> {
> return readl(_IO_BASE + (port & IO_SPACE_LIMIT));
> @@ -227,16 +228,19 @@ static inline u32 inl(unsigned long port)
> * @data: data to write to
> * @addr: address in I/O space
> */
> +#define outb outb
> static inline void outb(u8 data, unsigned long port)
> {
> writeb(data, _IO_BASE + (port & IO_SPACE_LIMIT));
> }
>
> +#define outw outw
> static inline void outw(u16 data, unsigned long port)
> {
> writew(data, _IO_BASE + (port & IO_SPACE_LIMIT));
> }
>
> +#define outl outl
> static inline void outl(u32 data, unsigned long port)
> {
> writel(data, _IO_BASE + (port & IO_SPACE_LIMIT));
>
--
Sincerely yours,
Mike.
On 06/11/23 at 08:40am, Mike Rapoport wrote:
> Hi Baoquan,
>
> On Sat, Jun 10, 2023 at 04:26:21PM +0800, Baoquan He wrote:
> > On 06/09/23 at 07:09pm, kernel test robot wrote:
> > > Hi Baoquan,
> > >
> > > kernel test robot noticed the following build errors:
> > >
> > > [auto build test ERROR on akpm-mm/mm-everything]
> > >
> > > url: https://github.com/intel-lab-lkp/linux/commits/Baoquan-He/asm-generic-iomap-h-remove-ARCH_HAS_IOREMAP_xx-macros/20230609-160014
> > > base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
> > > patch link: https://lore.kernel.org/r/20230609075528.9390-3-bhe%40redhat.com
> > > patch subject: [PATCH v6 02/19] hexagon: mm: Convert to GENERIC_IOREMAP
> > > config: hexagon-randconfig-r041-20230608 (https://download.01.org/0day-ci/archive/20230609/[email protected]/config)
> > > compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a)
> > > reproduce (this is a W=1 build):
> > > mkdir -p ~/bin
> > > wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> > > chmod +x ~/bin/make.cross
> > > git remote add akpm-mm https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git
> > > git fetch akpm-mm mm-everything
> > > git checkout akpm-mm/mm-everything
> > > b4 shazam https://lore.kernel.org/r/[email protected]
> > > # save the config file
> > > mkdir build_dir && cp config build_dir/.config
> > > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon olddefconfig
> > > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon prepare
> > >
> > > If you fix the issue in a separate patch/commit (i.e. not just a new version of
> > > the same patch/commit), kindly add following tags
> > > | Reported-by: kernel test robot <[email protected]>
> > > | Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> >
> > Thanks for reporting. I reproduced them on my local machine. Below patch
> > can fix them. And by the way, I also saw the clone3 warning, and have to
> > made change in scripts/checksyscalls.sh to mute it, wondering how you
> > handle it in your testing.
>
> I think the warning kbuild reported is rather this one:
>
> >> include/asm-generic/io.h:1078:6: error: conflicting types for 'iounmap'
> 1078 | void iounmap(volatile void __iomem *addr);
> | ^
This one is reported as error. The old iounmap() declaration has a const,
while the standard one doesn't have. So I just remove the old one to use
the standard one.
Another one is warning about PCI_IOBASE. Because inb/w/l and outb/w/l is
redefined in asm-generic/io.h, and it uses PCI_IOBASE which is defniend
as NULL in asm-generic/io.h if ARCH doesn't have its own PCI_IOBASE
definition. Then the warning is triggered. So I define macro to override
the standard inb/w/l and outb/w/l.
#ifndef PCI_IOBASE
#define PCI_IOBASE ((void __iomem *)0)
#endif
> > ------
> > stdin>:1520:2: warning: syscall clone3 not implemented [-W#warnings]
> > 1520 | #warning syscall clone3 not implemented
> > | ^
> > 1 warning generated.
> >
> > ------
> > diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
> > index 1e5d2eeb726d..3a369b78edb7 100755
> > --- a/scripts/checksyscalls.sh
> > +++ b/scripts/checksyscalls.sh
> > @@ -148,6 +148,7 @@ cat << EOF
> > #define __IGNORE_nanosleep
> > #define __IGNORE_io_getevents
> > #define __IGNORE_recvmmsg
> > +#define __IGNORE_clone3
> > #endif
> >
> >
> > From 6a86f4360a61a2b7b4d71172e5c03be554367553 Mon Sep 17 00:00:00 2001
> > From: root <[email protected]>
> > Date: Fri, 9 Jun 2023 21:21:36 -0400
> > Subject: [PATCH] hexagon: mm: fix warning in asm/io.h
> > Content-type: text/plain
> >
> > Remove the old iounmap() declaration which is not consistent with the
> > standard one in asm-generic/io.h, let's use the standard one.
> >
> > And also add macro definition of inb/w/l and outb/w/l to override
> > the definition of them in asm-generic/io.h.
> >
> > Reported-by: kernel test robot <[email protected]>
> > Signed-off-by: Baoquan He <[email protected]>
> > ---
> > arch/hexagon/include/asm/io.h | 8 ++++++--
> > scripts/checksyscalls.sh | 1 +
> > 2 files changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h
> > index dcd9cbbf5934..efe9cb00ebf8 100644
> > --- a/arch/hexagon/include/asm/io.h
> > +++ b/arch/hexagon/include/asm/io.h
> > @@ -27,8 +27,6 @@
> > extern int remap_area_pages(unsigned long start, unsigned long phys_addr,
> > unsigned long end, unsigned long flags);
> >
> > -extern void iounmap(const volatile void __iomem *addr);
> > -
> > /* Defined in lib/io.c, needed for smc91x driver. */
> > extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen);
> > extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen);
> > @@ -207,16 +205,19 @@ static inline void memset_io(volatile void __iomem *addr, int value,
> > *
> > * Operates on "I/O bus I/O space"
> > */
> > +#define inb inb
> > static inline u8 inb(unsigned long port)
> > {
> > return readb(_IO_BASE + (port & IO_SPACE_LIMIT));
> > }
> >
> > +#define inw inw
> > static inline u16 inw(unsigned long port)
> > {
> > return readw(_IO_BASE + (port & IO_SPACE_LIMIT));
> > }
> >
> > +#define inl inl
> > static inline u32 inl(unsigned long port)
> > {
> > return readl(_IO_BASE + (port & IO_SPACE_LIMIT));
> > @@ -227,16 +228,19 @@ static inline u32 inl(unsigned long port)
> > * @data: data to write to
> > * @addr: address in I/O space
> > */
> > +#define outb outb
> > static inline void outb(u8 data, unsigned long port)
> > {
> > writeb(data, _IO_BASE + (port & IO_SPACE_LIMIT));
> > }
> >
> > +#define outw outw
> > static inline void outw(u16 data, unsigned long port)
> > {
> > writew(data, _IO_BASE + (port & IO_SPACE_LIMIT));
> > }
> >
> > +#define outl outl
> > static inline void outl(u32 data, unsigned long port)
> > {
> > writel(data, _IO_BASE + (port & IO_SPACE_LIMIT));
> >
>
> --
> Sincerely yours,
> Mike.
>
On Sun, Jun 11, 2023 at 03:57:32PM +0800, Baoquan He wrote:
> On 06/11/23 at 08:40am, Mike Rapoport wrote:
> > Hi Baoquan,
> >
> > On Sat, Jun 10, 2023 at 04:26:21PM +0800, Baoquan He wrote:
> > > On 06/09/23 at 07:09pm, kernel test robot wrote:
> > > > Hi Baoquan,
> > > >
> > > > kernel test robot noticed the following build errors:
> > > >
> > > > [auto build test ERROR on akpm-mm/mm-everything]
> > > >
> > > > url: https://github.com/intel-lab-lkp/linux/commits/Baoquan-He/asm-generic-iomap-h-remove-ARCH_HAS_IOREMAP_xx-macros/20230609-160014
> > > > base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
> > > > patch link: https://lore.kernel.org/r/20230609075528.9390-3-bhe%40redhat.com
> > > > patch subject: [PATCH v6 02/19] hexagon: mm: Convert to GENERIC_IOREMAP
> > > > config: hexagon-randconfig-r041-20230608 (https://download.01.org/0day-ci/archive/20230609/[email protected]/config)
> > > > compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a)
> > > > reproduce (this is a W=1 build):
> > > > mkdir -p ~/bin
> > > > wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> > > > chmod +x ~/bin/make.cross
> > > > git remote add akpm-mm https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git
> > > > git fetch akpm-mm mm-everything
> > > > git checkout akpm-mm/mm-everything
> > > > b4 shazam https://lore.kernel.org/r/[email protected]
> > > > # save the config file
> > > > mkdir build_dir && cp config build_dir/.config
> > > > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon olddefconfig
> > > > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon prepare
> > > >
> > > > If you fix the issue in a separate patch/commit (i.e. not just a new version of
> > > > the same patch/commit), kindly add following tags
> > > > | Reported-by: kernel test robot <[email protected]>
> > > > | Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> > >
> > > Thanks for reporting. I reproduced them on my local machine. Below patch
> > > can fix them. And by the way, I also saw the clone3 warning, and have to
> > > made change in scripts/checksyscalls.sh to mute it, wondering how you
> > > handle it in your testing.
> >
> > I think the warning kbuild reported is rather this one:
> >
> > >> include/asm-generic/io.h:1078:6: error: conflicting types for 'iounmap'
> > 1078 | void iounmap(volatile void __iomem *addr);
> > | ^
>
> This one is reported as error. The old iounmap() declaration has a const,
> while the standard one doesn't have. So I just remove the old one to use
> the standard one.
>
> Another one is warning about PCI_IOBASE. Because inb/w/l and outb/w/l is
> redefined in asm-generic/io.h, and it uses PCI_IOBASE which is defniend
> as NULL in asm-generic/io.h if ARCH doesn't have its own PCI_IOBASE
> definition. Then the warning is triggered. So I define macro to override
> the standard inb/w/l and outb/w/l.
>
> #ifndef PCI_IOBASE
> #define PCI_IOBASE ((void __iomem *)0)
> #endif
I believe that this series [1] by Niklas Schnelle should take care of
the PCI_IOBASE warnings (which are not Hexagon specific), so there is no
need to worry about them when they show up in build reports.
[1]: https://lore.kernel.org/[email protected]/
Cheers,
Nathan
> > > stdin>:1520:2: warning: syscall clone3 not implemented [-W#warnings]
> > > 1520 | #warning syscall clone3 not implemented
> > > | ^
> > > 1 warning generated.
> > >
> > > ------
> > > diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
> > > index 1e5d2eeb726d..3a369b78edb7 100755
> > > --- a/scripts/checksyscalls.sh
> > > +++ b/scripts/checksyscalls.sh
> > > @@ -148,6 +148,7 @@ cat << EOF
> > > #define __IGNORE_nanosleep
> > > #define __IGNORE_io_getevents
> > > #define __IGNORE_recvmmsg
> > > +#define __IGNORE_clone3
> > > #endif
> > >
> > >
> > > From 6a86f4360a61a2b7b4d71172e5c03be554367553 Mon Sep 17 00:00:00 2001
> > > From: root <[email protected]>
> > > Date: Fri, 9 Jun 2023 21:21:36 -0400
> > > Subject: [PATCH] hexagon: mm: fix warning in asm/io.h
> > > Content-type: text/plain
> > >
> > > Remove the old iounmap() declaration which is not consistent with the
> > > standard one in asm-generic/io.h, let's use the standard one.
> > >
> > > And also add macro definition of inb/w/l and outb/w/l to override
> > > the definition of them in asm-generic/io.h.
> > >
> > > Reported-by: kernel test robot <[email protected]>
> > > Signed-off-by: Baoquan He <[email protected]>
> > > ---
> > > arch/hexagon/include/asm/io.h | 8 ++++++--
> > > scripts/checksyscalls.sh | 1 +
> > > 2 files changed, 7 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/arch/hexagon/include/asm/io.h b/arch/hexagon/include/asm/io.h
> > > index dcd9cbbf5934..efe9cb00ebf8 100644
> > > --- a/arch/hexagon/include/asm/io.h
> > > +++ b/arch/hexagon/include/asm/io.h
> > > @@ -27,8 +27,6 @@
> > > extern int remap_area_pages(unsigned long start, unsigned long phys_addr,
> > > unsigned long end, unsigned long flags);
> > >
> > > -extern void iounmap(const volatile void __iomem *addr);
> > > -
> > > /* Defined in lib/io.c, needed for smc91x driver. */
> > > extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen);
> > > extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen);
> > > @@ -207,16 +205,19 @@ static inline void memset_io(volatile void __iomem *addr, int value,
> > > *
> > > * Operates on "I/O bus I/O space"
> > > */
> > > +#define inb inb
> > > static inline u8 inb(unsigned long port)
> > > {
> > > return readb(_IO_BASE + (port & IO_SPACE_LIMIT));
> > > }
> > >
> > > +#define inw inw
> > > static inline u16 inw(unsigned long port)
> > > {
> > > return readw(_IO_BASE + (port & IO_SPACE_LIMIT));
> > > }
> > >
> > > +#define inl inl
> > > static inline u32 inl(unsigned long port)
> > > {
> > > return readl(_IO_BASE + (port & IO_SPACE_LIMIT));
> > > @@ -227,16 +228,19 @@ static inline u32 inl(unsigned long port)
> > > * @data: data to write to
> > > * @addr: address in I/O space
> > > */
> > > +#define outb outb
> > > static inline void outb(u8 data, unsigned long port)
> > > {
> > > writeb(data, _IO_BASE + (port & IO_SPACE_LIMIT));
> > > }
> > >
> > > +#define outw outw
> > > static inline void outw(u16 data, unsigned long port)
> > > {
> > > writew(data, _IO_BASE + (port & IO_SPACE_LIMIT));
> > > }
> > >
> > > +#define outl outl
> > > static inline void outl(u32 data, unsigned long port)
> > > {
> > > writel(data, _IO_BASE + (port & IO_SPACE_LIMIT));
> > >
> >
> > --
> > Sincerely yours,
> > Mike.
> >
>
>
On 06/12/23 at 09:02am, Nathan Chancellor wrote:
> On Sun, Jun 11, 2023 at 03:57:32PM +0800, Baoquan He wrote:
> > On 06/11/23 at 08:40am, Mike Rapoport wrote:
> > > Hi Baoquan,
> > >
> > > On Sat, Jun 10, 2023 at 04:26:21PM +0800, Baoquan He wrote:
> > > > On 06/09/23 at 07:09pm, kernel test robot wrote:
> > > > > Hi Baoquan,
> > > > >
> > > > > kernel test robot noticed the following build errors:
> > > > >
> > > > > [auto build test ERROR on akpm-mm/mm-everything]
> > > > >
> > > > > url: https://github.com/intel-lab-lkp/linux/commits/Baoquan-He/asm-generic-iomap-h-remove-ARCH_HAS_IOREMAP_xx-macros/20230609-160014
> > > > > base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
> > > > > patch link: https://lore.kernel.org/r/20230609075528.9390-3-bhe%40redhat.com
> > > > > patch subject: [PATCH v6 02/19] hexagon: mm: Convert to GENERIC_IOREMAP
> > > > > config: hexagon-randconfig-r041-20230608 (https://download.01.org/0day-ci/archive/20230609/[email protected]/config)
> > > > > compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a)
> > > > > reproduce (this is a W=1 build):
> > > > > mkdir -p ~/bin
> > > > > wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> > > > > chmod +x ~/bin/make.cross
> > > > > git remote add akpm-mm https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git
> > > > > git fetch akpm-mm mm-everything
> > > > > git checkout akpm-mm/mm-everything
> > > > > b4 shazam https://lore.kernel.org/r/[email protected]
> > > > > # save the config file
> > > > > mkdir build_dir && cp config build_dir/.config
> > > > > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon olddefconfig
> > > > > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=hexagon prepare
> > > > >
> > > > > If you fix the issue in a separate patch/commit (i.e. not just a new version of
> > > > > the same patch/commit), kindly add following tags
> > > > > | Reported-by: kernel test robot <[email protected]>
> > > > > | Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> > > >
> > > > Thanks for reporting. I reproduced them on my local machine. Below patch
> > > > can fix them. And by the way, I also saw the clone3 warning, and have to
> > > > made change in scripts/checksyscalls.sh to mute it, wondering how you
> > > > handle it in your testing.
> > >
> > > I think the warning kbuild reported is rather this one:
> > >
> > > >> include/asm-generic/io.h:1078:6: error: conflicting types for 'iounmap'
> > > 1078 | void iounmap(volatile void __iomem *addr);
> > > | ^
> >
> > This one is reported as error. The old iounmap() declaration has a const,
> > while the standard one doesn't have. So I just remove the old one to use
> > the standard one.
> >
> > Another one is warning about PCI_IOBASE. Because inb/w/l and outb/w/l is
> > redefined in asm-generic/io.h, and it uses PCI_IOBASE which is defniend
> > as NULL in asm-generic/io.h if ARCH doesn't have its own PCI_IOBASE
> > definition. Then the warning is triggered. So I define macro to override
> > the standard inb/w/l and outb/w/l.
> >
> > #ifndef PCI_IOBASE
> > #define PCI_IOBASE ((void __iomem *)0)
> > #endif
>
> I believe that this series [1] by Niklas Schnelle should take care of
> the PCI_IOBASE warnings (which are not Hexagon specific), so there is no
> need to worry about them when they show up in build reports.
>
> [1]: https://lore.kernel.org/[email protected]/
That's great, then I can skip the fixing of PCI_IOBASE warnings, only
wrap the fixing of iounmap() declaration issue into the new post. Thanks
a lot for the information, Nathan.
Thanks
Baoquan