From patchwork Tue Jun 7 16:48:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 69562 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2075622qgf; Tue, 7 Jun 2016 09:50:39 -0700 (PDT) X-Received: by 10.176.4.49 with SMTP id 46mr174612uav.32.1465318222552; Tue, 07 Jun 2016 09:50:22 -0700 (PDT) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id f140si6868816vka.201.2016.06.07.09.50.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jun 2016 09:50:22 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAKBc-0000Os-1k; Tue, 07 Jun 2016 16:49:04 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAKBa-0000Ig-PZ for xen-devel@lists.xen.org; Tue, 07 Jun 2016 16:49:02 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 3B/99-06230-EFAF6575; Tue, 07 Jun 2016 16:49:02 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRWlGSWpSXmKPExsVysyfVTfffr7B wg9kf2C2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oztSz8xFfyTqli2/DBzA+NmsS5GLg4hgQ2M ErunbWWFcE4zSlzaMpWli5GTg01AU+LO509MILaIgLTEtc+XGUGKmAXmMUqcWbiTHSQhLJAi8 fP3QbAGFgFViTX3zrF1MXJw8Ao4S1w+aw8SlhCQkzh5bDIriM0p4CLx8vlLsHIhoJIHDbuYJz ByL2BkWMWoXpxaVJZapGuol1SUmZ5RkpuYmaNraGCml5taXJyYnpqTmFSsl5yfu4kR6F8GINj BuPO50yFGSQ4mJVHep9/CwoX4kvJTKjMSizPii0pzUosPMcpwcChJ8Mr8BMoJFqWmp1akZeYA Aw0mLcHBoyTCm/UOKM1bXJCYW5yZDpE6xagoJc6rA5IQAElklObBtcGC+xKjrJQwLyPQIUI8B alFuZklqPKvGMU5GJWEeT1AtvNk5pXATX8FtJgJaDHLV7DFJYkIKakGxuTWzevvdobxukuVZu 8p7712TOfOXbPP19+yMOrvkX1gdDL74e1CPfV8nRreubr5mT2mrf6Hoj6w7PVafc6i9MSTY/2 rTx9qNZJrNJ/h2fFtu0KVmYTV1869R7ftYL78YP+Ccj+vO+fPen7Sqe9c9HMdY50k01oxIYb7 M725xZebNq4Xme8/R4mlOCPRUIu5qDgRAFY4eRFpAgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1465318141!17767636!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39145 invoked from network); 7 Jun 2016 16:49:01 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-14.tower-21.messagelabs.com with SMTP; 7 Jun 2016 16:49:01 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B533EF; Tue, 7 Jun 2016 09:49:32 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.215.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 08CEF3F246; Tue, 7 Jun 2016 09:48:56 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 7 Jun 2016 17:48:39 +0100 Message-Id: <1465318123-3090-5-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465318123-3090-1-git-send-email-julien.grall@arm.com> References: <1465318123-3090-1-git-send-email-julien.grall@arm.com> Cc: sstabellini@kernel.org, wei.chen@arm.com, steve.capper@arm.com, Julien Grall , shannon.zhao@linaro.org, shankerd@codeaurora.org Subject: [Xen-devel] [RFC 4/8] xen/arm: gic: set_type: Pass the type in parameter rather than in desc->arch.type X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" 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 --- 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 */