linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree

[LV-k25-commit] kernel-2.5/arch/vax defconfig,1.13,1.14

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12045/arch/vax

Modified Files:
	defconfig 
Log Message:
Enable core SCSI support in defconfig


Index: defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/defconfig,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- defconfig	6 Aug 2004 22:51:05 -0000	1.13
+++ defconfig	7 Aug 2004 23:24:42 -0000	1.14
@@ -223,7 +223,44 @@
 #
 # SCSI device support
 #
-# CONFIG_SCSI is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI Transport Attributes
+#
+CONFIG_SCSI_SPI_ATTRS=y
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# VAX SCSI low-level drivers
+#
+# CONFIG_SCSI_VAX_5380 is not set
+# CONFIG_SCSI_VAX_53C94 is not set
 
 #
 # File systems

[LV-k25-commit] kernel-2.5/include/asm-vax pci.h,1.4,1.5

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10265/include/asm-vax

Modified Files:
	pci.h 
Log Message:
Need this #define to get SCSI to compile


Index: pci.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/pci.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pci.h	2 Jun 2004 21:04:04 -0000	1.4
+++ pci.h	7 Aug 2004 00:06:47 -0000	1.5
@@ -12,4 +12,6 @@
  * atp Mar 2002
  */
 
+#define PCI_DMA_BUS_IS_PHYS     (0)
+
 #endif /* _ASM_VAX_PCI_H */

[LV-k25-commit] kernel-2.5/drivers/scsi scsi_ioctl.c,1.20,1.21

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9657

Modified Files:
	scsi_ioctl.c 
Log Message:
Way back, I wrapped this function in CONFIG_PCI to prevent a compilation
error on our non-PCI VAXen.  This isn't needed anymore


Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- scsi_ioctl.c	28 Jul 2004 23:08:58 -0000	1.20
+++ scsi_ioctl.c	7 Aug 2004 00:03:09 -0000	1.21
@@ -351,7 +351,6 @@
 	return result;
 }
 
-#ifdef CONFIG_PCI
 /*
  * The scsi_ioctl_get_pci() function places into arg the value
  * pci_dev::slot_name (8 characters) for the PCI device (if any).
@@ -370,13 +369,6 @@
 		return -ENXIO;
         return copy_to_user(arg, dev->bus_id, sizeof(dev->bus_id))? -EFAULT: 0;
 }
-#else
-static int
-scsi_ioctl_get_pci(Scsi_Device * dev, void *arg)
-{
-      return -ENXIO;
-}
-#endif 
 
 /*
  * the scsi_ioctl() function differs from most ioctls in that it does

[LV-k25-commit] kernel-2.5 Makefile,1.104,1.105

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5274

Modified Files:
	Makefile 
Log Message:
Remove the EXTRAVERSION release tag


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- Makefile	6 Aug 2004 22:53:44 -0000	1.104
+++ Makefile	6 Aug 2004 23:37:57 -0000	1.105
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 7
-EXTRAVERSION = -20040806
+EXTRAVERSION =
 NAME=Zonked Quokka
 
 # *DOCUMENTATION*

[LV-k25-commit] kernel-2.5 Makefile,1.103,1.104

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31409

Modified Files:
	Makefile 
Log Message:
Set EXTRAVERSION to -20040806.  I'm going to tag the tree.


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- Makefile	28 Jul 2004 22:57:23 -0000	1.103
+++ Makefile	6 Aug 2004 22:53:44 -0000	1.104
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 7
-EXTRAVERSION =
+EXTRAVERSION = -20040806
 NAME=Zonked Quokka
 
 # *DOCUMENTATION*

[LV-k25-commit] kernel-2.5/arch/vax defconfig,1.12,1.13

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30885/arch/vax

Modified Files:
	defconfig 
Log Message:
This defconfig should support KA42, KA43, KA46 and KA650 (i.e. 
VAXstation 3100m38, VAXstation 3100m76, VAXstation 4000/60 and SIMH)
as far as a login: prompt with Andy's vaxroot tarball via nfsroot.


Index: defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/defconfig,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- defconfig	18 Sep 2003 23:59:00 -0000	1.12
+++ defconfig	6 Aug 2004 22:51:05 -0000	1.13
@@ -8,12 +8,34 @@
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 CONFIG_ELF_KERNEL=y
 CONFIG_KCORE_ELF=y
+# CONFIG_I2C is not set
+# CONFIG_I2C_ALGOBIT is not set
 # CONFIG_PREEMPT is not set
+CONFIG_CMDLINE="root=/dev/nfs ip=bootp rw debug"
+CONFIG_EARLY_PRINTK=y
+
+#
+# VAX CPU types
+#
+# CONFIG_CPU_KA630 is not set
+# CONFIG_CPU_KA640 is not set
+CONFIG_CPU_KA650=y
+# CONFIG_CPU_KA660 is not set
+# CONFIG_CPU_KA410 is not set
+CONFIG_CPU_KA42=y
+CONFIG_CPU_KA43=y
+CONFIG_CPU_KA46=y
+# CONFIG_CPU_KA48 is not set
+# CONFIG_CPU_KA55 is not set
+# CONFIG_CPU_VXT is not set
 
 #
 # Code maturity level options
 #
 # CONFIG_EXPERIMENTAL is not set
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+CONFIG_BROKEN_ON_SMP=y
 
 #
 # General setup
@@ -22,24 +44,83 @@
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_HOTPLUG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 # CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 
 #
 # Loadable module support
 #
 # CONFIG_MODULES is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_LKKBD=y
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+# CONFIG_MOUSE_PS2 is not set
+# CONFIG_MOUSE_SERIAL is not set
+CONFIG_MOUSE_VSXXXAA=y
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 
 #
 # VAX Bus support
 #
-# CONFIG_QBUS is not set
+CONFIG_QBUS=y
 CONFIG_VSBUS=y
-CONFIG_VAX_4000HC=y
 
 #
 # Block devices
@@ -48,7 +129,6 @@
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
 
 #
 # Networking support
@@ -61,7 +141,6 @@
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_NETLINK_DEV=y
-# CONFIG_NETFILTER is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
@@ -73,16 +152,17 @@
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
-# CONFIG_INET_ECN is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
-# CONFIG_XFRM_USER is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
-# CONFIG_LLC is not set
 # CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
 
 #
 # QoS and/or fair queueing
@@ -93,6 +173,11 @@
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
@@ -111,31 +196,32 @@
 #
 # Ethernet (10000 Mbit)
 #
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Token Ring devices
 #
-# CONFIG_NET_RADIO is not set
 
 #
-# Token Ring devices (depends on LLC=y)
+# Wireless LAN (non-hamradio)
 #
+# CONFIG_NET_RADIO is not set
 
 #
 # Wan interfaces
 #
 # CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
 
 #
 # VAX Network device support
 #
 CONFIG_VAX_LANCE=y
 # CONFIG_VAX_SGEC is not set
+CONFIG_DELQA=y
 
 #
-# SCSI support
+# SCSI device support
 #
 # CONFIG_SCSI is not set
 
@@ -171,14 +257,17 @@
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
-CONFIG_DEVPTS_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
 # CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 
 #
 # Miscellaneous filesystems
 #
+# CONFIG_HFSPLUS_FS is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -223,16 +312,22 @@
 # CONFIG_EFI_PARTITION is not set
 
 #
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
 # Generic Driver Options
 #
-# CONFIG_FW_LOADER is not set
+CONFIG_DEBUG_DRIVER=y
 
 #
 # VAX character devices
 #
 CONFIG_SERIAL=y
+CONFIG_SERIAL_CORE=y
 CONFIG_DZ=y
-# CONFIG_SERIAL_IPR is not set
+CONFIG_SERIAL_IPR=y
 CONFIG_SERIAL_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256
@@ -245,6 +340,7 @@
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_VAX_DIAG_LED=y
 
 #
 # Security options
@@ -257,6 +353,12 @@
 # CONFIG_CRYPTO is not set
 
 #
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
 # Library routines
 #
 CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set

[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_ka42.c,1.12,1.13 cpu_ka43.c,1.15,1.16

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30686/arch/vax/kernel

Modified Files:
	cpu_ka42.c cpu_ka43.c 
Log Message:
Add DZ to the device tree at arch init time for KA42 and KA43


Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cpu_ka43.c	30 Jul 2004 00:21:27 -0000	1.15
+++ cpu_ka43.c	6 Aug 2004 22:48:28 -0000	1.16
@@ -267,6 +267,7 @@
         if (!retval) {
 #ifdef CONFIG_VSBUS
                 vsbus_add_fixed_device(&ka43_vsbus_device.dev, "lance", 0x200e0000, 5);
+                vsbus_add_fixed_device(&ka43_vsbus_device.dev, "dz", 0x200a0000, 6);
 #endif
         }
 

Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cpu_ka42.c	30 Jul 2004 00:21:27 -0000	1.12
+++ cpu_ka42.c	6 Aug 2004 22:48:28 -0000	1.13
@@ -87,6 +87,7 @@
 	if (!retval) {
 #ifdef CONFIG_VSBUS
 		vsbus_add_fixed_device(&ka42_vsbus_device.dev, "lance", 0x200e0000, 5);
+		vsbus_add_fixed_device(&ka42_vsbus_device.dev, "dz", 0x200a0000, 6);
 #endif
 	}
 	

[LV-k25-commit] kernel-2.5/drivers/vax/bus vsbus-ka4x.c,1.1,1.2

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29780/drivers/vax/bus

Modified Files:
	vsbus-ka4x.c 
Log Message:
Correct a comment


Index: vsbus-ka4x.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus/vsbus-ka4x.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vsbus-ka4x.c	10 May 2004 23:20:34 -0000	1.1
+++ vsbus-ka4x.c	6 Aug 2004 22:41:36 -0000	1.2
@@ -19,8 +19,11 @@
 
 static int __init vsbus_ka4x_probe(struct device *busdev)
 {
-	/* Probe the area where we expect to find our device
-	   registers and map it if they are there */
+	/*
+	 * Map the area where we expect to find our device
+	 * interrupt vectors and copy them somewhere more
+	 * convenient
+	 */
 
 	unsigned int *rom_vectors;
 

[LV-k25-commit] kernel-2.5/drivers/char dz.c,1.22,1.23 dz.h,1.7,1.8

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17516/drivers/char

Modified Files:
	dz.c dz.h 
Log Message:
Bring the DZ driver into the driver model.  Note that this makes 
drivers/char/dz.c a vsbus-only driver, so I've removed the MIPS
code.  (This is OK, since this file no longer exists in Linus'
tree.)


Index: dz.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dz.h	10 Mar 2004 21:02:15 -0000	1.7
+++ dz.h	6 Aug 2004 00:01:08 -0000	1.8
@@ -187,9 +187,6 @@
 static struct dz_serial multi[DZ_NB_PORT];    /* Four serial lines in the DZ chip */
 static struct dz_serial *dz_console;
 
-#ifdef CONFIG_VAX
-static unsigned char dz_vsbus_rx_int, dz_vsbus_tx_int;
-#endif
 /*
  * tmp_buf is used as a temporary buffer by serial_write.  We need to
  * lock it in case the copy_from_user blocks while swapping in a page,

Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- dz.c	30 Jul 2004 00:17:16 -0000	1.22
+++ dz.c	6 Aug 2004 00:01:08 -0000	1.23
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 
 #include <linux/config.h>
+#include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h> 
@@ -37,18 +38,12 @@
 #include <linux/interrupt.h>
 #include <linux/serial.h>
 #include <linux/serialP.h>
+
 #ifdef CONFIG_SERIO
 #include <linux/serio.h>
 #endif /* CONFIG_SERIO */
-#ifdef CONFIG_VAX
-#define SERIAL_RX 0xB0 /* FIXME: this is wrong */
-#define SERIAL_TX 0xB1 /* FIXME: this is wrong */
-#define SERIAL SERIAL_RX
-#define wbflush()	do{}while(0)
-#else
-#include <asm-mips/wbflush.h>
-#include <asm/dec/interrupts.h>                   /* for definition of SERIAL */
-#endif
+
+#include <asm/bus/vsbus.h>
 
 /* for definition of struct console */
 #ifdef CONFIG_SERIAL_CONSOLE
@@ -64,16 +59,9 @@
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 
-#ifdef CONFIG_VAX
 #include <asm/mv.h>
 #include <asm/vsa.h>
 #include <asm/dz11.h>
-#else
-#include <asm/dec/machtype.h>
-#include <asm/dec/kn01.h>
-#include <asm/dec/kn02.h>
-#include <asm/bootinfo.h>
-#endif
 
 #ifdef DEBUG_DZ
 #include <linux/ptrace.h>
@@ -376,55 +364,35 @@
  * ------------------------------------------------------------
  */
 /* VAX has separate RX/TX interrupts */
-#ifdef CONFIG_VAX 
+
 static irqreturn_t dz_interrupt_rx (int irq, void *dev, struct pt_regs *regs)
 {
-  struct dz_serial *info;
-  unsigned short status;
-
-  status = dz_in ((struct dz_serial *)dev, DZ_CSR); /* get the reason why we just got an irq */
-  info = lines[LINE(status)];     /* re-arrange info the proper port */
+	struct dz_serial *info;
+	unsigned short status;
 
-  if (status & DZ_RDONE) 
-      receive_chars (info);          /* the receive function */
+	status = dz_in ((struct dz_serial *)dev, DZ_CSR); /* get the reason why we just got an irq */
+	info = lines[LINE(status)];     /* re-arrange info the proper port */
 
-  vsbus_clear_int(dz_vsbus_rx_int);
+	if (status & DZ_RDONE) 
+		receive_chars (info);          /* the receive function */
 
-  return IRQ_HANDLED;
+	return IRQ_HANDLED;
 }
 
 static irqreturn_t dz_interrupt_tx (int irq, void *dev, struct pt_regs *regs)
 {
-  struct dz_serial *info;
-  unsigned short status;
-
-  status = dz_in ((struct dz_serial *)dev, DZ_CSR); /* get the reason why we just got an irq */
-  info = lines[LINE(status)];     /* re-arrange info the proper port */
-
-  if (status & DZ_TRDY) 
-    transmit_chars (info);
-
-  vsbus_clear_int(dz_vsbus_tx_int);
-
-  return IRQ_HANDLED;
-}
-#else
-static void dz_interrupt (int irq, void *dev, struct pt_regs *regs)
-{
 	struct dz_serial *info;
 	unsigned short status;
 
-	 /* get the reason why we just got an irq */
-	status = dz_in((struct dz_serial *)dev, DZ_CSR);
+	status = dz_in ((struct dz_serial *)dev, DZ_CSR); /* get the reason why we just got an irq */
 	info = lines[LINE(status)];     /* re-arrange info the proper port */
 
-	if (status & DZ_RDONE) 
-		receive_chars(info);	/* the receive function */
-
 	if (status & DZ_TRDY) 
 		transmit_chars (info);
+
+	return IRQ_HANDLED;
 }
-#endif
+
 /*
  * -------------------------------------------------------------------
  * Here ends the DZ interrupt routines.
@@ -508,10 +476,6 @@
 	tmp |= (DZ_RIE | DZ_TIE | DZ_MSE);
 	dz_out (info, DZ_CSR, tmp);
 
-#ifdef CONFIG_VAX
-  vsbus_enable_int(dz_vsbus_rx_int);
-  vsbus_enable_int(dz_vsbus_tx_int);
-#endif
 	info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
 
 	change_speed (info);			/* set up the speed */
@@ -899,7 +863,7 @@
 	tmp.type = info->type;
 	tmp.line = info->line;
 	tmp.port = info->port;
-	tmp.irq = SERIAL;
+	tmp.irq = 0;
 	tmp.flags = info->flags;
 	tmp.baud_base = info->baud_base;
 	tmp.close_delay = info->close_delay;
@@ -1352,13 +1316,14 @@
 	.hangup = dz_hangup,
 };
 
-int __init dz_init(void)
+static int __init dz_probe(struct vsbus_device *vsbus_dev)
 {
 	int i, flags;
+	unsigned long base_addr;
 	struct dz_serial *info;
-#ifdef CONFIG_VAX
-        int irq;
-#endif   
+
+        printk("dz_probe: name = %s, base = 0x%08x, irqindex = %d\n",
+                vsbus_dev->dev.bus_id, vsbus_dev->phys_base, vsbus_dev->vsbus_irq);
 
 	serial_driver = alloc_tty_driver(DZ_NB_PORT);
 	if (!serial_driver)
@@ -1382,21 +1347,16 @@
 	if (tty_register_driver(serial_driver))
 		panic("Couldn't register serial driver\n");
 
+	/* FIXME: check this for NULL */
+	base_addr = (unsigned long) ioremap(vsbus_dev->phys_base, 16);
+
 	save_flags(flags); cli();
 	for (i=0; i < DZ_NB_PORT;  i++) {
 		info = &multi[i]; 
 		lines[i] = info;
 		info->magic = SERIAL_MAGIC;
 
-#ifdef CONFIG_VAX
-		info->port = (unsigned long) dz11_addr;
-#else
-		if ((mips_machtype == MACH_DS23100) ||
-		    (mips_machtype == MACH_DS5100)) 
-			info->port = (unsigned long) KN01_DZ11_BASE;
-		else 
-			info->port = (unsigned long) KN02_DZ11_BASE;
-#endif
+		info->port = base_addr;
 		info->line = i;
 		info->tty = 0;
 		info->close_delay = 50;
@@ -1417,12 +1377,7 @@
 		if (! info->port)
 			return 0;
 
-#ifdef CONFIG_VAX
 		printk("ttyS%02d at 0x%04x\n", info->line, info->port);
-#else
-		printk("ttyS%02d at 0x%08x (irq = %d)\n", info->line,
-		       info->port, SERIAL);
-#endif
 
 		tty_register_device(serial_driver, info->line, NULL);
 
@@ -1466,7 +1421,6 @@
 		int tmp;
 		dz_out(info, DZ_CSR, DZ_CLR);
 		while ((tmp = dz_in(info,DZ_CSR)) & DZ_CLR);
-		wbflush();
   
 		/* Enable scanning */
 		dz_out(info, DZ_CSR, DZ_MSE); 
@@ -1479,83 +1433,35 @@
 	 */
 	restore_flags(flags);
   
-#if CONFIG_VAX
-#ifndef CONFIG_VAX_4000HC
-  {
-    short i;
-    unsigned char num;
-    unsigned long irq_mask;
-
-    irq_mask = probe_irq_on();
-    vsbus_probe_irq_on();
-    i = dz_in(info, DZ_TCR);
-    dz_out(info, DZ_CSR, DZ_MSE|DZ_TIE);
-    dz_out(info, DZ_TCR, 0);
-    mdelay(1);
-    dz_out(info, DZ_TCR, 1);
-    mdelay(10);
-    dz_out(info, DZ_TCR, i);
-    num=vsbus_probe_irq_report();
-    irq=probe_irq_off(irq_mask);
-     if (num)
-      {
-	dz_vsbus_rx_int=num;
-	dz_vsbus_tx_int=num+1;
-      }
-
-    irq_mask = probe_irq_on();
-    
-    vsbus_enable_int(num);
-
-    i = dz_in(info, DZ_TCR);
-    dz_out(info, DZ_CSR, DZ_MSE|DZ_TIE);
-    dz_out(info, DZ_TCR, 0);
-    mdelay(1);
-    dz_out(info, DZ_TCR, 1);
-    mdelay(10);
-    dz_out(info, DZ_TCR, i);
-    vsbus_clear_int(num);
-    vsbus_disable_int(num);
-    irq=probe_irq_off(irq_mask);
-  }
-#else    
-if (is_ka46()){
-  dz_vsbus_tx_int=5;
-  dz_vsbus_rx_int=4;
-  irq=149;
-} else {
-  dz_vsbus_tx_int=7;
-  dz_vsbus_rx_int=6;
-  irq=177;
-}
-#endif
-  printk("dz.c: using irq rx %d, irq tx %d\n", irq-1, irq);
+	/* The bus-specific IRQ we are handed in the vsbus_dev
+	 * structure is the TX interrupt.  The RX is always the
+	 * next one up.
+	 */
+	printk("dz.c: using irq rx %d(bus %d), irq tx %d(bus %d)\n", 
+		vsbus_irqindex_to_irq(vsbus_dev->vsbus_irq + 1),
+		vsbus_dev->vsbus_irq + 1,
+		vsbus_irqindex_to_irq(vsbus_dev->vsbus_irq),
+		vsbus_dev->vsbus_irq);
  
-  if (request_irq (irq, dz_interrupt_tx, SA_INTERRUPT, "DZ", lines[0]))
-    panic ("Unable to register DZ TX interrupt\n");
-  if (request_irq (irq-1, dz_interrupt_rx, SA_INTERRUPT, "DZ", lines[0]))
-    panic ("Unable to register DZ RX interrupt\n");
-#else
-	if (request_irq(SERIAL, dz_interrupt_rx, SA_INTERRUPT, "DZ", lines[0]))
-		panic("Unable to register DZ interrupt\n");
-#endif
-  /* enable scanning */
-  dz_out(info, DZ_CSR, DZ_MSE); 
+	if (vsbus_request_irq (vsbus_dev->vsbus_irq, dz_interrupt_tx, SA_INTERRUPT, "DZ-TX", lines[0]))
+		panic ("Unable to register DZ TX interrupt\n");
+	if (vsbus_request_irq (vsbus_dev->vsbus_irq + 1, dz_interrupt_rx, SA_INTERRUPT, "DZ-RX", lines[0]))
+		panic ("Unable to register DZ RX interrupt\n");
+
+	/* enable scanning */
+	dz_out(info, DZ_CSR, DZ_MSE); 
 
 	return 0;
 }
 
 #ifdef CONFIG_SERIAL_CONSOLE
-__initcall(dz_init);
 
 static void dz_console_put_char (unsigned char ch)
 {
 	unsigned long flags;
 	int  loops = 2500;
 	unsigned short tmp = ch;
-#ifdef CONFIG_VAX
         unsigned short tcr, mask;
-#endif   
 	/*
 	 * this code sends stuff out to serial device - spinning its wheels and
 	 * waiting.
@@ -1566,11 +1472,10 @@
 
 	save_and_cli(flags);
   
-#ifdef CONFIG_VAX
-  mask = 1 << dz_console->line;
-  tcr = dz_in (dz_console, DZ_TCR);       /* read the TX flag */
-  dz_out(dz_console, DZ_TCR, mask);
-#endif  
+	mask = 1 << dz_console->line;
+	tcr = dz_in (dz_console, DZ_TCR);       /* read the TX flag */
+	dz_out(dz_console, DZ_TCR, mask);
+
 	/* spin our wheels */
 	while (((dz_in(dz_console, DZ_CSR) & DZ_TRDY) != DZ_TRDY) &&  loops--)
 		;
@@ -1578,12 +1483,11 @@
 	/* Actually transmit the character. */
 	dz_out(dz_console, DZ_TDR, tmp);
 
-#ifdef CONFIG_VAX
-  /* spin our wheels */
-  while (((dz_in(dz_console,DZ_CSR) & DZ_TRDY) != DZ_TRDY) &&  loops--)
-    ;
-  dz_out(dz_console, DZ_TCR, tcr);
-#endif
+	/* spin our wheels */
+	while (((dz_in(dz_console,DZ_CSR) & DZ_TRDY) != DZ_TRDY) &&  loops--)
+		;
+	dz_out(dz_console, DZ_TCR, tcr);
+
 	restore_flags(flags); 
 }
 
@@ -1676,20 +1580,11 @@
 
 	/* TOFIX: force to console line */
 	dz_console = &multi[CONSOLE_LINE];
-#ifdef CONFIG_VAX
        	dz_console->port = (unsigned long)dz11_addr; 
-#else
-        if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100)) 
-		dz_console->port = KN01_DZ11_BASE;
-       	else 
-       		dz_console->port = KN02_DZ11_BASE; 
-#endif   
 	dz_console->line = CONSOLE_LINE;
 
 	/* This line locks up Dave Airlie's VS3100m38 after HALT */
-#ifndef CONFIG_VAX
-	dz_out(dz_console, DZ_CSR, DZ_CLR);
-#endif
+	/* dz_out(dz_console, DZ_CSR, DZ_CLR); */
 
 	while ((tmp = dz_in(dz_console,DZ_CSR)) & DZ_CLR)
 		;
@@ -1715,12 +1610,12 @@
 }
 
 static struct console dz_sercons = {
-    .name	= "ttyS",
-    .write	= dz_console_print,
-    .device	= dz_console_device,
-    .setup	= dz_console_setup,
-    .flags	= CON_CONSDEV,
-    .index	= CONSOLE_LINE,
+	.name	= "ttyS",
+	.write	= dz_console_print,
+	.device	= dz_console_device,
+	.setup	= dz_console_setup,
+	.flags	= CON_CONSDEV,
+	.index	= CONSOLE_LINE,
 };
 
 void __init dz_serial_console_init(void)
@@ -1730,4 +1625,18 @@
 
 #endif /* ifdef CONFIG_SERIAL_CONSOLE */
 
+static struct vsbus_driver dz_driver = {
+	.probe	= dz_probe,
+	.drv	= {
+		.name	 = "dz",
+	},
+};
+
+static int __init dz_init_new(void)
+{
+	return vsbus_register_driver(&dz_driver);
+}
+
+module_init(dz_init_new);
+
 MODULE_LICENSE("GPL");

[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_ka46.c,1.14,1.15

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17516/arch/vax/kernel

Modified Files:
	cpu_ka46.c 
Log Message:
Bring the DZ driver into the driver model.  Note that this makes 
drivers/char/dz.c a vsbus-only driver, so I've removed the MIPS
code.  (This is OK, since this file no longer exists in Linus'
tree.)


Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cpu_ka46.c	30 Jul 2004 00:21:27 -0000	1.14
+++ cpu_ka46.c	6 Aug 2004 00:01:07 -0000	1.15
@@ -163,6 +163,7 @@
 	if (!retval) {
 #ifdef CONFIG_VSBUS
 		vsbus_add_fixed_device(&ka46_vsbus_device.dev, "lance", 0x200e0000, 1);
+		vsbus_add_fixed_device(&ka46_vsbus_device.dev, "dz", 0x200a0000, 4);
 #endif
 	}
 

Re: [LV-k25-commit] kernel-2.5/arch/vax/configs ka4x_defconfig,1.3,1.4 ka650_defconfig,1.7,1.8

[Jan-Benedict G. <jb...@lu...>]

On Fri, 2004-07-30 00:24:14 +0000, Kenn Humborg <ke...@us...>
wrote in message <E1B...@sc...>:

> My plan is to get these 4 machines running off one .config.

One .config for only four machines?  Since now the CPU support tells us
which hardware actually is available, there should be room for later
improvements to actually get one config that fits them all:) Of course,
that will need some tweaking in some drivers...

MfG, JBG

--=20
Jan-Benedict Glaw       jb...@lu...    . +49-172-7608481             =
_ O _
"Eine Freie Meinung in  einem Freien Kopf    | Gegen Zensur | Gegen Krieg  =
_ _ O
 fuer einen Freien Staat voll Freier B=FCrger" | im Internet! |   im Irak! =
  O O O
ret =3D do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)=
);

[LV-k25-commit] kernel-2.5/arch/vax/configs ka4x_defconfig,1.3,1.4 ka650_defconfig,1.7,1.8

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/configs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30026/configs

Modified Files:
	ka4x_defconfig ka650_defconfig 
Log Message:
Bringing the IPR serial driver and the diag LED driver into the driver
model as platform devices allows them to easily co-exist in the same
kernel image.  These changes to KA650's and KA42/3/6's defconfigs
bring the configs closer together.

My plan is to get these 4 machines running off one .config.


Index: ka650_defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/configs/ka650_defconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ka650_defconfig	28 Jul 2004 23:11:44 -0000	1.7
+++ ka650_defconfig	30 Jul 2004 00:24:12 -0000	1.8
@@ -22,9 +22,9 @@
 CONFIG_CPU_KA650=y
 # CONFIG_CPU_KA660 is not set
 # CONFIG_CPU_KA410 is not set
-# CONFIG_CPU_KA42 is not set
-# CONFIG_CPU_KA43 is not set
-# CONFIG_CPU_KA46 is not set
+CONFIG_CPU_KA42=y
+CONFIG_CPU_KA43=y
+CONFIG_CPU_KA46=y
 # CONFIG_CPU_KA48 is not set
 # CONFIG_CPU_KA55 is not set
 # CONFIG_CPU_VXT is not set
@@ -332,7 +332,7 @@
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_VAX_DIAG_LED is not set
+CONFIG_VAX_DIAG_LED=y
 
 #
 # Security options

Index: ka4x_defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/configs/ka4x_defconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ka4x_defconfig	28 Jul 2004 23:11:44 -0000	1.3
+++ ka4x_defconfig	30 Jul 2004 00:24:12 -0000	1.4
@@ -19,7 +19,7 @@
 #
 # CONFIG_CPU_KA630 is not set
 # CONFIG_CPU_KA640 is not set
-# CONFIG_CPU_KA650 is not set
+CONFIG_CPU_KA650=y
 # CONFIG_CPU_KA660 is not set
 # CONFIG_CPU_KA410 is not set
 CONFIG_CPU_KA42=y
@@ -119,7 +119,7 @@
 #
 # VAX Bus support
 #
-# CONFIG_QBUS is not set
+CONFIG_QBUS=y
 CONFIG_VSBUS=y
 
 #
@@ -218,6 +218,7 @@
 #
 CONFIG_VAX_LANCE=y
 # CONFIG_VAX_SGEC is not set
+CONFIG_DELQA=y
 
 #
 # SCSI device support
@@ -326,7 +327,7 @@
 CONFIG_SERIAL=y
 CONFIG_SERIAL_CORE=y
 CONFIG_DZ=y
-# CONFIG_SERIAL_IPR is not set
+CONFIG_SERIAL_IPR=y
 CONFIG_SERIAL_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256

[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_ka42.c,1.11,1.12 cpu_ka43.c,1.14,1.15 cpu_ka46.c,1.13,1.14 cpu_ka650.c,1.11,1.12

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29842

Modified Files:
	cpu_ka42.c cpu_ka43.c cpu_ka46.c cpu_ka650.c 
Log Message:
KA650 always as an IPR-based console port and KA42/43/46 always have
the diagnostic LEDs available.  So create these platform devices at
init time as required


Index: cpu_ka650.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka650.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cpu_ka650.c	26 Apr 2004 23:30:41 -0000	1.11
+++ cpu_ka650.c	30 Jul 2004 00:21:27 -0000	1.12
@@ -85,15 +85,20 @@
 	.name = "cqbic"
 };
 
+static struct platform_device ka650_iprcons_device = {
+	.name = "iprcons"
+};
+
 static int __init ka650_platform_device_init(void)
 {
-	int retval = -ENODEV;
-
-	if (mv == &mv_ka650) {
-		retval = platform_device_register(&ka650_cqbic_device);
+	if (mv != &mv_ka650) {
+		return -ENODEV;
 	}
 
-	return retval;
+	platform_device_register(&ka650_cqbic_device);
+	platform_device_register(&ka650_iprcons_device);
+
+	return 0;
 }
 
 arch_initcall(ka650_platform_device_init);

Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cpu_ka46.c	9 Jul 2004 19:16:14 -0000	1.13
+++ cpu_ka46.c	30 Jul 2004 00:21:27 -0000	1.14
@@ -145,6 +145,10 @@
 	.name = "ka4x-vsbus"
 };
 
+static struct platform_device ka46_diag_led_device = {
+	.name = "diag_led"
+};
+
 static int __init ka46_platform_device_init(void)
 {
 	int retval;
@@ -153,9 +157,13 @@
 		return -ENODEV;
 	}
 
+	platform_device_register(&ka46_diag_led_device);
+
 	retval = platform_device_register(&ka46_vsbus_device);
 	if (!retval) {
+#ifdef CONFIG_VSBUS
 		vsbus_add_fixed_device(&ka46_vsbus_device.dev, "lance", 0x200e0000, 1);
+#endif
 	}
 
 	return retval;

Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cpu_ka42.c	10 May 2004 23:22:52 -0000	1.11
+++ cpu_ka42.c	30 Jul 2004 00:21:27 -0000	1.12
@@ -69,6 +69,10 @@
 	.name = "ka4x-vsbus"
 };
 
+static struct platform_device ka42_diag_led_device = {
+	.name = "diag_led"
+};
+
 static int __init ka42_platform_device_init(void)
 {
 	int retval;
@@ -77,9 +81,13 @@
 		return -ENODEV;
 	}
 
+	platform_device_register(&ka42_diag_led_device);
+
 	retval = platform_device_register(&ka42_vsbus_device);
 	if (!retval) {
+#ifdef CONFIG_VSBUS
 		vsbus_add_fixed_device(&ka42_vsbus_device.dev, "lance", 0x200e0000, 5);
+#endif
 	}
 	
 	return retval;

Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cpu_ka43.c	10 May 2004 23:38:07 -0000	1.14
+++ cpu_ka43.c	30 Jul 2004 00:21:27 -0000	1.15
@@ -249,6 +249,10 @@
         .name = "ka4x-vsbus"
 };
 
+static struct platform_device ka43_diag_led_device = {
+	.name = "diag_led"
+};
+
 static int __init ka43_platform_device_init(void)
 {
         int retval;
@@ -257,9 +261,13 @@
                 return -ENODEV;
         }
 
+        platform_device_register(&ka43_diag_led_device);
+
         retval = platform_device_register(&ka43_vsbus_device);
         if (!retval) {
+#ifdef CONFIG_VSBUS
                 vsbus_add_fixed_device(&ka43_vsbus_device.dev, "lance", 0x200e0000, 5);
+#endif
         }
 
         return retval;

[LV-k25-commit] kernel-2.5/arch/vax/kernel diag_led.c,1.5,1.6

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29591/arch/vax/kernel

Modified Files:
	diag_led.c 
Log Message:
Make the diagnostic LED driver a citizen of the driver-model world 
(as a platform driver)



Index: diag_led.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/diag_led.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- diag_led.c	13 May 2004 10:22:22 -0000	1.5
+++ diag_led.c	30 Jul 2004 00:19:34 -0000	1.6
@@ -1,3 +1,4 @@
+#include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -164,7 +165,7 @@
  * Find memory base and map that address
  */
 int __init
-diag_led_init (void)
+diag_led_probe (struct device *busdev)
 {
 	unsigned long base_address = diag_led_get_base ();
 
@@ -204,6 +205,19 @@
 	return;
 }
 
+static struct device_driver diag_led_driver = {
+        .name   = "diag_led",
+        .bus    = &platform_bus_type,
+        .probe  = diag_led_probe,
+};
+
+static int __init
+diag_led_init(void)
+{
+        return driver_register(&diag_led_driver);
+}
+
+
 EXPORT_SYMBOL (diag_led_set_state);
 EXPORT_SYMBOL (diag_led_get_state);
 EXPORT_SYMBOL (diag_led_on);

[LV-k25-commit] kernel-2.5/drivers/vax/serial ipr.c,1.6,1.7

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/serial
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29335/drivers/vax/serial

Modified Files:
	ipr.c 
Log Message:
Make the internal-processor-register serial driver a citizen of the
driver-model world (as a platform driver)


Index: ipr.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/serial/ipr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ipr.c	17 Apr 2004 23:54:58 -0000	1.6
+++ ipr.c	30 Jul 2004 00:18:58 -0000	1.7
@@ -17,6 +17,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/device.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/tty.h>
@@ -405,15 +406,19 @@
 	__mtpr(old_inten_tx, PR_TXCS);
 }
 
+/*
+ * This is really just a forward declaration for the static struct
+ * uart_driver defined below
+ */
 
-extern struct uart_driver iprcons_reg;
+extern struct uart_driver iprcons_uart_driver;
 
 static struct console iprcons_console = {
 	.name	= "ttyS",
 	.write	= iprcons_console_write,
 	.device	= uart_console_device,
 	.index	= -1,
-	.data	= &iprcons_reg,
+	.data	= &iprcons_uart_driver,
 };
 
 static int __init iprcons_console_init(void)
@@ -431,7 +436,7 @@
 
 #endif /* CONFIG_SERIAL_CONSOLE */
 
-static struct uart_driver iprcons_reg = {
+static struct uart_driver iprcons_uart_driver = {
 	.owner		= THIS_MODULE,
 	.driver_name	= "ttyS",
 	.dev_name	= "ttyS",
@@ -441,23 +446,47 @@
 	.cons		= VAX_IPR_CONSOLE,
 };
 
-static int __init iprcons_init(void)
+static void __exit iprcons_exit(void)
+{
+	/*
+	 * FIXME: this is probably very broken.  How should
+	 * we handled module removal with the driver model
+	 * and the serial core involved?
+	 */
+	uart_remove_one_port(&iprcons_uart_driver, &iprcons_port);
+	uart_unregister_driver(&iprcons_uart_driver);
+}
+
+static int __init iprcons_probe(struct device *busdev)
 {
 	int ret;
 
 	printk(KERN_INFO "Serial: VAX IPR CPU console driver $Revision$\n");
 
-	ret = uart_register_driver(&iprcons_reg);
+	/*
+	 * We are a platform device.  We'll only get probed if
+	 * the per-cpu init code registers a platform device called
+	 * 'iprcons'.  So it's safe to go ahead and register the
+	 * UART driver here without checking the presence of any
+	 * hardware.
+	 */
+
+	ret = uart_register_driver(&iprcons_uart_driver);
 	if (ret == 0) {
-		uart_add_one_port(&iprcons_reg, &iprcons_port);
+		uart_add_one_port(&iprcons_uart_driver, &iprcons_port);
 	}
 	return ret;
 }
 
-static void __exit iprcons_exit(void)
+static struct device_driver iprcons_driver = {
+	.name	= "iprcons",
+	.bus	= &platform_bus_type,
+	.probe	= iprcons_probe,
+};
+
+static int __init iprcons_init(void)
 {
-	uart_remove_one_port(&iprcons_reg, &iprcons_port);
-	uart_unregister_driver(&iprcons_reg);
+	return driver_register(&iprcons_driver);
 }
 
 module_init(iprcons_init);

[LV-k25-commit] kernel-2.5/drivers/char dz.c,1.21,1.22

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29006/drivers/char

Modified Files:
	dz.c 
Log Message:
Make generic early console I/O routines for DZ available always, even
if CONFIG_DZ is not set


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- dz.c	12 Jul 2004 23:19:46 -0000	1.21
+++ dz.c	30 Jul 2004 00:17:16 -0000	1.22
@@ -68,7 +68,6 @@
 #include <asm/mv.h>
 #include <asm/vsa.h>
 #include <asm/dz11.h>
-volatile struct dz11_regs *dz11_addr;
 #else
 #include <asm/dec/machtype.h>
 #include <asm/dec/kn01.h>

[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_generic.c,1.10,1.11

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29006/arch/vax/kernel

Modified Files:
	cpu_generic.c 
Log Message:
Make generic early console I/O routines for DZ available always, even
if CONFIG_DZ is not set


Index: cpu_generic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_generic.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cpu_generic.c	30 May 2004 09:29:01 -0000	1.10
+++ cpu_generic.c	30 Jul 2004 00:17:16 -0000	1.11
@@ -104,7 +104,7 @@
 	return 0;
 }
 
-#ifdef CONFIG_DZ
+//#ifdef CONFIG_DZ
 /************************************************************************/
 /* These functions can be used by implementations that do console I/O
    via a DZ11-compatible chip (KA410, KA42 and KA43 CPUs).  These functions can 
@@ -112,6 +112,8 @@
    mapped by map_dz11_regs(). */
 
 
+volatile struct dz11_regs *dz11_addr;
+
 /* This is the serial line on the DZ11 that we should use as the
    console.  Normally it is line 3 */
 static unsigned int dz11_line;
@@ -168,5 +170,5 @@
 	dz11_addr = ioremap(dz11_phys_addr, sizeof(*dz11_addr));
 	dz11_line = line;
 }
-#endif /* CONFIG_DZ */
+//#endif /* CONFIG_DZ */
 

[LV-k25-commit] kernel-2.5/arch/vax/kernel entry.S,1.16,1.17

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26654

Modified Files:
	entry.S 
Log Message:
- TABify.


Index: entry.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/entry.S,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- entry.S	14 Jun 2004 12:19:51 -0000	1.16
+++ entry.S	29 Jul 2004 20:59:19 -0000	1.17
@@ -67,7 +67,7 @@
 	extzv $22, $2, 4(%sp), -(%sp)	/* Extract PREVMODE field from saved
 					 * PSL and save on stack (because we
 					 * don't have any spare registers yet) */
-	cmpzv $24, $2, 8(%sp), (%sp)   /* Is PREVMODE == CURMODE? */
+	cmpzv $24, $2, 8(%sp), (%sp)	/* Is PREVMODE == CURMODE? */
 	beql same_mode
 	mfpr (%sp),(%sp)		/* HACK ALERT!  The processor modes are 0..3
 					 * for kernel..user mode.  The stack pointer

[LV-k25-commit] kernel-2.5/include/asm-vax unistd.h,1.11,1.12

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25764

Modified Files:
	unistd.h 
Log Message:
- Re-add support for named unix sockets.


Index: unistd.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/unistd.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- unistd.h	28 Jul 2004 23:52:28 -0000	1.11
+++ unistd.h	29 Jul 2004 12:23:43 -0000	1.12
@@ -457,6 +457,7 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_LLSEEK
 #define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_SYS_SOCKETCALL
 #define __ARCH_WANT_STAT64
 #endif
 

[LV-k25-commit] kernel-2.5/arch/vax/mm init.c,1.14,1.15

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/mm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31645/arch/vax/mm

Modified Files:
	init.c 
Log Message:
The handling of struct page's refcount changes in 2.6.7.  Adapt to this
change, and make free_initmem() look more like Alpha's.


Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/mm/init.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- init.c	28 Aug 2003 22:48:53 -0000	1.14
+++ init.c	29 Jul 2004 00:28:54 -0000	1.15
@@ -129,20 +129,25 @@
     return;
 }
 
+static void free_reserved_mem(void *start, void *end)
+{
+	void *__start = start;
+	for (; __start < end; __start += PAGE_SIZE) {
+		ClearPageReserved(virt_to_page(__start));
+		set_page_count(virt_to_page(__start), 1);
+		free_page((long)__start);
+		totalram_pages++;
+	}
+}
+
 void free_initmem(void)
 {
-    extern char __init_begin, __init_end;
-    unsigned long addr;
+	extern char __init_begin, __init_end;
 
-    addr = (unsigned long) (&__init_begin);
-    for (; addr < (unsigned long) (&__init_end); addr += PAGE_SIZE) {
-	mem_map[MAP_NR(addr)].flags &= ~(1 << PG_reserved);
-	atomic_set(&mem_map[MAP_NR(addr)].count, 1);
-	kill_page(addr);
-	free_page(addr);
-    }
-    printk("Freeing unused kernel memory: %dk freed\n",
-	   (&__init_end - &__init_begin) >> 10);
+        free_reserved_mem(&__init_begin, &__init_end);
+
+	printk("Freeing unused kernel memory: %dk freed\n",
+		(&__init_end - &__init_begin) >> 10);
 }
 
 void
@@ -164,7 +169,7 @@
 		else if (!page_count(mem_map+i))
 			free++;
 		else
-			shared += atomic_read(&mem_map[i].count) - 1;
+			shared += page_count(mem_map + i) - 1;
 	}
 	printk("%ld pages of RAM\n",total);
 	printk("%ld free pages\n",free);

[LV-k25-commit] kernel-2.5/include/asm-vax cacheflush.h,1.4,1.5 types.h,1.6,1.7

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26151/include/asm-vax

Modified Files:
	cacheflush.h types.h 
Log Message:
Add definitions needed by 2.6.7


Index: types.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/types.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- types.h	1 Oct 2003 01:31:42 -0000	1.6
+++ types.h	28 Jul 2004 23:52:49 -0000	1.7
@@ -57,6 +57,8 @@
 
 typedef u64 dma64_addr_t;
 
+typedef unsigned int kmem_bufctl_t;
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */

Index: cacheflush.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/cacheflush.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cacheflush.h	14 Oct 2003 00:36:38 -0000	1.4
+++ cacheflush.h	28 Jul 2004 23:52:49 -0000	1.5
@@ -17,6 +17,8 @@
 #define flush_cache_page(vma, vmaddr)		do { } while (0)
 #define flush_page_to_ram(page)			do { } while (0)
 #define flush_dcache_page(page)			do { } while (0)
+#define flush_dcache_mmap_lock(page)		do { } while (0)
+#define flush_dcache_mmap_unlock(page)		do { } while (0)
 #define flush_cache_vmap(start, end)		do { } while (0)
 #define flush_cache_vunmap(start, end)		do { } while (0)
 

[LV-k25-commit] kernel-2.5/include/asm-vax unistd.h,1.10,1.11

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26042/include/asm-vax

Modified Files:
	unistd.h 
Log Message:
Tell the arch-independent code that we want a bunch of syscalls to be
implemented for us


Index: unistd.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/unistd.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- unistd.h	12 Jun 2004 22:52:53 -0000	1.10
+++ unistd.h	28 Jul 2004 23:52:28 -0000	1.11
@@ -438,6 +438,28 @@
 }
 
 
+#ifdef __KERNEL__
+#define __ARCH_WANT_IPC_PARSE_VERSION
+#define __ARCH_WANT_SYS_WAITPID
+#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_OLDUMOUNT
+#define __ARCH_WANT_SYS_STIME
+#define __ARCH_WANT_SYS_ALARM
+#define __ARCH_WANT_SYS_PAUSE
+#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_NICE
+#define __ARCH_WANT_SYS_SIGNAL
+#define __ARCH_WANT_SYS_GETPGRP
+#define __ARCH_WANT_SYS_SGETMASK
+#define __ARCH_WANT_SYS_SSETMASK
+#define __ARCH_WANT_SYS_SIGPENDING
+#define __ARCH_WANT_SYS_OLD_GETRLIMIT
+#define __ARCH_WANT_SYS_SIGPROCMASK
+#define __ARCH_WANT_SYS_LLSEEK
+#define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_STAT64
+#endif
+
 
 #ifdef __KERNEL_SYSCALLS__
 

[LV-k25-commit] kernel-2.5/drivers/char Makefile,1.1.1.44,1.42

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25947

Modified Files:
	Makefile 
Log Message:
Linus removed the drivers/char/dz driver in 2.6.7, but we want to 
continue using it until the drivers/serial/dz driver works for us


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.1.1.44
retrieving revision 1.42
diff -u -d -r1.1.1.44 -r1.42
--- Makefile	28 Jul 2004 22:00:31 -0000	1.1.1.44
+++ Makefile	28 Jul 2004 23:51:44 -0000	1.42
@@ -69,6 +69,7 @@
 obj-$(CONFIG_FTAPE) += ftape/
 obj-$(CONFIG_H8) += h8.o
 obj-$(CONFIG_PPDEV) += ppdev.o
+obj-$(CONFIG_DZ) += dz.o
 obj-$(CONFIG_NWBUTTON) += nwbutton.o
 obj-$(CONFIG_NWFLASH) += nwflash.o
 obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o

[LV-k25-commit] kernel-2.5/arch/vax/configs ka4x_defconfig,1.2,1.3 ka650_defconfig,1.6,1.7

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/configs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19390/arch/vax/configs

Modified Files:
	ka4x_defconfig ka650_defconfig 
Log Message:
Update the KA650 and KA42/43/46 defconfigs for 2.6.7


Index: ka650_defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/configs/ka650_defconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ka650_defconfig	18 Jul 2004 21:57:39 -0000	1.6
+++ ka650_defconfig	28 Jul 2004 23:11:44 -0000	1.7
@@ -51,6 +51,7 @@
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_IOSCHED_NOOP=y

Index: ka4x_defconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/configs/ka4x_defconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ka4x_defconfig	18 Jul 2004 21:57:39 -0000	1.2
+++ ka4x_defconfig	28 Jul 2004 23:11:44 -0000	1.3
@@ -51,6 +51,7 @@
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_IOSCHED_NOOP=y

[LV-k25-commit] kernel-2.5/drivers/scsi Makefile,1.34,1.35 scsi_ioctl.c,1.19,1.20

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19041/drivers/scsi

Modified Files:
	Makefile scsi_ioctl.c 
Log Message:
Merge with 2.6.7


Index: scsi_ioctl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_ioctl.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- scsi_ioctl.c	4 Oct 2003 18:35:53 -0000	1.19
+++ scsi_ioctl.c	28 Jul 2004 23:08:58 -0000	1.20
@@ -42,14 +42,14 @@
  * (int *) arg
  */
 
-static int ioctl_probe(struct Scsi_Host *host, void *buffer)
+static int ioctl_probe(struct Scsi_Host *host, void __user *buffer)
 {
 	unsigned int len, slen;
 	const char *string;
 	int temp = host->hostt->present;
 
 	if (temp && buffer) {
-		if (get_user(len, (unsigned int *) buffer))
+		if (get_user(len, (unsigned int __user *) buffer))
 			return -EFAULT;
 
 		if (host->hostt->info)
@@ -204,11 +204,11 @@
 #define OMAX_SB_LEN 16		/* Old sense buffer length */
 
 int scsi_ioctl_send_command(struct scsi_device *sdev,
-			    struct scsi_ioctl_command *sic)
+			    struct scsi_ioctl_command __user *sic)
 {
 	char *buf;
 	unsigned char cmd[MAX_COMMAND_SIZE];
-	char *cmd_in;
+	char __user *cmd_in;
 	struct scsi_request *sreq;
 	unsigned char opcode;
 	unsigned int inlen, outlen, cmdlen;
@@ -362,7 +362,7 @@
  *                  device)
  *          any copy_to_user() error on failure there
  */
-static int scsi_ioctl_get_pci(struct scsi_device *sdev, void *arg)
+static int scsi_ioctl_get_pci(struct scsi_device *sdev, void __user *arg)
 {
 	struct device *dev = scsi_get_device(sdev->host);
 
@@ -383,7 +383,7 @@
  * not take a major/minor number as the dev field.  Rather, it takes
  * a pointer to a scsi_devices[] element, a structure. 
  */
-int scsi_ioctl(struct scsi_device *sdev, int cmd, void *arg)
+int scsi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
 {
 	char scsi_cmd[MAX_COMMAND_SIZE];
 
@@ -409,19 +409,18 @@
 			 + ((sdev->lun & 0xff) << 8)
 			 + ((sdev->channel & 0xff) << 16)
 			 + ((sdev->host->host_no & 0xff) << 24),
-			 &((struct scsi_idlun *)arg)->dev_id);
+			 &((struct scsi_idlun __user *)arg)->dev_id);
 		__put_user(sdev->host->unique_id,
-			 &((struct scsi_idlun *)arg)->host_unique_id);
+			 &((struct scsi_idlun __user *)arg)->host_unique_id);
 		return 0;
 	case SCSI_IOCTL_GET_BUS_NUMBER:
-		return put_user(sdev->host->host_no, (int *)arg);
+		return put_user(sdev->host->host_no, (int __user *)arg);
 	case SCSI_IOCTL_PROBE_HOST:
 		return ioctl_probe(sdev->host, arg);
 	case SCSI_IOCTL_SEND_COMMAND:
 		if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
 			return -EACCES;
-		return scsi_ioctl_send_command(sdev,
-				(struct scsi_ioctl_command *)arg);
+		return scsi_ioctl_send_command(sdev, arg);
 	case SCSI_IOCTL_DOORLOCK:
 		return scsi_set_medium_removal(sdev, SCSI_REMOVAL_PREVENT);
 	case SCSI_IOCTL_DOORUNLOCK:

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile	18 Jul 2004 21:49:26 -0000	1.34
+++ Makefile	28 Jul 2004 23:08:58 -0000	1.35
@@ -75,7 +75,8 @@
 obj-$(CONFIG_SCSI_NCR_D700)	+= 53c700.o NCR_D700.o
 obj-$(CONFIG_SCSI_NCR_Q720)	+= NCR_Q720_mod.o
 obj-$(CONFIG_SCSI_SYM53C416)	+= sym53c416.o
-obj-$(CONFIG_SCSI_QLOGIC_FAS)	+= qlogicfas.o
+obj-$(CONFIG_SCSI_QLOGIC_FAS)	+= qlogicfas408.o	qlogicfas.o
+obj-$(CONFIG_PCMCIA_QLOGIC)	+= qlogicfas408.o
 obj-$(CONFIG_SCSI_QLOGIC_ISP)	+= qlogicisp.o 
 obj-$(CONFIG_SCSI_QLOGIC_FC)	+= qlogicfc.o 
 obj-$(CONFIG_SCSI_QLOGIC_1280)	+= qla1280.o 
@@ -123,6 +124,7 @@
 obj-$(CONFIG_SCSI_CPQFCTS)	+= cpqfc.o
 obj-$(CONFIG_SCSI_LASI700)	+= 53c700.o lasi700.o
 obj-$(CONFIG_SCSI_NSP32)	+= nsp32.o
+obj-$(CONFIG_SCSI_IPR)		+= ipr.o
 obj-$(CONFIG_SCSI_SATA_SVW)	+= libata.o sata_svw.o
 obj-$(CONFIG_SCSI_ATA_PIIX)	+= libata.o ata_piix.o
 obj-$(CONFIG_SCSI_SATA_PROMISE)	+= libata.o sata_promise.o
@@ -130,6 +132,7 @@
 obj-$(CONFIG_SCSI_SATA_VIA)	+= libata.o sata_via.o
 obj-$(CONFIG_SCSI_SATA_VITESSE)	+= libata.o sata_vsc.o
 obj-$(CONFIG_SCSI_SATA_SIS)	+= libata.o sata_sis.o
+obj-$(CONFIG_SCSI_SATA_SX4)	+= libata.o sata_sx4.o
 
 obj-$(CONFIG_ARM)		+= arm/