socsvn commit: r289494 - soc2013/def/crashdump-head/sys/arm/arm

[def at FreeBSD.org]

Author: def
Date: Sun Aug  9 23:17:46 2015
New Revision: 289494
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289494

Log:
  Add EKCD support on ARM.

Modified:
  soc2013/def/crashdump-head/sys/arm/arm/minidump_machdep.c

Modified: soc2013/def/crashdump-head/sys/arm/arm/minidump_machdep.c
==============================================================================
--- soc2013/def/crashdump-head/sys/arm/arm/minidump_machdep.c	Sun Aug  9 23:11:04 2015	(r289493)
+++ soc2013/def/crashdump-head/sys/arm/arm/minidump_machdep.c	Sun Aug  9 23:17:46 2015	(r289494)
@@ -295,13 +295,15 @@
 	dumpsize += PAGE_SIZE;
 
 	/* Determine dump offset on device. */
-	if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
+	if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2 +
+	    kerneldumpkey_size(di->kdk)) {
 		error = ENOSPC;
 		goto fail;
 	}
 
 	dumplo = di->mediaoffset + di->mediasize - dumpsize;
 	dumplo -= sizeof(kdh) * 2;
+	dumplo -= kerneldumpkey_size(di->kdk);
 	progress = dumpsize;
 
 	/* Initialize mdhdr */
@@ -314,17 +316,23 @@
 	mdhdr.kernbase = KERNBASE;
 
 	mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize,
-	    di->blocksize);
+	    kerneldumpkey_size(di->kdk), di->blocksize);
 
 	printf("Physical memory: %u MB\n", ptoa((uintmax_t)physmem) / 1048576);
 	printf("Dumping %llu MB:", (long long)dumpsize >> 20);
 
 	/* Dump leader */
-	error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
+	error = dump_write_header(di, &kdh, 0, dumplo);
 	if (error)
 		goto fail;
 	dumplo += sizeof(kdh);
 
+	/* Dump key */
+	error = dump_write_key(di, di->kdk, 0, dumplo);
+	if (error)
+		goto fail;
+	dumplo += kerneldumpkey_size(di->kdk);
+
 	/* Dump my header */
 	bzero(&fakept, sizeof(fakept));
 	bcopy(&mdhdr, &fakept, sizeof(mdhdr));
@@ -455,7 +463,7 @@
 	}
 
 	/* Dump trailer */
-	error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
+	error = dump_write_header(di, &kdh, 0, dumplo);
 	if (error)
 		goto fail;
 	dumplo += sizeof(kdh);