From nobody Thu Apr 2 09:28:43 2026 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (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 8405535B651 for ; Sun, 22 Feb 2026 17:32:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771781568; cv=none; b=VQlmPY9FHLf+V+9AI6cFJhfSMdCcnviVm4Roc8CaE0J7r3FIccW3jClb3nd6d9N9lLWSGHw9b8XAXyELRIyeaVmNZPu8CA/mE9BDkRebi9hnsW31ja5LaKdZvBhvNqFUzcstJYNPoZC0Fquhcs7cqWyl2O6oqYgbXSd6X5XR1sc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771781568; c=relaxed/simple; bh=1m0uQK6CF91pCqxZ05R2dJ2x/VRhrWU9g6QLkLHuA+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jBB04uUYK2iJoTpZ9IJq2NLi4c6a/Vlu9U53Ckgekh9ndQXf5nQOcKXbvZH/PD3z2r++I1NOrJ4lMbJZf4YVKYp6z2M/d9K6Cfe8heX6eo4wDEgiKUU4lnbrEY305xGGRSaeMidSxN3zYlTyVJRrd2GNo2+IuLx2MZI1+L9VE1Q= 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=Wqs7c+Qv; arc=none smtp.client-ip=209.85.215.169 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="Wqs7c+Qv" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-c6de0527ce1so2007286a12.2 for ; Sun, 22 Feb 2026 09:32:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771781567; x=1772386367; 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=0wImU8utWXre1Uxo904gEyPqXxKNFzEXRXMuF4CHFNE=; b=Wqs7c+Qv6EJG//0TZ8uia4pjvAx3aW9zFICvglDd79CYOGlLAmkSvlaqNP3Ka6YCjF 1YMBUzwHuIu31pFI9LoRFt2BPDoMKAiMACh+jh/4N1j/pxHx9G9u8/Jw9/EjkSDnfeX/ KPlWNR8ISGxTADV3uguVE/qG7uAg0MNz+FFoSJGtxunmZNsZxdkWm/F/GPpJfmwvjnXU ozCUyC/nrNt7/pqRbGPxXXyHN1a5/2ye/ffITBKgW+IB9UTJO2vCdbBdY1JyBo4IpuTp fjDB4fYnfEvGuKoskXm9fgzCp8RalRs6F/X5wo0nCrhadhtylvW4rpuHEEpEzRyauZJ4 qBnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771781567; x=1772386367; 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=0wImU8utWXre1Uxo904gEyPqXxKNFzEXRXMuF4CHFNE=; b=SZfAJyGzv8gZ30Mm/SJjL4FPyKdv5dj/y9EQ1rdREn0Z+1Xtm6fIj0HzuwRtI28Vy6 gDmzVNrQKLZi8m+aJLqotgQjjsRCVp/epPkqJGvU4f2o20+fxVhvJ8jXtthtKcsars9O UqT/dZ/6/WuJF12nAlsV2AiUpCHHqcLx6fwTWtNsPBe6cq26fg2LzXeEr2nPCnoVvIkP sSh6H7FK6qkPq5lKuPFTXcnLe0BwaCjPTqX1RWVjpxTiINQ5wPm37Ap1wjsuG8BfJhHV k3m55XUr3wsNiU+aMX4nwlq0yRe5OpnkOBPIAoEgHlCw+P9qcMYU7Kem8C1YGK+mZi2I 0Lzw== X-Forwarded-Encrypted: i=1; AJvYcCVKZIs1HvAkPEFIjl7lxRSGd+Smdwz1mUdwesHsR3Hnw9VjEbr4t+sOkXhdwuuJAjUlwSaPGiY52NLk1io=@vger.kernel.org X-Gm-Message-State: AOJu0YzHRUoAWgRoOOQfCsxNDvinKKAkB5qx/T80yTNZqSuKGwK0vkEe kt7FgKAPJ7twA+cMvnWAFVDGFvSC3XedXP1gzF3eRGENjhR7gOHnP8OJ X-Gm-Gg: AZuq6aJSvAGKfDn+n1ghAphy5+5DOZUenD8ZXcAHjxTJSg157GGouRxGyyMgoFc/8bI RMnr8PDC8XfUEiVERtnczeneHZbybGXE+OLOWHZpm3IWHZWFOK8WF/h1OPNbWEb36voCSh2u9ot ea0mkGErNMK453o5tcWLodOdz6kzfO/0viNmevXYLKs45wPfcMN3aMxFqUo8ZFFkQ0YOkv0ckMY mmyKDuXN2kKiof8sZ64w5FBxwdsTYo6Lth19ZNOcPySn8mLkOuvfAO5OuW392GRJFdDBukYrjHL OYzFZS+Rw+/dVohaaqU9MO9j9T9TocaaeymnI595s8D8fyzaZG7epCunkmMFYZslzZFcd199Acg mpeKVNroPGqxx0QRkaiY2bQeG9kUMG1/1iNZ9EIoh3CNI+hL+6POZbmNOsRuDUTSlxwxUBOwMXQ aPXAli9g62mVnIc2ViJdwqZZSUYtGoe02wNfendOBy07Jf1JWZ8FZ5Ah+QuOY43tR7EadCJzsf4 ktlLlm/PxX4hrboYgieD1ok0mfL0IoFSrkR X-Received: by 2002:a05:6a20:3d19:b0:394:6344:e5c4 with SMTP id adf61e73a8af0-39545dc00f1mr5380438637.3.1771781566900; Sun, 22 Feb 2026 09:32:46 -0800 (PST) Received: from visitorckw-work01.c.googlers.com.com (7.162.199.104.bc.googleusercontent.com. [104.199.162.7]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c70b726cbf2sm5275750a12.34.2026.02.22.09.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 09:32:46 -0800 (PST) From: Kuan-Wei Chiu To: geert@linux-m68k.org, sre@kernel.org Cc: jserv@ccns.ncku.edu.tw, eleanor15x@gmail.com, daniel@0x0f.com, laurent@vivier.eu, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-pm@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v3 2/2] m68k: virt: Switch to qemu-virt-ctrl driver Date: Sun, 22 Feb 2026 17:32:25 +0000 Message-ID: <20260222173225.1105572-3-visitorckw@gmail.com> X-Mailer: git-send-email 2.53.0.345.g96ddfc5eaa-goog In-Reply-To: <20260222173225.1105572-1-visitorckw@gmail.com> References: <20260222173225.1105572-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. To prevent any regressions in reboot or power-off functionality when the driver is not built-in, explicitly select POWER_RESET and POWER_RESET_QEMU_VIRT_CTRL for the VIRT machine in Kconfig.machine. Signed-off-by: Kuan-Wei Chiu --- Changes in v3: - Add 'select POWER_RESET' and 'select POWER_RESET_QEMU_VIRT_CTRL' in Kconfig.machine to avoid restart/power-off regressions. arch/m68k/Kconfig.machine | 2 ++ arch/m68k/virt/config.c | 42 +-------------------------------------- arch/m68k/virt/platform.c | 20 ++++++++++++++++--- 3 files changed, 20 insertions(+), 44 deletions(-) diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index de39f23b180e..624e6b27f394 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine @@ -133,6 +133,8 @@ config VIRT select GOLDFISH_TIMER select GOLDFISH_TTY select M68040 + select POWER_RESET + select POWER_RESET_QEMU_VIRT_CTRL select RTC_CLASS select RTC_DRV_GOLDFISH select TTY 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.53.0.345.g96ddfc5eaa-goog