From patchwork Fri Jan 29 11:00:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 373320 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2104270jam; Fri, 29 Jan 2021 03:26:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrJkxx1JVnVt/rM2OTXRbrLE9qiPLJNHDo/XkmV91+Y0PNKILz936wG6X1d4g4djE5N9S6 X-Received: by 2002:a25:33d5:: with SMTP id z204mr5217540ybz.78.1611919586091; Fri, 29 Jan 2021 03:26:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611919586; cv=none; d=google.com; s=arc-20160816; b=nJYbVxgHIwP64U71425vx4lbj4BO94gE3ARKHCnWiC6QR1JNbyw+oONzB8CWGr+lGb emJyT5LrROKweIl1K7alFMoaTDy6PqveAPoO7b1JNcaje7hLjngCQCLHJlgN5GRHY9kU p/mlX0c0I5NIFE5OTerf14rJB1Ocgt7tA7hocBUOJOmihhfv1q3AXdw/nuWW96rSwe3U x5dp8phE5FKZ+kWr+nVZA2uiRzpcKWo/dbb/slP0wc2wzxed7tJoB+DlNX80MiJHcu/i my2QhWdDvrMEixbqv6recOGO+gZtosCS6YFPpZPUc5niLKrQm8rpF2DKrRjc6MxLABxb OqhQ== 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=RSDh1s4sSFCh+gnxQ/s51Xo8osmp4XAWuSEwUmDU5oQ=; b=LqiJ8cFebbCsiNJXvw5LFCDiGVCGkV5z3a8OXEVU5OVvBN4gXKQsUVkwgX4Xg30tZk mkIeCIGTKlgzX6hWk7gynjsW01r+TmEyec2uu6r9hQgPN97hM3nLDgXgHOGThs1iw7gc XH16cYztxIpVGdPc9CBudEPjxlFJtO5z1HZFib0nGju9VUBCbtuf8AN2SIwHoPBahfrd 8WWwzaATc4xYGVMC1SeP/YQjzH2bJqfm8iJ7zDhaWUKq5+gsuw1oKVCkFafCIczkYAmx veWOtWrQQwDw+U4tcFtVShruKEyae0D3zJbAYXCNeByDiVW2L+ob2vWnAdK8uPnhBjEQ ciNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=APGvjMnz; 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 d24si10678192ybe.234.2021.01.29.03.26.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jan 2021 03:26:26 -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=APGvjMnz; 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]:59216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5Ruz-0005gc-KH for patch@linaro.org; Fri, 29 Jan 2021 06:26:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5RWK-00052I-H2 for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:56 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:37926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5RWC-00077E-HQ for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:56 -0500 Received: by mail-wr1-x433.google.com with SMTP id s7so5398738wru.5 for ; Fri, 29 Jan 2021 03:00:48 -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=RSDh1s4sSFCh+gnxQ/s51Xo8osmp4XAWuSEwUmDU5oQ=; b=APGvjMnzN200RLhTWMMWwRfp/V+G4o8hs3Rdu6eu80n8G+1TQbxNfcyEc7pS99xbXt WiDVaSkkRBEGfFe5zrMf9mVyA+FaLra7ChZsWqPJuVzVWS4Zpz+8VL2o2m2qDj6SdGjY iSM7WWerOBNcICUvsDhn+4la2mUMan4Y2l6yyo11bKt+giGrW5brjSMu/Bos+/ri8KJ+ 2oK7jZL4rzBQvnJc3LyBTg2f7d1I53N0kSksEeocZGLbn9/HjN9lTW04F425iL3J9OLt v+Oisu0gBKIcL/O1emq9oR+2cQJdeAYaBmBXyKKBcc54LlTwsdDAFhEPrwwinXYqMZC3 F2+g== 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=RSDh1s4sSFCh+gnxQ/s51Xo8osmp4XAWuSEwUmDU5oQ=; b=rphZPYpnUbce0jkNDgfEjz+Csby9e4i8rYi2P/msOQHpwTLh8pa+0bvT7VSAESjft+ WKBm40ubOwOkNiQBhymwjccrRukQAh27uzGCPIObfgl52gbUFpTO51gbkuc8k/9vG3gd uteuQYtWbDlBrys3nvg/H2sFxkxLB1xBmwpU0n8PTxJ4EtDqjeHHWZt0sF3jCQukrSy+ nFJfh6dz9YZv7cJaEAp7Rc9AOb9qFZEJfIwCQEBXniYvnYX7M05eEi9WBMkWRz+B8919 EI0q1+IWZ3X7/3Fib/vP/wYm4cUWOvwhvfZFcm/RWX2erCige5vkEk6DUb/mzLF1BOxL LDXA== X-Gm-Message-State: AOAM531EAR3h7vdIr0CkA4XLHvYxQu3EF4vKLKNcSgO/e5UbtEd/5Rpn PtRQTitA3HfIki/9F1nfdhWlZiC/qT94Cw== X-Received: by 2002:adf:ee0d:: with SMTP id y13mr3958394wrn.228.1611918047235; Fri, 29 Jan 2021 03:00:47 -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.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 03:00:46 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 36/46] hw/arm/musca: Create and connect ARMSSE Clocks Date: Fri, 29 Jan 2021 11:00:02 +0000 Message-Id: <20210129110012.8660-37-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::433; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x433.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 and connect the two clocks needed by the ARMSSE. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Luc Michel Tested-by: Philippe Mathieu-Daudé Message-id: 20210128114145.20536-16-peter.maydell@linaro.org Message-id: 20210121190622.22000-16-peter.maydell@linaro.org --- hw/arm/musca.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.20.1 diff --git a/hw/arm/musca.c b/hw/arm/musca.c index d82bef11cf2..a9292482a06 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -33,6 +33,7 @@ #include "hw/misc/tz-ppc.h" #include "hw/misc/unimp.h" #include "hw/rtc/pl031.h" +#include "hw/qdev-clock.h" #include "qom/object.h" #define MUSCA_NUMIRQ_MAX 96 @@ -82,6 +83,8 @@ struct MuscaMachineState { UnimplementedDeviceState sdio; UnimplementedDeviceState gpio; UnimplementedDeviceState cryptoisland; + Clock *sysclk; + Clock *s32kclk; }; #define TYPE_MUSCA_MACHINE "musca" @@ -96,6 +99,8 @@ OBJECT_DECLARE_TYPE(MuscaMachineState, MuscaMachineClass, MUSCA_MACHINE) * don't model that in our SSE-200 model yet. */ #define SYSCLK_FRQ 40000000 +/* Slow 32Khz S32KCLK frequency in Hz */ +#define S32KCLK_FRQ (32 * 1000) static qemu_irq get_sse_irq_in(MuscaMachineState *mms, int irqno) { @@ -367,6 +372,11 @@ static void musca_init(MachineState *machine) exit(1); } + mms->sysclk = clock_new(OBJECT(machine), "SYSCLK"); + clock_set_hz(mms->sysclk, SYSCLK_FRQ); + mms->s32kclk = clock_new(OBJECT(machine), "S32KCLK"); + clock_set_hz(mms->s32kclk, S32KCLK_FRQ); + object_initialize_child(OBJECT(machine), "sse-200", &mms->sse, TYPE_SSE200); ssedev = DEVICE(&mms->sse); @@ -376,6 +386,8 @@ static void musca_init(MachineState *machine) qdev_prop_set_uint32(ssedev, "init-svtor", mmc->init_svtor); qdev_prop_set_uint32(ssedev, "SRAM_ADDR_WIDTH", mmc->sram_addr_width); qdev_prop_set_uint32(ssedev, "MAINCLK_FRQ", SYSCLK_FRQ); + qdev_connect_clock_in(ssedev, "MAINCLK", mms->sysclk); + qdev_connect_clock_in(ssedev, "S32KCLK", mms->s32kclk); /* * Musca-A takes the default SSE-200 FPU/DSP settings (ie no for * CPU0 and yes for CPU1); Musca-B1 explicitly enables them for CPU0.