From patchwork Wed Apr 27 23:41:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1623348 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=Gr98Xtt5; dkim=pass (2048-bit key; unprotected) header.d=opensource.wdc.com header.i=@opensource.wdc.com header.a=rsa-sha256 header.s=dkim header.b=EEgllN2n; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kpb7j413Nz9s5V for ; Thu, 28 Apr 2022 09:49:21 +1000 (AEST) Received: from localhost ([::1]:33102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njrPL-0003Xa-J1 for incoming@patchwork.ozlabs.org; Wed, 27 Apr 2022 19:49:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njrIp-0005BA-Kj for qemu-devel@nongnu.org; Wed, 27 Apr 2022 19:42:39 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:48849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njrIn-0004Xq-Rz for qemu-devel@nongnu.org; Wed, 27 Apr 2022 19:42:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1651102953; x=1682638953; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TRafi5SdzHuV4X0PCy+jdQib6Lt3hEKxPFu/WBMaC5c=; b=Gr98Xtt5+TeSHmU8P1dwtGhFEJ6vtSFPYDcLMvZr2/UhkAXed67jBTjW w9EiuGh4pH/WShmz9kvNDVPRJBIzFt61uwXDtjFwFjR7SDbjTRRd5Y+hL 8huB8RufxGP3R8ecGYd/SOWWt3fW9UsEsCml3TZAEpc8X2+Scy0C2uSUy Bk2KPss6CCpFvO+csWisRBveE2ONXeMzTtTaOhMHZ5ru3ye4b7+oZ+68d QqZPhkzoLkk3idq7JURFk7LZn7FuN5gXnOUfcccdsm6gcB5ZJaFg0ZU6O Hdjf2PncFgPoYt8OTT5oYFf4kAprnNpZEMDGlcyb7pN3vjHr2gs9huLUf A==; X-IronPort-AV: E=Sophos;i="5.90,294,1643644800"; d="scan'208";a="197844553" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 28 Apr 2022 07:42:18 +0800 IronPort-SDR: ZQZ+TcMBJB8JXqcdxh53FLi2mV0mqfzPPoB5UgJTrYGW/PBk/oFAujyj6jUnHBWBkWLHd3Ntdl F5GowpkS726kUd7T2FGJ0/uJS151cU3qXOEAzb+nDtRwBoKd9ug3igsZ0NgrL2bYLbY0CRyhtg t2TVDUDeHRVVEhKfEtw4qbVzUvGON0YVVN5gCRgBiJDeRtC2M6K7+hneucRYMyAcU5oHqKHz0g JZzt/J6uRoYpAlLQ8MmKbxSRxdUumH/aPefbBm7xb2vjwyxTSn/FHjVI82b8Ld9hxUbkVdtGKw beondNTYfHxyJzxayPcQBDVT Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 27 Apr 2022 16:12:27 -0700 IronPort-SDR: LJdURvkbYD+KV3cU4k/Z+Dgurr9oZ67ZVoy9K3TptZlknRUkRO3hH42Gt/aaN6lC13f8QfiOg9 18p1a3aigQFvNIZlEV9dONdChzfSq2M+UbVlR5M1XGXFX3rio8E8ur5/ljQ0qL7pitl9Sfj0jB XWzC+bjRD5HMC51Al76abg52T1gj6flij0+GIq2s8tm6AcOEKZCRpujuPtymKJDRsRZWZFDZDH u9r7q4sOMYzJ+QrvZmbJYcLsQFbmQz55c7FHqeH2j3SiDyHP9fzQxCElVepvUziiUS04hxQh/l Ds4= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 27 Apr 2022 16:42:18 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4KpZzY1Gcyz1SVny for ; Wed, 27 Apr 2022 16:42:17 -0700 (PDT) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1651102936; x=1653694937; bh=TRafi5SdzHuV4X0PCy +jdQib6Lt3hEKxPFu/WBMaC5c=; b=EEgllN2nTrDwxEODlSH5eLnAF4eUKpbLMQ 0kToOKCQQRXAhdY1Xd/g1XVg+TqaU4+MERWzQXaR0GsvHYnfF83DUH/bLh3KvcJi sIOCwoGh7swo4heV42CleWdiKXZj6B7axNqSruAsNNCAoWzO6Dqn9Dela6i1zO0u e2qJaJAEcbbPDviCb88S4hb3Zd4fdEfhKOEwpret9/LAVhAoKzs7PHOfbRXGQJ3H WqRkmr22wYa48Zy0cX32acetWfwHSl8sk6tc+IfptKh1gzX1DwLZ4f4IN17aDW4W BWei8frQbAtiMEZ+jBHyEVdQxijwdA4mHecV45g1yl10en2IVmOg== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id j3WFdxsAzsQ9 for ; Wed, 27 Apr 2022 16:42:16 -0700 (PDT) Received: from toolbox.wdc.com (unknown [10.225.165.122]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4KpZzS2MYsz1Rwrw; Wed, 27 Apr 2022 16:42:12 -0700 (PDT) From: Alistair Francis To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , alistair23@gmail.com, Palmer Dabbelt , qemu-arm@nongnu.org, Bin Meng , Alistair Francis , bmeng.cn@gmail.com Subject: [PATCH v5 5/6] hw/riscv: virt: Add device plug support Date: Thu, 28 Apr 2022 09:41:45 +1000 Message-Id: <20220427234146.1130752-6-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220427234146.1130752-1-alistair.francis@opensource.wdc.com> References: <20220427234146.1130752-1-alistair.francis@opensource.wdc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=109fe075d=alistair.francis@opensource.wdc.com; helo=esa4.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alistair Francis Add support for plugging in devices, this was tested with the TPM device. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Bin Meng --- hw/riscv/virt.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index a2ffd04a78..da098917dd 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1569,10 +1569,37 @@ static void virt_set_aclint(Object *obj, bool value, Error **errp) s->have_aclint = value; } +static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, + DeviceState *dev) +{ + MachineClass *mc = MACHINE_GET_CLASS(machine); + + if (device_is_dynamic_sysbus(mc, dev)) { + return HOTPLUG_HANDLER(machine); + } + return NULL; +} + +static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + RISCVVirtState *s = RISCV_VIRT_MACHINE(hotplug_dev); + + if (s->platform_bus_dev) { + MachineClass *mc = MACHINE_GET_CLASS(s); + + if (device_is_dynamic_sysbus(mc, dev)) { + platform_bus_link_device(PLATFORM_BUS_DEVICE(s->platform_bus_dev), + SYS_BUS_DEVICE(dev)); + } + } +} + static void virt_machine_class_init(ObjectClass *oc, void *data) { char str[128]; MachineClass *mc = MACHINE_CLASS(oc); + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); mc->desc = "RISC-V VirtIO board"; mc->init = virt_machine_init; @@ -1584,6 +1611,10 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->get_default_cpu_node_id = riscv_numa_get_default_cpu_node_id; mc->numa_mem_supported = true; mc->default_ram_id = "riscv_virt_board.ram"; + assert(!mc->get_hotplug_handler); + mc->get_hotplug_handler = virt_machine_get_hotplug_handler; + + hc->plug = virt_machine_device_plug_cb; machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); @@ -1614,6 +1645,10 @@ static const TypeInfo virt_machine_typeinfo = { .class_init = virt_machine_class_init, .instance_init = virt_machine_instance_init, .instance_size = sizeof(RISCVVirtState), + .interfaces = (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + }, }; static void virt_machine_init_register_types(void)