From: Julien Grall <julien.grall@arm.com>
To: xen-devel@lists.xen.org
Cc: sstabellini@kernel.org, wei.chen@arm.com, steve.capper@arm.com,
Julien Grall <julien.grall@arm.com>,
shannon.zhao@linaro.org, shankerd@codeaurora.org
Subject: [RFC 4/8] xen/arm: gic: set_type: Pass the type in parameter rather than in desc->arch.type
Date: Tue, 7 Jun 2016 17:48:39 +0100 [thread overview]
Message-ID: <1465318123-3090-5-git-send-email-julien.grall@arm.com> (raw)
In-Reply-To: <1465318123-3090-1-git-send-email-julien.grall@arm.com>
A follow-up patch will not store the type in desc->arch.type. Also, the
callback prototype is more logical.
Signed-off-by: Julien Grall <julien.grall@arm.com>
---
xen/arch/arm/gic-v2.c | 3 +--
xen/arch/arm/gic-v3.c | 3 +--
xen/arch/arm/gic.c | 9 ++++-----
xen/include/asm-arm/gic.h | 4 ++--
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index fa2c5a5..399b869 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -200,11 +200,10 @@ static unsigned int gicv2_read_irq(void)
return (readl_gicc(GICC_IAR) & GICC_IA_IRQ);
}
-static void gicv2_set_irq_type(struct irq_desc *desc)
+static void gicv2_set_irq_type(struct irq_desc *desc, unsigned int type)
{
uint32_t cfg, actual, edgebit;
unsigned int irq = desc->irq;
- unsigned int type = desc->arch.type;
spin_lock(&gicv2.lock);
/* Set edge / level */
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index c25fe50..d0a7a23 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -471,12 +471,11 @@ static inline uint64_t gicv3_mpidr_to_affinity(int cpu)
MPIDR_AFFINITY_LEVEL(mpidr, 0));
}
-static void gicv3_set_irq_type(struct irq_desc *desc)
+static void gicv3_set_irq_type(struct irq_desc *desc, unsigned int type)
{
uint32_t cfg, actual, edgebit;
void __iomem *base;
unsigned int irq = desc->irq;
- unsigned int type = desc->arch.type;
/* SGI's are always edge-triggered not need to call GICD_ICFGR0 */
ASSERT(irq >= NR_GIC_SGI);
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 0fd7e8c..8b992d8 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -96,12 +96,12 @@ void gic_restore_state(struct vcpu *v)
gic_restore_pending_irqs(v);
}
-static void gic_set_irq_type(struct irq_desc *desc)
+static void gic_set_irq_type(struct irq_desc *desc, unsigned int type)
{
ASSERT(spin_is_locked(&desc->lock));
- ASSERT(desc->arch.type != IRQ_TYPE_INVALID);
+ ASSERT(type != IRQ_TYPE_INVALID);
- gic_hw_ops->set_irq_type(desc);
+ gic_hw_ops->set_irq_type(desc, type);
}
static void gic_set_irq_priority(struct irq_desc *desc, unsigned int priority)
@@ -124,7 +124,6 @@ void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mask,
desc->handler->set_affinity(desc, cpu_mask);
- gic_set_irq_type(desc);
gic_set_irq_priority(desc, priority);
}
@@ -157,7 +156,7 @@ int gic_route_irq_to_guest(struct domain *d, unsigned int virq,
desc->handler = gic_hw_ops->gic_guest_irq_type;
set_bit(_IRQ_GUEST, &desc->status);
- gic_set_irq_type(desc);
+ gic_set_irq_type(desc, desc->arch.type);
gic_set_irq_priority(desc, priority);
p->desc = desc;
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index ffba469..ddc45a8 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -329,8 +329,8 @@ struct gic_hw_operations {
void (*deactivate_irq)(struct irq_desc *irqd);
/* Read IRQ id and Ack */
unsigned int (*read_irq)(void);
- /* Set IRQ type - type is taken from desc->arch.type */
- void (*set_irq_type)(struct irq_desc *desc);
+ /* Set IRQ type */
+ void (*set_irq_type)(struct irq_desc *desc, unsigned int type);
/* Set IRQ priority */
void (*set_irq_priority)(struct irq_desc *desc, unsigned int priority);
/* Send SGI */
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-07 16:48 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 16:48 [RFC 0/8] xen/arm: acpi: Support SPIs routing Julien Grall
2016-06-07 16:48 ` [RFC 1/8] xen/arm: gic: Consolidate the IRQ affinity set in a single place Julien Grall
2016-06-22 10:46 ` Stefano Stabellini
2016-06-07 16:48 ` [RFC 2/8] xen/arm: gic: Do not configure affinity for guest IRQ during routing Julien Grall
2016-06-22 10:54 ` Stefano Stabellini
2016-06-22 11:19 ` Julien Grall
2016-06-07 16:48 ` [RFC 3/8] xen/arm: gic: split set_irq_properties Julien Grall
2016-06-22 10:58 ` Stefano Stabellini
2016-06-07 16:48 ` Julien Grall [this message]
2016-06-22 11:25 ` [RFC 4/8] xen/arm: gic: set_type: Pass the type in parameter rather than in desc->arch.type Stefano Stabellini
2016-06-07 16:48 ` [RFC 5/8] xen/arm: gic: Document how gic_set_irq_type should be called Julien Grall
2016-06-22 11:00 ` Stefano Stabellini
2016-06-07 16:48 ` [RFC 6/8] Revert "xen/arm: warn the user that we cannot route SPIs to Dom0 on ACPI" Julien Grall
2016-06-22 11:01 ` Stefano Stabellini
2016-06-07 16:48 ` [RFC 7/8] xen/arm: Allow DOM0 to set the irq type when ACPI is inuse Julien Grall
2016-06-22 11:23 ` Stefano Stabellini
2016-06-22 11:46 ` Julien Grall
2016-06-22 11:49 ` Stefano Stabellini
2016-06-07 16:48 ` [RFC 8/8] xen/arm: acpi: route all unused IRQs to DOM0 Julien Grall
2016-06-22 11:44 ` Stefano Stabellini
2016-06-22 12:19 ` Julien Grall
2016-06-07 18:50 ` [RFC 0/8] xen/arm: acpi: Support SPIs routing Shanker Donthineni
2016-06-08 11:48 ` Shanker Donthineni
2016-06-08 11:49 ` Julien Grall
2016-06-08 12:11 ` Shanker Donthineni
2016-06-08 12:34 ` Julien Grall
2016-06-13 11:42 ` Julien Grall
2016-06-13 17:19 ` Shanker Donthineni
2016-06-13 17:20 ` Julien Grall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465318123-3090-5-git-send-email-julien.grall@arm.com \
--to=julien.grall@arm.com \
--cc=shankerd@codeaurora.org \
--cc=shannon.zhao@linaro.org \
--cc=sstabellini@kernel.org \
--cc=steve.capper@arm.com \
--cc=wei.chen@arm.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).