| Message ID | 20190305002951.jdrcgn5jf5xoa5rr@pburton-laptop (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [GIT,PULL] Main MIPS pull request for 5.1 | expand |
Hi Linus, On Tue, Mar 05, 2019 at 12:29:53AM +0000, Paul Burton wrote: > The following changes since commit 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8: > > Linux 5.0-rc2 (2019-01-14 10:41:12 +1200) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.1 > > for you to fetch changes up to aeb669d41ffabb91b1542f1f802cb12a989fced0: > > MIPS: lantiq: Remove separate GPHY Firmware loader (2019-02-25 14:17:10 -0800) D'oh, I forgot to mention that you'll see a few conflicts when merging due to fixes that went into v5.0. The correct resolutions are: - Delete arch/mips/ath79/dev-spi.h as done in mips_5.1. - Keep the mips_5.1 version of arch/mips/include/asm/pgtable.h (the version using cmpxchg). - Keep both hunks of code added to arch/mips/include/asm/barrier.h. Thanks, Paul
The pull request you sent on Tue, 5 Mar 2019 00:29:53 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d9862cfbe2099deb83f0e9c1932c91f2d9c50464
Thank you!
Hi Linus, Below are the main MIPS changes for v5.1; please pull. Thanks, Paul The following changes since commit 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8: Linux 5.0-rc2 (2019-01-14 10:41:12 +1200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.1 for you to fetch changes up to aeb669d41ffabb91b1542f1f802cb12a989fced0: MIPS: lantiq: Remove separate GPHY Firmware loader (2019-02-25 14:17:10 -0800) ---------------------------------------------------------------- Here's the main MIPS pull request for v5.1: - Support for the MIPSr6 MemoryMapID register & Global INValidate TLB (GINVT) instructions, allowing for more efficient TLB maintenance when running on a CPU such as the I6500 that supports these. - Enable huge page support for MIPS64r6. - Optimize post-DMA cache sync by removing that code entirely for kernel configurations in which we know it won't be needed. - The number of pages allocated for interrupt stacks is now calculated correctly, where before we would wastefully allocate too much memory in some configurations. - The ath79 platform migrates to devicetree. - The bcm47xx platform sees fixes for the Buffalo WHR-G54S board. - The ingenic/jz4740 platform gains support for appended devicetrees. - The cavium_octeon, lantiq, loongson32 & sgi-ip27 platforms all see cleanups as do various pieces of core architecture code. ---------------------------------------------------------------- Aaro Koskinen (7): MIPS: OCTEON: delete SMI/MDIO enable MIPS: OCTEON: delete unused cvmx-smix-defs.h MIPS: OCTEON: add fixed-link nodes to in-kernel device tree MIPS: OCTEON: warn if deprecated link status is being used MIPS: OCTEON: don't lie about interface type of CN3005 board MIPS: OCTEON: delete board-specific link status MIPS: OCTEON: program rx/tx-delay always from DT Felix Fietkau (6): MIPS: ath79: add helpers for setting clocks and expose the ref clock MIPS: ath79: move legacy "wdt" and "uart" clock aliases out of soc init MIPS: ath79: pass PLL base to clock init functions MIPS: ath79: make specifying the reference clock in DT optional MIPS: ath79: support setting up clock via DT on all SoC types MIPS: ath79: export switch MDIO reference clock Greg Kroah-Hartman (5): mips: cavium: no need to check return value of debugfs_create functions mips: ralink: no need to check return value of debugfs_create functions mips: mm: no need to check return value of debugfs_create functions mips: math-emu: no need to check return value of debugfs_create functions mips: kernel: no need to check return value of debugfs_create functions Hauke Mehrtens (2): MIPS: Compile post DMA flush only when needed MIPS: lantiq: Remove separate GPHY Firmware loader Jiaxun Yang (5): MIPS: Loongson32: Remove unused platform devices MIPS: Loongson32: clarify we don't support MIPS16 and merge configs MIPS: Loongson32: Set load address to 0x80200000 MIPS: Loongson32: workaround di issue MIPS: Loongson32: Revert ISA level to MIPS32R2 John Crispin (5): MIPS: ath79: drop legacy IRQ code MIPS: ath79: drop machfiles MIPS: ath79: drop legacy pci code MIPS: ath79: drop platform device registration code MIPS: ath79: drop !OF clock code Liu Xiang (1): MIPS: irq: Allocate accurate order pages for irq stack Masahiro Yamada (1): MIPS: remove meaningless generic-(CONFIG_GENERIC_CSUM) += checksum.h Paul Burton (26): MIPS: mm: Define activate_mm() using switch_mm() MIPS: mm: Remove redundant drop_mmu_context() cpu argument MIPS: mm: Remove redundant get_new_mmu_context() cpu argument MIPS: mm: Avoid HTW stop/start when dropping an inactive mm MIPS: mm: Consolidate drop_mmu_context() has-ASID checks MIPS: mm: Move drop_mmu_context() comment into appropriate block MIPS: mm: Remove redundant preempt_disable in local_flush_tlb_mm() MIPS: mm: Remove local_flush_tlb_mm() MIPS: mm: Split obj-y to a file per line MIPS: mm: Un-inline get_new_mmu_context MIPS: mm: Unify ASID version checks MIPS: mm: Add set_cpu_context() for ASID assignments MIPS: Add GINVT instruction helpers MIPS: MemoryMapID (MMID) Support MIPS: Remove open-coded cmpxchg() in set_pte() MIPS: Enable hugepage support for MIPS64r6 MIPS: Don't select ARCH_HAS_SYNC_DMA_FOR_CPU when DMA is coherent MIPS: Loongson32: Fix config brokenness; select SYS_SUPPORTS_32BIT_KERNEL MIPS: Loongson32: Remove DMA & NAND devices from ls1b/board.c MIPS: Export mm switching functions used by KVM MIPS: Fix set_pte() for Netlogic XLR using cmpxchg64() MIPS: Delete unused flush_cache_sigtramp() MIPS: CM: Fix indentation MIPS: eBPF: Always return sign extended 32b values MIPS: eBPF: Remove REG_32BIT_ZERO_EX MIPS: dma-noncoherent: Remove bogus condition in dma_sync_phys() Paul Cercueil (1): MIPS: ingenic: Add support for appended devicetree Rafał Miłecki (1): MIPS: BCM47XX: Fix/improve Buffalo WHR-G54S support Thomas Bogendoerfer (6): MIPS: SGI-IP27: get rid of volatile and hubreg_t MIPS: SGI-IP27: clean up bridge access and header files MIPS: SGI-IP27: use pr_info/pr_emerg and pr_cont to fix output MIPS: SGI-IP27: do xtalk scanning later MIPS: SGI-IP27: do boot CPU init later MIPS: SGI-IP27: rework HUB interrupts .../devicetree/bindings/mips/lantiq/rcu-gphy.txt | 36 --- .../devicetree/bindings/mips/lantiq/rcu.txt | 18 -- arch/mips/Kconfig | 13 +- arch/mips/Makefile | 2 + arch/mips/ath79/Kconfig | 73 ----- arch/mips/ath79/Makefile | 23 +- arch/mips/ath79/clock.c | 342 +++++++++----------- arch/mips/ath79/common.h | 5 - arch/mips/ath79/dev-common.c | 159 --------- arch/mips/ath79/dev-common.h | 18 -- arch/mips/ath79/dev-gpio-buttons.c | 56 ---- arch/mips/ath79/dev-gpio-buttons.h | 23 -- arch/mips/ath79/dev-leds-gpio.c | 54 ---- arch/mips/ath79/dev-leds-gpio.h | 21 -- arch/mips/ath79/dev-spi.c | 38 --- arch/mips/ath79/dev-spi.h | 22 -- arch/mips/ath79/dev-usb.c | 242 -------------- arch/mips/ath79/dev-usb.h | 17 - arch/mips/ath79/dev-wmac.c | 155 --------- arch/mips/ath79/dev-wmac.h | 17 - arch/mips/ath79/irq.c | 169 ---------- arch/mips/ath79/mach-ap121.c | 92 ------ arch/mips/ath79/mach-ap136.c | 156 --------- arch/mips/ath79/mach-ap81.c | 100 ------ arch/mips/ath79/mach-db120.c | 136 -------- arch/mips/ath79/mach-pb44.c | 128 -------- arch/mips/ath79/mach-ubnt-xm.c | 126 -------- arch/mips/ath79/machtypes.h | 28 -- arch/mips/ath79/pci.c | 273 ---------------- arch/mips/ath79/pci.h | 35 -- arch/mips/ath79/setup.c | 78 +---- arch/mips/bcm47xx/buttons.c | 2 +- arch/mips/bcm47xx/leds.c | 10 +- arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 14 + arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts | 6 + .../cavium-octeon/executive/cvmx-helper-board.c | 86 +---- arch/mips/cavium-octeon/executive/cvmx-helper.c | 39 +-- arch/mips/cavium-octeon/oct_ilm.c | 32 +- arch/mips/cavium-octeon/octeon-platform.c | 64 ++++ arch/mips/configs/xway_defconfig | 1 - arch/mips/include/asm/Kbuild | 1 - arch/mips/include/asm/barrier.h | 19 ++ arch/mips/include/asm/cacheflush.h | 2 - arch/mips/include/asm/cmpxchg.h | 104 +++++- arch/mips/include/asm/cpu-features.h | 13 + arch/mips/include/asm/cpu.h | 1 + arch/mips/include/asm/ginvt.h | 56 ++++ arch/mips/include/asm/irqflags.h | 2 +- arch/mips/include/asm/mach-ath79/ath79.h | 4 - arch/mips/include/asm/mach-ip27/irq.h | 12 +- arch/mips/include/asm/mach-ip27/mmzone.h | 9 - arch/mips/include/asm/mach-loongson32/platform.h | 4 - arch/mips/include/asm/mipsregs.h | 11 + arch/mips/include/asm/mmu.h | 6 +- arch/mips/include/asm/mmu_context.h | 139 ++++---- arch/mips/include/asm/octeon/cvmx-helper-board.h | 12 - arch/mips/include/asm/octeon/cvmx-smix-defs.h | 276 ---------------- arch/mips/include/asm/pci/bridge.h | 206 ++++++------ arch/mips/include/asm/pgtable.h | 49 +-- arch/mips/include/asm/smp-ops.h | 1 + arch/mips/include/asm/sn/addrs.h | 72 +---- arch/mips/include/asm/sn/arch.h | 2 - arch/mips/include/asm/sn/io.h | 2 +- arch/mips/include/asm/sn/sn0/addrs.h | 5 - arch/mips/include/asm/tlbflush.h | 5 +- arch/mips/jz4740/setup.c | 14 +- arch/mips/kernel/cpu-probe.c | 55 +++- arch/mips/kernel/irq.c | 4 +- arch/mips/kernel/mips-cm.c | 4 +- arch/mips/kernel/mips-r2-to-r6-emul.c | 21 +- arch/mips/kernel/segment.c | 15 +- arch/mips/kernel/setup.c | 7 +- arch/mips/kernel/smp.c | 69 +++- arch/mips/kernel/spinlock_test.c | 21 +- arch/mips/kernel/traps.c | 4 +- arch/mips/kernel/unaligned.c | 17 +- arch/mips/kvm/emulate.c | 8 +- arch/mips/kvm/mips.c | 5 + arch/mips/kvm/trap_emul.c | 30 +- arch/mips/kvm/vz.c | 8 +- arch/mips/lantiq/Kconfig | 4 - arch/mips/lib/dump_tlb.c | 22 +- arch/mips/loongson32/Kconfig | 2 - arch/mips/loongson32/Platform | 4 +- arch/mips/loongson32/common/platform.c | 63 ---- arch/mips/loongson32/ls1b/board.c | 28 -- arch/mips/math-emu/me-debugfs.c | 23 +- arch/mips/mm/Makefile | 16 +- arch/mips/mm/c-octeon.c | 18 -- arch/mips/mm/c-r3k.c | 25 -- arch/mips/mm/c-r4k.c | 124 +------ arch/mips/mm/c-tx39.c | 21 -- arch/mips/mm/cache.c | 1 - arch/mips/mm/context.c | 291 +++++++++++++++++ arch/mips/mm/dma-noncoherent.c | 9 +- arch/mips/mm/init.c | 7 + arch/mips/mm/sc-debugfs.c | 15 +- arch/mips/mm/tlb-r3k.c | 14 +- arch/mips/mm/tlb-r4k.c | 71 ++-- arch/mips/mm/tlb-r8k.c | 10 +- arch/mips/net/ebpf_jit.c | 24 +- arch/mips/pci/Makefile | 1 + arch/mips/pci/fixup-ath79.c | 21 ++ arch/mips/pci/ops-bridge.c | 68 ++-- arch/mips/pci/pci-ip27.c | 49 +-- arch/mips/ralink/bootrom.c | 8 +- arch/mips/sgi-ip27/Makefile | 3 +- arch/mips/sgi-ip27/ip27-hubio.c | 4 +- arch/mips/sgi-ip27/ip27-init.c | 39 +-- arch/mips/sgi-ip27/ip27-irq-pci.c | 266 --------------- arch/mips/sgi-ip27/ip27-irq.c | 357 ++++++++++++++------- arch/mips/sgi-ip27/ip27-irqno.c | 48 --- arch/mips/sgi-ip27/ip27-memory.c | 34 +- arch/mips/sgi-ip27/ip27-nmi.c | 64 ++-- arch/mips/sgi-ip27/ip27-smp.c | 5 +- arch/mips/sgi-ip27/ip27-timer.c | 42 +-- arch/mips/sgi-ip27/ip27-xtalk.c | 13 +- drivers/soc/lantiq/Makefile | 1 - drivers/soc/lantiq/gphy.c | 224 ------------- include/dt-bindings/clock/ath79-clk.h | 4 +- 120 files changed, 1622 insertions(+), 4625 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mips/lantiq/rcu-gphy.txt delete mode 100644 arch/mips/ath79/dev-common.c delete mode 100644 arch/mips/ath79/dev-common.h delete mode 100644 arch/mips/ath79/dev-gpio-buttons.c delete mode 100644 arch/mips/ath79/dev-gpio-buttons.h delete mode 100644 arch/mips/ath79/dev-leds-gpio.c delete mode 100644 arch/mips/ath79/dev-leds-gpio.h delete mode 100644 arch/mips/ath79/dev-spi.c delete mode 100644 arch/mips/ath79/dev-spi.h delete mode 100644 arch/mips/ath79/dev-usb.c delete mode 100644 arch/mips/ath79/dev-usb.h delete mode 100644 arch/mips/ath79/dev-wmac.c delete mode 100644 arch/mips/ath79/dev-wmac.h delete mode 100644 arch/mips/ath79/irq.c delete mode 100644 arch/mips/ath79/mach-ap121.c delete mode 100644 arch/mips/ath79/mach-ap136.c delete mode 100644 arch/mips/ath79/mach-ap81.c delete mode 100644 arch/mips/ath79/mach-db120.c delete mode 100644 arch/mips/ath79/mach-pb44.c delete mode 100644 arch/mips/ath79/mach-ubnt-xm.c delete mode 100644 arch/mips/ath79/machtypes.h delete mode 100644 arch/mips/ath79/pci.c delete mode 100644 arch/mips/ath79/pci.h create mode 100644 arch/mips/include/asm/ginvt.h delete mode 100644 arch/mips/include/asm/octeon/cvmx-smix-defs.h create mode 100644 arch/mips/mm/context.c create mode 100644 arch/mips/pci/fixup-ath79.c delete mode 100644 arch/mips/sgi-ip27/ip27-irq-pci.c delete mode 100644 arch/mips/sgi-ip27/ip27-irqno.c delete mode 100644 drivers/soc/lantiq/gphy.c