From patchwork Fri Jan 29 10:59:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 373314 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2100777jam; Fri, 29 Jan 2021 03:20:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIjLB9m9p9pYrLQ81xxHtipXqhRU+vlFq4E64P702PnQsJ4am7ZD+H2JClM+6JXijgiuD0 X-Received: by 2002:a25:3bc5:: with SMTP id i188mr5354668yba.332.1611919227455; Fri, 29 Jan 2021 03:20:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611919227; cv=none; d=google.com; s=arc-20160816; b=RVqgCGHEK5gNnmNTNTQ7GyCQC0DFGvLFZYqyH71yx762eU3FcBDMWsw0O3gaKeFc9s D6VyJf1nKIzgnXUG13xJRtEv+iZF0IFohIO6TJ8hKI1pc6uRoLVjQ5Ki3vudmCr9nxTT wdpVbgwZmj7Z7n7I7pa2VJSt2mZX5fI4Yy6jkIOZk5WYKqsael5jYh57LbjpdMaq3AtQ inBDVlPuaWxDktEyQEralzK+oTiRmGl805QN8Y8SHDgK1KuG7Q9CfoBxosf0kanGIUl6 /LJ3heWRGm2+tgU5u72ohPC0v/YH5FDs37XLwYEiDPh9BbjPw36oVXPWt5vcWWS+r8VN Nc2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=jPNInFcZRqUL6RSZboTJeMy6Ihc+QO3ISy9yB391PuA=; b=AcG4dsH0TxuWg8gK0wcHhSgsLsNAb75quMKKQS+OCoioT+DhIN3QcjWvogWbcWNoqp KkFB7RFTLvyabUXkw54YbwXaWMhvfBKqRNEnW8NuXEQ3fUxTVOJvor/cF+qp6ZuGmvJ5 NNiRQZZeNsnNk0/kwGjhNJ0bQLy/fVuGQUE/BS1BiZglbzJ2NU7FAQIUAZgkosKNUVue 6JotVuqwMovYfPSXK7l59+fDG2KCed9UB8+Ww0AbLCvLZ6T1s/2BhknXbjdtBViIVESl pLYz0r8UEWBBe6uRZZ9kR0ftiIJYjv+4p4eZwkvCB88ztAMHT6gZ2ybhBVAdrB0xkAwd J8Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E6GFJtVX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 123si7982354ybt.200.2021.01.29.03.20.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jan 2021 03:20:27 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E6GFJtVX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5RpB-0005xm-7A for patch@linaro.org; Fri, 29 Jan 2021 06:20:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5RWI-0004wY-8I for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:54 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:52197) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5RW9-00076d-F0 for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:53 -0500 Received: by mail-wm1-x330.google.com with SMTP id m2so6511136wmm.1 for ; Fri, 29 Jan 2021 03:00:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jPNInFcZRqUL6RSZboTJeMy6Ihc+QO3ISy9yB391PuA=; b=E6GFJtVXdXwkv6ccoPUo7ZcYAmFL5R22lVa4y3QdHd5p+7rUtu1YH9/fLaLNU2dnKL pvAuUtOHi2/OThdu2qwR4HnERsmVEJlxDC/VH8a+k0R0WAInafQHdP1yohHa2z+4g8ew /xBN+5d3apL1VtsGy126OvS32Sapd/Oj/UuV9i78E5NAqRCcTRc1GZ7kVzqCBXfp1+8B DUiQRJYH4J7W0eaVRDAJ8Ujdix7aj8t+SUvSohKB6m8uLrjPSZycpHfZr09s+AtadW2w ACF/t9hCAUf5xhOPKLKei+lxhqF6CBKKmqGTl6bSGcJAAaa4J4txOmccoVZOm8P9kW2+ lYTQ== 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:mime-version:content-transfer-encoding; bh=jPNInFcZRqUL6RSZboTJeMy6Ihc+QO3ISy9yB391PuA=; b=VRHR4+V092NJtMHVOXFjDAv21ne1fm6OxHXW9WSjtifEhPkO/zMn4t/GwyGwnwt6i6 472d0a+NsV0Vd3DgRVLD6M2efjwXp9xGDc643oZBR39vU8H+Q3pN8cwYojwNVfJKFPXu yBfqHna4mnVh6CwVhGWwB0HZVvGLS/xgscS00jmp4OAqvLaPWfIqscCdDr2sB0xcUEbL gMD2Sg1RWCm4NIGFImQkrVIp+GgNs3S4XXBnaaYY8hRoeP0UtGbVdil2E+CV6WEvqWYx nIjyvxAt0mPIVFApwOKm8QUxJsiCpRj++KnJe0t0QF+GBHaKSJOVU0AWvcnf2T0W0Q3Q XkqQ== X-Gm-Message-State: AOAM531Un74xKN8Hm7ADLcFq7MD3kDDjPdZWVBDz3VLMgE/SvabY+Rha oGg2JF70OSmikki9q32gjTVzZlC8VXF2JA== X-Received: by 2002:a1c:730f:: with SMTP id d15mr3210423wmb.135.1611918043930; Fri, 29 Jan 2021 03:00:43 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w20sm9268761wmm.12.2021.01.29.03.00.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 03:00:43 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 32/46] hw/arm/armsse: Wire up clocks Date: Fri, 29 Jan 2021 10:59:58 +0000 Message-Id: <20210129110012.8660-33-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210129110012.8660-1-peter.maydell@linaro.org> References: <20210129110012.8660-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Create two input clocks on the ARMSSE devices, one for the normal MAINCLK, and one for the 32KHz S32KCLK, and wire these up to the appropriate devices. The old property-based clock frequency setting will remain in place until conversion is complete. This is a migration compatibility break for machines mps2-an505, mps2-an521, musca-a, musca-b1. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Luc Michel Tested-by: Philippe Mathieu-Daudé Message-id: 20210128114145.20536-12-peter.maydell@linaro.org Message-id: 20210121190622.22000-12-peter.maydell@linaro.org --- include/hw/arm/armsse.h | 6 ++++++ hw/arm/armsse.c | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h index 4860a793f4b..bfa1e79c4fe 100644 --- a/include/hw/arm/armsse.h +++ b/include/hw/arm/armsse.h @@ -37,6 +37,8 @@ * per-CPU identity and control register blocks * * QEMU interface: + * + Clock input "MAINCLK": clock for CPUs and most peripherals + * + Clock input "S32KCLK": slow 32KHz clock used for a few peripherals * + QOM property "memory" is a MemoryRegion containing the devices provided * by the board model. * + QOM property "MAINCLK_FRQ" is the frequency of the main system clock @@ -103,6 +105,7 @@ #include "hw/misc/armsse-mhu.h" #include "hw/misc/unimp.h" #include "hw/or-irq.h" +#include "hw/clock.h" #include "hw/core/split-irq.h" #include "hw/cpu/cluster.h" #include "qom/object.h" @@ -209,6 +212,9 @@ struct ARMSSE { uint32_t nsccfg; + Clock *mainclk; + Clock *s32kclk; + /* Properties */ MemoryRegion *board_memory; uint32_t exp_numirq; diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index d2ba0459c44..4349ce9bfdb 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -21,6 +21,7 @@ #include "hw/arm/armsse.h" #include "hw/arm/boot.h" #include "hw/irq.h" +#include "hw/qdev-clock.h" /* Format of the System Information block SYS_CONFIG register */ typedef enum SysConfigFormat { @@ -241,6 +242,9 @@ static void armsse_init(Object *obj) assert(info->sram_banks <= MAX_SRAM_BANKS); assert(info->num_cpus <= SSE_MAX_CPUS); + s->mainclk = qdev_init_clock_in(DEVICE(s), "MAINCLK", NULL, NULL); + s->s32kclk = qdev_init_clock_in(DEVICE(s), "S32KCLK", NULL, NULL); + memory_region_init(&s->container, obj, "armsse-container", UINT64_MAX); for (i = 0; i < info->num_cpus; i++) { @@ -711,6 +715,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) * map its upstream ends to the right place in the container. */ qdev_prop_set_uint32(DEVICE(&s->timer0), "pclk-frq", s->mainclk_frq); + qdev_connect_clock_in(DEVICE(&s->timer0), "pclk", s->mainclk); if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer0), errp)) { return; } @@ -721,6 +726,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) &error_abort); qdev_prop_set_uint32(DEVICE(&s->timer1), "pclk-frq", s->mainclk_frq); + qdev_connect_clock_in(DEVICE(&s->timer1), "pclk", s->mainclk); if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer1), errp)) { return; } @@ -731,6 +737,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) &error_abort); qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq); + qdev_connect_clock_in(DEVICE(&s->dualtimer), "TIMCLK", s->mainclk); if (!sysbus_realize(SYS_BUS_DEVICE(&s->dualtimer), errp)) { return; } @@ -889,6 +896,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) * 0x4002f000: S32K timer */ qdev_prop_set_uint32(DEVICE(&s->s32ktimer), "pclk-frq", S32KCLK); + qdev_connect_clock_in(DEVICE(&s->s32ktimer), "pclk", s->s32kclk); if (!sysbus_realize(SYS_BUS_DEVICE(&s->s32ktimer), errp)) { return; } @@ -982,6 +990,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) qdev_get_gpio_in_named(DEVICE(&s->armv7m), "NMI", 0)); qdev_prop_set_uint32(DEVICE(&s->s32kwatchdog), "wdogclk-frq", S32KCLK); + qdev_connect_clock_in(DEVICE(&s->s32kwatchdog), "WDOGCLK", s->s32kclk); if (!sysbus_realize(SYS_BUS_DEVICE(&s->s32kwatchdog), errp)) { return; } @@ -992,6 +1001,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) /* 0x40080000 .. 0x4008ffff : ARMSSE second Base peripheral region */ qdev_prop_set_uint32(DEVICE(&s->nswatchdog), "wdogclk-frq", s->mainclk_frq); + qdev_connect_clock_in(DEVICE(&s->nswatchdog), "WDOGCLK", s->mainclk); if (!sysbus_realize(SYS_BUS_DEVICE(&s->nswatchdog), errp)) { return; } @@ -1000,6 +1010,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->nswatchdog), 0, 0x40081000); qdev_prop_set_uint32(DEVICE(&s->swatchdog), "wdogclk-frq", s->mainclk_frq); + qdev_connect_clock_in(DEVICE(&s->swatchdog), "WDOGCLK", s->mainclk); if (!sysbus_realize(SYS_BUS_DEVICE(&s->swatchdog), errp)) { return; } @@ -1127,9 +1138,11 @@ static void armsse_idau_check(IDAUInterface *ii, uint32_t address, static const VMStateDescription armsse_vmstate = { .name = "iotkit", - .version_id = 1, - .minimum_version_id = 1, + .version_id = 2, + .minimum_version_id = 2, .fields = (VMStateField[]) { + VMSTATE_CLOCK(mainclk, ARMSSE), + VMSTATE_CLOCK(s32kclk, ARMSSE), VMSTATE_UINT32(nsccfg, ARMSSE), VMSTATE_END_OF_LIST() }