From patchwork Fri Mar 5 17:14:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1448154 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=mLYCMPan; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DsbYk5751z9sVt for ; Sat, 6 Mar 2021 05:17:30 +1100 (AEDT) Received: from localhost ([::1]:49622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIF0y-0000h0-Ef for incoming@patchwork.ozlabs.org; Fri, 05 Mar 2021 13:17:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIE3f-0007Ja-NG for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:16:12 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIE3E-0007cM-8V for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:16:10 -0500 Received: by mail-wm1-x331.google.com with SMTP id l22so2109720wme.1 for ; Fri, 05 Mar 2021 09:15:36 -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=wk0S0KTbLUFNBa4y721gmJ4km7P/S6HBOD3pRDA2m3Y=; b=mLYCMPanw9nJWjuGykL0cZQlXJoIAnla4C5Yvm5uMHrwEc9N8gsvspC9H5qBc8Jnbw 6fvuEYaNh69lALrxANy+7Mwjq2xU7WohRdZNSXprMSsfzWybQfdwzpbiYJX5EL2SylGy vtEcALxekY18HsQbhgaLV0qeA1bvgGr2+CFZAjd10H4g+mxBWzf7hKtze9Cf0lzOU/um cqnhBKp3TvOW55WpgXHLTYuc5Nbp+zQVdUJoOHAt7QiCs+Jq1+TCSOm5mYGohlP6DWgo sqvDTE44pm5edwWBdLEh8pwfUF8MVB/SDJZUVlZVed5zxgUcP6LTlQhv6wKNC2/FzSGU HTGA== 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=wk0S0KTbLUFNBa4y721gmJ4km7P/S6HBOD3pRDA2m3Y=; b=dONDVy5TD4PFde7e8E/1sOmBepM3uCBW2A2pt0AeVGUGytt5f0FSSFg8gYRPJESFSu JLUrtvr2rUD92scHkNFNYal/oEC14e/iXOfTIpY1GjbDO65qvbvX9lhyHDNL2G4JQZkJ 5S+t4o48SSQ3H6D01fbLXLv5l+sTCMuBlL1UrWVsvu97GUn4wcTtPIhvlpvANBlHFjUw p+sNfb7uhHy2R7ixpQOMaA++Cm5ymJnUNVNyayWjtVdmB0yAMkuJp0EDWi0Xn7HQUFiW AlZrmXB+Xro9e3MnAVABtyGAtXERhTKQ/rxgd/zoBxBHkOOQzqvH5SU0vXeR2miEiy0b i39g== X-Gm-Message-State: AOAM5333+ka4kIVnN5/Ytrjmu4tgGgDJ60aEQGLPxYop1vmYvKcy069z 6XiepVRK0EOSHLjr3sIzB/QAY+mcj7ecnw== X-Google-Smtp-Source: ABdhPJxywINTwFp46m/Wh7lY9GaCzNMB1eZoeB59J4Re+8ctcgJgLSMcNi7PousvzsBTsnvv1A37Ng== X-Received: by 2002:a1c:ddc6:: with SMTP id u189mr10050856wmg.171.1614964535846; Fri, 05 Mar 2021 09:15:35 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m132sm5942357wmf.45.2021.03.05.09.15.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 09:15:35 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 26/49] hw/arm/mps2-tz: Make SYSCLK frequency board-specific Date: Fri, 5 Mar 2021 17:14:52 +0000 Message-Id: <20210305171515.1038-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305171515.1038-1-peter.maydell@linaro.org> References: <20210305171515.1038-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The AN524 has a different SYSCLK frequency from the AN505 and AN521; make the SYSCLK frequency a field in the MPS2TZMachineClass rather than a compile-time constant so we can support the AN524. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20210215115138.20465-2-peter.maydell@linaro.org --- hw/arm/mps2-tz.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 90caa914934..82ce6262817 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -76,6 +76,7 @@ struct MPS2TZMachineClass { MachineClass parent; MPS2TZFPGAType fpga_type; uint32_t scc_id; + uint32_t sysclk_frq; /* Main SYSCLK frequency in Hz */ const char *armsse_type; }; @@ -111,8 +112,6 @@ struct MPS2TZMachineState { OBJECT_DECLARE_TYPE(MPS2TZMachineState, MPS2TZMachineClass, MPS2TZ_MACHINE) -/* Main SYSCLK frequency in Hz */ -#define SYSCLK_FRQ 20000000 /* Slow 32Khz S32KCLK frequency in Hz */ #define S32KCLK_FRQ (32 * 1000) @@ -186,6 +185,7 @@ static MemoryRegion *make_unimp_dev(MPS2TZMachineState *mms, static MemoryRegion *make_uart(MPS2TZMachineState *mms, void *opaque, const char *name, hwaddr size) { + MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms); CMSDKAPBUART *uart = opaque; int i = uart - &mms->uart[0]; int rxirqno = i * 2; @@ -196,7 +196,7 @@ static MemoryRegion *make_uart(MPS2TZMachineState *mms, void *opaque, object_initialize_child(OBJECT(mms), name, uart, TYPE_CMSDK_APB_UART); qdev_prop_set_chr(DEVICE(uart), "chardev", serial_hd(i)); - qdev_prop_set_uint32(DEVICE(uart), "pclk-frq", SYSCLK_FRQ); + qdev_prop_set_uint32(DEVICE(uart), "pclk-frq", mmc->sysclk_frq); sysbus_realize(SYS_BUS_DEVICE(uart), &error_fatal); s = SYS_BUS_DEVICE(uart); sysbus_connect_irq(s, 0, get_sse_irq_in(mms, txirqno)); @@ -403,7 +403,7 @@ static void mps2tz_common_init(MachineState *machine) /* These clocks don't need migration because they are fixed-frequency */ mms->sysclk = clock_new(OBJECT(machine), "SYSCLK"); - clock_set_hz(mms->sysclk, SYSCLK_FRQ); + clock_set_hz(mms->sysclk, mmc->sysclk_frq); mms->s32kclk = clock_new(OBJECT(machine), "S32KCLK"); clock_set_hz(mms->s32kclk, S32KCLK_FRQ); @@ -670,6 +670,7 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data) mmc->fpga_type = FPGA_AN505; mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33"); mmc->scc_id = 0x41045050; + mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */ mmc->armsse_type = TYPE_IOTKIT; } @@ -685,6 +686,7 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data) mmc->fpga_type = FPGA_AN521; mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33"); mmc->scc_id = 0x41045210; + mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */ mmc->armsse_type = TYPE_SSE200; }