2011-04-01 08:15:20 +04:00
|
|
|
/*
|
|
|
|
* QEMU PowerPC pSeries Logical Partition (aka sPAPR) hardware System Emulator
|
|
|
|
*
|
|
|
|
* Copyright (c) 2004-2007 Fabrice Bellard
|
|
|
|
* Copyright (c) 2007 Jocelyn Mayer
|
|
|
|
* Copyright (c) 2010 David Gibson, IBM Corporation.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
#include "sysemu.h"
|
|
|
|
#include "hw.h"
|
|
|
|
#include "elf.h"
|
2011-04-01 08:15:29 +04:00
|
|
|
#include "net.h"
|
2011-04-01 08:15:31 +04:00
|
|
|
#include "blockdev.h"
|
2011-09-30 01:39:10 +04:00
|
|
|
#include "cpus.h"
|
|
|
|
#include "kvm.h"
|
|
|
|
#include "kvm_ppc.h"
|
2011-04-01 08:15:20 +04:00
|
|
|
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/ppc.h"
|
|
|
|
#include "hw/loader.h"
|
|
|
|
|
|
|
|
#include "hw/spapr.h"
|
2011-04-01 08:15:21 +04:00
|
|
|
#include "hw/spapr_vio.h"
|
2011-10-30 21:16:46 +04:00
|
|
|
#include "hw/spapr_pci.h"
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
#include "hw/xics.h"
|
2011-04-01 08:15:20 +04:00
|
|
|
|
2011-08-09 19:57:37 +04:00
|
|
|
#include "kvm.h"
|
|
|
|
#include "kvm_ppc.h"
|
2011-10-30 21:16:46 +04:00
|
|
|
#include "pci.h"
|
2011-08-09 19:57:37 +04:00
|
|
|
|
2011-10-03 14:56:38 +04:00
|
|
|
#include "exec-memory.h"
|
|
|
|
|
2011-04-01 08:15:20 +04:00
|
|
|
#include <libfdt.h>
|
|
|
|
|
|
|
|
#define KERNEL_LOAD_ADDR 0x00000000
|
|
|
|
#define INITRD_LOAD_ADDR 0x02800000
|
|
|
|
#define FDT_MAX_SIZE 0x10000
|
2011-04-01 08:15:23 +04:00
|
|
|
#define RTAS_MAX_SIZE 0x10000
|
Add SLOF-based partition firmware for pSeries machine, allowing more boot options
Currently, the emulated pSeries machine requires the use of the
-kernel parameter in order to explicitly load a guest kernel. This
means booting from the virtual disk, cdrom or network is not possible.
This patch addresses this limitation by inserting a within-partition
firmware image (derived from the "SLOF" free Open Firmware project).
If -kernel is not specified, qemu will now load the SLOF image, which
has access to the qemu boot device list through the device tree, and
can boot from any of the usual virtual devices.
In order to support the new firmware, an extension to the emulated
machine/hypervisor is necessary. Unlike Linux, which expects
multi-CPU entry to be handled kexec() style, the SLOF firmware expects
only one CPU to be active at entry, and to use a hypervisor RTAS
method to enable the other CPUs one by one.
This patch also implements this 'start-cpu' method, so that SLOF can
start the secondary CPUs and marshal them into the kexec() holding
pattern ready for entry into the guest OS. Linux should, and in the
future might directly use the start-cpu method to enable initially
disabled CPUs, but for now it does require kexec() entry.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:34 +04:00
|
|
|
#define FW_MAX_SIZE 0x400000
|
|
|
|
#define FW_FILE_NAME "slof.bin"
|
|
|
|
|
2011-11-13 21:18:57 +04:00
|
|
|
#define MIN_RMA_SLOF 128UL
|
2011-04-01 08:15:20 +04:00
|
|
|
|
|
|
|
#define TIMEBASE_FREQ 512000000ULL
|
|
|
|
|
2011-04-19 05:54:50 +04:00
|
|
|
#define MAX_CPUS 256
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
#define XICS_IRQS 1024
|
2011-04-01 08:15:20 +04:00
|
|
|
|
2011-10-30 21:16:46 +04:00
|
|
|
#define SPAPR_PCI_BUID 0x800000020000001ULL
|
|
|
|
#define SPAPR_PCI_MEM_WIN_ADDR (0x10000000000ULL + 0xA0000000)
|
|
|
|
#define SPAPR_PCI_MEM_WIN_SIZE 0x20000000
|
|
|
|
#define SPAPR_PCI_IO_WIN_ADDR (0x10000000000ULL + 0x80000000)
|
|
|
|
|
2011-08-04 01:02:17 +04:00
|
|
|
#define PHANDLE_XICP 0x00001111
|
|
|
|
|
2011-04-01 08:15:20 +04:00
|
|
|
sPAPREnvironment *spapr;
|
|
|
|
|
2011-09-16 00:49:49 +04:00
|
|
|
qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num)
|
|
|
|
{
|
|
|
|
uint32_t irq;
|
|
|
|
qemu_irq qirq;
|
|
|
|
|
|
|
|
if (hint) {
|
|
|
|
irq = hint;
|
|
|
|
/* FIXME: we should probably check for collisions somehow */
|
|
|
|
} else {
|
|
|
|
irq = spapr->next_irq++;
|
|
|
|
}
|
|
|
|
|
|
|
|
qirq = xics_find_qirq(spapr->icp, irq);
|
|
|
|
if (!qirq) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (irq_num) {
|
|
|
|
*irq_num = irq;
|
|
|
|
}
|
|
|
|
|
|
|
|
return qirq;
|
|
|
|
}
|
|
|
|
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
static void *spapr_create_fdt_skel(const char *cpu_model,
|
2011-09-30 01:39:11 +04:00
|
|
|
target_phys_addr_t rma_size,
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
target_phys_addr_t initrd_base,
|
|
|
|
target_phys_addr_t initrd_size,
|
|
|
|
const char *boot_device,
|
|
|
|
const char *kernel_cmdline,
|
|
|
|
long hash_shift)
|
2011-04-01 08:15:20 +04:00
|
|
|
{
|
|
|
|
void *fdt;
|
2011-04-05 09:12:09 +04:00
|
|
|
CPUState *env;
|
2011-09-30 01:39:11 +04:00
|
|
|
uint64_t mem_reg_property_rma[] = { 0, cpu_to_be64(rma_size) };
|
|
|
|
uint64_t mem_reg_property_nonrma[] = { cpu_to_be64(rma_size),
|
|
|
|
cpu_to_be64(ram_size - rma_size) };
|
2011-04-01 08:15:20 +04:00
|
|
|
uint32_t start_prop = cpu_to_be32(initrd_base);
|
|
|
|
uint32_t end_prop = cpu_to_be32(initrd_base + initrd_size);
|
2011-04-01 08:15:22 +04:00
|
|
|
uint32_t pft_size_prop[] = {0, cpu_to_be32(hash_shift)};
|
2011-04-01 08:15:28 +04:00
|
|
|
char hypertas_prop[] = "hcall-pft\0hcall-term\0hcall-dabr\0hcall-interrupt"
|
2011-08-31 19:50:50 +04:00
|
|
|
"\0hcall-tce\0hcall-vio\0hcall-splpar\0hcall-bulk";
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
uint32_t interrupt_server_ranges_prop[] = {0, cpu_to_be32(smp_cpus)};
|
2011-04-01 08:15:20 +04:00
|
|
|
int i;
|
|
|
|
char *modelname;
|
2011-09-30 01:39:10 +04:00
|
|
|
int smt = kvmppc_smt_threads();
|
2011-04-01 08:15:20 +04:00
|
|
|
|
|
|
|
#define _FDT(exp) \
|
|
|
|
do { \
|
|
|
|
int ret = (exp); \
|
|
|
|
if (ret < 0) { \
|
|
|
|
fprintf(stderr, "qemu: error creating device tree: %s: %s\n", \
|
|
|
|
#exp, fdt_strerror(ret)); \
|
|
|
|
exit(1); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
fdt = g_malloc0(FDT_MAX_SIZE);
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_create(fdt, FDT_MAX_SIZE)));
|
|
|
|
|
|
|
|
_FDT((fdt_finish_reservemap(fdt)));
|
|
|
|
|
|
|
|
/* Root node */
|
|
|
|
_FDT((fdt_begin_node(fdt, "")));
|
|
|
|
_FDT((fdt_property_string(fdt, "device_type", "chrp")));
|
2011-04-19 05:54:51 +04:00
|
|
|
_FDT((fdt_property_string(fdt, "model", "IBM pSeries (emulated by qemu)")));
|
2011-04-01 08:15:20 +04:00
|
|
|
|
|
|
|
_FDT((fdt_property_cell(fdt, "#address-cells", 0x2)));
|
|
|
|
_FDT((fdt_property_cell(fdt, "#size-cells", 0x2)));
|
|
|
|
|
|
|
|
/* /chosen */
|
|
|
|
_FDT((fdt_begin_node(fdt, "chosen")));
|
|
|
|
|
|
|
|
_FDT((fdt_property_string(fdt, "bootargs", kernel_cmdline)));
|
|
|
|
_FDT((fdt_property(fdt, "linux,initrd-start",
|
|
|
|
&start_prop, sizeof(start_prop))));
|
|
|
|
_FDT((fdt_property(fdt, "linux,initrd-end",
|
|
|
|
&end_prop, sizeof(end_prop))));
|
Add SLOF-based partition firmware for pSeries machine, allowing more boot options
Currently, the emulated pSeries machine requires the use of the
-kernel parameter in order to explicitly load a guest kernel. This
means booting from the virtual disk, cdrom or network is not possible.
This patch addresses this limitation by inserting a within-partition
firmware image (derived from the "SLOF" free Open Firmware project).
If -kernel is not specified, qemu will now load the SLOF image, which
has access to the qemu boot device list through the device tree, and
can boot from any of the usual virtual devices.
In order to support the new firmware, an extension to the emulated
machine/hypervisor is necessary. Unlike Linux, which expects
multi-CPU entry to be handled kexec() style, the SLOF firmware expects
only one CPU to be active at entry, and to use a hypervisor RTAS
method to enable the other CPUs one by one.
This patch also implements this 'start-cpu' method, so that SLOF can
start the secondary CPUs and marshal them into the kexec() holding
pattern ready for entry into the guest OS. Linux should, and in the
future might directly use the start-cpu method to enable initially
disabled CPUs, but for now it does require kexec() entry.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:34 +04:00
|
|
|
_FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device)));
|
2011-04-01 08:15:20 +04:00
|
|
|
|
2011-10-30 21:16:46 +04:00
|
|
|
/*
|
|
|
|
* Because we don't always invoke any firmware, we can't rely on
|
|
|
|
* that to do BAR allocation. Long term, we should probably do
|
|
|
|
* that ourselves, but for now, this setting (plus advertising the
|
|
|
|
* current BARs as 0) causes sufficiently recent kernels to to the
|
|
|
|
* BAR assignment themselves */
|
|
|
|
_FDT((fdt_property_cell(fdt, "linux,pci-probe-only", 0)));
|
|
|
|
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_end_node(fdt)));
|
|
|
|
|
2011-09-30 01:39:11 +04:00
|
|
|
/* memory node(s) */
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_begin_node(fdt, "memory@0")));
|
|
|
|
|
|
|
|
_FDT((fdt_property_string(fdt, "device_type", "memory")));
|
2011-09-30 01:39:11 +04:00
|
|
|
_FDT((fdt_property(fdt, "reg", mem_reg_property_rma,
|
|
|
|
sizeof(mem_reg_property_rma))));
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_end_node(fdt)));
|
|
|
|
|
2011-09-30 01:39:11 +04:00
|
|
|
if (ram_size > rma_size) {
|
|
|
|
char mem_name[32];
|
|
|
|
|
|
|
|
sprintf(mem_name, "memory@%" PRIx64, (uint64_t)rma_size);
|
|
|
|
_FDT((fdt_begin_node(fdt, mem_name)));
|
|
|
|
_FDT((fdt_property_string(fdt, "device_type", "memory")));
|
|
|
|
_FDT((fdt_property(fdt, "reg", mem_reg_property_nonrma,
|
|
|
|
sizeof(mem_reg_property_nonrma))));
|
|
|
|
_FDT((fdt_end_node(fdt)));
|
|
|
|
}
|
|
|
|
|
2011-04-01 08:15:20 +04:00
|
|
|
/* cpus */
|
|
|
|
_FDT((fdt_begin_node(fdt, "cpus")));
|
|
|
|
|
|
|
|
_FDT((fdt_property_cell(fdt, "#address-cells", 0x1)));
|
|
|
|
_FDT((fdt_property_cell(fdt, "#size-cells", 0x0)));
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
modelname = g_strdup(cpu_model);
|
2011-04-01 08:15:20 +04:00
|
|
|
|
|
|
|
for (i = 0; i < strlen(modelname); i++) {
|
|
|
|
modelname[i] = toupper(modelname[i]);
|
|
|
|
}
|
|
|
|
|
2011-04-05 09:12:09 +04:00
|
|
|
for (env = first_cpu; env != NULL; env = env->next_cpu) {
|
|
|
|
int index = env->cpu_index;
|
2011-09-30 01:39:10 +04:00
|
|
|
uint32_t servers_prop[smp_threads];
|
|
|
|
uint32_t gservers_prop[smp_threads * 2];
|
2011-04-01 08:15:20 +04:00
|
|
|
char *nodename;
|
|
|
|
uint32_t segs[] = {cpu_to_be32(28), cpu_to_be32(40),
|
|
|
|
0xffffffff, 0xffffffff};
|
2011-08-09 20:07:13 +04:00
|
|
|
uint32_t tbfreq = kvm_enabled() ? kvmppc_get_tbfreq() : TIMEBASE_FREQ;
|
|
|
|
uint32_t cpufreq = kvm_enabled() ? kvmppc_get_clockfreq() : 1000000000;
|
2011-04-01 08:15:20 +04:00
|
|
|
|
2011-09-30 01:39:10 +04:00
|
|
|
if ((index % smt) != 0) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2011-04-05 09:12:09 +04:00
|
|
|
if (asprintf(&nodename, "%s@%x", modelname, index) < 0) {
|
2011-04-01 08:15:20 +04:00
|
|
|
fprintf(stderr, "Allocation failure\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
_FDT((fdt_begin_node(fdt, nodename)));
|
|
|
|
|
|
|
|
free(nodename);
|
|
|
|
|
2011-04-05 09:12:09 +04:00
|
|
|
_FDT((fdt_property_cell(fdt, "reg", index)));
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_property_string(fdt, "device_type", "cpu")));
|
|
|
|
|
|
|
|
_FDT((fdt_property_cell(fdt, "cpu-version", env->spr[SPR_PVR])));
|
|
|
|
_FDT((fdt_property_cell(fdt, "dcache-block-size",
|
|
|
|
env->dcache_line_size)));
|
|
|
|
_FDT((fdt_property_cell(fdt, "icache-block-size",
|
|
|
|
env->icache_line_size)));
|
2011-08-09 20:07:13 +04:00
|
|
|
_FDT((fdt_property_cell(fdt, "timebase-frequency", tbfreq)));
|
|
|
|
_FDT((fdt_property_cell(fdt, "clock-frequency", cpufreq)));
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_property_cell(fdt, "ibm,slb-size", env->slb_nr)));
|
2011-04-01 08:15:22 +04:00
|
|
|
_FDT((fdt_property(fdt, "ibm,pft-size",
|
|
|
|
pft_size_prop, sizeof(pft_size_prop))));
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_property_string(fdt, "status", "okay")));
|
|
|
|
_FDT((fdt_property(fdt, "64-bit", NULL, 0)));
|
2011-09-30 01:39:10 +04:00
|
|
|
|
|
|
|
/* Build interrupt servers and gservers properties */
|
|
|
|
for (i = 0; i < smp_threads; i++) {
|
|
|
|
servers_prop[i] = cpu_to_be32(index + i);
|
|
|
|
/* Hack, direct the group queues back to cpu 0 */
|
|
|
|
gservers_prop[i*2] = cpu_to_be32(index + i);
|
|
|
|
gservers_prop[i*2 + 1] = 0;
|
|
|
|
}
|
|
|
|
_FDT((fdt_property(fdt, "ibm,ppc-interrupt-server#s",
|
|
|
|
servers_prop, sizeof(servers_prop))));
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
_FDT((fdt_property(fdt, "ibm,ppc-interrupt-gserver#s",
|
2011-09-30 01:39:10 +04:00
|
|
|
gservers_prop, sizeof(gservers_prop))));
|
2011-04-01 08:15:20 +04:00
|
|
|
|
2011-04-05 09:12:09 +04:00
|
|
|
if (env->mmu_model & POWERPC_MMU_1TSEG) {
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_property(fdt, "ibm,processor-segment-sizes",
|
|
|
|
segs, sizeof(segs))));
|
|
|
|
}
|
|
|
|
|
pseries: Add device tree properties for VMX/VSX and DFP under kvm
Sufficiently recent PAPR specifications define properties "ibm,vmx"
and "ibm,dfp" on the CPU node which advertise whether the VMX vector
extensions (or the later VSX version) and/or the Decimal Floating
Point operations from IBM's recent POWER CPUs are available.
Currently we do not put these in the guest device tree and the guest
kernel will consequently assume they are not available. This is good,
because they are not supported under TCG. VMX is similar enough to
Altivec that it might be trivial to support, but VSX and DFP would
both require significant work to support in TCG.
However, when running under kvm on a host which supports these
instructions, there's no reason not to let the guest use them. This
patch, therefore, checks for the relevant support on the host CPU
and, if present, advertises them to the guest as well.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-10-10 22:31:01 +04:00
|
|
|
/* Advertise VMX/VSX (vector extensions) if available
|
|
|
|
* 0 / no property == no vector extensions
|
|
|
|
* 1 == VMX / Altivec available
|
|
|
|
* 2 == VSX available */
|
2011-10-17 22:15:41 +04:00
|
|
|
if (env->insns_flags & PPC_ALTIVEC) {
|
|
|
|
uint32_t vmx = (env->insns_flags2 & PPC2_VSX) ? 2 : 1;
|
|
|
|
|
pseries: Add device tree properties for VMX/VSX and DFP under kvm
Sufficiently recent PAPR specifications define properties "ibm,vmx"
and "ibm,dfp" on the CPU node which advertise whether the VMX vector
extensions (or the later VSX version) and/or the Decimal Floating
Point operations from IBM's recent POWER CPUs are available.
Currently we do not put these in the guest device tree and the guest
kernel will consequently assume they are not available. This is good,
because they are not supported under TCG. VMX is similar enough to
Altivec that it might be trivial to support, but VSX and DFP would
both require significant work to support in TCG.
However, when running under kvm on a host which supports these
instructions, there's no reason not to let the guest use them. This
patch, therefore, checks for the relevant support on the host CPU
and, if present, advertises them to the guest as well.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-10-10 22:31:01 +04:00
|
|
|
_FDT((fdt_property_cell(fdt, "ibm,vmx", vmx)));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Advertise DFP (Decimal Floating Point) if available
|
|
|
|
* 0 / no property == no DFP
|
|
|
|
* 1 == DFP available */
|
2011-10-17 22:15:41 +04:00
|
|
|
if (env->insns_flags2 & PPC2_DFP) {
|
|
|
|
_FDT((fdt_property_cell(fdt, "ibm,dfp", 1)));
|
pseries: Add device tree properties for VMX/VSX and DFP under kvm
Sufficiently recent PAPR specifications define properties "ibm,vmx"
and "ibm,dfp" on the CPU node which advertise whether the VMX vector
extensions (or the later VSX version) and/or the Decimal Floating
Point operations from IBM's recent POWER CPUs are available.
Currently we do not put these in the guest device tree and the guest
kernel will consequently assume they are not available. This is good,
because they are not supported under TCG. VMX is similar enough to
Altivec that it might be trivial to support, but VSX and DFP would
both require significant work to support in TCG.
However, when running under kvm on a host which supports these
instructions, there's no reason not to let the guest use them. This
patch, therefore, checks for the relevant support on the host CPU
and, if present, advertises them to the guest as well.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-10-10 22:31:01 +04:00
|
|
|
}
|
|
|
|
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_end_node(fdt)));
|
|
|
|
}
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(modelname);
|
2011-04-01 08:15:20 +04:00
|
|
|
|
|
|
|
_FDT((fdt_end_node(fdt)));
|
|
|
|
|
2011-04-01 08:15:22 +04:00
|
|
|
/* RTAS */
|
|
|
|
_FDT((fdt_begin_node(fdt, "rtas")));
|
|
|
|
|
|
|
|
_FDT((fdt_property(fdt, "ibm,hypertas-functions", hypertas_prop,
|
|
|
|
sizeof(hypertas_prop))));
|
|
|
|
|
|
|
|
_FDT((fdt_end_node(fdt)));
|
|
|
|
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
/* interrupt controller */
|
2011-08-04 01:02:18 +04:00
|
|
|
_FDT((fdt_begin_node(fdt, "interrupt-controller")));
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
|
|
|
|
_FDT((fdt_property_string(fdt, "device_type",
|
|
|
|
"PowerPC-External-Interrupt-Presentation")));
|
|
|
|
_FDT((fdt_property_string(fdt, "compatible", "IBM,ppc-xicp")));
|
|
|
|
_FDT((fdt_property(fdt, "interrupt-controller", NULL, 0)));
|
|
|
|
_FDT((fdt_property(fdt, "ibm,interrupt-server-ranges",
|
|
|
|
interrupt_server_ranges_prop,
|
|
|
|
sizeof(interrupt_server_ranges_prop))));
|
2011-08-04 01:02:17 +04:00
|
|
|
_FDT((fdt_property_cell(fdt, "#interrupt-cells", 2)));
|
|
|
|
_FDT((fdt_property_cell(fdt, "linux,phandle", PHANDLE_XICP)));
|
|
|
|
_FDT((fdt_property_cell(fdt, "phandle", PHANDLE_XICP)));
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
|
|
|
|
_FDT((fdt_end_node(fdt)));
|
|
|
|
|
2011-04-01 08:15:21 +04:00
|
|
|
/* vdevice */
|
|
|
|
_FDT((fdt_begin_node(fdt, "vdevice")));
|
|
|
|
|
|
|
|
_FDT((fdt_property_string(fdt, "device_type", "vdevice")));
|
|
|
|
_FDT((fdt_property_string(fdt, "compatible", "IBM,vdevice")));
|
|
|
|
_FDT((fdt_property_cell(fdt, "#address-cells", 0x1)));
|
|
|
|
_FDT((fdt_property_cell(fdt, "#size-cells", 0x0)));
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
_FDT((fdt_property_cell(fdt, "#interrupt-cells", 0x2)));
|
|
|
|
_FDT((fdt_property(fdt, "interrupt-controller", NULL, 0)));
|
2011-04-01 08:15:21 +04:00
|
|
|
|
|
|
|
_FDT((fdt_end_node(fdt)));
|
|
|
|
|
2011-04-01 08:15:20 +04:00
|
|
|
_FDT((fdt_end_node(fdt))); /* close root node */
|
|
|
|
_FDT((fdt_finish(fdt)));
|
|
|
|
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
return fdt;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void spapr_finalize_fdt(sPAPREnvironment *spapr,
|
|
|
|
target_phys_addr_t fdt_addr,
|
|
|
|
target_phys_addr_t rtas_addr,
|
|
|
|
target_phys_addr_t rtas_size)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
void *fdt;
|
2011-10-30 21:16:46 +04:00
|
|
|
sPAPRPHBState *phb;
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
fdt = g_malloc(FDT_MAX_SIZE);
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
|
|
|
|
/* open out the base tree into a temp buffer for the final tweaks */
|
|
|
|
_FDT((fdt_open_into(spapr->fdt_skel, fdt, FDT_MAX_SIZE)));
|
2011-04-01 08:15:21 +04:00
|
|
|
|
|
|
|
ret = spapr_populate_vdevice(spapr->vio_bus, fdt);
|
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "couldn't setup vio devices in fdt\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2011-10-30 21:16:46 +04:00
|
|
|
QLIST_FOREACH(phb, &spapr->phbs, list) {
|
|
|
|
ret = spapr_populate_pci_devices(phb, PHANDLE_XICP, fdt);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "couldn't setup PCI devices in fdt\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2011-04-01 08:15:23 +04:00
|
|
|
/* RTAS */
|
|
|
|
ret = spapr_rtas_device_tree_setup(fdt, rtas_addr, rtas_size);
|
|
|
|
if (ret < 0) {
|
|
|
|
fprintf(stderr, "Couldn't set up RTAS device tree properties\n");
|
|
|
|
}
|
|
|
|
|
2011-04-01 08:15:21 +04:00
|
|
|
_FDT((fdt_pack(fdt)));
|
|
|
|
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
cpu_physical_memory_write(fdt_addr, fdt, fdt_totalsize(fdt));
|
2011-04-01 08:15:20 +04:00
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(fdt);
|
2011-04-01 08:15:20 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
|
|
|
|
{
|
|
|
|
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void emulate_spapr_hypercall(CPUState *env)
|
|
|
|
{
|
|
|
|
env->gpr[3] = spapr_hypercall(env, env->gpr[3], &env->gpr[4]);
|
|
|
|
}
|
|
|
|
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
static void spapr_reset(void *opaque)
|
|
|
|
{
|
|
|
|
sPAPREnvironment *spapr = (sPAPREnvironment *)opaque;
|
|
|
|
|
|
|
|
fprintf(stderr, "sPAPR reset\n");
|
|
|
|
|
|
|
|
/* flush out the hash table */
|
|
|
|
memset(spapr->htab, 0, spapr->htab_size);
|
|
|
|
|
|
|
|
/* Load the fdt */
|
|
|
|
spapr_finalize_fdt(spapr, spapr->fdt_addr, spapr->rtas_addr,
|
|
|
|
spapr->rtas_size);
|
|
|
|
|
|
|
|
/* Set up the entry state */
|
|
|
|
first_cpu->gpr[3] = spapr->fdt_addr;
|
|
|
|
first_cpu->gpr[5] = 0;
|
|
|
|
first_cpu->halted = 0;
|
|
|
|
first_cpu->nip = spapr->entry_point;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2011-04-01 08:15:20 +04:00
|
|
|
/* pSeries LPAR / sPAPR hardware init */
|
|
|
|
static void ppc_spapr_init(ram_addr_t ram_size,
|
|
|
|
const char *boot_device,
|
|
|
|
const char *kernel_filename,
|
|
|
|
const char *kernel_cmdline,
|
|
|
|
const char *initrd_filename,
|
|
|
|
const char *cpu_model)
|
|
|
|
{
|
2011-04-05 09:12:09 +04:00
|
|
|
CPUState *env;
|
2011-04-01 08:15:20 +04:00
|
|
|
int i;
|
2011-10-03 14:56:38 +04:00
|
|
|
MemoryRegion *sysmem = get_system_memory();
|
|
|
|
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
2011-09-30 01:39:11 +04:00
|
|
|
target_phys_addr_t rma_alloc_size, rma_size;
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
uint32_t initrd_base;
|
|
|
|
long kernel_size, initrd_size, fw_size;
|
2011-04-01 08:15:22 +04:00
|
|
|
long pteg_shift = 17;
|
2011-04-01 08:15:23 +04:00
|
|
|
char *filename;
|
2011-04-01 08:15:20 +04:00
|
|
|
|
2011-11-01 20:49:05 +04:00
|
|
|
spapr = g_malloc0(sizeof(*spapr));
|
|
|
|
QLIST_INIT(&spapr->phbs);
|
|
|
|
|
2011-04-01 08:15:20 +04:00
|
|
|
cpu_ppc_hypercall = emulate_spapr_hypercall;
|
|
|
|
|
2011-09-30 01:39:11 +04:00
|
|
|
/* Allocate RMA if necessary */
|
|
|
|
rma_alloc_size = kvmppc_alloc_rma("ppc_spapr.rma", sysmem);
|
|
|
|
|
|
|
|
if (rma_alloc_size == -1) {
|
|
|
|
hw_error("qemu: Unable to create RMA\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (rma_alloc_size && (rma_alloc_size < ram_size)) {
|
|
|
|
rma_size = rma_alloc_size;
|
|
|
|
} else {
|
|
|
|
rma_size = ram_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We place the device tree just below either the top of the RMA,
|
|
|
|
* or just below 2GB, whichever is lowere, so that it can be
|
|
|
|
* processed with 32-bit real mode code if necessary */
|
|
|
|
spapr->fdt_addr = MIN(rma_size, 0x80000000) - FDT_MAX_SIZE;
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
spapr->rtas_addr = spapr->fdt_addr - RTAS_MAX_SIZE;
|
2011-04-01 08:15:20 +04:00
|
|
|
|
|
|
|
/* init CPUs */
|
|
|
|
if (cpu_model == NULL) {
|
2011-10-13 02:40:34 +04:00
|
|
|
cpu_model = kvm_enabled() ? "host" : "POWER7";
|
2011-04-01 08:15:20 +04:00
|
|
|
}
|
|
|
|
for (i = 0; i < smp_cpus; i++) {
|
2011-04-05 09:12:09 +04:00
|
|
|
env = cpu_init(cpu_model);
|
2011-04-01 08:15:20 +04:00
|
|
|
|
|
|
|
if (!env) {
|
|
|
|
fprintf(stderr, "Unable to find PowerPC CPU definition\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Set time-base frequency to 512 MHz */
|
|
|
|
cpu_ppc_tb_init(env, TIMEBASE_FREQ);
|
|
|
|
qemu_register_reset((QEMUResetHandler *)&cpu_reset, env);
|
|
|
|
|
|
|
|
env->hreset_vector = 0x60;
|
|
|
|
env->hreset_excp_prefix = 0;
|
2011-04-05 09:12:09 +04:00
|
|
|
env->gpr[3] = env->cpu_index;
|
2011-04-01 08:15:20 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* allocate RAM */
|
2011-08-04 01:02:19 +04:00
|
|
|
spapr->ram_limit = ram_size;
|
2011-09-30 01:39:11 +04:00
|
|
|
if (spapr->ram_limit > rma_alloc_size) {
|
|
|
|
ram_addr_t nonrma_base = rma_alloc_size;
|
|
|
|
ram_addr_t nonrma_size = spapr->ram_limit - rma_alloc_size;
|
|
|
|
|
2011-12-20 17:59:12 +04:00
|
|
|
memory_region_init_ram(ram, "ppc_spapr.ram", nonrma_size);
|
|
|
|
vmstate_register_ram_global(ram);
|
2011-09-30 01:39:11 +04:00
|
|
|
memory_region_add_subregion(sysmem, nonrma_base, ram);
|
|
|
|
}
|
2011-04-01 08:15:20 +04:00
|
|
|
|
2011-04-01 08:15:22 +04:00
|
|
|
/* allocate hash page table. For now we always make this 16mb,
|
|
|
|
* later we should probably make it scale to the size of guest
|
|
|
|
* RAM */
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
spapr->htab_size = 1ULL << (pteg_shift + 7);
|
2011-08-09 19:57:37 +04:00
|
|
|
spapr->htab = qemu_memalign(spapr->htab_size, spapr->htab_size);
|
2011-04-01 08:15:22 +04:00
|
|
|
|
2011-04-05 09:12:09 +04:00
|
|
|
for (env = first_cpu; env != NULL; env = env->next_cpu) {
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
env->external_htab = spapr->htab;
|
2011-04-05 09:12:09 +04:00
|
|
|
env->htab_base = -1;
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
env->htab_mask = spapr->htab_size - 1;
|
2011-08-09 19:57:37 +04:00
|
|
|
|
|
|
|
/* Tell KVM that we're in PAPR mode */
|
|
|
|
env->spr[SPR_SDR1] = (unsigned long)spapr->htab |
|
|
|
|
((pteg_shift + 7) - 18);
|
|
|
|
env->spr[SPR_HIOR] = 0;
|
|
|
|
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
kvmppc_set_papr(env);
|
|
|
|
}
|
2011-04-01 08:15:22 +04:00
|
|
|
}
|
|
|
|
|
2011-04-01 08:15:23 +04:00
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "spapr-rtas.bin");
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
spapr->rtas_size = load_image_targphys(filename, spapr->rtas_addr,
|
|
|
|
ram_size - spapr->rtas_addr);
|
|
|
|
if (spapr->rtas_size < 0) {
|
2011-04-01 08:15:23 +04:00
|
|
|
hw_error("qemu: could not load LPAR rtas '%s'\n", filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(filename);
|
2011-04-01 08:15:23 +04:00
|
|
|
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
/* Set up Interrupt Controller */
|
2011-04-05 09:12:09 +04:00
|
|
|
spapr->icp = xics_system_init(XICS_IRQS);
|
2011-09-16 00:49:49 +04:00
|
|
|
spapr->next_irq = 16;
|
Implement the PAPR (pSeries) virtualized interrupt controller (xics)
PAPR defines an interrupt control architecture which is logically divided
into ICS (Interrupt Control Presentation, each unit is responsible for
presenting interrupts to a particular "interrupt server", i.e. CPU) and
ICS (Interrupt Control Source, each unit responsible for one or more
hardware interrupts as numbered globally across the system). All PAPR
virtual IO devices expect to deliver interrupts via this mechanism. In
Linux, this interrupt controller system is handled by the "xics" driver.
On pSeries systems, access to the interrupt controller is virtualized via
hypercalls and RTAS methods. However, the virtualized interface is very
similar to the underlying interrupt controller hardware, and similar PICs
exist un-virtualized in some other systems.
This patch implements both the ICP and ICS sides of the PAPR interrupt
controller. For now, only the hypercall virtualized interface is provided,
however it would be relatively straightforward to graft an emulated
register interface onto the underlying interrupt logic if we want to add
a machine with a hardware ICS/ICP system in the future.
There are some limitations in this implementation: it is assumed for now
that only one instance of the ICS exists, although a full xics system can
have several, each responsible for a different group of hardware irqs.
ICP/ICS can handle both level-sensitve (LSI) and message signalled (MSI)
interrupt inputs. For now, this implementation supports only MSI
interrupts, since that is used by PAPR virtual IO devices.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:25 +04:00
|
|
|
|
|
|
|
/* Set up VIO bus */
|
2011-04-01 08:15:21 +04:00
|
|
|
spapr->vio_bus = spapr_vio_bus_init();
|
|
|
|
|
2011-05-26 13:52:44 +04:00
|
|
|
for (i = 0; i < MAX_SERIAL_PORTS; i++) {
|
2011-04-01 08:15:21 +04:00
|
|
|
if (serial_hds[i]) {
|
2011-04-19 05:54:52 +04:00
|
|
|
spapr_vty_create(spapr->vio_bus, SPAPR_VTY_BASE_ADDRESS + i,
|
2011-05-26 13:52:44 +04:00
|
|
|
serial_hds[i]);
|
2011-04-01 08:15:21 +04:00
|
|
|
}
|
|
|
|
}
|
2011-04-01 08:15:20 +04:00
|
|
|
|
2011-10-30 21:16:46 +04:00
|
|
|
/* Set up PCI */
|
|
|
|
spapr_create_phb(spapr, "pci", SPAPR_PCI_BUID,
|
|
|
|
SPAPR_PCI_MEM_WIN_ADDR,
|
|
|
|
SPAPR_PCI_MEM_WIN_SIZE,
|
|
|
|
SPAPR_PCI_IO_WIN_ADDR);
|
|
|
|
|
2011-05-26 13:52:44 +04:00
|
|
|
for (i = 0; i < nb_nics; i++) {
|
2011-04-01 08:15:29 +04:00
|
|
|
NICInfo *nd = &nd_table[i];
|
|
|
|
|
|
|
|
if (!nd->model) {
|
2011-08-21 07:09:37 +04:00
|
|
|
nd->model = g_strdup("ibmveth");
|
2011-04-01 08:15:29 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (strcmp(nd->model, "ibmveth") == 0) {
|
2011-05-26 13:52:44 +04:00
|
|
|
spapr_vlan_create(spapr->vio_bus, 0x1000 + i, nd);
|
2011-04-01 08:15:29 +04:00
|
|
|
} else {
|
2011-10-30 21:16:46 +04:00
|
|
|
pci_nic_init_nofail(&nd_table[i], nd->model, NULL);
|
2011-04-01 08:15:29 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-01 08:15:31 +04:00
|
|
|
for (i = 0; i <= drive_get_max_bus(IF_SCSI); i++) {
|
2011-05-26 13:52:44 +04:00
|
|
|
spapr_vscsi_create(spapr->vio_bus, 0x2000 + i);
|
2011-04-01 08:15:31 +04:00
|
|
|
}
|
|
|
|
|
2011-04-01 08:15:20 +04:00
|
|
|
if (kernel_filename) {
|
|
|
|
uint64_t lowaddr = 0;
|
|
|
|
|
|
|
|
kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL,
|
|
|
|
NULL, &lowaddr, NULL, 1, ELF_MACHINE, 0);
|
|
|
|
if (kernel_size < 0) {
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
kernel_size = load_image_targphys(kernel_filename,
|
|
|
|
KERNEL_LOAD_ADDR,
|
|
|
|
ram_size - KERNEL_LOAD_ADDR);
|
2011-04-01 08:15:20 +04:00
|
|
|
}
|
|
|
|
if (kernel_size < 0) {
|
|
|
|
fprintf(stderr, "qemu: could not load kernel '%s'\n",
|
|
|
|
kernel_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* load initrd */
|
|
|
|
if (initrd_filename) {
|
|
|
|
initrd_base = INITRD_LOAD_ADDR;
|
|
|
|
initrd_size = load_image_targphys(initrd_filename, initrd_base,
|
|
|
|
ram_size - initrd_base);
|
|
|
|
if (initrd_size < 0) {
|
|
|
|
fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
|
|
|
|
initrd_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
initrd_base = 0;
|
|
|
|
initrd_size = 0;
|
|
|
|
}
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
|
|
|
|
spapr->entry_point = KERNEL_LOAD_ADDR;
|
2011-04-01 08:15:20 +04:00
|
|
|
} else {
|
2011-11-13 21:18:57 +04:00
|
|
|
if (rma_size < (MIN_RMA_SLOF << 20)) {
|
Add SLOF-based partition firmware for pSeries machine, allowing more boot options
Currently, the emulated pSeries machine requires the use of the
-kernel parameter in order to explicitly load a guest kernel. This
means booting from the virtual disk, cdrom or network is not possible.
This patch addresses this limitation by inserting a within-partition
firmware image (derived from the "SLOF" free Open Firmware project).
If -kernel is not specified, qemu will now load the SLOF image, which
has access to the qemu boot device list through the device tree, and
can boot from any of the usual virtual devices.
In order to support the new firmware, an extension to the emulated
machine/hypervisor is necessary. Unlike Linux, which expects
multi-CPU entry to be handled kexec() style, the SLOF firmware expects
only one CPU to be active at entry, and to use a hypervisor RTAS
method to enable the other CPUs one by one.
This patch also implements this 'start-cpu' method, so that SLOF can
start the secondary CPUs and marshal them into the kexec() holding
pattern ready for entry into the guest OS. Linux should, and in the
future might directly use the start-cpu method to enable initially
disabled CPUs, but for now it does require kexec() entry.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:34 +04:00
|
|
|
fprintf(stderr, "qemu: pSeries SLOF firmware requires >= "
|
2011-11-13 21:18:57 +04:00
|
|
|
"%ldM guest RMA (Real Mode Area memory)\n", MIN_RMA_SLOF);
|
Add SLOF-based partition firmware for pSeries machine, allowing more boot options
Currently, the emulated pSeries machine requires the use of the
-kernel parameter in order to explicitly load a guest kernel. This
means booting from the virtual disk, cdrom or network is not possible.
This patch addresses this limitation by inserting a within-partition
firmware image (derived from the "SLOF" free Open Firmware project).
If -kernel is not specified, qemu will now load the SLOF image, which
has access to the qemu boot device list through the device tree, and
can boot from any of the usual virtual devices.
In order to support the new firmware, an extension to the emulated
machine/hypervisor is necessary. Unlike Linux, which expects
multi-CPU entry to be handled kexec() style, the SLOF firmware expects
only one CPU to be active at entry, and to use a hypervisor RTAS
method to enable the other CPUs one by one.
This patch also implements this 'start-cpu' method, so that SLOF can
start the secondary CPUs and marshal them into the kexec() holding
pattern ready for entry into the guest OS. Linux should, and in the
future might directly use the start-cpu method to enable initially
disabled CPUs, but for now it does require kexec() entry.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:34 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
2011-08-10 20:36:27 +04:00
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, FW_FILE_NAME);
|
Add SLOF-based partition firmware for pSeries machine, allowing more boot options
Currently, the emulated pSeries machine requires the use of the
-kernel parameter in order to explicitly load a guest kernel. This
means booting from the virtual disk, cdrom or network is not possible.
This patch addresses this limitation by inserting a within-partition
firmware image (derived from the "SLOF" free Open Firmware project).
If -kernel is not specified, qemu will now load the SLOF image, which
has access to the qemu boot device list through the device tree, and
can boot from any of the usual virtual devices.
In order to support the new firmware, an extension to the emulated
machine/hypervisor is necessary. Unlike Linux, which expects
multi-CPU entry to be handled kexec() style, the SLOF firmware expects
only one CPU to be active at entry, and to use a hypervisor RTAS
method to enable the other CPUs one by one.
This patch also implements this 'start-cpu' method, so that SLOF can
start the secondary CPUs and marshal them into the kexec() holding
pattern ready for entry into the guest OS. Linux should, and in the
future might directly use the start-cpu method to enable initially
disabled CPUs, but for now it does require kexec() entry.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:34 +04:00
|
|
|
fw_size = load_image_targphys(filename, 0, FW_MAX_SIZE);
|
|
|
|
if (fw_size < 0) {
|
|
|
|
hw_error("qemu: could not load LPAR rtas '%s'\n", filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(filename);
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
spapr->entry_point = 0x100;
|
Add SLOF-based partition firmware for pSeries machine, allowing more boot options
Currently, the emulated pSeries machine requires the use of the
-kernel parameter in order to explicitly load a guest kernel. This
means booting from the virtual disk, cdrom or network is not possible.
This patch addresses this limitation by inserting a within-partition
firmware image (derived from the "SLOF" free Open Firmware project).
If -kernel is not specified, qemu will now load the SLOF image, which
has access to the qemu boot device list through the device tree, and
can boot from any of the usual virtual devices.
In order to support the new firmware, an extension to the emulated
machine/hypervisor is necessary. Unlike Linux, which expects
multi-CPU entry to be handled kexec() style, the SLOF firmware expects
only one CPU to be active at entry, and to use a hypervisor RTAS
method to enable the other CPUs one by one.
This patch also implements this 'start-cpu' method, so that SLOF can
start the secondary CPUs and marshal them into the kexec() holding
pattern ready for entry into the guest OS. Linux should, and in the
future might directly use the start-cpu method to enable initially
disabled CPUs, but for now it does require kexec() entry.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:34 +04:00
|
|
|
initrd_base = 0;
|
|
|
|
initrd_size = 0;
|
|
|
|
|
|
|
|
/* SLOF will startup the secondary CPUs using RTAS,
|
|
|
|
rather than expecting a kexec() style entry */
|
2011-04-05 09:12:09 +04:00
|
|
|
for (env = first_cpu; env != NULL; env = env->next_cpu) {
|
|
|
|
env->halted = 1;
|
Add SLOF-based partition firmware for pSeries machine, allowing more boot options
Currently, the emulated pSeries machine requires the use of the
-kernel parameter in order to explicitly load a guest kernel. This
means booting from the virtual disk, cdrom or network is not possible.
This patch addresses this limitation by inserting a within-partition
firmware image (derived from the "SLOF" free Open Firmware project).
If -kernel is not specified, qemu will now load the SLOF image, which
has access to the qemu boot device list through the device tree, and
can boot from any of the usual virtual devices.
In order to support the new firmware, an extension to the emulated
machine/hypervisor is necessary. Unlike Linux, which expects
multi-CPU entry to be handled kexec() style, the SLOF firmware expects
only one CPU to be active at entry, and to use a hypervisor RTAS
method to enable the other CPUs one by one.
This patch also implements this 'start-cpu' method, so that SLOF can
start the secondary CPUs and marshal them into the kexec() holding
pattern ready for entry into the guest OS. Linux should, and in the
future might directly use the start-cpu method to enable initially
disabled CPUs, but for now it does require kexec() entry.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-01 08:15:34 +04:00
|
|
|
}
|
2011-04-01 08:15:20 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Prepare the device tree */
|
2011-09-30 01:39:11 +04:00
|
|
|
spapr->fdt_skel = spapr_create_fdt_skel(cpu_model, rma_size,
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
initrd_base, initrd_size,
|
|
|
|
boot_device, kernel_cmdline,
|
|
|
|
pteg_shift + 7);
|
|
|
|
assert(spapr->fdt_skel != NULL);
|
2011-04-01 08:15:20 +04:00
|
|
|
|
Delay creation of pseries device tree until reset
At present, the 'pseries' machine creates a flattened device tree in the
machine->init function to pass to either the guest kernel or to firmware.
However, the machine->init function runs before processing of -device
command line options, which means that the device tree so created will
be (incorrectly) missing devices specified that way.
Supplying a correct device tree is, in any case, part of the required
platform entry conditions. Therefore, this patch moves the creation and
loading of the device tree from machine->init to a reset callback. The
setup of entry point address and initial register state moves with it,
which leads to a slight cleanup.
This is not, alas, quite enough to make a fully working reset for pseries.
For that we would need to reload the firmware images, which on this
machine are loaded into RAM. It's a step in the right direction, though.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-04-05 09:12:10 +04:00
|
|
|
qemu_register_reset(spapr_reset, spapr);
|
2011-04-01 08:15:20 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static QEMUMachine spapr_machine = {
|
|
|
|
.name = "pseries",
|
|
|
|
.desc = "pSeries Logical Partition (PAPR compliant)",
|
|
|
|
.init = ppc_spapr_init,
|
|
|
|
.max_cpus = MAX_CPUS,
|
|
|
|
.no_vga = 1,
|
|
|
|
.no_parallel = 1,
|
2011-04-01 08:15:31 +04:00
|
|
|
.use_scsi = 1,
|
2011-04-01 08:15:20 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
static void spapr_machine_init(void)
|
|
|
|
{
|
|
|
|
qemu_register_machine(&spapr_machine);
|
|
|
|
}
|
|
|
|
|
|
|
|
machine_init(spapr_machine_init);
|