Commit 64ea3b99 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/hotplug' into next 

* pci/hotplug:
  x86/PCI: VMD: Request userspace control of PCIe hotplug indicators
  PCI: pciehp: Allow exclusive userspace control of indicators
  PCI: pciehp: Remove useless pciehp_get_latch_status() calls
  PCI: pciehp: Clean up dmesg "Slot(%s)" messages
  PCI: pciehp: Remove unnecessary guard
  PCI: pciehp: Don't re-read Slot Status when handling surprise event
  PCI: pciehp: Don't re-read Slot Status when queuing hotplug event
  PCI: pciehp: Process all hotplug events before looking for new ones
  PCI: pciehp: Return IRQ_NONE when we can't read interrupt status
  PCI: pciehp: Rename pcie_isr() locals for clarity
  PCI: pciehp: Clear attention LED on device add
parents fb6b6cc4 3161832d

arch/x86/include/asm/pci.h

+14 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ struct pci_sysdata { 
#ifdef CONFIG_PCI_MSI_IRQ_DOMAIN

	void		*fwnode;	/* IRQ domain for MSI assignment */

#endif

#if IS_ENABLED(CONFIG_VMD)

	bool vmd_domain;		/* True if in Intel VMD domain */

#endif

};



extern int pci_routeirq;
@@ -56,6 +59,17 @@ static inline void *_pci_root_bus_fwnode(struct pci_bus *bus) 
#define pci_root_bus_fwnode	_pci_root_bus_fwnode

#endif



static inline bool is_vmd(struct pci_bus *bus)

{

#if IS_ENABLED(CONFIG_VMD)

	struct pci_sysdata *sd = bus->sysdata;



	return sd->vmd_domain;

#else

	return false;

#endif

}



/* Can be used to override the logic in pci_scan_bus for skipping

   already-configured bus numbers - to be used for buggy BIOSes

   or architectures with incomplete PCI setup by the loader */

arch/x86/pci/common.c

+7 −0
Original line number Diff line number Diff line
@@ -677,6 +677,12 @@ static void set_dma_domain_ops(struct pci_dev *pdev) 
static void set_dma_domain_ops(struct pci_dev *pdev) {}

#endif



static void set_dev_domain_options(struct pci_dev *pdev)

{

	if (is_vmd(pdev->bus))

		pdev->hotplug_user_indicators = 1;

}



int pcibios_add_device(struct pci_dev *dev)

{

	struct setup_data *data;
@@ -707,6 +713,7 @@ int pcibios_add_device(struct pci_dev *dev) 
		iounmap(data);

	}

	set_dma_domain_ops(dev);

	set_dev_domain_options(dev);

	return 0;

}

arch/x86/pci/vmd.c

+1 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd) 
		.parent = res,

	};



	sd->vmd_domain = true;

	sd->domain = vmd_find_free_domain();

	if (sd->domain < 0)

		return sd->domain;

drivers/pci/hotplug/pciehp.h

+3 −0
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ bool pciehp_check_link_active(struct controller *ctrl); 
void pciehp_release_ctrl(struct controller *ctrl);

int pciehp_reset_slot(struct slot *slot, int probe);



int pciehp_set_raw_indicator_status(struct hotplug_slot *h_slot, u8 status);

int pciehp_get_raw_indicator_status(struct hotplug_slot *h_slot, u8 *status);



static inline const char *slot_name(struct slot *slot)

{

	return hotplug_slot_name(slot->hotplug_slot);

drivers/pci/hotplug/pciehp_core.c

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ static int init_slot(struct controller *ctrl) 
	if (ATTN_LED(ctrl)) {

		ops->get_attention_status = get_attention_status;

		ops->set_attention_status = set_attention_status;

	} else if (ctrl->pcie->port->hotplug_user_indicators) {

		ops->get_attention_status = pciehp_get_raw_indicator_status;

		ops->set_attention_status = pciehp_set_raw_indicator_status;

	}



	/* register this slot with the hotplug pci core */

CRA Git | Maintained and supported by SUSTech CRA and CCSE