* [GIT PULL] MIPS changes
@ 2020-01-31 17:55 Paul Burton
2020-01-31 19:35 ` pr-tracker-bot
0 siblings, 1 reply; 13+ messages in thread
From: Paul Burton @ 2020-01-31 17:55 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-mips
[-- Attachment #1: Type: text/plain, Size: 13207 bytes --]
Hi Linus,
Here are the main MIPS changes for 5.6. My apologies that they're coming
at the end of the week rather than the start, but there's nothing too
big or scary in here. Please pull.
There's one minor conflict with current master, in the DT
vendor-prefixes.yaml file. The correct resolution is of course to keep
both additions:
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 1bc7b3c4b591,31b364107e60..7fcd48adc276
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1082,8 -1062,8 +1084,10 @@@ patternProperties
description: Xilinx
"^xunlong,.*":
description: Shenzhen Xunlong Software CO.,Limited
+ "^xylon,.*":
+ description: Xylon
+ "^yna,.*":
+ description: YSH & ATIL
"^yones-toptech,.*":
description: Yones Toptech Co., Ltd.
"^ysoft,.*":
Thanks,
Paul
The following changes since commit c79f46a282390e0f5b306007bf7b11a46d529538:
Linux 5.5-rc5 (2020-01-05 14:23:27 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.6
for you to fetch changes up to 2c4288719806ca0b3de1b742ada26b25a60d6a45:
MIPS: PCI: Add detection of IOC3 on IO7, IO8, IO9 and Fuel (2020-01-24 11:37:45 -0800)
----------------------------------------------------------------
The main MIPS changes for 5.6:
- Support mremap() for the VDSO, primarily to allow CRIU to restore the
VDSO to its checkpointed location.
- Restore the MIPS32 cBPF JIT, after having reverted the enablement of
the eBPF JIT for MIPS32 systems in the 5.5 cycle.
- Improve cop0 counter synchronization behaviour whilst onlining CPUs by
running with interrupts disabled.
- Better match FPU behaviour when emulating multiply-accumulate
instructions on pre-r6 systems that implement IEEE754-2008 style MACs.
- Loongson64 kernels now build using the MIPS64r2 ISA, allowing them to
take advantage of instructions introduced by r2.
- Support for the Ingenic X1000 SoC & the really nice little CU Neo
development board that's using it.
- Support for WMAC on GARDENA Smart Gateway devices.
- Lots of cleanup & refactoring of SGI IP27 (Origin 2*) support in
preparation for introducing IP35 (Origin 3*) support.
- Various Kconfig & Makefile cleanups.
----------------------------------------------------------------
Alexander Lobakin (8):
MIPS: fix indentation of the 'RELOCS' message
MIPS: boot: fix typo in 'vmlinux.lzma.its' target
MIPS: syscalls: fix indentation of the 'SYSNR' message
MIPS: don't explicitly select LIBFDT in Kconfig
MIPS: generic: don't unconditionally select PINCTRL
MIPS: make CPU_HAS_LOAD_STORE_LR opt-out
MIPS: sort MIPS and MIPS_GENERIC Kconfig selects alphabetically (again)
Revert "MIPS: Add custom serial.h with BASE_BAUD override for generic kernel"
Colin Ian King (1):
MIPS: OCTEON: octeon-irq: fix spelling mistake "to" -> "too"
Geert Uytterhoeven (2):
MIPS: ip22-gio: Make gio_match_device() static
tc: Make tc_match_device() static
Guoyun Sun (1):
mips/vdso: Support mremap() for vDSO
James Hogan (1):
MAINTAINERS: Drop James Hogan as MIPS maintainer
Jiaxun Yang (6):
dt-bindings: Document loongson vendor-prefix
MIPS: Add MAC2008 Support
MIPS: Loongson64: Select mac2008 only feature
MIPS: Make DIEI support as a config option
MIPS: Loongson64: Bump ISA level to MIPSR2
MIPS: Loongson64: Disable exec hazard
Julia Lawall (1):
MIPS: use resource_size
Kees Cook (1):
MIPS: BPF: Use sizeof_field() instead of FIELD_SIZEOF()
Mao Wenan (1):
MIPS: Loongson2ef: drop pointless static qualifier in loongson_suspend_enter()
Paul Burton (1):
MIPS: BPF: Restore MIPS32 cBPF JIT
Reto Schneider (3):
MIPS: ralink: dts: mt7628a.dtsi: Add WMAC DT node
MIPS: ralink: dts: gardena_smart_gateway_mt7688: Enable WMAC
MIPS: ralink: dts: gardena_smart_gateway_mt7688: Limit UART1
Sergey Korolev (1):
MIPS: sync-r4k: do slave counter synchronization with disabled HW interrupts
Thomas Bogendoerfer (22):
MIPS: SGI-IP27: Fix node_distance
MIPS: Loongson64: Fix node_distance()
MIPS: mm: Place per_cpu on different nodes, if NUMA is enabled
MIPS: SGI-IP27: use nodemask instead of cpumask
MIPS: SGI-IP27: use cpu physid already present while scanning for CPUs
MIPS: SGI-IP27: use asm/sn/agent.h for including HUB related stuff
MIPS: SGI-IP27: get rid of asm/sn/sn0/ip27.h
MIPS: SGI-IP27: move IP27 specific macro to IP27 specific header file
MIPS: SGI-IP27: Move get_nasid() to a IP27 specific file
MIPS: SGI-IP27: Split kldir.h into generic SN and IP27 parts
MIPS: SGI-IP27: Use union instead of typedef
MIPS: SGI-IP27: Use structs for decoding error status registers
MIPS: SGI-IP27: Use specific get_region_shift
MIPS: SGI-IP27: Move all shared IP27 declarations to ip27-common.h
MIPS: SGI-IP27: Only reserve interrupts used in Linux
MIPS: SGI-IP27: Store cpu speed when scanning for CPUs and use it later
MIPS: SGI-IP27: No need for slice_map
MIPS: PCI: Support mapping of INTB/C/D for pci-xtalk-bridge
MIPS: SGI-IP27: fix readb/writeb addressing
mfd: ioc3: Add driver for SGI IOC3 chip
MIPS: SGI-IP30: Check for valid pointer before using it
MIPS: PCI: Add detection of IOC3 on IO7, IO8, IO9 and Fuel
Tiezhu Yang (1):
MIPS: Loongson: Fix potential NULL dereference in loongson3_platform_init()
Wang Xuerui (1):
MIPS: asm: local: add barriers for Loongson
Yangtao Li (1):
soc: lantiq: convert to devm_platform_ioremap_resource
yu kuai (1):
MIPS: ralink: add missing put_device in ill_acc_of_setup
周琰杰 (Zhou Yanjie) (7):
MIPS: Ingenic: Add Ingenic X1000 support.
dt-bindings: Document yna vendor-prefix.
dt-bindings: MIPS: Add Ingenic XBurst based boards.
MIPS: Ingenic: Add YSH & ATIL CU Neo board support.
MIPS: X1830: Add X1830 system type.
MIPS: Ingenic: Add missing nodes for X1000 and CU1000-Neo.
MIPS: CU1000-Neo: Refresh defconfig to support HWMON and WiFi.
.../devicetree/bindings/mips/ingenic/devices.yaml | 35 +
.../devicetree/bindings/vendor-prefixes.yaml | 4 +
MAINTAINERS | 1 -
arch/mips/Kconfig | 84 +-
arch/mips/Makefile.postlink | 2 +-
arch/mips/boot/Makefile | 2 +-
arch/mips/boot/dts/ingenic/Makefile | 1 +
arch/mips/boot/dts/ingenic/cu1000-neo.dts | 170 +++
arch/mips/boot/dts/ingenic/x1000.dtsi | 317 +++++
.../dts/ralink/gardena_smart_gateway_mt7688.dts | 8 +
arch/mips/boot/dts/ralink/mt7628a.dtsi | 10 +
arch/mips/cavium-octeon/octeon-irq.c | 2 +-
arch/mips/configs/cu1000-neo_defconfig | 117 ++
arch/mips/configs/generic/board-ocelot.config | 1 +
arch/mips/include/asm/Kbuild | 1 +
arch/mips/include/asm/bootinfo.h | 1 +
arch/mips/include/asm/cpu-features.h | 4 +
arch/mips/include/asm/cpu.h | 6 +-
arch/mips/include/asm/gio_device.h | 2 -
arch/mips/include/asm/hazards.h | 4 +-
arch/mips/include/asm/irqflags.h | 6 +-
arch/mips/include/asm/local.h | 4 +
.../mips/include/asm/mach-ip27/kernel-entry-init.h | 12 +-
arch/mips/include/asm/mach-ip27/mangle-port.h | 4 +-
arch/mips/include/asm/mach-ip27/mmzone.h | 4 +-
arch/mips/include/asm/mach-ip27/topology.h | 2 +-
.../asm/mach-loongson64/cpu-feature-overrides.h | 2 +
arch/mips/include/asm/mipsregs.h | 3 +
arch/mips/include/asm/pci/bridge.h | 3 +-
arch/mips/include/asm/serial.h | 18 -
arch/mips/include/asm/sn/arch.h | 3 -
arch/mips/include/asm/sn/hub.h | 17 -
arch/mips/include/asm/sn/intr.h | 17 -
arch/mips/include/asm/sn/ioc3.h | 42 +-
arch/mips/include/asm/sn/klconfig.h | 4 -
arch/mips/include/asm/sn/kldir.h | 193 +--
arch/mips/include/asm/sn/sn0/hub.h | 22 +
arch/mips/include/asm/sn/sn0/hubni.h | 8 +
arch/mips/include/asm/sn/sn0/ip27.h | 85 --
arch/mips/include/asm/sn/sn0/kldir.h | 186 +++
arch/mips/include/asm/sn/sn_private.h | 19 -
arch/mips/include/asm/sn/types.h | 4 +
arch/mips/jz4740/Kconfig | 10 +
arch/mips/jz4740/setup.c | 4 +
arch/mips/kernel/cpu-probe.c | 81 +-
arch/mips/kernel/setup.c | 6 +-
arch/mips/kernel/sync-r4k.c | 5 +
arch/mips/kernel/syscalls/Makefile | 2 +-
arch/mips/kernel/unaligned.c | 36 +-
arch/mips/lib/memcpy.S | 14 +-
arch/mips/lib/memset.S | 16 +-
arch/mips/lib/mips-atomic.c | 4 +-
arch/mips/loongson2ef/common/pm.c | 2 +-
arch/mips/loongson64/numa.c | 2 +-
arch/mips/loongson64/platform.c | 3 +
arch/mips/math-emu/cp1emu.c | 38 +-
arch/mips/math-emu/dp_maddf.c | 53 +-
arch/mips/math-emu/ieee754.h | 16 +
arch/mips/math-emu/ieee754int.h | 1 +
arch/mips/math-emu/sp_maddf.c | 53 +-
arch/mips/mm/init.c | 45 +
arch/mips/net/Makefile | 1 +
arch/mips/net/bpf_jit.c | 1270 ++++++++++++++++++++
arch/mips/net/bpf_jit_asm.S | 285 +++++
arch/mips/pci/pci-ip27.c | 2 +-
arch/mips/pci/pci-xtalk-bridge.c | 52 +-
arch/mips/ralink/ill_acc.c | 2 +
arch/mips/sgi-ip22/ip22-gio.c | 6 +-
arch/mips/sgi-ip27/ip27-berr.c | 40 +-
arch/mips/sgi-ip27/ip27-common.h | 12 +-
arch/mips/sgi-ip27/ip27-console.c | 5 +-
arch/mips/sgi-ip27/ip27-hubio.c | 8 +-
arch/mips/sgi-ip27/ip27-init.c | 25 +-
arch/mips/sgi-ip27/ip27-irq.c | 5 +-
arch/mips/sgi-ip27/ip27-klconfig.c | 51 -
arch/mips/sgi-ip27/ip27-klnuma.c | 16 +-
arch/mips/sgi-ip27/ip27-memory.c | 57 +-
arch/mips/sgi-ip27/ip27-nmi.c | 5 +-
arch/mips/sgi-ip27/ip27-reset.c | 2 +-
arch/mips/sgi-ip27/ip27-smp.c | 33 +-
arch/mips/sgi-ip27/ip27-timer.c | 48 +-
arch/mips/sgi-ip27/ip27-xtalk.c | 1 -
arch/mips/sgi-ip30/ip30-irq.c | 5 +-
arch/mips/vdso/genvdso.c | 13 +
drivers/mfd/Kconfig | 13 +
drivers/mfd/Makefile | 1 +
drivers/mfd/ioc3.c | 669 +++++++++++
drivers/net/ethernet/sgi/Kconfig | 5 +-
drivers/net/ethernet/sgi/ioc3-eth.c | 544 ++-------
drivers/rtc/rtc-m48t35.c | 11 +
drivers/soc/lantiq/fpi-bus.c | 4 +-
drivers/tc/tc-driver.c | 5 +-
drivers/tty/serial/8250/8250_ioc3.c | 98 ++
drivers/tty/serial/8250/Kconfig | 11 +
drivers/tty/serial/8250/Makefile | 1 +
95 files changed, 3888 insertions(+), 1239 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mips/ingenic/devices.yaml
create mode 100644 arch/mips/boot/dts/ingenic/cu1000-neo.dts
create mode 100644 arch/mips/boot/dts/ingenic/x1000.dtsi
create mode 100644 arch/mips/configs/cu1000-neo_defconfig
delete mode 100644 arch/mips/include/asm/serial.h
delete mode 100644 arch/mips/include/asm/sn/hub.h
delete mode 100644 arch/mips/include/asm/sn/sn0/ip27.h
create mode 100644 arch/mips/include/asm/sn/sn0/kldir.h
delete mode 100644 arch/mips/include/asm/sn/sn_private.h
create mode 100644 arch/mips/net/bpf_jit.c
create mode 100644 arch/mips/net/bpf_jit_asm.S
create mode 100644 drivers/mfd/ioc3.c
create mode 100644 drivers/tty/serial/8250/8250_ioc3.c
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* [GIT PULL] MIPS changes
@ 2019-09-21 23:10 Paul Burton
2019-09-22 16:45 ` pr-tracker-bot
2019-09-22 18:35 ` Linus Torvalds
0 siblings, 2 replies; 13+ messages in thread
From: Paul Burton @ 2019-09-21 23:10 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-mips
[-- Attachment #1: Type: text/plain, Size: 19602 bytes --]
Hi Linus,
Here are the main MIPS changes for v5.4; please pull.
My apologies that this is arriving at the end of the week; a combination
of travel & discovering a MIPS32 page table handling issue later than
would have been ideal delayed things.
There are a number of minor merge conflicts with current master, my
suggested resolutions are as follows:
diff --cc Documentation/mips/index.rst
index fd9023c8a89f,321b4794f3b8..3616fb872af3
--- a/Documentation/mips/index.rst
+++ b/Documentation/mips/index.rst
@@@ -1,17 -1,11 +1,18 @@@
.. SPDX-License-Identifier: GPL-2.0
-===========================
-MIPS-specific Documentation
-===========================
+=================
+MIPS architecture
+=================
.. toctree::
- :maxdepth: 1
- :numbered:
+ :maxdepth: 2
+ au1xxx_ide
+ ingenic-tcu
+
+.. only:: subproject and html
+
+ Indices
+ =======
+
+ * :ref:`genindex`
diff --cc arch/mips/Kconfig
index 904c096fa4da,2f7c050e8cde..cc8e2b1032a5
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -43,8 -44,7 +44,8 @@@ config MIP
select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT
select HAVE_ARCH_SECCOMP_FILTER
select HAVE_ARCH_TRACEHOOK
- select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
+ select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
+ select HAVE_ASM_MODVERSIONS
select HAVE_EBPF_JIT if (!CPU_MICROMIPS)
select HAVE_CONTEXT_TRACKING
select HAVE_COPY_THREAD_TLS
diff --cc drivers/video/fbdev/Makefile
index aab7155884ea,49502d6256cb..aa6352798cf4
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@@ -116,7 -116,7 +116,6 @@@ obj-y += om
obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o
obj-$(CONFIG_FB_CARMINE) += carminefb.o
obj-$(CONFIG_FB_MB862XX) += mb862xx/
- obj-$(CONFIG_FB_JZ4740) += jz4740_fb.o
-obj-$(CONFIG_FB_NUC900) += nuc900fb.o
obj-$(CONFIG_FB_PUV3_UNIGFX) += fb-puv3.o
obj-$(CONFIG_FB_HYPERV) += hyperv_fb.o
obj-$(CONFIG_FB_OPENCORES) += ocfb.o
Thanks,
Paul
The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b:
Linus 5.3-rc1 (2019-07-21 14:05:38 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.4
for you to fetch changes up to 05d013a0366d50f4f0dbebf8c1b22b42020bf49a:
MIPS: Detect bad _PFN_SHIFT values (2019-09-20 14:55:07 -0700)
----------------------------------------------------------------
Main MIPS changes for v5.4:
- boot_mem_map is removed, providing a nice cleanup made possible by the
recent removal of bootmem.
- Some fixes to atomics, in general providing compiler barriers for
smp_mb__{before,after}_atomic plus fixes specific to Loongson CPUs or
MIPS32 systems using cmpxchg64().
- Conversion to the new generic VDSO infrastructure courtesy of Vincenzo
Frascino.
- Removal of undefined behavior in set_io_port_base(), fixing the
behavior of some MIPS kernel configurations when built with recent
clang versions.
- Initial MIPS32 huge page support, functional on at least Ingenic SoCs.
- pte_special() is now supported for some configurations, allowing among
other things generic fast GUP to be used.
- Miscellaneous fixes & cleanups.
And platform specific changes:
- Major improvements to Ingenic SoC support from Paul Cercueil, mostly
enabled by the inclusion of the new TCU (timer-counter unit) drivers
he's spent a very patient year or so working on. Plus some fixes for
X1000 SoCs from Zhou Yanjie.
- Netgear R6200 v1 systems are now supported by the bcm47xx platform.
- DT updates for BMIPS, Lantiq & Microsemi Ocelot systems.
----------------------------------------------------------------
Antoine Tenart (2):
MIPS: dts: mscc: describe the PTP register range
MIPS: dts: mscc: describe the PTP ready interrupt
Arnd Bergmann (1):
mips: fix vdso32 build, again
Christoph Hellwig (1):
mips: remove ioremap_cachable
Christophe JAILLET (1):
MIPS: Octeon: Fix a typo in #define OCTOEN_SERIAL_LEN
Daniel Silsby (5):
MIPS: Disallow CPU_SUPPORTS_HUGEPAGES for XPA,EVA
MIPS: Add partial 32-bit huge page support
MIPS: Decouple CPU_SUPPORTS_HUGEPAGES from 64BIT
MIPS: ingenic: Add support for huge pages
MIPS: Undefine PMD_ORDER for 32-bit builds
Dmitry Korotin (1):
MIPS: pte_special()/pte_mkspecial() support
Edward Matijević (1):
MIPS: BCM47XX: Add support for Netgear R6200 V1
Fabian Mewes (1):
MIPS: Kconfig: remove HAVE_LATENCYTOP_SUPPORT
Firoz Khan (1):
mips: remove nargs from __SYSCALL
Florian Fainelli (2):
firmware: bcm47xx_nvram: Correct size_t printf format
firmware: bcm47xx_nvram: Allow COMPILE_TEST
Hauke Mehrtens (1):
MIPS: ralink: deactivate PCI support for SOC_MT7621
Jiaxun Yang (9):
MIPS: OCTEON: Drop boot_mem_map
MIPS: fw: Record prom memory
MIPS: malta: Drop prom_free_prom_memory
MIPS: msp: Record prom memory
MIPS: ip22: Drop addr_is_ram
MIPS: xlp: Drop boot_mem_map
MIPS: mm: Drop boot_mem_map
MIPS: init: Drop boot_mem_map
MIPS: Treat Loongson Extensions as ASEs
Jonas Gorski (1):
MIPS: BMIPS: add clock controller nodes
Martin Blumenstingl (1):
MIPS: lantiq: update the clock alias' for the mainline PCIe PHY driver
Nathan Chancellor (3):
MIPS: Don't use bc_false uninitialized in __mm_isBranchInstr
MIPS/ptrace: Update mips_get_syscall_arg's return type
MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean
Nick Desaulniers (1):
mips: avoid explicit UB in assignment of mips_io_port_base
Paul Burton (15):
MIPS: Remove unused R4300 CPU support
MIPS: Remove unused R5432 CPU support
MIPS: Remove unused R5432_CP0_INTERRUPT_WAR
MIPS: Remove unused R8000 CPU support
MIPS: octeon: Remove cpu_has_saa
MIPS: octeon: Remove ARCH_HAS_IRQ_PER_CPU
Merge branch 'ingenic-tcu-v5.4' into mips-next
MIPS: mm: Fix highmem compile
MIPS: Fix build with CONFIG_PROC_VMCORE=y
MIPS: Select R3k-style TLB in Kconfig
MIPS: tlbex: Simplify r3k check
MIPS: tlbex: Remove cpu_has_local_ebase
MIPS: Drop Loongson _CACHE_* definitions
MIPS: Disable pte_special() for MIPS32 with RiXi
MIPS: Detect bad _PFN_SHIFT values
Paul Cercueil (27):
MIPS: Rename JZRISC to XBURST
MIPS: Decode config3 register on Ingenic SoCs
MIPS: DTS: jz4740: Add node for the MMC driver
MIPS: qi_lb60: Move MMC configuration to devicetree
MIPS: DTS: jz4740: Add missing nodes
MIPS: qi_lb60: Migrate to devicetree
MIPS: configs: LB60: update defconfig
ASoC: jz4740: Drop lb60 board code
video/fbdev: Drop JZ4740 driver
dma: Drop JZ4740 driver
mtd: rawnand: Drop obsolete JZ4740 NAND driver
power/supply: Drop obsolete JZ4740 driver
hwmon: Drop obsolete JZ4740 driver
MIPS: jz4740: Drop dead code
dt-bindings: ingenic: Add DT bindings for TCU clocks
doc: Add doc for the Ingenic TCU hardware
dt-bindings: Add doc for the Ingenic TCU drivers
mfd/syscon: Add device_node_to_regmap()
clk: ingenic: Add driver for the TCU clocks
irqchip: Add irq-ingenic-tcu driver
clocksource: Add a new timer-ingenic driver
clk: jz4740: Add TCU clock
MIPS: jz4740: Add DTS nodes for the TCU drivers
MIPS: qi_lb60: Reduce system timer and clocksource to 750 kHz
MIPS: CI20: Reduce system timer and clocksource to 3 MHz
MIPS: GCW0: Reduce system timer and clocksource to 750 kHz
MIPS: jz4740: Drop obsolete code
Peter Zijlstra (3):
mips/atomic: Fix cmpxchg64 barriers
mips/atomic: Fix loongson_llsc_mb() wreckage
mips/atomic: Fix smp_mb__{before,after}_atomic()
Stephen Boyd (1):
MIPS: Remove dev_err() usage after platform_get_irq()
Thomas Bogendoerfer (1):
MIPS: PCI: refactor ioc3 special handling
Vincenzo Frascino (6):
mips: Add support for generic vDSO
mips: Add clock_getres entry point
mips: Add clock_gettime64 entry point
mips: vdso: Fix source path
mips: vdso: Fix flip/flop vdso building bug
mips: compat: vdso: Use legacy syscalls as fallback
YueHaibing (2):
irqchip/irq-ingenic-tcu: Fix COMPILE_TEST building
MIPS: Octeon: remove duplicated include from dma-octeon.c
Zhou Yanjie (3):
MIPS: X1000: Add X1000 system type.
MIPS: Ingenic: Fix bugs when detecting X1000's L2 cache.
MIPS: Ingenic: Disable broken BTB lookup optimization.
.../devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt | 22 -
.../devicetree/bindings/timer/ingenic,tcu.txt | 137 ++++
.../bindings/watchdog/ingenic,jz4740-wdt.txt | 17 -
Documentation/index.rst | 1 +
Documentation/mips/index.rst | 11 +
Documentation/mips/ingenic-tcu.rst | 71 +++
arch/mips/Kconfig | 65 +-
arch/mips/Makefile | 4 -
arch/mips/bcm47xx/board.c | 1 +
arch/mips/bcm47xx/buttons.c | 10 +
arch/mips/boot/dts/brcm/bcm3368.dtsi | 12 +-
arch/mips/boot/dts/brcm/bcm63268.dtsi | 12 +-
arch/mips/boot/dts/brcm/bcm6328.dtsi | 6 +
arch/mips/boot/dts/brcm/bcm6358.dtsi | 12 +-
arch/mips/boot/dts/brcm/bcm6362.dtsi | 12 +-
arch/mips/boot/dts/brcm/bcm6368.dtsi | 12 +-
arch/mips/boot/dts/ingenic/ci20.dts | 7 +
arch/mips/boot/dts/ingenic/gcw0.dts | 10 +
arch/mips/boot/dts/ingenic/jz4740.dtsi | 127 +++-
arch/mips/boot/dts/ingenic/jz4770.dtsi | 21 +
arch/mips/boot/dts/ingenic/jz4780.dtsi | 23 +
arch/mips/boot/dts/ingenic/qi_lb60.dts | 325 ++++++++++
arch/mips/boot/dts/mscc/ocelot.dtsi | 7 +-
arch/mips/cavium-octeon/dma-octeon.c | 16 +-
arch/mips/cavium-octeon/setup.c | 3 +-
arch/mips/configs/qi_lb60_defconfig | 44 +-
arch/mips/fw/arc/memory.c | 24 +-
arch/mips/include/asm/addrspace.h | 9 -
arch/mips/include/asm/atomic.h | 19 +-
arch/mips/include/asm/barrier.h | 44 +-
arch/mips/include/asm/bitops.h | 47 +-
arch/mips/include/asm/bootinfo.h | 17 +-
arch/mips/include/asm/cmpxchg.h | 18 +-
arch/mips/include/asm/cpu-features.h | 19 +-
arch/mips/include/asm/cpu-type.h | 15 +-
arch/mips/include/asm/cpu.h | 19 +-
arch/mips/include/asm/io.h | 21 +-
arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 +
.../asm/mach-cavium-octeon/cpu-feature-overrides.h | 9 -
arch/mips/include/asm/mach-cavium-octeon/war.h | 1 -
.../include/asm/mach-dec/cpu-feature-overrides.h | 1 -
arch/mips/include/asm/mach-generic/war.h | 1 -
arch/mips/include/asm/mach-ip22/war.h | 1 -
arch/mips/include/asm/mach-ip27/war.h | 1 -
arch/mips/include/asm/mach-ip28/war.h | 1 -
arch/mips/include/asm/mach-ip32/war.h | 1 -
arch/mips/include/asm/mach-jz4740/gpio.h | 15 -
arch/mips/include/asm/mach-jz4740/jz4740_fb.h | 58 --
arch/mips/include/asm/mach-jz4740/jz4740_mmc.h | 12 -
arch/mips/include/asm/mach-jz4740/platform.h | 26 -
.../asm/mach-loongson64/cpu-feature-overrides.h | 1 -
arch/mips/include/asm/mach-malta/war.h | 1 -
arch/mips/include/asm/mach-pmcs-msp71xx/war.h | 1 -
arch/mips/include/asm/mach-rc32434/war.h | 1 -
arch/mips/include/asm/mach-rm/war.h | 1 -
arch/mips/include/asm/mach-sibyte/war.h | 1 -
arch/mips/include/asm/mach-tx49xx/war.h | 1 -
arch/mips/include/asm/mipsregs.h | 4 +
arch/mips/include/asm/module.h | 6 -
arch/mips/include/asm/octeon/octeon.h | 4 +-
arch/mips/include/asm/pgtable-32.h | 62 +-
arch/mips/include/asm/pgtable-bits.h | 34 +-
arch/mips/include/asm/pgtable.h | 20 +-
arch/mips/include/asm/syscall.h | 21 +-
arch/mips/include/asm/vdso.h | 78 +--
arch/mips/include/asm/vdso/gettimeofday.h | 222 +++++++
arch/mips/{ => include/asm}/vdso/vdso.h | 16 +-
arch/mips/include/asm/vdso/vsyscall.h | 43 ++
arch/mips/include/asm/war.h | 13 -
arch/mips/jz4740/Makefile | 7 +-
arch/mips/jz4740/board-qi_lb60.c | 523 ----------------
arch/mips/jz4740/platform.c | 250 --------
arch/mips/jz4740/prom.c | 5 -
arch/mips/jz4740/setup.c | 7 +-
arch/mips/jz4740/time.c | 151 +----
arch/mips/kernel/branch.c | 2 +-
arch/mips/kernel/cpu-probe.c | 53 +-
arch/mips/kernel/genex.S | 3 -
arch/mips/kernel/idle.c | 3 +-
arch/mips/kernel/proc.c | 4 +
arch/mips/kernel/scall32-o32.S | 2 +-
arch/mips/kernel/scall64-n32.S | 2 +-
arch/mips/kernel/scall64-n64.S | 2 +-
arch/mips/kernel/scall64-o32.S | 2 +-
arch/mips/kernel/setup.c | 357 +++--------
arch/mips/kernel/syscall.c | 1 +
arch/mips/kernel/syscalls/syscalltbl.sh | 4 +-
arch/mips/kernel/vdso.c | 37 +-
arch/mips/lantiq/xway/sysctrl.c | 16 +-
arch/mips/mm/Makefile | 6 +-
arch/mips/mm/c-r4k.c | 2 -
arch/mips/mm/init.c | 98 ++-
arch/mips/mm/pgtable-32.c | 20 +
arch/mips/mm/sc-mips.c | 27 +-
arch/mips/mm/tlb-r8k.c | 239 -------
arch/mips/mm/tlbex.c | 63 +-
arch/mips/mti-malta/malta-memory.c | 11 -
arch/mips/netlogic/xlp/setup.c | 12 +-
arch/mips/pci/pci-xtalk-bridge.c | 167 ++---
arch/mips/pmcs-msp71xx/msp_prom.c | 22 +-
arch/mips/ralink/Kconfig | 1 -
arch/mips/ralink/timer.c | 4 +-
arch/mips/sgi-ip22/ip28-berr.c | 20 +-
arch/mips/vdso/Makefile | 41 +-
arch/mips/vdso/config-n32-o32-env.c | 19 +
arch/mips/vdso/elf.S | 2 +-
arch/mips/vdso/sigreturn.S | 2 +-
arch/mips/vdso/vdso.lds.S | 4 +
arch/mips/vdso/vgettimeofday.c | 58 ++
drivers/clk/ingenic/Kconfig | 10 +-
drivers/clk/ingenic/Makefile | 1 +
drivers/clk/ingenic/jz4740-cgu.c | 6 +
drivers/clk/ingenic/tcu.c | 474 ++++++++++++++
drivers/clocksource/Kconfig | 11 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/ingenic-timer.c | 356 +++++++++++
drivers/dma/Kconfig | 6 -
drivers/dma/Makefile | 1 -
drivers/dma/dma-jz4740.c | 623 -------------------
drivers/firmware/broadcom/Kconfig | 2 +-
drivers/firmware/broadcom/bcm47xx_nvram.c | 4 +-
drivers/hwmon/Kconfig | 10 -
drivers/hwmon/Makefile | 1 -
drivers/hwmon/jz4740-hwmon.c | 135 ----
drivers/irqchip/Kconfig | 12 +
drivers/irqchip/Makefile | 1 +
drivers/irqchip/irq-ingenic-tcu.c | 182 ++++++
drivers/mfd/syscon.c | 46 +-
drivers/mtd/nand/raw/ingenic/Kconfig | 7 -
drivers/mtd/nand/raw/ingenic/Makefile | 1 -
drivers/mtd/nand/raw/ingenic/jz4740_nand.c | 536 ----------------
drivers/power/supply/Kconfig | 11 -
drivers/power/supply/Makefile | 1 -
drivers/power/supply/jz4740-battery.c | 421 -------------
drivers/video/fbdev/Kconfig | 9 -
drivers/video/fbdev/Makefile | 1 -
drivers/video/fbdev/jz4740_fb.c | 690 ---------------------
include/dt-bindings/clock/ingenic,tcu.h | 20 +
include/dt-bindings/clock/jz4740-cgu.h | 1 +
include/linux/mfd/syscon.h | 6 +
sound/soc/jz4740/Kconfig | 25 +-
sound/soc/jz4740/Makefile | 5 -
sound/soc/jz4740/qi_lb60.c | 106 ----
143 files changed, 2921 insertions(+), 4948 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt
create mode 100644 Documentation/devicetree/bindings/timer/ingenic,tcu.txt
delete mode 100644 Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt
create mode 100644 Documentation/mips/index.rst
create mode 100644 Documentation/mips/ingenic-tcu.rst
delete mode 100644 arch/mips/include/asm/mach-jz4740/gpio.h
delete mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_fb.h
delete mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
delete mode 100644 arch/mips/include/asm/mach-jz4740/platform.h
create mode 100644 arch/mips/include/asm/vdso/gettimeofday.h
rename arch/mips/{ => include/asm}/vdso/vdso.h (77%)
create mode 100644 arch/mips/include/asm/vdso/vsyscall.h
delete mode 100644 arch/mips/jz4740/board-qi_lb60.c
delete mode 100644 arch/mips/jz4740/platform.c
delete mode 100644 arch/mips/mm/tlb-r8k.c
create mode 100644 arch/mips/vdso/config-n32-o32-env.c
create mode 100644 arch/mips/vdso/vgettimeofday.c
create mode 100644 drivers/clk/ingenic/tcu.c
create mode 100644 drivers/clocksource/ingenic-timer.c
delete mode 100644 drivers/dma/dma-jz4740.c
delete mode 100644 drivers/hwmon/jz4740-hwmon.c
create mode 100644 drivers/irqchip/irq-ingenic-tcu.c
delete mode 100644 drivers/mtd/nand/raw/ingenic/jz4740_nand.c
delete mode 100644 drivers/power/supply/jz4740-battery.c
delete mode 100644 drivers/video/fbdev/jz4740_fb.c
create mode 100644 include/dt-bindings/clock/ingenic,tcu.h
delete mode 100644 sound/soc/jz4740/qi_lb60.c
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [GIT PULL] MIPS changes
2019-09-21 23:10 Paul Burton
@ 2019-09-22 16:45 ` pr-tracker-bot
2019-09-22 18:35 ` Linus Torvalds
1 sibling, 0 replies; 13+ messages in thread
From: pr-tracker-bot @ 2019-09-22 16:45 UTC (permalink / raw)
To: Paul Burton; +Cc: Linus Torvalds, linux-kernel, linux-mips
The pull request you sent on Sat, 21 Sep 2019 23:10:24 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.4
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5c6bd5de3c2e5bc8a17451e281ed2613375a7fd5
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] MIPS changes
2019-09-21 23:10 Paul Burton
2019-09-22 16:45 ` pr-tracker-bot
@ 2019-09-22 18:35 ` Linus Torvalds
2019-09-23 15:36 ` Florian Fainelli
2019-09-23 18:07 ` Paul Burton
1 sibling, 2 replies; 13+ messages in thread
From: Linus Torvalds @ 2019-09-22 18:35 UTC (permalink / raw)
To: Paul Burton; +Cc: linux-kernel, linux-mips
On Sat, Sep 21, 2019 at 4:10 PM Paul Burton <paul.burton@mips.com> wrote:
>
> Here are the main MIPS changes for v5.4; please pull.
Hmm. I pulled and because initial tests didn't show any issues, I
already pushed out.
But some unrelated further testing then shows that this:
> Florian Fainelli (2):
> firmware: bcm47xx_nvram: Correct size_t printf format
> firmware: bcm47xx_nvram: Allow COMPILE_TEST
causes problems, and commit feb4eb060c3a ("firmware: bcm47xx_nvram:
Correct size_t printf format") is buggy:
drivers/firmware/broadcom/bcm47xx_nvram.c: In function ‘nvram_init’:
drivers/firmware/broadcom/bcm47xx_nvram.c:151: warning: format ‘%zu’
expects argument of type ‘size_t’, but argument 2 has type ‘u32’ {aka
‘unsigned int’} [-Wformat=]
and the change to use %zu was completely wrong.
It prints out 'header.len', which is an u32, not nvram_len which is a size_t.
Tssk tssk.
I've fixed it in my tree, but this should have shown up in linux-next,
or in MIPS testing. The process clearly failed.
Linus
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [GIT PULL] MIPS changes
2019-09-22 18:35 ` Linus Torvalds
@ 2019-09-23 15:36 ` Florian Fainelli
2019-09-23 18:07 ` Paul Burton
1 sibling, 0 replies; 13+ messages in thread
From: Florian Fainelli @ 2019-09-23 15:36 UTC (permalink / raw)
To: Linus Torvalds, Paul Burton; +Cc: linux-kernel, linux-mips
On 9/22/2019 11:35 AM, Linus Torvalds wrote:
> On Sat, Sep 21, 2019 at 4:10 PM Paul Burton <paul.burton@mips.com> wrote:
>>
>> Here are the main MIPS changes for v5.4; please pull.
>
> Hmm. I pulled and because initial tests didn't show any issues, I
> already pushed out.
>
> But some unrelated further testing then shows that this:
>
>> Florian Fainelli (2):
>> firmware: bcm47xx_nvram: Correct size_t printf format
>> firmware: bcm47xx_nvram: Allow COMPILE_TEST
>
> causes problems, and commit feb4eb060c3a ("firmware: bcm47xx_nvram:
> Correct size_t printf format") is buggy:
>
> drivers/firmware/broadcom/bcm47xx_nvram.c: In function ‘nvram_init’:
> drivers/firmware/broadcom/bcm47xx_nvram.c:151: warning: format ‘%zu’
> expects argument of type ‘size_t’, but argument 2 has type ‘u32’ {aka
> ‘unsigned int’} [-Wformat=]
>
> and the change to use %zu was completely wrong.
>
> It prints out 'header.len', which is an u32, not nvram_len which is a size_t.
>
> Tssk tssk.
>
> I've fixed it in my tree, but this should have shown up in linux-next,
> or in MIPS testing. The process clearly failed.
Thanks for fixing that. The process worked, there was an email sent by
the kbuild robot but I saw it only now somehow and failed to address it
in time before Paul sent out the pull request.
--
Florian
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [GIT PULL] MIPS changes
2019-09-22 18:35 ` Linus Torvalds
2019-09-23 15:36 ` Florian Fainelli
@ 2019-09-23 18:07 ` Paul Burton
2019-09-23 18:18 ` Linus Torvalds
2019-09-24 12:40 ` David Howells
1 sibling, 2 replies; 13+ messages in thread
From: Paul Burton @ 2019-09-23 18:07 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-mips, Florian Fainelli
Hi Linus,
On Sun, Sep 22, 2019 at 11:35:36AM -0700, Linus Torvalds wrote:
> On Sat, Sep 21, 2019 at 4:10 PM Paul Burton <paul.burton@mips.com> wrote:
> >
> > Here are the main MIPS changes for v5.4; please pull.
>
> Hmm. I pulled and because initial tests didn't show any issues, I
> already pushed out.
>
> But some unrelated further testing then shows that this:
>
> > Florian Fainelli (2):
> > firmware: bcm47xx_nvram: Correct size_t printf format
> > firmware: bcm47xx_nvram: Allow COMPILE_TEST
>
> causes problems, and commit feb4eb060c3a ("firmware: bcm47xx_nvram:
> Correct size_t printf format") is buggy:
>
> drivers/firmware/broadcom/bcm47xx_nvram.c: In function ‘nvram_init’:
> drivers/firmware/broadcom/bcm47xx_nvram.c:151: warning: format ‘%zu’
> expects argument of type ‘size_t’, but argument 2 has type ‘u32’ {aka
> ‘unsigned int’} [-Wformat=]
>
> and the change to use %zu was completely wrong.
>
> It prints out 'header.len', which is an u32, not nvram_len which is a size_t.
>
> Tssk tssk.
Oopsie.
> I've fixed it in my tree, but this should have shown up in linux-next,
> or in MIPS testing. The process clearly failed.
Looking back I do see that the kbuild test robot reported an issue here,
so one aspect of the failure is squarely on my not having caught up on
email properly yet.
Another issue is that there are currently 'expected' warnings dotted
through the tree for various defconfigs, so whilst I do perform test
builds before submitting pull requests I generally don't pay too much
attention to warnings... So an improvement I'll look at is fixing up
those warnings & building with -Werror, or at least not ignoring
warnings.
My apologies and thanks for fixing this up,
Paul
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [GIT PULL] MIPS changes
2019-09-23 18:07 ` Paul Burton
@ 2019-09-23 18:18 ` Linus Torvalds
2019-09-24 12:40 ` David Howells
1 sibling, 0 replies; 13+ messages in thread
From: Linus Torvalds @ 2019-09-23 18:18 UTC (permalink / raw)
To: Paul Burton, David Howells, Al Viro
Cc: linux-kernel, linux-mips, Florian Fainelli
On Mon, Sep 23, 2019 at 11:07 AM Paul Burton <paul.burton@mips.com> wrote:
>
> Another issue is that there are currently 'expected' warnings dotted
> through the tree for various defconfigs
This is why I refuse to have _any_ warnings at all in my tree during
the merge window.
If you have expected warnings, you will ignore the new and valid ones.
So the only acceptable situation is "no warnings".
In honesty, I actually do have one warning in my tree:
samples/vfs/test-statx.c:24:15: warning: ‘struct foo’ declared
inside parameter list will not be visible outside of this definition
or declaration
24 | #define statx foo
| ^~~
but because it's in the sample code, it pretty much never gets rebuilt
for me unless I basically do a "git clean" to get rid of everything,
so I don't normally see it for any normal pull.
So I've ignored that one warning, although I've actually been tempted
to just remove the sample because of it.
Adding David and Al to the cc just in case they have some simple fixup
for it that is likely to work across different user headers.
I considered just adding a
struct foo;
declaration, but the whole thing is incredibly ugly.
Linus
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [GIT PULL] MIPS changes
2019-09-23 18:07 ` Paul Burton
2019-09-23 18:18 ` Linus Torvalds
@ 2019-09-24 12:40 ` David Howells
2019-09-24 15:32 ` Linus Torvalds
1 sibling, 1 reply; 13+ messages in thread
From: David Howells @ 2019-09-24 12:40 UTC (permalink / raw)
To: Linus Torvalds
Cc: dhowells, Paul Burton, Al Viro, linux-kernel, linux-mips,
Florian Fainelli
Linus Torvalds <torvalds@linux-foundation.org> wrote:
> In honesty, I actually do have one warning in my tree:
>
> samples/vfs/test-statx.c:24:15: warning: ‘struct foo’ declared
> inside parameter list will not be visible outside of this definition
> or declaration
> 24 | #define statx foo
> | ^~~
Were there any note lines from the compiler associated with this? The warning
message can't actually be taking place on this line.
Another thing I'm wondering is why your compiler shows this warning - and mine
does not. I've seen this before with uninitialised variables too where you
get a warning and I don't.
> but because it's in the sample code, it pretty much never gets rebuilt
> for me unless I basically do a "git clean" to get rid of everything,
> so I don't normally see it for any normal pull.
>
> So I've ignored that one warning, although I've actually been tempted
> to just remove the sample because of it.
>
> Adding David and Al to the cc just in case they have some simple fixup
> for it that is likely to work across different user headers.
>
> I considered just adding a
>
> struct foo;
>
> declaration, but the whole thing is incredibly ugly.
Yeah - I'm not sure the best way to deal with this. The problem being that
userspace may have a conflicting definition - or no definition at all - and I
need to use the one from the kernel in preference as that may have changes in
it that aren't yet reflected in userspace.
I'd rather not remove the sample if I can avoid it as I use it occasionally,
but maybe I should switch to relying on glibc.
David
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL] MIPS changes
2019-09-24 12:40 ` David Howells
@ 2019-09-24 15:32 ` Linus Torvalds
0 siblings, 0 replies; 13+ messages in thread
From: Linus Torvalds @ 2019-09-24 15:32 UTC (permalink / raw)
To: David Howells
Cc: Paul Burton, Al Viro, linux-kernel, linux-mips, Florian Fainelli
On Tue, Sep 24, 2019 at 5:40 AM David Howells <dhowells@redhat.com> wrote:
>
> Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> > In honesty, I actually do have one warning in my tree:
> >
> > samples/vfs/test-statx.c:24:15: warning: ‘struct foo’ declared
> > inside parameter list
>
> Were there any note lines from the compiler associated with this? The warning
> message can't actually be taking place on this line.
That's the only thing that gcc says. I agree that it's not where the
problem occurs, but the gcc warning system tries to avoid warning
inside system header files, so it seems to have logic tracing it back
to the user.
But I have system header files that look like this:
/* Fill *BUF with information about PATH in DIRFD. */
int statx (int __dirfd, const char *__restrict __path, int __flags,
unsigned int __mask, struct statx *__restrict __buf)
__THROW __nonnull ((2, 5));
and I think that's the one that triggers.
You must have hit *something* similar too, since the only reason for that
#define statx foo
#define statx_timestamp foo_timestamp
#include <sys/stat.h>
#undef statx
#undef statx_timestamp
is that you're playing games with the kernel 'statx' clashing with
user 'statx' use.
And what I think happens is that you had the <sys/types.h> include
*without* that #define, so the 'struct statx' got declared there, and
then in <sys/stat.h> it gets used, but it gets used as 'struct foo',
so now the compiler complains (properly) that you're using this
undeclared 'struct foo' in the function declaration, and because of
namespace rules it's not the same thing as then a later 'struct foo'
would be.
Linus
Linus
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL] MIPS changes
@ 2019-07-17 15:25 Paul Burton
2019-07-17 16:41 ` Linus Torvalds
2019-07-17 16:50 ` pr-tracker-bot
0 siblings, 2 replies; 13+ messages in thread
From: Paul Burton @ 2019-07-17 15:25 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-mips
Hi Linus,
Here are the main MIPS changes for v5.3, a light batch this time around
but significant improvements for certain systems. Please pull.
There's one minor conflict in arch/mips/include/asm/mach-ralink/pinmux.h
when merging with current master. Commit 1d0ea0692ae3 ("treewide:
Replace GPLv2 boilerplate/reference with SPDX - rule 332") in master &
commit 017105478bb5 ("MIPS: ralink: Switch pinmux.h to SPDX header")
from the MIPS tree both add the SPDX header but a little differently in
terms of comment style & license name. Reading
Documentation/process/license-rules.rst suggests to me that the version
in the MIPS tree is correct in terms of license name ("GPL-2.0" without
the "-only" suffix) whilst the version in master is correct in terms of
comment style ("/* */" rather than "//"). That would make the correct
resolution something like this:
diff --cc arch/mips/include/asm/mach-ralink/pinmux.h
index e54d4e1533b4,33647f796140..06ff9b17e42e
--- a/arch/mips/include/asm/mach-ralink/pinmux.h
+++ b/arch/mips/include/asm/mach-ralink/pinmux.h
@@@ -1,6 -1,5 +1,5 @@@
- /* SPDX-License-Identifier: GPL-2.0-only */
-// SPDX-License-Identifier: GPL-2.0
++/* SPDX-License-Identifier: GPL-2.0 */
/*
- *
* Copyright (C) 2012 John Crispin <john@phrozen.org>
*/
Thanks,
Paul
The following changes since commit cd6c84d8f0cdc911df435bb075ba22ce3c605b07:
Linux 5.2-rc2 (2019-05-26 16:49:19 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.3
for you to fetch changes up to e5793cd1b5fedb39337cfa62251a25030f526e56:
MIPS: fix some more fall through errors in arch/mips (2019-07-16 12:40:16 +0100)
----------------------------------------------------------------
The main MIPS changes for a pretty light v5.3 cycle, including:
- 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.
----------------------------------------------------------------
Anshuman Khandual (1):
mips/kprobes: Export kprobe_fault_handler()
Geert Uytterhoeven (2):
memory: jz4780-nemc: Grammar s/the its/its/
MIPS: ftrace: Reword prepare_ftrace_return() comment block
Krzysztof Kozlowski (2):
MIPS: config: Remove left-over BACKLIGHT_LCD_SUPPORT
MIPS: configs: Remove useless UEVENT_HELPER_PATH
Lubomir Rintel (1):
MIPS: ralink: Switch pinmux.h to SPDX header
Masahiro Yamada (1):
MIPS: replace MBIT_ULL() with BIT_ULL()
Paul Burton (1):
FDDI: defza: Include linux/io-64-nonatomic-lo-hi.h
Paul Cercueil (6):
MIPS: lb60: Fix pin mappings
memory: Kconfig: Drop dependency on MACH_JZ4780 for jz4780
dt-bindings: memory: jz4780: Add compatible string for JZ4740 SoC
memory: jz4780_nemc: Add support for the JZ4740
memory: jz4780-nemc: Reduce size of const array
MAINTAINERS: Add myself as Ingenic SoCs maintainer
Petr Cvek (7):
MIPS: lantiq: Move macro directly to iomem function
MIPS: lantiq: Change variables to the same type as the source
MIPS: lantiq: Fix attributes of of_device_id structure
MIPS: lantiq: Remove unused macros
MIPS: lantiq: Fix bitfield masking
MIPS: lantiq: Shorten register names, remove unused macros
MIPS: lantiq: Add SMP support for lantiq interrupt controller
Serge Semin (1):
mips: Remove q-accessors from non-64bit platforms
Stefan Roese (6):
MIPS: ralink: mt7628a.dtsi: Add SPDX GPL-2.0 license identifier
MIPS: ralink: mt7628a.dtsi: Add pinmux DT node
MIPS: ralink: mt7628a.dtsi: Add pinctrl DT properties to the UART nodes
MIPS: ralink: mt7628a.dtsi: Add GPIO controller DT node
MIPS: ralink: mt7628a.dtsi: Add SPI controller DT node
MIPS: ralink: mt7628a.dtsi: Add watchdog controller DT node
Stephen Rothwell (2):
MIPS: perf events: handle switch statement falling through warnings
MIPS: fix some more fall through errors in arch/mips
.../memory-controllers/ingenic,jz4780-nemc.txt | 1 +
MAINTAINERS | 27 ++++
arch/mips/ar7/setup.c | 1 +
arch/mips/ath79/setup.c | 2 +-
arch/mips/bcm63xx/dev-flash.c | 1 +
arch/mips/boot/dts/ralink/mt7628a.dtsi | 148 ++++++++++++++++-
arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +-
arch/mips/configs/ar7_defconfig | 1 -
arch/mips/configs/ath25_defconfig | 1 -
arch/mips/configs/ath79_defconfig | 1 -
arch/mips/configs/bcm63xx_defconfig | 1 -
arch/mips/configs/bigsur_defconfig | 1 -
arch/mips/configs/bmips_be_defconfig | 1 -
arch/mips/configs/bmips_stb_defconfig | 1 -
arch/mips/configs/cavium_octeon_defconfig | 1 -
arch/mips/configs/ci20_defconfig | 1 -
arch/mips/configs/cobalt_defconfig | 1 -
arch/mips/configs/fuloong2e_defconfig | 1 -
arch/mips/configs/gpr_defconfig | 1 -
arch/mips/configs/ip27_defconfig | 1 -
arch/mips/configs/ip32_defconfig | 1 -
arch/mips/configs/lemote2f_defconfig | 2 -
arch/mips/configs/loongson1b_defconfig | 1 -
arch/mips/configs/loongson1c_defconfig | 1 -
arch/mips/configs/loongson3_defconfig | 1 -
arch/mips/configs/malta_defconfig | 1 -
arch/mips/configs/malta_kvm_defconfig | 1 -
arch/mips/configs/malta_kvm_guest_defconfig | 1 -
arch/mips/configs/maltaup_xpa_defconfig | 1 -
arch/mips/configs/mips_paravirt_defconfig | 1 -
arch/mips/configs/omega2p_defconfig | 1 -
arch/mips/configs/pistachio_defconfig | 1 -
arch/mips/configs/pnx8335_stb225_defconfig | 1 -
arch/mips/configs/qi_lb60_defconfig | 2 -
arch/mips/configs/rb532_defconfig | 1 -
arch/mips/configs/rt305x_defconfig | 1 -
arch/mips/configs/sb1250_swarm_defconfig | 1 -
arch/mips/configs/tb0219_defconfig | 1 -
arch/mips/configs/tb0226_defconfig | 1 -
arch/mips/configs/tb0287_defconfig | 1 -
arch/mips/configs/vocore2_defconfig | 1 -
arch/mips/configs/xway_defconfig | 1 -
arch/mips/include/asm/cpu.h | 125 +++++++--------
arch/mips/include/asm/io.h | 11 ++
arch/mips/include/asm/kprobes.h | 1 +
arch/mips/include/asm/mach-ralink/pinmux.h | 5 +-
arch/mips/jz4740/board-qi_lb60.c | 16 +-
arch/mips/kernel/ftrace.c | 23 +--
arch/mips/kernel/kprobes.c | 2 +-
arch/mips/kernel/perf_event_mipsxx.c | 30 ++--
arch/mips/lantiq/irq.c | 177 +++++++++++++++------
drivers/memory/Kconfig | 2 +-
drivers/memory/jz4780-nemc.c | 28 +++-
drivers/net/fddi/defza.c | 1 +
54 files changed, 439 insertions(+), 201 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [GIT PULL] MIPS changes
2019-07-17 15:25 Paul Burton
@ 2019-07-17 16:41 ` Linus Torvalds
2019-07-17 16:50 ` pr-tracker-bot
1 sibling, 0 replies; 13+ messages in thread
From: Linus Torvalds @ 2019-07-17 16:41 UTC (permalink / raw)
To: Paul Burton; +Cc: linux-kernel, linux-mips
On Wed, Jul 17, 2019 at 8:25 AM Paul Burton <paul.burton@mips.com> wrote:
>
> Documentation/process/license-rules.rst suggests to me that the version
> in the MIPS tree is correct in terms of license name ("GPL-2.0" without
> the "-only" suffix) whilst the version in master is correct in terms of
> comment style ("/* */" rather than "//").
It's actually license-rules.rst that just hasn't been updated. The
"GPL-.2.0" and "GPL-2.0+" naming was considered too terse, so the
modern spdx tag suggestions are "GPL-2.0-only" and "GPL-2.0-or-later".
The full list of all spdx license tags (many of which aren't relevant
for the kernel, of course) can be found at
https://spdx.org/licenses/
in case you care.
Linus
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [GIT PULL] MIPS changes
2019-07-17 15:25 Paul Burton
2019-07-17 16:41 ` Linus Torvalds
@ 2019-07-17 16:50 ` pr-tracker-bot
1 sibling, 0 replies; 13+ messages in thread
From: pr-tracker-bot @ 2019-07-17 16:50 UTC (permalink / raw)
To: Paul Burton; +Cc: Linus Torvalds, linux-kernel, linux-mips
The pull request you sent on Wed, 17 Jul 2019 15:25:47 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/fa121bb3fed6313b1f0af23952301e06cf6d32ed
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2020-01-31 19:35 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-31 17:55 [GIT PULL] MIPS changes Paul Burton
2020-01-31 19:35 ` pr-tracker-bot
-- strict thread matches above, loose matches on Subject: below --
2019-09-21 23:10 Paul Burton
2019-09-22 16:45 ` pr-tracker-bot
2019-09-22 18:35 ` Linus Torvalds
2019-09-23 15:36 ` Florian Fainelli
2019-09-23 18:07 ` Paul Burton
2019-09-23 18:18 ` Linus Torvalds
2019-09-24 12:40 ` David Howells
2019-09-24 15:32 ` Linus Torvalds
2019-07-17 15:25 Paul Burton
2019-07-17 16:41 ` Linus Torvalds
2019-07-17 16:50 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).