Commit e4ca714b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux 

Pull MIPS fixes from Ralf Baechle:
 "MIPS fixes for 4.1 all across the tree"

* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux:
  MIPS: strnlen_user.S: Fix a CPU_DADDI_WORKAROUNDS regression
  MIPS: BMIPS: Fix bmips_wr_vec()
  MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set
  MIPS: Fuloong 2E: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760
  MIPS: irq: Use DECLARE_BITMAP
  ttyFDC: Fix to use native endian MMIO reads
  MIPS: Fix CDMM to use native endian MMIO reads
parents 50f5a1ee c4fca4fd

arch/mips/ath79/prom.c

+3 −0
Original line number Diff line number Diff line 
/*

 *  Atheros AR71XX/AR724X/AR913X specific prom routines

 *

 *  Copyright (C) 2015 Laurent Fasnacht <l@libres.ch>

 *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>

 *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>

 *
@@ -25,12 +26,14 @@ void __init prom_init(void) 
{

	fw_init_cmdline();



#ifdef CONFIG_BLK_DEV_INITRD

	/* Read the initrd address from the firmware environment */

	initrd_start = fw_getenvl("initrd_start");

	if (initrd_start) {

		initrd_start = KSEG0ADDR(initrd_start);

		initrd_end = initrd_start + fw_getenvl("initrd_size");

	}

#endif

}



void __init prom_free_prom_memory(void)

arch/mips/configs/fuloong2e_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ CONFIG_USB_WUSB_CBAF=m 
CONFIG_USB_C67X00_HCD=m

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

CONFIG_USB_ISP1760_HCD=m

CONFIG_USB_ISP1760=m

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_UHCI_HCD=m

CONFIG_USB_R8A66597_HCD=m

arch/mips/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
int kgdb_early_setup;

#endif



static unsigned long irq_map[NR_IRQS / BITS_PER_LONG];

static DECLARE_BITMAP(irq_map, NR_IRQS);



int allocate_irqno(void)

{

arch/mips/kernel/smp-bmips.c

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ struct plat_smp_ops bmips5000_smp_ops = { 
static void bmips_wr_vec(unsigned long dst, char *start, char *end)

{

	memcpy((void *)dst, start, end - start);

	dma_cache_wback((unsigned long)start, end - start);

	dma_cache_wback(dst, end - start);

	local_flush_icache_range(dst, dst + (end - start));

	instruction_hazard();

}

arch/mips/lib/strnlen_user.S

+13 −2
Original line number Diff line number Diff line
@@ -34,7 +34,12 @@ LEAF(__strnlen_\func\()_asm) 
FEXPORT(__strnlen_\func\()_nocheck_asm)

	move		v0, a0

	PTR_ADDU	a1, a0			# stop pointer

1:	beq		v0, a1, 1f		# limit reached?

1:

#ifdef CONFIG_CPU_DADDI_WORKAROUNDS

	.set		noat

	li		AT, 1

#endif

	beq		v0, a1, 1f		# limit reached?

.ifeqs "\func", "kernel"

	EX(lb, t0, (v0), .Lfault\@)

.else
@@ -42,7 +47,13 @@ FEXPORT(__strnlen_\func\()_nocheck_asm) 
.endif

	.set		noreorder

	bnez		t0, 1b

1:	 PTR_ADDIU	v0, 1

1:

#ifndef CONFIG_CPU_DADDI_WORKAROUNDS

	 PTR_ADDIU	v0, 1

#else

	 PTR_ADDU	v0, AT

	.set		at

#endif

	.set		reorder

	PTR_SUBU	v0, a0

	jr		ra

CRA Git | Maintained and supported by SUSTech CRA and CCSE