Merge branch 'master' into openslxopenslx

1 files changed, 37 insertions, 53 deletions

diff --git a/src/arch/x86/image/com32.c b/src/arch/x86/image/com32.c
index 6f0e66041..2b31fb2e5 100644
--- a/src/arch/x86/image/com32.c
+++ b/src/arch/x86/image/com32.c
@@ -39,7 +39,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/image.h>
 #include <ipxe/segment.h>
 #include <ipxe/init.h>
-#include <ipxe/io.h>
+#include <ipxe/memmap.h>
 #include <ipxe/console.h>
 
 /**
@@ -49,8 +49,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * @ret rc		Return status code
  */
 static int com32_exec_loop ( struct image *image ) {
-	struct memory_map memmap;
-	unsigned int i;
+	struct memmap_region region;
 	int state;
 	uint32_t avail_mem_top;
 
@@ -59,21 +58,12 @@ static int com32_exec_loop ( struct image *image ) {
 	switch ( state ) {
 	case 0: /* First time through; invoke COM32 program */
 
-		/* Get memory map */
-		get_memmap ( &memmap );
-
 		/* Find end of block covering COM32 image loading area */
-		for ( i = 0, avail_mem_top = 0 ; i < memmap.count ; i++ ) {
-			if ( (memmap.regions[i].start <= COM32_START_PHYS) &&
-			     (memmap.regions[i].end > COM32_START_PHYS + image->len) ) {
-				avail_mem_top = memmap.regions[i].end;
-				break;
-			}
-		}
-
-		DBGC ( image, "COM32 %p: available memory top = 0x%x\n",
-		       image, avail_mem_top );
-
+		memmap_describe ( COM32_START_PHYS, 1, &region );
+		assert ( memmap_is_usable ( &region ) );
+		avail_mem_top = ( COM32_START_PHYS + memmap_size ( &region ) );
+		DBGC ( image, "COM32 %s: available memory top = 0x%x\n",
+		       image->name, avail_mem_top );
 		assert ( avail_mem_top != 0 );
 
 		/* Hook COMBOOT API interrupts */
@@ -114,32 +104,32 @@ static int com32_exec_loop ( struct image *image ) {
 			/* Restore registers */
 			"popal\n\t" )
 			:
-			: "r" ( avail_mem_top ),
-			  "r" ( virt_to_phys ( com32_cfarcall_wrapper ) ),
-			  "r" ( virt_to_phys ( com32_farcall_wrapper ) ),
-			  "r" ( get_fbms() * 1024 - ( COM32_BOUNCE_SEG << 4 ) ),
+			: "R" ( avail_mem_top ),
+			  "R" ( virt_to_phys ( com32_cfarcall_wrapper ) ),
+			  "R" ( virt_to_phys ( com32_farcall_wrapper ) ),
+			  "R" ( get_fbms() * 1024 - ( COM32_BOUNCE_SEG << 4 ) ),
 			  "i" ( COM32_BOUNCE_SEG << 4 ),
-			  "r" ( virt_to_phys ( com32_intcall_wrapper ) ),
-			  "r" ( virt_to_phys ( image->cmdline ?
+			  "R" ( virt_to_phys ( com32_intcall_wrapper ) ),
+			  "R" ( virt_to_phys ( image->cmdline ?
 					       image->cmdline : "" ) ),
 			  "i" ( COM32_START_PHYS )
 			: "memory" );
-		DBGC ( image, "COM32 %p: returned\n", image );
+		DBGC ( image, "COM32 %s: returned\n", image->name );
 		break;
 
 	case COMBOOT_EXIT:
-		DBGC ( image, "COM32 %p: exited\n", image );
+		DBGC ( image, "COM32 %s: exited\n", image->name );
 		break;
 
 	case COMBOOT_EXIT_RUN_KERNEL:
 		assert ( image->replacement );
-		DBGC ( image, "COM32 %p: exited to run kernel %s\n",
-		       image, image->replacement->name );
+		DBGC ( image, "COM32 %s: exited to run kernel %s\n",
+		       image->name, image->replacement->name );
 		break;
 
 	case COMBOOT_EXIT_COMMAND:
-		DBGC ( image, "COM32 %p: exited after executing command\n",
-		       image );
+		DBGC ( image, "COM32 %s: exited after executing command\n",
+		       image->name );
 		break;
 
 	default:
@@ -162,17 +152,15 @@ static int com32_exec_loop ( struct image *image ) {
 static int com32_identify ( struct image *image ) {
 	const char *ext;
 	static const uint8_t magic[] = { 0xB8, 0xFF, 0x4C, 0xCD, 0x21 };
-	uint8_t buf[5];
 
-	if ( image->len >= 5 ) {
+	if ( image->len >= sizeof ( magic ) ) {
 		/* Check for magic number
 		 * mov eax,21cd4cffh
 		 * B8 FF 4C CD 21
 		 */
-		copy_from_user ( buf, image->data, 0, sizeof(buf) );
-		if ( ! memcmp ( buf, magic, sizeof(buf) ) ) {
-			DBGC ( image, "COM32 %p: found magic number\n",
-			       image );
+		if ( memcmp ( image->data, magic, sizeof ( magic) ) == 0 ) {
+			DBGC ( image, "COM32 %s: found magic number\n",
+			       image->name );
 			return 0;
 		}
 	}
@@ -182,16 +170,16 @@ static int com32_identify ( struct image *image ) {
 	ext = strrchr( image->name, '.' );
 
 	if ( ! ext ) {
-		DBGC ( image, "COM32 %p: no extension\n",
-		       image );
+		DBGC ( image, "COM32 %s: no extension\n",
+		       image->name );
 		return -ENOEXEC;
 	}
 
 	++ext;
 
 	if ( strcasecmp( ext, "c32" ) ) {
-		DBGC ( image, "COM32 %p: unrecognized extension %s\n",
-		       image, ext );
+		DBGC ( image, "COM32 %s: unrecognized extension %s\n",
+		       image->name, ext );
 		return -ENOEXEC;
 	}
 
@@ -206,20 +194,20 @@ static int com32_identify ( struct image *image ) {
  */
 static int com32_load_image ( struct image *image ) {
 	size_t filesz, memsz;
-	userptr_t buffer;
+	void *buffer;
 	int rc;
 
 	filesz = image->len;
 	memsz = filesz;
-	buffer = phys_to_user ( COM32_START_PHYS );
+	buffer = phys_to_virt ( COM32_START_PHYS );
 	if ( ( rc = prep_segment ( buffer, filesz, memsz ) ) != 0 ) {
-		DBGC ( image, "COM32 %p: could not prepare segment: %s\n",
-		       image, strerror ( rc ) );
+		DBGC ( image, "COM32 %s: could not prepare segment: %s\n",
+		       image->name, strerror ( rc ) );
 		return rc;
 	}
 
 	/* Copy image to segment */
-	memcpy_user ( buffer, 0, image->data, 0, filesz );
+	memcpy ( buffer, image->data, filesz );
 
 	return 0;
 }
@@ -230,22 +218,20 @@ static int com32_load_image ( struct image *image ) {
  * @ret rc		Return status code
  */
 static int com32_prepare_bounce_buffer ( struct image * image ) {
-	unsigned int seg;
-	userptr_t seg_userptr;
+	void *seg;
 	size_t filesz, memsz;
 	int rc;
 
-	seg = COM32_BOUNCE_SEG;
-	seg_userptr = real_to_user ( seg, 0 );
+	seg = real_to_virt ( COM32_BOUNCE_SEG, 0 );
 
 	/* Ensure the entire 64k segment is free */
 	memsz = 0xFFFF;
 	filesz = 0;
 
 	/* Prepare, verify, and load the real-mode segment */
-	if ( ( rc = prep_segment ( seg_userptr, filesz, memsz ) ) != 0 ) {
-		DBGC ( image, "COM32 %p: could not prepare bounce buffer segment: %s\n",
-		       image, strerror ( rc ) );
+	if ( ( rc = prep_segment ( seg, filesz, memsz ) ) != 0 ) {
+		DBGC ( image, "COM32 %s: could not prepare bounce buffer segment: %s\n",
+		       image->name, strerror ( rc ) );
 		return rc;
 	}
 
@@ -261,8 +247,6 @@ static int com32_prepare_bounce_buffer ( struct image * image ) {
 static int com32_probe ( struct image *image ) {
 	int rc;
 
-	DBGC ( image, "COM32 %p: name '%s'\n", image, image->name );
-
 	/* Check if this is a COMBOOT image */
 	if ( ( rc = com32_identify ( image ) ) != 0 ) {
 		return rc;