From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: Bernhard Beschow <shentey@gmail.com>, qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
qemu-ppc@nongnu.org, "Aurelien Jarno" <aurelien@aurel32.net>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"Antony Pavlov" <antonynpavlov@gmail.com>,
"BALATON Zoltan" <balaton@eik.bme.hu>,
"Alistair Francis" <alistair@alistair23.me>,
"Bin Meng" <bin.meng@windriver.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Jan Kiszka" <jan.kiszka@web.de>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Hanna Reitz" <hreitz@redhat.com>,
qemu-arm@nongnu.org, "Magnus Damm" <magnus.damm@gmail.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
qemu-block@nongnu.org
Subject: Re: [PATCH v4 7/7] hw/ppc/e500: Add Freescale eSDHC to e500plat
Date: Wed, 26 Oct 2022 14:11:55 -0300 [thread overview]
Message-ID: <6cdd1223-eeaa-ae12-2371-93d73f7c0163@gmail.com> (raw)
In-Reply-To: <20221018210146.193159-8-shentey@gmail.com>
On 10/18/22 18:01, Bernhard Beschow wrote:
> 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>
> ---
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> docs/system/ppc/ppce500.rst | 12 ++++++++++++
> hw/ppc/Kconfig | 1 +
> hw/ppc/e500.c | 35 ++++++++++++++++++++++++++++++++++-
> hw/ppc/e500.h | 1 +
> hw/ppc/e500plat.c | 1 +
> 5 files changed, 49 insertions(+), 1 deletion(-)
>
> diff --git a/docs/system/ppc/ppce500.rst b/docs/system/ppc/ppce500.rst
> index 38f8ceb0cf..c9fe0915dc 100644
> --- a/docs/system/ppc/ppce500.rst
> +++ b/docs/system/ppc/ppce500.rst
> @@ -19,6 +19,7 @@ The ``ppce500`` machine supports the following devices:
> * Power-off functionality via one GPIO pin
> * 1 Freescale MPC8xxx PCI host controller
> * VirtIO devices via PCI bus
> +* 1 Freescale Enhanced Secure Digital Host controller (eSDHC)
> * 1 Freescale Enhanced Triple Speed Ethernet controller (eTSEC)
>
> Hardware configuration information
> @@ -181,3 +182,14 @@ as follows:
> -drive if=pflash,file=/path/to/rootfs.ext2,format=raw \
> -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"
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index 769a1ead1c..6e31f568ba 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -129,6 +129,7 @@ config E500
> select PFLASH_CFI01
> select PLATFORM_BUS
> select PPCE500_PCI
> + select SDHCI
> select SERIAL
> select MPC_I2C
> select FDT_PPC
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index 73198adac8..15d1f5ea00 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -48,6 +48,7 @@
> #include "hw/net/fsl_etsec/etsec.h"
> #include "hw/i2c/i2c.h"
> #include "hw/irq.h"
> +#include "hw/sd/sdhci.h"
>
> #define EPAPR_MAGIC (0x45504150)
> #define DTC_LOAD_PAD 0x1800000
> @@ -66,11 +67,14 @@
> #define MPC8544_SERIAL1_REGS_OFFSET 0x4600ULL
> #define MPC8544_PCI_REGS_OFFSET 0x8000ULL
> #define MPC8544_PCI_REGS_SIZE 0x1000ULL
> +#define MPC85XX_ESDHC_REGS_OFFSET 0x2e000ULL
> +#define MPC85XX_ESDHC_REGS_SIZE 0x1000ULL
> #define MPC8544_UTIL_OFFSET 0xe0000ULL
> #define MPC8XXX_GPIO_OFFSET 0x000FF000ULL
> #define MPC8544_I2C_REGS_OFFSET 0x3000ULL
> #define MPC8XXX_GPIO_IRQ 47
> #define MPC8544_I2C_IRQ 43
> +#define MPC85XX_ESDHC_IRQ 72
> #define RTC_REGS_OFFSET 0x68
>
> #define PLATFORM_CLK_FREQ_HZ (400 * 1000 * 1000)
> @@ -203,6 +207,22 @@ static void dt_i2c_create(void *fdt, const char *soc, const char *mpic,
> 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 {
> void *fdt;
> @@ -553,6 +573,10 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms,
>
> 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,
> MPC8544_UTIL_OFFSET);
> @@ -982,7 +1006,8 @@ void ppce500_init(MachineState *machine)
> 0, qdev_get_gpio_in(mpicdev, 42), 399193,
> serial_hd(1), DEVICE_BIG_ENDIAN);
> }
> - /* I2C */
> +
> + /* I2C */
> dev = qdev_new("mpc-i2c");
> s = SYS_BUS_DEVICE(dev);
> sysbus_realize_and_unref(s, &error_fatal);
> @@ -992,6 +1017,14 @@ void ppce500_init(MachineState *machine)
> i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
> i2c_slave_create_simple(i2c, "ds1338", RTC_REGS_OFFSET);
>
> + /* eSDHC */
> + if (pmc->has_esdhc) {
> + dev = qdev_new(TYPE_FSL_ESDHC);
> + s = SYS_BUS_DEVICE(dev);
> + sysbus_realize_and_unref(s, &error_fatal);
> + sysbus_mmio_map(s, 0, pmc->ccsrbar_base + MPC85XX_ESDHC_REGS_OFFSET);
> + sysbus_connect_irq(s, 0, qdev_get_gpio_in(mpicdev, MPC85XX_ESDHC_IRQ));
> + }
>
> /* General Utility device */
> dev = qdev_new("mpc8544-guts");
> diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h
> index 68f754ce50..8c09ef92e4 100644
> --- a/hw/ppc/e500.h
> +++ b/hw/ppc/e500.h
> @@ -27,6 +27,7 @@ struct PPCE500MachineClass {
>
> int mpic_version;
> bool has_mpc8xxx_gpio;
> + bool has_esdhc;
> hwaddr platform_bus_base;
> hwaddr platform_bus_size;
> int platform_bus_first_irq;
> diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
> index 5bb1c603da..44bf874b0f 100644
> --- a/hw/ppc/e500plat.c
> +++ b/hw/ppc/e500plat.c
> @@ -86,6 +86,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data)
> pmc->fixup_devtree = e500plat_fixup_devtree;
> pmc->mpic_version = OPENPIC_MODEL_FSL_MPIC_42;
> pmc->has_mpc8xxx_gpio = true;
> + pmc->has_esdhc = true;
> pmc->platform_bus_base = 0xf00000000ULL;
> pmc->platform_bus_size = 128 * MiB;
> pmc->platform_bus_first_irq = 5;
next prev parent reply other threads:[~2022-10-26 17:12 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 21:01 [PATCH v4 0/7] ppc/e500: Add support for two types of flash, cleanup Bernhard Beschow
2022-10-18 21:01 ` [PATCH v4 1/7] docs/system/ppc/ppce500: Use qemu-system-ppc64 across the board(s) Bernhard Beschow
2022-10-18 21:01 ` [PATCH v4 2/7] hw/block/pflash_cfi0{1, 2}: Error out if device length isn't a power of two Bernhard Beschow
2022-10-18 21:01 ` [PATCH v4 3/7] hw/sd/sdhci-internal: Unexport ESDHC defines Bernhard Beschow
2022-10-18 21:01 ` [PATCH v4 4/7] hw/sd/sdhci: Rename ESDHC_* defines to USDHC_* Bernhard Beschow
2022-10-18 21:01 ` [PATCH v4 5/7] hw/ppc/e500: Implement pflash handling Bernhard Beschow
2022-10-26 17:03 ` Daniel Henrique Barboza
2022-10-27 21:11 ` Philippe Mathieu-Daudé
2022-10-28 15:09 ` Daniel Henrique Barboza
2022-10-28 16:03 ` B
2022-10-28 22:42 ` Philippe Mathieu-Daudé
2022-10-29 9:29 ` Daniel Henrique Barboza
2022-10-29 11:24 ` Bernhard Beschow
2022-10-18 21:01 ` [PATCH v4 6/7] hw/sd/sdhci: Implement Freescale eSDHC device model Bernhard Beschow
2022-10-27 21:40 ` Philippe Mathieu-Daudé
2022-10-29 11:33 ` Bernhard Beschow
2022-10-29 13:04 ` Bernhard Beschow
2022-10-29 18:28 ` Bernhard Beschow
2022-10-29 23:10 ` Philippe Mathieu-Daudé
2022-10-30 11:46 ` Bernhard Beschow
2022-10-31 12:11 ` Philippe Mathieu-Daudé
2022-11-01 10:49 ` Bernhard Beschow
2022-12-16 14:38 ` Bernhard Beschow
2022-10-18 21:01 ` [PATCH v4 7/7] hw/ppc/e500: Add Freescale eSDHC to e500plat Bernhard Beschow
2022-10-26 17:11 ` Daniel Henrique Barboza [this message]
2022-10-27 21:12 ` Philippe Mathieu-Daudé
2022-10-23 8:36 ` [PATCH v4 0/7] ppc/e500: Add support for two types of flash, cleanup Bernhard Beschow
2022-10-26 17:18 ` Daniel Henrique Barboza
2022-10-26 19:51 ` B
2022-10-26 21:40 ` Daniel Henrique Barboza
2022-10-31 12:13 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6cdd1223-eeaa-ae12-2371-93d73f7c0163@gmail.com \
--to=danielhb413@gmail.com \
--cc=alistair@alistair23.me \
--cc=antonynpavlov@gmail.com \
--cc=aurelien@aurel32.net \
--cc=balaton@eik.bme.hu \
--cc=bin.meng@windriver.com \
--cc=edgar.iglesias@gmail.com \
--cc=f4bug@amsat.org \
--cc=hreitz@redhat.com \
--cc=jan.kiszka@web.de \
--cc=kwolf@redhat.com \
--cc=magnus.damm@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=shentey@gmail.com \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).