From patchwork Mon Jul 8 11:39:54 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: 1957909 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=u8Hag+pJ; dkim=pass (2048-bit key; unprotected) header.d=Eviden.com header.i=@Eviden.com header.a=rsa-sha256 header.s=selector1 header.b=oj7Kbzcz; 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 4WHhyk49Skz1xpP for ; Mon, 8 Jul 2024 21:41:02 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sQmjN-0004Nu-Uh; Mon, 08 Jul 2024 07:40:30 -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 1sQmjB-000415-Tx for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:40:18 -0400 Received: from smarthost1.eviden.com ([80.78.11.82]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sQmj6-0007rr-5m for qemu-devel@nongnu.org; Mon, 08 Jul 2024 07:40:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eviden.com; i=@eviden.com; q=dns/txt; s=mail; t=1720438812; x=1751974812; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=xQVM7ylMlGKzxRaBVpQZpqXD9KGA8oCWP93OVr5usyQ=; b=u8Hag+pJfDP/S2Ct+sjZKxXA53O7XU+0ATXpcvePhGgbc8eVnV/Flmyw mEhmVbVbm1rXKr+9BFnGWyDRMgvfGUArO3YXYi+SysWDtmJDFzLhiNkvO McTIRDVz2Ef8KbRHYZm8UGjcFf/VLkPkA8VvWso9dleszWn0f7YKf9JbC /T/VlIthuo/qd3opdETTP2tc04uHFdf8SO1ZGYDRlhbYjshD/3VtlFzNB f7YFdHriqFLp7BoxLLRA3Rsi3k6Xgt0UN210LVWuv3/t5rWRqrvqjVzTI G7VZJoshqSV9pk7tz6UXZ6ijhVGQ2l1iTTuoTiZyL500b5ztRs5eQ3JTv Q==; X-IronPort-AV: E=Sophos;i="6.09,191,1716242400"; d="scan'208";a="16077477" X-MGA-submission: MDEA7u1XtJwC04CN3vh+0fhaLBoa9W7HsmJZpqjvSKGvonBSfTxzN1pe/XEcJ9w9vEJGrzCDPH8ivUC+DIhj9ZZKR9QTisN5uqcbf2neWi0Zgea4BBtcqxSDubcJMBeP+L6tAOTz7N9mC/T5BbiHmlwNg2rnT0/qzl1lTyuqNYUqPA== Received: from mail-vi1eur03lp2110.outbound.protection.outlook.com (HELO EUR03-VI1-obe.outbound.protection.outlook.com) ([104.47.30.110]) by smarthost1.eviden.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2024 13:39:55 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=diyPNUNr9Iq7gvKYklrjGuqsDcctOVYRU3+SVTgqjrjOWIfVm9XIEdIcvfA6/mPc8rbB4hqts4A8+3KvVWamNwEaE9ApXLQbv6xRsUY4HQUBLaLE59HRnSWA5Fw7+Kwk2grlE3AsLWdb5v77POfeY7tr8xHpLdDY9AS9dK+daOfN2NaEtkrWb8ihcC7QPNyJzluUI/ozpuc0LlJn4aSFNFO0awMoraEvB6Y8B7sNL0aJVyU7O0YD7gOpKXHCWnwzh76JgFoQi7O3Apc1FlbwfmVHrIy3qURiy4G++VRmbfJ0UuyKnKp20w4MmcjjTtIHII9Knu0MP7wQT5vzbHSdvw== 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=Vb2COn001I1r8BD1vvM6XWfwtLem1kW76yoZ7uM7R9eVuPexvxSGfw4J0iL+tHp6lcmatDqAzB1jq2YLfP4KyXJCaUWMxNST3oQBaJH326y88R1DKXaolRSSTqTMF2fV6aZDn86PQ6Ux6YQqGw4a5ITfKrGmpAjeH0bJGBhBg2IdrF4W6R3qiHH7VCdtdKTn91/cq8b8bqbSwBTO9CXjsNCXtrZY/9BgFUXADy3eEv2CAPe6FUMoK7eGiHNKn3zirqaY8LwzySq7KHeD8ePnEAs8xzruouQBZ9QolAZjmTQmgnXlB5E+fst+guBpoHn2FL9CyUaYYJMYLXq5aBgLjw== 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=oj7Kbzcz8OnvPnCbTVHZuUXPzTh/P1/j4ZWmhHRSIRoaY+pKL10SxUkmLGBaAl7iIveEwBR28lyKWI4hyWu/Iyj7eOj4Y3hfRukcgcehZDiJw1brdyDzotvaSNECDXB8sGSaElwE3DTNB7sQyFSi0UTzRzCnJx5Z/qHgiFQRv1xrZ8XJmqrMm15iVuoWpCzOkXaTimLY+h2f8kOyLAqxRxXIt4cpIDpm30XDB1UrWWVv2EOuxgQkRAkodh/48p4ef2aRS7+ETxQTXbpmBiFD8V2YYWHcMw3Wm0wQSqGvaXXBUR7SFAMKSjjfw77xPgN0KlC/VI9zdaq4RET3Y4tGeg== Received: from AM8PR07MB7602.eurprd07.prod.outlook.com (2603:10a6:20b:24b::7) by AS8PR07MB7400.eurprd07.prod.outlook.com (2603:10a6:20b:2a4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.18; Mon, 8 Jul 2024 11:39:54 +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.7762.016; Mon, 8 Jul 2024 11:39:54 +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 v5 2/4] intel_iommu: move VTD_FRCD_PV and VTD_FRCD_PP declarations Thread-Topic: [PATCH v5 2/4] intel_iommu: move VTD_FRCD_PV and VTD_FRCD_PP declarations Thread-Index: AQHa0SuNdXrKd5AlR0+pdFBq0nmsCw== Date: Mon, 8 Jul 2024 11:39:54 +0000 Message-ID: <20240708113908.19535-3-clement.mathieu--drif@eviden.com> References: <20240708113908.19535-1-clement.mathieu--drif@eviden.com> In-Reply-To: <20240708113908.19535-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_|AS8PR07MB7400:EE_ x-ms-office365-filtering-correlation-id: 1ff73dd2-0028-4898-9c1b-08dc9f42af7d x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|1800799024|376014|38070700018; x-microsoft-antispam-message-info: =?utf-8?q?B5GbjBZ6zwXfvNXeWQ4Nh7YFpQujDVa?= =?utf-8?q?XZJ1dAA2jwGYppTuzfVnTWXZOj8lozQzHAFsSdg41Vvdjtky2hGX1+xASa/gpYxWE?= =?utf-8?q?aLfgxR2khVB85FasEQX0W9dC+6mcerxJ0TUBIj1Rw9O+9BsRqXs1vp1aiBozz9epX?= =?utf-8?q?J/HefKhDW/B3MGXIJZHoJ/9V9eYpWdYp/L38io23DmatrPh5GSQfLyBxmfXWQTptE?= =?utf-8?q?8GbCsC+jdZbm/A2EpmQ+nXvdCsKCk1nAWMqId9s8QbX/TOSIO2EwtKyHYqKYjStnz?= =?utf-8?q?LwOBPT03s6bNCQApteAXcloqtJ19oAtDFJeNJdaJpq/U1sbH18KCF66YU/O/+PIE1?= =?utf-8?q?Zt+uOCdvyYyk8Kgf69ej6SwseaVDqoFh2M/QrJbzoOeOngUz67QlMNFGpOMl0EbWz?= =?utf-8?q?/5IC0XqkShGHuINw7CqPjqIt9JB8jjkh4mjra8Sj47YMxP2lCkreRS1LtrMkCdZjl?= =?utf-8?q?HlnZoAKMOsP/mwRkcztE16acgriDGffQXa6ZoAuTR9U5sIfE5tzUTcihHW9UNZsRt?= =?utf-8?q?8omY6DZ+w1Uu5NYNdqwGRnb1W1EnyMundRWiLuYqqSMAP826Rf7uhhze2Q//mjFKj?= =?utf-8?q?ZZpJoWGjAHNIilhU+e1OHUBNzs3uaGR4aIROCj8XFps7vOvhWi17a1zDxUYJ4uzYX?= =?utf-8?q?5xkRANb/YMovjkey5LTLcm7aNHrH8cHko4+uctBY/OdKixWtSp87DQjFoDKtniRGk?= =?utf-8?q?E8541a0UpeKmHX/wWxIVGlsaMn564iMjTQQfD7w05m0aAh9qY8x8S0Guk5x2xh0Bj?= =?utf-8?q?kD2jYcE+OjcW49x0307iPNnCpIJdwEYp7kS9S5wkcmf9mK38m2hAHBOGOSUscWUqS?= =?utf-8?q?jGEIM1k5wxrQi7UEjgu2/6I4vLpmXo4mqdHcgpHM5JSDkHxMC4hCsKUgrja3JhuEi?= =?utf-8?q?HVBbXdOqiSIOyZVrce6amgv0z0eZqUqa+k6xzJYXcbYrSiGpRU0+du2ReDveREOzY?= =?utf-8?q?wietz8lVqeDtQxse1Vx6e3K9Qpt5Gf5EigEBUCjRKtlLaBllpvPL0NxEKyXiryuiT?= =?utf-8?q?IfTes2S3vFL1PF9bz6Ju6V3m8VWGXCMeQPDj0V1ps9CWuCZ4NAE7/LHO04D6T4urF?= =?utf-8?q?RIgBzoQh41HBSPry4V7A1XTLGyX+vDFLLk7JyBJ5osJW3GnJ98YDJ/itKlWZSr1HL?= =?utf-8?q?KSzWquohFrfXv6WQXiS9Rje6n++TheCHggpeEuTUkqwHu5eebS9pWCE0Hc6NXWMtq?= =?utf-8?q?B6jmLBkHwOQbSQEG5F+RzfUCv2zlIcBoPdNZwmCE8oMRf/DpxfVZHjk5nt7QhLSv+?= =?utf-8?q?331lkC1lfotBCDjYlnhj0triva3nGW0T0t+Dd6hnTCYF9sHT8Tp1wzmc+WOdvNDqH?= =?utf-8?q?6B8ALkf7n4pd2f/kWjgIdcjrk83eXlXd8w=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)(366016)(1800799024)(376014)(38070700018); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?jWCa4hLpUvmZ7fs9WMKeUSwA48BU?= =?utf-8?q?iTLVYCp5bBDvrfFzslE7b0C5oyDWVm10twAmqBFJ4gl7WPvjH+YkbO1ZqH1QNPmSZ?= =?utf-8?q?ALjXfLhhK9Sn02xj7T0vZX10ixPymZWtST+MUZCRoJdMYG1Z023FxaPDOpY5aRDvz?= =?utf-8?q?wKCMdGlvZrKwK6gAh1KXUknTkIQ5FPigZ8gNDEDejWV9suf9M612lWZkGY7qhP2ek?= =?utf-8?q?QsuzHEzObxrqGoHk4G3ABKoGAK9+SXwPTpkIJzKWZFFsiGf7zzKoQFXpJGg0rZ1W/?= =?utf-8?q?KPW6vc7UV00sUiuYRwzOyT+dZ37gFFXJIIB/di54euUIqvQZapj6og1/mj5DLHleF?= =?utf-8?q?F1TKU+nmG3AkL+Ifm0mfNqgXPbhPnOYBfl6TbRi3OC4tsalrn7/2l5MWLFfusfmnd?= =?utf-8?q?QfH0TrPj3Kc9H9DvTcAqZ+2fve5+Tn+fmiRob3s80Q0h4esAIjFOM3QMifrSH/zRZ?= =?utf-8?q?qpO/XMAJie7yU5wKb3yjzcRgcW5D3beS24FNpIYsN+ZKhqeG8NYQ8vIZZqbOY5Aoa?= =?utf-8?q?nSZO/ng00Lm7PNALTrVJZ08GyvzndpS1a0V9MX8Nrp8a9iYRd9Myg/0TpVPwJnyhw?= =?utf-8?q?VFhpbl4YAM5m9+N7+cx/M+vj2AzxKXkbda8NuskZJFHXDdfpTi7pJFGbr0R7L9dPE?= =?utf-8?q?r+MbE8oz8DIKatJF8Fhw8nYPv+wrM6+0/I3rnkj7zPsCYZkVAihTdmTGfXa+XGgK5?= =?utf-8?q?RezS1fCViCu787hbvd7gfpzTCY7qKvU9tBDI4S6yj1rjGp/WWG7ixCj7Zlsg2qujX?= =?utf-8?q?IUqk34dcJBabeagyCTFFx7Q2GA6hCcO4KQvPM6NpPNEaSz53Q45O8m3B7hCf5WVTr?= =?utf-8?q?gSFSxLPaXrtiPenYBGH46YosInZ5XYhiktRfOZkJCGjkC2rquew0J1OZdf22KqV4P?= =?utf-8?q?obdNVYNT3pdBvoxopBt2g8QMnpz6IRAj8gfOZK6XaM4VRAIwmCCYeLJUNjXO5Y8+e?= =?utf-8?q?ruE5F4FFzlAjp7fPQ6PGB2g9fneXKr9SnQiFnxdJNC5PK7lOk5RxThDAD+kDjnORV?= =?utf-8?q?i3cfV68QT44udLNTr1uyLAuhr8RIf6GCuu8CvFSbrUHI45wNrtCK7AWQk3N6IXuZE?= =?utf-8?q?Fblmk/Dxy/mBeD3CBGARp58mjXlI20Ktu0koq6rc0VJe2aHh2mvj2dVAill3yZE6V?= =?utf-8?q?nCDdO/d1aXzUmcCFUBTNUqTakGn2EAYhK1lAmFRqWZjRwXwv3XjIzjchy/zBK9eBN?= =?utf-8?q?9lPjhDLu0ouEGQOzH+Qc0hfW0NO113Uh4Ld6ZGnkJcIic1xrJbX+wx3PIM9shEz3g?= =?utf-8?q?ZL1QHDIkTYKrU2LDt9+U6UxD4r3Qwrm8zPW5IJL465UkggAwENM9kdUkYHPdhJOcP?= =?utf-8?q?FfzYiauIqvXNps990aesNAXD6WIsHrnXO97zQIoQL2AANQEo/JCC9EK0fPrYXqk40?= =?utf-8?q?JnqaocyW9i8+ch7M2rFB9ywGvIaPHkHF+7ZpZZjp4a23dzyrjLjEXyzEplq+EZIIg?= =?utf-8?q?7M0nbMMApccSG+R0hi686Nhx4UbKYwlB2QS2QUTM9JAnsOCWVmLrVj/5YNdtFUjkZ?= =?utf-8?q?RCA3PujbMV103N8Y3alWwwGBDuD9yUE7GsDDfmaNSj1f4b4ScyOdJGk=3D?= Content-ID: <3CBBB09A47AF9C4BB29D2F88CE1436F2@eurprd07.prod.outlook.com> 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: 1ff73dd2-0028-4898-9c1b-08dc9f42af7d X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2024 11:39:54.0565 (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: ZwgmdMLQ9ypHrY6cf7Cmzxwaeco4/aXiCmPYou2HO5wNJlCfApCgjyaVqstPLgWGZatT0/aDaHX61sFGsGMVa2AW1Q4Fuiz4nTRt+0RlEqmFNdjujV3Q1J+GPVNfyEWp X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7400 Received-SPF: pass client-ip=80.78.11.82; envelope-from=clement.mathieu--drif@eviden.com; helo=smarthost1.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 Reviewed-by: Minwoo Im --- 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 */