From: Manivannan Sadhasivam <mani@kernel.org>
To: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: lpieralisi@kernel.org, kw@linux.com, robh@kernel.org,
bhelgaas@google.com, krzysztof.kozlowski+dt@linaro.org,
conor+dt@kernel.org, jingoohan1@gmail.com, mani@kernel.org,
marek.vasut+renesas@gmail.com, linux-pci@vger.kernel.org,
devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH v7 4/7] PCI: rcar-gen4: Add rcar_gen4_pcie_drvdata
Date: Sat, 11 May 2024 12:57:02 +0530 [thread overview]
Message-ID: <20240511072702.GD6672@thinkpad> (raw)
In-Reply-To: <20240415081135.3814373-5-yoshihiro.shimoda.uh@renesas.com>
On Mon, Apr 15, 2024 at 05:11:32PM +0900, Yoshihiro Shimoda wrote:
> In other to support future SoCs such as r8a779g0 and r8a779h0 that
> require different initialization settings, let's introduce SoC
> specific driver data with the initial member being the device mode.
> No functional change.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
One nitpick below. With that addressed,
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> ---
> drivers/pci/controller/dwc/pcie-rcar-gen4.c | 30 ++++++++++++++-------
> 1 file changed, 21 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
> index 0be760ed420b..3da0a844e1b6 100644
> --- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c
> +++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
> @@ -48,11 +48,15 @@
> #define RCAR_GEN4_PCIE_EP_FUNC_DBI_OFFSET 0x1000
> #define RCAR_GEN4_PCIE_EP_FUNC_DBI2_OFFSET 0x800
>
> +struct rcar_gen4_pcie_drvdata {
> + enum dw_pcie_device_mode mode;
> +};
> +
> struct rcar_gen4_pcie {
> struct dw_pcie dw;
> void __iomem *base;
> struct platform_device *pdev;
> - enum dw_pcie_device_mode mode;
> + const struct rcar_gen4_pcie_drvdata *drvdata;
> };
> #define to_rcar_gen4_pcie(_dw) container_of(_dw, struct rcar_gen4_pcie, dw)
>
> @@ -137,7 +141,7 @@ static int rcar_gen4_pcie_start_link(struct dw_pcie *dw)
> * Since dw_pcie_setup_rc() sets it once, PCIe Gen2 will be trained.
> * So, this needs remaining times for up to PCIe Gen4 if RC mode.
> */
> - if (changes && rcar->mode == DW_PCIE_RC_TYPE)
> + if (changes && rcar->drvdata->mode == DW_PCIE_RC_TYPE)
> changes--;
>
> for (i = 0; i < changes; i++) {
> @@ -172,9 +176,9 @@ static int rcar_gen4_pcie_common_init(struct rcar_gen4_pcie *rcar)
> reset_control_assert(dw->core_rsts[DW_PCIE_PWR_RST].rstc);
>
> val = readl(rcar->base + PCIEMSR0);
> - if (rcar->mode == DW_PCIE_RC_TYPE) {
> + if (rcar->drvdata->mode == DW_PCIE_RC_TYPE) {
> val |= DEVICE_TYPE_RC;
> - } else if (rcar->mode == DW_PCIE_EP_TYPE) {
> + } else if (rcar->drvdata->mode == DW_PCIE_EP_TYPE) {
> val |= DEVICE_TYPE_EP;
> } else {
> ret = -EINVAL;
> @@ -437,9 +441,9 @@ static void rcar_gen4_remove_dw_pcie_ep(struct rcar_gen4_pcie *rcar)
> /* Common */
> static int rcar_gen4_add_dw_pcie(struct rcar_gen4_pcie *rcar)
> {
> - rcar->mode = (uintptr_t)of_device_get_match_data(&rcar->pdev->dev);
> + rcar->drvdata = of_device_get_match_data(&rcar->pdev->dev);
Even though rcar->drvdata won't be NULL, the lack of NULL check will cause
folks to send fixup patch later. So please add a NULL check here itself.
- Mani
>
> - switch (rcar->mode) {
> + switch (rcar->drvdata->mode) {
> case DW_PCIE_RC_TYPE:
> return rcar_gen4_add_dw_pcie_rp(rcar);
> case DW_PCIE_EP_TYPE:
> @@ -480,7 +484,7 @@ static int rcar_gen4_pcie_probe(struct platform_device *pdev)
>
> static void rcar_gen4_remove_dw_pcie(struct rcar_gen4_pcie *rcar)
> {
> - switch (rcar->mode) {
> + switch (rcar->drvdata->mode) {
> case DW_PCIE_RC_TYPE:
> rcar_gen4_remove_dw_pcie_rp(rcar);
> break;
> @@ -500,14 +504,22 @@ static void rcar_gen4_pcie_remove(struct platform_device *pdev)
> rcar_gen4_pcie_unprepare(rcar);
> }
>
> +static struct rcar_gen4_pcie_drvdata drvdata_rcar_gen4_pcie = {
> + .mode = DW_PCIE_RC_TYPE,
> +};
> +
> +static struct rcar_gen4_pcie_drvdata drvdata_rcar_gen4_pcie_ep = {
> + .mode = DW_PCIE_EP_TYPE,
> +};
> +
> static const struct of_device_id rcar_gen4_pcie_of_match[] = {
> {
> .compatible = "renesas,rcar-gen4-pcie",
> - .data = (void *)DW_PCIE_RC_TYPE,
> + .data = &drvdata_rcar_gen4_pcie,
> },
> {
> .compatible = "renesas,rcar-gen4-pcie-ep",
> - .data = (void *)DW_PCIE_EP_TYPE,
> + .data = &drvdata_rcar_gen4_pcie_ep,
> },
> {},
> };
> --
> 2.25.1
>
>
--
மணிவண்ணன் சதாசிவம்
next prev parent reply other threads:[~2024-05-11 7:27 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-15 8:11 [PATCH v7 0/7] PCI: rcar-gen4: Add R-Car V4H support Yoshihiro Shimoda
2024-04-15 8:11 ` [PATCH v7 1/7] dt-bindings: PCI: rcar-gen4-pci-host: Add R-Car V4H compatible Yoshihiro Shimoda
2024-04-15 8:11 ` [PATCH v7 2/7] dt-bindings: PCI: rcar-gen4-pci-ep: " Yoshihiro Shimoda
2024-04-15 8:11 ` [PATCH v7 3/7] PCI: dwc: Add PCIE_PORT_{FORCE,LANE_SKEW} macros Yoshihiro Shimoda
2024-04-15 8:11 ` [PATCH v7 4/7] PCI: rcar-gen4: Add rcar_gen4_pcie_drvdata Yoshihiro Shimoda
2024-05-11 7:27 ` Manivannan Sadhasivam [this message]
2024-05-13 9:20 ` Geert Uytterhoeven
2024-05-15 7:56 ` Manivannan Sadhasivam
2024-04-15 8:11 ` [PATCH v7 5/7] PCI: rcar-gen4: Add .ltssm_enable() for other SoC support Yoshihiro Shimoda
2024-05-11 7:38 ` Manivannan Sadhasivam
2024-05-14 11:08 ` Yoshihiro Shimoda
2024-04-15 8:11 ` [PATCH v7 6/7] PCI: rcar-gen4: Add support for r8a779g0 Yoshihiro Shimoda
2024-04-15 8:27 ` Niklas Cassel
2024-04-15 9:19 ` Yoshihiro Shimoda
2024-04-15 12:24 ` Niklas Cassel
2024-05-11 8:02 ` Manivannan Sadhasivam
2024-05-14 11:27 ` Yoshihiro Shimoda
2024-05-15 7:59 ` Manivannan Sadhasivam
2024-05-15 8:59 ` Wolfram Sang
2024-05-15 9:09 ` Wolfram Sang
2024-05-15 16:26 ` Niklas Cassel
2024-05-15 20:10 ` Wolfram Sang
2024-05-16 12:41 ` Manivannan Sadhasivam
2024-05-16 12:51 ` Manivannan Sadhasivam
2024-05-17 11:45 ` Yoshihiro Shimoda
2024-04-15 8:11 ` [PATCH v7 7/7] misc: pci_endpoint_test: Document a policy about adding pci_device_id Yoshihiro Shimoda
2024-04-15 14:42 ` Frank Li
2024-05-17 10:33 ` [PATCH v7 0/7] PCI: rcar-gen4: Add R-Car V4H support Krzysztof Wilczyński
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240511072702.GD6672@thinkpad \
--to=mani@kernel.org \
--cc=bhelgaas@google.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jingoohan1@gmail.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kw@linux.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=marek.vasut+renesas@gmail.com \
--cc=robh@kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).