Re: [RESEND RFC PATCH 03/12] sh: SH4 OF support.

Hi Sato-san,

On Thu, Aug 31, 2023 at 5:22 AM Yoshinori Sato
<[email protected]> wrote:
> - switch generic framework in clock / PCI.
>
> Signed-off-by: Yoshinori Sato <[email protected]>

> --- a/arch/sh/include/asm/io.h
> +++ b/arch/sh/include/asm/io.h
> @@ -292,4 +292,14 @@ static inline void iounmap(volatile void __iomem *addr) { }
>  int valid_phys_addr_range(phys_addr_t addr, size_t size);
>  int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
>
> +
> +#ifdef __KERNEL__
> +#define PCI_IOBASE     0xfe240000UL
> +
> +#define HAVE_ARCH_PIO_SIZE
> +#define PIO_OFFSET     PCI_IOBASE
> +#define PIO_MASK       0x3ffffUL
> +#define PIO_RESERVED   0x40000UL
> +#endif /* __KERNEL__ */
> +

Since commit b94692e84dccf12d ("sh: add <asm-generic/io.h> including")
in v6.6-rc1, the new definitions must be inserted higher up, before
the inclusion of <asm-generic/io.h>, to avoid:

    arch/sh/include/asm/io.h:322: warning: "PCI_IOBASE" redefined
      322 | #define PCI_IOBASE      0xfe240000UL
          |
    include/asm-generic/io.h:527: note: this is the location of the
previous definition

>  #endif /* __ASM_SH_IO_H */

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds