On Tue, Feb 08, 2022 at 05:34:31PM +0100, Guillaume Bertholon wrote:
The upstream commit b400c2f4f4c5 ("net: axienet: Wait for PhyRstCmplt after core reset") add new instructions in the `__axienet_device_reset` function to wait until PhyRstCmplt bit is set, and return a non zero-exit value if this exceeds a timeout.
However, its backported version in 4.9 (commit 9f1a3c13342b ("net: axienet: Wait for PhyRstCmplt after core reset")) insert these instructions in `axienet_dma_bd_init` instead.
Unlike upstream, the version of `__axienet_device_reset` currently present in branch stable/linux-4.9.y does not return an integer for error codes. Therefore the backport cannot be as simple as moving the inserted instructions in the right place.
Where and how should we backport the patch in this case ? Should we simply revert it instead ?
We should just revert it. Can you make up a patch that does so?
thanks,
greg k-h