From: Vijaya Kumar K Date: Tue, 1 Jul 2014 06:41:16 +0000 (+0530) Subject: xen/arm: move vgic defines to vgic header file X-Git-Tag: 4.5.0-rc1~581 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1f83dbf0b514372265156a42fb6521a89bcb0aaa;p=xen.git xen/arm: move vgic defines to vgic header file gic.h contains defines of vgic. Move these to vgic header file. Also move inline functions and defines/macros in vgic.c to vgic.h. These vgic functions and macros can be used by other GIC HW specific VGIC drivers, Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini Acked-by: Ian Campbell Acked-by: Julien Grall --- diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 9c141bc876..3a8acbf228 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -26,6 +26,7 @@ #include #include +#include static unsigned int local_irqs_type[NR_LOCAL_IRQS]; static DEFINE_SPINLOCK(local_irqs_type_lock); diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 06cc709abc..4c3e1a6f09 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index d01f1d9d80..96bd7c1c05 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -33,34 +33,9 @@ #define REG(n) (n) -/* Number of ranks of interrupt registers for a domain */ -#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) - static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info); static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info); -/* - * Rank containing GICD_ for GICD_ with - * -bits-per-interrupt - */ -static inline int REG_RANK_NR(int b, uint32_t n) -{ - switch ( b ) - { - case 8: return n >> 3; - case 4: return n >> 2; - case 2: return n >> 1; - case 1: return n; - default: BUG(); - } -} - -/* - * Offset of GICD_ with its rank, for GICD_ with - * -bits-per-interrupt. - */ -#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) - /* * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. @@ -174,34 +149,6 @@ int vcpu_vgic_free(struct vcpu *v) return 0; } -#define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) -#define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) - -#define vgic_lock_rank(v, r) spin_lock(&(r)->lock) -#define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) - -static uint32_t vgic_byte_read(uint32_t val, int sign, int offset) -{ - int byte = offset & 0x3; - - val = val >> (8*byte); - if ( sign && (val & 0x80) ) - val |= 0xffffff00; - else - val &= 0x000000ff; - return val; -} - -static void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) -{ - int byte = offset & 0x3; - - var &= (0xff << (8*byte)); - - *reg &= ~(0xff << (8*byte)); - *reg |= var; -} - static int vgic_distr_mmio_read(struct vcpu *v, mmio_info_t *info) { struct hsr_dabt dabt = info->dabt; diff --git a/xen/arch/arm/vpsci.c b/xen/arch/arm/vpsci.c index 1ceb8cb008..80678f6865 100644 --- a/xen/arch/arm/vpsci.c +++ b/xen/arch/arm/vpsci.c @@ -16,6 +16,7 @@ #include #include +#include #include int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point) diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c index c268873e18..690657b9c7 100644 --- a/xen/arch/arm/vtimer.c +++ b/xen/arch/arm/vtimer.c @@ -24,6 +24,7 @@ #include #include #include +#include #include extern s_time_t ticks_to_ns(uint64_t ticks); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 5ff4477c26..ed610cb14f 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -188,13 +188,6 @@ enum gic_version { }; extern enum gic_version gic_hw_version(void); -extern int domain_vgic_init(struct domain *d); -extern void domain_vgic_free(struct domain *d); - -extern int vcpu_vgic_init(struct vcpu *v); - -extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); -extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); /* Program the GIC to route an interrupt */ diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 0fd5b4100e..92f1e86e9d 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -18,6 +18,8 @@ #ifndef __ASM_ARM_VGIC_H__ #define __ASM_ARM_VGIC_H__ +#include + /* Represents state corresponding to a block of 32 interrupts */ struct vgic_irq_rank { spinlock_t lock; /* Covers access to all other members of this struct */ @@ -27,6 +29,65 @@ struct vgic_irq_rank { uint32_t itargets[8]; }; +/* Number of ranks of interrupt registers for a domain */ +#define DOMAIN_NR_RANKS(d) (((d)->arch.vgic.nr_lines+31)/32) + +#define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) +#define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) + +#define vgic_lock_rank(v, r) spin_lock(&(r)->lock) +#define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) + +/* + * Rank containing GICD_ for GICD_ with + * -bits-per-interrupt + */ +static inline int REG_RANK_NR(int b, uint32_t n) +{ + switch ( b ) + { + case 8: return n >> 3; + case 4: return n >> 2; + case 2: return n >> 1; + case 1: return n; + default: BUG(); + } +} + +static inline uint32_t vgic_byte_read(uint32_t val, int sign, int offset) +{ + int byte = offset & 0x3; + + val = val >> (8*byte); + if ( sign && (val & 0x80) ) + val |= 0xffffff00; + else + val &= 0x000000ff; + return val; +} + +static inline void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) +{ + int byte = offset & 0x3; + + var &= (0xff << (8*byte)); + + *reg &= ~(0xff << (8*byte)); + *reg |= var; +} + +/* + * Offset of GICD_ with its rank, for GICD_ with + * -bits-per-interrupt. + */ +#define REG_RANK_INDEX(b, n) (((n) >> 2) & ((b)-1)) + +extern int domain_vgic_init(struct domain *d); +extern void domain_vgic_free(struct domain *d); +extern int vcpu_vgic_init(struct vcpu *v); +extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); +extern void vgic_clear_pending_irqs(struct vcpu *v); + extern int vcpu_vgic_free(struct vcpu *v); #endif /* __ASM_ARM_VGIC_H__ */