From patchwork Tue Jul 9 14:26:09 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: 1958473 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=IMOIJMgV; dkim=pass (2048-bit key; unprotected) header.d=Eviden.com header.i=@Eviden.com header.a=rsa-sha256 header.s=selector1 header.b=jHaa4e6R; 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 4WJNcN56kSz1yV0 for ; Wed, 10 Jul 2024 00:27:32 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRBns-00087m-D4; Tue, 09 Jul 2024 10:26:48 -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 1sRBnd-00073q-FM for qemu-devel@nongnu.org; Tue, 09 Jul 2024 10:26:34 -0400 Received: from smarthost3.eviden.com ([80.78.11.84]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sRBnM-0002lO-Ob for qemu-devel@nongnu.org; Tue, 09 Jul 2024 10:26:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eviden.com; i=@eviden.com; q=dns/txt; s=mail; t=1720535176; x=1752071176; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=rMSbcG3FjkA/956ne7dFU6tsNnbwdrHjNAv6+ySCMSM=; b=IMOIJMgVK3v5OI1V1nOJWtUKCpNfMV6NXQ2s7FxsQmfyI20IbjM25PIo K0feHUM3VKy7uHinWQ10Cq7IfVNE+gvXo9kF7lDYSGrYzKh2nZACT5ZrW W7OOhbi5ATg/Qy5C0au/sLrte79r0bzLeGSLBiow8KZBToZbt37BkZRfQ hwtfv9GW2N2JxS4hUXtVQNU4VpbmtwoHe7n5XEUXsSikPnUS2oXQgiuQc vrGV0mu7Bajxs3eEUCryCg9mf748Q7vLH/kMcgbmOyxEyTqPsmBLkyWbL ns4dNtRi4f+JIfa0Yv+SQXGyQx4HuE2Zr8/khiSH/voOMia7phHTNDDe2 g==; X-IronPort-AV: E=Sophos;i="6.09,195,1716242400"; d="scan'208";a="16172661" X-MGA-submission: MDGeFlJoZcif0Gxd9c5oju/xlyOa1hR8axmOdNrwpFNW/Yn3HMQlpKb5W5oHK4i16K/VbjFazZoMoZNwF/xwxH5jyJPJ4uYaeg7T1RJnoudnUont48OzKVWRIOQAY+9dH92xagBXE/VJuvMJaUebSNUU1VzxsJyL61KwOBiFX6BCWw== Received: from mail-db5eur02lp2104.outbound.protection.outlook.com (HELO EUR02-DB5-obe.outbound.protection.outlook.com) ([104.47.11.104]) by smarthost3.eviden.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2024 16:26:13 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rD1ryXXgg+SbImK77vPKOjbwkzevnw/vOWuCaNf/s7VTKChaHJTmRbydDIbaEUqFMNnGLR+rom39Y7uc2Iudf8Mfsi3RljB7qycCC94IQy/td3ZmkcyEB9ORe1QL58EefvMjvo63e29KvVM1mGLeaL5V6FTnIlIZCtC1FzdC6BIDic+gitKWgdnuC6q8V15zEnTYeZ4v4twTqDi2huSRywYMww0GeVT7RzMy5s1b2KlFD2e1X4SWGNvUklcKomiuaAglUtMsStwB+piJzRBc/gGJ1kcVWswQlfS6Q+Fbbqdb9HJlJZHpkusgVxNG03XPrOehEiZKd1KtYteatKbo4Q== 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=rMSbcG3FjkA/956ne7dFU6tsNnbwdrHjNAv6+ySCMSM=; b=pf39+yrCaTEOlm+uZkBxUd9Pylkd6UQwaO1hRd14YMv4AKFcZUFARgGOVcTr5OqPBvFabla2lM9tVGdVkn9HNbteRZs6q9tXAG9l1JIAz519HqPyV69/qvtJm6RJ2PzsKXlP7ASwLlDMsGnTmImwEMQcNT1KOqASDtnzarz1L1wQazJu4kH43LOe+Aakw/x0NBjYSmpo3QaDMMvkNa9unG08Gck/qSHKCGk84Rc+Y4kqm/I5y98lfDAZvELrkI+diiaxWZcrfGqR9bSb+kX5LIyERUsMpCgOayFhwsB5Nlo8xhBzlVFuke+yXnJDyQqg3dLvu04N//DwHijDfeh9aQ== 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=rMSbcG3FjkA/956ne7dFU6tsNnbwdrHjNAv6+ySCMSM=; b=jHaa4e6RHNBnkd5leIvT0xDE+P8HFLc0ORw/z+lFLpE6jYrOoLHjzZHd8yMhc58o5Dugz1EwM9/a9MUCcB0JgJUAS7URB57r907KzDU+InUVXB3fV1QX8hqF+L7kiXrG1KRkgpRvk9tBHol3PjRHHpw6w5l87y8NCBv7zQ0sC96LjkdnnrgAMftR0mLVEZpO0mlFSFoaphayXvFFSeJkY19s/Tu5aMLleoOXf1ZFMPk2umIr+wnyYSMPu0VIiNM5kkF0C3j5zTrOMWvWaH1RJSnqfUrQV6yVf5VYeoiC6ZW3ifEqPU0OuObGVu+afZYdi31HkYF/GvaG05rxKEDgEQ== Received: from AM8PR07MB7602.eurprd07.prod.outlook.com (2603:10a6:20b:24b::7) by AS4PR07MB8459.eurprd07.prod.outlook.com (2603:10a6:20b:4e6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 14:26:09 +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; Tue, 9 Jul 2024 14:26:09 +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 , Minwoo Im Subject: [PATCH v7 2/4] intel_iommu: move VTD_FRCD_PV and VTD_FRCD_PP declarations Thread-Topic: [PATCH v7 2/4] intel_iommu: move VTD_FRCD_PV and VTD_FRCD_PP declarations Thread-Index: AQHa0gvxlNSFVDQ4xEy/j0fpVYVa5A== Date: Tue, 9 Jul 2024 14:26:09 +0000 Message-ID: <20240709142557.317271-3-clement.mathieu--drif@eviden.com> References: <20240709142557.317271-1-clement.mathieu--drif@eviden.com> In-Reply-To: <20240709142557.317271-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_|AS4PR07MB8459:EE_ x-ms-office365-filtering-correlation-id: 4bc7f8e3-c624-4409-c3e6-08dca02313a6 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|376014|1800799024|38070700018; x-microsoft-antispam-message-info: =?utf-8?q?QXMBN9UjVoTB0dyPgpVYUizQAGbxBEC?= =?utf-8?q?KCXlq4NqhSPckiM3LlaA5jvX6bIxmjDZceCoV2DMCRumqZnwmy2pRObU+AIxA171t?= =?utf-8?q?RgPewcx0e5MN4G4mg9wkUXSwOKWsL75qfWi3F4nJRq7kwAEz28+MLzthxgppznr/v?= =?utf-8?q?bVB9VjzxtSCm772Jms7Dp5+jANpawuGipHOtSpTUgfxgRmVU6hZtAIvmVLB3HKJlE?= =?utf-8?q?CPxYfqPDFbsWM9ulsaZSmUV05Ku/TiKwX2qAQ5e1tLSV8bG6mxJH+JADJyIaZ3CU5?= =?utf-8?q?ncsSi7+8v1SWPMlxPm7bdX62FdzQko5FpWq97CLh7d39tSFfnLVGftMtdCuKECfdo?= =?utf-8?q?XYs7bAWb/po6YpPOTNvkuvTmseqCuc5onHY1z2I9qsWCN1tvvL6No6l/+ZHVx8gxA?= =?utf-8?q?nMeK1lb9xSKau2k9A6afp0oFhgojUm9cVOQP46Us0YgM1r1XYvkYPsaqX8vinHPNm?= =?utf-8?q?wN3QxySDnl4rNcMjAYAuGZmg076gEGMqvppo72Wax85D5kdNPW3LuJHmzjk2tIXzq?= =?utf-8?q?DSg9fC6ZmG9E2pP8NkjH+hEb8+bCPXSkmzmvC7hC3drpRoOf9FRZTdFMWUzZomTL0?= =?utf-8?q?Q2Pp3FfVP4+KpBddmmWwOnJm9Ny6Bap0v8+W7Wl3NGiRxEwwcrFOnQnZdD7H0MrXq?= =?utf-8?q?jli06nG8+/tScPukFFgoY7wyc15Y+J/X8xC3S5xb9CuTLnsEbypYX851ywwdJFN+Q?= =?utf-8?q?HjrUwu6y4qbEOh/BHMOBF9oZF1+IqdF5tm9mNJh5Y2FUkMK+9lv7gcIlO4JEVUEmw?= =?utf-8?q?a0WKp97vCIRufnI6YyHWsXyZi80Annh0QhTgXabuw6QReOrqXARKmIPlSN6uPo09Q?= =?utf-8?q?dpVn0p6/e51MfSzsRID0Eev/XndYAqsEtsi2iDwJtk1mL8XZJiakIJDVVCAyeUlge?= =?utf-8?q?2bdIiedoWUb4m2IGKDoERstxicjtVuZuNTjf8xcMWfUy1fKERJL0MJRp0MrBk/43K?= =?utf-8?q?FeVs5I3sQuCffIDAzpRnZlEVLnPKJLEzOpKT6baoOBy9rruXTpNvRSXxPTea9Kfy2?= =?utf-8?q?iDeAEka0f4vznQv3l49SbMESl6kdCLwGRIHNWngds0kCrGoaFsq6Pm+0l7Ni4sUKa?= =?utf-8?q?a4FM8tTSwEdwNsn8qLXJ76aKbsCdEh6dUGYHo4FcoltbNTEbJnIUobMt6DfYlAyre?= =?utf-8?q?ve46148HJk7pCWjtsnI4u4zTADlmlZ7TjLq5L6DZZMLTesiUrrTUDvZb4BTAiNi1C?= =?utf-8?q?+VzY+s2GflPWtFnY22L4IF2GcC+EHkWdsQSmxRXHolskdYv996TgsM7OGZ+YkWviI?= =?utf-8?q?2yCMzbx9Bdua23iH55Luhpye1eGho3scR1yqxbw6KwbHf0+uEGUERY7nWclXB4ad1?= =?utf-8?q?Tgdq6vloZ9FXTEwiakyQVzXoZ9x9f/x1CA=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)(376014)(1800799024)(38070700018); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?b2uHC74L58rtDxTWtCSu+5NK9yJf?= =?utf-8?q?rBcy5LJ7WP15clyrBHIJlU45MXwOxVrlhIFQv6SqF4UsMlcn/w3FvGD6oqIpgD7QS?= =?utf-8?q?KmZw1zsjZYkFEYvaJcE1sP3uFB6koim8B5myCHiI4bJPhUr5Z26Gpo+KEOlwqvVef?= =?utf-8?q?3NAf7yQGMlrd7h7HDlxmRqaMZMWLebZ+Eaf2QS6LbWVnzbmumk969lKoj3ChMZFzs?= =?utf-8?q?5SKiMCQaiHJz1kCoDiUfpy8ga3fSAV0GsWBJcBik9huHwgEJzhUPXzak39AgD2oQk?= =?utf-8?q?OD+BXJLRtaFEwU8eJ+GEF9Py4rBmsdmiYixRZGMf83wclakZgM8OM4rf9Iu1KeAlH?= =?utf-8?q?05bp88ZxMkxqiJAUd0q1T71y+qgWQiOKPeJ6QrSfC7iRn/x3Zcy7yGGMcBZ6D3yt6?= =?utf-8?q?dnruNhHFB2EyQKgt1zT/BTGw/e/kLCqgGxZbNpXPxFg7hr2QOXKq467kYZpqZPDAv?= =?utf-8?q?1UTVwRcgTbwqOKK0FXx48xh7wwJvTzOSUfXjPZAV+vPBC65pJj+R7ibZCb/EALH8z?= =?utf-8?q?d49GSsJfauVXExsPaI5znyBzdQ5DgopyHZa97bdd3DKN0oqD3F7RNzwsXLHk4TqqO?= =?utf-8?q?FSQTXnKcg1Rvg9otM3ks3SgeKT9/UhSnF5H+/SML7WMCqtDQ3RebOhvoGvzhkzRM/?= =?utf-8?q?4yuCmX3WgJmk/bqmA7Cd4BQB3SKt/xPWibCP8p1G6VZbdwgTyiqLuCIkWyamk56wk?= =?utf-8?q?G6UNJ+RIKdXHnhBFfz06sw6VTI+V2P75Nnir3A2K/0jAnmt4pUyiG9hjmVmozwu6y?= =?utf-8?q?YB9O3HuFzD3IgdvvNfY6lAp/t44/nV74VKfzNspK2jCzymsX2+gFYJ3fwQC4X5rMC?= =?utf-8?q?NarHw2wvy5euTjse6PvXakOSOFIyFfA1RjU/CfFJkOjqvVc06TVCApEWQF+PKzLeR?= =?utf-8?q?zKhPsXekZUOteQHtoKwN1qMFPg2qh62q7AcTc2xUvIDa68RSKd1rZ7FIYXcCqh6hk?= =?utf-8?q?57exKpV8vQFg19bJjVdvBgNQQGhieMWs7+hUdX3/b4n8+/7qPKlLlc4/nMMFrNUwN?= =?utf-8?q?81N0BMNp9dXD5uOXDIVy8Is6R9DTpTfYd0nGQEBxulWObz1IxAWwEL02ngsIa0Qqq?= =?utf-8?q?LKy05TftgQcrLCYGb9zHx+oEsnmwcOOWuxKvzayAjmFOXajb+bChZT8RD7GKwcveQ?= =?utf-8?q?YR4gRDVXmV2io0v23iAJuK4bg4GMuJ+BITmRImBXNiLimezgWxYoISApYLQe9j0+T?= =?utf-8?q?ldFl0Hra5nrOjhPukA4YiwSjwqU6TBCDQmBY69Q5KH+pCgVR4h4sFb8Ip1Za52MBV?= =?utf-8?q?zx/BodPJKm/MUuTj4et67ohoFrJzkTztduG0gKN/9IGfH0yBsCuT+RTLq+26Iq1v6?= =?utf-8?q?ejkuXRycHrg1fEX8joFav30lJIX0FOZeF9CApN8CoQ5wDS63fFUC/iyj/unt98SZJ?= =?utf-8?q?T4w4PlW+Dww3fnDuc1I/XbB41UQa6WeF2nG0fw05iV9xxaLrUEbkQcpB4BIQVrLk6?= =?utf-8?q?m4yLInuMKk6bC6DrrZ2ANmlplnEfzinmvj9bdq2Ekgb+ekZfTcQtmHPrwBSJvY4Ti?= =?utf-8?q?pwVW0MBlhH97xdNKtGw3ES/yNSc99W/xcWrJYXWEQqpeSJ94v265ykA=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: 4bc7f8e3-c624-4409-c3e6-08dca02313a6 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jul 2024 14:26:09.3614 (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: NWFPlI0Z8AFEtvMNCIlxkSFTzFXcVKFJY0ThdIyqxEyIsDn48vS04ehHeJZ6JOR1g7cP14/RptyjN/G08+i2TtLmNeBar5niTOfVgY6IVkVAm2FDzDRPXJDOEIXal0Bq X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR07MB8459 Received-SPF: pass client-ip=80.78.11.84; envelope-from=clement.mathieu--drif@eviden.com; helo=smarthost3.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 Reviewed-by: Yi Liu --- 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 */