From nobody Mon Feb 9 14:31:54 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5293387585 for ; Mon, 12 Jan 2026 18:23:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768242209; cv=none; b=YY+6qkvGVcGvb4qmV8p0Hm37g1PTJSmnHLgMRyC9bK062mRDuXr+Saz5J1w14qmpi9g1+FfUPWg7TEdhnGQTsXt2Kv1mzatbZYzhSjZGCikLp9pNpqvhYbfvKOJ+BzYb0OsicYufnGzsYodQDymDquMAdiw1e5K7SzhYpvL9Xaw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768242209; c=relaxed/simple; bh=Kxc48WP3JMgRcgbxaB+vq6PuqCnjrP3YyAQS4BlYEQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WH+cVOgdf2Mt9wneHRzzs4M8EjQxDE7T9rA+LQCotSPCO75q/r6K7fuGp0eyweslqmuJwKfOLNrykajL5B5TVtQTTtQVdbhLKek3/3bgY87Ml+gY06fMl6j2jFlL+/WpGzbCo+JK0JQOxiOJcuN7yLd/uwiVM7vYotjjVma1BUE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jU+O4RXk; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jU+O4RXk" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-29f30233d8aso44771335ad.0 for ; Mon, 12 Jan 2026 10:23:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768242202; x=1768847002; darn=vger.kernel.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=yoCe2UhjfoZKQZoLbe4Gba2T09UGHCeiBMJ/gxSy8bI=; b=jU+O4RXkUvB5DFZHEAbH8NKHMRUSQMwiBgxvZn95nYz2CzeKFCPGBkUoCu2T25P8jO p3ue8i9VE0yYM0EBCwbBlzTQEVov4iFXEGhrcv+zQ4TB2X66wocSsJnoF2XUev+qyER2 +cQwQuD2woHUIhvNgYQXeMQrDrxeXg/92IhrYce4hUhw4/hqifT9Iz/Yoet1orPMdolM 3IkKKmkvqGTJ4qB4J+iv+2q/tg2It5Ty9I3SZS1VwnJSiDbWN5vOJmE1u7MxNL1/n9m3 dYcm2E4fRfMGzCX+XathPAu1WFgJC+9oWzciVrfw28VIqDkNCsibVkytkt9npkRIA5+2 ZKnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768242202; x=1768847002; 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=yoCe2UhjfoZKQZoLbe4Gba2T09UGHCeiBMJ/gxSy8bI=; b=sMaK/XGDHp26DVAVGtLMcXbPPVxYn2NjLUeudTt3Dlw/Qs5WBEvz6Qa2vquDEvnYhF hgSNCAOTYdu5mpxQDbDW0JhJP3aeV9i/knuJ+dgYCmC2Y+zYgezx+Yv38ZjAtvO9bipE W7qUDMGpPeJOCdN9uRIs+LQ14UOaKMu+w0fdog5q3rA1dLwGTsMGNv8TbCq7oPA2x+tq 8xiJSQ88Jot3AlK4SO67hZORseSlUKe+VeAlB3A0tct6ajyZtK4fb/mJKDOgCxwpQqTR DvszCP/fRr2zut3p08Lvfm4BDqgKC0Dxm77Xb8cGdIKd29TKhiHkyujf8y+Mbzy2uJ8f JWzQ== X-Forwarded-Encrypted: i=1; AJvYcCV4ptfdKIRxRy0Rkz48b+0dnnGq5nJWBZ5Nh5ytKXcFaJBoERWzhL8x9YyJlVsO2EMf7LNtjks0XxrK+7M=@vger.kernel.org X-Gm-Message-State: AOJu0YyIdxV1ma1SxrU49gHJyskRhSI++EhB0ueNlZMCeSGZMrdq6+em CL9iaTM98C82WslwjxADr3vfWlJnu8WZjTw47EgykWyAQL+iwpbWCXWw X-Gm-Gg: AY/fxX4dL+kvcD2BZ7tFzziugUPomk8ti2Eb2SmuWRujdkv8AEhk3J9Rdz3oPXDBslt m0kvvhol9n4uG9nPnq8C4s6T5Ca5USzmWbIARyV1A7mLYuXsXQ2t3CSYtPmkCbe9bO/XYG8TrKr 1DS489m33gm2ceONaZUmb1eJlG+jpCRBuiCEORTcmTfW1Kb26uMwWs5lAyGhWElX6MWDvlfhylT /MReqslLe5YK/NWVgRbORK/DTPlHPLp1iHovemYu44c3t0jk9U7wf6hMEISNo2LgnQBZ6NloPEf rJoQe82PMLhuHe3JGgjfZCj4hVa26XH5juHtCMufANA2CROejHWXII2jr42PVLvLVeYPLUTwaDb rJn/MEjulyVNi6xtuRD9LKNuU74bQGlOJBfmjWX/WGliF3pyesdy3dE1DaU0CS7j5uxn2BlecB4 z2RhxSxlWNwMlUJ9oMYX/uNbQogMEPURcgyXVi8A1Q61lnAiqG1W1LQbiJVpNn5zLmnLXHkHmIm eFd4rYjpoXXT8yFikYwSBYls7Shmb2t X-Google-Smtp-Source: AGHT+IFOhUPoNBwog45Pm9TL7FzCA1sp3oukPpoTWT6iUCTMKypbSZPVqb0VZiOgYc5YjqZK29Rrkw== X-Received: by 2002:a17:903:291:b0:2a0:afeb:fbb2 with SMTP id d9443c01a7336-2a3ee4f5a79mr156866405ad.60.1768242201853; Mon, 12 Jan 2026 10:23:21 -0800 (PST) Received: from visitorckw-work01.c.googlers.com.com (25.118.81.34.bc.googleusercontent.com. [34.81.118.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cc794asm180981205ad.70.2026.01.12.10.23.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 10:23:21 -0800 (PST) From: Kuan-Wei Chiu To: geert@linux-m68k.org, sre@kernel.org Cc: jserv@ccns.ncku.edu.tw, eleanor15x@gmail.com, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-pm@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH 2/2] m68k: virt: Switch to qemu-virt-ctrl driver Date: Mon, 12 Jan 2026 18:22:57 +0000 Message-ID: <20260112182258.1851769-3-visitorckw@gmail.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog In-Reply-To: <20260112182258.1851769-1-visitorckw@gmail.com> References: <20260112182258.1851769-1-visitorckw@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Register the "qemu-virt-ctrl" platform device during board initialization to utilize the new generic power/reset driver. Consequently, remove the legacy reset and power-off implementations specific to the virt machine. The platform's mach_reset callback is updated to call do_kernel_restart(), bridging the legacy m68k reboot path to the generic kernel restart handler framework for this machine. Signed-off-by: Kuan-Wei Chiu --- arch/m68k/virt/config.c | 42 +-------------------------------------- arch/m68k/virt/platform.c | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 44 deletions(-) diff --git a/arch/m68k/virt/config.c b/arch/m68k/virt/config.c index 632ba200ad42..b338e2a8da6a 100644 --- a/arch/m68k/virt/config.c +++ b/arch/m68k/virt/config.c @@ -13,18 +13,6 @@ =20 struct virt_booter_data virt_bi_data; =20 -#define VIRT_CTRL_REG_FEATURES 0x00 -#define VIRT_CTRL_REG_CMD 0x04 - -static struct resource ctrlres; - -enum { - CMD_NOOP, - CMD_RESET, - CMD_HALT, - CMD_PANIC, -}; - static void virt_get_model(char *str) { /* str is 80 characters long */ @@ -33,25 +21,9 @@ static void virt_get_model(char *str) (u8)(virt_bi_data.qemu_version >> 16), (u8)(virt_bi_data.qemu_version >> 8)); } - -static void virt_halt(void) -{ - void __iomem *base =3D (void __iomem *)virt_bi_data.ctrl.mmio; - - iowrite32be(CMD_HALT, base + VIRT_CTRL_REG_CMD); - local_irq_disable(); - while (1) - ; -} - static void virt_reset(void) { - void __iomem *base =3D (void __iomem *)virt_bi_data.ctrl.mmio; - - iowrite32be(CMD_RESET, base + VIRT_CTRL_REG_CMD); - local_irq_disable(); - while (1) - ; + do_kernel_restart(NULL); } =20 /* @@ -113,20 +85,8 @@ void __init config_virt(void) virt_bi_data.tty.mmio); setup_earlycon(earlycon); =20 - ctrlres =3D (struct resource) - DEFINE_RES_MEM_NAMED(virt_bi_data.ctrl.mmio, 0x100, - "virtctrl"); - - if (request_resource(&iomem_resource, &ctrlres)) { - pr_err("Cannot allocate virt controller resource\n"); - return; - } - mach_init_IRQ =3D virt_init_IRQ; mach_sched_init =3D virt_sched_init; mach_get_model =3D virt_get_model; mach_reset =3D virt_reset; - mach_halt =3D virt_halt; - - register_platform_power_off(virt_halt); } diff --git a/arch/m68k/virt/platform.c b/arch/m68k/virt/platform.c index 1560c4140ab9..764f556b4b32 100644 --- a/arch/m68k/virt/platform.c +++ b/arch/m68k/virt/platform.c @@ -30,7 +30,10 @@ static int __init virt_platform_init(void) DEFINE_RES_MEM(virt_bi_data.rtc.mmio + 0x1000, 0x1000), DEFINE_RES_IRQ(virt_bi_data.rtc.irq + 1), }; - struct platform_device *pdev1, *pdev2; + const struct resource virt_ctrl_res[] =3D { + DEFINE_RES_MEM(virt_bi_data.ctrl.mmio, 0x100), + }; + struct platform_device *pdev1, *pdev2, *pdev3; struct platform_device *pdevs[VIRTIO_BUS_NB]; unsigned int i; int ret =3D 0; @@ -57,19 +60,30 @@ static int __init virt_platform_init(void) goto err_unregister_tty; } =20 + pdev3 =3D platform_device_register_simple("qemu-virt-ctrl", + PLATFORM_DEVID_NONE, + virt_ctrl_res, + ARRAY_SIZE(virt_ctrl_res)); + if (IS_ERR(pdev3)) { + ret =3D PTR_ERR(pdev3); + goto err_unregister_rtc; + } + for (i =3D 0; i < VIRTIO_BUS_NB; i++) { pdevs[i] =3D virt_virtio_init(i); if (IS_ERR(pdevs[i])) { ret =3D PTR_ERR(pdevs[i]); - goto err_unregister_rtc_virtio; + goto err_unregister_virtio; } } =20 return 0; =20 -err_unregister_rtc_virtio: +err_unregister_virtio: while (i > 0) platform_device_unregister(pdevs[--i]); + platform_device_unregister(pdev3); +err_unregister_rtc: platform_device_unregister(pdev2); err_unregister_tty: platform_device_unregister(pdev1); --=20 2.52.0.457.g6b5491de43-goog