Commit 2f419d76 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/hotplug' into next 

* pci/hotplug:
  PCI: pciehp: Prevent NULL dereference during probe
  PCI: pciehp: Reduce PCIe slot_ctrl to 16 bits
  PCI: Configure *all* devices, not just hot-added ones
  PCI: Preserve MPS and MRRS when applying _HPX settings
  PCI: Apply _HPP settings to all hot-added PCI devices
  PCI: Preserve BIOS PCI_COMMAND_SERR and PCI_COMMAND_PARITY settings
  PCI: Apply _HPP settings to PCIe devices as well as PCI and PCI-X
  PCI: Remove unused pci_configure_slot()
  ACPI / hotplug / PCI: Remove pci_configure_slot() usage
  PCI: shpchp: Remove pci_configure_slot() usage
  PCI: pciehp: Remove pci_configure_slot() usage
  PCI: Add pci_configure_device() during enumeration
  PCI: Move pci_configure_slot() to drivers/pci/probe.c
  PCI: Shuffle pci-acpi.c functions to group them logically
  PCI: Whitespace cleanup in pci-acpi.c
  PCI: Move pci_get_hp_params() to drivers/pci/pci-acpi.c
  PCI: pciehp: Configure hot-added display devices
  PCI: Remove "no hotplug settings from platform" warning
parents ef39ab79 bceee4a9

drivers/pci/hotplug/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ obj-$(CONFIG_HOTPLUG_PCI_S390) += s390_pci_hpc.o 


obj-$(CONFIG_HOTPLUG_PCI_ACPI_IBM)	+= acpiphp_ibm.o



pci_hotplug-objs	:=	pci_hotplug_core.o pcihp_slot.o

pci_hotplug-objs	:=	pci_hotplug_core.o



ifdef CONFIG_HOTPLUG_PCI_CPCI

pci_hotplug-objs	+=	cpci_hotplug_core.o	\

drivers/pci/hotplug/acpi_pcihp.c

+0 −251
Original line number Diff line number Diff line
@@ -46,215 +46,6 @@ 


static bool debug_acpi;



static acpi_status

decode_type0_hpx_record(union acpi_object *record, struct hotplug_params *hpx)

{

	int i;

	union acpi_object *fields = record->package.elements;

	u32 revision = fields[1].integer.value;



	switch (revision) {

	case 1:

		if (record->package.count != 6)

			return AE_ERROR;

		for (i = 2; i < 6; i++)

			if (fields[i].type != ACPI_TYPE_INTEGER)

				return AE_ERROR;

		hpx->t0 = &hpx->type0_data;

		hpx->t0->revision        = revision;

		hpx->t0->cache_line_size = fields[2].integer.value;

		hpx->t0->latency_timer   = fields[3].integer.value;

		hpx->t0->enable_serr     = fields[4].integer.value;

		hpx->t0->enable_perr     = fields[5].integer.value;

		break;

	default:

		printk(KERN_WARNING

		       "%s: Type 0 Revision %d record not supported\n",

		       __func__, revision);

		return AE_ERROR;

	}

	return AE_OK;

}



static acpi_status

decode_type1_hpx_record(union acpi_object *record, struct hotplug_params *hpx)

{

	int i;

	union acpi_object *fields = record->package.elements;

	u32 revision = fields[1].integer.value;



	switch (revision) {

	case 1:

		if (record->package.count != 5)

			return AE_ERROR;

		for (i = 2; i < 5; i++)

			if (fields[i].type != ACPI_TYPE_INTEGER)

				return AE_ERROR;

		hpx->t1 = &hpx->type1_data;

		hpx->t1->revision      = revision;

		hpx->t1->max_mem_read  = fields[2].integer.value;

		hpx->t1->avg_max_split = fields[3].integer.value;

		hpx->t1->tot_max_split = fields[4].integer.value;

		break;

	default:

		printk(KERN_WARNING

		       "%s: Type 1 Revision %d record not supported\n",

		       __func__, revision);

		return AE_ERROR;

	}

	return AE_OK;

}



static acpi_status

decode_type2_hpx_record(union acpi_object *record, struct hotplug_params *hpx)

{

	int i;

	union acpi_object *fields = record->package.elements;

	u32 revision = fields[1].integer.value;



	switch (revision) {

	case 1:

		if (record->package.count != 18)

			return AE_ERROR;

		for (i = 2; i < 18; i++)

			if (fields[i].type != ACPI_TYPE_INTEGER)

				return AE_ERROR;

		hpx->t2 = &hpx->type2_data;

		hpx->t2->revision      = revision;

		hpx->t2->unc_err_mask_and      = fields[2].integer.value;

		hpx->t2->unc_err_mask_or       = fields[3].integer.value;

		hpx->t2->unc_err_sever_and     = fields[4].integer.value;

		hpx->t2->unc_err_sever_or      = fields[5].integer.value;

		hpx->t2->cor_err_mask_and      = fields[6].integer.value;

		hpx->t2->cor_err_mask_or       = fields[7].integer.value;

		hpx->t2->adv_err_cap_and       = fields[8].integer.value;

		hpx->t2->adv_err_cap_or        = fields[9].integer.value;

		hpx->t2->pci_exp_devctl_and    = fields[10].integer.value;

		hpx->t2->pci_exp_devctl_or     = fields[11].integer.value;

		hpx->t2->pci_exp_lnkctl_and    = fields[12].integer.value;

		hpx->t2->pci_exp_lnkctl_or     = fields[13].integer.value;

		hpx->t2->sec_unc_err_sever_and = fields[14].integer.value;

		hpx->t2->sec_unc_err_sever_or  = fields[15].integer.value;

		hpx->t2->sec_unc_err_mask_and  = fields[16].integer.value;

		hpx->t2->sec_unc_err_mask_or   = fields[17].integer.value;

		break;

	default:

		printk(KERN_WARNING

		       "%s: Type 2 Revision %d record not supported\n",

		       __func__, revision);

		return AE_ERROR;

	}

	return AE_OK;

}



static acpi_status

acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx)

{

	acpi_status status;

	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};

	union acpi_object *package, *record, *fields;

	u32 type;

	int i;



	/* Clear the return buffer with zeros */

	memset(hpx, 0, sizeof(struct hotplug_params));



	status = acpi_evaluate_object(handle, "_HPX", NULL, &buffer);

	if (ACPI_FAILURE(status))

		return status;



	package = (union acpi_object *)buffer.pointer;

	if (package->type != ACPI_TYPE_PACKAGE) {

		status = AE_ERROR;

		goto exit;

	}



	for (i = 0; i < package->package.count; i++) {

		record = &package->package.elements[i];

		if (record->type != ACPI_TYPE_PACKAGE) {

			status = AE_ERROR;

			goto exit;

		}



		fields = record->package.elements;

		if (fields[0].type != ACPI_TYPE_INTEGER ||

		    fields[1].type != ACPI_TYPE_INTEGER) {

			status = AE_ERROR;

			goto exit;

		}



		type = fields[0].integer.value;

		switch (type) {

		case 0:

			status = decode_type0_hpx_record(record, hpx);

			if (ACPI_FAILURE(status))

				goto exit;

			break;

		case 1:

			status = decode_type1_hpx_record(record, hpx);

			if (ACPI_FAILURE(status))

				goto exit;

			break;

		case 2:

			status = decode_type2_hpx_record(record, hpx);

			if (ACPI_FAILURE(status))

				goto exit;

			break;

		default:

			printk(KERN_ERR "%s: Type %d record not supported\n",

			       __func__, type);

			status = AE_ERROR;

			goto exit;

		}

	}

 exit:

	kfree(buffer.pointer);

	return status;

}



static acpi_status

acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)

{

	acpi_status status;

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *package, *fields;

	int i;



	memset(hpp, 0, sizeof(struct hotplug_params));



	status = acpi_evaluate_object(handle, "_HPP", NULL, &buffer);

	if (ACPI_FAILURE(status))

		return status;



	package = (union acpi_object *) buffer.pointer;

	if (package->type != ACPI_TYPE_PACKAGE ||

	    package->package.count != 4) {

		status = AE_ERROR;

		goto exit;

	}



	fields = package->package.elements;

	for (i = 0; i < 4; i++) {

		if (fields[i].type != ACPI_TYPE_INTEGER) {

			status = AE_ERROR;

			goto exit;

		}

	}



	hpp->t0 = &hpp->type0_data;

	hpp->t0->revision        = 1;

	hpp->t0->cache_line_size = fields[0].integer.value;

	hpp->t0->latency_timer   = fields[1].integer.value;

	hpp->t0->enable_serr     = fields[2].integer.value;

	hpp->t0->enable_perr     = fields[3].integer.value;



exit:

	kfree(buffer.pointer);

	return status;

}







/* acpi_run_oshp - get control of hotplug from the firmware

 *

 * @handle - the handle of the hotplug controller.
@@ -283,48 +74,6 @@ static acpi_status acpi_run_oshp(acpi_handle handle) 
	return status;

}



/* pci_get_hp_params

 *

 * @dev - the pci_dev for which we want parameters

 * @hpp - allocated by the caller

 */

int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp)

{

	acpi_status status;

	acpi_handle handle, phandle;

	struct pci_bus *pbus;



	handle = NULL;

	for (pbus = dev->bus; pbus; pbus = pbus->parent) {

		handle = acpi_pci_get_bridge_handle(pbus);

		if (handle)

			break;

	}



	/*

	 * _HPP settings apply to all child buses, until another _HPP is

	 * encountered. If we don't find an _HPP for the input pci dev,

	 * look for it in the parent device scope since that would apply to

	 * this pci dev.

	 */

	while (handle) {

		status = acpi_run_hpx(handle, hpp);

		if (ACPI_SUCCESS(status))

			return 0;

		status = acpi_run_hpp(handle, hpp);

		if (ACPI_SUCCESS(status))

			return 0;

		if (acpi_is_root_bridge(handle))

			break;

		status = acpi_get_parent(handle, &phandle);

		if (ACPI_FAILURE(status))

			break;

		handle = phandle;

	}

	return -ENODEV;

}

EXPORT_SYMBOL_GPL(pci_get_hp_params);



/**

 * acpi_get_hp_hw_control_from_firmware

 * @dev: the pci_dev of the bridge that has a hotplug controller

drivers/pci/hotplug/acpiphp_glue.c

+1 −10
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static DEFINE_MUTEX(bridge_mutex); 
static int acpiphp_hotplug_notify(struct acpi_device *adev, u32 type);

static void acpiphp_post_dock_fixup(struct acpi_device *adev);

static void acpiphp_sanitize_bus(struct pci_bus *bus);

static void acpiphp_set_hpp_values(struct pci_bus *bus);

static void hotplug_event(u32 type, struct acpiphp_context *context);

static void free_bridge(struct kref *kref);
@@ -510,7 +509,7 @@ static void enable_slot(struct acpiphp_slot *slot) 
	__pci_bus_assign_resources(bus, &add_list, NULL);



	acpiphp_sanitize_bus(bus);

	acpiphp_set_hpp_values(bus);

	pcie_bus_configure_settings(bus);

	acpiphp_set_acpi_region(slot);



	list_for_each_entry(dev, &bus->devices, bus_list) {
@@ -702,14 +701,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge) 
	}

}



static void acpiphp_set_hpp_values(struct pci_bus *bus)

{

	struct pci_dev *dev;



	list_for_each_entry(dev, &bus->devices, bus_list)

		pci_configure_slot(dev);

}



/*

 * Remove devices for which we could not assign resources, call

 * arch specific code to fix-up the bus

drivers/pci/hotplug/pciehp.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct controller { 
	struct slot *slot;

	wait_queue_head_t queue;	/* sleep & wake process */

	u32 slot_cap;

	u32 slot_ctrl;

	u16 slot_ctrl;

	struct timer_list poll_timer;

	unsigned long cmd_started;	/* jiffies */

	unsigned int cmd_busy:1;

drivers/pci/hotplug/pciehp_core.c

+7 −0
Original line number Diff line number Diff line
@@ -262,6 +262,13 @@ static int pciehp_probe(struct pcie_device *dev) 
		goto err_out_none;

	}



	if (!dev->port->subordinate) {

		/* Can happen if we run out of bus numbers during probe */

		dev_err(&dev->device,

			"Hotplug bridge without secondary bus, ignoring\n");

		goto err_out_none;

	}



	ctrl = pcie_init(dev);

	if (!ctrl) {

		dev_err(&dev->device, "Controller initialization failed\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE