1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
From a885649098e06432939907eee84f735a644883e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
Date: Tue, 5 Sep 2023 08:48:43 +0200
Subject: [PATCH 19/55] x86/ioapic: add a raw field to RTE struct
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Further changes will require access to the full RTE as a single value
in order to pass it to IOMMU interrupt remapping handlers.
No functional change intended.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
master commit: cdc48cb5a74b10c2b07a09d2f554756d730bfee3
master date: 2023-07-28 09:39:44 +0200
---
xen/arch/x86/include/asm/io_apic.h | 57 +++++++++++++-----------
xen/arch/x86/io_apic.c | 2 +-
xen/drivers/passthrough/amd/iommu_intr.c | 4 +-
xen/drivers/passthrough/vtd/intremap.c | 4 +-
4 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/xen/arch/x86/include/asm/io_apic.h b/xen/arch/x86/include/asm/io_apic.h
index ef0878b09e..a558bb063c 100644
--- a/xen/arch/x86/include/asm/io_apic.h
+++ b/xen/arch/x86/include/asm/io_apic.h
@@ -89,35 +89,38 @@ enum ioapic_irq_destination_types {
};
struct IO_APIC_route_entry {
- unsigned int vector:8;
- unsigned int delivery_mode:3; /*
- * 000: FIXED
- * 001: lowest prio
- * 111: ExtINT
- */
- unsigned int dest_mode:1; /* 0: physical, 1: logical */
- unsigned int delivery_status:1;
- unsigned int polarity:1; /* 0: low, 1: high */
- unsigned int irr:1;
- unsigned int trigger:1; /* 0: edge, 1: level */
- unsigned int mask:1; /* 0: enabled, 1: disabled */
- unsigned int __reserved_2:15;
-
union {
struct {
- unsigned int __reserved_1:24;
- unsigned int physical_dest:4;
- unsigned int __reserved_2:4;
- } physical;
-
- struct {
- unsigned int __reserved_1:24;
- unsigned int logical_dest:8;
- } logical;
-
- /* used when Interrupt Remapping with EIM is enabled */
- unsigned int dest32;
- } dest;
+ unsigned int vector:8;
+ unsigned int delivery_mode:3; /*
+ * 000: FIXED
+ * 001: lowest prio
+ * 111: ExtINT
+ */
+ unsigned int dest_mode:1; /* 0: physical, 1: logical */
+ unsigned int delivery_status:1;
+ unsigned int polarity:1; /* 0: low, 1: high */
+ unsigned int irr:1;
+ unsigned int trigger:1; /* 0: edge, 1: level */
+ unsigned int mask:1; /* 0: enabled, 1: disabled */
+ unsigned int __reserved_2:15;
+
+ union {
+ struct {
+ unsigned int __reserved_1:24;
+ unsigned int physical_dest:4;
+ unsigned int __reserved_2:4;
+ } physical;
+
+ struct {
+ unsigned int __reserved_1:24;
+ unsigned int logical_dest:8;
+ } logical;
+ unsigned int dest32;
+ } dest;
+ };
+ uint64_t raw;
+ };
};
/*
diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 25a08b1ea6..aada2ef96c 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -2360,7 +2360,7 @@ int ioapic_guest_read(unsigned long physbase, unsigned int reg, u32 *pval)
int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val)
{
int apic, pin, irq, ret, pirq;
- struct IO_APIC_route_entry rte = { 0 };
+ struct IO_APIC_route_entry rte = { };
unsigned long flags;
struct irq_desc *desc;
diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c
index f4de09f431..9e6be3be35 100644
--- a/xen/drivers/passthrough/amd/iommu_intr.c
+++ b/xen/drivers/passthrough/amd/iommu_intr.c
@@ -352,8 +352,8 @@ static int update_intremap_entry_from_ioapic(
void cf_check amd_iommu_ioapic_update_ire(
unsigned int apic, unsigned int reg, unsigned int value)
{
- struct IO_APIC_route_entry old_rte = { 0 };
- struct IO_APIC_route_entry new_rte = { 0 };
+ struct IO_APIC_route_entry old_rte = { };
+ struct IO_APIC_route_entry new_rte = { };
unsigned int rte_lo = (reg & 1) ? reg - 1 : reg;
unsigned int pin = (reg - 0x10) / 2;
int seg, bdf, rc;
diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c
index 1512e4866b..019c21c556 100644
--- a/xen/drivers/passthrough/vtd/intremap.c
+++ b/xen/drivers/passthrough/vtd/intremap.c
@@ -419,7 +419,7 @@ unsigned int cf_check io_apic_read_remap_rte(
{
unsigned int ioapic_pin = (reg - 0x10) / 2;
int index;
- struct IO_xAPIC_route_entry old_rte = { 0 };
+ struct IO_xAPIC_route_entry old_rte = { };
int rte_upper = (reg & 1) ? 1 : 0;
struct vtd_iommu *iommu = ioapic_to_iommu(IO_APIC_ID(apic));
@@ -442,7 +442,7 @@ void cf_check io_apic_write_remap_rte(
unsigned int apic, unsigned int reg, unsigned int value)
{
unsigned int ioapic_pin = (reg - 0x10) / 2;
- struct IO_xAPIC_route_entry old_rte = { 0 };
+ 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));
--
2.42.0
|
GitWeb