Re: [RFC PATCH net-next 1/7] net: sunhme: Just restart autonegotiation if we can't bring the link up

[Sean Anderson <seanga2@gmail.com>]

On 2/25/23 11:56, Simon Horman wrote:
> On Wed, Feb 22, 2023 at 04:03:49PM -0500, Sean Anderson wrote:
>> If we've tried regular autonegotiation and forcing the link mode, just
>> restart autonegotiation instead of reinitializing the whole NIC.
>>
>> Signed-off-by: Sean Anderson <seanga2@gmail.com>
>> ---
>>
>>   drivers/net/ethernet/sun/sunhme.c | 12 +++++-------
>>   1 file changed, 5 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
>> index dd14114cbcfb..3eeda8f3fa80 100644
>> --- a/drivers/net/ethernet/sun/sunhme.c
>> +++ b/drivers/net/ethernet/sun/sunhme.c
>> @@ -589,7 +589,10 @@ static int set_happy_link_modes(struct happy_meal *hp, void __iomem *tregs)
>>   	return 1;
>>   }
>>   
>> -static int happy_meal_init(struct happy_meal *hp);
>> +static void
>> +happy_meal_begin_auto_negotiation(struct happy_meal *hp,
>> +				  void __iomem *tregs,
>> +				  const struct ethtool_link_ksettings *ep);
> 
> I think it is preferable, though far more verbose, to move
> happy_meal_begin_auto_negotiation() before happy_meal_timer and avoid the
> need for a forward declaration. I did try this locally, and it did
> compile.

Fine by me.

--Sean

>>   static int is_lucent_phy(struct happy_meal *hp)
>>   {
>> @@ -743,12 +746,7 @@ static void happy_meal_timer(struct timer_list *t)
>>   					netdev_notice(hp->dev,
>>   						      "Link down, cable problem?\n");
>>   
>> -					ret = happy_meal_init(hp);
>> -					if (ret) {
>> -						/* ho hum... */
>> -						netdev_err(hp->dev,
>> -							   "Error, cannot re-init the Happy Meal.\n");
>> -					}
>> +					happy_meal_begin_auto_negotiation(hp, tregs, NULL);
>>   					goto out;
>>   				}
>>   				if (!is_lucent_phy(hp)) {
>> -- 
>> 2.37.1
>>