Skip to content

Commit e6501fc

Browse files
pkitszelanguy11
authored andcommitted
ice: stop calling pci_disable_device() as we use pcim
Our driver uses devres to manage resources, in particular we call pcim_enable_device(), what also means we express the intent to get automatic pci_disable_device() call at driver removal. Manual calls to pci_disable_device() misuse the API. Recent commit (see "Fixes" tag) has changed the removal action from conditional (silent ignore of double call to pci_disable_device()) to unconditional, but able to catch unwanted redundant calls; see cited "Fixes" commit for details. Since that, unloading the driver yields following warn+splat: [70633.628490] ice 0000:af:00.7: disabling already-disabled device [70633.628512] WARNING: CPU: 52 PID: 33890 at drivers/pci/pci.c:2250 pci_disable_device+0xf4/0x100 ... [70633.628744] ? pci_disable_device+0xf4/0x100 [70633.628752] release_nodes+0x4a/0x70 [70633.628759] devres_release_all+0x8b/0xc0 [70633.628768] device_unbind_cleanup+0xe/0x70 [70633.628774] device_release_driver_internal+0x208/0x250 [70633.628781] driver_detach+0x47/0x90 [70633.628786] bus_remove_driver+0x80/0x100 [70633.628791] pci_unregister_driver+0x2a/0xb0 [70633.628799] ice_module_exit+0x11/0x3a [ice] Note that this is the only Intel ethernet driver that needs such fix. Fixes: f748a07 ("PCI: Remove legacy pcim_release()") Reviewed-by: Larysa Zaremba <[email protected]> Reviewed-by: Philipp Stanner <[email protected]> Signed-off-by: Przemek Kitszel <[email protected]> Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent e843cf7 commit e6501fc

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/net/ethernet/intel/ice/ice_main.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5363,7 +5363,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
53635363
ice_deinit(pf);
53645364
err_init:
53655365
ice_adapter_put(pdev);
5366-
pci_disable_device(pdev);
53675366
return err;
53685367
}
53695368

@@ -5470,7 +5469,6 @@ static void ice_remove(struct pci_dev *pdev)
54705469
ice_set_wake(pf);
54715470

54725471
ice_adapter_put(pdev);
5473-
pci_disable_device(pdev);
54745472
}
54755473

54765474
/**

0 commit comments

Comments
 (0)