Re: [PATCH v3] net: ftgmac100: Get link speed and duplex for NC-SI: manual merge

[Matthieu Baerts <matttbe@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1744 bytes --]

Hello,

On 27/08/2024 05:05, Jacky Chou wrote:
> The ethtool of this driver uses the phy API of ethtool
> to get the link information from PHY driver.
> Because the NC-SI is forced on 100Mbps and full duplex,
> the driver connect a fixed-link phy driver for NC-SI.
> The ethtool will get the link information from the
> fixed-link phy driver.

FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

  4186c8d9e6af ("net: ftgmac100: Ensure tx descriptor updates are visible")

and this one from 'net-next':

  e24a6c874601 ("net: ftgmac100: Get link speed and duplex for NC-SI")

----- Generic Message -----
The best is to avoid conflicts between 'net' and 'net-next' trees but if
they cannot be avoided when preparing patches, a note about how to fix
them is much appreciated.

The conflict has been resolved on our side[1] and the resolution we
suggest is attached to this email. Please report any issues linked to
this conflict resolution as it might be used by others. If you worked on
the mentioned patches, don't hesitate to ACK this conflict resolution.
---------------------------

Regarding this conflict, it looks like it was due to a
refactoring/clean-up, removing extra whitespaces a bit everywhere in the
same file, and was surprisingly part of the fix patch applied in 'net'.
The two unrelated changes have been taken to resolve this conflict:
removing the extra space, and adding 'phy_stop(netdev->phydev);' after
the 'err_ncsi' label.

Rerere cache is available in [2].

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/ecf6b3c48b19
[2] https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/20cd
-- 
Sponsored by the NGI0 Core fund.

[-- Attachment #2: ecf6b3c48b19f91d96881bd5f2d41e312bae58ce.patch --]
[-- Type: text/x-patch, Size: 666 bytes --]

diff --cc drivers/net/ethernet/faraday/ftgmac100.c
index 4c546c3aef0f,444671b8bbe2..f3cc14cc757d
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@@ -1553,15 -1554,16 +1564,16 @@@ static int ftgmac100_open(struct net_de
  
  	return 0;
  
 - err_ncsi:
 +err_ncsi:
+ 	phy_stop(netdev->phydev);
  	napi_disable(&priv->napi);
  	netif_stop_queue(netdev);
 - err_alloc:
 +err_alloc:
  	ftgmac100_free_buffers(priv);
  	free_irq(netdev->irq, netdev);
 - err_irq:
 +err_irq:
  	netif_napi_del(&priv->napi);
 - err_hw:
 +err_hw:
  	iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);
  	ftgmac100_free_rings(priv);
  	return err;