---

yaml
---
r: 72351
b: refs/heads/master
c: ea58065
h: refs/heads/master
i:
  72349: 094e83f
  72347: fbf2201
  72343: 0eeebb5
  72335: cad1161
  72319: bf83aaa
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1212663fba7c5e003e05d24f043d5ed57eb18b24
+refs/heads/master: ea5806559f92a3e7439bc7a4f2c0d04692e68931

trunk/Documentation/scsi/sym53c8xx_2.txt

@@ -449,14 +449,25 @@ options as above.
         cmd_per_lun=#tags (#tags > 1) tagged command queuing enabled
   #tags will be truncated to the max queued commands configuration parameter.
 
-10.2.2 Burst max
+10.2.2  Detailed control of tagged commands
+  This option allows you to specify a command queue depth for each device 
+  that supports tagged command queueing.
+  Example:
+      tag_ctrl=10/t2t3q16-t5q24/t1u2q32
+  will set devices queue depth as follow:
+      - controller #0 target #2 and target #3                  -> 16 commands,
+      - controller #0 target #5                                -> 24 commands,
+      - controller #1 target #1 logical unit #2                -> 32 commands,
+      - all other logical units (all targets, all controllers) -> 10 commands.
+
+10.2.3 Burst max
         burst=0    burst disabled
         burst=255  get burst length from initial IO register settings.
         burst=#x   burst enabled (1<<#x burst transfers max)
   #x is an integer value which is log base 2 of the burst transfers max.
   By default the driver uses the maximum value supported by the chip.
 
-10.2.3 LED support
+10.2.4 LED support
         led=1      enable  LED support
         led=0      disable LED support
   Do not enable LED support if your scsi board does not use SDMS BIOS.
@@ -549,9 +560,9 @@ Previously, the sym2 driver accepted arguments of the form
 	sym53c8xx=tags:4,sync:10,debug:0x200
 
 As a result of the new module parameters, this is no longer available.
-Most of the options have remained the same, but tags has become
-cmd_per_lun to reflect its different purposes.  The sample above would
-be specified as:
+Most of the options have remained the same, but tags has split into
+cmd_per_lun and tag_ctrl for its two different purposes.  The sample above
+would be specified as:
 	modprobe sym53c8xx cmd_per_lun=4 sync=10 debug=0x200
 
 or on the kernel boot line as:

trunk/Documentation/watchdog/src/watchdog-simple.c

@@ -3,25 +3,15 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-int main(void)
-{
+int main(int argc, const char *argv[]) {
 	int fd = open("/dev/watchdog", O_WRONLY);
-	int ret = 0;
 	if (fd == -1) {
 		perror("watchdog");
-		exit(EXIT_FAILURE);
+		exit(1);
 	}
 	while (1) {
-		ret = write(fd, "\0", 1);
-		if (ret != 1) {
-			ret = -1;
-			break;
-		}
-		ret = fsync(fd);
-		if (ret)
-			break;
+		write(fd, "\0", 1);
+		fsync(fd);
 		sleep(10);
 	}
-	close(fd);
-	return ret;
 }

trunk/MAINTAINERS

@@ -325,12 +325,6 @@ M:	Juergen Fischer <fischer@norbit.de>
 L:	linux-scsi@vger.kernel.org
 S:	Maintained
 
-AIC7XXX / AIC79XX SCSI DRIVER
-P:	Hannes Reinecke
-M:	hare@suse.de
-L:	linux-scsi@vger.kernel.org
-S:	Maintained
-
 ALCATEL SPEEDTOUCH USB DRIVER
 P:	Duncan Sands
 M:	duncan.sands@free.fr

trunk/arch/arm/mach-pxa/pxa300.c

@@ -23,10 +23,8 @@ static struct pxa3xx_mfp_addr_map pxa300_mfp_addr_map[] __initdata = {
 
 	MFP_ADDR_X(GPIO0,   GPIO2,   0x00b4),
 	MFP_ADDR_X(GPIO3,   GPIO26,  0x027c),
-	MFP_ADDR_X(GPIO27,  GPIO98,  0x0400),
-	MFP_ADDR_X(GPIO99,  GPIO127, 0x0600),
-	MFP_ADDR_X(GPIO0_2, GPIO1_2, 0x0674),
-	MFP_ADDR_X(GPIO2_2, GPIO6_2, 0x02dc),
+	MFP_ADDR_X(GPIO27,  GPIO127, 0x0400),
+	MFP_ADDR_X(GPIO0_2, GPIO6_2, 0x02ec),
 
 	MFP_ADDR(nBE0, 0x0204),
 	MFP_ADDR(nBE1, 0x0208),

trunk/arch/arm/vfp/vfpdouble.c

@@ -1132,7 +1132,7 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr)
 	unsigned int vecitr, veclen, vecstride;
 	struct op *fop;
 
-	vecstride = (1 + ((fpscr & FPSCR_STRIDE_MASK) == FPSCR_STRIDE_MASK));
+	vecstride = (1 + ((fpscr & FPSCR_STRIDE_MASK) == FPSCR_STRIDE_MASK)) * 2;
 
 	fop = (op == FOP_EXT) ? &fops_ext[FEXT_TO_IDX(inst)] : &fops[FOP_TO_IDX(op)];
 
@@ -1184,10 +1184,10 @@ u32 vfp_double_cpdo(u32 inst, u32 fpscr)
 		 * CHECK: It appears to be undefined whether we stop when
 		 * we encounter an exception.  We continue.
 		 */
-		dest = FREG_BANK(dest) + ((FREG_IDX(dest) + vecstride) & 3);
-		dn = FREG_BANK(dn) + ((FREG_IDX(dn) + vecstride) & 3);
+		dest = FREG_BANK(dest) + ((FREG_IDX(dest) + vecstride) & 6);
+		dn = FREG_BANK(dn) + ((FREG_IDX(dn) + vecstride) & 6);
 		if (FREG_BANK(dm) != 0)
-			dm = FREG_BANK(dm) + ((FREG_IDX(dm) + vecstride) & 3);
+			dm = FREG_BANK(dm) + ((FREG_IDX(dm) + vecstride) & 6);
 	}
 	return exceptions;
 

trunk/arch/arm/vfp/vfpmodule.c

@@ -229,7 +229,7 @@ void VFP9_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
 	/*
 	 * Enable access to the VFP so we can handle the bounce.
 	 */
-	fmxr(FPEXC, fpexc & ~(FPEXC_EX|FPEXC_FPV2|FPEXC_INV|FPEXC_UFC|FPEXC_OFC|FPEXC_IOC));
+	fmxr(FPEXC, fpexc & ~(FPEXC_EX|FPEXC_INV|FPEXC_UFC|FPEXC_IOC));
 
 	orig_fpscr = fpscr = fmrx(FPSCR);
 

trunk/arch/i386/Kconfig

@@ -1270,6 +1270,8 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/i386/Kconfig.debug"
 
 source "security/Kconfig"

trunk/arch/sparc64/Kconfig

@@ -460,6 +460,8 @@ source "drivers/Kconfig"
 
 source "drivers/sbus/char/Kconfig"
 
+source "drivers/fc4/Kconfig"
+
 source "fs/Kconfig"
 
 source "kernel/Kconfig.instrumentation"

trunk/arch/x86_64/Kconfig

@@ -833,6 +833,8 @@ source "drivers/firmware/Kconfig"
 
 source fs/Kconfig
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/x86_64/Kconfig.debug"
 
 source "security/Kconfig"

trunk/drivers/Makefile

@@ -34,6 +34,7 @@ obj-$(CONFIG_NUBUS)		+= nubus/
 obj-$(CONFIG_ATM)		+= atm/
 obj-y				+= macintosh/
 obj-$(CONFIG_IDE)		+= ide/
+obj-$(CONFIG_FC4)		+= fc4/
 obj-$(CONFIG_SCSI)		+= scsi/
 obj-$(CONFIG_ATA)		+= ata/
 obj-$(CONFIG_FUSION)		+= message/

trunk/drivers/fc4/Kconfig

@@ -0,0 +1,81 @@
+#
+# FC4 device configuration
+#
+
+menu "Fibre Channel support"
+
+config FC4
+	tristate "Fibre Channel and FC4 SCSI support"
+	---help---
+	  Fibre Channel is a high speed serial protocol mainly used to
+	  connect large storage devices to the computer; it is compatible with
+	  and intended to replace SCSI.
+
+	  This is an experimental support for storage arrays connected to your
+	  computer using optical fibre cables and the "X3.269-199X Fibre
+	  Channel Protocol for SCSI" specification. If you want to use this,
+	  you need to say Y here and to "SCSI support" as well as to the
+	  drivers for the storage array itself and for the interface adapter
+	  such as SOC or SOC+. This subsystem could even serve for IP
+	  networking, with some code extensions.
+
+	  If unsure, say N.
+
+comment "FC4 drivers"
+	depends on FC4
+
+config FC4_SOC
+	tristate "Sun SOC/Sbus"
+	depends on FC4!=n && SPARC
+	help
+	  Serial Optical Channel is an interface card with one or two Fibre
+	  Optic ports, each of which can be connected to a disk array. Note
+	  that if you have older firmware in the card, you'll need the
+	  microcode from the Solaris driver to make it work.
+
+	  To compile this support as a module, choose M here: the module will
+	  be called soc.
+
+config FC4_SOCAL
+	tristate "Sun SOC+ (aka SOCAL)"
+	depends on FC4!=n && SPARC
+	---help---
+	  Serial Optical Channel Plus is an interface card with up to two
+	  Fibre Optic ports. This card supports FC Arbitrated Loop (usually
+	  A5000 or internal FC disks in E[3-6]000 machines through the
+	  Interface Board). You'll probably need the microcode from the
+	  Solaris driver to make it work.
+
+	  To compile this support as a module, choose M here: the module will
+	  be called socal.
+
+comment "FC4 targets"
+	depends on FC4
+
+config SCSI_PLUTO
+	tristate "SparcSTORAGE Array 100 and 200 series"
+	depends on FC4!=n && SCSI
+	help
+	  If you never bought a disk array made by Sun, go with N.
+
+	  To compile this support as a module, choose M here: the module will
+	  be called pluto.
+
+config SCSI_FCAL
+	tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC
+	depends on FC4!=n && SCSI
+	help
+	  This driver drives FC-AL disks connected through a Fibre Channel
+	  card using the drivers/fc4 layer (currently only SOCAL). The most
+	  common is either A5000 array or internal disks in E[3-6]000
+	  machines.
+
+	  To compile this support as a module, choose M here: the module will
+	  be called fcal.
+
+config SCSI_FCAL
+	prompt "Generic FC-AL disk driver"
+	depends on FC4!=n && SCSI && !SPARC
+
+endmenu
+

trunk/drivers/fc4/Makefile

@@ -0,0 +1,9 @@
+#
+# Makefile for the Linux Fibre Channel device drivers.
+#
+
+fc4-objs := fc.o fc_syms.o
+
+obj-$(CONFIG_FC4) += fc4.o
+obj-$(CONFIG_FC4_SOC) += soc.o
+obj-$(CONFIG_FC4_SOCAL) += socal.o

trunk/drivers/fc4/fc-al.h

@@ -0,0 +1,27 @@
+/* fc-al.h: Definitions for Fibre Channel Arbitrated Loop topology.
+ *
+ * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
+ *
+ * Sources:
+ *	Fibre Channel Arbitrated Loop (FC-AL), ANSI, Rev. 4.5, 1995
+ */
+
+#ifndef __FC_AL_H
+#define __FC_AL_H
+
+/* Loop initialization payloads */
+#define	FC_AL_LISM	0x11010000	/* Select Master, 12B payload */
+#define FC_AL_LIFA	0x11020000	/* Fabric Assign AL_PA bitmap, 20B payload */
+#define FC_AL_LIPA	0x11030000	/* Previously Acquired AL_PA bitmap, 20B payload */
+#define FC_AL_LIHA	0x11040000	/* Hard Assigned AL_PA bitmap, 20B payload */
+#define FC_AL_LISA	0x11050000	/* Soft Assigned AL_PA bitmap, 20B payload */
+#define FC_AL_LIRP	0x11060000	/* Report AL_PA position map, 132B payload */
+#define FC_AL_LILP	0x11070000	/* Loop AL_PA position map, 132B payload */
+
+typedef struct {
+	u32	magic;
+	u8	len;
+	u8	alpa[127];
+} fc_al_posmap;
+
+#endif /* !(__FC_H) */