diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2024-06-19 10:19:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2024-06-19 10:19:41 -0700 |
| commit | 6785e3cc09f149c42ce70eb92736d68c0db64684 (patch) | |
| tree | 4dbadb4e9549e0fdf1c46fb8d5b1741045d516b8 | |
| parent | Merge tag 'linux_kselftest-fixes-6.10-rc5' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | Revert "MIPS: pci: lantiq: restore reset gpio polarity" (diff) | |
| download | linux-6785e3cc09f149c42ce70eb92736d68c0db64684.tar.gz linux-6785e3cc09f149c42ce70eb92736d68c0db64684.tar.bz2 linux-6785e3cc09f149c42ce70eb92736d68c0db64684.zip | |
Merge tag 'mips-fixes_6.10_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Thomas Bogendoerfer:
- fix for BCM6538 boards
- fix RB532 PCI workaround
* tag 'mips-fixes_6.10_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
Revert "MIPS: pci: lantiq: restore reset gpio polarity"
mips: bmips: BCM6358: make sure CBR is correctly set
MIPS: pci: lantiq: restore reset gpio polarity
MIPS: Routerboard 532: Fix vendor retry check code
| -rw-r--r-- | arch/mips/bmips/setup.c | 3 | ||||
| -rw-r--r-- | arch/mips/pci/ops-rc32434.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c index ec180ab92eaa..66a8ba19c287 100644 --- a/arch/mips/bmips/setup.c +++ b/arch/mips/bmips/setup.c @@ -110,7 +110,8 @@ static void bcm6358_quirks(void) * RAC flush causes kernel panics on BCM6358 when booting from TP1 * because the bootloader is not initializing it properly. */ - bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31)); + bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31)) || + !!BMIPS_GET_CBR(); } static void bcm6368_quirks(void) diff --git a/arch/mips/pci/ops-rc32434.c b/arch/mips/pci/ops-rc32434.c index 874ed6df9768..34b9323bdabb 100644 --- a/arch/mips/pci/ops-rc32434.c +++ b/arch/mips/pci/ops-rc32434.c @@ -112,8 +112,8 @@ retry: * gives them time to settle */ if (where == PCI_VENDOR_ID) { - if (ret == 0xffffffff || ret == 0x00000000 || - ret == 0x0000ffff || ret == 0xffff0000) { + if (*val == 0xffffffff || *val == 0x00000000 || + *val == 0x0000ffff || *val == 0xffff0000) { if (delay > 4) return 0; delay *= 2; |