a45863bda9
When supporting CPU hot removal by parking the vCPU fd and reusing it during hotplug again, there can be cases where we try to reenable KVM_CAP_IRQ_XICS CAP for the vCPU for which it was already enabled. Introduce a boolean member in ICPState to track this and don't reenable the CAP if it was already enabled earlier. Re-enabling this CAP should ideally work, but currently it results in kernel trying to create and associate ICP with this vCPU and that fails since there is already an ICP associated with it. Hence this patch is needed to work around this problem in the kernel. This change allows CPU hot removal to work for sPAPR. Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Alexander Graf <agraf@suse.de>
171 lines
5.2 KiB
C
171 lines
5.2 KiB
C
/*
|
|
* QEMU PowerPC pSeries Logical Partition (aka sPAPR) hardware System Emulator
|
|
*
|
|
* PAPR Virtualized Interrupt System, aka ICS/ICP aka xics
|
|
*
|
|
* Copyright (c) 2010,2011 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.
|
|
*
|
|
*/
|
|
#if !defined(__XICS_H__)
|
|
#define __XICS_H__
|
|
|
|
#include "hw/sysbus.h"
|
|
|
|
#define TYPE_XICS_COMMON "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)
|
|
|
|
#define TYPE_KVM_XICS "xics-kvm"
|
|
#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_KVM_XICS)
|
|
|
|
#define XICS_COMMON_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_COMMON)
|
|
#define XICS_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS)
|
|
#define XICS_COMMON_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_COMMON)
|
|
#define XICS_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS)
|
|
|
|
#define XICS_IPI 0x2
|
|
#define XICS_BUID 0x1
|
|
#define XICS_IRQ_BASE (XICS_BUID << 12)
|
|
|
|
/*
|
|
* We currently only support one BUID which is our interrupt base
|
|
* (the kernel implementation supports more but we don't exploit
|
|
* that yet)
|
|
*/
|
|
typedef struct XICSStateClass XICSStateClass;
|
|
typedef struct XICSState XICSState;
|
|
typedef struct ICPStateClass ICPStateClass;
|
|
typedef struct ICPState ICPState;
|
|
typedef struct ICSStateClass ICSStateClass;
|
|
typedef struct ICSState ICSState;
|
|
typedef struct ICSIRQState ICSIRQState;
|
|
|
|
struct XICSStateClass {
|
|
DeviceClass parent_class;
|
|
|
|
void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu);
|
|
void (*set_nr_irqs)(XICSState *icp, uint32_t nr_irqs, Error **errp);
|
|
void (*set_nr_servers)(XICSState *icp, uint32_t nr_servers, Error **errp);
|
|
};
|
|
|
|
struct XICSState {
|
|
/*< private >*/
|
|
SysBusDevice parent_obj;
|
|
/*< public >*/
|
|
uint32_t nr_servers;
|
|
uint32_t nr_irqs;
|
|
ICPState *ss;
|
|
ICSState *ics;
|
|
};
|
|
|
|
#define TYPE_ICP "icp"
|
|
#define ICP(obj) OBJECT_CHECK(ICPState, (obj), TYPE_ICP)
|
|
|
|
#define TYPE_KVM_ICP "icp-kvm"
|
|
#define KVM_ICP(obj) OBJECT_CHECK(ICPState, (obj), TYPE_KVM_ICP)
|
|
|
|
#define ICP_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(ICPStateClass, (klass), TYPE_ICP)
|
|
#define ICP_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(ICPStateClass, (obj), TYPE_ICP)
|
|
|
|
struct ICPStateClass {
|
|
DeviceClass parent_class;
|
|
|
|
void (*pre_save)(ICPState *s);
|
|
int (*post_load)(ICPState *s, int version_id);
|
|
};
|
|
|
|
struct ICPState {
|
|
/*< private >*/
|
|
DeviceState parent_obj;
|
|
/*< public >*/
|
|
CPUState *cs;
|
|
uint32_t xirr;
|
|
uint8_t pending_priority;
|
|
uint8_t mfrr;
|
|
qemu_irq output;
|
|
bool cap_irq_xics_enabled;
|
|
};
|
|
|
|
#define TYPE_ICS "ics"
|
|
#define ICS(obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS)
|
|
|
|
#define TYPE_KVM_ICS "icskvm"
|
|
#define KVM_ICS(obj) OBJECT_CHECK(ICSState, (obj), TYPE_KVM_ICS)
|
|
|
|
#define ICS_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(ICSStateClass, (klass), TYPE_ICS)
|
|
#define ICS_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(ICSStateClass, (obj), TYPE_ICS)
|
|
|
|
struct ICSStateClass {
|
|
DeviceClass parent_class;
|
|
|
|
void (*pre_save)(ICSState *s);
|
|
int (*post_load)(ICSState *s, int version_id);
|
|
};
|
|
|
|
struct ICSState {
|
|
/*< private >*/
|
|
DeviceState parent_obj;
|
|
/*< public >*/
|
|
uint32_t nr_irqs;
|
|
uint32_t offset;
|
|
qemu_irq *qirqs;
|
|
ICSIRQState *irqs;
|
|
XICSState *icp;
|
|
};
|
|
|
|
struct ICSIRQState {
|
|
uint32_t server;
|
|
uint8_t priority;
|
|
uint8_t saved_priority;
|
|
#define XICS_STATUS_ASSERTED 0x1
|
|
#define XICS_STATUS_SENT 0x2
|
|
#define XICS_STATUS_REJECTED 0x4
|
|
#define XICS_STATUS_MASKED_PENDING 0x8
|
|
uint8_t status;
|
|
/* (flags & XICS_FLAGS_IRQ_MASK) == 0 means the interrupt is not allocated */
|
|
#define XICS_FLAGS_IRQ_LSI 0x1
|
|
#define XICS_FLAGS_IRQ_MSI 0x2
|
|
#define XICS_FLAGS_IRQ_MASK 0x3
|
|
uint8_t flags;
|
|
};
|
|
|
|
#define XICS_IRQS 1024
|
|
|
|
qemu_irq xics_get_qirq(XICSState *icp, int irq);
|
|
void xics_set_irq_type(XICSState *icp, int irq, bool lsi);
|
|
int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi);
|
|
int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align);
|
|
void xics_free(XICSState *icp, int irq, int num);
|
|
|
|
void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu);
|
|
|
|
#endif /* __XICS_H__ */
|