[GIT PULL] asm-generic changes for 6.15

[GIT PULL] asm-generic changes for 6.15

[Arnd Bergmann]

The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b:

  Linux 6.14-rc1 (2025-02-02 15:39:26 -0800)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git tags/asm-generic-6.15

for you to fetch changes up to ece69af2ede103e190ffdfccd9f9ec850606ab5e:

  rwonce: handle KCSAN like KASAN in read_word_at_a_time() (2025-03-25 17:50:38 +0100)

----------------------------------------------------------------
asm-generic changes for 6.15

This is mainly set of cleanups of asm-generic/io.h, resolving problems
with inconsistent semantics of ioread64/iowrite64 that were causing
runtime and build issues.

The "GENERIC_IOMAP" version that switches between inb()/outb() and
readb()/writeb() style accessors is now only used on architectures that
have PC-style ISA devices that are not memory mapped (x86, uml, m68k-q40
and powerpc-powernv), while alpha and parisc use a more complicated
variant and everything else just maps the ioread interfaces to plan MMIO
(readb/writeb etc).

In addition there are two small changes from Raag Jadav to simplify
the asm-generic/io.h indirect inclusions and from Jann Horn to fix
a corner case with read_word_at_a_time.

----------------------------------------------------------------
Arnd Bergmann (10):
      asm-generic/io.h: rework split ioread64/iowrite64 helpers
      alpha: stop using asm-generic/iomap.h
      sh: remove duplicate ioread/iowrite helpers
      parisc: stop using asm-generic/iomap.h
      powerpc: asm/io.h: remove split ioread64/iowrite64 helpers
      mips: drop GENERIC_IOMAP wrapper
      m68k/nommu: stop using GENERIC_IOMAP
      mips: fix PCI_IOBASE definition
      mips: export pci_iounmap()
      m68k: coldfire: select PCI_IOMAP for PCI

Jann Horn (1):
      rwonce: handle KCSAN like KASAN in read_word_at_a_time()

Raag Jadav (2):
      drm/draw: include missing headers
      io.h: drop unused headers

 arch/alpha/include/asm/io.h                    |  31 ++---
 arch/m68k/Kconfig                              |   3 +-
 arch/m68k/include/asm/io_no.h                  |   4 -
 arch/mips/Kconfig                              |   2 +-
 arch/mips/include/asm/io.h                     |  25 ++--
 arch/mips/include/asm/mach-loongson64/spaces.h |   5 +-
 arch/mips/include/asm/mach-ralink/spaces.h     |   2 +-
 arch/mips/lib/iomap-pci.c                      |  10 ++
 arch/mips/loongson64/init.c                    |   4 +-
 arch/parisc/include/asm/io.h                   |  36 ++++--
 arch/powerpc/include/asm/io.h                  |  48 --------
 arch/sh/include/asm/io.h                       |  30 +----
 arch/sh/kernel/Makefile                        |   3 -
 arch/sh/kernel/iomap.c                         | 162 -------------------------
 arch/sh/kernel/ioport.c                        |   5 -
 arch/sh/lib/io.c                               |   4 +-
 drivers/gpu/drm/drm_draw.c                     |   2 +
 drivers/sh/clk/cpg.c                           |  25 ++--
 include/asm-generic/iomap.h                    |  36 ++----
 include/asm-generic/rwonce.h                   |   7 +-
 include/linux/io-64-nonatomic-hi-lo.h          |  16 +++
 include/linux/io-64-nonatomic-lo-hi.h          |  16 +++
 include/linux/io.h                             |   3 -
 lib/iomap.c                                    |  40 +++---
 24 files changed, 163 insertions(+), 356 deletions(-)
 delete mode 100644 arch/sh/kernel/iomap.c

Re: [GIT PULL] asm-generic changes for 6.15

[Jann Horn]

On Wed, Mar 26, 2025 at 8:43 PM Arnd Bergmann <arnd@arndb.de> wrote:
> The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b:
>
>   Linux 6.14-rc1 (2025-02-02 15:39:26 -0800)
>
> are available in the Git repository at:
>
>   https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git tags/asm-generic-6.15
>
> for you to fetch changes up to ece69af2ede103e190ffdfccd9f9ec850606ab5e:
>
>   rwonce: handle KCSAN like KASAN in read_word_at_a_time() (2025-03-25 17:50:38 +0100)
[...]
> Jann Horn (1):
>       rwonce: handle KCSAN like KASAN in read_word_at_a_time()

Uh, sorry about this...

Nathan Chancellor just pointed out that my commit "rwonce: handle
KCSAN like KASAN in read_word_at_a_time()" breaks the arm64 build when
LTO is enabled (<https://lore.kernel.org/all/20250326203926.GA10484@ax162/>).
I just posted a patch that undoes the buggy part of my patch at
<https://lore.kernel.org/r/20250326-rwaat-fix-v1-1-600f411eaf23@google.com>.

@Linus: Sorry for throwing a spanner in the works here... maybe you
should only pull up to the commit before mine (luckily mine's the last
in the stack, and it's not important), or wait for Arnd to give his
opinion.

Re: [GIT PULL] asm-generic changes for 6.15

[Arnd Bergmann]

On Wed, Mar 26, 2025, at 22:08, Jann Horn wrote:
> On Wed, Mar 26, 2025 at 8:43 PM Arnd Bergmann <arnd@arndb.de> wrote:
>> The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b:
>>
>>   Linux 6.14-rc1 (2025-02-02 15:39:26 -0800)
>>
>> are available in the Git repository at:
>>
>>   https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git tags/asm-generic-6.15
>>
>> for you to fetch changes up to ece69af2ede103e190ffdfccd9f9ec850606ab5e:
>>
>>   rwonce: handle KCSAN like KASAN in read_word_at_a_time() (2025-03-25 17:50:38 +0100)
> [...]
>> Jann Horn (1):
>>       rwonce: handle KCSAN like KASAN in read_word_at_a_time()
>
> Uh, sorry about this...
>
> Nathan Chancellor just pointed out that my commit "rwonce: handle
> KCSAN like KASAN in read_word_at_a_time()" breaks the arm64 build when
> LTO is enabled (<https://lore.kernel.org/all/20250326203926.GA10484@ax162/>).
> I just posted a patch that undoes the buggy part of my patch at
> <https://lore.kernel.org/r/20250326-rwaat-fix-v1-1-600f411eaf23@google.com>.
>
> @Linus: Sorry for throwing a spanner in the works here... maybe you
> should only pull up to the commit before mine (luckily mine's the last
> in the stack, and it's not important), or wait for Arnd to give his
> opinion.

I've already tagged a tags/asm-generic-6.15-2 with your fix included
and the same tag description.

I don't think it's worth doing a partial pull here.

Linus, if you have already pulled the tags/asm-generic-6.15 tag,
I suggest you just apply the fix directly yourself, otherwise
you can use the tags/asm-generic-6.15-2 tag instead, or hold off
for today and wait for me to send a new pull request after
I get an ok from Nathan.

     Arnd

Re: [GIT PULL] asm-generic changes for 6.15

[Nathan Chancellor]

On Wed, Mar 26, 2025 at 10:32:39PM +0100, Arnd Bergmann wrote:
> On Wed, Mar 26, 2025, at 22:08, Jann Horn wrote:
> > On Wed, Mar 26, 2025 at 8:43 PM Arnd Bergmann <arnd@arndb.de> wrote:
> >> The following changes since commit 2014c95afecee3e76ca4a56956a936e23283f05b:
> >>
> >>   Linux 6.14-rc1 (2025-02-02 15:39:26 -0800)
> >>
> >> are available in the Git repository at:
> >>
> >>   https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git tags/asm-generic-6.15
> >>
> >> for you to fetch changes up to ece69af2ede103e190ffdfccd9f9ec850606ab5e:
> >>
> >>   rwonce: handle KCSAN like KASAN in read_word_at_a_time() (2025-03-25 17:50:38 +0100)
> > [...]
> >> Jann Horn (1):
> >>       rwonce: handle KCSAN like KASAN in read_word_at_a_time()
> >
> > Uh, sorry about this...
> >
> > Nathan Chancellor just pointed out that my commit "rwonce: handle
> > KCSAN like KASAN in read_word_at_a_time()" breaks the arm64 build when
> > LTO is enabled (<https://lore.kernel.org/all/20250326203926.GA10484@ax162/>).
> > I just posted a patch that undoes the buggy part of my patch at
> > <https://lore.kernel.org/r/20250326-rwaat-fix-v1-1-600f411eaf23@google.com>.
> >
> > @Linus: Sorry for throwing a spanner in the works here... maybe you
> > should only pull up to the commit before mine (luckily mine's the last
> > in the stack, and it's not important), or wait for Arnd to give his
> > opinion.
> 
> I've already tagged a tags/asm-generic-6.15-2 with your fix included
> and the same tag description.
> 
> I don't think it's worth doing a partial pull here.
> 
> Linus, if you have already pulled the tags/asm-generic-6.15 tag,
> I suggest you just apply the fix directly yourself, otherwise
> you can use the tags/asm-generic-6.15-2 tag instead, or hold off
> for today and wait for me to send a new pull request after
> I get an ok from Nathan.

Jann's patch resolves the issue for me. My two arm64 boxes happily
boot with it applied to next-20250326 and the virtual test case passes
as well.

Cheers,
Nathan

Re: [GIT PULL] asm-generic changes for 6.15

[pr-tracker-bot]

The pull request you sent on Wed, 26 Mar 2025 20:43:17 +0100:

> https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git tags/asm-generic-6.15

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/47a60391ae0ed04ffbb9bd8dcd94ad9d08b41288

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html