Pull MIPS fixes from Ralf Baechle: "Random fixes across arch/mips, essentially. One fix for an issue in get_user_pages_fast() which previously was discovered on x86, a miscalculation in the support for the MIPS MT hardware multithreading support, the RTC support for the Malta and a fix for a spurious interrupt issue that seems to bite only very special Malta configurations." * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: Malta: Don't crash on spurious interrupt. MIPS: Malta: Remove RTC Data Mode bootstrap breakage MIPS: mm: Add compound tail page _mapcount when mapped MIPS: CMP/SMTC: Fix tc_id calculation
Unified · Split
| @@ -102,7 +102,7 @@ static void cmp_init_secondary(void) · 101 unmodified lines | ||
| 102 | 102 | c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & TCBIND_CURVPE; |
| 103 | 103 | #endif |
| 104 | 104 | #ifdef CONFIG_MIPS_MT_SMTC |
| 105 | − c->tc_id = (read_c0_tcbind() >> TCBIND_CURTC_SHIFT) & TCBIND_CURTC; | |
| 105 | + c->tc_id = (read_c0_tcbind() & TCBIND_CURTC) >> TCBIND_CURTC_SHIFT; | |
| 106 | 106 | #endif |
| 107 | 107 | } |
| 108 | 108 | |
| @@ -152,6 +152,8 @@ static int gup_huge_pud(pud_t pud, unsigned long addr, unsigned long end, · 151 unmodified lines | ||
| 152 | 152 | do { |
| 153 | 153 | VM_BUG_ON(compound_head(page) != head); |
| 154 | 154 | pages[*nr] = page; |
| 155 | + if (PageTail(page)) | |
| 156 | + get_huge_page_tail(page); | |
| 155 | 157 | (*nr)++; |
| 156 | 158 | page++; |
| 157 | 159 | refs++; |
| @@ -273,16 +273,19 @@ asmlinkage void plat_irq_dispatch(void) · 272 unmodified lines | ||
| 273 | 273 | unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM; |
| 274 | 274 | int irq; |
| 275 | 275 | |
| 276 | + if (unlikely(!pending)) { | |
| 277 | + spurious_interrupt(); | |
| 278 | + return; | |
| 279 | + } | |
| 280 | + | |
| 276 | 281 | irq = irq_ffs(pending); |
| 277 | 282 | |
| 278 | 283 | if (irq == MIPSCPU_INT_I8259A) |
| 279 | 284 | malta_hw0_irqdispatch(); |
| 280 | 285 | else if (gic_present && ((1 << irq) & ipi_map[smp_processor_id()])) |
| 281 | 286 | malta_ipi_irqdispatch(); |
| 282 | − else if (irq >= 0) | |
| 283 | − do_IRQ(MIPS_CPU_IRQ_BASE + irq); | |
| 284 | 287 | else |
| 285 | − spurious_interrupt(); | |
| 288 | + do_IRQ(MIPS_CPU_IRQ_BASE + irq); | |
| 286 | 289 | } |
| 287 | 290 | |
| 288 | 291 | #ifdef CONFIG_MIPS_MT_SMP |
| @@ -138,11 +138,6 @@ static int __init malta_add_devices(void) · 137 unmodified lines | ||
| 138 | 138 | if (err) |
| 139 | 139 | return err; |
| 140 | 140 | |
| 141 | − /* | |
| 142 | − * Set RTC to BCD mode to support current alarm code. | |
| 143 | − */ | |
| 144 | − CMOS_WRITE(CMOS_READ(RTC_CONTROL) & ~RTC_DM_BINARY, RTC_CONTROL); | |
| 145 | − | |
| 146 | 141 | return 0; |
| 147 | 142 | } |
| 148 | 143 | |