From nobody Sun Apr 12 00:57:50 2026 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=1771521530; cv=none; d=zohomail.com; s=zohoarc; b=aij4VG8yk8V6Sz8JN+ORt9gwBH2NOn0tYnNt1bUeuamJtzkpj6PPKBYfeoJaICsXAr/PUzeuCVvsMiBXG8ugikNgOEYFtIWWUr1Lm+J4qrY5PHSVgI5LJmtzItlfHTMIy+6YSiFHyeSwQcpHKzBgpC1WTt489blqTeyGX8PPJY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521530; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2GGmWkjWz4puRqxAAWgWsdZGg7jCqrUwwLlCs/EENBI=; b=gKi10wyo/TFMuH2ERUlch47bZZI7ZUGr7a8gJe/WLqXm9y/NCT7i1GLgFWUJW2J9mPKxYFFabLrFdw3cVFPL3c2uMzXVNdKo9eGla8ghnaJkIUG2+CNSQBRN1d9KJ1l+494TC8bMu0hCWKEorbSxHgBRnvQ/Kexth5OiPWXDKdM= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521530069365.464997441293; Thu, 19 Feb 2026 09:18:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fR-0005Nt-Do; Thu, 19 Feb 2026 12:18:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fO-0005Lj-LK for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:18 -0500 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fM-0000QV-TP for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:18 -0500 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-65808d08423so1724420a12.1 for ; Thu, 19 Feb 2026 09:18:16 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65bad29d4afsm3912153a12.10.2026.02.19.09.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:11 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9F1355F877; Thu, 19 Feb 2026 17:18:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521495; x=1772126295; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2GGmWkjWz4puRqxAAWgWsdZGg7jCqrUwwLlCs/EENBI=; b=Mm3T/3uQaIKRTqZ8YcIZ5tMR8BWeZhvz8n29B86ta1/5/PBzlBnxpOzDdVDnEAhUrX SiJGO6l8/y5JmmJ6rLX5z6/7p/w/bs+Y8hJ6FqkFPpBSOBzZfNBdH0laj/9mnrUakK5w +T42Vbo+nRgBQwZCQSmdnckZoN/IV21sMETor9dbsanHGWcJE0TRRRxdVg7hY7XTlO4H KOddffcQr55MDydsL+IliL6dvovntmj9kIU+l0uFzLwhfO13gnKX//rKjiQwihIrt1Nd kPQgAezBqFI9hOc8rqcoSSa9Et8cLWzUWT4MpUU160BKy1GYYSxFZheKqisYQo3pfI2b vSnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521495; x=1772126295; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2GGmWkjWz4puRqxAAWgWsdZGg7jCqrUwwLlCs/EENBI=; b=CWT6FOwc4HSwPtzZ+2rqyEl66kNGGG7uxvZZYg8CMA5Vd4+0PpULE6YYyCx/6RHBEX vEY03ZUYn4z8iNqlauFC6WvCJ4Zv6gdZ4Og4ni6nG8jow0M06RQXK5+DgYqIIATQHr1R EGUNZ25KtbUTNyKCMl9wHkzu6nubYkSuITcUnOYKzNnFrgoyqvngUEGONb7UJk4mtNHu 4bs7ht9ZzpLrR13BQ/TxXP+b67VJSVPQXchnhrjRWvxdkS/EEOCA1ByDwh+k6cwngRFR nl/ePBhqwjGi6/jBcbdkVXjBG9znP074itkeRVpDWiM85/tNiypK8aIqbxqMwZ0rghFE ezTA== X-Gm-Message-State: AOJu0Yz1mZCYvSdvFmihQXR88b1Mmtj7sbdb1yaMEKRAU+BX0cKg9rGT YSWf1F+5mBwr09X3seQkZfivN3GXIUHQIXPJCXz4IARz/jnNn0yZNcL3It1ohg5yvgY= X-Gm-Gg: AZuq6aKpPc8SzXKjfgDBGFB4jny0kCk3XTwNQedKo1ZvwCC0/hgsYLONe5vqdS9R4/3 +hrZOtbz9RdVV5CruBtZsRQSLzY/F6yDxxZytOPZKTbK9XaYjNzs2Jlpu358sqS30FQvKkh0ry2 zw0yR9+1/pc0Q5AYC2WmlIMeLaF6ZwoBsLYVb6Iw37Cd6s4431r7sjcJaeH31MnuyvSsCxH3ymz CzBm2JPmN56uVamA3+0NCG7ufiRzN0kDq8R6Fit8gC+xV0RMY+O+WDRxFE+n6Qvi0YVMAphYXGy V2n6siOrhQy0Z340u8J23Pn3GU47k+5GiNobJ1pG4QUNCvouiFJAmbVlZOuKvR2f2cUW+jpkQLI 0ZxF0HdQt6ca4vnBwHCOMqeB0pS2VsNjyZe455RgUwhAyc4SgOtiNjHxWm/mwONT7O6OoH5lK60 BWAyc6lDk23u8M0RCRgqPPc/4= X-Received: by 2002:a05:6402:5186:b0:659:5c63:e0e0 with SMTP id 4fb4d7f45d1cf-65c76a24826mr3305965a12.24.1771521495125; Thu, 19 Feb 2026 09:18:15 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 01/14] target/m68k: clean-up includes in cpu.c Date: Thu, 19 Feb 2026 17:17:57 +0000 Message-ID: <20260219171810.602667-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521532616154100 We don't need translation-block.h as the TB flags are local and the only bits needed come from cpu-ops.h. The vmstate is a system only concerns so we can guard against including it for linux-user. Finally tidy up the order to keep things together with the local cpu.h kept at the end. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Reviewed-by: Thomas Huth --- target/m68k/cpu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index c721a23b966..d849a4a90fc 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -19,12 +19,15 @@ */ =20 #include "qemu/osdep.h" +#include "accel/tcg/cpu-ops.h" +#include "fpu/softfloat.h" #include "qapi/error.h" -#include "cpu.h" + +#ifndef CONFIG_USER_ONLY #include "migration/vmstate.h" -#include "fpu/softfloat.h" -#include "exec/translation-block.h" -#include "accel/tcg/cpu-ops.h" +#endif + +#include "cpu.h" =20 static void m68k_cpu_set_pc(CPUState *cs, vaddr value) { --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521530; cv=none; d=zohomail.com; s=zohoarc; b=g4Ov1mx162LxuehpBN3pWnqi57vhnqdD+eJWEwcukmMI4keRnN/6vpcNHJ3iqUstlIF3/OLO6P9b+6IFfER6OBQu9mh/Em1GxmQ3sk5MMZFawTcgbBI4WG7FfNvDcCN7gPO3es+mAAYbBwf6jsenCBJhfQ2FMLZsMGjIny5iCsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521530; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PctGYd5Mfdikoz9PktEn3l1PiB58v2keUC2KBTjncYk=; b=hfOwsaD6V+TrlVprwcCZqzama02zhiG1QQ0RVmwG6nf7g07SF63OLnQm22zvJfXMeqiMO3btu2XucMDaNiei0ZaU9+odRsK4I1P4fazowj0OOg6L4nnaULi4fvgPeBLQg7TTWbjXSS0ooxA/FeMhZOkXj05RZGl+7AAFTfMATOU= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521529980145.72556917908912; Thu, 19 Feb 2026 09:18:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fO-0005Lf-GQ; Thu, 19 Feb 2026 12:18:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fM-0005Kk-38 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:16 -0500 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fK-0000Py-F2 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:15 -0500 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-65be78011c8so1553011a12.3 for ; Thu, 19 Feb 2026 09:18:14 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8fc735e5a6sm597992366b.1.2026.02.19.09.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:11 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B417D5F8A0; Thu, 19 Feb 2026 17:18:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521493; x=1772126293; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PctGYd5Mfdikoz9PktEn3l1PiB58v2keUC2KBTjncYk=; b=n35egehwbG748bnECAXwCMMsqrAbn8dFTPDqOt0RQgqHCcLgyJScqh6n1CeYD781j+ tJg17l0OR5+whzZHoVrXXJrb5nKs+jfi4Zy8iaX34f2yAhEeeXwGKC7Ccr3010eG0CAF syWsa0QEjLnQpGeIA5WiFl5U3IgOqMxNqVvyWI2WYB+xMhDhYEhQ6lfKnnuzK5P1Z9en tj6Rkwp78Lo3Jhz+CPIpNxG5hikZkXDr9a8IDn1NMFb/TdyDBnPwL7NGcLt5xD/FAwpn ZHcR+pkiHe3cdCM0hbOBBkC6/7SeIpuDH87+OK5sK9yY7dsD9u+uIfBcYvGh6X9Un13+ Kxjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521493; x=1772126293; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PctGYd5Mfdikoz9PktEn3l1PiB58v2keUC2KBTjncYk=; b=Ld2US6udC3FUFmlyWKyYz7JENpFPNeqzthaTAHDF/yt3QUbxZPGegByvGZlFTOG04s AbWSF9RYZCvJDBjaG19xzcPIYeyl2lGODaadUnUDjFHW5AN5nRTFPfGg82ICr2/0GFAW 40lfE1PZafKFtUfTWhfKHY2AAzJl7vnYjgQzV7iPdvPNAq2IOUieuYeytzzQo0yYikUr mlCIm1ctO3O8kAqX6VMlYAaesGn46WbRQnMkjQ0XBUoFfbxX38c9CADIQyf5ZyDT8EnW /G20lwMf1G75AXoL7h3DiLXJxLYS5jfiKL15sm9HIj6v69hFw69MK+p7NNKxuNVyZXll COLQ== X-Gm-Message-State: AOJu0YyGpMSgkOFNwDTiI9PVnKLKb5vkwOzvRKJWPjSw/Oq3LS3ODfJb 2xC71QHU85E1RMV+9VxREWz+ZUmwpDZ6H5LiGfQCwug/7baHvlqJbKmMYNF2WWghMq8= X-Gm-Gg: AZuq6aI8KhblDLSfIUqPmEeb/Xb6Byx7uKndmy2hQF/y9itIhxhXE8Q3QhNZyDWz0gs 7u/xJ5UCsNeBuA8qF7XhTJlV9Rnl1qkPSRcaGTNDFGnwoD0VTuNWQ3QiUxyKkyP70zBzFR3A22p JeAZe5abywAM+I+9X6Z2kmno6Sgk6OcW/+RGLejmFLi0O9XHCRnG1RStwJ5EICOncTAiayJgYSQ w8hIMrsHBcK/0li7heiUO1NHJ9XdnCcx6TXtFCWUNCfNxw0V5n30DJRmNRrEafLJ+J4XLfNaTUQ X8dNFi9ezkARmpePkjm3cxieL5jqzix/wCYldIfLkTSuPYYHSmanJyKtZHJwkjzPSrzs+QoDlst hQd8elkm4+0WopGVwBmpX26WlMHIIZ/qKT8ySnfLymB6YOASJTLEFjLZZFkCaJzg8D8xaUftJwk RCvDGBwxbvEVUYcu+y+USdnHo= X-Received: by 2002:a17:907:980a:b0:b84:1fc7:944f with SMTP id a640c23a62f3a-b8face4d5c1mr1161789166b.45.1771521492516; Thu, 19 Feb 2026 09:18:12 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 02/14] target/m68k: initialise pc/sp vector during reset Date: Thu, 19 Feb 2026 17:17:58 +0000 Message-ID: <20260219171810.602667-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::529; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x529.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521532637154100 All 68k chips should be able to follow the architectural behaviour on reset which is to load the initial sp/pc from the first 8 bytes of the address space. To avoid any potential issues with un-reset memory controllers we punt the final setting of the register to the exit phase when everything else is guaranteed to have been through the hold phase. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier Reviewed-by: Thomas Huth --- target/m68k/cpu.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index d849a4a90fc..0dce8ef282e 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -25,6 +25,7 @@ =20 #ifndef CONFIG_USER_ONLY #include "migration/vmstate.h" +#include "system/memory.h" #endif =20 #include "cpu.h" @@ -174,9 +175,25 @@ static void m68k_cpu_reset_hold(Object *obj, ResetType= type) } cpu_m68k_set_fpcr(env, 0); env->fpsr =3D 0; +} =20 - /* TODO: We should set PC from the interrupt vector. */ - env->pc =3D 0; +/* + * We defer the final setting of the PC to the exit phase to ensure + * if any memory controllers need to be reset they are before we read + * the initial reset vector. This is a NOP for user-mode which will + * set the PC in init_main_thread() after the CPU is reset. + */ +static void m68k_cpu_reset_exit(Object *obj, ResetType type) +{ +#ifndef CONFIG_USER_ONLY + CPUState *cs =3D CPU(obj); + CPUM68KState *env =3D cpu_env(cs); + + env->aregs[7] =3D address_space_ldl_be(cs->as, 0, + MEMTXATTRS_UNSPECIFIED, NULL); + env->pc =3D address_space_ldl_be(cs->as, 4, + MEMTXATTRS_UNSPECIFIED, NULL); +#endif } =20 static void m68k_cpu_disas_set_info(const CPUState *cs, disassemble_info *= info) @@ -396,7 +413,6 @@ static void m68k_cpu_realizefn(DeviceState *dev, Error = **errp) =20 m68k_cpu_init_gdb(cpu); =20 - cpu_reset(cs); qemu_init_vcpu(cs); =20 mcc->parent_realize(dev, errp); @@ -641,7 +657,8 @@ static void m68k_cpu_class_init(ObjectClass *c, const v= oid *data) =20 device_class_set_parent_realize(dc, m68k_cpu_realizefn, &mcc->parent_realize); - resettable_class_set_parent_phases(rc, NULL, m68k_cpu_reset_hold, NULL, + resettable_class_set_parent_phases(rc, NULL, + m68k_cpu_reset_hold, m68k_cpu_reset= _exit, &mcc->parent_phases); =20 cc->class_by_name =3D m68k_cpu_class_by_name; --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521609; cv=none; d=zohomail.com; s=zohoarc; b=nqFIWFv38hd+czG7/hDb3gUFunWbQf+rG2vJnVmxYuYXK1sYr58z66n8q2jmMlKtbXha333NMTGFX4Jxc5xVth4UaHNVGMF0C6Vt0Pwvhmy/ZycDS509VbR7vtdBGfiALDUOSf0xrNJkelIRW5AAyREU5PYwNPlFAjL34X/Gxmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521609; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SoUGojlUBFbeTt19n+1NScOu+57mMHlZ25AsG3U0eCQ=; b=MEB5gK6r81bfnnS1f5CRHtTzQuj/U3WuJf3EqWsmoIROiEMRzPC2T+U9mtOoIPhydUT0V56DId7036yPi0TvjW4JJAFWVnvHwxQxwL9uUmF4NEDYsXHkkQftHOuyAYvR3ttosnaCmOi3K5VqZgGvcyxWlWBidpxjKFX+KkYaqvw= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521609218239.08990581637568; Thu, 19 Feb 2026 09:20:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fW-0005Rq-SN; Thu, 19 Feb 2026 12:18:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fN-0005L1-H2 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:17 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fL-0000QB-BI for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:17 -0500 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-b8f97c626aaso163088066b.2 for ; Thu, 19 Feb 2026 09:18:14 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8fc735d516sm596445866b.5.2026.02.19.09.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:11 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id CA2B35F8A4; Thu, 19 Feb 2026 17:18:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521494; x=1772126294; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SoUGojlUBFbeTt19n+1NScOu+57mMHlZ25AsG3U0eCQ=; b=hO80TEESVkCxnoCOw4FWUWV3iI8z4zYFjRbfbQYiIP77CSqkqUavlS5F+emDaDHXsJ tcw1B7VSESyIh0oykHPYlHLPvBRtFQWxHHrat6EG/4/nO6H1BnUimoG1bkl9xfJBsADn M0wKxMiT0Ude8waNIrNIg9z7XMQBtQ4qRkE9BqLSUVOGlRFPnS7GVTLCKUUAU3pOcLxd PMLB/zY5d+VhCeAf/AMbv6GxmqA48n33LkHI5Dtm0uRnfxtj0bTw3UyRT8djDCyyEqXc TW9sSH6Ajv79CXHEQbezmuGoJwiL8BWAzjOs7f6+TaSPfQxoPpxguk72o5WBS0QMIlAC oOFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521494; x=1772126294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SoUGojlUBFbeTt19n+1NScOu+57mMHlZ25AsG3U0eCQ=; b=IgoaRgAnE3/aaOWT1KnBBuzBT0i/4tU0MO16l5d+AD7fWGEIyFIg4zfAKS54OnPipP ez0pBQ7vILVomCosGy65kIqxMi4jS63n7sVwEdSfikRtakISuJNSw5/u7ZQdmReQEmij G5Lqdw2CmbeMEmrYPxul9IDQCCxfICiBXpu9wDvev86XVAzc/I7H9Czz/12XUM5Q1kRs P8gy93bQeYkVVLsIJNxsOYVnzQPpeuE7h5xLAewtjW+aAxk8kH1xmBNDeT/qxEP1gnei Q4JJN9hULuS3uvdrOhxBBK45v1v4rZLONQD6MWetTfuV/UfNuKmeBUQnbw77Dd0ypIop 6j3w== X-Gm-Message-State: AOJu0Ywc1ExqNgRyAPHCn9pyYKioV6F65vvGdJEH90BByM5jSn4KJNne beOEQWAnmRx0pXhRcDO+OSetYzHUt9S1JrMZLfoGzHyjGrLqPwrnrxIe2TBC/D2gmQU= X-Gm-Gg: AZuq6aI7Mk2GXcuc9HJ0czwWpmklq8B1tA2jbwOOHWE+VinIxxczSO5yKBy8W5iXy7d vLr3GtBzhPVMMyof7eQlXqpY1CQ2lpYZnrHQ2WRFyj4uLbRUr20f6KNG9b4g2N5zbiJX9kVDhWh 11U0u3N2ofEf07TKKSB/yjPanGGEHBfPfSQy7z5fxc53cg89GTVdWdslA4DRlewm6D0DRgi3iaN o2EIHQchDfEilJyucZq17/zAukSJEg38yMAbpGVvqtVb5XObBtx9Qy+ZoN8T/a17x+9T+o58waD Kc1cfg+ydDSPz/wzI9GQDgTcFbwrNEQMgxoLpwFQQtvTm0dHLLUHDBtQjoUOsouQCQMK4DGGN2o ycM+RbQFHFwH0hixLqiE3Es2Yny6vbO1bBm41RjjI/v8rNCb0bnrCa6k3FWY7cCBBhcVo7S0ykQ 03IHvjJm554Y8OsbHYxJ1QI+k= X-Received: by 2002:a17:907:25c1:b0:b87:efa:8786 with SMTP id a640c23a62f3a-b904deacd46mr211257966b.55.1771521493625; Thu, 19 Feb 2026 09:18:13 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 03/14] hw/m68k: transition virt machine to multi-phase reset Date: Thu, 19 Feb 2026 17:17:59 +0000 Message-ID: <20260219171810.602667-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521610893154100 We don't need to re-create the architectural reset behaviour now it is handled in the core m68k CPU reset code. We do however need to add support for direct kernel booting so we stash that value in env->direct_kernel_boot_pc and enhance m68k_cpu_reset_exit() to use it if set. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- v2 - re-write to use proper 3-phase logic, so dropped all tags - favour cpu_reset over resettable_reset(cs) --- target/m68k/cpu.h | 2 ++ hw/m68k/virt.c | 34 ++++++++++------------------------ target/m68k/cpu.c | 5 +++++ 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 7911ab9de30..d3b604689ab 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -155,6 +155,8 @@ typedef struct CPUArchState { =20 /* Fields from here on are preserved across CPU reset. */ uint64_t features; + /* Override the normal reset vector with a direct kernel boot */ + uint32_t direct_kernel_boot_pc; } CPUM68KState; =20 /* diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index e67900c727d..b2e651ebcfd 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -87,23 +87,6 @@ #define VIRT_VIRTIO_MMIO_BASE 0xff010000 /* MMIO: 0xff010000 - 0xff01f= fff */ #define VIRT_VIRTIO_IRQ_BASE PIC_IRQ(2, 1) /* PIC: 2, 3, 4, 5, IRQ: ALL = */ =20 -typedef struct { - M68kCPU *cpu; - hwaddr initial_pc; - hwaddr initial_stack; -} ResetInfo; - -static void main_cpu_reset(void *opaque) -{ - ResetInfo *reset_info =3D opaque; - M68kCPU *cpu =3D reset_info->cpu; - CPUState *cs =3D CPU(cpu); - - cpu_reset(cs); - cpu->env.aregs[7] =3D reset_info->initial_stack; - cpu->env.pc =3D reset_info->initial_pc; -} - static void rerandomize_rng_seed(void *opaque) { struct bi_record *rng_seed =3D opaque; @@ -111,6 +94,14 @@ static void rerandomize_rng_seed(void *opaque) be16_to_cpu(*(uint16_t *)rng_seed->data)); } =20 +static void virt_machine_reset(MachineState *ms, ResetType type) +{ + CPUState *cs =3D first_cpu; + + qemu_devices_reset(type); + cpu_reset(cs); +} + static void virt_init(MachineState *machine) { M68kCPU *cpu =3D NULL; @@ -129,7 +120,6 @@ static void virt_init(MachineState *machine) SysBusDevice *sysbus; hwaddr io_base; int i; - ResetInfo *reset_info; uint8_t rng_seed[32]; =20 if (ram_size > 3399672 * KiB) { @@ -142,14 +132,9 @@ static void virt_init(MachineState *machine) exit(1); } =20 - reset_info =3D g_new0(ResetInfo, 1); - /* init CPUs */ cpu =3D M68K_CPU(cpu_create(machine->cpu_type)); =20 - reset_info->cpu =3D cpu; - qemu_register_reset(main_cpu_reset, reset_info); - /* RAM */ memory_region_add_subregion(get_system_memory(), 0, machine->ram); =20 @@ -235,7 +220,7 @@ static void virt_init(MachineState *machine) error_report("could not load kernel '%s'", kernel_filename); exit(1); } - reset_info->initial_pc =3D elf_entry; + cpu->env.direct_kernel_boot_pc =3D elf_entry; parameters_base =3D (high + 1) & ~1; param_ptr =3D param_blob; =20 @@ -315,6 +300,7 @@ static void virt_machine_class_init(ObjectClass *oc, co= nst void *data) MachineClass *mc =3D MACHINE_CLASS(oc); mc->desc =3D "QEMU M68K Virtual Machine"; mc->init =3D virt_init; + mc->reset =3D virt_machine_reset; mc->default_cpu_type =3D M68K_CPU_TYPE_NAME("m68040"); mc->max_cpus =3D 1; mc->no_floppy =3D 1; diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 0dce8ef282e..71393b9fa19 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -193,6 +193,11 @@ static void m68k_cpu_reset_exit(Object *obj, ResetType= type) MEMTXATTRS_UNSPECIFIED, NULL); env->pc =3D address_space_ldl_be(cs->as, 4, MEMTXATTRS_UNSPECIFIED, NULL); + + /* some machine models support direct kernel boot */ + if (env->direct_kernel_boot_pc) { + env->pc =3D env->direct_kernel_boot_pc; + } #endif } =20 --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521632; cv=none; d=zohomail.com; s=zohoarc; b=jtELjIUUqZsnwvTA9RVmwSETOMEaAHKw/HYNhWMZFNGcf4bj8xK0NRIBERnYeizpGwZWaP2WtPgSt05gGqcrWL5pZci4SRpRhiKtVEjQm/Fidaau4k3bnOg/lQYRHRyC1TOrC60ZaFmZfOWmzw2AFRv+KahhzAu6yx0Ll9jjabc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521632; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tmInN0JteBeMKRB6GTa7UJFQ9ygY8v6TAwibYQDcB7c=; b=AtHBSdzquPdeM9DTzYJnp5DrXK5omIP+qsUls+I6udf0OpJ+w8koUwD9qnNAJLraMOSJVP32UjX9xkKdkMn4n779JlT9Ry8NNw+yAL5RwCGD+y5VLUQK1Jp4si3mZWnY69SnsA5xQt7AuH1FFwrot8JU7LShlhWb1NSAza+3ii4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17715216320781.5922139337698127; Thu, 19 Feb 2026 09:20:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fW-0005Rr-SP; Thu, 19 Feb 2026 12:18:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fO-0005Li-L5 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:18 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fL-0000QG-Ty for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:18 -0500 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-65baa72399fso1622977a12.0 for ; Thu, 19 Feb 2026 09:18:15 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8fc7385f5dsm591973166b.20.2026.02.19.09.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:11 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DCF205F8BA; Thu, 19 Feb 2026 17:18:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521494; x=1772126294; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tmInN0JteBeMKRB6GTa7UJFQ9ygY8v6TAwibYQDcB7c=; b=gNdPaKEmVv1lmFM13V7qEEktc0Kj9TrTuGt/Z2N4p8CGjCPQ33/JVdyf+KVVT86/4g P8gYPIyrBvH6JkkgrD78URmSEQJsVlH+b3BfDpwME35PlA/fI+eb2j+kdil945/Hp5/M xp78io6n1X9HMNBad1bCWCiLYhh+RJLVPtU66CdpFesTt2hlHp82G/cv6e8vQ2SGA5kH 9i0OY8jy3j5zZ3ZGzRUuxy9sZNrOAYUcNPjzxa4NWdZzshEW/jytIMTzu9Vaz/srq8CT TfxwwS7BH9st1EHKwSAlErxkvn73QLWRcdjJQWJFc2O9inMvr4y+vvW1f5M+SdV9ioWs H8VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521494; x=1772126294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tmInN0JteBeMKRB6GTa7UJFQ9ygY8v6TAwibYQDcB7c=; b=GcaAclI90WMqu30DRv332YqBsp2zeNXYkpGfUFn+QmWkOwq3XfHP/tU8kfeYdWjFYP VYxB1RK9wBpOmFRpDaPJGRM9MkYOMm/hPaNv+gMv5SBgl+0BCwoe1L3xA8+kUoZ7nuqh MCcJESgCs8qIwfIcseQs68ynXfO4YIasA6Dm8rQbqoH9NBMizz74Os1SlAc/CUhacJra o7ChJKMWIsYxuSiUKM7JfULhvMbn1Bl9JT1Z5lcT24vL9rF1f4osAvXghdxsFIFACjIN wDWJ5THdFoqLyv0AdsfWtgx50RotHH/Xa3FtfDbHktDpdoq11T8UOgpPh5/8HDLz6FWA wZuw== X-Gm-Message-State: AOJu0YyJ+QRHqu1uqEe29EBMhmY+xeDcKH/F789jUXJrh5XJNO/xCK0e cMiZPF2ZdymiP/tUKyzPEmUrJAbtrwRcNLREdVt8T02P8Q7Yu/Zm9T/PRUnubpkEfm6Hh3ha16Y NZM7g X-Gm-Gg: AZuq6aIdMKVIJonlFYuzrIoxf3I5I7kWkDmXN/h2y0FOH3CdeIpKvmqfXxl4i3DLR9p 8jVD/buj00SXn5uKP2AWSD8n+0VNHB3KrB4CKjlX7edwnOVfBXjRUqePI1mZ9gyAPZ3DrW+oVY0 zVbbdR8NhjKqMUCHVCLJeYUnkc2qxJsttouB4XkiUe4t627ijKAXJ90tSe1HoweXkk76lm4lhAD tTWkx72QUwyKNbOYtwdeTGXn2HcZjZJLEIYr+Q8XTprx2Fhl+sgkM8aZSvpT1airS/J/Gqc8TpK IDGC+DGF0zeE3r70ab79xitdjZTjWiddUi/+embfswQGxr3dEA0Tc+5L72PVPPlqrLs4gcD27/M 8TaWdCoD8tJ/PRxXr3qOpR2T8KgINYG+XgpPmdWwkqoF8zWW+QHZQOSQNfKv3ItY/rWl1yl4iEm keTRwif7U45ZP+xVpCkOdTcL8= X-Received: by 2002:a17:907:728d:b0:b88:47b4:7626 with SMTP id a640c23a62f3a-b8fc3b66536mr1139397566b.27.1771521494227; Thu, 19 Feb 2026 09:18:14 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 04/14] hw/m68k: update nextcube to 3-phase reset Date: Thu, 19 Feb 2026 17:18:00 +0000 Message-ID: <20260219171810.602667-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521633285158500 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- v2 - re-written, tags dropped. - favour cpu_reset over resettable_reset(cs) --- hw/m68k/next-cube.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 26177c7b867..b10129dd9d7 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -16,6 +16,7 @@ #include "exec/cpu-interrupt.h" #include "system/system.h" #include "system/qtest.h" +#include "system/reset.h" #include "hw/core/irq.h" #include "hw/m68k/next-cube.h" #include "hw/core/boards.h" @@ -1249,6 +1250,19 @@ static const TypeInfo next_pc_info =3D { .class_init =3D next_pc_class_init, }; =20 +static void next_cube_reset(MachineState *ms, ResetType type) +{ + CPUState *cs =3D first_cpu; + M68kCPU *cpu =3D M68K_CPU(cs); + + qemu_devices_reset(type); + cpu_reset(cs); + + /* Initialize CPU registers. */ + cpu->env.vbr =3D 0; + cpu->env.sr =3D 0x2700; +} + static void next_cube_init(MachineState *machine) { NeXTState *m =3D NEXT_MACHINE(machine); @@ -1266,10 +1280,6 @@ static void next_cube_init(MachineState *machine) } env =3D &cpu->env; =20 - /* Initialize CPU registers. */ - env->vbr =3D 0; - env->sr =3D 0x2700; - /* Peripheral Controller */ pcdev =3D qdev_new(TYPE_NEXT_PC); object_property_set_link(OBJECT(pcdev), "cpu", OBJECT(cpu), &error_abo= rt); @@ -1335,8 +1345,8 @@ static void next_cube_init(MachineState *machine) /* Initial PC is always at offset 4 in firmware binaries */ ptr =3D rom_ptr(0x01000004, 4); g_assert(ptr !=3D NULL); - env->pc =3D ldl_be_p(ptr); - if (env->pc >=3D 0x01020000) { + cpu->env.direct_kernel_boot_pc =3D ldl_be_p(ptr); + if (env->direct_kernel_boot_pc >=3D 0x01020000) { error_report("'%s' does not seem to be a valid firmware image.= ", bios_name); exit(1); @@ -1355,6 +1365,7 @@ static void next_machine_class_init(ObjectClass *oc, = const void *data) =20 mc->desc =3D "NeXT Cube"; mc->init =3D next_cube_init; + mc->reset =3D next_cube_reset; mc->block_default_type =3D IF_SCSI; mc->default_ram_size =3D RAM_SIZE; mc->default_ram_id =3D "next.ram"; --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521657; cv=none; d=zohomail.com; s=zohoarc; b=VQ25taVyhEtGNMqEcdQ/0Y2kSuii3Sd700aYn8/Vu6rPVMiJh+TngMYYztLaWiGaPaX75Pw+XZ8XR5qSeSvEO1oE3M5pe+qyyGL0YVycLkoQfHJWVFtfxfiD7nacnpwmZ7ynrS4wwdX2+fKzIWo1AcY20cv61H0akQwBa7PAUeU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521657; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HNFbszyLV6dYFrNFoEy5UENmIo/yFnvFimQs2acqFY8=; b=NjiLY8J8y+AdeH1GHvMWcGTu/t6h5giRlv3WO0K+r/N75mcO8Xab7/bab6bLMoOhTsoQ/lpqPdo2Bm8xcz9l/N9Vpj8cWnFGs4dJaCGDaBwQT1OiMcAm0xp1yqBnWPMxvjUX4ueCKUMdUnvCkeMFZx9vtgm63YHjbiFR0ulkK2I= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177152165736081.68617112873062; Thu, 19 Feb 2026 09:20:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fZ-0005To-RT; Thu, 19 Feb 2026 12:18:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fR-0005OG-Ra for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:21 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fQ-0000SF-2v for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:21 -0500 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-658b6757f7fso2313542a12.1 for ; Thu, 19 Feb 2026 09:18:19 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65bad3f137dsm3928037a12.27.2026.02.19.09.18.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:15 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id F41195F8BC; Thu, 19 Feb 2026 17:18:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521498; x=1772126298; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HNFbszyLV6dYFrNFoEy5UENmIo/yFnvFimQs2acqFY8=; b=ZjRjmN8VxoEu0dbM5Mrh80oxgVJ1k0pfA0T3kX1VniDbUU4XRIuP4dX9l/BYPrq+sH 3jrtjc2FbREejBWDdYKEvmYnReJYxJvatMpYB39NubutvgOelw5j8CKvLyCRbOfseuEs pQRPZZ2z5OPt/YqgAXt36sFSBLr82zTkCcPNak3beY/e/fSLDIxfPhghFl9ep5lz9LaB mlUyi+dRN2ninMukpVm7Lw1hRT7keiF8PupixLoG/NA0icuEyP/vsegElJ0nHx8BKvjc Pn3gE3jryP+DQ+gsKFXS96w8XPW/KbuKcpzzx8XmYZ0Rl1fXeeUX+DU65xpP7eaBIrY0 uLpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521498; x=1772126298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HNFbszyLV6dYFrNFoEy5UENmIo/yFnvFimQs2acqFY8=; b=HE0PO4Hf9fJBRH0eHfuVzysQPNSaYZR6nllp/xlq9/4+XAAbA4mibWGH+Aq7v0c8pT vYb9jLBLRNEBWIctiZa+Dx/6Vsv9HzXluMBNp5yPf9yPK81GLQyP7BC/QlOGbc9FLgH1 80kGNVnrCe+2HthaRZB6O2MFfQzVAYqLISME7IoW5P1BFpY97aSfAz7Ec/d01++7fSRi UcLT1ZYdvozkkCsk2VCKfxVGNC720NjWr/YSEXE+U6Wax+jdGSl3mf6Parf3Xbat5/tl y3Phfz2Lb/S6/+ATOfJ738xeka6jTV0MuZeZy24JFYvfqBZneIPcomNOLuk6AJ7CmD/O HRag== X-Gm-Message-State: AOJu0YwMzZF7iaqtOqO1pSecRgrW9DuE0/dD2Xu64RXX4vwWh48TUp87 triJrHQuEgf0MP3smqIcwrIWl+3bScPY5uSSx7GBnrtMiE+g2H/6oESReV7tVEKTwZs= X-Gm-Gg: AZuq6aJkvGHGJ8PP/T7h0P8HVFxqef27Ikx0A5Rh2E4iixaRCzS8jm/+Y00zjJ0wMxc O8ZxNr+4aRukMykvb4+woKTGnl/Z705K1oc1TsnxUShNKD6pz/UNmNo96k6PhCreTbDYkrlfTbL ozBahSUEFIdVKtsE40B0AzhWtD5GojqMl9nDNvU8yP4mMym3+6h64Y3hqduTqtZ1wZeRSmiMjUq aINNY3E0QQA9ORwfIQ2DhvyUn4k4vVuwesg7Fku6t8RdARwnvuSQTFtkbIEjRPD28mo8+qxK0ns jhM4wUwBorPBxcw5ADmLwnKvb+Hx+5zeDwFlSa3hGq7favwmtMOi4HKmA5Zo/g8zXchmgbyp6Qq 7ohMa5Z7Fg3AN/qQuBByZwhzmoF4dW3tKGJUHcbUBvMo1Z28kRtsBzgXbJ8h1rwrnCMgjIFDujS Sm/gkwvSEtQFAgym/kSN79X+PP9BtzSyMXrw== X-Received: by 2002:a05:6402:5207:b0:658:b029:9e50 with SMTP id 4fb4d7f45d1cf-65e4f76df95mr1538580a12.12.1771521498318; Thu, 19 Feb 2026 09:18:18 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 05/14] hw/m68k: update mcf5208evb to 3-phase reset Date: Thu, 19 Feb 2026 17:18:01 +0000 Message-ID: <20260219171810.602667-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521659671154100 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- v2 - rewritten - favour cpu_reset over resettable_reset(cs) --- hw/m68k/mcf5208.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index c6d1c5fae9f..38e2d1307a6 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -27,6 +27,7 @@ #include "qemu/timer.h" #include "hw/core/ptimer.h" #include "system/system.h" +#include "system/reset.h" #include "system/qtest.h" #include "net/net.h" #include "hw/core/boards.h" @@ -274,6 +275,13 @@ static void mcf_fec_init(MemoryRegion *sysmem, hwaddr = base, qemu_irq *irqs) memory_region_add_subregion(sysmem, base, sysbus_mmio_get_region(s, 0)= ); } =20 +static void mcf5208evb_reset(MachineState *ms, ResetType type) +{ + CPUState *cs =3D first_cpu; + qemu_devices_reset(type); + cpu_reset(cs); +} + static void mcf5208evb_init(MachineState *machine) { ram_addr_t ram_size =3D machine->ram_size; @@ -289,11 +297,8 @@ static void mcf5208evb_init(MachineState *machine) MemoryRegion *sram =3D g_new(MemoryRegion, 1); =20 cpu =3D M68K_CPU(cpu_create(machine->cpu_type)); - env =3D &cpu->env; =20 - /* Initialize CPU registers. */ - env->vbr =3D 0; - /* TODO: Configure BARs. */ + env =3D &cpu->env; =20 /* ROM at 0x00000000 */ memory_region_init_rom(rom, NULL, "mcf5208.rom", ROM_SIZE, &error_fata= l); @@ -343,10 +348,7 @@ static void mcf5208evb_init(MachineState *machine) =20 /* Load firmware */ if (machine->firmware) { - char *fn; - uint8_t *ptr; - - fn =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware); + g_autofree char *fn =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, machin= e->firmware); if (!fn) { error_report("Could not find ROM image '%s'", machine->firmwar= e); exit(1); @@ -355,11 +357,6 @@ static void mcf5208evb_init(MachineState *machine) error_report("Could not load ROM image '%s'", machine->firmwar= e); exit(1); } - g_free(fn); - /* Initial PC is always at offset 4 in firmware binaries */ - ptr =3D rom_ptr(0x4, 4); - assert(ptr !=3D NULL); - env->pc =3D ldl_be_p(ptr); } =20 /* Load kernel. */ @@ -388,13 +385,14 @@ static void mcf5208evb_init(MachineState *machine) exit(1); } =20 - env->pc =3D entry; + env->direct_kernel_boot_pc =3D entry; } =20 static void mcf5208evb_machine_init(MachineClass *mc) { mc->desc =3D "MCF5208EVB"; mc->init =3D mcf5208evb_init; + mc->reset =3D mcf5208evb_reset; mc->is_default =3D true; mc->default_cpu_type =3D M68K_CPU_TYPE_NAME("m5208"); mc->default_ram_id =3D "mcf5208.ram"; --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521610; cv=none; d=zohomail.com; s=zohoarc; b=NmvuX6GKqnWNwCbsrcwYtkzQLhM2dxPUwtXEZH0hW+ff7KDDoGchVe0dtroxDZ53G8PFl03mcsvQJJyjf2yYFkHQMgUGz3JiKiH4hMuOgtaSakgN/b4zUTJ365rJbHqWvxEQ8UKpTXsZomgpyS02Gym91vS/1bvKOGpVoYAhPJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521610; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8Zd4Bit+n8F+fad2IoTdU9p0oAYOcGsBgNed8Vqbx5U=; b=ckCregVg/a4OFAgNmDHvFv2J/AmhUSdwG14r4baAur+9EKD8AKznug0J6tETx8/4cBALeNp/n52teGSHqk6yZOgdB4oMIF2uzCRWF5k6MzcvzNjQRK9Id8IiqcPATnqBeaFrjE9NQBh5uxt2ukIJJ7VtezxtQfmKT8y8xD1VsUs= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17715216109661006.3531958177122; Thu, 19 Feb 2026 09:20:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fT-0005PN-3u; Thu, 19 Feb 2026 12:18:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fP-0005M8-22 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:19 -0500 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fN-0000Ql-Gh for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:18 -0500 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-65a3fdeb7d9so1569598a12.0 for ; Thu, 19 Feb 2026 09:18:17 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65bad4fac3dsm4178438a12.32.2026.02.19.09.18.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:15 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 14F7A5F8C1; Thu, 19 Feb 2026 17:18:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521496; x=1772126296; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8Zd4Bit+n8F+fad2IoTdU9p0oAYOcGsBgNed8Vqbx5U=; b=gamCJvcRtaQTARmlCY7odq76JS3vR2S8B4PNyyLB/YbWT5vNMOIKCjuFBVXqRBevjO SmbteWI3u9qa/+x1TFE9JQxSK/R7iiBv8EnCRX8vQc7jlR5xJerPGcKdgmhJ024TwAIh A5YatbHxMWoQR7gAEX2RuC8pFdsuz7PHQdH1FEOutd4dL4zkXR4TGmntvptrGAxoG1yZ swj5pyO19o+5dBT+ZylCZrgzD7Nrh0e1xhzqa1qqtYs+F82y9aPc7dGia39Ej6KUeHCd oDFjv3GjUGn0g/0Q1BFUk9C6o3uen1ldtO8dd9ymjWvxbzW4TtqKJ3yLHAx/5yfgovg7 FM/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521496; x=1772126296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8Zd4Bit+n8F+fad2IoTdU9p0oAYOcGsBgNed8Vqbx5U=; b=wPw9pMhC3opJtVTwsrrJvA1pKPEmC+jBfYbOrgwwmNlmLvqZG4WDed7GioF8Hc6pKt bn6RYbuxUV5oBI/Mfv6lFsimjOx2s4tLCbebwNKAcshX61r5wLOFDlBvcHzB5Hyw3dVd Kz/YKzwhwK1xkY35dRZFFqJwjsuoHun4vyJ2va3toOsCL9BRA95WVsCQZx8SoXCu31Il 0vJnZmXIuZ3ADUEKNdBn+JaJrDjYebDNLZPlwFOSKt90Lgcn4hs+LfVuy2ABsDnrf9S3 U7+IpbNZ1a86Zl6CgJd79GGJ4aQ1GoEomduG9Y2HrbDjqZQZWsbtdsjGieytseidF4ZV vCDA== X-Gm-Message-State: AOJu0YyNhKLo42S3sAmqm/Ke26zevPFHflzzMSw2rQUlnL94IqLAKnjf J+oDa9ruym8olT9ryWY2WKC9kczVIKcCZhQSvvlZgE6EHI27cH2XiYSOy1GOAd1b43o= X-Gm-Gg: AZuq6aIXEnHLHXgU5P+LHVuwNjCPjc9nszLkgvBgB6KOPcEPaIU8iWaPv2587JfEmdN 3UQaOO/xDToq+VnyPDtiG/jWHjr1O/utRrytiKI/YkLQfCUhMduQj7kYu3RNRcRzP5AaEB7+ZkB X280MrP/KNjWnmzvwzGrx5lde51lasKoCe+Ea+I7vIbdb5vMOE7HgLXwY8rbeMoqwAnJ29an/BZ iIKjKd88kPEuUZIhSdFEuoJxkEsDYrEVqk1ZZB4AoB0mGZfY94SVxLbdFjbKyPKJfbYRFrweTly xG1PYeL0PWNr/glLH/6/KoE8aIJRouVb+EOaOl6T+jhM8mAMm/9E+k+lZRch18E2SPLPDIJ4zGK zbP2vJWVla4P0+5KnhAsiVBRJs3lJ7cyen1OiyjzhKDfBlxkc+3vBVLgX82Cm96m1U79Wfnzz03 GosJQfXy2Igv62HY1M9VNH9AM= X-Received: by 2002:a05:6402:2709:b0:658:177a:292 with SMTP id 4fb4d7f45d1cf-65bb118a752mr11484729a12.17.1771521495832; Thu, 19 Feb 2026 09:18:15 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 06/14] hw/m68k: update an5206 to 3-phase reset Date: Thu, 19 Feb 2026 17:18:02 +0000 Message-ID: <20260219171810.602667-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::530; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x530.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521612943154100 As the mbar/rambar0 values are currently fixed we can migrate the setting of them to the reset handler as well. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- v2 - re-written, dropped tags - favour cpu_reset over resettable_reset(cs) --- hw/m68k/an5206.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index f92a5d6a339..509980db566 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -15,11 +15,25 @@ #include "elf.h" #include "qemu/error-report.h" #include "system/qtest.h" +#include "system/reset.h" =20 #define KERNEL_LOAD_ADDR 0x10000 #define AN5206_MBAR_ADDR 0x10000000 #define AN5206_RAMBAR_ADDR 0x20000000 =20 +static void an5206_reset(MachineState *ms, ResetType type) +{ + CPUState *cs =3D first_cpu; + M68kCPU *cpu =3D M68K_CPU(cs); + + qemu_devices_reset(type); + cpu_reset(cs); + + cpu->env.vbr =3D 0; + cpu->env.mbar =3D AN5206_MBAR_ADDR | 1; + cpu->env.rambar0 =3D AN5206_RAMBAR_ADDR | 1; +} + static void mcf5206_init(M68kCPU *cpu, MemoryRegion *sysmem, uint32_t base) { DeviceState *dev; @@ -49,12 +63,6 @@ static void an5206_init(MachineState *machine) cpu =3D M68K_CPU(cpu_create(machine->cpu_type)); env =3D &cpu->env; =20 - /* Initialize CPU registers. */ - env->vbr =3D 0; - /* TODO: allow changing MBAR and RAMBAR. */ - env->mbar =3D AN5206_MBAR_ADDR | 1; - env->rambar0 =3D AN5206_RAMBAR_ADDR | 1; - /* DRAM at address zero */ memory_region_add_subregion(address_space_mem, 0, machine->ram); =20 @@ -90,13 +98,14 @@ static void an5206_init(MachineState *machine) exit(1); } =20 - env->pc =3D entry; + env->direct_kernel_boot_pc =3D entry; } =20 static void an5206_machine_init(MachineClass *mc) { mc->desc =3D "Arnewsh 5206"; mc->init =3D an5206_init; + mc->reset =3D an5206_reset; mc->default_cpu_type =3D M68K_CPU_TYPE_NAME("m5206"); mc->default_ram_id =3D "an5206.ram"; } --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521610; cv=none; d=zohomail.com; s=zohoarc; b=jBB1DWRZFditQkgwuCtCX6LVmTd1y8xAH3vSLjFhriv0VopqRY1Bw1c4+T9vN4nfX5Nyd1UWXpHNB+vIOzeM+E6NnqIbC6mwKLY8GwnG0uQ3giyJOdqHL7cNqVN2zWvU3xWkqzx+wEgurb4ihu5EIeWbKQaOXZErAr3sP6cpj9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521610; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QUfwa0oycwqnYQ2VQ69bE7FIxznUu+NWvjU6U13JUi0=; b=lYdMiQSQwIbq/WTO1md5JvdbCRidOILzt+z6bZvVVhBcxf6CpWLWKVlIrjeqCF+QB5w2RoH3BI5rLiKFAJzP40xJPFLCFnrSkGo0jWwbgkaEP22wSWl5XzuZ4MCjjvsFQp84M0uPYZAHdy35MOvX9P1Ul33tnX9vvs2BaM/J4KI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521610561737.069445123909; Thu, 19 Feb 2026 09:20:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fW-0005Rs-TH; Thu, 19 Feb 2026 12:18:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fT-0005Pt-Gv for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:23 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fR-0000T1-K2 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:23 -0500 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-b8842e5a2a1so166345066b.2 for ; Thu, 19 Feb 2026 09:18:21 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65bad29d826sm4261165a12.13.2026.02.19.09.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:15 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2B90D5F8CC; Thu, 19 Feb 2026 17:18:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521500; x=1772126300; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QUfwa0oycwqnYQ2VQ69bE7FIxznUu+NWvjU6U13JUi0=; b=EYz2lv8nXmTHupf7u8MVFMKXH/U0gfS6B9X72DPhWIrr0tYMLkT+cxxljaGoxqY62q sMfw3bGGdkVls6ibrl7KHiivgtEwPi3QweH8/Qe3iHS7FRFiZynuFThflSDqv+8fmOz0 XRJi6GI41q12en98Mz+NQ0Q0ZoQXqHXTNljE3K1SlrjalkWskgN4qrOoftJry9cAqrit wPYx9zn3Z2aI7RBXLRpwQPoIeORvNgd0W8cOvghC7uTY2cTRZ8lGNdhl6Hni4kFBEPwj FtiA9moyuZu+17R6LyzPNXKRunzsJdp4siWL5hncBLD7M0GZymA29eT/84x/WnjJC4oQ GtLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521500; x=1772126300; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QUfwa0oycwqnYQ2VQ69bE7FIxznUu+NWvjU6U13JUi0=; b=MGhdWwZ0dvx2VtkLEO3D9oYezAaHV6aijsuFerug5i0t699TIO+YZjdhZDH62dUHJY ey12tB9q67f8YsiZ4Q/1tGRgvHZA2HXg7C8bTJLr8iZmY0YXBtlvVJogh6kf0DH/qiMo dNnGwagEx7VGPhlsPlB85DHhDzeQxPBMFBUF9sg5rfwYYM86aPZQOfbyhX2k281PrBvw Xi4pl6NUtT85wj+eKBoqyvZQcXOoGdmCe4JTsRDElezlT0ApQ9bHurAf3fs5NeHXqP2m GqxgXFc0v7W8/FtUPd6SZsGN8it4b9ms9I00J4dFS6ocjtYNadr9jGOSu2rtU0m4fa3M E5vg== X-Gm-Message-State: AOJu0YwfC2A+u/FO4KwfAoLs2H+btcCHxPelXO+M5fqMOmsyAcxX3tlc t/0hXYe4xBIDdWLhouEEMCTvHwO5rnGzQkmYw7EvPuBNzCz0WYMlNAVMl5vcFrNGhb4= X-Gm-Gg: AZuq6aIfFRHHo2H74CvCPwO5reF6woQ07XUUWOaMPimPVFC+xDZAtLYIl3Py0SxXmQ1 oMFf3YLgVf5ncERvXEYL4zhNBadSUaGqb96L+AFyQ9s9y9fuXh9+M1G+asx8R6OpYDJcOylVD14 nYPVwhc19fbGks6uyEqsMNVgxtl0PlMZLco1IXVW6xb5XOx1+wmXwr+OU2Vl+XECfp9ekXSwbIo S4pTvHutj8HtM8XXJPKgrf/DAe8XvyxFVxXwjlTesIB9jRyAuUY99p8FDvtdAWNbp8+tjErNCcX kyZQ3g8DhsOcH8fez9Ivrq9SGXJVtfxzQ8M3CuBoBOd7avK+pbzb15LZpBBRnAkM/6Q0zBLeYwm BV2H5rNcEHV/A9z3eUijiqxudrPNwl5/6olBCly4Ix+y+37sb/y7mIMqnFT6Z5CKc96WJiVzqBu dnWiJLt80Ey0e68IHP97PAX3A= X-Received: by 2002:a17:907:728c:b0:b8e:8874:8384 with SMTP id a640c23a62f3a-b8fb419390bmr1165549966b.4.1771521499992; Thu, 19 Feb 2026 09:18:19 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 07/14] hw/mips: defer finalising gcr_base until reset time Date: Thu, 19 Feb 2026 17:18:03 +0000 Message-ID: <20260219171810.602667-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521613015154100 Currently the cpu_reset() in mips_cpu_realizefn() hides an implicit sequencing requirement when setting gcr_base. Without it we barf because we end up setting the region between 0x0-0x000000001fbfffff which trips over a qtest that accesses the GCR during "memsave 0 4096 /dev/null". By moving to the reset phase we have to drop the property lest we are admonished for "Attempting to set...after it was realized" but there doesn't seem to be a need to expose the property anyway. NB: it would be safer if I could guarantee the place in the reset tree but I haven't quite grokked how to do that yet. Currently I see this sequence when testing: env MALLOC_PERTURB_=3D43 G_TEST_DBUS_DAEMON=3D/home/alex/lsrc/qemu.git/te= sts/dbus-vmstate-daemon.sh UBSAN_OPTIONS=3Dhalt_on_error=3D1:abort_on_error= =3D1:print_summary=3D1:print_stacktrace=3D1 QTEST_QEMU_IMG=3D./qemu-img QTE= ST_QEMU_BINARY=3D./qemu-system-mips64el SPEED=3Dthorough MESON_TEST_ITERATI= ON=3D1 MSAN_OPTIONS=3Dhalt_on_error=3D1:abort_on_error=3D1:print_summary=3D= 1:print_stacktrace=3D1 PYTHON=3D/home/alex/lsrc/qemu.git/builds/all/pyvenv/= bin/python3 QTEST_QEMU_STORAGE_DAEMON_BINARY=3D./storage-daemon/qemu-storag= e-daemon ASAN_OPTIONS=3Dhalt_on_error=3D1:abort_on_error=3D1:print_summary= =3D1 G_TEST_SLOW=3D1 RUST_BACKTRACE=3D1 /home/alex/lsrc/qemu.git/builds/all= /tests/qtest/test-hmp --tap -p /mips64el/hmp/boston TAP version 14 # random seed: R02S0d3b1a4f1aef5198107851bdee539e7d # Start of mips64el tests # Start of hmp tests # starting QEMU: exec ./qemu-system-mips64el -qtest unix:/tmp/qtest-53018= 1.sock -qtest-log /dev/null -chardev socket,path=3D/tmp/qtest-530181.qmp,id= =3Dchar0 -mon chardev=3Dchar0,mode=3Dcontrol -display none -audio none -run= -with exit-with-parent=3Don -S -M boston -accel qtest main_cpu_reset: dbg mips_gcr_reset: dbg mps_reset_exit: dbg ok 1 /mips64el/hmp/boston # End of hmp tests # End of mips64el tests 1..1 Cc: Peter Maydell Message-ID: <20260108143423.1378674-9-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- v2 - use proper 3-phase reset --- include/hw/mips/cps.h | 14 +++++++++++++- hw/mips/cps.c | 26 +++++++++++++++++--------- hw/misc/mips_cmgcr.c | 1 - 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/include/hw/mips/cps.h b/include/hw/mips/cps.h index 878b4d819f4..1084a10de0f 100644 --- a/include/hw/mips/cps.h +++ b/include/hw/mips/cps.h @@ -30,7 +30,7 @@ #include "qom/object.h" =20 #define TYPE_MIPS_CPS "mips-cps" -OBJECT_DECLARE_SIMPLE_TYPE(MIPSCPSState, MIPS_CPS) +OBJECT_DECLARE_TYPE(MIPSCPSState, MIPSCPSClass, MIPS_CPS) =20 struct MIPSCPSState { SysBusDevice parent_obj; @@ -48,6 +48,18 @@ struct MIPSCPSState { Clock *clock; }; =20 +/* + * MIPSCPSClass: + * @parent_phases: The parent class' reset phase handlers. + * + * A Coherent Processing System model. + */ +struct MIPSCPSClass { + SysBusDeviceClass parent_class; + + ResettablePhases parent_phases; +}; + qemu_irq get_cps_irq(MIPSCPSState *cps, int pin_number); =20 #endif diff --git a/hw/mips/cps.c b/hw/mips/cps.c index 620ee972f8f..23918147276 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -55,6 +55,17 @@ static void main_cpu_reset(void *opaque) cpu_reset(cs); } =20 +static void mps_reset_exit(Object *obj, ResetType type) +{ + MIPSCPSState *s =3D MIPS_CPS(obj); + hwaddr gcr_base; + + /* Global Configuration Registers - only valid once the CPU has been r= eset */ + gcr_base =3D MIPS_CPU(first_cpu)->env.CP0_CMGCRBase << 4; + memory_region_add_subregion(&s->container, gcr_base, + sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gcr)= , 0)); +} + static bool cpu_mips_itu_supported(CPUMIPSState *env) { bool is_mt =3D (env->CP0_Config5 & (1 << CP0C5_VP)) || ase_mt_availabl= e(env); @@ -65,7 +76,6 @@ static bool cpu_mips_itu_supported(CPUMIPSState *env) static void mips_cps_realize(DeviceState *dev, Error **errp) { MIPSCPSState *s =3D MIPS_CPS(dev); - target_ulong gcr_base; bool itu_present =3D false; =20 if (!clock_get(s->clock)) { @@ -144,16 +154,11 @@ static void mips_cps_realize(DeviceState *dev, Error = **errp) memory_region_add_subregion(&s->container, 0, sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gic)= , 0)); =20 - /* Global Configuration Registers */ - gcr_base =3D MIPS_CPU(first_cpu)->env.CP0_CMGCRBase << 4; - object_initialize_child(OBJECT(dev), "gcr", &s->gcr, TYPE_MIPS_GCR); object_property_set_uint(OBJECT(&s->gcr), "num-vp", s->num_vp, &error_abort); object_property_set_int(OBJECT(&s->gcr), "gcr-rev", 0x800, &error_abort); - object_property_set_int(OBJECT(&s->gcr), "gcr-base", gcr_base, - &error_abort); object_property_set_link(OBJECT(&s->gcr), "gic", OBJECT(&s->gic.mr), &error_abort); object_property_set_link(OBJECT(&s->gcr), "cpc", OBJECT(&s->cpc.mr), @@ -161,9 +166,6 @@ static void mips_cps_realize(DeviceState *dev, Error **= errp) if (!sysbus_realize(SYS_BUS_DEVICE(&s->gcr), errp)) { return; } - - memory_region_add_subregion(&s->container, gcr_base, - sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gcr)= , 0)); } =20 static const Property mips_cps_properties[] =3D { @@ -176,8 +178,13 @@ static const Property mips_cps_properties[] =3D { static void mips_cps_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + MIPSCPSClass *mcs =3D MIPS_CPS_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); =20 dc->realize =3D mips_cps_realize; + + resettable_class_set_parent_phases(rc, NULL, NULL, mps_reset_exit, + &mcs->parent_phases); device_class_set_props(dc, mips_cps_properties); } =20 @@ -187,6 +194,7 @@ static const TypeInfo mips_cps_info =3D { .instance_size =3D sizeof(MIPSCPSState), .instance_init =3D mips_cps_init, .class_init =3D mips_cps_class_init, + .class_size =3D sizeof(MIPSCPSClass), }; =20 static void mips_cps_register_types(void) diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 3e262e828bc..9e1c8d26ea5 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -214,7 +214,6 @@ static const VMStateDescription vmstate_mips_gcr =3D { static const Property mips_gcr_properties[] =3D { DEFINE_PROP_UINT32("num-vp", MIPSGCRState, num_vps, 1), DEFINE_PROP_INT32("gcr-rev", MIPSGCRState, gcr_rev, 0x800), - DEFINE_PROP_UINT64("gcr-base", MIPSGCRState, gcr_base, GCR_BASE_ADDR), DEFINE_PROP_LINK("gic", MIPSGCRState, gic_mr, TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_LINK("cpc", MIPSGCRState, cpc_mr, TYPE_MEMORY_REGION, --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521609; cv=none; d=zohomail.com; s=zohoarc; b=ZNPevkJODPhL5ObnJgM7tEze70C/AZbJ0tPwpaQ/GFjL7WGhlKmHBiMCkOW5WaZWnrlGzCrxJkJgDjxTBv9B3VO3hZm2BTMBVIiH5c4VWi6N0vZzWUKVABZTNRWTwKCA9uLh+iiuSXwR8FRshBo5eNEtuHKp5v+/vkjesBsSRYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521609; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+3rDXWxTc8F8CeotEYArZQgzd6idckf+iX82oWokDYc=; b=SLAnDUDksrvKTCHq0PryYaQ9/kwq9PXo27zPcnrn4z3Cg37627qaixctVdXAc8YErrpB0YRvOvJmHM4n7olPL6vBax04xOtHOqVeaf8SD9yj+ClZnWqs0vlDpcblkNvu16n+hDfXAOZvC4ISln2a5PK6Y+B2F4aoUTPaPA9PM6w= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521609340977.8965664782402; Thu, 19 Feb 2026 09:20:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fT-0005Pr-N5; Thu, 19 Feb 2026 12:18:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fQ-0005Mf-B5 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:20 -0500 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fO-0000R5-A9 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:19 -0500 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-65a3fdeb7d9so1569613a12.0 for ; Thu, 19 Feb 2026 09:18:17 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8fc7665563sm589027366b.47.2026.02.19.09.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:15 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3E8835F8D0; Thu, 19 Feb 2026 17:18:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521497; x=1772126297; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+3rDXWxTc8F8CeotEYArZQgzd6idckf+iX82oWokDYc=; b=Fq78MWP7URx3I24UvNwCju1I+GME4or7+mfquZKfxoTHytjiImdDZELS4ncEftjO+O +Ui9uMD0oeinPhZ6g8JHk0rl9orI3SsUeHEUAZvM/wmFiGnafbHHmiESyuQBqG1RnzkM GOU4XJwX7DATwKj2nwzL6D9wUFMneoSfXbA1ceZuIF66EMNydnBhoZg3D02ceXuMftXy irSmZs3Otmw9AS3OP7w4T9vy4zvf9b4bPOvXeO1K03aPI25XjKH2uH9T/CiXB33Nh2GU lSrLB4TQxIcODV5D7MSbfSsdU1s6wpP3gbFu8ORfc/qAnWDV9IBqCj2PqHmVuoJ4npHR 9j1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521497; x=1772126297; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+3rDXWxTc8F8CeotEYArZQgzd6idckf+iX82oWokDYc=; b=wp5Nhi6PHB6/4n/lt9Rz/hYFrbz2JnZkgsbO3xzNbupF7xjHMLSIjpZi5ZdT+hdbsK Gz9ArM36cmABUkmTgB077zzhOtNgYKHlwNKhq3BYDeKnY4JuirzivBtlQ8EK70OS7VMQ OfODYLnsaLSzwxORr5IdEzjEq8wFRZzRiJ5LcO4g0mcfsIia6yOWvA8I43Lnnkt9MfT1 bDyzQfLkwQGcek7Kw5nmwW1w/9moeqaCE5G02uylSNdlvPeY/y/ADH0Tdy7zaZuQiO3+ JoRusmG0AVY9rsrufjD6Klk38tD4Hbvs9dBvoi1z4IzE8dK7VysFgbj9SMoRlGsWuVuv XISw== X-Gm-Message-State: AOJu0Yw7+uOM2DJ//6VnQjPUAs8bei9OHeQ1YYddgGEKsSRPKINnzl8j uIO8Gk1SSojMooPmRmv44wCA9L/PoMlYTijCQvgnXrcLJH8HJ3vP60aBUdG29RipI5A= X-Gm-Gg: AZuq6aKiDeOYnQ4Xkp3Qg6ZGbTgCNOzooHerlLyvUkH5oJWtFK8TIbW5J2WGVWr1xHK pyO2a+nLRAwAA/gsr3I8Q9gAOgbDfu0UNs1PgdQQmc7E9GiVa5qyHUt9PwhOufcvcLEMk6MnpwL ogb6u4gjEnxxShEWLJlw7HFasGFGXmS/8NE+JvMoxohBFpWXByFaNbavQLdvYO4wcTyCLWtW9Lh Na0JjaOoxnA6w7LsRmyqilIavDVAXwi160t+HbzZHP/ls6ttM6UtYDoifS70+OFxe63JnWAGth0 8e1Vwj+q8+J3Wv+KTB2xHiBt89g7NzwdYeqL4BQoAKHMG9L0Igl2QDifnDs+/VN3MEZgdBNEWu0 8UFn5f3HNTsBZxifVPUVsankSdlnU3sKWTC7LYjh8afkZ5KPDJ7JGYaa3KYzTphBJGmcq+vII6J ObX34n3O2fH23kHCHkSjUKqBk= X-Received: by 2002:a17:906:d54a:b0:b8f:1c:e815 with SMTP id a640c23a62f3a-b8fb44fd4b4mr1289377666b.48.1771521496614; Thu, 19 Feb 2026 09:18:16 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 08/14] hw/mips: drop cpu_reset in mips_cpu_realizefn Date: Thu, 19 Feb 2026 17:18:04 +0000 Message-ID: <20260219171810.602667-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::535; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x535.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521611061158500 We will always do a cpu_reset during mips_cpu_reset_hold(). Message-ID: <20260108143423.1378674-10-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- target/mips/cpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index e424d115018..f20613f1223 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -488,7 +488,6 @@ static void mips_cpu_realizefn(DeviceState *dev, Error = **errp) fpu_init(env, env->cpu_model); mvp_init(env); =20 - cpu_reset(cs); qemu_init_vcpu(cs); =20 mcc->parent_realize(dev, errp); --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521609; cv=none; d=zohomail.com; s=zohoarc; b=Pudk9BeLV7yEgu+Qk8CJyHHK3owqo7JbniLHJh57IrqglKXz7vn7zypsW8IstP0CRQRvy8bqqUQODN6mE4GJQ1ykgQtRMnhYrjW01viKDUKtk26pXS2BNjvXHaPWChe+DHqkMUqaoHtgzZCsqp+jAqJKh8cHKQEdaZyPUtJILmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521609; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FPbEe6rl2yKmSfHI3D0ZBNoF06K4sgdbd3ruNGI9+Bw=; b=mjdoW5cR0AB51qGSMigAOgUQRfM3Rh1dBHQtpOU0GZ4eG/OA2VJfi1O2KTTvTDe3dCAWvO9sjLtCBHKvfmXD7WHul5UooSssu2LwhILH6GOmPlJb75Ph6nJoDmGOctQzwColMyY5ReiKlTlB+NedLibYI4gv+vrcT3cYwgqPh1o= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521609145473.02457953003807; Thu, 19 Feb 2026 09:20:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fV-0005QQ-13; Thu, 19 Feb 2026 12:18:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fQ-0005NG-Rz for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:21 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fP-0000Rf-9W for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:20 -0500 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-65c0d2f5fe1so1880986a12.3 for ; Thu, 19 Feb 2026 09:18:18 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65bad3e39bfsm4190716a12.22.2026.02.19.09.18.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:15 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 534E35F8D3; Thu, 19 Feb 2026 17:18:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521498; x=1772126298; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FPbEe6rl2yKmSfHI3D0ZBNoF06K4sgdbd3ruNGI9+Bw=; b=cyTJHChAA9BSydym/HDWkLwchNsFNwf8HrsxDyzqNViix6EQgr4kHtXCVMVMpOJdrU C9Du45n9FI3te4pFVuPozB6lnjYYh789yklfa+/2qJW7Y0Xq8Uc6oGK/HTtwQA5rqAc1 PnPFqTOBMV6MJEZNpTlI8z+OjDEVy6p8bozx93sdPSId5q34TkE5shTMx+ChSG5g6I/4 leGfF0eXJVBqXQSSUpgt7hPx7riSB/Gq1ga952D+XkiGpsViV8+MTNSxPJ8zAt3kTMM2 Jspi6fuHCmgBIk3jSR4LZc0olvXFY8Jyj53OthUKifGXW62wceAj9DYRvftNjl8hItSJ RxcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521498; x=1772126298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FPbEe6rl2yKmSfHI3D0ZBNoF06K4sgdbd3ruNGI9+Bw=; b=OnOOa2rglGyrP5q0K+JuUHcyEcEq5VYHzIpqC9XJazYSHmpBsKb/VTqnQy9s65JpwW +wvGk0AIqxNVXRhvnUaPCv2TSGhFZt7e7v13kGFi/57TzlLP/2/S6EvBffY1b+iKsktJ 155VgEbPytQJUb6KwXu3DZqiT0RNC8zDtP6sik/u4RlM7UUVVVAFaoKPJcUAPV40YlCi zSzaXNsFAcLIuW+3dMhGBw8HdCu79WGtvuoAmKtxs6vSc59QdRR+GG3SINEbAVFam5Ob N/7iHepptHRmQ8KgtkZBpshZvQA7N2MePptczr9C3D/osUaM2znYoNLhCAvQFN+D9wy9 Ba7g== X-Gm-Message-State: AOJu0YyHn+houi7dU4yKZwy9Ufs/leSMEokr3LnqcVCmbXOQsnaPzqiA 4yGjbrH+lRcqVm7Ec0hj07D2kQgWzzuVfUVOj8daHFmsyw5Fq2yyiT93jSbp5zmGie0= X-Gm-Gg: AZuq6aIxzoweGJinI/uU3FHw6+gjeIfbBxpXaTxVIWpW2+igiAsbIy6Svgjr/oJ+ON+ 53f0MM2/BouDLu3XAP4qrAqgqtWbLGAwQAND6IA0R7RYhT+FSj5sH3k5GwopTZ/b+cp7BNJYBrc B2Fliyjg/uJUkq7GC5xlfuWoVbttL6pWrlQXbLcHjXXqNqaTcQjFgZMk+O9/f3byaKZ7OQgvZsw j6+DdHXCOatggSAq9YG8rfNxStThuKwKX/yJ+3oxREmdm0106LAqgx3VlUAYblveTey29okOFP2 aVc12VRyp0o2JemkaMVZR2OvfBb3+ImLQlw7a6WH26yB3EaJv+AkXyWUG+YSDCQBOyOEz3ptn4x X34gAgyHy1kEbu3uviXmkod7NjDlr42lflyb3tc0/DvqA62io6h+O4EAqm8h/1LWcXtkqAjHuMg 2kWTcNN1JmVsZTza6uCVXm0WKmP75Yd2dfvw== X-Received: by 2002:a05:6402:2787:b0:658:11c3:4221 with SMTP id 4fb4d7f45d1cf-65c76959b25mr3583625a12.7.1771521497211; Thu, 19 Feb 2026 09:18:17 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 09/14] target/tricore: move cpu_reset from tricore_cpu_realizefn Date: Thu, 19 Feb 2026 17:18:05 +0000 Message-ID: <20260219171810.602667-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521611065158500 Implement a proper cpu reset handler for tricore cpus. Message-ID: <20260108143423.1378674-11-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- target/tricore/cpu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 04319e107ba..c3dda9f6a54 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -24,6 +24,7 @@ #include "qemu/error-report.h" #include "tcg/debug-assert.h" #include "accel/tcg/cpu-ops.h" +#include "system/reset.h" =20 static inline void set_feature(CPUTriCoreState *env, int feature) { @@ -81,6 +82,12 @@ static void tricore_cpu_reset_hold(Object *obj, ResetTyp= e type) cpu_state_reset(cpu_env(cs)); } =20 +static void tricore_cpu_reset(void *opaque) +{ + CPUState *cs =3D opaque; + cpu_reset(cs); +} + static bool tricore_cpu_has_work(CPUState *cs) { return true; @@ -120,8 +127,8 @@ static void tricore_cpu_realizefn(DeviceState *dev, Err= or **errp) if (tricore_has_feature(env, TRICORE_FEATURE_131)) { set_feature(env, TRICORE_FEATURE_13); } - cpu_reset(cs); qemu_init_vcpu(cs); + qemu_register_reset(tricore_cpu_reset, cs); =20 tcc->parent_realize(dev, errp); } --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521530; cv=none; d=zohomail.com; s=zohoarc; b=AnIQ7bcp2hcqIV4htxP9wkJ17ZkgEB2XaKoDWzn9H6x72JOUYTRAWlaa6zWXT4RVJd47jhAsChmXk+pHVBMWR01oblELzVUrACdps3upgo7HyuTjjXiTAsF102VzTm2TtI0BzEZRO3zNw2GDxsLckOw8zVoFE/eZKOkOVPjLaig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521530; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TpcVusHH4ds43Bv7hqrg9C8PwOPYIZ9SdTqnEeifYvk=; b=a9NwMukxgIk5Ioft6l6Hf0c7qbyGZ7qMfsAW2b/OtokGQqLCyB3auxvvW+vCqXYUmPCJdhbpygljJMSPDj/9Yk6ZcP9b/IViXDuERLQrexyKKM4kWrDBgaveJcbfGqmT6sLc6ATno2I/mFTSVovbCqQhgNVPRBdJFJFl2tX9OpM= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521530628686.4549746734045; Thu, 19 Feb 2026 09:18:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fZ-0005Tl-LX; Thu, 19 Feb 2026 12:18:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fR-0005Nm-Bx for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:21 -0500 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fP-0000Ru-L5 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:21 -0500 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-b8845cb5862so201757266b.3 for ; Thu, 19 Feb 2026 09:18:19 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9048d96bb0sm131339366b.18.2026.02.19.09.18.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:15 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 679685F8D5; Thu, 19 Feb 2026 17:18:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521498; x=1772126298; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TpcVusHH4ds43Bv7hqrg9C8PwOPYIZ9SdTqnEeifYvk=; b=tR4/yVx7frvxu6x3G4jWWCpIBZF7XAmxeLGJVvFxFquiWMUcR5HlcX+Ia4VXDst3Aq pkhhj6W0/HfQYkPK7Vf8Q43fATKw50nkznFPrs1QNNUDSghEHGkLGGd5xjhQqp8nMreY 1lcrZdR1fHaCf110685jp60K0AGm1nF++Tbysd9a5jpq3V4xK3cY7aVw21RuwmTroww5 7EOvoW2K4jc9m1TGIcCVRCkre1YD+2jg+79VVdOQTefsBGF4TkrRu6Y7sPEDASe+b2eW cYawi3c/es+y1GDTM9/wbnGBxomQTzhUIHY4BK0oo2nLRuNViMbL1q8hGGFpxQDi/TXl h8DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521498; x=1772126298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TpcVusHH4ds43Bv7hqrg9C8PwOPYIZ9SdTqnEeifYvk=; b=kK0XNAX0nwZWjlHo0HU41sC4JroOCtWDjPU+xjaq/H/4aqpqIPE2neztOmTcKaYdSY jcmVM3/PKL1R/ihvGeLQXQ/21tnAOAgOQJWkRlex8ObR3WX1Dp/B3Kfow/ifJS22OjVV B/22m3gJGXu3a3fShUhnPEdjHcjXzSwE+fNWDvG02O2BeX/tI3k40wXAa2JsyhIVIIi8 Ui28Q5MLqlZaom7A188huRRYPRF8PGL/5L7vtFwpWs4OuBuh/6X9kyPIA52D2dOqWIT5 ljpVwwnRWJ5kqjByhR63UCU53YqTedKHLH8y49E+7uPxeM1ayQfocSLcYfoYPAkzeQir 9iCg== X-Gm-Message-State: AOJu0YwJwo8d3skjanZvYR10q6bUEkvkpefU8hHehyR25nZrPzMzM8nD M0cP9VWEn6vCN+LfhmYm9U8WQei2m63XhqBNYMzzREIWnGvu5EuiuTcMvjhPATj9VYc= X-Gm-Gg: AZuq6aJDPsw5cb/i6JGbKlo8Wq68kW2bte4CrDfMMaeSlx98H0zjUNFal+1WVC43W52 Ki51E4FYzNWCWmW+oWFmUW6kpqqv8CRSpQ5iPzq2P0Ss8jt9pMi2nLNneVOs8sf/W4Kx8cj/brD kM/MRgt8QU9fh4ySL/l0oGHMCF8wofQ1vRmNC4hxgbNrHc7UfPmJItFlmEIcRHPvuW65bC9oiW6 rfN4s7CMAtybQv6kTj3V6m/PyM8XzCcRQ1CUV/V6+VwmztVbjVAZU1cUXfMi4a9J9zU87j7dhIj LjgYxUOGdDR2WLmx/YYOpwEU6gsAYADPgC+tNpXXcqLT4SnrSN5F9KLOFCVsRb5wcOQfKfk9rQg eWNXsJbQuy/ggYluw78H0WCsPLdgJybEblJ9mywio0HjEjaRu9nLq5D+VwkLzcKOG2K9b0keyPv Wywn8DSFKIEvG51mtDepHuZr9iVFb9r1yXJw== X-Received: by 2002:a17:906:d552:b0:b87:368a:2bf7 with SMTP id a640c23a62f3a-b903da48f1amr458184266b.13.1771521497915; Thu, 19 Feb 2026 09:18:17 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 10/14] target/arm: remove extraneous cpu_reset from realizefn Date: Thu, 19 Feb 2026 17:18:06 +0000 Message-ID: <20260219171810.602667-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521533596158500 We already have do_cpu_reset called when the system is reset so there is no need to do it here. By removing this we now only do (smp*2)-1 calls to cpu_reset. Once per core as part of qemu_system_reset and then once per secondary core as PSCI calls are made to reset them. Message-ID: <20260108143423.1378674-12-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Peter Maydell Reviewed-by: Pierrick Bouvier --- target/arm/cpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 10f8280eef2..dadc48e06e5 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2198,7 +2198,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Error= **errp) } =20 qemu_init_vcpu(cs); - cpu_reset(cs); =20 acc->parent_realize(dev, errp); } --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521634; cv=none; d=zohomail.com; s=zohoarc; b=dbYmh7mrZ+S7WWD7HHFj7qE/aZxGUE74mRWc+dXW9u8ZOJoqdVX/UpB20qROfZeoa2/FfUqphOCR9j8ggI5DQvEj8M52ww6z2GTv1T6U1WX0EI7mbV9Imd0o3pSLivc2lv8MGvetEGL3I++whDEVWIoGk1JEomBe6/KNNlYjINo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521634; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dmOkyNB6zbICeYWYgNzTd6FhytcB3LOA5y9a/vnPkW0=; b=EFHV0v9Ja5SRZNyVbtOcUq/tStgemltSvjOi3kTz50hOOAovvb0/I9+rs7XXnj3L3KalZPXLvHx0a1t/nAQG4WptSpLrTonm1SnJtELD03f5Wwb8DlKPgCc8YzgCHIDDXe3rzIDfcTU+XmTa6Y7qG18oPY6b40+0pkUF15du9qQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521634439471.803271015886; Thu, 19 Feb 2026 09:20:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fY-0005TU-QH; Thu, 19 Feb 2026 12:18:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fS-0005PA-JY for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:22 -0500 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fR-0000SW-46 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:22 -0500 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-65a11e565a9so1345833a12.3 for ; Thu, 19 Feb 2026 09:18:20 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8fc73f7c24sm599234866b.30.2026.02.19.09.18.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:15 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7BFCE5F8D7; Thu, 19 Feb 2026 17:18:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521499; x=1772126299; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dmOkyNB6zbICeYWYgNzTd6FhytcB3LOA5y9a/vnPkW0=; b=C9+w79Mt2oSFiUA2FLjfbpip+eOywc0L1ITI2/J9cUri7F3hnAxAIom/7yGth2/fzP WGtHJ3PCgmYfl3dtjucrEVS4Vi8BrpvTYXvkPfkgARHx2huCEjPtCuKx+qc2ITH83ArN i9sckLIkPbnjlXoLBgAvAGwSlBqP6xCdRq12SdYZ9BlMydeRaIKhFEW1F2Owc70QhbqF dn7WBs14I0czJlQaLCk1+u64TFNUuZVan3pUbobcjQ8A5p6AeIahGuB2CwA6WhHytBCX f3XsXVsUcAKyOJL1N+y3YDDKwho0k92gB1dhmYec4giIvqb3umkKWW1YQqYA1Vqpibyw ZSjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521499; x=1772126299; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dmOkyNB6zbICeYWYgNzTd6FhytcB3LOA5y9a/vnPkW0=; b=iZPUzGEIxsf8fXscmVirMARSmeuQE6ISfkXCL84g2oFLaVlNlN5AaLPKGb5S/a5jpp dkzCYlsmOuzvcPUD2xxDvlKcQo1k22anHUikmGJdrJkLwU41NoQmnuUaAtqcHv9dUBFE Ey/dc+ylrIHm+3UJalIvPM+UdkYpfs7T7rNHlOG6bw7cl3tKyQ5pNnaOzYmF6/A3pRmx URjp/odZ2lmO7nWXD4M/tNBObcDdmLXnQlTmoy9VwpRkqPDYiIdeL/P2ow16r6HJ+zHW ZJ2/NBtNHZY1OA9Xe0mUIbEQRET/KLnAU3+kc5/PMleKaauR71H8lxa+SndLaLGxNMXF LJsw== X-Gm-Message-State: AOJu0Yw8UEbwRG4a+auuHiEAThzNbfWyBHHJZ5kX02A/4TaCnegTNkin P1xE2qBWyOi6uDZmgGkyDXl9BY/bCgK26ZsKG2dEBO7zXcfv/yGSrBh/bNUes4D0plo= X-Gm-Gg: AZuq6aImTslp69y6iSa2iCWmEFe7jyZG58h4Gb/+RqXixsJkDnOigTZk4zJEZ0ruG+1 apNbb4EqLSGtgIjyAJ8VXP4pKdX+qOniJSFVNHCbqUsnjPzwy5U3fDBt5dT4FFTdDICyvMmDN8A ud83YTPolB08XPkDbW7tVxBdfbw0/QO6xsNtuG1jYHsrO/sMvWsQMf8C0UPNFdPkItO9XKl5NPz FfLy+c8UXMqlVgEeWBECAzZ4QIE8bxyrGpd3MwNJ1+5fDu9JeiulRcpBX/zx3c8lNKeewYj1SNP QtXwPJ1fNNz40kPLFcCANefWwR9S2J+kMPQ2ZYQIEF4/KfR/nH8XD79PiZwnoM+YQGFJpXcCDni gFKGznt+iiaitTKtbgnjvEnEoTJoKIkFoADedXZZ2jvboGkWuHfCb6EHsdZQlIvj6iDYK0zdjqT V/YJ/C5xZrW7Pf6MJAfzFmIPi0XjFkJnTnVQ== X-Received: by 2002:a17:906:7304:b0:b87:2abc:4a23 with SMTP id a640c23a62f3a-b903da90fccmr330924466b.2.1771521499273; Thu, 19 Feb 2026 09:18:19 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 11/14] hw/alpha: remove unused includes Date: Thu, 19 Feb 2026 17:18:07 +0000 Message-ID: <20260219171810.602667-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521635068158500 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- hw/alpha/dp264.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 5e64528431e..98219f04569 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -16,8 +16,6 @@ #include "hw/rtc/mc146818rtc.h" #include "hw/ide/pci.h" #include "hw/isa/superio.h" -#include "net/net.h" -#include "qemu/cutils.h" #include "qemu/datadir.h" =20 static uint64_t cpu_alpha_superpage_to_phys(void *opaque, uint64_t addr) --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521983; cv=none; d=zohomail.com; s=zohoarc; b=BSxnT9gPR7TXJLy5D8H+YKgJXFrxRlkyUsJJk4ieSkT1UGrm+zmkLQ+BN8qu2J2ZItIF11eACnN4TADUDxjLSDoIANQPyAhbYv0E0om5r6YvxKhUTWZJqF4gBpodtTPZx288CROEmK0BaYP/LWK6jL48hRmziESIWO7Ea+k+iuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521983; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TlxnWY3WbQiT4E/p8Y0OKDOkVWTi7VBe2yqZtOJIOQw=; b=eI/CZk6nXaMOemHXXr1guJrK1DzlRbBoNc5GGspQSynBIJn93I5YFNQvBqW8OTSX7Uj7G/rAf5YNdHlqnR1B4X+XtncJy6aqGFqihB0ZVe12sV28VSYdoCiUa5HOzmjAVqJ3VIpkq7s5PQJrvl7OieP69ua+JqwyBq+72dz9Skg= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521983702990.0397529126951; Thu, 19 Feb 2026 09:26:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7mO-0003ff-JZ; Thu, 19 Feb 2026 12:25:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7mK-0003f5-5t for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:25:30 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7mF-00023h-MF for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:25:27 -0500 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-65a36583ef9so2493514a12.0 for ; Thu, 19 Feb 2026 09:25:22 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65bad19bf20sm4269435a12.5.2026.02.19.09.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:25:20 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8F1185F8D8; Thu, 19 Feb 2026 17:18:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521921; x=1772126721; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TlxnWY3WbQiT4E/p8Y0OKDOkVWTi7VBe2yqZtOJIOQw=; b=D+mOLxD3W6lxg442yuBeRDYwSERBrMrAZdaKzDQl8X/9NZkObQMbVSNZyxlCmzcxfh giA6H5EcriEBDhdh5DKh2hGJuNmDaD9wIi2sDi4pVepGbz+szohVda1KKJ2nhRVDoqBa rks6AB+QC1C9n+mXXjYn6lxtqChRcOfic22g4+rUVHjy0LUvmrVy6/JgZq2BHyELIAce tU4AskXc5O498cwVkXKblPKatqZejR5iqKvewQSDSbhK+ksiv5Sm1NLGDT7fiv0eCoTG vSpA1mi+rjOwykdF7CigGJta0Q0FfYyj/QKjVI8lJ/8cMAgLVozrUJCnzGxLB+TlAfQO d9fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521921; x=1772126721; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TlxnWY3WbQiT4E/p8Y0OKDOkVWTi7VBe2yqZtOJIOQw=; b=kDqIc48ay5mC8hve4oZCxIPd50VbyDuv8UY09fqbROR3trvooKMR0SUjXoq1Wp5y+a 2JuY4oBj0FQ8920EEAyhi1OwqBvxEmAQsSBP7zlaSBrPM8HxD/Ei/3cooh0BDfucjwkG Nn+UPYXbO2+QNYlYvgk+V67/2kOKlhJJk63Tx92HWkvwjFsdIG5fOPwKvY2YFTAKQpEw Tz7Fe+iGGPxBec6+NQyfrsyhR8jik1I7QCWCFe8nDryukjicHGurgjBG4myTGdY1Mlo0 R/+rYubLk98zXtfFFuoHz1LSwDGN1tWhBFlSnmDAIXWXVvOn5Xx310usJIKuKr1K8A4d 7TrQ== X-Gm-Message-State: AOJu0YyPutmkNIR24sescdRPwc1/0aN5brk9yjSk4uoOmrarwLu0XB3M M2GpXybxhcANAh7/KsjIKZYm9RgNBsyUKl1qct73oTUTkjuKpzAtMCgFlDf//2W+ltc= X-Gm-Gg: AZuq6aJ+cxNsIsADqKW+Dwl3jpMudFP/+E0Ulf+W0qzbhyqE0pF9yoLq1xbK5Tep65+ m1qRtkS81fcM01/p3nHjQROOfujOudB9bsfV0NSNvlwKvj9ZToHIAGKdo7KGgf+/bvL62f28tur 3w8ED+pOg7aQBIT/+YFAHpRl4AYei7r4VrvuYE+C+QONY5eFpfZqkDqZ6muOa7Lvd97DAK2XaR7 nZJZdks/VJwpfTKCCc9iWOeKbMepTrBHNt3MwV9NfhOsEUjeTxOHfYvgv5jJ9f/7+ZLfzHm6j8r rwtpOhjpx3xzt6Z9APgDEQJu2/9ty+FwTa1V1t6B22f62h2m5UQtUB37CcFyDEGvFY1HTC7GCFs PO/AWt+iQkfIyA2N0zhmndAeXlgsA3JHvDNqnIc7CyLQMvkndmL3q8tDkXx/VOrllHt27vI5aLb 1fmg4FXM5b/9ZXG6UXrTLX9Og= X-Received: by 2002:a05:6402:3553:b0:64d:4149:4924 with SMTP id 4fb4d7f45d1cf-65e4f13e8aemr1621136a12.4.1771521920731; Thu, 19 Feb 2026 09:25:20 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 12/14] hw/alpha: add a reset function for the clipper machine Date: Thu, 19 Feb 2026 17:18:08 +0000 Message-ID: <20260219171810.602667-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::532; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x532.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521984903158500 Once this is setup we can move CPU reset to a 3-phase reset handler. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- hw/alpha/dp264.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 98219f04569..f660fc41bcd 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -17,6 +17,7 @@ #include "hw/ide/pci.h" #include "hw/isa/superio.h" #include "qemu/datadir.h" +#include "system/reset.h" =20 static uint64_t cpu_alpha_superpage_to_phys(void *opaque, uint64_t addr) { @@ -42,6 +43,14 @@ static int clipper_pci_map_irq(PCIDevice *d, int irq_num) return (slot + 1) * 4 + irq_num; } =20 +static void clipper_reset(MachineState *ms, ResetType type) +{ + CPUState *cs =3D first_cpu; + + qemu_devices_reset(type); + cpu_reset(cs); +} + static void clipper_init(MachineState *machine) { ram_addr_t ram_size =3D machine->ram_size; @@ -205,6 +214,7 @@ static void clipper_machine_init(MachineClass *mc) { mc->desc =3D "Alpha DP264/CLIPPER"; mc->init =3D clipper_init; + mc->reset =3D clipper_reset; mc->block_default_type =3D IF_IDE; mc->max_cpus =3D 4; mc->is_default =3D true; --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521601; cv=none; d=zohomail.com; s=zohoarc; b=nUTKjafJVbhxGpvNe2yM4ZS8dUiC3qd52Xqvz2UqxA6wnfdlGrlm2oO/bVJaSgrqrMiqMo/cqfB3SPpSwVH9hErw8htiS9NjFiSLEcNZ8qsQ9od7GWfhGduJk7N1PPk7RgwucPUWskkH4vpDr9SpPUF+KPQ8OgPvBoVJkfDVctM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521601; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lbJf3C90R3jDGQBcdsPQ9rdD2GJU3JqzF3kfy/njWjs=; b=Rdeunn/8szDm4foKnDG8nmJIpEi/2XlMyMXltsG5lnHJG+bR6ZxhDHN0t58WgJ5cFaxZ/erNcUqyBsQ9Mz5Lmy8yRTQWGznRgauB74vahj8xc+4pLJeYHjy8dAxDla3yk+tC0RvE2LtKIRNqjo4ze/xFYQ2/V2vDYaPl67ZXmdE= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521601190624.0816929647194; Thu, 19 Feb 2026 09:20:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fY-0005TX-TK; Thu, 19 Feb 2026 12:18:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fU-0005QF-8F for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:24 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fS-0000TT-Lg for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:24 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-b884a84e622so189140366b.1 for ; Thu, 19 Feb 2026 09:18:22 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8fc735d66esm564719366b.4.2026.02.19.09.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:20 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A5C615F8D9; Thu, 19 Feb 2026 17:18:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521501; x=1772126301; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lbJf3C90R3jDGQBcdsPQ9rdD2GJU3JqzF3kfy/njWjs=; b=kxovPOtsfX6LK0xr4Hk3JBK70KSTuqzYuIFrAyBLazH1IxbVdJSQsdHsoWL5Sew3XV 7WOvWoGM6pdGvadkdZyujp51ELpnIDyS3o0i704WxvUBYoLYmKZCJKreQ8tSwfbw/1UR vEkOElgcovGPnojXC/oJnoPrvlcnoX3OAk3A9dWC4ra7++GZaFyUv4g9XvEg9xTe+mbS fniEsxGaA8tm81LU1AGS3YAtck0Tv7JbI5G8YdIU+GhxHt3C7oPqFDBMoz4l4X5rjt+p wVdGRB5RaQmaphrj3VndiX/lTlsk0NWTbMou4HJiK+84kvQy2vsfeQQl9X67PDmmtvMJ XfUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521501; x=1772126301; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lbJf3C90R3jDGQBcdsPQ9rdD2GJU3JqzF3kfy/njWjs=; b=A6pD0rj4dTakbygQchXJ9crWnse9GJONL6m9eLHHmbbmY4jRo7Q5WUGe43cLoCeafo bspeibSAtZV/qOmdYVDoYAAyBUnN8yR4DZFdfG9SpF2Arceg7NwkDfT1i4/vAig0Le/D rHoELZjtEVCgdiN+HQWOCqHjpvmFJfkC6HdgHz7iuo+NQGJ3wf2DAFlqVp45icglwCYf 3F0z18YnPWY32QcIEhU3r4fFpWY2fpNnHHn5ZsjyUc3xlBCj7gYyuMruynO20t/S2Ln1 6Z2x8bBGZAv20qmWQui4hDUAb0M4w4NHgGtMbfCx1sx+tw3bELMgc6j/QBogbpgOXP2e 4TAA== X-Gm-Message-State: AOJu0YwQ6FkCGA6N7k58rjtwpfnuIwjml1FqWgFVmfQtTIX62d4PvoLG Iq9KqxzgsfPVdaw2uASD2f2574WJOQkbGLz1RzzTf7hjkidos7uuhjO5ZMs5j09klM4= X-Gm-Gg: AZuq6aIzeQXaL18WaqA1iBrHpvvVSiszfuOZOfoTfG5MPQF0urZMqKdlzIID/KRiVF3 zCExOZIwzZRZ+vhN2z6GiAT+BihHeVVZc7w32NgyMY0xf0DF8cqYBD5KallAzcJoKyc3SGncsrt cTJlu0RAgA461hIB//pYTnYrrFAGJIXaaEpbyS2hz7+q3K4dy94MIS6MZTEluPUid5ogzhiIOjB jsAr8iTV2sIhlo03teNVx4aFssS1uGbVXSkYYyypHaVAJ6HeTnm/1YW8JIcZ2CyKyVlFQ7H5p5V QLRHqoYItiOypAw7D4asdqWP9iRzmUpbJyq4uOegP/viHMhATcSO4jugzKH7zS3p2jHyFBCaAIg B5Zh0xjqFMw143aazNQAEsDnDTE6siQ9itUSaOGS04JIXI4hJUWYTTJja6p0hbqqlyzrrb4Jjmw jmR9tLsSC5wRcGvwYaAwn68po= X-Received: by 2002:a17:907:6d28:b0:b87:2fcd:1955 with SMTP id a640c23a62f3a-b8face541famr1257006666b.50.1771521500922; Thu, 19 Feb 2026 09:18:20 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 13/14] target/alpha: move cpu reset into a proper reset function Date: Thu, 19 Feb 2026 17:18:09 +0000 Message-ID: <20260219171810.602667-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521602779154101 Now the alpha clipper machine will execute a proper reset we can use the reset mechanisms to reset the CPU. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- target/alpha/cpu.h | 2 ++ target/alpha/cpu.c | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index 45944e46b54..0da6a4a2f10 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -269,6 +269,7 @@ struct ArchCPU { /** * AlphaCPUClass: * @parent_realize: The parent class' realize handler. + * @parent_phases: The parent class' reset phase handlers. * * An Alpha CPU model. */ @@ -276,6 +277,7 @@ struct AlphaCPUClass { CPUClass parent_class; =20 DeviceRealize parent_realize; + ResettablePhases parent_phases; }; =20 #ifndef CONFIG_USER_ONLY diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 1780db7d1e2..e225f11ac0a 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -202,12 +202,10 @@ static void ev67_cpu_initfn(Object *obj) cpu_env(CPU(obj))->amask |=3D AMASK_CIX | AMASK_PREFETCH; } =20 -static void alpha_cpu_initfn(Object *obj) +static void alpha_cpu_reset_exit(Object *obj, ResetType type) { CPUAlphaState *env =3D cpu_env(CPU(obj)); =20 - /* TODO all this should be done in reset, not init */ - env->lock_addr =3D -1; =20 /* @@ -277,10 +275,15 @@ static void alpha_cpu_class_init(ObjectClass *oc, con= st void *data) DeviceClass *dc =3D DEVICE_CLASS(oc); CPUClass *cc =3D CPU_CLASS(oc); AlphaCPUClass *acc =3D ALPHA_CPU_CLASS(oc); + ResettableClass *rc =3D RESETTABLE_CLASS(oc); =20 device_class_set_parent_realize(dc, alpha_cpu_realizefn, &acc->parent_realize); =20 + resettable_class_set_parent_phases(rc, + NULL, NULL, alpha_cpu_reset_exit, + &acc->parent_phases); + cc->class_by_name =3D alpha_cpu_class_by_name; cc->dump_state =3D alpha_cpu_dump_state; cc->set_pc =3D alpha_cpu_set_pc; @@ -311,7 +314,6 @@ static const TypeInfo alpha_cpu_type_infos[] =3D { .parent =3D TYPE_CPU, .instance_size =3D sizeof(AlphaCPU), .instance_align =3D __alignof(AlphaCPU), - .instance_init =3D alpha_cpu_initfn, .abstract =3D true, .class_size =3D sizeof(AlphaCPUClass), .class_init =3D alpha_cpu_class_init, --=20 2.47.3 From nobody Sun Apr 12 00:57:50 2026 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=1771521612; cv=none; d=zohomail.com; s=zohoarc; b=TGIagLJUvhOowqw+JscPVAqLUQPBt8YrpBHdMS+dTRpoYKymHQcRsIViBnE19ACjguXNHtFLoTdA3p3OcUC+62F+eVVNrxqakW+22uBK7rKzeH5D5YUf5g7wU0a9AP1J0yBDNLQD6V9Ax1zkO1VDm6fHJMnJLE4TrSY70zMZrQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771521612; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tCDkr1jO2SJrSBq99OhOFgeCFzvnaZH4BPYFgm6DI20=; b=aqiPLdnJ7CD2trDx1jZAnDlOKT8Pp439i24uQfdKRZOp6yHJhvqMg6sNZhKlY3DMpMLqlY9qIcq65LuGfORpBDKpZdoDxete/pPcDcCV375aaXqIzBc1RqhetDjxAzYOK/nDIPOYyunagQIlQ4X5k+wyUbGfal7IP+dIOY8d3c4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771521612259665.0298632643793; Thu, 19 Feb 2026 09:20:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt7fa-0005U6-Gt; Thu, 19 Feb 2026 12:18:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vt7fU-0005QU-P6 for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:24 -0500 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt7fT-0000Tn-Bx for qemu-devel@nongnu.org; Thu, 19 Feb 2026 12:18:24 -0500 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-6580dbdb41eso1528223a12.0 for ; Thu, 19 Feb 2026 09:18:22 -0800 (PST) Received: from draig.lan ([185.124.0.126]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-65bad2a9d1asm3984008a12.15.2026.02.19.09.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:18:20 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BB66C5F8DB; Thu, 19 Feb 2026 17:18:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771521502; x=1772126302; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tCDkr1jO2SJrSBq99OhOFgeCFzvnaZH4BPYFgm6DI20=; b=U9y3tvTGjJTwQ2i1M3/vRVzYcRWBDC+WkX4CIQioYXmVBUglvHWRh6bZAdnmn4H02E 9q+H7t8+5v/n80SaJiVPkMLZuwhcrVYULO9uG9hOU6QvkxlFEB/rDbUsmCZRAL1ladeK 685PKDTHS8KT/o9D2aoE/cahZsIozeLSa1L0E0TwScUVLhBaCTkc4umQOf3XMFXaE/Pn LT3mjftswObJ8xz9qk9eNBpWDURIHr4umqvlT0I90RgUcZG8OLOmbnnK5u/lKI5LsbQn DB3d/JPywG8DL7KIEWJIZ4Vc2/3Y8GmbtoFrwMi7pyHBqWO62zVIlc9u6o3nsEF2fisS WeSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521502; x=1772126302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tCDkr1jO2SJrSBq99OhOFgeCFzvnaZH4BPYFgm6DI20=; b=D4pYSzHIW2lWYnVR4rjBAD1VrDSQ6m1ypmFxAnSpCfiAd0MTaLlWJzEzKfpZenmJto c+14P2YFd6ZmJimYA880a+fC6Dl4ZAmQpKhXjQGd06qCFoC5I8TQ0ojGw4CkHWNKEVme XGzLPCyVPzr1MFdXmKE2CiCaROKwDuNNSMf/Qofg5jXieVUv6YLIqDF54JoP3L2V8eU/ CVvTtFuvTq4WdoID50uZ1tX9zhhwNKBV/FgO0mISuzCVZ6GQIrScYAxxI821yAf5jx+d gY/ajEtIEtvDZSA1Lrf51PsgHGT64ONiyZujgwwpXz/8pbLj+2zgB42WtZUaDoSDBitK VBeg== X-Gm-Message-State: AOJu0Yx9BRj2c3Lt4HlPaLKWWIwBQVXxttHOx9i2hQR8ejlqmeTcbRnq xAep7775pfGCSYYIfmFxCRrJJptj3zHOfEZMCAMZVHH48/wcBSyCh7pCqQT2KnnMzCA= X-Gm-Gg: AZuq6aJpk3wVH0857hoDld7nnkicAgPb6mvaORcOevk9SQgnX9yCyFervX9kTJfggMD njKKqpF0Oaz+Dn7gr0om7OKD8iWqb7+59Fv89L7APlD2VJRWfWB4+ChccuHzYoFgNYGJrOVBCTR NLOz1FsVU3EpOzf0JQbLZdpDxU1q4F2GkwEQOZVhW9tfuCPcfx0H2qxLqt9rBQM/OJgBRtz/Kwh W+EnwLbfUHtBRff/zi7/GQnkes2FuJ4AZI8/ldU6TKWKWeD9ABbzt0GwYlWJtrFDb4SaC6eLwPm 4vcr7KznppMYba9KLHoJS28V1Nhw2oIADG660+fYhgSHnmIo6Ggx38+cMoO2xWFfcm+J+12qc0B XqyfmcWd6UFoXMvDbnR2ytW2QvVUP/vxixMVnqn0yQic3KjYL4geOmMZ9lkOAjdwDudbIZTBgE+ ej78FS4BBO0P4H9fW5WzRNgbc= X-Received: by 2002:a05:6402:254a:b0:658:15c4:6790 with SMTP id 4fb4d7f45d1cf-65c76a13a38mr3577387a12.17.1771521501815; Thu, 19 Feb 2026 09:18:21 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , qemu-arm@nongnu.org, Laurent Vivier , Thomas Huth , Marcel Apfelbaum , Akihiko Odaki , Aurelien Jarno , Jim MacArthur , Eduardo Habkost , Peter Maydell , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Zhao Liu , Jiaxun Yang , Yanan Wang , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH v2 14/14] include/hw: expand cpu_reset function docs Date: Thu, 19 Feb 2026 17:18:10 +0000 Message-ID: <20260219171810.602667-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219171810.602667-1-alex.bennee@linaro.org> References: <20260219171810.602667-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::530; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x530.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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771521614813154100 Add a hint to the developer that this should only be called from a reset chain. Reviewed-by: Richard Henderson Message-ID: <20260108143423.1378674-13-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Pierrick Bouvier --- include/hw/core/cpu.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index ef20cb356a6..89934b8efe2 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -815,6 +815,9 @@ void cpu_list_remove(CPUState *cpu); /** * cpu_reset: * @cpu: The CPU whose state is to be reset. + * + * You should refrain from calling this during CPU realization and + * make sure this is called from the reset logic instead. */ void cpu_reset(CPUState *cpu); =20 --=20 2.47.3