Cleanup IRQ type definitions
Subsystems (24)
v4 cover Cleanup IRQ type definitions
The first patch renames PCI_IRQ_LEGACY to PCI_IRQ_INTX as suggested by Bjorn (hence the patch authorship is given to him). The second patch removes the redundant IRQ type definitions PCI_EPC_IRQ_XXX and replace these with a direct use of the PCI_IRQ_XXX definitions. These 2 patches have been sent and reviewed previously but were never applied. Hence the resend with this new series version.
The remaining patches rename functions and correct comments etc to refer to "intx" instead of "legacy".
Changes from v3:
- Added tags to patch 2
- Added patch 3 to 16
Changes from v2:
- Modified PCI_IRQ_LEGACY comment in patch 1 as suggested by Serge
- Fixed forgotten rename in patch 2
Changes from v1:
- Updated first patch Signed-of tag and commit message as suggested by Bjorn.
- Added review tags.
Bjorn Helgaas (1):
PCI: Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX
Damien Le Moal (15):
PCI: endpoint: Drop PCI_EPC_IRQ_XXX definitions
PCI: endpoint: Use INTX instead of legacy
PCI: endpoint: Rename LEGACY to INTX in test function driver
misc: pci_endpoint_test: Use INTX instead of LEGACY
PCI: portdrv: Use PCI_IRQ_INTX
PCI: dra7xx: Rename dra7xx_pcie_raise_legacy_irq()
PCI: cadence: Use INTX instead of legacy
PCI: dwc: Rename dw_pcie_ep_raise_legacy_irq()
PCI: keystone: Use INTX instead of legacy
PCI: dw-rockchip: Rename rockchip_pcie_legacy_int_handler()
PCI: tegra194: Use INTX instead of legacy
PCI: uniphier: Use INTX instead of legacy
PCI: rockchip-ep: Use INTX instead of legacy
PCI: rockchip-host: Rename rockchip_pcie_legacy_int_handler()
PCI: xilinx-nwl: Use INTX instead of legacy
drivers/misc/pci_endpoint_test.c | 30 +++---- .../pci/controller/cadence/pcie-cadence-ep.c | 19 ++-- drivers/pci/controller/cadence/pcie-cadence.h | 12 +-- drivers/pci/controller/dwc/pci-dra7xx.c | 10 +-- drivers/pci/controller/dwc/pci-imx6.c | 11 ++- drivers/pci/controller/dwc/pci-keystone.c | 86 +++++++++---------- .../pci/controller/dwc/pci-layerscape-ep.c | 10 +-- drivers/pci/controller/dwc/pcie-artpec6.c | 8 +- .../pci/controller/dwc/pcie-designware-ep.c | 8 +- .../pci/controller/dwc/pcie-designware-plat.c | 11 ++- drivers/pci/controller/dwc/pcie-designware.h | 6 +- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 4 +- drivers/pci/controller/dwc/pcie-keembay.c | 13 ++- drivers/pci/controller/dwc/pcie-qcom-ep.c | 8 +- drivers/pci/controller/dwc/pcie-rcar-gen4.c | 9 +- drivers/pci/controller/dwc/pcie-tegra194.c | 19 ++-- drivers/pci/controller/dwc/pcie-uniphier-ep.c | 11 ++- drivers/pci/controller/dwc/pcie-uniphier.c | 12 +-- drivers/pci/controller/pcie-rcar-ep.c | 7 +- drivers/pci/controller/pcie-rockchip-ep.c | 23 +++-- drivers/pci/controller/pcie-rockchip-host.c | 4 +- drivers/pci/controller/pcie-xilinx-nwl.c | 52 +++++------ 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 | 14 +-- drivers/pci/endpoint/functions/pci-epf-vntb.c | 7 +- drivers/pci/endpoint/pci-epc-core.c | 6 +- drivers/pci/pcie/portdrv.c | 8 +- include/linux/pci-epc.h | 11 +-- include/linux/pci.h | 4 +- include/uapi/linux/pcitest.h | 3 +- 31 files changed, 206 insertions(+), 226 deletions(-)
Signature · 1 line
2.42.0
PATCH v4 1/16 PCI: Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX
From: Bjorn Helgaas <[email protected]>
Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX to be more explicit about the type of IRQ being referenced as well as to match the PCI specifications terms. Redefine PCI_IRQ_LEGACY as an alias to PCI_IRQ_INTX to avoid the need for doing the renaming tree-wide. New drivers and new code should now prefer using PCI_IRQ_INTX instead of PCI_IRQ_LEGACY.
--- include/linux/pci.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/linux/pci.h +3 -1
@@ -1073,11 +1073,13 @@ enum { PCI_SCAN_ALL_PCIE_DEVS = 0x00000040, /* Scan all, not just dev 0 */ }; -#define PCI_IRQ_LEGACY (1 << 0)/* Allow legacy interrupts */ +#define PCI_IRQ_INTX (1 << 0)/* Allow INTx interrupts */ #define PCI_IRQ_MSI (1 << 1)/* Allow MSI interrupts */ #define PCI_IRQ_MSIX (1 << 2)/* Allow MSI-X interrupts */ #define PCI_IRQ_AFFINITY (1 << 3)/* Auto-assign affinity */ +#define PCI_IRQ_LEGACY PCI_IRQ_INTX/* Deprecated! Use PCI_IRQ_INTX */ +/* These external functions are only available when PCI support is enabled */ #ifdef CONFIG_PCI
Signature · 1 line
2.42.0
PATCH v4 2/16 PCI: endpoint: Drop PCI_EPC_IRQ_XXX definitions
In reply to Damien Le Moallinux/pci.h defines the IRQ flags PCI_IRQ_INTX, 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. This removes the need for defining this enum type completely.
--- 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 | 8 ++++---- 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 | 13 ++++++------- drivers/pci/controller/dwc/pcie-qcom-ep.c | 6 +++--- drivers/pci/controller/dwc/pcie-rcar-gen4.c | 7 +++---- 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 ++--------- 22 files changed, 65 insertions(+), 85 deletions(-)
drivers/pci/controller/cadence/pcie-cadence-ep.c +4 -5
@@ -532,25 +532,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_INTX :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 :
drivers/pci/controller/dwc/pci-dra7xx.c +3 -3
@@ -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_INTX :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 :
drivers/pci/controller/dwc/pci-imx6.c +4 -5
@@ -1058,17 +1058,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_INTX :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" );
drivers/pci/controller/dwc/pci-keystone.c +4 -5
@@ -900,20 +900,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_INTX :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 :
drivers/pci/controller/dwc/pci-layerscape-ep.c +4 -4
@@ -166,16 +166,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_INTX :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 :
drivers/pci/controller/dwc/pcie-artpec6.c +4 -4
@@ -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 : -dev_err (pci->dev,"EP cannot trigger legacy IRQs\n" ); +case PCI_IRQ_INTX : +dev_err (pci->dev,"EP cannot trigger INTx 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" );
drivers/pci/controller/dwc/pcie-designware-ep.c +1 -1
@@ -443,7 +443,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);
drivers/pci/controller/dwc/pcie-designware-plat.c +4 -5
@@ -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_INTX :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" );
drivers/pci/controller/dwc/pcie-designware.h +1 -1
@@ -335,7 +335,7 @@ struct dw_pcie_ep_ops {void (*ep_init)(struct dw_pcie_ep *ep);void (*deinit)(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
drivers/pci/controller/dwc/pcie-keembay.c +6 -7
@@ -289,19 +289,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 : -/* Legacy interrupts are not supported in Keem Bay */ -dev_err (pci->dev,"Legacy IRQ is not supported\n" ); +case PCI_IRQ_INTX : +/* INTx interrupts are not supported in Keem Bay */ +dev_err (pci->dev,"INTx 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);
drivers/pci/controller/dwc/pcie-qcom-ep.c +3 -3
@@ -726,14 +726,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_INTX :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" );
drivers/pci/controller/dwc/pcie-rcar-gen4.c +3 -4
@@ -362,15 +362,14 @@ static void rcar_gen4_pcie_ep_deinit(struct dw_pcie_ep *ep) }static int rcar_gen4_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 *dw =to_dw_pcie_from_ep (ep);switch (type) { -case PCI_EPC_IRQ_LEGACY : +case PCI_IRQ_INTX :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 (dw->dev,"Unknown IRQ type\n" );
drivers/pci/controller/dwc/pcie-tegra194.c +4 -5
@@ -1979,20 +1979,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_INTX :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 :
drivers/pci/controller/dwc/pcie-uniphier-ep.c +3 -4
@@ -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_INTX :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 :
drivers/pci/controller/pcie-rcar-ep.c +3 -4
@@ -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_INTX :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 :
drivers/pci/controller/pcie-rockchip-ep.c +3 -4
@@ -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_INTX :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 ;
drivers/pci/endpoint/functions/pci-epf-mhi.c +1 -1
@@ -205,7 +205,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 ); }
drivers/pci/endpoint/functions/pci-epf-ntb.c +2 -2
@@ -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,
drivers/pci/endpoint/functions/pci-epf-test.c +3 -3
@@ -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_INTX ,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" );
drivers/pci/endpoint/functions/pci-epf-vntb.c +2 -5
@@ -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" );
drivers/pci/endpoint/pci-epc-core.c +1 -1
@@ -217,7 +217,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;
include/linux/pci-epc.h +2 -9
@@ -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,
Signature · 1 line
2.42.0
PATCH v4 3/16 PCI: endpoint: Use INTX instead of legacy
In reply to Damien Le MoalIn the endpoint controller core code, change references to "legacy" interrupts to "INTX" interrupts to match the term used in the PCI specifications.
--- drivers/pci/endpoint/pci-epc-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/endpoint/pci-epc-core.c +2 -2
@@ -211,10 +211,10 @@ EXPORT_SYMBOL_GPL(pci_epc_start);* @epc: the EPC device which has to interrupt the host * @func_no: the physical endpoint function number in the EPC device * @vfunc_no: the virtual endpoint function number in the physical function -* @type: specify the type of interrupt; legacy, MSI or MSI-X +* @type: specify the type of interrupt; INTX, MSI or MSI-X * @interrupt_num: the MSI or MSI-X interrupt number with range (1-N) * -* Invoke to raise an legacy, MSI or MSI-X interrupt +* Invoke to raise an INTX, MSI or MSI-X interrupt */ int pci_epc_raise_irq (struct pci_epc *epc,u8 func_no,u8 vfunc_no,unsigned int type,u16 interrupt_num)
Signature · 1 line
2.42.0
PATCH v4 4/16 PCI: endpoint: Rename LEGACY to INTX in test function driver
In reply to Damien Le MoalIn the endpoint test function driver, rename IRQ_TYPE_LEGACY to IRQ_TYPE_INTX and COMMAND_RAISE_LEGACY_IRQ to COMMAND_RAISE_INTX_IRQ to match the term used in the PCI specifications.
--- drivers/pci/endpoint/functions/pci-epf-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pci/endpoint/functions/pci-epf-test.c +4 -4
@@ -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,7 +600,7 @@ 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_IRQ_INTX ,0 );break ;
@@ -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);
Signature · 1 line
2.42.0
PATCH v4 5/16 misc: pci_endpoint_test: Use INTX instead of LEGACY
In reply to Damien Le MoalIn the root complex pci endpoint test function driver, change macros and functions names using the term "legacy" to use "intx" instead to match the term used in the PCI specifications.
--- drivers/misc/pci_endpoint_test.c | 30 +++++++++++++++--------------- include/uapi/linux/pcitest.h | 3 ++- 2 files changed, 17 insertions(+), 16 deletions(-)
drivers/misc/pci_endpoint_test.c +15 -15
@@ -28,14 +28,14 @@#define DRV_MODULE_NAME "pci-endpoint-test"#define IRQ_TYPE_UNDEFINED -1 -#define IRQ_TYPE_LEGACY 0 +#define IRQ_TYPE_INTX 0#define IRQ_TYPE_MSI 1#define IRQ_TYPE_MSIX 2#define PCI_ENDPOINT_TEST_MAGIC 0x0#define PCI_ENDPOINT_TEST_COMMAND 0x4 -#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)
@@ -183,8 +183,8 @@ static bool pci_endpoint_test_alloc_irq_vectors(struct pci_endpoint_test *test,bool res = true;switch (type) { -case IRQ_TYPE_LEGACY : - irq =pci_alloc_irq_vectors (pdev,1 ,1 ,PCI_IRQ_LEGACY ); +case IRQ_TYPE_INTX : + irq =pci_alloc_irq_vectors (pdev,1 ,1 ,PCI_IRQ_INTX );if (irq <0 )dev_err (dev,"Failed to get Legacy interrupt\n" );break ;
@@ -244,7 +244,7 @@ static bool pci_endpoint_test_request_irq(struct pci_endpoint_test *test) fail:switch (irq_type) { -case IRQ_TYPE_LEGACY : +case IRQ_TYPE_INTX :dev_err (dev,"Failed to request IRQ %d for Legacy\n" ,pci_irq_vector (pdev, i));break ;
@@ -291,15 +291,15 @@ static bool pci_endpoint_test_bar(struct pci_endpoint_test *test,return true; } -static bool pci_endpoint_test_legacy_irq (struct pci_endpoint_test *test) +static bool pci_endpoint_test_intx_irq (struct pci_endpoint_test *test) {u32 val;pci_endpoint_test_writel (test,PCI_ENDPOINT_TEST_IRQ_TYPE , -IRQ_TYPE_LEGACY ); +IRQ_TYPE_INTX );pci_endpoint_test_writel (test,PCI_ENDPOINT_TEST_IRQ_NUMBER ,0 );pci_endpoint_test_writel (test,PCI_ENDPOINT_TEST_COMMAND , -COMMAND_RAISE_LEGACY_IRQ ); +COMMAND_RAISE_INTX_IRQ ); val =wait_for_completion_timeout (&test->irq_raised,msecs_to_jiffies (1000 ));if (!val)
@@ -385,7 +385,7 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test,if (use_dma) flags |=FLAG_USE_DMA ; -if (irq_type <IRQ_TYPE_LEGACY || irq_type >IRQ_TYPE_MSIX ) { +if (irq_type <IRQ_TYPE_INTX || irq_type >IRQ_TYPE_MSIX ) {dev_err (dev,"Invalid IRQ type option\n" ); goto err; }
@@ -521,7 +521,7 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test,if (use_dma) flags |=FLAG_USE_DMA ; -if (irq_type <IRQ_TYPE_LEGACY || irq_type >IRQ_TYPE_MSIX ) { +if (irq_type <IRQ_TYPE_INTX || irq_type >IRQ_TYPE_MSIX ) {dev_err (dev,"Invalid IRQ type option\n" ); goto err; }
@@ -621,7 +621,7 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test,if (use_dma) flags |=FLAG_USE_DMA ; -if (irq_type <IRQ_TYPE_LEGACY || irq_type >IRQ_TYPE_MSIX ) { +if (irq_type <IRQ_TYPE_INTX || irq_type >IRQ_TYPE_MSIX ) {dev_err (dev,"Invalid IRQ type option\n" ); goto err; }
@@ -691,7 +691,7 @@ static bool pci_endpoint_test_set_irq(struct pci_endpoint_test *test,struct pci_dev *pdev = test->pdev;struct device *dev = &pdev->dev; -if (req_irq_type <IRQ_TYPE_LEGACY || req_irq_type >IRQ_TYPE_MSIX ) { +if (req_irq_type <IRQ_TYPE_INTX || req_irq_type >IRQ_TYPE_MSIX ) {dev_err (dev,"Invalid IRQ type option\n" );return false; }
@@ -737,8 +737,8 @@ static long pci_endpoint_test_ioctl(struct file *file, unsigned int cmd, goto ret; ret =pci_endpoint_test_bar (test, bar);break ; -case PCITEST_LEGACY_IRQ : - ret =pci_endpoint_test_legacy_irq (test); +case PCITEST_INTX_IRQ : + ret =pci_endpoint_test_intx_irq (test);break ;case PCITEST_MSI :case PCITEST_MSIX :
@@ -801,7 +801,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, test->irq_type =IRQ_TYPE_UNDEFINED ;if (no_msi) - irq_type =IRQ_TYPE_LEGACY ; + irq_type =IRQ_TYPE_INTX ; data = (struct pci_endpoint_test_data *)ent->driver_data;if (data) {
include/uapi/linux/pcitest.h +2 -1
@@ -11,7 +11,8 @@#define __UAPI_LINUX_PCITEST_H#define PCITEST_BAR _IO('P', 0x1) -#define PCITEST_LEGACY_IRQ _IO('P', 0x2) +#define PCITEST_INTX_IRQ _IO('P', 0x2) +#define PCITEST_LEGACY_IRQ PCITEST_INTX_IRQ#define PCITEST_MSI _IOW('P', 0x3, int)#define PCITEST_WRITE _IOW('P', 0x4, unsigned long)#define PCITEST_READ _IOW('P', 0x5, unsigned long)
Signature · 1 line
2.42.0
PATCH v4 6/16 PCI: portdrv: Use PCI_IRQ_INTX
In reply to Damien Le MoalIn the PCI Express Port Bus Driver, use the macro PCI_IRQ_INTX instead of the now deprecated PCI_IRQ_LEGACY macro.
--- drivers/pci/pcie/portdrv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pci/pcie/portdrv.c +4 -4
@@ -187,15 +187,15 @@ static int pcie_init_service_irqs(struct pci_dev *dev, int *irqs, int mask)* interrupt. */ if ((mask &PCIE_PORT_SERVICE_PME ) &&pcie_pme_no_msi ()) - goto legacy_irq; + goto intx_irq;/* Try to use MSI-X or MSI if supported */ if (pcie_port_enable_irq_vec (dev, irqs, mask) ==0 )return 0 ; -legacy_irq: -/* fall back to legacy IRQ */ - ret =pci_alloc_irq_vectors (dev,1 ,1 ,PCI_IRQ_LEGACY ); +intx_irq: +/* fall back to INTX IRQ */ + ret =pci_alloc_irq_vectors (dev,1 ,1 ,PCI_IRQ_INTX );if (ret <0 )return -ENODEV ;
Signature · 1 line
2.42.0
PATCH v4 7/16 PCI: dra7xx: Rename dra7xx_pcie_raise_legacy_irq()
In reply to Damien Le MoalRename the function dra7xx_pcie_raise_legacy_irq() to dra7xx_pcie_raise_intx_irq() to match the use of the PCI_IRQ_INTX macro.
--- drivers/pci/controller/dwc/pci-dra7xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/dwc/pci-dra7xx.c +2 -2
@@ -386,7 +386,7 @@ static void dra7xx_pcie_ep_init(struct dw_pcie_ep *ep)dra7xx_pcie_enable_wrapper_interrupts (dra7xx); } -static void dra7xx_pcie_raise_legacy_irq (struct dra7xx_pcie *dra7xx) +static void dra7xx_pcie_raise_intx_irq (struct dra7xx_pcie *dra7xx) {dra7xx_pcie_writel (dra7xx,PCIECTRL_TI_CONF_INTX_ASSERT ,0x1 );mdelay (1 );
@@ -411,7 +411,7 @@ static int dra7xx_pcie_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -dra7xx_pcie_raise_legacy_irq (dra7xx); +dra7xx_pcie_raise_intx_irq (dra7xx);break ;case PCI_IRQ_MSI :dra7xx_pcie_raise_msi_irq (dra7xx, interrupt_num);
Signature · 1 line
2.42.0
PATCH v4 8/16 PCI: cadence: Use INTX instead of legacy
In reply to Damien Le MoalIn the Cadence endpoint controller driver, rename the function cdns_pcie_ep_send_legacy_irq() to cdns_pcie_ep_send_intx_irq() to match the macro PCI_IRQ_INTX name. Related comments and messages mentioning "legacy" are also changed to refer to "intx".
--- drivers/pci/controller/cadence/pcie-cadence-ep.c | 10 +++++----- drivers/pci/controller/cadence/pcie-cadence.h | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/pci/controller/cadence/pcie-cadence-ep.c +5 -5
@@ -360,8 +360,8 @@ static void cdns_pcie_ep_assert_intx(struct cdns_pcie_ep *ep, u8 fn, u8 intx,writel (0 , ep->irq_cpu_addr + offset); } -static int cdns_pcie_ep_send_legacy_irq (struct cdns_pcie_ep *ep,u8 fn,u8 vfn, -u8 intx) +static int cdns_pcie_ep_send_intx_irq (struct cdns_pcie_ep *ep,u8 fn,u8 vfn, +u8 intx) {u16 cmd;
@@ -371,7 +371,7 @@ static int cdns_pcie_ep_send_legacy_irq(struct cdns_pcie_ep *ep, u8 fn, u8 vfn,cdns_pcie_ep_assert_intx (ep, fn, intx, true);/* -* The mdelay() value was taken from dra7xx_pcie_raise_legacy_irq() +* The mdelay() value was taken from dra7xx_pcie_raise_intx_irq() */ mdelay (1 );cdns_pcie_ep_assert_intx (ep, fn, intx, false);
@@ -541,10 +541,10 @@ static int cdns_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn,switch (type) {case PCI_IRQ_INTX :if (vfn >0 ) { -dev_err (dev,"Cannot raise legacy interrupts for VF\n" ); +dev_err (dev,"Cannot raise INTX interrupts for VF\n" );return -EINVAL ; } -return cdns_pcie_ep_send_legacy_irq (ep, fn, vfn,0 ); +return cdns_pcie_ep_send_intx_irq (ep, fn, vfn,0 );case PCI_IRQ_MSI :return cdns_pcie_ep_send_msi_irq (ep, fn, vfn, interrupt_num);
drivers/pci/controller/cadence/pcie-cadence.h +6 -6
@@ -347,16 +347,16 @@ struct cdns_pcie_epf {* @max_regions: maximum number of regions supported by hardware * @ob_region_map: bitmask of mapped outbound regions * @ob_addr: base addresses in the AXI bus where the outbound regions start -* @irq_phys_addr: base address on the AXI bus where the MSI/legacy IRQ +* @irq_phys_addr: base address on the AXI bus where the MSI/INTX IRQ * dedicated outbound regions is mapped. * @irq_cpu_addr: base address in the CPU space where a write access triggers -* the sending of a memory write (MSI) / normal message (legacy +* the sending of a memory write (MSI) / normal message (INTX * IRQ) TLP through the PCIe bus. -* @irq_pci_addr: used to save the current mapping of the MSI/legacy IRQ +* @irq_pci_addr: used to save the current mapping of the MSI/INTX IRQ * dedicated outbound region. * @irq_pci_fn: the latest PCI function that has updated the mapping of -* the MSI/legacy IRQ dedicated outbound region. -* @irq_pending: bitmask of asserted legacy IRQs. +* the MSI/INTX IRQ dedicated outbound region. +* @irq_pending: bitmask of asserted INTX IRQs. * @lock: spin lock to disable interrupts while modifying PCIe controller * registers fields (RMW) accessible by both remote RC and EP to * minimize time between read and write
@@ -374,7 +374,7 @@ struct cdns_pcie_ep {u64 irq_pci_addr;u8 irq_pci_fn;u8 irq_pending; -/* protect writing to PCI_STATUS while raising legacy interrupts */ +/* protect writing to PCI_STATUS while raising INTX interrupts */ spinlock_t lock;struct cdns_pcie_epf *epf; unsigned int quirk_detect_quiet_flag:1;
Signature · 1 line
2.42.0
PATCH v4 9/16 PCI: dwc: Rename dw_pcie_ep_raise_legacy_irq()
In reply to Damien Le MoalRename the function dw_pcie_ep_raise_legacy_irq() of the Designware endpoint controller driver to dw_pcie_ep_raise_intx_irq() to match the name of the PCI_IRQ_INTX macro.
--- drivers/pci/controller/dwc/pci-imx6.c | 2 +- drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- drivers/pci/controller/dwc/pcie-designware-ep.c | 6 +++--- drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +- drivers/pci/controller/dwc/pcie-designware.h | 4 ++-- drivers/pci/controller/dwc/pcie-qcom-ep.c | 2 +- drivers/pci/controller/dwc/pcie-rcar-gen4.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-)
drivers/pci/controller/dwc/pci-imx6.c +1 -1
@@ -1064,7 +1064,7 @@ static int imx6_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);case PCI_IRQ_MSIX :
drivers/pci/controller/dwc/pci-layerscape-ep.c +1 -1
@@ -172,7 +172,7 @@ static int ls_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);case PCI_IRQ_MSIX :
drivers/pci/controller/dwc/pcie-designware-ep.c +3 -3
@@ -496,16 +496,16 @@ static const struct pci_epc_ops epc_ops = { .get_features = dw_pcie_ep_get_features, }; -int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no) +int dw_pcie_ep_raise_intx_irq (struct dw_pcie_ep *ep,u8 func_no) {struct dw_pcie *pci =to_dw_pcie_from_ep (ep);struct device *dev = pci->dev; -dev_err (dev,"EP cannot trigger legacy IRQs\n" ); +dev_err (dev,"EP cannot raise INTX IRQs\n" );return -EINVAL ; } -EXPORT_SYMBOL_GPL (dw_pcie_ep_raise_legacy_irq); +EXPORT_SYMBOL_GPL (dw_pcie_ep_raise_intx_irq);int dw_pcie_ep_raise_msi_irq (struct dw_pcie_ep *ep,u8 func_no,u8 interrupt_num)
drivers/pci/controller/dwc/pcie-designware-plat.c +1 -1
@@ -48,7 +48,7 @@ static int dw_plat_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);case PCI_IRQ_MSIX :
drivers/pci/controller/dwc/pcie-designware.h +2 -2
@@ -580,7 +580,7 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep);int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep);void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep); -int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no); +int dw_pcie_ep_raise_intx_irq (struct dw_pcie_ep *ep,u8 func_no);int dw_pcie_ep_raise_msi_irq (struct dw_pcie_ep *ep,u8 func_no,u8 interrupt_num); int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
@@ -613,7 +613,7 @@ static inline void dw_pcie_ep_exit(struct dw_pcie_ep *ep) { } -static inline int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no) +static inline int dw_pcie_ep_raise_intx_irq (struct dw_pcie_ep *ep,u8 func_no) {return 0 ; }
drivers/pci/controller/dwc/pcie-qcom-ep.c +1 -1
@@ -732,7 +732,7 @@ static int qcom_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);default :
drivers/pci/controller/dwc/pcie-rcar-gen4.c +1 -1
@@ -368,7 +368,7 @@ static int rcar_gen4_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);default :
Signature · 1 line
2.42.0
PATCH v4 10/16 PCI: keystone: Use INTX instead of legacy
In reply to Damien Le MoalIn the Keystone controller driver, change all names using "legacy" to use "intx" instead, to match the term used in the PCI specifications. Given that the field legacy_intc_np of struct keystone_pcie is unused, this field is removed instead of being renamed.
--- drivers/pci/controller/dwc/pci-keystone.c | 77 +++++++++++------------ 1 file changed, 37 insertions(+), 40 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +37 -40
@@ -115,8 +115,7 @@ struct keystone_pcie {struct dw_pcie *pci;/* PCI Device ID */ u32 device_id; -int legacy_host_irqs[PCI_NUM_INTX ]; -struct device_node *legacy_intc_np; +int intx_host_irqs[PCI_NUM_INTX ];int msi_host_irq;int num_lanes;
@@ -124,7 +123,7 @@ struct keystone_pcie {struct phy **phy;struct device_link **link;struct device_node *msi_intc_np; -struct irq_domain *legacy_irq_domain; +struct irq_domain *intx_irq_domain;struct device_node *np;/* Application register space */
@@ -252,8 +251,8 @@ static int ks_pcie_msi_host_init(struct dw_pcie_rp *pp)return dw_pcie_allocate_domains (pp); } -static void ks_pcie_handle_legacy_irq (struct keystone_pcie *ks_pcie, -int offset) +static void ks_pcie_handle_intx_irq (struct keystone_pcie *ks_pcie, +int offset) {struct dw_pcie *pci = ks_pcie->pci;struct device *dev = pci->dev;
@@ -263,7 +262,7 @@ static void ks_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie,if (BIT (0 ) & pending) {dev_dbg (dev,": irq: irq_offset %d" , offset); -generic_handle_domain_irq (ks_pcie->legacy_irq_domain, offset); +generic_handle_domain_irq (ks_pcie->intx_irq_domain, offset); }/* EOI the INTx interrupt */
@@ -307,38 +306,37 @@ static irqreturn_t ks_pcie_handle_error_irq(struct keystone_pcie *ks_pcie)return IRQ_HANDLED ; } -static void ks_pcie_ack_legacy_irq (struct irq_data *d) +static void ks_pcie_ack_intx_irq (struct irq_data *d) { } -static void ks_pcie_mask_legacy_irq (struct irq_data *d) +static void ks_pcie_mask_intx_irq (struct irq_data *d) { } -static void ks_pcie_unmask_legacy_irq (struct irq_data *d) +static void ks_pcie_unmask_intx_irq (struct irq_data *d) { } -static struct irq_chip ks_pcie_legacy_irq_chip = { - .name ="Keystone-PCI-Legacy-IRQ" , - .irq_ack = ks_pcie_ack_legacy_irq, - .irq_mask = ks_pcie_mask_legacy_irq, - .irq_unmask = ks_pcie_unmask_legacy_irq, +static struct irq_chip ks_pcie_intx_irq_chip = { + .name ="Keystone-PCI-INTX-IRQ" , + .irq_ack = ks_pcie_ack_intx_irq, + .irq_mask = ks_pcie_mask_intx_irq, + .irq_unmask = ks_pcie_unmask_intx_irq, }; -static int ks_pcie_init_legacy_irq_map (struct irq_domain *d, -unsigned int irq, -irq_hw_number_t hw_irq) +static int ks_pcie_init_intx_irq_map (struct irq_domain *d, +unsigned int irq,irq_hw_number_t hw_irq) { -irq_set_chip_and_handler (irq, &ks_pcie_legacy_irq_chip, +irq_set_chip_and_handler (irq, &ks_pcie_intx_irq_chip, handle_level_irq);irq_set_chip_data (irq, d->host_data);return 0 ; } -static const struct irq_domain_ops ks_pcie_legacy_irq_domain_ops = { - .map = ks_pcie_init_legacy_irq_map, +static const struct irq_domain_ops ks_pcie_intx_irq_domain_ops = { + .map = ks_pcie_init_intx_irq_map, .xlate = irq_domain_xlate_onetwocell, };
@@ -605,22 +603,22 @@ static void ks_pcie_msi_irq_handler(struct irq_desc *desc) }/** -* ks_pcie_legacy_irq_handler() - Handle legacy interrupt +* ks_pcie_intx_irq_handler() - Handle INTX interrupt * @desc: Pointer to irq descriptor * -* Traverse through pending legacy interrupts and invoke handler for each. Also +* Traverse through pending INTX interrupts and invoke handler for each. Also * takes care of interrupt controller level mask/ack operation. */ -static void ks_pcie_legacy_irq_handler (struct irq_desc *desc) +static void ks_pcie_intx_irq_handler (struct irq_desc *desc) {unsigned int irq =irq_desc_get_irq (desc);struct keystone_pcie *ks_pcie =irq_desc_get_handler_data (desc);struct dw_pcie *pci = ks_pcie->pci;struct device *dev = pci->dev; -u32 irq_offset = irq - ks_pcie->legacy_host_irqs[0 ]; +u32 irq_offset = irq - ks_pcie->intx_host_irqs[0 ];struct irq_chip *chip =irq_desc_get_chip (desc); -dev_dbg (dev,": Handling legacy irq %d\n" , irq); +dev_dbg (dev,": Handling INTX irq %d\n" , irq);/* * The chained irq handler installation would have replaced normal
@@ -628,7 +626,7 @@ static void ks_pcie_legacy_irq_handler(struct irq_desc *desc)* ack operation. */ chained_irq_enter (chip, desc); -ks_pcie_handle_legacy_irq (ks_pcie, irq_offset); +ks_pcie_handle_intx_irq (ks_pcie, irq_offset);chained_irq_exit (chip, desc); }
@@ -686,10 +684,10 @@ static int ks_pcie_config_msi_irq(struct keystone_pcie *ks_pcie)return ret; } -static int ks_pcie_config_legacy_irq (struct keystone_pcie *ks_pcie) +static int ks_pcie_config_intx_irq (struct keystone_pcie *ks_pcie) {struct device *dev = ks_pcie->pci->dev; -struct irq_domain *legacy_irq_domain; +struct irq_domain *intx_irq_domain;struct device_node *np = ks_pcie->np;struct device_node *intc_np;int irq_count, irq, ret =0 , i;
@@ -697,7 +695,7 @@ static int ks_pcie_config_legacy_irq(struct keystone_pcie *ks_pcie) intc_np =of_get_child_by_name (np,"legacy-interrupt-controller" );if (!intc_np) {/* -* Since legacy interrupts are modeled as edge-interrupts in +* Since INTX interrupts are modeled as edge-interrupts in * AM6, keep it disabled for now. */ if (ks_pcie->is_am6)
@@ -719,22 +717,21 @@ static int ks_pcie_config_legacy_irq(struct keystone_pcie *ks_pcie) ret = -EINVAL ; goto err; } - ks_pcie->legacy_host_irqs[i] = irq; + ks_pcie->intx_host_irqs[i] = irq;irq_set_chained_handler_and_data (irq, - ks_pcie_legacy_irq_handler, + ks_pcie_intx_irq_handler, ks_pcie); } - legacy_irq_domain = -irq_domain_add_linear (intc_np,PCI_NUM_INTX , - &ks_pcie_legacy_irq_domain_ops,NULL ); -if (!legacy_irq_domain) { -dev_err (dev,"Failed to add irq domain for legacy irqs\n" ); + intx_irq_domain =irq_domain_add_linear (intc_np,PCI_NUM_INTX , + &ks_pcie_intx_irq_domain_ops,NULL ); +if (!intx_irq_domain) { +dev_err (dev,"Failed to add irq domain for INTX irqs\n" ); ret = -EINVAL ; goto err; } - ks_pcie->legacy_irq_domain = legacy_irq_domain; + ks_pcie->intx_irq_domain = intx_irq_domain;for (i =0 ; i <PCI_NUM_INTX ; i++)ks_pcie_app_writel (ks_pcie,IRQ_ENABLE_SET (i), INTx_EN);
@@ -808,7 +805,7 @@ static int __init ks_pcie_host_init(struct dw_pcie_rp *pp)if (!ks_pcie->is_am6) pp->bridge->child_ops = &ks_child_pcie_ops; - ret =ks_pcie_config_legacy_irq (ks_pcie); + ret =ks_pcie_config_intx_irq (ks_pcie);if (ret)return ret;
@@ -881,7 +878,7 @@ static void ks_pcie_am654_ep_init(struct dw_pcie_ep *ep)dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 , flags); } -static void ks_pcie_am654_raise_legacy_irq (struct keystone_pcie *ks_pcie) +static void ks_pcie_am654_raise_intx_irq (struct keystone_pcie *ks_pcie) {struct dw_pcie *pci = ks_pcie->pci;u8 int_pin;
@@ -907,7 +904,7 @@ static int ks_pcie_am654_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -ks_pcie_am654_raise_legacy_irq (ks_pcie); +ks_pcie_am654_raise_intx_irq (ks_pcie);break ;case PCI_IRQ_MSI :dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);
Signature · 1 line
2.42.0
PATCH v4 11/16 PCI: dw-rockchip: Rename rockchip_pcie_legacy_int_handler()
In reply to Damien Le MoalRename the function rockchip_pcie_legacy_int_handler() to rockchip_pcie_intx_handler() to match the code managing INTX interrupts (e.g. intx_domain_ops) and the term used in the PCI specifications.
--- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/dwc/pcie-dw-rockchip.c +2 -2
@@ -72,7 +72,7 @@ static void rockchip_pcie_writel_apb(struct rockchip_pcie *rockchip,writel_relaxed (val, rockchip->apb_base + reg); } -static void rockchip_pcie_legacy_int_handler (struct irq_desc *desc) +static void rockchip_pcie_intx_handler (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct rockchip_pcie *rockchip =irq_desc_get_handler_data (desc);
@@ -202,7 +202,7 @@ static int rockchip_pcie_host_init(struct dw_pcie_rp *pp)if (ret <0 )dev_err (dev,"failed to init irq domain\n" ); -irq_set_chained_handler_and_data (irq, rockchip_pcie_legacy_int_handler, +irq_set_chained_handler_and_data (irq, rockchip_pcie_intx_handler, rockchip);/* LTSSM enable control mode */
Signature · 1 line
2.42.0
PATCH v4 12/16 PCI: tegra194: Use INTX instead of legacy
In reply to Damien Le MoalIn the Designware tegra194 controller driver, change all names using "legacy" to use "intx", to match the term used in the PCI specifications.
--- drivers/pci/controller/dwc/pcie-tegra194.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pcie-tegra194.c +5 -5
@@ -773,13 +773,13 @@ static void tegra_pcie_enable_system_interrupts(struct dw_pcie_rp *pp) val_w); } -static void tegra_pcie_enable_legacy_interrupts (struct dw_pcie_rp *pp) +static void tegra_pcie_enable_intx_interrupts (struct dw_pcie_rp *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct tegra_pcie_dw *pcie =to_tegra_pcie (pci);u32 val; -/* Enable legacy interrupt generation */ +/* Enable INTX interrupt generation */ val =appl_readl (pcie,APPL_INTR_EN_L0_0 ); val |=APPL_INTR_EN_L0_0_SYS_INTR_EN ; val |=APPL_INTR_EN_L0_0_INT_INT_EN ;
@@ -830,7 +830,7 @@ static void tegra_pcie_enable_interrupts(struct dw_pcie_rp *pp)appl_writel (pcie,0xFFFFFFFF ,APPL_INTR_STATUS_L1_17 );tegra_pcie_enable_system_interrupts (pp); -tegra_pcie_enable_legacy_interrupts (pp); +tegra_pcie_enable_intx_interrupts (pp);if (IS_ENABLED (CONFIG_PCI_MSI ))tegra_pcie_enable_msi_interrupts (pp); }
@@ -1947,7 +1947,7 @@ static irqreturn_t tegra_pcie_ep_pex_rst_irq(int irq, void *arg)return IRQ_HANDLED ; } -static int tegra_pcie_ep_raise_legacy_irq (struct tegra_pcie_dw *pcie,u16 irq) +static int tegra_pcie_ep_raise_intx_irq (struct tegra_pcie_dw *pcie,u16 irq) {/* Tegra194 supports only INTA */ if (irq >1 )
@@ -1986,7 +1986,7 @@ static int tegra_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return tegra_pcie_ep_raise_legacy_irq (pcie, interrupt_num); +return tegra_pcie_ep_raise_intx_irq (pcie, interrupt_num);case PCI_IRQ_MSI :return tegra_pcie_ep_raise_msi_irq (pcie, interrupt_num);
Signature · 1 line
2.42.0
PATCH v4 13/16 PCI: uniphier: Use INTX instead of legacy
In reply to Damien Le MoalIn the Designware uniphier controller driver, including the endpoint driver, change all names using "legacy" to use "intx", to match the term used in the PCI specifications.
--- drivers/pci/controller/dwc/pcie-uniphier-ep.c | 4 ++-- drivers/pci/controller/dwc/pcie-uniphier.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/pci/controller/dwc/pcie-uniphier-ep.c +2 -2
@@ -212,7 +212,7 @@ static void uniphier_pcie_ep_init(struct dw_pcie_ep *ep)dw_pcie_ep_reset_bar (pci, bar); } -static int uniphier_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep) +static int uniphier_pcie_ep_raise_intx_irq (struct dw_pcie_ep *ep) {struct dw_pcie *pci =to_dw_pcie_from_ep (ep);struct uniphier_pcie_ep_priv *priv =to_uniphier_pcie (pci);
@@ -262,7 +262,7 @@ static int uniphier_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return uniphier_pcie_ep_raise_legacy_irq (ep); +return uniphier_pcie_ep_raise_intx_irq (ep);case PCI_IRQ_MSI :return uniphier_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);
drivers/pci/controller/dwc/pcie-uniphier.c +6 -6
@@ -67,7 +67,7 @@ struct uniphier_pcie {struct clk *clk;struct reset_control *rst;struct phy *phy; -struct irq_domain *legacy_irq_domain; +struct irq_domain *intx_irq_domain; };#define to_uniphier_pcie (x) dev_get_drvdata((x)->dev)
@@ -253,12 +253,12 @@ static void uniphier_pcie_irq_handler(struct irq_desc *desc) reg =FIELD_GET (PCL_RCV_INTX_ALL_STATUS , val);for_each_set_bit (bit, ®,PCI_NUM_INTX ) -generic_handle_domain_irq (pcie->legacy_irq_domain, bit); +generic_handle_domain_irq (pcie->intx_irq_domain, bit);chained_irq_exit (chip, desc); } -static int uniphier_pcie_config_legacy_irq (struct dw_pcie_rp *pp) +static int uniphier_pcie_config_intx_irq (struct dw_pcie_rp *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct uniphier_pcie *pcie =to_uniphier_pcie (pci);
@@ -279,9 +279,9 @@ static int uniphier_pcie_config_legacy_irq(struct dw_pcie_rp *pp) goto out_put_node; } - pcie->legacy_irq_domain =irq_domain_add_linear (np_intc,PCI_NUM_INTX , + pcie->intx_irq_domain =irq_domain_add_linear (np_intc,PCI_NUM_INTX , &uniphier_intx_domain_ops, pp); -if (!pcie->legacy_irq_domain) { +if (!pcie->intx_irq_domain) {dev_err (pci->dev,"Failed to get INTx domain\n" ); ret = -ENODEV ; goto out_put_node;
@@ -301,7 +301,7 @@ static int uniphier_pcie_host_init(struct dw_pcie_rp *pp)struct uniphier_pcie *pcie =to_uniphier_pcie (pci);int ret; - ret =uniphier_pcie_config_legacy_irq (pp); + ret =uniphier_pcie_config_intx_irq (pp);if (ret)return ret;
Signature · 1 line
2.42.0
PATCH v4 14/16 PCI: rockchip-ep: Use INTX instead of legacy
In reply to Damien Le MoalRename the function rockchip_pcie_ep_send_legacy_irq() of the rockchip endpoint driver to rockchip_pcie_ep_send_intx_irq(). Uses of the term "legacy" are also replaced with "INTX" in comments.
--- drivers/pci/controller/pcie-rockchip-ep.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pci/controller/pcie-rockchip-ep.c +8 -8
@@ -26,16 +26,16 @@* @max_regions: maximum number of regions supported by hardware * @ob_region_map: bitmask of mapped outbound regions * @ob_addr: base addresses in the AXI bus where the outbound regions start -* @irq_phys_addr: base address on the AXI bus where the MSI/legacy IRQ +* @irq_phys_addr: base address on the AXI bus where the MSI/INTX IRQ * dedicated outbound regions is mapped. * @irq_cpu_addr: base address in the CPU space where a write access triggers -* the sending of a memory write (MSI) / normal message (legacy +* the sending of a memory write (MSI) / normal message (INTX * IRQ) TLP through the PCIe bus. -* @irq_pci_addr: used to save the current mapping of the MSI/legacy IRQ +* @irq_pci_addr: used to save the current mapping of the MSI/INTX IRQ * dedicated outbound region. * @irq_pci_fn: the latest PCI function that has updated the mapping of -* the MSI/legacy IRQ dedicated outbound region. -* @irq_pending: bitmask of asserted legacy IRQs. +* the MSI/INTX IRQ dedicated outbound region. +* @irq_pending: bitmask of asserted INTX IRQs. */ struct rockchip_pcie_ep {struct rockchip_pcie rockchip;
@@ -325,8 +325,8 @@ static void rockchip_pcie_ep_assert_intx(struct rockchip_pcie_ep *ep, u8 fn, } } -static int rockchip_pcie_ep_send_legacy_irq (struct rockchip_pcie_ep *ep,u8 fn, -u8 intx) +static int rockchip_pcie_ep_send_intx_irq (struct rockchip_pcie_ep *ep,u8 fn, +u8 intx) {u16 cmd;
@@ -413,7 +413,7 @@ static int rockchip_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn,switch (type) {case PCI_IRQ_INTX : -return rockchip_pcie_ep_send_legacy_irq (ep, fn,0 ); +return rockchip_pcie_ep_send_intx_irq (ep, fn,0 );case PCI_IRQ_MSI :return rockchip_pcie_ep_send_msi_irq (ep, fn, interrupt_num);default :
Signature · 1 line
2.42.0
PATCH v4 15/16 PCI: rockchip-host: Rename rockchip_pcie_legacy_int_handler()
In reply to Damien Le MoalRename the function rockchip_pcie_legacy_int_handler() of the rockchip host driver to rockchip_pcie_intx_handler() to match the PCI_IRQ_INTX macro name used to control this function execution, and to match the term used in the PCI specifications.
--- drivers/pci/controller/pcie-rockchip-host.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-rockchip-host.c +2 -2
@@ -505,7 +505,7 @@ static irqreturn_t rockchip_pcie_client_irq_handler(int irq, void *arg)return IRQ_HANDLED ; } -static void rockchip_pcie_legacy_int_handler (struct irq_desc *desc) +static void rockchip_pcie_intx_handler (struct irq_desc *desc) {struct irq_chip *chip =irq_desc_get_chip (desc);struct rockchip_pcie *rockchip =irq_desc_get_handler_data (desc);
@@ -553,7 +553,7 @@ static int rockchip_pcie_setup_irq(struct rockchip_pcie *rockchip)return irq;irq_set_chained_handler_and_data (irq, - rockchip_pcie_legacy_int_handler, + rockchip_pcie_intx_handler, rockchip); irq =platform_get_irq_byname (pdev,"client" );
Signature · 1 line
2.42.0
PATCH v4 16/16 PCI: xilinx-nwl: Use INTX instead of legacy
In reply to Damien Le MoalIn the xilinx-nwl controller driver, change all use of "legacy" and "leg" to "intx", to match the term used in the PCI specifications.
--- drivers/pci/controller/pcie-xilinx-nwl.c | 52 ++++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/pci/controller/pcie-xilinx-nwl.c +26 -26
@@ -166,7 +166,7 @@ struct nwl_pcie {int irq_intx;int irq_misc;struct nwl_msi msi; -struct irq_domain *legacy_irq_domain; +struct irq_domain *intx_irq_domain;struct clk *clk;raw_spinlock_t leg_mask_lock; };
@@ -324,7 +324,7 @@ static void nwl_pcie_leg_handler(struct irq_desc *desc)while ((status =nwl_bridge_readl (pcie,MSGF_LEG_STATUS ) &MSGF_LEG_SR_MASKALL ) !=0 ) {for_each_set_bit (bit, &status,PCI_NUM_INTX ) -generic_handle_domain_irq (pcie->legacy_irq_domain, bit); +generic_handle_domain_irq (pcie->intx_irq_domain, bit); }chained_irq_exit (chip, desc);
@@ -364,7 +364,7 @@ static void nwl_pcie_msi_handler_low(struct irq_desc *desc)chained_irq_exit (chip, desc); } -static void nwl_mask_leg_irq (struct irq_data *data) +static void nwl_mask_intx_irq (struct irq_data *data) {struct nwl_pcie *pcie =irq_data_get_irq_chip_data (data);unsigned long flags;
@@ -378,7 +378,7 @@ static void nwl_mask_leg_irq(struct irq_data *data)raw_spin_unlock_irqrestore (&pcie->leg_mask_lock, flags); } -static void nwl_unmask_leg_irq (struct irq_data *data) +static void nwl_unmask_intx_irq (struct irq_data *data) {struct nwl_pcie *pcie =irq_data_get_irq_chip_data (data);unsigned long flags;
@@ -392,26 +392,26 @@ static void nwl_unmask_leg_irq(struct irq_data *data)raw_spin_unlock_irqrestore (&pcie->leg_mask_lock, flags); } -static struct irq_chip nwl_leg_irq_chip = { +static struct irq_chip nwl_intx_irq_chip = { .name ="nwl_pcie:legacy" , - .irq_enable = nwl_unmask_leg_irq, - .irq_disable = nwl_mask_leg_irq, - .irq_mask = nwl_mask_leg_irq, - .irq_unmask = nwl_unmask_leg_irq, + .irq_enable = nwl_unmask_intx_irq, + .irq_disable = nwl_mask_intx_irq, + .irq_mask = nwl_mask_intx_irq, + .irq_unmask = nwl_unmask_intx_irq, }; -static int nwl_legacy_map (struct irq_domain *domain,unsigned int irq, -irq_hw_number_t hwirq) +static int nwl_intx_map (struct irq_domain *domain,unsigned int irq, +irq_hw_number_t hwirq) { -irq_set_chip_and_handler (irq, &nwl_leg_irq_chip, handle_level_irq); +irq_set_chip_and_handler (irq, &nwl_intx_irq_chip, handle_level_irq);irq_set_chip_data (irq, domain->host_data);irq_set_status_flags (irq,IRQ_LEVEL );return 0 ; } -static const struct irq_domain_ops legacy_domain_ops = { - .map = nwl_legacy_map, +static const struct irq_domain_ops intx_domain_ops = { + .map = nwl_intx_map, .xlate = pci_irqd_intx_xlate, };
@@ -525,20 +525,20 @@ static int nwl_pcie_init_irq_domain(struct nwl_pcie *pcie) {struct device *dev = pcie->dev;struct device_node *node = dev->of_node; -struct device_node *legacy_intc_node; +struct device_node *intc_node; - legacy_intc_node =of_get_next_child (node,NULL ); -if (!legacy_intc_node) { + intc_node =of_get_next_child (node,NULL ); +if (!intc_node) {dev_err (dev,"No legacy intc node found\n" );return -EINVAL ; } - pcie->legacy_irq_domain =irq_domain_add_linear (legacy_intc_node, -PCI_NUM_INTX , - &legacy_domain_ops, - pcie); -of_node_put (legacy_intc_node); -if (!pcie->legacy_irq_domain) { + pcie->intx_irq_domain =irq_domain_add_linear (intc_node, +PCI_NUM_INTX , + &intx_domain_ops, + pcie); +of_node_put (intc_node); +if (!pcie->intx_irq_domain) {dev_err (dev,"failed to create IRQ domain\n" );return -ENOMEM ; }
@@ -710,14 +710,14 @@ static int nwl_pcie_bridge_init(struct nwl_pcie *pcie)/* Enable all misc interrupts */ nwl_bridge_writel (pcie,MSGF_MISC_SR_MASKALL ,MSGF_MISC_MASK ); -/* Disable all legacy interrupts */ +/* Disable all INTX interrupts */ nwl_bridge_writel (pcie, (u32 )~MSGF_LEG_SR_MASKALL ,MSGF_LEG_MASK ); -/* Clear pending legacy interrupts */ +/* Clear pending INTX interrupts */ nwl_bridge_writel (pcie,nwl_bridge_readl (pcie,MSGF_LEG_STATUS ) &MSGF_LEG_SR_MASKALL ,MSGF_LEG_STATUS ); -/* Enable all legacy interrupts */ +/* Enable all INTX interrupts */ nwl_bridge_writel (pcie,MSGF_LEG_SR_MASKALL ,MSGF_LEG_MASK );/* Enable the bridge config interrupt */
Signature · 1 line
2.42.0
Re: [PATCH v4 01/16] PCI: Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX
In reply to Damien Le MoalQuoted 7 lines · Damien Le Moal
From: Bjorn Helgaas <[email protected]>
Rename
PCI_IRQ_LEGACYtoPCI_IRQ_INTXto be more explicit about the type of IRQ being referenced as well as to match the PCI specifications terms. RedefinePCI_IRQ_LEGACYas an alias toPCI_IRQ_INTXto avoid the need for doing the renaming tree-wide. New drivers and new code should now prefer usingPCI_IRQ_INTXinstead ofPCI_IRQ_LEGACY.
Sorry for picking this horrible name back in the day.
(and please run a script to fix this up after the next -rc1)
Re: [PATCH v4 02/16] PCI: endpoint: Drop PCI_EPC_IRQ_XXX definitions
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 03/16] PCI: endpoint: Use INTX instead of legacy
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 04/16] PCI: endpoint: Rename LEGACY to INTX in test function driver
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 05/16] misc: pci_endpoint_test: Use INTX instead of LEGACY
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
In reply to Damien Le MoalQuoted 2 lines · Damien Le Moal
In the PCI Express Port Bus Driver, use the macro
PCI_IRQ_INTXinstead of the now deprecatedPCI_IRQ_LEGACYmacro.
I'd prefer to just script these cleanups in one big run to be honest..
Re: [PATCH v4 07/16] PCI: dra7xx: Rename dra7xx_pcie_raise_legacy_irq()
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 08/16] PCI: cadence: Use INTX instead of legacy
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 09/16] PCI: dwc: Rename dw_pcie_ep_raise_legacy_irq()
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 10/16] PCI: keystone: Use INTX instead of legacy
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 11/16] PCI: dw-rockchip: Rename rockchip_pcie_legacy_int_handler()
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 12/16] PCI: tegra194: Use INTX instead of legacy
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 13/16] PCI: uniphier: Use INTX instead of legacy
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 14/16] PCI: rockchip-ep: Use INTX instead of legacy
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 15/16] PCI: rockchip-host: Rename rockchip_pcie_legacy_int_handler()
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 16/16] PCI: xilinx-nwl: Use INTX instead of legacy
In reply to Damien Le MoalLooks good:
Re: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
Quoted 2 lines · Damien Le Moal
In the PCI Express Port Bus Driver, use the macro
PCI_IRQ_INTXinstead of the now deprecatedPCI_IRQ_LEGACYmacro.I'd prefer to just script these cleanups in one big run to be honest..
I did not want to go as far as changing all drivers everywhere and limited the series to drivers/pci. We could do a coccinel script for everything else.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
Quoted 2 lines · Damien Le Moal
I did not want to go as far as changing all drivers everywhere and limited the series to
drivers/pci. We could do a coccinel script for everything else.
Yes. This is actually even trivial enough for sed :)
Re: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
Quoted 5 lines · Christoph Hellwig
Quoted 2 lines · Damien Le Moal
I did not want to go as far as changing all drivers everywhere and limited the series to
drivers/pci. We could do a coccinel script for everything else.Yes. This is actually even trivial enough for sed :)
Surprisingly, only 44 files use PCI_IRQ_LEGACY. Let me see how a patch look with the change.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
Quoted 9 lines · Damien Le Moal
Quoted 5 lines · Christoph Hellwig
Quoted 2 lines · Damien Le Moal
I did not want to go as far as changing all drivers everywhere and limited the series to
drivers/pci. We could do a coccinel script for everything else.Yes. This is actually even trivial enough for sed :)
Surprisingly, only 44 files use
PCI_IRQ_LEGACY. Let me see how a patch look with the change.
As mentioned in reply 1 I think this is perfect for a scripted run after -rc1.
I'm actually surprised PCI_IRQ_LEGACY is used even 44 times. There is really no point in using the APIs based on PCI_IRQ_ for legacy irqs, and the case where it is just supposed as a fallback are covered by PCI_IRQ_ALL_TYPES.
Re: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
Quoted 6 lines · Christoph Hellwig
Quoted 5 lines · Damien Le Moal
Quoted 4 lines · Christoph Hellwig
Quoted 2 lines · Damien Le Moal
I did not want to go as far as changing all drivers everywhere and limited the series to
drivers/pci. We could do a coccinel script for everything else.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Yes. This is actually even trivial enough for sed :)
Surprisingly, only 44 files use
PCI_IRQ_LEGACY. Let me see how a patch look with the change.As mentioned in reply 1 I think this is perfect for a scripted run after -rc1.
You mean 6.8-rc1 next cycle ?
Quoted 5 lines
I'm actually surprised
PCI_IRQ_LEGACYis used even 44 times. There is really no point in using the APIs based onPCI_IRQ_for legacy irqs, and the case where it is just supposed as a fallback are covered byPCI_IRQ_ALL_TYPES.
I had a closer look and if we want to do this correctly, there is more to do than just the rename of PCI_IRQ_LEGACY to PCI_IRQ_INTX. There is also NR_IRQS_LEGACY, some Kconfig options, functions that use "legacy_irq" in there name, etc. A big chunk is just the rename, but some drivers will need finer handling as otherwise we'll endup mixing up intx and legacy in the same code, which is not pretty/confusing.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
Quoted 4 lines · Damien Le Moal
Quoted 2 lines
As mentioned in reply 1 I think this is perfect for a scripted run after -rc1.
You mean 6.8-rc1 next cycle ?
Yes. 6.7-rc1 is over :)
Re: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
Quoted 7 lines · Christoph Hellwig
Quoted 4 lines · Damien Le Moal
Quoted 2 lines
As mentioned in reply 1 I think this is perfect for a scripted run after -rc1.
You mean 6.8-rc1 next cycle ?
Yes. 6.7-rc1 is over :)
OK.
Bjorn,
I can resend without this patch, or maybe you can drop it when applying. Let me know what you prefer.
Signature · 2 lines
Damien Le Moal Western Digital Research
Re: [PATCH v4 09/16] PCI: dwc: Rename dw_pcie_ep_raise_legacy_irq()
In reply to Damien Le MoalQuoted 5 lines · Damien Le Moal
Rename the function
dw_pcie_ep_raise_legacy_irq()of the Designware endpoint controller driver todw_pcie_ep_raise_intx_irq()to match the name of thePCI_IRQ_INTXmacro.Signed-off-by Damien Le Moal <[email protected]>
Looks good. Thanks for cleaning this up.
-Serge(y)
Quoted 124 lines
--- drivers/pci/controller/dwc/pci-imx6.c | 2 +- drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- drivers/pci/controller/dwc/pcie-designware-ep.c | 6 +++--- drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +- drivers/pci/controller/dwc/pcie-designware.h | 4 ++-- drivers/pci/controller/dwc/pcie-qcom-ep.c | 2 +- drivers/pci/controller/dwc/pcie-rcar-gen4.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-)drivers/pci/controller/dwc/pci-imx6.c +1
-1@@ -1064,7 +1064,7 @@ static int imx6_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);case PCI_IRQ_MSIX :drivers/pci/controller/dwc/pci-layerscape-ep.c +1
-1@@ -172,7 +172,7 @@ static int ls_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);case PCI_IRQ_MSIX :drivers/pci/controller/dwc/pcie-designware-ep.c +3
-3@@ -496,16 +496,16 @@ static const struct pci_epc_ops epc_ops = { .get_features = dw_pcie_ep_get_features, }; -int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no) +int dw_pcie_ep_raise_intx_irq (struct dw_pcie_ep *ep,u8 func_no) {struct dw_pcie *pci =to_dw_pcie_from_ep (ep);struct device *dev = pci->dev; -dev_err (dev,"EP cannot trigger legacy IRQs\n" ); +dev_err (dev,"EP cannot raise INTX IRQs\n" );return -EINVAL ; } -EXPORT_SYMBOL_GPL (dw_pcie_ep_raise_legacy_irq); +EXPORT_SYMBOL_GPL (dw_pcie_ep_raise_intx_irq);int dw_pcie_ep_raise_msi_irq (struct dw_pcie_ep *ep,u8 func_no,u8 interrupt_num)drivers/pci/controller/dwc/pcie-designware-plat.c +1
-1@@ -48,7 +48,7 @@ static int dw_plat_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);case PCI_IRQ_MSIX :drivers/pci/controller/dwc/pcie-designware.h +2
-2@@ -580,7 +580,7 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep);int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep);void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep); -int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no); +int dw_pcie_ep_raise_intx_irq (struct dw_pcie_ep *ep,u8 func_no);int dw_pcie_ep_raise_msi_irq (struct dw_pcie_ep *ep,u8 func_no,u8 interrupt_num); int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,@@ -613,7 +613,7 @@ static inline void dw_pcie_ep_exit(struct dw_pcie_ep *ep) { } -static inline int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no) +static inline int dw_pcie_ep_raise_intx_irq (struct dw_pcie_ep *ep,u8 func_no) {return 0 ; }drivers/pci/controller/dwc/pcie-qcom-ep.c +1
-1@@ -732,7 +732,7 @@ static int qcom_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);default :drivers/pci/controller/dwc/pcie-rcar-gen4.c +1
-1@@ -368,7 +368,7 @@ static int rcar_gen4_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,switch (type) {case PCI_IRQ_INTX : -return dw_pcie_ep_raise_legacy_irq (ep, func_no); +return dw_pcie_ep_raise_intx_irq (ep, func_no);case PCI_IRQ_MSI :return dw_pcie_ep_raise_msi_irq (ep, func_no, interrupt_num);default :Signature · 1 line
2.42.0
Quoted 9 lines · Damien Le Moal
The first patch renames
PCI_IRQ_LEGACYtoPCI_IRQ_INTXas suggested by Bjorn (hence the patch authorship is given to him). The second patch removes the redundant IRQ type definitionsPCI_EPC_IRQ_XXXand replace these with a direct use of thePCI_IRQ_XXXdefinitions. These 2 patches have been sent and reviewed previously but were never applied. Hence the resend with this new series version.The remaining patches rename functions and correct comments etc to refer to "intx" instead of "legacy".
Ping ?
Note that patch 6 can be dropped and we can do that sort of rename done in that patch on 6.8-rc1 once the series is applied.
Quoted 67 lines
Changes from v3:
- Added tags to patch 2
- Added patch 3 to 16Changes from v2:
- ModifiedPCI_IRQ_LEGACYcomment in patch 1 as suggested by Serge
- Fixed forgotten rename in patch 2Changes from v1:
- Updated first patch Signed-of tag and commit message as suggested by Bjorn.
- Added review tags.Bjorn Helgaas (1):
PCI: RenamePCI_IRQ_LEGACYtoPCI_IRQ_INTXDamien Le Moal (15):
PCI: endpoint: DropPCI_EPC_IRQ_XXXdefinitions
PCI: endpoint: Use INTX instead of legacy
PCI: endpoint: Rename LEGACY to INTX in test function driver
misc:pci_endpoint_test: Use INTX instead of LEGACY
PCI: portdrv: UsePCI_IRQ_INTX
PCI: dra7xx: Renamedra7xx_pcie_raise_legacy_irq()
PCI: cadence: Use INTX instead of legacy
PCI: dwc: Renamedw_pcie_ep_raise_legacy_irq()
PCI: keystone: Use INTX instead of legacy
PCI: dw-rockchip: Renamerockchip_pcie_legacy_int_handler()
PCI: tegra194: Use INTX instead of legacy
PCI: uniphier: Use INTX instead of legacy
PCI: rockchip-ep: Use INTX instead of legacy
PCI: rockchip-host: Renamerockchip_pcie_legacy_int_handler()
PCI: xilinx-nwl: Use INTX instead of legacydrivers/misc/pci_endpoint_test.c | 30 +++---- .../pci/controller/cadence/pcie-cadence-ep.c | 19 ++-- drivers/pci/controller/cadence/pcie-cadence.h | 12 +-- drivers/pci/controller/dwc/pci-dra7xx.c | 10 +-- drivers/pci/controller/dwc/pci-imx6.c | 11 ++- drivers/pci/controller/dwc/pci-keystone.c | 86 +++++++++---------- .../pci/controller/dwc/pci-layerscape-ep.c | 10 +-- drivers/pci/controller/dwc/pcie-artpec6.c | 8 +- .../pci/controller/dwc/pcie-designware-ep.c | 8 +- .../pci/controller/dwc/pcie-designware-plat.c | 11 ++- drivers/pci/controller/dwc/pcie-designware.h | 6 +- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 4 +- drivers/pci/controller/dwc/pcie-keembay.c | 13 ++- drivers/pci/controller/dwc/pcie-qcom-ep.c | 8 +- drivers/pci/controller/dwc/pcie-rcar-gen4.c | 9 +- drivers/pci/controller/dwc/pcie-tegra194.c | 19 ++-- drivers/pci/controller/dwc/pcie-uniphier-ep.c | 11 ++- drivers/pci/controller/dwc/pcie-uniphier.c | 12 +-- drivers/pci/controller/pcie-rcar-ep.c | 7 +- drivers/pci/controller/pcie-rockchip-ep.c | 23 +++-- drivers/pci/controller/pcie-rockchip-host.c | 4 +- drivers/pci/controller/pcie-xilinx-nwl.c | 52 +++++------ 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 | 14 +-- drivers/pci/endpoint/functions/pci-epf-vntb.c | 7 +- drivers/pci/endpoint/pci-epc-core.c | 6 +- drivers/pci/pcie/portdrv.c | 8 +- include/linux/pci-epc.h | 11 +-- include/linux/pci.h | 4 +- include/uapi/linux/pcitest.h | 3 +- 31 files changed, 206 insertions(+), 226 deletions(-)
Signature · 2 lines
Damien Le Moal Western Digital Research
Quoted 26 lines · Damien Le Moal
The first patch renames
PCI_IRQ_LEGACYtoPCI_IRQ_INTXas suggested by Bjorn (hence the patch authorship is given to him). The second patch removes the redundant IRQ type definitionsPCI_EPC_IRQ_XXXand replace these with a direct use of thePCI_IRQ_XXXdefinitions. These 2 patches have been sent and reviewed previously but were never applied. Hence the resend with this new series version.The remaining patches rename functions and correct comments etc to refer to "intx" instead of "legacy".
Changes from v3:
- Added tags to patch 2
- Added patch 3 to 16Changes from v2:
- ModifiedPCI_IRQ_LEGACYcomment in patch 1 as suggested by Serge
- Fixed forgotten rename in patch 2Changes from v1:
- Updated first patch Signed-of tag and commit message as suggested by Bjorn.
- Added review tags.Bjorn Helgaas (1):
PCI: RenamePCI_IRQ_LEGACYtoPCI_IRQ_INTX
Quoted 17 lines
Damien Le Moal (15):
PCI: endpoint: DropPCI_EPC_IRQ_XXXdefinitions
PCI: endpoint: Use INTX instead of legacy
PCI: endpoint: Rename LEGACY to INTX in test function driver
misc:pci_endpoint_test: Use INTX instead of LEGACY
PCI: portdrv: UsePCI_IRQ_INTX
PCI: dra7xx: Renamedra7xx_pcie_raise_legacy_irq()
PCI: cadence: Use INTX instead of legacy
PCI: dwc: Renamedw_pcie_ep_raise_legacy_irq()
PCI: keystone: Use INTX instead of legacy
PCI: dw-rockchip: Renamerockchip_pcie_legacy_int_handler()
PCI: tegra194: Use INTX instead of legacy
PCI: uniphier: Use INTX instead of legacy
PCI: rockchip-ep: Use INTX instead of legacy
PCI: rockchip-host: Renamerockchip_pcie_legacy_int_handler()
PCI: xilinx-nwl: Use INTX instead of legacy
For the series:
- Mani
Quoted 36 lines
drivers/misc/pci_endpoint_test.c | 30 +++---- .../pci/controller/cadence/pcie-cadence-ep.c | 19 ++-- drivers/pci/controller/cadence/pcie-cadence.h | 12 +-- drivers/pci/controller/dwc/pci-dra7xx.c | 10 +-- drivers/pci/controller/dwc/pci-imx6.c | 11 ++- drivers/pci/controller/dwc/pci-keystone.c | 86 +++++++++---------- .../pci/controller/dwc/pci-layerscape-ep.c | 10 +-- drivers/pci/controller/dwc/pcie-artpec6.c | 8 +- .../pci/controller/dwc/pcie-designware-ep.c | 8 +- .../pci/controller/dwc/pcie-designware-plat.c | 11 ++- drivers/pci/controller/dwc/pcie-designware.h | 6 +- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 4 +- drivers/pci/controller/dwc/pcie-keembay.c | 13 ++- drivers/pci/controller/dwc/pcie-qcom-ep.c | 8 +- drivers/pci/controller/dwc/pcie-rcar-gen4.c | 9 +- drivers/pci/controller/dwc/pcie-tegra194.c | 19 ++-- drivers/pci/controller/dwc/pcie-uniphier-ep.c | 11 ++- drivers/pci/controller/dwc/pcie-uniphier.c | 12 +-- drivers/pci/controller/pcie-rcar-ep.c | 7 +- drivers/pci/controller/pcie-rockchip-ep.c | 23 +++-- drivers/pci/controller/pcie-rockchip-host.c | 4 +- drivers/pci/controller/pcie-xilinx-nwl.c | 52 +++++------ 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 | 14 +-- drivers/pci/endpoint/functions/pci-epf-vntb.c | 7 +- drivers/pci/endpoint/pci-epc-core.c | 6 +- drivers/pci/pcie/portdrv.c | 8 +- include/linux/pci-epc.h | 11 +-- include/linux/pci.h | 4 +- include/uapi/linux/pcitest.h | 3 +- 31 files changed, 206 insertions(+), 226 deletions(-)Signature · 1 line
2.42.0
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Quoted 67 lines · Damien Le Moal
The first patch renames
PCI_IRQ_LEGACYtoPCI_IRQ_INTXas suggested by Bjorn (hence the patch authorship is given to him). The second patch removes the redundant IRQ type definitionsPCI_EPC_IRQ_XXXand replace these with a direct use of thePCI_IRQ_XXXdefinitions. These 2 patches have been sent and reviewed previously but were never applied. Hence the resend with this new series version.The remaining patches rename functions and correct comments etc to refer to "intx" instead of "legacy".
Changes from v3:
- Added tags to patch 2
- Added patch 3 to 16Changes from v2:
- ModifiedPCI_IRQ_LEGACYcomment in patch 1 as suggested by Serge
- Fixed forgotten rename in patch 2Changes from v1:
- Updated first patch Signed-of tag and commit message as suggested by Bjorn.
- Added review tags.Bjorn Helgaas (1):
PCI: RenamePCI_IRQ_LEGACYtoPCI_IRQ_INTXDamien Le Moal (15):
PCI: endpoint: DropPCI_EPC_IRQ_XXXdefinitions
PCI: endpoint: Use INTX instead of legacy
PCI: endpoint: Rename LEGACY to INTX in test function driver
misc:pci_endpoint_test: Use INTX instead of LEGACY
PCI: portdrv: UsePCI_IRQ_INTX
PCI: dra7xx: Renamedra7xx_pcie_raise_legacy_irq()
PCI: cadence: Use INTX instead of legacy
PCI: dwc: Renamedw_pcie_ep_raise_legacy_irq()
PCI: keystone: Use INTX instead of legacy
PCI: dw-rockchip: Renamerockchip_pcie_legacy_int_handler()
PCI: tegra194: Use INTX instead of legacy
PCI: uniphier: Use INTX instead of legacy
PCI: rockchip-ep: Use INTX instead of legacy
PCI: rockchip-host: Renamerockchip_pcie_legacy_int_handler()
PCI: xilinx-nwl: Use INTX instead of legacydrivers/misc/pci_endpoint_test.c | 30 +++---- .../pci/controller/cadence/pcie-cadence-ep.c | 19 ++-- drivers/pci/controller/cadence/pcie-cadence.h | 12 +-- drivers/pci/controller/dwc/pci-dra7xx.c | 10 +-- drivers/pci/controller/dwc/pci-imx6.c | 11 ++- drivers/pci/controller/dwc/pci-keystone.c | 86 +++++++++---------- .../pci/controller/dwc/pci-layerscape-ep.c | 10 +-- drivers/pci/controller/dwc/pcie-artpec6.c | 8 +- .../pci/controller/dwc/pcie-designware-ep.c | 8 +- .../pci/controller/dwc/pcie-designware-plat.c | 11 ++- drivers/pci/controller/dwc/pcie-designware.h | 6 +- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 4 +- drivers/pci/controller/dwc/pcie-keembay.c | 13 ++- drivers/pci/controller/dwc/pcie-qcom-ep.c | 8 +- drivers/pci/controller/dwc/pcie-rcar-gen4.c | 9 +- drivers/pci/controller/dwc/pcie-tegra194.c | 19 ++-- drivers/pci/controller/dwc/pcie-uniphier-ep.c | 11 ++- drivers/pci/controller/dwc/pcie-uniphier.c | 12 +-- drivers/pci/controller/pcie-rcar-ep.c | 7 +- drivers/pci/controller/pcie-rockchip-ep.c | 23 +++-- drivers/pci/controller/pcie-rockchip-host.c | 4 +- drivers/pci/controller/pcie-xilinx-nwl.c | 52 +++++------ drivers/pci/endpoint/functions/pci-epf-mhi.c | 2 +- drivers/pci/endpoint/functions/pci-epf-ntb.c | 4 +-
Quoted 8 lines
drivers/pci/endpoint/functions/pci-epf-test.c | 14 +-- drivers/pci/endpoint/functions/pci-epf-vntb.c | 7 +- drivers/pci/endpoint/pci-epc-core.c | 6 +- drivers/pci/pcie/portdrv.c | 8 +- include/linux/pci-epc.h | 11 +-- include/linux/pci.h | 4 +- include/uapi/linux/pcitest.h | 3 +- 31 files changed, 206 insertions(+), 226 deletions(-)
Looks good to me, Damien. Thanks for doing all this work. I think Lorenzo or Krzysztof will pick this up, and we'll get it into -next.
Bjorn
Quoted 2 lines · Bjorn Helgaas
Looks good to me, Damien. Thanks for doing all this work. I think Lorenzo or Krzysztof will pick this up, and we'll get it into -next.
Ping ? I do not see this series queued anywhere. Did I miss it ?
Signature · 2 lines
Damien Le Moal Western Digital Research
Quoted 8 lines · Damien Le Moal
The first patch renames
PCI_IRQ_LEGACYtoPCI_IRQ_INTXas suggested by Bjorn (hence the patch authorship is given to him). The second patch removes the redundant IRQ type definitionsPCI_EPC_IRQ_XXXand replace these with a direct use of thePCI_IRQ_XXXdefinitions. These 2 patches have been sent and reviewed previously but were never applied. Hence the resend with this new series version.[...]
Applied to irq-clean-up, thanks! It might take a while before we merge it into -next but it is targeting v6.8 anyway.
[01/16] PCI: Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX
https://git.kernel.org/pci/pci/c/58ff9c5acb4a [02/16] PCI: endpoint: Drop PCI_EPC_IRQ_XXX definitions https://git.kernel.org/pci/pci/c/74955cb8ccc3 [03/16] PCI: endpoint: Use INTX instead of legacy https://git.kernel.org/pci/pci/c/8a608dac4bf6 [04/16] PCI: endpoint: Rename LEGACY to INTX in test function driver https://git.kernel.org/pci/pci/c/5b0fbadc0f87 [05/16] misc: pci_endpoint_test: Use INTX instead of LEGACY https://git.kernel.org/pci/pci/c/acd288666979 [06/16] PCI: portdrv: Use PCI_IRQ_INTX https://git.kernel.org/pci/pci/c/0e9149d9b864 [07/16] PCI: dra7xx: Rename dra7xx_pcie_raise_legacy_irq() https://git.kernel.org/pci/pci/c/a963ce0a542c [08/16] PCI: cadence: Use INTX instead of legacy https://git.kernel.org/pci/pci/c/29e3e6620ab1 [09/16] PCI: dwc: Rename dw_pcie_ep_raise_legacy_irq() https://git.kernel.org/pci/pci/c/6847fc7fa27d [10/16] PCI: keystone: Use INTX instead of legacy https://git.kernel.org/pci/pci/c/45b27ac543c0 [11/16] PCI: dw-rockchip: Rename rockchip_pcie_legacy_int_handler() https://git.kernel.org/pci/pci/c/50bdb9ef1dd1 [12/16] PCI: tegra194: Use INTX instead of legacy https://git.kernel.org/pci/pci/c/08fc17974dec [13/16] PCI: uniphier: Use INTX instead of legacy https://git.kernel.org/pci/pci/c/b0908aed6eca [14/16] PCI: rockchip-ep: Use INTX instead of legacy https://git.kernel.org/pci/pci/c/8072efc6bbe1 [15/16] PCI: rockchip-host: Rename rockchip_pcie_legacy_int_handler() https://git.kernel.org/pci/pci/c/a00e643ea9ed [16/16] PCI: xilinx-nwl: Use INTX instead of legacy https://git.kernel.org/pci/pci/c/07e681ce7bdb
Thanks,
Lorenzo
Lorenzo Pieralisi
maintainerRe: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
In reply to Damien Le MoalQuoted 7 lines · Damien Le Moal
Quoted 6 lines · Christoph Hellwig
Quoted 4 lines · Damien Le Moal
Quoted 2 lines
As mentioned in reply 1 I think this is perfect for a scripted run after -rc1.
You mean 6.8-rc1 next cycle ?
Quoted 8 lines
Quoted 1 line
Yes. 6.7-rc1 is over :)
OK.
Bjorn,
I can resend without this patch, or maybe you can drop it when applying. Let me know what you prefer.
Krzysztof diligently made me notice, thanks.
I have now dropped it and repushed out the resulting irq-clean-up branch.
Lorenzo
Re: [PATCH v4 06/16] PCI: portdrv: Use PCI_IRQ_INTX
Quoted 14 lines · Lorenzo Pieralisi
Quoted 13 lines · Damien Le Moal
Quoted 7 lines · Christoph Hellwig
Quoted 4 lines · Damien Le Moal
Quoted 2 lines
As mentioned in reply 1 I think this is perfect for a scripted run after -rc1.
You mean 6.8-rc1 next cycle ?
Yes. 6.7-rc1 is over :)
OK.
Bjorn,
Quoted 7 lines
Quoted 2 lines
I can resend without this patch, or maybe you can drop it when applying. Let me know what you prefer.
Krzysztof diligently made me notice, thanks.
I have now dropped it and repushed out the resulting irq-clean-up branch.
OK. Thanks. I will work on removing what remains of "legacy" naming once everything is in linux next.
Signature · 2 lines
Damien Le Moal Western Digital Research