From nobody Sat Feb 7 21:23:57 2026 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (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 003133D3D14 for ; Tue, 3 Feb 2026 17:08:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770138522; cv=none; b=Vy0xw2Y/KopxnFBJBlzHirBjQ2eRAGgbKItuEBPlB/3hPLEOP/phBXU1/lpEEUhTrX0xx8FQG/LCYpchu7Bv8xnfZLyWru5RtI0cmV6cLPHm2O6RhQwn0FIWCMtSGaDsm2uQMrFU8glzok1YlibK2PSm7VI+mxPA4U2iAcMMqcw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770138522; c=relaxed/simple; bh=/fH3+b9yDcS1GIgeZS0m79tZEAT4nkei8lSgwKowqvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NhJ7iTTa/hv7LZjeyKdRBeK6FXwzfbVj+8EeyFE1UP5kTUyVCtlD3U1sZEHz09uAVm3535kfj/rQ8F9JakuX4qxtvoVPtE/tDcrB/RtNr0i6XRsHc2NRtnnInWTF9bu2AR2aB6jUNW0aE9OyG3z+hLAznioDtOH2xhZEMOTpXGg= 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=I2j8z48n; arc=none smtp.client-ip=209.85.215.171 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="I2j8z48n" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-bc29d64b39dso2321346a12.3 for ; Tue, 03 Feb 2026 09:08:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770138520; x=1770743320; 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=CTHfF0XW7B+7Ih5DzZqFm1iLafo8D1AWNlp8qH8D6r0=; b=I2j8z48n3ENz9QK6bZcO5Hbm/22Xc6BJSTSYi8fn+bEl4PGqk5QtgBD8X/YI8IfnIa X8xF2hK1BkN4YxKSHs0iMfOrGL1E1UOtwJgbsnKVqdjKmZQpLa752n7nxbNMKBfpbZxI 5/Ctl1wpidldvr2eweAiECrGnxo52rdZoNMU5Tiou+v/xxSGfWCTPy3WoPAyBvMIoEBK jTjce1TxS1ZZZgnV1Ur3+oqKxADjKQ0220j2jITFjDfavQSQ8GAsoYZZNsspoMM+JKTZ dQPFVYNUPoTjn8TMiqihBXVf8ITdU66pUsQcVbUAjKBknIPEExgnDP6H3Lgeeir1K9Lq X//A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770138520; x=1770743320; 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=CTHfF0XW7B+7Ih5DzZqFm1iLafo8D1AWNlp8qH8D6r0=; b=Fo6fgVSFXtwQPSReGZL289KDjwgRxf6Kr6HF7Mu1hMjlMhYoDc0fI8PZmN2WVtJeqj xglHKsviANJeUePuKa8z6AEftrY5WNnfK7gFydPkRCl6LrgLqJbh6eIT9PJSRe8GPiU/ kXu+yD8INu5a2/Y8/IRFRyLlENX6W8DFr4nKSsGfaW6TuO0evaP4ykPr/wi2uCnnu+jW 0SLnA4q0RlndR3gpmjBNLxLKrK5EWQ2M6uTSxAo4ymNW7nnGGAcufQFbI0u068YlMwHR zAtWGSTf0yYJ1qVLFiMkK8b5BH969fOzxzKgEx1d67ORI3czjJVza1OMvcDsyLSrm5qm ukpg== X-Forwarded-Encrypted: i=1; AJvYcCXRC5fzi6s4JFUzu1oYAIfVk0oBJM5nKi9MgayK5SxrkJ9LFbd+BJPYO0o8q4wKgbtco9os7DdNqcf5JUc=@vger.kernel.org X-Gm-Message-State: AOJu0YxNGtmKE12lXfY5zRKrwFumFXUokA4n1YxFfS+z0z01a7W5t5El qGvBKqDFKonXzPuAhtD0bhmdZjI0btTex6ilO82xxOjau8rDhPT0jA7v X-Gm-Gg: AZuq6aJZc1DvO5z6lPJeYYTC4vIKTgNp8NH/e6QKxG+Ly+vIKF9LLLxof5zT+mF3XBo BC/cGLRGraiT4E+j6dtwfW7gIVY2dsnHegJSkIX8GaWy6t7PUJAd7BrWtcuOlg+Qe3s7WZG8On9 0AiaFv6pM2ooJZyrbm2s03qrvbWdnN8wuJKPc4/pS0runmLrjIyIQvSJHqhgApdaICxiji/Pwvq 8hqj5lYpiMl066Xk20UL69E1MFFa7c8HhnahXjMlxI+V01vIXc6doie9UnGBWOqTCdBoKSiupM+ injEYeohTN2VYAhdh2J6DncVfG0zwR5PsN4tRyn2v6lYBABjJxVeld5V+NOSGEtiQVuUVgg8X4R a8aTlaw43hMUT6LtVwUSSmidYs4PWH9gI5t0sjXPVsbLpTI4boNd1m+rbbL+m7m1q2Xc4BVUOxA FpF/Du5KnAu6yPGWBQx868Ry/z+4v8HX1RsxFFLuwNMCtQIYiSn1IZczWfDIPomS0fMeZ4ltGcQ moLZ4tOq1p+KYvNgqtMIBuhADc= X-Received: by 2002:a05:6a21:a4c9:b0:38d:f08d:b349 with SMTP id adf61e73a8af0-39372427382mr82350637.43.1770138520086; Tue, 03 Feb 2026 09:08:40 -0800 (PST) Received: from visitorckw-work01.c.googlers.com.com (118.239.201.35.bc.googleusercontent.com. [35.201.239.118]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3548633616csm177520a91.17.2026.02.03.09.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Feb 2026 09:08:39 -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, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-pm@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v2 1/2] power: reset: Add QEMU virt-ctrl driver Date: Tue, 3 Feb 2026 17:08:23 +0000 Message-ID: <20260203170824.2968045-2-visitorckw@gmail.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog In-Reply-To: <20260203170824.2968045-1-visitorckw@gmail.com> References: <20260203170824.2968045-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" Add a new driver for the 'virt-ctrl' device found on QEMU virt machines (e.g. m68k). This device provides a simple interface for system reset and power off [1]. This driver utilizes the modern system-off API to register callbacks for both system restart and power off. It is designed to be generic and can be reused by other architectures utilizing this QEMU device. Link: https://gitlab.com/qemu-project/qemu/-/blob/v10.2.0/hw/misc/virt_ctrl= .c [1] Signed-off-by: Kuan-Wei Chiu --- Changes in v2: - Use devm_register_sys_off_handler() instead of register_restart_handler() and global pm_power_off. - Switch Kconfig to tristate to support modular build. - Add .id_table to platform_driver and use MODULE_DEVICE_TABLE() to correct module auto-loading. MAINTAINERS | 6 ++ drivers/power/reset/Kconfig | 10 ++++ drivers/power/reset/Makefile | 1 + drivers/power/reset/qemu-virt-ctrl.c | 89 ++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 drivers/power/reset/qemu-virt-ctrl.c diff --git a/MAINTAINERS b/MAINTAINERS index 0efa8cc6775b..57b403dae375 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21190,6 +21190,12 @@ S: Maintained F: drivers/firmware/qemu_fw_cfg.c F: include/uapi/linux/qemu_fw_cfg.h =20 +QEMU VIRT MACHINE SYSTEM CONTROLLER DRIVER +M: Kuan-Wei Chiu +L: linux-pm@vger.kernel.org +S: Maintained +F: drivers/power/reset/qemu-virt-ctrl.c + QLOGIC QL41xxx FCOE DRIVER M: Saurav Kashyap M: Javed Hasan diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index f6c1bcbb57de..99e3334726a5 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -354,4 +354,14 @@ config POWER_MLXBF help This driver supports reset or low power mode handling for Mellanox Blue= Field. =20 +config POWER_RESET_QEMU_VIRT_CTRL + tristate "QEMU Virt Machine System Controller" + depends on HAS_IOMEM + help + This driver supports the system reset and power off functionality + provided by the QEMU 'virt-ctrl' device. + + Say Y here if you are running Linux on a QEMU virtual machine that + provides this controller, such as the m68k virt machine. + endif diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile index 0e4ae6f6b5c5..d7ae97241a83 100644 --- a/drivers/power/reset/Makefile +++ b/drivers/power/reset/Makefile @@ -41,3 +41,4 @@ obj-$(CONFIG_SYSCON_REBOOT_MODE) +=3D syscon-reboot-mode.o obj-$(CONFIG_POWER_RESET_SC27XX) +=3D sc27xx-poweroff.o obj-$(CONFIG_NVMEM_REBOOT_MODE) +=3D nvmem-reboot-mode.o obj-$(CONFIG_POWER_MLXBF) +=3D pwr-mlxbf.o +obj-$(CONFIG_POWER_RESET_QEMU_VIRT_CTRL) +=3D qemu-virt-ctrl.o diff --git a/drivers/power/reset/qemu-virt-ctrl.c b/drivers/power/reset/qem= u-virt-ctrl.c new file mode 100644 index 000000000000..2192ead56ca0 --- /dev/null +++ b/drivers/power/reset/qemu-virt-ctrl.c @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * QEMU Virt Machine System Controller Driver + * + * Copyright (C) 2026 Kuan-Wei Chiu + */ + +#include +#include +#include +#include +#include + +/* Registers */ +#define VIRT_CTRL_REG_FEATURES 0x00 +#define VIRT_CTRL_REG_CMD 0x04 + +/* Commands */ +#define CMD_NOOP 0 +#define CMD_RESET 1 +#define CMD_HALT 2 +#define CMD_PANIC 3 + +static int qemu_virt_ctrl_power_off(struct sys_off_data *data) +{ + void __iomem *base =3D data->cb_data; + + iowrite32be(CMD_HALT, base + VIRT_CTRL_REG_CMD); + + return NOTIFY_DONE; +} + +static int qemu_virt_ctrl_restart(struct sys_off_data *data) +{ + void __iomem *base =3D data->cb_data; + + iowrite32be(CMD_RESET, base + VIRT_CTRL_REG_CMD); + + return NOTIFY_DONE; +} + +static int qemu_virt_ctrl_probe(struct platform_device *pdev) +{ + void __iomem *base; + int ret; + + base =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + ret =3D devm_register_sys_off_handler(&pdev->dev, + SYS_OFF_MODE_RESTART, + SYS_OFF_PRIO_DEFAULT, + qemu_virt_ctrl_restart, + base); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "cannot register restart handler\n"); + + ret =3D devm_register_sys_off_handler(&pdev->dev, + SYS_OFF_MODE_POWER_OFF, + SYS_OFF_PRIO_DEFAULT, + qemu_virt_ctrl_power_off, + base); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "cannot register power-off handler\n"); + + return 0; +} + +static const struct platform_device_id qemu_virt_ctrl_id[] =3D { + { "qemu-virt-ctrl", 0 }, + { } +}; +MODULE_DEVICE_TABLE(platform, qemu_virt_ctrl_id); + +static struct platform_driver qemu_virt_ctrl_driver =3D { + .probe =3D qemu_virt_ctrl_probe, + .driver =3D { + .name =3D "qemu-virt-ctrl", + }, + .id_table =3D qemu_virt_ctrl_id, +}; +module_platform_driver(qemu_virt_ctrl_driver); + +MODULE_AUTHOR("Kuan-Wei Chiu "); +MODULE_DESCRIPTION("QEMU Virt Machine System Controller Driver"); +MODULE_LICENSE("GPL"); --=20 2.53.0.rc1.225.gd81095ad13-goog From nobody Sat Feb 7 21:23:57 2026 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 723E83D3D00 for ; Tue, 3 Feb 2026 17:08:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770138526; cv=none; b=TSrzOoFgiKzJhuxCsezQ1sV8IGjvM7GVcdQKgR5aqcBe8/w7BN+WskqL1FK1goieFNG/DtLAKAYJ2Cag4L7qqf1qNxNNj9MAV2jg9BBR6DkuuZ73IQdMS6wJBX77NsMpboSYR4fE8VnDCRtTTUciDv8/vOMiRFaf9d6veeVmwvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770138526; c=relaxed/simple; bh=T6tIZRJUpiLEl+8c9MJZV1DBe1EhMpSZLJGZ8wivEa8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bYsOF3TQhL9fZ15kR5P7Wc0Jq5uzL9IPASkXGdAKxhYqvC9KeTU8Ucjcx+GONNUZeG/+Edked/2jYOuRFap7aOSAEIBaNu2x/q4Imqcm9nY+qMYbsSZMxZ4ejNYc7sw0mfYfBeoJDeFkgglC7t0+rEi8VOgMdabFtk6X1wK3Rtk= 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=LZc3Lg0L; arc=none smtp.client-ip=209.85.216.45 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="LZc3Lg0L" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-34be2be4b7cso3111045a91.3 for ; Tue, 03 Feb 2026 09:08:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770138524; x=1770743324; 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=9zD7pq3hW6e61IJuUPkSkjm+44mDvpuhBJ6/ipMbijs=; b=LZc3Lg0LLPrtpw7Pj0uBcZmSharSXYngpdAs7UGm2bushRIDmxKpCF76vyj0BLAZHT mH2/nm0BX+GmBt/GcwHFiBOaSkYqyBVkZfMq3OBCBWm7plbY5M90T6h3Jok4z9leQsIz 2kfbu7749hpwhsLbYt7EFQCzwiGCqfc1VZvbDbPyAWhBsENnWbbW6NBTBibt2anq6zkz YDgKxE1dmOuIdlhLc1JOTlSiOqAXirqqFF03qeXM7Au3BPLTnXKhRQq/4SKSvsZ7qbya 27Mno0JsMe+KoQL44nEpkjR+guvcTvWGHMVv3sU02N/NVYCYBWtL6JrAuLZMz+7lNhtQ 38GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770138524; x=1770743324; 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=9zD7pq3hW6e61IJuUPkSkjm+44mDvpuhBJ6/ipMbijs=; b=GF3kIZPQy8b5RnNeu8IoPfYVf2+qP50ZYP3f5NEytl6WEkdmrmLlpdM7rw3pwl+9Tg Shssm3TLxybxiTCSMNRBFhcFlFcsa8FxSx+6RECpfSbzdCV/kEmOLsv1fOXAMOA6njYh T3Jf6tpZAWd33AQRvZDIeqGY3X+hyCEcPRHL/yb9012OSift4xy8pN/EYFWgHEfQyIyT /FTRbPtesxmskUlMWtivxK0lHx2nGmyw9p7Yo1mcj1kxDnZRq6Mfm8q5dJ7QTCppsyX0 vZlD5Le+VYIV33tG28X6P2HlBjDs156EHCPUB1VK0M5SaJw+SLHpdfULS9/0ATap43HT o3gg== X-Forwarded-Encrypted: i=1; AJvYcCVxgf2eHP59HkG+oFkgU4KUDVEqYiDRNa4BiyWNwNoWp/OuBWQrFYypGBevWDD+e4SJr/dxxBcWFI2mkQA=@vger.kernel.org X-Gm-Message-State: AOJu0YxtBsEhywsBMOIIxYOxKztjHXHBrM37AMBAioSgiBoHH9IiFyjS j++7Zv53OfDUvK2ku5FkjdArLofKA+J7YZbikD+7sI68IXZYZ+sUhgRb X-Gm-Gg: AZuq6aJW/4m00MKosWkyZMdFan/MzzwmP9/CJzSq+gl0OOYvFIuVM4Ye4EuOMqQxzp6 rt3bDJRcE/FoIoNuBNlTgMIVhGWJYLtU8tYSmjDRbk1ly6a1XwG2eFv+hbQyTNoRWirhQupyyD1 G7IGpS0PV+RDfL8UXt9CXUq4bwDzuuhr+0iqaaoFeZzPe7yLyWLHnS4GNRu9wPatIIvwg+026VV wGc3UB52MFF6siLJynPCi4nm+/n2slFuTBl7Ud1LA6wOXLhu7RJ6fU/4vC8q/riH+YIui//pnom N/MRjJvOVT/imZWbAWnljLpJxWeMwacfFroAN/ty02ZVwB3S1bPRyr6KFonyqy/vUQMxg04em5O Pe9/dNF55r0o2D4L0H4HKgEh3UOnzb/SFqP+1b8uw9HB1mFSH3OBJlpunI3/3NEZN/MjJ5/4oUL xOKFL6s+5bvDhczVuN19NM7GAbXVVP+jrk7TebZVueL9he6cii34fGNzgNJ6g52fcobKByIq+Qs TaAXWFjJz48jpxIKAQiziCK2t4= X-Received: by 2002:a17:90b:3905:b0:340:f05a:3ed3 with SMTP id 98e67ed59e1d1-3543b3b21d6mr15984672a91.17.1770138523661; Tue, 03 Feb 2026 09:08:43 -0800 (PST) Received: from visitorckw-work01.c.googlers.com.com (118.239.201.35.bc.googleusercontent.com. [35.201.239.118]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3548633616csm177520a91.17.2026.02.03.09.08.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Feb 2026 09:08:43 -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, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-pm@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH v2 2/2] m68k: virt: Switch to qemu-virt-ctrl driver Date: Tue, 3 Feb 2026 17:08:24 +0000 Message-ID: <20260203170824.2968045-3-visitorckw@gmail.com> X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog In-Reply-To: <20260203170824.2968045-1-visitorckw@gmail.com> References: <20260203170824.2968045-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 --- No Changes in v2. 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.53.0.rc1.225.gd81095ad13-goog