diff options
author | Gustavo Pimentel <gustavo.pimentel@synopsys.com> | 2018-07-19 04:32:13 -0400 |
---|---|---|
committer | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2018-07-19 06:34:42 -0400 |
commit | d3c70a98d7d63cae02d50ebfafea04264a767401 (patch) | |
tree | f430393cdc4af823044656f2a2bfee4b8ca93b04 /drivers | |
parent | 8963106eabdc56911e9b65258eb5e9a6b7b3dfda (diff) |
PCI: Update xxx_pcie_ep_raise_irq() and pci_epc_raise_irq() signatures
Change {cdns, dra7xx, artpec6, dw, rockchip}_pcie_ep_raise_irq() and
pci_epc_raise_irq() signature, namely the interrupt_num variable type
from u8 to u16 to accommodate 2048 maximum MSI-X interrupts.
Signed-off-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Alan Douglas <adouglas@cadence.com>
Acked-by: Shawn Lin <shawn.lin@rock-chips.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: Joao Pinto <jpinto@synopsys.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pci/controller/dwc/pci-dra7xx.c | 2 | ||||
-rw-r--r-- | drivers/pci/controller/dwc/pcie-artpec6.c | 2 | ||||
-rw-r--r-- | drivers/pci/controller/dwc/pcie-designware-ep.c | 2 | ||||
-rw-r--r-- | drivers/pci/controller/dwc/pcie-designware-plat.c | 2 | ||||
-rw-r--r-- | drivers/pci/controller/dwc/pcie-designware.h | 2 | ||||
-rw-r--r-- | drivers/pci/controller/pcie-cadence-ep.c | 3 | ||||
-rw-r--r-- | drivers/pci/controller/pcie-rockchip-ep.c | 2 | ||||
-rw-r--r-- | drivers/pci/endpoint/pci-epc-core.c | 8 |
8 files changed, 12 insertions, 11 deletions
diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c index 345aab56ce8b..ce9224a36f62 100644 --- a/drivers/pci/controller/dwc/pci-dra7xx.c +++ b/drivers/pci/controller/dwc/pci-dra7xx.c | |||
@@ -370,7 +370,7 @@ static void dra7xx_pcie_raise_msi_irq(struct dra7xx_pcie *dra7xx, | |||
370 | } | 370 | } |
371 | 371 | ||
372 | static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no, | 372 | static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no, |
373 | enum pci_epc_irq_type type, u8 interrupt_num) | 373 | enum pci_epc_irq_type type, u16 interrupt_num) |
374 | { | 374 | { |
375 | struct dw_pcie *pci = to_dw_pcie_from_ep(ep); | 375 | struct dw_pcie *pci = to_dw_pcie_from_ep(ep); |
376 | struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci); | 376 | struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci); |
diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c index 128b182648b3..dba83abfe764 100644 --- a/drivers/pci/controller/dwc/pcie-artpec6.c +++ b/drivers/pci/controller/dwc/pcie-artpec6.c | |||
@@ -427,7 +427,7 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep) | |||
427 | } | 427 | } |
428 | 428 | ||
429 | static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no, | 429 | static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no, |
430 | enum pci_epc_irq_type type, u8 interrupt_num) | 430 | enum pci_epc_irq_type type, u16 interrupt_num) |
431 | { | 431 | { |
432 | struct dw_pcie *pci = to_dw_pcie_from_ep(ep); | 432 | struct dw_pcie *pci = to_dw_pcie_from_ep(ep); |
433 | 433 | ||
diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c index 04092a7aba89..69d039de2af6 100644 --- a/drivers/pci/controller/dwc/pcie-designware-ep.c +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c | |||
@@ -242,7 +242,7 @@ static int dw_pcie_ep_set_msi(struct pci_epc *epc, u8 func_no, u8 encode_int) | |||
242 | } | 242 | } |
243 | 243 | ||
244 | static int dw_pcie_ep_raise_irq(struct pci_epc *epc, u8 func_no, | 244 | static int dw_pcie_ep_raise_irq(struct pci_epc *epc, u8 func_no, |
245 | enum pci_epc_irq_type type, u8 interrupt_num) | 245 | enum pci_epc_irq_type type, u16 interrupt_num) |
246 | { | 246 | { |
247 | struct dw_pcie_ep *ep = epc_get_drvdata(epc); | 247 | struct dw_pcie_ep *ep = epc_get_drvdata(epc); |
248 | 248 | ||
diff --git a/drivers/pci/controller/dwc/pcie-designware-plat.c b/drivers/pci/controller/dwc/pcie-designware-plat.c index a37dc92a03c7..cca69ac63319 100644 --- a/drivers/pci/controller/dwc/pcie-designware-plat.c +++ b/drivers/pci/controller/dwc/pcie-designware-plat.c | |||
@@ -81,7 +81,7 @@ static void dw_plat_pcie_ep_init(struct dw_pcie_ep *ep) | |||
81 | 81 | ||
82 | static int dw_plat_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no, | 82 | static int dw_plat_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no, |
83 | enum pci_epc_irq_type type, | 83 | enum pci_epc_irq_type type, |
84 | u8 interrupt_num) | 84 | u16 interrupt_num) |
85 | { | 85 | { |
86 | struct dw_pcie *pci = to_dw_pcie_from_ep(ep); | 86 | struct dw_pcie *pci = to_dw_pcie_from_ep(ep); |
87 | 87 | ||
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h index bee4e2535a61..9d581c077329 100644 --- a/drivers/pci/controller/dwc/pcie-designware.h +++ b/drivers/pci/controller/dwc/pcie-designware.h | |||
@@ -191,7 +191,7 @@ enum dw_pcie_as_type { | |||
191 | struct dw_pcie_ep_ops { | 191 | struct dw_pcie_ep_ops { |
192 | void (*ep_init)(struct dw_pcie_ep *ep); | 192 | void (*ep_init)(struct dw_pcie_ep *ep); |
193 | int (*raise_irq)(struct dw_pcie_ep *ep, u8 func_no, | 193 | int (*raise_irq)(struct dw_pcie_ep *ep, u8 func_no, |
194 | enum pci_epc_irq_type type, u8 interrupt_num); | 194 | enum pci_epc_irq_type type, u16 interrupt_num); |
195 | }; | 195 | }; |
196 | 196 | ||
197 | struct dw_pcie_ep { | 197 | struct dw_pcie_ep { |
diff --git a/drivers/pci/controller/pcie-cadence-ep.c b/drivers/pci/controller/pcie-cadence-ep.c index e3fe4124e3af..208d11f27d5d 100644 --- a/drivers/pci/controller/pcie-cadence-ep.c +++ b/drivers/pci/controller/pcie-cadence-ep.c | |||
@@ -363,7 +363,8 @@ static int cdns_pcie_ep_send_msi_irq(struct cdns_pcie_ep *ep, u8 fn, | |||
363 | } | 363 | } |
364 | 364 | ||
365 | static int cdns_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, | 365 | static int cdns_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, |
366 | enum pci_epc_irq_type type, u8 interrupt_num) | 366 | enum pci_epc_irq_type type, |
367 | u16 interrupt_num) | ||
367 | { | 368 | { |
368 | struct cdns_pcie_ep *ep = epc_get_drvdata(epc); | 369 | struct cdns_pcie_ep *ep = epc_get_drvdata(epc); |
369 | 370 | ||
diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c index 6beba8ed7b84..b8163c56a142 100644 --- a/drivers/pci/controller/pcie-rockchip-ep.c +++ b/drivers/pci/controller/pcie-rockchip-ep.c | |||
@@ -472,7 +472,7 @@ static int rockchip_pcie_ep_send_msi_irq(struct rockchip_pcie_ep *ep, u8 fn, | |||
472 | 472 | ||
473 | static int rockchip_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, | 473 | static int rockchip_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, |
474 | enum pci_epc_irq_type type, | 474 | enum pci_epc_irq_type type, |
475 | u8 interrupt_num) | 475 | u16 interrupt_num) |
476 | { | 476 | { |
477 | struct rockchip_pcie_ep *ep = epc_get_drvdata(epc); | 477 | struct rockchip_pcie_ep *ep = epc_get_drvdata(epc); |
478 | 478 | ||
diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c index 7d77bd0e5d4a..c72e656e7e29 100644 --- a/drivers/pci/endpoint/pci-epc-core.c +++ b/drivers/pci/endpoint/pci-epc-core.c | |||
@@ -131,13 +131,13 @@ EXPORT_SYMBOL_GPL(pci_epc_start); | |||
131 | * pci_epc_raise_irq() - interrupt the host system | 131 | * pci_epc_raise_irq() - interrupt the host system |
132 | * @epc: the EPC device which has to interrupt the host | 132 | * @epc: the EPC device which has to interrupt the host |
133 | * @func_no: the endpoint function number in the EPC device | 133 | * @func_no: the endpoint function number in the EPC device |
134 | * @type: specify the type of interrupt; legacy or MSI | 134 | * @type: specify the type of interrupt; legacy, MSI or MSI-X |
135 | * @interrupt_num: the MSI interrupt number | 135 | * @interrupt_num: the MSI or MSI-X interrupt number |
136 | * | 136 | * |
137 | * Invoke to raise an MSI or legacy interrupt | 137 | * Invoke to raise an legacy, MSI or MSI-X interrupt |
138 | */ | 138 | */ |
139 | int pci_epc_raise_irq(struct pci_epc *epc, u8 func_no, | 139 | int pci_epc_raise_irq(struct pci_epc *epc, u8 func_no, |
140 | enum pci_epc_irq_type type, u8 interrupt_num) | 140 | enum pci_epc_irq_type type, u16 interrupt_num) |
141 | { | 141 | { |
142 | int ret; | 142 | int ret; |
143 | unsigned long flags; | 143 | unsigned long flags; |