From nobody Sat Feb 7 05:32:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602362624; cv=none; d=zohomail.com; s=zohoarc; b=PPt5VlEBJsca5G5SJi28+lyPqv7Zn8502qlPWid7+mvdhLRX9+YHvweSlTvt+IKof9jlOIf0Q68Fg+Q52B+y3P08bs7nMo114A6iYt6qWoCVkgqU78qK8GAfvJ/pPpXjXj1qPHyVgAriwFIPNLsDZX+4EM8f4WleGKYIqs3Mfhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602362624; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0r12VoVMUTuY3t4zO68E4z3Dus4xytIOTYR5/hVgU8s=; b=f0yO481hrMEfq3VruYMJUY1yy0g+MJe4wRK4Fnf/jZ8Fln8hbuTdw3VIW5DdFXR67Dx9RPnzxQHFAEzd0yA66YUdv9ehw3vDYbwEdsemca5dFSoE9lz8sA/ol6hF/pfjTJ/ltmxZZSJuX4r3ZQeMcN/ux2lY6H2sVVuyZkLMAUc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1602362624266621.4199296519263; Sat, 10 Oct 2020 13:43:44 -0700 (PDT) Received: by mail-wm1-f66.google.com with SMTP id a72so2708536wme.5 for ; Sat, 10 Oct 2020 13:43:43 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id 205sm2705471wme.38.2020.10.10.13.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2020 13:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0r12VoVMUTuY3t4zO68E4z3Dus4xytIOTYR5/hVgU8s=; b=OOmNf+rCJsuY+oq6W29mMirFbIEhjXNPoadgfx2xZYsCkRPnoich8ikQFilhLEHyN3 jFdsNfI/v3EFTG/rSCKIjxQFPjKsnkrWyCjUyPIEN7jfp+Xv3iY3wdSGw+rAiQLsx3L/ 0m5uelrWaTSWq3djm6f9qLKfnytoJfKcCaXZDRYD6ubg/lDFF4rqpJ1s1eKp4EJt22Zg Zf10ZTkxDS3FgmhYEqfBVwDHou23eG+I1Jtrj6CUscx6o1Q7LFqObF8lntiosgUlcJIp TyBEmOxQKKWz3d3yL8tMv/8/P0UDun7fzJCg+bWI5uuqc+NVU6xSUzT8UI/RPAeDXgUn SseA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0r12VoVMUTuY3t4zO68E4z3Dus4xytIOTYR5/hVgU8s=; b=GaQxk67/gySBS6MxVeYoFYA96URgIXJuiRTp4IBTaA2qXF1fWb9EsUuEIWAZH27pDc +oSwIZ885/wlcYKUKGQjTU3YZenz+REjxGVAVFm9us/uyZ5upPOzf6TKZRrpHcMSmYYL WVhwcOhCon+Ippww6Wsg/DqbxSi2C3aW5Y+RJiFnQsLRNJxp7KKHVWWji2gcjEhtyNHK xTOLxHMbmU0fQOnh18dIITMRiWQiqVXv5F3cw4ENy8RhWXk1zZQQhPstoJO4iquymQwd tmrg5etJzDYt+cQtd2XtaeevJ9Ytv4Shok09GudbzB6VHB/AGZ1tvLh6M93sgQhaCDeD 0U9A== X-Gm-Message-State: AOAM533ArFYU12ttMFwl9ZVlIE0GsGVeLi/uHNlK/8Zwe9X0QPGCfbPu IvGGNYtDEdoY79YR5llNOUE= X-Google-Smtp-Source: ABdhPJxKRQc9S/7ZR4utn9z55DkplkzkYAI90A8n47/cv+NT0DAgKje7aYoYZ/BXTZkkfrFgvDzmVQ== X-Received: by 2002:a1c:ed01:: with SMTP id l1mr4238892wmh.152.1602362622384; Sat, 10 Oct 2020 13:43:42 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Damien Hedde , Paul Burton , Luc Michel , Aleksandar Rikalo , Huacai Chen , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Aurelien Jarno , Jiaxun Yang Subject: [PATCH v3 15/20] hw/mips/jazz: Correct CPU frequencies Date: Sat, 10 Oct 2020 22:43:14 +0200 Message-Id: <20201010204319.3119239-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201010204319.3119239-1-f4bug@amsat.org> References: <20201010204319.3119239-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The Magnum 4000PC CPU runs at 100 MHz, and the Acer PICA-61 CPU at ~134 MHz. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/jazz.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 47723093b63..e56e36cf3f7 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -45,6 +45,7 @@ #include "hw/audio/pcspk.h" #include "hw/input/i8042.h" #include "hw/sysbus.h" +#include "hw/qdev-clock.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" @@ -145,6 +146,7 @@ static void mips_jazz_init(MachineState *machine, MIPSCPU *cpu; CPUClass *cc; CPUMIPSState *env; + Clock *cpuclk; qemu_irq *i8259; rc4030_dma *dmas; IOMMUMemoryRegion *rc4030_dma_mr; @@ -163,6 +165,13 @@ static void mips_jazz_init(MachineState *machine, MemoryRegion *bios2 =3D g_new(MemoryRegion, 1); SysBusESPState *sysbus_esp; ESPState *esp; + static const struct { + unsigned freq_hz; + unsigned pll_mult; + } ext_clk[] =3D { + [JAZZ_MAGNUM] =3D {50000000, 2}, + [JAZZ_PICA61] =3D {33333333, 4}, + }; =20 if (machine->ram_size > 256 * MiB) { error_report("RAM size more than 256Mb is not supported"); @@ -170,7 +179,12 @@ static void mips_jazz_init(MachineState *machine, } =20 /* init CPUs */ - cpu =3D MIPS_CPU(cpu_create(machine->cpu_type)); + cpu =3D MIPS_CPU(object_new(machine->cpu_type)); + cpuclk =3D clock_new(OBJECT(machine), "cpu-refclk"); + clock_set_hz(cpuclk, + ext_clk[jazz_model].freq_hz * ext_clk[jazz_model].pll_mul= t); + qdev_connect_clock_in(DEVICE(cpu), "clk-in", cpuclk); + qdev_realize(DEVICE(cpu), NULL, &error_abort); env =3D &cpu->env; qemu_register_reset(main_cpu_reset, cpu); =20 --=20 2.26.2