Commit 54413b82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (27 commits)
  MIPS: Loongson 2F: Fix of problems introduced by -mfix-loongson2f-jump
  MIPS: Loongson-2F: Use CONFIG_CPU_JUMP_WORKAROUNDS to control workarounds.
  MIPS: Loongson 2F: Enable fixups of the latest binutils
  MIPS: Loongson: Add CPU_LOONGSON2F_WORKAROUNDS
  MIPS: Kconfig: Make Broadcom SoC support naming consistent
  MIPS: BCM63xx: Update defconfig
  MIPS: oprofile: Fix breakage when CONFIG_OPROFILE=m
  STAGING: octeon-ethernet: Use proper phy addresses for Movidis hardware.
  NET: mdio-octeon: Enable the hardware before using it.
  I2C: Fix section mismatch errors in i2c-octeon.c
  MIPS: Loongson: Fix LOONGSON_ADDRWIN_CFG macro.
  MIPS: Loongson: Fix phys_mem_access_prot() check
  MIPS: Loongson: Fix find_vga_mem_init()
  MIPS: Loongson: Fix typo in gdium mach type string.
  MIPS: Use CKSEG1ADDR for uncached handler
  MIPS: Check for accesses beyond the end of the PGD.
  MIPS: Use uasm_i_ds{r,l}l_safe() instead of uasm_i_ds{r,l}l() in tlbex.c
  MIPS: Add uasm_i_dsrl_safe() and uasm_i_dsll_safe() to uasm.
  MIPS: die() does not call die notifier chain
  MIPS: Swarm, Littlesur: Enable PATA platform driver.
  ...
parents be1066bb 64fc74f5

arch/mips/Kconfig

+30 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ config AR7 
	  family: TNETD7100, 7200 and 7300.

	  family: TNETD7100, 7200 and 7300.





config BCM47XX

config BCM47XX

	bool "BCM47XX based boards"

	bool "Broadcom BCM47XX based boards"

	select CEVT_R4K

	select CEVT_R4K

	select CSRC_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select DMA_NONCOHERENT
@@ -509,6 +509,7 @@ config SIBYTE_SWARM 
	bool "Sibyte BCM91250A-SWARM"

	bool "Sibyte BCM91250A-SWARM"

	select BOOT_ELF32

	select BOOT_ELF32

	select DMA_COHERENT

	select DMA_COHERENT

	select HAVE_PATA_PLATFORM

	select NR_CPUS_DEFAULT_2

	select NR_CPUS_DEFAULT_2

	select SIBYTE_SB1250

	select SIBYTE_SB1250

	select SWAP_IO_SPACE

	select SWAP_IO_SPACE
@@ -523,6 +524,7 @@ config SIBYTE_LITTLESUR 
	depends on EXPERIMENTAL

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select BOOT_ELF32

	select DMA_COHERENT

	select DMA_COHERENT

	select HAVE_PATA_PLATFORM

	select NR_CPUS_DEFAULT_2

	select NR_CPUS_DEFAULT_2

	select SIBYTE_SB1250

	select SIBYTE_SB1250

	select SWAP_IO_SPACE

	select SWAP_IO_SPACE
@@ -1305,6 +1307,33 @@ config CPU_CAVIUM_OCTEON 




endchoice

endchoice





if CPU_LOONGSON2F

config CPU_NOP_WORKAROUNDS

	bool



config CPU_JUMP_WORKAROUNDS

	bool



config CPU_LOONGSON2F_WORKAROUNDS

	bool "Loongson 2F Workarounds"

	default y

	select CPU_NOP_WORKAROUNDS

	select CPU_JUMP_WORKAROUNDS

	help

	  Loongson 2F01 / 2F02 processors have the NOP & JUMP issues which

	  require workarounds.  Without workarounds the system may hang

	  unexpectedly.  For more information please refer to the gas

	  -mfix-loongson2f-nop and -mfix-loongson2f-jump options.



	  Loongson 2F03 and later have fixed these issues and no workarounds

	  are needed.  The workarounds have no significant side effect on them

	  but may decrease the performance of the system so this option should

	  be disabled unless the kernel is intended to be run on 2F01 or 2F02

	  systems.



	  If unsure, please say Y.

endif # CPU_LOONGSON2F



config SYS_SUPPORTS_ZBOOT

config SYS_SUPPORTS_ZBOOT

	bool

	bool

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_GZIP

arch/mips/Makefile

+13 −0
Original line number Original line Diff line number Diff line
@@ -136,6 +136,19 @@ cflags-$(CONFIG_CPU_LOONGSON2E) += \ 
	$(call cc-option,-march=loongson2e,-march=r4600)

	$(call cc-option,-march=loongson2e,-march=r4600)

cflags-$(CONFIG_CPU_LOONGSON2F) += \

cflags-$(CONFIG_CPU_LOONGSON2F) += \

	$(call cc-option,-march=loongson2f,-march=r4600)

	$(call cc-option,-march=loongson2f,-march=r4600)

# enable the workarounds for loongson2f

ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS

  ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-nop,),)

    $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-nop)

  else

    cflags-$(CONFIG_CPU_NOP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-nop

  endif

  ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-jump,),)

    $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-jump)

  else

    cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-jump

  endif

endif





cflags-$(CONFIG_CPU_MIPS32_R1)	+= $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \

cflags-$(CONFIG_CPU_MIPS32_R1)	+= $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \

			-Wa,-mips32 -Wa,--trap

			-Wa,-mips32 -Wa,--trap

arch/mips/alchemy/devboards/db1200/setup.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -66,12 +66,16 @@ static int __init db1200_arch_init(void) 
	set_irq_type(AU1200_GPIO7_INT, IRQF_TRIGGER_LOW);

	set_irq_type(AU1200_GPIO7_INT, IRQF_TRIGGER_LOW);

	bcsr_init_irq(DB1200_INT_BEGIN, DB1200_INT_END, AU1200_GPIO7_INT);

	bcsr_init_irq(DB1200_INT_BEGIN, DB1200_INT_END, AU1200_GPIO7_INT);





	/* do not autoenable these: CPLD has broken edge int handling,

	/* insert/eject pairs: one of both is always screaming.  To avoid

	 * and the CD handler setup requires manual enabling to work

	 * issues they must not be automatically enabled when initially

	 * around that.

	 * requested.

	 */

	 */

	irq_to_desc(DB1200_SD0_INSERT_INT)->status |= IRQ_NOAUTOEN;

	irq_to_desc(DB1200_SD0_INSERT_INT)->status |= IRQ_NOAUTOEN;

	irq_to_desc(DB1200_SD0_EJECT_INT)->status |= IRQ_NOAUTOEN;

	irq_to_desc(DB1200_SD0_EJECT_INT)->status |= IRQ_NOAUTOEN;

	irq_to_desc(DB1200_PC0_INSERT_INT)->status |= IRQ_NOAUTOEN;

	irq_to_desc(DB1200_PC0_EJECT_INT)->status |= IRQ_NOAUTOEN;

	irq_to_desc(DB1200_PC1_INSERT_INT)->status |= IRQ_NOAUTOEN;

	irq_to_desc(DB1200_PC1_EJECT_INT)->status |= IRQ_NOAUTOEN;





	return 0;

	return 0;

}

}

arch/mips/configs/bcm63xx_defconfig

+335 −83

File changed.

Preview size limit exceeded, changes collapsed.

arch/mips/include/asm/mach-loongson/loongson.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -307,7 +307,7 @@ extern unsigned long _loongson_addrwincfg_base; 
 */

 */

#define LOONGSON_ADDRWIN_CFG(s, d, w, src, dst, size) do {\

#define LOONGSON_ADDRWIN_CFG(s, d, w, src, dst, size) do {\

	s##_WIN##w##_BASE = (src); \

	s##_WIN##w##_BASE = (src); \

	s##_WIN##w##_MMAP = (src) | ADDRWIN_MAP_DST_##d; \

	s##_WIN##w##_MMAP = (dst) | ADDRWIN_MAP_DST_##d; \

	s##_WIN##w##_MASK = ~(size-1); \

	s##_WIN##w##_MASK = ~(size-1); \

} while (0)

} while (0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE