From nobody Sat Nov 15 12:16:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751230208; cv=none; d=zohomail.com; s=zohoarc; b=cTfmFmGxBioxUVsEkspxoJQKlNV261EPnwKYD4MAltfeHpErOPKFlmdIJ2WGgDj2+/D+nB8vE004T7WcHEMXHJYRF/eRu4YLFrstUlcVj8CNMTf2GpmvwirZjipWOPH6HPsxElkr9RvTGvtBSvxpW7SQk9MuO5BTPfwUaafM5/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751230208; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LQOw7AHWnconnv7IJtYR9CMfxMCXTEspg6v7zFVpGKE=; b=Zs9MYZYXK5RxkeIl/2t5emuJ4slMZKBJgRoWAuQdKIsJysx38e/oDxvtss+yrzBcCPl0GqBQYmPEOWIrZNfrlQ8CK1pmO7wWi8aGWt8pYRtiZw/QsPYKuDUdszX74taMj2QkLPaMNkJ2oEze986G1LJXay8guIgjACremHUgo40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1751230208965469.3416261627375; Sun, 29 Jun 2025 13:50:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uVyxW-0003ei-Jm; Sun, 29 Jun 2025 16:49:06 -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 1uVyxV-0003eC-EE; Sun, 29 Jun 2025 16:49:05 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uVyxU-0000Rn-1Q; Sun, 29 Jun 2025 16:49:05 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-ae0b2ead33cso678500266b.0; Sun, 29 Jun 2025 13:49:03 -0700 (PDT) Received: from Provence (dynamic-2a02-3100-2f97-a200-0219-99ff-feb2-2458.310.pool.telefonica.de. [2a02:3100:2f97:a200:219:99ff:feb2:2458]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae353659e06sm535709566b.44.2025.06.29.13.49.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 13:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751230141; x=1751834941; darn=nongnu.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=LQOw7AHWnconnv7IJtYR9CMfxMCXTEspg6v7zFVpGKE=; b=dVYeuqkcuBagkpsDhSzVQWJyAgLr5F2TJEYjM8qEpTgKvBUmPh0EK8oUKUuDihu95s FrnWSlrv9Hyl6vNKUcHWjhJvb+09ZGtFDof+YE+aFboQjaUsCl6udKZemxvOuI4J52G0 7UTQi/Ffg4UNykJAlZ9FyMw+bxgf/Y34nwFyHBviJdZRIdj7D6VNYtwbV0sl+Lc9DOp1 E6hWGq6gvBKpRUGlVxyEVHgGDAPT1JhOSVa3jK4uJlm7/QrW7E3fmaeY9CLyOPmAjWSi 1NmFpc0ZDelqAqYTncm54xlXriff60O5DmPZb43H5aS4GOjvKVr9ZtR5ncPYkReX8V5a dQfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751230141; x=1751834941; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LQOw7AHWnconnv7IJtYR9CMfxMCXTEspg6v7zFVpGKE=; b=rsQtiE7Jm02UGQyIZTNIT2Iu7Va+BUSlSg72fYGEH5qqmPax1lqyHkeLnEYyjr5nXe mljSvIoh+cRoqK/P3M389xW4b7l6ojbF7MuUAFbH0RwZno4gex6kcQYa4uev+8GynhJh iF1fhNJmJJRg5v9aIJUrtrEj3D5KmlNvZqEXWX8hLiNldG67UmHWfzoxgzBOtEyTgsKi gsujSX8dD1AHWao8WRLYeTEfzvYNaYDhKYa9vo2aCd3s7jEdHN8ZdIzPKGO7UBJn7tSP 1a8NDW+Daq6HeQPG6gVwj7fCdHdHrWJ2GwFBJ12DBExS0eFbPvzfN+W2TpCieX+faJgg dGNg== X-Gm-Message-State: AOJu0YwQTBb2LbS+v+hwVyYxaw4fygDkKr71xXg9DvXWWEccYluI0dtt 0LLJ6sTfrG1E2TIgaMQ0JnHwItwzQt4YU5olLY8tST/B/I/1SSyg5tTuTDpZEw== X-Gm-Gg: ASbGncua3U5trXyaaGCq8EToV2dDsBzrpTStNCQ8s8ULqpJdk4powxK7bNi39Moj9XM FFIq3o/2jY9X3sxRJc8u1DFDKvGxxE3lZ3WGYWPB4usd9vVruyGZRiGcAhOI/IUKULOhbETRzXh jYtsvg9H9LssMOv4so4c7bXWN2S7uf7LUyYSM7w84ppCW2qCNTNEKJnCxVkgm06eh3F9bnKlExr ubW6Mvr6HLnCvcrZ8M37Ig5rgb1CmvlA9qu1fWUXV8x/7JLcw2aSqcuIC9Dm3UPx9ygGM4up4HD X+cqnypgglCAAxnIpokzS8W9vbNH1G8PppsdW98BLDjZniG8b1jeAXjy4PNOMKI2kUUsTprLuJ2 AbarJO/jfOZ6Ac7VDXQ18r4A4d1y/zyMmTAf8pjT+LKkV0/2d/Rsu8UrhnCOmwJePpw== X-Google-Smtp-Source: AGHT+IFMfXIpJbgmQAE7ZwsWVtoK1YAjL8z+OjDo0/mkoYKcc/0kuMXrHWwP0eyF7MDi1tS+Dp8Tdg== X-Received: by 2002:a17:907:94c8:b0:ae0:6621:2f69 with SMTP id a640c23a62f3a-ae0d262937emr1704713166b.13.1751230141268; Sun, 29 Jun 2025 13:49:01 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , Bernhard Beschow , Paolo Bonzini Subject: [PATCH 1/2] hw/arm/fsl-imx8mp: Wire VIRQ and VFIQ Date: Sun, 29 Jun 2025 22:48:50 +0200 Message-ID: <20250629204851.1778-2-shentey@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629204851.1778-1-shentey@gmail.com> References: <20250629204851.1778-1-shentey@gmail.com> 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=2a00:1450:4864:20::62d; envelope-from=shentey@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 @gmail.com) X-ZM-MESSAGEID: 1751230210961116600 Content-Type: text/plain; charset="utf-8" Allows to run KVM guests inside the imx8mp-evk machine. Fixes: a4eefc69b237 ("hw/arm: Add i.MX 8M Plus EVK board") CC: qemu-stable Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/fsl-imx8mp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c index 23e662c16c..866f4d1d74 100644 --- a/hw/arm/fsl-imx8mp.c +++ b/hw/arm/fsl-imx8mp.c @@ -356,6 +356,10 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error= **errp) qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); sysbus_connect_irq(gicsbd, i + ms->smp.cpus, qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); + sysbus_connect_irq(gicsbd, i + 2 * ms->smp.cpus, + qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); + sysbus_connect_irq(gicsbd, i + 3 * ms->smp.cpus, + qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); } } =20 --=20 2.50.0 From nobody Sat Nov 15 12:16:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751230209; cv=none; d=zohomail.com; s=zohoarc; b=aUuOnxPtQFmmjIRs8i2xYp0Q9oWxLPXK6w1lhYF7//C4YG42MKguTyzNv47jSzlxn353O34FVYNs8a6UDlHBqzGtY1wbEo3PczQc6+yXWeayOuRkTX1LGGhsmwn/I2aocYADeuTzqItqlzB3Pm3RM7aT+v3JsdgG1qR5lIZ6ORE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751230209; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6ZwtYW+m6w4oQmOf8ZPSw+Fz8ib8szmgXYuwZPtcG1c=; b=aEqJLGUpcjGH1Q2wEs6kSH8gAx0Q9fV4KapoKNZN7mxslepQjHw/lGr43OLS42KSLc4YwFpk96VupTkGGnBk4qVTV8HTq39ZCQ8PmcfFvM6HWFuQIGH/dqWXTkd26xS3KNciED3DRVKvdj+9tgELSRbh9p0uVJ3XV+H1ngQm/E8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1751230209985599.2641611598997; Sun, 29 Jun 2025 13:50:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uVyxY-0003fr-7d; Sun, 29 Jun 2025 16:49:08 -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 1uVyxW-0003f1-OH; Sun, 29 Jun 2025 16:49:06 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uVyxU-0000Rs-By; Sun, 29 Jun 2025 16:49:06 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-ad574992fcaso246731666b.1; Sun, 29 Jun 2025 13:49:03 -0700 (PDT) Received: from Provence (dynamic-2a02-3100-2f97-a200-0219-99ff-feb2-2458.310.pool.telefonica.de. [2a02:3100:2f97:a200:219:99ff:feb2:2458]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae353659e06sm535709566b.44.2025.06.29.13.49.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 13:49:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751230142; x=1751834942; darn=nongnu.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=6ZwtYW+m6w4oQmOf8ZPSw+Fz8ib8szmgXYuwZPtcG1c=; b=CMK6iZTkbf8lLL+hRjHdIgCUuiUEFbqTK+qseOAkz54Lmo/084LnGp7g+McWo/ImHj n5u2dPjZgfIAYm67ALJ/h1CvJKobSQQXlNVfNkTmerivrgLpngUBvlNuk8/CfaFUkxc+ BvFmZR/7eVuZQJpH7J6OX0tmo9XMaU/XYzBuVAdhHUQKtRQTWBMFUPB/PLX7CVimnDYj sqvi8Od4tNcRjNhYLFNnRzvqhofvHt1J/u+WiPAn/s86IfdrTVpFc0wG/ujsw818HXHu Ae6KrWEa42Rx4751Ioa5g2lr5+z2+Chiuif2kf2j0ry3WovPgGhYfoVe3wTC9WlUZxv+ 28BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751230142; x=1751834942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6ZwtYW+m6w4oQmOf8ZPSw+Fz8ib8szmgXYuwZPtcG1c=; b=xII6Ab657BcuBBALHU8QbE/06rKGkFPPvfeH2i3bsHXq+s/NoqudyfvsBOTf1lVhAL VXBFap5nu8Io95KkSmIXJ6XOV7cvVUTMacLul89Og+pio77XwPh83nZqYyedPZNqiK/Q I51QpKCpPikjghAZXjthahiAFJYImcR2WGQD9I1cYjIkIthiXwt65nVZbwLosUKReyvY 8n0GVWQ7QY6QNOVKVjtmcHu13mwsdvmzpB+Qaqp/J17q5iOk6wuS6rbYrwvpSrSK1jiZ 3X7aPszbBtoyiVikf97rl3gPu93AliaMIJ8sWtAdxM2T+yMJJp1ObSeDlrYNfebJTU8f JAMw== X-Gm-Message-State: AOJu0YyPRwF1Z8l2xmYuG4pVF/LNgQY1B788es85LVYwJg+oRTdOZ75T +N0HoQLLublqZxc2hkmfbo4P3nBBAr3ii6GTUPoVp2e7fJyK5pqOnLJDerjvYA== X-Gm-Gg: ASbGnctzpgk+6bhUtTTtYChlhq2vFxtdK1hq7CrbyP75n87cnmxBetpScfPS8AyQtOA WxA3A+yokCJj+yefO/JkY3PrWF8Y1FkvYfPFkhbmHXtzruhE4VMcJLdaOvYF15K08RIHqvv3k66 PVZD9rqrMu0eyeBnlG6xm3qWvGk9j2ZeudoffUvI5PL2v53U12Xg0vgJTFYcIom+wsYQzSgbWw2 8pPo0zwwYdo/4IW2fuL25ueDHbA8kggzdZxdeKu9+MDZWQmQBynLRWcEc5hfi5pErTymMJDPIvA 1AIPdN30Qnr6AQEjxcguBwnInYv73bt3LApA/pHT2RorDXTWkDnu8QRvuc9m4X1hvho5Q+brNnD IB39d+DujP2zKWVcgOoN6jmd2UkXQtcA3VU9oMIvnCjKAzBV9oFiOYywfa/UPFEk1xQ== X-Google-Smtp-Source: AGHT+IGOKjC8J/uC/oucGHcGtp6vbIJkNsADCG8KvjfUamwbZIRXrnnBRgtfw1sL/NOgPPsIYrtE1A== X-Received: by 2002:a17:907:9603:b0:ae0:cf36:ea81 with SMTP id a640c23a62f3a-ae34fd1837fmr957999566b.5.1751230141999; Sun, 29 Jun 2025 13:49:01 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , Bernhard Beschow , Paolo Bonzini Subject: [PATCH 2/2] hw/arm/imx8mp-evk: Add KVM support Date: Sun, 29 Jun 2025 22:48:51 +0200 Message-ID: <20250629204851.1778-3-shentey@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250629204851.1778-1-shentey@gmail.com> References: <20250629204851.1778-1-shentey@gmail.com> 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=2a00:1450:4864:20::62c; envelope-from=shentey@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 @gmail.com) X-ZM-MESSAGEID: 1751230211134116600 Content-Type: text/plain; charset="utf-8" Allows the imx8mp-evk machine to be run with KVM acceleration as a guest. Signed-off-by: Bernhard Beschow --- docs/system/arm/imx8mp-evk.rst | 7 +++++++ hw/arm/fsl-imx8mp.c | 33 ++++++++++++++++++++++++++++----- hw/arm/imx8mp-evk.c | 11 +++++++++++ hw/arm/Kconfig | 3 ++- hw/arm/meson.build | 2 +- 5 files changed, 49 insertions(+), 7 deletions(-) diff --git a/docs/system/arm/imx8mp-evk.rst b/docs/system/arm/imx8mp-evk.rst index b2f7d29ade..1399820163 100644 --- a/docs/system/arm/imx8mp-evk.rst +++ b/docs/system/arm/imx8mp-evk.rst @@ -60,3 +60,10 @@ Now that everything is prepared the machine can be start= ed as follows: -dtb imx8mp-evk.dtb \ -append "root=3D/dev/mmcblk2p2" \ -drive file=3Dsdcard.img,if=3Dsd,bus=3D2,format=3Draw,id=3Dmmcblk2 + + +KVM Virtualization +------------------ + +To enable hardware-assisted acceleration via KVM, append +``-accel kvm -cpu host`` to the command line. diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c index 866f4d1d74..7e61392abb 100644 --- a/hw/arm/fsl-imx8mp.c +++ b/hw/arm/fsl-imx8mp.c @@ -12,11 +12,13 @@ #include "system/address-spaces.h" #include "hw/arm/bsa.h" #include "hw/arm/fsl-imx8mp.h" -#include "hw/intc/arm_gicv3.h" #include "hw/misc/unimp.h" #include "hw/boards.h" +#include "system/kvm.h" #include "system/system.h" +#include "target/arm/cpu.h" #include "target/arm/cpu-qom.h" +#include "target/arm/kvm_arm.h" #include "qapi/error.h" #include "qobject/qlist.h" =20 @@ -197,11 +199,10 @@ static void fsl_imx8mp_init(Object *obj) =20 for (i =3D 0; i < MIN(ms->smp.cpus, FSL_IMX8MP_NUM_CPUS); i++) { g_autofree char *name =3D g_strdup_printf("cpu%d", i); - object_initialize_child(obj, name, &s->cpu[i], - ARM_CPU_TYPE_NAME("cortex-a53")); + object_initialize_child(obj, name, &s->cpu[i], ms->cpu_type); } =20 - object_initialize_child(obj, "gic", &s->gic, TYPE_ARM_GICV3); + object_initialize_child(obj, "gic", &s->gic, gicv3_class_name()); =20 object_initialize_child(obj, "ccm", &s->ccm, TYPE_IMX8MP_CCM); =20 @@ -274,7 +275,8 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error = **errp) /* CPUs */ for (i =3D 0; i < ms->smp.cpus; i++) { /* On uniprocessor, the CBAR is set to 0 */ - if (ms->smp.cpus > 1) { + if (ms->smp.cpus > 1 && + object_property_find(OBJECT(&s->cpu[i]), "reset-cbar")) { object_property_set_int(OBJECT(&s->cpu[i]), "reset-cbar", fsl_imx8mp_memmap[FSL_IMX8MP_GIC_DIST]= .addr, &error_abort); @@ -286,6 +288,16 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error= **errp) object_property_set_int(OBJECT(&s->cpu[i]), "cntfrq", 8000000, &error_abort); =20 + if (object_property_find(OBJECT(&s->cpu[i]), "has_el2")) { + object_property_set_bool(OBJECT(&s->cpu[i]), "has_el2", + !kvm_enabled(), &error_abort); + } + + if (object_property_find(OBJECT(&s->cpu[i]), "has_el3")) { + object_property_set_bool(OBJECT(&s->cpu[i]), "has_el3", + !kvm_enabled(), &error_abort); + } + if (i) { /* * Secondary CPUs start in powered-down state (and can be @@ -304,6 +316,7 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error = **errp) { SysBusDevice *gicsbd =3D SYS_BUS_DEVICE(&s->gic); QList *redist_region_count; + bool pmu =3D object_property_get_bool(OBJECT(first_cpu), "pmu", NU= LL); =20 qdev_prop_set_uint32(gicdev, "num-cpu", ms->smp.cpus); qdev_prop_set_uint32(gicdev, "num-irq", @@ -360,6 +373,16 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error= **errp) qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); sysbus_connect_irq(gicsbd, i + 3 * ms->smp.cpus, qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); + + if (kvm_enabled()) { + if (pmu) { + assert(arm_feature(&s->cpu[i].env, ARM_FEATURE_PMU)); + if (kvm_irqchip_in_kernel()) { + kvm_arm_pmu_set_irq(&s->cpu[i], VIRTUAL_PMU_IRQ); + } + kvm_arm_pmu_init(&s->cpu[i]); + } + } } } =20 diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index b3082fa60d..30eb57318d 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -95,9 +95,20 @@ static void imx8mp_evk_init(MachineState *machine) =20 static void imx8mp_evk_machine_init(MachineClass *mc) { + static const char *const valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-a53"), +#ifdef CONFIG_KVM + ARM_CPU_TYPE_NAME("host"), +#endif /* CONFIG_KVM */ + NULL + }; + mc->desc =3D "NXP i.MX 8M Plus EVK Board"; mc->init =3D imx8mp_evk_init; mc->max_cpus =3D FSL_IMX8MP_NUM_CPUS; + mc->valid_cpu_types =3D valid_cpu_types; + mc->default_cpu_type =3D mc->valid_cpu_types[0]; mc->default_ram_id =3D "imx8mp-evk.ram"; } + DEFINE_MACHINE("imx8mp-evk", imx8mp_evk_machine_init) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index f543d944c3..d35f41331f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -604,7 +604,8 @@ config FSL_IMX8MP config FSL_IMX8MP_EVK bool default y - depends on TCG && AARCH64 + depends on AARCH64 + depends on TCG || KVM select FSL_IMX8MP =20 config ARM_SMMUV3 diff --git a/hw/arm/meson.build b/hw/arm/meson.build index d90be8f4c9..a4212a6ab2 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -59,7 +59,7 @@ arm_common_ss.add(when: 'CONFIG_MUSCA', if_true: files('m= usca.c')) arm_common_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'm= cimx7d-sabre.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP', if_true: files('fsl-imx8mp.c'= )) -arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP_EVK', if_true: files('imx8mp-ev= k.c')) +arm_ss.add(when: 'CONFIG_FSL_IMX8MP_EVK', if_true: files('imx8mp-evk.c')) arm_common_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_common_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c'= , 'mcimx6ul-evk.c')) arm_common_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) --=20 2.50.0