| Message ID | 817880fd50d623ac84f6a01fc7eb3748864386a8.1716973237.git.siyanteng@loongson.cn (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | stmmac: Add Loongson platform support | expand |
On Wed, May 29, 2024 at 06:19:48PM +0800, Yanteng Si wrote: > Just introduce PCI device info data to prepare for later > ACPI-base support. Loongson machines may use UEFI (implies > ACPI) or PMON/UBOOT (implies FDT) as the BIOS. > > The BIOS type has no relationship with device types, which > means: machines can be either ACPI-based or FDT-based. AFAICS the commit log is misleading because the DT-less (ACPI-based) setups is being added in the next commit and it's implemented by using the if-else statement with no setup() callback infrastructure utilized. But this change is still needed for adding the Loongson GNET support later in the series. The setup() callback will be pre-initialized with the network controller specific method based on the PCIe Device ID. So to speak, please alter the commit log with the correct justification. Like this: "The Loongson GNET device support is about to be added in one of the next commits. As another preparation for that introduce the PCI device info data with a setup() callback performing the device-specific platform data initializations. Currently it is utilized for the already supported Loongson GMAC device only." -Serge(y) > > Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn> > Signed-off-by: Yinggang Gu <guyinggang@loongson.cn> > Signed-off-by: Yanteng Si <siyanteng@loongson.cn> > --- > .../ethernet/stmicro/stmmac/dwmac-loongson.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c > index 0289956e274b..fec2aa0607d4 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c > @@ -11,6 +11,10 @@ > > #define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03 > > +struct stmmac_pci_info { > + int (*setup)(struct plat_stmmacenet_data *plat); > +}; > + > static void loongson_default_data(struct plat_stmmacenet_data *plat) > { > plat->clk_csr = 2; /* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */ > @@ -54,9 +58,14 @@ static int loongson_gmac_data(struct plat_stmmacenet_data *plat) > return 0; > } > > +static struct stmmac_pci_info loongson_gmac_pci_info = { > + .setup = loongson_gmac_data, > +}; > + > static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id *id) > { > struct plat_stmmacenet_data *plat; > + struct stmmac_pci_info *info; > struct stmmac_resources res; > struct device_node *np; > int ret, i, phy_mode; > @@ -107,6 +116,11 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id > break; > } > > + info = (struct stmmac_pci_info *)id->driver_data; > + ret = info->setup(plat); > + if (ret) > + goto err_disable_device; > + > plat->bus_id = of_alias_get_id(np, "ethernet"); > if (plat->bus_id < 0) > plat->bus_id = pci_dev_id(pdev); > @@ -122,7 +136,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id > > pci_set_master(pdev); > > - loongson_gmac_data(plat); > pci_enable_msi(pdev); > memset(&res, 0, sizeof(res)); > res.addr = pcim_iomap_table(pdev)[0]; > @@ -224,7 +237,7 @@ static SIMPLE_DEV_PM_OPS(loongson_dwmac_pm_ops, loongson_dwmac_suspend, > loongson_dwmac_resume); > > static const struct pci_device_id loongson_dwmac_id_table[] = { > - { PCI_DEVICE_DATA(LOONGSON, GMAC, NULL) }, > + { PCI_DEVICE_DATA(LOONGSON, GMAC, &loongson_gmac_pci_info) }, > {} > }; > MODULE_DEVICE_TABLE(pci, loongson_dwmac_id_table); > -- > 2.31.4 >
在 2024/7/2 17:18, Serge Semin 写道: > On Wed, May 29, 2024 at 06:19:48PM +0800, Yanteng Si wrote: >> Just introduce PCI device info data to prepare for later >> ACPI-base support. Loongson machines may use UEFI (implies >> ACPI) or PMON/UBOOT (implies FDT) as the BIOS. >> >> The BIOS type has no relationship with device types, which >> means: machines can be either ACPI-based or FDT-based. > AFAICS the commit log is misleading because the DT-less (ACPI-based) > setups is being added in the next commit and it's implemented by using > the if-else statement with no setup() callback infrastructure > utilized. > > But this change is still needed for adding the Loongson GNET support > later in the series. The setup() callback will be pre-initialized with > the network controller specific method based on the PCIe Device ID. So > to speak, please alter the commit log with the correct justification. > Like this: > > "The Loongson GNET device support is about to be added in one of the > next commits. As another preparation for that introduce the PCI device > info data with a setup() callback performing the device-specific > platform data initializations. Currently it is utilized for the > already supported Loongson GMAC device only." > Ok, Thanks! Thanks, Yanteng
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c index 0289956e274b..fec2aa0607d4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -11,6 +11,10 @@ #define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03 +struct stmmac_pci_info { + int (*setup)(struct plat_stmmacenet_data *plat); +}; + static void loongson_default_data(struct plat_stmmacenet_data *plat) { plat->clk_csr = 2; /* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */ @@ -54,9 +58,14 @@ static int loongson_gmac_data(struct plat_stmmacenet_data *plat) return 0; } +static struct stmmac_pci_info loongson_gmac_pci_info = { + .setup = loongson_gmac_data, +}; + static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct plat_stmmacenet_data *plat; + struct stmmac_pci_info *info; struct stmmac_resources res; struct device_node *np; int ret, i, phy_mode; @@ -107,6 +116,11 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id break; } + info = (struct stmmac_pci_info *)id->driver_data; + ret = info->setup(plat); + if (ret) + goto err_disable_device; + plat->bus_id = of_alias_get_id(np, "ethernet"); if (plat->bus_id < 0) plat->bus_id = pci_dev_id(pdev); @@ -122,7 +136,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id pci_set_master(pdev); - loongson_gmac_data(plat); pci_enable_msi(pdev); memset(&res, 0, sizeof(res)); res.addr = pcim_iomap_table(pdev)[0]; @@ -224,7 +237,7 @@ static SIMPLE_DEV_PM_OPS(loongson_dwmac_pm_ops, loongson_dwmac_suspend, loongson_dwmac_resume); static const struct pci_device_id loongson_dwmac_id_table[] = { - { PCI_DEVICE_DATA(LOONGSON, GMAC, NULL) }, + { PCI_DEVICE_DATA(LOONGSON, GMAC, &loongson_gmac_pci_info) }, {} }; MODULE_DEVICE_TABLE(pci, loongson_dwmac_id_table);