From patchwork Fri Jul 5 11:01:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: CLEMENT MATHIEU--DRIF X-Patchwork-Id: 1957290 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=eviden.com header.i=@eviden.com header.a=rsa-sha256 header.s=mail header.b=Ylc+pk5d; dkim=pass (2048-bit key; unprotected) header.d=Eviden.com header.i=@Eviden.com header.a=rsa-sha256 header.s=selector1 header.b=B8e5swG8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WFrGc5PY4z1xpP for ; Fri, 5 Jul 2024 21:03:20 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPght-0006Ti-5x; Fri, 05 Jul 2024 07:02:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPghm-0006RA-7t for qemu-devel@nongnu.org; Fri, 05 Jul 2024 07:02:19 -0400 Received: from smarthost4.eviden.com ([80.78.11.85]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPghk-0001UB-KA for qemu-devel@nongnu.org; Fri, 05 Jul 2024 07:02:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eviden.com; i=@eviden.com; q=dns/txt; s=mail; t=1720177337; x=1751713337; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=xQVM7ylMlGKzxRaBVpQZpqXD9KGA8oCWP93OVr5usyQ=; b=Ylc+pk5dOAcknYdpnlMcdjV51s0/TfRAWaWnaoaHVIQXbfPSPlFJqVZM j4rw4TTo616tDsFreE24LXOR0mQC3V9NtUbwT+fgz2W93wxiZldbEbeP3 nufrOtJLcA0GPDUgRPtOxngpIRDh2a/nHILWbAC5bpb6qkN8OyHeznQHT 8Axy4W2pSwiary5HM0v2KPstx5NNSMjBVP1osty7FlCjHRu0/POLxc4ht eLRItNd3AyHUEOFKADTcg4nTT/xeC43c5vwAJAdKDdAjggjk8hz35pCZU bMMtaMD2Nm/F4qEI2Twzrz1FCFoes9dMPS5zofqzy6We/sAdZZXu07OjD w==; X-IronPort-AV: E=Sophos;i="6.09,184,1716242400"; d="scan'208";a="16056521" X-MGA-submission: MDHlrUuxReAWgnVhkPvP+ginv1tq7w0+HKx/d9wOC2RId3eKO87B3D/ZT50WoMlXuTXWOWUh7g1uY2FpDU01swOk+OJHP9ZHCSl1BwJ/K50vGdop8Tia6D677mU0pD2mIhwwQiVj5C5nDK2Cp/x9yPjgfChnsq51GZrtlRoBiZsFfw== Received: from mail-db8eur05lp2105.outbound.protection.outlook.com (HELO EUR05-DB8-obe.outbound.protection.outlook.com) ([104.47.17.105]) by smarthost4.eviden.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2024 13:01:59 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BueE5yn6X9gtbCo4d4d1Cmup23JSQuS3M7iiGT0opbra2vBFOjzXP0qw3U2G7lhxiI8nwRbGyAPP8rXHiLvL4TT3GtHBCVQfDB6IOBzpmY/3sFsgWwanKQ0gf8eLvNPa2OKDllI3rnBV7qriLyEX9kKuXxNuJ3UC3f+I6WZ2ufwL+6+4XpirMMEFxYECnsvKJCgKyi7KcDYF3GknikmqFah9bjmMzd9UBsKz7QPAxohnE6GJvZcWNMcuHl756HmPbREfzRg0BzBr4cIRyt4Bg4wi9eijof+WVmrnhaYFhF1jDOVTkWuszP4LVg/oMyTEI1Nlm6g/42IJ5mT8SgX5Lg== 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=xQVM7ylMlGKzxRaBVpQZpqXD9KGA8oCWP93OVr5usyQ=; b=XOLQeHVhwp2wqY9m6u8xj+KXN47hqJKdKHmnghDtlmqHJ3MFXpfffZzbWlWfaPftmihwydrS3rDbpBnaGt4Wqu6Yui4tUD3ydrsiV4WqDj/3mSToMolfz7UbU6gemBQfX7NgoqXYx9C62YnDXQgtt/nJItjuQ8T8OpWzZGv9sO3t9lYKg7qWFj8KU5i8CRkBGUcMFkezvnGuO8fgFw8p1mUGoooac08LuVq7jq6LTv1+MurujDhmaIw3NWEBCiWe3hfMutB/S/wLWusGPxfE3qU7sHjlXraMX/DrXjw1KrdZhZ2tMmS7R5drP0LnH6afyqh9gAJybDRlctrfueI/Jg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=eviden.com; dmarc=pass action=none header.from=eviden.com; dkim=pass header.d=eviden.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Eviden.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xQVM7ylMlGKzxRaBVpQZpqXD9KGA8oCWP93OVr5usyQ=; b=B8e5swG8jr5djHO7BIa5BTfiKYF5b44tWFN3LDJkaw/ZzfnVoqvqxGbQITGOoLMwbrP6MoJ90eO5ku+MKkCFyEXicdnvcCUmARxT4oX33OpoGp0jF2l2IJEgWm/IEJgFFc8ZOfO1pvEOSwK8+oxA4Q6Wtj2FFauzIGu9dBqf2f6rwf/JAeOMgPg30njmTm7XPZnFBh7ORf0ZHXqHm8r5T93eguDXzhwpdKKTw7vy9E0OxM2LKZ9nZThI3hg6b1lFUM17Ppf8ncX7FM81PXlwOlM8/utzhERFWybWFhddAJxihXH/k8IdhRFrcplDk4LWGKlyCKk6nCAJtFBtjPkqNQ== Received: from AM8PR07MB7602.eurprd07.prod.outlook.com (2603:10a6:20b:24b::7) by AS8PR07MB7303.eurprd07.prod.outlook.com (2603:10a6:20b:259::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.11; Fri, 5 Jul 2024 11:01:57 +0000 Received: from AM8PR07MB7602.eurprd07.prod.outlook.com ([fe80::fbd7:ca71:b636:6f9d]) by AM8PR07MB7602.eurprd07.prod.outlook.com ([fe80::fbd7:ca71:b636:6f9d%4]) with mapi id 15.20.7741.017; Fri, 5 Jul 2024 11:01:57 +0000 From: CLEMENT MATHIEU--DRIF To: "qemu-devel@nongnu.org" CC: "jasowang@redhat.com" , "zhenzhong.duan@intel.com" , "kevin.tian@intel.com" , "yi.l.liu@intel.com" , "joao.m.martins@oracle.com" , "peterx@redhat.com" , "mst@redhat.com" , CLEMENT MATHIEU--DRIF Subject: [PATCH v4 2/4] intel_iommu: move VTD_FRCD_PV and VTD_FRCD_PP declarations Thread-Topic: [PATCH v4 2/4] intel_iommu: move VTD_FRCD_PV and VTD_FRCD_PP declarations Thread-Index: AQHazsrAAk6W8c6+BUWyia/w+c4s6w== Date: Fri, 5 Jul 2024 11:01:57 +0000 Message-ID: <20240705105937.1630829-3-clement.mathieu--drif@eviden.com> References: <20240705105937.1630829-1-clement.mathieu--drif@eviden.com> In-Reply-To: <20240705105937.1630829-1-clement.mathieu--drif@eviden.com> Accept-Language: en-GB, fr-FR, 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=eviden.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM8PR07MB7602:EE_|AS8PR07MB7303:EE_ x-ms-office365-filtering-correlation-id: 7ffd236b-be85-403e-0444-08dc9ce1e373 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: =?utf-8?q?WKb/gw/sDVS41L/akeuImFK0DO+A0Gh?= =?utf-8?q?4HkM/5xth0HjsiulvPCy2PasdMEDmqzyS8mr1Lfejx7C+UFBlTn/ktD0UBWRhMr6s?= =?utf-8?q?+Dh38ev8uCQFlnE1h3wQmz7fptWBrTe5AaakiCnZIwp6DPqoWyw/c/2Mljn5erxmj?= =?utf-8?q?Cf5/7rNmfHd8Shvms+8XyAJ/nfAb4GuJudBPFylb6CZERINpA5b468ixSGJcfXrMT?= =?utf-8?q?Gc3iKyS6QNbh4N6tQZO1bNnmOyi+Flzsyaa7LqsYkCzoBxwxwCNTwbjleBPbTYVJu?= =?utf-8?q?9Yp94H2RdzSPLuvELKXMoy/0EIR/Ua5LOYBEw2axwEd/OG5Wzr38UnyPYTD5Q/Fji?= =?utf-8?q?0Rn/qLNyJSstBI/vxcSfvoLooAphjgGOagwwAfJlE5tBacYuqpq49bC9hKQ7Ign9y?= =?utf-8?q?wRxJ2zmxvTag5QaBhi7EQ5Hn/VlCVpG6zBxTv5Mr+ytLDpYpcIzrOYXrynYWBTDDY?= =?utf-8?q?tlCFBAwuiMHY5CfAa/XtuIpKZU6PU+nYNqTM379a/qPAoWqBTbsWV0T2AdbsKq0us?= =?utf-8?q?mL4CT1i1q39pisMgwS76PArthOrm1T7PMTvWmGwdhhh/ATm/LELarRrk4M0kZ4cTy?= =?utf-8?q?2Q/CbhXHKJ0W/nu+7gudCS2HG9TkO9tsQKMP+SYjKfG8RYQBEUrZ2MiLfAcV9zJUT?= =?utf-8?q?wvmb5mjLlyXC+FvS8KNZYLsSObjKvo/VIJMrDHeUKMDHqV48u9tc6D/Mmsv2PGg52?= =?utf-8?q?3qIMCD7X9nhj+E42rC1h7bPRSpuYMiWCRCd4dN5hdsZBm9ml/WCEjUPvUrq/mjQDn?= =?utf-8?q?WcCGC82c0UYRfP1c7wmBQTn59RFErub2XppK/phsgYMoEUvw10FJsjgPVvDvqCKJj?= =?utf-8?q?bX81038XBb0HErEQ1QqeFA2rpdnJVNrgGNrjBT5qqdK8WhZB+yQBybnmsGQABwWb1?= =?utf-8?q?Eh8m7YpdFOGc5M9ryayVR84PCwUjaBDWlruTMiZ6mvkVHcjWLpMlF5hRD/xmnnI3g?= =?utf-8?q?VxYf4k+iE1ovzaZj32GTiZOky47Tn6DUDmFz0xsg2ziL7hOO4CoFsvUSEBvW/2FUm?= =?utf-8?q?kDPtANaMwY/S5WSqcmkg6f3G42P0awfUquFFkiL519Jh9twMAp9SW94dhEJXJiYoz?= =?utf-8?q?g8sfozDkUqLYlVPDE8CsfcHAvXcaDgs/MVaKICRvmOpQrPZYkrXeiATmmLMfOHkV1?= =?utf-8?q?w/8wLaiMH/LLsJQERhNNOj+NJtsHvj5dbTs7+u12CSlJIpQ93zcbhc1UdlqNNcrpI?= =?utf-8?q?Enr/9DtnQmGNHXiW0qQpQKRXGgDpa5BWPD0mwrR1rZgVu6A4w6ZoPinoycxyK8aj1?= =?utf-8?q?qKPKksT+UmWS9LFjGJPZ4pywig4T/7EqQI1kbhCNvmZTikm3cZtUQ40DL1gEYot/y?= =?utf-8?q?ygQOzDfcXn25Gd3qRdFEPBU+COOHpHEZZw=3D=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR07MB7602.eurprd07.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: =?utf-8?q?MC9/4X8WTM59XDCX4w3z6XNmmCLr?= =?utf-8?q?v7o51J4M9ScF/FMwJP1UK8LNKSupc+pLWTsBT66UF6ecN5OCWz/WzrXnx1hBGxpV+?= =?utf-8?q?U2KzCXrhIG1K+xOzdmhmSFnBAlZJIF+c/6/HRbHdCBDbSil4uSBiP5atQRLbgHhzz?= =?utf-8?q?zhIwoGnJnODE4Q9lT0t+FthMzye5TS04/Iyi07YLrVB08ossbVxQayRz3trNdYagX?= =?utf-8?q?VDjUY6UvJlqRAiCkSqPG8VR7zi04MHf5qxP74FAfrYi4aC1vF8DaMnN5PSZD/Hy92?= =?utf-8?q?xdTfr/rguguwdO4iNOEIMCENK5wL5D+WGXAgtnt7HZqniMSys/W5l1rL9p9SUqlX6?= =?utf-8?q?vVu1VzUU2iX0iWapN8/xi1eZdoFqAWxldsaysOJMhZgHcqx6MH1Lebm1fVi9IvxDn?= =?utf-8?q?e4AafsGDzW5VT+dUAAeHkcdFKQUT/Ga9hwd2mL7v6hQ0qV8MhAO/nyfZ3rXFlatCC?= =?utf-8?q?PkdsWANVWS9pj6iTlW+qWRiEhGyL3u/eNLjGRnNnsQMtcrprawFQj7lTMZsi+iPWY?= =?utf-8?q?B0d/s+4VpHDp0HC2M/3QPA82fk4DZyPMQfQgVrCegPO16hXUT0fmvYrS11Y+IRPwG?= =?utf-8?q?Z+GGDkFiU1sY8K4DEnQj1udfTEFfK0xSoPlKAXFyYsedsgZx/Dr6AjzlunPmS0C+b?= =?utf-8?q?44GzD9OKRdk1aBSmtaHZzYnCtEVffSjaG1Qqe6s7ZTsWndPCoy2Ku4O2Jqbb+Ptea?= =?utf-8?q?IuqPV853i+aZ4EanFv4YHOUYcyBLhUt7woe5DzDkTciZn0yv7s5lVn0nlCprulxWy?= =?utf-8?q?lNAF9JBn1MX0suXuG7cxnbtUlc0HbaLZSmT7SRUFxvoxJ2z3Zy+vOy7NzavwQxCbT?= =?utf-8?q?nVWUcU5wRDVjlUhRYgjQHmmtptxmBLC8i5yf1HDLKRdzaw+5z67O1QeOgU+rDsgE/?= =?utf-8?q?4K1gxnTGhYvvcgVihMeQEwHhBA5iW9mRj172xIlurknKKTb6CMv0YZlQmS6k4JyHU?= =?utf-8?q?mj+YLRb4coOVei6qDGe8XqEuso6TIvLfiAkuEsA4GIz93ZZvIq8RVsclMOL/qC2lw?= =?utf-8?q?h/2E7GZ2uNPdhbzLdPp6vZKFWWwAwXbc/w8ccXmRDRqHSfMJ/40bAwJYLEGgKliAQ?= =?utf-8?q?HiOp8HkT+wm8wmOcG65MO8UkOjlz2lpE5zATPvedv45Fg1aofWNzQiSQqQpNQNUW/?= =?utf-8?q?Y8pDxK6n/pmlSHh6Qq4LrLpn1Tr9syD/coEvEKvz80dfT/emF//Txw64wtiCHO93+?= =?utf-8?q?Dq/NztWvh+fWFGPHiDXfR/hIAuvg+yt0iaBw/4BmoLnesPcaeIkkXB9FAnWsI+xbC?= =?utf-8?q?OclBHZy0VOJVJAcqqfHMOyVJxArNJbKqPrbeLXYy3uh2IRsLaqF9a0DcrPLdepC2P?= =?utf-8?q?l8+5hXLLpbaa+6j+pdsRBJcM3Ozdb6DICAP3BR6aPK+SC0S3zCczKSJYhVmKJyyQl?= =?utf-8?q?zwAhdK2CaTafWxYBBwalB8fkRtm03AYU//gpTCM8ariMIax6QiyhGZc1/NpB4eij+?= =?utf-8?q?WOu7pIunExKQ0+iccs40DXdJNmgS0adUj0Ot+ma0dn/2urGjEww7HGvoGKv8GfGh7?= =?utf-8?q?/eKv179NlPYNq79sHkIOFVrC7ok7mephffgF5SHXgnH6Csr+0LMc/mA=3D?= Content-ID: MIME-Version: 1.0 X-OriginatorOrg: eviden.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM8PR07MB7602.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ffd236b-be85-403e-0444-08dc9ce1e373 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jul 2024 11:01:57.7288 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7d1c7785-2d8a-437d-b842-1ed5d8fbe00a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: nzUm602UVUBTmvyUp10C3K0hlNFdBsqDT28lWisudSIqxhEDTe0F5rcRYY4ch5YlJOPeF8nL49mJGJ/v3AaVJrdpPvQ2tt5cZe+J5RDCFG/WcaeTHQlr+iJfsX9hPcMh X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7303 Received-SPF: pass client-ip=80.78.11.85; envelope-from=clement.mathieu--drif@eviden.com; helo=smarthost4.eviden.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Clément Mathieu--Drif These 2 macros are for high 64-bit of the FRCD registers. Declarations have to be moved accordingly. Signed-off-by: Clément Mathieu--Drif --- hw/i386/intel_iommu_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h index cbc4030031..faea23e8d6 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -264,10 +264,10 @@ #define VTD_FRCD_FR(val) (((val) & 0xffULL) << 32) #define VTD_FRCD_SID_MASK 0xffffULL #define VTD_FRCD_SID(val) ((val) & VTD_FRCD_SID_MASK) -/* For the low 64-bit of 128-bit */ -#define VTD_FRCD_FI(val) ((val) & ~0xfffULL) #define VTD_FRCD_PV(val) (((val) & 0xffffULL) << 40) #define VTD_FRCD_PP(val) (((val) & 0x1ULL) << 31) +/* For the low 64-bit of 128-bit */ +#define VTD_FRCD_FI(val) ((val) & ~0xfffULL) #define VTD_FRCD_IR_IDX(val) (((val) & 0xffffULL) << 48) /* DMA Remapping Fault Conditions */