From nobody Wed Mar 5 02:31:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1741097987; cv=pass; d=zohomail.com; s=zohoarc; b=RuCNMvKIGXE7JWl0W4TVCnuM/Pi5WkboHnpVa+40xuirM4WNvjBK6s5VTmw3rIgRDYmZFny4UdQ8W9Z4uJAuvDna+KMjtQnCYRWRob82eGaI7GFoxOvzDVSOe2UdcHbXvk9qRkh4AdRxEGJJYEVatdDw+l6gMaaZjzG9aeRon5k= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741097987; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RGsJ3nSXXtVI9XNLXlkFt7+rGWOC2QYyBnYpADSDxps=; b=jQ9xqczz/xXSM74OxgiBEQzzH7ey8qHDa4VWaejbiG14WIYZ7VFIoMyhjA+NDoYa9OGlrSKuZkJBSMMmPMmOTUKhEFWmydg0Hmo9a8wK6dA+Qb4M9qO1axnyXIlT/IbFnkE3sgZAe/M0m8MWnsJ98b+tqHjmfy6r7k4ehz+mXMs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741097987499664.6779636398184; Tue, 4 Mar 2025 06:19:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpT6f-0005Oy-4k; Tue, 04 Mar 2025 09:18:49 -0500 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 1tpT6b-0005OP-Es for qemu-devel@nongnu.org; Tue, 04 Mar 2025 09:18:45 -0500 Received: from mail-bn8nam11on20618.outbound.protection.outlook.com ([2a01:111:f403:2414::618] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpT6T-0003Qw-7p for qemu-devel@nongnu.org; Tue, 04 Mar 2025 09:18:41 -0500 Received: from CH2PR14CA0024.namprd14.prod.outlook.com (2603:10b6:610:60::34) by SJ0PR12MB8091.namprd12.prod.outlook.com (2603:10b6:a03:4d5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.20; Tue, 4 Mar 2025 14:18:28 +0000 Received: from CH2PEPF0000009C.namprd02.prod.outlook.com (2603:10b6:610:60:cafe::36) by CH2PR14CA0024.outlook.office365.com (2603:10b6:610:60::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.28 via Frontend Transport; Tue, 4 Mar 2025 14:18:28 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CH2PEPF0000009C.mail.protection.outlook.com (10.167.244.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 14:18:27 +0000 Received: from purico-ed03host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 4 Mar 2025 08:18:23 -0600 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rK/P0HTpJNrnJkzecEhiM445W4jizONkpVUdVfzZ6j8QiSINl2hAZ0hjnHRieFIQX3meHcO+P7Hfacq2fzdHyJTNrgYDyC4T0dAIp+q9nJyHHw3FF9kv1hnXtWk//k4KdUCODpl044PxynAs9flnPDR397jP/AJZNxlXPsKYuZNkN1+oWhIr+yaBFj2DMsmuPxX98/2t8pebbksKV8T9uLrqikCjqUf/IQllzF2eKLoryaw/GCM298Tql2DKo4IFXL2iRCN1gC7t+6n8uZQyvFlhyt9qL76admGqGGkWmgs0F6mqATGI0lEyWA7RYMAix9StTs85JfSBiiilE1VVyg== 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=RGsJ3nSXXtVI9XNLXlkFt7+rGWOC2QYyBnYpADSDxps=; b=sQ2TQLn/f3QzgwPPbjdF5o8cqJ4rfBZTa2DI+XZXYaVbTcK6IWnMqLwr40b55hF5NbeS0N87Kbq253YgWt3L7jcScK0s3plax3chMqzU3AYjsAKxVLpy+9Sb3OnhqEgih8AyPVfac2gPS0QQumwPZjcWqqqODwvqKAqnPnfv9b17O3m0DWSyXm8pddzSfVir0OhLsBUIHoB0dse0/O5GUtjARKs722odoroDCIaz3B+7I5nEb5W/crHq25ViWJhPIHPQeAXr0BPU4iFwNTxeHfH8gKAW9QeQe7pvZyNUqjFTtxMQVB5PxDobaznUl8xOok73E8sZCHFdW2T0nWfGBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RGsJ3nSXXtVI9XNLXlkFt7+rGWOC2QYyBnYpADSDxps=; b=Ja42ldYYzofCAyVANs7nAD2Ilgs00aIdX9JMhv1gtTBZbh6b3ZGlsbhAmx91P5E5xZoXGkTuS03Fo0JN9vBTtJp8hAwpKGG8GV3mIQT9+gtuN3/2E85lkbaQuKn9x3TGutFyPm1J+a4wEt2MY3h/S06YnKuoa0AlT3gQATS4jHs= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Suravee Suthikulpanit To: CC: , , , , , , , , , , , , Suravee Suthikulpanit Subject: [PATCH v4 1/2] hw/i386/amd_iommu: Isolate AMDVI-PCI from amd-iommu device to allow full control over the PCI device creation Date: Tue, 4 Mar 2025 14:17:15 +0000 Message-ID: <20250304141716.638880-2-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304141716.638880-1-suravee.suthikulpanit@amd.com> References: <20250304141716.638880-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF0000009C:EE_|SJ0PR12MB8091:EE_ X-MS-Office365-Filtering-Correlation-Id: 5fa0ed41-9416-409e-f237-08dd5b276ef7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Z1g2Y2RvV2VuVzY5SjBZT1VHREdNSk10SjZEMzlzaFpoV0JiUnZrNmVPMWZm?= =?utf-8?B?cHoyb1Q5Y1JVM05lbll4L3lXZ1psM1hlN3Z5T0RJWWJLdGt0K0dKN1dqN21J?= =?utf-8?B?bFpDVHNZcEIyV2t1NEx2MUdYdktKc3VFbm1FbXdVdDdheFdmRVg2RUhZMHFx?= =?utf-8?B?b2ZIbGFrOFU2Ujcrd2RFeXpDU3hnbDJEU0NCSENtdTdNcUd5RWUwRytSVFNF?= =?utf-8?B?SjhWL3hHNUlhQ1JIVHlNdHZ4ZmMrVFRXeVg2RHlqQjd5eURrMXRyaCsrYUcr?= =?utf-8?B?T2RvNHZhblhCb1E0MWFCMmdDeUVzeldPb1QvQTZDeW5XOUFkTDFYNVhIeVVI?= =?utf-8?B?SUhXMGd6ZVA4Z1gzM1krUk9Tcis1aW5QaTRVOWdCaEpYcUtqTVp4c2htQ0Rm?= =?utf-8?B?cVZodUo3QlBaSk5VTFk5QVZrbTlWT3JRQk0vNUhnZytOZ0hzN2JFMk4wTkxp?= =?utf-8?B?Um52YURYeGhZQjcrQXhJa2M3ZXFQMWdPSlUvZGpQcTF0TDg1Yjh3bkluSklz?= =?utf-8?B?UWhEN3MzeDNnS1NvTDdYNTRxaWowTEVJQzhYL1NEMm0rMjVDNHpHcXh6bDRY?= =?utf-8?B?MXFlR1ZFSDR3T0V0TzRNWjdObDI3YzNZbWtaR0FXajMxMVVacEdqd2dXenIy?= =?utf-8?B?SzE4U0g4b1pHVC9aeTFETFRERmQ2cHcwNWUwNVhucCszbzZOdzNjR3UvcFV4?= =?utf-8?B?T000OUdRczFTQWJzODZqN1JaRWg2QmZtV0pNMTg3eG05WmRGNVk1UVl3aG5i?= =?utf-8?B?aG9DbHpoc2M1aXJhRWRaTkh0Y210OHEwbUU2ajkxNjlEc1FsQlQ1dWZQdGZV?= =?utf-8?B?dVFuRjFwcFFTTFdadDJVay9aV3IvbmI2NmhJeGU5dndtUXo5M0FPOWE0MEw3?= =?utf-8?B?ODJaU0RuTk10UkdLNnVoby80aVZCOW01SSsrKzZMVmJMeVRDbVh4WW85VGU3?= =?utf-8?B?RE9FUWtBR0FnSmxoTGJwcTNXdzNadzYyVkRmanJjTStsMHh5L09XRE8vRHQ3?= =?utf-8?B?V0xNNTJuS2NKWXRBazRkeU1xZU0wVFJ3NG5HWmh1d0NSRUZ1R01lTkxiZ1pF?= =?utf-8?B?bE15SzZzRFR6RVMySEJRa0c4dWJEcHdiTTRJOCtQL2ZLcGdRV0tSc3RhdGVG?= =?utf-8?B?ZTIyc2ViNngyMjJ2cjl3WVRaa0VHTDNKd0VoZXQ0dFpyNVlkVVRjbWFrWklU?= =?utf-8?B?UCtlNHVRdklDejVmOXF0aU1Db0JuU0dtRzA3cVVvR3pML0JxNUhCWmxBSVlN?= =?utf-8?B?SkxvV3JiM2xnbGhzeGJlVWl1R3hxazVNUVR4K0FzeXE2cDdLQVBPTWkySkNz?= =?utf-8?B?YmdyWGlsL0h5QnhvVThVdlJnV08rMWtRZmhYVkE2NnhQR3FIdVcyK2lHQWZw?= =?utf-8?B?RmxmazROM2t3MWh3V1NRa3BYQmwweEhUYjU1V0I0bGxoaktQVjRSNW1raDR2?= =?utf-8?B?UDhpemRoMHFPOGpDM2ZHMm5TUlpZUThxdndUSUdUN0R3YW4rd3lwOFdMU3pr?= =?utf-8?B?RFAvaUhLcS9GcDVSb0JHOExsM1o5a2RBV0pWTkhsU1NkQ0hkM0JnSFQ5SG5O?= =?utf-8?B?Q0k0TitNQVRHUDNtN1NlemwxTHZsL1VCdGZENTJLU0VQQVozU2dkU1RxUE0r?= =?utf-8?B?cGVuc0hPR2hhcHhVLzNEbDF5ekJjK3UzaTJKZ2l4dkhoSHplK05JbXBUZUhQ?= =?utf-8?B?WjNscHdBK1E0Z1R1YUhmbVpHSGhmSU5TbmpRVXBDdll6NExmZlR1RjVRVUxt?= =?utf-8?B?TkpTem5NSXpwU05pMXhvNFBVT3RzUE9LQWR4K0pOeVN6ZmRnbVNZekhBeG1F?= =?utf-8?B?bUZ2Zzl3K09mY3l5aGlpTk5kYVg5UHl3RnFRN2RQZFhiTWNBUkwyQzZoaVhn?= =?utf-8?B?OExsRHh6Wjk0eEpTdERnZ3RHbjh4cS9VRDAxcElteWRMYVAvdTZKUXl4Q3ND?= =?utf-8?B?dnJCT2VabWd5QzkvRWpPWVBPZlVGeUFCYzMrNTBHSjJvKzRqcjlBUE10Zi9x?= =?utf-8?Q?1Na3sVkbCItXp3Vr1EpvxMTIeSBpAI=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 14:18:27.9450 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5fa0ed41-9416-409e-f237-08dd5b276ef7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF0000009C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB8091 Received-SPF: permerror client-ip=2a01:111:f403:2414::618; envelope-from=Suravee.Suthikulpanit@amd.com; helo=NAM11-BN8-obe.outbound.protection.outlook.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, DKIMWL_WL_HIGH=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1741097989854019000 Current amd-iommu model internally creates an AMDVI-PCI device. Here is a snippet from info qtree: bus: main-system-bus type System dev: amd-iommu, id "" xtsup =3D false pci-id =3D "" intremap =3D "on" device-iotlb =3D false pt =3D true ... dev: q35-pcihost, id "" MCFG =3D -1 (0xffffffffffffffff) pci-hole64-size =3D 34359738368 (32 GiB) below-4g-mem-size =3D 134217728 (128 MiB) above-4g-mem-size =3D 0 (0 B) smm-ranges =3D true x-pci-hole64-fix =3D true x-config-reg-migration-enabled =3D true bypass-iommu =3D false bus: pcie.0 type PCIE dev: AMDVI-PCI, id "" addr =3D 01.0 romfile =3D "" romsize =3D 4294967295 (0xffffffff) rombar =3D -1 (0xffffffffffffffff) multifunction =3D false x-pcie-lnksta-dllla =3D true x-pcie-extcap-init =3D true failover_pair_id =3D "" acpi-index =3D 0 (0x0) x-pcie-err-unc-mask =3D true x-pcie-ari-nextfn-1 =3D false x-max-bounce-buffer-size =3D 4096 (4 KiB) x-pcie-ext-tag =3D true busnr =3D 0 (0x0) class Class 0806, addr 00:01.0, pci id 1022:0000 (sub 1af4:1100) ... This prohibits users from specifying the PCI topology for the amd-iommu dev= ice, which becomes a problem when trying to support VM migration since it does n= ot guarantee the same enumeration of AMD IOMMU device. Therfore, decouple the AMDVI-PCI from amd-iommu device and introduce pci-id parameter to link between the two devices. For example: -device AMDVI-PCI,id=3Diommupci0,bus=3Dpcie.0,addr=3D0x05 \ -device amd-iommu,intremap=3Don,pt=3Don,xtsup=3Don,pci-id=3Diommupci0 \ For backward-compatibility, internally create the AMDVI-PCI device if not specified on the CLI. Co-developed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Suravee Suthikulpanit Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/i386/acpi-build.c | 8 +++---- hw/i386/amd_iommu.c | 52 +++++++++++++++++++++++++++----------------- hw/i386/amd_iommu.h | 3 ++- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 53b7306b43..e70eeaf577 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2333,10 +2333,10 @@ build_amd_iommu(GArray *table_data, BIOSLinker *lin= ker, const char *oem_id, build_append_int_noprefix(table_data, ivhd_blob->len + 24, 2); /* DeviceID */ build_append_int_noprefix(table_data, - object_property_get_int(OBJECT(&s->pci), "ad= dr", + object_property_get_int(OBJECT(s->pci), "add= r", &error_abort), 2); /* Capability offset */ - build_append_int_noprefix(table_data, s->pci.capab_offset, 2); + build_append_int_noprefix(table_data, s->pci->capab_offset, 2); /* IOMMU base address */ build_append_int_noprefix(table_data, s->mr_mmio.addr, 8); /* PCI Segment Group */ @@ -2368,10 +2368,10 @@ build_amd_iommu(GArray *table_data, BIOSLinker *lin= ker, const char *oem_id, build_append_int_noprefix(table_data, ivhd_blob->len + 40, 2); /* DeviceID */ build_append_int_noprefix(table_data, - object_property_get_int(OBJECT(&s->pci), "ad= dr", + object_property_get_int(OBJECT(s->pci), "add= r", &error_abort), 2); /* Capability offset */ - build_append_int_noprefix(table_data, s->pci.capab_offset, 2); + build_append_int_noprefix(table_data, s->pci->capab_offset, 2); /* IOMMU base address */ build_append_int_noprefix(table_data, s->mr_mmio.addr, 8); /* PCI Segment Group */ diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 975a438631..4c8b2dbdf1 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -167,11 +167,11 @@ static void amdvi_generate_msi_interrupt(AMDVIState *= s) { MSIMessage msg =3D {}; MemTxAttrs attrs =3D { - .requester_id =3D pci_requester_id(&s->pci.dev) + .requester_id =3D pci_requester_id(&s->pci->dev) }; =20 - if (msi_enabled(&s->pci.dev)) { - msg =3D msi_get_message(&s->pci.dev, 0); + if (msi_enabled(&s->pci->dev)) { + msg =3D msi_get_message(&s->pci->dev, 0); address_space_stl_le(&address_space_memory, msg.address, msg.data, attrs, NULL); } @@ -239,7 +239,7 @@ static void amdvi_page_fault(AMDVIState *s, uint16_t de= vid, info |=3D AMDVI_EVENT_IOPF_I | AMDVI_EVENT_IOPF; amdvi_encode_event(evt, devid, addr, info); amdvi_log_event(s, evt); - pci_word_test_and_set_mask(s->pci.dev.config + PCI_STATUS, + pci_word_test_and_set_mask(s->pci->dev.config + PCI_STATUS, PCI_STATUS_SIG_TARGET_ABORT); } /* @@ -256,7 +256,7 @@ static void amdvi_log_devtab_error(AMDVIState *s, uint1= 6_t devid, =20 amdvi_encode_event(evt, devid, devtab, info); amdvi_log_event(s, evt); - pci_word_test_and_set_mask(s->pci.dev.config + PCI_STATUS, + pci_word_test_and_set_mask(s->pci->dev.config + PCI_STATUS, PCI_STATUS_SIG_TARGET_ABORT); } /* log an event trying to access command buffer @@ -269,7 +269,7 @@ static void amdvi_log_command_error(AMDVIState *s, hwad= dr addr) =20 amdvi_encode_event(evt, 0, addr, info); amdvi_log_event(s, evt); - pci_word_test_and_set_mask(s->pci.dev.config + PCI_STATUS, + pci_word_test_and_set_mask(s->pci->dev.config + PCI_STATUS, PCI_STATUS_SIG_TARGET_ABORT); } /* log an illegal command event @@ -310,7 +310,7 @@ static void amdvi_log_pagetab_error(AMDVIState *s, uint= 16_t devid, info |=3D AMDVI_EVENT_PAGE_TAB_HW_ERROR; amdvi_encode_event(evt, devid, addr, info); amdvi_log_event(s, evt); - pci_word_test_and_set_mask(s->pci.dev.config + PCI_STATUS, + pci_word_test_and_set_mask(s->pci->dev.config + PCI_STATUS, PCI_STATUS_SIG_TARGET_ABORT); } =20 @@ -1607,7 +1607,7 @@ static void amdvi_sysbus_reset(DeviceState *dev) { AMDVIState *s =3D AMD_IOMMU_DEVICE(dev); =20 - msi_reset(&s->pci.dev); + msi_reset(&s->pci->dev); amdvi_init(s); } =20 @@ -1619,14 +1619,32 @@ static void amdvi_sysbus_realize(DeviceState *dev, = Error **errp) X86MachineState *x86ms =3D X86_MACHINE(ms); PCIBus *bus =3D pcms->pcibus; =20 - s->iotlb =3D g_hash_table_new_full(amdvi_uint64_hash, - amdvi_uint64_equal, g_free, g_free); + if (s->pci_id) { + PCIDevice *pdev =3D NULL; + int ret =3D pci_qdev_find_device(s->pci_id, &pdev); =20 - /* This device should take care of IOMMU PCI properties */ - if (!qdev_realize(DEVICE(&s->pci), &bus->qbus, errp)) { - return; + if (ret) { + error_report("Cannot find PCI device '%s'", s->pci_id); + return; + } + + if (!object_dynamic_cast(OBJECT(pdev), TYPE_AMD_IOMMU_PCI)) { + error_report("Device '%s' must be an AMDVI-PCI device type", s= ->pci_id); + return; + } + + s->pci =3D AMD_IOMMU_PCI(pdev); + } else { + s->pci =3D AMD_IOMMU_PCI(object_new(TYPE_AMD_IOMMU_PCI)); + /* This device should take care of IOMMU PCI properties */ + if (!qdev_realize(DEVICE(s->pci), &bus->qbus, errp)) { + return; + } } =20 + s->iotlb =3D g_hash_table_new_full(amdvi_uint64_hash, + amdvi_uint64_equal, g_free, g_free); + /* Pseudo address space under root PCI bus. */ x86ms->ioapic_as =3D amdvi_host_dma_iommu(bus, s, AMDVI_IOAPIC_SB_DEVI= D); =20 @@ -1663,6 +1681,7 @@ static void amdvi_sysbus_realize(DeviceState *dev, Er= ror **errp) =20 static const Property amdvi_properties[] =3D { DEFINE_PROP_BOOL("xtsup", AMDVIState, xtsup, false), + DEFINE_PROP_STRING("pci-id", AMDVIState, pci_id), }; =20 static const VMStateDescription vmstate_amdvi_sysbus =3D { @@ -1670,12 +1689,6 @@ static const VMStateDescription vmstate_amdvi_sysbus= =3D { .unmigratable =3D 1 }; =20 -static void amdvi_sysbus_instance_init(Object *klass) -{ - AMDVIState *s =3D AMD_IOMMU_DEVICE(klass); - - object_initialize(&s->pci, sizeof(s->pci), TYPE_AMD_IOMMU_PCI); -} =20 static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) { @@ -1698,7 +1711,6 @@ static const TypeInfo amdvi_sysbus =3D { .name =3D TYPE_AMD_IOMMU_DEVICE, .parent =3D TYPE_X86_IOMMU_DEVICE, .instance_size =3D sizeof(AMDVIState), - .instance_init =3D amdvi_sysbus_instance_init, .class_init =3D amdvi_sysbus_class_init }; =20 diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h index e0dac4d9a9..ece71ff0b6 100644 --- a/hw/i386/amd_iommu.h +++ b/hw/i386/amd_iommu.h @@ -315,7 +315,8 @@ struct AMDVIPCIState { =20 struct AMDVIState { X86IOMMUState iommu; /* IOMMU bus device */ - AMDVIPCIState pci; /* IOMMU PCI device */ + AMDVIPCIState *pci; /* IOMMU PCI device */ + char *pci_id; /* ID of AMDVI-PCI device, if user created= */ =20 uint32_t version; =20 --=20 2.34.1 From nobody Wed Mar 5 02:31:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1741097987; cv=pass; d=zohomail.com; s=zohoarc; b=C4YQGp+mjoQzPFyVmaW9D7kgYFvpVRexiHEc64I6ikF/YXJrjnVBgqEJoqSlLzbWfhH+DTdunFxZCDD74XO7SBrIpPV7qvCCFiAzNfclQaWvDG21NuB1KrFqkUd+ou5yRx1tEpcPxz0mTK6u6GOAogDKTzKtTIY7vSSlIkHAOVU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741097987; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RJyrjFXf/jYQHtvwfs6mGuwJpy5+1cY0q83/V7N7FKA=; b=AxnXzcgfvjmfgsJ9PIl3aygsHAlEdeJTKu0TlD4PPSHyGTd/y/9oiuYdJppgZyFWs0dVAKUygz7XF8T/lCkc5UOdymjUki1Ur/dTVOnpz9RPhTbKPHVxuWvkP5obAHn/ZKKax6T+2kbD/Mw2/P1bf33aubOG9/gTSD6kxgTYLfk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741097987740657.388362932951; Tue, 4 Mar 2025 06:19:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpT6f-0005P2-5A; Tue, 04 Mar 2025 09:18:49 -0500 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 1tpT6b-0005OQ-FI for qemu-devel@nongnu.org; Tue, 04 Mar 2025 09:18:45 -0500 Received: from mail-mw2nam12on20614.outbound.protection.outlook.com ([2a01:111:f403:200a::614] helo=NAM12-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpT6U-0003Qx-NO for qemu-devel@nongnu.org; Tue, 04 Mar 2025 09:18:41 -0500 Received: from CH5P220CA0007.NAMP220.PROD.OUTLOOK.COM (2603:10b6:610:1ef::13) by IA1PR12MB8555.namprd12.prod.outlook.com (2603:10b6:208:44f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.28; Tue, 4 Mar 2025 14:18:31 +0000 Received: from CH2PEPF0000009F.namprd02.prod.outlook.com (2603:10b6:610:1ef:cafe::b4) by CH5P220CA0007.outlook.office365.com (2603:10b6:610:1ef::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8489.28 via Frontend Transport; Tue, 4 Mar 2025 14:18:31 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CH2PEPF0000009F.mail.protection.outlook.com (10.167.244.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8511.15 via Frontend Transport; Tue, 4 Mar 2025 14:18:31 +0000 Received: from purico-ed03host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 4 Mar 2025 08:18:27 -0600 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eo4Ub+DUZ3OCEk6KvjrZV99s4irruz/UUud3aqsFnTtIxuZBnJ+9NayyGE9BOuA8HhBWLTpXYxPOxOJnrSGRG3yzXas3Qq1qNw1Uk+IIBxXDr+BVX2QxXLZXLE5wLaFkqL3V2gPhavpmowTVykYQjmB3wvfdavwdg8Ll7U0/KmqnL7BIv17dX31/nj6FYYlwv5Ehlym6cRgUJEc98rq7UClMC4zRENV6PN0KJX+rzM2PDimtowQZcnDrgjsJ2sNtMeIjR5WocrYkr0DV70rwXk3ZRJua91Kl5dKXUdgzdlOJJA/BuIYvN240vSm7yHyThFvE5tFYUV853ySj2+jquA== 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=RJyrjFXf/jYQHtvwfs6mGuwJpy5+1cY0q83/V7N7FKA=; b=JQZulcRj5CI8pL0ay0cTbiLrFu6MsI9T5NuBcwkyrnVFfw0gV3AcpDRTXYiRcs7xdjWFXzD2zgI7u0Sa3NYc1pBzhHsdCqoa/Tc1tKFT+lwyDRjYwKqg2TmyaQDpbQqkXRfnZSLXydzgJzGaH8qvShGTDG9Rf9e4gsjjRt2aA6KJMWhUcxmHipbSZ2gqm76XTeCHcFGOidDaC077JFW06w6207tyRngmf5psRVdANW9ns+zFE83cMQXEOHUlN8iXl1YBdoupw6lu1GM0ikEcqwrw+NSvMUPFzmgJmcEm02SYBSzNqODY23jt8aqECe+aP7YCLiQaEJyLgMZEdEtw9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RJyrjFXf/jYQHtvwfs6mGuwJpy5+1cY0q83/V7N7FKA=; b=4MXFZ5Fo/qXQPViHz0Sc1bUWNW2L6A8ByTcpYAw92Y3kS/jfqv3wOPKvJfJn52PFuWCeSdYkAfSaV8uOv7wx+sqNArecpGLQFDas+VoLfv9dKge0myRsdOUzL8dXweLm/ysdbbNJRp92A4lzIeaLvMa/pEW6A4qHtJt7GgNzzyc= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Suravee Suthikulpanit To: CC: , , , , , , , , , , , , Suravee Suthikulpanit Subject: [PATCH v4 2/2] hw/i386/amd_iommu: Allow migration when explicitly create the AMDVI-PCI device Date: Tue, 4 Mar 2025 14:17:16 +0000 Message-ID: <20250304141716.638880-3-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304141716.638880-1-suravee.suthikulpanit@amd.com> References: <20250304141716.638880-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF0000009F:EE_|IA1PR12MB8555:EE_ X-MS-Office365-Filtering-Correlation-Id: 338584e5-fcd2-4596-a14f-08dd5b27711d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ns3pKg2wCywuTp1aH0yRq/oVvls9BnrF9dkw+4JH5Q6hnwjvD92jd9AjuZhd?= =?us-ascii?Q?3b/4Ch9qRkClVIYRg0f7OZIYwCZlBhgM3cq3ewRRfgl7D4muyG0xBT3Peo2Q?= =?us-ascii?Q?6aTuMibyXyyJb0PmXGDN5pKp/8WYa8/U23FlOBFjJRcUlQXuM3cM3WHw15c3?= =?us-ascii?Q?qEfuIgTEJfSdRyyLS5LKd/fYl4bKM3LB1XzeIetQ/wSD72lNoiRbE6UjOqZb?= =?us-ascii?Q?I4y02jsEyOP5koOB3Gwr7+KNVt63MB87l2G4Hnn9UabXNrq+lu5lJErg4XKJ?= =?us-ascii?Q?meQtCyQc0hOe0I5KE9FOb7vIRSPkB81VYAfF5p+Nch4fvuAUkzZkdNHGvvtu?= =?us-ascii?Q?249R0fyEvN1Vo8/PeYhe4Itocuz5MCPxMprvhd0aamyiWADk3383s84bwzX6?= =?us-ascii?Q?Xsv819n4x5XWmcNzqaMk79hlp0EXkP2pHfSQdacBjttRryBWgCs7/UeH61sN?= =?us-ascii?Q?owK/mgorzwAV2gDMfB0Yn2pjr+W+qsWl5b9KxcKuBniovtW8zJbyyUgkaMQ9?= =?us-ascii?Q?W9QMRTpBl6Ay48tqMucpDnYXBhtLTksaQJY3ZNJifN/cBI105IV6MV60XEha?= =?us-ascii?Q?2Tiz7bU9OWk9++byrBqb1Z9yyA1tNolopgurm4Z6E/wsePs2iLI3lSCsTiDg?= =?us-ascii?Q?KQpLGQtvs8LM3gj1WNmcNW1qKxVPpMcB9Cp+vuR3cTgb8PGVrqXyAOyMeOk2?= =?us-ascii?Q?U60a6fvBRPizyoMoSRA4xssYXNnAUOBi6eBRAyEH4bme94GnO8h8yvuUOpTd?= =?us-ascii?Q?EZmlJT4aqSY183kYvr2CtDnOyS6V0YuU04vwuub99/GUj9gqAw0Fx+HC9JzQ?= =?us-ascii?Q?IsACq2i97hkdCx0w5ko1TU+AeAdJKhNajjuLMK7XN0EXHxlD9wzFthnNgbpH?= =?us-ascii?Q?LZmsLp72lAtDl2/qPcSAZbXUSw/hXq4jNpGaCHYDmGA5SMVOm3fEowKPXYhM?= =?us-ascii?Q?xO0nYKwQalpxPqEa2P7NigRaQbb/l8v5zpojsWkyVZX7xKW4VlfguZBSFlgq?= =?us-ascii?Q?46GZQrfEx2TfFplfXTKDuKRDmspehJ+uEBbdjTvSVCDeVfKIEMiAH39Hgvvg?= =?us-ascii?Q?szpObE3IHbiv5v8mpf5uNLSAsAVCf3d+R4hxREUDAChGqxZIJw5PsPLsAwzJ?= =?us-ascii?Q?UudNWkAGqKAVxxugIn7nvuM+goRvRLdsISHYXhwP7vvNN/VDANQdlPrE0Mkl?= =?us-ascii?Q?c1zG6BhRCrIxpilmTQV8D/gVBvr//qb22Q3TbjumN3hSzhYL22NJeYCYMm3C?= =?us-ascii?Q?r8tsdBILxr0TVC1EqBlrGlsrndOQz5BFG7Y9H5Wa/FPVKanHbzQ9Q1IX/YFs?= =?us-ascii?Q?RrquUsMGF5l6iS1+lHrmZNQDWa1kUJogvW6nrLYgZzHij2lai7qBJXgZPdt2?= =?us-ascii?Q?dt1/ixBMSZL5AQ3aReGokHNK20LR9wS05GkIi/VwMCSz1aLEEv6g08UNb+IJ?= =?us-ascii?Q?EX6oJDsPOsp/978BCDGqfs/KjrcyUsEhAZW+Kwp183e8cm8lH5xC+0fbGC1b?= =?us-ascii?Q?Y2x7ZZSSem695ts=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 14:18:31.5472 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 338584e5-fcd2-4596-a14f-08dd5b27711d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF0000009F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8555 Received-SPF: permerror client-ip=2a01:111:f403:200a::614; envelope-from=Suravee.Suthikulpanit@amd.com; helo=NAM12-MW2-obe.outbound.protection.outlook.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, DKIMWL_WL_HIGH=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1741097988939019000 Content-Type: text/plain; charset="utf-8" Add migration support for AMD IOMMU model by saving necessary AMDVIState parameters for MMIO registers, device table, command buffer, and event buffers. Also change devtab_len type from size_t to uint64_t to avoid 32-bit build issue. Signed-off-by: Suravee Suthikulpanit --- hw/i386/amd_iommu.c | 59 ++++++++++++++++++++++++++++++++++++++++----- hw/i386/amd_iommu.h | 2 +- 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 4c8b2dbdf1..4d8564249c 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1611,8 +1611,60 @@ static void amdvi_sysbus_reset(DeviceState *dev) amdvi_init(s); } =20 +static const VMStateDescription vmstate_amdvi_sysbus =3D { + .name =3D "amd-iommu", + .unmigratable =3D 1 +}; + +static const VMStateDescription vmstate_amdvi_sysbus_migratable =3D { + .name =3D "amd-iommu", + .version_id =3D 1, + .minimum_version_id =3D 1, + .priority =3D MIG_PRI_IOMMU, + .fields =3D (VMStateField[]) { + /* Updated in amdvi_handle_control_write() */ + VMSTATE_BOOL(enabled, AMDVIState), + VMSTATE_BOOL(ga_enabled, AMDVIState), + VMSTATE_BOOL(ats_enabled, AMDVIState), + VMSTATE_BOOL(cmdbuf_enabled, AMDVIState), + VMSTATE_BOOL(completion_wait_intr, AMDVIState), + VMSTATE_BOOL(evtlog_enabled, AMDVIState), + VMSTATE_BOOL(evtlog_intr, AMDVIState), + /* Updated in amdvi_handle_devtab_write() */ + VMSTATE_UINT64(devtab, AMDVIState), + VMSTATE_UINT64(devtab_len, AMDVIState), + /* Updated in amdvi_handle_cmdbase_write() */ + VMSTATE_UINT64(cmdbuf, AMDVIState), + VMSTATE_UINT64(cmdbuf_len, AMDVIState), + /* Updated in amdvi_handle_cmdhead_write() */ + VMSTATE_UINT32(cmdbuf_head, AMDVIState), + /* Updated in amdvi_handle_cmdtail_write() */ + VMSTATE_UINT32(cmdbuf_tail, AMDVIState), + /* Updated in amdvi_handle_evtbase_write() */ + VMSTATE_UINT64(evtlog, AMDVIState), + VMSTATE_UINT32(evtlog_len, AMDVIState), + /* Updated in amdvi_handle_evthead_write() */ + VMSTATE_UINT32(evtlog_head, AMDVIState), + /* Updated in amdvi_handle_evttail_write() */ + VMSTATE_UINT32(evtlog_tail, AMDVIState), + /* Updated in amdvi_handle_pprbase_write() */ + VMSTATE_UINT64(ppr_log, AMDVIState), + VMSTATE_UINT32(pprlog_len, AMDVIState), + /* Updated in amdvi_handle_pprhead_write() */ + VMSTATE_UINT32(pprlog_head, AMDVIState), + /* Updated in amdvi_handle_tailhead_write() */ + VMSTATE_UINT32(pprlog_tail, AMDVIState), + /* MMIO registers */ + VMSTATE_UINT8_ARRAY(mmior, AMDVIState, AMDVI_MMIO_SIZE), + VMSTATE_UINT8_ARRAY(romask, AMDVIState, AMDVI_MMIO_SIZE), + VMSTATE_UINT8_ARRAY(w1cmask, AMDVIState, AMDVI_MMIO_SIZE), + VMSTATE_END_OF_LIST() + } +}; + static void amdvi_sysbus_realize(DeviceState *dev, Error **errp) { + DeviceClass *dc =3D (DeviceClass *) object_get_class(OBJECT(dev)); AMDVIState *s =3D AMD_IOMMU_DEVICE(dev); MachineState *ms =3D MACHINE(qdev_get_machine()); PCMachineState *pcms =3D PC_MACHINE(ms); @@ -1634,6 +1686,7 @@ static void amdvi_sysbus_realize(DeviceState *dev, Er= ror **errp) } =20 s->pci =3D AMD_IOMMU_PCI(pdev); + dc->vmsd =3D &vmstate_amdvi_sysbus_migratable; } else { s->pci =3D AMD_IOMMU_PCI(object_new(TYPE_AMD_IOMMU_PCI)); /* This device should take care of IOMMU PCI properties */ @@ -1684,12 +1737,6 @@ static const Property amdvi_properties[] =3D { DEFINE_PROP_STRING("pci-id", AMDVIState, pci_id), }; =20 -static const VMStateDescription vmstate_amdvi_sysbus =3D { - .name =3D "amd-iommu", - .unmigratable =3D 1 -}; - - static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h index ece71ff0b6..741dd9a910 100644 --- a/hw/i386/amd_iommu.h +++ b/hw/i386/amd_iommu.h @@ -329,7 +329,7 @@ struct AMDVIState { bool excl_enabled; =20 hwaddr devtab; /* base address device table */ - size_t devtab_len; /* device table length */ + uint64_t devtab_len; /* device table length */ =20 hwaddr cmdbuf; /* command buffer base address */ uint64_t cmdbuf_len; /* command buffer length */ --=20 2.34.1