Re: [PATCHv2 3/4] pci: remove slot specific lock/unlock and save/restore

[Keith Busch <kbusch@kernel.org>]

On Fri, Jan 30, 2026 at 09:58:39PM -0800, dan.j.williams@intel.com wrote:
> Should this be:
> 
>     bus = slot ? slot->bus : NULL;
> 
> ?

Yes, you're right.

> Looks like at least pci_reset_bus() could pass a NULL @slot.
> 
> >  	int rc;
> >  
> > -	if (!slot || !pci_slot_resettable(slot))
> > +	if (!slot || (bus && !pci_bus_resettable(bus)))
> 
> With above and something like this:
> 
> @@ -5219,6 +5219,8 @@ static bool pci_bus_resettable(struct pci_bus *bus)
>  {
>         struct pci_dev *dev;
>  
> +       if (!bus)
> +               return false;

Sounds good.

> >  	int rc;
> >  
> >  	rc = pci_slot_reset(slot, PCI_RESET_PROBE);
> >  	if (rc)
> >  		return rc;
> >  
> > -	if (pci_slot_trylock(slot)) {
> > -		pci_slot_save_and_disable_locked(slot);
> > +	if (pci_bus_trylock(bus)) {
> > +		pci_bus_save_and_disable_locked(bus);
> >  		might_sleep();
> >  		rc = pci_reset_hotplug_slot(slot->hotplug, PCI_RESET_DO_RESET);
> > -		pci_slot_restore_locked(slot);
> > -		pci_slot_unlock(slot);
> > +		pci_bus_restore_locked(bus);
> > +		pci_bus_unlock(bus);
> 
> With at least the @bus initialization fixup above and with or without
> the other suggested cleanups you can add:

Thanks!