mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-04 00:06:36 +00:00
a7da21613c
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> |
||
|---|---|---|
| .. | ||
| acer-wireless.c | ||
| acer-wmi.c | ||
| acerhdf.c | ||
| alienware-wmi.c | ||
| amilo-rfkill.c | ||
| apple-gmux.c | ||
| asus-laptop.c | ||
| asus-nb-wmi.c | ||
| asus-wireless.c | ||
| asus-wmi.c | ||
| asus-wmi.h | ||
| classmate-laptop.c | ||
| compal-laptop.c | ||
| dell-laptop.c | ||
| dell-rbtn.c | ||
| dell-rbtn.h | ||
| dell-smbios-base.c | ||
| dell-smbios-smm.c | ||
| dell-smbios-wmi.c | ||
| dell-smbios.h | ||
| dell-smo8800.c | ||
| dell-wmi-aio.c | ||
| dell-wmi-descriptor.c | ||
| dell-wmi-descriptor.h | ||
| dell-wmi-led.c | ||
| dell-wmi.c | ||
| eeepc-laptop.c | ||
| eeepc-wmi.c | ||
| fujitsu-laptop.c | ||
| fujitsu-tablet.c | ||
| gpd-pocket-fan.c | ||
| hdaps.c | ||
| hp-wireless.c | ||
| hp-wmi.c | ||
| hp_accel.c | ||
| i2c-multi-instantiate.c | ||
| ibm_rtl.c | ||
| ideapad-laptop.c | ||
| intel-hid.c | ||
| intel-rst.c | ||
| intel-smartconnect.c | ||
| intel-vbtn.c | ||
| intel-wmi-thunderbolt.c | ||
| intel_bxtwc_tmu.c | ||
| intel_cht_int33fe.c | ||
| intel_chtdc_ti_pwrbtn.c | ||
| intel_int0002_vgpio.c | ||
| intel_ips.c | ||
| intel_ips.h | ||
| intel_menlow.c | ||
| intel_mid_powerbtn.c | ||
| intel_mid_thermal.c | ||
| intel_oaktrail.c | ||
| intel_pmc_core.c | ||
| intel_pmc_core.h | ||
| intel_pmc_ipc.c | ||
| intel_punit_ipc.c | ||
| intel_scu_ipc.c | ||
| intel_scu_ipcutil.c | ||
| intel_telemetry_core.c | ||
| intel_telemetry_debugfs.c | ||
| intel_telemetry_pltdrv.c | ||
| intel_turbo_max_3.c | ||
| Kconfig | ||
| Makefile | ||
| mlx-platform.c | ||
| msi-laptop.c | ||
| msi-wmi.c | ||
| mxm-wmi.c | ||
| panasonic-laptop.c | ||
| peaq-wmi.c | ||
| pmc_atom.c | ||
| pvpanic.c | ||
| samsung-laptop.c | ||
| samsung-q10.c | ||
| sony-laptop.c | ||
| surface3-wmi.c | ||
| surface3_button.c | ||
| surfacepro3_button.c | ||
| tc1100-wmi.c | ||
| thinkpad_acpi.c | ||
| topstar-laptop.c | ||
| toshiba-wmi.c | ||
| toshiba_acpi.c | ||
| toshiba_bluetooth.c | ||
| toshiba_haps.c | ||
| touchscreen_dmi.c | ||
| wmi-bmof.c | ||
| wmi.c | ||
| xo1-rfkill.c | ||
| xo15-ebook.c | ||