m68k: Add support for QEMU virt machine
Subsystems (2)
v4 cover m68k: Add support for QEMU virt machine
Add support for the QEMU 'virt' machine on the m68k architecture. The QEMU virt machine models a generic system utilizing Goldfish virtual peripherals and is capable of emulating various classic 68k CPUs.
Currently, U-Boot's m68k architecture support focuses on ColdFire variants. Expand this to include the classic M680x0 architecture, implementing the necessary exception vectors, startup code, and a bootinfo parser compatible with the QEMU interface. A driver for the Goldfish TTY is also added to enable serial console output.
The implementation has been verified on QEMU targeting the M68040 CPU, confirming successful hardware initialization and boot to the U-Boot command shell. Additionally, the CI configuration was verified locally using gitlab-ci-local "qemu_m68k_virt test.py", resulting in PASS qemu_m68k_virt test.py.
---
Changes in v4:
- Support DT probing with platform data as a fallback. (serial & timer)
- Fix sandbox build warnings by removing incorrect type casting.
- Add comment explaining read latching behavior in the timer driver.
- Sort headers alphabetically in the timer driver.
Changes in v3:
- Add Goldfish timer driver.
- Update Goldfish RTC driver to support non-DT probing.
- Enable Goldfish RTC and Timer support in board configuration.
- Add safety loop limit to bootinfo parsing in dram_init.
- Remove dummy timer functions from architecture code.
- Remove unnecessary type casts in Goldfish TTY driver.
- Remove TEST_PY_ID from CI job definitions.
- Update documentation to include new RTC support.
Changes in v2:
- Refactor Goldfish TTY driver to use priv data for the RX buffer and ensure single-byte reads.
- Rename arch/m68k/cpu/m68040 to arch/m68k/cpu/m680x0 to separate the architecture family from the specific CPU model.
- Introduce M680x0 Kconfig symbol and separate MAINTAINERS entries for the architecture and the board.
- Regenerate qemu-m68k_defconfig using make savedefconfig and add the board to the documentation index.
- Add a new patch to enable CI testing on GitLab and Azure Pipelines.
- Update SPDX identifiers to GPL-2.0-or-later.
- Sort headers alphabetically.
- Fix tabs vs spaces.
v3: https://lore.kernel.org/u-boot/[email protected]/
v2: https://lore.kernel.org/u-boot/[email protected]/
v1: https://lore.kernel.org/u-boot/[email protected]/
Kuan-Wei Chiu (6):
serial: Add Goldfish TTY driver
timer: Add Goldfish timer driver
rtc: goldfish: Support platform data for non-DT probing
m68k: Add support for M68040 CPU
board: Add QEMU m68k virt board support
CI: Add test jobs for QEMU m68k virt machine
.azure-pipelines.yml | 3 + .gitlab-ci.yml | 6 ++ MAINTAINERS | 18 ++++ arch/m68k/Kconfig | 24 ++++++ arch/m68k/Makefile | 1 + arch/m68k/config.mk | 10 ++- arch/m68k/cpu/m680x0/Makefile | 6 ++ arch/m68k/cpu/m680x0/cpu.c | 72 ++++++++++++++++ arch/m68k/cpu/m680x0/start.S | 73 ++++++++++++++++ arch/m68k/cpu/m680x0/u-boot.lds | 47 +++++++++++ arch/m68k/include/asm/bootinfo.h | 31 +++++++ arch/m68k/lib/Makefile | 9 +- board/emulation/qemu-m68k/Kconfig | 12 +++ board/emulation/qemu-m68k/MAINTAINERS | 8 ++ board/emulation/qemu-m68k/Makefile | 5 ++ board/emulation/qemu-m68k/qemu-m68k.c | 115 ++++++++++++++++++++++++++ configs/qemu-m68k_defconfig | 16 ++++ doc/board/emulation/index.rst | 1 + doc/board/emulation/qemu-m68k.rst | 39 +++++++++ drivers/rtc/goldfish_rtc.c | 13 ++- drivers/serial/Kconfig | 8 ++ drivers/serial/Makefile | 1 + drivers/serial/serial_goldfish.c | 109 ++++++++++++++++++++++++ drivers/timer/Kconfig | 8 ++ drivers/timer/Makefile | 1 + drivers/timer/goldfish_timer.c | 81 ++++++++++++++++++ include/configs/qemu-m68k.h | 18 ++++ include/goldfish_rtc.h | 15 ++++ include/goldfish_timer.h | 13 +++ include/goldfish_tty.h | 18 ++++ 30 files changed, 770 insertions(+), 11 deletions(-) create mode 100644 arch/m68k/cpu/m680x0/Makefile create mode 100644 arch/m68k/cpu/m680x0/cpu.c create mode 100644 arch/m68k/cpu/m680x0/start.S create mode 100644 arch/m68k/cpu/m680x0/u-boot.lds create mode 100644 arch/m68k/include/asm/bootinfo.h create mode 100644 board/emulation/qemu-m68k/Kconfig create mode 100644 board/emulation/qemu-m68k/MAINTAINERS create mode 100644 board/emulation/qemu-m68k/Makefile create mode 100644 board/emulation/qemu-m68k/qemu-m68k.c create mode 100644 configs/qemu-m68k_defconfig create mode 100644 doc/board/emulation/qemu-m68k.rst create mode 100644 drivers/serial/serial_goldfish.c create mode 100644 drivers/timer/goldfish_timer.c create mode 100644 include/configs/qemu-m68k.h create mode 100644 include/goldfish_rtc.h create mode 100644 include/goldfish_timer.h create mode 100644 include/goldfish_tty.h
Signature · 1 line
2.52.0.358.g0dd7633a29-goog
PATCH v4 1/6 serial: Add Goldfish TTY driver
Add support for the Google Goldfish TTY serial device. This virtual device is commonly used in QEMU virtual machines (such as the m68k virt machine) and Android emulators.
The driver implements basic console output and input polling using the Goldfish MMIO interface.
---
Changes in v4:
- Support DT probing with platform data as a fallback.
MAINTAINERS | 6 ++ drivers/serial/Kconfig | 8 +++ drivers/serial/Makefile | 1 + drivers/serial/serial_goldfish.c | 109 +++++++++++++++++++++++++++++++ include/goldfish_tty.h | 18 +++++ 5 files changed, 142 insertions(+) create mode 100644 drivers/serial/serial_goldfish.c create mode 100644 include/goldfish_tty.h
MAINTAINERS +6 -0
@@ -1259,6 +1259,12 @@ S: Maintained F: drivers/misc/gsc.c F: include/gsc.h +GOLDFISH SERIAL DRIVER +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: drivers/serial/serial_goldfish.c +F: include/goldfish_tty.h + I2C M: Heiko Schocher <[email protected]> S: Maintained
drivers/serial/Kconfig +8 -0
@@ -1193,4 +1193,12 @@ config SYS_SDMR depends on MPC8XX_CONS default 0x0 +config SERIAL_GOLDFISH + bool "Goldfish TTY support" + depends on DM_SERIAL + help + Select this to enable support for the Goldfish TTY serial port. + This virtual device is commonly used by QEMU virtual machines + (e.g. m68k virt) for console output. + endif
drivers/serial/Makefile +1 -0
@@ -63,3 +63,4 @@ obj-$(CONFIG_XTENSA_SEMIHOSTING_SERIAL) += serial_xtensa_semihosting.o obj-$(CONFIG_S5P4418_PL011_SERIAL) += serial_s5p4418_pl011.o obj-$(CONFIG_UART4_SERIAL) += serial_adi_uart4.o +obj-$(CONFIG_SERIAL_GOLDFISH) += serial_goldfish.o
drivers/serial/serial_goldfish.c new file +109 -0
109 lines not on this page · raw message
include/goldfish_tty.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +*/ + +#ifndef _GOLDFISH_TTY_H_ +#define _GOLDFISH_TTY_H_ + +#include <linux/types.h> + +/* Platform data for the Goldfish TTY driver +* Used to pass hardware base address from Board to Driver +*/ +struct goldfish_tty_plat { +void __iomem *base; +}; + +#endif /* _GOLDFISH_TTY_H_ */
Signature · 1 line
2.52.0.358.g0dd7633a29-goog
Re: [PATCH v4 1/6] serial: Add Goldfish TTY driver
Quoted 10 lines · Kuan-Wei Chiu
Add support for the Google Goldfish TTY serial device. This virtual device is commonly used in QEMU virtual machines (such as the m68k virt machine) and Android emulators.
The driver implements basic console output and input polling using the Goldfish MMIO interface.
Signed-off-by Kuan-Wei Chiu <[email protected]>Reviewed-by Yao Zi <[email protected]>Tested-by Daniel Palmer <[email protected]>
Quoted 195 lines
---
Changes in v4:
- Support DT probing with platform data as a fallback.MAINTAINERS | 6 ++ drivers/serial/Kconfig | 8 +++ drivers/serial/Makefile | 1 + drivers/serial/serial_goldfish.c | 109 +++++++++++++++++++++++++++++++ include/goldfish_tty.h | 18 +++++ 5 files changed, 142 insertions(+)create mode 100644
drivers/serial/serial_goldfish.ccreate mode 100644include/goldfish_tty.hMAINTAINERS +6
-0@@ -1259,6 +1259,12 @@ S: Maintained F: drivers/misc/gsc.c F: include/gsc.h +GOLDFISH SERIAL DRIVER +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: drivers/serial/serial_goldfish.c +F: include/goldfish_tty.h + I2C M: Heiko Schocher <[email protected]> S: Maintaineddrivers/serial/Kconfig +8
-0@@ -1193,4 +1193,12 @@ config SYS_SDMR depends on MPC8XX_CONS default 0x0 +config SERIAL_GOLDFISH + bool "Goldfish TTY support" + depends on DM_SERIAL + help + Select this to enable support for the Goldfish TTY serial port. + This virtual device is commonly used by QEMU virtual machines + (e.g. m68k virt) for console output. + endifdrivers/serial/Makefile +1
-0@@ -63,3 +63,4 @@ obj-$(CONFIG_XTENSA_SEMIHOSTING_SERIAL) += serial_xtensa_semihosting.o obj-$(CONFIG_S5P4418_PL011_SERIAL) += serial_s5p4418_pl011.o obj-$(CONFIG_UART4_SERIAL) += serial_adi_uart4.o +obj-$(CONFIG_SERIAL_GOLDFISH) += serial_goldfish.odrivers/serial/serial_goldfish.c new file +109
-0@@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +* Goldfish TTY driver for U-Boot +*/ + +#include <asm/io.h> +#include <dm.h> +#include <goldfish_tty.h> +#include <linux/types.h> +#include <mapmem.h> +#include <serial.h> + +/* Goldfish TTY Register Offsets */ +#define GOLDFISH_TTY_PUT_CHAR 0x00 +#define GOLDFISH_TTY_BYTES_READY 0x04 +#define GOLDFISH_TTY_CMD 0x08 +#define GOLDFISH_TTY_DATA_PTR 0x10 +#define GOLDFISH_TTY_DATA_LEN 0x14 +#define GOLDFISH_TTY_DATA_PTR_HIGH 0x18 +#define GOLDFISH_TTY_VERSION 0x20 + +/* Commands */ +#define CMD_WRITE_BUFFER 2 +#define CMD_READ_BUFFER 3 + +struct goldfish_tty_priv { +void __iomem *base; +u8 rx_buf; +}; + +static int goldfish_serial_getc (struct udevice *dev) +{ +struct goldfish_tty_priv *priv =dev_get_priv (dev); +unsigned long paddr; +u32 count; + + count =__raw_readl (priv->base +GOLDFISH_TTY_BYTES_READY ); +if (count ==0 ) +return -EAGAIN ; + + paddr =virt_to_phys ((void *)&priv->rx_buf); + +__raw_writel (0 , priv->base +GOLDFISH_TTY_DATA_PTR_HIGH ); +__raw_writel (paddr, priv->base +GOLDFISH_TTY_DATA_PTR ); +__raw_writel (1 , priv->base +GOLDFISH_TTY_DATA_LEN ); +__raw_writel (CMD_READ_BUFFER , priv->base +GOLDFISH_TTY_CMD ); + +return priv->rx_buf; +} + +static int goldfish_serial_putc (struct udevice *dev,const char ch) +{ +struct goldfish_tty_priv *priv =dev_get_priv (dev); + +__raw_writel (ch, priv->base +GOLDFISH_TTY_PUT_CHAR ); + +return 0 ; +} + +static int goldfish_serial_pending (struct udevice *dev,bool input) +{ +struct goldfish_tty_priv *priv =dev_get_priv (dev); + +if (input) +return __raw_readl (priv->base +GOLDFISH_TTY_BYTES_READY ); + +return 0 ; +} + +static int goldfish_serial_probe (struct udevice *dev) +{ +struct goldfish_tty_priv *priv =dev_get_priv (dev); +struct goldfish_tty_plat *plat =dev_get_plat (dev); +fdt_addr_t addr; + + addr =dev_read_addr (dev); +if (addr !=FDT_ADDR_T_NONE ) { + priv->base =map_sysmem (addr,0x1000 ); + }else { + plat =dev_get_plat (dev); +if (!plat) +return -EINVAL ; + priv->base = plat->base; + } + +return 0 ; +} + +static const struct dm_serial_ops goldfish_serial_ops = { + .putc = goldfish_serial_putc, + .pending = goldfish_serial_pending, + .getc = goldfish_serial_getc, +}; + +static const struct udevice_id goldfish_serial_ids[] = { + { .compatible ="google,goldfish-tty" }, + { } +}; + +U_BOOT_DRIVER (serial_goldfish) = { + .name ="serial_goldfish" , + .id =UCLASS_SERIAL , + .of_match = goldfish_serial_ids, + .probe = goldfish_serial_probe, + .ops = &goldfish_serial_ops, + .priv_auto =sizeof (struct goldfish_tty_priv ), + .flags =DM_FLAG_PRE_RELOC , +};include/goldfish_tty.h new file +18
-0@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +*/ + +#ifndef _GOLDFISH_TTY_H_ +#define _GOLDFISH_TTY_H_ + +#include <linux/types.h> + +/* Platform data for the Goldfish TTY driver +* Used to pass hardware base address from Board to Driver +*/ +struct goldfish_tty_plat { +void __iomem *base; +}; + +#endif /* _GOLDFISH_TTY_H_ */
Re: [PATCH v4 1/6] serial: Add Goldfish TTY driver
Quoted 27 lines · Heinrich Schuchardt
Quoted 10 lines · Kuan-Wei Chiu
Add support for the Google Goldfish TTY serial device. This virtual device is commonly used in QEMU virtual machines (such as the m68k virt machine) and Android emulators.
The driver implements basic console output and input polling using the Goldfish MMIO interface.
Signed-off-by Kuan-Wei Chiu <[email protected]>Reviewed-by Yao Zi <[email protected]>Tested-by Daniel Palmer <[email protected]>Quoted 13 lines
---
Changes in v4:
- Support DT probing with platform data as a fallback.MAINTAINERS | 6 ++ drivers/serial/Kconfig | 8 +++ drivers/serial/Makefile | 1 +
drivers/serial/serial_goldfish.c| 109 +++++++++++++++++++++++++++++++ include/goldfish_tty.h | 18 +++++5 files changed, 142 insertions(+)create mode 100644
drivers/serial/serial_goldfish.ccreate mode 100644include/goldfish_tty.h
Quoted 13 lines
MAINTAINERS S: Maintained · line 1267
Quoted 13 lines
MAINTAINERS +0
-0@@ -1259,6 +1259,12 @@ S: MaintainedF:
drivers/misc/gsc.c
F:include/gsc.hMAINTAINERS +6
-0+GOLDFISH SERIAL DRIVER +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: drivers/serial/serial_goldfish.c +F: include/goldfish_tty.h +
Applying: serial: Add Goldfish TTY driver Patch failed at 0001 serial: Add Goldfish TTY driver
error: patch failed: MAINTAINERS:1259
error: MAINTAINERS: patch does not apply
Should a respin of the series be needed, please, check that the series applies to origin/next before sending.
Best regards
Heinrich
Quoted 168 lines
Quoted 167 lines
I2C
M: Heiko Schocher <[email protected]>
S: Maintaineddrivers/serial/Kconfig +0
-0@@ -1193,4 +1193,12 @@ config SYS_SDMRdepends on
MPC8XX_CONS
default0x0drivers/serial/Kconfig +8
-0+config SERIAL_GOLDFISH + bool "Goldfish TTY support" + depends on DM_SERIAL + help + Select this to enable support for the Goldfish TTY serial port. + This virtual device is commonly used by QEMU virtual machines + (e.g. m68k virt) for console output. +endif
drivers/serial/Makefile +0
-0@@ -63,3 +63,4 @@ obj-$(CONFIG_XTENSA_SEMIHOSTING_SERIAL) +=serial_xtensa_semihosting.o obj-$(CONFIG_S5P4418_PL011_SERIAL) += serial_s5p4418_pl011.o obj-$(CONFIG_UART4_SERIAL) += serial_adi_uart4.o
drivers/serial/Makefile +1
-0+obj-$(CONFIG_SERIAL_GOLDFISH) += serial_goldfish.odrivers/serial/serial_goldfish.c new file +109
-0@@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +* Goldfish TTY driver for U-Boot +*/ + +#include <asm/io.h> +#include <dm.h> +#include <goldfish_tty.h> +#include <linux/types.h> +#include <mapmem.h> +#include <serial.h> + +/* Goldfish TTY Register Offsets */ +#define GOLDFISH_TTY_PUT_CHAR 0x00 +#define GOLDFISH_TTY_BYTES_READY 0x04 +#define GOLDFISH_TTY_CMD 0x08 +#define GOLDFISH_TTY_DATA_PTR 0x10 +#define GOLDFISH_TTY_DATA_LEN 0x14 +#define GOLDFISH_TTY_DATA_PTR_HIGH 0x18 +#define GOLDFISH_TTY_VERSION 0x20 + +/* Commands */ +#define CMD_WRITE_BUFFER 2 +#define CMD_READ_BUFFER 3 + +struct goldfish_tty_priv { + void __iomem *base; + u8 rx_buf; +}; + +static int goldfish_serial_getc (struct udevice *dev) +{ + struct goldfish_tty_priv *priv = dev_get_priv(dev); + unsigned long paddr; + u32 count; + + count = __raw_readl(priv->base + GOLDFISH_TTY_BYTES_READY); + if (count == 0) + return -EAGAIN; + + paddr = virt_to_phys((void *)&priv->rx_buf); + + __raw_writel(0, priv->base + GOLDFISH_TTY_DATA_PTR_HIGH); + __raw_writel(paddr, priv->base + GOLDFISH_TTY_DATA_PTR); + __raw_writel(1, priv->base + GOLDFISH_TTY_DATA_LEN); + __raw_writel(CMD_READ_BUFFER, priv->base + GOLDFISH_TTY_CMD); + + return priv->rx_buf; +} + +static int goldfish_serial_putc (struct udevice *dev,const char ch) +{ + struct goldfish_tty_priv *priv = dev_get_priv(dev); + + __raw_writel(ch, priv->base + GOLDFISH_TTY_PUT_CHAR); + + return 0; +} + +static int goldfish_serial_pending (struct udevice *dev,bool input) +{ + struct goldfish_tty_priv *priv = dev_get_priv(dev); + + if (input) + return __raw_readl(priv->base + GOLDFISH_TTY_BYTES_READY); + + return 0; +} + +static int goldfish_serial_probe (struct udevice *dev) +{ + struct goldfish_tty_priv *priv = dev_get_priv(dev); + struct goldfish_tty_plat *plat = dev_get_plat(dev); + fdt_addr_t addr; + + addr = dev_read_addr(dev); + if (addr != FDT_ADDR_T_NONE) { + priv->base = map_sysmem(addr, 0x1000); + } else { + plat = dev_get_plat(dev); + if (!plat) + return -EINVAL; + priv->base = plat->base; + } + + return 0; +} + +static const struct dm_serial_ops goldfish_serial_ops = { + .putc = goldfish_serial_putc, + .pending = goldfish_serial_pending, + .getc = goldfish_serial_getc, +}; + +static const struct udevice_id goldfish_serial_ids[] = { + { .compatible = "google,goldfish-tty" }, + { } +}; + +U_BOOT_DRIVER (serial_goldfish) = { + .name = "serial_goldfish", + .id = UCLASS_SERIAL, + .of_match = goldfish_serial_ids, + .probe = goldfish_serial_probe, + .ops = &goldfish_serial_ops, + .priv_auto = sizeof(struct goldfish_tty_priv), + .flags = DM_FLAG_PRE_RELOC, +};include/goldfish_tty.h new file +18
-0@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +*/ + +#ifndef _GOLDFISH_TTY_H_ +#define _GOLDFISH_TTY_H_ + +#include <linux/types.h> + +/* Platform data for the Goldfish TTY driver +* Used to pass hardware base address from Board to Driver +*/ +struct goldfish_tty_plat { + void __iomem *base; +}; + +#endif /* _GOLDFISH_TTY_H_ */
Re: [PATCH v4 1/6] serial: Add Goldfish TTY driver
Hi Heinrich,
Quoted 6 lines · Heinrich Schuchardt
Quoted 5 lines · Heinrich Schuchardt
Quoted 4 lines · Kuan-Wei Chiu
Add support for the Google Goldfish TTY serial device. This virtual device is commonly used in QEMU virtual machines (such as the m68k virt machine) and Android emulators.
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
The driver implements basic console output and input polling using the Goldfish MMIO interface.
Signed-off-by Kuan-Wei Chiu <[email protected]>Reviewed-by Yao Zi <[email protected]>Tested-by Daniel Palmer <[email protected]>
Thanks for the review.
Quoted 33 lines
Quoted 14 lines
Quoted 14 lines
---
Changes in v4:
- Support DT probing with platform data as a fallback.MAINTAINERS | 6 ++ drivers/serial/Kconfig | 8 +++ drivers/serial/Makefile | 1 +
drivers/serial/serial_goldfish.c| 109 +++++++++++++++++++++++++++++++ include/goldfish_tty.h | 18 +++++5 files changed, 142 insertions(+)create mode 100644
drivers/serial/serial_goldfish.ccreate mode 100644include/goldfish_tty.hQuoted 13 lines
MAINTAINERS S: Maintained · line 1267
Quoted 13 lines
MAINTAINERS +0
-0@@ -1259,6 +1259,12 @@ S: MaintainedF:
drivers/misc/gsc.c
F:include/gsc.hMAINTAINERS +6
-0+GOLDFISH SERIAL DRIVER +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: drivers/serial/serial_goldfish.c +F: include/goldfish_tty.h +Applying: serial: Add Goldfish TTY driver Patch failed at 0001 serial: Add Goldfish TTY driver
error: patch failed: MAINTAINERS:1259
error:MAINTAINERS: patch does not apply
Quoted 2 lines
Should a respin of the series be needed, please, check that the series applies to origin/next before sending.
To make sure I base the next version on the correct tree, should I base it on the ColdFire tree's next branch:
https://source.denx.de/u-boot/custodians/u-boot-coldfire.git
Or the main U-Boot repository's next branch:
https://source.denx.de/u-boot/u-boot.git
Regards,
Kuan-Wei
Re: [PATCH v4 1/6] serial: Add Goldfish TTY driver
Quoted 56 lines · Kuan-Wei Chiu
Hi Heinrich,
Quoted 6 lines · Heinrich Schuchardt
Quoted 5 lines · Heinrich Schuchardt
Quoted 4 lines · Kuan-Wei Chiu
Add support for the Google Goldfish TTY serial device. This virtual device is commonly used in QEMU virtual machines (such as the m68k virt machine) and Android emulators.
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
The driver implements basic console output and input polling using the Goldfish MMIO interface.
Signed-off-by Kuan-Wei Chiu <[email protected]>Reviewed-by Yao Zi <[email protected]>Tested-by Daniel Palmer <[email protected]>Thanks for the review.
Quoted 33 lines
Quoted 14 lines
Quoted 14 lines
---
Changes in v4:
- Support DT probing with platform data as a fallback.MAINTAINERS | 6 ++ drivers/serial/Kconfig | 8 +++ drivers/serial/Makefile | 1 +
drivers/serial/serial_goldfish.c| 109 +++++++++++++++++++++++++++++++ include/goldfish_tty.h | 18 +++++5 files changed, 142 insertions(+)create mode 100644
drivers/serial/serial_goldfish.ccreate mode 100644include/goldfish_tty.hQuoted 13 lines
MAINTAINERS S: Maintained · line 1267
Quoted 13 lines
MAINTAINERS +0
-0@@ -1259,6 +1259,12 @@ S: MaintainedF:
drivers/misc/gsc.c
F:include/gsc.hMAINTAINERS +6
-0+GOLDFISH SERIAL DRIVER +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: drivers/serial/serial_goldfish.c +F: include/goldfish_tty.h +Applying: serial: Add Goldfish TTY driver Patch failed at 0001 serial: Add Goldfish TTY driver
error: patch failed: MAINTAINERS:1259
error:MAINTAINERS: patch does not applyQuoted 2 lines
Should a respin of the series be needed, please, check that the series applies to origin/next before sending.
Quoted 8 lines
To make sure I base the next version on the correct tree, should I base it on the ColdFire tree's next branch:
https://source.denx.de/u-boot/custodians/u-boot-coldfire.git
Or the main U-Boot repository's next branch:
The main U-Boot tree. Custodian trees are not always up to date (and with the renewed interest in m68k, I was going to ask if someone else would like to step up as co-maintainer as part of all of this, Angelo might like some help).
Signature · 1 line
Tom
Re: [PATCH v4 1/6] serial: Add Goldfish TTY driver
Hi Tom,
Quoted 60 lines · Tom Rini
Quoted 59 lines · Kuan-Wei Chiu
Hi Heinrich,
Quoted 6 lines · Heinrich Schuchardt
Quoted 5 lines · Heinrich Schuchardt
Quoted 4 lines · Kuan-Wei Chiu
Add support for the Google Goldfish TTY serial device. This virtual device is commonly used in QEMU virtual machines (such as the m68k virt machine) and Android emulators.
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
The driver implements basic console output and input polling using the Goldfish MMIO interface.
Signed-off-by Kuan-Wei Chiu <[email protected]>Reviewed-by Yao Zi <[email protected]>Tested-by Daniel Palmer <[email protected]>Thanks for the review.
Quoted 33 lines
Quoted 14 lines
Quoted 14 lines
---
Changes in v4:
- Support DT probing with platform data as a fallback.MAINTAINERS | 6 ++ drivers/serial/Kconfig | 8 +++ drivers/serial/Makefile | 1 +
drivers/serial/serial_goldfish.c| 109 +++++++++++++++++++++++++++++++ include/goldfish_tty.h | 18 +++++5 files changed, 142 insertions(+)create mode 100644
drivers/serial/serial_goldfish.ccreate mode 100644include/goldfish_tty.hQuoted 13 lines
MAINTAINERS S: Maintained · line 1267
Quoted 13 lines
MAINTAINERS +0
-0@@ -1259,6 +1259,12 @@ S: MaintainedF:
drivers/misc/gsc.c
F:include/gsc.hMAINTAINERS +6
-0+GOLDFISH SERIAL DRIVER +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: drivers/serial/serial_goldfish.c +F: include/goldfish_tty.h +Applying: serial: Add Goldfish TTY driver Patch failed at 0001 serial: Add Goldfish TTY driver
error: patch failed: MAINTAINERS:1259
error:MAINTAINERS: patch does not applyQuoted 2 lines
Should a respin of the series be needed, please, check that the series applies to origin/next before sending.
To make sure I base the next version on the correct tree, should I base it on the ColdFire tree's next branch:
Quoted 7 lines
Quoted 5 lines
https://source.denx.de/u-boot/custodians/u-boot-coldfire.git
Or the main U-Boot repository's next branch:
The main U-Boot tree. Custodian trees are not always up to date (and
Thanks for the clarification.
I will base v5 on the main U-Boot tree's next branch.
Quoted 3 lines
with the renewed interest in m68k, I was going to ask if someone else would like to step up as co-maintainer as part of all of this, Angelo might like some help).
TBH, being relatively new to the U-Boot community, I'm not sure if I have gained enough trust or shown enough knowledge of the m68k code and development workflow just yet.
However, if help is needed, I'm happy to help review and test m68k-related patches.
Regards,
Kuan-Wei
Re: [PATCH v4 1/6] serial: Add Goldfish TTY driver
Quoted 78 lines · Kuan-Wei Chiu
Hi Tom,
Quoted 60 lines · Tom Rini
Quoted 59 lines · Kuan-Wei Chiu
Hi Heinrich,
Quoted 6 lines · Heinrich Schuchardt
Quoted 5 lines · Heinrich Schuchardt
Quoted 4 lines · Kuan-Wei Chiu
Add support for the Google Goldfish TTY serial device. This virtual device is commonly used in QEMU virtual machines (such as the m68k virt machine) and Android emulators.
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
The driver implements basic console output and input polling using the Goldfish MMIO interface.
Signed-off-by Kuan-Wei Chiu <[email protected]>Reviewed-by Yao Zi <[email protected]>Tested-by Daniel Palmer <[email protected]>Thanks for the review.
Quoted 33 lines
Quoted 14 lines
Quoted 14 lines
---
Changes in v4:
- Support DT probing with platform data as a fallback.MAINTAINERS | 6 ++ drivers/serial/Kconfig | 8 +++ drivers/serial/Makefile | 1 +
drivers/serial/serial_goldfish.c| 109 +++++++++++++++++++++++++++++++ include/goldfish_tty.h | 18 +++++5 files changed, 142 insertions(+)create mode 100644
drivers/serial/serial_goldfish.ccreate mode 100644include/goldfish_tty.hQuoted 13 lines
MAINTAINERS S: Maintained · line 1267
Quoted 13 lines
MAINTAINERS +0
-0@@ -1259,6 +1259,12 @@ S: MaintainedF:
drivers/misc/gsc.c
F:include/gsc.hMAINTAINERS +6
-0+GOLDFISH SERIAL DRIVER +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: drivers/serial/serial_goldfish.c +F: include/goldfish_tty.h +Applying: serial: Add Goldfish TTY driver Patch failed at 0001 serial: Add Goldfish TTY driver
error: patch failed: MAINTAINERS:1259
error:MAINTAINERS: patch does not applyQuoted 2 lines
Should a respin of the series be needed, please, check that the series applies to origin/next before sending.
To make sure I base the next version on the correct tree, should I base it on the ColdFire tree's next branch:
Quoted 7 lines
Quoted 5 lines
https://source.denx.de/u-boot/custodians/u-boot-coldfire.git
Or the main U-Boot repository's next branch:
The main U-Boot tree. Custodian trees are not always up to date (and
Thanks for the clarification.
I will base v5 on the main U-Boot tree's next branch.Quoted 3 lines
with the renewed interest in m68k, I was going to ask if someone else would like to step up as co-maintainer as part of all of this, Angelo might like some help).
Quoted 6 lines
TBH, being relatively new to the U-Boot community, I'm not sure if I have gained enough trust or shown enough knowledge of the m68k code and development workflow just yet.
However, if help is needed, I'm happy to help review and test m68k-related patches.
I understand, and yes, starting with reviewing things is fine. But this is also the most activity m68k has gotten in a decade or so, so I do believe you to be on the forefront of how the code is :)
Signature · 1 line
Tom
Re: [PATCH v4 1/6] serial: Add Goldfish TTY driver
Hi Tom,
Quoted 84 lines · Tom Rini
Quoted 82 lines · Kuan-Wei Chiu
Hi Tom,
Quoted 60 lines · Tom Rini
Quoted 59 lines · Kuan-Wei Chiu
Hi Heinrich,
Quoted 6 lines · Heinrich Schuchardt
Quoted 5 lines · Heinrich Schuchardt
Quoted 4 lines · Kuan-Wei Chiu
Add support for the Google Goldfish TTY serial device. This virtual device is commonly used in QEMU virtual machines (such as the m68k virt machine) and Android emulators.
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
The driver implements basic console output and input polling using the Goldfish MMIO interface.
Signed-off-by Kuan-Wei Chiu <[email protected]>Reviewed-by Yao Zi <[email protected]>Tested-by Daniel Palmer <[email protected]>Thanks for the review.
Quoted 33 lines
Quoted 14 lines
Quoted 14 lines
---
Changes in v4:
- Support DT probing with platform data as a fallback.MAINTAINERS | 6 ++ drivers/serial/Kconfig | 8 +++ drivers/serial/Makefile | 1 +
drivers/serial/serial_goldfish.c| 109 +++++++++++++++++++++++++++++++ include/goldfish_tty.h | 18 +++++5 files changed, 142 insertions(+)create mode 100644
drivers/serial/serial_goldfish.ccreate mode 100644include/goldfish_tty.hQuoted 13 lines
MAINTAINERS
Quoted 13 lines
MAINTAINERS +0
-0@@ -1259,6 +1259,12 @@ S: MaintainedF:
drivers/misc/gsc.c
F:include/gsc.hMAINTAINERS +6
-0+GOLDFISH SERIAL DRIVER +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: drivers/serial/serial_goldfish.c +F: include/goldfish_tty.h +Applying: serial: Add Goldfish TTY driver Patch failed at 0001 serial: Add Goldfish TTY driver
error: patch failed: MAINTAINERS:1259
error:MAINTAINERS: patch does not applyQuoted 2 lines
Should a respin of the series be needed, please, check that the series applies to origin/next before sending.
To make sure I base the next version on the correct tree, should I base it on the ColdFire tree's next branch:
Quoted 7 lines
Quoted 5 lines
https://source.denx.de/u-boot/custodians/u-boot-coldfire.git
Or the main U-Boot repository's next branch:
The main U-Boot tree. Custodian trees are not always up to date (and
Thanks for the clarification.
I will base v5 on the main U-Boot tree's next branch.Quoted 3 lines
with the renewed interest in m68k, I was going to ask if someone else would like to step up as co-maintainer as part of all of this, Angelo might like some help).
TBH, being relatively new to the U-Boot community, I'm not sure if I have gained enough trust or shown enough knowledge of the m68k code and development workflow just yet.
Quoted 6 lines
Quoted 2 lines
However, if help is needed, I'm happy to help review and test m68k-related patches.
I understand, and yes, starting with reviewing things is fine. But this is also the most activity m68k has gotten in a decade or so, so I do believe you to be on the forefront of how the code is :)
Thanks for the kind words.
In that case, I'll append a patch to the end of the v5 series to add myself to the m68k entry in MAINTAINERS (after Angelo), so I will be notified of m68k patches to help with review and testing.
Regards,
Kuan-Wei
PATCH v4 2/6 timer: Add Goldfish timer driver
In reply to Kuan-Wei ChiuAdd support for the Goldfish timer driver. This driver utilizes the Goldfish RTC hardware to provide a nanosecond-resolution timer. This virtual device is commonly found in QEMU virtual machines (such as the m68k virt machine) and Android emulators.
The driver implements the standard U-Boot timer UCLASS interface, exposing a 64-bit monotonically increasing counter with a 1GHz clock rate derived from the RTC registers.
---
Changes in v4:
- Sort headers alphabetically.
- Add comment explaining read latching behavior.
- Support DT probing with platform data as a fallback.
MAINTAINERS | 6 +++ drivers/timer/Kconfig | 8 ++++ drivers/timer/Makefile | 1 + drivers/timer/goldfish_timer.c | 81 ++++++++++++++++++++++++++++++++++ include/goldfish_timer.h | 13 ++++++ 5 files changed, 109 insertions(+) create mode 100644 drivers/timer/goldfish_timer.c create mode 100644 include/goldfish_timer.h
MAINTAINERS +6 -0
@@ -1265,6 +1265,12 @@ S: Maintained F: drivers/serial/serial_goldfish.c F: include/goldfish_tty.h +GOLDFISH TIMER DRIVER +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: drivers/timer/goldfish_timer.c +F: include/goldfish_timer.h + I2C M: Heiko Schocher <[email protected]> S: Maintained
drivers/timer/Kconfig +8 -0
@@ -340,4 +340,12 @@ config STARFIVE_TIMER Select this to enable support for the timer found on Starfive SoC. +config GOLDFISH_TIMER + bool "Goldfish Timer support" + depends on TIMER + help + Select this to enable support for the Goldfish Timer. + It uses the Goldfish RTC hardware to provide a nanosecond-resolution + timer, commonly found in QEMU virt machines. + endmenu
drivers/timer/Makefile +1 -0
@@ -36,3 +36,4 @@ obj-$(CONFIG_MCHP_PIT64B_TIMER) += mchp-pit64b-timer.o obj-$(CONFIG_IMX_GPT_TIMER) += imx-gpt-timer.o obj-$(CONFIG_XILINX_TIMER) += xilinx-timer.o obj-$(CONFIG_STARFIVE_TIMER) += starfive-timer.o +obj-$(CONFIG_GOLDFISH_TIMER) += goldfish_timer.o
drivers/timer/goldfish_timer.c new file +81 -0
81 lines not on this page · raw message
include/goldfish_timer.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +*/ + +#ifndef _GOLDFISH_TIMER_H_ +#define _GOLDFISH_TIMER_H_ + +struct goldfish_timer_plat { +void __iomem *base; +}; + +#endif /* _GOLDFISH_TIMER_H_ */
Signature · 1 line
2.52.0.358.g0dd7633a29-goog
PATCH v4 3/6 rtc: goldfish: Support platform data for non-DT probing
In reply to Kuan-Wei ChiuCurrently, the Goldfish RTC driver exclusively relies on device tree to retrieve the base address, failing immediately if dev_read_addr() returns FDT_ADDR_T_NONE. This restriction prevents the driver from being used on platforms that instantiate devices via U_BOOT_DRVINFO() instead of device tree, such as the QEMU m68k virt machine.
Add support for platform data to address this limitation. Update the probe function to fall back to retrieving the base address from struct goldfish_rtc_plat if the device tree address is unavailable. Introduce a new header file include/goldfish_rtc.h to define the platform data structure.
---
Changes in v4:
- Fix sandbox build warning by removing incorrect pointer casting.
- Assign plat->base directly to priv->base instead of using map_sysmem() for platform data.
drivers/rtc/goldfish_rtc.c | 13 ++++++++++--- include/goldfish_rtc.h | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 include/goldfish_rtc.h
drivers/rtc/goldfish_rtc.c +10 -3
@@ -9,6 +9,7 @@#include <div64.h> #include <dm.h> +#include <goldfish_rtc.h> #include <mapmem.h> #include <rtc.h> #include <linux/io.h>
@@ -77,12 +78,18 @@ static int goldfish_rtc_set(struct udevice *dev, const struct rtc_time *time)static int goldfish_rtc_probe (struct udevice *dev) {struct goldfish_rtc *priv =dev_get_priv (dev); +struct goldfish_rtc_plat *plat;fdt_addr_t addr; addr =dev_read_addr (dev); -if (addr ==FDT_ADDR_T_NONE ) -return -EINVAL ; - priv->base =map_sysmem (addr,0x20 ); +if (addr !=FDT_ADDR_T_NONE ) { + priv->base =map_sysmem (addr,0x20 ); + }else { + plat =dev_get_plat (dev); +if (!plat) +return -EINVAL ; + priv->base = plat->base; + }return 0 ; }
include/goldfish_rtc.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +*/ + +#ifndef _GOLDFISH_RTC_H_ +#define _GOLDFISH_RTC_H_ + +#include <linux/types.h> + +struct goldfish_rtc_plat { +void __iomem *base; +}; + +#endif /* _GOLDFISH_RTC_H_ */
Signature · 1 line
2.52.0.358.g0dd7633a29-goog
Re: [PATCH v4 3/6] rtc: goldfish: Support platform data for non-DT probing
Quoted 6 lines · Kuan-Wei Chiu
Currently, the Goldfish RTC driver exclusively relies on device tree to retrieve the base address, failing immediately if
dev_read_addr()returnsFDT_ADDR_T_NONE. This restriction prevents the driver from being used on platforms that instantiate devices viaU_BOOT_DRVINFO()instead of device tree, such as the QEMU m68k virt machine.
Quoted 7 lines
Add support for platform data to address this limitation. Update the probe function to fall back to retrieving the base address from struct
goldfish_rtc_platif the device tree address is unavailable. Introduce a new header fileinclude/goldfish_rtc.hto define the platform data structure.Signed-off-by Kuan-Wei Chiu <[email protected]>
Quoted 66 lines
---
Changes in v4:
- Fix sandbox build warning by removing incorrect pointer casting.
- Assignplat->basedirectly topriv->baseinstead of usingmap_sysmem()for platform data.drivers/rtc/goldfish_rtc.c | 13 ++++++++++--- include/goldfish_rtc.h | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-)create mode 100644
include/goldfish_rtc.hdrivers/rtc/goldfish_rtc.c +10
-3@@ -9,6 +9,7 @@#include <div64.h> #include <dm.h> +#include <goldfish_rtc.h> #include <mapmem.h> #include <rtc.h> #include <linux/io.h> @@ -77,12 +78,18 @@ static int goldfish_rtc_set(struct udevice *dev, const struct rtc_time *time)static int goldfish_rtc_probe (struct udevice *dev) {struct goldfish_rtc *priv =dev_get_priv (dev); +struct goldfish_rtc_plat *plat;fdt_addr_t addr; addr =dev_read_addr (dev); -if (addr ==FDT_ADDR_T_NONE ) -return -EINVAL ; - priv->base =map_sysmem (addr,0x20 ); +if (addr !=FDT_ADDR_T_NONE ) { + priv->base =map_sysmem (addr,0x20 ); + }else { + plat =dev_get_plat (dev); +if (!plat) +return -EINVAL ; + priv->base = plat->base; + }return 0 ; }include/goldfish_rtc.h new file +15
-0@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +*/ + +#ifndef _GOLDFISH_RTC_H_ +#define _GOLDFISH_RTC_H_ + +#include <linux/types.h> + +struct goldfish_rtc_plat { +void __iomem *base; +}; + +#endif /* _GOLDFISH_RTC_H_ */
PATCH v4 4/6 m68k: Add support for M68040 CPU
In reply to Kuan-Wei ChiuAdd support for the Motorola 68040 architecture. Currently, m68k support in U-Boot is primarily focused on ColdFire variants. Introduce the necessary infrastructure to support the classic M680x0 series, specifically targeting the M68040 as emulated by QEMU.
The implementation includes exception vectors, early startup code, and minimal CPU initialization and relocation stubs. It also defines the standard m68k boot information structure used for passing hardware information to the operating system. To ensure compatibility, ColdFire- specific library objects such as cache and interrupt handling are excluded from the build when M68040 is selected.
Additionally, apply a specific workaround during the early memory reservation stage. Use a manual loop to clear global data instead of the standard memset() function, as utilizing memset() at this point was observed to cause a hang on the QEMU platform.
---
No changes in v4.
MAINTAINERS | 6 +++ arch/m68k/Kconfig | 16 +++++++ arch/m68k/Makefile | 1 + arch/m68k/config.mk | 10 ++++- arch/m68k/cpu/m680x0/Makefile | 6 +++ arch/m68k/cpu/m680x0/cpu.c | 72 +++++++++++++++++++++++++++++++ arch/m68k/cpu/m680x0/start.S | 73 ++++++++++++++++++++++++++++++++ arch/m68k/cpu/m680x0/u-boot.lds | 47 ++++++++++++++++++++ arch/m68k/include/asm/bootinfo.h | 31 ++++++++++++++ arch/m68k/lib/Makefile | 9 ++-- 10 files changed, 263 insertions(+), 8 deletions(-) create mode 100644 arch/m68k/cpu/m680x0/Makefile create mode 100644 arch/m68k/cpu/m680x0/cpu.c create mode 100644 arch/m68k/cpu/m680x0/start.S create mode 100644 arch/m68k/cpu/m680x0/u-boot.lds create mode 100644 arch/m68k/include/asm/bootinfo.h
MAINTAINERS +6 -0
@@ -1312,6 +1312,12 @@ F: lib/getopt.c F: test/log/ F: test/py/tests/test_log.py +M680X0 ARCHITECTURE +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: arch/m68k/cpu/m680x0/ +F: arch/m68k/include/asm/bootinfo.h + MALI DISPLAY PROCESSORS M: Liviu Dudau <[email protected]> S: Supported
arch/m68k/Kconfig +16 -0
@@ -56,6 +56,9 @@ config MCF5441x select DM_SERIAL bool +config M680x0 + bool + # processor type config M5208 bool
@@ -110,6 +113,10 @@ config M54418 bool select MCF5441x +config M68040 + bool + select M680x0 + # peripherals config CF_DSPI bool
@@ -178,6 +185,15 @@ config TARGET_STMARK2 endchoice +config SYS_CPU + string + default "mcf52x2" if MCF52x2 + default "mcf523x" if MCF523x + default "mcf530x" if MCF530x + default "mcf532x" if MCF532x + default "mcf5445x" if MCF5445x + default "m680x0" if M680x0 + source "board/BuS/eb_cpu5282/Kconfig" source "board/cobra5272/Kconfig" source "board/freescale/m5208evbe/Kconfig"
arch/m68k/Makefile +1 -0
@@ -17,6 +17,7 @@ cpuflags-$(CONFIG_M5307) := -mcpu=5307 cpuflags-$(CONFIG_MCF5301x) := -mcpu=53015 -fPIC cpuflags-$(CONFIG_MCF532x) := -mcpu=5329 -fPIC cpuflags-$(CONFIG_MCF5441x) := -mcpu=54418 -fPIC +cpuflags-$(CONFIG_M68040) := -mcpu=68040 -fno-pic PLATFORM_CPPFLAGS += $(cpuflags-y)
arch/m68k/config.mk +8 -2
@@ -3,8 +3,14 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, [email protected]. -PLATFORM_CPPFLAGS += -D__M68K__ -fPIC +PLATFORM_CPPFLAGS += -D__M68K__ +ifneq ($(CONFIG_M680x0),y) +PLATFORM_CPPFLAGS += -fPIC +endif KBUILD_LDFLAGS += -n -pie PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -PLATFORM_RELFLAGS += -ffixed-d7 -msep-data +PLATFORM_RELFLAGS += -ffixed-d7 +ifneq ($(CONFIG_M680x0),y) +PLATFORM_RELFLAGS += -msep-data +endif LDFLAGS_FINAL += --gc-sections -pie
arch/m68k/cpu/m680x0/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> + +extra-y += start.o +obj-y += cpu.o
arch/m68k/cpu/m680x0/cpu.c new file +72 -0
72 lines not on this page · raw message
arch/m68k/cpu/m680x0/start.S new file +73 -0
73 lines not on this page · raw message
arch/m68k/cpu/m680x0/u-boot.lds new file +47 -0
47 lines not on this page · raw message
arch/m68k/include/asm/bootinfo.h new file +31 -0
@@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +* +* Definitions for the m68k bootinfo interface. +*/ + +#ifndef _ASM_M68K_BOOTINFO_H +#define _ASM_M68K_BOOTINFO_H + +#ifndef __ASSEMBLY__ + +struct bi_record { +unsigned short tag;/* tag ID */ +unsigned short size;/* size of record (in bytes) */ +unsigned long data[0 ];/* data */ +}; + +#endif /* __ASSEMBLY__ */ + +/* Bootinfo Tag IDs */ +#define BI_LAST 0x0000 +#define BI_MACHTYPE 0x0001 +#define BI_CPUTYPE 0x0002 +#define BI_FPUTYPE 0x0003 +#define BI_MMUTYPE 0x0004 +#define BI_MEMCHUNK 0x0005 +#define BI_RAMDISK 0x0006 +#define BI_COMMAND_LINE 0x0007 + +#endif /* _ASM_M68K_BOOTINFO_H */
arch/m68k/lib/Makefile +3 -6
@@ -7,10 +7,7 @@ ## if the user asked for it lib-$(CONFIG_USE_PRIVATE_LIBGCC) += lshrdi3.o muldi3.o ashldi3.o ashrdi3.o -obj-y += bdinfo.o obj-$(CONFIG_CMD_BOOTM) += bootm.o -obj-y += cache.o -obj-y += interrupts.o -obj-y += time.o -obj-y += traps.o -obj-y += fec.o +ifndef CONFIG_M680x0 +obj-y += cache.o interrupts.o time.o traps.o bdinfo.o fec.o +endif
Signature · 1 line
2.52.0.358.g0dd7633a29-goog
PATCH v4 5/6 board: Add QEMU m68k virt board support
In reply to Kuan-Wei ChiuAdd support for the QEMU 'virt' machine on the m68k architecture. This board emulates a generic machine based on the Motorola 68040 CPU equipped with Goldfish virtual peripherals.
Introduce the necessary board configuration and initialization infrastructure. The implementation includes logic to parse the QEMU bootinfo interface, enabling dynamic detection of system RAM size to adapt to the virtual machine's configuration.
Enable the Goldfish TTY driver for serial console output. Additionally, enable Goldfish RTC and timer drivers to support real-time clock functionality and nanosecond-resolution delays. Include comprehensive documentation covering build instructions and usage examples.
---
No changes in v4.
arch/m68k/Kconfig | 8 ++ board/emulation/qemu-m68k/Kconfig | 12 +++ board/emulation/qemu-m68k/MAINTAINERS | 8 ++ board/emulation/qemu-m68k/Makefile | 5 ++ board/emulation/qemu-m68k/qemu-m68k.c | 115 ++++++++++++++++++++++++++ configs/qemu-m68k_defconfig | 16 ++++ doc/board/emulation/index.rst | 1 + doc/board/emulation/qemu-m68k.rst | 39 +++++++++ include/configs/qemu-m68k.h | 18 ++++ 9 files changed, 222 insertions(+) create mode 100644 board/emulation/qemu-m68k/Kconfig create mode 100644 board/emulation/qemu-m68k/MAINTAINERS create mode 100644 board/emulation/qemu-m68k/Makefile create mode 100644 board/emulation/qemu-m68k/qemu-m68k.c create mode 100644 configs/qemu-m68k_defconfig create mode 100644 doc/board/emulation/qemu-m68k.rst create mode 100644 include/configs/qemu-m68k.h
arch/m68k/Kconfig +8 -0
@@ -183,6 +183,13 @@ config TARGET_STMARK2 select CF_DSPI select M54418 +config TARGET_QEMU_M68K + bool "Support QEMU m68k virt" + select M68040 + help + This target supports the QEMU m68k virtual machine (-M virt). + It simulates a Motorola 68040 CPU with Goldfish peripherals. + endchoice config SYS_CPU
@@ -208,6 +215,7 @@ source "board/freescale/m5329evb/Kconfig" source "board/freescale/m5373evb/Kconfig" source "board/sysam/amcore/Kconfig" source "board/sysam/stmark2/Kconfig" +source "board/emulation/qemu-m68k/Kconfig" config M68K_QEMU bool "Build with workarounds for incomplete QEMU emulation"
board/emulation/qemu-m68k/Kconfig new file +12 -0
@@ -0,0 +1,12 @@ +if TARGET_QEMU_M68K + +config SYS_BOARD + default "qemu-m68k" + +config SYS_VENDOR + default "emulation" + +config SYS_CONFIG_NAME + default "qemu-m68k" + +endif
board/emulation/qemu-m68k/MAINTAINERS new file +8 -0
@@ -0,0 +1,8 @@ +QEMU M68K VIRT BOARD +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: board/emulation/qemu-m68k/ +F: board/emulation/common/ +F: include/configs/qemu-m68k.h +F: configs/qemu-m68k_defconfig +F: doc/board/emulation/qemu-m68k.rst
board/emulation/qemu-m68k/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> + +obj-y += qemu-m68k.o
board/emulation/qemu-m68k/qemu-m68k.c new file +115 -0
115 lines not on this page · raw message
configs/qemu-m68k_defconfig new file +16 -0
@@ -0,0 +1,16 @@ +CONFIG_M68K=y +CONFIG_TEXT_BASE=0x00000000 +CONFIG_SYS_MALLOC_LEN=0x20000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_SYS_MONITOR_LEN=262144 +CONFIG_SYS_BOOTM_LEN=0x1000000 +CONFIG_SYS_LOAD_ADDR=0x00000000 +CONFIG_TARGET_QEMU_M68K=y +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_DM_RTC=y +CONFIG_RTC_GOLDFISH=y +CONFIG_DM_SERIAL=y +CONFIG_SERIAL_GOLDFISH=y +CONFIG_TIMER=y +CONFIG_GOLDFISH_TIMER=y
doc/board/emulation/index.rst +1 -0
@@ -15,6 +15,7 @@ Emulation qemu-sbsa qemu-x86 qemu-xtensa + qemu-m68k Also see
doc/board/emulation/qemu-m68k.rst new file +39 -0
@@ -0,0 +1,39 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later +.. Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> + +QEMU m68k +========= + +QEMU for m68k supports a special 'virt' machine designed for emulation and +virtualization purposes. This document describes how to run U-Boot under it. + +The QEMU virt machine models a generic m68k virtual machine with Goldfish +interfaces. It supports the Motorola 68040 CPU architecture. + +Building U-Boot +--------------- +Set the CROSS_COMPILE environment variable to your m68k toolchain, and run: + +.. code-block:: bash + + export CROSS_COMPILE=m68k-linux-gnu- + make qemu-m68k_defconfig + make + +Running U-Boot +-------------- +The minimal QEMU command line to get U-Boot up and running is: + +.. code-block:: bash + + qemu-system-m68k -M virt -cpu m68040 -nographic -kernel u-boot + +Note that the `-nographic` option is used to redirect the console to stdio, +which connects to the emulated Goldfish TTY device. + +Hardware Support +---------------- +The following QEMU virt peripherals are supported in U-Boot: + +* Goldfish TTY (Serial Console) +* Goldfish RTC (Real Time Clock)
include/configs/qemu-m68k.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +*/ + +#ifndef __QEMU_M68K_H +#define __QEMU_M68K_H + +/* Memory Configuration */ +#define CFG_SYS_SDRAM_BASE 0x00000000 + +/* +* Initial Stack Pointer: +* Place the stack at 4MB offset to avoid overwriting U-Boot code/data. +*/ +#define CFG_SYS_INIT_SP_ADDR (CFG_SYS_SDRAM_BASE + 0x400000) + +#endif /* __QEMU_M68K_H */
Signature · 1 line
2.52.0.358.g0dd7633a29-goog
Re: [PATCH v4 5/6] board: Add QEMU m68k virt board support
Quoted 42 lines · Kuan-Wei Chiu
Add support for the QEMU 'virt' machine on the m68k architecture. This board emulates a generic machine based on the Motorola 68040 CPU equipped with Goldfish virtual peripherals.
Introduce the necessary board configuration and initialization infrastructure. The implementation includes logic to parse the QEMU bootinfo interface, enabling dynamic detection of system RAM size to adapt to the virtual machine's configuration.
Enable the Goldfish TTY driver for serial console output. Additionally, enable Goldfish RTC and timer drivers to support real-time clock functionality and nanosecond-resolution delays. Include comprehensive documentation covering build instructions and usage examples.
Signed-off-by Kuan-Wei Chiu <[email protected]>Tested-by Daniel Palmer <[email protected]>---
No changes in v4.arch/m68k/Kconfig | 8 ++ board/emulation/qemu-m68k/Kconfig | 12 +++ board/emulation/qemu-m68k/MAINTAINERS | 8 ++ board/emulation/qemu-m68k/Makefile | 5 ++ board/emulation/qemu-m68k/qemu-m68k.c | 115 ++++++++++++++++++++++++++ configs/qemu-m68k_defconfig | 16 ++++ doc/board/emulation/index.rst | 1 + doc/board/emulation/qemu-m68k.rst | 39 +++++++++ include/configs/qemu-m68k.h | 18 ++++ 9 files changed, 222 insertions(+)create mode 100644 board/emulation/qemu-m68k/Kconfig create mode 100644 board/emulation/qemu-m68k/MAINTAINERS create mode 100644 board/emulation/qemu-m68k/Makefile create mode 100644
board/emulation/qemu-m68k/qemu-m68k.ccreate mode 100644 configs/qemu-m68k_defconfig create mode 100644doc/board/emulation/qemu-m68k.rstcreate mode 100644include/configs/qemu-m68k.harch/m68k/Kconfig +0
-0
arch/m68k/Kconfig config TARGET_STMARK2 · line 188
Quoted 6 lines
arch/m68k/Kconfig +3
-0@@ -183,6 +183,13 @@ config TARGET_STMARK2 select CF_DSPI select M54418 +config TARGET_QEMU_M68K + bool "Support QEMU m68k virt" + select M68040
Not even the dm command is available on the board by default. How about letting TARGET_QEMU_M68K imply CMD_DM like other targets do?
Best regards
Heinrich
Quoted 282 lines
arch/m68k/Kconfig +5
-0+ help + This target supports the QEMU m68k virtual machine (-M virt). + It simulates a Motorola 68040 CPU with Goldfish peripherals. + endchoice config SYS_CPU@@ -208,6 +215,7 @@ source "board/freescale/m5329evb/Kconfig" source "board/freescale/m5373evb/Kconfig" source "board/sysam/amcore/Kconfig" source "board/sysam/stmark2/Kconfig" +source "board/emulation/qemu-m68k/Kconfig" config M68K_QEMU bool "Build with workarounds for incomplete QEMU emulation"board/emulation/qemu-m68k/Kconfig new file +12
-0@@ -0,0 +1,12 @@ +if TARGET_QEMU_M68K + +config SYS_BOARD + default "qemu-m68k" + +config SYS_VENDOR + default "emulation" + +config SYS_CONFIG_NAME + default "qemu-m68k" + +endifboard/emulation/qemu-m68k/MAINTAINERS new file +8
-0@@ -0,0 +1,8 @@ +QEMU M68K VIRT BOARD +M: Kuan-Wei Chiu <[email protected]> +S: Maintained +F: board/emulation/qemu-m68k/ +F: board/emulation/common/ +F: include/configs/qemu-m68k.h +F: configs/qemu-m68k_defconfig +F: doc/board/emulation/qemu-m68k.rstboard/emulation/qemu-m68k/Makefile new file +5
-0@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> + +obj-y += qemu-m68k.oboard/emulation/qemu-m68k/qemu-m68k.c new file +115
-0@@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +*/ + +#include <asm-generic/sections.h> +#include <asm/bootinfo.h> +#include <asm/global_data.h> +#include <asm/io.h> +#include <config.h> +#include <dm/platdata.h> +#include <goldfish_rtc.h> +#include <goldfish_timer.h> +#include <goldfish_tty.h> +#include <init.h> +#include <linux/errno.h> +#include <serial.h> + +DECLARE_GLOBAL_DATA_PTR ; + +/* QEMU Virt Machine Hardware Map */ +#define VIRT_GF_RTC_MMIO_BASE 0xff007000 +#define VIRT_GF_TTY_MMIO_BASE 0xff008000 +#define VIRT_CTRL_MMIO_BASE 0xff009000 +#define VIRT_CTRL_RESET 0x01 + +/* +* Theoretical limit derivation: +* Max Bootinfo Size (Standard Page) = 4096 bytes +* Min Record Size (Tag + Size) = 4 bytes +* Max Records = 4096 / 4 = 1024 +*/ +#define MAX_BOOTINFO_RECORDS 1024 + +int board_early_init_f (void ) +{ +return 0 ; +} + +int checkboard (void ) +{ +puts ("Board: QEMU m68k virt\n" ); +return 0 ; +} + +int dram_init (void ) +{ +struct bi_record *record; +ulong addr; +int loops =0 ; + +/* Default: 16MB */ + gd->ram_size =0x01000000 ; + +/* QEMU places bootinfo after _end, aligned to 2 bytes */ + addr = (ulong)&_end; + addr =ALIGN (addr,2 ); + + record = (struct bi_record *)addr; + +if (record->tag !=BI_MACHTYPE ) +return 0 ; + +while (record->tag !=BI_LAST ) { +if (++loops >MAX_BOOTINFO_RECORDS ) +panic ("Bootinfo loop exceeded" ); +if (record->tag ==BI_MEMCHUNK ) { + gd->ram_size = record->data[1 ]; +break ; + } + record = (struct bi_record *)((ulong )record + record->size); + } + +return 0 ; +} + +void reset_cpu (unsigned long addr) +{ +writel (VIRT_CTRL_RESET ,VIRT_CTRL_MMIO_BASE ); +while (1 ) + ; +} + +int do_reset (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) +{ +reset_cpu (0 ); +return 0 ; +} + +static const struct goldfish_rtc_plat rtc_plat = { + .base = (void __iomem *)VIRT_GF_RTC_MMIO_BASE , +}; + +U_BOOT_DRVINFO (goldfish_rtc) = { + .name ="rtc_goldfish" , + .plat = &rtc_plat, +}; + +static const struct goldfish_timer_plat timer_plat = { + .base = (void __iomem *)VIRT_GF_RTC_MMIO_BASE , +}; + +U_BOOT_DRVINFO (goldfish_timer) = { + .name ="goldfish_timer" , + .plat = &timer_plat, +}; + +static const struct goldfish_tty_plat serial_plat = { + .base = (void __iomem *)VIRT_GF_TTY_MMIO_BASE , +}; + +U_BOOT_DRVINFO (goldfish_serial) = { + .name ="serial_goldfish" , + .plat = &serial_plat, +};configs/qemu-m68k_defconfig new file +16
-0@@ -0,0 +1,16 @@ +CONFIG_M68K=y +CONFIG_TEXT_BASE=0x00000000 +CONFIG_SYS_MALLOC_LEN=0x20000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_SYS_MONITOR_LEN=262144 +CONFIG_SYS_BOOTM_LEN=0x1000000 +CONFIG_SYS_LOAD_ADDR=0x00000000 +CONFIG_TARGET_QEMU_M68K=y +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_DM_RTC=y +CONFIG_RTC_GOLDFISH=y +CONFIG_DM_SERIAL=y +CONFIG_SERIAL_GOLDFISH=y +CONFIG_TIMER=y +CONFIG_GOLDFISH_TIMER=ydoc/board/emulation/index.rst +1
-0@@ -15,6 +15,7 @@ Emulation qemu-sbsa qemu-x86 qemu-xtensa + qemu-m68k Also seedoc/board/emulation/qemu-m68k.rst new file +39
-0@@ -0,0 +1,39 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later +.. Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> + +QEMU m68k +========= + +QEMU for m68k supports a special 'virt' machine designed for emulation and +virtualization purposes. This document describes how to run U-Boot under it. + +The QEMU virt machine models a generic m68k virtual machine with Goldfish +interfaces. It supports the Motorola 68040 CPU architecture. + +Building U-Boot +--------------- +Set the CROSS_COMPILE environment variable to your m68k toolchain, and run: + +.. code-block:: bash + + export CROSS_COMPILE=m68k-linux-gnu- + make qemu-m68k_defconfig + make + +Running U-Boot +-------------- +The minimal QEMU command line to get U-Boot up and running is: + +.. code-block:: bash + + qemu-system-m68k -M virt -cpu m68040 -nographic -kernel u-boot + +Note that the `-nographic` option is used to redirect the console to stdio, +which connects to the emulated Goldfish TTY device. + +Hardware Support +---------------- +The following QEMU virt peripherals are supported in U-Boot: + +* Goldfish TTY (Serial Console) +* Goldfish RTC (Real Time Clock)include/configs/qemu-m68k.h new file +18
-0@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2025, Kuan-Wei Chiu <[email protected]> +*/ + +#ifndef __QEMU_M68K_H +#define __QEMU_M68K_H + +/* Memory Configuration */ +#define CFG_SYS_SDRAM_BASE 0x00000000 + +/* +* Initial Stack Pointer: +* Place the stack at 4MB offset to avoid overwriting U-Boot code/data. +*/ +#define CFG_SYS_INIT_SP_ADDR (CFG_SYS_SDRAM_BASE + 0x400000) + +#endif /* __QEMU_M68K_H */
Re: [PATCH v4 5/6] board: Add QEMU m68k virt board support
Hi Heinrich,
Quoted 38 lines · Heinrich Schuchardt
Quoted 37 lines · Kuan-Wei Chiu
Add support for the QEMU 'virt' machine on the m68k architecture. This board emulates a generic machine based on the Motorola 68040 CPU equipped with Goldfish virtual peripherals.
Introduce the necessary board configuration and initialization infrastructure. The implementation includes logic to parse the QEMU bootinfo interface, enabling dynamic detection of system RAM size to adapt to the virtual machine's configuration.
Enable the Goldfish TTY driver for serial console output. Additionally, enable Goldfish RTC and timer drivers to support real-time clock functionality and nanosecond-resolution delays. Include comprehensive documentation covering build instructions and usage examples.
Signed-off-by Kuan-Wei Chiu <[email protected]>Tested-by Daniel Palmer <[email protected]>---
No changes in v4.arch/m68k/Kconfig | 8 ++ board/emulation/qemu-m68k/Kconfig | 12 +++ board/emulation/qemu-m68k/MAINTAINERS | 8 ++ board/emulation/qemu-m68k/Makefile | 5 ++ board/emulation/qemu-m68k/qemu-m68k.c | 115 ++++++++++++++++++++++++++ configs/qemu-m68k_defconfig | 16 ++++ doc/board/emulation/index.rst | 1 + doc/board/emulation/qemu-m68k.rst | 39 +++++++++ include/configs/qemu-m68k.h | 18 ++++ 9 files changed, 222 insertions(+)create mode 100644 board/emulation/qemu-m68k/Kconfig create mode 100644 board/emulation/qemu-m68k/MAINTAINERS create mode 100644 board/emulation/qemu-m68k/Makefile create mode 100644
board/emulation/qemu-m68k/qemu-m68k.ccreate mode 100644 configs/qemu-m68k_defconfig create mode 100644doc/board/emulation/qemu-m68k.rstcreate mode 100644include/configs/qemu-m68k.h
Quoted 13 lines
arch/m68k/Kconfig config TARGET_STMARK2 · line 187
Quoted 10 lines
arch/m68k/Kconfig +3
-0@@ -183,6 +183,13 @@ config TARGET_STMARK2 select CF_DSPI select M54418 +config TARGET_QEMU_M68K + bool "Support QEMU m68k virt" + select M68040Not even the dm command is available on the board by default. How about letting
TARGET_QEMU_M68KimplyCMD_DMlike other targets do?
Agreed.
Will add imply CMD_DM in the next version.
Regards,
Kuan-Wei
PATCH v4 6/6 CI: Add test jobs for QEMU m68k virt machine
In reply to Kuan-Wei ChiuEnable CI testing for the newly introduced QEMU m68k 'virt' board on both GitLab CI and Azure Pipelines. This ensures the new M68040 architecture support is built and booted correctly in the emulated environment.
---
No changes in v4.
.azure-pipelines.yml | 3 +++ .gitlab-ci.yml | 6 ++++++ 2 files changed, 9 insertions(+)
.azure-pipelines.yml +3 -0
@@ -518,6 +518,9 @@ stages: TEST_PY_ID: "--id qemu" TEST_PY_TEST_SPEC: "not sleep and not efi" OVERRIDE: "-a CONFIG_M68K_QEMU=y -a ~CONFIG_MCFTMR" + qemu_m68k_virt: + TEST_PY_BD: "qemu-m68k" + TEST_PY_TEST_SPEC: "not sleep" qemu_malta: TEST_PY_BD: "malta" TEST_PY_ID: "--id qemu"
.gitlab-ci.yml +6 -0
@@ -408,6 +408,12 @@ qemu_m68k test.py: OVERRIDE: "-a CONFIG_M68K_QEMU=y -a ~CONFIG_MCFTMR" <<: *buildman_and_testpy_dfn +qemu_m68k_virt test.py: + variables: + TEST_PY_BD: "qemu-m68k" + TEST_PY_TEST_SPEC: "not sleep" + <<: *buildman_and_testpy_dfn + qemu_malta test.py: variables: TEST_PY_BD: "malta"
Signature · 1 line
2.52.0.358.g0dd7633a29-goog