From patchwork Thu Nov 6 10:12:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 40271 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 304FC24237 for ; Thu, 6 Nov 2014 10:15:08 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id n15sf454961lbi.2 for ; Thu, 06 Nov 2014 02:15:07 -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=r13UPIMdURBrSbN10W2IKdL/X3VHJxCxasIl5h1ZbIA=; b=ELtBExKsUkuvgZGv652lbJzVW70EKW0Y2s0eKW6UQMH6T2D0DOcizh3uzJ5L09J9wh nlwRZYCM01WIwuafYS7Toj1b319Eooc6WktnJ88bIyw4SbiAveJ9keMzUFaBEpavH0/L kGBoEwIgm0i9e0ExWpcTc/HlTeo+ByItR7lwJ7jGHpQ7f6VRORjtT+pM+TXSIF/JqjZF /B6xmqQ3qVRGUNkdIKrLLNtFi7Iovq6UFZ0BvRf7UtB0OT7BtvEd/1u1A3OzMbPNNFOv /QOz7OyqCH6id+CqrPLoroNVu0sG9p2TYFdFrKGT8EGyPhWcihM2WKfFZORKkdXDwRgE Ep9Q== X-Gm-Message-State: ALoCoQm+aMgv0CgTwzZ8Ka2oZKunOZw4LHABosNRhfVosyD4dChTOaDk+fyZf5jh30GjdtpEQMQL X-Received: by 10.112.166.102 with SMTP id zf6mr190972lbb.12.1415268907153; Thu, 06 Nov 2014 02:15:07 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.5 with SMTP id o5ls69376lao.3.gmail; Thu, 06 Nov 2014 02:15:07 -0800 (PST) X-Received: by 10.112.159.229 with SMTP id xf5mr4041608lbb.64.1415268907008; Thu, 06 Nov 2014 02:15:07 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id ca5si10732292lad.118.2014.11.06.02.15.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Nov 2014 02:15:06 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id w7so618436lbi.31 for ; Thu, 06 Nov 2014 02:15:06 -0800 (PST) X-Received: by 10.152.6.228 with SMTP id e4mr3943441laa.71.1415268906586; Thu, 06 Nov 2014 02:15:06 -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 ew9csp21732lbc; Thu, 6 Nov 2014 02:15:05 -0800 (PST) X-Received: by 10.224.97.72 with SMTP id k8mr5065660qan.25.1415268905045; Thu, 06 Nov 2014 02:15:05 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id b10si11163563qgf.10.2014.11.06.02.15.04 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 06 Nov 2014 02:15:05 -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 1XmK4A-0008LC-IC; Thu, 06 Nov 2014 10:13:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XmK48-0008Jm-Q2 for xen-devel@lists.xen.org; Thu, 06 Nov 2014 10:13:21 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 70/11-19763-0C94B545; Thu, 06 Nov 2014 10:13:20 +0000 X-Env-Sender: frediano.ziglio@huawei.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1415268793!10815795!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 7727 invoked from network); 6 Nov 2014 10:13:17 -0000 Received: from szxga02-in.huawei.com (HELO szxga02-in.huawei.com) (119.145.14.65) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 6 Nov 2014 10:13:17 -0000 Received: from 172.24.2.119 (EHLO szxeml460-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CBY66965; Thu, 06 Nov 2014 18:13:12 +0800 (CST) Received: from localhost.localdomain (10.47.67.20) by szxeml460-hub.china.huawei.com (10.82.67.203) with Microsoft SMTP Server id 14.3.158.1; Thu, 6 Nov 2014 18:13:00 +0800 From: Frediano Ziglio To: Ian Campbell , Stefano Stabellini , Tim Deegan , Julien Grall , Date: Thu, 6 Nov 2014 10:12:06 +0000 Message-ID: <1415268731-6519-3-git-send-email-frediano.ziglio@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415268731-6519-1-git-send-email-frediano.ziglio@huawei.com> References: <1415268731-6519-1-git-send-email-frediano.ziglio@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.67.20] X-CFilter-Loop: Reflected Cc: zoltan.kiss@huawei.com, xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH v3 2/7] xen/arm: Implement 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.172 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: Add this new platform to Xen. This platform requires specific code to initialize CPUs. Signed-off-by: Frediano Ziglio Signed-off-by: Zoltan Kiss --- xen/arch/arm/platforms/Makefile | 1 + xen/arch/arm/platforms/hip04.c | 300 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 301 insertions(+) create mode 100644 xen/arch/arm/platforms/hip04.c diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile index 8f47c16..d0b2d99 100644 --- a/xen/arch/arm/platforms/Makefile +++ b/xen/arch/arm/platforms/Makefile @@ -5,4 +5,5 @@ obj-$(CONFIG_ARM_32) += midway.o obj-$(CONFIG_ARM_32) += omap5.o obj-$(CONFIG_ARM_32) += sunxi.o obj-$(CONFIG_ARM_64) += seattle.o +obj-$(CONFIG_ARM_32) += hip04.o obj-$(CONFIG_ARM_64) += xgene-storm.o diff --git a/xen/arch/arm/platforms/hip04.c b/xen/arch/arm/platforms/hip04.c new file mode 100644 index 0000000..f25282c --- /dev/null +++ b/xen/arch/arm/platforms/hip04.c @@ -0,0 +1,300 @@ +/* + * xen/arch/arm/platforms/hip04.c + * + * HiSilicon HIP-04 D01 board + * + * Copyright (c) 2012-2013 Hisilicon Ltd. + * Copyright (c) 2012-2013 Linaro Ltd. + * Copyright (c) 2014 Huawei Tech. Co., Ltd. + * + * Author: Frediano Ziglio + * + * Original code from Linux kernel arch/arm/mach-hisi/hisilicon.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include + +#define CORE_RESET_BIT(x) (1 << x) +#define NEON_RESET_BIT(x) (1 << (x + 4)) +#define CORE_DEBUG_RESET_BIT(x) (1 << (x + 9)) +#define CLUSTER_L2_RESET_BIT (1 << 8) +#define CLUSTER_DEBUG_RESET_BIT (1 << 13) + +#define CLUSTER_L2_RESET_STATUS (1 << 8) +#define CLUSTER_DEBUG_RESET_STATUS (1 << 13) + +#define SC_CPU_RESET_DREQ(x) (0x524 + (x << 3)) /* unreset */ +#define SC_CPU_RESET_STATUS(x) (0x1520 + (x << 3)) + +#define FAB_SF_MODE 0x0c + +#define HIP04_MAX_CLUSTERS 4 +#define HIP04_MAX_CPUS_PER_CLUSTER 4 + +struct hip04_secondary_cpu_data +{ + u32 bootwrapper_phys; + u32 bootwrapper_size; + u32 bootwrapper_magic; + u32 relocation_entry; + u32 relocation_size; +}; + +static void __iomem *relocation, *sysctrl, *fabric, *gb2; +static int hip04_cpu_table[HIP04_MAX_CLUSTERS][HIP04_MAX_CPUS_PER_CLUSTER]; +static struct hip04_secondary_cpu_data hip04_boot; + +static void hip04_reset(void) +{ + unsigned long data; + + data = readl_relaxed(gb2); + writel_relaxed(data & ~0x4000000u, gb2); + + mdelay(10); +} + +static void hip04_set_snoop_filter(unsigned int cluster, unsigned int on) +{ + unsigned long data; + + data = readl_relaxed(fabric + FAB_SF_MODE); + if ( on ) + data |= 1 << cluster; + else + data &= ~(1 << cluster); + writel_relaxed(data, fabric + FAB_SF_MODE); + while ( 1 ) + { + if ( data == readl_relaxed(fabric + FAB_SF_MODE) ) + break; + } +} + +static bool __init hip04_cpu_table_init(void) +{ + unsigned int mpidr, cpu, cluster; + + mpidr = cpu_logical_map(smp_processor_id()); + cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0); + cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1); + + if ( cluster >= HIP04_MAX_CLUSTERS || + cpu >= HIP04_MAX_CPUS_PER_CLUSTER ) + { + printk(XENLOG_ERR "%s: boot CPU is out of bound!\n", __func__); + return false; + } + + hip04_set_snoop_filter(cluster, 1); + hip04_cpu_table[cluster][cpu] = 1; + return true; +} + +static bool hip04_cluster_down(unsigned int cluster) +{ + int i; + + for ( i = 0; i < HIP04_MAX_CPUS_PER_CLUSTER; i++ ) + if ( hip04_cpu_table[cluster][i] ) + return false; + return true; +} + +static void hip04_cluster_up(unsigned int cluster) +{ + unsigned long data, mask; + + if ( !hip04_cluster_down(cluster) ) + return; + + data = CLUSTER_L2_RESET_BIT | CLUSTER_DEBUG_RESET_BIT; + writel_relaxed(data, sysctrl + SC_CPU_RESET_DREQ(cluster)); + do { + mask = CLUSTER_L2_RESET_STATUS | \ + CLUSTER_DEBUG_RESET_STATUS; + data = readl_relaxed(sysctrl + \ + SC_CPU_RESET_STATUS(cluster)); + } while ( data & mask ); + hip04_set_snoop_filter(cluster, 1); +} + +static void __init hip04_iounmap(void __iomem **p) +{ + iounmap(*p); + *p = NULL; +} + +static int __init hip04_smp_init(void) +{ + const struct dt_device_node *np, *np_fab, *bw; + const char *msg; + u64 addr, size; + + np = dt_find_compatible_node(NULL, NULL, "hisilicon,sysctrl"); + msg = "hisilicon,sysctrl missing in DT\n"; + if ( !np ) + goto err; + + np_fab = dt_find_compatible_node(NULL, NULL, "hisilicon,hip04-fabric"); + msg = "hisilicon,hip04-fabric missing in DT\n"; + if ( !np_fab ) + goto err; + + if ( !dt_property_read_u32(np, "bootwrapper-phys", + &hip04_boot.bootwrapper_phys) ) { + u32 boot_method[4]; + bw = dt_find_compatible_node(NULL, NULL, "hisilicon,hip04-bootwrapper"); + msg = "hisilicon,hip04-bootwrapper missing in DT\n"; + if ( !bw ) + goto err; + + msg = "failed to get boot-method\n"; + if ( !dt_property_read_u32_array(bw, "boot-method", boot_method, 4) ) + goto err; + hip04_boot.bootwrapper_phys = boot_method[0]; + hip04_boot.bootwrapper_size = boot_method[1]; + hip04_boot.bootwrapper_magic = 0xa5a5a5a5; + hip04_boot.relocation_entry = boot_method[2]; + hip04_boot.relocation_size = boot_method[3]; + } + else + { + msg = "failed to get bootwrapper-size\n"; + if ( !dt_property_read_u32(np, "bootwrapper-size", + &hip04_boot.bootwrapper_size) ) + goto err; + + msg = "failed to get bootwrapper-magic\n"; + if ( !dt_property_read_u32(np, "bootwrapper-magic", + &hip04_boot.bootwrapper_magic) ) + goto err; + + msg = "failed to get relocation-entry\n"; + if ( !dt_property_read_u32(np, "relocation-entry", + &hip04_boot.relocation_entry) ) + goto err; + + msg = "failed to get relocation-size\n"; + if ( !dt_property_read_u32(np, "relocation-size", + &hip04_boot.relocation_size) ) + goto err; + } + + relocation = ioremap_nocache(hip04_boot.relocation_entry, + hip04_boot.relocation_size); + msg = "failed to map relocation space\n"; + if ( !relocation ) + goto err; + + msg = "Error in \"hisilicon,sysctrl\"\n"; + if ( dt_device_get_address(np, 0, &addr, &size) ) + goto err; + sysctrl = ioremap_nocache(addr, size); + if ( !sysctrl ) + goto err; + + msg = "Error in \"hisilicon,hip04-fabric\"\n"; + if ( dt_device_get_address(np_fab, 0, &addr, &size) ) + goto err; + fabric = ioremap_nocache(addr, size); + if ( !fabric ) + goto err; + + msg = "Error mapping GB2\n"; + gb2 = ioremap_nocache(0xe4002000, 0x1000); + if ( !gb2 ) + goto err; + + msg = "Error initializing SMP table\n"; + if ( !hip04_cpu_table_init() ) + goto err; + + writel_relaxed(hip04_boot.bootwrapper_phys, relocation); + writel_relaxed(hip04_boot.bootwrapper_magic, relocation + 4); + writel_relaxed(__pa(init_secondary), relocation + 8); + writel_relaxed(0, relocation + 12); + + return 0; + +err: + hip04_iounmap(&relocation); + hip04_iounmap(&sysctrl); + hip04_iounmap(&fabric); + hip04_iounmap(&gb2); + + printk("%s", msg); + return -ENXIO; +} + +static int hip04_cpu_up(int cpu) +{ + unsigned int cluster; + unsigned long data; + + cluster = cpu / HIP04_MAX_CPUS_PER_CLUSTER; + cpu %= HIP04_MAX_CPUS_PER_CLUSTER; + + writel_relaxed(hip04_boot.bootwrapper_phys, relocation); + writel_relaxed(hip04_boot.bootwrapper_magic, relocation + 4); + writel_relaxed(__pa(init_secondary), relocation + 8); + writel_relaxed(0, relocation + 12); + + hip04_cluster_up(cluster); + + hip04_cpu_table[cluster][cpu]++; + + data = CORE_RESET_BIT(cpu) | NEON_RESET_BIT(cpu) | \ + CORE_DEBUG_RESET_BIT(cpu); + writel_relaxed(data, sysctrl + SC_CPU_RESET_DREQ(cluster)); + + return cpu_up_send_sgi(cpu); +} + + +static const char * const hip04_dt_compat[] __initconst = +{ + "hisilicon,hip04-d01", + NULL +}; + +static const struct dt_device_match hip04_blacklist_dev[] __initconst = +{ + /* Hardware power management */ + DT_MATCH_COMPATIBLE("hisilicon,sysctrl"), + DT_MATCH_COMPATIBLE("hisilicon,hip04-fabric"), + { /* sentinel */ }, +}; + + +PLATFORM_START(hip04, "HISILICON HIP04") + .compatible = hip04_dt_compat, + .smp_init = hip04_smp_init, + .cpu_up = hip04_cpu_up, + .reset = hip04_reset, + .blacklist_dev = hip04_blacklist_dev, +PLATFORM_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */