Re: [PATCH net-next v7 3/3] net: stmmac: Add driver support for DWMAC5 common safety IRQ

[Suraj Jaiswal]

hi Serge,
taken care of comments please review.

Thanks
Suraj

On 12/20/2023 8:20 PM, Serge Semin wrote:
> Hi Suraj
> 
> On Tue, Dec 19, 2023 at 04:18:15PM +0530, Suraj Jaiswal wrote:
>> Add support to listen HW safety IRQ like ECC(error
>> correction code), DPP(data path parity), FSM(finite state
>> machine) fault in common IRQ line.
>>
>> Signed-off-by: Suraj Jaiswal <quic_jsuraj@xxxxxxxxxxx>
>> ---
>>  drivers/net/ethernet/stmicro/stmmac/common.h  |  1 +
>>  drivers/net/ethernet/stmicro/stmmac/stmmac.h  |  2 ++
>>  .../net/ethernet/stmicro/stmmac/stmmac_main.c | 35 +++++++++++++++++++
>>  .../ethernet/stmicro/stmmac/stmmac_platform.c |  8 +++++
>>  4 files changed, 46 insertions(+)
>>
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
>> index 721c1f8e892f..b9233b09b80f 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/common.h
>> +++ b/drivers/net/ethernet/stmicro/stmmac/common.h
>> @@ -344,6 +344,7 @@ enum request_irq_err {
>>  	REQ_IRQ_ERR_ALL,
>>  	REQ_IRQ_ERR_TX,
>>  	REQ_IRQ_ERR_RX,
>> +	REQ_IRQ_ERR_SFTY,
>>  	REQ_IRQ_ERR_SFTY_UE,
>>  	REQ_IRQ_ERR_SFTY_CE,
>>  	REQ_IRQ_ERR_LPI,
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
>> index 9f89acf31050..9aeaca01cace 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
>> @@ -31,6 +31,7 @@ struct stmmac_resources {
>>  	int wol_irq;
>>  	int lpi_irq;
>>  	int irq;
>> +	int sfty_irq;
>>  	int sfty_ce_irq;
>>  	int sfty_ue_irq;
>>  	int rx_irq[MTL_MAX_RX_QUEUES];
>> @@ -297,6 +298,7 @@ struct stmmac_priv {
>>  	void __iomem *ptpaddr;
>>  	void __iomem *estaddr;
>>  	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
>> +	int sfty_irq;
>>  	int sfty_ce_irq;
>>  	int sfty_ue_irq;
>>  	int rx_irq[MTL_MAX_RX_QUEUES];
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> index 47de466e432c..f6639ffb017e 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>> @@ -3592,6 +3592,10 @@ static void stmmac_free_irq(struct net_device *dev,
>>  		if (priv->wol_irq > 0 && priv->wol_irq != dev->irq)
>>  			free_irq(priv->wol_irq, dev);
>>  		fallthrough;
>> +	case REQ_IRQ_ERR_SFTY:
>> +		if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq)
>> +			free_irq(priv->sfty_irq, dev);
>> +		fallthrough;
>>  	case REQ_IRQ_ERR_WOL:
>>  		free_irq(dev->irq, dev);
>>  		fallthrough;
>> @@ -3661,6 +3665,21 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev)
>>  		}
>>  	}
>>  
>> +	/* Request the common Safety Feature Correctible/Uncorrectible
>> +	 * Error line in case of another line is used
>> +	 */
> 
>> +	if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) {
>> +		ret = request_irq(priv->sfty_irq, stmmac_safety_interrupt,
>> +				  0, dev->name, dev);
> 
> Not entirely what I asked. What I asked was to make the code unified in
> the respective IRQ-request methods. You just copy-and-pasted the same
> code snippet in both functions. To see what I meant please find the
> diff attached to this message. It's applicable on top of this patch.
> 
>> +		if (unlikely(ret < 0)) {
>> +			netdev_err(priv->dev,
> 
>> +				   "%s: alloc safety failed %d (error: %d)\n",
>> +				   __func__, priv->sfty_irq, ret);
> 
> This looks different than the rest of the error messages in this
> method (see the attached diff).
> 
>> +			irq_err = REQ_IRQ_ERR_SFTY;
>> +			goto irq_error;
>> +		}
>> +	}
>> +
>>  	/* Request the Safety Feature Correctible Error line in
>>  	 * case of another line is used
>>  	 */
>> @@ -3798,6 +3817,21 @@ static int stmmac_request_irq_single(struct net_device *dev)
>>  		}
>>  	}
>>  
>> +	/* Request the common Safety Feature Correctible/Uncorrectible
>> +	 * Error line in case of another line is used
>> +	 */
>> +	if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) {
> 
>> +		ret = request_irq(priv->sfty_irq, stmmac_safety_interrupt,
>> +				  0, dev->name, dev);
> 
> IRQF_SHARED?
> 
>> +		if (unlikely(ret < 0)) {
> 
>> +			netdev_err(priv->dev,
>> +				   "%s: alloc safety failed %d (error: %d)\n",
>> +				   __func__, priv->sfty_irq, ret);
> 
> This also looks different than the rest of the error messages in this 
> method (see the attached diff).
> 
> Some other comments I'll send to v8 after all the above finally fixed.
> 
> -Serge(y)
> 
>> +			irq_err = REQ_IRQ_ERR_SFTY;
>> +			goto irq_error;
>> +		}
>> +	}
>> +
>>  	return 0;
>>  
>>  irq_error:
>> @@ -7462,6 +7496,7 @@ int stmmac_dvr_probe(struct device *device,
>>  	priv->dev->irq = res->irq;
>>  	priv->wol_irq = res->wol_irq;
>>  	priv->lpi_irq = res->lpi_irq;
>> +	priv->sfty_irq = res->sfty_irq;
>>  	priv->sfty_ce_irq = res->sfty_ce_irq;
>>  	priv->sfty_ue_irq = res->sfty_ue_irq;
>>  	for (i = 0; i < MTL_MAX_RX_QUEUES; i++)
>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
>> index 70eadc83ca68..ab250161fd79 100644
>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
>> @@ -743,6 +743,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev,
>>  		dev_info(&pdev->dev, "IRQ eth_lpi not found\n");
>>  	}
>>  
>> +	stmmac_res->sfty_irq =
>> +		platform_get_irq_byname_optional(pdev, "sfty");
>> +	if (stmmac_res->sfty_irq < 0) {
>> +		if (stmmac_res->sfty_irq == -EPROBE_DEFER)
>> +			return -EPROBE_DEFER;
>> +		dev_info(&pdev->dev, "IRQ safety IRQ not found\n");
>> +	}
>> +
>>  	stmmac_res->addr = devm_platform_ioremap_resource(pdev, 0);
>>  
>>  	return PTR_ERR_OR_ZERO(stmmac_res->addr);
>> -- 
>> 2.25.1
>>
>>