[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] hw/arm/sbsa-ref: use XHCI to replace EHCI
From: |
Peter Maydell |
Subject: |
[PULL 02/11] hw/arm/sbsa-ref: use XHCI to replace EHCI |
Date: |
Tue, 4 Jul 2023 17:36:25 +0100 |
From: Yuquan Wang <wangyuquan1236@phytium.com.cn>
The current sbsa-ref cannot use EHCI controller which is only
able to do 32-bit DMA, since sbsa-ref doesn't have RAM below 4GB.
Hence, this uses XHCI to provide a usb controller with 64-bit
DMA capablity instead of EHCI.
We bump the platform version to 0.3 with this change. Although the
hardware at the USB controller address changes, the firmware and
Linux can both cope with this -- on an older non-XHCI-aware
firmware/kernel setup the probe routine simply fails and the guest
proceeds without any USB. (This isn't a loss of functionality,
because the old USB controller never worked in the first place.) So
we can call this a backwards-compatible change and only bump the
minor version.
Signed-off-by: Yuquan Wang <wangyuquan1236@phytium.com.cn>
Message-id: 20230621103847.447508-2-wangyuquan1236@phytium.com.cn
[PMM: tweaked commit message; add line to docs about what
changes in platform version 0.3]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
docs/system/arm/sbsa.rst | 5 ++++-
hw/arm/sbsa-ref.c | 23 +++++++++++++----------
hw/arm/Kconfig | 2 +-
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/docs/system/arm/sbsa.rst b/docs/system/arm/sbsa.rst
index a8e0b530a24..bca61608ff8 100644
--- a/docs/system/arm/sbsa.rst
+++ b/docs/system/arm/sbsa.rst
@@ -19,7 +19,7 @@ The ``sbsa-ref`` board supports:
- A configurable number of AArch64 CPUs
- GIC version 3
- System bus AHCI controller
- - System bus EHCI controller
+ - System bus XHCI controller
- CDROM and hard disc on AHCI bus
- E1000E ethernet card on PCIe bus
- Bochs display adapter on PCIe bus
@@ -68,3 +68,6 @@ Platform version changes:
0.2
GIC ITS information is present in devicetree.
+
+0.3
+ The USB controller is an XHCI device, not EHCI
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 82a28b2e0be..1a8519b868f 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -42,6 +42,7 @@
#include "hw/pci-host/gpex.h"
#include "hw/qdev-properties.h"
#include "hw/usb.h"
+#include "hw/usb/xhci.h"
#include "hw/char/pl011.h"
#include "hw/watchdog/sbsa_gwdt.h"
#include "net/net.h"
@@ -85,7 +86,7 @@ enum {
SBSA_SECURE_UART_MM,
SBSA_SECURE_MEM,
SBSA_AHCI,
- SBSA_EHCI,
+ SBSA_XHCI,
};
struct SBSAMachineState {
@@ -123,7 +124,7 @@ static const MemMapEntry sbsa_ref_memmap[] = {
[SBSA_SMMU] = { 0x60050000, 0x00020000 },
/* Space here reserved for more SMMUs */
[SBSA_AHCI] = { 0x60100000, 0x00010000 },
- [SBSA_EHCI] = { 0x60110000, 0x00010000 },
+ [SBSA_XHCI] = { 0x60110000, 0x00010000 },
/* Space here reserved for other devices */
[SBSA_PCIE_PIO] = { 0x7fff0000, 0x00010000 },
/* 32-bit address PCIE MMIO space */
@@ -143,7 +144,7 @@ static const int sbsa_ref_irqmap[] = {
[SBSA_SECURE_UART] = 8,
[SBSA_SECURE_UART_MM] = 9,
[SBSA_AHCI] = 10,
- [SBSA_EHCI] = 11,
+ [SBSA_XHCI] = 11,
[SBSA_SMMU] = 12, /* ... to 15 */
[SBSA_GWDT_WS0] = 16,
};
@@ -230,7 +231,7 @@ static void create_fdt(SBSAMachineState *sms)
* fw compatibility.
*/
qemu_fdt_setprop_cell(fdt, "/", "machine-version-major", 0);
- qemu_fdt_setprop_cell(fdt, "/", "machine-version-minor", 2);
+ qemu_fdt_setprop_cell(fdt, "/", "machine-version-minor", 3);
if (ms->numa_state->have_numa_distance) {
int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t);
@@ -604,13 +605,15 @@ static void create_ahci(const SBSAMachineState *sms)
}
}
-static void create_ehci(const SBSAMachineState *sms)
+static void create_xhci(const SBSAMachineState *sms)
{
- hwaddr base = sbsa_ref_memmap[SBSA_EHCI].base;
- int irq = sbsa_ref_irqmap[SBSA_EHCI];
+ hwaddr base = sbsa_ref_memmap[SBSA_XHCI].base;
+ int irq = sbsa_ref_irqmap[SBSA_XHCI];
+ DeviceState *dev = qdev_new(TYPE_XHCI_SYSBUS);
- sysbus_create_simple("platform-ehci-usb", base,
- qdev_get_gpio_in(sms->gic, irq));
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+ sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
+ sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(sms->gic,
irq));
}
static void create_smmu(const SBSAMachineState *sms, PCIBus *bus)
@@ -832,7 +835,7 @@ static void sbsa_ref_init(MachineState *machine)
create_ahci(sms);
- create_ehci(sms);
+ create_xhci(sms);
create_pcie(sms);
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 7de17d1e8c3..7e683484405 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -266,7 +266,7 @@ config SBSA_REF
select PL011 # UART
select PL031 # RTC
select PL061 # GPIO
- select USB_EHCI_SYSBUS
+ select USB_XHCI_SYSBUS
select WDT_SBSA
select BOCHS_DISPLAY
--
2.34.1
- [PULL 07/11] tests/tcg/aarch64: Add testcases for IC IVAU and dual-mapped code, (continued)
- [PULL 07/11] tests/tcg/aarch64: Add testcases for IC IVAU and dual-mapped code, Peter Maydell, 2023/07/04
- Re: [PULL 07/11] tests/tcg/aarch64: Add testcases for IC IVAU and dual-mapped code, Richard Henderson, 2023/07/05
- Re: [PULL 07/11] tests/tcg/aarch64: Add testcases for IC IVAU and dual-mapped code, Philippe Mathieu-Daudé, 2023/07/05
- Re: [PULL 07/11] tests/tcg/aarch64: Add testcases for IC IVAU and dual-mapped code, Richard Henderson, 2023/07/05
- Re: [PULL 07/11] tests/tcg/aarch64: Add testcases for IC IVAU and dual-mapped code, Peter Maydell, 2023/07/06
- Re: [PULL 07/11] tests/tcg/aarch64: Add testcases for IC IVAU and dual-mapped code, John Högberg, 2023/07/06
- Re: [PULL 07/11] tests/tcg/aarch64: Add testcases for IC IVAU and dual-mapped code, Peter Maydell, 2023/07/06
- Re: [PULL 07/11] tests/tcg/aarch64: Add testcases for IC IVAU and dual-mapped code, John Högberg, 2023/07/07
[PULL 06/11] target/arm: Handle IC IVAU to improve compatibility with JITs, Peter Maydell, 2023/07/04
[PULL 03/11] target/arm: Avoid splitting Zregs across lines in dump, Peter Maydell, 2023/07/04
[PULL 02/11] hw/arm/sbsa-ref: use XHCI to replace EHCI,
Peter Maydell <=
[PULL 04/11] target/arm: Dump ZA[] when active, Peter Maydell, 2023/07/04
[PULL 08/11] tests/qtest: xlnx-canfd-test: Fix code coverity issues, Peter Maydell, 2023/07/04
[PULL 05/11] target/arm: Fix SME full tile indexing, Peter Maydell, 2023/07/04
[PULL 10/11] hw: arm: allwinner-sramc: Set class_size, Peter Maydell, 2023/07/04
[PULL 09/11] target/arm: gdbstub: Guard M-profile code with CONFIG_TCG, Peter Maydell, 2023/07/04
[PULL 11/11] target/xtensa: Assert that interrupt level is within bounds, Peter Maydell, 2023/07/04
Re: [PULL 00/11] target-arm queue, Richard Henderson, 2023/07/05