From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C783EC0015E for ; Fri, 11 Aug 2023 22:34:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235812AbjHKWeD (ORCPT ); Fri, 11 Aug 2023 18:34:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235786AbjHKWeC (ORCPT ); Fri, 11 Aug 2023 18:34:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6E471FF0 for ; Fri, 11 Aug 2023 15:34:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5C2316534C for ; Fri, 11 Aug 2023 22:34:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFF6AC433C8; Fri, 11 Aug 2023 22:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1691793240; bh=YKCOkB+OKjnmkeqcuF3ksvU20+3r+4kuo5+TEhft3IE=; h=Date:To:From:Subject:From; b=y9uXyPq0MUwkUvBJwn4J3cDo37lYGgJ3xQA1k1ZZh6JSBHcsOClNBnIMlaG/2yyYV TJwh0igVCCX3VZP3EMzE38L6Wc9HzFtxXJsiR190D312YwJvXLs0j5fTg8t6F/hpBw ojJOjg+sKSr3w8Zzy+ykBkAM2KJxGfe2HL+Gfvg0= Date: Fri, 11 Aug 2023 15:34:00 -0700 To: mm-commits@vger.kernel.org, ysato@users.sourceforge.jp, linux@roeck-us.net, glaubitz@physik.fu-berlin.de, geert@linux-m68k.org, dalias@libc.org, bhe@redhat.com, arnd@arndb.de, akpm@linux-foundation.org From: Andrew Morton Subject: [folded-merged] sh-add-asm-generic-ioh-including-fix.patch removed from -mm tree Message-Id: <20230811223400.AFF6AC433C8@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: sh: fix asm-generic/io.h inclusion has been removed from the -mm tree. Its filename was sh-add-asm-generic-ioh-including-fix.patch This patch was dropped because it was folded into sh-add-asm-generic-ioh-including.patch ------------------------------------------------------ From: Arnd Bergmann Subject: sh: fix asm-generic/io.h inclusion Date: Wed, 2 Aug 2023 16:16:41 +0200 A recent cleanup patch started using the generic asm/io.h header from the sh version, but unfortunately this caused build regressions in many configurations, such as: include/asm-generic/io.h:636:15: error: redefinition of `inb_p' I added some of the missing defines that are needed to keep using the sh specific implementations rather than the generic ones where they clash. I build all sh defconfig files to catch the various combinations of CONFIG_MMU, CONFIG_GENERIC_IOMAP and CONFIG_NO_IOPORT_MAP, this should cover them all. A lot of the sh specific functions are equivalent to the generic ones and could in fact be removed, but it would be best to only do that with actual runtime testing. In particular, the indirect ioport_map() implementation is only used for the "microdev" platform that appears to be broken beyond repair for as long as the git history goes, so removing both microdev and the custom ioport handling in favor of the asm-generic/io.h version would be a great cleanup, but this can be done another time if anyone feels motivated to clean up arch/sh. Link: https://lkml.kernel.org/r/20230802141658.2064864-1-arnd@kernel.org Fixes: e41f1f7ff6c2b ("sh: add including") Link: https://lore.kernel.org/lkml/09094baf-dadf-4bce-9f63-f2a1f255f9a8@app.fastmail.com/ Signed-off-by: Arnd Bergmann Reported-by: Geert Uytterhoeven Tested-by: Guenter Roeck Acked-by: John Paul Adrian Glaubitz Cc: Baoquan He Cc: Rich Felker Cc: Yoshinori Sato Signed-off-by: Andrew Morton --- arch/sh/include/asm/io.h | 24 ++++++++++++++++++++++++ arch/sh/include/asm/io_noioport.h | 14 -------------- 2 files changed, 24 insertions(+), 14 deletions(-) --- a/arch/sh/include/asm/io.h~sh-add-asm-generic-ioh-including-fix +++ a/arch/sh/include/asm/io.h @@ -119,6 +119,10 @@ void __raw_readsl(const void __iomem *ad __BUILD_MEMORY_STRING(__raw_, q, u64) +#define ioport_map ioport_map +#define ioport_unmap ioport_unmap +#define pci_iounmap pci_iounmap + #define ioread8 ioread8 #define ioread16 ioread16 #define ioread16be ioread16be @@ -241,6 +245,26 @@ __BUILD_IOPORT_STRING(q, u64) #endif +#define inb(addr) inb(addr) +#define inw(addr) inw(addr) +#define inl(addr) inl(addr) +#define outb(x, addr) outb((x), (addr)) +#define outw(x, addr) outw((x), (addr)) +#define outl(x, addr) outl((x), (addr)) + +#define inb_p(addr) inb(addr) +#define inw_p(addr) inw(addr) +#define inl_p(addr) inl(addr) +#define outb_p(x, addr) outb((x), (addr)) +#define outw_p(x, addr) outw((x), (addr)) +#define outl_p(x, addr) outl((x), (addr)) + +#define insb insb +#define insw insw +#define insl insl +#define outsb outsb +#define outsw outsw +#define outsl outsl #define IO_SPACE_LIMIT 0xffffffff --- a/arch/sh/include/asm/io_noioport.h~sh-add-asm-generic-ioh-including-fix +++ a/arch/sh/include/asm/io_noioport.h @@ -46,20 +46,6 @@ static inline void ioport_unmap(void __i BUG(); } -#define inb_p(addr) inb(addr) -#define inw_p(addr) inw(addr) -#define inl_p(addr) inl(addr) -#define outb_p(x, addr) outb((x), (addr)) -#define outw_p(x, addr) outw((x), (addr)) -#define outl_p(x, addr) outl((x), (addr)) - -#define insb insb -#define insw insw -#define insl insl -#define outsb outsb -#define outsw outsw -#define outsl outsl - static inline void insb(unsigned long port, void *dst, unsigned long count) { BUG(); _ Patches currently in -mm which might be from arnd@arndb.de are radix-tree-remove-unused-variable.patch sh-add-asm-generic-ioh-including.patch iomem-remove-__weak-ioremap_cache-helper.patch gcov-shut-up-missing-prototype-warnings-for-internal-stubs.patch