PCI: let the core manage slot names
Subsystems (5)
cover PCI: let the core manage slot names
This series implements a series of changes that allows the PCI core to manage slot names, rather than individual hotplug drivers.
There are several benefits to this approach:
1) The core can prevent duplicate slot names on systems with broken firmware.
2) Since the kobject core keeps a copy of the slot name, there is no need for each driver to manage a separate copy, especially since the core can rename slots from underneath drivers. We save runtime memory by only referencing the kobject name.
2.a) The PCI hotplug core doesn't need its own reference
for slot name either.
3) Individual hotplug drivers become just a little bit simpler by pushing as many kzalloc() calls for 'name' down into the PCI core as possible.
I've compile tested every driver, including sgi, rpaphp, and ibmphp.
I've runtime tested acpiphp and pciehp, as I only have access to platforms that support those two drivers.
I would love it if Kenji-san could test the duplicate slot name logic for me, as I don't have access to platforms with that behavior.
I think this *might* be 2.6.27 material, because the original impetus for this change was a user (Pierre Ossman) complaining that 2.6.27 required him to pass a parameter to pciehp in order to successfully load the module.
Although the diffstat is large, don't be fooled. The significant portion of the additions come from the duplicate slot logic in the PCI core. And of those changes, they were 40% comments, so it looks like more was added than is truly the case.
---
Alex Chiang (13):
PCI: Hotplug core: remove 'name'
PCI: shcphp: remove 'name' parameter
PCI: SGI Hotplug: stop managing bss_hotplug_slot->name
PCI: rpaphp: stop managing hotplug_slot->name
PCI: pciehp: remove 'name' parameter
PCI: ibmphp: stop managing hotplug_slot->name
PCI: fakephp: remove 'name' parameter
PCI: cpqphp: stop managing hotplug_slot->name
PCI: cpci_hotplug: stop managing hotplug_slot->name
PCI: acpiphp: remove 'name' parameter
PCI, PCI Hotplug: introduce slot_name helpers
PCI: prevent duplicate slot names
PCI Hotplug core: add 'name' param pci_hp_register interface
drivers/pci/hotplug/acpiphp.h | 9 ++- drivers/pci/hotplug/acpiphp_core.c | 37 +++++++----- drivers/pci/hotplug/cpci_hotplug.h | 6 ++ drivers/pci/hotplug/cpci_hotplug_core.c | 75 ++++++++++--------------- drivers/pci/hotplug/cpci_hotplug_pci.c | 4 + drivers/pci/hotplug/cpqphp.h | 13 ++-- drivers/pci/hotplug/cpqphp_core.c | 41 +++++++------- drivers/pci/hotplug/fakephp.c | 19 ++++-- drivers/pci/hotplug/ibmphp.h | 5 +- drivers/pci/hotplug/ibmphp_ebda.c | 20 +++---- drivers/pci/hotplug/pci_hotplug_core.c | 29 ++++------ drivers/pci/hotplug/pciehp.h | 11 ++-- drivers/pci/hotplug/pciehp_core.c | 34 +++++------ drivers/pci/hotplug/pciehp_ctrl.c | 48 ++++++++-------- drivers/pci/hotplug/pciehp_hpc.c | 10 --- drivers/pci/hotplug/rpaphp.h | 10 ++- drivers/pci/hotplug/rpaphp_core.c | 6 +- drivers/pci/hotplug/rpaphp_pci.c | 4 + drivers/pci/hotplug/rpaphp_slot.c | 26 +++------ drivers/pci/hotplug/sgi_hotplug.c | 19 ++---- drivers/pci/hotplug/shpchp.h | 9 ++- drivers/pci/hotplug/shpchp_core.c | 46 +++++---------- drivers/pci/hotplug/shpchp_ctrl.c | 48 ++++++++-------- drivers/pci/slot.c | 93 +++++++++++++++++++++++++------ include/linux/pci.h | 5 ++ include/linux/pci_hotplug.h | 13 +++- 26 files changed, 328 insertions(+), 312 deletions(-)
PATCH 1/13 PCI Hotplug core: add 'name' param pci_hp_register interface
Update pci_hp_register() to take a const char *name parameter.
The motivation for this is to clean up the individual hotplug drivers so that each one does not have to manage its own name. The PCI core should be the place where we manage the name.
We update the interface and all callsites first, in a "no functional change" manner, and clean up the drivers later.
---
drivers/pci/hotplug/acpiphp_core.c | 3 ++- drivers/pci/hotplug/cpci_hotplug_core.c | 3 ++- drivers/pci/hotplug/cpqphp_core.c | 3 ++- drivers/pci/hotplug/fakephp.c | 3 ++- drivers/pci/hotplug/ibmphp_ebda.c | 3 ++- drivers/pci/hotplug/pci_hotplug_core.c | 21 +++++++++++---------- drivers/pci/hotplug/pciehp_core.c | 3 ++- drivers/pci/hotplug/rpaphp_slot.c | 2 +- drivers/pci/hotplug/sgi_hotplug.c | 3 ++- drivers/pci/hotplug/shpchp_core.c | 3 ++- include/linux/pci_hotplug.h | 5 ++++- 11 files changed, 32 insertions(+), 20 deletions(-)
drivers/pci/hotplug/acpiphp_core.c +2 -1
@@ -340,7 +340,8 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) retval =pci_hp_register (slot->hotplug_slot, acpiphp_slot->bridge->pci_bus, - acpiphp_slot->device); + acpiphp_slot->device, + slot->name);if (retval == -EBUSY ) goto error_hpslot;if (retval) {
drivers/pci/hotplug/cpci_hotplug_core.c +2 -1
@@ -285,7 +285,8 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last) info->attention_status =cpci_get_attention_status (slot);dbg ("registering slot %s" , slot->hotplug_slot->name); - status =pci_hp_register (slot->hotplug_slot, bus, i); + status =pci_hp_register (slot->hotplug_slot, bus, i, + slot->hotplug_slot->name);if (status) {err ("pci_hp_register failed with error %d" , status); goto error_name;
drivers/pci/hotplug/cpqphp_core.c +2 -1
@@ -436,7 +436,8 @@ static int ctrl_slot_setup(struct controller *ctrl, slot_number); result =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, - slot->device); + slot->device, + hotplug_slot->name);if (result) {err ("pci_hp_register failed with error %d\n" , result); goto error_name;
drivers/pci/hotplug/fakephp.c +2 -1
@@ -126,7 +126,8 @@ static int add_slot(struct pci_dev *dev) slot->release = &dummy_release; slot->private = dslot; - retval =pci_hp_register (slot, dev->bus,PCI_SLOT (dev->devfn)); + retval =pci_hp_register (slot, dev->bus,PCI_SLOT (dev->devfn), + slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); goto error_dslot;
drivers/pci/hotplug/ibmphp_ebda.c +2 -1
@@ -1002,7 +1002,8 @@ static int __init ebda_rsrc_controller (void)snprintf (tmp_slot->hotplug_slot->name,30 ,"%s" ,create_file_name (tmp_slot));pci_hp_register (tmp_slot->hotplug_slot, -pci_find_bus (0 , tmp_slot->bus), tmp_slot->device); +pci_find_bus (0 , tmp_slot->bus), tmp_slot->device, + tmp_slot->hotplug_slot->name); }print_ebda_hpc ();
drivers/pci/hotplug/pci_hotplug_core.c +11 -10
@@ -547,13 +547,15 @@ out:* @bus: bus this slot is on * @slot: pointer to the &struct hotplug_slot to register * @slot_nr: slot number +* @name: name registered with kobject core * * Registers a hotplug slot with the pci hotplug subsystem, which will allow * userspace interaction to the slot. * * Returns 0 if successful, anything else for an error. -*/ -int pci_hp_register (struct hotplug_slot *slot,struct pci_bus *bus,int slot_nr) +**/ +int pci_hp_register (struct hotplug_slot *slot,struct pci_bus *bus,int slot_nr, +const char *name) {int result;struct pci_slot *pci_slot;
@@ -569,7 +571,7 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr) }/* Check if we have already registered a slot with the same name. */ -if (get_slot_from_name (slot->name)) +if (get_slot_from_name (name))return -EEXIST ;/*
@@ -577,7 +579,7 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr)* driver and call it here again. If we've already created the * pci_slot, the interface will simply bump the refcount. */ - pci_slot =pci_create_slot (bus, slot_nr, slot->name); + pci_slot =pci_create_slot (bus, slot_nr, name);if (IS_ERR (pci_slot))return PTR_ERR (pci_slot);
@@ -593,8 +595,8 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr)/* * Allow pcihp drivers to override the ACPI_PCI_SLOT name. */ -if (strcmp (kobject_name (&pci_slot->kobj), slot->name)) { - result =kobject_rename (&pci_slot->kobj, slot->name); +if (strcmp (kobject_name (&pci_slot->kobj), name)) { + result =kobject_rename (&pci_slot->kobj, name);if (result) {pci_destroy_slot (pci_slot);return result;
@@ -607,8 +609,7 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr) result =fs_add_slot (pci_slot);kobject_uevent (&pci_slot->kobj,KOBJ_ADD ); -dbg ("Added slot %s to the list\n" , slot->name); - +dbg ("Added slot %s to the list\n" , name);return result; }
@@ -621,7 +622,7 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr)* previously with a call to pci_hp_register(). * * Returns 0 if successful, anything else for an error. -*/ +**/ int pci_hp_deregister (struct hotplug_slot *hotplug) {struct hotplug_slot *temp;
@@ -658,7 +659,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)* hotplug subsystem previously with a call to pci_hp_register(). * * Returns 0 if successful, anything else for an error. -*/ +**/ int __must_check pci_hp_change_slot_info (struct hotplug_slot *hotplug,struct hotplug_slot_info *info) {
drivers/pci/hotplug/pciehp_core.c +2 -1
@@ -222,7 +222,8 @@ static int init_slots(struct controller *ctrl) slot->hp_slot, slot->number, ctrl->slot_device_offset); retval =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, - slot->device); + slot->device, + slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval);if (retval == -EEXIST )
drivers/pci/hotplug/rpaphp_slot.c +1 -1
@@ -137,7 +137,7 @@ int rpaphp_register_slot(struct slot *slot) slotno =PCI_SLOT (PCI_DN (slot->dn->child)->devfn); else slotno =-1 ; - retval =pci_hp_register (php_slot, slot->bus, slotno); + retval =pci_hp_register (php_slot, slot->bus, slotno, slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval);return retval;
drivers/pci/hotplug/sgi_hotplug.c +2 -1
@@ -653,7 +653,8 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) bss_hotplug_slot->ops = &sn_hotplug_slot_ops; bss_hotplug_slot->release = &sn_release_slot; - rc =pci_hp_register (bss_hotplug_slot, pci_bus, device); + rc =pci_hp_register (bss_hotplug_slot, pci_bus, device, + bss_hotplug_slot->name);if (rc) goto register_err;
drivers/pci/hotplug/shpchp_core.c +2 -1
@@ -158,7 +158,8 @@ static int init_slots(struct controller *ctrl)"slot_device_offset=%x\n" , slot->bus, slot->device, slot->hp_slot, slot->number, ctrl->slot_device_offset); retval =pci_hp_register (slot->hotplug_slot, - ctrl->pci_dev->subordinate, slot->device); + ctrl->pci_dev->subordinate, slot->device, + hotplug_slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval);if (retval == -EEXIST )
include/linux/pci_hotplug.h +4 -1
@@ -165,7 +165,10 @@ struct hotplug_slot { };#define to_hotplug_slot (n) container_of(n, struct hotplug_slot, kobj) -extern int pci_hp_register (struct hotplug_slot *,struct pci_bus *,int nr); +extern int pci_hp_register (struct hotplug_slot *, +struct pci_bus *, +int nr, +const char *name);extern int pci_hp_deregister (struct hotplug_slot *slot);extern int __must_check pci_hp_change_slot_info (struct hotplug_slot *slot,struct hotplug_slot_info *info);
PATCH 2/13 PCI: prevent duplicate slot names
In reply to Alex ChiangPrevent callers of pci_create_slot() from registering slots with duplicate names. This condition occurs most often when PCI hotplug drivers are loaded on platforms with broken firmware that assigns identical names to multiple slots.
We now rename these duplicate slots on behalf of the user.
If firmware assigns the name N to multiple slots, then:
The first registered slot is assigned N The second registered slot is assigned N-1 The third registered slot is assigned N-2 The Mth registered slot becomes N-M
A side effect of this patch is that the error condition for when multiple drivers attempt to claim the same slot becomes much more prominent.
In other words, the previous error condition returned for duplicate slot names (-EEXIST) masked the case when multiple drivers attempted to claim the same slot. Now, the -EBUSY return makes the true error more obvious.
Finally, since we now prevent duplicate slot names, we remove the logic introduced by the following commits:
pci hotplug core: add check of duplicate slot name a86161b3134465f072d965ca7508ec9c1e2e52c7 pciehp: fix slot name 3800345f723fd130d50434d4717b99d4a9f383c8 pciehp: add message about pciehp_slot_with_bus option 9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009 shpchp: fix slot name ef0ff95f136f0f2d035667af5d18b824609de320 shpchp: add message about shpchp_slot_with_bus option b3bd307c628af2f0a581c42d5d7e4bcdbbf64b6a
---
drivers/pci/hotplug/pci_hotplug_core.c | 4 - drivers/pci/hotplug/pciehp.h | 1 drivers/pci/hotplug/pciehp_core.c | 7 -- drivers/pci/hotplug/pciehp_hpc.c | 6 -- drivers/pci/hotplug/shpchp_core.c | 14 ----- drivers/pci/slot.c | 93 +++++++++++++++++++++++++------- 6 files changed, 76 insertions(+), 49 deletions(-)
drivers/pci/hotplug/pci_hotplug_core.c +0 -4
@@ -570,10 +570,6 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr,return -EINVAL ; } -/* Check if we have already registered a slot with the same name. */ -if (get_slot_from_name (name)) -return -EEXIST ; -/* * No problems if we call this interface from both ACPI_PCI_SLOT * driver and call it here again. If we've already created the
drivers/pci/hotplug/pciehp.h +0 -1
@@ -43,7 +43,6 @@ extern int pciehp_poll_mode;extern int pciehp_poll_time;extern int pciehp_debug;extern int pciehp_force; -extern int pciehp_slot_with_bus;extern struct workqueue_struct *pciehp_wq; #define dbg(format, arg...) \
drivers/pci/hotplug/pciehp_core.c +0 -7
@@ -41,7 +41,6 @@ int pciehp_debug;int pciehp_poll_mode;int pciehp_poll_time;int pciehp_force; -int pciehp_slot_with_bus;struct workqueue_struct *pciehp_wq;#define DRIVER_VERSION "0.4"
@@ -56,12 +55,10 @@ module_param(pciehp_debug, bool, 0644);module_param (pciehp_poll_mode, bool,0644 );module_param (pciehp_poll_time, int,0644 );module_param (pciehp_force, bool,0644 ); -module_param (pciehp_slot_with_bus, bool,0644 );MODULE_PARM_DESC (pciehp_debug,"Debugging mode enabled or not" );MODULE_PARM_DESC (pciehp_poll_mode,"Using polling mechanism for hot-plug events or not" );MODULE_PARM_DESC (pciehp_poll_time,"Polling mechanism frequency, in seconds" );MODULE_PARM_DESC (pciehp_force,"Force pciehp, even if _OSC and OSHP are missing" ); -MODULE_PARM_DESC (pciehp_slot_with_bus,"Use bus number in the slot name" );#define PCIE_MODULE_NAME "pciehp"
@@ -226,10 +223,6 @@ static int init_slots(struct controller *ctrl) slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); -if (retval == -EEXIST ) -err ("Failed to register slot because of name " -"collision. Try \'pciehp_slot_with_bus\' " -"module option.\n" ); goto error_info; }/* create additional sysfs entries */
drivers/pci/hotplug/pciehp_hpc.c +1 -5
@@ -1032,11 +1032,7 @@ static void pcie_shutdown_notification(struct controller *ctrl)static void make_slot_name (struct slot *slot) { -if (pciehp_slot_with_bus) -snprintf (slot->name,SLOT_NAME_SIZE ,"%04d_%04d" , - slot->bus, slot->number); -else -snprintf (slot->name,SLOT_NAME_SIZE ,"%d" , slot->number); +snprintf (slot->name,SLOT_NAME_SIZE ,"%d" , slot->number); }static int pcie_init_slot (struct controller *ctrl)
drivers/pci/hotplug/shpchp_core.c +1 -13
@@ -39,7 +39,6 @@int shpchp_debug;int shpchp_poll_mode;int shpchp_poll_time; -static int shpchp_slot_with_bus;struct workqueue_struct *shpchp_wq;#define DRIVER_VERSION "0.4"
@@ -53,11 +52,9 @@ MODULE_LICENSE("GPL");module_param (shpchp_debug, bool,0644 );module_param (shpchp_poll_mode, bool,0644 );module_param (shpchp_poll_time, int,0644 ); -module_param (shpchp_slot_with_bus, bool,0644 );MODULE_PARM_DESC (shpchp_debug,"Debugging mode enabled or not" );MODULE_PARM_DESC (shpchp_poll_mode,"Using polling mechanism for hot-plug events or not" );MODULE_PARM_DESC (shpchp_poll_time,"Polling mechanism frequency, in seconds" ); -MODULE_PARM_DESC (shpchp_slot_with_bus,"Use bus number in the slot name" );#define SHPC_MODULE_NAME "shpchp"
@@ -101,12 +98,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)static void make_slot_name (struct slot *slot) { -if (shpchp_slot_with_bus) -snprintf (slot->hotplug_slot->name,SLOT_NAME_SIZE ,"%04d_%04d" , - slot->bus, slot->number); -else -snprintf (slot->hotplug_slot->name,SLOT_NAME_SIZE ,"%d" , - slot->number); +snprintf (slot->hotplug_slot->name,SLOT_NAME_SIZE ,"%d" , slot->number); }static int init_slots (struct controller *ctrl)
@@ -162,10 +154,6 @@ static int init_slots(struct controller *ctrl) hotplug_slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); -if (retval == -EEXIST ) -err ("Failed to register slot because of name " -"collision. Try \'shpchp_slot_with_bus\' " -"module option.\n" ); goto error_info; }
drivers/pci/slot.c +74 -19
149 lines not on this page · raw message
Re: [PATCH 02/13] PCI: prevent duplicate slot names
Hi Alex-san,
Thank you for updated patches and I'm sorry for delayed comment. I reviewed your patch and I found two problems. Please see below.
Quoted 204 lines · Alex Chiang
Prevent callers of
pci_create_slot()from registering slots with duplicate names. This condition occurs most often when PCI hotplug drivers are loaded on platforms with broken firmware that assigns identical names to multiple slots.We now rename these duplicate slots on behalf of the user.
If firmware assigns the name N to multiple slots, then:
The first registered slot is assigned N The second registered slot is assigned N-1 The third registered slot is assigned N-2 The Mth registered slot becomes N-M
A side effect of this patch is that the error condition for when multiple drivers attempt to claim the same slot becomes much more prominent.
In other words, the previous error condition returned for duplicate slot names (
-EEXIST) masked the case when multiple drivers attempted to claim the same slot. Now, the-EBUSYreturn makes the true error more obvious.Finally, since we now prevent duplicate slot names, we remove the logic introduced by the following commits:
pci hotplug core: add check of duplicate slot name a86161b3134465f072d965ca7508ec9c1e2e52c7 pciehp: fix slot name 3800345f723fd130d50434d4717b99d4a9f383c8 pciehp: add message about pciehp_slot_with_bus option 9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009 shpchp: fix slot name ef0ff95f136f0f2d035667af5d18b824609de320 shpchp: add message about shpchp_slot_with_bus option b3bd307c628af2f0a581c42d5d7e4bcdbbf64b6aSigned-off-by Alex Chiang <[email protected]>---
drivers/pci/hotplug/pci_hotplug_core.c | 4 - drivers/pci/hotplug/pciehp.h | 1 drivers/pci/hotplug/pciehp_core.c | 7 -- drivers/pci/hotplug/pciehp_hpc.c | 6 -- drivers/pci/hotplug/shpchp_core.c | 14 ----- drivers/pci/slot.c | 93 +++++++++++++++++++++++++------- 6 files changed, 76 insertions(+), 49 deletions(-)drivers/pci/hotplug/pci_hotplug_core.c +0
-4@@ -570,10 +570,6 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr,return -EINVAL ; } -/* Check if we have already registered a slot with the same name. */ -if (get_slot_from_name (name)) -return -EEXIST ; -/* * No problems if we call this interface from both ACPI_PCI_SLOT * driver and call it here again. If we've already created the drivers/pci/hotplug/pciehp.h +0
-1@@ -43,7 +43,6 @@ extern int pciehp_poll_mode;extern int pciehp_poll_time;extern int pciehp_debug;extern int pciehp_force; -extern int pciehp_slot_with_bus;extern struct workqueue_struct *pciehp_wq; #define dbg(format, arg...) \drivers/pci/hotplug/pciehp_core.c +0
-7@@ -41,7 +41,6 @@ int pciehp_debug;int pciehp_poll_mode;int pciehp_poll_time;int pciehp_force; -int pciehp_slot_with_bus;struct workqueue_struct *pciehp_wq;#define DRIVER_VERSION "0.4"@@ -56,12 +55,10 @@ module_param(pciehp_debug, bool, 0644);module_param (pciehp_poll_mode, bool,0644 );module_param (pciehp_poll_time, int,0644 );module_param (pciehp_force, bool,0644 ); -module_param (pciehp_slot_with_bus, bool,0644 );MODULE_PARM_DESC (pciehp_debug,"Debugging mode enabled or not" );MODULE_PARM_DESC (pciehp_poll_mode,"Using polling mechanism for hot-plug events or not" );MODULE_PARM_DESC (pciehp_poll_time,"Polling mechanism frequency, in seconds" );MODULE_PARM_DESC (pciehp_force,"Force pciehp, even if _OSC and OSHP are missing" ); -MODULE_PARM_DESC (pciehp_slot_with_bus,"Use bus number in the slot name" );#define PCIE_MODULE_NAME "pciehp"@@ -226,10 +223,6 @@ static int init_slots(struct controller *ctrl) slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); -if (retval == -EEXIST ) -err ("Failed to register slot because of name " -"collision. Try \'pciehp_slot_with_bus\' " -"module option.\n" ); goto error_info; }/* create additional sysfs entries */ drivers/pci/hotplug/pciehp_hpc.c +1
-5@@ -1032,11 +1032,7 @@ static void pcie_shutdown_notification(struct controller *ctrl)static void make_slot_name (struct slot *slot) { -if (pciehp_slot_with_bus) -snprintf (slot->name,SLOT_NAME_SIZE ,"%04d_%04d" , - slot->bus, slot->number); -else -snprintf (slot->name,SLOT_NAME_SIZE ,"%d" , slot->number); +snprintf (slot->name,SLOT_NAME_SIZE ,"%d" , slot->number); }static int pcie_init_slot (struct controller *ctrl)drivers/pci/hotplug/shpchp_core.c +1
-13@@ -39,7 +39,6 @@int shpchp_debug;int shpchp_poll_mode;int shpchp_poll_time; -static int shpchp_slot_with_bus;struct workqueue_struct *shpchp_wq;#define DRIVER_VERSION "0.4"@@ -53,11 +52,9 @@ MODULE_LICENSE("GPL");module_param (shpchp_debug, bool,0644 );module_param (shpchp_poll_mode, bool,0644 );module_param (shpchp_poll_time, int,0644 ); -module_param (shpchp_slot_with_bus, bool,0644 );MODULE_PARM_DESC (shpchp_debug,"Debugging mode enabled or not" );MODULE_PARM_DESC (shpchp_poll_mode,"Using polling mechanism for hot-plug events or not" );MODULE_PARM_DESC (shpchp_poll_time,"Polling mechanism frequency, in seconds" ); -MODULE_PARM_DESC (shpchp_slot_with_bus,"Use bus number in the slot name" );#define SHPC_MODULE_NAME "shpchp"@@ -101,12 +98,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)static void make_slot_name (struct slot *slot) { -if (shpchp_slot_with_bus) -snprintf (slot->hotplug_slot->name,SLOT_NAME_SIZE ,"%04d_%04d" , - slot->bus, slot->number); -else -snprintf (slot->hotplug_slot->name,SLOT_NAME_SIZE ,"%d" , - slot->number); +snprintf (slot->hotplug_slot->name,SLOT_NAME_SIZE ,"%d" , slot->number); }static int init_slots (struct controller *ctrl)@@ -162,10 +154,6 @@ static int init_slots(struct controller *ctrl) hotplug_slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); -if (retval == -EEXIST ) -err ("Failed to register slot because of name " -"collision. Try \'shpchp_slot_with_bus\' " -"module option.\n" ); goto error_info; }drivers/pci/slot.c +11
-0@@ -73,6 +73,50 @@ static struct kobj_type pci_slot_ktype = { .default_attrs = pci_slot_default_attrs, }; +static char *make_slot_name (const char *name) +{ +char *new_name; +int len, width, dup =1 ; +struct kobject *dup_slot; + + new_name =kstrdup (name,GFP_KERNEL ); +if (!new_name) + goto out; + +/*
drivers/pci/slot.c static struct kobj_type pci_slot_ktype = { · line 96
Quoted 10 lines
drivers/pci/slot.c +10
-0+* Start off allocating enough room for "name-X" +*/ + len =strlen (name) +2 ; + width =1 ; + +try_again: + dup_slot =kset_find_obj (pci_slots_kset, new_name); +if (!dup_slot) + goto out; +
The kset_find_obj() increments reference counter of specified kobject. So we must call kobject_put() for 'dup_slot', otherwise it leaks reference counter of 'dup_slot' kobject and the corresponding slot directory will never be removed. Here is a sample to fix this problem.
dup_slot = kset_find_ojb(pci_slots_kset, new_name); if (!dup_slot) goto out; kobject_put(dup_slot); ^^^^^^^^^^^^^^^^^^^^^^ Added this line
I found another problem in pci_hp_register() that would be more complex to fix than above-mentioned problem. Here is a pci_hp_register() with all of your patch applied.
int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr,
const char *name)
{
(snip...)
/*
* No problems if we call this interface from both ACPI_PCI_SLOT
* driver and call it here again. If we've already created the
* pci_slot, the interface will simply bump the refcount.
*/
pci_slot = pci_create_slot(bus, slot_nr, name);
if (IS_ERR(pci_slot))
return PTR_ERR(pci_slot);
if (pci_slot->hotplug) {
dbg("%s: already claimed\n", __func__);
pci_destroy_slot(pci_slot);
return -EBUSY;
}
slot->pci_slot = pci_slot;
pci_slot->hotplug = slot;
/*
* Allow pcihp drivers to override the ACPI_PCI_SLOT name.
*/
if (strcmp(kobject_name(&pci_slot->kobj), name)) {
result = kobject_rename(&pci_slot->kobj, name);
if (result) {
pci_destroy_slot(pci_slot);
return result;
}
}
(snip...)
}If name duplication was detected in pci_create_slot(), it renames the slot name like 'N-1' and return successfully. Even though slot's kobject name was registered as 'N-1', 'name' array still have 'N' at this point. So the following 'if' statement becomes true unexpectedly.
/*
* Allow pcihp drivers to override the ACPI_PCI_SLOT name.
*/
if (strcmp(kobject_name(&pci_slot->kobj), name)) {Then pci_hp_register() attempt to rename the slot name with 'N' again by calling kobject_rename(), but it fails because there already exists kobject with name 'N'. As a result, pci_hp_register() will fail.
Thanks,
Kenji Kaneshige
Re: [PATCH 02/13] PCI: prevent duplicate slot names
Hi Kenji-san,
As always, thank you very much for the excellent review.
Sorry for the delay; I've been busy with travel, and trying to figure out how to solve the issue you pointed out below.
* Kenji Kaneshige <[email protected]>:
Quoted 59 lines
Hi Alex-san,
Thank you for updated patches and I'm sorry for delayed comment. I reviewed your patch and I found two problems. Please see below.
Quoted 37 lines · Alex Chiang
Prevent callers of
pci_create_slot()from registering slots with duplicate names. This condition occurs most often when PCI hotplug drivers are loaded on platforms with broken firmware that assigns identical names to multiple slots.We now rename these duplicate slots on behalf of the user.
If firmware assigns the name N to multiple slots, then:
The first registered slot is assigned N The second registered slot is assigned N-1 The third registered slot is assigned N-2 The Mth registered slot becomes N-M
A side effect of this patch is that the error condition for when multiple drivers attempt to claim the same slot becomes much more prominent.
In other words, the previous error condition returned for duplicate slot names (
-EEXIST) masked the case when multiple drivers attempted to claim the same slot. Now, the-EBUSYreturn makes the true error more obvious.Finally, since we now prevent duplicate slot names, we remove the logic introduced by the following commits:
+static char *make_slot_name(const char *name)
drivers/pci/slot.c +10
-0+{ +char *new_name; +int len, width, dup =1 ; +struct kobject *dup_slot; + + new_name =kstrdup (name,GFP_KERNEL ); +if (!new_name) + goto out; + +/* drivers/pci/slot.c static struct kobj_type pci_slot_ktype = { · line 96
Quoted 10 lines
drivers/pci/slot.c +10
-0+* Start off allocating enough room for "name-X" +*/ + len =strlen (name) +2 ; + width =1 ; + +try_again: + dup_slot =kset_find_obj (pci_slots_kset, new_name); +if (!dup_slot) + goto out; +The
kset_find_obj()increments reference counter of specified kobject. So we must callkobject_put()for 'dup_slot', otherwise it leaks reference counter of 'dup_slot' kobject and the corresponding slot directory will never be removed. Here is a sample to fix this problem.
Quoted 5 lines
dup_slot = kset_find_ojb(pci_slots_kset, new_name); if (!dup_slot) goto out; kobject_put(dup_slot); ^^^^^^^^^^^^^^^^^^^^^^ Added this line
Yes, thanks for catching that. I've fixed it.
Quoted 46 lines
I found another problem in
pci_hp_register()that would be more complex to fix than above-mentioned problem. Here is apci_hp_register()with all of your patch applied.int pci_hp_register(struct
hotplug_slot*slot, structpci_bus*bus, intslot_nr,
const char *name){ (snip...) /* * No problems if we call this interface from both ACPI_PCI_SLOT * driver and call it here again. If we've already created the * pci_slot, the interface will simply bump the refcount. */ pci_slot = pci_create_slot(bus, slot_nr, name); if (IS_ERR(pci_slot)) return PTR_ERR(pci_slot); if (pci_slot->hotplug) { dbg("%s: already claimed\n", __func__); pci_destroy_slot(pci_slot); return -EBUSY; } slot->pci_slot = pci_slot; pci_slot->hotplug = slot; /* * Allow pcihp drivers to override the ACPI_PCI_SLOT name. */ if (strcmp(kobject_name(&pci_slot->kobj), name)) { result = kobject_rename(&pci_slot->kobj, name); if (result) { pci_destroy_slot(pci_slot); return result; } } (snip...) }If name duplication was detected in
pci_create_slot(), it renames the slot name like 'N-1' and return successfully. Even though slot's kobject name was registered as 'N-1', 'name' array still have 'N' at this point. So the following 'if' statement becomes true unexpectedly.
Quoted 8 lines
/* * Allow pcihp drivers to override the ACPI_PCI_SLOT name. */ if (strcmp(kobject_name(&pci_slot->kobj), name)) {Then
pci_hp_register()attempt to rename the slot name with 'N' again by callingkobject_rename(), but it fails because there already exists kobject with name 'N'. As a result,pci_hp_register()will fail.
Yes, you are right, that is a problem.
I've taken the following approach:
- the above code is providing a mechanism to allow a _hotplug_ driver to override a _detection_ driver slot name.
- in other words, we only have to worry about the case when a _detection_ driver was loaded before a _hotplug_ driver.
- we can ignore the case where another _hotplug_ driver was loaded first, because we'll already return -EBUSY.
- so, to figure out if a _detection_ driver has already been loaded, we check to see if the pci_dev already has a valid pci_slot pointer.
- if yes, then we later check to see if the existing slot name matches the requested slot name from the hotplug driver.
- if the hotplug driver is requesting a different name, then we use a new interface, pci_rename_slot() which will safely attempt to rename the slot without name collision.
I'll send out the patch set soon, it would be great if you could test it for me, since I don't have systems with duplicate slot names.
Thank you very much!
/ac
Re: [PATCH 02/13] PCI: prevent duplicate slot names
Hi Alex-san,
Thank you very much for your continuous effort.
I have one comment about the new design. Please see below.
Quoted 67 lines
Quoted 46 lines
I found another problem in
pci_hp_register()that would be more complex to fix than above-mentioned problem. Here is apci_hp_register()with all of your patch applied.int pci_hp_register(struct
hotplug_slot*slot, structpci_bus*bus, intslot_nr,
const char *name){ (snip...) /* * No problems if we call this interface from both ACPI_PCI_SLOT * driver and call it here again. If we've already created the * pci_slot, the interface will simply bump the refcount. */ pci_slot = pci_create_slot(bus, slot_nr, name); if (IS_ERR(pci_slot)) return PTR_ERR(pci_slot); if (pci_slot->hotplug) { dbg("%s: already claimed\n", __func__); pci_destroy_slot(pci_slot); return -EBUSY; } slot->pci_slot = pci_slot; pci_slot->hotplug = slot; /* * Allow pcihp drivers to override the ACPI_PCI_SLOT name. */ if (strcmp(kobject_name(&pci_slot->kobj), name)) { result = kobject_rename(&pci_slot->kobj, name); if (result) { pci_destroy_slot(pci_slot); return result; } } (snip...) }If name duplication was detected in
pci_create_slot(), it renames the slot name like 'N-1' and return successfully. Even though slot's kobject name was registered as 'N-1', 'name' array still have 'N' at this point. So the following 'if' statement becomes true unexpectedly.Quoted 8 lines
/* * Allow pcihp drivers to override the ACPI_PCI_SLOT name. */ if (strcmp(kobject_name(&pci_slot->kobj), name)) {Then
pci_hp_register()attempt to rename the slot name with 'N' again by callingkobject_rename(), but it fails because there already exists kobject with name 'N'. As a result,pci_hp_register()will fail.Yes, you are right, that is a problem.
I've taken the following approach:
- the above code is providing a mechanism to allow a _hotplug_ driver to override a _detection_ driver slot name.
- in other words, we only have to worry about the case when a _detection_ driver was loaded before a _hotplug_ driver.
Quoted 6 lines
- we can ignore the case where another _hotplug_ driver was loaded first, because we'll already return
-EBUSY.- so, to figure out if a _detection_ driver has already been loaded, we check to see if the
pci_devalready has a validpci_slotpointer.
We need to take into account that the hotplug slot can be empty. In this case, we cannot do this check because pci_dev doesn't exist, I think.
Quoted 5 lines
- if yes, then we later check to see if the existing slot name matches the requested slot name from the hotplug driver.
Quoted 9 lines
- if the hotplug driver is requesting a different name, then we use a new interface,
pci_rename_slot()which will safely attempt to rename the slot without name collision.I'll send out the patch set soon, it would be great if you could test it for me, since I don't have systems with duplicate slot names.
Sure.
P.S.
I also don't have the system with duplicate slot names. So I use the debug patch that emulates this kind of system for testing.
Thanks,
Kenji Kaneshige
Re: [PATCH v2 02/13] PCI: prevent duplicate slot names
Hi Kenji-san,
* Kenji Kaneshige <[email protected]>:
Quoted 3 lines
Hi Alex-san,
Thank you very much for your continuous effort.
We'll get there some day. ;)
Quoted 29 lines
Quoted 29 lines
Quoted 5 lines
If name duplication was detected in
pci_create_slot(), it renames the slot name like 'N-1' and return successfully. Even though slot's kobject name was registered as 'N-1', 'name' array still have 'N' at this point. So the following 'if' statement becomes true unexpectedly.Quoted 8 lines
/* * Allow pcihp drivers to override the ACPI_PCI_SLOT name. */ if (strcmp(kobject_name(&pci_slot->kobj), name)) {Then
pci_hp_register()attempt to rename the slot name with 'N' again by callingkobject_rename(), but it fails because there already exists kobject with name 'N'. As a result,pci_hp_register()will fail.Yes, you are right, that is a problem.
I've taken the following approach:
- the above code is providing a mechanism to allow a _hotplug_ driver to override a _detection_ driver slot name.
- in other words, we only have to worry about the case when a _detection_ driver was loaded before a _hotplug_ driver.
- we can ignore the case where another _hotplug_ driver was loaded first, because we'll already return
-EBUSY.
Quoted 7 lines
Quoted 3 lines
- so, to figure out if a _detection_ driver has already been loaded, we check to see if the
pci_devalready has a validpci_slotpointer.We need to take into account that the hotplug slot can be empty. In this case, we cannot do this check because
pci_devdoesn't exist, I think.
You are right. We still only have to worry about the case where a _detection_ driver was loaded before a _hotplug_ driver, and we need to worry abou the case of an empty slot.
I created a new interface called pci_get_physical_slot() that will tell us if we've already created a slot or not. This will work even if the slot is empty.
Using this inteface should simplify the tortured logic in my last patch and make pci_hp_register easier to read.
Quoted 14 lines
Quoted 4 lines
- if yes, then we later check to see if the existing slot name matches the requested slot name from the hotplug driver.
Quoted 9 lines
- if the hotplug driver is requesting a different name, then we use a new interface,
pci_rename_slot()which will safely attempt to rename the slot without name collision.I'll send out the patch set soon, it would be great if you could test it for me, since I don't have systems with duplicate slot names.
Quoted 5 lines
Sure.
P.S.
I also don't have the system with duplicate slot names. So I use the debug patch that emulates this kind of system for testing.
Hm, ok. I might think about adding some code to the fakephp driver to use it as a debug tool as well...
A little more below...
Quoted 34 lines
Quoted 21 lines
drivers/pci/hotplug/pci_hotplug_core.c +4
-3@@ -558,7 +558,8 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, const char *name) {int result; -struct pci_slot *pci_slot; +struct pci_dev *dev; +struct pci_slot *pci_slot, *tmp_slot =NULL ;if (slot ==NULL )return -ENODEV ;@@ -570,9 +571,17 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr,return -EINVAL ; } - /* Check if we have already registered a slot with the same name. */ - if (get_slot_from_name(name)) - return -EEXIST; +/* +* If we find a tmp_slot here, it means that another slot drivers/pci/hotplug/pci_hotplug_core.c int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, · line 585
Quoted 10 lines
drivers/pci/hotplug/pci_hotplug_core.c +9
-0+* driver has already created a pci_slot for this device. +* We care (below) if the existing slot has a different name from +* the new name that this particular hotplug driver is requesting. +*/ + dev =pci_get_slot (bus,PCI_DEVFN (slot_nr,0 )); +if (dev && dev->slot) { + tmp_slot = dev->slot; +pci_dev_put (dev); + }I have two comments here.
Quoted 8 lines
(1) I think the reference counter of the device will be leaked if (dev == NULL) && (
dev->slot!= NULL). We needpci_dev_put()whenever dev is not NULL.(2) When the slot is empty, the 'dev' will be always NULL. Therefore, '
tmp_slot' will be always NULL on the empty slot here. Because of this, the following code to rename the slot will not work on the empty slot, I think.
The new pci_get_physical_slot() interface will solve both issues.
Thanks.
/ac
PATCH 3/13 PCI, PCI Hotplug: introduce slot_name helpers
In reply to Alex ChiangIn preparation for cleaning up the various hotplug drivers such that they don't have to manage their own 'name' parameters anymore, we provide the following convenience functions:
pci_slot_name() hotplug_slot_name()
These helpers will be used by individual hotplug drivers.
---
include/linux/pci.h | 5 +++++ include/linux/pci_hotplug.h | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-)
include/linux/pci.h +5 -0
@@ -64,6 +64,11 @@ struct pci_slot {struct kobject kobj; }; +static inline const char *pci_slot_name (const struct pci_slot *slot) +{ +return kobject_name (&slot->kobj); +} +/* File state for mmap()s on /proc/bus/pci/X/Y */ enum pci_mmap_state { pci_mmap_io,
include/linux/pci_hotplug.h +5 -0
@@ -165,6 +165,11 @@ struct hotplug_slot { };#define to_hotplug_slot (n) container_of(n, struct hotplug_slot, kobj) +static inline const char *hotplug_slot_name (const struct hotplug_slot *slot) +{ +return pci_slot_name (slot->pci_slot); +} + extern int pci_hp_register(struct hotplug_slot *, struct pci_bus *, int nr,
PATCH 4/13 PCI: acpiphp: remove 'name' parameter
In reply to Alex ChiangWe do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Remove 'name' from acpiphp's version of struct slot.
---
drivers/pci/hotplug/acpiphp.h | 9 +++++---- drivers/pci/hotplug/acpiphp_core.c | 36 +++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 21 deletions(-)
drivers/pci/hotplug/acpiphp.h +5 -4
@@ -50,9 +50,6 @@ #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) -/* name size which is used for entries in pcihpfs */ -#define SLOT_NAME_SIZE 20/* {_SUN} */ -struct acpiphp_bridge ;struct acpiphp_slot ;
@@ -63,9 +60,13 @@ struct slot {struct hotplug_slot *hotplug_slot;struct acpiphp_slot *acpi_slot;struct hotplug_slot_info info; -char name[SLOT_NAME_SIZE ]; }; +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * struct acpiphp_bridge - PCI bridge information *
drivers/pci/hotplug/acpiphp_core.c +19 -17
@@ -44,6 +44,9 @@#define MY_NAME "acpiphp" +/* name size which is used for entries in pcihpfs */ +#define SLOT_NAME_SIZE 20/* {_SUN} */ +static int debug;int acpiphp_debug;
@@ -84,7 +87,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = { .get_adapter_status = get_adapter_status, }; -/** * acpiphp_register_attention - set attention LED callback * @info: must be completely filled with LED callbacks
@@ -92,7 +94,7 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = {* Description: This is used to register a hardware specific ACPI * driver that manipulates the attention LED. All the fields in * info must be set. -*/ +**/ int acpiphp_register_attention (struct acpiphp_attention_info *info) {int retval = -EINVAL ;
@@ -113,7 +115,7 @@ int acpiphp_register_attention(struct acpiphp_attention_info *info)* Description: This is used to un-register a hardware specific acpi * driver that manipulates the attention LED. The pointer to the * info struct must be the same as the one used to set it. -*/ +**/ int acpiphp_unregister_attention (struct acpiphp_attention_info *info) {int retval = -EINVAL ;
@@ -136,7 +138,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* enable the specified slot */ return acpiphp_enable_slot (slot->acpi_slot);
@@ -154,7 +156,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* disable the specified slot */ retval =acpiphp_disable_slot (slot->acpi_slot);
@@ -177,7 +179,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) {int retval = -ENODEV ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) { retval = attention_info->set_attn (hotplug_slot, status);
@@ -200,7 +202,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_power_status (slot->acpi_slot);
@@ -222,7 +224,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value) {int retval = -EINVAL ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) { retval = attention_info->get_attn (hotplug_slot, value);
@@ -245,7 +247,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_latch_status (slot->acpi_slot);
@@ -265,7 +267,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_adapter_status (slot->acpi_slot);
@@ -299,7 +301,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));kfree (slot->hotplug_slot);kfree (slot);
@@ -310,6 +312,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) {struct slot *slot;int retval = -ENOMEM ; +char name[SLOT_NAME_SIZE ]; slot =kzalloc (sizeof (*slot),GFP_KERNEL );if (!slot)
@@ -321,8 +324,6 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) slot->hotplug_slot->info = &slot->info; - slot->hotplug_slot->name = slot->name; - slot->hotplug_slot->private = slot; slot->hotplug_slot->release = &release_slot; slot->hotplug_slot->ops = &acpi_hotplug_slot_ops;
@@ -336,12 +337,13 @@ 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 (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun); retval =pci_hp_register (slot->hotplug_slot, acpiphp_slot->bridge->pci_bus, acpiphp_slot->device, - slot->name); + name);if (retval == -EBUSY ) goto error_hpslot;if (retval) {
@@ -349,7 +351,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) goto error_hpslot; } -info ("Slot [%s] registered\n" , slot->hotplug_slot->name); +info ("Slot [%s] registered\n" ,slot_name (slot));return 0 ; error_hpslot:
@@ -366,7 +368,7 @@ void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *acpiphp_slot)struct slot *slot = acpiphp_slot->slot;int retval =0 ; -info ("Slot [%s] unregistered\n" , slot->hotplug_slot->name); +info ("Slot [%s] unregistered\n" ,slot_name (slot)); retval =pci_hp_deregister (slot->hotplug_slot);if (retval)
Re: [PATCH 04/13] PCI: acpiphp: remove 'name' parameter
Quoted 37 lines · Alex Chiang
We do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Remove 'name' from acpiphp's version of struct slot.
Signed-off-by Alex Chiang <[email protected]>---
drivers/pci/hotplug/acpiphp.h | 9 +++++---- drivers/pci/hotplug/acpiphp_core.c | 36+++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 21 deletions(-)
drivers/pci/hotplug/acpiphp.h +0
-4@@ -50,9 +50,6 @@ #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) -/* name size which is used for entries in pcihpfs */ -#define SLOT_NAME_SIZE 20/* {_SUN} */ -struct acpiphp_bridge ;struct acpiphp_slot ;@@ -63,9 +60,13 @@ struct slot {struct hotplug_slot *hotplug_slot;struct acpiphp_slot *acpi_slot;struct hotplug_slot_info info; -char name[SLOT_NAME_SIZE ];
drivers/pci/hotplug/acpiphp.h struct slot { · line 72
Quoted 10 lines
drivers/pci/hotplug/acpiphp.h +5
-0}; +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * struct acpiphp_bridge - PCI bridge information *
I don't see a point in this function. Why not call hotplug_slot_name() directly?
Quoted 15 lines
(quoted diff) +0
-0
b/drivers/pci/hotplug/acpiphp_core.cindex e984176..687cac3 100644drivers/pci/hotplug/acpiphp_core.c +3
-0@@ -44,6 +44,9 @@#define MY_NAME "acpiphp" +/* name size which is used for entries in pcihpfs */ +#define SLOT_NAME_SIZE 20/* {_SUN} */ +static int debug;int acpiphp_debug;
drivers/pci/hotplug/acpiphp_core.c static struct hotplug_slot_ops acpi_hotplug_slot_ops = { · line 92
Quoted 7 lines
drivers/pci/hotplug/acpiphp_core.c +0
-1@@ -84,7 +87,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = { .get_adapter_status = get_adapter_status, }; -/** * acpiphp_register_attention - set attention LED callback * @info: must be completely filled with LED callbacks
Fuzz.
drivers/pci/hotplug/acpiphp_core.c static struct hotplug_slot_ops acpi_hotplug_slot_ops = { · line 100
Quoted 9 lines
drivers/pci/hotplug/acpiphp_core.c +1
-1@@ -92,7 +94,7 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = {* Description: This is used to register a hardware specific ACPI * driver that manipulates the attention LED. All the fields in * info must be set. -*/ +**/ int acpiphp_register_attention (struct acpiphp_attention_info *info) {int retval = -EINVAL ;
Fuzz. Make the patch look bigger than it actually is. But that's just a note, Jesse will have to judge if this is acceptable.
Quoted 102 lines
drivers/pci/hotplug/acpiphp_core.c +0
-0@@ -113,7 +115,7 @@ int acpiphp_register_attention(struct
acpiphp_attention_info*info) * Description: This is used to un-register a hardware specific acpi * driver that manipulates the attention LED. The pointer to the * info struct must be the same as the one used to set it.
- */
+ **/
intacpiphp_unregister_attention(struct acpiphp_attention_info *info){drivers/pci/hotplug/acpiphp_core.c +3
-3int retval = -EINVAL ;@@ -136,7 +138,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* enable the specified slot */ return acpiphp_enable_slot (slot->acpi_slot);@@ -154,7 +156,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* disable the specified slot */ retval =acpiphp_disable_slot (slot->acpi_slot);@@ -177,7 +179,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) {int retval = -ENODEV ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) {drivers/pci/hotplug/acpiphp_core.c +2
-2retval = attention_info->set_attn (hotplug_slot, status);@@ -200,7 +202,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_power_status (slot->acpi_slot);@@ -222,7 +224,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value) {int retval = -EINVAL ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) {drivers/pci/hotplug/acpiphp_core.c +4
-5retval = attention_info->get_attn (hotplug_slot, value);@@ -245,7 +247,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_latch_status (slot->acpi_slot);@@ -265,7 +267,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_adapter_status (slot->acpi_slot);@@ -299,7 +301,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));kfree (slot->hotplug_slot);kfree (slot);@@ -310,6 +312,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) {struct slot *slot;int retval = -ENOMEM ; +char name[SLOT_NAME_SIZE ]; slot =kzalloc (sizeof (*slot),GFP_KERNEL );if (!slot)@@ -321,8 +324,6 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) slot->hotplug_slot->info = &slot->info; - slot->hotplug_slot->name = slot->name; - slot->hotplug_slot->private = slot; slot->hotplug_slot->release = &release_slot;drivers/pci/hotplug/acpiphp_core.c +0
-0slot->hotplug_slot->ops = &acpi_hotplug_slot_ops;
drivers/pci/hotplug/acpiphp_core.c int acpiphp_register_hotplug_slot(struct acpiphp_slot · line 341
Quoted 6 lines
drivers/pci/hotplug/acpiphp_core.c +2
-1@@ -336,12 +337,13 @@ 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 (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun);
The memset() is not needed at all. And the sizeof is IMHO a good idea anyway as it allows to get rid of the define.
Quoted 18 lines
drivers/pci/hotplug/acpiphp_core.c +2
-2retval =pci_hp_register (slot->hotplug_slot, acpiphp_slot->bridge->pci_bus, acpiphp_slot->device, - slot->name); + name);if (retval == -EBUSY ) goto error_hpslot;if (retval) {@@ -349,7 +351,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) goto error_hpslot; } -info ("Slot [%s] registered\n" , slot->hotplug_slot->name); +info ("Slot [%s] registered\n" ,slot_name (slot));return 0 ; error_hpslot:
drivers/pci/hotplug/acpiphp_core.c void acpiphp_unregister_hotplug_slot(struct · line 374
Quoted 8 lines
drivers/pci/hotplug/acpiphp_core.c +1
-1@@ -366,7 +368,7 @@ void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *acpiphp_slot) struct slot *slot = acpiphp_slot->slot;int retval =0 ; -info ("Slot [%s] unregistered\n" , slot->hotplug_slot->name); +info ("Slot [%s] unregistered\n" ,slot_name (slot)); retval =pci_hp_deregister (slot->hotplug_slot);if (retval)
Greetings,
Eike
Re: [PATCH 04/13] PCI: acpiphp: remove 'name' parameter
* Rolf Eike Beer <[email protected]>:
Quoted 40 lines
Quoted 39 lines · Alex Chiang
We do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Remove 'name' from acpiphp's version of struct slot.
Signed-off-by Alex Chiang <[email protected]>---
drivers/pci/hotplug/acpiphp.h | 9 +++++---- drivers/pci/hotplug/acpiphp_core.c | 36+++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 21 deletions(-)
drivers/pci/hotplug/acpiphp.h +0
-4@@ -50,9 +50,6 @@ #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) -/* name size which is used for entries in pcihpfs */ -#define SLOT_NAME_SIZE 20/* {_SUN} */ -struct acpiphp_bridge ;struct acpiphp_slot ;@@ -63,9 +60,13 @@ struct slot {struct hotplug_slot *hotplug_slot;struct acpiphp_slot *acpi_slot;struct hotplug_slot_info info; -char name[SLOT_NAME_SIZE ]; };
Quoted 11 lines
drivers/pci/hotplug/acpiphp.h struct slot { · line 72
Quoted 8 lines
drivers/pci/hotplug/acpiphp.h +5
-0+static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * struct acpiphp_bridge - PCI bridge information * I don't see a point in this function. Why not call
hotplug_slot_name()directly?
You're correct that we don't exactly need it in acpiphp. However, it is a useful helper function for some of the other drivers, and I thought it would be better to keep consistency if possible.
Also, it helps later on, when trying to stay below the 80 column limit. :)
Quoted 18 lines
Quoted 18 lines
(quoted diff) +0
-0
b/drivers/pci/hotplug/acpiphp_core.cindex e984176..687cac3 100644drivers/pci/hotplug/acpiphp_core.c +3
-0@@ -44,6 +44,9 @@#define MY_NAME "acpiphp" +/* name size which is used for entries in pcihpfs */ +#define SLOT_NAME_SIZE 20/* {_SUN} */ +static int debug;int acpiphp_debug;@@ -84,7 +87,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = { .get_adapter_status = get_adapter_status, };
Quoted 6 lines
drivers/pci/hotplug/acpiphp_core.c static struct hotplug_slot_ops acpi_hotplug_slot_ops = { · line 92
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +0
-1-/** * acpiphp_register_attention - set attention LED callback * @info: must be completely filled with LED callbacks Fuzz.
Yes, it's fuzz, but my practice has been to clean up* source files during the course of making actual, functional changes. Better than sending a mostly-useless whitespace patchbomb, IMO.
* Note that "clean up" here means "reasonable cleanup" that doesn't detract from reading the rest of the patch.
Quoted 4 lines
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +0
-0@@ -92,7 +94,7 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = {* Description: This is used to register a hardware specific ACPI * driver that manipulates the attention LED. All the fields in * info must be set.
Quoted 8 lines
drivers/pci/hotplug/acpiphp_core.c static struct hotplug_slot_ops acpi_hotplug_slot_ops = { · line 100
Quoted 5 lines
drivers/pci/hotplug/acpiphp_core.c +1
-1-*/ +**/ int acpiphp_register_attention (struct acpiphp_attention_info *info) {int retval = -EINVAL ;Fuzz. Make the patch look bigger than it actually is. But that's just a note, Jesse will have to judge if this is acceptable.
See above. Fixing incorrect kerneldoc doesn't seem so bad, IMO.
Quoted 104 lines
Quoted 104 lines
drivers/pci/hotplug/acpiphp_core.c +0
-0@@ -113,7 +115,7 @@ int acpiphp_register_attention(struct
acpiphp_attention_info*info) * Description: This is used to un-register a hardware specific acpi * driver that manipulates the attention LED. The pointer to the * info struct must be the same as the one used to set it.
- */
+ **/
intacpiphp_unregister_attention(struct acpiphp_attention_info *info){drivers/pci/hotplug/acpiphp_core.c +3
-3int retval = -EINVAL ;@@ -136,7 +138,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* enable the specified slot */ return acpiphp_enable_slot (slot->acpi_slot);@@ -154,7 +156,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* disable the specified slot */ retval =acpiphp_disable_slot (slot->acpi_slot);@@ -177,7 +179,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) {int retval = -ENODEV ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) {drivers/pci/hotplug/acpiphp_core.c +2
-2retval = attention_info->set_attn (hotplug_slot, status);@@ -200,7 +202,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_power_status (slot->acpi_slot);@@ -222,7 +224,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value) {int retval = -EINVAL ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) {drivers/pci/hotplug/acpiphp_core.c +4
-5retval = attention_info->get_attn (hotplug_slot, value);@@ -245,7 +247,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_latch_status (slot->acpi_slot);@@ -265,7 +267,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_adapter_status (slot->acpi_slot);@@ -299,7 +301,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));kfree (slot->hotplug_slot);kfree (slot);@@ -310,6 +312,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) {struct slot *slot;int retval = -ENOMEM ; +char name[SLOT_NAME_SIZE ]; slot =kzalloc (sizeof (*slot),GFP_KERNEL );if (!slot)@@ -321,8 +324,6 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) slot->hotplug_slot->info = &slot->info; - slot->hotplug_slot->name = slot->name; - slot->hotplug_slot->private = slot; slot->hotplug_slot->release = &release_slot;drivers/pci/hotplug/acpiphp_core.c +0
-0slot->hotplug_slot->ops = &acpi_hotplug_slot_ops;@@ -336,12 +337,13 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN;
Quoted 7 lines
drivers/pci/hotplug/acpiphp_core.c int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) · line 341
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +2
-1acpiphp_slot->slot = slot; -snprintf (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun);The
memset()is not needed at all. And the sizeof is IMHO a good idea anyway as it allows to get rid of the define.
Hm, don't need a memset? I won't have garbage on the stack? </n00b>
On the other hand, keeping the #define is important, because again, that's the established convention of the PCI hotplug drivers.
Thanks for the review.
/ac
Quoted 31 lines
Quoted 19 lines
drivers/pci/hotplug/acpiphp_core.c +2
-2retval =pci_hp_register (slot->hotplug_slot, acpiphp_slot->bridge->pci_bus, acpiphp_slot->device, - slot->name); + name);if (retval == -EBUSY ) goto error_hpslot;if (retval) {@@ -349,7 +351,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) goto error_hpslot; } -info ("Slot [%s] registered\n" , slot->hotplug_slot->name); +info ("Slot [%s] registered\n" ,slot_name (slot));return 0 ; error_hpslot:drivers/pci/hotplug/acpiphp_core.c void acpiphp_unregister_hotplug_slot(struct · line 374
Quoted 8 lines
drivers/pci/hotplug/acpiphp_core.c +1
-1@@ -366,7 +368,7 @@ void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *acpiphp_slot) struct slot *slot = acpiphp_slot->slot;int retval =0 ; -info ("Slot [%s] unregistered\n" , slot->hotplug_slot->name); +info ("Slot [%s] unregistered\n" ,slot_name (slot)); retval =pci_hp_deregister (slot->hotplug_slot);if (retval)Greetings,
Eike
Re: [PATCH 04/13] PCI: acpiphp: remove 'name' parameter
Quoted 53 lines · Alex Chiang
* Rolf Eike Beer <[email protected]>:
Quoted 40 lines
Quoted 39 lines · Alex Chiang
We do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Remove 'name' from acpiphp's version of struct slot.
Signed-off-by Alex Chiang <[email protected]>---
drivers/pci/hotplug/acpiphp.h | 9 +++++---- drivers/pci/hotplug/acpiphp_core.c | 36+++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 21 deletions(-)
(quoted diff) +0
-0
b/drivers/pci/hotplug/acpiphp.hindex 5a58b07..f9e244d 100644drivers/pci/hotplug/acpiphp.h +0
-4@@ -50,9 +50,6 @@ #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) -/* name size which is used for entries in pcihpfs */ -#define SLOT_NAME_SIZE 20/* {_SUN} */ -struct acpiphp_bridge ;struct acpiphp_slot ;@@ -63,9 +60,13 @@ struct slot {struct hotplug_slot *hotplug_slot;struct acpiphp_slot *acpi_slot;struct hotplug_slot_info info; -char name[SLOT_NAME_SIZE ]; };Quoted 11 lines
drivers/pci/hotplug/acpiphp.h struct slot { · line 72
Quoted 8 lines
drivers/pci/hotplug/acpiphp.h +5
-0+static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * struct acpiphp_bridge - PCI bridge information * I don't see a point in this function. Why not call
hotplug_slot_name()directly?
Quoted 3 lines
You're correct that we don't exactly need it in acpiphp. However, it is a useful helper function for some of the other drivers, and I thought it would be better to keep consistency if possible.
I looked into all other patches and the function is the same in every one.
Quoted 2 lines
Also, it helps later on, when trying to stay below the 80 column limit. :)
Rip it.
Quoted 45 lines
Quoted 18 lines
Quoted 18 lines
(quoted diff) +0
-0
b/drivers/pci/hotplug/acpiphp_core.cindex e984176..687cac3 100644drivers/pci/hotplug/acpiphp_core.c +3
-0@@ -44,6 +44,9 @@#define MY_NAME "acpiphp" +/* name size which is used for entries in pcihpfs */ +#define SLOT_NAME_SIZE 20/* {_SUN} */ +static int debug;int acpiphp_debug;@@ -84,7 +87,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = { .get_adapter_status = get_adapter_status, };Quoted 6 lines
drivers/pci/hotplug/acpiphp_core.c static struct hotplug_slot_ops acpi_hotplug_slot_ops = { · line 92
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +0
-1-/** * acpiphp_register_attention - set attention LED callback * @info: must be completely filled with LED callbacks Fuzz.
Yes, it's fuzz, but my practice has been to clean up* source files during the course of making actual, functional changes. Better than sending a mostly-useless whitespace patchbomb, IMO.
* Note that "clean up" here means "reasonable cleanup" that doesn't detract from reading the rest of the patch.
Quoted 4 lines
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +0
-0@@ -92,7 +94,7 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops= { * Description: This is used to register a hardware specific ACPI * driver that manipulates the attention LED. All the fields in * info must be set.
Quoted 8 lines
Quoted 5 lines
- */
+ **/
intacpiphp_register_attention(struct acpiphp_attention_info *info){
int retval =-EINVAL;Fuzz. Make the patch look bigger than it actually is. But that's just a note, Jesse will have to judge if this is acceptable.
Quoted 1 line
See above. Fixing incorrect kerneldoc doesn't seem so bad, IMO.
As I said: Jesse's decision. The smaller the patch is the easier get's the review.
Quoted 113 lines
Quoted 105 lines
Quoted 105 lines
drivers/pci/hotplug/acpiphp_core.c +0
-0@@ -113,7 +115,7 @@ int acpiphp_register_attention(struct
acpiphp_attention_info*info) * Description: This is used to un-register a hardware specific acpi * driver that manipulates the attention LED. The pointer to the * info struct must be the same as the one used to set it. - */
+ **/
intacpiphp_unregister_attention(struct acpiphp_attention_info *info){drivers/pci/hotplug/acpiphp_core.c +3
-3int retval = -EINVAL ;@@ -136,7 +138,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* enable the specified slot */ return acpiphp_enable_slot (slot->acpi_slot);@@ -154,7 +156,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* disable the specified slot */ retval =acpiphp_disable_slot (slot->acpi_slot);@@ -177,7 +179,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) {int retval = -ENODEV ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) {drivers/pci/hotplug/acpiphp_core.c +2
-2retval = attention_info->set_attn (hotplug_slot, status);@@ -200,7 +202,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_power_status (slot->acpi_slot);@@ -222,7 +224,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value) {int retval = -EINVAL ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) {drivers/pci/hotplug/acpiphp_core.c +4
-5retval = attention_info->get_attn (hotplug_slot, value);@@ -245,7 +247,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_latch_status (slot->acpi_slot);@@ -265,7 +267,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_adapter_status (slot->acpi_slot);@@ -299,7 +301,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));kfree (slot->hotplug_slot);kfree (slot);@@ -310,6 +312,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) {struct slot *slot;int retval = -ENOMEM ; +char name[SLOT_NAME_SIZE ]; slot =kzalloc (sizeof (*slot),GFP_KERNEL );if (!slot)@@ -321,8 +324,6 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) slot->hotplug_slot->info = &slot->info; - slot->hotplug_slot->name = slot->name; - slot->hotplug_slot->private = slot; slot->hotplug_slot->release = &release_slot;drivers/pci/hotplug/acpiphp_core.c +0
-0slot->hotplug_slot->ops = &acpi_hotplug_slot_ops;@@ -336,12 +337,13 @@ int acpiphp_register_hotplug_slot(struct
acpiphp_slot*acpiphp_slot)slot->hotplug_slot->info->cur_bus_speed=PCI_SPEED_UNKNOWN;Quoted 7 lines
drivers/pci/hotplug/acpiphp_core.c int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) · line 341
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +2
-1acpiphp_slot->slot = slot; -snprintf (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun);The
memset()is not needed at all. And the sizeof is IMHO a good idea anyway as it allows to get rid of the define.
Quoted 2 lines
Hm, don't need a memset? I won't have garbage on the stack? </n00b>
Yes, you have garbage on the stack. But snprintf() does not care what is in the buffer before it starts and the result is 0-terminated afterwards.
Quoted 3 lines
On the other hand, keeping the #define is important, because again, that's the established convention of the PCI hotplug drivers.
I would not bet on this. It has been there and copied around from one driver to the other. If we can get rid of those I guess noone would be upset. And you introduced at least two of them ;) Jesse?
Eike
Re: [PATCH 04/13] PCI: acpiphp: remove 'name' parameter
* Rolf Eike Beer <[email protected]>:
Quoted 16 lines
Quoted 15 lines · Alex Chiang
* Rolf Eike Beer <[email protected]>:
Quoted 13 lines
drivers/pci/hotplug/acpiphp.h struct slot { · line 72
Quoted 9 lines · Alex Chiang
drivers/pci/hotplug/acpiphp.h +5
-0+static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * struct acpiphp_bridge - PCI bridge information * I don't see a point in this function. Why not call
hotplug_slot_name()directly?
Quoted 5 lines
Quoted 3 lines
You're correct that we don't exactly need it in acpiphp. However, it is a useful helper function for some of the other drivers, and I thought it would be better to keep consistency if possible.
I looked into all other patches and the function is the same in every one.
For example, in shpchp, I use slot_name() in both shpchp_core.c and in shpchp_ctrl.c. This is the case for a few other drivers too.
Based on that reasoning, I felt a little consistency across drivers was warranted. Besides, the generated code should be the same.
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
drivers/pci/hotplug/acpiphp_core.c int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) · line 341
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +2
-1acpiphp_slot->slot = slot; -snprintf (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun);The
memset()is not needed at all. And the sizeof is IMHO a good idea anyway as it allows to get rid of the define.
Quoted 5 lines
Quoted 2 lines
Hm, don't need a memset? I won't have garbage on the stack? </n00b>
Yes, you have garbage on the stack. But
snprintf()does not care what is in the buffer before it starts and the result is 0-terminated afterwards.
Ok, you're right. For some reason, I was thinking that there were versions of snprintf() that did not NULL-terminate in the event of truncation, but I checked the kernel implementation, and it does NULL terminate in either case.
Besides, it looks like I should be using scnprintf() instead. So I'll rework the patches.
Quoted 8 lines
Quoted 3 lines
On the other hand, keeping the #define is important, because again, that's the established convention of the PCI hotplug drivers.
I would not bet on this. It has been there and copied around from one driver to the other. If we can get rid of those I guess noone would be upset. And you introduced at least two of them ;) Jesse?
The #define exists in the original pcihp_skeleton.c example.
This is perhaps the 2nd or 3rd time I've swept through the PCI hotplug drivers for cleanups, and for me, I really prefer some sort of consistency, otherwise I go insane trying to keep track of the differences.
But I will defer to Jesse's opinion.
Thanks,
/ac
Re: [PATCH 04/13] PCI: acpiphp: remove 'name' parameter
In reply to Alex ChiangQuoted 14 lines · Alex Chiang
* Rolf Eike Beer <[email protected]>:
Quoted 12 lines
drivers/pci/hotplug/acpiphp.h struct slot { · line 72
Quoted 8 lines · Alex Chiang
drivers/pci/hotplug/acpiphp.h +5
-0+static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * struct acpiphp_bridge - PCI bridge information * I don't see a point in this function. Why not call
hotplug_slot_name()directly?
Quoted 6 lines
You're correct that we don't exactly need it in acpiphp. However, it is a useful helper function for some of the other drivers, and I thought it would be better to keep consistency if possible.
Also, it helps later on, when trying to stay below the 80 column limit. :)
If they're all identical, maybe we should pull this up into a common function (with a short name :). That can be a subsequent cleanup though.
Quoted 11 lines
Quoted 10 lines
drivers/pci/hotplug/acpiphp_core.c static struct hotplug_slot_ops acpi_hotplug_slot_ops · line 92
Quoted 8 lines
drivers/pci/hotplug/acpiphp_core.c +0
-1@@ -84,7 +87,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = { .get_adapter_status = get_adapter_status, }; -/** * acpiphp_register_attention - set attention LED callback * @info: must be completely filled with LED callbacks Fuzz.
Quoted 6 lines
Yes, it's fuzz, but my practice has been to clean up* source files during the course of making actual, functional changes. Better than sending a mostly-useless whitespace patchbomb, IMO.
* Note that "clean up" here means "reasonable cleanup" that doesn't detract from reading the rest of the patch.
Yeah the main reason for separating whitespace changes from real ones is to avoid making the patch hard to read in case a problem crops up. Killing an extra newline doesn't make things harder to read, imo, so it's fine with me if you keep it (though if you *do* end up doing a cleanup patch later you could save it for that).
Quoted 13 lines
Quoted 4 lines
Quoted 4 lines
(quoted diff) +0
-0@@ -92,7 +94,7 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops= { * Description: This is used to register a hardware specific ACPI * driver that manipulates the attention LED. All the fields in * info must be set.
Quoted 8 lines
Quoted 5 lines
- */
+ **/
intacpiphp_register_attention(struct acpiphp_attention_info *info){
int retval =-EINVAL;Fuzz. Make the patch look bigger than it actually is. But that's just a note, Jesse will have to judge if this is acceptable.
Quoted 1 line
See above. Fixing incorrect kerneldoc doesn't seem so bad, IMO.
kerneldoc is ok with either */ or **/ as a closing comment, so you can drop these bits.
Quoted 10 lines
Quoted 7 lines
drivers/pci/hotplug/acpiphp_core.c int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) · line 341
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +2
-1acpiphp_slot->slot = slot; -snprintf (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun);The
memset()is not needed at all. And the sizeof is IMHO a good idea anyway as it allows to get rid of the define.Hm, don't need a memset? I won't have garbage on the stack? </n00b>
Yeah, but you'll overwrite it with snprintf anyway, so the memset is redundant.
Quoted 5 lines
On the other hand, keeping the #define is important, because again, that's the established convention of the PCI hotplug drivers.
Thanks for the review.
Going from the define to sizeof() everywhere could be another cleanup, but I don't have strong feelings about that.
Jesse
Re: [PATCH 04/13] PCI: acpiphp: remove 'name' parameter
* Jesse Barnes <[email protected]>:
Quoted 19 lines · Alex Chiang
Quoted 18 lines
* Rolf Eike Beer <[email protected]>:
Quoted 12 lines
drivers/pci/hotplug/acpiphp.h struct slot { · line 72
Quoted 8 lines · Alex Chiang
drivers/pci/hotplug/acpiphp.h +5
-0+static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * struct acpiphp_bridge - PCI bridge information * I don't see a point in this function. Why not call
hotplug_slot_name()directly?You're correct that we don't exactly need it in acpiphp. However, it is a useful helper function for some of the other drivers, and I thought it would be better to keep consistency if possible.
Quoted 6 lines
Quoted 2 lines
Also, it helps later on, when trying to stay below the 80 column limit. :)
If they're all identical, maybe we should pull this up into a common function (with a short name :). That can be a subsequent cleanup though.
Ok, I'll save this for next time. Or someone else can have the git glory. ;)
Quoted 18 lines
Quoted 11 lines
Quoted 10 lines
drivers/pci/hotplug/acpiphp_core.c static struct hotplug_slot_ops acpi_hotplug_slot_ops · line 92
Quoted 8 lines
drivers/pci/hotplug/acpiphp_core.c +0
-1@@ -84,7 +87,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = { .get_adapter_status = get_adapter_status, }; -/** * acpiphp_register_attention - set attention LED callback * @info: must be completely filled with LED callbacks Fuzz.
Quoted 6 lines
Yes, it's fuzz, but my practice has been to clean up* source files during the course of making actual, functional changes. Better than sending a mostly-useless whitespace patchbomb, IMO.
* Note that "clean up" here means "reasonable cleanup" that doesn't detract from reading the rest of the patch.
Quoted 6 lines
Yeah the main reason for separating whitespace changes from real ones is to avoid making the patch hard to read in case a problem crops up. Killing an extra newline doesn't make things harder to read, imo, so it's fine with me if you keep it (though if you *do* end up doing a cleanup patch later you could save it for that).
I'll keep the 'kill the newline' here but drop the kerneldoc stuff. As you point out, kerneldoc will take either */ or **/.
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
drivers/pci/hotplug/acpiphp_core.c int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) · line 341
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +2
-1acpiphp_slot->slot = slot; -snprintf (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun);The
memset()is not needed at all. And the sizeof is IMHO a good idea anyway as it allows to get rid of the define.
Quoted 5 lines
Quoted 2 lines
Hm, don't need a memset? I won't have garbage on the stack? </n00b>
Yeah, but you'll overwrite it with snprintf anyway, so the memset is redundant.
Ok. I went through and removed the superfluous memsets, and changed instances of snprintf() to scnprintf().
Quoted 8 lines
Quoted 5 lines
On the other hand, keeping the #define is important, because again, that's the established convention of the PCI hotplug drivers.
Thanks for the review.
Going from the define to
sizeof()everywhere could be another cleanup, but I don't have strong feelings about that.
Ok, saving these for next time too.
I'll hold off from sending v2 until I hear comments from Kenji-san, so if he has any suggestions, I can incorporate them all in v2.
Thanks.
/ac
Re: [PATCH 04/13] PCI: acpiphp: remove 'name' parameter
Quoted 70 lines · Alex Chiang
* Jesse Barnes <[email protected]>:
Quoted 17 lines · Alex Chiang
Quoted 16 lines
* Rolf Eike Beer <[email protected]>:
Quoted 11 lines
drivers/pci/hotplug/acpiphp.h struct slot { · line 72
Quoted 8 lines · Alex Chiang
drivers/pci/hotplug/acpiphp.h +5
-0+static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * struct acpiphp_bridge - PCI bridge information * I don't see a point in this function. Why not call
hotplug_slot_name()directly?You're correct that we don't exactly need it in acpiphp. However, it is a useful helper function for some of the other drivers, and I thought it would be better to keep consistency if possible.
Quoted 5 lines
Quoted 2 lines
Also, it helps later on, when trying to stay below the 80 column limit. :)
If they're all identical, maybe we should pull this up into a common function (with a short name :). That can be a subsequent cleanup though.
Ok, I'll save this for next time. Or someone else can have the git glory. ;)
Quoted 13 lines
Quoted 13 lines
Quoted 9 lines
drivers/pci/hotplug/acpiphp_core.c static struct hotplug_slot_ops acpi_hotplug_slot_ops · line 92
Quoted 8 lines
drivers/pci/hotplug/acpiphp_core.c +0
-1@@ -84,7 +87,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = { .get_adapter_status = get_adapter_status, }; -/** * acpiphp_register_attention - set attention LED callback * @info: must be completely filled with LED callbacks Fuzz.
Yes, it's fuzz, but my practice has been to clean up* source files during the course of making actual, functional changes. Better than sending a mostly-useless whitespace patchbomb, IMO.
Quoted 8 lines
Quoted 2 lines
* Note that "clean up" here means "reasonable cleanup" that doesn't detract from reading the rest of the patch.
Yeah the main reason for separating whitespace changes from real ones is to avoid making the patch hard to read in case a problem crops up. Killing an extra newline doesn't make things harder to read, imo, so it's fine with me if you keep it (though if you *do* end up doing a cleanup patch later you could save it for that).
I'll keep the 'kill the newline' here but drop the kerneldoc stuff. As you point out, kerneldoc will take either */ or **/.
Quoted 9 lines
Quoted 8 lines
Quoted 6 lines
drivers/pci/hotplug/acpiphp_core.c int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) · line 341
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +2
-1acpiphp_slot->slot = slot; -snprintf (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun);The
memset()is not needed at all. And the sizeof is IMHO a good idea anyway as it allows to get rid of the define.Hm, don't need a memset? I won't have garbage on the stack? </n00b>
Yeah, but you'll overwrite it with snprintf anyway, so the memset is redundant.
Ok. I went through and removed the superfluous memsets, and changed instances of
snprintf()toscnprintf().Quoted 5 lines
Quoted 5 lines
On the other hand, keeping the #define is important, because again, that's the established convention of the PCI hotplug drivers.
Thanks for the review.
Quoted 9 lines
Quoted 2 lines
Going from the define to
sizeof()everywhere could be another cleanup, but I don't have strong feelings about that.Ok, saving these for next time too.
I'll hold off from sending v2 until I hear comments from Kenji-san, so if he has any suggestions, I can incorporate them all in v2.
Hi Alex-san, and all,
I'm sorry for my delay. I had been on vacation on these days. I'll review your patches as soon as possible.
Thanks,
Kenji Kaneshige
PATCH 5/13 PCI: cpci_hotplug: stop managing hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest.
---
drivers/pci/hotplug/cpci_hotplug.h | 6 ++ drivers/pci/hotplug/cpci_hotplug_core.c | 76 ++++++++++++------------------- drivers/pci/hotplug/cpci_hotplug_pci.c | 4 +- 3 files changed, 37 insertions(+), 49 deletions(-)
drivers/pci/hotplug/cpci_hotplug.h +6 -0
@@ -30,6 +30,7 @@#include <linux/types.h> #include <linux/pci.h> +#include <linux/pci_hotplug.h> /* PICMG 2.1 R2.0 HS CSR bits: */ #define HS_CSR_INS 0x0080
@@ -69,6 +70,11 @@ struct cpci_hp_controller {struct cpci_hp_controller_ops *ops; }; +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +extern int cpci_hp_register_controller (struct cpci_hp_controller *controller);extern int cpci_hp_unregister_controller (struct cpci_hp_controller *controller);extern int cpci_hp_register_bus (struct pci_bus *bus,u8 first,u8 last);
drivers/pci/hotplug/cpci_hotplug_core.c +29 -47
215 lines not on this page · raw message
drivers/pci/hotplug/cpci_hotplug_pci.c +2 -2
@@ -209,7 +209,7 @@ int cpci_led_on(struct slot* slot) hs_cap + 2, hs_csr)) {err ("Could not set LOO for slot %s" , - slot->hotplug_slot->name); +hotplug_slot_name (slot->hotplug_slot));return -ENODEV ; } }
@@ -238,7 +238,7 @@ int cpci_led_off(struct slot* slot) hs_cap + 2, hs_csr)) {err ("Could not clear LOO for slot %s" , - slot->hotplug_slot->name); +hotplug_slot_name (slot->hotplug_slot));return -ENODEV ; } }
PATCH 6/13 PCI: cpqphp: stop managing hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest.
---
drivers/pci/hotplug/cpqphp.h | 13 +++++------- drivers/pci/hotplug/cpqphp_core.c | 40 ++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 29 deletions(-)
drivers/pci/hotplug/cpqphp.h +5 -8
@@ -449,6 +449,11 @@ extern u8 cpqhp_disk_irq;/* inline functions */ +static inline char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * return_resource *
@@ -696,14 +701,6 @@ static inline int get_presence_status(struct controller *ctrl, struct slot *slotreturn presence_save; } -#define SLOT_NAME_SIZE 10 - -static inline void make_slot_name (char *buffer,int buffer_size,struct slot *slot) -{ -snprintf (buffer, buffer_size,"%d" , slot->number); -} - -static inline int wait_for_ctrl_irq (struct controller *ctrl) {DECLARE_WAITQUEUE (wait, current);
drivers/pci/hotplug/cpqphp_core.c +19 -21
@@ -315,14 +315,15 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));kfree (slot->hotplug_slot->info); -kfree (slot->hotplug_slot->name);kfree (slot->hotplug_slot);kfree (slot); } +#define SLOT_NAME_SIZE 10 +static int ctrl_slot_setup (struct controller *ctrl,void __iomem *smbios_start,void __iomem *smbios_table)
@@ -335,6 +336,7 @@ static int ctrl_slot_setup(struct controller *ctrl,u8 slot_number;u8 ctrl_slot;u32 tempdword; +char name[SLOT_NAME_SIZE ];void __iomem *slot_entry=NULL ;int result = -ENOMEM ;
@@ -363,10 +365,6 @@ static int ctrl_slot_setup(struct controller *ctrl,if (!hotplug_slot->info) goto error_hpslot; hotplug_slot_info = hotplug_slot->info; - hotplug_slot->name =kmalloc (SLOT_NAME_SIZE ,GFP_KERNEL ); - -if (!hotplug_slot->name) - goto error_info; slot->ctrl = ctrl; slot->bus = ctrl->bus;
@@ -418,8 +416,10 @@ static int ctrl_slot_setup(struct controller *ctrl,/* register this slot with the hotplug pci core */ hotplug_slot->release = &release_slot; hotplug_slot->private = slot; -make_slot_name (hotplug_slot->name,SLOT_NAME_SIZE , slot); hotplug_slot->ops = &cpqphp_hotplug_slot_ops; + +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%d" , slot->number); hotplug_slot_info->power_status =get_slot_enabled (ctrl, slot); hotplug_slot_info->attention_status =
@@ -437,10 +437,10 @@ static int ctrl_slot_setup(struct controller *ctrl, result =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, slot->device, - hotplug_slot->name); + name);if (result) {err ("pci_hp_register failed with error %d\n" , result); - goto error_name; + goto error_info; } slot->next = ctrl->slot;
@@ -452,8 +452,6 @@ static int ctrl_slot_setup(struct controller *ctrl, }return 0 ; -error_name: -kfree (hotplug_slot->name); error_info:kfree (hotplug_slot_info); error_hpslot:
@@ -639,7 +637,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)u8 device;u8 function; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));if (cpqhp_get_bus_dev (ctrl, &bus, &devfn, slot->number) ==-1 )return -ENODEV ;
@@ -666,7 +664,7 @@ static int process_SI(struct hotplug_slot *hotplug_slot)u8 device;u8 function; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));if (cpqhp_get_bus_dev (ctrl, &bus, &devfn, slot->number) ==-1 )return -ENODEV ;
@@ -698,7 +696,7 @@ static int process_SS(struct hotplug_slot *hotplug_slot)u8 device;u8 function; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));if (cpqhp_get_bus_dev (ctrl, &bus, &devfn, slot->number) ==-1 )return -ENODEV ;
@@ -721,7 +719,7 @@ static int hardware_test(struct hotplug_slot *hotplug_slot, u32 value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return cpqhp_hardware_test (ctrl, value); }
@@ -732,7 +730,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =get_slot_enabled (ctrl, slot);return 0 ;
@@ -743,7 +741,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =cpq_get_attention_status (ctrl, slot);return 0 ;
@@ -754,7 +752,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =cpq_get_latch_status (ctrl, slot);
@@ -766,7 +764,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =get_presence_status (ctrl, slot);
@@ -778,7 +776,7 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value = ctrl->speed_capability;
@@ -790,7 +788,7 @@ static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value = ctrl->speed;
PATCH 7/13 PCI: fakephp: remove 'name' parameter
In reply to Alex ChiangRemove 'name' from fakephp's struct dummy_slot, as the PCI core will now manage our slot name for us.
---
drivers/pci/hotplug/fakephp.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-)
drivers/pci/hotplug/fakephp.c +11 -9
@@ -66,7 +66,6 @@ struct dummy_slot {struct pci_dev *dev;struct work_struct remove_work;unsigned long removed; -char name[8 ]; };static int debug;
@@ -96,10 +95,13 @@ static void dummy_release(struct hotplug_slot *slot)kfree (dslot); } +#define SLOT_NAME_SIZE 8 +static int add_slot (struct pci_dev *dev) {struct dummy_slot *dslot;struct hotplug_slot *slot; +char name[SLOT_NAME_SIZE ];int retval = -ENOMEM ;static int count =1 ;
@@ -119,15 +121,14 @@ static int add_slot(struct pci_dev *dev)if (!dslot) goto error_info; - slot->name = dslot->name; -snprintf (slot->name,sizeof (dslot->name),"fake%d" , count++); -dbg ("slot->name = %s\n" , slot->name); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"fake%d" , count++); +dbg ("slot->name = %s\n" , name); slot->ops = &dummy_hotplug_slot_ops; slot->release = &dummy_release; slot->private = dslot; - retval =pci_hp_register (slot, dev->bus,PCI_SLOT (dev->devfn), - slot->name); + retval =pci_hp_register (slot, dev->bus,PCI_SLOT (dev->devfn), name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); goto error_dslot;
@@ -168,10 +169,11 @@ static void remove_slot(struct dummy_slot *dslot) {int retval; -dbg ("removing slot %s\n" , dslot->slot->name); +dbg ("removing slot %s\n" ,hotplug_slot_name (dslot->slot)); retval =pci_hp_deregister (dslot->slot);if (retval) -err ("Problem unregistering a slot %s\n" , dslot->slot->name); +err ("Problem unregistering a slot %s\n" , +hotplug_slot_name (dslot->slot)); }/* called from the single-threaded workqueue handler to remove a slot */
@@ -309,7 +311,7 @@ static int disable_slot(struct hotplug_slot *slot)return -ENODEV ; dslot = slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (slot));for (func =7 ; func >=0 ; func--) { dev =pci_get_slot (dslot->dev->bus, dslot->dev->devfn + func);
PATCH 8/13 PCI: ibmphp: stop managing hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest.
---
drivers/pci/hotplug/ibmphp.h | 5 ++--- drivers/pci/hotplug/ibmphp_ebda.c | 21 ++++++++------------- 2 files changed, 10 insertions(+), 16 deletions(-)
drivers/pci/hotplug/ibmphp.h +2 -3
@@ -707,17 +707,16 @@ struct slot {u8 device;u8 number;u8 real_physical_slot_num; -char name[100 ];u32 capabilities;u8 supported_speed;u8 supported_bus_mode; +u8 flag;/* this is for disable slot and polling */ +u8 ctlr_index;struct hotplug_slot *hotplug_slot;struct controller *ctrl;struct pci_func *func;u8 irq[4 ]; -u8 flag;/* this is for disable slot and polling */ int bit_mode;/* 0 = 32, 1 = 64 */ -u8 ctlr_index;struct bus_info *bus_on;struct list_head ibm_slot_list;u8 status;
drivers/pci/hotplug/ibmphp_ebda.c +8 -13
@@ -620,11 +620,14 @@ static u8 calculate_first_slot (u8 slot_num)return first_slot +1 ; } + +#define SLOT_NAME_SIZE 30 +static char *create_file_name (struct slot * slot_cur) {struct opt_rio *opt_vg_ptr =NULL ;struct opt_rio_lo *opt_lo_ptr =NULL ; -static char str[30 ]; +static char str[SLOT_NAME_SIZE ];int which =0 ;/* rxe = 1, chassis = 0 */ u8 number =1 ;/* either chassis or rxe # */ u8 first_slot =1 ;
@@ -736,7 +739,6 @@ static void release_slot(struct hotplug_slot *hotplug_slot) slot = hotplug_slot->private;kfree (slot->hotplug_slot->info); -kfree (slot->hotplug_slot->name);kfree (slot->hotplug_slot); slot->ctrl =NULL ; slot->bus_on =NULL ;
@@ -768,6 +770,7 @@ static int __init ebda_rsrc_controller (void)int rc;struct slot *tmp_slot;struct list_head *list; +char name[SLOT_NAME_SIZE ]; addr = hpc_list_ptr->phys_addr;for (ctlr =0 ; ctlr < hpc_list_ptr->num_ctlrs; ctlr++) {
@@ -931,12 +934,6 @@ static int __init ebda_rsrc_controller (void) goto error_no_hp_info; } - hp_slot_ptr->name =kmalloc (30 ,GFP_KERNEL ); -if (!hp_slot_ptr->name) { - rc = -ENOMEM ; - goto error_no_hp_name; - } - tmp_slot =kzalloc (sizeof (*tmp_slot),GFP_KERNEL );if (!tmp_slot) { rc = -ENOMEM ;
@@ -1000,10 +997,10 @@ static int __init ebda_rsrc_controller (void) list_for_each (list, &ibmphp_slot_head) { tmp_slot = list_entry (list, struct slot, ibm_slot_list); -snprintf (tmp_slot->hotplug_slot->name,30 ,"%s" ,create_file_name (tmp_slot)); +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%s" ,create_file_name (tmp_slot));pci_hp_register (tmp_slot->hotplug_slot, -pci_find_bus (0 , tmp_slot->bus), tmp_slot->device, - tmp_slot->hotplug_slot->name); +pci_find_bus (0 , tmp_slot->bus), tmp_slot->device, name); }print_ebda_hpc ();
@@ -1013,8 +1010,6 @@ static int __init ebda_rsrc_controller (void) error:kfree (hp_slot_ptr->private); error_no_slot: -kfree (hp_slot_ptr->name); -error_no_hp_name:kfree (hp_slot_ptr->info); error_no_hp_info:kfree (hp_slot_ptr);
PATCH 9/13 PCI: pciehp: remove 'name' parameter
In reply to Alex ChiangWe do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Remove 'name' from pciehp's version of struct slot.
---
drivers/pci/hotplug/pciehp.h | 10 +++++--- drivers/pci/hotplug/pciehp_core.c | 26 +++++++++++--------- drivers/pci/hotplug/pciehp_ctrl.c | 48 +++++++++++++++++++------------------ drivers/pci/hotplug/pciehp_hpc.c | 6 ----- 4 files changed, 45 insertions(+), 45 deletions(-)
drivers/pci/hotplug/pciehp.h +7 -3
@@ -61,15 +61,14 @@ extern struct workqueue_struct *pciehp_wq;struct slot {u8 bus;u8 device; -u32 number;u8 state; -struct timer_list task_event;u8 hp_slot; +u32 number; +struct timer_list task_event;struct controller *ctrl;struct hpc_ops *hpc_ops;struct hotplug_slot *hotplug_slot;struct list_head slot_list; -char name[SLOT_NAME_SIZE ];unsigned long last_emi_toggle;struct delayed_work work;/* work for button event */ struct mutex lock;
@@ -161,6 +160,11 @@ int pciehp_enable_slot(struct slot *p_slot);int pciehp_disable_slot (struct slot *p_slot);int pcie_enable_notification (struct controller *ctrl); +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +static inline struct slot *pciehp_find_slot (struct controller *ctrl,u8 device) {struct slot *slot;
drivers/pci/hotplug/pciehp_core.c +14 -12
@@ -180,7 +180,7 @@ static struct hotplug_slot_attribute hotplug_slot_attr_lock = {*/ static void release_slot (struct hotplug_slot *hotplug_slot) { -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));kfree (hotplug_slot->info);kfree (hotplug_slot);
@@ -191,6 +191,7 @@ static int init_slots(struct controller *ctrl)struct slot *slot;struct hotplug_slot *hotplug_slot;struct hotplug_slot_info *info; +char name[SLOT_NAME_SIZE ];int retval = -ENOMEM ;list_for_each_entry (slot, &ctrl->slot_list, slot_list) {
@@ -204,7 +205,6 @@ static int init_slots(struct controller *ctrl)/* register this slot with the hotplug pci core */ hotplug_slot->info = info; - hotplug_slot->name = slot->name; hotplug_slot->private = slot; hotplug_slot->release = &release_slot; hotplug_slot->ops = &pciehp_hotplug_slot_ops;
@@ -213,6 +213,8 @@ static int init_slots(struct controller *ctrl)get_latch_status (hotplug_slot, &info->latch_status);get_adapter_status (hotplug_slot, &info->adapter_status); slot->hotplug_slot = hotplug_slot; +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%d" , slot->number); dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x " "slot_device_offset=%x\n", slot->bus, slot->device,
@@ -220,7 +222,7 @@ static int init_slots(struct controller *ctrl) retval =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, slot->device, - slot->name); + name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); goto error_info;
@@ -265,7 +267,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); hotplug_slot->info->attention_status = status;
@@ -280,7 +282,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return pciehp_sysfs_enable_slot (slot); }
@@ -290,7 +292,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return pciehp_sysfs_disable_slot (slot); }
@@ -300,7 +302,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_power_status (slot, value);if (retval <0 )
@@ -314,7 +316,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_attention_status (slot, value);if (retval <0 )
@@ -328,7 +330,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_latch_status (slot, value);if (retval <0 )
@@ -342,7 +344,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_adapter_status (slot, value);if (retval <0 )
@@ -357,7 +359,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot,struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_max_bus_speed (slot, value);if (retval <0 )
@@ -371,7 +373,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spestruct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_cur_bus_speed (slot, value);if (retval <0 )
drivers/pci/hotplug/pciehp_ctrl.c +24 -24
172 lines not on this page · raw message
drivers/pci/hotplug/pciehp_hpc.c +0 -6
@@ -1030,11 +1030,6 @@ static void pcie_shutdown_notification(struct controller *ctrl)pciehp_free_irq (ctrl); } -static void make_slot_name (struct slot *slot) -{ -snprintf (slot->name,SLOT_NAME_SIZE ,"%d" , slot->number); -} -static int pcie_init_slot (struct controller *ctrl) {struct slot *slot;
@@ -1049,7 +1044,6 @@ static int pcie_init_slot(struct controller *ctrl) slot->device = ctrl->slot_device_offset + slot->hp_slot; slot->hpc_ops = ctrl->hpc_ops; slot->number = ctrl->first_slot; -make_slot_name (slot);mutex_init (&slot->lock);INIT_DELAYED_WORK (&slot->work, pciehp_queue_pushbutton_work);list_add (&slot->slot_list, &ctrl->slot_list);
PATCH 10/13 PCI: rpaphp: stop managing hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
This means that alloc_slot_struct() no longer needs to take a 'name' param. On the other hand, we give rpaphp_register_slot() a 'name' param now to simplify the hotplug registration process. rpaphp_register_slot() can directly pass the drc_name to the PCI hotplug core.
---
drivers/pci/hotplug/rpaphp.h | 10 +++++++--- drivers/pci/hotplug/rpaphp_core.c | 6 +++--- drivers/pci/hotplug/rpaphp_pci.c | 4 ++-- drivers/pci/hotplug/rpaphp_slot.c | 26 +++++++++----------------- 4 files changed, 21 insertions(+), 25 deletions(-)
drivers/pci/hotplug/rpaphp.h +7 -3
@@ -73,13 +73,17 @@ struct slot {u32 index;u32 type;u32 power_domain; -char *name;struct device_node *dn;struct pci_bus *bus;struct list_head *pci_devs;struct hotplug_slot *hotplug_slot; }; +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops;extern struct list_head rpaphp_slot_head;
@@ -96,8 +100,8 @@ extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,/* rpaphp_slot.c */ extern void dealloc_slot_struct (struct slot *slot); -extern struct slot *alloc_slot_struct (struct device_node *dn,int drc_index,char *drc_name,int power_domain); -extern int rpaphp_register_slot (struct slot *slot); +extern struct slot *alloc_slot_struct (struct device_node *dn,int drc_index,int power_domain); +extern int rpaphp_register_slot (struct slot *slot,const char *name);extern int rpaphp_deregister_slot (struct slot *slot);#endif /* _PPC64PHP_H */
drivers/pci/hotplug/rpaphp_core.c +3 -3
@@ -324,7 +324,7 @@ int rpaphp_add_slot(struct device_node *dn) type = (char *) &types[1 ];for (i =0 ; i < indexes[0 ]; i++) { - slot =alloc_slot_struct (dn, indexes[i +1 ], name, power_domains[i +1 ]); + slot =alloc_slot_struct (dn, indexes[i +1 ], power_domains[i +1 ]);if (!slot)return -ENOMEM ;
@@ -335,7 +335,7 @@ int rpaphp_add_slot(struct device_node *dn) retval =rpaphp_enable_slot (slot);if (!retval) - retval =rpaphp_register_slot (slot); + retval =rpaphp_register_slot (slot, name);if (retval)dealloc_slot_struct (slot);
@@ -404,7 +404,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) }else if (state ==EMPTY ) { slot->state =EMPTY ; }else { -err ("%s: slot[%s] is in invalid state\n" , __func__, slot->name); +err ("%s: slot[%s] is in invalid state\n" , __func__,slot_name (slot)); slot->state =NOT_VALID ;return -EINVAL ; }
drivers/pci/hotplug/rpaphp_pci.c +2 -2
@@ -51,7 +51,7 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state) &setlevel);if (rc <0 ) {dbg ("%s: power on slot[%s] failed rc=%d.\n" , - __func__, slot->name, rc); + __func__,slot_name (slot), rc); }else { rc =rtas_get_sensor (DR_ENTITY_SENSE , slot->index, state);
@@ -111,7 +111,7 @@ int rpaphp_enable_slot(struct slot *slot)/* non-empty slot has to have child */ if (!slot->dn->child) {err ("%s: slot[%s]'s device_node doesn't have child for adapter\n" , - __func__, slot->name); + __func__,slot_name (slot));return -EINVAL ; }
drivers/pci/hotplug/rpaphp_slot.c +9 -17
@@ -43,13 +43,12 @@ static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)void dealloc_slot_struct (struct slot *slot) {kfree (slot->hotplug_slot->info); -kfree (slot->hotplug_slot->name);kfree (slot->hotplug_slot);kfree (slot); }struct slot *alloc_slot_struct (struct device_node *dn, -int drc_index,char *drc_name,int power_domain) +int drc_index,int power_domain) {struct slot *slot;
@@ -63,11 +62,6 @@ struct slot *alloc_slot_struct(struct device_node *dn, GFP_KERNEL);if (!slot->hotplug_slot->info) goto error_hpslot; - slot->hotplug_slot->name =kmalloc (strlen (drc_name) +1 ,GFP_KERNEL ); -if (!slot->hotplug_slot->name) - goto error_info; - slot->name = slot->hotplug_slot->name; -strcpy (slot->name, drc_name); slot->dn = dn; slot->index = drc_index; slot->power_domain = power_domain;
@@ -77,8 +71,6 @@ struct slot *alloc_slot_struct(struct device_node *dn,return (slot); -error_info: -kfree (slot->hotplug_slot->info); error_hpslot:kfree (slot->hotplug_slot); error_slot:
@@ -92,7 +84,7 @@ static int is_registered(struct slot *slot)struct slot *tmp_slot;list_for_each_entry (tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) { -if (!strcmp (tmp_slot->name, slot->name)) +if (!strcmp (slot_name (tmp_slot),slot_name (slot)))return 1 ; }return 0 ;
@@ -104,32 +96,32 @@ int rpaphp_deregister_slot(struct slot *slot)struct hotplug_slot *php_slot = slot->hotplug_slot;dbg ("%s - Entry: deregistering slot=%s\n" , - __func__, slot->name); + __func__,slot_name (slot));list_del (&slot->rpaphp_slot_list); retval =pci_hp_deregister (php_slot);if (retval) -err ("Problem unregistering a slot %s\n" , slot->name); +err ("Problem unregistering a slot %s\n" ,slot_name (slot));dbg ("%s - Exit: rc[%d]\n" , __func__, retval);return retval; }EXPORT_SYMBOL_GPL (rpaphp_deregister_slot); -int rpaphp_register_slot (struct slot *slot) +int rpaphp_register_slot (struct slot *slot,const char *name) {struct hotplug_slot *php_slot = slot->hotplug_slot;int retval;int slotno;dbg ("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n" , - __func__, slot->dn->full_name, slot->index, slot->name, + __func__, slot->dn->full_name, slot->index,slot_name (slot), slot->power_domain, slot->type);/* should not try to register the same slot twice */ if (is_registered (slot)) { -err ("rpaphp_register_slot: slot[%s] is already registered\n" , slot->name); +err ("rpaphp_register_slot: slot[%s] is already registered\n" ,slot_name (slot));return -EAGAIN ; }
@@ -137,7 +129,7 @@ int rpaphp_register_slot(struct slot *slot) slotno =PCI_SLOT (PCI_DN (slot->dn->child)->devfn); else slotno =-1 ; - retval =pci_hp_register (php_slot, slot->bus, slotno, slot->name); + retval =pci_hp_register (php_slot, slot->bus, slotno, name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval);return retval;
@@ -145,7 +137,7 @@ int rpaphp_register_slot(struct slot *slot)/* add slot to our internal list */ list_add (&slot->rpaphp_slot_list, &rpaphp_slot_head); -info ("Slot [%s] registered\n" , slot->name); +info ("Slot [%s] registered\n" , name);return 0 ; sysfs_fail:
PATCH 11/13 PCI: SGI Hotplug: stop managing bss_hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
Update the sn_hp_slot_private_alloc() interface to fill in the correct name for us, as that function already has all the parameters needed to determine the name.
---
drivers/pci/hotplug/sgi_hotplug.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-)
drivers/pci/hotplug/sgi_hotplug.c +7 -13
@@ -161,7 +161,8 @@ static int sn_pci_bus_valid(struct pci_bus *pci_bus) }static int sn_hp_slot_private_alloc (struct hotplug_slot *bss_hotplug_slot, -struct pci_bus *pci_bus,int device) +struct pci_bus *pci_bus,int device, +char *name) {struct pcibus_info *pcibus_info;struct slot *slot;
@@ -173,15 +174,9 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,return -ENOMEM ; bss_hotplug_slot->private = slot; - bss_hotplug_slot->name =kmalloc (SN_SLOT_NAME_SIZE ,GFP_KERNEL ); -if (!bss_hotplug_slot->name) { -kfree (bss_hotplug_slot->private); -return -ENOMEM ; - } - slot->device_num = device; slot->pci_bus = pci_bus; -sprintf (bss_hotplug_slot->name,"%04x:%02x:%02x" , +sprintf (name,"%04x:%02x:%02x" ,pci_domain_nr (pci_bus), ((u16 )pcibus_info->pbi_buscommon.bs_persist_busnum), device +1 );
@@ -608,7 +603,6 @@ static inline int get_power_status(struct hotplug_slot *bss_hotplug_slot,static void sn_release_slot (struct hotplug_slot *bss_hotplug_slot) {kfree (bss_hotplug_slot->info); -kfree (bss_hotplug_slot->name);kfree (bss_hotplug_slot->private);kfree (bss_hotplug_slot); }
@@ -618,6 +612,7 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus)int device;struct pci_slot *pci_slot;struct hotplug_slot *bss_hotplug_slot; +char name[SN_SLOT_NAME_SIZE ];int rc =0 ;/*
@@ -644,17 +639,16 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) goto alloc_err; } +memset (name,0 ,SN_SLOT_NAME_SIZE );if (sn_hp_slot_private_alloc (bss_hotplug_slot, - pci_bus, device)) { + pci_bus, device, name)) { rc = -ENOMEM ; goto alloc_err; } - bss_hotplug_slot->ops = &sn_hotplug_slot_ops; bss_hotplug_slot->release = &sn_release_slot; - rc =pci_hp_register (bss_hotplug_slot, pci_bus, device, - bss_hotplug_slot->name); + rc =pci_hp_register (bss_hotplug_slot, pci_bus, device, name);if (rc) goto register_err;
PATCH 12/13 PCI: shcphp: remove 'name' parameter
In reply to Alex ChiangWe do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Remove 'name' from shpchp's version of struct slot.
This change also removes the unused struct task_event from the slot structure.
---
drivers/pci/hotplug/shpchp.h | 9 +++++-- drivers/pci/hotplug/shpchp_core.c | 35 ++++++++++++--------------- drivers/pci/hotplug/shpchp_ctrl.c | 48 +++++++++++++++++++------------------ 3 files changed, 45 insertions(+), 47 deletions(-)
drivers/pci/hotplug/shpchp.h +6 -3
@@ -69,15 +69,13 @@ struct slot {u8 state;u8 presence_save;u8 pwr_save; -struct timer_list task_event; -u8 hp_slot;struct controller *ctrl;struct hpc_ops *hpc_ops;struct hotplug_slot *hotplug_slot;struct list_head slot_list; -char name[SLOT_NAME_SIZE ];struct delayed_work work;/* work for button event */ struct mutex lock; +u8 hp_slot; };struct event_info {
@@ -169,6 +167,11 @@ extern void cleanup_slots(struct controller *ctrl);extern void shpchp_queue_pushbutton_work (struct work_struct *work);extern int shpc_init (struct controller *ctrl,struct pci_dev *pdev); +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +#ifdef CONFIG_ACPI #include <linux/pci-acpi.h> static inline int get_hp_params_from_firmware(struct pci_dev *dev,
drivers/pci/hotplug/shpchp_core.c +15 -20
@@ -89,23 +89,19 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));kfree (slot->hotplug_slot->info);kfree (slot->hotplug_slot);kfree (slot); } -static void make_slot_name (struct slot *slot) -{ -snprintf (slot->hotplug_slot->name,SLOT_NAME_SIZE ,"%d" , slot->number); -} -static int init_slots (struct controller *ctrl) {struct slot *slot;struct hotplug_slot *hotplug_slot;struct hotplug_slot_info *info; +char name[SLOT_NAME_SIZE ];int retval = -ENOMEM ;int i;
@@ -124,8 +120,6 @@ static int init_slots(struct controller *ctrl) goto error_hpslot; hotplug_slot->info = info; - hotplug_slot->name = slot->name; - slot->hp_slot = i; slot->ctrl = ctrl; slot->bus = ctrl->pci_dev->subordinate->number;
@@ -138,9 +132,11 @@ static int init_slots(struct controller *ctrl)/* register this slot with the hotplug pci core */ hotplug_slot->private = slot; hotplug_slot->release = &release_slot; -make_slot_name (slot); hotplug_slot->ops = &shpchp_hotplug_slot_ops; +memset (name,0 ,SLOT_NAME_SIZE ); +snprintf (name,SLOT_NAME_SIZE ,"%d" , slot->number); +get_power_status (hotplug_slot, &info->power_status);get_attention_status (hotplug_slot, &info->attention_status);get_latch_status (hotplug_slot, &info->latch_status);
@@ -150,8 +146,7 @@ static int init_slots(struct controller *ctrl)"slot_device_offset=%x\n" , slot->bus, slot->device, slot->hp_slot, slot->number, ctrl->slot_device_offset); retval =pci_hp_register (slot->hotplug_slot, - ctrl->pci_dev->subordinate, slot->device, - hotplug_slot->name); + ctrl->pci_dev->subordinate, slot->device, name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); goto error_info;
@@ -194,7 +189,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status) {struct slot *slot =get_slot (hotplug_slot); -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); hotplug_slot->info->attention_status = status; slot->hpc_ops->set_attention_status (slot, status);
@@ -206,7 +201,7 @@ static int enable_slot (struct hotplug_slot *hotplug_slot) {struct slot *slot =get_slot (hotplug_slot); -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return shpchp_sysfs_enable_slot (slot); }
@@ -215,7 +210,7 @@ static int disable_slot (struct hotplug_slot *hotplug_slot) {struct slot *slot =get_slot (hotplug_slot); -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return shpchp_sysfs_disable_slot (slot); }
@@ -225,7 +220,7 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_power_status (slot, value);if (retval <0 )
@@ -239,7 +234,7 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_attention_status (slot, value);if (retval <0 )
@@ -253,7 +248,7 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_latch_status (slot, value);if (retval <0 )
@@ -267,7 +262,7 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_adapter_status (slot, value);if (retval <0 )
@@ -282,7 +277,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot,struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_max_bus_speed (slot, value);if (retval <0 )
@@ -296,7 +291,7 @@ static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_cur_bus_speed (slot, value);if (retval <0 )
drivers/pci/hotplug/shpchp_ctrl.c +24 -24
166 lines not on this page · raw message
PATCH 13/13 PCI: Hotplug core: remove 'name'
In reply to Alex ChiangNow that the PCI core manages the 'name' for each individual hotplug driver, and all drivers have been converted to use hotplug_slot_name(), there is no need for the PCI hotplug core to drag around its own copy of name either.
---
drivers/pci/hotplug/pci_hotplug_core.c | 6 +++--- include/linux/pci_hotplug.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/pci/hotplug/pci_hotplug_core.c +3 -3
@@ -533,7 +533,7 @@ static struct hotplug_slot *get_slot_from_name (const char *name)spin_lock (&pci_hotplug_slot_list_lock); list_for_each (tmp, &pci_hotplug_slot_list) { slot = list_entry (tmp, struct hotplug_slot, slot_list); -if (strcmp (slot->name, name) ==0 ) +if (strcmp (hotplug_slot_name (slot), name) ==0 ) goto out; } slot =NULL ;
@@ -627,7 +627,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)if (!hotplug)return -ENODEV ; - temp =get_slot_from_name (hotplug->name); + temp =get_slot_from_name (hotplug_slot_name (hotplug));if (temp != hotplug)return -ENODEV ;
@@ -637,7 +637,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug) slot = hotplug->pci_slot;fs_remove_slot (slot); -dbg ("Removed slot %s from the list\n" , hotplug->name); +dbg ("Removed slot %s from the list\n" ,hotplug_slot_name (hotplug)); hotplug->release (hotplug); slot->hotplug =NULL ;
include/linux/pci_hotplug.h +0 -3
@@ -142,8 +142,6 @@ struct hotplug_slot_info {/** * struct hotplug_slot - used to register a physical slot with the hotplug pci core -* @name: the name of the slot being registered. This string must -* be unique amoung slots registered on this system. * @ops: pointer to the &struct hotplug_slot_ops to be used for this slot * @info: pointer to the &struct hotplug_slot_info for the initial values for * this slot.
@@ -153,7 +151,6 @@ struct hotplug_slot_info {* needs. */ struct hotplug_slot { -char *name;struct hotplug_slot_ops *ops;struct hotplug_slot_info *info;void (*release) (struct hotplug_slot *slot);
v2 cover PCI: let the core manage slot names
Hi Jesse,
This is v2 of the series that implements a series of changes that allows the PCI core to manage slot names, rather than individual hotplug drivers.
It addresses comments raised during the first round of review, most notably the bug that Kenji-san found of possible false name collisions.
This series applies against linux-next.
I'm including the previous explanation/justification to remind folks of the raison d'etre for this patchset.
Thanks.
/ac
There are several benefits to this approach:
1) The core can prevent duplicate slot names on systems with broken firmware.
2) Since the kobject core keeps a copy of the slot name, there is no need for each driver to manage a separate copy, especially since the core can rename slots from underneath drivers. We save runtime memory by only referencing the kobject name.
2.a) The PCI hotplug core doesn't need its own reference
for slot name either.
3) Individual hotplug drivers become just a little bit simpler by pushing as many kzalloc() calls for 'name' down into the PCI core as possible.
---
Alex Chiang (13):
PCI: Hotplug core: remove 'name'
PCI: shcphp: remove 'name' parameter
PCI: SGI Hotplug: stop managing bss_hotplug_slot->name
PCI: rpaphp: stop managing hotplug_slot->name
PCI: pciehp: remove 'name' parameter
PCI: ibmphp: stop managing hotplug_slot->name
PCI: fakephp: remove 'name' parameter
PCI: cpqphp: stop managing hotplug_slot->name
PCI: cpci_hotplug: stop managing hotplug_slot->name
PCI: acpiphp: remove 'name' parameter
PCI, PCI Hotplug: introduce slot_name helpers
PCI: prevent duplicate slot names
PCI Hotplug core: add 'name' param pci_hp_register interface
drivers/pci/hotplug/acpiphp.h | 9 +- drivers/pci/hotplug/acpiphp_core.c | 32 +++++--- drivers/pci/hotplug/cpci_hotplug.h | 6 ++ drivers/pci/hotplug/cpci_hotplug_core.c | 74 +++++++------------- drivers/pci/hotplug/cpci_hotplug_pci.c | 4 + drivers/pci/hotplug/cpqphp.h | 13 +-- drivers/pci/hotplug/cpqphp_core.c | 40 +++++------ drivers/pci/hotplug/fakephp.c | 18 +++-- drivers/pci/hotplug/ibmphp.h | 5 + drivers/pci/hotplug/ibmphp_ebda.c | 19 ++--- drivers/pci/hotplug/pci_hotplug_core.c | 38 ++++++---- drivers/pci/hotplug/pciehp.h | 9 ++ drivers/pci/hotplug/pciehp_core.c | 40 ++++------- drivers/pci/hotplug/pciehp_ctrl.c | 48 ++++++------- drivers/pci/hotplug/pciehp_hpc.c | 1 drivers/pci/hotplug/rpaphp.h | 10 ++- drivers/pci/hotplug/rpaphp_core.c | 6 +- drivers/pci/hotplug/rpaphp_pci.c | 4 + drivers/pci/hotplug/rpaphp_slot.c | 26 ++----- drivers/pci/hotplug/sgi_hotplug.c | 18 ++--- drivers/pci/hotplug/shpchp.h | 9 ++ drivers/pci/hotplug/shpchp_core.c | 42 ++++------- drivers/pci/hotplug/shpchp_ctrl.c | 48 ++++++------- drivers/pci/slot.c | 117 ++++++++++++++++++++++++++----- include/linux/pci.h | 8 ++ include/linux/pci_hotplug.h | 13 ++- 26 files changed, 354 insertions(+), 303 deletions(-)
PATCH v2 1/13 PCI Hotplug core: add 'name' param pci_hp_register interface
Update pci_hp_register() to take a const char *name parameter.
The motivation for this is to clean up the individual hotplug drivers so that each one does not have to manage its own name. The PCI core should be the place where we manage the name.
We update the interface and all callsites first, in a "no functional change" manner, and clean up the drivers later.
---
drivers/pci/hotplug/acpiphp_core.c | 3 ++- drivers/pci/hotplug/cpci_hotplug_core.c | 3 ++- drivers/pci/hotplug/cpqphp_core.c | 3 ++- drivers/pci/hotplug/fakephp.c | 3 ++- drivers/pci/hotplug/ibmphp_ebda.c | 3 ++- drivers/pci/hotplug/pci_hotplug_core.c | 15 ++++++++------- drivers/pci/hotplug/pciehp_core.c | 3 ++- drivers/pci/hotplug/rpaphp_slot.c | 2 +- drivers/pci/hotplug/sgi_hotplug.c | 3 ++- drivers/pci/hotplug/shpchp_core.c | 3 ++- include/linux/pci_hotplug.h | 5 ++++- 11 files changed, 29 insertions(+), 17 deletions(-)
drivers/pci/hotplug/acpiphp_core.c +2 -1
@@ -340,7 +340,8 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) retval =pci_hp_register (slot->hotplug_slot, acpiphp_slot->bridge->pci_bus, - acpiphp_slot->device); + acpiphp_slot->device, + slot->name);if (retval == -EBUSY ) goto error_hpslot;if (retval) {
drivers/pci/hotplug/cpci_hotplug_core.c +2 -1
@@ -285,7 +285,8 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last) info->attention_status =cpci_get_attention_status (slot);dbg ("registering slot %s" , slot->hotplug_slot->name); - status =pci_hp_register (slot->hotplug_slot, bus, i); + status =pci_hp_register (slot->hotplug_slot, bus, i, + slot->hotplug_slot->name);if (status) {err ("pci_hp_register failed with error %d" , status); goto error_name;
drivers/pci/hotplug/cpqphp_core.c +2 -1
@@ -436,7 +436,8 @@ static int ctrl_slot_setup(struct controller *ctrl, slot_number); result =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, - slot->device); + slot->device, + hotplug_slot->name);if (result) {err ("pci_hp_register failed with error %d\n" , result); goto error_name;
drivers/pci/hotplug/fakephp.c +2 -1
@@ -126,7 +126,8 @@ static int add_slot(struct pci_dev *dev) slot->release = &dummy_release; slot->private = dslot; - retval =pci_hp_register (slot, dev->bus,PCI_SLOT (dev->devfn)); + retval =pci_hp_register (slot, dev->bus,PCI_SLOT (dev->devfn), + slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); goto error_dslot;
drivers/pci/hotplug/ibmphp_ebda.c +2 -1
@@ -966,7 +966,8 @@ static int __init ebda_rsrc_controller (void)list_for_each_entry (tmp_slot, &ibmphp_slot_head, ibm_slot_list) {snprintf (tmp_slot->hotplug_slot->name,30 ,"%s" ,create_file_name (tmp_slot));pci_hp_register (tmp_slot->hotplug_slot, -pci_find_bus (0 , tmp_slot->bus), tmp_slot->device); +pci_find_bus (0 , tmp_slot->bus), tmp_slot->device, + tmp_slot->hotplug_slot->name); }print_ebda_hpc ();
drivers/pci/hotplug/pci_hotplug_core.c +8 -7
@@ -547,13 +547,15 @@ out:* @bus: bus this slot is on * @slot: pointer to the &struct hotplug_slot to register * @slot_nr: slot number +* @name: name registered with kobject core * * Registers a hotplug slot with the pci hotplug subsystem, which will allow * userspace interaction to the slot. * * Returns 0 if successful, anything else for an error. */ -int pci_hp_register (struct hotplug_slot *slot,struct pci_bus *bus,int slot_nr) +int pci_hp_register (struct hotplug_slot *slot,struct pci_bus *bus,int slot_nr, +const char *name) {int result;struct pci_slot *pci_slot;
@@ -569,7 +571,7 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr) }/* Check if we have already registered a slot with the same name. */ -if (get_slot_from_name (slot->name)) +if (get_slot_from_name (name))return -EEXIST ;/*
@@ -577,7 +579,7 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr)* driver and call it here again. If we've already created the * pci_slot, the interface will simply bump the refcount. */ - pci_slot =pci_create_slot (bus, slot_nr, slot->name); + pci_slot =pci_create_slot (bus, slot_nr, name);if (IS_ERR (pci_slot))return PTR_ERR (pci_slot);
@@ -593,8 +595,8 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr)/* * Allow pcihp drivers to override the ACPI_PCI_SLOT name. */ -if (strcmp (kobject_name (&pci_slot->kobj), slot->name)) { - result =kobject_rename (&pci_slot->kobj, slot->name); +if (strcmp (kobject_name (&pci_slot->kobj), name)) { + result =kobject_rename (&pci_slot->kobj, name);if (result) {pci_destroy_slot (pci_slot);return result;
@@ -607,8 +609,7 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr) result =fs_add_slot (pci_slot);kobject_uevent (&pci_slot->kobj,KOBJ_ADD ); -dbg ("Added slot %s to the list\n" , slot->name); - +dbg ("Added slot %s to the list\n" , name);return result; }
drivers/pci/hotplug/pciehp_core.c +2 -1
@@ -221,7 +221,8 @@ static int init_slots(struct controller *ctrl) duplicate_name: retval =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, - slot->device); + slot->device, + slot->name);if (retval) {/* * If slot N already exists, we'll try to create
drivers/pci/hotplug/rpaphp_slot.c +1 -1
@@ -137,7 +137,7 @@ int rpaphp_register_slot(struct slot *slot) slotno =PCI_SLOT (PCI_DN (slot->dn->child)->devfn); else slotno =-1 ; - retval =pci_hp_register (php_slot, slot->bus, slotno); + retval =pci_hp_register (php_slot, slot->bus, slotno, slot->name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval);return retval;
drivers/pci/hotplug/sgi_hotplug.c +2 -1
@@ -653,7 +653,8 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) bss_hotplug_slot->ops = &sn_hotplug_slot_ops; bss_hotplug_slot->release = &sn_release_slot; - rc =pci_hp_register (bss_hotplug_slot, pci_bus, device); + rc =pci_hp_register (bss_hotplug_slot, pci_bus, device, + bss_hotplug_slot->name);if (rc) goto register_err;
drivers/pci/hotplug/shpchp_core.c +2 -1
@@ -146,7 +146,8 @@ static int init_slots(struct controller *ctrl) slot->hp_slot, slot->number, ctrl->slot_device_offset); duplicate_name: retval =pci_hp_register (slot->hotplug_slot, - ctrl->pci_dev->subordinate, slot->device); + ctrl->pci_dev->subordinate, slot->device, + hotplug_slot->name);if (retval) {/* * If slot N already exists, we'll try to create
include/linux/pci_hotplug.h +4 -1
@@ -165,7 +165,10 @@ struct hotplug_slot { };#define to_hotplug_slot (n) container_of(n, struct hotplug_slot, kobj) -extern int pci_hp_register (struct hotplug_slot *,struct pci_bus *,int nr); +extern int pci_hp_register (struct hotplug_slot *, +struct pci_bus *, +int nr, +const char *name);extern int pci_hp_deregister (struct hotplug_slot *slot);extern int __must_check pci_hp_change_slot_info (struct hotplug_slot *slot,struct hotplug_slot_info *info);
Re: [PATCH v2 01/13] PCI Hotplug core: add 'name' param pci_hp_register interface
include/linux/pci_hotplug.h struct hotplug_slot { · line 171
Quoted 5 lines · Alex Chiang
include/linux/pci_hotplug.h +4
-1-extern int pci_hp_register (struct hotplug_slot *,struct pci_bus *,int nr); +extern int pci_hp_register (struct hotplug_slot *, +struct pci_bus *, +int nr, +const char *name);
Not a huge fan of this style ... the usual style would be:
extern int pci_hp_register(struct hotplug_slot *, struct pci_bus *, int nr,
const char *name);
Otherwise Acked-by: Matthew Wilcox <[email protected]>
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH v2 01/13] PCI Hotplug core: add 'name' param pci_hp_register interface
* Matthew Wilcox <[email protected]>:
Quoted 11 lines · Alex Chiang
include/linux/pci_hotplug.h struct hotplug_slot { · line 171
Quoted 5 lines
include/linux/pci_hotplug.h +4
-1-extern int pci_hp_register (struct hotplug_slot *,struct pci_bus *,int nr); +extern int pci_hp_register (struct hotplug_slot *, +struct pci_bus *, +int nr, +const char *name);Not a huge fan of this style ... the usual style would be:
extern int pci_hp_register(struct
hotplug_slot*, structpci_bus*, int nr,const char *name);
Ok, will fix.
Quoted 1 line
Otherwise Acked-by: Matthew Wilcox <[email protected]>
Thanks.
/ac
PATCH v2 2/13 PCI: prevent duplicate slot names
In reply to Alex ChiangPrevent callers of pci_create_slot() from registering slots with duplicate names. This condition occurs most often when PCI hotplug drivers are loaded on platforms with broken firmware that assigns identical names to multiple slots.
We now rename these duplicate slots on behalf of the user.
If firmware assigns the name N to multiple slots, then:
The first registered slot is assigned N The second registered slot is assigned N-1 The third registered slot is assigned N-2 The Mth registered slot becomes N-M
A side effect of this patch is that the error condition for when multiple drivers attempt to claim the same slot becomes much more prominent.
In other words, the previous error condition returned for duplicate slot names (-EEXIST) masked the case when multiple drivers attempted to claim the same slot. Now, the -EBUSY return makes the true error more obvious.
This is the permanent fix mentioned in earlier commits:
shpchp: Rename duplicate slot name N as N-1, N-2, N-M... d6a9e9b40be7da84f82eb414c2ad98c5bb69986b pciehp: Rename duplicate slot name N as N-1, N-2, N-M... 167e782e301188c7c7e31e486bbeea5f918324c1
---
drivers/pci/hotplug/pci_hotplug_core.c | 23 ++++-- drivers/pci/hotplug/pciehp_core.c | 14 ---- drivers/pci/hotplug/shpchp_core.c | 15 ---- drivers/pci/slot.c | 117 +++++++++++++++++++++++++++----- include/linux/pci.h | 3 + 5 files changed, 117 insertions(+), 55 deletions(-)
drivers/pci/hotplug/pci_hotplug_core.c +16 -7
@@ -558,7 +558,8 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, const char *name) {int result; -struct pci_slot *pci_slot; +struct pci_dev *dev; +struct pci_slot *pci_slot, *tmp_slot =NULL ;if (slot ==NULL )return -ENODEV ;
@@ -570,9 +571,17 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr,return -EINVAL ; } -/* Check if we have already registered a slot with the same name. */ -if (get_slot_from_name (name)) -return -EEXIST ; +/* +* If we find a tmp_slot here, it means that another slot +* driver has already created a pci_slot for this device. +* We care (below) if the existing slot has a different name from +* the new name that this particular hotplug driver is requesting. +*/ + dev =pci_get_slot (bus,PCI_DEVFN (slot_nr,0 )); +if (dev && dev->slot) { + tmp_slot = dev->slot; +pci_dev_put (dev); + }/* * No problems if we call this interface from both ACPI_PCI_SLOT
@@ -593,10 +602,10 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, pci_slot->hotplug = slot;/* -* Allow pcihp drivers to override the ACPI_PCI_SLOT name. +* Allow pcihp drivers to override existing slot name. */ -if (strcmp (kobject_name (&pci_slot->kobj), name)) { - result =kobject_rename (&pci_slot->kobj, name); +if (tmp_slot &&strcmp (kobject_name (&tmp_slot->kobj), name)) { + result =pci_rename_slot (pci_slot, name);if (result) {pci_destroy_slot (pci_slot);return result;
drivers/pci/hotplug/pciehp_core.c +0 -14
@@ -191,7 +191,6 @@ static int init_slots(struct controller *ctrl)struct slot *slot;struct hotplug_slot *hotplug_slot;struct hotplug_slot_info *info; -int len, dup =1 ;int retval = -ENOMEM ;list_for_each_entry (slot, &ctrl->slot_list, slot_list) {
@@ -218,24 +217,11 @@ static int init_slots(struct controller *ctrl)dbg ("Registering bus=%x dev=%x hp_slot=%x sun=%x " "slot_device_offset=%x\n" , slot->bus, slot->device, slot->hp_slot, slot->number, ctrl->slot_device_offset); -duplicate_name: retval =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, slot->device, slot->name);if (retval) { -/* -* If slot N already exists, we'll try to create -* slot N-1, N-2 ... N-M, until we overflow. -*/ -if (retval == -EEXIST ) { - len =snprintf (slot->name,SLOT_NAME_SIZE , -"%d-%d" , slot->number, dup++); -if (len <SLOT_NAME_SIZE ) - goto duplicate_name; -else -err ("duplicate slot name overflow\n" ); - }err ("pci_hp_register failed with error %d\n" , retval); goto error_info; }
drivers/pci/hotplug/shpchp_core.c +1 -14
@@ -102,7 +102,7 @@ static int init_slots(struct controller *ctrl)struct hotplug_slot *hotplug_slot;struct hotplug_slot_info *info;int retval = -ENOMEM ; -int i, len, dup =1 ; +int i;for (i =0 ; i < ctrl->num_slots; i++) { slot =kzalloc (sizeof (*slot),GFP_KERNEL );
@@ -144,23 +144,10 @@ static int init_slots(struct controller *ctrl)dbg ("Registering bus=%x dev=%x hp_slot=%x sun=%x " "slot_device_offset=%x\n" , slot->bus, slot->device, slot->hp_slot, slot->number, ctrl->slot_device_offset); -duplicate_name: retval =pci_hp_register (slot->hotplug_slot, ctrl->pci_dev->subordinate, slot->device, hotplug_slot->name);if (retval) { -/* -* If slot N already exists, we'll try to create -* slot N-1, N-2 ... N-M, until we overflow. -*/ -if (retval == -EEXIST ) { - len =snprintf (slot->name,SLOT_NAME_SIZE , -"%d-%d" , slot->number, dup++); -if (len <SLOT_NAME_SIZE ) - goto duplicate_name; -else -err ("duplicate slot name overflow\n" ); - }err ("pci_hp_register failed with error %d\n" , retval); goto error_info; }
drivers/pci/slot.c +98 -19
183 lines not on this page · raw message
include/linux/pci.h +2 -1
@@ -510,7 +510,8 @@ struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,struct pci_slot *pci_create_slot (struct pci_bus *parent,int slot_nr,const char *name);void pci_destroy_slot (struct pci_slot *slot); -void pci_update_slot_number (struct pci_slot *slot,int slot_nr); +int pci_rename_slot (struct pci_slot *slot,const char *name); +void pci_renumber_slot (struct pci_slot *slot,int slot_nr);int pci_scan_slot (struct pci_bus *bus,int devfn);struct pci_dev *pci_scan_single_device (struct pci_bus *bus,int devfn);void pci_device_add (struct pci_dev *dev,struct pci_bus *bus);
Re: [PATCH v2 02/13] PCI: prevent duplicate slot names
Quoted 6 lines · Alex Chiang
If firmware assigns the name N to multiple slots, then:
The first registered slot is assigned N The second registered slot is assigned N-1 The third registered slot is assigned N-2 The Mth registered slot becomes N-M
Not quite true ... the Mth registered slot becomes N-(M-1). With the first '-' being a literal and the second being a minus sign ;-)
drivers/pci/hotplug/pci_hotplug_core.c int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, · line 605
Quoted 2 lines
drivers/pci/hotplug/pci_hotplug_core.c +1
-1-* Allow pcihp drivers to override the ACPI_PCI_SLOT name. +* Allow pcihp drivers to override existing slot name.
I would leave "the" in here.
Quoted 34 lines
drivers/pci/slot.c +34
-0+static char *make_slot_name (const char *name) +{ +char *new_name; +int len, width, dup =1 ; +struct kobject *dup_slot; + + new_name =kstrdup (name,GFP_KERNEL ); +if (!new_name) + goto out; + +/* +* Start off allocating enough room for "name-X" +*/ + len =strlen (name) +2 ; + width =1 ; + +try_again: + dup_slot =kset_find_obj (pci_slots_kset, new_name); +if (!dup_slot) + goto out; +kobject_put (dup_slot); + +/* +* We hit this the first time through, which gives us +* space for terminating NULL, and then every power of 10 +* afterwards, which gives us space to add another digit +* to "name-XX..." +*/ +if (dup % width ==0 ) { + len++; + width *=10 ; + } + + new_name =krealloc (new_name, len,GFP_KERNEL );
drivers/pci/slot.c static struct kobj_type pci_slot_ktype = { · line 124
Quoted 10 lines
drivers/pci/slot.c +10
-0+if (!new_name) + goto out; + +memset (new_name,0 , len); +scnprintf (new_name, len,"%s-%d" , name, dup++); + goto try_again; + +out: +return new_name; +}
I don't like the goto-loop style (yes, I know we do it elsewhere), and I think we only need to krealloc inside the 'if' condition. Something like this, perhaps:
static char *make_slot_name(const char *name)
{
char *new_name;
int len, max, dup;
new_name = kstrdup(name, GFP_KERNEL);
if (!new_name)
return NULL;
/*
* Make sure we hit the realloc case the first time through the
* loop. 'len' will be strlen(name) + 3 at that point which is
* enough space for "name-X" and the trailing NUL.
*/
len = strlen(name) + 2;
max = 1;
dup = 1;
for (;;) {
struct kobject *dup_slot;
dup_slot = kset_find_obj(pci_slots_kset, new_name);
if (!dup_slot)
break;
kobject_put(dup_slot);
if (dup == max) {
len++;
max *= 10;
new_name = krealloc(new_name, len, GFP_KERNEL);
if (!new_name)
break;
}
sprintf(new_name, "%s-%d", name, dup++);
}
return new_name;
}Quoted 8 lines
drivers/pci/slot.c +3
-1@@ -89,7 +134,19 @@ static struct kobj_type pci_slot_ktype = {* either return a new &struct pci_slot to the caller, or if the pci_slot * already exists, its refcount will be incremented. * -* Slots are uniquely identified by a @pci_bus, @slot_nr, @name tuple. +* Slots are uniquely identified by a @pci_bus, @slot_nr tuple. +* +* The kobject API imposes a restriction on us, and does not allow sysfs
drivers/pci/slot.c static struct kobj_type pci_slot_ktype = { · line 149
Quoted 10 lines
drivers/pci/slot.c +10
-0+* entries with duplicate names. There are known platforms with broken +* firmware that assign the same name to multiple slots. +* +* We workaround these broken platforms by renaming the slots on behalf +* of the caller. If firmware assigns name N to multiple slots: +* +* The first slot is assigned N +* The second slot is assigned N-1 +* The third slot is assigned N-2 +* The Mth slot is assigned N-M
How about simply replacing this last line with:
Quoted 15 lines
drivers/pci/slot.c +3
-1+ * etc. struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,const char *name) {struct pci_dev *dev;struct pci_slot *slot; -int err; +int err =0 ; +char *slot_name =NULL ;down_write (&pci_bus_sem);@@ -144,12 +201,18 @@ placeholder:
drivers/pci/slot.c placeholder: · line 210
Quoted 10 lines
drivers/pci/slot.c +6
-1slot->bus = parent; slot->number = slot_nr; - slot->kobj.kset = pci_slots_kset; + + slot_name =make_slot_name (name); +if (!slot_name) { + slot =ERR_PTR (-ENOMEM ); + goto err; + }
I think you need to kfree() slot before you assign an ERR_PTR to it. Actually, since the 'err' label does that, just make that:
if (!slot_name) {
err = -ENOMEM;
goto err;
}Quoted 7 lines
drivers/pci/slot.c +1
-2-void pci_update_slot_number (struct pci_slot *slot,int slot_nr) +void pci_renumber_slot (struct pci_slot *slot,int slot_nr) { -int name_count =0 ;struct pci_slot *tmp;down_write (&pci_bus_sem);
drivers/pci/slot.c EXPORT_SYMBOL_GPL(pci_create_slot); · line 201
Quoted 10 lines
drivers/pci/slot.c +1
-7-list_for_each_entry (tmp, &slot->bus->slots, list) { +list_for_each_entry (tmp, &slot->bus->slots, list)WARN_ON (tmp->number == slot_nr); -if (!strcmp (kobject_name (&tmp->kobj),kobject_name (&slot->kobj))) - name_count++; - } - -if (name_count >1 ) -printk (KERN_WARNING "pci_update_slot_number found %d slots with the same name: %s\n" , name_count,kobject_name (&slot->kobj));
Are you going to get enough information to debug problems with just this WARN_ON? And do we want to decline to renumber a slot to the same number as an existing one?
Anyway, looks good, and I really like the name-change for this function.
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH v2 02/13] PCI: prevent duplicate slot names
Hi Willy,
Thanks for the review. I've pretty much incorporated all your comments with a few exceptions...
Quoted 20 lines
static char *make_slot_name(const char *name)
{ char *new_name; int len, max, dup; new_name = kstrdup(name, GFP_KERNEL); if (!new_name) return NULL; /* * Make sure we hit the realloc case the first time through the * loop. 'len' will be strlen(name) + 3 at that point which is * enough space for "name-X" and the trailing NUL. */ len = strlen(name) + 2; max = 1; dup = 1; for (;;) { struct kobject *dup_slot;
Quoted 8 lines
dup_slot = kset_find_obj(pci_slots_kset, new_name);
if (!dup_slot)
break;
kobject_put(dup_slot);
if (dup == max) {
len++;
max *= 10;
new_name = krealloc(new_name, len, GFP_KERNEL);As Rolf Eike Beer pointed out, a failed krealloc() will leak the old version of new_name, so I did this instead:
kfree(new_name); new_name = kmalloc(len, GFP_KERNEL);
This is better than krealloc() in several ways:
1. we avoid the unneeded memcpy that krealloc() does for us. we don't need it because we're going to sprintf over it anyway.
2. the explicit kfree(new_name) means we won't leak anything.
Quoted 17 lines
if (!new_name) break; } sprintf(new_name, "%s-%d", name, dup++); } return new_name; }Quoted 8 lines
drivers/pci/slot.c +1
-2-void pci_update_slot_number (struct pci_slot *slot,int slot_nr) +void pci_renumber_slot (struct pci_slot *slot,int slot_nr) { -int name_count =0 ;struct pci_slot *tmp;down_write (&pci_bus_sem);
Quoted 13 lines
drivers/pci/slot.c EXPORT_SYMBOL_GPL(pci_create_slot); · line 201
Quoted 9 lines
drivers/pci/slot.c +1
-7-list_for_each_entry (tmp, &slot->bus->slots, list) { +list_for_each_entry (tmp, &slot->bus->slots, list)WARN_ON (tmp->number == slot_nr); -if (!strcmp (kobject_name (&tmp->kobj),kobject_name (&slot->kobj))) - name_count++; - } - -if (name_count >1 ) -printk (KERN_WARNING "pci_update_slot_number found %d slots with the same name: %s\n" , name_count,kobject_name (&slot->kobj));Are you going to get enough information to debug problems with just this
WARN_ON? And do we want to decline to renumber a slot to the same number as an existing one?
I think this should be sufficient for the following reasons:
1. This API was added for ppc; I can't imagine any other arch actually needing to renumber a slot after create.
2. I added this check at BenH's request as a "belt and suspenders" sort of thing; neither of us expects to really get a collision here ever, and if we do, it's an OFW error (iirc).
3. I think I will return early though, because otherwise, the refcounting will get very confused.
Quoted 1 line
Anyway, looks good, and I really like the name-change for this function.
Thanks.
/ac
Re: [PATCH v2 02/13] PCI: prevent duplicate slot names
Quoted 6 lines · Alex Chiang
As Rolf Eike Beer pointed out, a failed
krealloc()will leak the old version ofnew_name, so I did this instead:kfree(new_name); new_name = kmalloc(len, GFP_KERNEL);
Quoted 8 lines
This is better than
krealloc()in several ways:1. we avoid the unneeded memcpy that
krealloc()does for us. we don't need it because we're going to sprintf over it anyway.2. the explicit
kfree(new_name)means we won't leak anything.
Agreed.
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH v2 02/13] PCI: prevent duplicate slot names
In reply to Alex ChiangQuoted 203 lines · Alex Chiang
Prevent callers of
pci_create_slot()from registering slots with duplicate names. This condition occurs most often when PCI hotplug drivers are loaded on platforms with broken firmware that assigns identical names to multiple slots.We now rename these duplicate slots on behalf of the user.
If firmware assigns the name N to multiple slots, then:
The first registered slot is assigned N The second registered slot is assigned N-1 The third registered slot is assigned N-2 The Mth registered slot becomes N-M
A side effect of this patch is that the error condition for when multiple drivers attempt to claim the same slot becomes much more prominent.
In other words, the previous error condition returned for duplicate slot names (
-EEXIST) masked the case when multiple drivers attempted to claim the same slot. Now, the-EBUSYreturn makes the true error more obvious.This is the permanent fix mentioned in earlier commits:
shpchp: Rename duplicate slot name N as N-1, N-2, N-M... d6a9e9b40be7da84f82eb414c2ad98c5bb69986b pciehp: Rename duplicate slot name N as N-1, N-2, N-M... 167e782e301188c7c7e31e486bbeea5f918324c1Signed-off-by Alex Chiang <[email protected]>---
drivers/pci/hotplug/pci_hotplug_core.c | 23 ++++-- drivers/pci/hotplug/pciehp_core.c | 14 ---- drivers/pci/hotplug/shpchp_core.c | 15 ---- drivers/pci/slot.c | 117 +++++++++++++++++++++++++++----- include/linux/pci.h | 3 + 5 files changed, 117 insertions(+), 55 deletions(-)(quoted diff) +0
-0
b/drivers/pci/hotplug/pci_hotplug_core.cindex 3e37d63..2232608 100644drivers/pci/hotplug/pci_hotplug_core.c +16
-7@@ -558,7 +558,8 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, const char *name) { int result; -struct pci_slot *pci_slot; +struct pci_dev *dev; +struct pci_slot *pci_slot, *tmp_slot =NULL ;if (slot ==NULL )return -ENODEV ;@@ -570,9 +571,17 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, return -EINVAL; } -/* Check if we have already registered a slot with the same name. */ -if (get_slot_from_name (name)) -return -EEXIST ; +/* +* If we find a tmp_slot here, it means that another slot +* driver has already created a pci_slot for this device. +* We care (below) if the existing slot has a different name from +* the new name that this particular hotplug driver is requesting. +*/ + dev =pci_get_slot (bus,PCI_DEVFN (slot_nr,0 )); +if (dev && dev->slot) { + tmp_slot = dev->slot; +pci_dev_put (dev); + }/* * No problems if we call this interface from both ACPI_PCI_SLOT @@ -593,10 +602,10 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, pci_slot->hotplug = slot;/* -* Allow pcihp drivers to override the ACPI_PCI_SLOT name. +* Allow pcihp drivers to override existing slot name. */ -if (strcmp (kobject_name (&pci_slot->kobj), name)) { - result =kobject_rename (&pci_slot->kobj, name); +if (tmp_slot &&strcmp (kobject_name (&tmp_slot->kobj), name)) { + result =pci_rename_slot (pci_slot, name);if (result) {pci_destroy_slot (pci_slot);return result;(quoted diff) +0
-0
b/drivers/pci/hotplug/pciehp_core.cindex cbd84f8..bed77af 100644drivers/pci/hotplug/pciehp_core.c +0
-14@@ -191,7 +191,6 @@ static int init_slots(struct controller *ctrl)struct slot *slot;struct hotplug_slot *hotplug_slot;struct hotplug_slot_info *info; -int len, dup =1 ;int retval = -ENOMEM ;list_for_each_entry (slot, &ctrl->slot_list, slot_list) {@@ -218,24 +217,11 @@ static int init_slots(struct controller *ctrl)dbg ("Registering bus=%x dev=%x hp_slot=%x sun=%x " "slot_device_offset=%x\n" , slot->bus, slot->device, slot->hp_slot, slot->number, ctrl->slot_device_offset); -duplicate_name: retval =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, slot->device, slot->name);if (retval) { -/* -* If slot N already exists, we'll try to create -* slot N-1, N-2 ... N-M, until we overflow. -*/ -if (retval == -EEXIST ) { - len =snprintf (slot->name,SLOT_NAME_SIZE , -"%d-%d" , slot->number, dup++); -if (len <SLOT_NAME_SIZE ) - goto duplicate_name; -else -err ("duplicate slot name overflow\n" ); - }err ("pci_hp_register failed with error %d\n" , retval); goto error_info; }(quoted diff) +0
-0
b/drivers/pci/hotplug/shpchp_core.cindex bf50966..cfdd079 100644drivers/pci/hotplug/shpchp_core.c +1
-14@@ -102,7 +102,7 @@ static int init_slots(struct controller *ctrl)struct hotplug_slot *hotplug_slot;struct hotplug_slot_info *info;int retval = -ENOMEM ; -int i, len, dup =1 ; +int i;for (i =0 ; i < ctrl->num_slots; i++) { slot =kzalloc (sizeof (*slot),GFP_KERNEL );@@ -144,23 +144,10 @@ static int init_slots(struct controller *ctrl)dbg ("Registering bus=%x dev=%x hp_slot=%x sun=%x " "slot_device_offset=%x\n" , slot->bus, slot->device, slot->hp_slot, slot->number, ctrl->slot_device_offset); -duplicate_name: retval =pci_hp_register (slot->hotplug_slot, ctrl->pci_dev->subordinate, slot->device, hotplug_slot->name);if (retval) { -/* -* If slot N already exists, we'll try to create -* slot N-1, N-2 ... N-M, until we overflow. -*/ -if (retval == -EEXIST ) { - len =snprintf (slot->name,SLOT_NAME_SIZE , -"%d-%d" , slot->number, dup++); -if (len <SLOT_NAME_SIZE ) - goto duplicate_name; -else -err ("duplicate slot name overflow\n" ); - }err ("pci_hp_register failed with error %d\n" , retval); goto error_info; }drivers/pci/slot.c +26
-0@@ -78,6 +78,51 @@ static struct kobj_type pci_slot_ktype = { .default_attrs = pci_slot_default_attrs, }; +static char *make_slot_name (const char *name) +{ +char *new_name; +int len, width, dup =1 ; +struct kobject *dup_slot; + + new_name =kstrdup (name,GFP_KERNEL ); +if (!new_name) + goto out; + +/* +* Start off allocating enough room for "name-X" +*/ + len =strlen (name) +2 ; + width =1 ; + +try_again: + dup_slot =kset_find_obj (pci_slots_kset, new_name); +if (!dup_slot) + goto out; +kobject_put (dup_slot); + +/* +* We hit this the first time through, which gives us +* space for terminating NULL, and then every power of 10 +* afterwards, which gives us space to add another digit
drivers/pci/slot.c static struct kobj_type pci_slot_ktype = { · line 116
Quoted 10 lines
drivers/pci/slot.c +10
-0+* to "name-XX..." +*/ +if (dup % width ==0 ) { + len++; + width *=10 ; + } + + new_name =krealloc (new_name, len,GFP_KERNEL ); +if (!new_name) + goto out;
If krealloc() fails you will leak the old new_name here.
Eike
Re: [PATCH v2 02/13] PCI: prevent duplicate slot names
* Rolf Eike Beer <[email protected]>:
Quoted 9 lines
Quoted 9 lines
drivers/pci/slot.c +9
-0+ +/* +* We hit this the first time through, which gives us +* space for terminating NULL, and then every power of 10 +* afterwards, which gives us space to add another digit +* to "name-XX..." +*/ +if (dup % width ==0 ) { + len++;
Quoted 8 lines
drivers/pci/slot.c static struct kobj_type pci_slot_ktype = { · line 116
Quoted 6 lines
drivers/pci/slot.c +6
-0+ width *=10 ; + } + + new_name =krealloc (new_name, len,GFP_KERNEL ); +if (!new_name) + goto out;If
krealloc()fails you will leak the oldnew_namehere.
Thanks for catching this. I already responded to Willy that I'm changing it to:
kfree(new_name); new_name = kmalloc(len, GFP_KERNEL);
That will prevent any leaks.
Thanks for the review.
/ac
Re: [PATCH v2 02/13] PCI: prevent duplicate slot names
In reply to Alex ChiangQuoted 68 lines · Alex Chiang
Prevent callers of
pci_create_slot()from registering slots with duplicate names. This condition occurs most often when PCI hotplug drivers are loaded on platforms with broken firmware that assigns identical names to multiple slots.We now rename these duplicate slots on behalf of the user.
If firmware assigns the name N to multiple slots, then:
The first registered slot is assigned N The second registered slot is assigned N-1 The third registered slot is assigned N-2 The Mth registered slot becomes N-M
A side effect of this patch is that the error condition for when multiple drivers attempt to claim the same slot becomes much more prominent.
In other words, the previous error condition returned for duplicate slot names (
-EEXIST) masked the case when multiple drivers attempted to claim the same slot. Now, the-EBUSYreturn makes the true error more obvious.This is the permanent fix mentioned in earlier commits:
shpchp: Rename duplicate slot name N as N-1, N-2, N-M... d6a9e9b40be7da84f82eb414c2ad98c5bb69986b pciehp: Rename duplicate slot name N as N-1, N-2, N-M... 167e782e301188c7c7e31e486bbeea5f918324c1Signed-off-by Alex Chiang <[email protected]>---
drivers/pci/hotplug/pci_hotplug_core.c | 23 ++++-- drivers/pci/hotplug/pciehp_core.c | 14 ---- drivers/pci/hotplug/shpchp_core.c | 15 ---- drivers/pci/slot.c | 117 +++++++++++++++++++++++++++----- include/linux/pci.h | 3 + 5 files changed, 117 insertions(+), 55 deletions(-)drivers/pci/hotplug/pci_hotplug_core.c +4
-4@@ -558,7 +558,8 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, const char *name) {int result; -struct pci_slot *pci_slot; +struct pci_dev *dev; +struct pci_slot *pci_slot, *tmp_slot =NULL ;if (slot ==NULL )return -ENODEV ;@@ -570,9 +571,17 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr,return -EINVAL ; } -/* Check if we have already registered a slot with the same name. */ -if (get_slot_from_name (name)) -return -EEXIST ; +/* +* If we find a tmp_slot here, it means that another slot
drivers/pci/hotplug/pci_hotplug_core.c int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, · line 585
Quoted 10 lines
drivers/pci/hotplug/pci_hotplug_core.c +9
-0+* driver has already created a pci_slot for this device. +* We care (below) if the existing slot has a different name from +* the new name that this particular hotplug driver is requesting. +*/ + dev =pci_get_slot (bus,PCI_DEVFN (slot_nr,0 )); +if (dev && dev->slot) { + tmp_slot = dev->slot; +pci_dev_put (dev); + }
I have two comments here.
(1) I think the reference counter of the device will be leaked if (dev == NULL) && (dev->slot != NULL). We need pci_dev_put() whenever dev is not NULL.
(2) When the slot is empty, the 'dev' will be always NULL. Therefore, 'tmp_slot' will be always NULL on the empty slot here. Because of this, the following code to rename the slot will not work on the empty slot, I think.
drivers/pci/hotplug/pci_hotplug_core.c int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, · line 611
Quoted 11 lines
drivers/pci/hotplug/pci_hotplug_core.c +1
-1/* -* Allow pcihp drivers to override the ACPI_PCI_SLOT name. +* Allow pcihp drivers to override existing slot name. drivers/pci/hotplug/pci_hotplug_core.c +2
-2*/ -if (strcmp (kobject_name (&pci_slot->kobj), name)) { - result =kobject_rename (&pci_slot->kobj, name); +if (tmp_slot &&strcmp (kobject_name (&tmp_slot->kobj), name)) { + result =pci_rename_slot (pci_slot, name);if (result) {pci_destroy_slot (pci_slot);return result;
Thanks,
Kenji Kaneshige
Re: [PATCH v2 02/13] PCI: prevent duplicate slot names
* Kenji Kaneshige <[email protected]>:
Quoted 22 lines
Quoted 8 lines · Alex Chiang
drivers/pci/hotplug/pci_hotplug_core.c +2
-2@@ -570,9 +571,17 @@ int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr,return -EINVAL ; } - /* Check if we have already registered a slot with the same name. */ - if (get_slot_from_name(name)) - return -EEXIST; +/* +* If we find a tmp_slot here, it means that another slot drivers/pci/hotplug/pci_hotplug_core.c int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr, · line 585
Quoted 10 lines
drivers/pci/hotplug/pci_hotplug_core.c +9
-0+* driver has already created a pci_slot for this device. +* We care (below) if the existing slot has a different name from +* the new name that this particular hotplug driver is requesting. +*/ + dev =pci_get_slot (bus,PCI_DEVFN (slot_nr,0 )); +if (dev && dev->slot) { + tmp_slot = dev->slot; +pci_dev_put (dev); + }I have two comments here.
Quoted 3 lines
(1) I think the reference counter of the device will be leaked if (dev == NULL) && (
dev->slot!= NULL). We needpci_dev_put()whenever dev is not NULL.
You're right, thank you.
[one day, I _will_ learn how to get refcounting correct. :-/]
Quoted 4 lines
(2) When the slot is empty, the 'dev' will be always NULL. Therefore, '
tmp_slot' will be always NULL on the empty slot here. Because of this, the following code to rename the slot will not work on the empty slot, I think.
Ok, I was trying to avoid creating a new interface called "pci_find_phys_slot()" or something similar, but I think we need it, and it will fix this issue.
Thanks again for the review.
/ac
PATCH v2 3/13 PCI, PCI Hotplug: introduce slot_name helpers
In reply to Alex ChiangIn preparation for cleaning up the various hotplug drivers such that they don't have to manage their own 'name' parameters anymore, we provide the following convenience functions:
pci_slot_name() hotplug_slot_name()
These helpers will be used by individual hotplug drivers.
---
include/linux/pci.h | 5 +++++ include/linux/pci_hotplug.h | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-)
include/linux/pci.h +5 -0
@@ -64,6 +64,11 @@ struct pci_slot {struct kobject kobj; }; +static inline const char *pci_slot_name (const struct pci_slot *slot) +{ +return kobject_name (&slot->kobj); +} +/* File state for mmap()s on /proc/bus/pci/X/Y */ enum pci_mmap_state { pci_mmap_io,
include/linux/pci_hotplug.h +5 -0
@@ -165,6 +165,11 @@ struct hotplug_slot { };#define to_hotplug_slot (n) container_of(n, struct hotplug_slot, kobj) +static inline const char *hotplug_slot_name (const struct hotplug_slot *slot) +{ +return pci_slot_name (slot->pci_slot); +} + extern int pci_hp_register(struct hotplug_slot *, struct pci_bus *, int nr,
Re: [PATCH v2 03/13] PCI, PCI Hotplug: introduce slot_name helpers
Quoted 7 lines · Alex Chiang
In preparation for cleaning up the various hotplug drivers such that they don't have to manage their own 'name' parameters anymore, we provide the following convenience functions:
pci_slot_name() hotplug_slot_name()
Quoted 7 lines
These helpers will be used by individual hotplug drivers.
Signed-off-by Alex Chiang <[email protected]>
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
PATCH v2 4/13 PCI: acpiphp: remove 'name' parameter
In reply to Alex ChiangWe do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Remove 'name' from acpiphp's version of struct slot.
---
drivers/pci/hotplug/acpiphp.h | 9 +++++---- drivers/pci/hotplug/acpiphp_core.c | 31 ++++++++++++++++--------------- 2 files changed, 21 insertions(+), 19 deletions(-)
drivers/pci/hotplug/acpiphp.h +5 -4
@@ -50,9 +50,6 @@ #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) -/* name size which is used for entries in pcihpfs */ -#define SLOT_NAME_SIZE 20/* {_SUN} */ -struct acpiphp_bridge ;struct acpiphp_slot ;
@@ -63,9 +60,13 @@ struct slot {struct hotplug_slot *hotplug_slot;struct acpiphp_slot *acpi_slot;struct hotplug_slot_info info; -char name[SLOT_NAME_SIZE ]; }; +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * struct acpiphp_bridge - PCI bridge information *
drivers/pci/hotplug/acpiphp_core.c +16 -15
@@ -44,6 +44,9 @@#define MY_NAME "acpiphp" +/* name size which is used for entries in pcihpfs */ +#define SLOT_NAME_SIZE 20/* {_SUN} */ +static int debug;int acpiphp_debug;
@@ -84,7 +87,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = { .get_adapter_status = get_adapter_status, }; -/** * acpiphp_register_attention - set attention LED callback * @info: must be completely filled with LED callbacks
@@ -136,7 +138,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* enable the specified slot */ return acpiphp_enable_slot (slot->acpi_slot);
@@ -154,7 +156,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));/* disable the specified slot */ retval =acpiphp_disable_slot (slot->acpi_slot);
@@ -177,7 +179,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) {int retval = -ENODEV ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) { retval = attention_info->set_attn (hotplug_slot, status);
@@ -200,7 +202,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_power_status (slot->acpi_slot);
@@ -222,7 +224,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value) {int retval = -EINVAL ; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));if (attention_info &&try_module_get (attention_info->owner)) { retval = attention_info->get_attn (hotplug_slot, value);
@@ -245,7 +247,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_latch_status (slot->acpi_slot);
@@ -265,7 +267,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =acpiphp_get_adapter_status (slot->acpi_slot);
@@ -299,7 +301,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));kfree (slot->hotplug_slot);kfree (slot);
@@ -310,6 +312,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) {struct slot *slot;int retval = -ENOMEM ; +char name[SLOT_NAME_SIZE ]; slot =kzalloc (sizeof (*slot),GFP_KERNEL );if (!slot)
@@ -321,8 +324,6 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) slot->hotplug_slot->info = &slot->info; - slot->hotplug_slot->name = slot->name; - slot->hotplug_slot->private = slot; slot->hotplug_slot->release = &release_slot; slot->hotplug_slot->ops = &acpi_hotplug_slot_ops;
@@ -336,12 +337,12 @@ 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 (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +scnprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun); retval =pci_hp_register (slot->hotplug_slot, acpiphp_slot->bridge->pci_bus, acpiphp_slot->device, - slot->name); + name);if (retval == -EBUSY ) goto error_hpslot;if (retval) {
@@ -349,7 +350,7 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) goto error_hpslot; } -info ("Slot [%s] registered\n" , slot->hotplug_slot->name); +info ("Slot [%s] registered\n" ,slot_name (slot));return 0 ; error_hpslot:
@@ -366,7 +367,7 @@ void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *acpiphp_slot)struct slot *slot = acpiphp_slot->slot;int retval =0 ; -info ("Slot [%s] unregistered\n" , slot->hotplug_slot->name); +info ("Slot [%s] unregistered\n" ,slot_name (slot)); retval =pci_hp_deregister (slot->hotplug_slot);if (retval)
Re: [PATCH v2 04/13] PCI: acpiphp: remove 'name' parameter
Quoted 3 lines · Alex Chiang
We do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Looks good, just a question ...
drivers/pci/hotplug/acpiphp_core.c int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) · line 340
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +1
-1acpiphp_slot->slot = slot; -snprintf (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +scnprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun);
What's the difference between snprintf and scnprintf?
And why were we bothering to use snprintf anyway? For when we fall into a parallel universe where a u32 can have more than twenty digits?
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH v2 04/13] PCI: acpiphp: remove 'name' parameter
* Matthew Wilcox <[email protected]>:
Quoted 5 lines · Alex Chiang
Quoted 3 lines
We do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Quoted 8 lines
Looks good, just a question ...
drivers/pci/hotplug/acpiphp_core.c int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot) · line 340
Quoted 4 lines
drivers/pci/hotplug/acpiphp_core.c +1
-1acpiphp_slot->slot = slot; -snprintf (slot->name,sizeof (slot->name),"%u" , slot->acpi_slot->sun); +scnprintf (name,SLOT_NAME_SIZE ,"%u" , slot->acpi_slot->sun);What's the difference between snprintf and scnprintf?
I think this may have already been answered somewhere else, but scnprintf tells you number of characters that actually fits into the buffer whereas snprintf tells you the number of characters that _would_ have fit into the buffer it were big enough.
Quoted 2 lines
And why were we bothering to use snprintf anyway? For when we fall into a parallel universe where a u32 can have more than twenty digits?
Well, I think there are some in-flight patches that want to change sun to a 64 bit value, which makes me think we want to change SLOT_NAME_SIZE to 21...
/ac
PATCH v2 5/13 PCI: cpci_hotplug: stop managing hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest.
---
drivers/pci/hotplug/cpci_hotplug.h | 6 ++ drivers/pci/hotplug/cpci_hotplug_core.c | 75 ++++++++++++------------------- drivers/pci/hotplug/cpci_hotplug_pci.c | 4 +- 3 files changed, 36 insertions(+), 49 deletions(-)
drivers/pci/hotplug/cpci_hotplug.h +6 -0
@@ -30,6 +30,7 @@#include <linux/types.h> #include <linux/pci.h> +#include <linux/pci_hotplug.h> /* PICMG 2.1 R2.0 HS CSR bits: */ #define HS_CSR_INS 0x0080
@@ -69,6 +70,11 @@ struct cpci_hp_controller {struct cpci_hp_controller_ops *ops; }; +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +extern int cpci_hp_register_controller (struct cpci_hp_controller *controller);extern int cpci_hp_unregister_controller (struct cpci_hp_controller *controller);extern int cpci_hp_register_bus (struct pci_bus *bus,u8 first,u8 last);
drivers/pci/hotplug/cpci_hotplug_core.c +28 -47
214 lines not on this page · raw message
drivers/pci/hotplug/cpci_hotplug_pci.c +2 -2
@@ -209,7 +209,7 @@ int cpci_led_on(struct slot* slot) hs_cap + 2, hs_csr)) {err ("Could not set LOO for slot %s" , - slot->hotplug_slot->name); +hotplug_slot_name (slot->hotplug_slot));return -ENODEV ; } }
@@ -238,7 +238,7 @@ int cpci_led_off(struct slot* slot) hs_cap + 2, hs_csr)) {err ("Could not clear LOO for slot %s" , - slot->hotplug_slot->name); +hotplug_slot_name (slot->hotplug_slot));return -ENODEV ; } }
Re: [PATCH v2 05/13] PCI: cpci_hotplug: stop managing hotplug_slot->name
Quoted 7 lines · Alex Chiang
We no longer need to manage our version of
hotplug_slot->namesince the PCI and hotplug core manage it on our behalf.Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest.
drivers/pci/hotplug/cpci_hotplug_core.c +0
-1-static void
drivers/pci/hotplug/cpci_hotplug_core.c static void release_slot(struct hotplug_slot *hotplug_slot)
Quoted 10 lines
drivers/pci/hotplug/cpci_hotplug_core.c +2
-5-make_slot_name(struct slot *slot) -{ -snprintf (slot->hotplug_slot->name, -SLOT_NAME_SIZE ,"%02x:%02x" , slot->bus->number, slot->number); -} +scnprintf (name,SLOT_NAME_SIZE ,"%02x:%02x" , bus->number, i); + hotplug_slot->private = slot;
Unfortunately, our name is kind of crappy. Can we not give the user anything better than this? I can't seem to find the CompactPCI specification to see if we have a better name available.
I wonder if we can use DMI data on this class of machine. Scott?
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH v2 05/13] PCI: cpci_hotplug: stop managing hotplug_slot->name
Quoted 23 lines · Matthew Wilcox
Quoted 7 lines · Alex Chiang
We no longer need to manage our version of
hotplug_slot->namesince the PCI and hotplug core manage it on our behalf.Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest.
drivers/pci/hotplug/cpci_hotplug_core.c +0
-1-static voiddrivers/pci/hotplug/cpci_hotplug_core.c static void release_slot(struct hotplug_slot *hotplug_slot)
Quoted 10 lines
drivers/pci/hotplug/cpci_hotplug_core.c +2
-5-make_slot_name(struct slot *slot) -{ -snprintf (slot->hotplug_slot->name, -SLOT_NAME_SIZE ,"%02x:%02x" , slot->bus->number, slot->number); -} +scnprintf (name,SLOT_NAME_SIZE ,"%02x:%02x" , bus->number, i); + hotplug_slot->private = slot;Unfortunately, our name is kind of crappy. Can we not give the user anything better than this? I can't seem to find the CompactPCI specification to see if we have a better name available.
Quoted 1 line
I wonder if we can use DMI data on this class of machine. Scott?
This is about all that can be done, unfortunately. I've never seen anything useful with regards to this in DMI on the boards I've looked at, and we would have to rework the board driver -> CPCI hotplug core interface to pass that information along even if we could get it for some boards. In general, it is a difficult problem to solve since the same set of system master and peripheral boards in a different chassis could very well be at different geographic addresses depending on where the chassis vendor has placed the system master slot(s).
Scott
Signature · 4 lines
Scott Murray SOMA Networks, Inc. Toronto, Ontario e-mail: [email protected]
PATCH v2 6/13 PCI: cpqphp: stop managing hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest.
---
drivers/pci/hotplug/cpqphp.h | 13 +++++------- drivers/pci/hotplug/cpqphp_core.c | 39 +++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 29 deletions(-)
drivers/pci/hotplug/cpqphp.h +5 -8
@@ -449,6 +449,11 @@ extern u8 cpqhp_disk_irq;/* inline functions */ +static inline char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +/* * return_resource *
@@ -696,14 +701,6 @@ static inline int get_presence_status(struct controller *ctrl, struct slot *slotreturn presence_save; } -#define SLOT_NAME_SIZE 10 - -static inline void make_slot_name (char *buffer,int buffer_size,struct slot *slot) -{ -snprintf (buffer, buffer_size,"%d" , slot->number); -} - -static inline int wait_for_ctrl_irq (struct controller *ctrl) {DECLARE_WAITQUEUE (wait, current);
drivers/pci/hotplug/cpqphp_core.c +18 -21
@@ -315,14 +315,15 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));kfree (slot->hotplug_slot->info); -kfree (slot->hotplug_slot->name);kfree (slot->hotplug_slot);kfree (slot); } +#define SLOT_NAME_SIZE 10 +static int ctrl_slot_setup (struct controller *ctrl,void __iomem *smbios_start,void __iomem *smbios_table)
@@ -335,6 +336,7 @@ static int ctrl_slot_setup(struct controller *ctrl,u8 slot_number;u8 ctrl_slot;u32 tempdword; +char name[SLOT_NAME_SIZE ];void __iomem *slot_entry=NULL ;int result = -ENOMEM ;
@@ -363,10 +365,6 @@ static int ctrl_slot_setup(struct controller *ctrl,if (!hotplug_slot->info) goto error_hpslot; hotplug_slot_info = hotplug_slot->info; - hotplug_slot->name =kmalloc (SLOT_NAME_SIZE ,GFP_KERNEL ); - -if (!hotplug_slot->name) - goto error_info; slot->ctrl = ctrl; slot->bus = ctrl->bus;
@@ -418,8 +416,9 @@ static int ctrl_slot_setup(struct controller *ctrl,/* register this slot with the hotplug pci core */ hotplug_slot->release = &release_slot; hotplug_slot->private = slot; -make_slot_name (hotplug_slot->name,SLOT_NAME_SIZE , slot); hotplug_slot->ops = &cpqphp_hotplug_slot_ops; + +scnprintf (name,SLOT_NAME_SIZE ,"%d" , slot->number); hotplug_slot_info->power_status =get_slot_enabled (ctrl, slot); hotplug_slot_info->attention_status =
@@ -437,10 +436,10 @@ static int ctrl_slot_setup(struct controller *ctrl, result =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, slot->device, - hotplug_slot->name); + name);if (result) {err ("pci_hp_register failed with error %d\n" , result); - goto error_name; + goto error_info; } slot->next = ctrl->slot;
@@ -452,8 +451,6 @@ static int ctrl_slot_setup(struct controller *ctrl, }return 0 ; -error_name: -kfree (hotplug_slot->name); error_info:kfree (hotplug_slot_info); error_hpslot:
@@ -639,7 +636,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)u8 device;u8 function; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));if (cpqhp_get_bus_dev (ctrl, &bus, &devfn, slot->number) ==-1 )return -ENODEV ;
@@ -666,7 +663,7 @@ static int process_SI(struct hotplug_slot *hotplug_slot)u8 device;u8 function; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));if (cpqhp_get_bus_dev (ctrl, &bus, &devfn, slot->number) ==-1 )return -ENODEV ;
@@ -698,7 +695,7 @@ static int process_SS(struct hotplug_slot *hotplug_slot)u8 device;u8 function; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));if (cpqhp_get_bus_dev (ctrl, &bus, &devfn, slot->number) ==-1 )return -ENODEV ;
@@ -721,7 +718,7 @@ static int hardware_test(struct hotplug_slot *hotplug_slot, u32 value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return cpqhp_hardware_test (ctrl, value); }
@@ -732,7 +729,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =get_slot_enabled (ctrl, slot);return 0 ;
@@ -743,7 +740,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =cpq_get_attention_status (ctrl, slot);return 0 ;
@@ -754,7 +751,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =cpq_get_latch_status (ctrl, slot);
@@ -766,7 +763,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value =get_presence_status (ctrl, slot);
@@ -778,7 +775,7 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value = ctrl->speed_capability;
@@ -790,7 +787,7 @@ static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot = hotplug_slot->private;struct controller *ctrl = slot->ctrl; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); *value = ctrl->speed;
Re: [PATCH v2 06/13] PCI: cpqphp: stop managing hotplug_slot->name
drivers/pci/hotplug/cpqphp.h static inline int get_presence_status(struct controller *ctrl, struct slot *slot
Quoted 7 lines · Alex Chiang
drivers/pci/hotplug/cpqphp.h +2
-4-static inline void make_slot_name (char *buffer,int buffer_size,struct slot *slot) -{ -snprintf (buffer, buffer_size,"%d" , slot->number); -} + +scnprintf (name,SLOT_NAME_SIZE ,"%d" , slot->number);
So ... we're using %d here and %u in acpiphp. Obviously we don't expect to get a number above 2 billion, but I think if we do have some utterly bogus firmware that gives us a number above 2 billion, printing a positive number is a better user experience than a negative number.
We clearly have a common pattern here where hotplug drivers have a number insteaqd of a name (I would venture this is the most common). Maybe we need a common helper? I think this is a subject for the long-term todo list, not something that needs to be addressed in the context of this patch series.
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Re: [PATCH v2 06/13] PCI: cpqphp: stop managing hotplug_slot->name
* Matthew Wilcox <[email protected]>:
Quoted 6 lines · Alex Chiang
Quoted 4 lines
drivers/pci/hotplug/cpqphp.h +0
-4-static inline void make_slot_name (char *buffer,int buffer_size,struct slot *slot) -{ -snprintf (buffer, buffer_size,"%d" , slot->number); -}
Quoted 7 lines
drivers/pci/hotplug/cpqphp_core.c static int ctrl_slot_setup(struct controller *ctrl, · line 421
Quoted 2 lines
drivers/pci/hotplug/cpqphp_core.c +2
-0+ +scnprintf (name,SLOT_NAME_SIZE ,"%d" , slot->number);So ... we're using %d here and %u in acpiphp. Obviously we don't expect to get a number above 2 billion, but I think if we do have some utterly bogus firmware that gives us a number above 2 billion, printing a positive number is a better user experience than a negative number.
Well, on some HP machines, a slot number >2 billion actually does make sense, if you convert it to hex, and then consider that to be some sort of encoding for topology.
But your point here stands, I can change this driver to a %u.
Quoted 5 lines
We clearly have a common pattern here where hotplug drivers have a number insteaqd of a name (I would venture this is the most common). Maybe we need a common helper? I think this is a subject for the long-term todo list, not something that needs to be addressed in the context of this patch series.
Yeah, ok -- long term todo. ;)
/ac
PATCH v2 7/13 PCI: fakephp: remove 'name' parameter
In reply to Alex ChiangRemove 'name' from fakephp's struct dummy_slot, as the PCI core will now manage our slot name for us.
---
drivers/pci/hotplug/fakephp.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-)
drivers/pci/hotplug/fakephp.c +10 -9
@@ -66,7 +66,6 @@ struct dummy_slot {struct pci_dev *dev;struct work_struct remove_work;unsigned long removed; -char name[8 ]; };static int debug;
@@ -96,10 +95,13 @@ static void dummy_release(struct hotplug_slot *slot)kfree (dslot); } +#define SLOT_NAME_SIZE 8 +static int add_slot (struct pci_dev *dev) {struct dummy_slot *dslot;struct hotplug_slot *slot; +char name[SLOT_NAME_SIZE ];int retval = -ENOMEM ;static int count =1 ;
@@ -119,15 +121,13 @@ static int add_slot(struct pci_dev *dev)if (!dslot) goto error_info; - slot->name = dslot->name; -snprintf (slot->name,sizeof (dslot->name),"fake%d" , count++); -dbg ("slot->name = %s\n" , slot->name); +scnprintf (name,SLOT_NAME_SIZE ,"fake%d" , count++); +dbg ("slot->name = %s\n" , name); slot->ops = &dummy_hotplug_slot_ops; slot->release = &dummy_release; slot->private = dslot; - retval =pci_hp_register (slot, dev->bus,PCI_SLOT (dev->devfn), - slot->name); + retval =pci_hp_register (slot, dev->bus,PCI_SLOT (dev->devfn), name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); goto error_dslot;
@@ -168,10 +168,11 @@ static void remove_slot(struct dummy_slot *dslot) {int retval; -dbg ("removing slot %s\n" , dslot->slot->name); +dbg ("removing slot %s\n" ,hotplug_slot_name (dslot->slot)); retval =pci_hp_deregister (dslot->slot);if (retval) -err ("Problem unregistering a slot %s\n" , dslot->slot->name); +err ("Problem unregistering a slot %s\n" , +hotplug_slot_name (dslot->slot)); }/* called from the single-threaded workqueue handler to remove a slot */
@@ -309,7 +310,7 @@ static int disable_slot(struct hotplug_slot *slot)return -ENODEV ; dslot = slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (slot));for (func =7 ; func >=0 ; func--) { dev =pci_get_slot (dslot->dev->bus, dslot->dev->devfn + func);
PATCH v2 8/13 PCI: ibmphp: stop managing hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
Now, we simply advise the PCI core of the name that we would like, and let the core take care of the rest.
Additionally, slightly rearrange the members of struct slot so they are naturally aligned to eliminate holes.
---
drivers/pci/hotplug/ibmphp.h | 5 ++--- drivers/pci/hotplug/ibmphp_ebda.c | 20 +++++++------------- 2 files changed, 9 insertions(+), 16 deletions(-)
drivers/pci/hotplug/ibmphp.h +2 -3
@@ -707,17 +707,16 @@ struct slot {u8 device;u8 number;u8 real_physical_slot_num; -char name[100 ];u32 capabilities;u8 supported_speed;u8 supported_bus_mode; +u8 flag;/* this is for disable slot and polling */ +u8 ctlr_index;struct hotplug_slot *hotplug_slot;struct controller *ctrl;struct pci_func *func;u8 irq[4 ]; -u8 flag;/* this is for disable slot and polling */ int bit_mode;/* 0 = 32, 1 = 64 */ -u8 ctlr_index;struct bus_info *bus_on;struct list_head ibm_slot_list;u8 status;
drivers/pci/hotplug/ibmphp_ebda.c +7 -13
@@ -587,11 +587,14 @@ static u8 calculate_first_slot (u8 slot_num)return first_slot +1 ; } + +#define SLOT_NAME_SIZE 30 +static char *create_file_name (struct slot * slot_cur) {struct opt_rio *opt_vg_ptr =NULL ;struct opt_rio_lo *opt_lo_ptr =NULL ; -static char str[30 ]; +static char str[SLOT_NAME_SIZE ];int which =0 ;/* rxe = 1, chassis = 0 */ u8 number =1 ;/* either chassis or rxe # */ u8 first_slot =1 ;
@@ -703,7 +706,6 @@ static void release_slot(struct hotplug_slot *hotplug_slot) slot = hotplug_slot->private;kfree (slot->hotplug_slot->info); -kfree (slot->hotplug_slot->name);kfree (slot->hotplug_slot); slot->ctrl =NULL ; slot->bus_on =NULL ;
@@ -734,6 +736,7 @@ static int __init ebda_rsrc_controller (void)struct bus_info *bus_info_ptr1, *bus_info_ptr2;int rc;struct slot *tmp_slot; +char name[SLOT_NAME_SIZE ]; addr = hpc_list_ptr->phys_addr;for (ctlr =0 ; ctlr < hpc_list_ptr->num_ctlrs; ctlr++) {
@@ -897,12 +900,6 @@ static int __init ebda_rsrc_controller (void) goto error_no_hp_info; } - hp_slot_ptr->name =kmalloc (30 ,GFP_KERNEL ); -if (!hp_slot_ptr->name) { - rc = -ENOMEM ; - goto error_no_hp_name; - } - tmp_slot =kzalloc (sizeof (*tmp_slot),GFP_KERNEL );if (!tmp_slot) { rc = -ENOMEM ;
@@ -964,10 +961,9 @@ static int __init ebda_rsrc_controller (void) }/* each hpc */ list_for_each_entry (tmp_slot, &ibmphp_slot_head, ibm_slot_list) { -snprintf (tmp_slot->hotplug_slot->name,30 ,"%s" ,create_file_name (tmp_slot)); +snprintf (name,SLOT_NAME_SIZE ,"%s" ,create_file_name (tmp_slot));pci_hp_register (tmp_slot->hotplug_slot, -pci_find_bus (0 , tmp_slot->bus), tmp_slot->device, - tmp_slot->hotplug_slot->name); +pci_find_bus (0 , tmp_slot->bus), tmp_slot->device, name); }print_ebda_hpc ();
@@ -977,8 +973,6 @@ static int __init ebda_rsrc_controller (void) error:kfree (hp_slot_ptr->private); error_no_slot: -kfree (hp_slot_ptr->name); -error_no_hp_name:kfree (hp_slot_ptr->info); error_no_hp_info:kfree (hp_slot_ptr);
PATCH v2 9/13 PCI: pciehp: remove 'name' parameter
In reply to Alex ChiangWe do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Remove 'name' from pciehp's version of struct slot, and remove unused 'task_list' as well.
---
drivers/pci/hotplug/pciehp.h | 9 +++++-- drivers/pci/hotplug/pciehp_core.c | 25 ++++++++++--------- drivers/pci/hotplug/pciehp_ctrl.c | 48 +++++++++++++++++++------------------ 3 files changed, 43 insertions(+), 39 deletions(-)
drivers/pci/hotplug/pciehp.h +6 -3
@@ -61,15 +61,13 @@ extern struct workqueue_struct *pciehp_wq;struct slot {u8 bus;u8 device; -u32 number;u8 state; -struct timer_list task_event;u8 hp_slot; +u32 number;struct controller *ctrl;struct hpc_ops *hpc_ops;struct hotplug_slot *hotplug_slot;struct list_head slot_list; -char name[SLOT_NAME_SIZE ];unsigned long last_emi_toggle;struct delayed_work work;/* work for button event */ struct mutex lock;
@@ -162,6 +160,11 @@ int pciehp_enable_slot(struct slot *p_slot);int pciehp_disable_slot (struct slot *p_slot);int pcie_enable_notification (struct controller *ctrl); +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +static inline struct slot *pciehp_find_slot (struct controller *ctrl,u8 device) {struct slot *slot;
drivers/pci/hotplug/pciehp_core.c +13 -12
@@ -180,7 +180,7 @@ static struct hotplug_slot_attribute hotplug_slot_attr_lock = {*/ static void release_slot (struct hotplug_slot *hotplug_slot) { -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,hotplug_slot_name (hotplug_slot));kfree (hotplug_slot->info);kfree (hotplug_slot);
@@ -191,6 +191,7 @@ static int init_slots(struct controller *ctrl)struct slot *slot;struct hotplug_slot *hotplug_slot;struct hotplug_slot_info *info; +char name[SLOT_NAME_SIZE ];int retval = -ENOMEM ;list_for_each_entry (slot, &ctrl->slot_list, slot_list) {
@@ -204,7 +205,6 @@ static int init_slots(struct controller *ctrl)/* register this slot with the hotplug pci core */ hotplug_slot->info = info; - hotplug_slot->name = slot->name; hotplug_slot->private = slot; hotplug_slot->release = &release_slot; hotplug_slot->ops = &pciehp_hotplug_slot_ops;
@@ -213,6 +213,7 @@ static int init_slots(struct controller *ctrl)get_latch_status (hotplug_slot, &info->latch_status);get_adapter_status (hotplug_slot, &info->adapter_status); slot->hotplug_slot = hotplug_slot; +scnprintf (name,SLOT_NAME_SIZE ,"%d" , slot->number); dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x " "slot_device_offset=%x\n", slot->bus, slot->device,
@@ -220,7 +221,7 @@ static int init_slots(struct controller *ctrl) retval =pci_hp_register (hotplug_slot, ctrl->pci_dev->subordinate, slot->device, - slot->name); + name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); goto error_info;
@@ -265,7 +266,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); hotplug_slot->info->attention_status = status;
@@ -280,7 +281,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return pciehp_sysfs_enable_slot (slot); }
@@ -290,7 +291,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return pciehp_sysfs_disable_slot (slot); }
@@ -300,7 +301,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_power_status (slot, value);if (retval <0 )
@@ -314,7 +315,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_attention_status (slot, value);if (retval <0 )
@@ -328,7 +329,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_latch_status (slot, value);if (retval <0 )
@@ -342,7 +343,7 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_adapter_status (slot, value);if (retval <0 )
@@ -357,7 +358,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot,struct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_max_bus_speed (slot, value);if (retval <0 )
@@ -371,7 +372,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spestruct slot *slot = hotplug_slot->private;int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_cur_bus_speed (slot, value);if (retval <0 )
drivers/pci/hotplug/pciehp_ctrl.c +24 -24
172 lines not on this page · raw message
PATCH v2 10/13 PCI: rpaphp: stop managing hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
This means that alloc_slot_struct() no longer needs to take a 'name' param. On the other hand, we give rpaphp_register_slot() a 'name' param now to simplify the hotplug registration process. rpaphp_register_slot() can directly pass the drc_name to the PCI hotplug core.
---
drivers/pci/hotplug/rpaphp.h | 10 +++++++--- drivers/pci/hotplug/rpaphp_core.c | 6 +++--- drivers/pci/hotplug/rpaphp_pci.c | 4 ++-- drivers/pci/hotplug/rpaphp_slot.c | 26 +++++++++----------------- 4 files changed, 21 insertions(+), 25 deletions(-)
drivers/pci/hotplug/rpaphp.h +7 -3
@@ -73,13 +73,17 @@ struct slot {u32 index;u32 type;u32 power_domain; -char *name;struct device_node *dn;struct pci_bus *bus;struct list_head *pci_devs;struct hotplug_slot *hotplug_slot; }; +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops;extern struct list_head rpaphp_slot_head;
@@ -96,8 +100,8 @@ extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,/* rpaphp_slot.c */ extern void dealloc_slot_struct (struct slot *slot); -extern struct slot *alloc_slot_struct (struct device_node *dn,int drc_index,char *drc_name,int power_domain); -extern int rpaphp_register_slot (struct slot *slot); +extern struct slot *alloc_slot_struct (struct device_node *dn,int drc_index,int power_domain); +extern int rpaphp_register_slot (struct slot *slot,const char *name);extern int rpaphp_deregister_slot (struct slot *slot);#endif /* _PPC64PHP_H */
drivers/pci/hotplug/rpaphp_core.c +3 -3
@@ -324,7 +324,7 @@ int rpaphp_add_slot(struct device_node *dn) type = (char *) &types[1 ];for (i =0 ; i < indexes[0 ]; i++) { - slot =alloc_slot_struct (dn, indexes[i +1 ], name, power_domains[i +1 ]); + slot =alloc_slot_struct (dn, indexes[i +1 ], power_domains[i +1 ]);if (!slot)return -ENOMEM ;
@@ -335,7 +335,7 @@ int rpaphp_add_slot(struct device_node *dn) retval =rpaphp_enable_slot (slot);if (!retval) - retval =rpaphp_register_slot (slot); + retval =rpaphp_register_slot (slot, name);if (retval)dealloc_slot_struct (slot);
@@ -404,7 +404,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot) }else if (state ==EMPTY ) { slot->state =EMPTY ; }else { -err ("%s: slot[%s] is in invalid state\n" , __func__, slot->name); +err ("%s: slot[%s] is in invalid state\n" , __func__,slot_name (slot)); slot->state =NOT_VALID ;return -EINVAL ; }
drivers/pci/hotplug/rpaphp_pci.c +2 -2
@@ -51,7 +51,7 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state) &setlevel);if (rc <0 ) {dbg ("%s: power on slot[%s] failed rc=%d.\n" , - __func__, slot->name, rc); + __func__,slot_name (slot), rc); }else { rc =rtas_get_sensor (DR_ENTITY_SENSE , slot->index, state);
@@ -111,7 +111,7 @@ int rpaphp_enable_slot(struct slot *slot)/* non-empty slot has to have child */ if (!slot->dn->child) {err ("%s: slot[%s]'s device_node doesn't have child for adapter\n" , - __func__, slot->name); + __func__,slot_name (slot));return -EINVAL ; }
drivers/pci/hotplug/rpaphp_slot.c +9 -17
@@ -43,13 +43,12 @@ static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)void dealloc_slot_struct (struct slot *slot) {kfree (slot->hotplug_slot->info); -kfree (slot->hotplug_slot->name);kfree (slot->hotplug_slot);kfree (slot); }struct slot *alloc_slot_struct (struct device_node *dn, -int drc_index,char *drc_name,int power_domain) +int drc_index,int power_domain) {struct slot *slot;
@@ -63,11 +62,6 @@ struct slot *alloc_slot_struct(struct device_node *dn, GFP_KERNEL);if (!slot->hotplug_slot->info) goto error_hpslot; - slot->hotplug_slot->name =kmalloc (strlen (drc_name) +1 ,GFP_KERNEL ); -if (!slot->hotplug_slot->name) - goto error_info; - slot->name = slot->hotplug_slot->name; -strcpy (slot->name, drc_name); slot->dn = dn; slot->index = drc_index; slot->power_domain = power_domain;
@@ -77,8 +71,6 @@ struct slot *alloc_slot_struct(struct device_node *dn,return (slot); -error_info: -kfree (slot->hotplug_slot->info); error_hpslot:kfree (slot->hotplug_slot); error_slot:
@@ -92,7 +84,7 @@ static int is_registered(struct slot *slot)struct slot *tmp_slot;list_for_each_entry (tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) { -if (!strcmp (tmp_slot->name, slot->name)) +if (!strcmp (slot_name (tmp_slot),slot_name (slot)))return 1 ; }return 0 ;
@@ -104,32 +96,32 @@ int rpaphp_deregister_slot(struct slot *slot)struct hotplug_slot *php_slot = slot->hotplug_slot;dbg ("%s - Entry: deregistering slot=%s\n" , - __func__, slot->name); + __func__,slot_name (slot));list_del (&slot->rpaphp_slot_list); retval =pci_hp_deregister (php_slot);if (retval) -err ("Problem unregistering a slot %s\n" , slot->name); +err ("Problem unregistering a slot %s\n" ,slot_name (slot));dbg ("%s - Exit: rc[%d]\n" , __func__, retval);return retval; }EXPORT_SYMBOL_GPL (rpaphp_deregister_slot); -int rpaphp_register_slot (struct slot *slot) +int rpaphp_register_slot (struct slot *slot,const char *name) {struct hotplug_slot *php_slot = slot->hotplug_slot;int retval;int slotno;dbg ("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n" , - __func__, slot->dn->full_name, slot->index, slot->name, + __func__, slot->dn->full_name, slot->index,slot_name (slot), slot->power_domain, slot->type);/* should not try to register the same slot twice */ if (is_registered (slot)) { -err ("rpaphp_register_slot: slot[%s] is already registered\n" , slot->name); +err ("rpaphp_register_slot: slot[%s] is already registered\n" ,slot_name (slot));return -EAGAIN ; }
@@ -137,7 +129,7 @@ int rpaphp_register_slot(struct slot *slot) slotno =PCI_SLOT (PCI_DN (slot->dn->child)->devfn); else slotno =-1 ; - retval =pci_hp_register (php_slot, slot->bus, slotno, slot->name); + retval =pci_hp_register (php_slot, slot->bus, slotno, name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval);return retval;
@@ -145,7 +137,7 @@ int rpaphp_register_slot(struct slot *slot)/* add slot to our internal list */ list_add (&slot->rpaphp_slot_list, &rpaphp_slot_head); -info ("Slot [%s] registered\n" , slot->name); +info ("Slot [%s] registered\n" , name);return 0 ; }
PATCH v2 11/13 PCI: SGI Hotplug: stop managing bss_hotplug_slot->name
In reply to Alex ChiangWe no longer need to manage our version of hotplug_slot->name since the PCI and hotplug core manage it on our behalf.
Update the sn_hp_slot_private_alloc() interface to fill in the correct name for us, as that function already has all the parameters needed to determine the name.
---
drivers/pci/hotplug/sgi_hotplug.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-)
drivers/pci/hotplug/sgi_hotplug.c +6 -13
@@ -161,7 +161,8 @@ static int sn_pci_bus_valid(struct pci_bus *pci_bus) }static int sn_hp_slot_private_alloc (struct hotplug_slot *bss_hotplug_slot, -struct pci_bus *pci_bus,int device) +struct pci_bus *pci_bus,int device, +char *name) {struct pcibus_info *pcibus_info;struct slot *slot;
@@ -173,15 +174,9 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,return -ENOMEM ; bss_hotplug_slot->private = slot; - bss_hotplug_slot->name =kmalloc (SN_SLOT_NAME_SIZE ,GFP_KERNEL ); -if (!bss_hotplug_slot->name) { -kfree (bss_hotplug_slot->private); -return -ENOMEM ; - } - slot->device_num = device; slot->pci_bus = pci_bus; -sprintf (bss_hotplug_slot->name,"%04x:%02x:%02x" , +sprintf (name,"%04x:%02x:%02x" ,pci_domain_nr (pci_bus), ((u16 )pcibus_info->pbi_buscommon.bs_persist_busnum), device +1 );
@@ -608,7 +603,6 @@ static inline int get_power_status(struct hotplug_slot *bss_hotplug_slot,static void sn_release_slot (struct hotplug_slot *bss_hotplug_slot) {kfree (bss_hotplug_slot->info); -kfree (bss_hotplug_slot->name);kfree (bss_hotplug_slot->private);kfree (bss_hotplug_slot); }
@@ -618,6 +612,7 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus)int device;struct pci_slot *pci_slot;struct hotplug_slot *bss_hotplug_slot; +char name[SN_SLOT_NAME_SIZE ];int rc =0 ;/*
@@ -645,16 +640,14 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) }if (sn_hp_slot_private_alloc (bss_hotplug_slot, - pci_bus, device)) { + pci_bus, device, name)) { rc = -ENOMEM ; goto alloc_err; } - bss_hotplug_slot->ops = &sn_hotplug_slot_ops; bss_hotplug_slot->release = &sn_release_slot; - rc =pci_hp_register (bss_hotplug_slot, pci_bus, device, - bss_hotplug_slot->name); + rc =pci_hp_register (bss_hotplug_slot, pci_bus, device, name);if (rc) goto register_err;
PATCH v2 12/13 PCI: shcphp: remove 'name' parameter
In reply to Alex ChiangWe do not need to manage our own name parameter, especially since the PCI core can change it on our behalf, in the case of duplicate slot names.
Remove 'name' from shpchp's version of struct slot.
This change also removes the unused struct task_event from the slot structure.
---
drivers/pci/hotplug/pciehp_hpc.c | 1 - drivers/pci/hotplug/shpchp.h | 9 +++++-- drivers/pci/hotplug/shpchp_core.c | 28 ++++++++++------------ drivers/pci/hotplug/shpchp_ctrl.c | 48 +++++++++++++++++++------------------ 4 files changed, 43 insertions(+), 43 deletions(-)
drivers/pci/hotplug/pciehp_hpc.c +0 -1
@@ -1044,7 +1044,6 @@ static int pcie_init_slot(struct controller *ctrl) slot->device = ctrl->slot_device_offset + slot->hp_slot; slot->hpc_ops = ctrl->hpc_ops; slot->number = ctrl->first_slot; -snprintf (slot->name,SLOT_NAME_SIZE ,"%d" , slot->number);mutex_init (&slot->lock);INIT_DELAYED_WORK (&slot->work, pciehp_queue_pushbutton_work);list_add (&slot->slot_list, &ctrl->slot_list);
drivers/pci/hotplug/shpchp.h +6 -3
@@ -69,15 +69,13 @@ struct slot {u8 state;u8 presence_save;u8 pwr_save; -struct timer_list task_event; -u8 hp_slot;struct controller *ctrl;struct hpc_ops *hpc_ops;struct hotplug_slot *hotplug_slot;struct list_head slot_list; -char name[SLOT_NAME_SIZE ];struct delayed_work work;/* work for button event */ struct mutex lock; +u8 hp_slot; };struct event_info {
@@ -169,6 +167,11 @@ extern void cleanup_slots(struct controller *ctrl);extern void shpchp_queue_pushbutton_work (struct work_struct *work);extern int shpc_init (struct controller *ctrl,struct pci_dev *pdev); +static inline const char *slot_name (struct slot *slot) +{ +return hotplug_slot_name (slot->hotplug_slot); +} +#ifdef CONFIG_ACPI #include <linux/pci-acpi.h> static inline int get_hp_params_from_firmware(struct pci_dev *dev,
drivers/pci/hotplug/shpchp_core.c +13 -15
@@ -89,7 +89,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) {struct slot *slot = hotplug_slot->private; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));kfree (slot->hotplug_slot->info);kfree (slot->hotplug_slot);
@@ -101,6 +101,7 @@ static int init_slots(struct controller *ctrl)struct slot *slot;struct hotplug_slot *hotplug_slot;struct hotplug_slot_info *info; +char name[SLOT_NAME_SIZE ];int retval = -ENOMEM ;int i;
@@ -119,8 +120,6 @@ static int init_slots(struct controller *ctrl) goto error_hpslot; hotplug_slot->info = info; - hotplug_slot->name = slot->name; - slot->hp_slot = i; slot->ctrl = ctrl; slot->bus = ctrl->pci_dev->subordinate->number;
@@ -133,7 +132,7 @@ static int init_slots(struct controller *ctrl)/* register this slot with the hotplug pci core */ hotplug_slot->private = slot; hotplug_slot->release = &release_slot; -snprintf (slot->name,SLOT_NAME_SIZE ,"%d" , slot->number); +snprintf (name,SLOT_NAME_SIZE ,"%d" , slot->number); hotplug_slot->ops = &shpchp_hotplug_slot_ops;get_power_status (hotplug_slot, &info->power_status);
@@ -145,8 +144,7 @@ static int init_slots(struct controller *ctrl)"slot_device_offset=%x\n" , slot->bus, slot->device, slot->hp_slot, slot->number, ctrl->slot_device_offset); retval =pci_hp_register (slot->hotplug_slot, - ctrl->pci_dev->subordinate, slot->device, - hotplug_slot->name); + ctrl->pci_dev->subordinate, slot->device, name);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); goto error_info;
@@ -189,7 +187,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status) {struct slot *slot =get_slot (hotplug_slot); -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); hotplug_slot->info->attention_status = status; slot->hpc_ops->set_attention_status (slot, status);
@@ -201,7 +199,7 @@ static int enable_slot (struct hotplug_slot *hotplug_slot) {struct slot *slot =get_slot (hotplug_slot); -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return shpchp_sysfs_enable_slot (slot); }
@@ -210,7 +208,7 @@ static int disable_slot (struct hotplug_slot *hotplug_slot) {struct slot *slot =get_slot (hotplug_slot); -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot));return shpchp_sysfs_disable_slot (slot); }
@@ -220,7 +218,7 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_power_status (slot, value);if (retval <0 )
@@ -234,7 +232,7 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_attention_status (slot, value);if (retval <0 )
@@ -248,7 +246,7 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_latch_status (slot, value);if (retval <0 )
@@ -262,7 +260,7 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_adapter_status (slot, value);if (retval <0 )
@@ -277,7 +275,7 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot,struct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_max_bus_speed (slot, value);if (retval <0 )
@@ -291,7 +289,7 @@ static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_spstruct slot *slot =get_slot (hotplug_slot);int retval; -dbg ("%s - physical_slot = %s\n" , __func__, hotplug_slot->name); +dbg ("%s - physical_slot = %s\n" , __func__,slot_name (slot)); retval = slot->hpc_ops->get_cur_bus_speed (slot, value);if (retval <0 )
drivers/pci/hotplug/shpchp_ctrl.c +24 -24
166 lines not on this page · raw message
PATCH v2 13/13 PCI: Hotplug core: remove 'name'
In reply to Alex ChiangNow that the PCI core manages the 'name' for each individual hotplug driver, and all drivers have been converted to use hotplug_slot_name(), there is no need for the PCI hotplug core to drag around its own copy of name either.
---
drivers/pci/hotplug/pci_hotplug_core.c | 6 +++--- include/linux/pci_hotplug.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/pci/hotplug/pci_hotplug_core.c +3 -3
@@ -533,7 +533,7 @@ static struct hotplug_slot *get_slot_from_name (const char *name)spin_lock (&pci_hotplug_slot_list_lock); list_for_each (tmp, &pci_hotplug_slot_list) { slot = list_entry (tmp, struct hotplug_slot, slot_list); -if (strcmp (slot->name, name) ==0 ) +if (strcmp (hotplug_slot_name (slot), name) ==0 ) goto out; } slot =NULL ;
@@ -640,7 +640,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)if (!hotplug)return -ENODEV ; - temp =get_slot_from_name (hotplug->name); + temp =get_slot_from_name (hotplug_slot_name (hotplug));if (temp != hotplug)return -ENODEV ;
@@ -650,7 +650,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug) slot = hotplug->pci_slot;fs_remove_slot (slot); -dbg ("Removed slot %s from the list\n" , hotplug->name); +dbg ("Removed slot %s from the list\n" ,hotplug_slot_name (hotplug)); hotplug->release (hotplug); slot->hotplug =NULL ;
include/linux/pci_hotplug.h +0 -3
@@ -142,8 +142,6 @@ struct hotplug_slot_info {/** * struct hotplug_slot - used to register a physical slot with the hotplug pci core -* @name: the name of the slot being registered. This string must -* be unique amoung slots registered on this system. * @ops: pointer to the &struct hotplug_slot_ops to be used for this slot * @info: pointer to the &struct hotplug_slot_info for the initial values for * this slot.
@@ -153,7 +151,6 @@ struct hotplug_slot_info {* needs. */ struct hotplug_slot { -char *name;struct hotplug_slot_ops *ops;struct hotplug_slot_info *info;void (*release) (struct hotplug_slot *slot);