On 16 Aug 17:04, Bjorn Helgaas wrote:
On Wed, Aug 16, 2023 at 02:45:15PM -0700, Saeed Mahameed wrote:On 14 Aug 17:32, Bjorn Helgaas wrote: > On Mon, Aug 14, 2023 at 04:27:20PM +0300, Ilpo Järvinen wrote: > > mlx5_pci_link_toggle() returns mix PCI specific error codes and generic > > errnos. > > > > Convert the PCI specific error values to generic errno using > > pcibios_err_to_errno() before returning them. > > > > Fixes: eabe8e5e88f5 ("net/mlx5: Handle sync reset now event") > > Fixes: 212b4d7251c1 ("net/mlx5: Wait for firmware to enable CRS before pci_restore_state") > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx> > > > > --- > > > > Maintainers beware, this will conflict with read+write -> set/clear_word > > fixes in pci.git/pcie-rmw. As such, it might be the easiest for Bjorn to > > take it instead of net people. > > I provisionally rebased and applied it on pci/pcie-rmw. Take a look > and make sure I didn't botch it -- I also found a case in > mlx5_check_dev_ids() that looks like it needs the same conversion. > > The commit as applied is below. > > If networking folks would prefer to take this, let me know and I can > drop it. I Just took this patch into my mlx5 submission queue and sent it to netdev tree, please drop it from your tree.OK, will do. Note that this will generate a conflict between netdev and the PCI tree during the merge window.
In such case let me drop it and you submit it, I was worried it will conflict with another ongoing feature in mlx5, but I am almost sure it won't be ready this cycle, so no reason to panic, you can take the patch to the pci tree and I will revise my PR, it's not too late.
Bjorn
