From: Paul Burton <paul.burton@mips.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-mips@vger.kernel.org" <linux-mips@vger.kernel.org>
Subject: [GIT PULL] More MIPS changes for 5.2
Date: Sat, 18 May 2019 06:31:51 +0000 [thread overview]
Message-ID: <20190518063149.pvcmpgulqnwwuwuf@pburton-laptop> (raw)
[-- Attachment #1: Type: text/plain, Size: 3340 bytes --]
Hi Linus,
Here's a few more MIPS changes for 5.2, consisting of some SGI IP27
specific PCI rework and a batch of fixes. Please pull.
You'll see a conflict in arch/mips/sgi-ip27/ip27-irq.c due to commit
e4952b0c2c03 ("MIPS: SGI-IP27: Fix use of unchecked pointer in
shutdown_bridge_irq") which was merged in v5.1-rc5. The correct
resolution is to take the file content from the mips_5.2_2 tag, ie.
remove the startup_bridge_irq() & shutdown_bridge_irq() functions.
Thanks,
Paul
The following changes since commit 3751cbda8f223549d7ea28803cbec8ac87e43ed2:
mips: Manually call fdt_init_reserved_mem() method (2019-05-05 20:12:20 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git tags/mips_5.2_2
for you to fetch changes up to b1e479e3dcbc970bfc0b20a56f213e4df08daf75:
MIPS: Alchemy: add DMA masks for on-chip ethernet (2019-05-15 14:29:29 -0700)
----------------------------------------------------------------
A few more MIPS changes for 5.2:
- A build fix for BMIPS5000 configurations with CONFIG_HW_PERF_EVENTS=y,
which also neatly removes some #ifdefery.
- A fix to report supported ISAs correctly on older Ingenic SoCs which
incorrectly indicate MIPSr2 support in their cop0 Config register.
- Some PCI modernization for SGI IP27 systems as part of ongoing work to
support some other SGI systems.
- A fix allowing use of appended DTB files with generic kernels.
- DMA mask fixes for SGI IP22 & Alchemy systems.
----------------------------------------------------------------
Florian Fainelli (1):
MIPS: perf: Fix build with CONFIG_CPU_BMIPS5000 enabled
Manuel Lauss (1):
MIPS: Alchemy: add DMA masks for on-chip ethernet
Marcin Nowakowski (1):
generic: fix appended dtb support
Paul Cercueil (1):
MIPS: Fix Ingenic SoCs sometimes reporting wrong ISA
Thomas Bogendoerfer (3):
MIPS: SGI-IP27: use generic PCI driver
MIPS: SGI-IP27: abstract chipset irq from bridge
MIPS: SGI-IP22: provide missing dma_mask/coherent_dma_mask
arch/mips/Kconfig | 6 +
arch/mips/alchemy/common/platform.c | 22 +-
arch/mips/generic/init.c | 4 +-
arch/mips/include/asm/mach-ip27/topology.h | 11 +-
arch/mips/include/asm/pci/bridge.h | 14 +-
arch/mips/include/asm/sn/irq_alloc.h | 11 +
arch/mips/include/asm/xtalk/xtalk.h | 9 -
arch/mips/kernel/cpu-probe.c | 8 +
arch/mips/kernel/perf_event_mipsxx.c | 21 +-
arch/mips/pci/Makefile | 3 +-
arch/mips/pci/ops-bridge.c | 302 --------------
arch/mips/pci/pci-ip27.c | 181 ---------
arch/mips/pci/pci-xtalk-bridge.c | 610 +++++++++++++++++++++++++++++
arch/mips/sgi-ip22/ip22-platform.c | 13 +
arch/mips/sgi-ip27/ip27-init.c | 2 +
arch/mips/sgi-ip27/ip27-irq.c | 191 ++++-----
arch/mips/sgi-ip27/ip27-xtalk.c | 61 ++-
include/linux/platform_data/xtalk-bridge.h | 22 ++
18 files changed, 831 insertions(+), 660 deletions(-)
create mode 100644 arch/mips/include/asm/sn/irq_alloc.h
delete mode 100644 arch/mips/pci/ops-bridge.c
create mode 100644 arch/mips/pci/pci-xtalk-bridge.c
create mode 100644 include/linux/platform_data/xtalk-bridge.h
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next reply other threads:[~2019-05-18 6:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-18 6:31 Paul Burton [this message]
2019-05-19 17:45 ` [GIT PULL] More MIPS changes for 5.2 pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190518063149.pvcmpgulqnwwuwuf@pburton-laptop \
--to=paul.burton@mips.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).