OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ppc/xics: Rename existing xics to xics_spapr

Browse Source 
The common class doesn't change, the KVM one is sPAPR specific. Rename
variables and functions to xics_spapr.

Retain the type name as "xics" to preserve migration for existing sPAPR
guests.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Benjamin Herrenschmidt 2016-06-29 00:35:12 +05:30 committed by David Gibson
parent 4322e8ced5
commit 161deaf225
7 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/intc/xics.c
View File

@ -718,7 +718,8 @@ static int ics_find_free_block(ICSState *ics, int num, int alignnum)
return -1; return -1;
} }
int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp) int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi,
Error **errp)
{ {
ICSState *ics = &icp->ics[src]; ICSState *ics = &icp->ics[src];
int irq; int irq;
@ -749,8 +750,8 @@ int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp)
* Allocate block of consecutive IRQs, and return the number of the first IRQ in the block. * Allocate block of consecutive IRQs, and return the number of the first IRQ in the block.
* If align==true, aligns the first IRQ number to num. * If align==true, aligns the first IRQ number to num.
*/ */
int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align, int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi,
Error **errp) bool align, Error **errp)
{ {
int i, first = -1; int i, first = -1;
ICSState *ics = &icp->ics[src]; ICSState *ics = &icp->ics[src];
@ -799,7 +800,7 @@ static void ics_free(ICSState *ics, int srcno, int num)
} }
} }
void xics_free(XICSState *icp, int irq, int num) void xics_spapr_free(XICSState *icp, int irq, int num)
{ {
int src = xics_find_source(icp, irq); int src = xics_find_source(icp, irq);
@ -1018,9 +1019,9 @@ static void xics_set_nr_servers(XICSState *icp, uint32_t nr_servers,
} }
} }
static void xics_realize(DeviceState *dev, Error **errp) static void xics_spapr_realize(DeviceState *dev, Error **errp)
{ {
XICSState *icp = XICS(dev); XICSState *icp = XICS_SPAPR(dev);
Error *error = NULL; Error *error = NULL;
int i; int i;
@ -1057,38 +1058,38 @@ static void xics_realize(DeviceState *dev, Error **errp)
} }
} }
static void xics_initfn(Object *obj) static void xics_spapr_initfn(Object *obj)
{ {
XICSState *xics = XICS(obj); XICSState *xics = XICS_SPAPR(obj);
xics->ics = ICS(object_new(TYPE_ICS)); xics->ics = ICS(object_new(TYPE_ICS));
object_property_add_child(obj, "ics", OBJECT(xics->ics), NULL); object_property_add_child(obj, "ics", OBJECT(xics->ics), NULL);
xics->ics->icp = xics; xics->ics->icp = xics;
} }
static void xics_class_init(ObjectClass *oc, void *data) static void xics_spapr_class_init(ObjectClass *oc, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(oc); DeviceClass *dc = DEVICE_CLASS(oc);
XICSStateClass *xsc = XICS_CLASS(oc); XICSStateClass *xsc = XICS_SPAPR_CLASS(oc);
dc->realize = xics_realize; dc->realize = xics_spapr_realize;
xsc->set_nr_irqs = xics_set_nr_irqs; xsc->set_nr_irqs = xics_set_nr_irqs;
xsc->set_nr_servers = xics_set_nr_servers; xsc->set_nr_servers = xics_set_nr_servers;
} }
static const TypeInfo xics_info = { static const TypeInfo xics_spapr_info = {
.name = TYPE_XICS, .name = TYPE_XICS_SPAPR,
.parent = TYPE_XICS_COMMON, .parent = TYPE_XICS_COMMON,
.instance_size = sizeof(XICSState), .instance_size = sizeof(XICSState),
.class_size = sizeof(XICSStateClass), .class_size = sizeof(XICSStateClass),
.class_init = xics_class_init, .class_init = xics_spapr_class_init,
.instance_init = xics_initfn, .instance_init = xics_spapr_initfn,
}; };
static void xics_register_types(void) static void xics_register_types(void)
{ {
type_register_static(&xics_common_info); type_register_static(&xics_common_info);
type_register_static(&xics_info); type_register_static(&xics_spapr_info);
type_register_static(&ics_info); type_register_static(&ics_info);
type_register_static(&icp_info); type_register_static(&icp_info);
} }

14
hw/intc/xics_kvm.c
View File

@ -145,7 +145,7 @@ static const TypeInfo icp_kvm_info = {
*/ */
static void ics_get_kvm_state(ICSState *ics) static void ics_get_kvm_state(ICSState *ics)
{ {
KVMXICSState *icpkvm = KVM_XICS(ics->icp); KVMXICSState *icpkvm = XICS_SPAPR_KVM(ics->icp);
uint64_t state; uint64_t state;
struct kvm_device_attr attr = { struct kvm_device_attr attr = {
.flags = 0, .flags = 0,
@ -204,7 +204,7 @@ static void ics_get_kvm_state(ICSState *ics)
static int ics_set_kvm_state(ICSState *ics, int version_id) static int ics_set_kvm_state(ICSState *ics, int version_id)
{ {
KVMXICSState *icpkvm = KVM_XICS(ics->icp); KVMXICSState *icpkvm = XICS_SPAPR_KVM(ics->icp);
uint64_t state; uint64_t state;
struct kvm_device_attr attr = { struct kvm_device_attr attr = {
.flags = 0, .flags = 0,
@ -328,7 +328,7 @@ static void xics_kvm_cpu_setup(XICSState *icp, PowerPCCPU *cpu)
{ {
CPUState *cs; CPUState *cs;
ICPState *ss; ICPState *ss;
KVMXICSState *icpkvm = KVM_XICS(icp); KVMXICSState *icpkvm = XICS_SPAPR_KVM(icp);
cs = CPU(cpu); cs = CPU(cpu);
ss = &icp->ss[cs->cpu_index]; ss = &icp->ss[cs->cpu_index];
@ -394,7 +394,7 @@ static void rtas_dummy(PowerPCCPU *cpu, sPAPRMachineState *spapr,
static void xics_kvm_realize(DeviceState *dev, Error **errp) static void xics_kvm_realize(DeviceState *dev, Error **errp)
{ {
KVMXICSState *icpkvm = KVM_XICS(dev); KVMXICSState *icpkvm = XICS_SPAPR_KVM(dev);
XICSState *icp = XICS_COMMON(dev); XICSState *icp = XICS_COMMON(dev);
int i, rc; int i, rc;
Error *error = NULL; Error *error = NULL;
@ -495,8 +495,8 @@ static void xics_kvm_class_init(ObjectClass *oc, void *data)
xsc->set_nr_servers = xics_kvm_set_nr_servers; xsc->set_nr_servers = xics_kvm_set_nr_servers;
} }
static const TypeInfo xics_kvm_info = { static const TypeInfo xics_spapr_kvm_info = {
.name = TYPE_KVM_XICS, .name = TYPE_XICS_SPAPR_KVM,
.parent = TYPE_XICS_COMMON, .parent = TYPE_XICS_COMMON,
.instance_size = sizeof(KVMXICSState), .instance_size = sizeof(KVMXICSState),
.class_init = xics_kvm_class_init, .class_init = xics_kvm_class_init,
@ -505,7 +505,7 @@ static const TypeInfo xics_kvm_info = {
static void xics_kvm_register_types(void) static void xics_kvm_register_types(void)
{ {
type_register_static(&xics_kvm_info); type_register_static(&xics_spapr_kvm_info);
type_register_static(&ics_kvm_info); type_register_static(&ics_kvm_info);
type_register_static(&icp_kvm_info); type_register_static(&icp_kvm_info);
} }

7
hw/ppc/spapr.c
View File

@ -122,7 +122,8 @@ static XICSState *xics_system_init(MachineState *machine,
Error *err = NULL; Error *err = NULL;
if (machine_kernel_irqchip_allowed(machine)) { if (machine_kernel_irqchip_allowed(machine)) {
icp = try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs, &err); icp = try_create_xics(TYPE_XICS_SPAPR_KVM, nr_servers, nr_irqs,
&err);
} }
if (machine_kernel_irqchip_required(machine) && !icp) { if (machine_kernel_irqchip_required(machine) && !icp) {
error_reportf_err(err, error_reportf_err(err,
@ -133,7 +134,7 @@ static XICSState *xics_system_init(MachineState *machine,
} }
if (!icp) { if (!icp) {
icp = try_create_xics(TYPE_XICS, nr_servers, nr_irqs, errp); icp = try_create_xics(TYPE_XICS_SPAPR, nr_servers, nr_irqs, errp);
} }
return icp; return icp;
@ -1784,7 +1785,7 @@ static void ppc_spapr_init(MachineState *machine)
/* Set up Interrupt Controller before we create the VCPUs */ /* Set up Interrupt Controller before we create the VCPUs */
spapr->icp = xics_system_init(machine, spapr->icp = xics_system_init(machine,
DIV_ROUND_UP(max_cpus * smt, smp_threads), DIV_ROUND_UP(max_cpus * smt, smp_threads),
XICS_IRQS, &error_fatal); XICS_IRQS_SPAPR, &error_fatal);
if (smc->dr_lmb_enabled) { if (smc->dr_lmb_enabled) {
spapr_validate_node_memory(machine, &error_fatal); spapr_validate_node_memory(machine, &error_fatal);

2
hw/ppc/spapr_events.c
View File

@ -603,7 +603,7 @@ out_no_events:
void spapr_events_init(sPAPRMachineState *spapr) void spapr_events_init(sPAPRMachineState *spapr)
{ {
QTAILQ_INIT(&spapr->pending_events); QTAILQ_INIT(&spapr->pending_events);
spapr->check_exception_irq = xics_alloc(spapr->icp, 0, 0, false, spapr->check_exception_irq = xics_spapr_alloc(spapr->icp, 0, 0, false,
&error_fatal); &error_fatal);
spapr->epow_notifier.notify = spapr_powerdown_req; spapr->epow_notifier.notify = spapr_powerdown_req;
qemu_register_powerdown_notifier(&spapr->epow_notifier); qemu_register_powerdown_notifier(&spapr->epow_notifier);

10
hw/ppc/spapr_pci.c
View File

@ -322,7 +322,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRMachineState *spapr,
return; return;
} }
xics_free(spapr->icp, msi->first_irq, msi->num); xics_spapr_free(spapr->icp, msi->first_irq, msi->num);
if (msi_present(pdev)) { if (msi_present(pdev)) {
spapr_msi_setmsg(pdev, 0, false, 0, 0); spapr_msi_setmsg(pdev, 0, false, 0, 0);
} }
@ -360,7 +360,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRMachineState *spapr,
} }
/* Allocate MSIs */ /* Allocate MSIs */
irq = xics_alloc_block(spapr->icp, 0, req_num, false, irq = xics_spapr_alloc_block(spapr->icp, 0, req_num, false,
ret_intr_type == RTAS_TYPE_MSI, &err); ret_intr_type == RTAS_TYPE_MSI, &err);
if (err) { if (err) {
error_reportf_err(err, "Can't allocate MSIs for device %x: ", error_reportf_err(err, "Can't allocate MSIs for device %x: ",
@ -371,7 +371,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRMachineState *spapr,
/* Release previous MSIs */ /* Release previous MSIs */
if (msi) { if (msi) {
xics_free(spapr->icp, msi->first_irq, msi->num); xics_spapr_free(spapr->icp, msi->first_irq, msi->num);
g_hash_table_remove(phb->msi, &config_addr); g_hash_table_remove(phb->msi, &config_addr);
} }
@ -1442,7 +1442,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
uint32_t irq; uint32_t irq;
Error *local_err = NULL; Error *local_err = NULL;
irq = xics_alloc_block(spapr->icp, 0, 1, true, false, &local_err); irq = xics_spapr_alloc_block(spapr->icp, 0, 1, true, false, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
error_prepend(errp, "can't allocate LSIs: "); error_prepend(errp, "can't allocate LSIs: ");
@ -1801,7 +1801,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb,
_FDT(fdt_setprop(fdt, bus_off, "ranges", &ranges, sizeof_ranges)); _FDT(fdt_setprop(fdt, bus_off, "ranges", &ranges, sizeof_ranges));
_FDT(fdt_setprop(fdt, bus_off, "reg", &bus_reg, sizeof(bus_reg))); _FDT(fdt_setprop(fdt, bus_off, "reg", &bus_reg, sizeof(bus_reg)));
_FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pci-config-space-type", 0x1)); _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pci-config-space-type", 0x1));
_FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi", XICS_IRQS)); _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi", XICS_IRQS_SPAPR));
/* Build the interrupt-map, this must matches what is done /* Build the interrupt-map, this must matches what is done
* in pci_spapr_map_irq * in pci_spapr_map_irq

2
hw/ppc/spapr_vio.c
View File

@ -463,7 +463,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev, Error **errp)
dev->qdev.id = id; dev->qdev.id = id;
} }
dev->irq = xics_alloc(spapr->icp, 0, dev->irq, false, &local_err); dev->irq = xics_spapr_alloc(spapr->icp, 0, dev->irq, false, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return; return;

30
include/hw/ppc/xics.h
View File

@ -32,20 +32,25 @@
#define TYPE_XICS_COMMON "xics-common" #define TYPE_XICS_COMMON "xics-common"
#define XICS_COMMON(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_COMMON) #define XICS_COMMON(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_COMMON)
#define TYPE_XICS "xics" /*
#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS) * Retain xics as the type name to be compatible for migration. Rest all the
* functions, class and variables are renamed as xics_spapr.
*/
#define TYPE_XICS_SPAPR "xics"
#define XICS_SPAPR(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_SPAPR)
#define TYPE_KVM_XICS "xics-kvm" #define TYPE_XICS_SPAPR_KVM "xics-spapr-kvm"
#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_KVM_XICS) #define XICS_SPAPR_KVM(obj) \
OBJECT_CHECK(KVMXICSState, (obj), TYPE_XICS_SPAPR_KVM)
#define XICS_COMMON_CLASS(klass) \ #define XICS_COMMON_CLASS(klass) \
OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_COMMON) OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_COMMON)
#define XICS_CLASS(klass) \ #define XICS_SPAPR_CLASS(klass) \
OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS) OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_SPAPR)
#define XICS_COMMON_GET_CLASS(obj) \ #define XICS_COMMON_GET_CLASS(obj) \
OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_COMMON) OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_COMMON)
#define XICS_GET_CLASS(obj) \ #define XICS_SPAPR_GET_CLASS(obj) \
OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS) OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_SPAPR)
#define XICS_IPI 0x2 #define XICS_IPI 0x2
#define XICS_BUID 0x1 #define XICS_BUID 0x1
@ -157,13 +162,14 @@ struct ICSIRQState {
uint8_t flags; uint8_t flags;
}; };
#define XICS_IRQS 1024 #define XICS_IRQS_SPAPR 1024
qemu_irq xics_get_qirq(XICSState *icp, int irq); qemu_irq xics_get_qirq(XICSState *icp, int irq);
int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp); int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi,
int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align,
Error **errp); Error **errp);
void xics_free(XICSState *icp, int irq, int num); int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi,
bool align, Error **errp);
void xics_spapr_free(XICSState *icp, int irq, int num);
void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu);
void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu); void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu);