From nobody Tue Feb 10 06:48:57 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1682298177; cv=none; d=zohomail.com; s=zohoarc; b=PWjY8Bd+xHMZxq9EEemBwJiPBpfmbWr1zkdZzbg9W/5o3KjH5rcDP9NYDwMRPdcD75ljMlAbnvtOE4e82OKV2RHzlU6pnzLlMBaLU2FE+Zs/ToRLM7JdX29v7h9vu1sP4MFjtbAT8TKcNyt9McbZ96ZF+EjpVUgbCeUvNopNefU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682298177; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=SwW7n7vkFqpVw0XgjflVgrNgDTr3SRL3Ff2ZaeTHUQo=; b=RZB5D635quw1bNEQ/AIc0UwCW1DtSO3Umz3BOGXwKu2kaa1jxuXvqKpip5Mn+YMGKT/aIJGBnn5qr2HV4o7o89jZmcamHd2eR/xNJG1+qRJQUe/2vJf1hob8xDTO92Mu8owUh9xASvYbpYvmz+bCQuMEXrZGJK7MtFmcbYHEyPI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682298177237541.2314290926046; Sun, 23 Apr 2023 18:02:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqkaa-0005QH-2v; Sun, 23 Apr 2023 21:01:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqkaR-0005Q2-2x for qemu-devel@nongnu.org; Sun, 23 Apr 2023 21:01:48 -0400 Received: from mga11.intel.com ([192.55.52.93]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqkaL-0003zT-9C for qemu-devel@nongnu.org; Sun, 23 Apr 2023 21:01:44 -0400 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2023 18:01:35 -0700 Received: from intel-optiplex-7090.sh.intel.com ([10.67.104.162]) by fmsmga006.fm.intel.com with ESMTP; 23 Apr 2023 18:01:34 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682298101; x=1713834101; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=uXPbfjHxN6AP0eMomnvsrHD1Yj5K9aguGd+S6to4jGU=; b=XVa3LxpivRwkV0sFWPp44JUo0awxHtJ7C1sHM0zaiFd4a8D29kfgf5DR 05IiH2Nr5S/KCJ/q7ZfwldNQCXwzgoG8eEnblR0CcJLc3Shx3yvd1rqlN hCO82j56mehztFVSykbt8rWht7x3ibjcBe6LOSMZHObQg/lHtjyabeZM1 MIlLdJEgrVMADOxZ0puouspTJgzxTXcJrpSxOz6zBrBN0Jzh5OkhgQqSJ TXsvqv5yCUPyoz/ErYIEKovKK5Y29XFXnqyHCjiRhzFQFAeIrKC6LtEuQ ihVgu89WvuW6OSa8QwXzxseI3+6bcDXv/GKcHoI7TyHRLlEipHksByMtZ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="343813948" X-IronPort-AV: E=Sophos;i="5.99,221,1677571200"; d="scan'208";a="343813948" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="939118853" X-IronPort-AV: E=Sophos;i="5.99,221,1677571200"; d="scan'208";a="939118853" From: Yong Li To: qemu-devel@nongnu.org Cc: Yong Li , "Zhiwei Liu" Subject: [PATCH] hw/riscv/virt: Add a second UART for secure world Date: Mon, 24 Apr 2023 09:01:32 +0800 Message-Id: <20230424010132.3334748-1-yong.li@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.93; envelope-from=yong.li@intel.com; helo=mga11.intel.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.172, 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_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1682298178172100001 Content-Type: text/plain; charset="utf-8" The virt machine can have two UARTs and the second UART can be used when host secure-mode support is enabled. Signed-off-by: Yong Li Cc: "Zhiwei Liu" Reviewed-by: LIU Zhiwei Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/virt.c | 4 ++++ include/hw/riscv/virt.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index b38b41e685..02475e1678 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -88,6 +88,7 @@ static const MemMapEntry virt_memmap[] =3D { [VIRT_APLIC_S] =3D { 0xd000000, APLIC_SIZE(VIRT_CPUS_MAX) }, [VIRT_UART0] =3D { 0x10000000, 0x100 }, [VIRT_VIRTIO] =3D { 0x10001000, 0x1000 }, + [VIRT_UART1] =3D { 0x10002000, 0x100 }, [VIRT_FW_CFG] =3D { 0x10100000, 0x18 }, [VIRT_FLASH] =3D { 0x20000000, 0x4000000 }, [VIRT_IMSIC_M] =3D { 0x24000000, VIRT_IMSIC_MAX_SIZE }, @@ -1508,6 +1509,9 @@ static void virt_machine_init(MachineState *machine) serial_mm_init(system_memory, memmap[VIRT_UART0].base, 0, qdev_get_gpio_in(DEVICE(mmio_irqchip), UART0_IRQ), 399193, serial_hd(0), DEVICE_LITTLE_ENDIAN); + serial_mm_init(system_memory, memmap[VIRT_UART1].base, + 0, qdev_get_gpio_in(DEVICE(mmio_irqchip), UART1_IRQ), 399193, + serial_hd(1), DEVICE_LITTLE_ENDIAN); =20 sysbus_create_simple("goldfish_rtc", memmap[VIRT_RTC].base, qdev_get_gpio_in(DEVICE(mmio_irqchip), RTC_IRQ)); diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index e5c474b26e..8d2f8f225d 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -74,6 +74,7 @@ enum { VIRT_APLIC_S, VIRT_UART0, VIRT_VIRTIO, + VIRT_UART1, VIRT_FW_CFG, VIRT_IMSIC_M, VIRT_IMSIC_S, @@ -88,6 +89,7 @@ enum { enum { UART0_IRQ =3D 10, RTC_IRQ =3D 11, + UART1_IRQ =3D 12, VIRTIO_IRQ =3D 1, /* 1 to 8 */ VIRTIO_COUNT =3D 8, PCIE_IRQ =3D 0x20, /* 32 to 35 */ --=20 2.25.1