linux-mips-commits — CVS Commit Patches

[Linux-mips-commits]CVS: linux/arch/mips Makefile,1.31,1.32

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv13634

Modified Files:
	Makefile 
Log Message:
Rearrange IP22 files the same way as 64-bit IP22.

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile	2001/11/26 19:57:38	1.31
+++ Makefile	2001/11/27 17:59:52	1.32
@@ -177,9 +177,9 @@
 endif
 
 ifdef CONFIG_SGI_IP22
-CORE_FILES    += arch/mips/sgi/kernel/ip22-kern.o
+CORE_FILES    += arch/mips/sgi-ip22/ip22-kern.o
 LIBS          += arch/mips/arc/arclib.a
-SUBDIRS       += arch/mips/sgi/kernel arch/mips/arc
+SUBDIRS       += arch/mips/sgi-ip22 arch/mips/arc
 #
 # Set LOADADDR to >= 0x88069000 if you want to leave space for symmon,
 # 0x88002000 for production kernels.  Note that the value must be

[Linux-mips-commits]CVS: linux/arch/mips/hp-lj init.c,1.1,1.2 setup.c,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/hp-lj
In directory usw-pr-cvs1:/tmp/cvs-serv12470

Modified Files:
	init.c setup.c 
Log Message:
Kill  strings.

Index: init.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/hp-lj/init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- init.c	2001/11/19 18:31:01	1.1
+++ init.c	2001/11/27 17:56:13	1.2
@@ -2,8 +2,6 @@
  * init.c: PROM library initialisation code.
  *
  * Copyright (C) 1998 Gleb Raiko & Vladimir Roganov 
- *
- * $Id$
  */
 
 #include <linux/mm.h>

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/hp-lj/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c	2001/11/19 18:31:01	1.1
+++ setup.c	2001/11/27 17:56:13	1.2
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * Setup pointers to hardware-dependent routines.
  *
  * This file is subject to the terms and conditions of the GNU General Public

[Linux-mips-commits]CVS: linux/arch/mips/sgi-ip22 - New directory

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/sgi-ip22
In directory usw-pr-cvs1:/tmp/cvs-serv12222/sgi-ip22

Log Message:
Directory /cvsroot/linux-mips/linux/arch/mips/sgi-ip22 added to the repository

[Linux-mips-commits]CVS: linux/arch/mips/arc init.c,NONE,1.1

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/arc
In directory usw-pr-cvs1:/tmp/cvs-serv12026

Added Files:
	init.c 
Log Message:
Remove dead arc_setup_console references.

--- NEW FILE: init.c ---
/*
 * This file is subject to the terms and conditions of the GNU General Public+ 
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
 * PROM library initialisation code.
 *
 * Copyright (C) 1996 David S. Miller (dm...@en...)
 */
#include <linux/init.h>
#include <linux/kernel.h>

#include <asm/sgialib.h>

#undef DEBUG_PROM_INIT

/* Master romvec interface. */
struct linux_romvec *romvec;
struct linux_promblock *sgi_pblock;
int prom_argc;
char **prom_argv, **prom_envp;
unsigned short prom_vers, prom_rev;

extern void prom_testtree(void);

void __init prom_init(int argc, char **argv, char **envp, int *prom_vec)
{
	struct linux_promblock *pb;

	romvec = ROMVECTOR;
	pb = sgi_pblock = PROMBLOCK;
	prom_argc = argc;
	prom_argv = argv;
	prom_envp = envp;

	if (pb->magic != 0x53435241) {
		prom_printf("Aieee, bad prom vector magic %08lx\n", pb->magic);
		while(1)
			;
	}

	prom_init_cmdline();

	prom_vers = pb->ver;
	prom_rev = pb->rev;
	prom_identify_arch();
	printk("PROMLIB: ARC firmware Version %d Revision %d\n",
		    prom_vers, prom_rev);
	prom_meminit();

#ifdef DEBUG_PROM_INIT
	{
		prom_printf("Press a key to reboot\n");
		(void) prom_getchar();
		romvec->imode();
	}
#endif
}

[Linux-mips-commits]CVS: linux/include/asm-mips cpu.h,1.16,1.17

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv11706/include/asm-mips

Modified Files:
	cpu.h 
Log Message:
Report FPU revision in /proc/cpuinfo if enabled.  Handle c0 hazard in cpu_get_fpu_id().  Re-arrange CPU/FPU reporting code in one place. Report CPU & FPU type and version on startup.

Index: cpu.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/cpu.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cpu.h	2001/11/26 19:28:45	1.16
+++ cpu.h	2001/11/27 17:53:47	1.17
@@ -108,6 +108,7 @@
  */
 struct mips_cpu {
 	unsigned int processor_id;
+	unsigned int fpu_id;
 	unsigned int cputype;
 	int isa_level;
 	int options;

[Linux-mips-commits]CVS: linux/arch/mips/mm c-andes.c,1.2,1.3 c-mips32.c,1.1,1.2 c-r3k.c,1.3,1.4 c-r4k.c,1.1,1.2 c-r5432.c,1.4,1.5 c-r5900.c,1.1,1.2 c-rm7k.c,1.2,1.3 c-tx39.c,1.2,1.3 c-tx49.c,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv11706/arch/mips/mm

Modified Files:
	c-andes.c c-mips32.c c-r3k.c c-r4k.c c-r5432.c c-r5900.c 
	c-rm7k.c c-tx39.c c-tx49.c 
Log Message:
Report FPU revision in /proc/cpuinfo if enabled.  Handle c0 hazard in cpu_get_fpu_id().  Re-arrange CPU/FPU reporting code in one place. Report CPU & FPU type and version on startup.

Index: c-andes.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-andes.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- c-andes.c	2001/11/26 19:18:13	1.2
+++ c-andes.c	2001/11/27 17:53:47	1.3
@@ -94,8 +94,6 @@
 
 void __init ld_mmu_andes(void)
 {
-	printk("CPU revision is: %08x\n", read_32bit_cp0_register(CP0_PRID));
-
 	printk("Primary instruction cache %dkb, linesize %d bytes\n",
 	       icache_size >> 10, ic_lsize);
 	printk("Primary data cache %dkb, linesize %d bytes\n",

Index: c-mips32.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-mips32.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- c-mips32.c	2001/10/23 17:20:14	1.1
+++ c-mips32.c	2001/11/27 17:53:47	1.2
@@ -674,8 +674,6 @@
 {
 	unsigned long config = read_32bit_cp0_register(CP0_CONFIG);
 
-	printk("CPU revision is: %08x\n", read_32bit_cp0_register(CP0_PRID));
-
 #ifdef CONFIG_MIPS_UNCACHED
 	change_cp0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
 #else

Index: c-r3k.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-r3k.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- c-r3k.c	2001/11/26 19:18:13	1.3
+++ c-r3k.c	2001/11/27 17:53:47	1.4
@@ -316,8 +316,6 @@
 {
 	unsigned long config;
 
-	printk("CPU revision is: %08x\n", read_32bit_cp0_register(CP0_PRID));
-
 	_clear_page = r3k_clear_page;
 	_copy_page = r3k_copy_page;
 

Index: c-r4k.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-r4k.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- c-r4k.c	2001/10/23 17:20:14	1.1
+++ c-r4k.c	2001/11/27 17:53:47	1.2
@@ -1547,8 +1547,6 @@
 {
 	unsigned long config = read_32bit_cp0_register(CP0_CONFIG);
 
-	printk("CPU revision is: %08x\n", read_32bit_cp0_register(CP0_PRID));
-
 #ifdef CONFIG_MIPS_UNCACHED
 	change_cp0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
 #else

Index: c-r5432.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-r5432.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- c-r5432.c	2001/11/06 00:30:42	1.4
+++ c-r5432.c	2001/11/27 17:53:47	1.5
@@ -455,8 +455,6 @@
 {
 	unsigned long config = read_32bit_cp0_register(CP0_CONFIG);
 
-	printk("CPU revision is: %08x\n", read_32bit_cp0_register(CP0_PRID));
-
 	change_cp0_config(CONF_CM_CMASK, CONF_CM_CACHABLE_NONCOHERENT);
 
 	probe_icache(config);

Index: c-r5900.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-r5900.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- c-r5900.c	2001/11/10 21:23:45	1.1
+++ c-r5900.c	2001/11/27 17:53:47	1.2
@@ -325,8 +325,6 @@
 {
 	unsigned long config = read_32bit_cp0_register(CP0_CONFIG);
 
-	printk("CPU revision is: %08x\n", read_32bit_cp0_register(CP0_PRID));
-
 	/*
 	 * Display CP0 config reg. to verify the workaround 
 	 * for branch prediction bug is done, or not.

Index: c-rm7k.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-rm7k.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- c-rm7k.c	2001/10/26 22:11:25	1.2
+++ c-rm7k.c	2001/11/27 17:53:47	1.3
@@ -293,8 +293,6 @@
 	unsigned long config = read_32bit_cp0_register(CP0_CONFIG);
 	unsigned long addr;
 
-	printk("CPU revision is: %08x\n", read_32bit_cp0_register(CP0_PRID));
-
         change_cp0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
 
 	/* RM7000 erratum #31. The icache is screwed at startup. */

Index: c-tx39.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-tx39.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- c-tx39.c	2001/10/24 23:32:54	1.2
+++ c-tx39.c	2001/11/27 17:53:47	1.3
@@ -273,8 +273,6 @@
 {
 	unsigned long config;
 
-	printk("CPU revision is: %08x\n", read_32bit_cp0_register(CP0_PRID));
-
 	_clear_page = r3k_clear_page;
 	_copy_page = r3k_copy_page;
 

Index: c-tx49.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-tx49.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- c-tx49.c	2001/10/24 23:32:54	1.1
+++ c-tx49.c	2001/11/27 17:53:47	1.2
@@ -383,8 +383,6 @@
 {
 	unsigned long config = read_32bit_cp0_register(CP0_CONFIG);
 
-	printk("CPU revision is: %08x\n", read_32bit_cp0_register(CP0_PRID));
-
 	if (mips_configk0 != -1)
 		change_cp0_config(CONF_CM_CMASK, mips_configk0);
 	else

[Linux-mips-commits]CVS: linux/arch/mips/kernel proc.c,1.6,1.7 setup.c,1.33,1.34

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv11706/arch/mips/kernel

Modified Files:
	proc.c setup.c 
Log Message:
Report FPU revision in /proc/cpuinfo if enabled.  Handle c0 hazard in cpu_get_fpu_id().  Re-arrange CPU/FPU reporting code in one place. Report CPU & FPU type and version on startup.

Index: proc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/proc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- proc.c	2001/08/25 02:19:27	1.6
+++ proc.c	2001/11/27 17:53:47	1.7
@@ -59,14 +59,18 @@
 		mach_ite_names, mach_philips_names, mach_globespan_names,
 		mach_sibyte_names, mach_toshiba_names, mach_alchemy_names,
 		mach_nec_vr41xx_names};
-	unsigned int version = read_32bit_cp0_register(CP0_PRID);
+	unsigned int version = mips_cpu.processor_id;
+	unsigned int fp_vers = mips_cpu.fpu_id;
 	int len;
 
 	len = sprintf(buffer, "cpu\t\t\t: MIPS\n");
-	len += sprintf(buffer + len, "cpu model\t\t: %s V%d.%d\n",
+	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
+	        (mips_cpu.options & MIPS_CPU_FPU) ? "  FPU V%d.%d" : "");
+	len += sprintf(buffer + len, fmt,
 	               cpu_name[mips_cpu.cputype <= CPU_LAST ?
 	                        mips_cpu.cputype : CPU_UNKNOWN],
-	               (version >> 4) & 0x0f, version & 0x0f);
+	               (version >> 4) & 0x0f, version & 0x0f,
+	               (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
 	len += sprintf(buffer + len, "system type\t\t: %s %s\n",
 		       mach_group_names[mips_machgroup],
 		       mach_group_to_name[mips_machgroup][mips_machtype]);

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- setup.c	2001/11/27 17:37:52	1.33
+++ setup.c	2001/11/27 17:53:47	1.34
@@ -192,7 +192,7 @@
 	unsigned long tmp, fpu_id;
 
 	tmp = read_32bit_cp0_register(CP0_STATUS);
-	write_32bit_cp0_register(CP0_STATUS, tmp | ST0_CU1);
+	__enable_fpu();
 	fpu_id = read_32bit_cp1_register(CP1_REVISION);
 	write_32bit_cp0_register(CP0_STATUS, tmp);
 	return fpu_id;
@@ -207,7 +207,8 @@
 }
 
 /* declaration of the global struct */
-struct mips_cpu mips_cpu = {PRID_IMP_UNKNOWN, CPU_UNKNOWN, 0, 0, 0,
+struct mips_cpu mips_cpu = {PRID_IMP_UNKNOWN, FPIR_IMP_NONE, CPU_UNKNOWN,
+			    0, 0, 0,
 			    {0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0}};
 
 /* Shortcut for assembler access to mips_cpu.options */
@@ -530,6 +531,15 @@
 	default:
 		mips_cpu.cputype = CPU_UNKNOWN;
 	}
+	if (mips_cpu.options & MIPS_CPU_FPU)
+		mips_cpu.fpu_id = cpu_get_fpu_id();
+}
+
+static inline void cpu_report(void)
+{
+	printk("CPU revision is: %08x\n", mips_cpu.processor_id);
+	if (mips_cpu.options & MIPS_CPU_FPU)
+		printk("FPU revision is: %08x\n", mips_cpu.fpu_id);
 }
 
 asmlinkage void __init
@@ -545,6 +555,8 @@
 #ifdef CONFIG_SGI_IP22
 	sgi_sysinit();
 #endif
+
+	cpu_report();
 
 	/*
 	 * Determine the mmu/cache attached to this machine,

[Linux-mips-commits]CVS: linux/arch/mips/kernel traps.c,1.26,1.27

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv9081

Modified Files:
	traps.c 
Log Message:
Implement show_registers() along the lines of i386.

Index: traps.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/traps.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- traps.c	2001/11/26 18:53:57	1.26
+++ traps.c	2001/11/27 17:45:17	1.27
@@ -314,17 +314,8 @@
 	       regs->cp0_cause);
 }
 
-spinlock_t die_lock;
-
-extern void __die(const char * str, struct pt_regs * regs, const char *where,
-                  unsigned long line)
+void show_registers(struct pt_regs *regs)
 {
-	console_verbose();
-	spin_lock_irq(&die_lock);
-	printk("%s", str);
-	if (where)
-		printk(" in %s, line %ld", where, line);
-	printk(":\n");
 	show_regs(regs);
 	printk("Process %s (pid: %d, stackpage=%08lx)\n",
 		current->comm, current->pid, (unsigned long) current);
@@ -332,6 +323,20 @@
 	show_trace((unsigned int *) regs->regs[29]);
 	show_code((unsigned int *) regs->cp0_epc);
 	printk("\n");
+}
+
+spinlock_t die_lock = SPIN_LOCK_UNLOCKED;
+
+void __die(const char * str, struct pt_regs * regs, const char *where,
+           unsigned long line)
+{
+	console_verbose();
+	spin_lock_irq(&die_lock);
+	printk("%s", str);
+	if (where)
+		printk(" in %s, line %ld", where, line);
+	printk(":\n");
+	show_registers(regs);
 	spin_unlock_irq(&die_lock);
 	do_exit(SIGSEGV);
 }

[Linux-mips-commits]CVS: linux/drivers/char qtronix.c,1.2,1.3

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv8740

Added Files:
	qtronix.c 
Log Message:
Update qtronix infrared keyboard driver to use new init api.

[Linux-mips-commits]CVS: linux/arch/mips/kernel entry.S,1.11,1.12

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv8290

Modified Files:
	entry.S 
Log Message:
Save a few nops in the R4000PC/MC general exception handler.

Index: entry.S
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/entry.S,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- entry.S	2001/11/26 19:31:47	1.11
+++ entry.S	2001/11/27 17:43:04	1.12
@@ -128,20 +128,21 @@
 
 		/* General exception vector R4000 version. */
 		NESTED(except_vec3_r4000, 0, sp)
+		.set	push
 		.set    mips3
 		.set	noat
 		mfc0	k1, CP0_CAUSE
-		andi	k1, k1, 0x7c
 		li	k0, 31<<2
+		andi	k1, k1, 0x7c
+		.set	noreorder
 		beq	k1, k0, handle_vced
 		 li	k0, 14<<2
 		beq	k1, k0, handle_vcei
 		 la	k0, exception_handlers
+		.set	reorder
 		addu	k0, k0, k1
 		lw	k0, (k0)
-		nop
 		jr	k0
-		 nop
 
 		/*
 		 * Big shit, we now may have two dirty primary cache lines for
@@ -174,7 +175,7 @@
 		sw	k1, %lo(vcei_count)(k0)
 #endif
 		eret
-		.set    mips0
+		.set    pop
 		END(except_vec3_r4000)
 
 		__FINIT

[Linux-mips-commits]CVS: linux/arch/mips/kernel setup.c,1.32,1.33

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv6727

Modified Files:
	setup.c 
Log Message:
Needed a const for mips_io_base to compile for gcc 3+

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- setup.c	2001/11/26 18:48:14	1.32
+++ setup.c	2001/11/27 17:37:52	1.33
@@ -106,7 +106,7 @@
  * mips_io_port_base is the begin of the address space to which x86 style
  * I/O ports are mapped.
  */
-unsigned long mips_io_port_base;	EXPORT_SYMBOL(mips_io_port_base);
+const unsigned long mips_io_port_base;	EXPORT_SYMBOL(mips_io_port_base);
 
 
 /*

[Linux-mips-commits]CVS: linux/arch/mips/vr4111/clio-1000 setup.c,1.2,1.3

[Jim P. <jim...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr4111/clio-1000
In directory usw-pr-cvs1:/tmp/cvs-serv1265/vr4111/clio-1000

Modified Files:
	setup.c 
Log Message:
- Removed <asm/power.h> dependency
- Added CONFIG_IDE and CONFIG_PCMCIA blocks to vr4111/clio-1000/setup.c


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4111/clio-1000/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c	2001/11/26 19:57:39	1.2
+++ setup.c	2001/11/27 01:16:41	1.3
@@ -19,7 +19,9 @@
 
 #include <linux/config.h>
 #include <linux/console.h>
+#ifdef CONFIG_IDE
 #include <linux/ide.h>
+#endif
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <asm/time.h>
@@ -33,14 +35,18 @@
 extern void vr4111_time_init(void);
 extern void vr4111_timer_setup(void);
 
+#ifdef CONFIG_IDE
 extern struct ide_ops std_ide_ops;
+#endif
 
+#ifdef CONFIG_PCMCIA
 void __init put_cf_reg(unsigned char reg, unsigned char val)
 {
 	/* PCMCIA controller (VG469) is mapped here */
 	outb(reg, 0x3e0);
 	outb(val, 0x3e1);
 }
+#endif
 
 void __init clio_1000_setup(void)
 {
@@ -57,17 +63,21 @@
 	_machine_power_off = vr4111_hibernate;
 	cpu_wait = vr4111_wait;
 
+#ifdef CONFIG_IDE
 	ide_ops = &std_ide_ops;
+#endif
 
 #ifdef CONFIG_FB
 	conswitchp = &dummy_con;
 #endif
 
+#ifdef CONFIG_PCMCIA
 	/* Reset the PCMCIA and CF and power them off */
 	put_cf_reg(0x03, 0x20);   /* Socket 0 */
 	put_cf_reg(0x43, 0x20);   /* Socket 1 */
 	put_cf_reg(0x02, 0x00);   /* Socket 0 */
 	put_cf_reg(0x42, 0x00);   /* Socket 1 */
+#endif
 
 	/* Clio-specific RS232 enable */
 	*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO42;

[Linux-mips-commits]CVS: linux/arch/mips/vr41xx/common reset.c,1.2,1.3

[Jim P. <jim...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/common
In directory usw-pr-cvs1:/tmp/cvs-serv1265/vr41xx/common

Modified Files:
	reset.c 
Log Message:
- Removed <asm/power.h> dependency
- Added CONFIG_IDE and CONFIG_PCMCIA blocks to vr4111/clio-1000/setup.c


Index: reset.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/common/reset.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- reset.c	2001/10/29 07:35:10	1.2
+++ reset.c	2001/11/27 01:16:41	1.3
@@ -23,7 +23,6 @@
 #include <asm/cacheops.h>
 #include <asm/mipsregs.h>
 #include <asm/pgalloc.h>
-#include <asm/power.h>
 
 void vr41xx_restart(char *c)
 {

[Linux-mips-commits]CVS: linux/arch/mips/vr4111/common power.c,1.1,1.2

[Jim P. <jim...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr4111/common
In directory usw-pr-cvs1:/tmp/cvs-serv1265/vr4111/common

Modified Files:
	power.c 
Log Message:
- Removed <asm/power.h> dependency
- Added CONFIG_IDE and CONFIG_PCMCIA blocks to vr4111/clio-1000/setup.c


Index: power.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4111/common/power.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- power.c	2001/10/28 23:04:19	1.1
+++ power.c	2001/11/27 01:16:41	1.2
@@ -24,7 +24,6 @@
 #include <asm/cacheops.h>
 #include <asm/mipsregs.h>
 #include <asm/pgalloc.h>
-#include <asm/power.h>
 
 /*
  * vr4111_dma_sem is needed because we cannot suspend while a DMA transfer

[Linux-mips-commits]CVS: linux/arch/mips config.in,1.55,1.56

[Jim P. <jim...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv27656

Modified Files:
	config.in 
Log Message:
Define CONFIG_NONCOHERENT_IO for Clio


Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- config.in	2001/11/26 20:34:42	1.55
+++ config.in	2001/11/27 00:45:17	1.56
@@ -312,6 +312,7 @@
    define_bool CONFIG_IRQ_CPU y
    define_bool CONFIG_NEW_TIME_C y
    define_bool CONFIG_ISA y
+   define_bool CONFIG_NONCOHERENT_IO y
    define_bool CONFIG_DUMMY_KEYB y
 fi
 if [ "$CONFIG_NINO" = "y" ]; then

[Linux-mips-commits]CVS: linux/arch/mips/ite-boards/generic it8172_pci.c,1.3,1.4

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic
In directory usw-pr-cvs1:/tmp/cvs-serv25204/arch/mips/ite-boards/generic

Modified Files:
	it8172_pci.c 
Log Message:
Added support for both it8172 PCI MEM windows.


Index: it8172_pci.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/it8172_pci.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- it8172_pci.c	2001/08/22 18:18:13	1.3
+++ it8172_pci.c	2001/11/27 00:30:25	1.4
@@ -50,22 +50,39 @@
 #define DBG(x...)
 #endif
 
+static struct resource pci_mem_resource_1;
+
 static struct resource pci_io_resource = {
 	"io pci IO space", 
 	0x14000000,
 	0x17FFFFFF,
-	IORESOURCE_IO};
+	IORESOURCE_IO
+};
 
-static struct resource pci_mem_resource = {
-	"ext pci memory space", 
+static struct resource pci_mem_resource_0 = {
+	"ext pci memory space 0/1", 
 	0x0C000000,
-	0x0FFFFFFF,
-	IORESOURCE_MEM};
+	0x13FFFFFF,
+	IORESOURCE_MEM,
+	&pci_mem_resource_0,
+	NULL,
+	&pci_mem_resource_1
+};
+
+static struct resource pci_mem_resource_1 = {
+	"ext pci memory space 2/3", 
+	0x1A000000,
+	0x1FBFFFFF,
+	IORESOURCE_MEM,
+	&pci_mem_resource_0,
+	NULL,
+	NULL
+};
 
 extern struct pci_ops it8172_pci_ops;
 
 struct pci_channel mips_pci_channels[] = {
-	{ &it8172_pci_ops, &pci_io_resource, &pci_mem_resource, 0, 0xff },
+	{ &it8172_pci_ops, &pci_io_resource, &pci_mem_resource_0, 0, 0xff },
 	{ NULL, NULL, NULL, NULL, NULL}
 };
 

[Linux-mips-commits]CVS: linux/arch/mips/kernel pci_auto.c,1.3,1.4

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv24629/arch/mips/kernel

Modified Files:
	pci_auto.c 
Log Message:
* Don't update BAR if we've exceeded the PCI IO or MEM (depending on
BAR type) window
* support non contiguous IO and MEM windows


Index: pci_auto.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/pci_auto.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pci_auto.c	2001/10/27 21:08:08	1.3
+++ pci_auto.c	2001/11/27 00:29:25	1.4
@@ -86,6 +86,9 @@
 EARLY_PCI_OP(write, word, u16)
 EARLY_PCI_OP(write, dword, u32)
 
+static struct resource *io_resource_inuse;
+static struct resource *mem_resource_inuse;
+
 static u32 pciauto_lower_iospc;
 static u32 pciauto_upper_iospc;
 
@@ -129,6 +132,7 @@
 		if (!(bar_response & 0xffff0000))
 			bar_response |= 0xffff0000;
 
+retry:
 		/* Check the BAR type and set our address mask */
 		if (bar_response & PCI_BASE_ADDRESS_SPACE) {
 			addr_mask = PCI_BASE_ADDRESS_IO_MASK;
@@ -146,12 +150,40 @@
 			DBG("        Mem");
 		}
 
+
 		/* Calculate requested size */
 		bar_size = ~(bar_response & addr_mask) + 1;
 
 		/* Allocate a base address */
 		bar_value = ((*lower_limit - 1) & ~(bar_size - 1)) + bar_size;
 
+		if ((bar_value + bar_size) > *upper_limit) {
+			if (bar_response & PCI_BASE_ADDRESS_SPACE) {
+				if (io_resource_inuse->child) {
+					io_resource_inuse = 
+						io_resource_inuse->child;
+					pciauto_lower_iospc = 
+						io_resource_inuse->start;
+					pciauto_upper_iospc = 
+						io_resource_inuse->end + 1;
+					goto retry;
+				}
+
+			} else {
+				if (mem_resource_inuse->child) {
+					mem_resource_inuse = 
+						mem_resource_inuse->child;
+					pciauto_lower_memspc = 
+						mem_resource_inuse->start;
+					pciauto_upper_memspc = 
+						mem_resource_inuse->end + 1;
+					goto retry;
+				}
+			}
+			DBG(" unavailable -- skipping\n");
+			continue;
+		}
+
 		/* Write it out and update our limit */
 		early_write_config_dword(hose, top_bus, current_bus, pci_devfn,
 					 bar, bar_value);
@@ -346,13 +378,17 @@
 pciauto_assign_resources(int busno, struct pci_channel *hose)
 {
 	/* setup resource limits */
-	pciauto_lower_iospc = hose->io_resource->start;
-	pciauto_upper_iospc = hose->io_resource->end + 1;
-	pciauto_lower_memspc = hose->mem_resource->start;
-	pciauto_upper_memspc = hose->mem_resource->end + 1;
+	io_resource_inuse = hose->io_resource;
+	mem_resource_inuse = hose->mem_resource;
+
+	pciauto_lower_iospc = io_resource_inuse->start;
+	pciauto_upper_iospc = io_resource_inuse->end + 1;
+	pciauto_lower_memspc = mem_resource_inuse->start;
+	pciauto_upper_memspc = mem_resource_inuse->end + 1;
 	DBG("Autoconfig PCI channel 0x%p\n", hose);
-	DBG("Scanning bus %.2x, I/O 0x%.8x, Mem 0x%.8x\n",
-		busno, pciauto_lower_iospc, pciauto_lower_memspc);
+	DBG("Scanning bus %.2x, I/O 0x%.8x:0x%.8x, Mem 0x%.8x:0x%.8x\n",
+		busno, pciauto_lower_iospc, pciauto_upper_iospc, 
+		pciauto_lower_memspc, pciauto_upper_memspc);
 
 	return pciauto_bus_scan(hose, busno, busno);
 }

[Linux-mips-commits]CVS: linux/include/pcmcia ss.h,1.3,1.4

[Jim P. <jim...@us...>]

Update of /cvsroot/linux-mips/linux/include/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv21821

Modified Files:
	ss.h 
Log Message:
Missed this earlier.  Finish up PCMCIA ISA IRQ remapping.


Index: ss.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/pcmcia/ss.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ss.h	2001/11/06 20:23:56	1.3
+++ ss.h	2001/11/27 00:15:13	1.4
@@ -136,6 +136,10 @@
 	int (*set_io_map)(unsigned int sock, struct pccard_io_map *io);
 	int (*get_mem_map)(unsigned int sock, struct pccard_mem_map *mem);
 	int (*set_mem_map)(unsigned int sock, struct pccard_mem_map *mem);
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+	int (*get_io_irq)(unsigned int sock, int *irq);
+	int (*get_bus_irq)(unsigned int sock, int *irq);
+#endif
 	void (*proc_setup)(unsigned int sock, struct proc_dir_entry *base);
 };
 

[Linux-mips-commits]CVS: linux/arch/mips/kernel Makefile,1.14,1.15

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv4686/arch/mips/kernel

Modified Files:
	Makefile 
Log Message:
setup.c exports symbols.. make sure it's in the export-objs..



Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	2001/11/06 00:30:42	1.14
+++ Makefile	2001/11/26 21:27:23	1.15
@@ -15,7 +15,7 @@
 
 O_TARGET := kernel.o
 
-export-objs			= pci-dma.o smp.o mips_ksyms.o
+export-objs			= pci-dma.o smp.o mips_ksyms.o setup.o
 
 obj-y				+= branch.o process.o signal.o entry.o \
 				   traps.o ptrace.o vm86.o ioport.o reset.o \

[Linux-mips-commits]CVS: linux/arch/mips config.in,1.54,1.55

[Jim P. <jim...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv15373

Modified Files:
	config.in 
Log Message:
Missing backslash


Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- config.in	2001/11/26 18:31:24	1.54
+++ config.in	2001/11/26 20:34:42	1.55
@@ -421,7 +421,7 @@
    bool '  lld/scd Instructions available' CONFIG_CPU_HAS_LLDSCD
    bool '  Writeback Buffer available' CONFIG_CPU_HAS_WB
 else
-   if [ "$CONFIG_CPU_R3000" = "y" -o "$CONFIG_CPU_VR41XX" = "y" -o 
+   if [ "$CONFIG_CPU_R3000" = "y" -o "$CONFIG_CPU_VR41XX" = "y" -o \
 	"$CONFIG_CPU_TX39XX" = "y" ]; then 
       define_bool CONFIG_CPU_HAS_LLSC n
       define_bool CONFIG_CPU_HAS_LLDSCD n

Re: [Linux-mips-commits]CVS: linux/include/asm-mips irq.h,1.5,1.6

[James S. <jsi...@tr...>]

Perhaps we should send Ralph a patch for this?

On Sun, 25 Nov 2001, Jim Paris wrote:

> Update of /cvsroot/linux-mips/linux/include/asm-mips
> In directory usw-pr-cvs1:/tmp/cvs-serv29458
> 
> Modified Files:
> 	irq.h 
> Log Message:
> Minor.  VR4111 has 71 IRQs.  This change was lost during a recent OSS sync.
> 
> 
> Index: irq.h
> ===================================================================
> RCS file: /cvsroot/linux-mips/linux/include/asm-mips/irq.h,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -d -r1.5 -r1.6
> --- irq.h	2001/11/06 00:30:47	1.5
> +++ irq.h	2001/11/26 02:04:16	1.6
> @@ -11,7 +11,7 @@
>  
>  #include <linux/config.h>
>  
> -#define NR_IRQS 64		/* Largest number of ints of all machines.  */
> +#define NR_IRQS 128		/* Largest number of ints of all machines.  */
>  
>  #define TIMER_IRQ 0
>  
> 
> 
> _______________________________________________
> Linux-mips-commits mailing list
> Lin...@li...
> https://lists.sourceforge.net/lists/listinfo/linux-mips-commits
> 

[Linux-mips-commits]CVS: linux/drivers/pcmcia Config.in,1.2,1.3 cs.c,1.4,1.5 i82365.c,1.1,1.2

[Jim P. <jim...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv11286

Modified Files:
	Config.in cs.c i82365.c 
Log Message:
Add support for ISA IRQ remapping


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Config.in	2001/11/06 09:10:22	1.2
+++ Config.in	2001/11/26 20:19:53	1.3
@@ -19,6 +19,7 @@
    fi
    bool '  i82092 compatible bridge support' CONFIG_I82092
    bool '  i82365 compatible bridge support' CONFIG_I82365
+   dep_bool '    Support ISA IRQ remapping' CONFIG_PCMCIA_IRQ_REMAP $CONFIG_I82365
    bool '  Databook TCIC host bridge support' CONFIG_TCIC
    if [ "$CONFIG_HD64465" = "y" ]; then
       dep_tristate '  HD64465 host bridge support' CONFIG_HD64465_PCMCIA $CONFIG_PCMCIA

Index: cs.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/cs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cs.c	2001/11/26 20:17:35	1.4
+++ cs.c	2001/11/26 20:19:53	1.5
@@ -268,6 +268,18 @@
 	return s->ss_entry->set_mem_map(s->sock, mem);
 }
 
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+static int get_io_irq(socket_info_t *s, int *irq)
+{
+	return s->ss_entry->get_io_irq(s->sock, irq);
+}
+
+static int get_bus_irq(socket_info_t *s, int *irq)
+{
+	return s->ss_entry->get_bus_irq(s->sock, irq);
+}
+#endif
+
 static int suspend_socket(socket_info_t *s)
 {
 	s->socket = dead_socket;
@@ -1348,6 +1360,16 @@
 	if (mod->Attributes & CONF_ENABLE_IRQ) {
 	    c->Attributes |= CONF_ENABLE_IRQ;
 	    s->socket.io_irq = s->irq.AssignedIRQ;
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+	    int irq;
+	    c->Attributes |= CONF_ENABLE_IRQ;
+	    irq = s->irq.AssignedIRQ;
+	    get_io_irq(s, &irq);
+	    s->socket.io_irq = irq;
+#else
+	    c->Attributes |= CONF_ENABLE_IRQ;
+	    s->socket.io_irq = s->irq.AssignedIRQ;
+#endif
 	} else {
 	    c->Attributes &= ~CONF_ENABLE_IRQ;
 	    s->socket.io_irq = 0;
@@ -1694,7 +1716,16 @@
     if (req->Attributes & CONF_ENABLE_SPKR)
 	s->socket.flags |= SS_SPKR_ENA;
     if (req->Attributes & CONF_ENABLE_IRQ)
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+    {
+	int irq;
+	irq = s->irq.AssignedIRQ;
+	get_io_irq(s, &irq);
+	s->socket.io_irq = irq;
+    }
+#else
 	s->socket.io_irq = s->irq.AssignedIRQ;
+#endif
     else
 	s->socket.io_irq = 0;
     set_socket(s, &s->socket);
@@ -1882,6 +1913,15 @@
 	    for (try = 0; try < 2; try++) {
 		for (irq = 0; irq < 32; irq++)
 		    if ((mask >> irq) & 1) {
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+			get_bus_irq(s, &irq);
+			if ((req->Attributes & IRQ_TYPE) == IRQ_TYPE_DYNAMIC_SHARING) {
+			    if (try == 0)
+				req->Attributes |=  IRQ_FIRST_SHARED;
+			    else
+				req->Attributes &=  ~IRQ_FIRST_SHARED;
+			}
+#endif
 			ret = try_irq(req->Attributes, irq, try);
 			if (ret == 0) break;
 		    }

Index: i82365.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/i82365.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- i82365.c	2001/11/26 20:17:35	1.1
+++ i82365.c	2001/11/26 20:19:53	1.2
@@ -46,6 +46,9 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/proc_fs.h>
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+#include <linux/interrupt.h>
+#endif
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
@@ -106,6 +109,10 @@
 static int irq_list[16] = { -1 };
 /* The card status change interrupt -- 0 means autoselect */
 static int cs_irq = 0;
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+/* IRQ map for IO IRQ convert to ISA IRQ */
+static int irq_map[16] = { [0 ... 15] = 0 };
+#endif
 #endif
 
 /* Probe for safe interrupts? */
@@ -139,6 +146,9 @@
 MODULE_PARM(irq_mask, "i");
 MODULE_PARM(irq_list, "1-16i");
 MODULE_PARM(cs_irq, "i");
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+MODULE_PARM(irq_map, "1-16i");
+#endif
 MODULE_PARM(async_clock, "i");
 MODULE_PARM(cable_mode, "i");
 MODULE_PARM(wakeup, "i");
@@ -548,6 +558,15 @@
 static u_int __init test_irq(u_short sock, int irq)
 {
     DEBUG(2, "  testing ISA irq %d\n", irq);
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+{
+    unsigned long irqs;
+    int probe_irq, i;
+    udelay(1000);
+    probe_irq_off(probe_irq_on());
+    irq_hits = 0;
+    irqs = probe_irq_on();
+#else
     if (request_irq(irq, irq_count, 0, "scan", irq_count) != 0)
 	return 1;
     irq_hits = 0; irq_sock = sock;
@@ -558,13 +577,26 @@
 	DEBUG(2, "    spurious hit!\n");
 	return 1;
     }
-
+#endif
     /* Generate one interrupt */
     i365_set(sock, I365_CSCINT, I365_CSC_DETECT | (irq << 4));
     i365_bset(sock, I365_GENCTL, I365_CTL_SW_IRQ);
     udelay(1000);
 
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+    probe_irq = probe_irq_off(irqs);
+    if (probe_irq) {
+	for (i = 0; i < 16; i++)
+	    if (irq_map[i] == probe_irq) break;
+	if (i >= 16 || i == irq) {
+	    irq_map[irq] = probe_irq;
+	    irq_hits = 1;
+	}
+    }
+}
+#else
     free_irq(irq, irq_count);
+#endif
 
     /* mask all interrupts */
     i365_set(sock, I365_CSCINT, 0);
@@ -585,7 +617,6 @@
     /* Don't probe level-triggered interrupts -- reserved for PCI */
     mask0 &= ~(inb(PIC) | (inb(PIC+1) << 8));
 #endif
-    
     if (do_scan) {
 	set_bridge_state(sock);
 	i365_set(sock, I365_CSCINT, 0);
@@ -601,10 +632,12 @@
     if (mask1) {
 	printk("scanned");
     } else {
+#ifndef CONFIG_PCMCIA_IRQ_REMAP
 	/* Fallback: just find interrupts that aren't in use */
 	for (i = 0; i < 16; i++)
 	    if ((mask0 & (1 << i)) && (_check_irq(i, 0) == 0))
 		mask1 |= (1 << i);
+#endif
 	printk("default");
 	/* If scan failed, default to polled status */
 	if (!cs_irq && (poll_interval == 0)) poll_interval = HZ;
@@ -613,7 +646,11 @@
     
     for (i = 0; i < 16; i++)
 	if (mask1 & (1<<i))
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+	    printk("%s%d", ((mask1 & ((1<<i)-1)) ? "," : ""), irq_map[i]);
+#else
 	    printk("%s%d", ((mask1 & ((1<<i)-1)) ? "," : ""), i);
+#endif
     if (mask1 == 0) printk("none!");
     
     return mask1;
@@ -1549,6 +1586,33 @@
 	LOCKED(i365_set_mem_map(sock, mem));
 }
 
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+static int pcic_get_io_irq(unsigned int sock, int *irq)
+{
+	int i;
+
+	for (i = 0; i < 16; i++)
+		if (irq_map[i] == *irq) break;
+
+	if (i < 16)
+		*irq = i;
+	else
+		*irq = 0;
+
+	return 0;
+}
+
+static int pcic_get_bus_irq(unsigned int sock, int *irq)
+{
+	if (*irq < 0 || *irq >= 16)
+		return -EINVAL;
+
+	*irq =  irq_map[*irq];
+
+	return 0;
+}
+#endif
+
 static int pcic_init(unsigned int s)
 {
 	int i;
@@ -1585,6 +1649,10 @@
 	pcic_set_io_map,
 	pcic_get_mem_map,
 	pcic_set_mem_map,
+#ifdef CONFIG_PCMCIA_IRQ_REMAP
+	pcic_get_io_irq,
+	pcic_get_bus_irq,
+#endif
 	pcic_proc_setup
 };
 

[Linux-mips-commits]CVS: linux/drivers/pcmcia cs.c,1.3,1.4 i82365.c,NONE,1.1

[Jim P. <jim...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv10500

Added Files:
	cs.c i82365.c 
Log Message:
Imported from stock linux-2.4.14 tree



--- NEW FILE: i82365.c ---
/*======================================================================

    Device driver for Intel 82365 and compatible PC Card controllers.

    i82365.c 1.265 1999/11/10 18:36:21

    The contents of this file are subject to the Mozilla Public
    License Version 1.1 (the "License"); you may not use this file
    except in compliance with the License. You may obtain a copy of
    the License at http://www.mozilla.org/MPL/

    Software distributed under the License is distributed on an "AS
    IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
    implied. See the License for the specific language governing
    rights and limitations under the License.

    The initial developer of the original code is David A. Hinds
    <dh...@pc...>.  Portions created by David A. Hinds
    are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
[...1625 lines suppressed...]
	del_timer(&poll_timer);
#ifdef CONFIG_ISA
    if (grab_irq != 0)
	free_irq(cs_irq, pcic_interrupt);
#endif
    for (i = 0; i < sockets; i++) {
	/* Turn off all interrupt sources! */
	i365_set(i, I365_CSCINT, 0);
	release_region(socket[i].ioaddr, 2);
    }
#if defined(CONFIG_ISA) && defined(I82365_ISAPNP)
    if (i82365_pnpdev && i82365_pnpdev->deactivate)
		i82365_pnpdev->deactivate(i82365_pnpdev);
#endif
} /* exit_i82365 */

module_init(init_i82365);
module_exit(exit_i82365);
MODULE_LICENSE("Dual MPL/GPL");
/*====================================================================*/

[Linux-mips-commits]CVS: linux/arch/mips/mips-boards/generic init.c,NONE,1.1 printf.c,NONE,1.1

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/mips-boards/generic
In directory usw-pr-cvs1:/tmp/cvs-serv3172/arch/mips/mips-boards/generic

Added Files:
	init.c printf.c 
Log Message:
Cleanup of include/asm-mips/io.h.  Now looks neat and harmless.

--- NEW FILE: init.c ---
/*
 * Carsten Langgaard, car...@mi...
 * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
 *
 *  This program is free software; you can distribute it and/or modify it
 *  under the terms of the GNU General Public License (Version 2) as
 *  published by the Free Software Foundation.
 *
 *  This program is distributed in the hope it will be useful, but WITHOUT
 *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 *  for more details.
 *
 *  You should have received a copy of the GNU General Public License along
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 *
 * PROM library initialisation code.
 */
#include <linux/config.h>
#include <linux/init.h>
#include <linux/string.h>
#include <linux/kernel.h>

#include <asm/io.h>
#include <asm/mips-boards/prom.h>
#include <asm/mips-boards/generic.h>
#include <asm/gt64120.h>
#include <asm/mips-boards/malta.h>

/* Environment variable */
typedef struct
{
	char *name;
	char *val;
} t_env_var;

int prom_argc;
char **prom_argv, **prom_envp;

int init_debug = 0;

char *prom_getenv(char *envname)
{
        /*
	 * Return a pointer to the given environment variable.
	 */

	t_env_var *env = (t_env_var *)prom_envp;
	int i;

	i = strlen(envname);

	while(env->name) {
		if(strncmp(envname, env->name, i) == 0) {
			return(env->val);
		}
		env++;
	}
	return(NULL);
}

static inline unsigned char str2hexnum(unsigned char c)
{
	if(c >= '0' && c <= '9')
		return c - '0';
	if(c >= 'a' && c <= 'f')
		return c - 'a' + 10;
	return 0; /* foo */
}

static inline void str2eaddr(unsigned char *ea, unsigned char *str)
{
	int i;

	for(i = 0; i < 6; i++) {
		unsigned char num;

		if((*str == '.') || (*str == ':'))
			str++;
		num = str2hexnum(*str++) << 4;
		num |= (str2hexnum(*str++));
		ea[i] = num;
	}
}
 
int get_ethernet_addr(char *ethernet_addr)
{
        char *ethaddr_str;

        ethaddr_str = prom_getenv("ethaddr");
	if (!ethaddr_str) {
	        printk("ethaddr not set in boot prom\n");
		return -1;
	}
	str2eaddr(ethernet_addr, ethaddr_str);

	if (init_debug > 1) {
	        int i;
		printk("get_ethernet_addr: ");
	        for (i=0; i<5; i++)
		        printk("%02x:", (unsigned char)*(ethernet_addr+i));
		printk("%02x\n", *(ethernet_addr+i));
	}

	return 0;
}

int __init prom_init(int argc, char **argv, char **envp)
{
	prom_argc = argc;
	prom_argv = argv;
	prom_envp = envp;

	mips_display_message("LINUX");

	/*
	 * Setup the North bridge to do Master byte-lane swapping when 
	 * running in bigendian.
	 */
#if defined(__MIPSEL__)
	GT_WRITE(GT_PCI0_CMD_OFS, GT_PCI0_CMD_MBYTESWAP_BIT |
		 GT_PCI0_CMD_SBYTESWAP_BIT);
#else
	GT_WRITE(GT_PCI0_CMD_OFS, 0);
#endif

#if defined(CONFIG_MIPS_MALTA)
	set_io_port_base(MALTA_PORT_BASE);
#else
	set_io_port_base(KSEG1);
#endif
	setup_prom_printf(0);
	prom_printf("\nLINUX started...\n");
	prom_init_cmdline();
	prom_meminit();

	return 0;
}

--- NEW FILE: printf.c ---
/*
 * Carsten Langgaard, car...@mi...
 * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
 *
 * ########################################################################
 *
 *  This program is free software; you can distribute it and/or modify it
 *  under the terms of the GNU General Public License (Version 2) as
 *  published by the Free Software Foundation.
 *
 *  This program is distributed in the hope it will be useful, but WITHOUT
 *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 *  for more details.
 *
 *  You should have received a copy of the GNU General Public License along
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 *
 * ########################################################################
 *
 * Putting things on the screen/serial line using YAMONs facilities.
 *
 */
#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/serialP.h>
#include <linux/serial_reg.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/serial.h>


#ifdef CONFIG_MIPS_ATLAS 
/* 
 * Atlas registers are memory mapped on 64-bit aligned boundaries and 
 * only word access are allowed.
 * When reading the UART 8 bit registers only the LSB are valid.
 */
unsigned int atlas_serial_in(struct async_struct *info, int offset)
{
	return inl(info->port + offset*8) & 0xff;
}

void atlas_serial_out(struct async_struct *info, int offset, int value)
{
	outl(value, info->port + offset*8);
}

#define serial_in  atlas_serial_in
#define serial_out atlas_serial_out

#else

static unsigned int serial_in(struct async_struct *info, int offset)
{
	return inb(info->port + offset);
}

static void serial_out(struct async_struct *info, int offset,
				int value)
{
	outb(value, info->port + offset);
}
#endif

static struct serial_state rs_table[] = {
	SERIAL_PORT_DFNS	/* Defined in serial.h */
};

/*
 * Hooks to fake "prom" console I/O before devices 
 * are fully initialized. 
 */
static struct async_struct prom_port_info = {0};

void __init setup_prom_printf(int tty_no) {
	struct serial_state *ser = &rs_table[tty_no];

	prom_port_info.state = ser;
	prom_port_info.magic = SERIAL_MAGIC;
	prom_port_info.port = ser->port;
	prom_port_info.flags = ser->flags;

	/* No setup of UART - assume YAMON left in sane state */
}

int putPromChar(char c)
{
        if (!prom_port_info.state) { 	/* need to init device first */
		return 0;
	}

	while ((serial_in(&prom_port_info, UART_LSR) & UART_LSR_THRE) == 0)
		;

	serial_out(&prom_port_info, UART_TX, c);

	return 1;
}

char getPromChar(void)
{
	if (!prom_port_info.state) { 	/* need to init device first */
		return 0;
	}

	while (!(serial_in(&prom_port_info, UART_LSR) & 1))
		;

	return(serial_in(&prom_port_info, UART_RX));
}

static char buf[1024];

void __init prom_printf(char *fmt, ...)
{
	va_list args;
	int l;
	char *p, *buf_end;
	long flags;

	int putPromChar(char);

	/* Low level, brute force, not SMP safe... */
	save_and_cli(flags);
	va_start(args, fmt);
	l = vsprintf(buf, fmt, args); /* hopefully i < sizeof(buf) */
	va_end(args);

	buf_end = buf + l;

	for (p = buf; p < buf_end; p++) {
		/* Crude cr/nl handling is better than none */
		if(*p == '\n')putPromChar('\r');
		putPromChar(*p);
	}
	restore_flags(flags);
}

[Linux-mips-commits]CVS: linux/arch/mips/ps2 setup.c,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/ps2
In directory usw-pr-cvs1:/tmp/cvs-serv3172/arch/mips/ps2

Modified Files:
	setup.c 
Log Message:
Cleanup of include/asm-mips/io.h.  Now looks neat and harmless.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ps2/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c	2001/08/25 11:20:20	1.1
+++ setup.c	2001/11/26 19:57:39	1.2
@@ -43,7 +43,7 @@
 	_machine_halt      = ps2_machine_halt;
 	_machine_power_off = ps2_machine_power_off;
 
-	mips_io_port_base = KSEG0;
+	set_io_port_base(KSEG0);
 	
 	ioport_resource.start = ps2_resources.ee_reg.start;
 	ioport_resource.end   = ps2_resources.gs_reg.end;