From nobody Fri Apr 10 05:59:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=epam.com); dmarc=pass(p=quarantine dis=none) header.from=epam.com ARC-Seal: i=2; a=rsa-sha256; t=1775493576; cv=pass; d=zohomail.com; s=zohoarc; b=RO+Yvf6cNy0j9MLQxUA+ecQ1+BUFjp+qIIhQFiUgzrMD3sSeIME8a2ElawGLe+nEJZOAMTWXbBcI/DgAIcxYmuXpDslpTKBT/lN0PLnI7Cc/Rj5PFLYBislB048pDUVoDbx+sbOc+ld13opNmsxNR8l6C3RSF9vyIsR9bRBRhCo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775493576; h=Content-ID:Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fbEO3RVvEwhUUyzboTiopXddvgM7h+yrLsQzWylsC0I=; b=XyS+X2LRNNu4viskEUxYrfTMPnzeQYkS2eDe517l//WGgS88N8cKFsU+/VCIoHYtbMDloj80bG9a5MfYc7N0lSFpYKwl5MRNVzESssGwkKtCmQ0rX/tPgT+pfY8JQDB/s3cxczmLG1qPpabrxNCaIc4+Twvc/5iVxObpp6+4sPs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=epam.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 177549357607933.991217149367; Mon, 6 Apr 2026 09:39:36 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1274255.1560421 (Exim 4.92) (envelope-from ) id 1w9myf-0002AP-OY; Mon, 06 Apr 2026 16:39:05 +0000 Received: by outflank-mailman (output) from mailman id 1274255.1560421; Mon, 06 Apr 2026 16:39:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w9myf-00029W-Ig; Mon, 06 Apr 2026 16:39:05 +0000 Received: by outflank-mailman (input) for mailman id 1274255; Mon, 06 Apr 2026 16:39:04 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1w9mye-00027D-76 for xen-devel@lists.xenproject.org; Mon, 06 Apr 2026 16:39:04 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1w9myd-001MTX-9h for xen-devel@lists.xenproject.org; Mon, 06 Apr 2026 18:39:03 +0200 Received: from [10.42.69.6] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69d3e1a7-bab6-0a2a0a5309dd-0a2a4506d52e-0 for ; Mon, 06 Apr 2026 18:39:03 +0200 Received: from [52.101.72.89] (helo=AM0PR02CU008.outbound.protection.outlook.com) by tlsNG-16d1c6.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.0) (envelope-from ) id 69d3e1a6-0df0-0a2a45060019-34654859bef8-3 for ; Mon, 06 Apr 2026 18:39:03 +0200 Received: from DU5PR03MB10263.eurprd03.prod.outlook.com (2603:10a6:10:519::5) by AM9PR03MB6817.eurprd03.prod.outlook.com (2603:10a6:20b:2df::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.18; Mon, 6 Apr 2026 16:39:01 +0000 Received: from DU5PR03MB10263.eurprd03.prod.outlook.com ([fe80::8c9e:b301:61c0:3908]) by DU5PR03MB10263.eurprd03.prod.outlook.com ([fe80::8c9e:b301:61c0:3908%5]) with mapi id 15.20.9769.020; Mon, 6 Apr 2026 16:39:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=epam.com header.i="@epam.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:x-ms-exchange-senderadcheck" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZKjB98zHVj8wfjTuY6TUHKHh1QvFVyY23V9ezTfIPJSEQLyw7ND3NROq5+cH14soYQMnQznAiQpLmXZiR8KEGIEgBDbhsEoj40THWQF7Q/rvoGNZF1MSEQgOKhq8uUAH+Z22XinxkqYteDy26USDFZ3savB4ibCoYuYYGNuwRl2AMqzbRP0WPZwnBiLI02gMiwxWtZ0TThMls16P7hoW7ja77fT8SOlOhr6FN/QVcirqTA5Q5G9gKbQtRG1o0+wfQH84ItlLgcDvuviY3sfqIwKer/QSP/bkgEZE3fauGnfZmBkAnsbAAPOP/mxgoP4J9kXoeZ/S83Q6YgqbNWZ14A== 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=fbEO3RVvEwhUUyzboTiopXddvgM7h+yrLsQzWylsC0I=; b=rCYfuE/AhGdoovguitZWJIKW9u3vOKLyVQeDIzQXxxjrEe0tA+GQyEpWricIrAi6e03ERW/1idSwmvSgygpCG+u2Yjtikze/ISwaDbzAvMahgGUzef76fkzHJ6uv4Fs5HYhfdZo7SBoYtunNKFEt7vdPbJz6hlVI7jbnWkha83zA/M+M2bDk9bkZ7dgw9bgUb4/0EOD1kO+yqzMhsjEfmPc6XOIVIqgouaMeTE30qTfqW6Ing6FNZui8IUvA25aa2eZK7D5lyxY6TzF2GQjHVdmJdVeCZG/XZN4Ko+/5JwYb5tu7/xo82NqvOaGf7b4ToJRIQBFVpzIglSDNmqc2Bw== 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=fbEO3RVvEwhUUyzboTiopXddvgM7h+yrLsQzWylsC0I=; b=QFHWvLObFTWy1nosQLJUaX8xTaLbfo1QOQJMyinUgvYSRLQfnS1uXsgwuDNLR2b6bhy6aAjZeNvOcEWj8Lj5p+f8SlDR5X4ZTCRbu+UBsko/gDRIK7ODRgSmFLfbhzOYUXogXfvG+qk2vilA97dKtLufl1y4b0OCGtfVQGA/QEKtqrTq7PIQsL8gDP1BNIRVHUMhNeHVgBICoqHGpii4PSYfPte7r1Q5j3rOnau7gSOg3uOuQ1rqYWBiVgVP22gzxmQj7aQGG9YJK6nuei7pd4RIWlT2wNJqtLwgBBC+N8+itySvnqhOVPXm5hZSEdaI9TXskSP6vE8D/gFniW66cA== From: Oleksii Moisieiev To: "xen-devel@lists.xenproject.org" CC: Andrew Cooper , Anthony PERARD , Bertrand Marquis , Jan Beulich , Juergen Gross , Julien Grall , Michal Orzel , Oleksii Moisieiev , =?utf-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= , Stefano Stabellini , Volodymyr Babchuk , Grygorii Strashko Subject: [PATCH v11 1/6] xen/domctl: chain SCI handling before IOMMU in assign_device domctl Thread-Topic: [PATCH v11 1/6] xen/domctl: chain SCI handling before IOMMU in assign_device domctl Thread-Index: AQHcxePfx39ACAuRcE2aBj5D+lufNQ== Date: Mon, 6 Apr 2026 16:39:01 +0000 Message-ID: <594def52910bbdac9a30d2e4a397b044411b66a6.1775493499.git.oleksii_moisieiev@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: DU5PR03MB10263:EE_|AM9PR03MB6817:EE_ x-ms-office365-filtering-correlation-id: dabf50da-5c19-4139-4c41-08de93fb021c x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|1800799024|7416014|376014|366016|18002099003|38070700021|22082099003|56012099003; x-microsoft-antispam-message-info: a/txYcaIINzLQsAakcO2ScQeUDcBs3Ycul6CJ+UlOi17XpAhMJM7PUpVkpo5lMTTTDfJPDzdasBzy9jFW0jzOVmWbymn3IfgQHrNQZmJp9LnlxiyCvXUmDRr+m9/esoV+AOoX/L7g5m1MT7k42OmQBCnhuzzJ2sLbd+ocDXyIupcWARlLPg+L48hNG0Dc12qZFpg3K7Ves10g2XOFpa/IP3B/B0yMY+YVJkSYdnGQeGSGxRUFObL27vbUozyH/YavgiwSJu9U8WP9aaDuAhThRtpgYR6yE98DGDS86nl3UXuvznBmcLWNiTaf9wmj73IHYH3NZqjv1qnA7nzicu4xGa7jvGZ2X+KqeA0KglNOwoDbW591qdaBhlQV4z2gDlo9FN5Vke2PnpiD26VV2LVERzfkA0edGog/A9bBOie5sPr9bdGe35X/U1jpUIWCaxqPv09mMiyIkBBMgbWItnZ7ZPQITj13DPZrAmb32VD5R08X4o2A8Cdin69gZJkBQV8BRt9S4wwaLJtnk/Pd0CY7a1Tx8QODGFCRPXgog/4lsBupuyxWj3t9MVybncs134kHb+SkviOvI4tB3RRn5XX8yk8ohW/d+RlBHvfdAyk11aWPv9SEjjEI/pJxarnri/8QWvwNdP7gkkHDl6X+aBeH5oWdWVLUygeuzGhu7sfqx9JfKzafnmwsYukrcGnsn/ZH8HiUUNRiDmSDgFpJlFgSI6EgfkmVcidvj8uJcasGDUniTLpP+toviSXY/hzhPUX9X149Oy/gCl2GOO84q9JrzOc7biFk7OcZdhzOk3iVBA= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU5PR03MB10263.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(376014)(366016)(18002099003)(38070700021)(22082099003)(56012099003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?Y1J6NDl1cFMvbjFJNFZlZTRhWENTVWd5R1RVRTVFVDRJbThIb3BnTy9XeWNw?= =?utf-8?B?TkpTUC9YSXQxQWxqRzZ2aWRGRFhxN3J3NnorRnpJcUhpTEE5Rk9zRzUrWWZi?= =?utf-8?B?REN0cnlWbnpCYmZTVEtQdzBBblc4QW9vUU9maWVWelpvajNKYjVhNUtaaWd1?= =?utf-8?B?YXVLZ245RU0zeERBMEhwT0lrN21TQmNuVmRiemZhb3ozdkVCbFI3OHNSbWRw?= =?utf-8?B?L255bzljaStuK2xxTVRBcmZWbUFqNXNOTHZOMWhwN2dyNDdCaUVZNXpsK3J3?= =?utf-8?B?MkpNRkhnUFJQK3dPbVI2L0h0cktHMXRuM3g2TVNNTHUza1lSaEdwNkYrY3FE?= =?utf-8?B?a0FabmJTajk1RFlOVmJaSFJzZDRlWjMwTnRZL0RRUUtqb1FSVVVZTjcxQmFm?= =?utf-8?B?Q3k5ajQ1VjEwYllxVlQ5VmYraTZLanhIcDE2U3NLVWRtLzVXb0JFL2RuTWJX?= =?utf-8?B?R2g5cXROdmlVU2pMeG1OMTUramVpckk1dlRLTS9ldzkvZE5MbkRyb2orNEZE?= =?utf-8?B?WGw2V2Y3dWljbGh4ck1YNk9WeVpNMnJqN05OcmhyMlhKRWZ2aW1VczlRQkYv?= =?utf-8?B?UnRvSTNZZm9DSkZMRGxWdU1FK0FyZ2tlUEdJdktXOFBrZ2FtTTU1bmJFZnRs?= =?utf-8?B?NWFSSG5seXZDaFk1YXBjcnlLTXlOOXJOZ1pWamJCOUxpZ1ZReU44TTF4aFVt?= =?utf-8?B?SUFqZVlOaWZwcy9PR1QyR0FpZ0FPWm96ZzArbzRnUk8waGZuTlNtT0xReFNF?= =?utf-8?B?Q3NnS05rd0lBbEJZV3U3aTBvbHgzNmI5NDJpTDdQYlhiSjlHeCtFOXpxUFdy?= =?utf-8?B?akpGNWhIQnVaYXJpOUYrQXEwZGM1VXRaeldpVll2elNPQ3hrRnEydUpRZ0Yv?= =?utf-8?B?VFRmWkZiOFNVLzJxUnVtb3hmeURmckVUVnZ4QUp6TXFwZzBweEp0alZvK2ho?= =?utf-8?B?cXpMbGxFSTdtY3BwMXRjNysvTk5xcTBmM3cyWnNVYzRneG5adlZrYWQ0cnNY?= =?utf-8?B?RVZlcUFLTlcvWlgycWVINFd0WGk5azMySm84cHl6RG80ZGs5Z0QzTkxRWkx2?= =?utf-8?B?N1JZZjJTdTNBVVpHQ2I3amI1d0xYcGVQc2tQNnROemJjc0ZNcU9JVmFvZDBG?= =?utf-8?B?ZHk2ZS9WN0tyZ3U4bmhML0k4RHRrNWRTRXVRbXdINFlzc25ad3VhTWpEWXNV?= =?utf-8?B?R1drUWxsWXA0VFRRNnA1SXg4Zi9TVlpCSWZwWEpNdTZScGxMelJRKy9Ka3Nv?= =?utf-8?B?b3hsSTNOR0NKdWtpL3QzdWNTanRvZmdEbHo2cy96MGd3SXc5cGRHRzcyZnVl?= =?utf-8?B?MThZWitLN2tueDRjV1IrdWZkS0N5YVk2aEtIN3NWUEVTTEQrMDdDR213cThB?= =?utf-8?B?QUo0dzhVNmJtODNFODR4ejZSdDZ0bklydXQwQmU5SURqeVF4U0x1L0owanlz?= =?utf-8?B?Wld2ODJJeVI3Q0ZMSTVUQXM0L3ZsLytoMDVZZTAvbk1nMnhXV2U4Rm5Sd3N1?= =?utf-8?B?dm1SdXpPYXUrdDRlWjM2SjZlQXJPazN6Z1p4a2hSWmZsTnFnUThaVjNxZjl1?= =?utf-8?B?Y2F1YmM3cDhGUjB0QkZ0UXpvRVhGdmdrVThIcVh3dVFVRlpUU3hYYVM1cGh4?= =?utf-8?B?QVk2b0VURUZJeStMTldyejFPNUsrSWhpN0NIdTJmcUdZOS9Kam1pYzJMU1F2?= =?utf-8?B?TytyeWFrY0NJU3NyeGxnUVlBM2RCRjk1SDhmM2V3T281cW55NmVGdk5uZFp3?= =?utf-8?B?cGdmMFhIZlVzSlY5UGJkcnE4bTBmQ21DNnZoakpMZHBMOHk2NmFQVk5PSGZo?= =?utf-8?B?Uk9KcjYvOHV3N0J2VmNDNGhQSWhwZGhuZHh3MElSNjhGSnBsSzc0bk5wTkFi?= =?utf-8?B?Vjd0VVBCWUtyeGp1Y2U1Vk9qV05sVG91R1hMTjdFKy8ycUszV01hN1Q4R1B5?= =?utf-8?B?VkxEN1JnYWRJWXRGVUV6dnZ5c3Z6WUF2dzlpd0hrbHFaOVRyaGdtRUZvSUpj?= =?utf-8?B?ZGQ1SFVYSWVzQStwenYvYjlOK2Y3Zy84T0JpUWhiMVdzTE9RVHFQblhXa2pv?= =?utf-8?B?eDVMQlprbEwwdFYxc3dVb2h6V1NoNlh0eDcraWNxcGR3d1ZldkZvSE5peDQv?= =?utf-8?B?cFVyVFErbkJ1bDcrMW1lMFRIM1g1NktuVjlObWQ0ZWxxTDAzRlJoaHh5YnpG?= =?utf-8?B?dzJHWE81bVp0L2dEclBGemNvaWZuQ0FJN0lNTm1hRXFkSnZORDJweE1qSUZB?= =?utf-8?B?MW9iZFZiOThWVFhSdDRDWFdlL2QwQ04zL0hSclJpUmFDZ1lJNFIvNnIvTGcv?= =?utf-8?B?TGlrb0orQ0RSd0dZOWpSSXhlU0Fzdm53UjlrNDJTZFh5NUQ3dWlLZHZxK2FH?= =?utf-8?Q?TPc4zKba/mtU4Wls=3D?= Content-Type: text/plain; charset="utf-8" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DU5PR03MB10263.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dabf50da-5c19-4139-4c41-08de93fb021c X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Apr 2026 16:39:01.4217 (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: zPsvbWao3jTIlOA/uC4PtatftmIaMeWTXSGp+DD/5a3+QiioRkt9xPZcpGiyrwMWHQGvGpaaz/BZh0pDRO4GCve79J8nxaAF+d5u1zs09Zo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR03MB6817 X-purgate-ID: tlsNG-16d1c6/1775493543-5DB2B3D8-C3150066/0/0 X-purgate-type: clean X-purgate-size: 11048 X-ZohoMail-DKIM: pass (identity @epam.com) X-ZM-MESSAGEID: 1775493576624158500 From: Grygorii Strashko Add chained handling of assigned DT devices to support access-controller functionality through SCI framework, so a DT device assign request can be passed to firmware for processing and enabling VM access to the requested device (for example, device power management through SCMI). The SCI access-controller DT device processing is called before the IOMMU path. It runs for any DT-described device (protected or not, and even when the IOMMU is disabled). The IOMMU path remains unchanged for PCI devices; only the DT path is relaxed to permit non-IOMMU devices. This lets xl.cfg:"dtdev" list both IOMMU-protected and non-protected DT devices: dtdev =3D [ "/soc/video@e6ef0000", <- IOMMU protected device "/soc/i2c@e6508000", <- not IOMMU protected device ] The change is done in two parts: 1) call sci_do_domctl() in do_domctl() before IOMMU processing. If sci_do_domctl() reports an error other than -ENXIO, treat it as authoritative and skip the IOMMU path. A return of -ENXIO indicates that SCI did not handle the request and is ignored, allowing the existing IOMMU handling to run unchanged; 2) update iommu_do_dt_domctl() to check for dt_device_is_protected() and not fail if DT device is not protected by IOMMU. iommu_do_pci_domctl doesn't need to be updated because iommu_do_domctl first tries iommu_do_pci_domctl (when CONFIG_HAS_PCI) and falls back to iommu_do_dt_domctl only if PCI returns -ENODEV. The new dt_device_is_protected() bypass in iommu_do_dt_domctl only applies to DT-described devices; SCI parameters are carried via DT nodes. PCI devices handled by iommu_do_pci_domctl do not carry DT/SCI metadata in this path, so there is no notion of =E2=80=9CSCI parameters on a non-IOMMU-protected PCI device=E2=80=9D for it to interpret or to skip. The= PCI path should continue to report errors if assignment cannot be performed by the IOMMU layer. So we should leave iommu_do_pci_domctl unchanged; the SCI/DT-specific relaxations belong only in the DT path. Also SCI handling only exists when DT is present. Signed-off-by: Grygorii Strashko Signed-off-by: Oleksii Moisieiev --- (no changes since v10) Changes in v10: - remove unused sci_do_domctl stub from sci.h Changes in v9: - treat SCI as a gate for XEN_DOMCTL_*assign_device: abort before IOMMU if sci_do_domctl() returns an error other than -ENXIO, instead of trying to propagate SCI errors after a successful IOMMU operation. This avoids partial success and the need for IOMMU rollback. - remove early return from do_domctl() in the assign_device path to keep RCU handling intact. - change IS_ENABLED(*) to #ifdef in sci_do_domctl quard Changes in v8: - check for CONFIG_ARM_SCI to be ebabled instead of COMFIG_ARM before calling sci_do_domctl - rework sci_do_domctl call to avoid extra checks, improved error handling. - do not propagate ret1 if sci_do_domctl returned positive ret - updated comment in domctl.c code Changes in v7: - update domctl to build on both Arm and x86 platforms - move ret1 declaration to the top of the function as required by code style Changes in v6: - change iommu_do_domctl and sci_do_domctl command order and call sci_do_domctl first which will produce cleaner code path. Also dropped changing return code when iommu was disabled in iommu_do_domctl. Changes in v5: - return -EINVAL if mediator without assign_dt_device was provided - invert return code check for iommu_do_domctl in XEN_DOMCTL_assign_device domctl processing to make cleaner code - change -ENOTSUPP error code to -ENXIO in sci_do_domctl - handle -ENXIO return comde of iommu_do_domctl - leave !dt_device_is_protected check in iommu_do_dt_domctl to make code work the same way it's done in "handle_device" call while creating hwdom(dom0) and "handle_passthrough_prop" call for dom0less creation - drop return check from sci_assign_dt_device call as not needed - do not return EINVAL when addign_dt_device is not set. That is because this callback is optional and not implemented in single-agent driver xen/arch/arm/firmware/sci.c | 36 +++++++++++++++++++++++++ xen/arch/arm/include/asm/firmware/sci.h | 8 ++++++ xen/common/domctl.c | 15 +++++++++++ xen/drivers/passthrough/device_tree.c | 6 +++++ 4 files changed, 65 insertions(+) diff --git a/xen/arch/arm/firmware/sci.c b/xen/arch/arm/firmware/sci.c index aa93cda7f0..a6c647a09d 100644 --- a/xen/arch/arm/firmware/sci.c +++ b/xen/arch/arm/firmware/sci.c @@ -126,6 +126,42 @@ int sci_assign_dt_device(struct domain *d, struct dt_d= evice_node *dev) return 0; } =20 +int sci_do_domctl(struct xen_domctl *domctl, struct domain *d, + XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) +{ + struct dt_device_node *dev; + int ret =3D 0; + + switch ( domctl->cmd ) + { + case XEN_DOMCTL_assign_device: + ret =3D -ENXIO; + if ( domctl->u.assign_device.dev !=3D XEN_DOMCTL_DEV_DT ) + break; + + if ( !cur_mediator ) + break; + + if ( !cur_mediator->assign_dt_device ) + break; + + ret =3D dt_find_node_by_gpath(domctl->u.assign_device.u.dt.path, + domctl->u.assign_device.u.dt.size, &de= v); + if ( ret ) + return ret; + + ret =3D sci_assign_dt_device(d, dev); + + break; + + default: + /* do not fail here as call is chained with iommu handling */ + break; + } + + return ret; +} + static int __init sci_init(void) { struct dt_device_node *np; diff --git a/xen/arch/arm/include/asm/firmware/sci.h b/xen/arch/arm/include= /asm/firmware/sci.h index 3500216bc2..5ee5a16674 100644 --- a/xen/arch/arm/include/asm/firmware/sci.h +++ b/xen/arch/arm/include/asm/firmware/sci.h @@ -146,6 +146,14 @@ int sci_dt_finalize(struct domain *d, void *fdt); * control" functionality. */ int sci_assign_dt_device(struct domain *d, struct dt_device_node *dev); + +/* + * SCI domctl handler + * + * Only XEN_DOMCTL_assign_device is handled for now. + */ +int sci_do_domctl(struct xen_domctl *domctl, struct domain *d, + XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl); #else =20 static inline bool sci_domain_is_enabled(struct domain *d) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 29a7726d32..b3d1381182 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -29,6 +29,9 @@ #include =20 #include +#ifdef CONFIG_ARM +#include +#endif #include #include #include @@ -833,6 +836,18 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_= domctl) case XEN_DOMCTL_test_assign_device: case XEN_DOMCTL_deassign_device: case XEN_DOMCTL_get_device_group: + /* + * Chain SCI DT handling ahead of the IOMMU path so an SCI mediator + * can authorise access-controlled DT devices. Unhandled cases rep= ort + * -ENXIO, which is ignored. Any other SCI error aborts before the + * IOMMU path runs. + */ +#ifdef CONFIG_ARM_SCI + ret =3D sci_do_domctl(op, d, u_domctl); + if ( ret < 0 && ret !=3D -ENXIO ) + break; +#endif + ret =3D iommu_do_domctl(op, d, u_domctl); break; =20 diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthroug= h/device_tree.c index f5850a2607..29a44dc773 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -379,6 +379,12 @@ int iommu_do_dt_domctl(struct xen_domctl *domctl, stru= ct domain *d, break; } =20 + if ( !dt_device_is_protected(dev) ) + { + ret =3D 0; + break; + } + ret =3D iommu_assign_dt_device(d, dev); =20 if ( ret ) --=20 2.43.0