[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 3/4] iommu/vtd: rename io_apic_read_remap_rte() local variable
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Wed, 26 Jul 2023 14:55:07 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- 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=OCnIUZuAFwbePOekwR0bgT5Rjf2c+Q+JJrHWHdx6kO0=; b=WeXUSrpOzQm6l6Z01xn/C+5GLtfIyKnM/niSa4I7yhBjnc4SkuEZMIrUSoNaMKADx0jYNzMNvFvTJi0baSmgNu+C/3AH+IgbTDYj7bVdEqVlUndtGvW7j8t3bAGVhK7SIjtpx0uLOqA4uxpJzv89QfAyMYxc//tjZPDVXVMJTmI/EH++dcvmhEmEYK5wG1ajJrd7JZRzAgw0GKyCKkSYHn9Yxcqrz+eIBG1OIz/IwCdT2pMBInl6ZcT7yvQ+DUy+mE+paWnA66M2tCuoV5hQR/c0gl4HdmUt8/2+fDWK71Xw5aIt/fWqgCNPpG/DDVb0KR4lgSYSSnTmYwc/R+fp8A==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JDasyB5TZgPHZAM+mPeZ1c0ukBDqzSeBJhJHkrJvpSXDVqLljJsE6cy+Xh7MxhjVl+hjeFxC8ccRnXiolC25MlSqOMMiYtUB6GF+EOUdACb/YYZnz7o1TnrQLbOq9hJLym5eQ84TK7xRqIAbi6YbdV6tSyz3siQNQHvVJ6szLJ0oPMkNyK7UCCJpEb9xG7k6iP4Hb2vu0LWqTGI3FYMi8sp5DcyD9j89nkXqZE9nTcWNg+F5QwQK43IDhk+JXwxTrCC8aSqKZ/gKHIPXOnOv3eh6yuX6Pu6+8O6c/63OItIMcCa7JVszNjpBVHrEsWkIM+tQ9YW7Y64aW7p3SL4bew==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Kevin Tian <kevin.tian@xxxxxxxxx>
- Delivery-date: Wed, 26 Jul 2023 12:55:53 +0000
- Ironport-data: A9a23:5udgSqPq1WUma2fvrR27lsFynXyQoLVcMsEvi/4bfWQNrUoj0jAPy TQfDW+PO/beYDD2ftt/PNvnoR9Vup6BxocyHQto+SlhQUwRpJueD7x1DKtS0wC6dZSfER09v 63yTvGacajYm1eF/k/F3oDJ9CU6jufQAOKnUoYoAwgpLSd8UiAtlBl/rOAwh49skLCRDhiE/ Nj/uKUzAnf8s9JPGjxSs/vrRC9H5qyo42tH5AJmPJingXeF/5UrJMNHTU2OByOQrrl8RoaSW +vFxbelyWLVlz9F5gSNy+uTnuUiG9Y+DCDW4pZkc/HKbitq/0Te5p0TJvsEAXq7vh3S9zxHJ HehgrTrIeshFvWkdO3wyHC0GQkmVUFN0OevzXRSLaV/ZqAJGpfh66wGMa04AWEX0uIuM0B03 KUWER4mUCjTgO3mzL+JEfY506zPLOGzVG8ekldJ6GiASNwAEdXESaiM4sJE1jAtgMwIBezZe 8cSdTtoalLHfgFLPVAUTpk5mY9EhFGmK2Ee9A3T+PpxujaDpOBy+OGF3N79YNuFSN8Thk+Fj mnH4374ElcRM9n3JT+tqyvz3bCfzH+jMG4UPLv/pvo33Hq3/V0SFkcLR2a8i9KViGfrDrqzL GRRoELCt5Ma5EGtC9XwQRC8iHqFpQIHHcpdFfUg7wOAwbaS5ByWbkAHQyBAbpo6tcYwbT0sy lKN2djuAFRSXKa9THuc8vKeq2O0MC1MdGsaP3ZaHU0C/sXpp5w1glTXVNF/HaWpj9rzXzbt3 zSNqyt4jLIW5SIW65iGEZn8q2rEjvD0osQdu16/sr6Nhu+hWLOYWg==
- Ironport-hdrordr: A9a23:pWsKB6zbMbPZqUSYyHNdKrPw6L1zdoMgy1knxilNoHxuH/Bw9v re+cjzsCWftN9/Yh4dcLy7VpVoIkmsl6Kdg7NwAV7KZmCP1FdARLsI0WKI+UyCJ8SRzI9gPa cLSdkFNDXzZ2IK8PoTNmODYqodKNrsytHWuQ/HpU0dKT2D88tbnn9E4gDwKDwQeCB2QaAXOb C7/cR9qz+paR0sH7+G7ilsZZmkmzXT/qiWGCI7Ow==
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Preparatory change to unify the IO-APIC pin variable name between
io_apic_read_remap_rte() and amd_iommu_ioapic_update_ire(), so that
the local variable can be made a function parameter with the same name
across vendors.
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Changes since v1:
- New in this version.
---
xen/drivers/passthrough/vtd/intremap.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/xen/drivers/passthrough/vtd/intremap.c
b/xen/drivers/passthrough/vtd/intremap.c
index 786388b4d9c7..05df6d5759b1 100644
--- a/xen/drivers/passthrough/vtd/intremap.c
+++ b/xen/drivers/passthrough/vtd/intremap.c
@@ -441,14 +441,14 @@ unsigned int cf_check io_apic_read_remap_rte(
void cf_check io_apic_write_remap_rte(
unsigned int apic, unsigned int reg, unsigned int value)
{
- unsigned int ioapic_pin = (reg - 0x10) / 2;
+ unsigned int pin = (reg - 0x10) / 2;
struct IO_xAPIC_route_entry old_rte = { };
struct IO_APIC_route_remap_entry *remap_rte;
unsigned int rte_upper = (reg & 1) ? 1 : 0;
struct vtd_iommu *iommu = ioapic_to_iommu(IO_APIC_ID(apic));
int saved_mask;
- old_rte = __ioapic_read_entry(apic, ioapic_pin, true);
+ old_rte = __ioapic_read_entry(apic, pin, true);
remap_rte = (struct IO_APIC_route_remap_entry *) &old_rte;
@@ -458,7 +458,7 @@ void cf_check io_apic_write_remap_rte(
__io_apic_write(apic, reg & ~1, *(u32 *)&old_rte);
remap_rte->mask = saved_mask;
- if ( ioapic_rte_to_remap_entry(iommu, apic, ioapic_pin,
+ if ( ioapic_rte_to_remap_entry(iommu, apic, pin,
&old_rte, rte_upper, value) )
{
__io_apic_write(apic, reg, value);
@@ -468,7 +468,7 @@ void cf_check io_apic_write_remap_rte(
__io_apic_write(apic, reg & ~1, *(u32 *)&old_rte);
}
else
- __ioapic_write_entry(apic, ioapic_pin, true, old_rte);
+ __ioapic_write_entry(apic, pin, true, old_rte);
}
static void set_msi_source_id(struct pci_dev *pdev, struct iremap_entry *ire)
--
2.41.0
|
