From patchwork Fri Dec 7 14:14:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1009478 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Der0M9mH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43BF4Q2gn7z9rxp for ; Sat, 8 Dec 2018 01:20:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 124F4C2273B; Fri, 7 Dec 2018 14:14:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0F496C2276B; Fri, 7 Dec 2018 14:10:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E6D02C22702; Fri, 7 Dec 2018 14:09:46 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 87386C22745 for ; Fri, 7 Dec 2018 14:09:42 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id v28so1776332pgk.10 for ; Fri, 07 Dec 2018 06:09:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=/9XhKIqqE6C0CbyCuvsmFqa0IiQhDmEQeqV/XDuuf1U=; b=Der0M9mHMhTZSb58gOD9lPprqGT/H8ODReBNT2i+dQtXupsMrZFJbTYYgkcMKKdPYV GNHB89oYC9Y5wcVehouCaWiCCAwcv20NZFJrlM083NRvaRMEwCaNPMfAVKJpClU9qvrc u/Ok0nJKJ5s+EqGUITmIUz5D4Fd4Xx9snYkZdTO8HwZsxCKJymXQxJvie1MEs/PpCHU3 WVxV7l2qIDqx/hJby71fjqjdTC1Ww4tIcrTfeFJJ2UElBGFlTnuXqNhMPPTqSqhhwgoG lr33J/e75C8vQz7Fk5LLKY/uUmuroq9PcKufwidZmyGdwfZaRoXsyq4p+dR14BkWMYMc 5dog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/9XhKIqqE6C0CbyCuvsmFqa0IiQhDmEQeqV/XDuuf1U=; b=jAF/L+fChQqH9sJ/ZiMDpM5e+bxuHhNaieHrEMdTX91QpzjORus/puRakwGP5BcLrI Kf7VVEiDcAr87QRlNhpP/I7L+AxOkVNaXRZZz3zdS+0S7DhwfuQgBynIDW9TFfJfT7BE LFrxFFOf4amstsiS6q4Q3T+YwPIX10fPbuOHIz2EP3ZKy4FX4DKb2dI+jcvETocVMW8t pS9HAlrZuiRNJ8G9Tq82GFa/yrt0jaTdh0PS1oGYSrNckfpkZUl8viT6oJaxEOFhRSO2 OWiJKvIjQTldoTGngsryEsPBhz3AvGMXOEI4fdGZt8eW1YkwR5yDh5SJMUGSNjeZrgWB iFmw== X-Gm-Message-State: AA+aEWbiUB40abbXcyp7NFSet8FtLftabKwTGTs2qYf/rprc/SCCm0p+ h6fitSGRCkpOS7h7l5jAjbs= X-Google-Smtp-Source: AFSGD/VeYMomAbNRVpt3gl1Q3BQ74bPEdNIsnGI2ysGBG0LTQraABhH5TqvCHe53S/623MujBkQjXA== X-Received: by 2002:a62:4156:: with SMTP id o83mr2396786pfa.72.1544191781141; Fri, 07 Dec 2018 06:09:41 -0800 (PST) Received: from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com. [147.11.156.139]) by smtp.gmail.com with ESMTPSA id f6sm5206070pfg.188.2018.12.07.06.09.40 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Dec 2018 06:09:40 -0800 (PST) From: Bin Meng To: Rick Chen , Simon Glass , Lukas Auer , Anup Patel , U-Boot Mailing List Date: Fri, 7 Dec 2018 06:14:20 -0800 Message-Id: <1544192072-28764-9-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1544192072-28764-1-git-send-email-bmeng.cn@gmail.com> References: <1544192072-28764-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v2 08/20] riscv: Add a SYSCON driver for SiFive's Core Local Interruptor X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This adds U-Boot syscon driver for SiFive's Core Local Interruptor (CLINT). The CLINT block holds memory-mapped control and status registers associated with software and timer interrupts. This driver implements the riscv_get_time() API as required by the generic RISC-V timer driver, as well as some other APIs that are needed for handling IPI. Signed-off-by: Bin Meng --- Changes in v2: - rename the driver name to sifive_clint - save the clint base address to arch specific global data to support pre-relocation stage - remove the probe routine - add riscv_clear_ipi() API arch/riscv/Kconfig | 9 +++++ arch/riscv/include/asm/global_data.h | 3 ++ arch/riscv/include/asm/syscon.h | 19 ++++++++++ arch/riscv/lib/Makefile | 1 + arch/riscv/lib/sifive_clint.c | 68 ++++++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+) create mode 100644 arch/riscv/include/asm/syscon.h create mode 100644 arch/riscv/lib/sifive_clint.c diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 55c60e4..f513f52 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -95,4 +95,13 @@ config 32BIT config 64BIT bool +config SIFIVE_CLINT + bool + depends on RISCV_MMODE + select REGMAP + select SYSCON + help + The SiFive CLINT block holds memory-mapped control and status registers + associated with software and timer interrupts. + endmenu diff --git a/arch/riscv/include/asm/global_data.h b/arch/riscv/include/asm/global_data.h index 4d5d623..46fcfab 100644 --- a/arch/riscv/include/asm/global_data.h +++ b/arch/riscv/include/asm/global_data.h @@ -12,6 +12,9 @@ /* Architecture-specific global data */ struct arch_global_data { +#ifdef CONFIG_SIFIVE_CLINT + void __iomem *clint; /* clint base address */ +#endif }; #include diff --git a/arch/riscv/include/asm/syscon.h b/arch/riscv/include/asm/syscon.h new file mode 100644 index 0000000..d311ee6 --- /dev/null +++ b/arch/riscv/include/asm/syscon.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2018, Bin Meng + */ + +#ifndef _ASM_SYSCON_H +#define _ASM_SYSCON_H + +/* + * System controllers in a RISC-V system + * + * So far only SiFive's Core Local Interruptor (CLINT) is defined. + */ +enum { + RISCV_NONE, + RISCV_SYSCON_CLINT, /* Core Local Interruptor (CLINT) */ +}; + +#endif /* _ASM_SYSCON_H */ diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index b58db89..b13c876 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-$(CONFIG_CMD_GO) += boot.o obj-y += cache.o +obj-$(CONFIG_SIFIVE_CLINT) += sifive_clint.o obj-y += interrupts.o obj-y += reset.o obj-y += setjmp.o diff --git a/arch/riscv/lib/sifive_clint.c b/arch/riscv/lib/sifive_clint.c new file mode 100644 index 0000000..2d4bfac --- /dev/null +++ b/arch/riscv/lib/sifive_clint.c @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018, Bin Meng + * + * U-Boot syscon driver for SiFive's Core Local Interruptor (CLINT). + * The CLINT block holds memory-mapped control and status registers + * associated with software and timer interrupts. + */ + +#include +#include +#include +#include +#include +#include + +/* MSIP registers */ +#define MSIP_REG(base, hart) ((ulong)(base) + (hart) * 4) +/* mtime compare register */ +#define MTIMECMP_REG(base, hart) ((ulong)(base) + 0x4000 + (hart) * 8) +/* mtime register */ +#define MTIME_REG(base) ((ulong)(base) + 0xbff8) + +DECLARE_GLOBAL_DATA_PTR; + +u64 riscv_get_time(void) +{ + if (!gd->arch.clint) + gd->arch.clint = syscon_get_first_range(RISCV_SYSCON_CLINT); + + return readq((void __iomem *)MTIME_REG(gd->arch.clint)); +} + +void riscv_set_timecmp(int hart, u64 cmp) +{ + if (!gd->arch.clint) + gd->arch.clint = syscon_get_first_range(RISCV_SYSCON_CLINT); + + writeq(cmp, (void __iomem *)MTIMECMP_REG(gd->arch.clint, hart)); +} + +void riscv_send_ipi(int hart) +{ + if (!gd->arch.clint) + gd->arch.clint = syscon_get_first_range(RISCV_SYSCON_CLINT); + + writel(1, (void __iomem *)MSIP_REG(gd->arch.clint, hart)); +} + +void riscv_clear_ipi(int hart) +{ + if (!gd->arch.clint) + gd->arch.clint = syscon_get_first_range(RISCV_SYSCON_CLINT); + + writel(0, (void __iomem *)MSIP_REG(gd->arch.clint, hart)); +} + +static const struct udevice_id sifive_clint_ids[] = { + { .compatible = "riscv,clint0", .data = RISCV_SYSCON_CLINT }, + { } +}; + +U_BOOT_DRIVER(sifive_clint) = { + .name = "sifive_clint", + .id = UCLASS_SYSCON, + .of_match = sifive_clint_ids, + .flags = DM_FLAG_PRE_RELOC, +};