From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610741656; cv=none; d=zohomail.com; s=zohoarc; b=DWC19cE0/ZEKuhdfkNkDeVODfpZM91IMUr14vXPriGcCXRbHd/S01wWUvADr4OXe6Bql3ggUZDCAQxKF5MkVIiGAgCcLDhTjFEqFo+MH/xm0Sel8vMCyjh6MrPmRmkbpRIlQjrf4Q8cYp500yqMBOfTcdmQ1bDzSao0MwAct4SY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610741656; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xwzt0q6nnq+N4lhh6i4hCtl/N6d0A+34im5bSdbG69I=; b=ca4uYTFfGMd9kxE1QswFg8xngLlEwdYEPXcPjK4tYOF5X4CyTa0XNE/Os16pKocSY1tVJvrl/2JYiEr1RHFu2T2AQ3kqJ5E3WlqWiwTc9JSStQTCitfM2GOifRig8KJCdXXyqyBFsu1hVvkSLFph/v0iRqfPTU6dDJA8G5CPNfU= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610741656263653.042147895401; Fri, 15 Jan 2021 12:14:16 -0800 (PST) Received: from localhost ([::1]:52438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VU6-0007L3-BN for importer@patchew.org; Fri, 15 Jan 2021 15:14:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSA-0005lE-3K for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:14 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:34362) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VS7-0008Ew-Nh for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:13 -0500 Received: by mail-wm1-x333.google.com with SMTP id o10so2524421wmc.1 for ; Fri, 15 Jan 2021 12:12:11 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xwzt0q6nnq+N4lhh6i4hCtl/N6d0A+34im5bSdbG69I=; b=Qez+C0zHEeGOBi8vwZ/oz53i/I5vQx7mpGFVS0xsetFfONwny9wdDmFgCvK61ceNeI 3/Zlhl2xOHpktzSr0pjuYM0a18TSfLzGeynEPKWdVkaPinmMAF7O75qXbe+QzBj2SdrB GvOSorWkbpKrxB98Nz/YZDhJKbuaxBc7D3+wQ+rVuSnHRrCrgBhtqJFkXRcc8v1FzoNo O2SBkQ1zH6gFzO4C1ZiYrX/hgohx4IeMrPoG6EhGF+uVnvDtJRsoDto1XjYzaONGGtHT o/EsJFkPargPwiBs5qmEpGmDjLrGPj54dHZeMaFZ3TVjcICeFUxY9raTu9BzatxqdiU3 WuwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xwzt0q6nnq+N4lhh6i4hCtl/N6d0A+34im5bSdbG69I=; b=bOVtclQzwcyKbaLynlWEBiBeIwA1Bt7tnGJFe+ytoyC9m7dKWvWBS0pFbEzGX3XptO WsVnQSmgo5W37Kr5zgXuvZdqivfEZYOlGIG0ByeqhdkXQQyUDDKNBShfXQs0xGcr9qfw Cf+H8wipPy+0q+K9kqzqOPLOTh1lqfpvfk/E9wwt4UkwtvxH2mJh7vR3Rc+irVlOuxQk FDcT3ZHDOyWtOB1AxzWz3SCQMd4e1GJq7hCB0bqDjBH8qtnH3nd5uVgeudaAQNtaJ/uu zEnDVFGdcXxj1qQDf6j5YEFxEb5w4XuUkqSDKa1DxViU/ITdoxC/MUIv7nGJ/HhqtF3t l1/Q== X-Gm-Message-State: AOAM532EKV/kGQGE7sedTphxjOknVevX5BSUaXvWSthn/0l/QMLtKqnH VJfyKoHJQ9azk6oRQzAOaOXgBczMIIjw5g== X-Google-Smtp-Source: ABdhPJyweR3NgTDjs4Dyk0jUqjLo/Bx1QQRFzM/NJYrMIlLR2DjMaaAr4sT6VKhZsc4WtEuMgCCGPQ== X-Received: by 2002:a1c:3c04:: with SMTP id j4mr10370886wma.147.1610741530164; Fri, 15 Jan 2021 12:12:10 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 01/11] hw/m68k/next-cube: Make next_irq() function static Date: Fri, 15 Jan 2021 20:11:56 +0000 Message-Id: <20210115201206.17347-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The next_irq() function is global, but isn't actually used anywhere outside next-cube.c. Make it static. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth --- include/hw/m68k/next-cube.h | 2 -- hw/m68k/next-cube.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/hw/m68k/next-cube.h b/include/hw/m68k/next-cube.h index a3be2b32abb..5a56c354b8e 100644 --- a/include/hw/m68k/next-cube.h +++ b/include/hw/m68k/next-cube.h @@ -42,6 +42,4 @@ enum next_irqs { NEXT_SND_I }; =20 -void next_irq(void *opaque, int number, int level); - #endif /* NEXT_CUBE_H */ diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 37bc35dfa43..f622d6589c8 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -724,7 +724,7 @@ static const MemoryRegionOps dma_ops =3D { * TODO: set the shift numbers as values in the enum, so the first switch * will not be needed */ -void next_irq(void *opaque, int number, int level) +static void next_irq(void *opaque, int number, int level) { M68kCPU *cpu =3D opaque; int shift =3D 0; --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610741812; cv=none; d=zohomail.com; s=zohoarc; b=I4QS710LzLLkBP5Vo6ZRVxRCnXkPvEuz2hbft43wuvWdC2IXaU/sxdzpFItAw7zUFHMyRvJhMnlDXIlls5DZJZLWHO/REXF7M7IQnBBMmqqD3sfjg9E1+5dEn5elgQe5ejY+JgouhupLkBMIQDvIckzmxnuXKhTVdJQw1T1s4IU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610741812; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rTWJIJzyn/d0f9c+f8XIvnchNfg5WqrGoOxuJbOhu5Q=; b=hnXUOHQN1ICfTbjPfT5D6DRDlKrxbLJJ8RW58HH3qNNkpDnLDbdDj8mj+ecwcwiGA1m6rpO5LTrbdDjYzmNVoIBCG/guh7GTI8cXPgqZ6az0gnTChm89UVoGvXKrVNCA7MA8ah1iDaviDy/t8x65xmuyJy+D9AevZiWX3TW4i3A= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610741812262117.60395180052285; Fri, 15 Jan 2021 12:16:52 -0800 (PST) Received: from localhost ([::1]:60254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VWd-00029G-6W for importer@patchew.org; Fri, 15 Jan 2021 15:16:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSA-0005lM-Nh for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:14 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:41981) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VS9-0008Fo-0H for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:14 -0500 Received: by mail-wr1-x430.google.com with SMTP id a12so10468946wrv.8 for ; Fri, 15 Jan 2021 12:12:12 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rTWJIJzyn/d0f9c+f8XIvnchNfg5WqrGoOxuJbOhu5Q=; b=D0uQ59eXKZOhx+K/zSQh1FEawYj/m1Qu8m4pE2PJ9FR+KxDom+MVM3EpOCqZ1NpPX/ X2ZG7rx6f8vgsRiabCkjEljxtdSvKT0hhek/RX6faLHHGSUoDXA/pAgmbUQ5WhuWSMFP uBdGJ4QyFvEYfCiAv3kg8kFb/wzHRh2lECfrik6uSBDdX/GR9XJjam1dwumXe4PU9om+ ErbUz4t0MT3OdIVj4lMzHyTxuvbExYhF3ISHXmudyqaoT62RgTWCxjDj0Kar6s364+NA TrEnQHN/Hgilw7cWBc2STR/AfDAVZb9TuTHCy5aP6cjJdp77jrqhLxDQm+5nPsOiQTZI EcNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rTWJIJzyn/d0f9c+f8XIvnchNfg5WqrGoOxuJbOhu5Q=; b=b9gC1VEKvUVXsKARoS7p1v2BvhsHOFLdTs1CfnD2QGSGbaJlVddFYwV30xnDmuTqzT 27fCwO3DmToaPP6QGPqiomcIUUM8xKiWlP8paHRdXqyLm1DnQhHO5BKHQDzlxuw6usr7 7uoiExxFpNBWZjgaP/yonMCcp2dthgh7fydrJOaMGVa51qfFSZXD/6iF37eXdskJbsxe efT3AgRe3d/yUG/udvAqPAIzmowitjHY5cmaWKryMz4zojGXCO9dqmTlo6r/s/CBy9rV 4S58IO0FNIyY/+pL73qbDZJDrYTX/IWj7lHGdEaHSctQhD6caXmmG9gHpXph/xOESJwM dBQQ== X-Gm-Message-State: AOAM531Y35mcFYmOZR8YJYOq2e+Q7NKiuX6viTTcXjAVo36hzhp1M1ib qmQjZlUKUrZi34fADeyI+lX0HHd21wbm6A== X-Google-Smtp-Source: ABdhPJz12d4A7Q7157T8a5zPQjWZDtiiZreBtyQwTAfmes+ccNEnjy9AHaziztRGJjZsCnPEAA71eQ== X-Received: by 2002:a5d:4104:: with SMTP id l4mr15266186wrp.340.1610741531220; Fri, 15 Jan 2021 12:12:11 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 02/11] hw/m68k/next-cube: Move register/interrupt functionality into a device Date: Fri, 15 Jan 2021 20:11:57 +0000 Message-Id: <20210115201206.17347-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Currently the next-cube board code open-codes a lot of handling of interrupts and some miscellaneous registers. Move this into a proper QOM device. In the real hardware this functionality seems to be the responsibility of the Peripheral Controller (PC) chip, so name the device that. There are several different things that will need to be moved into this device: * the mmio_iops register set * the scr_ops register set * the next_irq IRQ handling To ease review, we structure the change as a sequence of commits: in this first commit we create the skeleton of the NeXTPC device with no content, but with a backdoor pointer to the NeXTState machine's state struct so we can move parts of the code and still have refactored and non-refactored code using the same struct data fields. Further commits will move functionality into the new device piece by piece. At the end we will be able to remove the backdoor pointer because all the data fields will be in the NeXTPC struct and not the NeXTState struct. We'll add the VMState for the new device at the end of all that; this is in theory a migration compatibility break but this machine does not currently support migration at all anyway. Signed-off-by: Peter Maydell --- hw/m68k/next-cube.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index f622d6589c8..dccf3eb4313 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -90,6 +90,16 @@ struct NeXTState { NextRtc rtc; }; =20 +#define TYPE_NEXT_PC "next-pc" +OBJECT_DECLARE_SIMPLE_TYPE(NeXTPC, NEXT_PC) + +struct NeXTPC { + SysBusDevice parent_obj; + + /* Temporary until all functionality has been moved into this device */ + NeXTState *ns; +}; + /* Thanks to NeXT forums for this */ /* static const uint8_t rtc_ram3[32] =3D { @@ -857,6 +867,31 @@ static void next_escc_init(M68kCPU *cpu) sysbus_mmio_map(s, 0, 0x2118000); } =20 +static void next_pc_reset(DeviceState *dev) +{ +} + +static void next_pc_realize(DeviceState *dev, Error **errp) +{ +} + +static void next_pc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->desc =3D "NeXT Peripheral Controller"; + dc->realize =3D next_pc_realize; + dc->reset =3D next_pc_reset; + /* We will add the VMState in a later commit */ +} + +static const TypeInfo next_pc_info =3D { + .name =3D TYPE_NEXT_PC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(NeXTPC), + .class_init =3D next_pc_class_init, +}; + static void next_cube_init(MachineState *machine) { M68kCPU *cpu; @@ -871,6 +906,7 @@ static void next_cube_init(MachineState *machine) const char *bios_name =3D machine->firmware ?: ROM_FILE; NeXTState *ns =3D NEXT_MACHINE(machine); DeviceState *dev; + DeviceState *pcdev; =20 /* Initialize the cpu core */ cpu =3D M68K_CPU(cpu_create(machine->cpu_type)); @@ -884,6 +920,12 @@ static void next_cube_init(MachineState *machine) env->vbr =3D 0; env->sr =3D 0x2700; =20 + /* Peripheral Controller */ + pcdev =3D qdev_new(TYPE_NEXT_PC); + sysbus_realize_and_unref(SYS_BUS_DEVICE(pcdev), &error_fatal); + /* Temporary while we refactor this code */ + NEXT_PC(pcdev)->ns =3D ns; + /* Set internal registers to initial values */ /* 0x0000XX00 << vital bits */ ns->scr1 =3D 0x00011102; @@ -978,6 +1020,7 @@ static const TypeInfo next_typeinfo =3D { static void next_register_type(void) { type_register_static(&next_typeinfo); + type_register_static(&next_pc_info); } =20 type_init(next_register_type) --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610741810; cv=none; d=zohomail.com; s=zohoarc; b=K7+gNQCD5iQTd84HB4tow19Nplm0emDmcM5eigWM8SZblW6wEBJ2Er2X/w7Fy/UzTxKr3mcZHpDjtuDnHSumrratuR4+/xIPdpmcalSR8sUa7ucXz/ITJCVUy72984TtE9zAMZN99KDj0wXYzYy9ggmh/pTXInXpjDoCkym0MZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610741810; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UNbBc4SXLU0U2IV+7GjuHGXmjGUHTU+KZlWo4uGsEzI=; b=AcsPv3/FwBDqXwzrQgDjDIik3tJDhwnRunm/LvuM4t3mBsQ0ckGao5zcvIH77Y+UIBWiOPPoxHkAZ03pd+psDhXgPWEDIOCJfVLIbC9VclWFR4BaaEzB02cPTo1919SSktzZVUEFjYttzqzYRqYsN0EEHZO4yBgqrqyF2UwSj9M= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610741810749862.8674627624014; Fri, 15 Jan 2021 12:16:50 -0800 (PST) Received: from localhost ([::1]:60236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VWb-00028w-JH for importer@patchew.org; Fri, 15 Jan 2021 15:16:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSC-0005nI-Bc for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:16 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:51703) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VSA-0008GZ-8R for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:16 -0500 Received: by mail-wm1-x32f.google.com with SMTP id h17so8292898wmq.1 for ; Fri, 15 Jan 2021 12:12:13 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UNbBc4SXLU0U2IV+7GjuHGXmjGUHTU+KZlWo4uGsEzI=; b=OLudL/tlmMApfO5Tlul46Lnd26SCd+pL8MzgElAHmvAR/kUb3n6s51HIYCE26uEriG Uf5PSqmKHqUfnNH4G1TLW5cBAwRcPsz+di3AehA9zQiG5V2sbVU9DPXqqjnlMFnG+Fiv Jc2HXRk9LQzbF9yzQdl+Y+q3xtKjoo82oDp+e5Ny7hDndjlGED4nDOvIIx1tbyDv3a6X tzfEWJUra1S3UNrZx3o1lQuWCJcAQ1JLeRfGgk2SdqRJKEQ1cXHRGEhw8l3q3vk/ZOia NGrKl3XXTJLxFjL2CBBZQQ3MBTRSHqXy78AFut8hwEf4IevxtXH7u9KeJm7DpGewRJap K6fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UNbBc4SXLU0U2IV+7GjuHGXmjGUHTU+KZlWo4uGsEzI=; b=CBcddv1N1xgSxVen/w/vVinaeH0vqKHsCVXnD1Ucdw2BXFi4zZl2aLYxjR/HPZbvsB AKnXVENDqKdjfFkaF5jb9krv853YNZYbvsZhAc5+lm4Z8GGXiOnbnZ/ii/Pl+THZsDoL SYbgrjWplAaklRbyy9u4+OV+WH/NG0ATMQYdpZohigrPOaQnz82b9C+es6Cgaq7bqQio Iroo4ePmoOKmAnMH/hdmdFobWVScz4UstpHeliuttgN+QKd3s1Mbefe6bc+O6o6qfM3M oXHuHfsnFPGjQzSYezfJkC2beSM7olqdfu8wqce2fvDKHmoFCSqzoOm9KE7uatZGEktV RuUQ== X-Gm-Message-State: AOAM530zwZiXo8xEDDBae+UlDkK5suxSDcQIETMGvWrJDfczvA160aKL 6IsPO4t+C75ZMHWfQRw7a6OF3rIdcozEUA== X-Google-Smtp-Source: ABdhPJxEQ9E5G+19Fg4gGkp0ZyjnJGaeaDoqbTbaIzg3+CDl1Gm/IwpZq0Oeu2Iva8M84eDdVIhMQw== X-Received: by 2002:a7b:c205:: with SMTP id x5mr10700959wmi.115.1610741532163; Fri, 15 Jan 2021 12:12:12 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 03/11] hw/m68k/next-cube: Move mmio_ops into NeXTPC device Date: Fri, 15 Jan 2021 20:11:58 +0000 Message-Id: <20210115201206.17347-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Move the registers handled by the mmio_ops struct into the NeXTPC device. This allows us to also move the scr1 and scr2 data fields. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth --- hw/m68k/next-cube.c | 80 +++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index dccf3eb4313..ff121143e92 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -84,9 +84,6 @@ struct NeXTState { qemu_irq scsi_reset; qemu_irq *fd_irq; =20 - uint32_t scr1; - uint32_t scr2; - NextRtc rtc; }; =20 @@ -98,6 +95,11 @@ struct NeXTPC { =20 /* Temporary until all functionality has been moved into this device */ NeXTState *ns; + + MemoryRegion mmiomem; + + uint32_t scr1; + uint32_t scr2; }; =20 /* Thanks to NeXT forums for this */ @@ -120,13 +122,13 @@ static const uint8_t rtc_ram2[32] =3D { #define SCR2_RTDATA 0x4 #define SCR2_TOBCD(x) (((x / 10) << 4) + (x % 10)) =20 -static void nextscr2_write(NeXTState *s, uint32_t val, int size) +static void nextscr2_write(NeXTPC *s, uint32_t val, int size) { static int led; static int phase; static uint8_t old_scr2; uint8_t scr2_2; - NextRtc *rtc =3D &s->rtc; + NextRtc *rtc =3D &s->ns->rtc; =20 if (size =3D=3D 4) { scr2_2 =3D (val >> 8) & 0xFF; @@ -238,7 +240,7 @@ static void nextscr2_write(NeXTState *s, uint32_t val, = int size) /* clear FTU */ if (rtc->value & 0x04) { rtc->status =3D rtc->status & (~0x18); - s->int_status =3D s->int_status & (~0x04); + s->ns->int_status =3D s->ns->int_status & (~0x04); } } } @@ -254,7 +256,7 @@ static void nextscr2_write(NeXTState *s, uint32_t val, = int size) old_scr2 =3D scr2_2; } =20 -static uint32_t mmio_readb(NeXTState *s, hwaddr addr) +static uint32_t mmio_readb(NeXTPC *s, hwaddr addr) { switch (addr) { case 0xc000: @@ -284,7 +286,7 @@ static uint32_t mmio_readb(NeXTState *s, hwaddr addr) } } =20 -static uint32_t mmio_readw(NeXTState *s, hwaddr addr) +static uint32_t mmio_readw(NeXTPC *s, hwaddr addr) { switch (addr) { default: @@ -293,16 +295,16 @@ static uint32_t mmio_readw(NeXTState *s, hwaddr addr) } } =20 -static uint32_t mmio_readl(NeXTState *s, hwaddr addr) +static uint32_t mmio_readl(NeXTPC *s, hwaddr addr) { switch (addr) { case 0x7000: - /* DPRINTF("Read INT status: %x\n", s->int_status); */ - return s->int_status; + /* DPRINTF("Read INT status: %x\n", s->ns->int_status); */ + return s->ns->int_status; =20 case 0x7800: - DPRINTF("MMIO Read INT mask: %x\n", s->int_mask); - return s->int_mask; + DPRINTF("MMIO Read INT mask: %x\n", s->ns->int_mask); + return s->ns->int_mask; =20 case 0xc000: return s->scr1; @@ -316,7 +318,7 @@ static uint32_t mmio_readl(NeXTState *s, hwaddr addr) } } =20 -static void mmio_writeb(NeXTState *s, hwaddr addr, uint32_t val) +static void mmio_writeb(NeXTPC *s, hwaddr addr, uint32_t val) { switch (addr) { case 0xd003: @@ -328,21 +330,21 @@ static void mmio_writeb(NeXTState *s, hwaddr addr, ui= nt32_t val) =20 } =20 -static void mmio_writew(NeXTState *s, hwaddr addr, uint32_t val) +static void mmio_writew(NeXTPC *s, hwaddr addr, uint32_t val) { DPRINTF("MMIO Write W\n"); } =20 -static void mmio_writel(NeXTState *s, hwaddr addr, uint32_t val) +static void mmio_writel(NeXTPC *s, hwaddr addr, uint32_t val) { switch (addr) { case 0x7000: - DPRINTF("INT Status old: %x new: %x\n", s->int_status, val); - s->int_status =3D val; + DPRINTF("INT Status old: %x new: %x\n", s->ns->int_status, val); + s->ns->int_status =3D val; break; case 0x7800: - DPRINTF("INT Mask old: %x new: %x\n", s->int_mask, val); - s->int_mask =3D val; + DPRINTF("INT Mask old: %x new: %x\n", s->ns->int_mask, val); + s->ns->int_mask =3D val; break; case 0xc000: DPRINTF("SCR1 Write: %x\n", val); @@ -358,15 +360,15 @@ static void mmio_writel(NeXTState *s, hwaddr addr, ui= nt32_t val) =20 static uint64_t mmio_readfn(void *opaque, hwaddr addr, unsigned size) { - NeXTState *ns =3D NEXT_MACHINE(opaque); + NeXTPC *s =3D NEXT_PC(opaque); =20 switch (size) { case 1: - return mmio_readb(ns, addr); + return mmio_readb(s, addr); case 2: - return mmio_readw(ns, addr); + return mmio_readw(s, addr); case 4: - return mmio_readl(ns, addr); + return mmio_readl(s, addr); default: g_assert_not_reached(); } @@ -375,17 +377,17 @@ static uint64_t mmio_readfn(void *opaque, hwaddr addr= , unsigned size) static void mmio_writefn(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - NeXTState *ns =3D NEXT_MACHINE(opaque); + NeXTPC *s =3D NEXT_PC(opaque); =20 switch (size) { case 1: - mmio_writeb(ns, addr, value); + mmio_writeb(s, addr, value); break; case 2: - mmio_writew(ns, addr, value); + mmio_writew(s, addr, value); break; case 4: - mmio_writel(ns, addr, value); + mmio_writel(s, addr, value); break; default: g_assert_not_reached(); @@ -869,10 +871,23 @@ static void next_escc_init(M68kCPU *cpu) =20 static void next_pc_reset(DeviceState *dev) { + NeXTPC *s =3D NEXT_PC(dev); + + /* Set internal registers to initial values */ + /* 0x0000XX00 << vital bits */ + s->scr1 =3D 0x00011102; + s->scr2 =3D 0x00ff0c80; } =20 static void next_pc_realize(DeviceState *dev, Error **errp) { + NeXTPC *s =3D NEXT_PC(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + + memory_region_init_io(&s->mmiomem, OBJECT(s), &mmio_ops, s, + "next.mmio", 0xD0000); + + sysbus_init_mmio(sbd, &s->mmiomem); } =20 static void next_pc_class_init(ObjectClass *klass, void *data) @@ -897,7 +912,6 @@ static void next_cube_init(MachineState *machine) M68kCPU *cpu; CPUM68KState *env; MemoryRegion *rom =3D g_new(MemoryRegion, 1); - MemoryRegion *mmiomem =3D g_new(MemoryRegion, 1); MemoryRegion *scrmem =3D g_new(MemoryRegion, 1); MemoryRegion *dmamem =3D g_new(MemoryRegion, 1); MemoryRegion *bmapm1 =3D g_new(MemoryRegion, 1); @@ -926,10 +940,6 @@ static void next_cube_init(MachineState *machine) /* Temporary while we refactor this code */ NEXT_PC(pcdev)->ns =3D ns; =20 - /* Set internal registers to initial values */ - /* 0x0000XX00 << vital bits */ - ns->scr1 =3D 0x00011102; - ns->scr2 =3D 0x00ff0c80; ns->rtc.status =3D 0x90; =20 /* Load RTC RAM - TODO: provide possibility to load contents from file= */ @@ -944,9 +954,7 @@ static void next_cube_init(MachineState *machine) sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x0B000000); =20 /* MMIO */ - memory_region_init_io(mmiomem, NULL, &mmio_ops, machine, "next.mmio", - 0xD0000); - memory_region_add_subregion(sysmem, 0x02000000, mmiomem); + sysbus_mmio_map(SYS_BUS_DEVICE(pcdev), 0, 0x02000000); =20 /* BMAP memory */ memory_region_init_ram_shared_nomigrate(bmapm1, NULL, "next.bmapmem", = 64, --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610741661; cv=none; d=zohomail.com; s=zohoarc; b=KZDSDg8p5/W6uFO4DYGvqFIpLlwz/0qlnoLePPjqtIjQzgVX45i4vjco1FjpRmOtS4Z1Nnmr5NVTbE9v6wO6JmpV33OvForcMj54by2EB3vELNcNs7zQFI7/qUmrXWnD3TYewcr8Q0gEN0/BQMo0qKKwGHLEL0gpwsx6lZMctGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610741661; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Suq/BC3lJRGxMrIhmW6rsnvYq6sMOoUD1GTT6fv2wYE=; b=Gtdmma7zG+0/KnVsAfQ7BwfgDBb5NxmVKYf8N0tAhA5utg0FM7v2ssIRPJ11OxmrX2zLCZApJm7frK1eY60/puZTkk8lrEJRZL3iTt6BaN3MIqROlu2/j8+xvaFm3TEpLRFcIgU1k3t8TLhV9t9ImTm48RnR7XynpPoLvJhebVo= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610741661798255.70033797729423; Fri, 15 Jan 2021 12:14:21 -0800 (PST) Received: from localhost ([::1]:52948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VUC-0007XU-C9 for importer@patchew.org; Fri, 15 Jan 2021 15:14:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSE-0005qU-0M for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:18 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:40017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VSB-0008HQ-6E for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:17 -0500 Received: by mail-wr1-x434.google.com with SMTP id 91so10504117wrj.7 for ; Fri, 15 Jan 2021 12:12:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Suq/BC3lJRGxMrIhmW6rsnvYq6sMOoUD1GTT6fv2wYE=; b=H69f754sKl4k+sDjN0PPFo9dvZ3ThIVtyYbOKT6gzXHOtkF6BEK3Er8KHW0pJVqDVZ 9RDpKJGa3lJ+9/S5FMwAKxsmMNhT3GoN3LCvkFPz84fCkXIRFOVOdlVHn6z3KAEPXytX lW2IJFEbki70i90X/a0PHLdUHPlqadHpauG/4OhU18wF0HpqYXNGcKiUGDLNVMDI3cxA kom+xnrsAOo6onIM8/OpppnIyiHKw2iXK3t7l9hmFMNEw2UxCvM1Vw3m6H8AbGhj+JaQ nKRk71S3xGnkdXv8TsxJ3ODQRtKKetnhD2jLLSoV5WPOTOwgF0tUPgKYOCuS+YU+QuA+ dtpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Suq/BC3lJRGxMrIhmW6rsnvYq6sMOoUD1GTT6fv2wYE=; b=TKr5/BPj8IZ1L/ZQUFlbMdPRu/Wn09xzcjfrlJfeo0ogRJyRWKtP14z/zzWB3nrElQ CNqIwjzPLfxkLIY36op7XUxyJtlxoRoInMrj1wxpdA74DnNrNROhxINH26eaWYVLTooC F7p8oRu8miZ52oK5PMc8reEJF7fxnX8fXOb7BV2A5aDx/YbfV+PkRB7KVXucye1rKWFJ RwEyfyOUXla2IVKOPOMJPNczVEE0lJ3NrEcTkNkrmdSfxy3GsgmmFN+U2MASlvtgoRqw drw1Bi1fX8ENu42+vupdroTyxyKWon4IAbMw1hAjndne1H2sImHmXPFhMPJ2DBq8/+GZ jYTA== X-Gm-Message-State: AOAM532FSxgAUSNelqrIddnBenYVhGc/rqNPy1FjG8qZVJ9aBy8Py5Qv vRCBviM6NK/ryKX+Pgnq1gl3DA7CMt8z1g== X-Google-Smtp-Source: ABdhPJxkjj+9mFZ/9jgZ3odNDp1kJgeXMMPBpS8ejQQ87uU4HQ0PrPL3VNY98LeTrkTeO49OcjN8Iw== X-Received: by 2002:adf:d201:: with SMTP id j1mr14920440wrh.212.1610741533528; Fri, 15 Jan 2021 12:12:13 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 04/11] hw/m68k/next-cube: Move scr_ops into NeXTPC device Date: Fri, 15 Jan 2021 20:11:59 +0000 Message-Id: <20210115201206.17347-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Move the registers handled by the scr_ops struct into the NeXTPC device. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth --- hw/m68k/next-cube.c | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index ff121143e92..f5575cb43b8 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -76,8 +76,6 @@ struct NeXTState { uint32_t int_mask; uint32_t int_status; =20 - uint8_t scsi_csr_1; - uint8_t scsi_csr_2; next_dma dma[10]; qemu_irq *scsi_irq; qemu_irq scsi_dma; @@ -97,9 +95,12 @@ struct NeXTPC { NeXTState *ns; =20 MemoryRegion mmiomem; + MemoryRegion scrmem; =20 uint32_t scr1; uint32_t scr2; + uint8_t scsi_csr_1; + uint8_t scsi_csr_2; }; =20 /* Thanks to NeXT forums for this */ @@ -402,7 +403,7 @@ static const MemoryRegionOps mmio_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static uint32_t scr_readb(NeXTState *s, hwaddr addr) +static uint32_t scr_readb(NeXTPC *s, hwaddr addr) { switch (addr) { case 0x14108: @@ -436,13 +437,13 @@ static uint32_t scr_readb(NeXTState *s, hwaddr addr) } } =20 -static uint32_t scr_readw(NeXTState *s, hwaddr addr) +static uint32_t scr_readw(NeXTPC *s, hwaddr addr) { DPRINTF("BMAP Read W @ %x\n", (unsigned int)addr); return 0; } =20 -static uint32_t scr_readl(NeXTState *s, hwaddr addr) +static uint32_t scr_readl(NeXTPC *s, hwaddr addr) { DPRINTF("BMAP Read L @ %x\n", (unsigned int)addr); return 0; @@ -455,7 +456,7 @@ static uint32_t scr_readl(NeXTState *s, hwaddr addr) #define SCSICSR_CPUDMA 0x10 /* if set, dma enabled */ #define SCSICSR_INTMASK 0x20 /* if set, interrupt enabled */ =20 -static void scr_writeb(NeXTState *s, hwaddr addr, uint32_t value) +static void scr_writeb(NeXTPC *s, hwaddr addr, uint32_t value) { switch (addr) { case 0x14108: @@ -501,9 +502,9 @@ static void scr_writeb(NeXTState *s, hwaddr addr, uint3= 2_t value) DPRINTF("SCSICSR CPUDMA\n"); /* qemu_irq_raise(s->scsi_dma); */ =20 - s->int_status |=3D 0x4000000; + s->ns->int_status |=3D 0x4000000; } else { - s->int_status &=3D ~(0x4000000); + s->ns->int_status &=3D ~(0x4000000); } if (value & SCSICSR_INTMASK) { DPRINTF("SCSICSR INTMASK\n"); @@ -533,27 +534,27 @@ static void scr_writeb(NeXTState *s, hwaddr addr, uin= t32_t value) } } =20 -static void scr_writew(NeXTState *s, hwaddr addr, uint32_t value) +static void scr_writew(NeXTPC *s, hwaddr addr, uint32_t value) { DPRINTF("BMAP Write W @ %x with %x\n", (unsigned int)addr, value); } =20 -static void scr_writel(NeXTState *s, hwaddr addr, uint32_t value) +static void scr_writel(NeXTPC *s, hwaddr addr, uint32_t value) { DPRINTF("BMAP Write L @ %x with %x\n", (unsigned int)addr, value); } =20 static uint64_t scr_readfn(void *opaque, hwaddr addr, unsigned size) { - NeXTState *ns =3D NEXT_MACHINE(opaque); + NeXTPC *s =3D NEXT_PC(opaque); =20 switch (size) { case 1: - return scr_readb(ns, addr); + return scr_readb(s, addr); case 2: - return scr_readw(ns, addr); + return scr_readw(s, addr); case 4: - return scr_readl(ns, addr); + return scr_readl(s, addr); default: g_assert_not_reached(); } @@ -562,17 +563,17 @@ static uint64_t scr_readfn(void *opaque, hwaddr addr,= unsigned size) static void scr_writefn(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - NeXTState *ns =3D NEXT_MACHINE(opaque); + NeXTPC *s =3D NEXT_PC(opaque); =20 switch (size) { case 1: - scr_writeb(ns, addr, value); + scr_writeb(s, addr, value); break; case 2: - scr_writew(ns, addr, value); + scr_writew(s, addr, value); break; case 4: - scr_writel(ns, addr, value); + scr_writel(s, addr, value); break; default: g_assert_not_reached(); @@ -886,8 +887,10 @@ static void next_pc_realize(DeviceState *dev, Error **= errp) =20 memory_region_init_io(&s->mmiomem, OBJECT(s), &mmio_ops, s, "next.mmio", 0xD0000); - + memory_region_init_io(&s->scrmem, OBJECT(s), &scr_ops, s, + "next.scr", 0x20000); sysbus_init_mmio(sbd, &s->mmiomem); + sysbus_init_mmio(sbd, &s->scrmem); } =20 static void next_pc_class_init(ObjectClass *klass, void *data) @@ -912,7 +915,6 @@ static void next_cube_init(MachineState *machine) M68kCPU *cpu; CPUM68KState *env; MemoryRegion *rom =3D g_new(MemoryRegion, 1); - MemoryRegion *scrmem =3D g_new(MemoryRegion, 1); MemoryRegion *dmamem =3D g_new(MemoryRegion, 1); MemoryRegion *bmapm1 =3D g_new(MemoryRegion, 1); MemoryRegion *bmapm2 =3D g_new(MemoryRegion, 1); @@ -956,6 +958,9 @@ static void next_cube_init(MachineState *machine) /* MMIO */ sysbus_mmio_map(SYS_BUS_DEVICE(pcdev), 0, 0x02000000); =20 + /* BMAP IO - acts as a catch-all for now */ + sysbus_mmio_map(SYS_BUS_DEVICE(pcdev), 1, 0x02100000); + /* BMAP memory */ memory_region_init_ram_shared_nomigrate(bmapm1, NULL, "next.bmapmem", = 64, true, &error_fatal); @@ -964,11 +969,6 @@ static void next_cube_init(MachineState *machine) memory_region_init_alias(bmapm2, NULL, "next.bmapmem2", bmapm1, 0x0, 6= 4); memory_region_add_subregion(sysmem, 0x820c0000, bmapm2); =20 - /* BMAP IO - acts as a catch-all for now */ - memory_region_init_io(scrmem, NULL, &scr_ops, machine, "next.scr", - 0x20000); - memory_region_add_subregion(sysmem, 0x02100000, scrmem); - /* KBD */ dev =3D qdev_new(TYPE_NEXTKBD); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610741970; cv=none; d=zohomail.com; s=zohoarc; b=Hiy+xG/QYfF/uaAATv90/M3jrFdBms88nWcIAL0QThSnq+YPewgQVHOqGSGGZUvcSM47rwTgW47A22/hwpQRl3KM+YIlPTvCjgSJfxAqlNxhnD8l4hbXsltrMZxDGC7OveQfzX0k5h35EqervQeN/yc0BiemnCmZQ1NzjMSQtTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610741970; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xR1NK3G4cM5/r+VZn7S8gsomhJPIR4MqG1vQTRIRFSE=; b=OOW1S/IivLTe6x/j/pf5H2jKCjIZIoi1Y7VHcv5mN+nhb6w1Z8FzpH316XHNlnAY4GVAnqxFq1U3I3+VnpaxAKq/4iVG+Y/nybJ+1VWNwxgIWkayGmEkZD9CsDJ9cW/3B4x8h/m2QWs7Qnvasaqhsm4iboA5RHoUXpwC/e3oNQI= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610741970284418.41247222914274; Fri, 15 Jan 2021 12:19:30 -0800 (PST) Received: from localhost ([::1]:37474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VZ8-0004PU-P3 for importer@patchew.org; Fri, 15 Jan 2021 15:19:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSD-0005qB-Qi for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:17 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VSC-0008Hd-2n for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:17 -0500 Received: by mail-wr1-x431.google.com with SMTP id q18so10507692wrn.1 for ; Fri, 15 Jan 2021 12:12:15 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xR1NK3G4cM5/r+VZn7S8gsomhJPIR4MqG1vQTRIRFSE=; b=k8k7GWO9gdySRAvMfbDETI9huEkSUaljrkNQja+5V6ctU+/lta1CIzk66Rf+AKDckG GiMCGea+ZDyZSXxzn4/WptTaVK6jHphyPdh2A+G4KxS+7Ya2hWR50VldCGuiaPOG9fRv nCcGhCe84KKXQ4igZYznpanrptkqZ0MjLlUywCrtQhnqUlZrrgSoc7PhimYCTh1WE+D2 8d0sdY7bfywhRAu1rBwJn4JHO335yfKX7gV0j36mn/Qom6rpbJ6cQgdUyeDMeYJV1/OL 41B+GXuTOxpB1MZl6o1wUtyNqcrcxU0cfpDvU+hN3PUn/LBxNHRc4ydc9lw7hi68JdLR +Wmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xR1NK3G4cM5/r+VZn7S8gsomhJPIR4MqG1vQTRIRFSE=; b=HpJly62CYIo9mVoeZZOKY/jSnPcych6J7bIObLudyaxuRV9Fk6/C4A0t1SUf+v1RkQ ovYH1yDYGqvFewhSzqDI0bQf80VFku5Y3mOTso6gFaBm8dwUUl1eNYVpYNjFVE+B69oi W1ABlUFDy58No5lYMRZjZ2iTmY44ex+Zi3qbcpA9RoBgX0oQtyLyid6x02PWK4U4UbAP Rnmt1a3yTqxGLtS+somlVfjrz0EctLbkqBxsaILyYYG5iNQWo9PcAOxzZO+8EitZRjz0 Sxn+fCdwakeL0KzcxVZmYc/rWjfnKtejqmjOIlxbaT2RfidT1djNTY0RLhLcWgFmgu2A h2bw== X-Gm-Message-State: AOAM530EwOyogiRw8hfTgDslNCOOzMYB9iSerUkfsNgRDunLFpHgFt08 Wm6WOeTyhlKAUWlfq/LxzwuBMl0rWz1vSA== X-Google-Smtp-Source: ABdhPJzgZ862bkc4g1/+SIexhykDz+T/9MPtPIbI12qOWciUVwgCyLj9rhFpToy1qh5WVtEWKJUCjA== X-Received: by 2002:adf:8285:: with SMTP id 5mr14442624wrc.289.1610741534527; Fri, 15 Jan 2021 12:12:14 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 05/11] hw/m68k/next-cube: Make next_irq take NeXTPC* as its opaque Date: Fri, 15 Jan 2021 20:12:00 +0000 Message-Id: <20210115201206.17347-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Make the next_irq function take a NeXTPC* as its opaque rather than the M68kCPU*. This will make it simpler to turn the next_irq function into a gpio input line of the NeXTPC device in the next commit. For this to work we have to pass the CPU to the NeXTPC device via a link property, in the same way we do in q800.c (and for the same reason). Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth --- hw/m68k/next-cube.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index f5575cb43b8..a9e57304e04 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -94,6 +94,8 @@ struct NeXTPC { /* Temporary until all functionality has been moved into this device */ NeXTState *ns; =20 + M68kCPU *cpu; + MemoryRegion mmiomem; MemoryRegion scrmem; =20 @@ -739,9 +741,9 @@ static const MemoryRegionOps dma_ops =3D { */ static void next_irq(void *opaque, int number, int level) { - M68kCPU *cpu =3D opaque; + NeXTPC *s =3D NEXT_PC(opaque); + M68kCPU *cpu =3D s->cpu; int shift =3D 0; - NeXTState *ns =3D NEXT_MACHINE(qdev_get_machine()); =20 /* first switch sets interupt status */ /* DPRINTF("IRQ %i\n",number); */ @@ -796,14 +798,14 @@ static void next_irq(void *opaque, int number, int le= vel) * this HAS to be wrong, the interrupt handlers in mach and together * int_status and int_mask and return if there is a hit */ - if (ns->int_mask & (1 << shift)) { + if (s->ns->int_mask & (1 << shift)) { DPRINTF("%x interrupt masked @ %x\n", 1 << shift, cpu->env.pc); /* return; */ } =20 /* second switch triggers the correct interrupt */ if (level) { - ns->int_status |=3D 1 << shift; + s->ns->int_status |=3D 1 << shift; =20 switch (number) { /* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi, clock */ @@ -832,7 +834,7 @@ static void next_irq(void *opaque, int number, int leve= l) break; } } else { - ns->int_status &=3D ~(1 << shift); + s->ns->int_status &=3D ~(1 << shift); cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD); } } @@ -847,9 +849,9 @@ static void next_serial_irq(void *opaque, int n, int le= vel) } } =20 -static void next_escc_init(M68kCPU *cpu) +static void next_escc_init(DeviceState *pcdev) { - qemu_irq *ser_irq =3D qemu_allocate_irqs(next_serial_irq, cpu, 2); + qemu_irq *ser_irq =3D qemu_allocate_irqs(next_serial_irq, pcdev, 2); DeviceState *dev; SysBusDevice *s; =20 @@ -893,6 +895,17 @@ static void next_pc_realize(DeviceState *dev, Error **= errp) sysbus_init_mmio(sbd, &s->scrmem); } =20 +/* + * If the m68k CPU implemented its inbound irq lines as GPIO lines + * rather than via the m68k_set_irq_level() function we would not need + * this cpu link property and could instead provide outbound IRQ lines + * that the board could wire up to the CPU. + */ +static Property next_pc_properties[] =3D { + DEFINE_PROP_LINK("cpu", NeXTPC, cpu, TYPE_M68K_CPU, M68kCPU *), + DEFINE_PROP_END_OF_LIST(), +}; + static void next_pc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -900,6 +913,7 @@ static void next_pc_class_init(ObjectClass *klass, void= *data) dc->desc =3D "NeXT Peripheral Controller"; dc->realize =3D next_pc_realize; dc->reset =3D next_pc_reset; + device_class_set_props(dc, next_pc_properties); /* We will add the VMState in a later commit */ } =20 @@ -938,6 +952,7 @@ static void next_cube_init(MachineState *machine) =20 /* Peripheral Controller */ pcdev =3D qdev_new(TYPE_NEXT_PC); + object_property_set_link(OBJECT(pcdev), "cpu", OBJECT(cpu), &error_abo= rt); sysbus_realize_and_unref(SYS_BUS_DEVICE(pcdev), &error_fatal); /* Temporary while we refactor this code */ NEXT_PC(pcdev)->ns =3D ns; @@ -996,7 +1011,7 @@ static void next_cube_init(MachineState *machine) } =20 /* Serial */ - next_escc_init(cpu); + next_escc_init(pcdev); =20 /* TODO: */ /* Network */ --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610741969; cv=none; d=zohomail.com; s=zohoarc; b=AbQscj9S6ThaHKvlyZlsLZu/maVCd/rkdxeOgEdH4bpxp8VjlQNNxRH1YHyxCvgCKp7Sis47+BzfShtsGFLGhDIFqW9A7Df/CxuZyBexDwV63hXPwM+fs4oNlD8nBRtV99B6nQtWHOGm66fdslvRZ6rFIUuDDeEM7dI4gMWNokM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610741969; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u5SEU2LlCzjLfCWQO/ACZ9Nq9yD70zys6hJbaEYaJA0=; b=J39USsliQDDGBjs5NR52gXrcffgyBQh6uAQPKftGk8JO3Jxnph4NspEXhKqpsaZ/mNSZ0v5zKnunNPHWyxzjS7ZrXiMh8pmcOtBWPQLeydJ0UtNnyJHncYIac0Tz2VAB7hyDIAWlp4jUbUIIPhEDU643ORVykfwM28BqPnzAfy4= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610741969604514.620985678891; Fri, 15 Jan 2021 12:19:29 -0800 (PST) Received: from localhost ([::1]:37516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VZ9-0004QR-7p for importer@patchew.org; Fri, 15 Jan 2021 15:19:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSE-0005sD-U6 for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:18 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:44867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VSD-0008IQ-6i for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:18 -0500 Received: by mail-wr1-x434.google.com with SMTP id w5so10469332wrm.11 for ; Fri, 15 Jan 2021 12:12:16 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u5SEU2LlCzjLfCWQO/ACZ9Nq9yD70zys6hJbaEYaJA0=; b=VLxgGQ3tqTzI1RfpjBdVhqOQFZrSob/M2Jc3m75dh69daPiZI8nC+Xswsle4Zy8TRj qNQkd5adzm0xKbBrBNu6i28+igaR9teOk9Uv8v8zl3UkbnNzC4lGTBmc9piMt5EzANkX xqzp0UahNt9H1MVBBOwzEDpdKdDQmTxbvUzDEqrF0hUygoupxP2PS3YQCU9j03ZFMz3X vN8JhONZ03OWvzrpon5iiqgj4A1jjE90M/8hyO/e9Qex4tRDmHki9lrV61oajUA/txvC 5iGH1H3CPO1xqvfo7MGggRomEYB3c3LhtA+HEO0XT86vq5E6sWZIhjGCcImcPjB08hxl jEtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u5SEU2LlCzjLfCWQO/ACZ9Nq9yD70zys6hJbaEYaJA0=; b=NPE4ZbIZ9pYsVFqZfElI+6vQsREzJzWWOLAkCIJ74WrOF/6V/4vxJsKX56+8ldLqCQ pG1nYRf7hQRll4v+YLgcjHjTpb5SbceNc21PTqS24Mq5i0Dr0NR8x2eobEVDhIqevW0S uAx5uoY9IspitvO6ByPkWStKPj8E6wmMxOcF/mN/fSEQ5qO0sfpbJjG0tUZi8EFGfIiu BU5dC8yp9eVwvdn2gUVuLy69IXWBRYef2KfJipanpdaCASGJVYAMhBRj6DU3jzd62ZjN B8f54ZRXHd+JILMRfGejIc6xz9bLsFdaIAeyy9ChZbSpoDiweYQn6FemTNW9fXu+MrOK quhw== X-Gm-Message-State: AOAM530ubCd1uTYc/WsJBSt7horvu9mUwW2xBt8kn+8Ex8uUGEnxVQNv M7JfIPwyP4f8CY7x8idxAWxdh8RC3defYw== X-Google-Smtp-Source: ABdhPJxZvY456k0Ic1/h7cgIZ++a3Df+K0d41MgQQRCdkwdaWkoJxoOhdjXn5M9QBLMTWDtB4inuYA== X-Received: by 2002:adf:f78e:: with SMTP id q14mr14790400wrp.320.1610741535729; Fri, 15 Jan 2021 12:12:15 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 06/11] hw/m68k/next-cube: Move int_status and int_mask to NeXTPC struct Date: Fri, 15 Jan 2021 20:12:01 +0000 Message-Id: <20210115201206.17347-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" All the code which accesses int_status and int_mask is now doing so via the NeXTPC->NeXTState indirection, so we can move these fields into the NeXTPC struct where they belong. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth --- hw/m68k/next-cube.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index a9e57304e04..6b4bcfd4b9b 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -73,9 +73,6 @@ typedef struct NextRtc { struct NeXTState { MachineState parent; =20 - uint32_t int_mask; - uint32_t int_status; - next_dma dma[10]; qemu_irq *scsi_irq; qemu_irq scsi_dma; @@ -103,6 +100,8 @@ struct NeXTPC { uint32_t scr2; uint8_t scsi_csr_1; uint8_t scsi_csr_2; + uint32_t int_mask; + uint32_t int_status; }; =20 /* Thanks to NeXT forums for this */ @@ -243,7 +242,7 @@ static void nextscr2_write(NeXTPC *s, uint32_t val, int= size) /* clear FTU */ if (rtc->value & 0x04) { rtc->status =3D rtc->status & (~0x18); - s->ns->int_status =3D s->ns->int_status & (~0x04); + s->int_status =3D s->int_status & (~0x04); } } } @@ -302,12 +301,12 @@ static uint32_t mmio_readl(NeXTPC *s, hwaddr addr) { switch (addr) { case 0x7000: - /* DPRINTF("Read INT status: %x\n", s->ns->int_status); */ - return s->ns->int_status; + /* DPRINTF("Read INT status: %x\n", s->int_status); */ + return s->int_status; =20 case 0x7800: - DPRINTF("MMIO Read INT mask: %x\n", s->ns->int_mask); - return s->ns->int_mask; + DPRINTF("MMIO Read INT mask: %x\n", s->int_mask); + return s->int_mask; =20 case 0xc000: return s->scr1; @@ -342,12 +341,12 @@ static void mmio_writel(NeXTPC *s, hwaddr addr, uint3= 2_t val) { switch (addr) { case 0x7000: - DPRINTF("INT Status old: %x new: %x\n", s->ns->int_status, val); - s->ns->int_status =3D val; + DPRINTF("INT Status old: %x new: %x\n", s->int_status, val); + s->int_status =3D val; break; case 0x7800: - DPRINTF("INT Mask old: %x new: %x\n", s->ns->int_mask, val); - s->ns->int_mask =3D val; + DPRINTF("INT Mask old: %x new: %x\n", s->int_mask, val); + s->int_mask =3D val; break; case 0xc000: DPRINTF("SCR1 Write: %x\n", val); @@ -504,9 +503,9 @@ static void scr_writeb(NeXTPC *s, hwaddr addr, uint32_t= value) DPRINTF("SCSICSR CPUDMA\n"); /* qemu_irq_raise(s->scsi_dma); */ =20 - s->ns->int_status |=3D 0x4000000; + s->int_status |=3D 0x4000000; } else { - s->ns->int_status &=3D ~(0x4000000); + s->int_status &=3D ~(0x4000000); } if (value & SCSICSR_INTMASK) { DPRINTF("SCSICSR INTMASK\n"); @@ -798,14 +797,14 @@ static void next_irq(void *opaque, int number, int le= vel) * this HAS to be wrong, the interrupt handlers in mach and together * int_status and int_mask and return if there is a hit */ - if (s->ns->int_mask & (1 << shift)) { + if (s->int_mask & (1 << shift)) { DPRINTF("%x interrupt masked @ %x\n", 1 << shift, cpu->env.pc); /* return; */ } =20 /* second switch triggers the correct interrupt */ if (level) { - s->ns->int_status |=3D 1 << shift; + s->int_status |=3D 1 << shift; =20 switch (number) { /* level 3 - floppy, kbd/mouse, power, ether rx/tx, scsi, clock */ @@ -834,7 +833,7 @@ static void next_irq(void *opaque, int number, int leve= l) break; } } else { - s->ns->int_status &=3D ~(1 << shift); + s->int_status &=3D ~(1 << shift); cpu_reset_interrupt(CPU(cpu), CPU_INTERRUPT_HARD); } } --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610741817; cv=none; d=zohomail.com; s=zohoarc; b=CKIHbPsJNfbIA6KigPXQ9Hfh9bQGZcJsACnGEkLw3NNcpdVAj7nStBbAjUhpSBRahlPcjVqHJhMCBlM3g/M+nxW0yRdn/p2vmqJNJ9TrSpQihsbOhTFovBrLmIVKA8Y7VfG/PmGI+EU6CQLRHuZj3AT9bFWLSplKVMwVCnrnuFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610741817; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5z3pjzGRytH16qZkplw8pjDFH2MUg1wej/HifHKVc/k=; b=AKlnwl5VtzNZycIFRzxgxBaRO460Yhj95GrnbEX+AszSB0Cuy8o32H1aL2fJ92ZjWNZrbbXwF+FzdUPYb0KK4UxoPbckRGjSnKvJyMXNG3LDSNT9zGFQz3N0fW+gpLiJDTPK8uW6C8U0rsvbjKg8ocCOhbeOZ5WXh947P6YFTVk= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610741817425299.636029710039; Fri, 15 Jan 2021 12:16:57 -0800 (PST) Received: from localhost ([::1]:60674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VWi-0002JP-Am for importer@patchew.org; Fri, 15 Jan 2021 15:16:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSG-0005uj-2X for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:20 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:36107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VSE-0008If-B1 for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:19 -0500 Received: by mail-wm1-x334.google.com with SMTP id v184so4429093wma.1 for ; Fri, 15 Jan 2021 12:12:17 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5z3pjzGRytH16qZkplw8pjDFH2MUg1wej/HifHKVc/k=; b=YsDn/oMyFDnaqA3IJQXcIukFZgZu1cC9UKzzR/IimgpwC7mDv3B6Tn2mh0QcYUpZaU aNZX6y2QksPBh7Abzuc1TvuzWYVF2lc3J0ovojG8mj9LOeq+KW5CItAAdQQWoLyKZ2Ls Q3xUZlbjiqCqXWV60TiSMJu+xOaDtGJQ3ISmvvqKnTqA/K7O6ZS+mlMYOQ44QhpGliqx AE2wHEwHbgkMA+174psm2Nbdfvh1Ki1exMCFLql4pNVbMPppy1SGhZ6qJmpNbg3kai9W TxPIezjvMotqhZGEof9JVt5jHf0e0xKe7c/DHaPsvCdQxWoXFsMOpjC7AqnO71isXB11 +IwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5z3pjzGRytH16qZkplw8pjDFH2MUg1wej/HifHKVc/k=; b=RqOBSVIdhWdkTSDvRb5gVZnr3ohKuF95Vm1yWjdXruqLpFlcPYbKlhtStZ4+uB2h56 7Ja2kxdUghEbjhQGHrEXXcf7W4Kf55Gev/0bdlhwmuobPLowshZ6vzmKKTnzukkdHedc Zcj/ke5Yr/75NpiNistm2HhPXNKj/+MEWBg/Sv0+2/FM2xBQhAP9+8idH5yxghYmRl++ y2+IfbYqCabHHotxMfJZxNEIgLTdl+bjF4fRbUDVJP6+3cG9cRiWHAKv9oAKKkcRcTGH fiZp4DSuHVTLaXl9+5i20DNGFeGOO4AnhjGk5K/AmjLSsUqJ9nS8g8oSGPHOU3+fLDxS v6dQ== X-Gm-Message-State: AOAM533w/7a7YcOY7Dot4VLTOXVRvp85uiIYVZf3ozKZXTrbmFAJGWtR F6nCi+CFjbt7Hu7ql5JAze0k0j5+ywNaSA== X-Google-Smtp-Source: ABdhPJywhHhOSk/78/KXTBOVpTFY7TlZHKzMdN3NAbtmHfs3lVgpjKtBBoFfRI0Cl0jaQSIm8QdFrA== X-Received: by 2002:a05:600c:21c7:: with SMTP id x7mr10108768wmj.75.1610741536803; Fri, 15 Jan 2021 12:12:16 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 07/11] hw/m68k/next-cube: Make next_irq GPIO inputs to NEXT_PC device Date: Fri, 15 Jan 2021 20:12:02 +0000 Message-Id: <20210115201206.17347-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Make the next_irq function be GPIO inputs to the NEXT_PC device, rather than a freestanding set of qemu_irq lines. This fixes a minor Coverity issue where it correctly points out the trivial memory leak of the memory allocated in the call to qemu_allocate_irqs(). Fixes: CID 1421962 Signed-off-by: Peter Maydell Acked-by: Thomas Huth --- include/hw/m68k/next-cube.h | 3 ++- hw/m68k/next-cube.c | 21 ++++----------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/include/hw/m68k/next-cube.h b/include/hw/m68k/next-cube.h index 5a56c354b8e..d38c52d540d 100644 --- a/include/hw/m68k/next-cube.h +++ b/include/hw/m68k/next-cube.h @@ -39,7 +39,8 @@ enum next_irqs { NEXT_ENRX_DMA_I, NEXT_SCSI_DMA_I, NEXT_SCC_DMA_I, - NEXT_SND_I + NEXT_SND_I, + NEXT_NUM_IRQS }; =20 #endif /* NEXT_CUBE_H */ diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 6b4bcfd4b9b..5a8fc24ed35 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -734,10 +734,6 @@ static const MemoryRegionOps dma_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -/* - * TODO: set the shift numbers as values in the enum, so the first switch - * will not be needed - */ static void next_irq(void *opaque, int number, int level) { NeXTPC *s =3D NEXT_PC(opaque); @@ -838,19 +834,8 @@ static void next_irq(void *opaque, int number, int lev= el) } } =20 -static void next_serial_irq(void *opaque, int n, int level) -{ - /* DPRINTF("SCC IRQ NUM %i\n",n); */ - if (n) { - next_irq(opaque, NEXT_SCC_DMA_I, level); - } else { - next_irq(opaque, NEXT_SCC_I, level); - } -} - static void next_escc_init(DeviceState *pcdev) { - qemu_irq *ser_irq =3D qemu_allocate_irqs(next_serial_irq, pcdev, 2); DeviceState *dev; SysBusDevice *s; =20 @@ -866,8 +851,8 @@ static void next_escc_init(DeviceState *pcdev) =20 s =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(s, &error_fatal); - sysbus_connect_irq(s, 0, ser_irq[0]); - sysbus_connect_irq(s, 1, ser_irq[1]); + sysbus_connect_irq(s, 0, qdev_get_gpio_in(pcdev, NEXT_SCC_I)); + sysbus_connect_irq(s, 1, qdev_get_gpio_in(pcdev, NEXT_SCC_DMA_I)); sysbus_mmio_map(s, 0, 0x2118000); } =20 @@ -886,6 +871,8 @@ static void next_pc_realize(DeviceState *dev, Error **e= rrp) NeXTPC *s =3D NEXT_PC(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 + qdev_init_gpio_in(dev, next_irq, NEXT_NUM_IRQS); + memory_region_init_io(&s->mmiomem, OBJECT(s), &mmio_ops, s, "next.mmio", 0xD0000); memory_region_init_io(&s->scrmem, OBJECT(s), &scr_ops, s, --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610742096; cv=none; d=zohomail.com; s=zohoarc; b=Ic1TMIdQ8LWjta+PDe5fB3JWkTkSaMiH+c1mULbUBzc2XMAl2TAzn6t0GLbKgmEbwNd4I6Gz1W1zX952AulhELt9+lKlvol3jghnpf14BwPYJ1vyPbMTppbgKP3rl6vLjPhpaknHX+DEjj0q3K6wH28EMToSKShaf3Fx+JeDjSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610742096; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s8uTdRNQNLyJc2a5BTXUw8GgoVjbscNIEvNw+cn6bTs=; b=KUyMZKTb7FRkl1R1l7Apj+qJ1JmDZ+vQaWJHR/0YrRYGamX2hm05mO0xR4xcXA+2Dlg0AVr/JYdDuO/9yp81sTkEHL3w/y08j5JvpGM0LftaxHm6wsV3nxNlYz7NcSBtF093AEP8OyPA3BA3rdn2Q9D2VqsKmMFKn6o7xC6e10A= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610742096566741.1239234903886; Fri, 15 Jan 2021 12:21:36 -0800 (PST) Received: from localhost ([::1]:41824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VbD-0006Jv-D1 for importer@patchew.org; Fri, 15 Jan 2021 15:21:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSH-0005wu-4r for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:21 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:51698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VSF-0008Jn-Dh for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:20 -0500 Received: by mail-wm1-x329.google.com with SMTP id h17so8293101wmq.1 for ; Fri, 15 Jan 2021 12:12:19 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s8uTdRNQNLyJc2a5BTXUw8GgoVjbscNIEvNw+cn6bTs=; b=b0UAPeg5328E2sC1f3S8uIpJ/iTd3H4PiyjKHe6KhhOKR+3u+emmjNieuy/IlA/+1g FRv+r0VrJ9HqMG0pknIAtCaz6XOAYe5TbMqpplv/nDred+1D2pEWz4OSyiXddCtH2mpI r8aVrh/bzuBzuYgDjEPcRQn6579poTgtojp441DdO8pXTzdcizT1zVJkYS7QhF2yfqCm 4vO0VT926FR97vhPCHDx3CeECEc1X1UNFYO0P8VEsWqAfPvR6yXK5oa70GUva05t4a9m 6fopcSMmhblN3nxZLa/D19vOFchWNMZJ2V8TjzqE+x/FC1TeI1liewOKkdMCOx5XtawZ 4hKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s8uTdRNQNLyJc2a5BTXUw8GgoVjbscNIEvNw+cn6bTs=; b=d/XVQBDMqmPaOubZtrFPtQ8UyyWtlDxko6IZU9VDxKtakTVqHkJPLfYvw8XS0eUk1K uEvwvwqYDRlZ0WIvcVXBcMH+kvFue6o7PIxk3gC2nm9FPuTpMK1KdWwoFxGxg9OPIHqH FPrphFo8LVwfHB1NWss14rAGbo35aLVnn6ORxIVDjiVEh5AEOjsK46iscTqG1XV0jXll nE3B1Vq+qxBoxa8C6gW4tapJic8I+KdIMC3QsQuTf1HXTyGZf4jdjMnaXMaXi10Bz1MS Jioh+45dph5sJBb3E4SW8S3g+kV5w0Mug4lqpSTYWhiveKdteMg3zKa6lXORIPaKE5tf Dexw== X-Gm-Message-State: AOAM533gCpb/PO764UzErvK4shAfggf3WqpiUcVjfCRvM06G9zVXTQPh N4apaLK9HRUS2/lVsxGmVLcTWfzKkbbYPQ== X-Google-Smtp-Source: ABdhPJyO/YTJ8UrLDF5ck61fx4vs+GmmCfdrthxO4O4WtxSP6GlnRxsHNzULcMEEfwwP8XBRv2j4GQ== X-Received: by 2002:a1c:2d92:: with SMTP id t140mr10529622wmt.114.1610741537840; Fri, 15 Jan 2021 12:12:17 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 08/11] hw/m68k/next-cube: Move rtc into NeXTPC struct Date: Fri, 15 Jan 2021 20:12:03 +0000 Message-Id: <20210115201206.17347-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Move the rtc into the NeXTPC struct. Since this is the last use of the 'backdoor' NextState pointer we can now remove that. Probably the RTC should be its own device at some point: in hardware there is a separate MCS1850 RTC chip connected to the Peripheral Controller via a 1-bit serial interface. That goes beyond the remit of the current refactoring, though. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth --- hw/m68k/next-cube.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 5a8fc24ed35..3c83b874c56 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -78,8 +78,6 @@ struct NeXTState { qemu_irq scsi_dma; qemu_irq scsi_reset; qemu_irq *fd_irq; - - NextRtc rtc; }; =20 #define TYPE_NEXT_PC "next-pc" @@ -88,9 +86,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(NeXTPC, NEXT_PC) struct NeXTPC { SysBusDevice parent_obj; =20 - /* Temporary until all functionality has been moved into this device */ - NeXTState *ns; - M68kCPU *cpu; =20 MemoryRegion mmiomem; @@ -102,6 +97,8 @@ struct NeXTPC { uint8_t scsi_csr_2; uint32_t int_mask; uint32_t int_status; + + NextRtc rtc; }; =20 /* Thanks to NeXT forums for this */ @@ -130,7 +127,7 @@ static void nextscr2_write(NeXTPC *s, uint32_t val, int= size) static int phase; static uint8_t old_scr2; uint8_t scr2_2; - NextRtc *rtc =3D &s->ns->rtc; + NextRtc *rtc =3D &s->rtc; =20 if (size =3D=3D 4) { scr2_2 =3D (val >> 8) & 0xFF; @@ -864,6 +861,11 @@ static void next_pc_reset(DeviceState *dev) /* 0x0000XX00 << vital bits */ s->scr1 =3D 0x00011102; s->scr2 =3D 0x00ff0c80; + + s->rtc.status =3D 0x90; + + /* Load RTC RAM - TODO: provide possibility to load contents from file= */ + memcpy(s->rtc.ram, rtc_ram2, 32); } =20 static void next_pc_realize(DeviceState *dev, Error **errp) @@ -920,7 +922,6 @@ static void next_cube_init(MachineState *machine) MemoryRegion *bmapm2 =3D g_new(MemoryRegion, 1); MemoryRegion *sysmem =3D get_system_memory(); const char *bios_name =3D machine->firmware ?: ROM_FILE; - NeXTState *ns =3D NEXT_MACHINE(machine); DeviceState *dev; DeviceState *pcdev; =20 @@ -940,13 +941,6 @@ static void next_cube_init(MachineState *machine) pcdev =3D qdev_new(TYPE_NEXT_PC); object_property_set_link(OBJECT(pcdev), "cpu", OBJECT(cpu), &error_abo= rt); sysbus_realize_and_unref(SYS_BUS_DEVICE(pcdev), &error_fatal); - /* Temporary while we refactor this code */ - NEXT_PC(pcdev)->ns =3D ns; - - ns->rtc.status =3D 0x90; - - /* Load RTC RAM - TODO: provide possibility to load contents from file= */ - memcpy(ns->rtc.ram, rtc_ram2, 32); =20 /* 64MB RAM starting at 0x04000000 */ memory_region_add_subregion(sysmem, 0x04000000, machine->ram); --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610741664; cv=none; d=zohomail.com; s=zohoarc; b=luhjZTF1sw9BJgO7wQd9D9tzmVXl/8FmFfGCb133+Y4IHk0O1VtcHT+xNjgOyKlWfGyssOK9MCu/8A5PO3UecQshXERv21RKVqAk53DyBs6AQ6YqH0hLJvr2UrOqnHQV5ohQ9NjTOHwH/OkTUyQWGgXwk2G/xV8gY8xhut0TPQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610741664; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z2/OxhZnl1+hCx4R296hZXKkrZrY01o//F5I89aw4RA=; b=LPyWPM2MJNkyt8kWCsUgVdgAWSEh17lz4lgv56CicPu9G/SjGzgUiiIOwibWOzJRlT6apf4juwvPFpEWZs0861V8pT+nFuWBKJ2DELnoLSfTBU1VxZk67ZlZH8OaDxYSeeqRYi8+hd5mFGPzizTU6f86qn5GTkIh15FDmJfSUvA= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610741664516858.6058973233901; Fri, 15 Jan 2021 12:14:24 -0800 (PST) Received: from localhost ([::1]:53254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VUF-0007el-Ac for importer@patchew.org; Fri, 15 Jan 2021 15:14:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSI-0005yW-0j for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:22 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33007) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VSG-0008KF-D2 for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:21 -0500 Received: by mail-wr1-x435.google.com with SMTP id 7so3252981wrz.0 for ; Fri, 15 Jan 2021 12:12:19 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z2/OxhZnl1+hCx4R296hZXKkrZrY01o//F5I89aw4RA=; b=EY/xswtqUbQBtCAtA5CEj9AQyaxyzJtGh7hlLoIYFANCQTSndpaoZvyGzjUymO0e/q oWUeIfVcVnsk4uNQWHXHZrpy689tuhnTO1YVKtBPyrx05md7xMvas8RkNf0lWB1VzQAD l/g7qO1BUygEG7UZelPD1C9lHCFMSeB4ySd9q26Xx1V3L3jJim6h4raw/h3db4odwYfu YmPUxT1aYdCOn/oiygQU7fxgIn/84FNudT5KhxDq5PP0SN7/7wo615aCF/pM1d+3VLqy vEh5C1qehqJNgwVDGscMWwLwpG2+Xb/HaQySuMZ6rxIf7eQMtUZo/6B7Y4Psw49W6iUv LpUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z2/OxhZnl1+hCx4R296hZXKkrZrY01o//F5I89aw4RA=; b=d2QUBsVvox5YjJACNIyOoBMdMVbHjEJa5jWNDHakHClJB6fLTdZMsOzh1JDgBarl89 4/nN2OvbOeUVseNYjqVY0Acdpd1U4oodPYkxlhGlaA5ogie2Ue//IPQK8EgBezOYoS1H 17fE7upkrYgAFPWGjL3cIExp0O5F4wRrz97S1OwCDlBV3roVeRstm4B534LgsluJRXiz RQW+oKWXDPkptO3KdLn1TUVMQdOTxSFRtmfAHD709x7usKyT+qSRkEgo8L2xhJP6AMB0 /WRzomR2fVmP8h6eJDUq6rv3bOPlEYvQFf3PsD/0nomIOU1rxM6NQR+sFnxthcNpCwav uxSg== X-Gm-Message-State: AOAM5334AZgaqHTbi448VnJS1EKhS4dfYEFK05b/AGx6AWaoLfLjNten sMAmu+s0xj28lNyVFe6InMtzIMberdF+XQ== X-Google-Smtp-Source: ABdhPJxRtFLFu1TDUyLyJhGXXufIR2/3wgxV1rp5Qwk6mD9xpIusGfKlccTmXQa+vY3tHGaFnG+4YA== X-Received: by 2002:adf:ef06:: with SMTP id e6mr14649212wro.231.1610741538862; Fri, 15 Jan 2021 12:12:18 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 09/11] hw/m68k/next-cube: Remove unused fields from NeXTState Date: Fri, 15 Jan 2021 20:12:04 +0000 Message-Id: <20210115201206.17347-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The fields scsi_irq, scsi_dma, scsi_reset and fd_irq in NeXTState are all unused, except in commented out "this should do something like this" code. Remove the unused fields. As and when the functionality that might use them is added, we can put in the correct kind of wiring (which might or might not need to be a qemu_irq, but which in any case will need to be in the NeXTPC device, not in NeXTState). Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth --- hw/m68k/next-cube.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 3c83b874c56..dd0a2a5aea0 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -74,10 +74,6 @@ struct NeXTState { MachineState parent; =20 next_dma dma[10]; - qemu_irq *scsi_irq; - qemu_irq scsi_dma; - qemu_irq scsi_reset; - qemu_irq *fd_irq; }; =20 #define TYPE_NEXT_PC "next-pc" --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610742093; cv=none; d=zohomail.com; s=zohoarc; b=V9crYbfcIIzLgO26mo4nmMywlyk6J+B3RZXpVhHw8rsbNyOrhzNYWfSPXjIifrFZ3UUdQgkE8rE49NMtv6sn8bEEbdfbtx7J5O/f2RHqKK/9NJS+Rb0eQs76pfcpHgXQlnzN+567ObvbsFF/OpvduooVDFppEinzCqp0uY562tM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610742093; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Dg8m2zopNi5seDJ3Lmhy2PyjbDdEnmQIoHpz7Tv3WJ0=; b=cQ+2CXc4CqGwDr+iXrqYGOFbJt9HEpkHB2SGxvhDwZBf1kGbRP0Fq1QbsUYkhL8DVFlO3/pLfrxY9yNY8YL4QZWMqcajWOPWR/rZXefGr1VryCWkdGkgkL+PesM6M7+LlR1rnug5+xnCrw+e8QGF+UlN82r28NZikNUhe7TEtHU= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610742093899819.1456816097053; Fri, 15 Jan 2021 12:21:33 -0800 (PST) Received: from localhost ([::1]:41720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0VbA-0006HO-QA for importer@patchew.org; Fri, 15 Jan 2021 15:21:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSJ-00061D-4n for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:23 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:39605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VSH-0008KT-G4 for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:22 -0500 Received: by mail-wr1-x42c.google.com with SMTP id c5so10489855wrp.6 for ; Fri, 15 Jan 2021 12:12:21 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dg8m2zopNi5seDJ3Lmhy2PyjbDdEnmQIoHpz7Tv3WJ0=; b=An9KiHFNFETVmRotcwHqKM+RF+JovbGf2v9i085a+6hxTkNGR6ruM83Joq8QEuWxWu qpX54O7tszG32oU6D59VDPkFQbJSb6te+bELwZwbU/LWiEAvtZ6c8RuvOHXW9Gh4q5n6 jOCCdlnqG90l2ckHRbaldMOYBPS9Z5enEYBXNefM8MfpWlHUINoELvmJ3jzfzKlChZN+ mtXMCMrJmp6gJcxhOynRbG7/aM0pTxQKaKiiffa6Noo733vwDfnTZJbm4fdjoRAbzBix IqK4515OpETRlmLloLPo+cUswdDGtTTpPw/Kqcn4JETBD3KZj1rG3m29IGSQKq+BZwKk ppPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dg8m2zopNi5seDJ3Lmhy2PyjbDdEnmQIoHpz7Tv3WJ0=; b=KK3qmDihRY2DPqA84peBdu5Kp1oIK298bA3EOCGFiFzEcZkzKPwWv+PaM3p5hC7/tO AiJtwJdbrIn2X2Cvo9b7UAJS8IfU9s9aClNO2p5cpHQrDm3iSgDBNsrx0cx21Fg0Eb+U Is4V/tXolDC68ZRfQnrImhTmZTky2EFFeIv6LqEnP6YxoG/tmdmPYssq0vS/c7+CULah laXjQM4XZpr16qGa6A0Ab6J6TcJEXwnDluERUSjZh80mg9RkBIqLxjSFigjhjjLCIBdq eRkwCRIMgt//WpOpT+GA+jATueDkm115yOsOH03Ismj2fJv9lpjUIY8jeabyKmRxt7RB Z/vw== X-Gm-Message-State: AOAM5330YEWSf0kqUXtMg3ZtOVZkLw1t5022+1z3EiKszD1W5n6vvOL4 fG23Ay/frcE8THc/pqSL75ow2q07IyLlrA== X-Google-Smtp-Source: ABdhPJwnem4bDAnPqb+sk6nhOMJK9t+ibAYGa1mO3JjTe58l5x0ULnW6E2rT2fN9POhoddLwPVVT1g== X-Received: by 2002:a5d:6d06:: with SMTP id e6mr15033769wrq.425.1610741539913; Fri, 15 Jan 2021 12:12:19 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 10/11] hw/m68k/next-cube: Add vmstate for NeXTPC device Date: Fri, 15 Jan 2021 20:12:05 +0000 Message-Id: <20210115201206.17347-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Add the vmstate for the new NeXTPC devic; this is in theory a migration compatibility break, but this machine doesn't have working migration currently anyway. Signed-off-by: Peter Maydell Acked-by: Thomas Huth --- hw/m68k/next-cube.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index dd0a2a5aea0..9eb1e31752b 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -28,6 +28,7 @@ #include "qapi/error.h" #include "ui/console.h" #include "target/m68k/cpu.h" +#include "migration/vmstate.h" =20 /* #define DEBUG_NEXT */ #ifdef DEBUG_NEXT @@ -890,6 +891,37 @@ static Property next_pc_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static const VMStateDescription next_rtc_vmstate =3D { + .name =3D "next-rtc", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT8_ARRAY(ram, NextRtc, 32), + VMSTATE_UINT8(command, NextRtc), + VMSTATE_UINT8(value, NextRtc), + VMSTATE_UINT8(status, NextRtc), + VMSTATE_UINT8(control, NextRtc), + VMSTATE_UINT8(retval, NextRtc), + VMSTATE_END_OF_LIST() + }, +}; + +static const VMStateDescription next_pc_vmstate =3D { + .name =3D "next-pc", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(scr1, NeXTPC), + VMSTATE_UINT32(scr2, NeXTPC), + VMSTATE_UINT32(int_mask, NeXTPC), + VMSTATE_UINT32(int_status, NeXTPC), + VMSTATE_UINT8(scsi_csr_1, NeXTPC), + VMSTATE_UINT8(scsi_csr_2, NeXTPC), + VMSTATE_STRUCT(rtc, NeXTPC, 0, next_rtc_vmstate, NextRtc), + VMSTATE_END_OF_LIST() + }, +}; + static void next_pc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -898,7 +930,7 @@ static void next_pc_class_init(ObjectClass *klass, void= *data) dc->realize =3D next_pc_realize; dc->reset =3D next_pc_reset; device_class_set_props(dc, next_pc_properties); - /* We will add the VMState in a later commit */ + dc->vmsd =3D &next_pc_vmstate; } =20 static const TypeInfo next_pc_info =3D { --=20 2.20.1 From nobody Fri May 10 02:34:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1610742191; cv=none; d=zohomail.com; s=zohoarc; b=Tqc9XxWWumSCOghdSahy5PEcnX02CwbuZI2GktlIn5wtanDze5fPDD+4lkEwePzD7Xei4jbdbgIAwyu0OuIOIz7PHVTChBpZX5sK0RMrUWb4LmYRUykRfSVPi7iFhf7yIWAvT8ki6gsG5UgKwBkRUtH2lS9tjQkpSUe//ljMICg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610742191; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Y0DR22hMXp9oKz60CvU6efbhqp4d7kzllxBIJtK8094=; b=G/mxQe17x1ZdO0KNGIstEIxNw81Y1WLfVkjIZXubu3X9wft0w86Jjf1y4AdElc6Vvhl+XOAWl5V6fQTst8zxqw0K0NeHMul0aSzHTVlTjgzdqqR9JvQZ3CMR5pc6r5Xn03hQiZKSe9oCy1IVSbtst3RwGOv7Dapupvsp8RgWHzU= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610742191733432.94649072924415; Fri, 15 Jan 2021 12:23:11 -0800 (PST) Received: from localhost ([::1]:45580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0Vck-0007xG-JD for importer@patchew.org; Fri, 15 Jan 2021 15:23:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0VSK-000647-Aq for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:24 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38340) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0VSI-0008LA-O4 for qemu-devel@nongnu.org; Fri, 15 Jan 2021 15:12:24 -0500 Received: by mail-wr1-x42b.google.com with SMTP id a9so7037104wrt.5 for ; Fri, 15 Jan 2021 12:12:22 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b3sm10353807wrn.70.2021.01.15.12.12.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 12:12:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y0DR22hMXp9oKz60CvU6efbhqp4d7kzllxBIJtK8094=; b=DT7xskEi+hNdftkZVEAoYyboh5nCXyGCs9u2w43qJjHrD+WDJabsw/6qNVPbLlFWT3 fR1bvq7jecuE/djvGbeE5bnqR+w+nz/BlfA2rTO6S1+bUrx9drlL+i26gaYwNWIVxhaD aZEutGci4ZFG6BKX7VcsrbrZ58LW8MQ7eBmpUmKHeaoc7JWyaVu4xO43M6Q3/UBsMM9Y F++J9Aoif36RmBTYs/TCRV+vspVR4oMWfnDhNVGNLgNnb15g/tMWscvdHgQU+Wu5k4OC b1ngdOx4hOuq/u3/7uXrm2/+cQA34AAb28BHVv2dhPriKW0L06KJc8sfvEDhlKHWfQCx WV0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y0DR22hMXp9oKz60CvU6efbhqp4d7kzllxBIJtK8094=; b=iyIn6ZK6+4Yfw3lQ0bTtPfUMHkz+ijrxsX4Ej+h3xpzP2pV/tVScMmxW/jKt4CqK+K IIZROF8n6qOymUloRlsnLQiuGOMKSKJtnKbLNM77c8R2XbzJF+styNdIS3rLwfupEF+9 UrG2+NJR3KiSjUNiKSnc7ssic3WhVndGa4pt9eZVV/ZW6ibJxpOGIm0A+qWh1uT3eAbH k0WBtZKC/b+sTOBCeGr+WF+V8qYUu5BlR7gGzgX1DspfiJizEAGli4IIh498+oy9haD4 tV2p2EpDuwyaQDoruwOuhwSlrAu6ZT3M4LhW49lJhi3oAcyl0i2opmopsI0SiaoWrx2k F7xA== X-Gm-Message-State: AOAM533pFhEJSzALNejndS4e49hw+tmuFTGW/B+4Q2A//qQbbfRbOaBm LvM18ubbg15e/YOHlwGreWml/MQipAknDA== X-Google-Smtp-Source: ABdhPJycVJBkPkEUDfRI5ClNEKsu8uRDG+dTFJSke1zGzVU67NIv37/VLWlTuJMyMEBMASFp+2UKgA== X-Received: by 2002:a5d:4987:: with SMTP id r7mr15100366wrq.352.1610741540960; Fri, 15 Jan 2021 12:12:20 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 11/11] hw/m68k/next-cube: Add missing header comment to next-cube.h Date: Fri, 15 Jan 2021 20:12:06 +0000 Message-Id: <20210115201206.17347-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115201206.17347-1-peter.maydell@linaro.org> References: <20210115201206.17347-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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: , Cc: Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The next-cube.h file is missing the usual copyright-and-license header; add it (same as the next-cube.c one). Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth --- include/hw/m68k/next-cube.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/hw/m68k/next-cube.h b/include/hw/m68k/next-cube.h index d38c52d540d..43577282d15 100644 --- a/include/hw/m68k/next-cube.h +++ b/include/hw/m68k/next-cube.h @@ -1,3 +1,13 @@ +/* + * NeXT Cube + * + * Copyright (c) 2011 Bryce Lanham + * + * This code is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, + * or (at your option) any later version. + */ =20 #ifndef NEXT_CUBE_H #define NEXT_CUBE_H --=20 2.20.1