From nobody Sun Feb 8 01:31:25 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 843A9387370 for ; Mon, 12 Jan 2026 18:23:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768242203; cv=none; b=acAlgNGt7N+mDc/8hZWKYoVoavLg/7uZVZd65g+eaZQlpG86ES9XwzWruZ7Ss1Xb3d96M2NILwtOQaVbceQJYYXM1jpyYyxWlk/Rj5DK7pxJEVZ6tNRCGIynMB619U5WBG6kMhlSGwsXUda4BRkut0sKJfsIAjIB8rknwSf6vCk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768242203; c=relaxed/simple; bh=JixI5MKXXHfbCAOb4sZTT/q9s6LOvmfZnYyMilwvDNM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ceQCO6QW6roDUhblCsxwaoBY53bwpTFrIOQj68nBrvyqd3oVOyufbVlu3H8JxgD5O6whumF6CGWqm4LwFWLPIJsAqy5bfclMaS08FUzjmAY/wXy1x8n+7SH9en60UG/R3aGHvPtYwDUmkLuW7TQEwRr014CcuHKaNi+xQ1xsnOo= 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=OAkpqsA0; arc=none smtp.client-ip=209.85.214.181 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="OAkpqsA0" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2a0d5c365ceso45169735ad.3 for ; Mon, 12 Jan 2026 10:23:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768242199; x=1768846999; 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=X4oM9+6NMg5ZQ1ImC64TO0sq8NspPgsBXi1LprWrWHQ=; b=OAkpqsA0friR89/RMXT7Faw/B4SVrEpsimPi6OsntwHxo++PSTM1cwpVZKMQCMtrVk m7ASh/dqPWymsGoPCcTZGvNuE27aAbI6XDVah3rsifIbIcVAha5qvdkDIPJfyRkGQngd dda9dhXWDSXcm46rTehH7WToBYJH6ZLuQB+PeirJAJRkJwKGnx2OXFHK2PmFpJb7RtLp zqeNDJoIXIOniCRgyb3FyoG2hbIpNEpl+hW3KOxTmHpl+cb2hUjSOn5yaJJSTOdIT/m0 hyRA6vVvIvK9OYs3V+ld1Lgk5Z5GezAR4Lw+pMhqgFmilWYLMyUhpbzbYp7DDawa/d0E jrxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768242199; x=1768846999; 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=X4oM9+6NMg5ZQ1ImC64TO0sq8NspPgsBXi1LprWrWHQ=; b=C65Kp/cJc+ooPfh8ls1tQwmpH/2IP1xRg77dQShbw9Lg8dPf3u60zK1azVKLyoVwqP pBcvYITqoZc8772pHbd2xHKXdqwFP97+DsmGERLmgrFQ0TTQcFAMP/eCg8CG88EhlxyP FQ95SNFBCznRkmPKwVsxZpK6bGcaGivhZU/IZ+o1EJqoZlKGQt/whKCKP4+LsojqHS1j 1nEJ/cVsHArCuHE7TxmSQ9RZE45xwHpBalRWIkqB0J4ENDM+Aymx/CT5IjvxV6wQZK4j sJUGJgY91HyY5S6DAlUpDU9N9WQHf6uldO6JzD9oBC/O2GjjbPfcLK4ybknVDM57Xbpx wMeg== X-Forwarded-Encrypted: i=1; AJvYcCV9Z1Rky609dsK/6JdTkxOpaAa2vKbtVmS5sFzHMyQ1Y0aTcf9+eoxrYpUiDq8RRPCSkeownXS3wA64CsQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/1OcccD6iwywbjdW3ySBNjPrHlTIpnAFXYGsTSQh1+HIwAvLV nLpob4y8ZyP0V+eIK9KSM3ETZyoJuhMTE+uvrvMufA9YEOt+2Zl29dBN X-Gm-Gg: AY/fxX58oqlgJdyT4NZn0tVGvgXPg4evmOtGyVhoRwFPwMK49r2zN/DeTE9mzEAGMp0 q0ekyv5pLG5130HyH+f3FjjESUWfntju8zLXrrQghX1wL6VTHN2JHi2214+61llfht5V5gcbPMb Ru9vOL7u69lPf2WM3SucB5kdtsjKnzMQs4VqiFv4kjkAmENnZ8yTzXhDmxLhzderR4CzE0flFgx 6cHYVhhbgRgicOxyS53dryaHa4tcaap6XUhick6EvelfxkMp2zd3Dh5Yhfu9/RtYzN3Ezc6Z1QY I21dw5FeKPXK963AcwgMeChfp7GLTHMZgdIgDjald5tzYO1D57+u+Z5jcz1TeX+K6T4YNEhaifW 0IQYRON28+OjtNiblyNROFoQayzXs0KaWfCOHe6peAWzbIiKSVo9xp1sgRwv21qLc6rGrkHRgyd ifZDKfTa+HujamlYs0aYWLRbG1wBPSx70IRu7ZuNsw9sJ6/eb53y4K8+SJimyTGn0pAEtVPhF7K 33MldTj6+m2SpmeGbfSqcGHFb0S0ZVm X-Google-Smtp-Source: AGHT+IFt8RVpeeOtq9O9bSM2ksXYcn2EaNgWu8GverPZh2BzB+VspJTa4/pMhcKRNs5POXbaKfo/GQ== X-Received: by 2002:a17:903:13ce:b0:295:560a:e499 with SMTP id d9443c01a7336-2a3ee43316amr164992035ad.5.1768242198685; Mon, 12 Jan 2026 10:23:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 10:23:18 -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 1/2] power: reset: Add QEMU virt-ctrl driver Date: Mon, 12 Jan 2026 18:22:56 +0000 Message-ID: <20260112182258.1851769-2-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" 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 registers a restart handler for system reboot and sets the global pm_power_off callback for system shutdown. 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 --- MAINTAINERS | 6 ++ drivers/power/reset/Kconfig | 10 +++ drivers/power/reset/Makefile | 1 + drivers/power/reset/qemu-virt-ctrl.c | 98 ++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 drivers/power/reset/qemu-virt-ctrl.c diff --git a/MAINTAINERS b/MAINTAINERS index 0d044a58cbfe..2586e4162304 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21179,6 +21179,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..1ca1c2913cbc 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 + bool "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..f1acd22172ce --- /dev/null +++ b/drivers/power/reset/qemu-virt-ctrl.c @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * QEMU Virt Machine System Controller Driver + * + * Copyright (C) 2026 Kuan-Wei Chiu + */ + +#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 + +struct qemu_virt_ctrl { + void __iomem *base; + struct notifier_block restart_nb; +}; + +static void __iomem *qemu_virt_ctrl_base; + +static void qemu_virt_ctrl_power_off(void) +{ + if (qemu_virt_ctrl_base) + iowrite32be(CMD_HALT, qemu_virt_ctrl_base + VIRT_CTRL_REG_CMD); +} + +static int qemu_virt_ctrl_restart(struct notifier_block *nb, unsigned long= action, + void *data) +{ + struct qemu_virt_ctrl *vc =3D container_of(nb, struct qemu_virt_ctrl, res= tart_nb); + + iowrite32be(CMD_RESET, vc->base + VIRT_CTRL_REG_CMD); + + return NOTIFY_DONE; +} + +static int qemu_virt_ctrl_probe(struct platform_device *pdev) +{ + struct qemu_virt_ctrl *vc; + int ret; + + vc =3D devm_kzalloc(&pdev->dev, sizeof(*vc), GFP_KERNEL); + if (!vc) + return -ENOMEM; + + vc->base =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(vc->base)) + return PTR_ERR(vc->base); + + qemu_virt_ctrl_base =3D vc->base; + + vc->restart_nb.notifier_call =3D qemu_virt_ctrl_restart; + vc->restart_nb.priority =3D 128; + + ret =3D register_restart_handler(&vc->restart_nb); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "cannot register restart handler\n"); + + if (!pm_power_off) + pm_power_off =3D qemu_virt_ctrl_power_off; + + platform_set_drvdata(pdev, vc); + + return 0; +} + +static void qemu_virt_ctrl_remove(struct platform_device *pdev) +{ + struct qemu_virt_ctrl *vc =3D platform_get_drvdata(pdev); + + unregister_restart_handler(&vc->restart_nb); + + if (pm_power_off =3D=3D qemu_virt_ctrl_power_off) + pm_power_off =3D NULL; +} + +static struct platform_driver qemu_virt_ctrl_driver =3D { + .probe =3D qemu_virt_ctrl_probe, + .remove =3D qemu_virt_ctrl_remove, + .driver =3D { + .name =3D "qemu-virt-ctrl", + }, +}; +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.52.0.457.g6b5491de43-goog From nobody Sun Feb 8 01:31:25 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