PERFORCE change 138555 for review

Sam Leffler sam at FreeBSD.org
Tue Mar 25 21:50:36 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=138555

Change 138555 by sam at sam_ebb on 2008/03/25 21:49:37

	IFC @ 138554

Affected files ...

.. //depot/projects/vap/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/vap/sys/dev/aac/aac.c#10 integrate
.. //depot/projects/vap/sys/dev/aac/aac_disk.c#5 integrate
.. //depot/projects/vap/sys/dev/aac/aacreg.h#7 integrate
.. //depot/projects/vap/sys/dev/aac/aacvar.h#7 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo.h#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo_pci.c#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_malohal.c#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_malohal.h#2 integrate
.. //depot/projects/vap/sys/dev/malo/if_maloioctl.h#2 integrate
.. //depot/projects/vap/sys/modules/malo/Makefile#2 integrate
.. //depot/projects/vap/sys/sys/cdefs.h#9 integrate

Differences ...

==== //depot/projects/vap/sys/dev/aac/aac.c#10 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.133 2008/03/25 18:34:04 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.134 2008/03/25 21:39:06 emaste Exp $");
 
 /*
  * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
@@ -377,7 +377,9 @@
 	struct aac_mntinfo *mi;
 
 	mi = (struct aac_mntinfo *)&fib->data[0];
-	mi->Command = VM_NameServe;
+	/* use 64-bit LBA if enabled */
+	mi->Command = (sc->flags & AAC_FLAGS_LBA_64BIT) ?
+	    VM_NameServe64 : VM_NameServe;
 	mi->MntType = FT_FILESYS;
 	mi->MntCount = cid;
 
@@ -1802,6 +1804,11 @@
 		sc->flags |= AAC_FLAGS_RAW_IO;
 		device_printf(sc->aac_dev, "Enable Raw I/O\n");
 	}
+	if ((sc->flags & AAC_FLAGS_RAW_IO) &&
+	    (sc->flags & AAC_FLAGS_ARRAY_64BIT)) {
+		sc->flags |= AAC_FLAGS_LBA_64BIT;
+		device_printf(sc->aac_dev, "Enable 64-bit array\n");
+	}
 
 	return (0);
 }

==== //depot/projects/vap/sys/dev/aac/aac_disk.c#5 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.44 2008/03/24 19:23:33 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.45 2008/03/25 21:39:06 emaste Exp $");
 
 #include "opt_aac.h"
 
@@ -343,6 +343,9 @@
 	 * disk!
 	 */
 	sc->ad_size = sc->ad_container->co_mntobj.Capacity;
+	if (sc->ad_controller->flags & AAC_FLAGS_LBA_64BIT)
+		sc->ad_size += (u_int64_t)
+			sc->ad_container->co_mntobj.CapacityHigh << 32;
 	if (sc->ad_size >= (2 * 1024 * 1024)) {		/* 2GB */
 		sc->ad_heads = 255;
 		sc->ad_sectors = 63;
@@ -355,9 +358,9 @@
 	}
 	sc->ad_cylinders = (sc->ad_size / (sc->ad_heads * sc->ad_sectors));
 
-	device_printf(dev, "%uMB (%u sectors)\n",
-		      sc->ad_size / ((1024 * 1024) / AAC_BLOCK_SIZE),
-		      sc->ad_size);
+	device_printf(dev, "%juMB (%ju sectors)\n",
+		      (intmax_t)sc->ad_size / ((1024 * 1024) / AAC_BLOCK_SIZE),
+		      (intmax_t)sc->ad_size);
 
 	/* attach a generic disk device to ourselves */
 	sc->unit = device_get_unit(dev);

==== //depot/projects/vap/sys/dev/aac/aacreg.h#7 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/aac/aacreg.h,v 1.24 2007/12/07 18:05:41 emaste Exp $
+ *	$FreeBSD: src/sys/dev/aac/aacreg.h,v 1.25 2008/03/25 21:39:06 emaste Exp $
  */
 
 /*
@@ -1140,6 +1140,7 @@
 		u_int32_t	pad[8];
 	} ObjExtension;
 	u_int32_t			AlterEgoId;
+	u_int32_t			CapacityHigh;
 } __packed;
 
 struct aac_mntinfo {

==== //depot/projects/vap/sys/dev/aac/aacvar.h#7 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/aac/aacvar.h,v 1.50 2008/03/24 19:23:33 emaste Exp $
+ *	$FreeBSD: src/sys/dev/aac/aacvar.h,v 1.51 2008/03/25 21:39:06 emaste Exp $
  */
 
 #include <sys/bio.h>
@@ -133,7 +133,7 @@
 	int				ad_cylinders;
 	int				ad_heads;
 	int				ad_sectors;
-	u_int32_t			ad_size;
+	u_int64_t			ad_size;
 	int				unit;
 };
 
@@ -392,6 +392,7 @@
 #define AAC_FLAGS_NEW_COMM	(1 << 11)	/* New comm. interface supported */
 #define AAC_FLAGS_RAW_IO	(1 << 12)	/* Raw I/O interface */
 #define AAC_FLAGS_ARRAY_64BIT	(1 << 13)	/* 64-bit array size */
+#define	AAC_FLAGS_LBA_64BIT	(1 << 14)	/* 64-bit LBA support */
 
 	u_int32_t		supported_options;
 	u_int32_t		scsi_method_id;

==== //depot/projects/vap/sys/dev/malo/if_malo.c#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_malo.h#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_malo_pci.c#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_malohal.c#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_malohal.h#2 (text+ko) ====


==== //depot/projects/vap/sys/dev/malo/if_maloioctl.h#2 (text+ko) ====


==== //depot/projects/vap/sys/modules/malo/Makefile#2 (text+ko) ====


==== //depot/projects/vap/sys/sys/cdefs.h#9 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/cdefs.h,v 1.94 2007/12/09 21:00:36 alc Exp $
+ * $FreeBSD: src/sys/sys/cdefs.h,v 1.95 2008/03/25 21:30:01 sam Exp $
  */
 
 #ifndef	_SYS_CDEFS_H_
@@ -405,7 +405,7 @@
  * Embed the rcs id of a source file in the resulting library.  Note that in
  * more recent ELF binutils, we use .ident allowing the ID to be stripped.
  * Usage:
- *	__FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.94 2007/12/09 21:00:36 alc Exp $");
+ *	__FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.95 2008/03/25 21:30:01 sam Exp $");
  */
 #ifndef	__FBSDID
 #if !defined(lint) && !defined(STRIP_FBSDID)


More information about the p4-projects mailing list