Re: [PATCH net-next v2 1/4] net: phy: micrel: improve HW timestamping config logic

[Vadim Fedorenko <vadim.fedorenko@linux.dev>]

On 01/12/2025 09:33, Kory Maincent wrote:
> On Sat, 29 Nov 2025 19:53:31 +0000
> Vadim Fedorenko <vadim.fedorenko@linux.dev> wrote:
> 
>> The driver was adjusting stored values independently of what was
>> actually supported and configured. Improve logic to store values
>> once all checks are passing
>>
>> Signed-off-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
>> ---
>>   drivers/net/phy/micrel.c | 21 +++++++++++++++------
>>   1 file changed, 15 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
>> index 05de68b9f719..1ada05dd305c 100644
>> --- a/drivers/net/phy/micrel.c
>> +++ b/drivers/net/phy/micrel.c
>> @@ -3157,9 +3157,6 @@ static int lan8814_hwtstamp_set(struct mii_timestamper
>> *mii_ts, int txcfg = 0, rxcfg = 0;
>>   	int pkt_ts_enable;
>>   
>> -	ptp_priv->hwts_tx_type = config->tx_type;
>> -	ptp_priv->rx_filter = config->rx_filter;
>> -
>>   	switch (config->rx_filter) {
>>   	case HWTSTAMP_FILTER_NONE:
>>   		ptp_priv->layer = 0;
>> @@ -3187,6 +3184,18 @@ static int lan8814_hwtstamp_set(struct mii_timestamper
>> *mii_ts, return -ERANGE;
>>   	}
>>   
>> +	switch (config->rx_filter) {
> 
> You want to check tx_type here, not rx_filter.
> 
>> +	case HWTSTAMP_TX_OFF:
>> +	case HWTSTAMP_TX_ON:
>> +	case HWTSTAMP_TX_ONESTEP_SYNC:
>> +		break;
>> +	default:
>> +		return -ERANGE;
>> +	}
>> +
>> +	ptp_priv->hwts_tx_type = config->tx_type;
>> +	ptp_priv->rx_filter = config->rx_filter;
>> +
>>   	if (ptp_priv->layer & PTP_CLASS_L2) {
>>   		rxcfg = PTP_RX_PARSE_CONFIG_LAYER2_EN_;
>>   		txcfg = PTP_TX_PARSE_CONFIG_LAYER2_EN_;
>> @@ -5051,9 +5060,6 @@ static int lan8841_hwtstamp_set(struct mii_timestamper
>> *mii_ts, int txcfg = 0, rxcfg = 0;
>>   	int pkt_ts_enable;
>>   
>> -	ptp_priv->hwts_tx_type = config->tx_type;
>> -	ptp_priv->rx_filter = config->rx_filter;
>> -
>>   	switch (config->rx_filter) {
>>   	case HWTSTAMP_FILTER_NONE:
>>   		ptp_priv->layer = 0;
>> @@ -5081,6 +5087,9 @@ static int lan8841_hwtstamp_set(struct mii_timestamper
>> *mii_ts, return -ERANGE;
>>   	}
>>   
>> +	ptp_priv->hwts_tx_type = config->tx_type;
>> +	ptp_priv->rx_filter = config->rx_filter;
> 
> I there a reason to not add the check in the hwtstamp ops for lan8841 as well?
> because the issue is also present.

Hm... I thought I added it... Well, looks like I shouldn't work during
vacation :) Going to add it in v3, thanks!

> 
> Regards,