Change in coreboot[master]: soc/amd/picasso/acpi: Add missing eMMC device

[Raul Rangel (Code Review)]

Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

soc/amd/picasso/acpi: Add missing eMMC device

BUG=b:154756391
TEST=Boot trembyle and see that /dev/mmcblk1 now exists

Signed-off-by: Raul E Rangel 
Change-Id: Ica83b78a7ab081d9eac9f5e267b2904dcde0b283
---
M src/soc/amd/picasso/acpi/pcie.asl
M src/soc/amd/picasso/acpi/sb_fch.asl
2 files changed, 41 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/41836/1

diff --git a/src/soc/amd/picasso/acpi/pcie.asl b/src/soc/amd/picasso/acpi/pcie.asl
index 561a3f8..954c5365 100644
--- a/src/soc/amd/picasso/acpi/pcie.asl
+++ b/src/soc/amd/picasso/acpi/pcie.asl
@@ -16,6 +16,9 @@
    	PIRG, 0x00000008,	/* Index 6: INTG */
    	PIRH, 0x00000008,	/* Index 7: INTH */

+		Offset (0x43),
+		PMMC, 0x00000008,	/* Index 0x43: eMMC */
+
    	Offset (0x62),
    	PGPI, 0x00000008,	/* Index 0x62: GPIO */

@@ -42,6 +45,9 @@
    	IORG, 0x00000008,	/* Index 0x86: INTG */
    	IORH, 0x00000008,	/* Index 0x87: INTH */

+		Offset (0xC3),
+		IMMC, 0x00000008,	/* Index 0xC3: eMMC */
+
    	Offset (0xE2),
    	IGPI, 0x00000008,	/* Index 0xE2: GPIO */

diff --git a/src/soc/amd/picasso/acpi/sb_fch.asl b/src/soc/amd/picasso/acpi/sb_fch.asl
index 197da3a..98f716b 100644
--- a/src/soc/amd/picasso/acpi/sb_fch.asl
+++ b/src/soc/amd/picasso/acpi/sb_fch.asl
@@ -57,6 +57,41 @@
    }
 }

+Device (MMC0)
+{
+	Name (_HID, "AMDI0040")
+	Name (_UID, 0x0)
+	Method(_CRS, 0) {
+		local0=ResourceTemplate(){
+			Interrupt (
+				ResourceConsumer,
+				Level,
+				ActiveLow,
+				Exclusive, , , IRQR)
+			{ 0 }
+			Memory32Fixed (ReadWrite, APU_EMMC_BASE, 0x1000)
+		}
+		CreateDWordField(local0, IRQR._INT, IRQN)
+		If (PMOD) {
+			IRQN=IMMC
+		} Else {
+			IRQN=PMMC
+		}
+		If (IRQN == 0x1f) {
+			Return(ResourceTemplate(){
+				Memory32Fixed (ReadWrite, APU_EMMC_BASE, 0x1000)
+			})
+		} Else {
+			Return(local0)
+		}
+	}
+
+	Method (_STA, 0x0, NotSerialized)
+	{
+		Return (0x0F)
+	}
+}
+
 Device (FUR0)
 {
    Name (_HID, "AMD0020")

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

Patch Set 1: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

Patch Set 1:

(9 comments)

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
File src/soc/amd/picasso/acpi/sb_fch.asl:

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 64: (
space before (

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 65: {
space before {

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 65: local0
Local0 or Name (RBUF, ...)

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 74: (
space before (

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 76: =
spaces around =

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 78: =
spaces around =

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 81: (
space before (

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 81: {
space before {

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 85: (
space before (

[Raul Rangel (Code Review)]

Hello build bot (Jenkins), Furquan Shaikh, Aaron Durbin, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/41836

to look at the new patch set (#2).

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

soc/amd/picasso/acpi: Add missing eMMC device

BUG=b:154756391
TEST=Boot trembyle and see that /dev/mmcblk1 now exists

Signed-off-by: Raul E Rangel 
Change-Id: Ica83b78a7ab081d9eac9f5e267b2904dcde0b283
---
M src/soc/amd/picasso/acpi/pcie.asl
M src/soc/amd/picasso/acpi/sb_fch.asl
2 files changed, 41 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/41836/2

[Raul Rangel (Code Review)]

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

Uploaded patch set 2.

(9 comments)

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
File src/soc/amd/picasso/acpi/sb_fch.asl:

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 64: (
> space before (

Done

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 65: local0
> Local0 or Name (RBUF, ... […]

Done

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 65: {
> space before {

Done

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 74: (
> space before (

Done

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 76: =
> spaces around =

Done

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 78: =
> spaces around =

Done

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 81: (
> space before (

Done

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 81: {
> space before {

Done

https://review.coreboot.org/c/coreboot/+/41836/1/src/soc/amd/picasso/acpi/sb... 
PS1, Line 85: (
> space before (

Done

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

Patch Set 2: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/41836/2/src/soc/amd/picasso/acpi/sb... 
File src/soc/amd/picasso/acpi/sb_fch.asl:

https://review.coreboot.org/c/coreboot/+/41836/2/src/soc/amd/picasso/acpi/sb... 
PS2, Line 64: (
nit: space before (

[Raul Rangel (Code Review)]

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

Uploaded patch set 3: Patch Set 2 was rebased.

[Raul Rangel (Code Review)]

Hello build bot (Jenkins), Furquan Shaikh, Aaron Durbin, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/41836

to look at the new patch set (#4).

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

soc/amd/picasso/acpi: Add missing eMMC device

BUG=b:154756391
TEST=Boot trembyle and see that /dev/mmcblk1 now exists

Signed-off-by: Raul E Rangel 
Change-Id: Ica83b78a7ab081d9eac9f5e267b2904dcde0b283
---
M src/soc/amd/picasso/acpi/pcie.asl
M src/soc/amd/picasso/acpi/sb_fch.asl
2 files changed, 41 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/41836/4

[Raul Rangel (Code Review)]

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

Uploaded patch set 4.

[Raul Rangel (Code Review)]

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/c/coreboot/+/41836/2/src/soc/amd/picasso/acpi/sb... 
File src/soc/amd/picasso/acpi/sb_fch.asl:

https://review.coreboot.org/c/coreboot/+/41836/2/src/soc/amd/picasso/acpi/sb... 
PS2, Line 64: (
> nit: space before (

Done

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

Patch Set 4: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

soc/amd/picasso/acpi: Add missing eMMC device

BUG=b:154756391
TEST=Boot trembyle and see that /dev/mmcblk1 now exists

Signed-off-by: Raul E Rangel 
Change-Id: Ica83b78a7ab081d9eac9f5e267b2904dcde0b283
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41836
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
---
M src/soc/amd/picasso/acpi/pcie.asl
M src/soc/amd/picasso/acpi/sb_fch.asl
2 files changed, 41 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/soc/amd/picasso/acpi/pcie.asl b/src/soc/amd/picasso/acpi/pcie.asl
index 561a3f8..954c5365 100644
--- a/src/soc/amd/picasso/acpi/pcie.asl
+++ b/src/soc/amd/picasso/acpi/pcie.asl
@@ -16,6 +16,9 @@
    	PIRG, 0x00000008,	/* Index 6: INTG */
    	PIRH, 0x00000008,	/* Index 7: INTH */

+		Offset (0x43),
+		PMMC, 0x00000008,	/* Index 0x43: eMMC */
+
    	Offset (0x62),
    	PGPI, 0x00000008,	/* Index 0x62: GPIO */

@@ -42,6 +45,9 @@
    	IORG, 0x00000008,	/* Index 0x86: INTG */
    	IORH, 0x00000008,	/* Index 0x87: INTH */

+		Offset (0xC3),
+		IMMC, 0x00000008,	/* Index 0xC3: eMMC */
+
    	Offset (0xE2),
    	IGPI, 0x00000008,	/* Index 0xE2: GPIO */

diff --git a/src/soc/amd/picasso/acpi/sb_fch.asl b/src/soc/amd/picasso/acpi/sb_fch.asl
index c531648..a7f60c2 100644
--- a/src/soc/amd/picasso/acpi/sb_fch.asl
+++ b/src/soc/amd/picasso/acpi/sb_fch.asl
@@ -57,6 +57,41 @@
    }
 }

+Device (MMC0)
+{
+	Name (_HID, "AMDI0040")
+	Name (_UID, 0x0)
+	Method (_CRS, 0) {
+		Name (RBUF, ResourceTemplate() {
+			Interrupt (
+				ResourceConsumer,
+				Level,
+				ActiveLow,
+				Exclusive, , , IRQR)
+			{ 0 }
+			Memory32Fixed (ReadWrite, APU_EMMC_BASE, 0x1000)
+		})
+		CreateDWordField (RBUF, IRQR._INT, IRQN)
+		If (PMOD) {
+			IRQN = IMMC
+		} Else {
+			IRQN = PMMC
+		}
+		If (IRQN == 0x1f) {
+			Return (ResourceTemplate(){
+				Memory32Fixed (ReadWrite, APU_EMMC_BASE, 0x1000)
+			})
+		} Else {
+			Return (RBUF)
+		}
+	}
+
+	Method (_STA, 0x0, NotSerialized)
+	{
+		Return (0x0F)
+	}
+}
+
 Device (FUR0)
 {
    Name (_HID, "AMD0020")

[9elements QA (Code Review)]

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41836 )

Change subject: soc/amd/picasso/acpi: Add missing eMMC device
......................................................................

Patch Set 5:

Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4
Emulation targets:
"QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/4763
"QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/4762
"QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/4761
"QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/4760

Please note: This test is under development and might not be accurate at all!