From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 273DAC77B78 for ; Sat, 22 Apr 2023 10:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229504AbjDVK5S (ORCPT ); Sat, 22 Apr 2023 06:57:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbjDVK5S (ORCPT ); Sat, 22 Apr 2023 06:57:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB9061732; Sat, 22 Apr 2023 03:57:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2908060FF0; Sat, 22 Apr 2023 10:57:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD476C433D2; Sat, 22 Apr 2023 10:56:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682161034; bh=v3sGaJG8B87hpRE4daQ7EA3CCn7RlOrEJyDk0J1Mj2k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mLz3JjCVnn98r4gUJvDtaFXi9OS+0di2mciadSLUKaPwjqkFRmCJjjXR6CB9wLdrE Xqwn2ssq//u6lW0fFbxTdsQxMFkLyRRu4/OlsuibE1dax5FOkjhgz42vw4AqgzXeLI TjXF6B0/4PT85YrjxWuNpNG7rPqK6B6q74oL6U9oShELHlY5ZNKCUkEN/WkP/MfZNg xEnTWJWwUwrmeCdX3kOEFUVTx8S93nEeUXAvzlPAD+bPj9IRyIJ3seg95NzD1W9yRC nGqspQCKNWfjpS8kQ8/ToVOFgYsoLJ0UVm2e4YkC+Hh3nywDDLCPVDIbHhUaTEffpb sBX8aGkwA92DA== Date: Sat, 22 Apr 2023 16:26:49 +0530 From: Manivannan Sadhasivam To: Yoshihiro Shimoda Cc: jingoohan1@gmail.com, mani@kernel.org, gustavo.pimentel@synopsys.com, fancer.lancer@gmail.com, lpieralisi@kernel.org, robh+dt@kernel.org, kw@linux.com, bhelgaas@google.com, kishon@kernel.org, marek.vasut+renesas@gmail.com, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Bjorn Helgaas , Tom Joseph , Vignesh Raghavendra , Richard Zhu , Lucas Stach , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Minghuan Lian , Mingkai Hu , Roy Zang , Jesper Nilsson , Srikanth Thokala , Thierry Reding , Jonathan Hunter , Kunihiko Hayashi , Masami Hiramatsu , Shawn Lin , Heiko Stuebner Subject: Re: [PATCH v13 04/22] PCI: Rename PCI_EPC_IRQ_LEGACY with PCI_EPC_IRQ_INTX Message-ID: <20230422105649.GA4769@thinkpad> References: <20230418122403.3178462-1-yoshihiro.shimoda.uh@renesas.com> <20230418122403.3178462-5-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230418122403.3178462-5-yoshihiro.shimoda.uh@renesas.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Tue, Apr 18, 2023 at 09:23:45PM +0900, Yoshihiro Shimoda wrote: Subject should be: PCI: Rename PCI_EPC_IRQ_LEGACY to PCI_EPC_IRQ_INTX > Using "INTx" instead of "legacy" is more specific. So, rename > PCI_EPC_IRQ_LEGACY with PCI_EPC_IRQ_INTX. s/with/to > > Suggested-by: Bjorn Helgaas > Signed-off-by: Yoshihiro Shimoda With above changes, Reviewed-by: Manivannan Sadhasivam - Mani > Cc: Tom Joseph > Cc: Vignesh Raghavendra > Cc: Richard Zhu > Cc: Lucas Stach > Cc: Shawn Guo > Cc: Sascha Hauer > Cc: Pengutronix Kernel Team > Cc: Fabio Estevam > Cc: NXP Linux Team > Cc: Minghuan Lian > Cc: Mingkai Hu > Cc: Roy Zang > Cc: Jesper Nilsson > Cc: Jingoo Han > Cc: Manivannan Sadhasivam > Cc: Serge Semin > Cc: Srikanth Thokala > Cc: Thierry Reding > Cc: Jonathan Hunter > Cc: Kunihiko Hayashi > Cc: Masami Hiramatsu > Cc: Marek Vasut > Cc: Shawn Lin > Cc: Heiko Stuebner > Cc: Kishon Vijay Abraham I > --- > 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 | 12 ++++++------ > include/linux/pci-epc.h | 4 ++-- > 15 files changed, 21 insertions(+), 21 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 4ae807e7cf79..b42fb1cc8bc8 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 52906f999f2b..1f39e733ce19 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -1062,7 +1062,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 78818853af9e..3806f5530937 100644 > --- a/drivers/pci/controller/dwc/pci-keystone.c > +++ b/drivers/pci/controller/dwc/pci-keystone.c > @@ -908,7 +908,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 c640db60edc6..ab3306e206d8 100644 > --- a/drivers/pci/controller/dwc/pci-layerscape-ep.c > +++ b/drivers/pci/controller/dwc/pci-layerscape-ep.c > @@ -65,7 +65,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 98102079e26d..128cb1118e3a 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 1fcfb840f238..fc3b02949218 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 f90f36bac018..ceb940b327cb 100644 > --- a/drivers/pci/controller/dwc/pcie-keembay.c > +++ b/drivers/pci/controller/dwc/pcie-keembay.c > @@ -290,7 +290,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 19b32839ea26..077afce48d0b 100644 > --- a/drivers/pci/controller/dwc/pcie-qcom-ep.c > +++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c > @@ -658,7 +658,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 09825b4a075e..4adba379b83d 100644 > --- a/drivers/pci/controller/dwc/pcie-tegra194.c > +++ b/drivers/pci/controller/dwc/pcie-tegra194.c > @@ -1980,7 +1980,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 4d0a587c0ba5..7787eedf87f4 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 d1a200b93b2b..ef9d1f6c382a 100644 > --- a/drivers/pci/controller/pcie-rockchip-ep.c > +++ b/drivers/pci/controller/pcie-rockchip-ep.c > @@ -477,7 +477,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 172e5ac0bd96..36a2a8120653 100644 > --- a/drivers/pci/endpoint/functions/pci-epf-test.c > +++ b/drivers/pci/endpoint/functions/pci-epf-test.c > @@ -19,11 +19,11 @@ > #include > #include > > -#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) > @@ -606,9 +606,9 @@ static void pci_epf_test_raise_irq(struct pci_epf_test *epf_test, u8 irq_type, > reg->status |= STATUS_IRQ_RAISED; > > switch (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: > pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no, > @@ -649,10 +649,10 @@ static void pci_epf_test_cmd_handler(struct work_struct *work) > goto reset_handler; > } > > - if (command & COMMAND_RAISE_LEGACY_IRQ) { > + if (command & COMMAND_RAISE_INTX_IRQ) { > reg->status = STATUS_IRQ_RAISED; > pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no, > - PCI_EPC_IRQ_LEGACY, 0); > + PCI_EPC_IRQ_INTX, 0); > goto reset_handler; > } > > diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h > index 301bb0e53707..c2572a93d73d 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 > -- > 2.25.1 > -- மணிவண்ணன் சதாசிவம்