[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/5] iommu/vtd: rename io_apic_read_remap_rte() local variable
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Tue, 18 Jul 2023 14:43:32 +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=IrDALT/XZpG2n/fvfNo5ZxW7JijijjUt7j075TR7+926W7h51577+K7nkwq0hd8tXS12qOP4+iQC6PfeavFi9bHOsyf5uQM6sAcFZMYDP41um49kBBOiXXEnYELN7RfQwrgDkRXdrj94neecCSz6R+MAvl9gleUPIFPHoVaz2iQaVEt6aqWBd+DvRHbd2x6QhiVuh4O/A5i5CM3ggLBYLPVsG9KVhEzWNJqVv4rzUuBsGz/73uu4TxNdd92MEcQ32QVFDdGfzePjb5WT3X/akVULeukgYhMENoxfjR/kGybIZO4kbIRnBnlQozZnCcw6nEO+lpXjPA57cahXlHgbJw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=frMre0DkL8Z2df4GtYAhzvLnCvUb0L6IvV6p/crGziD9vBgZfwCrL5Nhz4TE2OfJdF3PCj33YM2i1ewPLXN9RR7i5jUu5KgxWzLjcHfoYUaQAxbWzV9faYTwc50zkrtwr4UV1XkXSU8d8sALtU/Ii5WB+g7IgZKKKT6fpn9gt00n5YDFUKREjHfMN0P+d++OxEVIQQguSgad7o+xnObLNEceKZyHgMhldWrMa7b2V2pFgasQnFHY8ZzFO1TKCgCL+eZD+E6BwWF/qGXdRkzZFvtoJkRGJL/xLzZJ+g9NbMDhwqXb2DAGQTvn0ci7+MjTFJf0Z2v2t3Tf/H9CHwEyLg==
- 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: Tue, 18 Jul 2023 12:44:15 +0000
- Ironport-data: A9a23:pkF6K60OGAyN9HQq8fbD5cxwkn2cJEfYwER7XKvMYLTBsI5bpz1Rz GEYDTzUOvmNZWTwc9pyaoXg8RgFsJ7TzIViGgtupC1hF35El5HIVI+TRqvS04F+DeWYFR46s J9OAjXkBJppJpMJjk71atANlVEliefTAOK6ULWeUsxIbVcMYD87jh5+kPIOjIdtgNyoayuAo tq3qMDEULOf82cc3lk8teTb8XuDgNyo4GlD5gNnNagR1LPjvyJ94Kw3dPnZw0TQGuG4LsbiL 87fwbew+H/u/htFIrtJRZ6iLyXm6paLVeS/oiI+t5qK23CulQRrukoPD9IOaF8/ttm8t4sZJ OOhF3CHYVxB0qXkwIzxWvTDes10FfUuFLTveRBTvSEPpqFvnrSFL/hGVSkL0YMkFulfOWhoq fkzC242ck6kuu+q8JakRdAwr5F2RCXrFNt3VnBI6xj8VapjZK+ZBqLA6JlfwSs6gd1IEbDGf c0FZDFzbRPGJRpSJlMQD5F4l+Ct7pX9W2QA9BTJ+uxouC6Kk1QZPLvFabI5fvSQQspYhACAr 3/u9GXlGBAKcteYzFJp91r137GRxXygBtN6+LuQqfwwvGCQ+GYpWD4WcEO5r8awr1WjYocKQ 6AT0m90xUQoz2S7Q9+4UxCmrXqsuh8HR8EWA+A88BuKyKff/0CeHGdsZj1Mdt0g8tM3TDoC1 1mVktevDjtq2IB5UlqY/7aQ6DatYy4cKDdeYTdeFFRdpd7+vIs0kxTDCM55F7K4hcH0Hje2x C2WqC85hPMYistjO7iHwG0rSgmE/vDhJjPZLC2ONo55xmuVvLKYWrE=
- Ironport-hdrordr: A9a23:qpuOCa8CXdWPjoAzL3Ruk+A7I+orL9Y04lQ7vn2ZLiYlDfBw9v re4MjzsCWetN9/Yh4dcK+7Scu9qB/nm6KdmLNhRYtKPzOHhILLFu1fBNDZsl7d8kTFn4ZgPM 9bEpSWY+ecMbEVt6zHCObRKadY/DFrmJrY/ts3Dx9WPHxXggpbnmJEIzfeA1dTTAlCBZ02NJ f03Ls8mxOQPWUMSsigHHEKU8jPzue78q7OcFoGCxYr5BK5iS6h6LOSKWn+4j4OFylSyrcumF K19zDE2g==
- 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
|
