2018-01-27 04:22:04 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* Standard Hot Plug Controller Driver
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1995,2001 Compaq Computer Corporation
|
|
|
|
|
* Copyright (C) 2001 Greg Kroah-Hartman (greg@kroah.com)
|
|
|
|
|
* Copyright (C) 2001 IBM Corp.
|
|
|
|
|
* Copyright (C) 2003-2004 Intel Corporation
|
|
|
|
|
*
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
2005-08-17 06:16:10 +08:00
|
|
|
* Send feedback to <greg@kroah.com>, <kristen.c.accardi@intel.com>
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/moduleparam.h>
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
#include <linux/types.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/pci.h>
|
|
|
|
|
#include "shpchp.h"
|
|
|
|
|
|
|
|
|
|
/* Global variables */
|
2012-01-13 07:02:20 +08:00
|
|
|
bool shpchp_debug;
|
|
|
|
|
bool shpchp_poll_mode;
|
2005-04-17 06:20:36 +08:00
|
|
|
int shpchp_poll_time;
|
|
|
|
|
|
|
|
|
|
#define DRIVER_VERSION "0.4"
|
|
|
|
|
#define DRIVER_AUTHOR "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
|
|
|
|
|
#define DRIVER_DESC "Standard Hot Plug PCI Controller Driver"
|
|
|
|
|
|
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
|
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
|
|
|
|
module_param(shpchp_debug, bool, 0644);
|
|
|
|
|
module_param(shpchp_poll_mode, bool, 0644);
|
|
|
|
|
module_param(shpchp_poll_time, int, 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");
|
|
|
|
|
|
|
|
|
|
#define SHPC_MODULE_NAME "shpchp"
|
|
|
|
|
|
2015-12-28 05:21:11 +08:00
|
|
|
static int set_attention_status(struct hotplug_slot *slot, u8 value);
|
|
|
|
|
static int enable_slot(struct hotplug_slot *slot);
|
|
|
|
|
static int disable_slot(struct hotplug_slot *slot);
|
|
|
|
|
static int get_power_status(struct hotplug_slot *slot, u8 *value);
|
|
|
|
|
static int get_attention_status(struct hotplug_slot *slot, u8 *value);
|
|
|
|
|
static int get_latch_status(struct hotplug_slot *slot, u8 *value);
|
|
|
|
|
static int get_adapter_status(struct hotplug_slot *slot, u8 *value);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2018-09-08 15:59:01 +08:00
|
|
|
static const struct hotplug_slot_ops shpchp_hotplug_slot_ops = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.set_attention_status = set_attention_status,
|
|
|
|
|
.enable_slot = enable_slot,
|
|
|
|
|
.disable_slot = disable_slot,
|
|
|
|
|
.get_power_status = get_power_status,
|
|
|
|
|
.get_attention_status = get_attention_status,
|
|
|
|
|
.get_latch_status = get_latch_status,
|
|
|
|
|
.get_adapter_status = get_adapter_status,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int init_slots(struct controller *ctrl)
|
|
|
|
|
{
|
2006-01-26 08:55:35 +08:00
|
|
|
struct slot *slot;
|
|
|
|
|
struct hotplug_slot *hotplug_slot;
|
2008-10-21 07:41:53 +08:00
|
|
|
char name[SLOT_NAME_SIZE];
|
2012-07-16 23:25:56 +08:00
|
|
|
int retval;
|
2008-10-21 07:41:02 +08:00
|
|
|
int i;
|
2006-01-26 08:55:35 +08:00
|
|
|
|
|
|
|
|
for (i = 0; i < ctrl->num_slots; i++) {
|
2006-01-26 09:02:41 +08:00
|
|
|
slot = kzalloc(sizeof(*slot), GFP_KERNEL);
|
2012-07-16 23:25:56 +08:00
|
|
|
if (!slot) {
|
|
|
|
|
retval = -ENOMEM;
|
2005-04-17 06:20:36 +08:00
|
|
|
goto error;
|
2012-07-16 23:25:56 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-01-26 09:02:41 +08:00
|
|
|
hotplug_slot = kzalloc(sizeof(*hotplug_slot), GFP_KERNEL);
|
2012-07-16 23:25:56 +08:00
|
|
|
if (!hotplug_slot) {
|
|
|
|
|
retval = -ENOMEM;
|
2005-04-17 06:20:36 +08:00
|
|
|
goto error_slot;
|
2012-07-16 23:25:56 +08:00
|
|
|
}
|
2006-01-26 08:55:35 +08:00
|
|
|
slot->hotplug_slot = hotplug_slot;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-01-26 08:55:35 +08:00
|
|
|
slot->hp_slot = i;
|
|
|
|
|
slot->ctrl = ctrl;
|
2006-12-17 07:25:42 +08:00
|
|
|
slot->bus = ctrl->pci_dev->subordinate->number;
|
2006-01-26 08:55:35 +08:00
|
|
|
slot->device = ctrl->slot_device_offset + i;
|
|
|
|
|
slot->hpc_ops = ctrl->hpc_ops;
|
2006-12-17 07:25:49 +08:00
|
|
|
slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);
|
2013-01-12 03:21:15 +08:00
|
|
|
|
2013-07-04 06:04:57 +08:00
|
|
|
slot->wq = alloc_workqueue("shpchp-%d", 0, 0, slot->number);
|
2013-01-12 03:21:15 +08:00
|
|
|
if (!slot->wq) {
|
|
|
|
|
retval = -ENOMEM;
|
PCI: hotplug: Drop hotplug_slot_info
Ever since the PCI hotplug core was introduced in 2002, drivers had to
allocate and register a struct hotplug_slot_info for every slot:
https://git.kernel.org/tglx/history/c/a8a2069f432c
Apparently the idea was that drivers furnish the hotplug core with an
up-to-date card presence status, power status, latch status and
attention indicator status as well as notify the hotplug core of changes
thereof. However only 4 out of 12 hotplug drivers bother to notify the
hotplug core with pci_hp_change_slot_info() and the hotplug core never
made any use of the information: There is just a single macro in
pci_hotplug_core.c, GET_STATUS(), which uses the hotplug_slot_info if
the driver lacks the corresponding callback in hotplug_slot_ops. The
macro is called when the user reads the attribute via sysfs.
Now, if the callback isn't defined, the attribute isn't exposed in sysfs
in the first place (see e.g. has_power_file()). There are only two
situations when the hotplug_slot_info would actually be accessed:
* If the driver defines ->enable_slot or ->disable_slot but not
->get_power_status.
* If the driver defines ->set_attention_status but not
->get_attention_status.
There is no driver doing the former and just a single driver doing the
latter, namely pnv_php.c. Amend it with a ->get_attention_status
callback. With that, the hotplug_slot_info becomes completely unused by
the PCI hotplug core. But a few drivers use it internally as a cache:
cpcihp uses it to cache the latch_status and adapter_status.
cpqhp uses it to cache the adapter_status.
pnv_php and rpaphp use it to cache the attention_status.
shpchp uses it to cache all four values.
Amend these drivers to cache the information in their private slot
struct. shpchp's slot struct already contains members to cache the
power_status and adapter_status, so additional members are only needed
for the other two values. In the case of cpqphp, the cached value is
only accessed in a single place, so instead of caching it, read the
current value from the hardware.
Caution: acpiphp, cpci, cpqhp, shpchp, asus-wmi and eeepc-laptop
populate the hotplug_slot_info with initial values on probe. That code
is herewith removed. There is a theoretical chance that the code has
side effects without which the driver fails to function, e.g. if the
ACPI method to read the adapter status needs to be executed at least
once on probe. That seems unlikely to me, still maintainers should
review the changes carefully for this possibility.
Rafael adds: "I'm not aware of any case in which it will break anything,
[...] but if that happens, it may be necessary to add the execution of
the control methods in question directly to the initialization part."
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> # drivers/pci/hotplug/rpa*
Acked-by: Sebastian Ott <sebott@linux.ibm.com> # drivers/pci/hotplug/s390*
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> # drivers/platform/x86
Cc: Len Brown <lenb@kernel.org>
Cc: Scott Murray <scott@spiteful.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Oliver OHalloran <oliveroh@au1.ibm.com>
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
2018-09-08 15:59:01 +08:00
|
|
|
goto error_hpslot;
|
2013-01-12 03:21:15 +08:00
|
|
|
}
|
|
|
|
|
|
2006-02-22 07:45:48 +08:00
|
|
|
mutex_init(&slot->lock);
|
2007-03-22 02:45:31 +08:00
|
|
|
INIT_DELAYED_WORK(&slot->work, shpchp_queue_pushbutton_work);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
/* register this slot with the hotplug pci core */
|
2006-01-26 08:55:35 +08:00
|
|
|
hotplug_slot->private = slot;
|
2008-10-21 07:41:53 +08:00
|
|
|
snprintf(name, SLOT_NAME_SIZE, "%d", slot->number);
|
2006-01-26 08:55:35 +08:00
|
|
|
hotplug_slot->ops = &shpchp_hotplug_slot_ops;
|
|
|
|
|
|
2014-04-19 08:13:50 +08:00
|
|
|
ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x hp_slot=%x sun=%x slot_device_offset=%x\n",
|
2013-11-15 02:28:18 +08:00
|
|
|
pci_domain_nr(ctrl->pci_dev->subordinate),
|
|
|
|
|
slot->bus, slot->device, slot->hp_slot, slot->number,
|
|
|
|
|
ctrl->slot_device_offset);
|
2008-06-11 05:28:50 +08:00
|
|
|
retval = pci_hp_register(slot->hotplug_slot,
|
2008-10-21 07:41:53 +08:00
|
|
|
ctrl->pci_dev->subordinate, slot->device, name);
|
2006-01-26 08:55:35 +08:00
|
|
|
if (retval) {
|
2008-10-23 10:52:12 +08:00
|
|
|
ctrl_err(ctrl, "pci_hp_register failed with error %d\n",
|
|
|
|
|
retval);
|
2013-01-12 03:21:15 +08:00
|
|
|
goto error_slotwq;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
PCI: hotplug: Drop hotplug_slot_info
Ever since the PCI hotplug core was introduced in 2002, drivers had to
allocate and register a struct hotplug_slot_info for every slot:
https://git.kernel.org/tglx/history/c/a8a2069f432c
Apparently the idea was that drivers furnish the hotplug core with an
up-to-date card presence status, power status, latch status and
attention indicator status as well as notify the hotplug core of changes
thereof. However only 4 out of 12 hotplug drivers bother to notify the
hotplug core with pci_hp_change_slot_info() and the hotplug core never
made any use of the information: There is just a single macro in
pci_hotplug_core.c, GET_STATUS(), which uses the hotplug_slot_info if
the driver lacks the corresponding callback in hotplug_slot_ops. The
macro is called when the user reads the attribute via sysfs.
Now, if the callback isn't defined, the attribute isn't exposed in sysfs
in the first place (see e.g. has_power_file()). There are only two
situations when the hotplug_slot_info would actually be accessed:
* If the driver defines ->enable_slot or ->disable_slot but not
->get_power_status.
* If the driver defines ->set_attention_status but not
->get_attention_status.
There is no driver doing the former and just a single driver doing the
latter, namely pnv_php.c. Amend it with a ->get_attention_status
callback. With that, the hotplug_slot_info becomes completely unused by
the PCI hotplug core. But a few drivers use it internally as a cache:
cpcihp uses it to cache the latch_status and adapter_status.
cpqhp uses it to cache the adapter_status.
pnv_php and rpaphp use it to cache the attention_status.
shpchp uses it to cache all four values.
Amend these drivers to cache the information in their private slot
struct. shpchp's slot struct already contains members to cache the
power_status and adapter_status, so additional members are only needed
for the other two values. In the case of cpqphp, the cached value is
only accessed in a single place, so instead of caching it, read the
current value from the hardware.
Caution: acpiphp, cpci, cpqhp, shpchp, asus-wmi and eeepc-laptop
populate the hotplug_slot_info with initial values on probe. That code
is herewith removed. There is a theoretical chance that the code has
side effects without which the driver fails to function, e.g. if the
ACPI method to read the adapter status needs to be executed at least
once on probe. That seems unlikely to me, still maintainers should
review the changes carefully for this possibility.
Rafael adds: "I'm not aware of any case in which it will break anything,
[...] but if that happens, it may be necessary to add the execution of
the control methods in question directly to the initialization part."
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> # drivers/pci/hotplug/rpa*
Acked-by: Sebastian Ott <sebott@linux.ibm.com> # drivers/pci/hotplug/s390*
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> # drivers/platform/x86
Cc: Len Brown <lenb@kernel.org>
Cc: Scott Murray <scott@spiteful.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Oliver OHalloran <oliveroh@au1.ibm.com>
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
2018-09-08 15:59:01 +08:00
|
|
|
get_power_status(hotplug_slot, &slot->pwr_save);
|
|
|
|
|
get_attention_status(hotplug_slot, &slot->attention_save);
|
|
|
|
|
get_latch_status(hotplug_slot, &slot->latch_save);
|
|
|
|
|
get_adapter_status(hotplug_slot, &slot->presence_save);
|
2008-10-21 07:41:53 +08:00
|
|
|
|
2006-01-26 08:57:40 +08:00
|
|
|
list_add(&slot->slot_list, &ctrl->slot_list);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
2013-01-12 03:21:15 +08:00
|
|
|
error_slotwq:
|
|
|
|
|
destroy_workqueue(slot->wq);
|
2005-04-17 06:20:36 +08:00
|
|
|
error_hpslot:
|
2006-01-26 08:55:35 +08:00
|
|
|
kfree(hotplug_slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
error_slot:
|
2006-01-26 08:55:35 +08:00
|
|
|
kfree(slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
error:
|
2006-01-26 08:55:35 +08:00
|
|
|
return retval;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2006-02-22 07:45:45 +08:00
|
|
|
void cleanup_slots(struct controller *ctrl)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2015-12-12 21:36:57 +08:00
|
|
|
struct slot *slot, *next;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2015-12-12 21:36:57 +08:00
|
|
|
list_for_each_entry_safe(slot, next, &ctrl->slot_list, slot_list) {
|
2006-01-26 08:57:40 +08:00
|
|
|
list_del(&slot->slot_list);
|
2006-02-22 07:45:45 +08:00
|
|
|
cancel_delayed_work(&slot->work);
|
2013-01-12 03:21:15 +08:00
|
|
|
destroy_workqueue(slot->wq);
|
2006-01-26 08:57:40 +08:00
|
|
|
pci_hp_deregister(slot->hotplug_slot);
|
PCI: hotplug: Demidlayer registration with the core
When a hotplug driver calls pci_hp_register(), all steps necessary for
registration are carried out in one go, including creation of a kobject
and addition to sysfs. That's a problem for pciehp once it's converted
to enable/disable the slot exclusively from the IRQ thread: The thread
needs to be spawned after creation of the kobject (because it uses the
kobject's name), but before addition to sysfs (because it will handle
enable/disable requests submitted via sysfs).
pci_hp_deregister() does offer a ->release callback that's invoked
after deletion from sysfs and before destruction of the kobject. But
because pci_hp_register() doesn't offer a counterpart, hotplug drivers'
->probe and ->remove code becomes asymmetric, which is error prone
as recently discovered use-after-free bugs in pciehp's ->remove hook
have shown.
In a sense, this appears to be a case of the midlayer antipattern:
"The core thesis of the "midlayer mistake" is that midlayers are
bad and should not exist. That common functionality which it is
so tempting to put in a midlayer should instead be provided as
library routines which can [be] used, augmented, or ignored by
each bottom level driver independently. Thus every subsystem
that supports multiple implementations (or drivers) should
provide a very thin top layer which calls directly into the
bottom layer drivers, and a rich library of support code that
eases the implementation of those drivers. This library is
available to, but not forced upon, those drivers."
-- Neil Brown (2009), https://lwn.net/Articles/336262/
The presence of midlayer traits in the PCI hotplug core might be ascribed
to its age: When it was introduced in February 2002, the blessings of a
library approach might not have been well known:
https://git.kernel.org/tglx/history/c/a8a2069f432c
For comparison, the driver core does offer split functions for creating
a kobject (device_initialize()) and addition to sysfs (device_add()) as
an alternative to carrying out everything at once (device_register()).
This was introduced in October 2002:
https://git.kernel.org/tglx/history/c/8b290eb19962
The odd ->release callback in the PCI hotplug core was added in 2003:
https://git.kernel.org/tglx/history/c/69f8d663b595
Clearly, a library approach would not force every hotplug driver to
implement a ->release callback, but rather allow the driver to remove
the sysfs files, release its data structures and finally destroy the
kobject. Alternatively, a driver may choose to remove everything with
pci_hp_deregister(), then release its data structures.
To this end, offer drivers pci_hp_initialize() and pci_hp_add() as a
split-up version of pci_hp_register(). Likewise, offer pci_hp_del()
and pci_hp_destroy() as a split-up version of pci_hp_deregister().
Eliminate the ->release callback and move its code into each driver's
teardown routine.
Declare pci_hp_deregister() void, in keeping with the usual kernel
pattern that enablement can fail, but disablement cannot. It only
returned an error if the caller passed in a NULL pointer or a slot which
has never or is no longer registered or is sharing its name with another
slot. Those would be bugs, so WARN about them. Few hotplug drivers
actually checked the return value and those that did only printed a
useless error message to dmesg. Remove that.
For most drivers the conversion was straightforward since it doesn't
matter whether the code in the ->release callback is executed before or
after destruction of the kobject. But in the case of ibmphp, it was
unclear to me whether setting slot_cur->ctrl and slot_cur->bus_on to
NULL needs to happen before the kobject is destroyed, so I erred on
the side of caution and ensured that the order stays the same. Another
nontrivial case is pnv_php, I've found the list and kref logic difficult
to understand, however my impression was that it is safe to delete the
list element and drop the references until after the kobject is
destroyed.
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> # drivers/platform/x86
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Scott Murray <scott@spiteful.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Andy Shevchenko <andy@infradead.org>
2018-07-20 06:27:43 +08:00
|
|
|
kfree(slot->hotplug_slot);
|
|
|
|
|
kfree(slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* set_attention_status - Turns the Amber LED for a slot on, off or blink
|
|
|
|
|
*/
|
2015-12-28 05:21:11 +08:00
|
|
|
static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-12-17 07:25:57 +08:00
|
|
|
struct slot *slot = get_slot(hotplug_slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-10-23 10:54:39 +08:00
|
|
|
ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
|
2008-10-23 10:52:12 +08:00
|
|
|
__func__, slot_name(slot));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
PCI: hotplug: Drop hotplug_slot_info
Ever since the PCI hotplug core was introduced in 2002, drivers had to
allocate and register a struct hotplug_slot_info for every slot:
https://git.kernel.org/tglx/history/c/a8a2069f432c
Apparently the idea was that drivers furnish the hotplug core with an
up-to-date card presence status, power status, latch status and
attention indicator status as well as notify the hotplug core of changes
thereof. However only 4 out of 12 hotplug drivers bother to notify the
hotplug core with pci_hp_change_slot_info() and the hotplug core never
made any use of the information: There is just a single macro in
pci_hotplug_core.c, GET_STATUS(), which uses the hotplug_slot_info if
the driver lacks the corresponding callback in hotplug_slot_ops. The
macro is called when the user reads the attribute via sysfs.
Now, if the callback isn't defined, the attribute isn't exposed in sysfs
in the first place (see e.g. has_power_file()). There are only two
situations when the hotplug_slot_info would actually be accessed:
* If the driver defines ->enable_slot or ->disable_slot but not
->get_power_status.
* If the driver defines ->set_attention_status but not
->get_attention_status.
There is no driver doing the former and just a single driver doing the
latter, namely pnv_php.c. Amend it with a ->get_attention_status
callback. With that, the hotplug_slot_info becomes completely unused by
the PCI hotplug core. But a few drivers use it internally as a cache:
cpcihp uses it to cache the latch_status and adapter_status.
cpqhp uses it to cache the adapter_status.
pnv_php and rpaphp use it to cache the attention_status.
shpchp uses it to cache all four values.
Amend these drivers to cache the information in their private slot
struct. shpchp's slot struct already contains members to cache the
power_status and adapter_status, so additional members are only needed
for the other two values. In the case of cpqphp, the cached value is
only accessed in a single place, so instead of caching it, read the
current value from the hardware.
Caution: acpiphp, cpci, cpqhp, shpchp, asus-wmi and eeepc-laptop
populate the hotplug_slot_info with initial values on probe. That code
is herewith removed. There is a theoretical chance that the code has
side effects without which the driver fails to function, e.g. if the
ACPI method to read the adapter status needs to be executed at least
once on probe. That seems unlikely to me, still maintainers should
review the changes carefully for this possibility.
Rafael adds: "I'm not aware of any case in which it will break anything,
[...] but if that happens, it may be necessary to add the execution of
the control methods in question directly to the initialization part."
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> # drivers/pci/hotplug/rpa*
Acked-by: Sebastian Ott <sebott@linux.ibm.com> # drivers/pci/hotplug/s390*
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> # drivers/platform/x86
Cc: Len Brown <lenb@kernel.org>
Cc: Scott Murray <scott@spiteful.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Oliver OHalloran <oliveroh@au1.ibm.com>
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
2018-09-08 15:59:01 +08:00
|
|
|
slot->attention_save = status;
|
2005-04-17 06:20:36 +08:00
|
|
|
slot->hpc_ops->set_attention_status(slot, status);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-28 05:21:11 +08:00
|
|
|
static int enable_slot(struct hotplug_slot *hotplug_slot)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-12-17 07:25:57 +08:00
|
|
|
struct slot *slot = get_slot(hotplug_slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-10-23 10:54:39 +08:00
|
|
|
ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
|
2008-10-23 10:52:12 +08:00
|
|
|
__func__, slot_name(slot));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-02-22 07:45:48 +08:00
|
|
|
return shpchp_sysfs_enable_slot(slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2015-12-28 05:21:11 +08:00
|
|
|
static int disable_slot(struct hotplug_slot *hotplug_slot)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-12-17 07:25:57 +08:00
|
|
|
struct slot *slot = get_slot(hotplug_slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-10-23 10:54:39 +08:00
|
|
|
ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
|
2008-10-23 10:52:12 +08:00
|
|
|
__func__, slot_name(slot));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-02-22 07:45:48 +08:00
|
|
|
return shpchp_sysfs_disable_slot(slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2015-12-28 05:21:11 +08:00
|
|
|
static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-12-17 07:25:57 +08:00
|
|
|
struct slot *slot = get_slot(hotplug_slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
int retval;
|
|
|
|
|
|
2008-10-23 10:54:39 +08:00
|
|
|
ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
|
2008-10-23 10:52:12 +08:00
|
|
|
__func__, slot_name(slot));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
retval = slot->hpc_ops->get_power_status(slot, value);
|
|
|
|
|
if (retval < 0)
|
PCI: hotplug: Drop hotplug_slot_info
Ever since the PCI hotplug core was introduced in 2002, drivers had to
allocate and register a struct hotplug_slot_info for every slot:
https://git.kernel.org/tglx/history/c/a8a2069f432c
Apparently the idea was that drivers furnish the hotplug core with an
up-to-date card presence status, power status, latch status and
attention indicator status as well as notify the hotplug core of changes
thereof. However only 4 out of 12 hotplug drivers bother to notify the
hotplug core with pci_hp_change_slot_info() and the hotplug core never
made any use of the information: There is just a single macro in
pci_hotplug_core.c, GET_STATUS(), which uses the hotplug_slot_info if
the driver lacks the corresponding callback in hotplug_slot_ops. The
macro is called when the user reads the attribute via sysfs.
Now, if the callback isn't defined, the attribute isn't exposed in sysfs
in the first place (see e.g. has_power_file()). There are only two
situations when the hotplug_slot_info would actually be accessed:
* If the driver defines ->enable_slot or ->disable_slot but not
->get_power_status.
* If the driver defines ->set_attention_status but not
->get_attention_status.
There is no driver doing the former and just a single driver doing the
latter, namely pnv_php.c. Amend it with a ->get_attention_status
callback. With that, the hotplug_slot_info becomes completely unused by
the PCI hotplug core. But a few drivers use it internally as a cache:
cpcihp uses it to cache the latch_status and adapter_status.
cpqhp uses it to cache the adapter_status.
pnv_php and rpaphp use it to cache the attention_status.
shpchp uses it to cache all four values.
Amend these drivers to cache the information in their private slot
struct. shpchp's slot struct already contains members to cache the
power_status and adapter_status, so additional members are only needed
for the other two values. In the case of cpqphp, the cached value is
only accessed in a single place, so instead of caching it, read the
current value from the hardware.
Caution: acpiphp, cpci, cpqhp, shpchp, asus-wmi and eeepc-laptop
populate the hotplug_slot_info with initial values on probe. That code
is herewith removed. There is a theoretical chance that the code has
side effects without which the driver fails to function, e.g. if the
ACPI method to read the adapter status needs to be executed at least
once on probe. That seems unlikely to me, still maintainers should
review the changes carefully for this possibility.
Rafael adds: "I'm not aware of any case in which it will break anything,
[...] but if that happens, it may be necessary to add the execution of
the control methods in question directly to the initialization part."
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> # drivers/pci/hotplug/rpa*
Acked-by: Sebastian Ott <sebott@linux.ibm.com> # drivers/pci/hotplug/s390*
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> # drivers/platform/x86
Cc: Len Brown <lenb@kernel.org>
Cc: Scott Murray <scott@spiteful.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Oliver OHalloran <oliveroh@au1.ibm.com>
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
2018-09-08 15:59:01 +08:00
|
|
|
*value = slot->pwr_save;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-28 05:21:11 +08:00
|
|
|
static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-12-17 07:25:57 +08:00
|
|
|
struct slot *slot = get_slot(hotplug_slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
int retval;
|
|
|
|
|
|
2008-10-23 10:54:39 +08:00
|
|
|
ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
|
2008-10-23 10:52:12 +08:00
|
|
|
__func__, slot_name(slot));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
retval = slot->hpc_ops->get_attention_status(slot, value);
|
|
|
|
|
if (retval < 0)
|
PCI: hotplug: Drop hotplug_slot_info
Ever since the PCI hotplug core was introduced in 2002, drivers had to
allocate and register a struct hotplug_slot_info for every slot:
https://git.kernel.org/tglx/history/c/a8a2069f432c
Apparently the idea was that drivers furnish the hotplug core with an
up-to-date card presence status, power status, latch status and
attention indicator status as well as notify the hotplug core of changes
thereof. However only 4 out of 12 hotplug drivers bother to notify the
hotplug core with pci_hp_change_slot_info() and the hotplug core never
made any use of the information: There is just a single macro in
pci_hotplug_core.c, GET_STATUS(), which uses the hotplug_slot_info if
the driver lacks the corresponding callback in hotplug_slot_ops. The
macro is called when the user reads the attribute via sysfs.
Now, if the callback isn't defined, the attribute isn't exposed in sysfs
in the first place (see e.g. has_power_file()). There are only two
situations when the hotplug_slot_info would actually be accessed:
* If the driver defines ->enable_slot or ->disable_slot but not
->get_power_status.
* If the driver defines ->set_attention_status but not
->get_attention_status.
There is no driver doing the former and just a single driver doing the
latter, namely pnv_php.c. Amend it with a ->get_attention_status
callback. With that, the hotplug_slot_info becomes completely unused by
the PCI hotplug core. But a few drivers use it internally as a cache:
cpcihp uses it to cache the latch_status and adapter_status.
cpqhp uses it to cache the adapter_status.
pnv_php and rpaphp use it to cache the attention_status.
shpchp uses it to cache all four values.
Amend these drivers to cache the information in their private slot
struct. shpchp's slot struct already contains members to cache the
power_status and adapter_status, so additional members are only needed
for the other two values. In the case of cpqphp, the cached value is
only accessed in a single place, so instead of caching it, read the
current value from the hardware.
Caution: acpiphp, cpci, cpqhp, shpchp, asus-wmi and eeepc-laptop
populate the hotplug_slot_info with initial values on probe. That code
is herewith removed. There is a theoretical chance that the code has
side effects without which the driver fails to function, e.g. if the
ACPI method to read the adapter status needs to be executed at least
once on probe. That seems unlikely to me, still maintainers should
review the changes carefully for this possibility.
Rafael adds: "I'm not aware of any case in which it will break anything,
[...] but if that happens, it may be necessary to add the execution of
the control methods in question directly to the initialization part."
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> # drivers/pci/hotplug/rpa*
Acked-by: Sebastian Ott <sebott@linux.ibm.com> # drivers/pci/hotplug/s390*
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> # drivers/platform/x86
Cc: Len Brown <lenb@kernel.org>
Cc: Scott Murray <scott@spiteful.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Oliver OHalloran <oliveroh@au1.ibm.com>
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
2018-09-08 15:59:01 +08:00
|
|
|
*value = slot->attention_save;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-28 05:21:11 +08:00
|
|
|
static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-12-17 07:25:57 +08:00
|
|
|
struct slot *slot = get_slot(hotplug_slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
int retval;
|
|
|
|
|
|
2008-10-23 10:54:39 +08:00
|
|
|
ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
|
2008-10-23 10:52:12 +08:00
|
|
|
__func__, slot_name(slot));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
retval = slot->hpc_ops->get_latch_status(slot, value);
|
|
|
|
|
if (retval < 0)
|
PCI: hotplug: Drop hotplug_slot_info
Ever since the PCI hotplug core was introduced in 2002, drivers had to
allocate and register a struct hotplug_slot_info for every slot:
https://git.kernel.org/tglx/history/c/a8a2069f432c
Apparently the idea was that drivers furnish the hotplug core with an
up-to-date card presence status, power status, latch status and
attention indicator status as well as notify the hotplug core of changes
thereof. However only 4 out of 12 hotplug drivers bother to notify the
hotplug core with pci_hp_change_slot_info() and the hotplug core never
made any use of the information: There is just a single macro in
pci_hotplug_core.c, GET_STATUS(), which uses the hotplug_slot_info if
the driver lacks the corresponding callback in hotplug_slot_ops. The
macro is called when the user reads the attribute via sysfs.
Now, if the callback isn't defined, the attribute isn't exposed in sysfs
in the first place (see e.g. has_power_file()). There are only two
situations when the hotplug_slot_info would actually be accessed:
* If the driver defines ->enable_slot or ->disable_slot but not
->get_power_status.
* If the driver defines ->set_attention_status but not
->get_attention_status.
There is no driver doing the former and just a single driver doing the
latter, namely pnv_php.c. Amend it with a ->get_attention_status
callback. With that, the hotplug_slot_info becomes completely unused by
the PCI hotplug core. But a few drivers use it internally as a cache:
cpcihp uses it to cache the latch_status and adapter_status.
cpqhp uses it to cache the adapter_status.
pnv_php and rpaphp use it to cache the attention_status.
shpchp uses it to cache all four values.
Amend these drivers to cache the information in their private slot
struct. shpchp's slot struct already contains members to cache the
power_status and adapter_status, so additional members are only needed
for the other two values. In the case of cpqphp, the cached value is
only accessed in a single place, so instead of caching it, read the
current value from the hardware.
Caution: acpiphp, cpci, cpqhp, shpchp, asus-wmi and eeepc-laptop
populate the hotplug_slot_info with initial values on probe. That code
is herewith removed. There is a theoretical chance that the code has
side effects without which the driver fails to function, e.g. if the
ACPI method to read the adapter status needs to be executed at least
once on probe. That seems unlikely to me, still maintainers should
review the changes carefully for this possibility.
Rafael adds: "I'm not aware of any case in which it will break anything,
[...] but if that happens, it may be necessary to add the execution of
the control methods in question directly to the initialization part."
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> # drivers/pci/hotplug/rpa*
Acked-by: Sebastian Ott <sebott@linux.ibm.com> # drivers/pci/hotplug/s390*
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> # drivers/platform/x86
Cc: Len Brown <lenb@kernel.org>
Cc: Scott Murray <scott@spiteful.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Oliver OHalloran <oliveroh@au1.ibm.com>
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
2018-09-08 15:59:01 +08:00
|
|
|
*value = slot->latch_save;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-28 05:21:11 +08:00
|
|
|
static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-12-17 07:25:57 +08:00
|
|
|
struct slot *slot = get_slot(hotplug_slot);
|
2005-04-17 06:20:36 +08:00
|
|
|
int retval;
|
|
|
|
|
|
2008-10-23 10:54:39 +08:00
|
|
|
ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
|
2008-10-23 10:52:12 +08:00
|
|
|
__func__, slot_name(slot));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
retval = slot->hpc_ops->get_adapter_status(slot, value);
|
|
|
|
|
if (retval < 0)
|
PCI: hotplug: Drop hotplug_slot_info
Ever since the PCI hotplug core was introduced in 2002, drivers had to
allocate and register a struct hotplug_slot_info for every slot:
https://git.kernel.org/tglx/history/c/a8a2069f432c
Apparently the idea was that drivers furnish the hotplug core with an
up-to-date card presence status, power status, latch status and
attention indicator status as well as notify the hotplug core of changes
thereof. However only 4 out of 12 hotplug drivers bother to notify the
hotplug core with pci_hp_change_slot_info() and the hotplug core never
made any use of the information: There is just a single macro in
pci_hotplug_core.c, GET_STATUS(), which uses the hotplug_slot_info if
the driver lacks the corresponding callback in hotplug_slot_ops. The
macro is called when the user reads the attribute via sysfs.
Now, if the callback isn't defined, the attribute isn't exposed in sysfs
in the first place (see e.g. has_power_file()). There are only two
situations when the hotplug_slot_info would actually be accessed:
* If the driver defines ->enable_slot or ->disable_slot but not
->get_power_status.
* If the driver defines ->set_attention_status but not
->get_attention_status.
There is no driver doing the former and just a single driver doing the
latter, namely pnv_php.c. Amend it with a ->get_attention_status
callback. With that, the hotplug_slot_info becomes completely unused by
the PCI hotplug core. But a few drivers use it internally as a cache:
cpcihp uses it to cache the latch_status and adapter_status.
cpqhp uses it to cache the adapter_status.
pnv_php and rpaphp use it to cache the attention_status.
shpchp uses it to cache all four values.
Amend these drivers to cache the information in their private slot
struct. shpchp's slot struct already contains members to cache the
power_status and adapter_status, so additional members are only needed
for the other two values. In the case of cpqphp, the cached value is
only accessed in a single place, so instead of caching it, read the
current value from the hardware.
Caution: acpiphp, cpci, cpqhp, shpchp, asus-wmi and eeepc-laptop
populate the hotplug_slot_info with initial values on probe. That code
is herewith removed. There is a theoretical chance that the code has
side effects without which the driver fails to function, e.g. if the
ACPI method to read the adapter status needs to be executed at least
once on probe. That seems unlikely to me, still maintainers should
review the changes carefully for this possibility.
Rafael adds: "I'm not aware of any case in which it will break anything,
[...] but if that happens, it may be necessary to add the execution of
the control methods in question directly to the initialization part."
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> # drivers/pci/hotplug/rpa*
Acked-by: Sebastian Ott <sebott@linux.ibm.com> # drivers/pci/hotplug/s390*
Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com> # drivers/platform/x86
Cc: Len Brown <lenb@kernel.org>
Cc: Scott Murray <scott@spiteful.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Oliver OHalloran <oliveroh@au1.ibm.com>
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
2018-09-08 15:59:01 +08:00
|
|
|
*value = slot->presence_save;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-26 05:49:06 +08:00
|
|
|
static bool shpc_capable(struct pci_dev *bridge)
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
* It is assumed that AMD GOLAM chips support SHPC but they do not
|
|
|
|
|
* have SHPC capability.
|
|
|
|
|
*/
|
|
|
|
|
if (bridge->vendor == PCI_VENDOR_ID_AMD &&
|
|
|
|
|
bridge->device == PCI_DEVICE_ID_AMD_GOLAM_7450)
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
if (pci_find_capability(bridge, PCI_CAP_ID_SHPC))
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
|
|
{
|
|
|
|
|
int rc;
|
|
|
|
|
struct controller *ctrl;
|
|
|
|
|
|
2018-06-26 05:49:06 +08:00
|
|
|
if (!shpc_capable(pdev))
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
2018-06-01 00:42:11 +08:00
|
|
|
if (acpi_get_hp_hw_control_from_firmware(pdev))
|
2005-10-14 03:05:39 +08:00
|
|
|
return -ENODEV;
|
|
|
|
|
|
2006-01-26 09:02:41 +08:00
|
|
|
ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
|
PCI: Remove unnecessary messages for memory allocation failures
Per ebfdc40969f2 ("checkpatch: attempt to find unnecessary 'out of memory'
messages"), when a memory allocation fails, the memory subsystem emits
generic "out of memory" messages (see slab_out_of_memory() for some of this
logging). Therefore, additional error messages in the caller don't add
much value.
Remove messages that merely report "out of memory".
This preserves some messages that report additional information, e.g.,
allocation failures that mean we drop hotplug events.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
[bhelgaas: changelog, squash patches, make similar changes to acpiphp,
cpqphp, ibmphp, keep warning when dropping hotplug event]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2017-12-29 19:15:16 +08:00
|
|
|
if (!ctrl)
|
2005-04-17 06:20:36 +08:00
|
|
|
goto err_out_none;
|
PCI: Remove unnecessary messages for memory allocation failures
Per ebfdc40969f2 ("checkpatch: attempt to find unnecessary 'out of memory'
messages"), when a memory allocation fails, the memory subsystem emits
generic "out of memory" messages (see slab_out_of_memory() for some of this
logging). Therefore, additional error messages in the caller don't add
much value.
Remove messages that merely report "out of memory".
This preserves some messages that report additional information, e.g.,
allocation failures that mean we drop hotplug events.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
[bhelgaas: changelog, squash patches, make similar changes to acpiphp,
cpqphp, ibmphp, keep warning when dropping hotplug event]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2017-12-29 19:15:16 +08:00
|
|
|
|
2006-01-26 08:57:40 +08:00
|
|
|
INIT_LIST_HEAD(&ctrl->slot_list);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-10-14 03:05:42 +08:00
|
|
|
rc = shpc_init(ctrl, pdev);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (rc) {
|
2008-10-23 10:54:39 +08:00
|
|
|
ctrl_dbg(ctrl, "Controller initialization failed\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
goto err_out_free_ctrl;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pci_set_drvdata(pdev, ctrl);
|
|
|
|
|
|
|
|
|
|
/* Setup the slot information structures */
|
|
|
|
|
rc = init_slots(ctrl);
|
|
|
|
|
if (rc) {
|
2008-10-23 10:54:39 +08:00
|
|
|
ctrl_err(ctrl, "Slot initialization failed\n");
|
2006-02-22 07:45:45 +08:00
|
|
|
goto err_out_release_ctlr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2006-08-29 02:43:25 +08:00
|
|
|
rc = shpchp_create_ctrl_files(ctrl);
|
|
|
|
|
if (rc)
|
|
|
|
|
goto err_cleanup_slots;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2018-06-26 05:49:06 +08:00
|
|
|
pdev->shpc_managed = 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
|
|
2006-08-29 02:43:25 +08:00
|
|
|
err_cleanup_slots:
|
|
|
|
|
cleanup_slots(ctrl);
|
2006-02-22 07:45:45 +08:00
|
|
|
err_out_release_ctlr:
|
2005-04-17 06:20:36 +08:00
|
|
|
ctrl->hpc_ops->release_ctlr(ctrl);
|
|
|
|
|
err_out_free_ctrl:
|
|
|
|
|
kfree(ctrl);
|
|
|
|
|
err_out_none:
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
2006-02-22 07:45:50 +08:00
|
|
|
static void shpc_remove(struct pci_dev *dev)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-02-22 07:45:50 +08:00
|
|
|
struct controller *ctrl = pci_get_drvdata(dev);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2018-06-26 05:49:06 +08:00
|
|
|
dev->shpc_managed = 0;
|
2006-02-22 07:45:50 +08:00
|
|
|
shpchp_remove_ctrl_files(ctrl);
|
|
|
|
|
ctrl->hpc_ops->release_ctlr(ctrl);
|
|
|
|
|
kfree(ctrl);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2017-08-04 07:20:17 +08:00
|
|
|
static const struct pci_device_id shpcd_pci_tbl[] = {
|
2006-01-26 08:56:53 +08:00
|
|
|
{PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0)},
|
2005-04-17 06:20:36 +08:00
|
|
|
{ /* end: all zeroes */ }
|
|
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(pci, shpcd_pci_tbl);
|
|
|
|
|
|
|
|
|
|
static struct pci_driver shpc_driver = {
|
|
|
|
|
.name = SHPC_MODULE_NAME,
|
|
|
|
|
.id_table = shpcd_pci_tbl,
|
|
|
|
|
.probe = shpc_probe,
|
2006-02-22 07:45:50 +08:00
|
|
|
.remove = shpc_remove,
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int __init shpcd_init(void)
|
|
|
|
|
{
|
2013-01-12 03:21:15 +08:00
|
|
|
int retval;
|
2010-10-18 14:33:02 +08:00
|
|
|
|
2005-10-14 03:05:38 +08:00
|
|
|
retval = pci_register_driver(&shpc_driver);
|
2008-03-04 11:09:46 +08:00
|
|
|
dbg("%s: pci_register_driver = %d\n", __func__, retval);
|
2005-10-14 03:05:38 +08:00
|
|
|
info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
|
2013-01-12 03:21:15 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void __exit shpcd_cleanup(void)
|
|
|
|
|
{
|
|
|
|
|
dbg("unload_shpchpd()\n");
|
|
|
|
|
pci_unregister_driver(&shpc_driver);
|
|
|
|
|
info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
module_init(shpcd_init);
|
|
|
|
|
module_exit(shpcd_cleanup);
|