Merge tag 'kvm-arm-for-4.8-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Changes for v4.8 - Take 2 Includes GSI routing support to go along with the new VGIC and a small fix that has been cooking in -next for a while.
This commit is contained in:
@@ -317,7 +317,13 @@ struct kvm_kernel_irq_routing_entry {
|
||||
unsigned irqchip;
|
||||
unsigned pin;
|
||||
} irqchip;
|
||||
struct msi_msg msi;
|
||||
struct {
|
||||
u32 address_lo;
|
||||
u32 address_hi;
|
||||
u32 data;
|
||||
u32 flags;
|
||||
u32 devid;
|
||||
} msi;
|
||||
struct kvm_s390_adapter_int adapter;
|
||||
struct kvm_hv_sint hv_sint;
|
||||
};
|
||||
@@ -1003,12 +1009,12 @@ static inline int mmu_notifier_retry(struct kvm *kvm, unsigned long mmu_seq)
|
||||
|
||||
#ifdef CONFIG_S390
|
||||
#define KVM_MAX_IRQ_ROUTES 4096 //FIXME: we can have more than that...
|
||||
#elif defined(CONFIG_ARM64)
|
||||
#define KVM_MAX_IRQ_ROUTES 4096
|
||||
#else
|
||||
#define KVM_MAX_IRQ_ROUTES 1024
|
||||
#endif
|
||||
|
||||
int kvm_setup_default_irq_routing(struct kvm *kvm);
|
||||
int kvm_setup_empty_irq_routing(struct kvm *kvm);
|
||||
int kvm_set_irq_routing(struct kvm *kvm,
|
||||
const struct kvm_irq_routing_entry *entries,
|
||||
unsigned nr,
|
||||
|
Reference in New Issue
Block a user