From patchwork Tue Jun 20 15:29:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Hildebrand X-Patchwork-Id: 13286110 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 11271EB64D8 for ; Tue, 20 Jun 2023 15:31:04 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.551944.861726 (Exim 4.92) (envelope-from ) id 1qBdJd-0000Kg-P4; Tue, 20 Jun 2023 15:30:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 551944.861726; Tue, 20 Jun 2023 15:30:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qBdJd-0000KZ-M6; Tue, 20 Jun 2023 15:30:45 +0000 Received: by outflank-mailman (input) for mailman id 551944; Tue, 20 Jun 2023 15:30:44 +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 1qBdJc-0000KR-Er for xen-devel@lists.xenproject.org; Tue, 20 Jun 2023 15:30:44 +0000 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2061b.outbound.protection.outlook.com [2a01:111:f400:fe5b::61b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6acbbd05-0f7f-11ee-b234-6b7b168915f2; Tue, 20 Jun 2023 17:30:43 +0200 (CEST) Received: from BYAPR01CA0069.prod.exchangelabs.com (2603:10b6:a03:94::46) by IA1PR12MB8309.namprd12.prod.outlook.com (2603:10b6:208:3fe::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.37; Tue, 20 Jun 2023 15:30:39 +0000 Received: from DM6NAM11FT069.eop-nam11.prod.protection.outlook.com (2603:10b6:a03:94:cafe::3d) by BYAPR01CA0069.outlook.office365.com (2603:10b6:a03:94::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.37 via Frontend Transport; Tue, 20 Jun 2023 15:30:38 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT069.mail.protection.outlook.com (10.13.173.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.37 via Frontend Transport; Tue, 20 Jun 2023 15:30:37 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 20 Jun 2023 10:30:37 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 20 Jun 2023 10:30:36 -0500 Received: from ubuntu.mshome.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Tue, 20 Jun 2023 10:30:35 -0500 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: 6acbbd05-0f7f-11ee-b234-6b7b168915f2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HoRUYfhxmkYI1i5Bnkj/aM/soI3D7V2APNX1xiiq0HZIhmsGjzx/+jPNr9BZL3TR6IKSy/NbzQqBMBk3Sg/OGQz2trJ1RqWFfF6ORceXsHYJTZvYS4CD8P9neJE8o55ZQ7qTep+klFwfDh5jMm+u2OypjNaypguAZlxROMf7DKnEw9oGkX79elqjvFH7GjWvR/n+HGHj+Ex95RelbLeH1iIwRz90BZpTVLx5mkN/DkqwiNpEKOV9QbP+uEqS5Sc642A6rzkrchkt36gIWjbPXd0EC0GvVrmTfnEp5qpRniMfsk9hiU4DFh8oIWk7RVzKdfAQv1tUvYCY2glwK63PYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PW8XXwxR3mhUCuU75aK6Miub4PizW0qiJ7ZMU8vXgGU=; b=UmWTtG7mKHA2oclHT/T0VpULlHadQdMll1vR1qG09g/I+Sh4B3uRMIPJlvMGOOHumLuMOExmmw12IQUe+thf45mihppT0PyjZpX+HVeaPxiMazNqsZzM5rW39jwDvHoyRDJNmWA6FV1ufH52WjM4FTYNT+JKA5pUX2SdSqpw/2QvpHGxxqFHlzqZO8/abR47oQxFUXA042pDqTDGgdqfhB2FKQi0Md5HZA0JvrJfZ5tMOs9787WWvXLb4AwzsWGOacT2cu3VzS42U70ydBFn9y42363ykQLWIu4L0qCIxp6jlykoenFMqeQL1qXfJE4UeDgljZjq7BF6bU+Ndrcp9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PW8XXwxR3mhUCuU75aK6Miub4PizW0qiJ7ZMU8vXgGU=; b=idtju5wtfHrMeK8Cs7mxDacNpgYL0/dbxB6cSDqj1rha6XYwS9wxCGSwwkBr4vwftS/IdPO1P5HC5zK9aQ1reIso4CZ0j3V5UcaGDUtGE++1kQBlnbgspQNhAXlzFM1BnPCVH0ry0LrWO2Ozj2ED2DUIkCiXfOnBqPIG3L/2MIY= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Stewart Hildebrand To: CC: Rahul Singh , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , "Oleksandr Tyshchenko" , Artem Mygaiev , Stewart Hildebrand , Stefano Stabellini Subject: [PATCH v1 1/2] xen/arm: pci: introduce PCI_PASSTHROUGH Kconfig option Date: Tue, 20 Jun 2023 11:29:20 -0400 Message-ID: <20230620152924.23622-1-stewart.hildebrand@amd.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT069:EE_|IA1PR12MB8309:EE_ X-MS-Office365-Filtering-Correlation-Id: c8a0f858-f251-4168-2ba3-08db71a34c3b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a9ZLolILG/e8ssLp3McrLGM/BfpLnrgkwtg0FZC2qTxpewGGaF9uEH1iCzfqZZb8fMAvwL80fCbJy/XYxgYsNx8sgI6dWrQhTuqjRJzvQrNqIlt9FpSXBr3Af7JzVLHwpynbzNtD9jEmKLTDGFoTTNLoIDrqN4MU2cO5b74F7HCJbwjC8ciCaT5T0ARxmT+DDleRxLOdeRLGOfk/jrjvlILlVzK0vBK2zLeDVktWZszRiE5ODIhrxwcFzec3wyqg6GTY3FI4ftIp/f6h1EHQgodnmPysn3fJrYvi11+CN3OBoyaM7IyH42NIpKVA58bhDsciJ41lMTFOhHkOficIQhR9V6LJe1yDgmvdco21kD9LDNqwodE6nlSFgy42rpxO0uGbUYgfeQqPBSiUzL0O/V108rAXJFXu8oimRRAliJW3Tk8eF8ghLdEsyrmgYOBx67hY9XteGt9cU3kk2AttHsFZIDu3KqS+gY4BL6ISVI2y5qJCQabym8711Dvc9swLB7tFXuoQktHPKmvAhBDgsuK+DmfRaUQeR2yH1E07XVNS0ti0nDcxDaDW83GHkpUgysI0aAuYl1VBB5O9+QjLkbjlNYlcxpTXdq0ZqEapsyut9iJTVyAVe4AfPmaGIAOwA/wOvMsVcK/ST72zX80jcWK6iC8U2Iu2MgLFvKA8r2/nfvOrsFPL4ddoz1szFrDPQDXIh4Y/H88+kDv+CBGvik93sJ8EyE8WIYbxsgAvXs8vO3+VCZnpygeGEbjqvscRJLYSI+AGJuA7DhIRhc4glafRNs4GLXXPS5/r77fdpzU= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(39860400002)(396003)(136003)(451199021)(36840700001)(40470700004)(46966006)(36860700001)(82310400005)(47076005)(966005)(478600001)(6666004)(336012)(54906003)(2616005)(1076003)(426003)(26005)(186003)(2906002)(5660300002)(44832011)(40460700003)(36756003)(70206006)(356005)(81166007)(70586007)(82740400003)(40480700001)(4326008)(316002)(8936002)(8676002)(41300700001)(86362001)(6916009)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2023 15:30:37.4673 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8a0f858-f251-4168-2ba3-08db71a34c3b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT069.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8309 From: Rahul Singh Setting CONFIG_PCI_PASSTHROUGH=y will enable PCI passthrough on ARM, even though the feature is not yet complete in the current upstream codebase. The purpose of this is to make it easier to enable the necessary configs (HAS_PCI, HAS_VPCI) for testing and development of PCI passthrough on ARM. Since PCI passthrough on ARM is still work in progress at this time, make it depend on UNSUPPORTED. Signed-off-by: Rahul Singh Signed-off-by: Stewart Hildebrand Signed-off-by: Stefano Stabellini --- (cherry picked from commit 9a08f1f7ce28ec619640ba9ce11018bf443e9a0e from the downstream branch [1]) Changes from downstream to v1: * depends on ARM_64 (Stefano) * Don't select HAS_VPCI_GUEST_SUPPORT since this config option is not currently used in the upstream codebase. This will want to be re-added here once the vpci series [2] is merged. * Don't select ARM_SMMU_V3 since this option can already be selected independently. While PCI passthrough on ARM depends on an SMMU, it does not depend on a particular version or variant of an SMMU. * Don't select HAS_ITS since this option can already be selected independently. HAS_ITS may want to be added here once the MSI series [1] is merged. * Don't select LATE_HWDOM since this option is unrelated to PCI passthrough. [1] https://gitlab.com/xen-project/people/bmarquis/xen-arm-poc/-/commits/poc/pci-passthrough [2] https://lists.xenproject.org/archives/html/xen-devel/2023-06/msg00863.html --- xen/arch/arm/Kconfig | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 61e581b8c2b0..3d22cd26a68c 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -184,6 +184,15 @@ config STATIC_SHM help This option enables statically shared memory on a dom0less system. +config PCI_PASSTHROUGH + bool "PCI passthrough on ARM (UNSUPPORTED)" if UNSUPPORTED + depends on ARM_64 + select HAS_PCI + select HAS_VPCI + default n + help + PCI device passthrough on ARM (UNSUPPORTED) + endmenu menu "ARM errata workaround via the alternative framework" From patchwork Tue Jun 20 15:29:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Hildebrand X-Patchwork-Id: 13286111 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 F2C59EB64D7 for ; Tue, 20 Jun 2023 15:31:05 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.551946.861737 (Exim 4.92) (envelope-from ) id 1qBdJp-0000cb-0x; Tue, 20 Jun 2023 15:30:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 551946.861737; Tue, 20 Jun 2023 15:30:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qBdJo-0000cS-Ub; Tue, 20 Jun 2023 15:30:56 +0000 Received: by outflank-mailman (input) for mailman id 551946; Tue, 20 Jun 2023 15:30:56 +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 1qBdJo-0000bo-Ew for xen-devel@lists.xenproject.org; Tue, 20 Jun 2023 15:30:56 +0000 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2061c.outbound.protection.outlook.com [2a01:111:f400:7eab::61c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 70906b89-0f7f-11ee-8611-37d641c3527e; Tue, 20 Jun 2023 17:30:53 +0200 (CEST) Received: from PH8PR15CA0018.namprd15.prod.outlook.com (2603:10b6:510:2d2::11) by MN0PR12MB6001.namprd12.prod.outlook.com (2603:10b6:208:37d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.21; Tue, 20 Jun 2023 15:30:48 +0000 Received: from SN1PEPF0002529E.namprd05.prod.outlook.com (2603:10b6:510:2d2:cafe::a8) by PH8PR15CA0018.outlook.office365.com (2603:10b6:510:2d2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.21 via Frontend Transport; Tue, 20 Jun 2023 15:30:48 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by SN1PEPF0002529E.mail.protection.outlook.com (10.167.242.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.27 via Frontend Transport; Tue, 20 Jun 2023 15:30:48 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 20 Jun 2023 10:30:47 -0500 Received: from ubuntu.mshome.net (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Tue, 20 Jun 2023 10:30:46 -0500 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: 70906b89-0f7f-11ee-8611-37d641c3527e ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jrOe7Zu8Mz4y8cpDQq1xBIjsdFy9YrZcJuCKUcX5/nAjn8jUS5z62NlyCsmSwHssgZd8JiJf7FU+KLo79ZmfpghHq4iMLPRCmGLSHrLkwd/vWJhEzzCn+HYBygU8fBMICZph60sjTnwz4MZ7yTH78+rUmojFl9sh8BIRdw+efEmJ14XUQpxKZyH1sEskdW7DabC6XGG0R08Mv75yx9UA8oYgJzgRpLlErceHNZncTXGVhvnwMiRP7WjB5QAdug6GwNCXUspy8ArCQ008+Vl+f/w4BC2K6jEuDTgypLrVWw/GUebEHoNBKydAUuF8lteRmBVQ2VzOkGj1u0+6FBOSCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eG/NAeIcLSXOojnAynZKH1cfX+YLxTjSKfYEa0GZua8=; b=DQiL3LL8zYJW1nUo26nBaxCa3DaOK7a58wJr/uUoRWNX6Xb37QxlI2iooTo4FRFHXwxxdov2YaJtxWVJGuZXjAmQYYwmomo6Pcxkpl9HKK1mqGjCT1EaEvrE0dNTKBtuGtuuSDWT/jAMQt81HGr5egU4BxhBmURSDC5wTmzvFsYhwjOOgUADYy8eyor9A88UYIBlEOqxqq8wm8AG3AQANWjvmi2U1NK7zKACkeTt2SwUVGxUMah8dtMJmG4EsdXYadRU3P5lK+ti8IVnwau6lgx1uuUAlOH8n4SsSShbDrqq/ruwOJbHBQDaeTdshGruR+BeQXlfqibJp+cSdNwGdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eG/NAeIcLSXOojnAynZKH1cfX+YLxTjSKfYEa0GZua8=; b=Rc1/RDHvriBFs19jSZ9efUSN1NIqkZCRTAM3gnuh9+opZkBOW1a7iIzDz1lgkMQGuuH1mhhEd2PoficF/7TTftrGIkmygMrEHCnJ6U4HySEZFOm3XL+acQ0jjj+SUGH3MoNRuf+zoGlOyrdG+3lBqwP8mvWbgKQfVQTIbkw74tY= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Stewart Hildebrand To: CC: Oleksandr Andrushchenko , "Stefano Stabellini" , Julien Grall , "Bertrand Marquis" , Volodymyr Babchuk , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Oleksandr Tyshchenko , Artem Mygaiev , Rahul Singh , Stewart Hildebrand Subject: [PATCH v1 2/2] xen/arm: Make has_vpci depend on CONFIG_HAS_VPCI Date: Tue, 20 Jun 2023 11:29:21 -0400 Message-ID: <20230620152924.23622-2-stewart.hildebrand@amd.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230620152924.23622-1-stewart.hildebrand@amd.com> References: <20230620152924.23622-1-stewart.hildebrand@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002529E:EE_|MN0PR12MB6001:EE_ X-MS-Office365-Filtering-Correlation-Id: 951a647b-3210-4ca4-ece3-08db71a35297 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dL69yDk0wJF33IAe2G/PrAsR7Y3g7JF9kZG8r6eUuEiZGSQ8hE/bzQ4+huWQyeIIxEOCEqCMZPKhVY5MrZXsGZ+Ty/KRjCMcg61p9Qo1gUurBcJJ0BFCSNx/O9Jmn2HZ8iLqQWtTCaQetjCYG6G3O4ZqDSbkcLe5BJrxBDD8mmYdv7fHgyKZLNrP/M13JdvYMVZ/Kt6UM1lBpfqgwxwSKijmWc4ZdWvCuV7NNwWnQdSR+XRVh1pnnEzXSddVJ2L0mzBb/M8dHMwhqEFDDejMVs1gp4h5lkqdDVdaUsDgOwuHp3qbX99KV92ZRPLsxOxClLsweyjk40FETbP1cRbbEVqRwqHfQVfFvEDWpI1xP0XmzjQhkyAd2eCsquK+dWg2x+EsNuaw6ncXuNK1qEafMRmo/IAnHmX7w1ENCOdpaNbA4J0LYsPeI0YskUMOtyWVmYi4RZMjjrF8tGyj7pVkoYtilknVvKQd5Zi4QDaaT1lpwjknd3+mbg32W/vuSVdAo7gymG/yXHtxEA3BM+/6ujGGGM37sy+0D1AFBJIeYATKacCqkojF8fHvaiaM1s55nclgHKI8i5ubGAZCd4RjxOdehQrSfi1z/NgSBiFtazI+9lipUWah4nmsLIkd4CjDMw0/67x7zXq/vFj8b9dwRzOxM6Uh9PzWCtd3ZM5aEp+ju5r5fNz7Tkw34EgmMspGLHT+LcwDCYLErQyPU8gSF1u9l0qiAWCTqaMBnpr//06MneK5kYk53G/7uXMoDVBdHpm6yQzsEI0NbYG6oFLoDZltrOy9iDqynhhBHWpA9qQ= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(39860400002)(396003)(136003)(451199021)(36840700001)(40470700004)(46966006)(36860700001)(82310400005)(47076005)(966005)(478600001)(6666004)(83380400001)(336012)(54906003)(2616005)(1076003)(426003)(26005)(186003)(2906002)(5660300002)(7416002)(44832011)(40460700003)(36756003)(70206006)(356005)(81166007)(70586007)(82740400003)(40480700001)(4326008)(316002)(8936002)(8676002)(41300700001)(86362001)(6916009)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2023 15:30:48.1728 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 951a647b-3210-4ca4-ece3-08db71a35297 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002529E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6001 From: Oleksandr Andrushchenko VPCI is disabled on ARM. Make it depend on CONFIG_HAS_VPCI to test the PCI passthrough support. While here, remove the comment on the preceding line. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Rahul Singh Signed-off-by: Stewart Hildebrand --- There are two downstreams [1] [2] that have independently made a version this change, each with different Signed-off-by's. I simply picked one at random for the Author: field, and added both Signed-off-by lines. Please let me know if there are any objections. downstream->v1: * change to IS_ENABLED(CONFIG_HAS_VPCI) instead of hardcoded to true * remove the comment on the preceding line [1] https://gitlab.com/xen-project/people/bmarquis/xen-arm-poc/-/commit/27be1729ce8128dbe37275ce7946b2fbd2e5a382 [2] https://github.com/xen-troops/xen/commit/bf12185e6fb2e31db0d8e6ea9ccd8a02abadec17 --- xen/arch/arm/include/asm/domain.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/domain.h index 99e798ffff68..6e016b00bae1 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -298,8 +298,7 @@ static inline void arch_vcpu_block(struct vcpu *v) {} #define arch_vm_assist_valid_mask(d) (1UL << VMASST_TYPE_runstate_update_flag) -/* vPCI is not available on Arm */ -#define has_vpci(d) ({ (void)(d); false; }) +#define has_vpci(d) ({ (void)(d); IS_ENABLED(CONFIG_HAS_VPCI); }) struct arch_vcpu_io { struct instr_details dabt_instr; /* when the instruction is decoded */