Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: j1MiUtqm1ozeR+8rfJZCpxeaHRnHt1v1iQw+9pr1+0RaPMFt7I4c03fET5EtXj31moRgl2mGsw
 9vYjfhuYsB5FgcSV0pV9F336QBFBUk9ZlDE2ONHdvMFkDZ4F7J3dTWDxKovsbo4UMGePLCiBO7
 VcHdiMdHmjlZdNu4PjWZ/73TFowJ9gzdQ1UAcZq1/p3kGey+Q0lSh4pvxZpfCwPN9IBZNeVMJ+
 8veR3GuU+nvd+OkjDIBydLta/MAe+gajmM9FLqPgN+YG4yeWdETQ4wFH5SBq9E0ORdqalqpFLs
 V1A=
From:   Anup Patel <anup.patel@wdc.com>
To:     Palmer Dabbelt <palmer@dabbelt.com>,
        Palmer Dabbelt <palmerdabbelt@google.com>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Marc Zyngier <maz@kernel.org>,
        Daniel Lezcano <daniel.lezcano@linaro.org>,
        Rob Herring <robh+dt@kernel.org>
Cc:     Atish Patra <atish.patra@wdc.com>,
        Alistair Francis <Alistair.Francis@wdc.com>,
        Anup Patel <anup@brainfault.org>,
        linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org, Anup Patel <anup.patel@wdc.com>
Subject: [RFC PATCH v1 07/10] clocksource: clint: Add support for ACLINT MTIMER device
Date:   Sat, 12 Jun 2021 21:34:19 +0530
Message-Id: <20210612160422.330705-8-anup.patel@wdc.com>
In-Reply-To: <20210612160422.330705-1-anup.patel@wdc.com>
References: <20210612160422.330705-1-anup.patel@wdc.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from wdc.com (122.171.171.205) by MA1PR0101CA0052.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:20::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Sat, 12 Jun 2021 16:05:29 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 44bdd14f-9869-4c6f-09c0-08d92dbbe964
X-MS-TrafficTypeDiagnostic: CO6PR04MB7747:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <CO6PR04MB77477E5395392EA6493E116C8D339@CO6PR04MB7747.namprd04.prod.outlook.com>
WDCIPOUTBOUND: EOP-TRUE
X-MS-Oob-TLC-OOBClassifiers: OLM:785;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: NCHjm85vcPzerGDn4DV+PyVNwL95/7oxo/e0qpTSh3D7eDXIZN+XgLt/nQrkZSLBXFDtbaTpPl5N7rcBeGnDt7FqTCGT7803BO/yiHYx0XDokzw0tzwNEGtk+ECetK3c0o2lbD7XrQuwMGzpPG6fvNRIB9buoDTfY1CfzrA+ISCJbvUSFa2tFsdjxVV7Gx1sMTGW2pvQyNZoPvV0WJyHiJPgvF737RE83XgPpQAYK7kw9dbQIejjmrSIY5DUKLxDK3BAGFr+SPKokGsCLIDBvlQBk8Iz2zZoY2g1uBY+EMRodJRP1Evf6G8SF18u/dp0cjQ4hjxW5nU6lHuUEltqP3pftZWyy89sm7Nyt90cHKLgUicbnmBis2VNBM69bbpz/CEdIwASWmx+kVSHwamftzm08DlhHe8jbr//7QlQVGqp882j/6Iet4Rzi7DXkGuIUx8drWSvUoj/7cOtJM255sP3GpTWJGlFgkaQrK7htKcoQ8GUJOB3R7g0i8REI7072h+7ZJPTVhqvvGWHdbXDExXv+MCOHdj7PoE22trEVntscC73xH9eFvQ10SWb+K5jo8oUF1iuHRWEblJ1smMB7quwe83qUjO8UzGR5HoHy4LA8OpI+WxLYg7jnecm2jSXIwfrskBz0A1jRjqZ27SuzQ==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR04MB7812.namprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(366004)(136003)(39860400002)(396003)(376002)(26005)(7696005)(55016002)(52116002)(6666004)(36756003)(5660300002)(83380400001)(478600001)(1076003)(7416002)(8886007)(2616005)(66476007)(66556008)(44832011)(16526019)(186003)(8936002)(8676002)(54906003)(4326008)(110136005)(38100700002)(38350700002)(86362001)(316002)(956004)(66946007)(2906002);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?j7yBOZutKJXwEm/UzPW+erubUN1Wx9XlVndn3ZDtrLoQds39JkcwwK1w2RAV?=
 =?us-ascii?Q?IV3NzxVIFzSdcyOitGIk/pvfRl1aMAHNT5x98ilQCUZPQeAXLFHaKYsPouO6?=
 =?us-ascii?Q?THfA3TP71WmglXLL7IDSLXKqjGzH4pAcHC7Ejxcr8AWGT1UgI1Pz1kNls+dm?=
 =?us-ascii?Q?6LRzvdcALa0RjqfgO1d2enP1kVmsRb8S6P3KIUOLNTFC6XKRPdBFgNI1sp9l?=
 =?us-ascii?Q?/YxdKh64XKtz13mIWvJhXtFjCoTfUpEbZ0rZdFe6kQf6Sx+VXzth75VaYQsh?=
 =?us-ascii?Q?pVvaPNhaySOHJaNHFujIOSgx0fyEFgQ2ms4q8IDdiKZUu8y/P9czCn/uib4J?=
 =?us-ascii?Q?kY/393nOD9CbWVQNbiht/uc8UUb7TCq+mDHYgrtdRxpQcvzSn0BJQk1tXu3U?=
 =?us-ascii?Q?F0YV5e5TACIcgvAGItHNx/yS+sHY8QeT/R1EDNhAK+YUkwANH253nHA14jrm?=
 =?us-ascii?Q?Ou3SYs1vKAFFMuMPiAq3A6a4OndHlge6M29MkXzVAk6YacikeaBhEvIp7uyK?=
 =?us-ascii?Q?sOTThtGFe5SKqcf0ifAoMEkmsvrzcza8BwkYGrTlYSK004TWAcFjUVzto7bf?=
 =?us-ascii?Q?uZdfjGWQkVKjNXh7Ycik/1nAiJo47s5782aUjF23C+xeqUic9DDGIUgZWNi1?=
 =?us-ascii?Q?QdLPz4qhUtLQo4lEdCMrenuZvFkU82DjCf1EpgNQVQzztFBfsufWoj1L2h9Q?=
 =?us-ascii?Q?xFxpHJ4i+7s4PRRrMIumIKFJCY0+xerygkccE65va/hx2f0sN9MrH2oA+dDu?=
 =?us-ascii?Q?p2zE0Q4ia3cowuFEp4NrzkgzLI7tzDKwwMIsY+m+n5ChNhmYdCr5e237d76g?=
 =?us-ascii?Q?whHUdr/j6f2kf2KNTDO6rn+ULFsuFh8ThPrJPgyPiRZIACviohHQyk+TGFHu?=
 =?us-ascii?Q?ygGY6+isSlGtF2+/eDeeHXksId0ypxMM1rDvMRMOhbuic8wDo4dKHsnQstEQ?=
 =?us-ascii?Q?S99GUK/rmkFLIOW4u11cBv2NJEKI8wcD5QlR0U8p+86EfBSakZgwWCwgOLLH?=
 =?us-ascii?Q?KXphg5cw5fnCEO22ADijsQdKWBSk/DKrR5zFCyGumAph6n+XzY4VHDILrMhF?=
 =?us-ascii?Q?eQQvx1qkcN7VRBMYy+iborOXIo65l6yFXT4SBRUYX3joujQBegvSc6cVNr9l?=
 =?us-ascii?Q?sGAcqpH1AO+RKS/NnS+cKrTHBZLDks8ox2Y8VS7K3bE96ZKvPWqhPE1CVNWA?=
 =?us-ascii?Q?wDy5FjjKBf+InG1Lmwkzwv6aRoGxC5xprjBnqcy407G3d/GJTZUcISIU+79P?=
 =?us-ascii?Q?csoLnFGBzwW1fim+of4LXHsIETMcOIBGDLtEVwq2bkgXng43aX7rsAB0Tlek?=
 =?us-ascii?Q?umAG5nrJVf+B2w5CJvMwqIAy?=
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 44bdd14f-9869-4c6f-09c0-08d92dbbe964
X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2021 16:05:34.9189
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: RNPnYbImiQ9mWORSrDfT5mEYHslXMPJ1yKzCkae6bMu5+8uXTKOpSUovNYRA30c9/PL7iCgys6nu/9ynUxVIqg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7747
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The RISC-V ACLINT specification is a modular specification and the
ACLINT MTIMER device is compatible with the M-mode timer functionality
of the CLINT device. This patch extends the CLINT driver to support
both CLINT device and ACLINT MTIMER device.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
---
 drivers/clocksource/timer-clint.c | 43 +++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/drivers/clocksource/timer-clint.c b/drivers/clocksource/timer-clint.c
index dfdcd94c1fd5..ca329c450810 100644
--- a/drivers/clocksource/timer-clint.c
+++ b/drivers/clocksource/timer-clint.c
@@ -2,8 +2,15 @@
 /*
  * Copyright (C) 2020 Western Digital Corporation or its affiliates.
  *
- * Most of the M-mode (i.e. NoMMU) RISC-V systems usually have a
- * CLINT MMIO timer device.
+ * Most of the M-mode (i.e. NoMMU) RISC-V systems usually have a CLINT
+ * MMIO device which is a composite device capable of injecting M-mode
+ * software interrupts and M-mode timer interrupts.
+ *
+ * The RISC-V ACLINT specification is modular in nature and defines
+ * separate devices for M-mode software interrupt (MSWI), M-mode timer
+ * (MTIMER) and S-mode software interrupt (SSWI).
+ *
+ * This is a common driver for CLINT device and ACLINT MTIMER device.
  */
 
 #define pr_fmt(fmt) "clint: " fmt
@@ -21,14 +28,20 @@
 #include <linux/smp.h>
 #include <linux/timex.h>
 
-#ifndef CONFIG_RISCV_M_MODE
+#ifdef CONFIG_RISCV_M_MODE
 #include <asm/clint.h>
+
+u64 __iomem *clint_time_val;
+EXPORT_SYMBOL(clint_time_val);
 #endif
 
 #define CLINT_IPI_OFF		0
 #define CLINT_TIMER_CMP_OFF	0x4000
 #define CLINT_TIMER_VAL_OFF	0xbff8
 
+#define ACLINT_MTIMER_CMP_OFF	0x0000
+#define ACLINT_MTIMER_VAL_OFF	0x7ff8
+
 /* CLINT manages IPI and Timer for RISC-V M-mode  */
 static u32 __iomem *clint_ipi_base;
 static u64 __iomem *clint_timer_cmp;
@@ -36,11 +49,6 @@ static u64 __iomem *clint_timer_val;
 static unsigned long clint_timer_freq;
 static unsigned int clint_timer_irq;
 
-#ifdef CONFIG_RISCV_M_MODE
-u64 __iomem *clint_time_val;
-EXPORT_SYMBOL(clint_time_val);
-#endif
-
 static void clint_send_ipi(const struct cpumask *target)
 {
 	unsigned int cpu;
@@ -191,9 +199,15 @@ static int __init clint_timer_init_dt(struct device_node *np)
 		return -ENODEV;
 	}
 
-	clint_ipi_base = base + CLINT_IPI_OFF;
-	clint_timer_cmp = base + CLINT_TIMER_CMP_OFF;
-	clint_timer_val = base + CLINT_TIMER_VAL_OFF;
+	if (of_device_is_compatible(np, "riscv,aclint-mtimer")) {
+		clint_ipi_base = NULL;
+		clint_timer_cmp = base + ACLINT_MTIMER_CMP_OFF;
+		clint_timer_val = base + ACLINT_MTIMER_VAL_OFF;
+	} else {
+		clint_ipi_base = base + CLINT_IPI_OFF;
+		clint_timer_cmp = base + CLINT_TIMER_CMP_OFF;
+		clint_timer_val = base + CLINT_TIMER_VAL_OFF;
+	}
 	clint_timer_freq = riscv_timebase;
 
 #ifdef CONFIG_RISCV_M_MODE
@@ -230,8 +244,10 @@ static int __init clint_timer_init_dt(struct device_node *np)
 		goto fail_free_irq;
 	}
 
-	riscv_set_ipi_ops(&clint_ipi_ops);
-	clint_clear_ipi();
+	if (clint_ipi_base) {
+		riscv_set_ipi_ops(&clint_ipi_ops);
+		clint_clear_ipi();
+	}
 
 	return 0;
 
@@ -244,3 +260,4 @@ static int __init clint_timer_init_dt(struct device_node *np)
 
 TIMER_OF_DECLARE(clint_timer, "riscv,clint0", clint_timer_init_dt);
 TIMER_OF_DECLARE(clint_timer1, "sifive,clint0", clint_timer_init_dt);
+TIMER_OF_DECLARE(clint_timer2, "riscv,aclint-mtimer", clint_timer_init_dt);
-- 
2.25.1