From patchwork Mon Feb 10 10:30:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Poturai X-Patchwork-Id: 13967579 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 ED715C021A2 for ; Mon, 10 Feb 2025 10:31:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.884561.1294293 (Exim 4.92) (envelope-from ) id 1thR3z-0004u1-Af; Mon, 10 Feb 2025 10:30:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 884561.1294293; Mon, 10 Feb 2025 10:30:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1thR3z-0004tu-7B; Mon, 10 Feb 2025 10:30:51 +0000 Received: by outflank-mailman (input) for mailman id 884561; Mon, 10 Feb 2025 10:30:49 +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 1thR3x-0004Pl-3C for xen-devel@lists.xenproject.org; Mon, 10 Feb 2025 10:30:49 +0000 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazlp170130004.outbound.protection.outlook.com [2a01:111:f403:c200::4]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 17edddeb-e79a-11ef-a075-877d107080fb; Mon, 10 Feb 2025 11:30:48 +0100 (CET) Received: from PAVPR03MB10102.eurprd03.prod.outlook.com (2603:10a6:102:30d::12) by GVXPR03MB8404.eurprd03.prod.outlook.com (2603:10a6:150:6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.18; Mon, 10 Feb 2025 10:30:44 +0000 Received: from PAVPR03MB10102.eurprd03.prod.outlook.com ([fe80::35ac:8893:c31c:b971]) by PAVPR03MB10102.eurprd03.prod.outlook.com ([fe80::35ac:8893:c31c:b971%3]) with mapi id 15.20.8422.012; Mon, 10 Feb 2025 10:30:44 +0000 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: 17edddeb-e79a-11ef-a075-877d107080fb ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QxMNDv95FbiEhQnwSWZyiXdw5um9rSIfnv4IMaR0/QbNXF7TmGQiP/ySNRYTL+t38WkLriH3y85R+PuaMqhgSUH3mp2LVUY0IzNI7SxaoszuaW2+Ee/KXLTpTe8rEcb1mrB6fpxOpN+Y6kHv/sgtnqLut79vN3tVOH5s5X7sPMyqUrgITNUJX4UI8rkZoh/XwBf6W/aYGIQDVbTNDCzOI9g8OHDMfLfe8VvUPMDrUgM3SapKibmC7B9gfQPKYGcyZR1vsfdvw1SfZCfaWytW9l6djI0S0K2l/iiC9FT9gMMYJL51rzkslOarVCd11/YQ9UNnGRNG60GiKlEFu8gxbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=K8ogDqoe1xUm7OYt5C1WUyKhVK0zheAKGwiUfGKwWu0=; b=h66695cLCoeMYQxa9vqk3bLJs1aZ5E8KnOfjZthUqtrADkT1LZ8p95gR/bYTjlXm8FuX5Qs83U+p0ErGDcH4ZcVeHswoMckaBF3rJVIrGZXykApsGPzguVzV6gdVZdOOj+cdFV1vz4XNxR0yt3lxXKjDqzICbAUXnC6KNfXVMmId0dEn5AcH5l7+yY4WCq+v5CD+h3KTNy/3TXkRaN6ElQIuOSi1gwNWQP0eHohgj/jI+5rqSV7g/TlWmH14O3dNtFunWMfql6+a7TvYfn6eaWMV/KQruY9K2gLRjK4MmQ4HOe8R7CiFpg3lui0TcUlXNXfge40sDjUEmIt+XoZgQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K8ogDqoe1xUm7OYt5C1WUyKhVK0zheAKGwiUfGKwWu0=; b=IY+vQ13/Krn4wdg3K+ihh+TSPulxuKo1mCZ4w9YW9G0D9D6X7CBssYgOF++J0MzgFoYPUFakkM2fMGZ+B7cFc7aFd/T0JJgUulmxrGVEVZCvfd7yI1t8BSB1F9ZKrsiRUb8BEggUaWQd0yiOgESbQI/nwxb0ZZx6HuBUREwu1FQvnNDVVs3Pp9xOXbhCH/O9dnE5ChKFuu0/gS3vPlCVDNBfyIinu3U/KrmBr5JD/Yb+0bOzDAmt28KR/g+6SuGauvcfyYyXFJAZHS1+e4X7tq++oZlnQfu9kpBknyTGSe6GponwlFzgFFXNsZnasrF6WoGLCIEanhlPhpje8bcTfg== From: Mykyta Poturai To: "xen-devel@lists.xenproject.org" CC: Stewart Hildebrand , Oleksandr Tyshchenko , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Jan Beulich , =?iso-8859-1?q?Roger_Pau_Monn=E9?= , Mykyta Poturai Subject: [PATCH v8 2/8] iommu/arm: Introduce iommu_add_dt_pci_sideband_ids API Thread-Topic: [PATCH v8 2/8] iommu/arm: Introduce iommu_add_dt_pci_sideband_ids API Thread-Index: AQHbe6bXkeUuupR7FUWii7Y2X2QPjw== Date: Mon, 10 Feb 2025 10:30:44 +0000 Message-ID: <67b9bd138c12c0df35e5c4b3137c30ad345097d5.1739182214.git.mykyta_poturai@epam.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAVPR03MB10102:EE_|GVXPR03MB8404:EE_ x-ms-office365-filtering-correlation-id: fd5751e9-05b1-4c33-f160-08dd49bdf99f x-ld-processed: b41b72d0-4e9f-4c26-8a69-f949f367c91d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|1800799024|38070700018; x-microsoft-antispam-message-info: =?iso-8859-1?q?ZMf/rT7q0qrPOin2aZeSnEzkx5?= =?iso-8859-1?q?uU1AxYuaSV3VcUxUjxX40emWfQSGkWlU619lNJKk6ZrbmsubKFseC85ES2gi?= =?iso-8859-1?q?VStoondvQ5mORkpHSnkTmh2imtLXxnh43GFHistqaGumWRCLmPb4tU3xGS7v?= =?iso-8859-1?q?AUeHUO6TzpMOH65oFcUfcYTRf54n0FKcBf1nPdNOKHuHzQGE+waK3pWXiCYz?= =?iso-8859-1?q?OezsPU1LUMIlcDnHk+qQ+mw8yywyhmU3QzN9AFM1FIabU/xbaZ9zVJppbcGg?= =?iso-8859-1?q?L9x4ISKOhYprExmlXgNRSyEWB/WZ6M5VGDCpeq7N1sW+xWn4XKk+ZfnnFDS5?= =?iso-8859-1?q?8WoZVIi8XuEuZxiEZ5ZPFp4JeHJi2JK7sfnirBwH1vp9TfoS3yjZYttGr8K6?= =?iso-8859-1?q?3JZrtl354fMVjHBTLMxUgx53cByJLoBUmo/oiMpOH/uq5Ln+M+1IQp0uy+1+?= =?iso-8859-1?q?BM2oS0oSC7SSSznVX7HgwinHcIg/xl+wI/4Xqen+WSYIAV1R9Anx+uJLvgwL?= =?iso-8859-1?q?3oWWg7e1rLgb1ue2yOi/D4bEUHKW6RNfEDt784W0w38+5AeYoNhUwWcwQoP9?= =?iso-8859-1?q?4lEpuprudcze28uNUdqyOkX49ZbpNTu4SproG9gEfF3kv+AT0SPQqqk8CizL?= =?iso-8859-1?q?bSxRwG8BvMOqqzCpb6Unn1tf/9VIrHCtve1D5cUzBbjgvFHh+oL29oDF2qWV?= =?iso-8859-1?q?9vg+UX71yZxApxnRehvktNQbdEXkk3UvE61HKulC/igtOobmwbzEiZQJ9xaN?= =?iso-8859-1?q?pZQCvF2BkUQuhKOwror93j22koFVJcPYbKZGlMmUpQPuw1Br21ar3A/PDQqa?= =?iso-8859-1?q?0/n5/moLLzglBp5qJud8TbW3FS05/d6HpMxbZ+h7XCNifYID1rTyALUdXK3w?= =?iso-8859-1?q?dbGr3N5ZXfr0OPlMAsDLMSmqk4O3EsmRs8fuFmIY05mruPmHyCl1wJK2tDqX?= =?iso-8859-1?q?qnG89YCmwLmkv1hdCRKNNTau3NAXhQuKDgaDfuRaninHQ8l1xR83moo8uHcR?= =?iso-8859-1?q?/Iiq2jqIs112LLQJQ5wICZv4jFzHTcA2UEIlKBvY8R0CpgBDE4djNe6hLth1?= =?iso-8859-1?q?eLeOTGiIZBIaOn4cTzwx7FnozpmwR1m9sL3aHnqWogARtmx4IhOVFRFXHUEz?= =?iso-8859-1?q?RqvC1g8CyXq8AkZAMOPBxAeX/+fA0EyvBvufq2w/6x0lygDFpfKUHlEP8xGC?= =?iso-8859-1?q?v+L2KsF0ZChIemuJBVC52OEPWigfFeH7EUx34Kxi2ziGdxzppCoI/SlXcwrr?= =?iso-8859-1?q?icdLgiiRoeZywVK3Uf5IHBDBIBPDJpCHQ0oz8TmSQ0+JK9UADetxPIDpDgzC?= =?iso-8859-1?q?9SdzPxuc8EhneY11UcyVdjahAi9vLVf73s7tvHxUP61TqMEMB3KWh5inaPKK?= =?iso-8859-1?q?G0wHGYUd5ErviOGOODYyXtkjeVTvpU/qBjb1GBc1LkH9jwWnE5mcOT5tPo9C?= =?iso-8859-1?q?MWbxtCNRenMVCH+Pw6akf7HyGMpDq37YRW1qjzsghMj2bwIOS5KdhfQ+ZrIg?= =?iso-8859-1?q?1cy7dM?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAVPR03MB10102.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(38070700018);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?sW+V88qhW5NuH4UZWiSaMc/?= =?iso-8859-1?q?knAtIc+FuSbcAfc17JVD0NvfrRt9NCeMo1UeHcJPy43dHaxxqg8luL7TQRfQ?= =?iso-8859-1?q?dP9Eq51HHgc/uT4nDajhOtsDpKbMctZ+R8JF7GeYHEmB1VBfYwIf+Dxw6D1d?= =?iso-8859-1?q?s0JvWH1cQOPOwewYSFQn5y7o+TkYuvF80QxPNOGqoRbPPqJuvWC2G1BLCqsq?= =?iso-8859-1?q?8mKocAheaPaA8Z1UJ0UM5S8sMOAS2J45qwkmTQJGsOQfNsSX7fDgf+9mMjcM?= =?iso-8859-1?q?iUUB6fbgUjk5rojISOtwSZk41MeKzKvH87Jxcwg39XPxPjKmjRYE3QZQxN2B?= =?iso-8859-1?q?0Wv+i8bXiX17Ok69bOdnhSkOhiB6na9QAXqK9FqySuT0w3QiDfiQug/xhbJJ?= =?iso-8859-1?q?SW3Dcxpgg4pe+vdJsPggpMuIb0i1tEHyBsErSxG4qM3c4FPs7fcFZZNhzzvR?= =?iso-8859-1?q?rDipXS+yD4P3XG7IHkD33YM5WMfV21Lp5VyFFzJ37rjyQpKPX2OHwk3w0wGY?= =?iso-8859-1?q?GE7xTG3Ad6UNjzg+/iTaWeD0JrJtjMyij/hknC0KDxIOgm2aIJBWmZgjHvFO?= =?iso-8859-1?q?+7ZHPe7+UTiHb7pkyGJlbNfEcmCZYv2lxt3ApEh+wb54GjaTtAzIzBr3VJzN?= =?iso-8859-1?q?h5bIlcAXWMVYUDXDnW0++f3gQZauzLo0hLnOxSxtWBrzh8KVQFbiQZT/t5pI?= =?iso-8859-1?q?GobCTlJJZGmvHh8O/KFrheOyCcG9ketpwjWJ/z5p/lcMLjrM71AK/yMiJ69M?= =?iso-8859-1?q?emr3kl202eFzV7XonL0/1/0B3SU+DdvTpSYFCCg44GEmidh15JhQED0pcPy3?= =?iso-8859-1?q?512hMUwyI33IbWA75iPIDWkh7x6h9ljKwKk4pmYi7i6v6ICCh38B2sdL96+C?= =?iso-8859-1?q?ZXkIEK4y1lvUQAvCAwWCQQPyhOniZpRV3bBX5jiyIeXbpTBTz4pg0CKyGZUs?= =?iso-8859-1?q?KXnpeqyh4PgqTKNC0A1p4VLizwWdcONge+9kYrnrD6RxHpHyenTOQQwnjylh?= =?iso-8859-1?q?goPe2Tm3QWdliDIoIGppd6MnPeEEy3z+e6aNNProLP0d0mkx2ZacDQeK1nui?= =?iso-8859-1?q?RSLQ0c3RPyuTwkS+ofpS65RcQQFjHJaEa5EI5Ep9TJh7rP+xQJiCh1Rk5Tjl?= =?iso-8859-1?q?lyKZSo3ifobVB5t7O84KJGrT48L64PlhY1yY67DegSE31Ab167NiNOl5451G?= =?iso-8859-1?q?wBcLSHvVfsKklx38HAli03Lw2F82977per40oNlkYOgnjIttoft9ikcn03Oi?= =?iso-8859-1?q?qr+wepzPYU5iMiEUCgq3zv9V46EssK9/Vd88I7PTwkwWRdUQiZLXxG3GRHEm?= =?iso-8859-1?q?SBLBfgfwrEhoS4782TFXhatYKXQKigYDDjXzxtr4idoPHxKw7EkCzyYlFowk?= =?iso-8859-1?q?0ewtdpxh28IeV1FfbXNjqUhf9a1GWfFhv40vdHqu+vKQKUGvRvILRzUKYIS/?= =?iso-8859-1?q?jLIv0FbFpSgARJQRAdrrT2vkH1mioPuZMkuXS9ldgPxqMNhC9ZO5jnC31MlM?= =?iso-8859-1?q?IFpYdU3ZSWMwYoqnIQgFIFvr0B9sfZE6YEyKqsoGWq/diQOXE+jHVjJahQ+O?= =?iso-8859-1?q?uxb78DMIeSj3R9JRa5uHK28t+uqLNvMli02LMN+xTmw+iu/h6DD7x/BD6RLV?= =?iso-8859-1?q?S5NsYsGIkwoLeifeB5N2XSayBbC5dGDC1TRgreA=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PAVPR03MB10102.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd5751e9-05b1-4c33-f160-08dd49bdf99f X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Feb 2025 10:30:44.1856 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 7a6hsZmyz6vMyjn+dI+REXAx+FLDoXkuDyIEqU3A8xM9Je3m+YprI3c5g2D7TipGwzkwuYi4HzziyO4CgUpKYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR03MB8404 From: Oleksandr Tyshchenko The main purpose of this patch is to add a way to register PCI device (which is behind the IOMMU) using the generic PCI-IOMMU DT bindings [1] before assigning that device to a domain. This behaves similarly to the existing iommu_add_dt_device API, except it handles PCI devices, and it is to be invoked from the add_device hook in the SMMU driver. The function dt_map_id to translate an ID through a downstream mapping (which is also suitable for mapping Requester ID) was borrowed from Linux (v5.10-rc6) and updated according to the Xen code base. [1] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/pci-iommu.txt Signed-off-by: Oleksandr Tyshchenko Signed-off-by: Stewart Hildebrand Signed-off-by: Mykyta Poturai --- Regarding pci_for_each_dma_alias question: getting host bridge node directly seems like a simpler solution with the same result. AFAIU with pci_for_each_dma_alias in linux we would arrive to the host brige node anyway, but also try to call dt_map_id for each device along the way. I am not sure why exactly it is done this way in linux, as according to the pci-iommu.txt, iommu-map node can only be present in the PCI root. v7->v8: * ENOSYS->EOPNOTSUPP * move iommu_add_pci_sideband_ids to iommu.c to fix x86 build * simplify iommu_add_pci_sideband_ids * add docstrings to iommu_add_{dt_}pci_sideband_ids v6->v7: * put iommu_add_pci_sideband_ids under ifdef * remove ifdef CONFIG_APCI * style: add newline for symmetry v5->v6: * pass ops to iommu_dt_xlate() v4->v5: * style: add newlines after variable declarations and before return in iommu.h * drop device_is_protected() check in iommu_add_dt_pci_sideband_ids() * rebase on top of ("dynamic node programming using overlay dtbo") series * fix typo in commit message * remove #ifdef around dt_map_id() prototype * move dt_map_id() to xen/common/device_tree.c * add function name in error prints * use dprintk for debug prints * use GENMASK and #include * fix typo in comment * remove unnecessary (int) cast in loop condition * assign *id_out and return success in case of no translation in dt_map_id() * don't initialize local variable unnecessarily * return error in case of ACPI/no DT in iommu_add_{dt_}pci_sideband_ids() v3->v4: * wrap #include and if ( acpi_disabled ) in #ifdef CONFIG_ACPI * fix Michal's remarks about style, parenthesis, and print formats * remove !ops->dt_xlate check since it is already in iommu_dt_xlate helper * rename s/iommu_dt_pci_map_id/dt_map_id/ because it is generic, not specific to iommu * update commit description v2->v3: * new patch title (was: iommu/arm: Introduce iommu_add_dt_pci_device API) * renamed function from: iommu_add_dt_pci_device to: iommu_add_dt_pci_sideband_ids * removed stale ops->add_device check * iommu.h: add empty stub iommu_add_dt_pci_sideband_ids for !HAS_DEVICE_TREE * iommu.h: add iommu_add_pci_sideband_ids helper * iommu.h: don't wrap prototype in #ifdef CONFIG_HAS_PCI * s/iommu_fwspec_free(pci_to_dev(pdev))/iommu_fwspec_free(dev)/ v1->v2: * remove extra devfn parameter since pdev fully describes the device * remove ops->add_device() call from iommu_add_dt_pci_device(). Instead, rely on the existing iommu call in iommu_add_device(). * move the ops->add_device and ops->dt_xlate checks earlier downstream->v1: * rebase * add const qualifier to struct dt_device_node *np arg in dt_map_id() * add const qualifier to struct dt_device_node *np declaration in iommu_add_pci_device() * use stdint.h types instead of u8/u32/etc... * rename functions: s/dt_iommu_xlate/iommu_dt_xlate/ s/dt_map_id/iommu_dt_pci_map_id/ s/iommu_add_pci_device/iommu_add_dt_pci_device/ * add device_is_protected check in iommu_add_dt_pci_device * wrap prototypes in CONFIG_HAS_PCI (cherry picked from commit 734e3bf6ee77e7947667ab8fa96c25b349c2e1da from the downstream branch poc/pci-passthrough from https://gitlab.com/xen-project/people/bmarquis/xen-arm-poc.git) --- xen/common/device-tree/device-tree.c | 91 +++++++++++++++++++++++++++ xen/drivers/passthrough/device_tree.c | 42 +++++++++++++ xen/drivers/passthrough/iommu.c | 13 ++++ xen/include/xen/device_tree.h | 23 +++++++ xen/include/xen/iommu.h | 32 +++++++++- 5 files changed, 200 insertions(+), 1 deletion(-) diff --git a/xen/common/device-tree/device-tree.c b/xen/common/device-tree/device-tree.c index d0528c5825..3de7858df6 100644 --- a/xen/common/device-tree/device-tree.c +++ b/xen/common/device-tree/device-tree.c @@ -10,6 +10,7 @@ * published by the Free Software Foundation. */ +#include #include #include #include @@ -2243,6 +2244,96 @@ int dt_get_pci_domain_nr(struct dt_device_node *node) return (u16)domain; } +int dt_map_id(const struct dt_device_node *np, uint32_t id, + const char *map_name, const char *map_mask_name, + struct dt_device_node **target, uint32_t *id_out) +{ + uint32_t map_mask, masked_id, map_len; + const __be32 *map = NULL; + + if ( !np || !map_name || (!target && !id_out) ) + return -EINVAL; + + map = dt_get_property(np, map_name, &map_len); + if ( !map ) + { + if ( target ) + return -ENODEV; + + /* Otherwise, no map implies no translation */ + *id_out = id; + return 0; + } + + if ( !map_len || (map_len % (4 * sizeof(*map))) ) + { + printk(XENLOG_ERR "%s(): %s: Error: Bad %s length: %u\n", __func__, + np->full_name, map_name, map_len); + return -EINVAL; + } + + /* The default is to select all bits. */ + map_mask = GENMASK(31, 0); + + /* + * Can be overridden by "{iommu,msi}-map-mask" property. + * If dt_property_read_u32() fails, the default is used. + */ + if ( map_mask_name ) + dt_property_read_u32(np, map_mask_name, &map_mask); + + masked_id = map_mask & id; + for ( ; map_len > 0; map_len -= 4 * sizeof(*map), map += 4 ) + { + struct dt_device_node *phandle_node; + uint32_t id_base = be32_to_cpup(map + 0); + uint32_t phandle = be32_to_cpup(map + 1); + uint32_t out_base = be32_to_cpup(map + 2); + uint32_t id_len = be32_to_cpup(map + 3); + + if ( id_base & ~map_mask ) + { + printk(XENLOG_ERR "%s(): %s: Invalid %s translation - %s-mask (0x%"PRIx32") ignores id-base (0x%"PRIx32")\n", + __func__, np->full_name, map_name, map_name, map_mask, + id_base); + return -EFAULT; + } + + if ( (masked_id < id_base) || (masked_id >= (id_base + id_len)) ) + continue; + + phandle_node = dt_find_node_by_phandle(phandle); + if ( !phandle_node ) + return -ENODEV; + + if ( target ) + { + if ( !*target ) + *target = phandle_node; + + if ( *target != phandle_node ) + continue; + } + + if ( id_out ) + *id_out = masked_id - id_base + out_base; + + dprintk(XENLOG_DEBUG, "%s: %s, using mask %08"PRIx32", id-base: %08"PRIx32", out-base: %08"PRIx32", length: %08"PRIx32", id: %08"PRIx32" -> %08"PRIx32"\n", + np->full_name, map_name, map_mask, id_base, out_base, id_len, id, + masked_id - id_base + out_base); + return 0; + } + + dprintk(XENLOG_DEBUG, "%s: no %s translation for id 0x%"PRIx32" on %s\n", + np->full_name, map_name, id, + (target && *target) ? (*target)->full_name : NULL); + + if ( id_out ) + *id_out = id; + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index fe2aaef2df..065fbbc0fd 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -161,6 +161,48 @@ static int iommu_dt_xlate(struct device *dev, return ops->dt_xlate(dev, iommu_spec); } +#ifdef CONFIG_HAS_PCI +int iommu_add_dt_pci_sideband_ids(struct pci_dev *pdev) +{ + const struct iommu_ops *ops = iommu_get_ops(); + struct dt_phandle_args iommu_spec = { .args_count = 1 }; + struct device *dev = pci_to_dev(pdev); + const struct dt_device_node *np; + int rc; + + if ( !iommu_enabled ) + return DT_NO_IOMMU; + + if ( !ops ) + return -EINVAL; + + if ( dev_iommu_fwspec_get(dev) ) + return -EEXIST; + + np = pci_find_host_bridge_node(pdev); + if ( !np ) + return -ENODEV; + + /* + * According to the Documentation/devicetree/bindings/pci/pci-iommu.txt + * from Linux. + */ + rc = dt_map_id(np, PCI_BDF(pdev->bus, pdev->devfn), "iommu-map", + "iommu-map-mask", &iommu_spec.np, iommu_spec.args); + if ( rc ) + return (rc == -ENODEV) ? DT_NO_IOMMU : rc; + + rc = iommu_dt_xlate(dev, &iommu_spec, ops); + if ( rc < 0 ) + { + iommu_fwspec_free(dev); + return -EINVAL; + } + + return rc; +} +#endif /* CONFIG_HAS_PCI */ + int iommu_remove_dt_device(struct dt_device_node *np) { const struct iommu_ops *ops = iommu_get_ops(); diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 9e74a1fc72..40c840a4b3 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #ifdef CONFIG_X86 @@ -744,6 +745,18 @@ int __init iommu_get_extra_reserved_device_memory(iommu_grdm_t *func, return 0; } +int iommu_add_pci_sideband_ids(struct pci_dev *pdev) +{ + int ret = -EOPNOTSUPP; + +#ifdef CONFIG_HAS_PCI + if ( acpi_disabled ) + ret = iommu_add_dt_pci_sideband_ids(pdev); +#endif + + return ret; +} + /* * Local variables: * mode: C diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h index 5ff763bb80..9254204af6 100644 --- a/xen/include/xen/device_tree.h +++ b/xen/include/xen/device_tree.h @@ -946,6 +946,29 @@ int dt_count_phandle_with_args(const struct dt_device_node *np, */ int dt_get_pci_domain_nr(struct dt_device_node *node); +/** + * dt_map_id - Translate an ID through a downstream mapping. + * @np: root complex device node. + * @id: device ID to map. + * @map_name: property name of the map to use. + * @map_mask_name: optional property name of the mask to use. + * @target: optional pointer to a target device node. + * @id_out: optional pointer to receive the translated ID. + * + * Given a device ID, look up the appropriate implementation-defined + * platform ID and/or the target device which receives transactions on that + * ID, as per the "iommu-map" and "msi-map" bindings. Either of @target or + * @id_out may be NULL if only the other is required. If @target points to + * a non-NULL device node pointer, only entries targeting that node will be + * matched; if it points to a NULL value, it will receive the device node of + * the first matching target phandle, with a reference held. + * + * Return: 0 on success or a standard error code on failure. + */ +int dt_map_id(const struct dt_device_node *np, uint32_t id, + const char *map_name, const char *map_mask_name, + struct dt_device_node **target, uint32_t *id_out); + struct dt_device_node *dt_find_node_by_phandle(dt_phandle handle); #ifdef CONFIG_DEVICE_TREE_DEBUG diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 2b6e6e8a3f..15ec261238 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -215,7 +215,8 @@ int iommu_dt_domain_init(struct domain *d); int iommu_release_dt_devices(struct domain *d); /* - * Helper to add master device to the IOMMU using generic IOMMU DT bindings. + * Helpers to add master device to the IOMMU using generic (PCI-)IOMMU + * DT bindings. * * Return values: * 0 : device is protected by an IOMMU @@ -225,6 +226,19 @@ int iommu_release_dt_devices(struct domain *d); */ int iommu_add_dt_device(struct dt_device_node *np); +/* + * Fills out the device's IOMMU fwspec with IOMMU ids from the DT. + * Ids are specified in the iommu-map property in the host bridge node. + * More information on the iommu-map property format can be found in + * Documentation/devicetree/bindings/pci/pci-iommu.txt from Linux. + * + * Return values: + * 0 : iommu_fwspec is filled out successfully. + * <0 : error while filling out the iommu_fwspec. + * >0 : IOMMU is not enabled/present or device is not connected to it. + */ +int iommu_add_dt_pci_sideband_ids(struct pci_dev *pdev); + int iommu_do_dt_domctl(struct xen_domctl *domctl, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl); @@ -246,8 +260,24 @@ int iommu_remove_dt_device(struct dt_device_node *np); #define DT_NO_IOMMU 1 +#else /* !HAS_DEVICE_TREE */ +static inline int iommu_add_dt_pci_sideband_ids(struct pci_dev *pdev) +{ + return -EOPNOTSUPP; +} + #endif /* HAS_DEVICE_TREE */ +/* + * Fills out the device's IOMMU fwspec with IOMMU ids. + * + * Return values: + * 0 : iommu_fwspec is filled out successfully. + * <0 : error while filling out the iommu_fwspec. + * >0 : IOMMU is not enabled/present or device is not connected to it. + */ +int iommu_add_pci_sideband_ids(struct pci_dev *pdev); + struct page_info; /*