From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FC14C7618B for ; Thu, 25 Jul 2019 12:12:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E4C6229F3 for ; Thu, 25 Jul 2019 12:12:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="tC/Aacxe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727860AbfGYMMf (ORCPT ); Thu, 25 Jul 2019 08:12:35 -0400 Received: from smtp-fw-9102.amazon.com ([207.171.184.29]:32213 "EHLO smtp-fw-9102.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726005AbfGYMMf (ORCPT ); Thu, 25 Jul 2019 08:12:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1564056754; x=1595592754; h=subject:to:cc:references:from:message-id:date: mime-version:in-reply-to:content-transfer-encoding; bh=Ab1CWKE+OztaUGMWuWyRMVWvhP5S22Y2ZduWwOWxgdY=; b=tC/AacxeClE3264rVltKPKjOCkgepVXiUbyqygz3c6MPAPAmFSk0S6qS 0cYhJSdOnB+QI16qXpnGFKlfX50MMoSGOLii8p3/PRWib4wOdbJzZXhHi m1j3+3/yTlnaj4RlhrQq+NMYTHTrsn2olhOoTRPpuY34R5qplPuWkkLVP M=; X-IronPort-AV: E=Sophos;i="5.64,306,1559520000"; d="scan'208";a="687871196" Received: from sea3-co-svc-lb6-vlan2.sea.amazon.com (HELO email-inbound-relay-1d-9ec21598.us-east-1.amazon.com) ([10.47.22.34]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP; 25 Jul 2019 12:12:27 +0000 Received: from EX13MTAUWC001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1d-9ec21598.us-east-1.amazon.com (Postfix) with ESMTPS id E59CCA2636; Thu, 25 Jul 2019 12:12:24 +0000 (UTC) Received: from EX13D20UWC001.ant.amazon.com (10.43.162.244) by EX13MTAUWC001.ant.amazon.com (10.43.162.135) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 25 Jul 2019 12:12:24 +0000 Received: from 38f9d3867b82.ant.amazon.com (10.43.161.30) by EX13D20UWC001.ant.amazon.com (10.43.162.244) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 25 Jul 2019 12:12:22 +0000 Subject: Re: [PATCH kvm-unit-tests v2] arm: Add PL031 test To: Andrew Jones CC: , , Marc Zyngier , Paolo Bonzini , Andre Przywara , Alexandru Elisei References: <20190712091938.492-1-graf@amazon.com> <20190715164235.z2xar7nqi5guqfuf@kamzik.brq.redhat.com> From: Alexander Graf Message-ID: <02a38777-3ec0-0354-8d49-d8ce337e5660@amazon.com> Date: Thu, 25 Jul 2019 14:12:19 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190715164235.z2xar7nqi5guqfuf@kamzik.brq.redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.43.161.30] X-ClientProxiedBy: EX13D24UWA004.ant.amazon.com (10.43.160.233) To EX13D20UWC001.ant.amazon.com (10.43.162.244) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 15.07.19 18:42, Andrew Jones wrote: > On Fri, Jul 12, 2019 at 11:19:38AM +0200, Alexander Graf wrote: >> This patch adds a unit test for the PL031 RTC that is used in the virt machine. >> It just pokes basic functionality. I've mostly written it to familiarize myself >> with the device, but I suppose having the test around does not hurt, as it also >> exercises the GIC SPI interrupt path. >> >> Signed-off-by: Alexander Graf >> >> --- >> >> v1 -> v2: >> >> - Use FDT to find base, irq and existence >> - Put isb after timer read >> - Use dist_base for gicv3 >> --- >> arm/Makefile.common | 1 + >> arm/pl031.c | 265 ++++++++++++++++++++++++++++++++++++++++++++ >> lib/arm/asm/gic.h | 1 + >> 3 files changed, 267 insertions(+) >> create mode 100644 arm/pl031.c >> >> diff --git a/arm/Makefile.common b/arm/Makefile.common >> index f0c4b5d..b8988f2 100644 >> --- a/arm/Makefile.common >> +++ b/arm/Makefile.common >> @@ -11,6 +11,7 @@ tests-common += $(TEST_DIR)/pmu.flat >> tests-common += $(TEST_DIR)/gic.flat >> tests-common += $(TEST_DIR)/psci.flat >> tests-common += $(TEST_DIR)/sieve.flat >> +tests-common += $(TEST_DIR)/pl031.flat > > Makefile.common is for both arm32 and arm64, but this code is only > compilable on arm64. As there's no reason for it to be arm64 only, > then ideally we'd modify the code to allow compiling and running > on both, but otherwise we need to move this to Makefile.arm64. D'oh. Sorry, I completely missed that bit. Of course we want to test on 32bit ARM as well! I'll fix it up :). [...] >> +static int rtc_fdt_init(void) >> +{ >> + const struct fdt_property *prop; >> + const void *fdt = dt_fdt(); >> + int node, len; >> + u32 *data; >> + >> + node = fdt_node_offset_by_compatible(fdt, -1, "arm,pl031"); >> + if (node < 0) >> + return -1; >> + >> + prop = fdt_get_property(fdt, node, "interrupts", &len); >> + assert(prop && len == (3 * sizeof(u32))); >> + data = (u32 *)prop->data; >> + assert(data[0] == 0); /* SPI */ >> + pl031_irq = SPI(fdt32_to_cpu(data[1])); > > Nit: Ideally we'd add some more devicetree API to get interrupts. With > that, and the existing devicetree API, we could remove all low-level fdt > related code in this function. Well, we probably want some really high level fdt API that can traverse reg properly to map bus regs into physical addresses. As long as we don't have all that magic, I see little point in inventing anything that looks more sophisticated but doesn't actually take the difficult problems into account :). > >> + >> + prop = fdt_get_property(fdt, node, "reg", &len); >> + assert(prop && len == (2 * sizeof(u64))); >> + data = (u32 *)prop->data; >> + pl031 = (void*)((ulong)fdt32_to_cpu(data[0]) << 32 | fdt32_to_cpu(data[1])); > > This works because we currently ID map all the physical memory. I usually > try to remember to use an ioremap in these cases anyway though. Great idea - it allows me to get rid of a bit of casting too. Alex