aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/pcie/aer/aer_inject.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index 182224acedbe..20db790465dd 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -41,12 +41,12 @@ struct aer_error_inj {
41 u32 header_log1; 41 u32 header_log1;
42 u32 header_log2; 42 u32 header_log2;
43 u32 header_log3; 43 u32 header_log3;
44 u16 domain; 44 u32 domain;
45}; 45};
46 46
47struct aer_error { 47struct aer_error {
48 struct list_head list; 48 struct list_head list;
49 u16 domain; 49 u32 domain;
50 unsigned int bus; 50 unsigned int bus;
51 unsigned int devfn; 51 unsigned int devfn;
52 int pos_cap_err; 52 int pos_cap_err;
@@ -74,7 +74,7 @@ static LIST_HEAD(pci_bus_ops_list);
74/* Protect einjected and pci_bus_ops_list */ 74/* Protect einjected and pci_bus_ops_list */
75static DEFINE_SPINLOCK(inject_lock); 75static DEFINE_SPINLOCK(inject_lock);
76 76
77static void aer_error_init(struct aer_error *err, u16 domain, 77static void aer_error_init(struct aer_error *err, u32 domain,
78 unsigned int bus, unsigned int devfn, 78 unsigned int bus, unsigned int devfn,
79 int pos_cap_err) 79 int pos_cap_err)
80{ 80{
@@ -86,7 +86,7 @@ static void aer_error_init(struct aer_error *err, u16 domain,
86} 86}
87 87
88/* inject_lock must be held before calling */ 88/* inject_lock must be held before calling */
89static struct aer_error *__find_aer_error(u16 domain, unsigned int bus, 89static struct aer_error *__find_aer_error(u32 domain, unsigned int bus,
90 unsigned int devfn) 90 unsigned int devfn)
91{ 91{
92 struct aer_error *err; 92 struct aer_error *err;
@@ -106,7 +106,7 @@ static struct aer_error *__find_aer_error_by_dev(struct pci_dev *dev)
106 int domain = pci_domain_nr(dev->bus); 106 int domain = pci_domain_nr(dev->bus);
107 if (domain < 0) 107 if (domain < 0)
108 return NULL; 108 return NULL;
109 return __find_aer_error((u16)domain, dev->bus->number, dev->devfn); 109 return __find_aer_error(domain, dev->bus->number, dev->devfn);
110} 110}
111 111
112/* inject_lock must be held before calling */ 112/* inject_lock must be held before calling */
@@ -196,7 +196,7 @@ static int pci_read_aer(struct pci_bus *bus, unsigned int devfn, int where,
196 domain = pci_domain_nr(bus); 196 domain = pci_domain_nr(bus);
197 if (domain < 0) 197 if (domain < 0)
198 goto out; 198 goto out;
199 err = __find_aer_error((u16)domain, bus->number, devfn); 199 err = __find_aer_error(domain, bus->number, devfn);
200 if (!err) 200 if (!err)
201 goto out; 201 goto out;
202 202
@@ -228,7 +228,7 @@ static int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where,
228 domain = pci_domain_nr(bus); 228 domain = pci_domain_nr(bus);
229 if (domain < 0) 229 if (domain < 0)
230 goto out; 230 goto out;
231 err = __find_aer_error((u16)domain, bus->number, devfn); 231 err = __find_aer_error(domain, bus->number, devfn);
232 if (!err) 232 if (!err)
233 goto out; 233 goto out;
234 234
@@ -329,7 +329,7 @@ static int aer_inject(struct aer_error_inj *einj)
329 u32 sever, cor_mask, uncor_mask, cor_mask_orig = 0, uncor_mask_orig = 0; 329 u32 sever, cor_mask, uncor_mask, cor_mask_orig = 0, uncor_mask_orig = 0;
330 int ret = 0; 330 int ret = 0;
331 331
332 dev = pci_get_domain_bus_and_slot((int)einj->domain, einj->bus, devfn); 332 dev = pci_get_domain_bus_and_slot(einj->domain, einj->bus, devfn);
333 if (!dev) 333 if (!dev)
334 return -ENODEV; 334 return -ENODEV;
335 rpdev = pcie_find_root_port(dev); 335 rpdev = pcie_find_root_port(dev);