Commit fb6c4513 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/enumeration' 

- Use pci_find_vsec_capability() instead of open-coding it (Andy
  Shevchenko)

- Convert pci_dev_present() stub from macro to static inline to avoid
  'unused variable' errors (Hans de Goede)

- Convert sysfs slot attributes from default_attrs to default_groups (Greg
  Kroah-Hartman)

- Use DWORD accesses for LTR, L1 SS to avoid BayHub OZ711LV2 erratum (Rajat
  Jain)

- Remove unnecessary initialization of static variables (Longji Guo)

* pci/enumeration:
  x86/PCI: Remove initialization of static variables to false
  PCI: Use DWORD accesses for LTR, L1 SS to avoid erratum
  PCI/sysfs: Use default_groups in kobj_type for slot attrs
  PCI: Convert pci_dev_present() stub to static inline
  PCI: Use pci_find_vsec_capability() when looking for TBT devices
parents 7498e41f 346865f0

arch/x86/pci/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ struct pci_root_info { 
};



static bool pci_use_crs = true;

static bool pci_ignore_seg = false;

static bool pci_ignore_seg;



static int __init set_use_crs(const struct dmi_system_id *id)

{

drivers/pci/pci.c

+8 −8
Original line number Diff line number Diff line
@@ -1556,7 +1556,7 @@ static void pci_save_ltr_state(struct pci_dev *dev) 
{

	int ltr;

	struct pci_cap_saved_state *save_state;

	u16 *cap;

	u32 *cap;



	if (!pci_is_pcie(dev))

		return;
@@ -1571,25 +1571,25 @@ static void pci_save_ltr_state(struct pci_dev *dev) 
		return;

	}



	cap = (u16 *)&save_state->cap.data[0];

	pci_read_config_word(dev, ltr + PCI_LTR_MAX_SNOOP_LAT, cap++);

	pci_read_config_word(dev, ltr + PCI_LTR_MAX_NOSNOOP_LAT, cap++);

	/* Some broken devices only support dword access to LTR */

	cap = &save_state->cap.data[0];

	pci_read_config_dword(dev, ltr + PCI_LTR_MAX_SNOOP_LAT, cap);

}



static void pci_restore_ltr_state(struct pci_dev *dev)

{

	struct pci_cap_saved_state *save_state;

	int ltr;

	u16 *cap;

	u32 *cap;



	save_state = pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_LTR);

	ltr = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_LTR);

	if (!save_state || !ltr)

		return;



	cap = (u16 *)&save_state->cap.data[0];

	pci_write_config_word(dev, ltr + PCI_LTR_MAX_SNOOP_LAT, *cap++);

	pci_write_config_word(dev, ltr + PCI_LTR_MAX_NOSNOOP_LAT, *cap++);

	/* Some broken devices only support dword access to LTR */

	cap = &save_state->cap.data[0];

	pci_write_config_dword(dev, ltr + PCI_LTR_MAX_SNOOP_LAT, *cap);

}



/**

drivers/pci/pcie/aspm.c

+1 −0
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ static void aspm_calc_l1ss_info(struct pcie_link_state *link, 
	encode_l12_threshold(l1_2_threshold, &scale, &value);

	ctl1 |= t_common_mode << 8 | scale << 29 | value << 16;



	/* Some broken devices only support dword access to L1 SS */

	pci_read_config_dword(parent, parent->l1ss + PCI_L1SS_CTL1, &pctl1);

	pci_read_config_dword(parent, parent->l1ss + PCI_L1SS_CTL2, &pctl2);

	pci_read_config_dword(child, child->l1ss + PCI_L1SS_CTL1, &cctl1);

drivers/pci/probe.c

+5 −13
Original line number Diff line number Diff line
@@ -1579,20 +1579,12 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev) 


static void set_pcie_thunderbolt(struct pci_dev *dev)

{

	int vsec = 0;

	u32 header;



	while ((vsec = pci_find_next_ext_capability(dev, vsec,

						    PCI_EXT_CAP_ID_VNDR))) {

		pci_read_config_dword(dev, vsec + PCI_VNDR_HEADER, &header);

	u16 vsec;



	/* Is the device part of a Thunderbolt controller? */

		if (dev->vendor == PCI_VENDOR_ID_INTEL &&

		    PCI_VNDR_HEADER_ID(header) == PCI_VSEC_ID_INTEL_TBT) {

	vsec = pci_find_vsec_capability(dev, PCI_VENDOR_ID_INTEL, PCI_VSEC_ID_INTEL_TBT);

	if (vsec)

		dev->is_thunderbolt = 1;

			return;

		}

	}

}



static void set_pcie_untrusted(struct pci_dev *dev)

drivers/pci/slot.c

+2 −1
Original line number Diff line number Diff line
@@ -96,11 +96,12 @@ static struct attribute *pci_slot_default_attrs[] = { 
	&pci_slot_attr_cur_speed.attr,

	NULL,

};

ATTRIBUTE_GROUPS(pci_slot_default);



static struct kobj_type pci_slot_ktype = {

	.sysfs_ops = &pci_slot_sysfs_ops,

	.release = &pci_slot_release,

	.default_attrs = pci_slot_default_attrs,

	.default_groups = pci_slot_default_groups,

};



static char *make_slot_name(const char *name)