SME : Please review and merge : hw/arm/aspeed: Added eMMC boot support for AST2600 image.

SME : Please review and merge : hw/arm/aspeed: Added eMMC boot support for AST2600 image.

[Shitalkumar Gandhi]

[-- Attachment #1.1: Type: text/plain, Size: 544 bytes --]



Hi SME's,

Please see the attached patch, which has been added to the boot eMMC image for AST2600 machine on QEMU.


qemu should be run as follows:

./qemu-system-arm -m 1G -M ast2600-evb -nographic -drive
file=mmc-evb-ast2600.img,format=raw,if=sd,index=2

Tested: Booted AST2600 eMMC image on QEMU.

Suggested-by: Troy Lee leetroy@gmail.com
Reviewed-by: Troy Lee leetroy@gmail.com
Reviewed-by: Andrew Jeffery andrew@aj.id.au
Signed-off-by: Shitalkumar Gandhi shitalkumar.gandhi@seagate.com



BR,
Shitalkumar Gandhi

[-- Attachment #1.2: Type: text/html, Size: 2713 bytes --]

[-- Attachment #2: 0001-hw-arm-aspeed-Added-eMMC-boot-support-for-AST2600-im.patch --]
[-- Type: application/octet-stream, Size: 1242 bytes --]

From 7a4856d07bad1a957b7f6d0836fbb2da6a8be5b4 Mon Sep 17 00:00:00 2001
From: Shitalkumar Gandhi <shitalkumar.gandhi@seagate.com>
Date: Fri, 24 Sep 2021 20:46:22 +0530
Subject: [PATCH] hw/arm/aspeed: Added eMMC boot support for AST2600 image.

This patch has been added to boot eMMC image for AST2600 machine on
QEMU.

Run quemu as follows:

./qemu-system-arm -m 1G -M ast2600-evb -nographic -drive
file=mmc-evb-ast2600.img,format=raw,if=sd,index=2

Tested: Booted AST2600 eMMC image on QEMU.

Suggested-by: Troy Lee <leetroy@gmail.com>
Reviewed-by: Troy Lee <leetroy@gmail.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Shitalkumar Gandhi <shitalkumar.gandhi@seagate.com>
---
 hw/arm/aspeed.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index ba5f1dc5af..6a890adb83 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -148,7 +148,7 @@ struct AspeedMachineState {
         SCU_AST2400_HW_STRAP_BOOT_MODE(AST2400_SPI_BOOT))
 
 /* AST2600 evb hardware value */
-#define AST2600_EVB_HW_STRAP1 0x000000C0
+#define AST2600_EVB_HW_STRAP1 (0x000000C0 | AST26500_HW_STRAP_BOOT_SRC_EMMC)
 #define AST2600_EVB_HW_STRAP2 0x00000003
 
 /* Tacoma hardware value */
-- 
2.30.2

Re: SME : Please review and merge : hw/arm/aspeed: Added eMMC boot support for AST2600 image.

[Peter Maydell]

On Tue, 9 Nov 2021 at 18:04, Shitalkumar Gandhi <shital_909@yahoo.com> wrote:
>
> Hi SME's,
>
> Please see the attached patch, which has been added to the boot eMMC image for AST2600 machine on QEMU.
>
> qemu should be run as follows:
>
> ./qemu-system-arm -m 1G -M ast2600-evb -nographic -drive
> file=mmc-evb-ast2600.img,format=raw,if=sd,index=2
>
> Tested: Booted AST2600 eMMC image on QEMU.
>
> Suggested-by: Troy Lee leetroy@gmail.com
> Reviewed-by: Troy Lee leetroy@gmail.com
> Reviewed-by: Andrew Jeffery andrew@aj.id.au
> Signed-off-by: Shitalkumar Gandhi shitalkumar.gandhi@seagate.com

Hi; thanks for this patch.

Fishing the patch out of the attachment, the diff is:

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index ba5f1dc5af..6a890adb83 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -148,7 +148,7 @@ struct AspeedMachineState {
         SCU_AST2400_HW_STRAP_BOOT_MODE(AST2400_SPI_BOOT))

 /* AST2600 evb hardware value */
-#define AST2600_EVB_HW_STRAP1 0x000000C0
+#define AST2600_EVB_HW_STRAP1 (0x000000C0 | AST26500_HW_STRAP_BOOT_SRC_EMMC)
 #define AST2600_EVB_HW_STRAP2 0x00000003

 /* Tacoma hardware value */
-- 

I've CC'd the aspeed maintainers, but since this has Andrew's R-by tag already
I'll put this into my set of patches to apply via target-arm.next for 7.0
unless somebody objects.

thanks
-- PMM

Re: SME : Please review and merge : hw/arm/aspeed: Added eMMC boot support for AST2600 image.

[Cédric Le Goater]

Hello,

On 11/29/21 18:20, Peter Maydell wrote:
> On Tue, 9 Nov 2021 at 18:04, Shitalkumar Gandhi <shital_909@yahoo.com> wrote:
>>
>> Hi SME's,
>>
>> Please see the attached patch, which has been added to the boot eMMC image for AST2600 machine on QEMU.
>>
>> qemu should be run as follows:
>>
>> ./qemu-system-arm -m 1G -M ast2600-evb -nographic -drive
>> file=mmc-evb-ast2600.img,format=raw,if=sd,index=2
>>
>> Tested: Booted AST2600 eMMC image on QEMU.
>>
>> Suggested-by: Troy Lee leetroy@gmail.com
>> Reviewed-by: Troy Lee leetroy@gmail.com
>> Reviewed-by: Andrew Jeffery andrew@aj.id.au
>> Signed-off-by: Shitalkumar Gandhi shitalkumar.gandhi@seagate.com
> 
> Hi; thanks for this patch.
> 
> Fishing the patch out of the attachment, the diff is:

Yes. A pull request was sent here also :
  
   https://github.com/openbmc/qemu/pull/35

The patch is based on the OpenBMC QEMU branch which includes a large
change adding eMMC support to the SD model. But without the eMMC
model upstream, it's pointless, we can only boot from flash.

For the time being, a "boot-emmc" machine option to set/unset the emmc
boot should be enough. It's all in my branch. I think the right approach
would be to use the boot index of the device on the command line to
change the hw strapping.

Thanks,

C.


> 
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index ba5f1dc5af..6a890adb83 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -148,7 +148,7 @@ struct AspeedMachineState {
>           SCU_AST2400_HW_STRAP_BOOT_MODE(AST2400_SPI_BOOT))
> 
>   /* AST2600 evb hardware value */
> -#define AST2600_EVB_HW_STRAP1 0x000000C0
> +#define AST2600_EVB_HW_STRAP1 (0x000000C0 | AST26500_HW_STRAP_BOOT_SRC_EMMC)
>   #define AST2600_EVB_HW_STRAP2 0x00000003
> 
>   /* Tacoma hardware value */
>