Re: [PATCH 2/3] Platform/RaspberryPi/Acpitables: Add eMMC2 device and tweak Arasan

["Ard Biesheuvel" <ard.biesheuvel@arm.com>]

On 1/8/21 7:16 AM, Jeremy Linton wrote:
> The primarly problem with the rpi Arasan controller working
> with a default SDHCI driver is the lack of a meaningful
> capabilities register. As such if we add a _DSD entry
> to provide that information, we can then bind it to
> the linux sdhci_iproc driver which already
> hardcodes the remaining controller bugs.
> 
> Further we have gotten BRCME88C approved as the HID
> for the newer eMMC2 controller. So lets define an
> ACPI object to describe it.
> 
> Of course both devices are sharing an interrupt so
> we should also indicate that in the table as well.
> 
> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
> ---
>  Platform/RaspberryPi/AcpiTables/Dsdt.asl |  2 +
>  Platform/RaspberryPi/AcpiTables/Sdhc.asl | 86 +++++++++++++++++++++++++++++++-
>  2 files changed, 86 insertions(+), 2 deletions(-)
> 
> diff --git a/Platform/RaspberryPi/AcpiTables/Dsdt.asl b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> index d116f965e1..cca08c0539 100644
> --- a/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> +++ b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> @@ -150,6 +150,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "RPIFDN", "RPI", 2)
>            QWORDMEMORYBUF(23)
>            QWORDMEMORYBUF(24)
>            QWORDMEMORYBUF(25)
> +          QWORDMEMORYBUF(26)
>          })
>  
>          // USB
> @@ -196,6 +197,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "RPIFDN", "RPI", 2)
>          // SDC
>          QWORDMEMORYSET(24, MMCHS1_OFFSET, MMCHS1_LENGTH)
>          QWORDMEMORYSET(25, SDHOST_OFFSET, SDHOST_LENGTH)
> +        QWORDMEMORYSET(26, MMCHS2_OFFSET, MMCHS2_LENGTH)
>  
>          Return (RBUF)
>        }
> diff --git a/Platform/RaspberryPi/AcpiTables/Sdhc.asl b/Platform/RaspberryPi/AcpiTables/Sdhc.asl
> index 0ab1ba27f2..a7ac831066 100644
> --- a/Platform/RaspberryPi/AcpiTables/Sdhc.asl
> +++ b/Platform/RaspberryPi/AcpiTables/Sdhc.asl
> @@ -19,7 +19,7 @@
>  // Note: UEFI can use either SDHost or Arasan. We expose both to the OS.
>  //
>  
> -// ArasanSD 3.0 SD Host Controller.
> +// ArasanSD 3.0 SD Host Controller. (brcm,bcm2835-sdhci)
>  Device (SDC1)
>  {
>    Name (_HID, "BCM2847")
> @@ -37,7 +37,7 @@ Device (SDC1)
>    Name (RBUF, ResourceTemplate ()
>    {
>      MEMORY32FIXED (ReadWrite, 0, MMCHS1_LENGTH, RMEM)
> -    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_MMCHS1_INTERRUPT }
> +    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { BCM2836_MMCHS1_INTERRUPT }
>    })
>    Method (_CRS, 0x0, Serialized)
>    {
> @@ -45,6 +45,86 @@ Device (SDC1)
>      Return (^RBUF)
>    }
>  
> +  // The standard CAPs registers on this controller
> +  // appear to be 0, lets set some minimal defaults
> +  // Since this cap doesn't indicate DMA capability
> +  // we don't need a _DMA()
> +  Name (_DSD, Package () {
> +    ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> +    Package () {
> +      Package () { "sdhci-caps", 0x0100fa81 },
> +    }
> +  })
> +
> +
> +  //
> +  // A child device that represents the
> +  // sd card, which is marked as non-removable.
> +  //
> +  Device (SDMM)
> +  {
> +    Method (_ADR)
> +    {
> +      Return (0)
> +    }
> +    Method (_RMV) // Is removable
> +    {
> +      Return (0) // 0 - fixed
> +    }
> +  }
> +}
> +
> +#if (RPI_MODEL == 4)
> +// emmc2 Host Controller. (brcm,bcm2711-emmc2)
> +Device (SDC3)
> +{
> +  Name (_HID, "BRCME88C")
> +  Name (_UID, 0x1)
> +  Name (_CCA, 0x0)
> +  Name (_S1D, 0x1)
> +  Name (_S2D, 0x1)
> +  Name (_S3D, 0x1)
> +  Name (_S4D, 0x1)
> +  Method (_STA)
> +  {
> +    Return(0xf)
> +  }
> +  Name (RBUF, ResourceTemplate ()
> +  {
> +    MEMORY32FIXED (ReadWrite, 0, MMCHS2_LENGTH, RMEM)
> +    Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { BCM2836_MMCHS1_INTERRUPT }
> +  })
> +  Method (_CRS, 0x0, Serialized)
> +  {
> +    MEMORY32SETBASE (RBUF, RMEM, RBAS, MMCHS2_OFFSET)
> +    Return (^RBUF)
> +  }
> +
> +  // forceably limit to 1G
> +  Name (_DMA, ResourceTemplate() {
> +    QWordMemory (ResourceConsumer,
> +      ,
> +      MinFixed,
> +      MaxFixed,
> +      NonCacheable,
> +      ReadWrite,
> +      0x0,
> +      0x0,        // MIN
> +      0x3fffffff, // MAX
> +      0x0,        // TRA
> +      0x40000000, // LEN
> +      ,
> +      ,
> +    )
> +  })
> +

Shouldn't the _DMA method be on a container object instead of on the
device object itself?


> +  Name (_DSD, Package () {
> +    ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> +    Package () {
> +      Package () { "sdhci-caps-mask", 0x0000000000080000 },
> +    }
> +  })
> +
>    //
>    // A child device that represents the
>    // sd card, which is marked as non-removable.
> @@ -62,6 +142,7 @@ Device (SDC1)
>    }
>  }
>  
> +#else // !RPI4
>  
>  // Broadcom SDHost 2.0 SD Host Controller
>  Device (SDC2)
> @@ -105,3 +186,4 @@ Device (SDC2)
>      }
>    }
>  }
> +#endif // !RPI4
>