Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6adc195 authored by Justin Chen's avatar Justin Chen Committed by Jesse Barnes
Browse files

PCI hotplug: acpiphp wants a 64-bit _SUN 



Certain HP machines require the full 64 bits of _SUN as allowed
by the ACPI spec. Without this change, we get name collisions in
the lower 32 bits of the _SUN returned by firmware.

Acked-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarJustin Chen <justin.chen@hp.com>
Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent db9aaf0b

drivers/pci/hotplug/acpiphp.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct acpiphp_slot { 


	u8		device;		/* pci device# */



	u32		sun;		/* ACPI _SUN (slot unique number) */

	unsigned long long sun;		/* ACPI _SUN (slot unique number) */

	u32		flags;		/* see below */

};

drivers/pci/hotplug/acpiphp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) 
	slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN;



	acpiphp_slot->slot = slot;

	snprintf(name, SLOT_NAME_SIZE, "%u", slot->acpi_slot->sun);

	snprintf(name, SLOT_NAME_SIZE, "%llu", slot->acpi_slot->sun);



	retval = pci_hp_register(slot->hotplug_slot,

					acpiphp_slot->bridge->pci_bus,

drivers/pci/hotplug/acpiphp_glue.c

+2 −2
Original line number Diff line number Diff line
@@ -255,13 +255,13 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) 


		bridge->nr_slots++;



		dbg("found ACPI PCI Hotplug slot %d at PCI %04x:%02x:%02x\n",

		dbg("found ACPI PCI Hotplug slot %llu at PCI %04x:%02x:%02x\n",

				slot->sun, pci_domain_nr(bridge->pci_bus),

				bridge->pci_bus->number, slot->device);

		retval = acpiphp_register_hotplug_slot(slot);

		if (retval) {

			if (retval == -EBUSY)

				warn("Slot %d already registered by another "

				warn("Slot %llu already registered by another "

					"hotplug driver\n", slot->sun);

			else

				warn("acpiphp_register_hotplug_slot failed "