[Linux-mips-commits]CVS: linux/include/asm-mips64/sibyte sb1250_io.h,NONE,1.1 swarm_ide.h,NONE,1.1 sb1250.h,1.1,1.2 sb1250_uart.h,1.1,1.2

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

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

Modified Files:
	sb1250.h sb1250_uart.h 
Added Files:
	sb1250_io.h swarm_ide.h 
Log Message:
Big overhaul of 64-bit kernel along the lines of what we already have for the 64-bit kernel just more radical.

--- NEW FILE: sb1250_io.h ---
/*
 * 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.
 *
 * Copyright (C) 2000 Ralf Baechle
 * Copyright (C) 2000 Silicon Graphics, Inc.
 */
#ifndef _ASM_SGI_IO_H
#define _ASM_SGI_IO_H

#include <asm/addrspace.h>

#define IO_SPACE_BASE K1BASE

/* For Indigo2.  */
#define IO_SPACE_LIMIT 0xffff

/* XXX ISA specific functions go here here.  */

#endif /* _ASM_SGI_IO_H */

--- NEW FILE: swarm_ide.h ---
/*
 * Copyright (C) 2001 Broadcom Corporation
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that 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.
 */

#ifndef _SWARM_IDE_H
#define _SWARM_IDE_H

#include <asm/sibyte/sb1250_int.h>

#define SWARM_IDE_BASE        (0xb00b0000-mips_io_port_base)
#define SWARM_IDE_REG(pcaddr) (SWARM_IDE_BASE + ((pcaddr)<<5))
#define SWARM_IDE_INT         (K_INT_GPIO_4)

extern ide_ideproc_t swarm_ideproc;

#define swarm_outb(val,port)							\
do {									\
	*(volatile u8 *)(mips_io_port_base + (port)) = val;	\
} while(0)

#define swarm_outw(val,port)							\
do {									\
	*(volatile u16 *)(mips_io_port_base + (port)) = val;	\
} while(0)

#define swarm_outl(val,port)							\
do {									\
	*(volatile u32 *)(mips_io_port_base + (port)) = val;\
} while(0)

static inline unsigned char swarm_inb(unsigned long port)
{
	return (*(volatile u8 *)(mips_io_port_base + port));
}

static inline unsigned short swarm_inw(unsigned long port)
{
	return (*(volatile u16 *)(mips_io_port_base + port));
}

static inline unsigned int swarm_inl(unsigned long port)
{
	return (*(volatile u32 *)(mips_io_port_base + port));
}


static inline void swarm_outsb(unsigned long port, void *addr, unsigned int count)
{
	while (count--) {
		swarm_outb(*(u8 *)addr, port);
		addr++;
	}
}

static inline void swarm_insb(unsigned long port, void *addr, unsigned int count)
{
	while (count--) {
		*(u8 *)addr = swarm_inb(port);
		addr++;
	}
}

static inline void swarm_outsw(unsigned long port, void *addr, unsigned int count)
{
	while (count--) {
		swarm_outw(*(u16 *)addr, port);
		addr += 2;
	}
}

static inline void swarm_insw(unsigned long port, void *addr, unsigned int count)
{
	while (count--) {
		*(u16 *)addr = swarm_inw(port);
		addr += 2;
	}
}

static inline void swarm_outsl(unsigned long port, void *addr, unsigned int count)
{
	while (count--) {
		swarm_outl(*(u32 *)addr, port);
		addr += 4;
	}
}

static inline void swarm_insl(unsigned long port, void *addr, unsigned int count)
{
	while (count--) {
		*(u32 *)addr = swarm_inl(port);
		addr += 4;
	}
}

#endif

Index: sb1250.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/sibyte/sb1250.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sb1250.h	2001/11/08 17:28:25	1.1
+++ sb1250.h	2002/01/28 20:32:06	1.2
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001 Broadcom Corporation
+ * Copyright (C) 2000, 2001 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +16,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifndef _ASM_SIBYTE_SB1250_H
+#define _ASM_SIBYTE_SB1250_H
+
+extern void sb1250_time_init(void);
 extern void sb1250_mask_irq(int cpu, int irq);
 extern void sb1250_unmask_irq(int cpu, int irq);
-extern void sb1250_time_init(void);
+extern void sb1250_smp_finish(void);
+
+#define IO_SPACE_BASE 0xa0000000UL
+
+#endif

Index: sb1250_uart.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/sibyte/sb1250_uart.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sb1250_uart.h	2001/11/08 17:28:25	1.1
+++ sb1250_uart.h	2002/01/28 20:32:06	1.2
@@ -6,7 +6,7 @@
     *  This module contains constants and macros useful for 
     *  manipulating the SB1250's UARTs
     *
-    *  SB1250 specification level:  0.2
+    *  SB1250 specification level:  01/02/2002
     *  
     *  Author:  Mitch Lichtenberg (mi...@si...)
     *  
@@ -63,7 +63,7 @@
 
 
 #define M_DUART_PARITY_TYPE_EVEN    0x00
-#define M_DUART_PARITY_TYPE_ODD     _SB_MAKEMASK1(3)
+#define M_DUART_PARITY_TYPE_ODD     _SB_MAKEMASK1(2)
 
 #define S_DUART_PARITY_MODE          3
 #define M_DUART_PARITY_MODE         _SB_MAKEMASK(2,S_DUART_PARITY_MODE)