Commit 40787d00 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:
  [MIPS] N32 needs to use the compat version of sys_nfsservctl.
  [MIPS] irq_cpu: use handle_percpu_irq handler to avoid dropping interrupts.
  [MIPS] Sibyte: Fix name of clocksource.
  [MIPS] SNI: s/achknowledge/acknowledge/
  [MIPS] Makefile: Fix canonical system names
  [MIPS] vpe: handle halting TCs in an errata safe way.
  [MIPS] Sibyte: Stop timers before programming next even.
  [MIPS] Sibyte: Increase minimum oneshot timer interval to two ticks.
  [MIPS] Lasat: Fix overlap of interrupt number ranges.
  [MIPS] SNI PCIT CPLUS: workaround for b0rked irq wiring of onboard PCI bus 1
  [MIPS] Fix shadow register support.
  [MIPS] Change get_cycles to always return 0.
  [MIPS] Fix typo in R3000 TRACE_IRQFLAGS code
  [MIPS] Sibyte: Replace use of removed IO_SPACE_BASE with IOADDR.
  [MIPS] iounmap if in vr41xx_pciu_init() pci clock is over 33MHz
  [MIPS] BCM1480: Remove duplicate acknowledge of timer interrupt.
  [MIPS] Sibyte: pin timer interrupt to their cores.
  [MIPS] Qemu: Add early printk, your friend in a cold night.
  [MIPS] Convert reference to mem_map to pfn_to_page().
  [MIPS] Sibyte: resurrect old cache hack.
parents 3c72f526 72e51065

arch/mips/Kconfig

+1 −10
Original line number Diff line number Diff line
@@ -361,10 +361,10 @@ config QEMU 
	select PCSPEAKER

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select ARCH_SPARSEMEM_ENABLE

	select GENERIC_HARDIRQS_NO__DO_IRQ

	select NR_CPUS_DEFAULT_1

	select SYS_SUPPORTS_SMP
@@ -1409,7 +1409,6 @@ config MIPS_MT_SMP 
	depends on SYS_SUPPORTS_MULTITHREADING

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select CPU_MIPSR2_SRS

	select MIPS_MT

	select NR_CPUS_DEFAULT_2

	select SMP
@@ -1426,7 +1425,6 @@ config MIPS_MT_SMTC 
	select GENERIC_CLOCKEVENTS_BROADCAST

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select CPU_MIPSR2_SRS

	select MIPS_MT

	select NR_CPUS_DEFAULT_8

	select SMP
@@ -1453,7 +1451,6 @@ config MIPS_VPE_LOADER 
	depends on SYS_SUPPORTS_MULTITHREADING

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select CPU_MIPSR2_SRS

	select MIPS_MT

	help

	  Includes a loader for loading an elf relocatable object
@@ -1582,12 +1579,6 @@ config CPU_MIPSR2_IRQ_VI 
config CPU_MIPSR2_IRQ_EI

	bool



#

# Shadow registers are an R2 feature

#

config CPU_MIPSR2_SRS

	bool



config CPU_HAS_SYNC

	bool

	depends on !CPU_R3000

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ endif 


ifneq ($(SUBARCH),$(ARCH))

  ifeq ($(CROSS_COMPILE),)

    CROSS_COMPILE := $(call cc-cross-prefix, $(tool-archpref)-linux-  $(tool-archpref)-gnu-linux-  $(tool-archpref)-unknown-gnu-linux-)

    CROSS_COMPILE := $(call cc-cross-prefix, $(tool-archpref)-linux-  $(tool-archpref)-linux-gnu-  $(tool-archpref)-unknown-linux-gnu-)

  endif

endif

arch/mips/kernel/cevt-bcm1480.c

+5 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ static int sibyte_next_event(unsigned long delta, struct clock_event_device *cd) 
	cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));

	init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT));



	__raw_writeq(0, cfg);

	__raw_writeq(delta - 1, init);

	__raw_writeq(M_SCD_TIMER_ENABLE, cfg);
@@ -122,7 +123,7 @@ void __cpuinit sb1480_clockevent_init(void) 
				  CLOCK_EVT_FEAT_ONESHOT;

	clockevent_set_clock(cd, V_SCD_TIMER_FREQ);

	cd->max_delta_ns	= clockevent_delta2ns(0x7fffff, cd);

	cd->min_delta_ns	= clockevent_delta2ns(1, cd);

	cd->min_delta_ns	= clockevent_delta2ns(2, cd);

	cd->rating		= 200;

	cd->irq			= irq;

	cd->cpumask		= cpumask_of_cpu(cpu);
@@ -143,7 +144,10 @@ void __cpuinit sb1480_clockevent_init(void) 


	action->handler	= sibyte_counter_handler;

	action->flags	= IRQF_DISABLED | IRQF_PERCPU;

	action->mask	= cpumask_of_cpu(cpu);

	action->name	= name;

	action->dev_id	= cd;



	irq_set_affinity(irq, cpumask_of_cpu(cpu));

	setup_irq(irq, action);

}

arch/mips/kernel/cevt-sb1250.c

+5 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static int sibyte_next_event(unsigned long delta, struct clock_event_device *cd) 
	cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));

	init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT));



	__raw_writeq(0, cfg);

	__raw_writeq(delta - 1, init);

	__raw_writeq(M_SCD_TIMER_ENABLE, cfg);
@@ -121,7 +122,7 @@ void __cpuinit sb1250_clockevent_init(void) 
				  CLOCK_EVT_FEAT_ONESHOT;

	clockevent_set_clock(cd, V_SCD_TIMER_FREQ);

	cd->max_delta_ns	= clockevent_delta2ns(0x7fffff, cd);

	cd->min_delta_ns	= clockevent_delta2ns(1, cd);

	cd->min_delta_ns	= clockevent_delta2ns(2, cd);

	cd->rating		= 200;

	cd->irq			= irq;

	cd->cpumask		= cpumask_of_cpu(cpu);
@@ -142,7 +143,10 @@ void __cpuinit sb1250_clockevent_init(void) 


	action->handler	= sibyte_counter_handler;

	action->flags	= IRQF_DISABLED | IRQF_PERCPU;

	action->mask	= cpumask_of_cpu(cpu);

	action->name	= name;

	action->dev_id	= cd;



	irq_set_affinity(irq, cpumask_of_cpu(cpu));

	setup_irq(irq, action);

}

arch/mips/kernel/cpu-probe.c

+5 −0
Original line number Diff line number Diff line
@@ -943,6 +943,11 @@ __init void cpu_probe(void) 
	}



	__cpu_name[cpu] = cpu_to_name(c);



	if (cpu_has_mips_r2)

		c->srsets = ((read_c0_srsctl() >> 26) & 0x0f) + 1;

	else

		c->srsets = 1;

}



__init void cpu_report(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE