On Tue, Feb 11, 2020 at 05:49:40AM +0100, Lukas Wunner wrote: > On Mon, Feb 10, 2020 at 06:08:16PM -0600, Bjorn Helgaas wrote: > > used ctrl_info() instead of pci_info() (I would actually like to change > > the whole driver to use pci_info(), but better to be consistent for now) > > Most of the ctrl_info() calls prepend "Slot(%s): " to the message. > However that prefix can only be used once pci_hp_initialize() has > been called. > > It would probably make sense to change ctrl_info() to always > include the prefix and change those invocations of ctrl_info() > which happen when the slot is not yet or no longer registered, > to pci_info(). Ouch, my tweaks were definitely half-baked. I really like your idea of hoisting the "Slot(%s)" text up into ctrl_*(). I might rename ctrl_*() to slot_*() or similar to connect it more with the slot registration. I'm a little confused about why pci_hp_initialize()/ __pci_hp_initialize()/pci_hp_register()/__pci_hp_register() is such a rat's nest with hotplug drivers using a mix of them. I wonder if that could be rationalized and maybe done earlier so all hotplug- related messages could use the same ctrl_*() logging. But this is all outside the scope of this patch. I'll look at the pcie_wait_for_presence() situation and revert to pci_info() if if can be called when the slot is not registered. > > @@ -930,7 +940,7 @@ struct controller *pcie_init(struct pcie_device *dev) > > PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_CC | > > PCI_EXP_SLTSTA_DLLSC | PCI_EXP_SLTSTA_PDC); > > > > - ctrl_info(ctrl, "Slot #%d AttnBtn%c PwrCtrl%c MRL%c AttnInd%c PwrInd%c HotPlug%c Surprise%c Interlock%c NoCompl%c LLActRep%c%s\n", > > + ctrl_info(ctrl, "Slot #%d AttnBtn%c PwrCtrl%c MRL%c AttnInd%c PwrInd%c HotPlug%c Surprise%c Interlock%c NoCompl%c IbPresDis%c LLActRep%c%s\n", > > (slot_cap & PCI_EXP_SLTCAP_PSN) >> 19, > > FLAG(slot_cap, PCI_EXP_SLTCAP_ABP), > > FLAG(slot_cap, PCI_EXP_SLTCAP_PCP), > > @@ -941,19 +951,10 @@ struct controller *pcie_init(struct pcie_device *dev) > > FLAG(slot_cap, PCI_EXP_SLTCAP_HPS), > > FLAG(slot_cap, PCI_EXP_SLTCAP_EIP), > > FLAG(slot_cap, PCI_EXP_SLTCAP_NCCS), > > + ctrl->inband_presence_disabled, > > FLAG(link_cap, PCI_EXP_LNKCAP_DLLLARC), > > pdev->broken_cmd_compl ? " (with Cmd Compl erratum)" : ""); > > I've just reviewed the resulting commits on pci/hotplug once more and > think there's a small issue here: If ctrl->inband_presence_disabled is 0, > the string will contain ASCII character 0 (end of string) and if it's 1 > it will contain ASCII character 1 (start of header). A possible solution > would be FLAG(ctrl->inband_presence_disabled, 1). Definitely broken, sorry about that. Feels like sort of a double-negative situation, too. Obviously the hardware bit has to be "1 means disabled" to be compatible with previous spec versions, but the code is usually easier to read if we test for something being *enabled*. I'll try to figure out something. Bjorn
