Re: [PATCH v18 02/20] PCI: Rename PCI_EPC_IRQ_LEGACY to PCI_EPC_IRQ_INTX

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 7/29/23 10:35, Serge Semin wrote:
> On Mon, Jul 24, 2023 at 01:02:11PM +0530, Manivannan Sadhasivam wrote:
>> On Fri, Jul 21, 2023 at 05:10:27PM +0900, Damien Le Moal wrote:
>>> On 7/21/23 16:44, Yoshihiro Shimoda wrote:
>>>> Using "INTx" instead of "legacy" is more specific. So, rename
>>>> PCI_EPC_IRQ_LEGACY to PCI_EPC_IRQ_INTX.
>>>>
>>>> Suggested-by: Bjorn Helgaas <helgaas@xxxxxxxxxx>
>>>> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx>
>>>> Reviewed-by: Manivannan Sadhasivam <mani@xxxxxxxxxx>
>>>> Acked-by: Jesper Nilsson <jesper.nilsson@xxxxxxxx> # ARTPEC
>>>> Reviewed-by: Serge Semin <fancer.lancer@xxxxxxxxx>
>>>
> 
>>> I would rather drop completely the PCI_EPC_IRQ_XXX enum and simply use the
>>> PCI_IRQ_XXX macros used everywhere. Less definitions :)
>>>
>>> See attached patch that I have in my queue (about to send that).
>>>
>>
>> It looks better! This patch should be dropped.
> 
> Back then Bjorn specifically asked to change the names suffix in a
> preparation patch before adding the INTx support to the DW PCIe core
> driver (see the Sb tag in the patch log). Damien, seeing you cleanup
> the names anyway what about fixing the macro suffix too: INTx instead
> of LEGACY)?

Sure, I can do that. That is going to be a gigantic patch though given that
PCI_IRQ_LEGACY is used well beyond the ep/pcie controller drivers.
While I agree it would be nice to do, not sure it is worth such code churn.

> Mani, Damien, what do you suggest to Yoshihiro to do with the
> LEGACY/INTx names in the following up patches of this series?

If everyone is OK with the patch I proposed (the PCI_IRQ_LEGACY -> PCI_IRQ_INTx
change can go on top), then I can rebase it and send it next week (the remaining
of my EP cleanup series needs some more testing & rebasing). Yoshihiro can
either include it in his series or rebase on it if the patch is added to
pci-next quickly.

> 
> -Serge(y)
> 
>>
>> - Mani
>>
>>>> ---
>>>> This CC-list is for git send-email.
>>>>
>>>> Cc: Tom Joseph <tjoseph@xxxxxxxxxxx>
>>>> Cc: Vignesh Raghavendra <vigneshr@xxxxxx>
>>>> Cc: Richard Zhu <hongxing.zhu@xxxxxxx>
>>>> Cc: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
>>>> Cc: Shawn Guo <shawnguo@xxxxxxxxxx>
>>>> Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
>>>> Cc: Pengutronix Kernel Team <kernel@xxxxxxxxxxxxxx>
>>>> Cc: Fabio Estevam <festevam@xxxxxxxxx>
>>>> Cc: NXP Linux Team <linux-imx@xxxxxxx>
>>>> Cc: Minghuan Lian <minghuan.Lian@xxxxxxx>
>>>> Cc: Mingkai Hu <mingkai.hu@xxxxxxx>
>>>> Cc: Roy Zang <roy.zang@xxxxxxx>
>>>> Cc: Jingoo Han <jingoohan1@xxxxxxxxx>
>>>> Cc: Srikanth Thokala <srikanth.thokala@xxxxxxxxx>
>>>> Cc: Thierry Reding <thierry.reding@xxxxxxxxx>
>>>> Cc: Jonathan Hunter <jonathanh@xxxxxxxxxx>
>>>> Cc: Kunihiko Hayashi <hayashi.kunihiko@xxxxxxxxxxxxx>
>>>> Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
>>>> Cc: Marek Vasut <marek.vasut+renesas@xxxxxxxxx>
>>>> Cc: Shawn Lin <shawn.lin@xxxxxxxxxxxxxx>
>>>> Cc: Heiko Stuebner <heiko@xxxxxxxxx>
>>>> Cc: Kishon Vijay Abraham I <kishon@xxxxxxxxxx>
>>>> ---
>>>>  drivers/pci/controller/cadence/pcie-cadence-ep.c  |  2 +-
>>>>  drivers/pci/controller/dwc/pci-dra7xx.c           |  2 +-
>>>>  drivers/pci/controller/dwc/pci-imx6.c             |  2 +-
>>>>  drivers/pci/controller/dwc/pci-keystone.c         |  2 +-
>>>>  drivers/pci/controller/dwc/pci-layerscape-ep.c    |  2 +-
>>>>  drivers/pci/controller/dwc/pcie-artpec6.c         |  2 +-
>>>>  drivers/pci/controller/dwc/pcie-designware-plat.c |  2 +-
>>>>  drivers/pci/controller/dwc/pcie-keembay.c         |  2 +-
>>>>  drivers/pci/controller/dwc/pcie-qcom-ep.c         |  2 +-
>>>>  drivers/pci/controller/dwc/pcie-tegra194.c        |  2 +-
>>>>  drivers/pci/controller/dwc/pcie-uniphier-ep.c     |  2 +-
>>>>  drivers/pci/controller/pcie-rcar-ep.c             |  2 +-
>>>>  drivers/pci/controller/pcie-rockchip-ep.c         |  2 +-
>>>>  drivers/pci/endpoint/functions/pci-epf-test.c     | 10 +++++-----
>>>>  include/linux/pci-epc.h                           |  4 ++--
>>>>  15 files changed, 20 insertions(+), 20 deletions(-)
>>>>
>>>> diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c
>>>> index b8b655d4047e..2af8eb4e6d91 100644
>>>> --- a/drivers/pci/controller/cadence/pcie-cadence-ep.c
>>>> +++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c
>>>> @@ -539,7 +539,7 @@ static int cdns_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn,
>>>>  	struct device *dev = pcie->dev;
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		if (vfn > 0) {
>>>>  			dev_err(dev, "Cannot raise legacy interrupts for VF\n");
>>>>  			return -EINVAL;
>>>> diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
>>>> index b445ffe95e3f..8767432dda5c 100644
>>>> --- a/drivers/pci/controller/dwc/pci-dra7xx.c
>>>> +++ b/drivers/pci/controller/dwc/pci-dra7xx.c
>>>> @@ -410,7 +410,7 @@ static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		dra7xx_pcie_raise_legacy_irq(dra7xx);
>>>>  		break;
>>>>  	case PCI_EPC_IRQ_MSI:
>>>> diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
>>>> index 235ead4c807f..feadc88782a7 100644
>>>> --- a/drivers/pci/controller/dwc/pci-imx6.c
>>>> +++ b/drivers/pci/controller/dwc/pci-imx6.c
>>>> @@ -1063,7 +1063,7 @@ static int imx6_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
>>>>  	case PCI_EPC_IRQ_MSI:
>>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>>> diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
>>>> index 49aea6ce3e87..fce300673ea3 100644
>>>> --- a/drivers/pci/controller/dwc/pci-keystone.c
>>>> +++ b/drivers/pci/controller/dwc/pci-keystone.c
>>>> @@ -907,7 +907,7 @@ static int ks_pcie_am654_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		ks_pcie_am654_raise_legacy_irq(ks_pcie);
>>>>  		break;
>>>>  	case PCI_EPC_IRQ_MSI:
>>>> diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c
>>>> index de4c1758a6c3..b2e14d64dba2 100644
>>>> --- a/drivers/pci/controller/dwc/pci-layerscape-ep.c
>>>> +++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c
>>>> @@ -155,7 +155,7 @@ static int ls_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
>>>>  	case PCI_EPC_IRQ_MSI:
>>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>>> diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
>>>> index 9b572a2b2c9a..cf92a11ede86 100644
>>>> --- a/drivers/pci/controller/dwc/pcie-artpec6.c
>>>> +++ b/drivers/pci/controller/dwc/pcie-artpec6.c
>>>> @@ -357,7 +357,7 @@ static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		dev_err(pci->dev, "EP cannot trigger legacy IRQs\n");
>>>>  		return -EINVAL;
>>>>  	case PCI_EPC_IRQ_MSI:
>>>> diff --git a/drivers/pci/controller/dwc/pcie-designware-plat.c b/drivers/pci/controller/dwc/pcie-designware-plat.c
>>>> index b625841e98aa..f72df38dd523 100644
>>>> --- a/drivers/pci/controller/dwc/pcie-designware-plat.c
>>>> +++ b/drivers/pci/controller/dwc/pcie-designware-plat.c
>>>> @@ -48,7 +48,7 @@ static int dw_plat_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
>>>>  	case PCI_EPC_IRQ_MSI:
>>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>>> diff --git a/drivers/pci/controller/dwc/pcie-keembay.c b/drivers/pci/controller/dwc/pcie-keembay.c
>>>> index 289bff99d762..62903fef343c 100644
>>>> --- a/drivers/pci/controller/dwc/pcie-keembay.c
>>>> +++ b/drivers/pci/controller/dwc/pcie-keembay.c
>>>> @@ -295,7 +295,7 @@ static int keembay_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		/* Legacy interrupts are not supported in Keem Bay */
>>>>  		dev_err(pci->dev, "Legacy IRQ is not supported\n");
>>>>  		return -EINVAL;
>>>> diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c
>>>> index 267e1247d548..21e2ccc49219 100644
>>>> --- a/drivers/pci/controller/dwc/pcie-qcom-ep.c
>>>> +++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c
>>>> @@ -660,7 +660,7 @@ static int qcom_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
>>>>  	case PCI_EPC_IRQ_MSI:
>>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>>> diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
>>>> index 383ba71d1e8f..85cc64324efd 100644
>>>> --- a/drivers/pci/controller/dwc/pcie-tegra194.c
>>>> +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
>>>> @@ -1999,7 +1999,7 @@ static int tegra_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		return tegra_pcie_ep_raise_legacy_irq(pcie, interrupt_num);
>>>>  
>>>>  	case PCI_EPC_IRQ_MSI:
>>>> diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
>>>> index cba3c88fcf39..a00301928c38 100644
>>>> --- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c
>>>> +++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
>>>> @@ -262,7 +262,7 @@ static int uniphier_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		return uniphier_pcie_ep_raise_legacy_irq(ep);
>>>>  	case PCI_EPC_IRQ_MSI:
>>>>  		return uniphier_pcie_ep_raise_msi_irq(ep, func_no,
>>>> diff --git a/drivers/pci/controller/pcie-rcar-ep.c b/drivers/pci/controller/pcie-rcar-ep.c
>>>> index f9682df1da61..fbdf3d85301c 100644
>>>> --- a/drivers/pci/controller/pcie-rcar-ep.c
>>>> +++ b/drivers/pci/controller/pcie-rcar-ep.c
>>>> @@ -408,7 +408,7 @@ static int rcar_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn,
>>>>  	struct rcar_pcie_endpoint *ep = epc_get_drvdata(epc);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		return rcar_pcie_ep_assert_intx(ep, fn, 0);
>>>>  
>>>>  	case PCI_EPC_IRQ_MSI:
>>>> diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c
>>>> index 0af0e965fb57..e856a45d0986 100644
>>>> --- a/drivers/pci/controller/pcie-rockchip-ep.c
>>>> +++ b/drivers/pci/controller/pcie-rockchip-ep.c
>>>> @@ -413,7 +413,7 @@ static int rockchip_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn,
>>>>  	struct rockchip_pcie_ep *ep = epc_get_drvdata(epc);
>>>>  
>>>>  	switch (type) {
>>>> -	case PCI_EPC_IRQ_LEGACY:
>>>> +	case PCI_EPC_IRQ_INTX:
>>>>  		return rockchip_pcie_ep_send_legacy_irq(ep, fn, 0);
>>>>  	case PCI_EPC_IRQ_MSI:
>>>>  		return rockchip_pcie_ep_send_msi_irq(ep, fn, interrupt_num);
>>>> diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
>>>> index 1f0d2b84296a..caa30596fadd 100644
>>>> --- a/drivers/pci/endpoint/functions/pci-epf-test.c
>>>> +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
>>>> @@ -19,11 +19,11 @@
>>>>  #include <linux/pci-epf.h>
>>>>  #include <linux/pci_regs.h>
>>>>  
>>>> -#define IRQ_TYPE_LEGACY			0
>>>> +#define IRQ_TYPE_INTX			0
>>>>  #define IRQ_TYPE_MSI			1
>>>>  #define IRQ_TYPE_MSIX			2
>>>>  
>>>> -#define COMMAND_RAISE_LEGACY_IRQ	BIT(0)
>>>> +#define COMMAND_RAISE_INTX_IRQ		BIT(0)
>>>>  #define COMMAND_RAISE_MSI_IRQ		BIT(1)
>>>>  #define COMMAND_RAISE_MSIX_IRQ		BIT(2)
>>>>  #define COMMAND_READ			BIT(3)
>>>> @@ -600,9 +600,9 @@ static void pci_epf_test_raise_irq(struct pci_epf_test *epf_test,
>>>>  	WRITE_ONCE(reg->status, status);
>>>>  
>>>>  	switch (reg->irq_type) {
>>>> -	case IRQ_TYPE_LEGACY:
>>>> +	case IRQ_TYPE_INTX:
>>>>  		pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no,
>>>> -				  PCI_EPC_IRQ_LEGACY, 0);
>>>> +				  PCI_EPC_IRQ_INTX, 0);
>>>>  		break;
>>>>  	case IRQ_TYPE_MSI:
>>>>  		count = pci_epc_get_msi(epc, epf->func_no, epf->vfunc_no);
>>>> @@ -659,7 +659,7 @@ static void pci_epf_test_cmd_handler(struct work_struct *work)
>>>>  	}
>>>>  
>>>>  	switch (command) {
>>>> -	case COMMAND_RAISE_LEGACY_IRQ:
>>>> +	case COMMAND_RAISE_INTX_IRQ:
>>>>  	case COMMAND_RAISE_MSI_IRQ:
>>>>  	case COMMAND_RAISE_MSIX_IRQ:
>>>>  		pci_epf_test_raise_irq(epf_test, reg);
>>>> diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
>>>> index 5cb694031072..c5ada36b6ca0 100644
>>>> --- a/include/linux/pci-epc.h
>>>> +++ b/include/linux/pci-epc.h
>>>> @@ -21,7 +21,7 @@ enum pci_epc_interface_type {
>>>>  
>>>>  enum pci_epc_irq_type {
>>>>  	PCI_EPC_IRQ_UNKNOWN,
>>>> -	PCI_EPC_IRQ_LEGACY,
>>>> +	PCI_EPC_IRQ_INTX,
>>>>  	PCI_EPC_IRQ_MSI,
>>>>  	PCI_EPC_IRQ_MSIX,
>>>>  };
>>>> @@ -54,7 +54,7 @@ pci_epc_interface_string(enum pci_epc_interface_type type)
>>>>   *	     MSI-X capability register
>>>>   * @get_msix: ops to get the number of MSI-X interrupts allocated by the RC
>>>>   *	     from the MSI-X capability register
>>>> - * @raise_irq: ops to raise a legacy, MSI or MSI-X interrupt
>>>> + * @raise_irq: ops to raise an INTx, MSI or MSI-X interrupt
>>>>   * @map_msi_irq: ops to map physical address to MSI address and return MSI data
>>>>   * @start: ops to start the PCI link
>>>>   * @stop: ops to stop the PCI link
>>>
>>> -- 
>>> Damien Le Moal
>>> Western Digital Research
>>
>>> From e2acf8cc92fc3902b355ba3fe4a8c37c9535c7c8 Mon Sep 17 00:00:00 2001
>>> From: Damien Le Moal <dlemoal@xxxxxxxxxx>
>>> Date: Wed, 12 Apr 2023 19:50:47 +0900
>>> Subject: [PATCH] PCI: endpoint: Drop PCI_EPC_IRQ_XXX definitions
>>>
>>> linux/pci.h defines the IRQ flags PCI_IRQ_LEGACY, PCI_IRQ_MSI and
>>> PCI_IRQ_MSIX. Let's use these flags directly instead of the endpoint
>>> definitions provided by enum pci_epc_irq_type.
>>>
>>> Signed-off-by: Damien Le Moal <dlemoal@xxxxxxxxxx>
>>> ---
>>>  drivers/pci/controller/cadence/pcie-cadence-ep.c  |  9 ++++-----
>>>  drivers/pci/controller/dwc/pci-dra7xx.c           |  6 +++---
>>>  drivers/pci/controller/dwc/pci-imx6.c             |  9 ++++-----
>>>  drivers/pci/controller/dwc/pci-keystone.c         |  9 ++++-----
>>>  drivers/pci/controller/dwc/pci-layerscape-ep.c    |  8 ++++----
>>>  drivers/pci/controller/dwc/pcie-artpec6.c         |  6 +++---
>>>  drivers/pci/controller/dwc/pcie-designware-ep.c   |  2 +-
>>>  drivers/pci/controller/dwc/pcie-designware-plat.c |  9 ++++-----
>>>  drivers/pci/controller/dwc/pcie-designware.h      |  2 +-
>>>  drivers/pci/controller/dwc/pcie-keembay.c         |  9 ++++-----
>>>  drivers/pci/controller/dwc/pcie-qcom-ep.c         |  6 +++---
>>>  drivers/pci/controller/dwc/pcie-tegra194.c        |  9 ++++-----
>>>  drivers/pci/controller/dwc/pcie-uniphier-ep.c     |  7 +++----
>>>  drivers/pci/controller/pcie-rcar-ep.c             |  7 +++----
>>>  drivers/pci/controller/pcie-rockchip-ep.c         |  7 +++----
>>>  drivers/pci/endpoint/functions/pci-epf-mhi.c      |  2 +-
>>>  drivers/pci/endpoint/functions/pci-epf-ntb.c      |  4 ++--
>>>  drivers/pci/endpoint/functions/pci-epf-test.c     |  6 +++---
>>>  drivers/pci/endpoint/functions/pci-epf-vntb.c     |  7 ++-----
>>>  drivers/pci/endpoint/pci-epc-core.c               |  2 +-
>>>  include/linux/pci-epc.h                           | 11 ++---------
>>>  21 files changed, 59 insertions(+), 78 deletions(-)
>>>
>>> diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c
>>> index b8b655d4047e..250ad1330ff3 100644
>>> --- a/drivers/pci/controller/cadence/pcie-cadence-ep.c
>>> +++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c
>>> @@ -531,25 +531,24 @@ static int cdns_pcie_ep_send_msix_irq(struct cdns_pcie_ep *ep, u8 fn, u8 vfn,
>>>  }
>>>  
>>>  static int cdns_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn,
>>> -				  enum pci_epc_irq_type type,
>>> -				  u16 interrupt_num)
>>> +				  unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct cdns_pcie_ep *ep = epc_get_drvdata(epc);
>>>  	struct cdns_pcie *pcie = &ep->pcie;
>>>  	struct device *dev = pcie->dev;
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		if (vfn > 0) {
>>>  			dev_err(dev, "Cannot raise legacy interrupts for VF\n");
>>>  			return -EINVAL;
>>>  		}
>>>  		return cdns_pcie_ep_send_legacy_irq(ep, fn, vfn, 0);
>>>  
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return cdns_pcie_ep_send_msi_irq(ep, fn, vfn, interrupt_num);
>>>  
>>> -	case PCI_EPC_IRQ_MSIX:
>>> +	case PCI_IRQ_MSIX:
>>>  		return cdns_pcie_ep_send_msix_irq(ep, fn, vfn, interrupt_num);
>>>  
>>>  	default:
>>> diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
>>> index 4ae807e7cf79..1203f76b3604 100644
>>> --- a/drivers/pci/controller/dwc/pci-dra7xx.c
>>> +++ b/drivers/pci/controller/dwc/pci-dra7xx.c
>>> @@ -404,16 +404,16 @@ static void dra7xx_pcie_raise_msi_irq(struct dra7xx_pcie *dra7xx,
>>>  }
>>>  
>>>  static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				 enum pci_epc_irq_type type, u16 interrupt_num)
>>> +				 unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		dra7xx_pcie_raise_legacy_irq(dra7xx);
>>>  		break;
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		dra7xx_pcie_raise_msi_irq(dra7xx, interrupt_num);
>>>  		break;
>>>  	default:
>>> diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
>>> index 27aaa2a6bf39..2975f3faca61 100644
>>> --- a/drivers/pci/controller/dwc/pci-imx6.c
>>> +++ b/drivers/pci/controller/dwc/pci-imx6.c
>>> @@ -1057,17 +1057,16 @@ static void imx6_pcie_ep_init(struct dw_pcie_ep *ep)
>>>  }
>>>  
>>>  static int imx6_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				  enum pci_epc_irq_type type,
>>> -				  u16 interrupt_num)
>>> +				  unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>> -	case PCI_EPC_IRQ_MSIX:
>>> +	case PCI_IRQ_MSIX:
>>>  		return dw_pcie_ep_raise_msix_irq(ep, func_no, interrupt_num);
>>>  	default:
>>>  		dev_err(pci->dev, "UNKNOWN IRQ type\n");
>>> diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
>>> index 78818853af9e..e63ea88051c0 100644
>>> --- a/drivers/pci/controller/dwc/pci-keystone.c
>>> +++ b/drivers/pci/controller/dwc/pci-keystone.c
>>> @@ -901,20 +901,19 @@ static void ks_pcie_am654_raise_legacy_irq(struct keystone_pcie *ks_pcie)
>>>  }
>>>  
>>>  static int ks_pcie_am654_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				   enum pci_epc_irq_type type,
>>> -				   u16 interrupt_num)
>>> +				   unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  	struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		ks_pcie_am654_raise_legacy_irq(ks_pcie);
>>>  		break;
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>>  		break;
>>> -	case PCI_EPC_IRQ_MSIX:
>>> +	case PCI_IRQ_MSIX:
>>>  		dw_pcie_ep_raise_msix_irq(ep, func_no, interrupt_num);
>>>  		break;
>>>  	default:
>>> diff --git a/drivers/pci/controller/dwc/pci-layerscape-ep.c b/drivers/pci/controller/dwc/pci-layerscape-ep.c
>>> index de4c1758a6c3..794e0bd199b7 100644
>>> --- a/drivers/pci/controller/dwc/pci-layerscape-ep.c
>>> +++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c
>>> @@ -150,16 +150,16 @@ static void ls_pcie_ep_init(struct dw_pcie_ep *ep)
>>>  }
>>>  
>>>  static int ls_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				enum pci_epc_irq_type type, u16 interrupt_num)
>>> +				unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>> -	case PCI_EPC_IRQ_MSIX:
>>> +	case PCI_IRQ_MSIX:
>>>  		return dw_pcie_ep_raise_msix_irq_doorbell(ep, func_no,
>>>  							  interrupt_num);
>>>  	default:
>>> diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
>>> index 98102079e26d..e84748b82fee 100644
>>> --- a/drivers/pci/controller/dwc/pcie-artpec6.c
>>> +++ b/drivers/pci/controller/dwc/pcie-artpec6.c
>>> @@ -352,15 +352,15 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)
>>>  }
>>>  
>>>  static int artpec6_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				  enum pci_epc_irq_type type, u16 interrupt_num)
>>> +				  unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		dev_err(pci->dev, "EP cannot trigger legacy IRQs\n");
>>>  		return -EINVAL;
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>>  	default:
>>>  		dev_err(pci->dev, "UNKNOWN IRQ type\n");
>>> diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
>>> index f9182f8d552f..ab87ea3b0986 100644
>>> --- a/drivers/pci/controller/dwc/pcie-designware-ep.c
>>> +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
>>> @@ -426,7 +426,7 @@ static int dw_pcie_ep_set_msix(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>>>  }
>>>  
>>>  static int dw_pcie_ep_raise_irq(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>>> -				enum pci_epc_irq_type type, u16 interrupt_num)
>>> +				unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie_ep *ep = epc_get_drvdata(epc);
>>>  
>>> diff --git a/drivers/pci/controller/dwc/pcie-designware-plat.c b/drivers/pci/controller/dwc/pcie-designware-plat.c
>>> index 1fcfb840f238..9871c49b0383 100644
>>> --- a/drivers/pci/controller/dwc/pcie-designware-plat.c
>>> +++ b/drivers/pci/controller/dwc/pcie-designware-plat.c
>>> @@ -42,17 +42,16 @@ static void dw_plat_pcie_ep_init(struct dw_pcie_ep *ep)
>>>  }
>>>  
>>>  static int dw_plat_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				     enum pci_epc_irq_type type,
>>> -				     u16 interrupt_num)
>>> +				     unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>> -	case PCI_EPC_IRQ_MSIX:
>>> +	case PCI_IRQ_MSIX:
>>>  		return dw_pcie_ep_raise_msix_irq(ep, func_no, interrupt_num);
>>>  	default:
>>>  		dev_err(pci->dev, "UNKNOWN IRQ type\n");
>>> diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
>>> index 615660640801..e039081eb947 100644
>>> --- a/drivers/pci/controller/dwc/pcie-designware.h
>>> +++ b/drivers/pci/controller/dwc/pcie-designware.h
>>> @@ -320,7 +320,7 @@ struct dw_pcie_rp {
>>>  struct dw_pcie_ep_ops {
>>>  	void	(*ep_init)(struct dw_pcie_ep *ep);
>>>  	int	(*raise_irq)(struct dw_pcie_ep *ep, u8 func_no,
>>> -			     enum pci_epc_irq_type type, u16 interrupt_num);
>>> +			     unsigned int type, u16 interrupt_num);
>>>  	const struct pci_epc_features* (*get_features)(struct dw_pcie_ep *ep);
>>>  	/*
>>>  	 * Provide a method to implement the different func config space
>>> diff --git a/drivers/pci/controller/dwc/pcie-keembay.c b/drivers/pci/controller/dwc/pcie-keembay.c
>>> index f90f36bac018..c93fd79d400b 100644
>>> --- a/drivers/pci/controller/dwc/pcie-keembay.c
>>> +++ b/drivers/pci/controller/dwc/pcie-keembay.c
>>> @@ -284,19 +284,18 @@ static void keembay_pcie_ep_init(struct dw_pcie_ep *ep)
>>>  }
>>>  
>>>  static int keembay_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				     enum pci_epc_irq_type type,
>>> -				     u16 interrupt_num)
>>> +				     unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		/* Legacy interrupts are not supported in Keem Bay */
>>>  		dev_err(pci->dev, "Legacy IRQ is not supported\n");
>>>  		return -EINVAL;
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>> -	case PCI_EPC_IRQ_MSIX:
>>> +	case PCI_IRQ_MSIX:
>>>  		return dw_pcie_ep_raise_msix_irq(ep, func_no, interrupt_num);
>>>  	default:
>>>  		dev_err(pci->dev, "Unknown IRQ type %d\n", type);
>>> diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c
>>> index 0fe7f06f2102..3faabc66f07b 100644
>>> --- a/drivers/pci/controller/dwc/pcie-qcom-ep.c
>>> +++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c
>>> @@ -655,14 +655,14 @@ static int qcom_pcie_ep_enable_irq_resources(struct platform_device *pdev,
>>>  }
>>>  
>>>  static int qcom_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				  enum pci_epc_irq_type type, u16 interrupt_num)
>>> +				  unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		return dw_pcie_ep_raise_legacy_irq(ep, func_no);
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num);
>>>  	default:
>>>  		dev_err(pci->dev, "Unknown IRQ type\n");
>>> diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
>>> index e1db909f53ec..cafcef0da223 100644
>>> --- a/drivers/pci/controller/dwc/pcie-tegra194.c
>>> +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
>>> @@ -1993,20 +1993,19 @@ static int tegra_pcie_ep_raise_msix_irq(struct tegra_pcie_dw *pcie, u16 irq)
>>>  }
>>>  
>>>  static int tegra_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				   enum pci_epc_irq_type type,
>>> -				   u16 interrupt_num)
>>> +				   unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  	struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		return tegra_pcie_ep_raise_legacy_irq(pcie, interrupt_num);
>>>  
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return tegra_pcie_ep_raise_msi_irq(pcie, interrupt_num);
>>>  
>>> -	case PCI_EPC_IRQ_MSIX:
>>> +	case PCI_IRQ_MSIX:
>>>  		return tegra_pcie_ep_raise_msix_irq(pcie, interrupt_num);
>>>  
>>>  	default:
>>> diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
>>> index 4d0a587c0ba5..43c27138c3c5 100644
>>> --- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c
>>> +++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
>>> @@ -256,15 +256,14 @@ static int uniphier_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep,
>>>  }
>>>  
>>>  static int uniphier_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
>>> -				      enum pci_epc_irq_type type,
>>> -				      u16 interrupt_num)
>>> +				      unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		return uniphier_pcie_ep_raise_legacy_irq(ep);
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return uniphier_pcie_ep_raise_msi_irq(ep, func_no,
>>>  						      interrupt_num);
>>>  	default:
>>> diff --git a/drivers/pci/controller/pcie-rcar-ep.c b/drivers/pci/controller/pcie-rcar-ep.c
>>> index f9682df1da61..2172db2343d9 100644
>>> --- a/drivers/pci/controller/pcie-rcar-ep.c
>>> +++ b/drivers/pci/controller/pcie-rcar-ep.c
>>> @@ -402,16 +402,15 @@ static int rcar_pcie_ep_assert_msi(struct rcar_pcie *pcie,
>>>  }
>>>  
>>>  static int rcar_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn,
>>> -				  enum pci_epc_irq_type type,
>>> -				  u16 interrupt_num)
>>> +				  unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct rcar_pcie_endpoint *ep = epc_get_drvdata(epc);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		return rcar_pcie_ep_assert_intx(ep, fn, 0);
>>>  
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return rcar_pcie_ep_assert_msi(&ep->pcie, fn, interrupt_num);
>>>  
>>>  	default:
>>> diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c
>>> index 0af0e965fb57..397ad551c912 100644
>>> --- a/drivers/pci/controller/pcie-rockchip-ep.c
>>> +++ b/drivers/pci/controller/pcie-rockchip-ep.c
>>> @@ -407,15 +407,14 @@ static int rockchip_pcie_ep_send_msi_irq(struct rockchip_pcie_ep *ep, u8 fn,
>>>  }
>>>  
>>>  static int rockchip_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn,
>>> -				      enum pci_epc_irq_type type,
>>> -				      u16 interrupt_num)
>>> +				      unsigned int type, u16 interrupt_num)
>>>  {
>>>  	struct rockchip_pcie_ep *ep = epc_get_drvdata(epc);
>>>  
>>>  	switch (type) {
>>> -	case PCI_EPC_IRQ_LEGACY:
>>> +	case PCI_IRQ_LEGACY:
>>>  		return rockchip_pcie_ep_send_legacy_irq(ep, fn, 0);
>>> -	case PCI_EPC_IRQ_MSI:
>>> +	case PCI_IRQ_MSI:
>>>  		return rockchip_pcie_ep_send_msi_irq(ep, fn, interrupt_num);
>>>  	default:
>>>  		return -EINVAL;
>>> diff --git a/drivers/pci/endpoint/functions/pci-epf-mhi.c b/drivers/pci/endpoint/functions/pci-epf-mhi.c
>>> index ddf0bace4e18..f2fcda1c5d4f 100644
>>> --- a/drivers/pci/endpoint/functions/pci-epf-mhi.c
>>> +++ b/drivers/pci/endpoint/functions/pci-epf-mhi.c
>>> @@ -177,7 +177,7 @@ static void pci_epf_mhi_raise_irq(struct mhi_ep_cntrl *mhi_cntrl, u32 vector)
>>>  	 * MHI supplies 0 based MSI vectors but the API expects the vector
>>>  	 * number to start from 1, so we need to increment the vector by 1.
>>>  	 */
>>> -	pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no, PCI_EPC_IRQ_MSI,
>>> +	pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no, PCI_IRQ_MSI,
>>>  			  vector + 1);
>>>  }
>>>  
>>> diff --git a/drivers/pci/endpoint/functions/pci-epf-ntb.c b/drivers/pci/endpoint/functions/pci-epf-ntb.c
>>> index 9aac2c6f3bb9..fad00b1a8335 100644
>>> --- a/drivers/pci/endpoint/functions/pci-epf-ntb.c
>>> +++ b/drivers/pci/endpoint/functions/pci-epf-ntb.c
>>> @@ -140,9 +140,9 @@ static struct pci_epf_header epf_ntb_header = {
>>>  static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up)
>>>  {
>>>  	enum pci_epc_interface_type type;
>>> -	enum pci_epc_irq_type irq_type;
>>>  	struct epf_ntb_epc *ntb_epc;
>>>  	struct epf_ntb_ctrl *ctrl;
>>> +	unsigned int irq_type;
>>>  	struct pci_epc *epc;
>>>  	u8 func_no, vfunc_no;
>>>  	bool is_msix;
>>> @@ -159,7 +159,7 @@ static int epf_ntb_link_up(struct epf_ntb *ntb, bool link_up)
>>>  			ctrl->link_status |= LINK_STATUS_UP;
>>>  		else
>>>  			ctrl->link_status &= ~LINK_STATUS_UP;
>>> -		irq_type = is_msix ? PCI_EPC_IRQ_MSIX : PCI_EPC_IRQ_MSI;
>>> +		irq_type = is_msix ? PCI_IRQ_MSIX : PCI_IRQ_MSI;
>>>  		ret = pci_epc_raise_irq(epc, func_no, vfunc_no, irq_type, 1);
>>>  		if (ret) {
>>>  			dev_err(&epc->dev,
>>> diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
>>> index fa993e71c224..76ddf4c92511 100644
>>> --- a/drivers/pci/endpoint/functions/pci-epf-test.c
>>> +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
>>> @@ -602,7 +602,7 @@ static void pci_epf_test_raise_irq(struct pci_epf_test *epf_test,
>>>  	switch (reg->irq_type) {
>>>  	case IRQ_TYPE_LEGACY:
>>>  		pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no,
>>> -				  PCI_EPC_IRQ_LEGACY, 0);
>>> +				  PCI_IRQ_LEGACY, 0);
>>>  		break;
>>>  	case IRQ_TYPE_MSI:
>>>  		count = pci_epc_get_msi(epc, epf->func_no, epf->vfunc_no);
>>> @@ -612,7 +612,7 @@ static void pci_epf_test_raise_irq(struct pci_epf_test *epf_test,
>>>  			return;
>>>  		}
>>>  		pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no,
>>> -				  PCI_EPC_IRQ_MSI, reg->irq_number);
>>> +				  PCI_IRQ_MSI, reg->irq_number);
>>>  		break;
>>>  	case IRQ_TYPE_MSIX:
>>>  		count = pci_epc_get_msix(epc, epf->func_no, epf->vfunc_no);
>>> @@ -622,7 +622,7 @@ static void pci_epf_test_raise_irq(struct pci_epf_test *epf_test,
>>>  			return;
>>>  		}
>>>  		pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no,
>>> -				  PCI_EPC_IRQ_MSIX, reg->irq_number);
>>> +				  PCI_IRQ_MSIX, reg->irq_number);
>>>  		break;
>>>  	default:
>>>  		dev_err(dev, "Failed to raise IRQ, unknown type\n");
>>> diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
>>> index c8b423c3c26e..ba2fe0bb400a 100644
>>> --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
>>> +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
>>> @@ -1172,11 +1172,8 @@ static int vntb_epf_peer_db_set(struct ntb_dev *ndev, u64 db_bits)
>>>  	func_no = ntb->epf->func_no;
>>>  	vfunc_no = ntb->epf->vfunc_no;
>>>  
>>> -	ret = pci_epc_raise_irq(ntb->epf->epc,
>>> -				func_no,
>>> -				vfunc_no,
>>> -				PCI_EPC_IRQ_MSI,
>>> -				interrupt_num + 1);
>>> +	ret = pci_epc_raise_irq(ntb->epf->epc, func_no, vfunc_no,
>>> +				PCI_IRQ_MSI, interrupt_num + 1);
>>>  	if (ret)
>>>  		dev_err(&ntb->ntb.dev, "Failed to raise IRQ\n");
>>>  
>>> diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
>>> index 6c54fa5684d2..835d56922cbb 100644
>>> --- a/drivers/pci/endpoint/pci-epc-core.c
>>> +++ b/drivers/pci/endpoint/pci-epc-core.c
>>> @@ -218,7 +218,7 @@ EXPORT_SYMBOL_GPL(pci_epc_start);
>>>   * Invoke to raise an legacy, MSI or MSI-X interrupt
>>>   */
>>>  int pci_epc_raise_irq(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>>> -		      enum pci_epc_irq_type type, u16 interrupt_num)
>>> +		      unsigned int type, u16 interrupt_num)
>>>  {
>>>  	int ret;
>>>  
>>> diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
>>> index 5cb694031072..f498f9aa2ab0 100644
>>> --- a/include/linux/pci-epc.h
>>> +++ b/include/linux/pci-epc.h
>>> @@ -19,13 +19,6 @@ enum pci_epc_interface_type {
>>>  	SECONDARY_INTERFACE,
>>>  };
>>>  
>>> -enum pci_epc_irq_type {
>>> -	PCI_EPC_IRQ_UNKNOWN,
>>> -	PCI_EPC_IRQ_LEGACY,
>>> -	PCI_EPC_IRQ_MSI,
>>> -	PCI_EPC_IRQ_MSIX,
>>> -};
>>> -
>>>  static inline const char *
>>>  pci_epc_interface_string(enum pci_epc_interface_type type)
>>>  {
>>> @@ -79,7 +72,7 @@ struct pci_epc_ops {
>>>  			    u16 interrupts, enum pci_barno, u32 offset);
>>>  	int	(*get_msix)(struct pci_epc *epc, u8 func_no, u8 vfunc_no);
>>>  	int	(*raise_irq)(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>>> -			     enum pci_epc_irq_type type, u16 interrupt_num);
>>> +			     unsigned int type, u16 interrupt_num);
>>>  	int	(*map_msi_irq)(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>>>  			       phys_addr_t phys_addr, u8 interrupt_num,
>>>  			       u32 entry_size, u32 *msi_data,
>>> @@ -229,7 +222,7 @@ int pci_epc_map_msi_irq(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>>>  			phys_addr_t phys_addr, u8 interrupt_num,
>>>  			u32 entry_size, u32 *msi_data, u32 *msi_addr_offset);
>>>  int pci_epc_raise_irq(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>>> -		      enum pci_epc_irq_type type, u16 interrupt_num);
>>> +		      unsigned int type, u16 interrupt_num);
>>>  int pci_epc_start(struct pci_epc *epc);
>>>  void pci_epc_stop(struct pci_epc *epc);
>>>  const struct pci_epc_features *pci_epc_get_features(struct pci_epc *epc,
>>> -- 
>>> 2.41.0
>>>
>>
>>
>> -- 
>> மணிவண்ணன் சதாசிவம்

-- 
Damien Le Moal
Western Digital Research




[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux