Skip to contentSkip to conversation

android: Fix ramdisk loading for bootimage v3+

PATCH In review Roman Stratiienko 4 participants 4 messages May 19, 2024 – Jun 10, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 android: Fix ramdisk loading for bootimage v3+

The boot_ramdisk and vendor_ramdisk must be both concatenated together. Without this change, Android root is missing some of the necessary tools to complete virtual AB OTA.

---
 boot/image-android.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
boot/image-android.c +8 -9
index 04f2a8015e..499eae9bcd 100644
@@ -64,7 +64,6 @@ static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3
 
 	data->kcmdline = hdr->cmdline;
 	data->header_version = hdr->header_version;
-	data->ramdisk_ptr = env_get_ulong("ramdisk_addr_r", 16, 0);
 
 	/*
 	 * The header takes a full page, the remaining components are aligned
@@ -75,6 +74,7 @@ static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3
 	data->kernel_ptr = end;
 	data->kernel_size = hdr->kernel_size;
 	end += ALIGN(hdr->kernel_size, ANDR_GKI_PAGE_SIZE);
+	data->ramdisk_ptr = end;
 	data->ramdisk_size = hdr->ramdisk_size;
 	data->boot_ramdisk_size = hdr->ramdisk_size;
 	end += ALIGN(hdr->ramdisk_size, ANDR_GKI_PAGE_SIZE);
@@ -462,25 +462,24 @@ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img,
 		return -1;
 	}
 	if (img_data.header_version > 2) {
-		ramdisk_ptr = img_data.ramdisk_ptr;
+		ramdisk_ptr = img_data.ramdisk_addr;
 		memcpy((void *)(ramdisk_ptr), (void *)img_data.vendor_ramdisk_ptr,
 		       img_data.vendor_ramdisk_size);
-		memcpy((void *)(ramdisk_ptr + img_data.vendor_ramdisk_size),
-		       (void *)img_data.ramdisk_ptr,
+		ramdisk_ptr += img_data.vendor_ramdisk_size;
+		memcpy((void *)(ramdisk_ptr), (void *)img_data.ramdisk_ptr,
 		       img_data.boot_ramdisk_size);
+		ramdisk_ptr += img_data.boot_ramdisk_size;
 		if (img_data.bootconfig_size) {
 			memcpy((void *)
-			       (ramdisk_ptr + img_data.vendor_ramdisk_size +
-			       img_data.boot_ramdisk_size),
-			       (void *)img_data.bootconfig_addr,
+			       (ramdisk_ptr), (void *)img_data.bootconfig_addr,
 			       img_data.bootconfig_size);
 		}
 	}
 
 	printf("RAM disk load addr 0x%08lx size %u KiB\n",
-	       img_data.ramdisk_ptr, DIV_ROUND_UP(img_data.ramdisk_size, 1024));
+	       img_data.ramdisk_addr, DIV_ROUND_UP(img_data.ramdisk_size, 1024));
 
-	*rd_data = img_data.ramdisk_ptr;
+	*rd_data = img_data.ramdisk_addr;
 
 	*rd_len = img_data.ramdisk_size;
 	return 0;
Signature · 1 line
2.40.1
Reviewed-by on v1 1/1
#1 lore raw

Hi Roman,

Thank you for the patch.

I know you reported this problem quite a while ago [1]. Sorry I did not follow up.

Quoted 5 lines · Roman Stratiienko

The boot_ramdisk and vendor_ramdisk must be both concatenated together. Without this change, Android root is missing some of the necessary tools to complete virtual AB OTA.

[1] https://lore.kernel.org/r/CAGphcdnC124V_D6x06P6apnE+L+PVJSp+88h0FFY449CBgY=Pw@mail.gmail.com

Quoted 59 lines
---
 boot/image-android.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
boot/image-android.c +8 -9
index 04f2a8015e..499eae9bcd 100644
@@ -64,7 +64,6 @@ static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3
 
 	data->kcmdline = hdr->cmdline;
 	data->header_version = hdr->header_version;
-	data->ramdisk_ptr = env_get_ulong("ramdisk_addr_r", 16, 0);
 
 	/*
 	 * The header takes a full page, the remaining components are aligned
@@ -75,6 +74,7 @@ static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3
 	data->kernel_ptr = end;
 	data->kernel_size = hdr->kernel_size;
 	end += ALIGN(hdr->kernel_size, ANDR_GKI_PAGE_SIZE);
+	data->ramdisk_ptr = end;
 	data->ramdisk_size = hdr->ramdisk_size;
 	data->boot_ramdisk_size = hdr->ramdisk_size;
 	end += ALIGN(hdr->ramdisk_size, ANDR_GKI_PAGE_SIZE);
@@ -462,25 +462,24 @@ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img,
 		return -1;
 	}
 	if (img_data.header_version > 2) {
-		ramdisk_ptr = img_data.ramdisk_ptr;
+		ramdisk_ptr = img_data.ramdisk_addr;
 		memcpy((void *)(ramdisk_ptr), (void *)img_data.vendor_ramdisk_ptr,
 		       img_data.vendor_ramdisk_size);
-		memcpy((void *)(ramdisk_ptr + img_data.vendor_ramdisk_size),
-		       (void *)img_data.ramdisk_ptr,
+		ramdisk_ptr += img_data.vendor_ramdisk_size;
+		memcpy((void *)(ramdisk_ptr), (void *)img_data.ramdisk_ptr,
 		       img_data.boot_ramdisk_size);
+		ramdisk_ptr += img_data.boot_ramdisk_size;
 		if (img_data.bootconfig_size) {
 			memcpy((void *)
-			       (ramdisk_ptr + img_data.vendor_ramdisk_size +
-			       img_data.boot_ramdisk_size),
-			       (void *)img_data.bootconfig_addr,
+			       (ramdisk_ptr), (void *)img_data.bootconfig_addr,
 			       img_data.bootconfig_size);
 		}
 	}
 
 	printf("RAM disk load addr 0x%08lx size %u KiB\n",
-	       img_data.ramdisk_ptr, DIV_ROUND_UP(img_data.ramdisk_size, 1024));
+	       img_data.ramdisk_addr, DIV_ROUND_UP(img_data.ramdisk_size, 1024));
 
-	*rd_data = img_data.ramdisk_ptr;
+	*rd_data = img_data.ramdisk_addr;
 
 	*rd_len = img_data.ramdisk_size;
 	return 0;
Signature · 1 line
2.40.1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Roman Stratiienko

Hi Roman,

Quoted 64 lines · Roman Stratiienko

The boot_ramdisk and vendor_ramdisk must be both concatenated together. Without this change, Android root is missing some of the necessary tools to complete virtual AB OTA.

---
 boot/image-android.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
boot/image-android.c +8 -10
index 04f2a8015e..499eae9bcd 100644
@@ -64,7 +64,6 @@ static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3
 
        data->kcmdline = hdr->cmdline;
        data->header_version = hdr->header_version;
-       data->ramdisk_ptr = env_get_ulong("ramdisk_addr_r", 16, 0);
 
        /*
         * The header takes a full page, the remaining components are aligned
@@ -75,6 +74,7 @@ static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3
        data->kernel_ptr = end;
        data->kernel_size = hdr->kernel_size;
        end += ALIGN(hdr->kernel_size, ANDR_GKI_PAGE_SIZE);
+       data->ramdisk_ptr = end;
        data->ramdisk_size = hdr->ramdisk_size;
        data->boot_ramdisk_size = hdr->ramdisk_size;
        end += ALIGN(hdr->ramdisk_size, ANDR_GKI_PAGE_SIZE);
@@ -462,25 +462,24 @@ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img,
                return -1;
        }
        if (img_data.header_version > 2) {
-               ramdisk_ptr = img_data.ramdisk_ptr;
+               ramdisk_ptr = img_data.ramdisk_addr;
                memcpy((void *)(ramdisk_ptr), (void *)img_data.vendor_ramdisk_ptr,
                       img_data.vendor_ramdisk_size);
-               memcpy((void *)(ramdisk_ptr + img_data.vendor_ramdisk_size),
-                      (void *)img_data.ramdisk_ptr,
+               ramdisk_ptr += img_data.vendor_ramdisk_size;
+               memcpy((void *)(ramdisk_ptr), (void *)img_data.ramdisk_ptr,
                       img_data.boot_ramdisk_size);
+               ramdisk_ptr += img_data.boot_ramdisk_size;
                if (img_data.bootconfig_size) {
                        memcpy((void *)
-                              (ramdisk_ptr + img_data.vendor_ramdisk_size +
-                              img_data.boot_ramdisk_size),
-                              (void *)img_data.bootconfig_addr,
+                              (ramdisk_ptr), (void *)img_data.bootconfig_addr,
                               img_data.bootconfig_size);
                }
        }
 
        printf("RAM disk load addr 0x%08lx size %u KiB\n",
-              img_data.ramdisk_ptr, DIV_ROUND_UP(img_data.ramdisk_size, 1024));
+              img_data.ramdisk_addr, DIV_ROUND_UP(img_data.ramdisk_size, 1024));
 
-       *rd_data = img_data.ramdisk_ptr;
+       *rd_data = img_data.ramdisk_addr;
 
        *rd_len = img_data.ramdisk_size;
        return 0;
--
Quoted 2 lines

2.40.1

Signature · 7 lines
Best regards - Atentamente - Meilleures salutations

Igor Opaniuk

mailto: [email protected]
skype: igor.opanyuk
https://www.linkedin.com/in/iopaniuk
#3 lore raw
In reply to Roman Stratiienko
Quoted 5 lines · Roman Stratiienko

The boot_ramdisk and vendor_ramdisk must be both concatenated together. Without this change, Android root is missing some of the necessary tools to complete virtual AB OTA.

Applied to u-boot/next, thanks!

Signature · 1 line
Tom