Skip to contentSkip to conversation

hw/xtensa: add virt machine

PATCH New Max Filippov 1 participant 1 message Oct 19, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/xtensa: add virt machine

virt machine is a sim machine with generic PCI host controller. Make common parts of sim machine initialization reusable. Add PCI controller at 0xf0000000 with PIO space at its base address, ECAM space at base address + 1M and MMIO space at base address + 64M. Connect IRQ lines to consecutive CPU external IRQ pins starting from 0. Instantiate network interfaces on virt machine.

Xtensa linux kernel configuration virt_defconfig can successfully boot on this machine.

---
 MAINTAINERS                        |   5 ++
 default-configs/xtensa-softmmu.mak |   1 +
 hw/xtensa/Kconfig                  |   6 ++
 hw/xtensa/Makefile.objs            |   1 +
 hw/xtensa/sim.c                    |  41 +++++----
 hw/xtensa/virt.c                   | 135 +++++++++++++++++++++++++++++
 hw/xtensa/xtensa_sim.h             |  34 ++++++++
 7 files changed, 208 insertions(+), 15 deletions(-)
 create mode 100644 hw/xtensa/virt.c
 create mode 100644 hw/xtensa/xtensa_sim.h
MAINTAINERS +5 -0
index 50eaf005f40e..7c2f35a2320f 100644
@@ -1302,6 +1302,11 @@ M: Max Filippov <[email protected]>
 S: Maintained
 F: hw/xtensa/sim.c
 
+virt
+M: Max Filippov <[email protected]>
+S: Maintained
+F: hw/xtensa/virt.c
+
 XTFPGA (LX60, LX200, ML605, KC705)
 M: Max Filippov <[email protected]>
 S: Maintained
default-configs/xtensa-softmmu.mak +1 -0
index 3aa20a47a7fb..4fe1bf00c94b 100644
@@ -5,4 +5,5 @@ CONFIG_SEMIHOSTING=y
 # Boards:
 #
 CONFIG_XTENSA_SIM=y
+CONFIG_XTENSA_VIRT=y
 CONFIG_XTENSA_XTFPGA=y
hw/xtensa/Kconfig +6 -0
index d72817d012e3..0740657ea58f 100644
@@ -1,6 +1,12 @@
 config XTENSA_SIM
     bool
 
+config XTENSA_VIRT
+    bool
+    select XTENSA_SIM
+    select PCI_EXPRESS_GENERIC_BRIDGE
+    select PCI_DEVICES
+
 config XTENSA_XTFPGA
     bool
     select OPENCORES_ETH
hw/xtensa/Makefile.objs +1 -0
index 0bbfccd6deae..2b40e1b60a0e 100644
@@ -2,4 +2,5 @@ obj-y += mx_pic.o
 obj-y += pic_cpu.o
 obj-y += xtensa_memory.o
 obj-$(CONFIG_XTENSA_SIM) += sim.o
+obj-$(CONFIG_XTENSA_VIRT) += virt.o
 obj-$(CONFIG_XTENSA_XTFPGA) += xtfpga.o
hw/xtensa/sim.c +26 -15

74 lines not on this page · raw message

hw/xtensa/virt.c new file +135 -0

135 lines not on this page · raw message

hw/xtensa/xtensa_sim.h new file +34 -0
new file mode 100644
index 000000000000..bdc92f3d2c39
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019, Max Filippov, Open Source and Linux Lab.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the Open Source and Linux Lab nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef XTENSA_SIM_H
+#define XTENSA_SIM_H
+
+XtensaCPU *xtensa_sim_common_init(MachineState *machine);
+void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine);
+
+#endif
Signature · 1 line
2.20.1