Hi Linus,
Here are the main MIPS changes for 4.20. Please pull.
A merge into master as of commit 18d0eae30e6a ("Merge tag
'char-misc-4.20-rc1' of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") results
in one minor conflict in arch/mips/lib/memset.S. Both the .set reorder &
.set noreorder directives following the .Lsmall_fixup label should be
removed, leaving the file matching its version as of the mips_4.20 tag.
Thanks,
Paul
The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_4.20
for you to fetch changes up to edbb4233e7efc37dbebb10f7774b38c64080dd66:
MIPS: Cleanup DSP ASE detection (2018-10-16 15:30:21 -0700)
----------------------------------------------------------------
Here are the main MIPS updates for 4.20:
- kexec support for the generic MIPS platform when running on a CPU
including the MIPS Coherence Manager & related hardware.
- Improvements to the definition of memory barriers used around MMIO
accesses, and fixes in their use.
- Switch to CONFIG_NO_BOOTMEM from Mike Rapoport, finally dropping
reliance on the old bootmem code.
- A number of fixes & improvements for Loongson 3 systems.
- DT & config updates for the Microsemi Ocelot platform.
- Workaround to enable USB power on the Netgear WNDR3400v3.
- Various cleanups & fixes.
----------------------------------------------------------------
Alexandre Belloni (4):
MIPS: dts: mscc: Add i2c on ocelot
MIPS: dts: mscc: enable i2c on ocelot_pcb123
MIPS: stop using _PTRS_PER_PGD
MIPS: generic: Add Network, SPI and I2C to ocelot_defconfig
Dengcheng Zhu (6):
MIPS: kexec: Mark CPU offline before disabling local IRQ
MIPS: kexec: Make a framework for both jumping and halting on nonboot CPUs
MIPS: kexec: CPS systems to halt nonboot CPUs
MIPS: kexec: Relax memory restriction
MIPS: kexec: Use prepare method from Generic for UHI platforms
MIPS: kdump: Mark cpu back online before rebooting
Ding Xiang (1):
mips: txx9: fix iounmap related issue
Huacai Chen (6):
MIPS: Loongon64: DMA functions cleanup
MIPS/PCI: Call pcie_bus_configure_settings() to set MPS/MRRS
MIPS: Loongson-3: Enable Store Fill Buffer at runtime
MIPS/PCI: Let Loongson-3 pci_ops access extended config space
MIPS: Loongson-3: Fix CPU UART irq delivery problem
MIPS: Loongson-3: Fix BRIDGE irq delivery problem
Maciej W. Rozycki (6):
MIPS: memset: Fix CPU_DADDI_WORKAROUNDS `small_fixup' regression
MIPS: memset: Limit excessive `noreorder' assembly mode use
MIPS: Define MMIO ordering barriers
MIPS: Correct `mmiowb' barrier for `wbflush' platforms
MIPS: Enforce strong ordering for MMIO accessors
MIPS: Provide actually relaxed MMIO accessors
Mathias Kresin (1):
MIPS: ralink: Add rt3352 SPI_CS1 pinmux
Mike Rapoport (1):
mips: switch to NO_BOOTMEM
Paul Burton (15):
MIPS: Use a custom elf-entry program to find kernel entry point
MIPS: Use GENERIC_IOMAP
MIPS: Remove SLOW_DOWN_IO
MIPS: Remove no-op/identity casts
MIPS: Move arch_mem_init() comment near definition
MIPS: MT: Remove unused MT single-threaded cache flush code
MIPS: MT: Remove obsolete cache flush repeat code
MIPS: Remove unused MOVN & MOVZ macros
MIPS: Remove unused PIC macros
MIPS: Remove unused TTABLE macro
MIPS: Add kernel_pref & user_pref helpers
MIPS: Remove unused CAT macro
MIPS: lib: Use kernel_pref & user_pref in memcpy()
MIPS: Remove unused PREF, PREFE & PREFX macros
MIPS: Cleanup DSP ASE detection
Quentin Schulz (2):
MIPS: mscc: add DT for Ocelot PCB120
MIPS: mscc: add PCB120 to the ocelot fitImage
Rob Herring (1):
MIPS: Convert to using %pOFn instead of device_node.name
Songjun Wu (1):
MIPS: dts: Change upper case to lower case
Tobias Wolf (1):
MIPS: pci-rt2880: set pci controller of_node
Tuomas Tynkkynen (1):
MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3
Yasha Cherikovsky (5):
MIPS/head: Add comments after #endif and #else
MIPS/head: Store ELF appended dtb in a global variable too
MIPS: BMIPS: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y
MIPS: Octeon: Remove special handling of CONFIG_MIPS_ELF_APPENDED_DTB=y
MIPS: Add Kconfig variable for CPUs with unaligned load/store instructions
arch/mips/Kconfig | 42 +++-
arch/mips/Makefile | 11 +-
arch/mips/bcm47xx/workarounds.c | 8 +-
arch/mips/bmips/setup.c | 9 +-
arch/mips/boot/dts/lantiq/danube.dtsi | 42 ++--
arch/mips/boot/dts/lantiq/easy50712.dts | 14 +-
arch/mips/boot/dts/mscc/Makefile | 2 +-
arch/mips/boot/dts/mscc/ocelot.dtsi | 19 ++
arch/mips/boot/dts/mscc/ocelot_pcb120.dts | 107 ++++++++++
arch/mips/boot/dts/mscc/ocelot_pcb123.dts | 6 +
arch/mips/cavium-octeon/octeon-irq.c | 16 +-
arch/mips/cavium-octeon/setup.c | 9 +-
arch/mips/cavium-octeon/smp.c | 7 +
arch/mips/configs/generic/board-ocelot.config | 10 +-
arch/mips/generic/Kconfig | 6 +-
arch/mips/generic/Makefile | 1 -
arch/mips/generic/Platform | 2 +-
...oard-ocelot_pcb123.its.S => board-ocelot.its.S} | 17 ++
arch/mips/generic/kexec.c | 44 ----
arch/mips/include/asm/asm-eva.h | 6 +
arch/mips/include/asm/asm.h | 116 -----------
arch/mips/include/asm/io.h | 129 ++++++------
arch/mips/include/asm/kexec.h | 11 +-
arch/mips/include/asm/mach-loongson64/irq.h | 2 +-
.../asm/mach-loongson64/kernel-entry-init.h | 16 +-
arch/mips/include/asm/mipsregs.h | 20 +-
arch/mips/include/asm/r4kcache.h | 73 -------
arch/mips/include/asm/smp-ops.h | 3 +
arch/mips/include/asm/smp.h | 16 ++
arch/mips/kernel/Makefile | 18 --
arch/mips/kernel/crash.c | 7 +-
arch/mips/kernel/head.S | 18 +-
arch/mips/kernel/machine_kexec.c | 143 ++++++++++++-
arch/mips/kernel/mips-mt.c | 59 ------
arch/mips/kernel/relocate.c | 2 +-
arch/mips/kernel/setup.c | 144 ++++---------
arch/mips/kernel/smp-bmips.c | 7 +
arch/mips/kernel/smp-cps.c | 80 +++++---
arch/mips/kernel/traps.c | 5 +-
arch/mips/kernel/unaligned.c | 47 +++--
arch/mips/lib/Makefile | 2 +-
arch/mips/lib/iomap-pci.c | 7 -
arch/mips/lib/iomap.c | 227 ---------------------
arch/mips/lib/memcpy.S | 22 +-
arch/mips/lib/memset.S | 60 +++---
arch/mips/loongson64/common/Makefile | 1 -
arch/mips/loongson64/fuloong-2e/Makefile | 2 +-
arch/mips/loongson64/fuloong-2e/dma.c | 12 ++
arch/mips/loongson64/lemote-2f/Makefile | 2 +-
arch/mips/loongson64/{common => lemote-2f}/dma.c | 4 -
arch/mips/loongson64/loongson-3/irq.c | 56 +----
arch/mips/loongson64/loongson-3/numa.c | 34 ++-
arch/mips/loongson64/loongson-3/smp.c | 14 +-
arch/mips/mm/init.c | 7 +-
arch/mips/netlogic/common/irq.c | 14 +-
arch/mips/pci/ops-loongson3.c | 34 ++-
arch/mips/pci/pci-legacy.c | 4 +
arch/mips/pci/pci-rt2880.c | 2 +
arch/mips/pmcs-msp71xx/msp_usb.c | 4 +-
arch/mips/ralink/cevt-rt3352.c | 6 +-
arch/mips/ralink/ill_acc.c | 2 +-
arch/mips/ralink/rt305x.c | 5 +
arch/mips/sgi-ip22/ip28-berr.c | 2 +-
arch/mips/sgi-ip27/ip27-memory.c | 11 +-
arch/mips/tools/.gitignore | 1 +
arch/mips/tools/Makefile | 5 +
arch/mips/tools/elf-entry.c | 96 +++++++++
arch/mips/txx9/generic/setup.c | 5 +-
68 files changed, 919 insertions(+), 1016 deletions(-)
create mode 100644 arch/mips/boot/dts/mscc/ocelot_pcb120.dts
rename arch/mips/generic/{board-ocelot_pcb123.its.S => board-ocelot.its.S} (55%)
delete mode 100644 arch/mips/generic/kexec.c
delete mode 100644 arch/mips/lib/iomap.c
create mode 100644 arch/mips/loongson64/fuloong-2e/dma.c
rename arch/mips/loongson64/{common => lemote-2f}/dma.c (75%)
create mode 100644 arch/mips/tools/.gitignore
create mode 100644 arch/mips/tools/Makefile
create mode 100644 arch/mips/tools/elf-entry.c
Attachment:
signature.asc
Description: PGP signature
