From: Inochi Amaoto <inochiama@gmail.com>
To: "Jingoo Han" <jingoohan1@gmail.com>,
"Manivannan Sadhasivam" <mani@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kwilczynski@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Yixun Lan" <dlan@kernel.org>, "Paul Walmsley" <pjw@kernel.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Alexandre Ghiti" <alex@ghiti.fr>,
"Inochi Amaoto" <inochiama@gmail.com>,
"Alex Elder" <elder@riscstar.com>,
"Gustavo Pimentel" <gustavo.pimentel@synopsys.com>
Cc: linux-pci@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org,
spacemit@lists.linux.dev, Yixun Lan <dlan@gentoo.org>,
Longbin Li <looong.bin@gmail.com>
Subject: [PATCH 1/5] PCI: spacemit-k1: Add device data support
Date: Sat, 2 May 2026 18:13:14 +0800 [thread overview]
Message-ID: <20260502101319.2364052-2-inochiama@gmail.com> (raw)
In-Reply-To: <20260502101319.2364052-1-inochiama@gmail.com>
To reuse the K1 PCIe driver logic for K3 PCIe controller, add device
data to handle the K1 specific logic and make room for the incoming
logic for K3.
Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
---
drivers/pci/controller/dwc/pcie-spacemit-k1.c | 35 ++++++++++++++++---
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-spacemit-k1.c b/drivers/pci/controller/dwc/pcie-spacemit-k1.c
index be20a520255b..cd3cd038ad2b 100644
--- a/drivers/pci/controller/dwc/pcie-spacemit-k1.c
+++ b/drivers/pci/controller/dwc/pcie-spacemit-k1.c
@@ -57,6 +57,13 @@ struct k1_pcie {
u32 pmu_off;
};
+struct k1_pcie_device_data {
+ const struct dw_pcie_host_ops *host_ops;
+ const struct dw_pcie_ops *ops;
+ int (*parse_port)(struct k1_pcie *k1);
+ int (*post_init)(struct k1_pcie *k1);
+};
+
#define to_k1_pcie(dw_pcie) \
platform_get_drvdata(to_platform_device((dw_pcie)->dev))
@@ -278,10 +285,15 @@ static int k1_pcie_parse_port(struct k1_pcie *k1)
static int k1_pcie_probe(struct platform_device *pdev)
{
+ const struct k1_pcie_device_data *data;
struct device *dev = &pdev->dev;
struct k1_pcie *k1;
int ret;
+ data = device_get_match_data(dev);
+ if (!data)
+ return -ENODEV;
+
k1 = devm_kzalloc(dev, sizeof(*k1), GFP_KERNEL);
if (!k1)
return -ENOMEM;
@@ -299,11 +311,11 @@ static int k1_pcie_probe(struct platform_device *pdev)
"failed to map \"link\" registers\n");
k1->pci.dev = dev;
- k1->pci.ops = &k1_pcie_ops;
+ k1->pci.ops = data->ops;
k1->pci.pp.num_vectors = MAX_MSI_IRQS;
dw_pcie_cap_set(&k1->pci, REQ_RES);
- k1->pci.pp.ops = &k1_pcie_host_ops;
+ k1->pci.pp.ops = data->host_ops;
/* Hold the PHY in reset until we start the link */
regmap_set_bits(k1->pmu, k1->pmu_off + PCIE_CLK_RESET_CONTROL,
@@ -320,7 +332,7 @@ static int k1_pcie_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, k1);
- ret = k1_pcie_parse_port(k1);
+ ret = data->parse_port(k1);
if (ret)
return dev_err_probe(dev, ret, "failed to parse root port\n");
@@ -328,6 +340,15 @@ static int k1_pcie_probe(struct platform_device *pdev)
if (ret)
return dev_err_probe(dev, ret, "failed to initialize host\n");
+ if (data->post_init) {
+ ret = data->post_init(k1);
+ if (ret) {
+ dw_pcie_host_deinit(&k1->pci.pp);
+ return dev_err_probe(dev, ret,
+ "Failed to post init\n");
+ }
+ }
+
return 0;
}
@@ -338,8 +359,14 @@ static void k1_pcie_remove(struct platform_device *pdev)
dw_pcie_host_deinit(&k1->pci.pp);
}
+static const struct k1_pcie_device_data k1_pcie_device_data = {
+ .host_ops = &k1_pcie_host_ops,
+ .ops = &k1_pcie_ops,
+ .parse_port = k1_pcie_parse_port,
+};
+
static const struct of_device_id k1_pcie_of_match_table[] = {
- { .compatible = "spacemit,k1-pcie", },
+ { .compatible = "spacemit,k1-pcie", .data = &k1_pcie_device_data},
{ }
};
--
2.54.0
next prev parent reply other threads:[~2026-05-02 10:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-02 10:13 [PATCH 0/5] riscv: spacemit: Add PCIe RC controller support for K3 Inochi Amaoto
2026-05-02 10:13 ` Inochi Amaoto [this message]
2026-05-02 10:13 ` [PATCH 2/5] PCI: spacemit-k1: Add multiple phy handles support Inochi Amaoto
2026-05-02 10:13 ` [PATCH 3/5] dt-bindings: PCI: snps,dw-pcie: Add msi-parent for msi handle check Inochi Amaoto
2026-05-02 10:13 ` [PATCH 4/5] dt-bindings: pci: spacemit: Introduce Spacemit K3 PCIe host controller Inochi Amaoto
2026-05-02 10:13 ` [PATCH 5/5] PCI: spacemit-k1: Add Spacemit K3 PCIe host controller support Inochi Amaoto
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=20260502101319.2364052-2-inochiama@gmail.com \
--to=inochiama@gmail.com \
--cc=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=bhelgaas@google.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dlan@gentoo.org \
--cc=dlan@kernel.org \
--cc=elder@riscstar.com \
--cc=gustavo.pimentel@synopsys.com \
--cc=jingoohan1@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=kwilczynski@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=looong.bin@gmail.com \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=palmer@dabbelt.com \
--cc=pjw@kernel.org \
--cc=robh@kernel.org \
--cc=spacemit@lists.linux.dev \
/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