hwmon: Remove amd_energy driver

Commit 60268b0 ("hwmon: (amd_energy) modify the visibility of the counters") restricted visibility of AMD energy counters to work around a side-channel attack using energy data to determine which instructions are executed. The attack is described in 'PLATYPUS: Software-based Power Side-Channel Attacks on x86'. It relies on quick and accurate energy readings. This change made the counters provided by the amd_energy driver effectively unusable for non-provileged users. However, unprivileged read access is the whole point of hardware monitoring attributes. An attempt to remedy the situation by limiting and randomizing access to chip registers was rejected by AMD. Since the driver is for all practical purposes unusable, remove it. Cc: Naveen Krishna Chatradhi <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
ambv · Apr 20, 2021 · 9049572 · 9049572
1 parent e157639
commit 9049572
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 516 deletions.
diff --git a/Documentation/hwmon/amd_energy.rst b/Documentation/hwmon/amd_energy.rst
diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst
@@ -39,7 +39,6 @@ Hardware Monitoring Kernel Drivers
    adt7475
    aht10
    amc6821
-   amd_energy
    asb100
    asc7621
    aspeed-pwm-tacho

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -870,13 +870,6 @@ S:	Supported
 T:	git git://people.freedesktop.org/~agd5f/linux
 F:	drivers/gpu/drm/amd/display/
 
-AMD ENERGY DRIVER
-M:	Naveen Krishna Chatradhi <[email protected]>
-L:	[email protected]
-S:	Maintained
-F:	Documentation/hwmon/amd_energy.rst
-F:	drivers/hwmon/amd_energy.c
-
 AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 M:	Huang Rui <[email protected]>
 L:	[email protected]

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
@@ -321,16 +321,6 @@ config SENSORS_FAM15H_POWER
 	  This driver can also be built as a module. If so, the module
 	  will be called fam15h_power.
 
-config SENSORS_AMD_ENERGY
-	tristate "AMD RAPL MSR based Energy driver"
-	depends on X86
-	help
-	  If you say yes here you get support for core and package energy
-	  sensors, based on RAPL MSR for AMD family 17h and above CPUs.
-
-	  This driver can also be built as a module. If so, the module
-	  will be called as amd_energy.
-
 config SENSORS_APPLESMC
 	tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
 	depends on INPUT && X86
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,6 @@ Hardware Monitoring Kernel Drivers @@
        adt7475
        aht10
        amc6821
-       amd_energy
        asb100
        asc7621
        aspeed-pwm-tacho
@@ Expand Down @@