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

Commit f46753c5 authored by Alex Chiang's avatar Alex Chiang Committed by Jesse Barnes
Browse files

PCI: introduce pci_slot 



Currently, /sys/bus/pci/slots/ only exposes hotplug attributes when a
hotplug driver is loaded, but PCI slots have attributes such as address,
speed, width, etc.  that are not related to hotplug at all.

Introduce pci_slot as the primary data structure and kobject model.
Hotplug attributes described in hotplug_slot become a secondary
structure associated with the pci_slot.

This patch only creates the infrastructure that allows the separation of
PCI slot attributes and hotplug attributes.  In this patch, the PCI
hotplug core remains the only user of this infrastructure, and thus,
/sys/bus/pci/slots/ will still only become populated when a hotplug
driver is loaded.

A later patch in this series will add a second user of this new
infrastructure and demonstrate splitting the task of exposing pci_slot
attributes from hotplug_slot attributes.

  - Make pci_slot the primary sysfs entity. hotplug_slot becomes a
    subsidiary structure.
    o pci_create_slot() creates and registers a slot with the PCI core
    o pci_slot_add_hotplug() gives it hotplug capability

  - Change the prototype of pci_hp_register() to take the bus and
    slot number (on parent bus) as parameters.

  - Remove all the ->get_address methods since this functionality is
    now handled by pci_slot directly.

[achiang@hp.com: rpaphp-correctly-pci_hp_register-for-empty-pci-slots]
Tested-by: default avatarBadari Pulavarty <pbadari@us.ibm.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: make headers_check happy]
[akpm@linux-foundation.org: nuther build fix]
[akpm@linux-foundation.org: fix typo in #include]
Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
Cc: Greg KH <greg@kroah.com>
Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Len Brown <lenb@kernel.org>
Acked-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent fe99740c

drivers/pci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the PCI bus specific drivers.

#



obj-y		+= access.o bus.o probe.o remove.o pci.o quirks.o \

obj-y		+= access.o bus.o probe.o remove.o pci.o quirks.o slot.o \

			pci-driver.o search.o pci-sysfs.o rom.o setup-res.o

obj-$(CONFIG_PROC_FS) += proc.o

drivers/pci/hotplug/acpiphp.h

+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ extern u8 acpiphp_get_power_status (struct acpiphp_slot *slot); 
extern u8 acpiphp_get_attention_status (struct acpiphp_slot *slot);

extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot);

extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);

extern u32 acpiphp_get_address (struct acpiphp_slot *slot);



/* variables */

extern int acpiphp_debug;

drivers/pci/hotplug/acpiphp_core.c

+5 −20
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static int disable_slot (struct hotplug_slot *slot); 
static int set_attention_status (struct hotplug_slot *slot, u8 value);

static int get_power_status	(struct hotplug_slot *slot, u8 *value);

static int get_attention_status (struct hotplug_slot *slot, u8 *value);

static int get_address		(struct hotplug_slot *slot, u32 *value);

static int get_latch_status	(struct hotplug_slot *slot, u8 *value);

static int get_adapter_status	(struct hotplug_slot *slot, u8 *value);
@@ -83,7 +82,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = { 
	.get_attention_status	= get_attention_status,

	.get_latch_status	= get_latch_status,

	.get_adapter_status	= get_adapter_status,

	.get_address		= get_address,

};
@@ -274,23 +272,6 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value) 
	return 0;

}





/**

 * get_address - get pci address of a slot

 * @hotplug_slot: slot to get status

 * @value: pointer to struct pci_busdev (seg, bus, dev)

 */

static int get_address(struct hotplug_slot *hotplug_slot, u32 *value)

{

	struct slot *slot = hotplug_slot->private;



	dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);



	*value = acpiphp_get_address(slot->acpi_slot);



	return 0;

}



static int __init init_acpi(void)

{

	int retval;
@@ -357,7 +338,11 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) 
	acpiphp_slot->slot = slot;

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



	retval = pci_hp_register(slot->hotplug_slot);

	retval = pci_hp_register(slot->hotplug_slot,

					acpiphp_slot->bridge->pci_bus,

					acpiphp_slot->device);

	if (retval == -EBUSY)

		goto error_hpslot;

	if (retval) {

		err("pci_hp_register failed with error %d\n", retval);

		goto error_hpslot;

drivers/pci/hotplug/acpiphp_glue.c

+6 −17
Original line number Diff line number Diff line
@@ -258,7 +258,12 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) 
				bridge->pci_bus->number, slot->device);

		retval = acpiphp_register_hotplug_slot(slot);

		if (retval) {

			warn("acpiphp_register_hotplug_slot failed(err code = 0x%x)\n", retval);

			if (retval == -EBUSY)

				warn("Slot %d already registered by another "

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

			else

				warn("acpiphp_register_hotplug_slot failed "

					"(err code = 0x%x)\n", retval);

			goto err_exit;

		}

	}
@@ -1867,19 +1872,3 @@ u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot) 


	return (sta == 0) ? 0 : 1;

}
 




/*

 * pci address (seg/bus/dev)

 */

u32 acpiphp_get_address(struct acpiphp_slot *slot)

{

	u32 address;

	struct pci_bus *pci_bus = slot->bridge->pci_bus;



	address = (pci_domain_nr(pci_bus) << 16) |

		  (pci_bus->number << 8) |

		  slot->device;



	return address;

}

drivers/pci/hotplug/acpiphp_ibm.c

+4 −2
Original line number Diff line number Diff line
@@ -33,8 +33,10 @@ 
#include <linux/kobject.h>

#include <asm/uaccess.h>

#include <linux/moduleparam.h>

#include <linux/pci.h>



#include "acpiphp.h"

#include "../pci.h"



#define DRIVER_VERSION	"1.0.1"

#define DRIVER_AUTHOR	"Irene Zubarev <zubarev@us.ibm.com>, Vernon Mauery <vernux@us.ibm.com>"
@@ -430,7 +432,7 @@ static int __init ibm_acpiphp_init(void) 
	int retval = 0;

	acpi_status status;

	struct acpi_device *device;

	struct kobject *sysdir = &pci_hotplug_slots_kset->kobj;

	struct kobject *sysdir = &pci_slots_kset->kobj;



	dbg("%s\n", __func__);
@@ -477,7 +479,7 @@ static int __init ibm_acpiphp_init(void) 
static void __exit ibm_acpiphp_exit(void)

{

	acpi_status status;

	struct kobject *sysdir = &pci_hotplug_slots_kset->kobj;

	struct kobject *sysdir = &pci_slots_kset->kobj;



	dbg("%s\n", __func__);