Re: [PATCH v4 3/6] PCI: spacemit-k1: Add device id update helper
Inochi Amaoto <[email protected]> Sun, 12 Jul 2026 15:32:11 +0800
| Newsgroups | dev.linux.lists.spacemit,org.infradead.lists.linux-riscv,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci |
|---|---|
| Message-ID | <[email protected]> |
On Fri, Jul 10, 2026 at 11:01:27AM -0500, Alex Elder wrote: > On 7/8/26 11:00 PM, Inochi Amaoto wrote: > > Both K1 and K3 needs to set vendor id and device id, add a helper function > > s/needs/need/ > > > to simplify this. > > I think someone might have commented on this, but I expected to find > that the next patch would fill in the code that's needed to support > K3, but that patch is at the end of your series. > > The reason I say it here is that I wondered while looking at this > one why it was needed to create this helper function. I now know > that k3_pcie_init() will call it (but I had to find that in the > last patch, which was later than I expected). > > Your series should start with DT binding changes, then code changes, > and (often) end with DTS changes. > There is another order, starts with the common change, then the specific logic for a specific driver. This is the order of this patchset. For this patchset, starting with DT binding changes makes the common part hard to be identified and taken. > Anyway, this looks good. > > Reviewed-by: Alex Elder <[email protected]> > > > Signed-off-by: Inochi Amaoto <[email protected]> > > --- > > drivers/pci/controller/dwc/pcie-spacemit-k1.c | 17 +++++++++++++---- > > 1 file changed, 13 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/pci/controller/dwc/pcie-spacemit-k1.c b/drivers/pci/controller/dwc/pcie-spacemit-k1.c > > index e22ecbd09579..31aac056b68e 100644 > > --- a/drivers/pci/controller/dwc/pcie-spacemit-k1.c > > +++ b/drivers/pci/controller/dwc/pcie-spacemit-k1.c > > @@ -56,6 +56,7 @@ struct k1_pcie_device_data { > > const struct dw_pcie_ops *ops; > > int (*parse_port)(struct k1_pcie *k1); > > unsigned int max_phy_count; > > + unsigned int device_id; > > }; > > struct k1_pcie { > > @@ -186,6 +187,16 @@ static void k1_pcie_disable_aspm_l1(struct k1_pcie *k1) > > dw_pcie_dbi_ro_wr_dis(pci); > > } > > +static void k1_pcie_set_device_id(struct k1_pcie *k1) > > +{ > > + struct dw_pcie *pci = &k1->pci; > > + > > + dw_pcie_dbi_ro_wr_en(pci); > > + dw_pcie_writew_dbi(pci, PCI_VENDOR_ID, PCI_VENDOR_ID_SPACEMIT); > > + dw_pcie_writew_dbi(pci, PCI_DEVICE_ID, k1->data->device_id); > > + dw_pcie_dbi_ro_wr_dis(pci); > > +} > > + > > static int k1_pcie_init(struct dw_pcie_rp *pp) > > { > > struct dw_pcie *pci = to_dw_pcie_from_pp(pp); > > @@ -201,10 +212,7 @@ static int k1_pcie_init(struct dw_pcie_rp *pp) > > return ret; > > /* Set the PCI vendor and device ID */ > > - dw_pcie_dbi_ro_wr_en(pci); > > - dw_pcie_writew_dbi(pci, PCI_VENDOR_ID, PCI_VENDOR_ID_SPACEMIT); > > - dw_pcie_writew_dbi(pci, PCI_DEVICE_ID, PCI_DEVICE_ID_SPACEMIT_K1); > > - dw_pcie_dbi_ro_wr_dis(pci); > > + k1_pcie_set_device_id(k1); > > /* > > * Start by asserting fundamental reset (drive PERST# low). The > > @@ -406,6 +414,7 @@ static const struct k1_pcie_device_data k1_pcie_device_data = { > > .ops = &k1_pcie_ops, > > .parse_port = k1_pcie_parse_port, > > .max_phy_count = 1, > > + .device_id = PCI_DEVICE_ID_SPACEMIT_K1, > > }; > > static const struct of_device_id k1_pcie_of_match_table[] = { >