Merge tag 'mips_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Paul Burton: "A light batch this time around but significant improvements for certain systems: - Removal of readq & writeq for MIPS32 kernels where they would simply BUG() anyway, allowing drivers or other code that #ifdefs on their presence to work properly. - Improvements for Ingenic JZ4740 systems, including support for the external memory controller & pinmuxing fixes for qi_lb60/NanoNote systems. - Improvements for Lantiq systems, in particular around SMP & IPIs. - DT updates for ralink/MediaTek MT7628a systems to probe & configure a bunch more devices. - Miscellaneous cleanups & build fixes" * tag 'mips_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (30 commits) MIPS: fix some more fall through errors in arch/mips MIPS: perf events: handle switch statement falling through warnings mips/kprobes: Export kprobe_fault_handler() MAINTAINERS: Add myself as Ingenic SoCs maintainer MIPS: ralink: mt7628a.dtsi: Add watchdog controller DT node MIPS: ralink: mt7628a.dtsi: Add SPI controller DT node MIPS: ralink: mt7628a.dtsi: Add GPIO controller DT node MIPS: ralink: mt7628a.dtsi: Add pinctrl DT properties to the UART nodes MIPS: ralink: mt7628a.dtsi: Add pinmux DT node MIPS: ralink: mt7628a.dtsi: Add SPDX GPL-2.0 license identifier MIPS: lantiq: Add SMP support for lantiq interrupt controller MIPS: lantiq: Shorten register names, remove unused macros MIPS: lantiq: Fix bitfield masking MIPS: lantiq: Remove unused macros MIPS: lantiq: Fix attributes of of_device_id structure MIPS: lantiq: Change variables to the same type as the source MIPS: lantiq: Move macro directly to iomem function mips: Remove q-accessors from non-64bit platforms FDDI: defza: Include linux/io-64-nonatomic-lo-hi.h MIPS: configs: Remove useless UEVENT_HELPER_PATH ...
This commit is contained in:
@@ -460,7 +460,12 @@ __BUILD_MEMORY_PFX(, bwlq, type, 0)
|
||||
BUILDIO_MEM(b, u8)
|
||||
BUILDIO_MEM(w, u16)
|
||||
BUILDIO_MEM(l, u32)
|
||||
#ifdef CONFIG_64BIT
|
||||
BUILDIO_MEM(q, u64)
|
||||
#else
|
||||
__BUILD_MEMORY_PFX(__raw_, q, u64, 0)
|
||||
__BUILD_MEMORY_PFX(__mem_, q, u64, 0)
|
||||
#endif
|
||||
|
||||
#define __BUILD_IOPORT_PFX(bus, bwlq, type) \
|
||||
__BUILD_IOPORT_SINGLE(bus, bwlq, type, 1, 0,) \
|
||||
@@ -486,12 +491,16 @@ __BUILDIO(q, u64)
|
||||
#define readb_relaxed __relaxed_readb
|
||||
#define readw_relaxed __relaxed_readw
|
||||
#define readl_relaxed __relaxed_readl
|
||||
#ifdef CONFIG_64BIT
|
||||
#define readq_relaxed __relaxed_readq
|
||||
#endif
|
||||
|
||||
#define writeb_relaxed __relaxed_writeb
|
||||
#define writew_relaxed __relaxed_writew
|
||||
#define writel_relaxed __relaxed_writel
|
||||
#ifdef CONFIG_64BIT
|
||||
#define writeq_relaxed __relaxed_writeq
|
||||
#endif
|
||||
|
||||
#define readb_be(addr) \
|
||||
__raw_readb((__force unsigned *)(addr))
|
||||
@@ -514,8 +523,10 @@ __BUILDIO(q, u64)
|
||||
/*
|
||||
* Some code tests for these symbols
|
||||
*/
|
||||
#ifdef CONFIG_64BIT
|
||||
#define readq readq
|
||||
#define writeq writeq
|
||||
#endif
|
||||
|
||||
#define __BUILD_MEMORY_STRING(bwlq, type) \
|
||||
\
|
||||
|
مرجع در شماره جدید
Block a user