Isaku Yamahata wrote:
> Define resend_irq_on_evtchn() which ia64/xen uses.
> Although it isn't used by current x86/xen code, it's arch generic
> so that put it into common code.
> make ipi_to_irq[] visible removing static because
> ia64/xen needs to access the variable from ia64 specific code
>
What kind of access? Would it be better to add some accessor functions?
If nothing else, it needs to be prefixed with xen_ if it goes non-static.
(As should resend_irq_on_evtchn(), but I'm less concerned about a name
collision.)
J
> Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
> ---
> drivers/xen/events.c | 18 +++++++++++++++++-
> include/xen/events.h | 1 +
> 2 files changed, 18 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/xen/events.c b/drivers/xen/events.c
> index 2396b44..1c2c193 100644
> --- a/drivers/xen/events.c
> +++ b/drivers/xen/events.c
> @@ -48,7 +48,7 @@ static DEFINE_SPINLOCK(irq_mapping_update_lock);
> static DEFINE_PER_CPU(int, virq_to_irq[NR_VIRQS]) = {[0 ... NR_VIRQS-1] = -1};
>
> /* IRQ <-> IPI mapping */
> -static DEFINE_PER_CPU(int, ipi_to_irq[XEN_NR_IPIS]) = {[0 ... XEN_NR_IPIS-1] = -1};
> +DEFINE_PER_CPU(int, ipi_to_irq[XEN_NR_IPIS]) = {[0 ... XEN_NR_IPIS-1] = -1};
>
> /* Packed IRQ information: binding type, sub-type index, and event channel. */
> struct packed_irq
> @@ -586,6 +586,22 @@ static void set_affinity_irq(unsigned irq, cpumask_t dest)
> rebind_irq_to_cpu(irq, tcpu);
> }
>
> +int resend_irq_on_evtchn(unsigned int irq)
> +{
> + int masked, evtchn = evtchn_from_irq(irq);
> + struct shared_info *s = HYPERVISOR_shared_info;
> +
> + if (!VALID_EVTCHN(evtchn))
> + return 1;
> +
> + masked = sync_test_and_set_bit(evtchn, s->evtchn_mask);
> + sync_set_bit(evtchn, s->evtchn_pending);
> + if (!masked)
> + unmask_evtchn(evtchn);
> +
> + return 1;
> +}
> +
> static void enable_dynirq(unsigned int irq)
> {
> int evtchn = evtchn_from_irq(irq);
> diff --git a/include/xen/events.h b/include/xen/events.h
> index 2bde54d..574cfa4 100644
> --- a/include/xen/events.h
> +++ b/include/xen/events.h
> @@ -37,6 +37,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
> void unbind_from_irqhandler(unsigned int irq, void *dev_id);
>
> void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector);
> +int resend_irq_on_evtchn(unsigned int irq);
>
> static inline void notify_remote_via_evtchn(int port)
> {
>
_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/virtualization
