From patchwork Mon Aug 12 13:05:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760538 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA6A3C52D7C for ; Mon, 12 Aug 2024 13:06:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775488.1185698 (Exim 4.92) (envelope-from ) id 1sdUke-00078H-3d; Mon, 12 Aug 2024 13:06:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775488.1185698; Mon, 12 Aug 2024 13:06:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkd-00077c-VQ; Mon, 12 Aug 2024 13:06:19 +0000 Received: by outflank-mailman (input) for mailman id 775488; Mon, 12 Aug 2024 13:06:18 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkc-00074b-Ss for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:18 +0000 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [2a00:1450:4864:20::234]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a9d20988-58ab-11ef-bc05-fd08da9f4363; Mon, 12 Aug 2024 15:06:18 +0200 (CEST) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2eeb1ba040aso58542581fa.1 for ; Mon, 12 Aug 2024 06:06:18 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f29203d817sm8573481fa.99.2024.08.12.06.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:16 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a9d20988-58ab-11ef-bc05-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467978; x=1724072778; darn=lists.xenproject.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=FnvsVFgAwwQYqvVPxF+lYxfpYXdBbERxwoGEJpJUJUI=; b=VNUXtoyXxFeQlfzRQujuWTNEWNDBK4+r8lCcvyE94P6T69/+izCk04ZsdYYCvuf6XZ w2zvox0fZUY/mMmxzzhtSoijQP5HaOuT6T+1CW+v0JtPUl6u8S33U1o095yLy+4+SHmf CDLqczOsstpMFnO6d6ofUQkcMfu1d1WA0oZd7skyQSr+hKGIeJq1fKeckB1lUD0wdgRJ 7UR5nUblFA0ftuKR6QswhIbuCsy3yi3Lt4ObIR6UBCKwo6k3REiXf8oNyDNyMqU6hsdV qOBdO4qfKIZ5iz2A2wV1nM3Gp7JQyo17zNvT1CBFse4Psilp8tuPt96wSqsQYSNLSRG1 rijg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467978; x=1724072778; 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=FnvsVFgAwwQYqvVPxF+lYxfpYXdBbERxwoGEJpJUJUI=; b=c8KMtCIKlelOfWneO5Z3xVcRpewFd99Wu4FSVCdVOAatmvcmW4XByU0AaW+m3L4uz0 DLHvD/kwd04RTdQ7NoFYYSvgTfbbsGna9l738qS9rSavM/S2tIT8xrur98UiwAVrC2GE YjI/4WYFCiStCcH31fWu8cEwI4HBwR/OeliHpF4XECA1jtbeas8zhgvhrWN41uoInhwp fxM7XFnQFwWsi/L2eUL13AZbieW3CXZo2ufDcZsJsMVdiJ0Pcy7qDvggbLeu8y7SW0CO +EDYXDmi3ns25FKMD7iM+Op04PojDRenv8h31WCfsrLwArSMGnJB0wP8jj1xExj0J0T5 RsMw== X-Forwarded-Encrypted: i=1; AJvYcCVkjDmGjqH2VD+pvhwDPoYnV//v4qvUHKyG4g0ArqFmeUtehrwvLAh+6Ak07fdZnRDblnqPjLdVTDcfAMyDc0Li9CVnFXP1zs9YALh/w58= X-Gm-Message-State: AOJu0YxE0m0KOjh9cbMFZDW2E1r0W8z8u0eLiLo5uqcwyAqoIFMGQRyC l1ayyFHyf0LHiDZqeldVGgoiilRbg+FePNZxHLe/Lwh4SpftOdae X-Google-Smtp-Source: AGHT+IEH+rt8R3wDG+QKY36k4z1epabtE0qsH5Q2v+VF3qRP2OiK5eGbpOcoKlfiNpSaMtmPoTatVw== X-Received: by 2002:a2e:721a:0:b0:2ef:1d79:cae7 with SMTP id 38308e7fff4ca-2f2b714cfddmr1523661fa.14.1723467977110; Mon, 12 Aug 2024 06:06:17 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org Subject: [PATCH v1 01/10] MAINTAINERS: Add docs/system/arm/xenpvh.rst Date: Mon, 12 Aug 2024 15:05:56 +0200 Message-ID: <20240812130606.90410-2-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias Acked-by: Stefano Stabellini --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 10af212632..a24c2e14d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -559,6 +559,7 @@ F: include/hw/xen/ F: include/sysemu/xen.h F: include/sysemu/xen-mapcache.h F: stubs/xen-hw-stub.c +F: docs/system/arm/xenpvh.rst Guest CPU Cores (NVMM) ---------------------- From patchwork Mon Aug 12 13:05:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760540 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 683E1C3DA7F for ; Mon, 12 Aug 2024 13:06:30 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775489.1185714 (Exim 4.92) (envelope-from ) id 1sdUkh-0007gh-DE; Mon, 12 Aug 2024 13:06:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775489.1185714; Mon, 12 Aug 2024 13:06:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkh-0007gY-9j; Mon, 12 Aug 2024 13:06:23 +0000 Received: by outflank-mailman (input) for mailman id 775489; Mon, 12 Aug 2024 13:06:21 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkf-0007ep-UI for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:21 +0000 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [2a00:1450:4864:20::229]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id aa9d6f82-58ab-11ef-8776-851b0ebba9a2; Mon, 12 Aug 2024 15:06:19 +0200 (CEST) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2f1870c355cso41518911fa.1 for ; Mon, 12 Aug 2024 06:06:19 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f291df57cbsm8687111fa.52.2024.08.12.06.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:17 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: aa9d6f82-58ab-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467979; x=1724072779; darn=lists.xenproject.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=q0MBRxvJH0y/bIJK1xHx6k1kVCY+2jxCQ2h5fP5Rdc8=; b=XmDjXo/FLlb+oTjzlkUJRxVRUpQajqR2uiuZz5G0K8cbzGzXNCY3HPqgylRZFA46m+ p+wvERCi82FjzMk8xeIBhHFTmYdtUWwEMwifxiQ2oAjjP6rKRv9ahV/43B4EpZwin4E0 MAdAgS/oeEH9xL0PmVHpZfTu5N75LduQCMmkqWn67v0edZ0XupC47R//w2GKhv6ljOCL GbGnYQHSI3BiqXwINULHC8EvnwiQ3eq9rtdGSFdKinErQpOQXbDJQf6EIm7g/5WB6jV9 u+O8vRaubmaNGqsGndHqdUwO92pEUPOuBjNu3Ixl285oZfdvyn0IjnvJRdrrol/UvCdV JkVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467979; x=1724072779; 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=q0MBRxvJH0y/bIJK1xHx6k1kVCY+2jxCQ2h5fP5Rdc8=; b=QqoDyUrvP9EyhBllF8r1f93zBu7EQzcivIYyK99b27ormNHML3VpWggUHZFpyNDh6O 0Uv1+Nnw7YwnrOG78vrQfHrCwR4c6FHxCEsbwbFLTN2mE5uIMGUTg1fQ1PaXcm2rQsxz k6uWjl7eA/rtyxj6lGGqf+eBsdfGd+jT/lGDtVnQ5bblRKY+DfLbxI+oUAPfcaYsH6RJ MyGQACieT30ihehkC6NB/gfAmWkJmoOdsrEgzUwbY00QJ5kEDmVYyd80AfVqDRV+xP3b 4nxoW/Sc1OduIYdm+GqNcLnDpefIA1l7uOSpxuhyqjglmCiFZRcQQQsJeH2W+AaHzhaF l/PA== X-Forwarded-Encrypted: i=1; AJvYcCWvrjgqXW7zljo37Z6UEFQG4YcLHmo+BKL1kmA2H1BFXPSD12MYRiWy4P5tBOxFh0CMwU7WvelacI8Jhg5tB+stkqy7WLYe3blXhBUrAYY= X-Gm-Message-State: AOJu0YztDRvWzIf8/X4HDnsJQNSclQoOPYpoV/FweqKqNgY/t/Ly+yqZ UgklCnNrDRKjMn3ONo9RLOVmMBIA8TN3s/EWTEOOnGe+kUGGh1pZ X-Google-Smtp-Source: AGHT+IFl4ehD3FYz4UFHWYeyrWigmFf76jU/CdxDFMCU8WOzXI0nnlPyTlTXorwYYcOTf9CmvnlIAA== X-Received: by 2002:a2e:8e6e:0:b0:2ef:2b45:b71d with SMTP id 38308e7fff4ca-2f2b7154f70mr1527581fa.24.1723467978593; Mon, 12 Aug 2024 06:06:18 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, qemu-arm@nongnu.org Subject: [PATCH v1 02/10] hw/arm: xenpvh: Update file header to use SPDX Date: Mon, 12 Aug 2024 15:05:57 +0200 Message-ID: <20240812130606.90410-3-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Update file header to use SPDX and remove stray empty comment line. No functional changes. Signed-off-by: Edgar E. Iglesias Acked-by: Stefano Stabellini --- hw/arm/xen_arm.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c index 6fad829ede..766a194fa1 100644 --- a/hw/arm/xen_arm.c +++ b/hw/arm/xen_arm.c @@ -1,24 +1,7 @@ /* * QEMU ARM Xen PVH Machine * - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. + * SPDX-License-Identifier: MIT */ #include "qemu/osdep.h" From patchwork Mon Aug 12 13:05:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1AB23C52D7C for ; Mon, 12 Aug 2024 13:06:31 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775490.1185719 (Exim 4.92) (envelope-from ) id 1sdUkh-0007jY-NM; Mon, 12 Aug 2024 13:06:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775490.1185719; Mon, 12 Aug 2024 13:06:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkh-0007iZ-Hv; Mon, 12 Aug 2024 13:06:23 +0000 Received: by outflank-mailman (input) for mailman id 775490; Mon, 12 Aug 2024 13:06:22 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkg-00074b-6o for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:22 +0000 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [2a00:1450:4864:20::136]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id abd74066-58ab-11ef-bc05-fd08da9f4363; Mon, 12 Aug 2024 15:06:21 +0200 (CEST) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-52f042c15e3so3631306e87.0 for ; Mon, 12 Aug 2024 06:06:21 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53200f4227csm730447e87.279.2024.08.12.06.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:19 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: abd74066-58ab-11ef-bc05-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467981; x=1724072781; darn=lists.xenproject.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=kOLz6jSGUU8Xiq4wmRd5lgikGGH6JiIyvQ0oMaht6JA=; b=RXc/ZrfYte0uKHALdoE6QbgS6W8b9qdxmnWl4+PjFaIKMaRjUH8dl82toTaJeYfor/ ZmBDYHP3mwGz0xxVCcXuTbh02escqGLxXEqZrRU2kAsOTuQDqLG4eVlCv/VHFIubq3BV rXlBGkZA0Gc0tvXeXfLlsafNEro/+2XAxyl91LRjAow8kJ8NQ+zfGzx5VkcILjXxc52U h+ltwf1eB+PjYq0SAxuhjoFnF0V9Rx5rk0STknLi7J1NVcQW/qTXExEWIsDw9jmnK7H2 ZAWsKkALQxcWbwBHH8PUN/eFvm9i1LrhMVNWAdYvP3wBa/kcSf5JxgRAYQpKyoNk+Wu3 ugcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467981; x=1724072781; 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=kOLz6jSGUU8Xiq4wmRd5lgikGGH6JiIyvQ0oMaht6JA=; b=akjC+NKpOyjnuJH4dXxBWfOTjTRhqsBvptaqLOb2lcjxcAzhAfQVPO5yfhdQTgP3o7 nKtfd7DgqdpmQjKe/Q9dUwgKVOuU3iVFRSIIjOLrpS8zXeg16xT83XxirR1sS/5BLyv+ Vg4YOOVSefGc3dFmFw1V650XYxIi5pQzIfRNzp6azHqAuTWp3lxQRZMrSsuoQ0xMdGVl oSFWCy0vV/woZ5HZW76S4YyaCjGqjRMbntq+l7tockdEiAgHCQOTG0PGywKKxAnOOM8v NuWc0w4Ol8LCWEjnIG/EFOaLLEJ2mVdKkwOohZQ5fc7JkvYL/W8spHVuG9vH62R7bvAc u7iw== X-Forwarded-Encrypted: i=1; AJvYcCUp585U+anvsYLPdfaUcizgcUNNm/trhWMVFIsXkJRGoPSFksBS9YNruVrIDz/iLaCvtfymEcWeTPI=@lists.xenproject.org X-Gm-Message-State: AOJu0YyUItlUQOQMDfkA9LqvdqKEHbel1pDLS4Av4ecm3VINuTgmum4o lUVDgoLYEKJ+3lGO8fIo5uNEDcXUSvxJXx+69yGrpZpFVqSZUP49 X-Google-Smtp-Source: AGHT+IFVFpgUsSJvoRktx9P5RahE3NL+hK1oSSRb0VxLTivi6mQbcvmAYVxkizJenzqOQTjrR9idAw== X-Received: by 2002:a05:6512:4020:b0:531:5b03:b1f7 with SMTP id 2adb3069b0e04-5321367c4ecmr11696e87.10.1723467980688; Mon, 12 Aug 2024 06:06:20 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, qemu-arm@nongnu.org Subject: [PATCH v1 03/10] hw/arm: xenpvh: Tweak machine description Date: Mon, 12 Aug 2024 15:05:58 +0200 Message-ID: <20240812130606.90410-4-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Tweak machine description to better express that this is a Xen PVH machine for ARM. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- hw/arm/xen_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c index 766a194fa1..5f75cc3779 100644 --- a/hw/arm/xen_arm.c +++ b/hw/arm/xen_arm.c @@ -216,7 +216,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); - mc->desc = "Xen Para-virtualized PC"; + mc->desc = "Xen PVH ARM machine"; mc->init = xen_arm_init; mc->max_cpus = 1; mc->default_machine_opts = "accel=xen"; From patchwork Mon Aug 12 13:05:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760542 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30C8FC52D7F for ; Mon, 12 Aug 2024 13:06:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775491.1185734 (Exim 4.92) (envelope-from ) id 1sdUkj-0008Fg-2k; Mon, 12 Aug 2024 13:06:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775491.1185734; Mon, 12 Aug 2024 13:06:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUki-0008EF-T0; Mon, 12 Aug 2024 13:06:24 +0000 Received: by outflank-mailman (input) for mailman id 775491; Mon, 12 Aug 2024 13:06:23 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkh-00074b-A5 for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:23 +0000 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [2a00:1450:4864:20::129]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ac6bf2df-58ab-11ef-bc05-fd08da9f4363; Mon, 12 Aug 2024 15:06:22 +0200 (CEST) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-52f025bc147so4940312e87.3 for ; Mon, 12 Aug 2024 06:06:22 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53200f42164sm727333e87.256.2024.08.12.06.06.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:21 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ac6bf2df-58ab-11ef-bc05-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467982; x=1724072782; darn=lists.xenproject.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=xwk/c9fy7uMLWpwC3gxJL5qXeUXnd09Co6O9sN+JUhY=; b=EPRh7bPHpCtQWDUPLeqHCBhpJ52JHLw6aAH/j15phCMC7ROV1Aq4nh1xc47UfH05ZQ zIw8rnIa+PE26tdEgPhGncjosn1IRsTC4mJhTRkaww7uUkeU7Z+HwyhaOmReVuomWM4z VlS095k+6RUg1+jy9J5gz50AOFQHRjqlKcFgo4zRfMBfwCBTbUpoFu/k/6iaRZXQ3EXk 8qxNNR/Rnim0gnueC4Vn/kZiSfJutAxLzy0fQZ9yybMVlNbr223nGC1YlrlOXciKOoz1 JTTxhNziHFRdSIS9X4E8T6Kal5ZAXlaq8WgbEx0TQcopEaPMxjzaH9sak0BLrZfaKgDv GRBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467982; x=1724072782; 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=xwk/c9fy7uMLWpwC3gxJL5qXeUXnd09Co6O9sN+JUhY=; b=ccHoqxbAmpnrNDQdSeaakV0iJ6DUv6/vrHhrhSuagmM1eYT40L1efh9xp8cb/VdXRW QEhBmgomxwdmz41+uk/FwxtaI8FTnE0loJh1BiwdCviAJSISWXdBSZ/fLM9RWcZ+athH UrBCQK1I2kYfWeGsVSFG5P3XDMU+y0aBxVs7aZZzJ6eMlXRAHk6xybKl9nDKtMs+xjre iUrh7raOpxRjuYidheeDuYNANHQMl79FU4IpocmcdNIoeF5SrFuqYXmzUQuuakR/N4KG eUQNs39ZozHUFyrzK7krGQZc2F3/VVtBWifsY9kS1S3iRVuXcioUiziOQeJJ3rwh7BOS NCfg== X-Forwarded-Encrypted: i=1; AJvYcCX9pfpLTzcHmcuv90mId2qZ+xxu93vGxHMhHd59yHgKWn24Z8jKcxMxeKVqj7FSr/LKMOScj3HAr8b/OUkpo1B5DAXr1DTRMJs2HnN/5Gs= X-Gm-Message-State: AOJu0YziOSpNYe9Fcbb54xGPCqMhBO4B4bTfkwoK8eFZBcrkE5fR8ItA j4LmFaAsyFRwH7HaWZVEz9C+l14aK24w+2WDRe7GOjcvjqzdgrYQPe1f75fd X-Google-Smtp-Source: AGHT+IFqodcbXvvGQbYAmgjAlCjjHyzPPhL/5h6u/IlGoF6PnqI7PI9+Ax4L4kxnxBVCA+PqtUfB/w== X-Received: by 2002:a05:6512:10d1:b0:52e:76e8:e18e with SMTP id 2adb3069b0e04-5321364a598mr46079e87.7.1723467981708; Mon, 12 Aug 2024 06:06:21 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, qemu-arm@nongnu.org Subject: [PATCH v1 04/10] hw/arm: xenpvh: Add support for SMP guests Date: Mon, 12 Aug 2024 15:05:59 +0200 Message-ID: <20240812130606.90410-5-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Add SMP support for Xen PVH ARM guests. Create max_cpus ioreq servers to handle hotplug. Signed-off-by: Edgar E. Iglesias --- hw/arm/xen_arm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c index 5f75cc3779..ef8315969c 100644 --- a/hw/arm/xen_arm.c +++ b/hw/arm/xen_arm.c @@ -173,7 +173,7 @@ static void xen_arm_init(MachineState *machine) xen_init_ram(machine); - xen_register_ioreq(xam->state, machine->smp.cpus, &xen_memory_listener); + xen_register_ioreq(xam->state, machine->smp.max_cpus, &xen_memory_listener); xen_create_virtio_mmio_devices(xam); @@ -218,7 +218,8 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data) MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Xen PVH ARM machine"; mc->init = xen_arm_init; - mc->max_cpus = 1; + /* MAX number of vcpus supported by Xen. */ + mc->max_cpus = GUEST_MAX_VCPUS; mc->default_machine_opts = "accel=xen"; /* Set explicitly here to make sure that real ram_size is passed */ mc->default_ram_size = 0; From patchwork Mon Aug 12 13:06:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760544 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2544DC52D7C for ; Mon, 12 Aug 2024 13:06:37 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775493.1185744 (Exim 4.92) (envelope-from ) id 1sdUkm-0000DQ-9I; Mon, 12 Aug 2024 13:06:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775493.1185744; Mon, 12 Aug 2024 13:06:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkm-0000CG-5Q; Mon, 12 Aug 2024 13:06:28 +0000 Received: by outflank-mailman (input) for mailman id 775493; Mon, 12 Aug 2024 13:06:26 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkk-00074b-GF for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:26 +0000 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [2a00:1450:4864:20::230]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ae0fe130-58ab-11ef-bc05-fd08da9f4363; Mon, 12 Aug 2024 15:06:25 +0200 (CEST) Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2f189a2a7f8so44356521fa.2 for ; Mon, 12 Aug 2024 06:06:25 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f291dff990sm8301261fa.64.2024.08.12.06.06.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:22 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ae0fe130-58ab-11ef-bc05-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467985; x=1724072785; darn=lists.xenproject.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=W/NQ+bDoiLffxrtbB/M0A1sRyjsF9bgHvteaiAPMvqQ=; b=V9rCi0Bx7d09sZMX0TUP7bBTeIxpjVzq8okmGchyI7DwqblFFWEKFo4L86+0sJCNTd WesmR2TN6fHt/UzwRy2OfaifTMGqhawOWYO0TIqNLamLyYotqbn4cq4FL2roRRSj8QXd OkrbKQ4qZwJAF0rJy+U0y+81stnBF2Mz+wmKRC60iB8z7/EmUG4u84pAa6KXQK/n80iA pjpgdCBJWAzqjzebwCfl5cXt9xYO3hkdK5NFtpzgLmXDJ4eoa3X+D+x5aKPnyVGvGPZt 2EQATJG1+Lj+Xln6e/y4YzE8Xe107lRqaCPOGbmoDYtCD1vZuusnbdd1vfBQqjhZQUe6 gNFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467985; x=1724072785; 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=W/NQ+bDoiLffxrtbB/M0A1sRyjsF9bgHvteaiAPMvqQ=; b=kvjkOSvlREk4N865N3erEf3/EdFR78zR76qMaLLFmMINS9Bnp8vB3jejyVY0WVFPdx 4UGbraNnEL0roTmOk+WYLi9AulGy7skgevJI1S6mfHEsV1V8HYy8U46WGjsRnmSNx8dR +mcAmdWiOQrbrNAEI2QZm4skWcm9BtLwI/vH33SBb2ieiKPKSaEI5timUPKPq3QtxOCm IaRhW8kV/zuQLriM4ghfKzKOKMQwK7GKkc0Bmu+xOBE95vNxZaz0pat/IfCIlP9SulL2 /KTFTL6defNQVsULJDuzj11ZtkChjpO6Z2oB0x2ISzO4MCFCvRMuFj/wpVow1xQH9d1f Tj2A== X-Forwarded-Encrypted: i=1; AJvYcCW8WfU1PiUDrAGNiakP8t4P+au2vLGWNwyYGFSocxosUdXZ+wdx9U+hldS8v+x6FUlx+HPysp90ozIHQhA/j/iRf0tf+soyiqJFomaxsLM= X-Gm-Message-State: AOJu0Yw36H8bZQUovzjFha3RTvM9P7zOssSxe0/jWkhoUWkPRviPKnnk CYWKpit7RrlKs5EBj99z3A07V4nPQlbq0zVSMiaLfYiZUSDPCyMj X-Google-Smtp-Source: AGHT+IF2RieUtGeR/iW9cWw+e/zdEKnbAONAmWuXU7OU5a81gT0ntNkasljwsAml/ALKofCfEA9e5A== X-Received: by 2002:a2e:b1d2:0:b0:2f1:5561:4b4a with SMTP id 38308e7fff4ca-2f2b7155335mr1355051fa.25.1723467984300; Mon, 12 Aug 2024 06:06:24 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, "Edgar E. Iglesias" , qemu-arm@nongnu.org Subject: [PATCH v1 05/10] hw/arm: xenpvh: Break out a common PVH module Date: Mon, 12 Aug 2024 15:06:00 +0200 Message-ID: <20240812130606.90410-6-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Break out a common Xen PVH module in preparation for adding a x86 Xen PVH Machine. Signed-off-by: Edgar E. Iglesias --- hw/arm/trace-events | 5 - hw/arm/xen_arm.c | 154 ++++++-------------------- hw/xen/meson.build | 1 + hw/xen/trace-events | 4 + hw/xen/xen-pvh-common.c | 185 ++++++++++++++++++++++++++++++++ include/hw/xen/xen-pvh-common.h | 45 ++++++++ 6 files changed, 269 insertions(+), 125 deletions(-) create mode 100644 hw/xen/xen-pvh-common.c create mode 100644 include/hw/xen/xen-pvh-common.h diff --git a/hw/arm/trace-events b/hw/arm/trace-events index be6c8f720b..c64ad344bd 100644 --- a/hw/arm/trace-events +++ b/hw/arm/trace-events @@ -68,10 +68,5 @@ z2_aer915_send_too_long(int8_t msg) "message too long (%i bytes)" z2_aer915_send(uint8_t reg, uint8_t value) "reg %d value 0x%02x" z2_aer915_event(int8_t event, int8_t len) "i2c event =0x%x len=%d bytes" -# xen_arm.c -xen_create_virtio_mmio_devices(int i, int irq, uint64_t base) "Created virtio-mmio device %d: irq %d base 0x%"PRIx64 -xen_init_ram(uint64_t machine_ram_size) "Initialized xen ram with size 0x%"PRIx64 -xen_enable_tpm(uint64_t addr) "Connected tpmdev at address 0x%"PRIx64 - # bcm2838.c bcm2838_gic_set_irq(int irq, int level) "gic irq:%d lvl:%d" diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c index ef8315969c..b8a5c09bdf 100644 --- a/hw/arm/xen_arm.c +++ b/hw/arm/xen_arm.c @@ -12,40 +12,25 @@ #include "hw/irq.h" #include "hw/sysbus.h" #include "sysemu/block-backend.h" -#include "sysemu/tpm_backend.h" #include "sysemu/sysemu.h" -#include "hw/xen/xen-hvm-common.h" +#include "hw/xen/xen-pvh-common.h" #include "sysemu/tpm.h" #include "hw/xen/arch_hvm.h" -#include "trace.h" #define TYPE_XEN_ARM MACHINE_TYPE_NAME("xenpvh") OBJECT_DECLARE_SIMPLE_TYPE(XenArmState, XEN_ARM) -static const MemoryListener xen_memory_listener = { - .region_add = xen_region_add, - .region_del = xen_region_del, - .log_start = NULL, - .log_stop = NULL, - .log_sync = NULL, - .log_global_start = NULL, - .log_global_stop = NULL, - .priority = MEMORY_LISTENER_PRIORITY_ACCEL, -}; - struct XenArmState { /*< private >*/ MachineState parent; - XenIOState *state; + XenPVHCommonState pvh; struct { uint64_t tpm_base_addr; } cfg; }; -static MemoryRegion ram_lo, ram_hi; - /* * VIRTIO_MMIO_DEV_SIZE is imported from tools/libs/light/libxl_arm.c under Xen * repository. @@ -57,64 +42,6 @@ static MemoryRegion ram_lo, ram_hi; #define NR_VIRTIO_MMIO_DEVICES \ (GUEST_VIRTIO_MMIO_SPI_LAST - GUEST_VIRTIO_MMIO_SPI_FIRST) -static void xen_set_irq(void *opaque, int irq, int level) -{ - if (xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level)) { - error_report("xendevicemodel_set_irq_level failed"); - } -} - -static void xen_create_virtio_mmio_devices(XenArmState *xam) -{ - int i; - - for (i = 0; i < NR_VIRTIO_MMIO_DEVICES; i++) { - hwaddr base = GUEST_VIRTIO_MMIO_BASE + i * VIRTIO_MMIO_DEV_SIZE; - qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL, - GUEST_VIRTIO_MMIO_SPI_FIRST + i); - - sysbus_create_simple("virtio-mmio", base, irq); - - trace_xen_create_virtio_mmio_devices(i, - GUEST_VIRTIO_MMIO_SPI_FIRST + i, - base); - } -} - -static void xen_init_ram(MachineState *machine) -{ - MemoryRegion *sysmem = get_system_memory(); - ram_addr_t block_len, ram_size[GUEST_RAM_BANKS]; - - trace_xen_init_ram(machine->ram_size); - if (machine->ram_size <= GUEST_RAM0_SIZE) { - ram_size[0] = machine->ram_size; - ram_size[1] = 0; - block_len = GUEST_RAM0_BASE + ram_size[0]; - } else { - ram_size[0] = GUEST_RAM0_SIZE; - ram_size[1] = machine->ram_size - GUEST_RAM0_SIZE; - block_len = GUEST_RAM1_BASE + ram_size[1]; - } - - memory_region_init_ram(&xen_memory, NULL, "xen.ram", block_len, - &error_fatal); - - memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", &xen_memory, - GUEST_RAM0_BASE, ram_size[0]); - memory_region_add_subregion(sysmem, GUEST_RAM0_BASE, &ram_lo); - if (ram_size[1] > 0) { - memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &xen_memory, - GUEST_RAM1_BASE, ram_size[1]); - memory_region_add_subregion(sysmem, GUEST_RAM1_BASE, &ram_hi); - } - - /* Setup support for grants. */ - memory_region_init_ram(&xen_grants, NULL, "xen.grants", block_len, - &error_fatal); - memory_region_add_subregion(sysmem, XEN_GRANT_ADDR_OFF, &xen_grants); -} - void arch_handle_ioreq(XenIOState *state, ioreq_t *req) { hw_error("Invalid ioreq type 0x%x\n", req->type); @@ -135,55 +62,42 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp) { } -#ifdef CONFIG_TPM -static void xen_enable_tpm(XenArmState *xam) -{ - Error *errp = NULL; - DeviceState *dev; - SysBusDevice *busdev; - - TPMBackend *be = qemu_find_tpm_be("tpm0"); - if (be == NULL) { - error_report("Couldn't find tmp0 backend"); - return; - } - dev = qdev_new(TYPE_TPM_TIS_SYSBUS); - object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &errp); - object_property_set_str(OBJECT(dev), "tpmdev", be->id, &errp); - busdev = SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(busdev, &error_fatal); - sysbus_mmio_map(busdev, 0, xam->cfg.tpm_base_addr); - - trace_xen_enable_tpm(xam->cfg.tpm_base_addr); -} -#endif - -static void xen_arm_init(MachineState *machine) +static void xen_arm_init(MachineState *ms) { - XenArmState *xam = XEN_ARM(machine); - - xam->state = g_new0(XenIOState, 1); + XenArmState *xam = XEN_ARM(ms); + const struct { + const char *name; + MemMapEntry map; + } map[] = { + { "ram-low", { GUEST_RAM0_BASE, GUEST_RAM0_SIZE } }, + { "ram-high", { GUEST_RAM1_BASE, GUEST_RAM1_SIZE } }, + { "virtio-mmio", { GUEST_VIRTIO_MMIO_BASE, VIRTIO_MMIO_DEV_SIZE } }, + { "tpm", { xam->cfg.tpm_base_addr, 0x1000 } }, + }; + int i; - if (machine->ram_size == 0) { - warn_report("%s non-zero ram size not specified. QEMU machine started" - " without IOREQ (no emulated devices including virtio)", - MACHINE_CLASS(object_get_class(OBJECT(machine)))->desc); - return; + object_initialize_child(OBJECT(ms), "pvh", &xam->pvh, TYPE_XEN_PVH_COMMON); + + object_property_set_int(OBJECT(&xam->pvh), "max-cpus", ms->smp.max_cpus, + &error_abort); + object_property_set_int(OBJECT(&xam->pvh), "ram-size", ms->ram_size, + &error_abort); + object_property_set_int(OBJECT(&xam->pvh), "virtio-mmio-num", + NR_VIRTIO_MMIO_DEVICES, &error_abort); + object_property_set_int(OBJECT(&xam->pvh), "virtio-mmio-irq-base", + GUEST_VIRTIO_MMIO_SPI_FIRST, &error_abort); + + for (i = 0; i < ARRAY_SIZE(map); i++) { + g_autofree char *base_name = g_strdup_printf("%s-base", map[i].name); + g_autofree char *size_name = g_strdup_printf("%s-size", map[i].name); + + object_property_set_int(OBJECT(&xam->pvh), base_name, map[i].map.base, + &error_abort); + object_property_set_int(OBJECT(&xam->pvh), size_name, map[i].map.size, + &error_abort); } - xen_init_ram(machine); - - xen_register_ioreq(xam->state, machine->smp.max_cpus, &xen_memory_listener); - - xen_create_virtio_mmio_devices(xam); - -#ifdef CONFIG_TPM - if (xam->cfg.tpm_base_addr) { - xen_enable_tpm(xam); - } else { - warn_report("tpm-base-addr is not provided. TPM will not be enabled"); - } -#endif + sysbus_realize(SYS_BUS_DEVICE(&xam->pvh), &error_abort); } #ifdef CONFIG_TPM diff --git a/hw/xen/meson.build b/hw/xen/meson.build index d887fa9ba4..4a486e3673 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -15,6 +15,7 @@ xen_specific_ss = ss.source_set() xen_specific_ss.add(files( 'xen-mapcache.c', 'xen-hvm-common.c', + 'xen-pvh-common.c', )) if have_xen_pci_passthrough xen_specific_ss.add(files( diff --git a/hw/xen/trace-events b/hw/xen/trace-events index d1b27f6c11..a07fe41c6d 100644 --- a/hw/xen/trace-events +++ b/hw/xen/trace-events @@ -64,6 +64,10 @@ destroy_hvm_domain_cannot_acquire_handle(void) "Cannot acquire xenctrl handle" destroy_hvm_domain_failed_action(const char *action, int sts, char *errno_s) "xc_domain_shutdown failed to issue %s, sts %d, %s" destroy_hvm_domain_action(int xen_domid, const char *action) "Issued domain %d %s" +# xen-pvh-common.c +xen_create_virtio_mmio_devices(int i, int irq, uint64_t base) "Created virtio-mmio device %d: irq %d base 0x%"PRIx64 +xen_enable_tpm(uint64_t addr) "Connected tpmdev at address 0x%"PRIx64 + # xen-mapcache.c xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64 xen_remap_bucket(uint64_t index) "index 0x%"PRIx64 diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c new file mode 100644 index 0000000000..0d368398d0 --- /dev/null +++ b/hw/xen/xen-pvh-common.c @@ -0,0 +1,185 @@ +/* + * Common Xen PVH code. + * + * Copyright (c) 2024 Advanced Micro Devices, Inc. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "qapi/error.h" +#include "hw/boards.h" +#include "hw/irq.h" +#include "hw/sysbus.h" +#include "sysemu/sysemu.h" +#include "sysemu/tpm.h" +#include "sysemu/tpm_backend.h" +#include "hw/xen/xen-pvh-common.h" +#include "trace.h" + +static const MemoryListener xen_memory_listener = { + .region_add = xen_region_add, + .region_del = xen_region_del, + .log_start = NULL, + .log_stop = NULL, + .log_sync = NULL, + .log_global_start = NULL, + .log_global_stop = NULL, + .priority = MEMORY_LISTENER_PRIORITY_ACCEL, +}; + +static void xen_pvh_init_ram(XenPVHCommonState *s, + MemoryRegion *sysmem) +{ + ram_addr_t block_len, ram_size[2]; + + if (s->cfg.ram_size <= s->cfg.ram_low.size) { + ram_size[0] = s->cfg.ram_size; + ram_size[1] = 0; + block_len = s->cfg.ram_low.base + ram_size[0]; + } else { + ram_size[0] = s->cfg.ram_low.size; + ram_size[1] = s->cfg.ram_size - s->cfg.ram_low.size; + block_len = s->cfg.ram_high.base + ram_size[1]; + } + + memory_region_init_ram(&xen_memory, NULL, "xen.ram", block_len, + &error_fatal); + + memory_region_init_alias(&s->ram.low, NULL, "xen.ram.lo", &xen_memory, + s->cfg.ram_low.base, ram_size[0]); + memory_region_add_subregion(sysmem, s->cfg.ram_low.base, &s->ram.low); + if (ram_size[1] > 0) { + memory_region_init_alias(&s->ram.high, NULL, "xen.ram.hi", &xen_memory, + s->cfg.ram_high.base, ram_size[1]); + memory_region_add_subregion(sysmem, s->cfg.ram_high.base, &s->ram.high); + } + + /* Setup support for grants. */ + memory_region_init_ram(&xen_grants, NULL, "xen.grants", block_len, + &error_fatal); + memory_region_add_subregion(sysmem, XEN_GRANT_ADDR_OFF, &xen_grants); +} + +static void xen_set_irq(void *opaque, int irq, int level) +{ + if (xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level)) { + error_report("xendevicemodel_set_irq_level failed"); + } +} + +static void xen_create_virtio_mmio_devices(XenPVHCommonState *s) +{ + int i; + + for (i = 0; i < s->cfg.virtio_mmio_num; i++) { + hwaddr base = s->cfg.virtio_mmio.base + i * s->cfg.virtio_mmio.size; + qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL, + s->cfg.virtio_mmio_irq_base + i); + + sysbus_create_simple("virtio-mmio", base, irq); + + trace_xen_create_virtio_mmio_devices(i, + s->cfg.virtio_mmio_irq_base + i, + base); + } +} + +#ifdef CONFIG_TPM +static void xen_enable_tpm(XenPVHCommonState *s) +{ + Error *errp = NULL; + DeviceState *dev; + SysBusDevice *busdev; + + TPMBackend *be = qemu_find_tpm_be("tpm0"); + if (be == NULL) { + error_report("Couldn't find tmp0 backend"); + return; + } + dev = qdev_new(TYPE_TPM_TIS_SYSBUS); + object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &errp); + object_property_set_str(OBJECT(dev), "tpmdev", be->id, &errp); + busdev = SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(busdev, &error_fatal); + sysbus_mmio_map(busdev, 0, s->cfg.tpm.base); + + trace_xen_enable_tpm(s->cfg.tpm.base); +} +#endif + +static void xen_pvh_realize(DeviceState *dev, Error **errp) +{ + XenPVHCommonState *s = XEN_PVH_COMMON(dev); + MemoryRegion *sysmem = get_system_memory(); + + if (s->cfg.ram_size == 0) { + /* FIXME: Prefix with object path and consider bailing out. */ + warn_report("non-zero ram size not specified. QEMU machine started" + " without IOREQ (no emulated devices including virtio)"); + return; + } + + if (s->cfg.max_cpus == 0) { + /* FIXME: Prefix with object path and bail out. */ + warn_report("max-cpus not specified. QEMU machine started"); + return; + } + + xen_pvh_init_ram(s, sysmem); + xen_register_ioreq(&s->ioreq, s->cfg.max_cpus, &xen_memory_listener); + + if (s->cfg.virtio_mmio_num) { + xen_create_virtio_mmio_devices(s); + } + +#ifdef CONFIG_TPM + if (s->cfg.tpm.base) { + xen_enable_tpm(s); + } else { + warn_report("tpm-base-addr is not provided. TPM will not be enabled"); + } +#endif +} + +#define DEFINE_PROP_MEMMAP(n, f) \ + DEFINE_PROP_UINT64(n "-base", XenPVHCommonState, cfg.f.base, 0), \ + DEFINE_PROP_UINT64(n "-size", XenPVHCommonState, cfg.f.size, 0) + +static Property xen_pvh_properties[] = { + DEFINE_PROP_UINT32("max-cpus", XenPVHCommonState, cfg.max_cpus, 0), + DEFINE_PROP_UINT64("ram-size", XenPVHCommonState, cfg.ram_size, 0), + DEFINE_PROP_MEMMAP("ram-low", ram_low), + DEFINE_PROP_MEMMAP("ram-high", ram_high), + DEFINE_PROP_MEMMAP("virtio-mmio", virtio_mmio), + DEFINE_PROP_MEMMAP("tpm", tpm), + DEFINE_PROP_UINT32("virtio-mmio-num", XenPVHCommonState, + cfg.virtio_mmio_num, 0), + DEFINE_PROP_UINT32("virtio-mmio-irq-base", XenPVHCommonState, + cfg.virtio_mmio_irq_base, 0), + DEFINE_PROP_END_OF_LIST() +}; + +static void xen_pvh_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->realize = xen_pvh_realize; + device_class_set_props(dc, xen_pvh_properties); + /* No VMSD since we haven't got any top-level SoC state to save. */ +} + +static const TypeInfo xen_pvh_info = { + .name = TYPE_XEN_PVH_COMMON, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(XenPVHCommonState), + .class_init = xen_pvh_class_init, +}; + +static void xen_pvh_register_types(void) +{ + type_register_static(&xen_pvh_info); +} + +type_init(xen_pvh_register_types); diff --git a/include/hw/xen/xen-pvh-common.h b/include/hw/xen/xen-pvh-common.h new file mode 100644 index 0000000000..e958b441fd --- /dev/null +++ b/include/hw/xen/xen-pvh-common.h @@ -0,0 +1,45 @@ +/* + * QEMU Xen PVH machine - common code. + * + * Copyright (c) 2024 Advanced Micro Devices, Inc. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef XEN_PVH_COMMON_H__ +#define XEN_PVH_COMMON_H__ + +#include +#include "hw/sysbus.h" +#include "hw/hw.h" +#include "hw/xen/xen-hvm-common.h" +#include "hw/pci-host/gpex.h" + +#define TYPE_XEN_PVH_COMMON "xen-pvh-common" +OBJECT_DECLARE_SIMPLE_TYPE(XenPVHCommonState, XEN_PVH_COMMON) + +typedef struct XenPVHCommonState { + /*< private >*/ + SysBusDevice parent_obj; + + XenIOState ioreq; + + struct { + MemoryRegion low; + MemoryRegion high; + } ram; + + struct { + uint64_t ram_size; + uint32_t max_cpus; + uint32_t virtio_mmio_num; + uint32_t virtio_mmio_irq_base; + struct { + uint64_t base; + uint64_t size; + } ram_low, ram_high, + virtio_mmio, + tpm; + } cfg; +} XenPVHCommonState; +#endif From patchwork Mon Aug 12 13:06:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760543 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D26A4C3DA7F for ; Mon, 12 Aug 2024 13:06:35 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775494.1185751 (Exim 4.92) (envelope-from ) id 1sdUkm-0000Mu-UZ; Mon, 12 Aug 2024 13:06:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775494.1185751; Mon, 12 Aug 2024 13:06:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkm-0000Lj-Oq; Mon, 12 Aug 2024 13:06:28 +0000 Received: by outflank-mailman (input) for mailman id 775494; Mon, 12 Aug 2024 13:06:28 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkm-0007ep-0w for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:28 +0000 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [2a00:1450:4864:20::233]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ae9f98bd-58ab-11ef-8776-851b0ebba9a2; Mon, 12 Aug 2024 15:06:26 +0200 (CEST) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2f032cb782dso44563071fa.3 for ; Mon, 12 Aug 2024 06:06:26 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f2920525b7sm8607681fa.121.2024.08.12.06.06.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:24 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ae9f98bd-58ab-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467986; x=1724072786; darn=lists.xenproject.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=KTEAe/pOjkrnvyxDHYihrpK7ln2+IQNSmZ/kBKccldI=; b=YIJPUU+llteL1oe/FljqFPaEXYBiwC49LeEZpNYAIEsH99ky4mJG71ovQtl2SsZvsK Mf6T+eBXJn5M/st9wuDWspG0Yr+qeaNGZS0eJJ+Miu/NzvnGZcE3jvkVDn33UX/wcc6s ybADnCmTXanpJggDmha4Z5ZQZFKjfOUJImayeYH8XN/PEgzO2m3hPzuVVYFolYphwkpR ChgAINNdEleQxvMM2M1/I2k9W3dYVuAIH9AQlfVbSEf43Z+UXXS6gzUIbg7ThmmBNynW zQXOIDrUOydxBLkzqkWCdKIzXREr0bNIMBHpu2wpVh50BTthMQ5xQY20CdH5Ur1+WhAX 8OgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467986; x=1724072786; 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=KTEAe/pOjkrnvyxDHYihrpK7ln2+IQNSmZ/kBKccldI=; b=m7iIqi34MFikXaVSfKbZqlosRyxteFroOTHb55s4eFWm7yEMMMuhGaDVaXs3lnFVr5 00EBWOfyqD2ciSz7W2jVESoFi0eUQuY6onBIfd/843DVl5+WEjW/hMD6+GHQjmv90ZkK YFqk96JzBs1VQhzpvBCxiIFdMEDU/vpF5MV5dKdp6SvBnsGpndAIxyyz1Ym6q9nJfpzH 50C/F7tBUIuCXtlde5aKNsJZS1L1xYeqXSLO0jGugvgVuzUvFu9Q5Lf8om4x1ARgDKAf FfTbxx8JLAYpm0vzHnZ6l6ncmdnjvfXxBGhT0X1nKsr/TCc7kFMoxI+iXN840Y+HglKI xamQ== X-Forwarded-Encrypted: i=1; AJvYcCWMAz4Hb5hcOHKoG92J1dUcG+s2U2lF5NXahY58WjYOv79Nimg6ePLEtJFxvYiUfaXkuNxTrBEb2iegJZGtn4AwHAkO7Jc7e4g2RW4OjGI= X-Gm-Message-State: AOJu0Yww43ZHRMBQHejVHYz1NEblRaE9sK0Bsku9w2jf/t4wCVOUmSjF rs1pJf+LKz/rWGbWgDe5RxeF+M0IE2tDwGzmqrt8S5V4NMcyVLZi X-Google-Smtp-Source: AGHT+IH0EXdKyQvoxf37ygreO5y2jLBKuw9Hze8ISbhMj2e1iAgBShVHSABDPv6QJ/gpCgSqjwyxEQ== X-Received: by 2002:a05:651c:507:b0:2ef:2c86:4d43 with SMTP id 38308e7fff4ca-2f2b714656amr1654731fa.3.1723467985346; Mon, 12 Aug 2024 06:06:25 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, qemu-arm@nongnu.org Subject: [PATCH v1 06/10] hw/arm: xenpvh: Rename xen_arm.c -> xen-pvh.c Date: Mon, 12 Aug 2024 15:06:01 +0200 Message-ID: <20240812130606.90410-7-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Rename xen_arm.c -> xen-pvh.c to better express that this is a PVH machine and to align with x86 HVM and future PVH machine filenames: hw/i386/xen/xen-hvm.c hw/i386/xen/xen-pvh.c (in preparation) No functional changes. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- hw/arm/meson.build | 2 +- hw/arm/{xen_arm.c => xen-pvh.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename hw/arm/{xen_arm.c => xen-pvh.c} (100%) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 0c07ab522f..769fe9ec1a 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -59,7 +59,7 @@ arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre. arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) -arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen_arm.c')) +arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen-pvh.c')) system_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c')) system_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c')) diff --git a/hw/arm/xen_arm.c b/hw/arm/xen-pvh.c similarity index 100% rename from hw/arm/xen_arm.c rename to hw/arm/xen-pvh.c From patchwork Mon Aug 12 13:06:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760545 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E2873C52D7F for ; Mon, 12 Aug 2024 13:06:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775495.1185764 (Exim 4.92) (envelope-from ) id 1sdUkq-0000uz-CO; Mon, 12 Aug 2024 13:06:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775495.1185764; Mon, 12 Aug 2024 13:06:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkq-0000uh-4u; Mon, 12 Aug 2024 13:06:32 +0000 Received: by outflank-mailman (input) for mailman id 775495; Mon, 12 Aug 2024 13:06:30 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUko-0007ep-St for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:30 +0000 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [2a00:1450:4864:20::22a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b0432a9c-58ab-11ef-8776-851b0ebba9a2; Mon, 12 Aug 2024 15:06:29 +0200 (CEST) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2ef2d96164aso46452721fa.3 for ; Mon, 12 Aug 2024 06:06:29 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53200f1ac89sm734534e87.184.2024.08.12.06.06.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:25 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b0432a9c-58ab-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467989; x=1724072789; darn=lists.xenproject.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=Nhh0TpUXfvKDYo1bINWU88Yt0WNYvGv2suBFZ023AEo=; b=f4oioUWGILPFUlnvv002QkQz5v79f+efVXkV0vDSfW/dycdVphHWEOMEIss7s+bAcL tcdoemY0DyllfXWB5tB6v43MV8VsNDza1p0hnOXdnhkhrFjpq2oP9WIACUtOvQdWN8KW 0xPPgx95CNTH+dzhw25lGDvJpuc2amxo1gTEfAPWpzm+wBQ5RdILQ05PU2CmibKlenbK FHeU3xNZwVyXQRzDIOZl/BtH19AB/9bLAV9q7qy54N17RNnGZLQBTbcvX0Yigd88YRfl LIX3G2xMpp6rWgXBFve/dNGSFVurD4GY3INKFuSk6LiQImCYiG+UoGmBI+Bnq/CP+A6e r5Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467989; x=1724072789; 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=Nhh0TpUXfvKDYo1bINWU88Yt0WNYvGv2suBFZ023AEo=; b=O6IbwXecgwnSQXiszo9tBVvNqqQPE67UEyY1hSRstoC2h6ticKSlVdaYENSRleN4cH rhuNAShYxNzyXuuPG+cNcSsj5YGHl49HYqb5uBkbKrUotGEOe8Wm0o6lw9slKd09E0Rt N8Re0EPF6wVGyvQSWYnvsSk+2ZU7q1Xnzy6LHw8PLtMlw/37lCo70gRJ9QKpKo6QB1qg lHy/w92E1Le3VzKwn1r83VW6wFSnvkCHwBKlekNvIFmolMOb7ltsf62VwcHRlNpBm2h1 owlzroQ/nHIzLkXTTFE0zZsIWmQs1RRcn2iI98b1dgdoog6/em11k7jN+x+ISI0viEv+ dWCA== X-Forwarded-Encrypted: i=1; AJvYcCWrQz7u7vXU7oOA6s4Aw3XiymoZOz7cZvjipESddFFDEK2zdTReKUvdK/ZOO36HIaiqBbh3m6bB6Zt18SLwK99Yt/2xEJu9gkRarvxXslk= X-Gm-Message-State: AOJu0YxFSFBVA2Ugj8GaIxfi1wuBDrZ6m3Zr9DXjqAkDX1sVmtkrwJFT 4vxBG6oCRx7eiNqhZHDGdM8LGh/iGtuKqpcOwntozPApWsbgeCb6 X-Google-Smtp-Source: AGHT+IHSkZQghDr6Glb8JEvdreF6qFC+N2jFtbTRBNglrKRLKqDk7xPj3u/onfFEY6yEqggs5c2vsg== X-Received: by 2002:a05:6512:1296:b0:52c:dfa0:dca0 with SMTP id 2adb3069b0e04-53213693c31mr31960e87.43.1723467988154; Mon, 12 Aug 2024 06:06:28 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, "Edgar E. Iglesias" Subject: [PATCH v1 07/10] hw/arm: xenpvh: Reverse virtio-mmio creation order Date: Mon, 12 Aug 2024 15:06:02 +0200 Message-ID: <20240812130606.90410-8-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" We've been creating the virtio-mmio devices in forwards order but since the qbus lists prepend (rather than append) entries, the virtio busses end up with decreasing base address order. Xen enables virtio-mmio nodes in forwards order so there's been a missmatch. So far, we've been working around this with an out-of-tree patch to Xen. This reverses the order making sure the virtio busses end up ordered with increasing base addresses avoiding the need to patch Xen. Signed-off-by: Edgar E. Iglesias Acked-by: Stefano Stabellini --- hw/xen/xen-pvh-common.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c index 0d368398d0..69a2dbdb6d 100644 --- a/hw/xen/xen-pvh-common.c +++ b/hw/xen/xen-pvh-common.c @@ -73,7 +73,18 @@ static void xen_create_virtio_mmio_devices(XenPVHCommonState *s) { int i; - for (i = 0; i < s->cfg.virtio_mmio_num; i++) { + /* + * We create the transports in reverse order. Since qbus_realize() + * prepends (not appends) new child buses, the decrementing loop below will + * create a list of virtio-mmio buses with increasing base addresses. + * + * When a -device option is processed from the command line, + * qbus_find_recursive() picks the next free virtio-mmio bus in forwards + * order. + * + * This is what the Xen tools expect. + */ + for (i = s->cfg.virtio_mmio_num - 1; i >= 0; i--) { hwaddr base = s->cfg.virtio_mmio.base + i * s->cfg.virtio_mmio.size; qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL, s->cfg.virtio_mmio_irq_base + i); From patchwork Mon Aug 12 13:06:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760546 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0958AC3DA7F for ; Mon, 12 Aug 2024 13:06:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775497.1185773 (Exim 4.92) (envelope-from ) id 1sdUkr-0001CY-La; Mon, 12 Aug 2024 13:06:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775497.1185773; Mon, 12 Aug 2024 13:06:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkr-0001Bl-Fk; Mon, 12 Aug 2024 13:06:33 +0000 Received: by outflank-mailman (input) for mailman id 775497; Mon, 12 Aug 2024 13:06:32 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkq-0007ep-1s for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:32 +0000 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [2a00:1450:4864:20::129]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b1013ab9-58ab-11ef-8776-851b0ebba9a2; Mon, 12 Aug 2024 15:06:30 +0200 (CEST) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-52f025bc147so4940625e87.3 for ; Mon, 12 Aug 2024 06:06:30 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53200f42667sm739978e87.294.2024.08.12.06.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:28 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b1013ab9-58ab-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467990; x=1724072790; darn=lists.xenproject.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=fsU79nmQ1AQVXUbNSxYwoeBBAkcfnxSMEvBp2lKDwWA=; b=B/xI+8KavbWBZZglNfWEf48hc0q0hZvTzA5TQwWKGyYhhR4NdslF57hJg4NKekTcb/ 0Q+uZumL7LBhYxSfjRb5GOeIGAZK4Z1vXMNRzL4WDlQ0AXEN7TNqQaPBXXrMfOuflvss WTKz4WhJjylmQnLc2VjrbXjkO3d+6FW1SrodK5owAjieVaGHPKAK+IYsWgOOKRMxaGDu z6JS5ur5pJz1sekEdkfddLOFTZkW+Z8ir0hMQPmoKRqGxsq89HrjpmZCVDdSSMjTVgwo 9QKVXcn9NuQK43h0nX7MttEIRW/fKjgxdyDYq7t1FM3ELOtxoUUmYj5rvtjVtIfPfdPo iaBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467990; x=1724072790; 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=fsU79nmQ1AQVXUbNSxYwoeBBAkcfnxSMEvBp2lKDwWA=; b=OJbjLmsFzk9yyekvzpcv3LoMEPJIVnkiKnEvxoI1TgRQMqUU/d6r/8ogR8l5gPzZ6U XusGrRF9/Nf2AollqusmQt4S6fmIFt9NyHfDY9mQ4uM2Z4scM2pN4uvxRNWKJai+HxVP hoQee1upt1Kk9oVB5CR/aESJGx7r+bCAnOn51OjxWk/anKojVUTiVlM29TSKun9ibiF6 LWIgV3MNon2N1J+tSxAf1hbaaB3Gl+SOxM8pj6avYE8V3tpcJYFV+9ueoWmQGiydbn6b 71nIfIc9dGjzqQq8YQHjmaFzC/gsAAyi9yfLHAlBngA5qdztA1F5SjvWFbihBGirrBtN BTUA== X-Forwarded-Encrypted: i=1; AJvYcCU9jI7HVqVHMq5yg3RqGYBbAN1wvBey+lOuZWVWZMUBuNvIMyw4l3cThY0x8JNi5YAUWhhLwoxJQN+bKjMluTbtEpoj/+PFvhb7YaQnDjI= X-Gm-Message-State: AOJu0Yx8nsIrn0UZqTyub3QTn0B+aW7/OS1ay0HoNFBffJQCgYEI/fwQ YtbFpdLP5XBwFAGtjm/LlNyL0yO1zdO87f24DYeGy6vxehf+4pwEH6BaVAD5 X-Google-Smtp-Source: AGHT+IExi6OAtMSH2lj/PgBrg+LlxDZERUpkwQQHEWkaEtSD3XJV0ILUPZ6rtXYIo0sScSOwNbS7/Q== X-Received: by 2002:a05:6512:6d1:b0:52e:941d:7039 with SMTP id 2adb3069b0e04-532136a4e69mr29594e87.59.1723467989238; Mon, 12 Aug 2024 06:06:29 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, "Edgar E. Iglesias" Subject: [PATCH v1 08/10] hw/xen: pvh-common: Add support for creating PCIe/GPEX Date: Mon, 12 Aug 2024 15:06:03 +0200 Message-ID: <20240812130606.90410-9-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Add support for optionally creating a PCIe/GPEX controller. Signed-off-by: Edgar E. Iglesias --- hw/xen/xen-pvh-common.c | 66 +++++++++++++++++++++++++++++++++ include/hw/xen/xen-pvh-common.h | 10 ++++- 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c index 69a2dbdb6d..b1432e4bd9 100644 --- a/hw/xen/xen-pvh-common.c +++ b/hw/xen/xen-pvh-common.c @@ -120,6 +120,59 @@ static void xen_enable_tpm(XenPVHCommonState *s) } #endif +static void xen_set_pci_intx_irq(void *opaque, int irq, int level) +{ + if (xen_set_pci_intx_level(xen_domid, 0, 0, 0, irq, level)) { + error_report("xendevicemodel_set_pci_intx_level failed"); + } +} + +static inline void xenpvh_gpex_init(XenPVHCommonState *s, + MemoryRegion *sysmem, + hwaddr ecam_base, hwaddr ecam_size, + hwaddr mmio_base, hwaddr mmio_size, + hwaddr mmio_high_base, + hwaddr mmio_high_size, + int intx_irq_base) +{ + MemoryRegion *ecam_reg; + MemoryRegion *mmio_reg; + DeviceState *dev; + int i; + + object_initialize_child(OBJECT(s), "gpex", &s->pci.gpex, + TYPE_GPEX_HOST); + dev = DEVICE(&s->pci.gpex); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + + ecam_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_add_subregion(sysmem, ecam_base, ecam_reg); + + mmio_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + + if (mmio_size) { + memory_region_init_alias(&s->pci.mmio_alias, OBJECT(dev), "pcie-mmio", + mmio_reg, mmio_base, mmio_size); + memory_region_add_subregion(sysmem, mmio_base, &s->pci.mmio_alias); + } + + if (mmio_high_size) { + memory_region_init_alias(&s->pci.mmio_high_alias, OBJECT(dev), + "pcie-mmio-high", + mmio_reg, mmio_high_base, mmio_high_size); + memory_region_add_subregion(sysmem, mmio_high_base, + &s->pci.mmio_high_alias); + } + + for (i = 0; i < GPEX_NUM_IRQS; i++) { + qemu_irq irq = qemu_allocate_irq(xen_set_pci_intx_irq, s, i); + + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, irq); + gpex_set_irq_num(GPEX_HOST(dev), i, intx_irq_base + i); + xen_set_pci_link_route(i, intx_irq_base + i); + } +} + static void xen_pvh_realize(DeviceState *dev, Error **errp) { XenPVHCommonState *s = XEN_PVH_COMMON(dev); @@ -152,6 +205,14 @@ static void xen_pvh_realize(DeviceState *dev, Error **errp) warn_report("tpm-base-addr is not provided. TPM will not be enabled"); } #endif + + if (s->cfg.ecam.size) { + xenpvh_gpex_init(s, sysmem, + s->cfg.ecam.base, s->cfg.ecam.size, + s->cfg.mmio.base, s->cfg.mmio.size, + s->cfg.mmio_high.base, s->cfg.mmio_high.size, + s->cfg.pci_intx_irq_base); + } } #define DEFINE_PROP_MEMMAP(n, f) \ @@ -165,10 +226,15 @@ static Property xen_pvh_properties[] = { DEFINE_PROP_MEMMAP("ram-high", ram_high), DEFINE_PROP_MEMMAP("virtio-mmio", virtio_mmio), DEFINE_PROP_MEMMAP("tpm", tpm), + DEFINE_PROP_MEMMAP("pci-ecam", ecam), + DEFINE_PROP_MEMMAP("pci-mmio", mmio), + DEFINE_PROP_MEMMAP("pci-mmio-high", mmio_high), DEFINE_PROP_UINT32("virtio-mmio-num", XenPVHCommonState, cfg.virtio_mmio_num, 0), DEFINE_PROP_UINT32("virtio-mmio-irq-base", XenPVHCommonState, cfg.virtio_mmio_irq_base, 0), + DEFINE_PROP_UINT32("pci-intx-irq-base", XenPVHCommonState, + cfg.pci_intx_irq_base, 0), DEFINE_PROP_END_OF_LIST() }; diff --git a/include/hw/xen/xen-pvh-common.h b/include/hw/xen/xen-pvh-common.h index e958b441fd..faacfca70e 100644 --- a/include/hw/xen/xen-pvh-common.h +++ b/include/hw/xen/xen-pvh-common.h @@ -29,17 +29,25 @@ typedef struct XenPVHCommonState { MemoryRegion high; } ram; + struct { + GPEXHost gpex; + MemoryRegion mmio_alias; + MemoryRegion mmio_high_alias; + } pci; + struct { uint64_t ram_size; uint32_t max_cpus; uint32_t virtio_mmio_num; uint32_t virtio_mmio_irq_base; + uint32_t pci_intx_irq_base; struct { uint64_t base; uint64_t size; } ram_low, ram_high, virtio_mmio, - tpm; + tpm, + ecam, mmio, mmio_high; } cfg; } XenPVHCommonState; #endif From patchwork Mon Aug 12 13:06:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760547 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9F89C52D7C for ; Mon, 12 Aug 2024 13:06:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775499.1185779 (Exim 4.92) (envelope-from ) id 1sdUks-0001Gn-4b; Mon, 12 Aug 2024 13:06:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775499.1185779; Mon, 12 Aug 2024 13:06:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkr-0001FU-QX; Mon, 12 Aug 2024 13:06:33 +0000 Received: by outflank-mailman (input) for mailman id 775499; Mon, 12 Aug 2024 13:06:32 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkq-00074b-8p for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:32 +0000 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [2a00:1450:4864:20::22b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b19c9544-58ab-11ef-bc05-fd08da9f4363; Mon, 12 Aug 2024 15:06:31 +0200 (CEST) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2f149845fbaso45483501fa.3 for ; Mon, 12 Aug 2024 06:06:31 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f291df3c4esm8503311fa.40.2024.08.12.06.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:29 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b19c9544-58ab-11ef-bc05-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467991; x=1724072791; darn=lists.xenproject.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=zpYqNKXAVuA0a+6/wfjyGjtY9ZeW5tCWM6T6raDN/Y4=; b=QgtnSVwvc56thpNKoLxfoUNC63Fjzv+hEvod3nd6UDvPR2s3IUGi6j4YUV2BpclwMj BjlEsJzQGwLC8NZQXg5i8Mfidi05RWTd3CErmFhpyv5nOrFa7hD3j1YItkMjfh+S85af +DFERiStt4Tc8Qgb2/DiH4FQFy8pD41uaBRT76Rf9bGucoReXgZ6UfbnFmPnHBGcK73f SHwF3Wlp8PIaINzUIL+DbpcC8nlSWf/fzhlCA2FIu5mJz4xj/2yxLhNkAUY7E+Pe7vbw mSAZrWwIvHf9ejvtUCrHFUxnW+wwTqZzhkrCYtWfbzUD24M+53KWpOmHeEw/Nq4O++PQ odkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467991; x=1724072791; 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=zpYqNKXAVuA0a+6/wfjyGjtY9ZeW5tCWM6T6raDN/Y4=; b=iisgonhi8F+AiaTVJt/i++d9IhHL9UGi/9O6XFH76/7hy4+aRfCoct5BUquQyzT533 ElZGfsNE8ThATyyY2adxpfnpXhfz2iP3Q2i4W4WyAGMDD1n+z0fD6CAuc7eQsa5oGmVm ZB1hQmIFZjL7wXbDPFvQb/Xij70UTeBH+yxmcAtzNJbUZ7BI3IooQH2++nYociaeWGGj VDs7Lhcdzpf/39qFCXaoL2m7Gv8BOR6Hn0TeQPziNo/LUzmVUj0BanAz40VF7bojwY2W 1/Z1iT+Wq6j8SQ/zmJtAKzn8WLKi97gMsyCjDzLlRIUPd1ruhNJoVKSTe8a3++a9fbPR AaNw== X-Forwarded-Encrypted: i=1; AJvYcCWPbfU8bBwWKDJzAH0XSWGwS4OxTstfwKlVYECoyaMVf6xMzhZsJdF5qdLTSLnagMYx+o3fk/XcFWG/C78RT7de8cGebOo16j/dou7Miw0= X-Gm-Message-State: AOJu0YwFS4RRpunwJmAIjLPeT9jlombF23gc82tM5KYMoCNaMEhJ9JMP Tv0cTHnGbTjAZQ9Z3mpehiv880foqE2gd40D/AgcdqymNMxFRkT3 X-Google-Smtp-Source: AGHT+IFbDkFVn4nHNTgp2rSK1ep8EB3W/CnGnNoziWsVxIa3hCXemD+rWCA6eJi3qacG+boCLJdOoQ== X-Received: by 2002:a2e:2414:0:b0:2ef:1808:7523 with SMTP id 38308e7fff4ca-2f2b714d294mr1493031fa.18.1723467990279; Mon, 12 Aug 2024 06:06:30 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, "Edgar E. Iglesias" , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PATCH v1 09/10] hw/i386/xen: Add a Xen PVH x86 machine Date: Mon, 12 Aug 2024 15:06:04 +0200 Message-ID: <20240812130606.90410-10-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" This adds a Xen PVH x86 machine based on the PVH Common module used by the ARM PVH machine. Signed-off-by: Edgar E. Iglesias --- hw/i386/xen/meson.build | 1 + hw/i386/xen/xen-pvh.c | 196 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 hw/i386/xen/xen-pvh.c diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build index 3f0df8bc07..c73c62b8e3 100644 --- a/hw/i386/xen/meson.build +++ b/hw/i386/xen/meson.build @@ -4,6 +4,7 @@ i386_ss.add(when: 'CONFIG_XEN', if_true: files( )) i386_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-hvm.c', + 'xen-pvh.c', )) i386_ss.add(when: 'CONFIG_XEN_BUS', if_true: files( diff --git a/hw/i386/xen/xen-pvh.c b/hw/i386/xen/xen-pvh.c new file mode 100644 index 0000000000..9c3d3fc58d --- /dev/null +++ b/hw/i386/xen/xen-pvh.c @@ -0,0 +1,196 @@ +/* + * QEMU Xen PVH x86 Machine + * + * Copyright (c) 2024 Advanced Micro Devices, Inc. + * Written by Edgar E. Iglesias + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "qemu/error-report.h" +#include "hw/boards.h" +#include "sysemu/sysemu.h" +#include "hw/xen/arch_hvm.h" +#include "hw/xen/xen.h" +#include "hw/xen/xen-pvh-common.h" + +#define TYPE_XEN_PVH_X86 MACHINE_TYPE_NAME("xenpvh") +OBJECT_DECLARE_SIMPLE_TYPE(XenPVHx86State, XEN_PVH_X86) + +#define PVH_MAX_CPUS 128 + +struct XenPVHx86State { + /*< private >*/ + MachineState parent; + + DeviceState *cpu[PVH_MAX_CPUS]; + XenPVHCommonState pvh; + + /* + * We provide these properties to allow Xen to move things to other + * addresses for example when users need to accomodate the memory-map + * for 1:1 mapped devices/memory. + */ + struct { + MemMapEntry ram_low, ram_high; + MemMapEntry pci_ecam, pci_mmio, pci_mmio_high; + } cfg; +}; + +static void xenpvh_cpu_new(MachineState *ms, + XenPVHx86State *xp, + int cpu_idx, + int64_t apic_id) +{ + Object *cpu = object_new(ms->cpu_type); + + object_property_add_child(OBJECT(ms), "cpu[*]", cpu); + object_property_set_uint(cpu, "apic-id", apic_id, &error_fatal); + qdev_realize(DEVICE(cpu), NULL, &error_fatal); + object_unref(cpu); + + xp->cpu[cpu_idx] = DEVICE(cpu); +} + +static void xenpvh_init(MachineState *ms) +{ + XenPVHx86State *xp = XEN_PVH_X86(ms); + const struct { + const char *name; + MemMapEntry *map; + } map[] = { + { "ram-low", &xp->cfg.ram_low }, + { "ram-high", &xp->cfg.ram_high }, + { "pci-ecam", &xp->cfg.pci_ecam }, + { "pci-mmio", &xp->cfg.pci_mmio }, + { "pci-mmio-high", &xp->cfg.pci_mmio_high }, + }; + int i; + + object_initialize_child(OBJECT(ms), "pvh", &xp->pvh, TYPE_XEN_PVH_COMMON); + object_property_set_int(OBJECT(&xp->pvh), "max-cpus", ms->smp.max_cpus, + &error_abort); + object_property_set_int(OBJECT(&xp->pvh), "ram-size", ms->ram_size, + &error_abort); + + for (i = 0; i < ARRAY_SIZE(map); i++) { + g_autofree char *base_name = g_strdup_printf("%s-base", map[i].name); + g_autofree char *size_name = g_strdup_printf("%s-size", map[i].name); + + object_property_set_int(OBJECT(&xp->pvh), base_name, map[i].map->base, + &error_abort); + object_property_set_int(OBJECT(&xp->pvh), size_name, map[i].map->size, + &error_abort); + } + + /* GSI's 16 - 20 are used for legacy PCIe INTX IRQs. */ + object_property_set_int(OBJECT(&xp->pvh), "pci-intx-irq-base", 16, + &error_abort); + + sysbus_realize(SYS_BUS_DEVICE(&xp->pvh), &error_abort); + + /* Create dummy cores. This will indirectly create the APIC MSI window. */ + for (i = 0; i < ms->smp.cpus; i++) { + xenpvh_cpu_new(ms, xp, i, i); + } +} + +#define XENPVH_PROP_MEMMAP_SETTER(n, f) \ +static void xenpvh_set_ ## n ## _ ## f(Object *obj, Visitor *v, \ + const char *name, void *opaque, \ + Error **errp) \ +{ \ + XenPVHx86State *xp = XEN_PVH_X86(obj); \ + uint64_t value; \ + \ + if (!visit_type_size(v, name, &value, errp)) { \ + return; \ + } \ + xp->cfg.n.f = value; \ +} + +#define XENPVH_PROP_MEMMAP_GETTER(n, f) \ +static void xenpvh_get_ ## n ## _ ## f(Object *obj, Visitor *v, \ + const char *name, void *opaque, \ + Error **errp) \ +{ \ + XenPVHx86State *xp = XEN_PVH_X86(obj); \ + uint64_t value = xp->cfg.n.f; \ + \ + visit_type_uint64(v, name, &value, errp); \ +} + +#define XENPVH_PROP_MEMMAP(n) \ + XENPVH_PROP_MEMMAP_SETTER(n, base) \ + XENPVH_PROP_MEMMAP_SETTER(n, size) \ + XENPVH_PROP_MEMMAP_GETTER(n, base) \ + XENPVH_PROP_MEMMAP_GETTER(n, size) + + +XENPVH_PROP_MEMMAP(ram_low) +XENPVH_PROP_MEMMAP(ram_high) +XENPVH_PROP_MEMMAP(pci_ecam) +XENPVH_PROP_MEMMAP(pci_mmio) +XENPVH_PROP_MEMMAP(pci_mmio_high) + +static void xenpvh_instance_init(Object *obj) +{ + XenPVHx86State *xp = XEN_PVH_X86(obj); + + /* Default memmap. */ + xp->cfg.ram_low.base = 0x0; + xp->cfg.ram_low.size = 0x80000000U; + xp->cfg.ram_high.base = 0xC000000000ULL; + xp->cfg.ram_high.size = 0x4000000000ULL; +} + +static void xenpvh_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->desc = "Xen PVH x86 machine"; + mc->init = xenpvh_init; + mc->max_cpus = PVH_MAX_CPUS; + mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; + mc->default_machine_opts = "accel=xen"; + /* Set explicitly here to make sure that real ram_size is passed */ + mc->default_ram_size = 0; + +#define OC_MEMMAP_PROP(c, prop_name, name) \ +do { \ + object_class_property_add(c, prop_name "-base", "uint64_t", \ + xenpvh_get_ ## name ## _base, \ + xenpvh_set_ ## name ## _base, NULL, NULL); \ + object_class_property_set_description(oc, prop_name "-base", \ + prop_name " base address"); \ + object_class_property_add(c, prop_name "-size", "uint64_t", \ + xenpvh_get_ ## name ## _size, \ + xenpvh_set_ ## name ## _size, NULL, NULL); \ + object_class_property_set_description(oc, prop_name "-size", \ + prop_name " size of memory region"); \ +} while (0) + + OC_MEMMAP_PROP(oc, "ram-low", ram_low); + OC_MEMMAP_PROP(oc, "ram-high", ram_high); + OC_MEMMAP_PROP(oc, "pci-ecam", pci_ecam); + OC_MEMMAP_PROP(oc, "pci-mmio", pci_mmio); + OC_MEMMAP_PROP(oc, "pci-mmio-high", pci_mmio_high); +} + +static const TypeInfo xenpvh_machine_type = { + .name = TYPE_XEN_PVH_X86, + .parent = TYPE_MACHINE, + .class_init = xenpvh_machine_class_init, + .instance_init = xenpvh_instance_init, + .instance_size = sizeof(XenPVHx86State), +}; + +static void xenpvh_machine_register_types(void) +{ + type_register_static(&xenpvh_machine_type); +} + +type_init(xenpvh_machine_register_types) From patchwork Mon Aug 12 13:06:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 13760548 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E79E4C3DA7F for ; Mon, 12 Aug 2024 13:06:43 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.775505.1185794 (Exim 4.92) (envelope-from ) id 1sdUku-00021z-Oy; Mon, 12 Aug 2024 13:06:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 775505.1185794; Mon, 12 Aug 2024 13:06:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUku-00021j-JQ; Mon, 12 Aug 2024 13:06:36 +0000 Received: by outflank-mailman (input) for mailman id 775505; Mon, 12 Aug 2024 13:06:34 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUks-00074b-Ke for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:34 +0000 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [2a00:1450:4864:20::22d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b31e9298-58ab-11ef-bc05-fd08da9f4363; Mon, 12 Aug 2024 15:06:34 +0200 (CEST) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2ef2c56d9dcso49208671fa.2 for ; Mon, 12 Aug 2024 06:06:34 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f29203d7ebsm8631921fa.83.2024.08.12.06.06.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:31 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b31e9298-58ab-11ef-bc05-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467993; x=1724072793; darn=lists.xenproject.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=mKBi8KqYhGDFlqsXHx9Zw2bI17GecQkQjZL9UWM7DqA=; b=kuUQm91TepPzeX6i4z1QYb7s6hZ1cgAqABPCKGKu3MpvVpr3auZGk9Gu5Y8GxOXU4R dG3+QI60Hkt+HGY+sZQDjC4yNd+sMiyIKGQMUjYKxmKzqBaGYQYpOJxQbprVWIVV/aQi jC2hLBR+8Um+vX2yrQJ4GakXk0U0xzC/VDyUCLU7WPyKeXGoy/DUSJUZzG+EGibEYKCb u75k7Qf1pWuU1Wxa3ceInxEL8pMjSpZRMLiN2FEvkhudXPRxBjnRk0ki7ETHBU1NcHki EDA1UllcrgHGNDuqy+S+vAGtg3J3c8zWNJFOw8Cj+kzqYhxIoEoS/S0Bbqa6X5uVB8ZZ ZsoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467993; x=1724072793; 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=mKBi8KqYhGDFlqsXHx9Zw2bI17GecQkQjZL9UWM7DqA=; b=fxz+z/kKGCW5Z6RBh2uWQwGoM3CjRqjUVpn8ZpYhisgSP7AxxYEgYTL9rUx1/0C1WK sxZb674F2cc7xYkph6pfwQOPgi46nJxJ0e0RAYTZtYIL3/0NlbM4XOTRK4u3hAUD8glD NUny34tMO//VFuGBsnTwOpkxij+EImTo8XWvArrqUe12YBWhqQY4UEil/N0d6boKQwH/ kgSrbOWBNKDWkCbK5C24Ny1wzu4rPvFFlYXFz1TfjdyB9AS4Lo7HqFP5GbRSILQM5xTX fuTGVQgMYGr6NoOuXkN5al9rmLwRdtnvx03CepD6KaOIsKVcmUAK9BAaXcDhDA3LjtSU nIZg== X-Forwarded-Encrypted: i=1; AJvYcCV0koXZNFNYmnG5EMsSZtW1eAK7qvoedo/fT/NoyxueC9hFnUBzbsVAhmxhF5sjpazxjeEA8PBediNHERlEo0W+1MunBLUjRupfgHIgf2A= X-Gm-Message-State: AOJu0Yz0fDrc6uOH/anVEM4WeSah0Jq8eCv2diY48k9ndNU4Jbi2yl4r mnQbh1edhGPOcfUMrLgzq6GpcfOgYweyfFb4FrnBG4c0mEJv5B2+ X-Google-Smtp-Source: AGHT+IFc8uBG8fAqe8QiFu7qL5vOSuGxpFRzQNhkfUh2olLgNFB3zwVq8FCW9cJURrXcMaKyPvPWuQ== X-Received: by 2002:a2e:9c10:0:b0:2ef:22bc:6fb0 with SMTP id 38308e7fff4ca-2f2b7179ecbmr1400471fa.34.1723467992891; Mon, 12 Aug 2024 06:06:32 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, "Edgar E. Iglesias" , Paolo Bonzini Subject: [PATCH v1 10/10] docs/system/i386: xenpvh: Add a basic description Date: Mon, 12 Aug 2024 15:06:05 +0200 Message-ID: <20240812130606.90410-11-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- MAINTAINERS | 1 + docs/system/i386/xenpvh.rst | 49 +++++++++++++++++++++++++++++++++++++ docs/system/target-i386.rst | 1 + 3 files changed, 51 insertions(+) create mode 100644 docs/system/i386/xenpvh.rst diff --git a/MAINTAINERS b/MAINTAINERS index a24c2e14d9..da4c9d4d46 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -560,6 +560,7 @@ F: include/sysemu/xen.h F: include/sysemu/xen-mapcache.h F: stubs/xen-hw-stub.c F: docs/system/arm/xenpvh.rst +F: docs/system/i386/xenpvh.rst Guest CPU Cores (NVMM) ---------------------- diff --git a/docs/system/i386/xenpvh.rst b/docs/system/i386/xenpvh.rst new file mode 100644 index 0000000000..354250f073 --- /dev/null +++ b/docs/system/i386/xenpvh.rst @@ -0,0 +1,49 @@ +Xen PVH machine (``xenpvh``) +========================================= + +Xen supports a spectrum of types of guests that vary in how they depend +on HW virtualization features, emulation models and paravirtualization. +PVH is a mode that uses HW virtualization features (like HVM) but tries +to avoid emulation models and instead use passthrough or +paravirtualized devices. + +QEMU can be used to provide PV virtio devices on an emulated PCIe controller. +That is the purpose of this minimal machine. + +Supported devices +----------------- + +The x86 Xen PVH QEMU machine provide the following devices: + +- RAM +- GPEX host bridge +- virtio-pci devices + +The idea is to only connect virtio-pci devices but in theory any compatible +PCI device model will work depending on Xen and guest support. + +Running +------- + +The Xen tools will typically construct a command-line and launch QEMU +for you when needed. But here's an example of what it can look like in +case you need to construct one manually: + +.. code-block:: console + + qemu-system-i386 -xen-domid 3 -no-shutdown \ + -chardev socket,id=libxl-cmd,path=/var/run/xen/qmp-libxl-3,server=on,wait=off \ + -mon chardev=libxl-cmd,mode=control \ + -chardev socket,id=libxenstat-cmd,path=/var/run/xen/qmp-libxenstat-3,server=on,wait=off \ + -mon chardev=libxenstat-cmd,mode=control \ + -nodefaults \ + -no-user-config \ + -xen-attach -name g0 \ + -vnc none \ + -display none \ + -device virtio-net-pci,id=nic0,netdev=net0,mac=00:16:3e:5c:81:78 \ + -netdev type=tap,id=net0,ifname=vif3.0-emu,br=xenbr0,script=no,downscript=no \ + -smp 4,maxcpus=4 \ + -nographic \ + -machine xenpvh,ram-low-base=0,ram-low-size=2147483648,ram-high-base=4294967296,ram-high-size=2147483648,pci-ecam-base=824633720832,pci-ecam-size=268435456,pci-mmio-base=4026531840,pci-mmio-size=33554432,pci-mmio-high-base=824902156288,pci-mmio-high-size=68719476736 \ + -m 4096 diff --git a/docs/system/target-i386.rst b/docs/system/target-i386.rst index 1b8a1f248a..23e84e3ba7 100644 --- a/docs/system/target-i386.rst +++ b/docs/system/target-i386.rst @@ -26,6 +26,7 @@ Architectural features i386/cpu i386/hyperv i386/xen + i386/xenpvh i386/kvm-pv i386/sgx i386/amd-memory-encryption