hw/ppc/e500: Add Freescale eSDHC to e500plat

Adds missing functionality to e500plat machine which increases the
chance of given "real" firmware images to access SD cards.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20221018210146.193159-8-shentey@gmail.com>
[PMD: Simplify using create_unimplemented_device("esdhc")]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20221101222934.52444-4-philmd@linaro.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Philippe Mathieu-Daudé 2022-11-01 23:29:34 +01:00 committed by Daniel Henrique Barboza
parent c0a55a0c9d
commit 3f288c4b2f
5 changed files with 64 additions and 1 deletions

View File

@ -19,6 +19,7 @@ The ``ppce500`` machine supports the following devices:
* Power-off functionality via one GPIO pin * Power-off functionality via one GPIO pin
* 1 Freescale MPC8xxx PCI host controller * 1 Freescale MPC8xxx PCI host controller
* VirtIO devices via PCI bus * VirtIO devices via PCI bus
* 1 Freescale Enhanced Secure Digital Host controller (eSDHC)
* 1 Freescale Enhanced Triple Speed Ethernet controller (eTSEC) * 1 Freescale Enhanced Triple Speed Ethernet controller (eTSEC)
Hardware configuration information Hardware configuration information
@ -180,3 +181,15 @@ as follows:
-kernel vmlinux \ -kernel vmlinux \
-drive if=pflash,file=/path/to/rootfs.ext2,format=raw \ -drive if=pflash,file=/path/to/rootfs.ext2,format=raw \
-append "rootwait root=/dev/mtdblock0" -append "rootwait root=/dev/mtdblock0"
Alternatively, the root file system can also reside on an emulated SD card
whose size must again be a power of two:
.. code-block:: bash
$ qemu-system-ppc64 -M ppce500 -cpu e500mc -smp 4 -m 2G \
-display none -serial stdio \
-kernel vmlinux \
-device sd-card,drive=mydrive \
-drive id=mydrive,if=none,file=/path/to/rootfs.ext2,format=raw \
-append "rootwait root=/dev/mmcblk0"

View File

@ -128,10 +128,12 @@ config E500
select PFLASH_CFI01 select PFLASH_CFI01
select PLATFORM_BUS select PLATFORM_BUS
select PPCE500_PCI select PPCE500_PCI
select SDHCI
select SERIAL select SERIAL
select MPC_I2C select MPC_I2C
select FDT_PPC select FDT_PPC
select DS1338 select DS1338
select UNIMP
config E500PLAT config E500PLAT
bool bool

View File

@ -48,6 +48,8 @@
#include "hw/net/fsl_etsec/etsec.h" #include "hw/net/fsl_etsec/etsec.h"
#include "hw/i2c/i2c.h" #include "hw/i2c/i2c.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/sd/sdhci.h"
#include "hw/misc/unimp.h"
#define EPAPR_MAGIC (0x45504150) #define EPAPR_MAGIC (0x45504150)
#define DTC_LOAD_PAD 0x1800000 #define DTC_LOAD_PAD 0x1800000
@ -66,11 +68,14 @@
#define MPC8544_SERIAL1_REGS_OFFSET 0x4600ULL #define MPC8544_SERIAL1_REGS_OFFSET 0x4600ULL
#define MPC8544_PCI_REGS_OFFSET 0x8000ULL #define MPC8544_PCI_REGS_OFFSET 0x8000ULL
#define MPC8544_PCI_REGS_SIZE 0x1000ULL #define MPC8544_PCI_REGS_SIZE 0x1000ULL
#define MPC85XX_ESDHC_REGS_OFFSET 0x2e000ULL
#define MPC85XX_ESDHC_REGS_SIZE 0x1000ULL
#define MPC8544_UTIL_OFFSET 0xe0000ULL #define MPC8544_UTIL_OFFSET 0xe0000ULL
#define MPC8XXX_GPIO_OFFSET 0x000FF000ULL #define MPC8XXX_GPIO_OFFSET 0x000FF000ULL
#define MPC8544_I2C_REGS_OFFSET 0x3000ULL #define MPC8544_I2C_REGS_OFFSET 0x3000ULL
#define MPC8XXX_GPIO_IRQ 47 #define MPC8XXX_GPIO_IRQ 47
#define MPC8544_I2C_IRQ 43 #define MPC8544_I2C_IRQ 43
#define MPC85XX_ESDHC_IRQ 72
#define RTC_REGS_OFFSET 0x68 #define RTC_REGS_OFFSET 0x68
#define PLATFORM_CLK_FREQ_HZ (400 * 1000 * 1000) #define PLATFORM_CLK_FREQ_HZ (400 * 1000 * 1000)
@ -203,6 +208,22 @@ static void dt_i2c_create(void *fdt, const char *soc, const char *mpic,
g_free(i2c); g_free(i2c);
} }
static void dt_sdhc_create(void *fdt, const char *parent, const char *mpic)
{
hwaddr mmio = MPC85XX_ESDHC_REGS_OFFSET;
hwaddr size = MPC85XX_ESDHC_REGS_SIZE;
int irq = MPC85XX_ESDHC_IRQ;
g_autofree char *name = NULL;
name = g_strdup_printf("%s/sdhc@%" PRIx64, parent, mmio);
qemu_fdt_add_subnode(fdt, name);
qemu_fdt_setprop(fdt, name, "sdhci,auto-cmd12", NULL, 0);
qemu_fdt_setprop_phandle(fdt, name, "interrupt-parent", mpic);
qemu_fdt_setprop_cells(fdt, name, "bus-width", 4);
qemu_fdt_setprop_cells(fdt, name, "interrupts", irq, 0x2);
qemu_fdt_setprop_cells(fdt, name, "reg", mmio, size);
qemu_fdt_setprop_string(fdt, name, "compatible", "fsl,esdhc");
}
typedef struct PlatformDevtreeData { typedef struct PlatformDevtreeData {
void *fdt; void *fdt;
@ -553,6 +574,10 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms,
dt_rtc_create(fdt, "i2c", "rtc"); dt_rtc_create(fdt, "i2c", "rtc");
/* sdhc */
if (pmc->has_esdhc) {
dt_sdhc_create(fdt, soc, mpic);
}
gutil = g_strdup_printf("%s/global-utilities@%llx", soc, gutil = g_strdup_printf("%s/global-utilities@%llx", soc,
MPC8544_UTIL_OFFSET); MPC8544_UTIL_OFFSET);
@ -982,6 +1007,7 @@ void ppce500_init(MachineState *machine)
0, qdev_get_gpio_in(mpicdev, 42), 399193, 0, qdev_get_gpio_in(mpicdev, 42), 399193,
serial_hd(1), DEVICE_BIG_ENDIAN); serial_hd(1), DEVICE_BIG_ENDIAN);
} }
/* I2C */ /* I2C */
dev = qdev_new("mpc-i2c"); dev = qdev_new("mpc-i2c");
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
@ -992,6 +1018,26 @@ void ppce500_init(MachineState *machine)
i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c"); i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
i2c_slave_create_simple(i2c, "ds1338", RTC_REGS_OFFSET); i2c_slave_create_simple(i2c, "ds1338", RTC_REGS_OFFSET);
/* eSDHC */
if (pmc->has_esdhc) {
create_unimplemented_device("esdhc",
pmc->ccsrbar_base + MPC85XX_ESDHC_REGS_OFFSET,
MPC85XX_ESDHC_REGS_SIZE);
/*
* Compatible with:
* - SD Host Controller Specification Version 2.0 Part A2
* (See MPC8569E Reference Manual)
*/
dev = qdev_new(TYPE_SYSBUS_SDHCI);
qdev_prop_set_uint8(dev, "sd-spec-version", 2);
qdev_prop_set_uint8(dev, "endianness", DEVICE_BIG_ENDIAN);
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
sysbus_connect_irq(s, 0, qdev_get_gpio_in(mpicdev, MPC85XX_ESDHC_IRQ));
memory_region_add_subregion(ccsr_addr_space, MPC85XX_ESDHC_REGS_OFFSET,
sysbus_mmio_get_region(s, 0));
}
/* General Utility device */ /* General Utility device */
dev = qdev_new("mpc8544-guts"); dev = qdev_new("mpc8544-guts");

View File

@ -27,6 +27,7 @@ struct PPCE500MachineClass {
int mpic_version; int mpic_version;
bool has_mpc8xxx_gpio; bool has_mpc8xxx_gpio;
bool has_esdhc;
hwaddr platform_bus_base; hwaddr platform_bus_base;
hwaddr platform_bus_size; hwaddr platform_bus_size;
int platform_bus_first_irq; int platform_bus_first_irq;

View File

@ -86,6 +86,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data)
pmc->fixup_devtree = e500plat_fixup_devtree; pmc->fixup_devtree = e500plat_fixup_devtree;
pmc->mpic_version = OPENPIC_MODEL_FSL_MPIC_42; pmc->mpic_version = OPENPIC_MODEL_FSL_MPIC_42;
pmc->has_mpc8xxx_gpio = true; pmc->has_mpc8xxx_gpio = true;
pmc->has_esdhc = true;
pmc->platform_bus_base = 0xf00000000ULL; pmc->platform_bus_base = 0xf00000000ULL;
pmc->platform_bus_size = 128 * MiB; pmc->platform_bus_size = 128 * MiB;
pmc->platform_bus_first_irq = 5; pmc->platform_bus_first_irq = 5;