Re: [PATCH net-next v16 11/14] net: stmmac: dwmac-loongson: Add DT-less GMAC PCI-device support

[YanTeng Si <si.yanteng@linux.dev>]

在 2024/8/7 3:10, Serge Semin 写道:
> On Tue, Aug 06, 2024 at 06:59:44PM +0800, Yanteng Si wrote:
>> The Loongson GMAC driver currently supports the network controllers
>> installed on the LS2K1000 SoC and LS7A1000 chipset, for which the GMAC
>> devices are required to be defined in the platform device tree source.
>> But Loongson machines may have UEFI (implies ACPI) or PMON/UBOOT
>> (implies FDT) as the system bootloaders. In order to have both system
>> configurations support let's extend the driver functionality with the
>> case of having the Loongson GMAC probed on the PCI bus with no device
>> tree node defined for it. That requires to make the device DT-node
>> optional, to rely on the IRQ line detected by the PCI core and to
>> have the MDIO bus ID calculated using the PCIe Domain+BDF numbers.
>>
>> In order to have the device probe() and remove() methods less
>> complicated let's move the DT- and ACPI-specific code to the
>> respective sub-functions.
>>
>> Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn>
>> Signed-off-by: Yinggang Gu <guyinggang@loongson.cn>
>> Acked-by: Huacai Chen <chenhuacai@loongson.cn>
>> Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
>> ---
>>   .../ethernet/stmicro/stmmac/dwmac-loongson.c  | 163 +++++++++++-------
>>   1 file changed, 100 insertions(+), 63 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
>> index 10b49bea8e3c..6ba4674bc076 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
>> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
>> @@ -12,11 +12,15 @@
>>   #define PCI_DEVICE_ID_LOONGSON_GMAC	0x7a03
>>   
>>   struct stmmac_pci_info {
>> -	int (*setup)(struct plat_stmmacenet_data *plat);
>> +	int (*setup)(struct pci_dev *pdev, struct plat_stmmacenet_data *plat);
>>   };
>>   
>> -static void loongson_default_data(struct plat_stmmacenet_data *plat)
>> +static void loongson_default_data(struct pci_dev *pdev,
>> +				  struct plat_stmmacenet_data *plat)
>>   {
>> +	/* Get bus_id, this can be overwritten later */
>> +	plat->bus_id = pci_dev_id(pdev);
>> +
>>   	plat->clk_csr = 2;	/* clk_csr_i = 20-35MHz & MDC = clk_csr_i/16 */
>>   	plat->has_gmac = 1;
>>   	plat->force_sf_dma_mode = 1;
>> @@ -49,9 +53,10 @@ static void loongson_default_data(struct plat_stmmacenet_data *plat)
>>   	plat->dma_cfg->pblx8 = true;
>>   }
>>   
>> -static int loongson_gmac_data(struct plat_stmmacenet_data *plat)
>> +static int loongson_gmac_data(struct pci_dev *pdev,
>> +			      struct plat_stmmacenet_data *plat)
>>   {
>> -	loongson_default_data(plat);
>> +	loongson_default_data(pdev, plat);
>>   
>>   	plat->tx_queues_to_use = 1;
>>   	plat->rx_queues_to_use = 1;
>> @@ -65,20 +70,83 @@ static struct stmmac_pci_info loongson_gmac_pci_info = {
>>   	.setup = loongson_gmac_data,
>>   };
>>   
>> +static int loongson_dwmac_dt_config(struct pci_dev *pdev,
>> +				    struct plat_stmmacenet_data *plat,
>> +				    struct stmmac_resources *res)
>> +{
>> +	struct device_node *np = dev_of_node(&pdev->dev);
>> +	int ret;
>> +
>> +	plat->mdio_node = of_get_child_by_name(np, "mdio");
>> +	if (plat->mdio_node) {
>> +		dev_info(&pdev->dev, "Found MDIO subnode\n");
>> +		plat->mdio_bus_data->needs_reset = true;
>> +	}
>> +
>> +	ret = of_alias_get_id(np, "ethernet");
>> +	if (ret >= 0)
>> +		plat->bus_id = ret;
>> +
>> +	res->irq = of_irq_get_byname(np, "macirq");
>> +	if (res->irq < 0) {
>> +		dev_err(&pdev->dev, "IRQ macirq not found\n");
>> +		ret = -ENODEV;
>> +		goto err_put_node;
>> +	}
>> +
>> +	res->wol_irq = of_irq_get_byname(np, "eth_wake_irq");
>> +	if (res->wol_irq < 0) {
>> +		dev_info(&pdev->dev,
>> +			 "IRQ eth_wake_irq not found, using macirq\n");
>> +		res->wol_irq = res->irq;
>> +	}
>> +
>> +	res->lpi_irq = of_irq_get_byname(np, "eth_lpi");
>> +	if (res->lpi_irq < 0) {
>> +		dev_err(&pdev->dev, "IRQ eth_lpi not found\n");
>> +		ret = -ENODEV;
>> +		goto err_put_node;
>> +	}
>> +
>> +	ret = device_get_phy_mode(&pdev->dev);
>> +	if (ret < 0) {
>> +		dev_err(&pdev->dev, "phy_mode not found\n");
>> +		ret = -ENODEV;
>> +		goto err_put_node;
>> +	}
>> +
>> +	plat->phy_interface = ret;
> +
> +	return 0;
>
> Arggg. Alas I missed this part in v15.(
>
> The rest of changes looks good. Thanks!

OK, Thanks!


Thanks,

Yanteng

>
> -Serge(y)
>
>> +
>> +err_put_node:
>> +	of_node_put(plat->mdio_node);
>> +
>> +	return ret;
>> +}
>> +
>>
>> ...