From nobody Sat May 11 14:02:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=kernel-space.org ARC-Seal: i=1; a=rsa-sha256; t=1709851152; cv=none; d=zohomail.com; s=zohoarc; b=OLcQtuRHV+nvFvlu0HbtdejrWmeUKK9hqKSMIPRuLWzACkxJ5J/SCP5na/qQYMvdMumhZU02/dC8/9wDPukEcVfwBb5kdwkl61DCAhLaCTtyY8Ea5Us0mzk84sPOKtKc2M/EhGf4NelfP7j3xc2Ejji2+Vmb+lvn16x12pfcRUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709851152; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rD5abJrS/1qaVIIVgWVqD38GjZDcefohfHLK99a/vmo=; b=JUvp+ts5pubvMrNhSJ8CulAviVzXGCQNak0ix+ZKvWU204lCgW+OzBrFef4TsH0LRAujmzO3PVsO58CSUF1KUEAqPjPqvgL7fDUJu42xe9oRib44G13ge4Y3xeq5sDzeK2aRnQ1lhnuPaIdSsViXFveoq1SBYEzb4JBwPMGfAmI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 170985115246177.29646131187303; Thu, 7 Mar 2024 14:39:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riMNn-0000Ve-Cr; Thu, 07 Mar 2024 17:38:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riMHu-0007Wj-Ef for qemu-devel@nongnu.org; Thu, 07 Mar 2024 17:32:30 -0500 Received: from mail.kernel-space.org ([195.201.34.187]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riMHo-0001ad-2E for qemu-devel@nongnu.org; Thu, 07 Mar 2024 17:32:30 -0500 Received: from kernel-space.org (localhost [127.0.0.1]) by kernel-space.org (OpenSMTPD) with ESMTP id 4b2621f6; Thu, 7 Mar 2024 22:29:48 +0000 (UTC) Received: from localhost.localdomain (host-79-51-238-97.retail.telecomitalia.it [79.51.238.97]) by kernel-space.org (OpenSMTPD) with ESMTPSA id cf0165d4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 7 Mar 2024 22:29:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=kernel-space.org; h=from :to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=s1; bh=WJUUy3rjmGQ96LDDLXs4int4T00 =; b=pdOWE2qI8JYVHclphUFxbzfiztIuk+0tFTHVD7A15+KmZF9uho+3kz+d2cE S7ds3dTqTQn6eQYBQ02gBXKB+dRsgV5yMADY7WvsGy34msrkFFnryQbp8PtfySmi Mcgr27Xc9JPrGhKsehV8BRKecD0ikCbQtT76XC2WJ7MxtotA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=kernel-space.org; h=from:to :cc:subject:date:message-id:mime-version :content-transfer-encoding; q=dns; s=s1; b=UWxFwEMTOrYCEzXqkHeht xSXEICIw/KVcDF36sQXOcJUj91tVYDuViUuQszspZ0MX5GMoJ4WZgHvnbxf0C/0N 7MUFBnaHh+x27AhISh9fg2zG0ggzd6Iq1sTvy3pLmg2IE1bQLAgRqj0vXQgAPP++ +97WaYUYO4qTnRcYkX2rrw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-space.org; s=s1; t=1709850588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rD5abJrS/1qaVIIVgWVqD38GjZDcefohfHLK99a/vmo=; b=chhS//F+dtNpqtUDkjb6WTDUABhzAzsOAuk1RkBIIruM524R8lNkjuY5L4Ic4ZWZ+MuEx+ gHQPJ+Plxc0RvJKSWSIN4pN+TlP/2qtqXjpPynrY0CLQlgXpI0ZPZ3/BRplYvBlPdPwBDe yxZYxgmR93DvPFNdOB0FmURUNq/dgFU= From: Angelo Dureghello To: huth@tuxfamily.org Cc: qemu-devel@nongnu.org, Angelo Dureghello Subject: [PATCH] hw/m68k/mcf5208: add support for reset Date: Thu, 7 Mar 2024 23:31:41 +0100 Message-ID: <20240307223141.795214-1-angelo@kernel-space.org> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.201.34.187; envelope-from=angelo@kernel-space.org; helo=mail.kernel-space.org 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 07 Mar 2024 17:38:33 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel-space.org) (identity @kernel-space.org) X-ZM-MESSAGEID: 1709851153224100001 Content-Type: text/plain; charset="utf-8" Add reset support. Signed-off-by: Angelo Dureghello --- hw/m68k/mcf5208.c | 51 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 0cfb806c20..b1ab3896d0 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -20,6 +20,7 @@ #include "hw/ptimer.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/runstate.h" #include "net/net.h" #include "hw/boards.h" #include "hw/loader.h" @@ -40,6 +41,8 @@ #define PCSR_PRE_SHIFT 8 #define PCSR_PRE_MASK 0x0f00 =20 +#define RCR_SOFTRST 0x80 + typedef struct { MemoryRegion iomem; qemu_irq irq; @@ -185,13 +188,55 @@ static const MemoryRegionOps m5208_sys_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic) +static uint64_t m5208_rcm_read(void *opaque, hwaddr addr, + unsigned size) +{ + qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIX "\n", + __func__, addr); + return 0; +} + +static void m5208_rcm_write(void *opaque, hwaddr addr, + uint64_t value, unsigned size) +{ + switch (addr) { + case 0x0: /* RCR */ + if (value & RCR_SOFTRST) { + M68kCPU *cpu =3D opaque; + CPUState *cs =3D CPU(cpu); + + cpu_reset(cs); + cpu->env.aregs[7] =3D ldl_phys(cs->as, 0); + cpu->env.pc =3D ldl_phys(cs->as, 4); + //qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); + } + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIX "\= n", + __func__, addr); + break; + } +} + +static const MemoryRegionOps m5208_rcm_ops =3D { + .read =3D m5208_rcm_read, + .write =3D m5208_rcm_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, +}; + +static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic, + M68kCPU *cpu) { - MemoryRegion *iomem =3D g_new(MemoryRegion, 1); + MemoryRegion *iomem; m5208_timer_state *s; int i; =20 + /* RCM */ + iomem =3D g_new(MemoryRegion, 1); + memory_region_init_io(iomem, NULL, &m5208_rcm_ops, cpu, "m5208-rcm", 0= x00000080); + memory_region_add_subregion(address_space, 0xfc0a0000, iomem); /* SDRAMC. */ + iomem =3D g_new(MemoryRegion, 1); memory_region_init_io(iomem, NULL, &m5208_sys_ops, NULL, "m5208-sys", = 0x00004000); memory_region_add_subregion(address_space, 0xfc0a8000, iomem); /* Timers. */ @@ -265,7 +310,7 @@ static void mcf5208evb_init(MachineState *machine) mcf_uart_create_mmap(0xfc064000, pic[27], serial_hd(1)); mcf_uart_create_mmap(0xfc068000, pic[28], serial_hd(2)); =20 - mcf5208_sys_init(address_space_mem, pic); + mcf5208_sys_init(address_space_mem, pic, cpu); =20 mcf_fec_init(address_space_mem, 0xfc030000, pic + 36); =20 --=20 2.44.0