1 files changed, 29 insertions, 46 deletions

diff --git a/src/arch/x86/image/sdi.c b/src/arch/x86/image/sdi.c
index fa2d0b73f..c0cded239 100644
--- a/src/arch/x86/image/sdi.c
+++ b/src/arch/x86/image/sdi.c
@@ -45,63 +45,36 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 FEATURE ( FEATURE_IMAGE, "SDI", DHCP_EB_FEATURE_SDI, 1 );
 
 /**
- * Parse SDI image header
- *
- * @v image		SDI file
- * @v sdi		SDI header to fill in
- * @ret rc		Return status code
- */
-static int sdi_parse_header ( struct image *image, struct sdi_header *sdi ) {
-
-	/* Sanity check */
-	if ( image->len < sizeof ( *sdi ) ) {
-		DBGC ( image, "SDI %p too short for SDI header\n", image );
-		return -ENOEXEC;
-	}
-
-	/* Read in header */
-	copy_from_user ( sdi, image->data, 0, sizeof ( *sdi ) );
-
-	/* Check signature */
-	if ( sdi->magic != SDI_MAGIC ) {
-		DBGC ( image, "SDI %p is not an SDI image\n", image );
-		return -ENOEXEC;
-	}
-
-	return 0;
-}
-
-/**
  * Execute SDI image
  *
  * @v image		SDI file
  * @ret rc		Return status code
  */
 static int sdi_exec ( struct image *image ) {
-	struct sdi_header sdi;
+	const struct sdi_header *sdi;
 	uint32_t sdiptr;
-	int rc;
 
-	/* Parse image header */
-	if ( ( rc = sdi_parse_header ( image, &sdi ) ) != 0 )
-		return rc;
+	/* Sanity check */
+	assert ( image->len >= sizeof ( *sdi ) );
+	sdi = image->data;
 
 	/* Check that image is bootable */
-	if ( sdi.boot_size == 0 ) {
-		DBGC ( image, "SDI %p is not bootable\n", image );
+	if ( sdi->boot_size == 0 ) {
+		DBGC ( image, "SDI %s is not bootable\n", image->name );
 		return -ENOTTY;
 	}
-	DBGC ( image, "SDI %p image at %08lx+%08zx\n",
-	       image, user_to_phys ( image->data, 0 ), image->len );
-	DBGC ( image, "SDI %p boot code at %08lx+%llx\n", image,
-	       user_to_phys ( image->data, sdi.boot_offset ), sdi.boot_size );
+	DBGC ( image, "SDI %s image at %08lx+%08zx\n",
+	       image->name, virt_to_phys ( image->data ), image->len );
+	DBGC ( image, "SDI %s boot code at %08llx+%llx\n", image->name,
+	       ( virt_to_phys ( image->data ) + sdi->boot_offset ),
+	       sdi->boot_size );
 
 	/* Copy boot code */
-	memcpy_user ( real_to_user ( SDI_BOOT_SEG, SDI_BOOT_OFF ), 0,
-		      image->data, sdi.boot_offset, sdi.boot_size );
+	memcpy ( real_to_virt ( SDI_BOOT_SEG, SDI_BOOT_OFF ),
+		 ( image->data + sdi->boot_offset ), sdi->boot_size );
 
 	/* Jump to boot code */
-	sdiptr = ( user_to_phys ( image->data, 0 ) | SDI_WTF );
+	sdiptr = ( virt_to_phys ( image->data ) | SDI_WTF );
 	__asm__ __volatile__ ( REAL_CODE ( "ljmp %0, %1\n\t" )
 			       : : "i" ( SDI_BOOT_SEG ),
 				   "i" ( SDI_BOOT_OFF ),
@@ -122,12 +95,22 @@ static int sdi_exec ( struct image *image ) {
  * @ret rc		Return status code
  */
 static int sdi_probe ( struct image *image ) {
-	struct sdi_header sdi;
-	int rc;
+	const struct sdi_header *sdi;
 
-	/* Parse image */
-	if ( ( rc = sdi_parse_header ( image, &sdi ) ) != 0 )
-		return rc;
+	/* Sanity check */
+	if ( image->len < sizeof ( *sdi ) ) {
+		DBGC ( image, "SDI %s too short for SDI header\n",
+		       image->name );
+		return -ENOEXEC;
+	}
+	sdi = image->data;
+
+	/* Check signature */
+	if ( sdi->magic != SDI_MAGIC ) {
+		DBGC ( image, "SDI %s is not an SDI image\n",
+		       image->name );
+		return -ENOEXEC;
+	}
 
 	return 0;
 }