On Mon, 3 Nov 2008 13:26:06 +0000 Matthew Garrett wrote: > Various pieces of hardware (such as the Acer Aspire One and Asus EEE) > use PCIE hotplug to change the state of devices in response to events > such as the removal of SD cards or disabling the wireless radio. > However, they do not provide firmware support for this. As a consequence > pciehp will refuse to load and various things break. > > The existing workaround has been to use the pciehp_force option. This is > undesirable as there is little guarantee that manipulating the power > file in the slot directory will actually result in anything happening, > leading to potential user confusion and hardware damage. This patch adds > a new option, pciehp_passive. In this configuration pciehp will listen > for events and notify the PCI core appropriately. However, it will not > provide any user controllable sysfs attributes and so the risk of > confusion or damage is averted. Any system slots that do have firmware > support will continue to provide full functionality. > > Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx> > > --- > > Includes a minor code change suggested by Matthew Wilcox to avoid > calling pciehp_get_hp_hw_control_from_firmware() twice and documentation > updates as suggested Grant Grundler. > > diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt > index 1bbcaa8..2503ee0 100644 > --- a/Documentation/kernel-parameters.txt > +++ b/Documentation/kernel-parameters.txt > @@ -1711,6 +1711,20 @@ and is between 256 and 4096 characters. It is defined in the file > force Enable ASPM even on devices that claim not to support it. > WARNING: Forcing ASPM on may cause system lockups. > > + pciehp.pciehp_force= [PCIE] Forcibly enable PCIE hotplug support on a > + slot even if the firmware provides no support for > + it. > + > + pciehp.pciehp_passive= [PCIE] Forcibly enable listening for PCIE > + hotplug events on a slot even if the firmware > + provides no support for it. Unlike pciehp.force, > + does not provide user interface for triggering > + hotplug events. > + > + pciehp.pciehp_poll_mode= [PCIE] Poll for PCIE hotplug events > + > + pciehp.pciehp_poll_time= [PCIE] Seconds to wait between polls > + Hi, Is it too late to comment on these parameters? Please don't make users repeat the "pciehp.pciehp" name. This can be changed easily in the source code by keeping the variable names as is but using module_param_named() instead of module_param(). One good example is drivers/video/uvesafb.c. > pcmv= [HW,PCMCIA] BadgePAD 4 > > pd. [PARIDE] > diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c > index 4b23bc3..2bb2f4b 100644 > --- a/drivers/pci/hotplug/pciehp_core.c > +++ b/drivers/pci/hotplug/pciehp_core.c > @@ -41,6 +41,7 @@ int pciehp_debug; > int pciehp_poll_mode; > int pciehp_poll_time; > int pciehp_force; > +int pciehp_passive; > struct workqueue_struct *pciehp_wq; > > #define DRIVER_VERSION "0.4" > @@ -55,10 +56,12 @@ 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_passive, 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_passive, "Listen for pciehp events, even if _OSC and OSHP are missing"); > > #define PCIE_MODULE_NAME "pciehp" > --- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
