Commit e4c6d3c6 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] Fix CONFIG_BOOT_RAW.
  [MIPS] Assume R4000/R4400 newer than 3.0 don't have the mfc0 count bug
  [MIPS] Fix IP32 breakage
  [MIPS] Alchemy: Fix use of __init code bug exposed by modpost warning
  [MIPS] Move inclusing of kernel/time/Kconfig menu to appropriate place
parents 89a30a83 ba820c5c

arch/mips/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -992,8 +992,6 @@ config BOOT_ELF64 


menu "CPU selection"



source "kernel/time/Kconfig"



choice

	prompt "CPU type"

	default CPU_R4X00
@@ -1768,6 +1766,8 @@ config NR_CPUS 
	  performance should round up your number of processors to the next

	  power of two.



source "kernel/time/Kconfig"



#

# Timer Interrupt Frequency Configuration

#

arch/mips/au1000/common/pci.c

+6 −2
Original line number Diff line number Diff line 
/*

 * BRIEF MODULE DESCRIPTION

 *	Alchemy/AMD Au1x00 pci support.

 *	Alchemy/AMD Au1x00 PCI support.

 *

 * Copyright 2001,2002,2003 MontaVista Software Inc.

 * Copyright 2001-2003, 2007 MontaVista Software Inc.

 * Author: MontaVista Software, Inc.

 *         	ppopov@mvista.com or source@mvista.com

 *
@@ -66,6 +66,8 @@ static unsigned long virt_io_addr; 


static int __init au1x_pci_setup(void)

{

	extern void au1x_pci_cfg_init(void);



#if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550)

	virt_io_addr = (unsigned long)ioremap(Au1500_PCI_IO_START,

			Au1500_PCI_IO_END - Au1500_PCI_IO_START + 1);
@@ -94,6 +96,8 @@ static int __init au1x_pci_setup(void) 
	set_io_port_base(virt_io_addr);

#endif



	au1x_pci_cfg_init();



	register_pci_controller(&au1x_controller);

	return 0;

}

arch/mips/kernel/head.S

+2 −1
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ EXPORT(_stext) 
	 * kernel load address.  This is needed because this platform does

	 * not have a ELF loader yet.

	 */

	__INIT

FEXPORT(__kernel_entry)

	j	kernel_entry

#endif



	__INIT_REFOK

arch/mips/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -147,9 +147,9 @@ static __init int cpu_has_mfc0_count_bug(void) 
			return 1;



		/*

		 * I don't have erratas for newer R4400 so be paranoid.

		 * we assume newer revisions are ok

		 */

		return 1;

		return 0;

	}



	return 0;

arch/mips/pci/ops-au1000.c

+26 −27
Original line number Diff line number Diff line 
/*

 * BRIEF MODULE DESCRIPTION

 *	Alchemy/AMD Au1x00 pci support.

 *	Alchemy/AMD Au1x00 PCI support.

 *

 * Copyright 2001,2002,2003 MontaVista Software Inc.

 * Copyright 2001-2003, 2007 MontaVista Software Inc.

 * Author: MontaVista Software, Inc.

 *         	ppopov@mvista.com or source@mvista.com

 *
@@ -69,10 +69,27 @@ void mod_wired_entry(int entry, unsigned long entrylo0, 
	write_c0_pagemask(old_pagemask);

}



struct vm_struct *pci_cfg_vm;

static struct vm_struct *pci_cfg_vm;

static int pci_cfg_wired_entry;

static int first_cfg = 1;

unsigned long last_entryLo0, last_entryLo1;

static unsigned long last_entryLo0, last_entryLo1;



/*

 * We can't ioremap the entire pci config space because it's too large.

 * Nor can we call ioremap dynamically because some device drivers use

 * the PCI config routines from within interrupt handlers and that

 * becomes a problem in get_vm_area().  We use one wired TLB to handle

 * all config accesses for all busses.

 */

void __init au1x_pci_cfg_init(void)

{

	/* Reserve a wired entry for PCI config accesses */

	pci_cfg_vm = get_vm_area(0x2000, VM_IOREMAP);

	if (!pci_cfg_vm)

		panic(KERN_ERR "PCI unable to get vm area\n");

	pci_cfg_wired_entry = read_c0_wired();

	add_wired_entry(0, 0, (unsigned long)pci_cfg_vm->addr, PM_4K);

	last_entryLo0 = last_entryLo1 = 0xffffffff;

}



static int config_access(unsigned char access_type, struct pci_bus *bus,

			 unsigned int dev_fn, unsigned char where,
@@ -97,27 +114,6 @@ static int config_access(unsigned char access_type, struct pci_bus *bus, 
			Au1500_PCI_STATCMD);

	au_sync_udelay(1);



	/*

	 * We can't ioremap the entire pci config space because it's

	 * too large. Nor can we call ioremap dynamically because some

	 * device drivers use the pci config routines from within

	 * interrupt handlers and that becomes a problem in get_vm_area().

	 * We use one wired tlb to handle all config accesses for all

	 * busses. To improve performance, if the current device

	 * is the same as the last device accessed, we don't touch the

	 * tlb.

	 */

	if (first_cfg) {

		/* reserve a wired entry for pci config accesses */

		first_cfg = 0;

		pci_cfg_vm = get_vm_area(0x2000, VM_IOREMAP);

		if (!pci_cfg_vm)

			panic(KERN_ERR "PCI unable to get vm area\n");

		pci_cfg_wired_entry = read_c0_wired();

		add_wired_entry(0, 0, (unsigned long)pci_cfg_vm->addr, PM_4K);

		last_entryLo0  = last_entryLo1 = 0xffffffff;

	}



	/* Allow board vendors to implement their own off-chip idsel.

	 * If it doesn't succeed, may as well bail out at this point.

	 */
@@ -144,9 +140,12 @@ static int config_access(unsigned char access_type, struct pci_bus *bus, 
	/* page boundary */

	cfg_base = cfg_base & PAGE_MASK;



	/*

	 * To improve performance, if the current device is the same as

	 * the last device accessed, we don't touch the TLB.

	 */

	entryLo0 = (6 << 26)  | (cfg_base >> 6) | (2 << 3) | 7;

	entryLo1 = (6 << 26)  | (cfg_base >> 6) | (0x1000 >> 6) | (2 << 3) | 7;



	if ((entryLo0 != last_entryLo0) || (entryLo1 != last_entryLo1)) {

		mod_wired_entry(pci_cfg_wired_entry, entryLo0, entryLo1,

				(unsigned long)pci_cfg_vm->addr, PM_4K);

CRA Git | Maintained and supported by SUSTech CRA and CCSE