From: Bin Meng <bin.meng@processmission.com>
To: QEMU <qemu-devel@nongnu.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-arm@nongnu.org
Subject: [PATCH 28/33] hw/arm: phytium: Add Phytium E2000 AHCI controllers
Date: Thu, 3 Sep 2026 19:25:08 +0800 [thread overview]
Message-ID: <20260903112532.3276678-29-bin.meng@processmission.com> (raw)
In-Reply-To: <20260903112532.3276678-1-bin.meng@processmission.com>
Add the two single-port sysbus AHCI controllers integrated in the E2000
SoC and route their interrupts to the GIC. Both boards expose the fixed
controller blocks, but Phytium Pi does not wire either controller to a
SATA disk and therefore rejects an IDE backend.
The physical COMe board wires its boot SSD to the second controller.
Attach its SATA backend to AHCI1 so that U-Boot and Linux observe the
same controller order as on hardware.
Signed-off-by: Bin Meng <bin.meng@processmission.com>
---
hw/arm/Kconfig | 3 +++
hw/arm/phytium_e2000.c | 54 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 940457b58b..11c16bbebc 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -131,10 +131,13 @@ config PHYTIUM_E2000
default y
depends on TCG && AARCH64
imply PCI_DEVICES
+ select AHCI_SYSBUS
select ARM_GIC
select CADENCE
select DESIGNWARE_I2C
select DW_MCI
+ select IDE_BUS
+ select IDE_DEV
select PCI_EXPRESS
select PCI_EXPRESS_GENERIC_BRIDGE
select PHYTIUM_E2000_QSPI
diff --git a/hw/arm/phytium_e2000.c b/hw/arm/phytium_e2000.c
index 499f5e0ffb..3acd9b716b 100644
--- a/hw/arm/phytium_e2000.c
+++ b/hw/arm/phytium_e2000.c
@@ -26,6 +26,8 @@
#include "hw/char/pl011.h"
#include "hw/core/boards.h"
#include "hw/core/qdev-properties.h"
+#include "hw/ide/ahci-sysbus.h"
+#include "hw/ide/ide-bus.h"
#include "hw/intc/arm_gicv3_common.h"
#include "hw/intc/arm_gicv3_its_common.h"
#include "hw/i2c/designware_i2c.h"
@@ -63,6 +65,9 @@ OBJECT_DECLARE_TYPE(PhytiumE2000State, PhytiumE2000MachineClass,
#define PHYTIUM_E2000_NUM_MCIS 2
#define PHYTIUM_E2000_NUM_UARTS 7
#define PHYTIUM_E2000_NUM_XHCIS 2
+#define PHYTIUM_E2000_NUM_AHCIS 2
+#define PHYTIUM_E2000_NUM_SATA_PORTS 1
+#define PHYTIUM_E2000_SATA_BOOT_AHCI 1
#define PHYTIUM_E2000_NUM_GEMS 4
#define PHYTIUM_E2000_MHU_BASE 0x32a00000
@@ -97,10 +102,12 @@ enum {
PHYTIUM_E2000_BOARD_CTRL,
PHYTIUM_E2000_XHCI0,
PHYTIUM_E2000_XHCI1,
+ PHYTIUM_E2000_AHCI0,
PHYTIUM_E2000_GEM0,
PHYTIUM_E2000_GEM1,
PHYTIUM_E2000_GEM2,
PHYTIUM_E2000_GEM3,
+ PHYTIUM_E2000_AHCI1,
PHYTIUM_E2000_RNG_REGS,
PHYTIUM_E2000_PLATFORM_CTRL,
PHYTIUM_E2000_SECURITY_CTRL,
@@ -136,6 +143,7 @@ struct PhytiumE2000MachineClass {
const char *direct_boot_dtb;
const char *pbr_boot_mode;
const char *qspi_flash_model;
+ bool has_sata_boot;
};
/*
@@ -168,10 +176,12 @@ static const MemMapEntry phytium_e2000_memmap[] = {
[PHYTIUM_E2000_BOARD_CTRL] = { 0x31800000, 0x01400000 },
[PHYTIUM_E2000_XHCI0] = { 0x31a08000, 0x00018000 },
[PHYTIUM_E2000_XHCI1] = { 0x31a28000, 0x00018000 },
+ [PHYTIUM_E2000_AHCI0] = { 0x31a40000, 0x00001000 },
[PHYTIUM_E2000_GEM0] = { 0x3200c000, 0x00002000 },
[PHYTIUM_E2000_GEM1] = { 0x3200e000, 0x00002000 },
[PHYTIUM_E2000_GEM2] = { 0x32010000, 0x00002000 },
[PHYTIUM_E2000_GEM3] = { 0x32012000, 0x00002000 },
+ [PHYTIUM_E2000_AHCI1] = { 0x32014000, 0x00001000 },
[PHYTIUM_E2000_RNG_REGS] = { 0x32a36000, 0x00001000 },
[PHYTIUM_E2000_PLATFORM_CTRL] = { 0x32e40000, 0x00010000 },
[PHYTIUM_E2000_SECURITY_CTRL] = { 0x32f00000, 0x00001000 },
@@ -207,6 +217,11 @@ static const int phytium_e2000_xhci_irqmap[] = {
[1] = 17,
};
+static const int phytium_e2000_ahci_irqmap[] = {
+ [0] = 42,
+ [1] = 43,
+};
+
static const uint8_t phytium_e2000_gem_num_queues[] = { 8, 4, 4, 4 };
static const int phytium_e2000_gem_irqmap[PHYTIUM_E2000_NUM_GEMS]
@@ -403,6 +418,32 @@ static void phytium_e2000_create_gem(PhytiumE2000State *s, int index)
}
}
+static void phytium_e2000_create_ahci(PhytiumE2000State *s, int index,
+ bool attach_boot_disk)
+{
+ int map_idx = index ? PHYTIUM_E2000_AHCI1 : PHYTIUM_E2000_AHCI0;
+ DriveInfo *hd[PHYTIUM_E2000_NUM_SATA_PORTS] = {};
+ DeviceState *dev = qdev_new(TYPE_SYSBUS_AHCI);
+ SysbusAHCIState *sysahci;
+
+ /*
+ * The COMe boot disk is wired to the second fixed AHCI controller. U-Boot
+ * probes both controllers and exposes the only attached disk as scsi 0.
+ */
+ qdev_prop_set_uint32(dev, "num-ports", PHYTIUM_E2000_NUM_SATA_PORTS);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+ sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0,
+ phytium_e2000_memmap[map_idx].base);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
+ qdev_get_gpio_in(s->gic, phytium_e2000_ahci_irqmap[index]));
+
+ if (attach_boot_disk) {
+ sysahci = SYSBUS_AHCI(dev);
+ ide_drive_get(hd, ARRAY_SIZE(hd));
+ ahci_ide_create_devs(&sysahci->ahci, hd);
+ }
+}
+
static void phytium_e2000_create_xhci(PhytiumE2000State *s, int index)
{
int map_idx = PHYTIUM_E2000_XHCI0 + index;
@@ -932,6 +973,12 @@ static void phytium_e2000_init(MachineState *ms)
exit(1);
}
+ if (!pemc->has_sata_boot && drive_get_by_index(IF_IDE, 0)) {
+ error_report("%s does not expose a SATA boot disk; "
+ "use if=sd,index=0", pemc->machine_name);
+ exit(1);
+ }
+
phytium_e2000_reject_legacy_firmware(ms, pemc);
phytium_e2000_create_ram(s);
@@ -961,6 +1008,10 @@ static void phytium_e2000_init(MachineState *ms)
for (i = 0; i < PHYTIUM_E2000_NUM_XHCIS; i++) {
phytium_e2000_create_xhci(s, i);
}
+ for (i = 0; i < PHYTIUM_E2000_NUM_AHCIS; i++) {
+ phytium_e2000_create_ahci(s, i,
+ pemc->has_sata_boot && i == PHYTIUM_E2000_SATA_BOOT_AHCI);
+ }
for (i = 0; i < PHYTIUM_E2000_NUM_GEMS; i++) {
phytium_e2000_create_gem(s, i);
}
@@ -1040,6 +1091,7 @@ static void phytium_pi_class_init(ObjectClass *oc, const void *data)
pemc->machine_name = "phytium-pi";
pemc->direct_boot_dtb = "phytiumpi_firefly.dtb";
pemc->pbr_boot_mode = PHYTIUM_E2000_PBR_BOOT_MODE_SD0;
+ pemc->has_sata_boot = false;
}
static void phytium_e2000_come_class_init(ObjectClass *oc, const void *data)
@@ -1049,10 +1101,12 @@ static void phytium_e2000_come_class_init(ObjectClass *oc, const void *data)
PHYTIUM_E2000_MACHINE_CLASS(oc);
mc->desc = "Phytium E2000Q COMe Development Board";
+ mc->block_default_type = IF_IDE;
pemc->machine_name = "phytium-e2000-come";
pemc->direct_boot_dtb = "e2000q-come-board.dtb";
pemc->pbr_boot_mode = PHYTIUM_E2000_PBR_BOOT_MODE_QSPI;
pemc->qspi_flash_model = "gd25q128";
+ pemc->has_sata_boot = true;
}
static const TypeInfo phytium_e2000_base_info = {
--
2.53.0
next prev parent reply other threads:[~2026-09-03 11:32 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-03 11:24 [PATCH 00/33] hw/arm: Add Phytium E2000Q SoC and board support Bin Meng
2026-09-03 11:24 ` [PATCH 01/33] target/arm: Add Phytium FTC310 and FTC664 CPU models Bin Meng
2026-09-03 14:45 ` Alex Bennée
2026-09-05 3:39 ` Bin Meng
2026-09-03 11:24 ` [PATCH 02/33] hw/arm: Add basic Phytium Pi machine Bin Meng
2026-09-03 16:56 ` Philippe Mathieu-Daudé
2026-09-04 7:57 ` Bin Meng
2026-09-04 10:15 ` Philippe Mathieu-Daudé
2026-09-04 10:25 ` Daniel P. Berrangé
2026-09-04 10:28 ` Peter Maydell
2026-09-04 10:36 ` Daniel P. Berrangé
2026-09-04 10:47 ` Peter Maydell
2026-09-04 11:24 ` Philippe Mathieu-Daudé
2026-09-04 11:40 ` Daniel P. Berrangé
2026-09-04 10:25 ` Peter Maydell
2026-09-03 11:24 ` [PATCH 03/33] hw/arm: phytium: Add Phytium E2000 PCIe host Bin Meng
2026-09-03 11:24 ` [PATCH 05/33] hw/sd: Add Phytium E2000 MCI controller Bin Meng
2026-09-03 11:24 ` [PATCH 06/33] hw/arm: phytium: Connect Phytium E2000 MCI controllers Bin Meng
2026-09-03 11:24 ` [PATCH 08/33] hw/arm: phytium: Connect Phytium E2000 GEM controllers Bin Meng
2026-09-03 11:24 ` [PATCH 09/33] hw/misc: Add Phytium E2000 DDR status Bin Meng
2026-09-03 11:24 ` [PATCH 10/33] hw/arm: phytium: Connect the " Bin Meng
2026-09-03 11:24 ` [PATCH 11/33] hw/misc: Add Phytium E2000 MHU doorbell Bin Meng
2026-09-03 11:24 ` [PATCH 12/33] hw/arm: phytium: Connect the Phytium E2000 MHU Bin Meng
2026-09-03 11:24 ` [PATCH 13/33] hw/ssi: Add Phytium E2000 QSPI controller Bin Meng
2026-09-03 11:24 ` [PATCH 14/33] hw/arm: phytium: Connect the " Bin Meng
2026-09-03 11:24 ` [PATCH 15/33] hw/misc: Add Phytium E2000 PBR model Bin Meng
2026-09-03 11:24 ` [PATCH 16/33] hw/arm: phytium: Integrate the Phytium E2000 PBR Bin Meng
2026-09-03 11:24 ` [PATCH 17/33] hw/arm: phytium: Add Phytium E2000 control region placeholders Bin Meng
2026-09-03 11:24 ` [PATCH 18/33] hw/misc: Support Phytium E2000 SCMI CPU power control Bin Meng
2026-09-03 11:24 ` [PATCH 19/33] hw/arm: phytium: Select the Phytium E2000 PBR boot medium Bin Meng
2026-09-03 11:25 ` [PATCH 20/33] hw/arm: phytium: Connect the Phytium E2000 I2C controller Bin Meng
2026-09-03 11:25 ` [PATCH 21/33] hw/arm: phytium: Add Phytium E2000 xHCI controllers Bin Meng
2026-09-03 11:25 ` [PATCH 22/33] hw/misc: Model the Phytium E2000 random generator Bin Meng
2026-09-03 11:25 ` [PATCH 23/33] hw/arm: phytium: Connect " Bin Meng
2026-09-03 11:25 ` [PATCH 24/33] hw/arm: phytium: Support Phytium E2000 direct Linux boot Bin Meng
2026-09-03 11:25 ` [PATCH 25/33] hw/arm: phytium: Add Phytium E2000Q COMe machine Bin Meng
2026-09-03 11:25 ` [PATCH 27/33] hw/arm: phytium: Connect the Phytium E2000Q COMe QSPI flash Bin Meng
2026-09-03 11:25 ` Bin Meng [this message]
2026-09-03 11:25 ` [PATCH 29/33] hw/arm: Add Phytium E2000 Linux SCMI channel Bin Meng
2026-09-03 11:25 ` [PATCH 30/33] hw/arm: phytium: Connect the Phytium E2000 SMMUv3 Bin Meng
2026-09-03 11:25 ` [PATCH 31/33] docs/system/arm: Document Phytium E2000 machines Bin Meng
2026-09-03 11:25 ` [PATCH 32/33] tests/functional/aarch64: Add Phytium Pi boot tests Bin Meng
2026-09-03 14:38 ` Alex Bennée
2026-09-04 8:52 ` Bin Meng
2026-09-04 14:23 ` Alex Bennée
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=20260903112532.3276678-29-bin.meng@processmission.com \
--to=bin.meng@processmission.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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