From patchwork Wed Nov 5 09:41:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 40173 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8E962240A6 for ; Wed, 5 Nov 2014 09:44:12 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id r20sf615324wiv.10 for ; Wed, 05 Nov 2014 01:44:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=qb0ti4aQjJCdaZ/MmtwI0aMJjN+9OMRnddf8HmhzwXs=; b=ZZOSwxC0kQagfHJE9MF+Ythq6JOI5sbMzhdiQ9fmHBrFcMd0dfxIDL2HdQkHwxeK4P XJa+LtHr5rj0PUMw5aP6LjakPF8Y9fLzvUYqs4jv+c2lHl96l47LB/aIuz2orLfxbzvg poAjYz2v2R6pZSnp9hElds3MSsGJaV6gg2aMWuh68U7Vnn5PGBnTjzVmgr+AdgYGHh89 nDDdt5pEjNQKA+s66tNP/7sX3Li8BVGiayb5umLAQGnUvHgYjDew7VzxyWIiQYjPSj5j 7VHDj/nxgxM//ruWwEpYiuMErbiq9NGYZWnrlaA8lL2V488STBryt76iYNviuf8wOeLt Uy/Q== X-Gm-Message-State: ALoCoQn1FM3Y2leb4MLlRdcGUURzAwZhoJNFZQwqGUsObBh42OFcy2Mi9ee2HueWh5u0b949CYiI X-Received: by 10.112.48.98 with SMTP id k2mr200007lbn.15.1415180651703; Wed, 05 Nov 2014 01:44:11 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.137 with SMTP id o9ls101730lal.17.gmail; Wed, 05 Nov 2014 01:44:11 -0800 (PST) X-Received: by 10.152.87.131 with SMTP id ay3mr3236326lab.97.1415180651550; Wed, 05 Nov 2014 01:44:11 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id k1si5289201lbv.25.2014.11.05.01.44.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Nov 2014 01:44:11 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id b6so319179lbj.16 for ; Wed, 05 Nov 2014 01:44:11 -0800 (PST) X-Received: by 10.152.120.199 with SMTP id le7mr43189173lab.67.1415180651447; Wed, 05 Nov 2014 01:44:11 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp256368lbc; Wed, 5 Nov 2014 01:44:10 -0800 (PST) X-Received: by 10.140.30.165 with SMTP id d34mr63028320qgd.55.1415180649921; Wed, 05 Nov 2014 01:44:09 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id m67si5435521qgd.29.2014.11.05.01.44.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 05 Nov 2014 01:44:09 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xlx6j-0007RP-V5; Wed, 05 Nov 2014 09:42:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xlx6i-0007Q0-2f for xen-devel@lists.xen.org; Wed, 05 Nov 2014 09:42:28 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 5F/DD-22777-301F9545; Wed, 05 Nov 2014 09:42:27 +0000 X-Env-Sender: frediano.ziglio@huawei.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1415180541!11279254!1 X-Originating-IP: [119.145.14.65] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTE5LjE0NS4xNC42NSA9PiA3NzQ2Mw==\n X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4990 invoked from network); 5 Nov 2014 09:42:25 -0000 Received: from szxga02-in.huawei.com (HELO szxga02-in.huawei.com) (119.145.14.65) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 5 Nov 2014 09:42:25 -0000 Received: from 172.24.2.119 (EHLO szxeml450-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CBW70498; Wed, 05 Nov 2014 17:42:21 +0800 (CST) Received: from localhost.localdomain (10.47.71.64) by szxeml450-hub.china.huawei.com (10.82.67.193) with Microsoft SMTP Server id 14.3.158.1; Wed, 5 Nov 2014 17:42:13 +0800 From: Frediano Ziglio To: Ian Campbell , Stefano Stabellini , Tim Deegan , Julien Grall , Date: Wed, 5 Nov 2014 09:41:10 +0000 Message-ID: <1415180475-8339-4-git-send-email-frediano.ziglio@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415180475-8339-1-git-send-email-frediano.ziglio@huawei.com> References: <1415180475-8339-1-git-send-email-frediano.ziglio@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.71.64] X-CFilter-Loop: Reflected Cc: zoltan.kiss@huawei.com, xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH v3 3/8] xen/arm: Make gic-v2 code handle hip04-d01 platform X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: frediano.ziglio@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: The GIC in this platform is mainly compatible with the standard GICv2 beside: - ITARGET is extended to 16 bit to support 16 CPUs; - SGI mask is extended to support 16 CPUs; - maximum supported interrupt is 510. Use nr_lines to check for maximum irq supported. hip04-d01 support less interrupts due to some field restriction. Any value above this is already an error. Signed-off-by: Frediano Ziglio Signed-off-by: Zoltan Kiss --- xen/arch/arm/gic-v2.c | 85 ++++++++++++++++++++++++++++++++++++++--------- xen/arch/arm/gic.c | 3 +- xen/include/asm-arm/gic.h | 4 ++- 3 files changed, 75 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index faad1ff..3cb59dd 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -79,16 +79,25 @@ static struct gic_info gicv2_info; * logical CPU numbering. Let's use mapping as returned by the GIC * itself */ -static DEFINE_PER_CPU(u8, gic_cpu_id); +static DEFINE_PER_CPU(u16, gic_cpu_id); /* Maximum cpu interface per GIC */ -#define NR_GIC_CPU_IF 8 +static unsigned int nr_gic_cpu_if = 8; +static unsigned int gicd_sgi_target_shift = GICD_SGI_TARGET_SHIFT; +static unsigned int gic_cpu_mask = 0xff; + +#define is_hip04() (nr_gic_cpu_if == 16) static inline void writeb_gicd(uint8_t val, unsigned int offset) { writeb_relaxed(val, gicv2.map_dbase + offset); } +static inline void writew_gicd(uint16_t val, unsigned int offset) +{ + writew_relaxed(val, gicv2.map_dbase + offset); +} + static inline void writel_gicd(uint32_t val, unsigned int offset) { writel_relaxed(val, gicv2.map_dbase + offset); @@ -132,7 +141,7 @@ static unsigned int gicv2_cpu_mask(const cpumask_t *cpumask) cpumask_and(&possible_mask, cpumask, &cpu_possible_map); for_each_cpu( cpu, &possible_mask ) { - ASSERT(cpu < NR_GIC_CPU_IF); + ASSERT(cpu < nr_gic_cpu_if); mask |= per_cpu(gic_cpu_id, cpu); } @@ -203,6 +212,15 @@ static unsigned int gicv2_read_irq(void) return (readl_gicc(GICC_IAR) & GICC_IA_IRQ); } +/* Set target CPU mask (RAZ/WI on uniprocessor) */ +static void gicv2_set_irq_mask(int irq, unsigned int mask) +{ + if ( is_hip04() ) + writew_gicd(mask, GICD_ITARGETSR + irq * 2); + else + writeb_gicd(mask, GICD_ITARGETSR + irq); +} + /* * needs to be called with a valid cpu_mask, ie each cpu in the mask has * already called gic_cpu_init @@ -230,7 +248,7 @@ static void gicv2_set_irq_properties(struct irq_desc *desc, writel_gicd(cfg, GICD_ICFGR + (irq / 16) * 4); /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_gicd(mask, GICD_ITARGETSR + irq); + gicv2_set_irq_mask(irq, mask); /* Set priority */ writeb_gicd(priority, GICD_IPRIORITYR + irq); @@ -244,16 +262,21 @@ static void __init gicv2_dist_init(void) uint32_t gic_cpus; int i; - cpumask = readl_gicd(GICD_ITARGETSR) & 0xff; - cpumask |= cpumask << 8; - cpumask |= cpumask << 16; + cpumask = readl_gicd(GICD_ITARGETSR) & gic_cpu_mask; /* Disable the distributor */ writel_gicd(0, GICD_CTLR); type = readl_gicd(GICD_TYPER); gicv2_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); - gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); + if ( is_hip04() ) + { + gic_cpus = 16; + } + else + { + gic_cpus = 1 + ((type & GICD_TYPE_CPUS) >> 5); + } printk("GICv2: %d lines, %d cpu%s%s (IID %8.8x).\n", gicv2_info.nr_lines, gic_cpus, (gic_cpus == 1) ? "" : "s", (type & GICD_TYPE_SEC) ? ", secure" : "", @@ -264,8 +287,19 @@ static void __init gicv2_dist_init(void) writel_gicd(0x0, GICD_ICFGR + (i / 16) * 4); /* Route all global IRQs to this CPU */ - for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) - writel_gicd(cpumask, GICD_ITARGETSR + (i / 4) * 4); + if ( is_hip04() ) + { + cpumask |= cpumask << 16; + for ( i = 32; i < gicv2_info.nr_lines; i += 2 ) + writel_gicd(cpumask, GICD_ITARGETSR + (i / 2) * 4); + } + else + { + cpumask |= cpumask << 8; + cpumask |= cpumask << 16; + for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) + writel_gicd(cpumask, GICD_ITARGETSR + (i / 4) * 4); + } /* Default priority for global interrupts */ for ( i = 32; i < gicv2_info.nr_lines; i += 4 ) @@ -285,7 +319,7 @@ static void __cpuinit gicv2_cpu_init(void) { int i; - this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & 0xff; + this_cpu(gic_cpu_id) = readl_gicd(GICD_ITARGETSR) & gic_cpu_mask; /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so * even though they are controlled with GICD registers, they must @@ -366,7 +400,7 @@ static void gicv2_send_SGI(enum gic_sgi sgi, enum gic_sgi_mode irqmode, cpumask_and(&online_mask, cpu_mask, &cpu_online_map); mask = gicv2_cpu_mask(&online_mask); writel_gicd(GICD_SGI_TARGET_LIST | - (mask << GICD_SGI_TARGET_SHIFT) | sgi, + (mask << gicd_sgi_target_shift) | sgi, GICD_SGIR); break; default: @@ -581,7 +615,7 @@ static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_m mask = gicv2_cpu_mask(cpu_mask); /* Set target CPU mask (RAZ/WI on uniprocessor) */ - writeb_gicd(mask, GICD_ITARGETSR + desc->irq); + gicv2_set_irq_mask(desc->irq, mask); spin_unlock(&gicv2.lock); } @@ -684,7 +718,7 @@ const static struct gic_hw_operations gicv2_ops = { }; /* Set up the GIC */ -static int __init gicv2_init(struct dt_device_node *node, const void *data) +static int __init gicv2_init_default(struct dt_device_node *node, const void *data) { int res; @@ -764,6 +798,15 @@ static int __init gicv2_init(struct dt_device_node *node, const void *data) return 0; } +static int __init hip04_gicv2_init(struct dt_device_node *node, const void *data) +{ + nr_gic_cpu_if = 16; + gicd_sgi_target_shift = 8; + gic_cpu_mask = 0xffff; + + return gicv2_init_default(node, data); +} + static const char * const gicv2_dt_compat[] __initconst = { DT_COMPAT_GIC_CORTEX_A15, @@ -774,9 +817,21 @@ static const char * const gicv2_dt_compat[] __initconst = DT_DEVICE_START(gicv2, "GICv2:", DEVICE_GIC) .compatible = gicv2_dt_compat, - .init = gicv2_init, + .init = gicv2_init_default, DT_DEVICE_END +static const char * const hip04_gicv2_dt_compat[] __initconst = +{ + DT_COMPAT_GIC_HIP04, + NULL +}; + +DT_DEVICE_START(hip04_gicv2, "GICv2:", DEVICE_GIC) + .compatible = hip04_gicv2_dt_compat, + .init = hip04_gicv2_init, +DT_DEVICE_END + + /* * Local variables: * mode: C diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 70d10d6..8050a65 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -563,12 +563,13 @@ static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) void gic_interrupt(struct cpu_user_regs *regs, int is_fiq) { unsigned int irq; + unsigned int max_irq = gic_hw_ops->info->nr_lines; do { /* Reading IRQ will ACK it */ irq = gic_hw_ops->read_irq(); - if ( likely(irq >= 16 && irq < 1021) ) + if ( likely(irq >= 16 && irq < max_irq) ) { local_irq_enable(); do_IRQ(regs, irq, is_fiq); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 187dc46..5adb628 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -155,10 +155,12 @@ #define DT_COMPAT_GIC_400 "arm,gic-400" #define DT_COMPAT_GIC_CORTEX_A15 "arm,cortex-a15-gic" #define DT_COMPAT_GIC_CORTEX_A7 "arm,cortex-a7-gic" +#define DT_COMPAT_GIC_HIP04 "hisilicon,hip04-gic" #define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7), \ - DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_400) + DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_400), \ + DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_HIP04) #define DT_COMPAT_GIC_V3 "arm,gic-v3"