From patchwork Wed Sep 6 08:07:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Higgins X-Patchwork-Id: 9940077 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 3D68760224 for ; Wed, 6 Sep 2017 08:21:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A6D228B2B for ; Wed, 6 Sep 2017 08:21:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F56628B2D; Wed, 6 Sep 2017 08:21:11 +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, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 705AE28B2B for ; Wed, 6 Sep 2017 08:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=k3lJ9MpLZLvzabfJCYES9QFZM12PY5Oo+l8nkXGU3GU=; b=jRIOu2PazX+9Uh32BI7EKPVqEr JP26m+sqpGespVdrIUBG2MCBxyT6zEnnqmjYd0SD3+juOcs5LYZXiOU2YCl0TVYT7RIQSvzr4vdMt hS3mL0X8cr+Bg9wiHrKo2lWq+bAL86IntZyKNZ55HHcMC1NKHZ1XOv8La4Ic1lCZReadQJUOsoKCt kgQpAiciX+42xJyz9Fx+VrnlIoBI9mPuJAYqLKvKnF3ATGDYpRCbGlxiI5N8mZKVmEEMzgL4bSQKA s+Dg1tz6X2VxZ/qwklerIbDk6eMy/34bB1ahDnDllFuN81m2MwcB1T3ACyRNuiUoBVvvkTRvDCD28 sJcaJJ6Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dpVa9-0005xd-Hs; Wed, 06 Sep 2017 08:21:09 +0000 Received: from mail-pg0-x231.google.com ([2607:f8b0:400e:c05::231]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dpVNn-0005Nf-Ph for linux-arm-kernel@lists.infradead.org; Wed, 06 Sep 2017 08:08:28 +0000 Received: by mail-pg0-x231.google.com with SMTP id v66so13922395pgb.5 for ; Wed, 06 Sep 2017 01:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iuX7muaRaRj/GcwkNMH4S/08YzkSR6mpFDlFG1YJ7F4=; b=cS2G69Es945tJx1nJ0Xw7BNOtniUKH0kRGfn04vwCARYVC63cr1NhunKDsZ/KOcMhO Ss1fLziHHjPJnYoSeGXU1O+zDOBJ8SBLfrINv9wtaA6KxopPg2Yq9JeFwr3LTd0xemhJ uxsfq/DyfcUXiLAwerqjhEQfFK7PIrWtKaOZamx30OAuauYC8XEezbYq4yOFt+kphwCa NVU0a0CGelIgT62300rqiqdB9aDeJ9I068C76aQQMmgzicQWV1EvEfKyXj3IyElNGUAw eEdXn8wZykelA/LrbM2ZhfZEhOLOdgJ5szqMMiZJvX5zQWQSIDdFs7hWY9xQkUIq3dNJ WfDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iuX7muaRaRj/GcwkNMH4S/08YzkSR6mpFDlFG1YJ7F4=; b=aM9Xcjm4d/POijrkjBYx4Yq/bkTDMCl1BPuqx2XCJ5CovMlkM03dMGRm9nB9HBNOhw TRYrRXAS9CCBS2Bbu0mHqna7HfMS9kvAQPJUlxqbyOT6mHUJPOJt/+pEio7IphLw1DgB bWmC1zE0KA8n6MVw4iwzuseiM+FMfHb8/rXMnKHRSRbXRlX+nrI5qV2FtUjbHwpvGcM5 Mv88t8KEeaG/v+rKTMZBe4aB2m3lrY4m8dv7MGx98NXnAjZ5nAQMt4NQXWKcqr65RgA3 2HJksvzw+0GiT7R/aFUAl4tgztnMP83zzbiDtpF3SEECQeufXvVR4Fyhe46IvbPsLYZi wX7Q== X-Gm-Message-State: AHPjjUhYM+451KcK5W90F9dANPbVlZvfPaOqyNb+l1Ybl1AnMt3UoR54 FGGc7AFEInxehcas X-Google-Smtp-Source: ADKCNb456jT7EEtMocx0iybGSoBswQOKPNWL5r1Isc7NxWbMG608+Mgq4Ugj9cB/2YHeLnmIRZPQoA== X-Received: by 10.84.194.3 with SMTP id g3mr2360799pld.246.1504685282592; Wed, 06 Sep 2017 01:08:02 -0700 (PDT) Received: from mactruck.svl.corp.google.com ([100.123.242.94]) by smtp.gmail.com with ESMTPSA id b187sm1687620pfg.135.2017.09.06.01.08.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Sep 2017 01:08:02 -0700 (PDT) From: Brendan Higgins To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, avifishman70@gmail.com, tmaimon77@gmail.com, raltherr@google.com, f.fainelli@gmail.com, joel@jms.id.au Subject: [PATCH v4 1/3] arm: npcm: add basic support for Nuvoton BMCs Date: Wed, 6 Sep 2017 01:07:49 -0700 Message-Id: <20170906080751.6773-2-brendanhiggins@google.com> X-Mailer: git-send-email 2.14.1.581.gf28d330327-goog In-Reply-To: <20170906080751.6773-1-brendanhiggins@google.com> References: <20170906080751.6773-1-brendanhiggins@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170906_010824_005348_C674EFAB X-CRM114-Status: GOOD ( 18.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, openbmc@lists.ozlabs.org, Brendan Higgins , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Adds basic support for the Nuvoton NPCM750 BMC. Signed-off-by: Brendan Higgins Reviewed-by: Tomer Maimon Reviewed-by: Avi Fishman Tested-by: Tomer Maimon Tested-by: Avi Fishman --- arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/mach-npcm/Kconfig | 50 +++++++++++++++++++++++++ arch/arm/mach-npcm/Makefile | 3 ++ arch/arm/mach-npcm/headsmp.S | 17 +++++++++ arch/arm/mach-npcm/npcm7xx.c | 34 +++++++++++++++++ arch/arm/mach-npcm/platsmp.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 196 insertions(+) create mode 100644 arch/arm/mach-npcm/Kconfig create mode 100644 arch/arm/mach-npcm/Makefile create mode 100644 arch/arm/mach-npcm/headsmp.S create mode 100644 arch/arm/mach-npcm/npcm7xx.c create mode 100644 arch/arm/mach-npcm/platsmp.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 61a0cb15067e..05543f1cfbde 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -782,6 +782,8 @@ source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-nomadik/Kconfig" +source "arch/arm/mach-npcm/Kconfig" + source "arch/arm/mach-nspire/Kconfig" source "arch/arm/plat-omap/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 47d3a1ab08d2..60ca50c7d762 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_MEDIATEK) += mediatek machine-$(CONFIG_ARCH_MXS) += mxs machine-$(CONFIG_ARCH_NETX) += netx machine-$(CONFIG_ARCH_NOMADIK) += nomadik +machine-$(CONFIG_ARCH_NPCM) += npcm machine-$(CONFIG_ARCH_NSPIRE) += nspire machine-$(CONFIG_ARCH_OXNAS) += oxnas machine-$(CONFIG_ARCH_OMAP1) += omap1 diff --git a/arch/arm/mach-npcm/Kconfig b/arch/arm/mach-npcm/Kconfig new file mode 100644 index 000000000000..d47061855439 --- /dev/null +++ b/arch/arm/mach-npcm/Kconfig @@ -0,0 +1,50 @@ +menuconfig ARCH_NPCM + bool "Nuvoton NPCM Architecture" + select ARCH_REQUIRE_GPIOLIB + select USE_OF + select PINCTRL + select PINCTRL_NPCM7XX + +if ARCH_NPCM + +comment "NPCMX50 CPU type" + +config CPU_NPCM750 + depends on ARCH_NPCM && ARCH_MULTI_V7 + bool "Support for NPCM750 BMC CPU (Poleg)" + select CACHE_L2X0 + select CPU_V7 + select ARM_GIC + select HAVE_SMP + select SMP + select SMP_ON_UP + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select ARM_ERRATA_458693 + select ARM_ERRATA_720789 + select ARM_ERRATA_742231 + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 + select ARM_ERRATA_794072 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + select USB_EHCI_ROOT_HUB_TT + select USB_ARCH_HAS_HCD + select USB_ARCH_HAS_EHCI + select USB_EHCI_HCD + select USB_ARCH_HAS_OHCI + select USB_OHCI_HCD + select USB + select FIQ + select CPU_USE_DOMAINS + select GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select COMMON_CLK if OF + select NPCM750_TIMER + select MFD_SYSCON + help + Support for NPCM750 BMC CPU (Poleg). + + Nuvoton NPCM750 BMC based on the Cortex A9. + +endif diff --git a/arch/arm/mach-npcm/Makefile b/arch/arm/mach-npcm/Makefile new file mode 100644 index 000000000000..78416055b854 --- /dev/null +++ b/arch/arm/mach-npcm/Makefile @@ -0,0 +1,3 @@ +AFLAGS_headsmp.o += -march=armv7-a + +obj-$(CONFIG_CPU_NPCM750) += npcm7xx.o platsmp.o headsmp.o diff --git a/arch/arm/mach-npcm/headsmp.S b/arch/arm/mach-npcm/headsmp.S new file mode 100644 index 000000000000..9fccbbd49ed4 --- /dev/null +++ b/arch/arm/mach-npcm/headsmp.S @@ -0,0 +1,17 @@ +/* + * Copyright 2017 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include + +ENTRY(npcm7xx_secondary_startup) + safe_svcmode_maskall r0 + + b secondary_startup +ENDPROC(npcm7xx_secondary_startup) diff --git a/arch/arm/mach-npcm/npcm7xx.c b/arch/arm/mach-npcm/npcm7xx.c new file mode 100644 index 000000000000..132e9d587857 --- /dev/null +++ b/arch/arm/mach-npcm/npcm7xx.c @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2017 Nuvoton Technology corporation. + * Copyright 2017 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include + +#define NPCM7XX_AUX_VAL (L310_AUX_CTRL_INSTR_PREFETCH | \ + L310_AUX_CTRL_DATA_PREFETCH | \ + L310_AUX_CTRL_NS_LOCKDOWN | \ + L310_AUX_CTRL_CACHE_REPLACE_RR | \ + L2C_AUX_CTRL_SHARED_OVERRIDE | \ + L310_AUX_CTRL_FULL_LINE_ZERO) + +static const char *const npcm7xx_dt_match[] = { + "nuvoton,npcm750", + NULL +}; + +DT_MACHINE_START(NPCM7XX_DT, "NPCMX50 Chip family") + .atag_offset = 0x100, + .dt_compat = npcm7xx_dt_match, + .l2c_aux_val = NPCM7XX_AUX_VAL, + .l2c_aux_mask = ~NPCM7XX_AUX_VAL, +MACHINE_END diff --git a/arch/arm/mach-npcm/platsmp.c b/arch/arm/mach-npcm/platsmp.c new file mode 100644 index 000000000000..144e3e7ec7e6 --- /dev/null +++ b/arch/arm/mach-npcm/platsmp.c @@ -0,0 +1,89 @@ +/* + * Copyright 2017 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#define pr_fmt(fmt) "PLATSMP: " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define NPCM7XX_SCRPAD_REG 0x13c + +extern void npcm7xx_secondary_startup(void); + +static int npcm7xx_smp_boot_secondary(unsigned int cpu, + struct task_struct *idle) +{ + struct device_node *gcr_np; + void __iomem *gcr_base; + int ret = 0; + + gcr_np = of_find_compatible_node(NULL, NULL, "nuvoton,npcm750-gcr"); + if (!gcr_np) { + pr_err("no gcr device node\n"); + ret = -EFAULT; + goto out; + } + gcr_base = of_iomap(gcr_np, 0); + if (!gcr_base) { + pr_err("could not iomap gcr at: 0x%llx\n", gcr_base); + ret = -EFAULT; + goto out; + } + + /* give boot ROM kernel start address. */ + iowrite32(__pa_symbol(npcm7xx_secondary_startup), gcr_base + + NPCM7XX_SCRPAD_REG); + /* make sure npcm7xx_secondary_startup is seen by all observers. */ + smp_wmb(); + dsb_sev(); + /* make sure write buffer is drained */ + mb(); + +out: + iounmap(gcr_base); + return ret; +} + +static void __init npcm7xx_smp_prepare_cpus(unsigned int max_cpus) +{ + struct device_node *scu_np; + void __iomem *scu_base; + + scu_np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu"); + if (!scu_np) { + pr_err("no scu device node\n"); + return; + } + scu_base = of_iomap(scu_np, 0); + if (!scu_base) { + pr_err("could not iomap scu at: 0x%llx\n", scu_base); + return; + } + + scu_enable(scu_base); + +out: + iounmap(scu_base); +} + +static struct smp_operations npcm7xx_smp_ops __initdata = { + .smp_prepare_cpus = npcm7xx_smp_prepare_cpus, + .smp_boot_secondary = npcm7xx_smp_boot_secondary, +}; + +CPU_METHOD_OF_DECLARE(npcm7xx_smp, "nuvoton,npcm7xx-smp", &npcm7xx_smp_ops);