From patchwork Thu Jul 14 16:22:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9230123 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3B0FB6075D for ; Thu, 14 Jul 2016 16:24:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C5211FF27 for ; Thu, 14 Jul 2016 16:24:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FB5627FA4; Thu, 14 Jul 2016 16:24:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A6E821FF27 for ; Thu, 14 Jul 2016 16:24:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNjP1-0003Tu-2f; Thu, 14 Jul 2016 16:22:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNjP0-0003T6-58 for xen-devel@lists.xen.org; Thu, 14 Jul 2016 16:22:18 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 62/D7-21227-93CB7875; Thu, 14 Jul 2016 16:22:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTddiT3u 4wfZbShZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0Z/V33BKpmKeVufMzUwbhTvYuTiEBLYyChx ed5CZgjnNKPEhNZLQA4nB5uApsSdz5+YQGwRAWmJa58vM4LYzAKFEtfPPmEDsYUFMiXWXXrI3 sXIwcEioCrxZGYESJhXwEXixKN3YGMkBOQkTh6bzApicwq4SqzY/QmsVQioZu7Tm8wTGLkXMD KsYtQoTi0qSy3SNTTRSyrKTM8oyU3MzNE1NDDWy00tLk5MT81JTCrWS87P3cQI9C4DEOxgXLH d8xCjJAeTkiivdn9buBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ3tu72sOFBItS01Mr0jJzgGEG k5bg4FES4ZXbDZTmLS5IzC3OTIdInWJUlBLn/QjSJwCSyCjNg2uDhfYlRlkpYV5GoEOEeApSi 3IzS1DlXzGKczAqCfN+BZnCk5lXAjf9FdBiJqDF1uZgi0sSEVJSDYzLOr8nbTS6oLXrdce65R 9eVgjOWSYRJsbxVfvx7M0dEhmPNlwzdfrxo6U3mfXMyZdBzp/z89rr6yZYGDtt+new0Frg4oI zLQ52H2yjTO6snxySn+H+8U1J9T9PB+0jzre+rNgir3LlRn9sybTYgAOLjRZXRr/47XEo5EFj lu2vGLeO8A1X2mYqsRRnJBpqMRcVJwIAWjlao2gCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1468513335!428170!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.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1025 invoked from network); 14 Jul 2016 16:22:16 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-4.tower-31.messagelabs.com with SMTP; 14 Jul 2016 16:22:16 -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 41DA328; Thu, 14 Jul 2016 09:23:21 -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 B103F3F4F6; Thu, 14 Jul 2016 09:22:14 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 14 Jul 2016 17:22:00 +0100 Message-Id: <1468513325-29492-5-git-send-email-julien.grall@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468513325-29492-1-git-send-email-julien.grall@arm.com> References: <1468513325-29492-1-git-send-email-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org, shankerd@codeaurora.org, steve.capper@arm.com Subject: [Xen-devel] [PATCH v2 4/9] 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" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Stefano Stabellini --- Changes in v2: - gic_set_irq_type has been dropped by mistake in gic_route_irq_to_xen. Re-add it! --- xen/arch/arm/gic-v2.c | 3 +-- xen/arch/arm/gic-v3.c | 3 +-- xen/arch/arm/gic.c | 10 +++++----- xen/include/asm-arm/gic.h | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 69ed72d..9bd9d0b 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -236,11 +236,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 781f25c..b8be395 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 c63c862..b9371a7 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) @@ -121,7 +121,7 @@ void gic_route_irq_to_xen(struct irq_desc *desc, unsigned int priority) desc->handler = gic_hw_ops->gic_host_irq_type; - gic_set_irq_type(desc); + gic_set_irq_type(desc, desc->arch.type); gic_set_irq_priority(desc, priority); } @@ -154,7 +154,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 3f39f79..2214e87 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -328,8 +328,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 */