Skip to content

Commit 5f16ee2

Browse files
bnilawarThomas Hellström
bnilawar
authored and
Thomas Hellström
committed
drm/hwmon: Fix abi doc warnings
This fixes warnings in xe, i915 hwmon docs: Warning: /sys/devices/.../hwmon/hwmon<i>/curr1_crit is defined 2 times: Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon:35 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon:52 Warning: /sys/devices/.../hwmon/hwmon<i>/energy1_input is defined 2 times: Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon:54 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon:65 Warning: /sys/devices/.../hwmon/hwmon<i>/in0_input is defined 2 times: Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon:46 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon:0 Warning: /sys/devices/.../hwmon/hwmon<i>/power1_crit is defined 2 times: Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon:22 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon:39 Warning: /sys/devices/.../hwmon/hwmon<i>/power1_max is defined 2 times: Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon:0 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon:8 Warning: /sys/devices/.../hwmon/hwmon<i>/power1_max_interval is defined 2 times: Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon:62 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon:30 Warning: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max is defined 2 times: Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon:14 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon:22 Use a path containing the driver name to differentiate the documentation of each entry. Fixes: fb1b706 ("drm/xe/hwmon: Expose power attributes") Fixes: 92d44a4 ("drm/xe/hwmon: Expose card reactive critical power") Fixes: fbcdc9d ("drm/xe/hwmon: Expose input voltage attribute") Fixes: 71d0a32 ("drm/xe/hwmon: Expose hwmon energy attribute") Fixes: 4446fcf ("drm/xe/hwmon: Expose power1_max_interval") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Closes: https://lore.kernel.org/all/20240125113345.291118ff@canb.auug.org.au/ Signed-off-by: Badal Nilawar <badal.nilawar@intel.com> Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240127165040.2348009-1-badal.nilawar@intel.com (cherry picked from commit 20485e3) Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
1 parent c9cfed2 commit 5f16ee2

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
What: /sys/devices/.../hwmon/hwmon<i>/in0_input
1+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input
22
Date: February 2023
33
KernelVersion: 6.2
44
Contact: intel-gfx@lists.freedesktop.org
55
Description: RO. Current Voltage in millivolt.
66

77
Only supported for particular Intel i915 graphics platforms.
88

9-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max
9+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max
1010
Date: February 2023
1111
KernelVersion: 6.2
1212
Contact: intel-gfx@lists.freedesktop.org
@@ -20,15 +20,15 @@ Description: RW. Card reactive sustained (PL1/Tau) power limit in microwatts.
2020

2121
Only supported for particular Intel i915 graphics platforms.
2222

23-
What: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max
23+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_rated_max
2424
Date: February 2023
2525
KernelVersion: 6.2
2626
Contact: intel-gfx@lists.freedesktop.org
2727
Description: RO. Card default power limit (default TDP setting).
2828

2929
Only supported for particular Intel i915 graphics platforms.
3030

31-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max_interval
31+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max_interval
3232
Date: February 2023
3333
KernelVersion: 6.2
3434
Contact: intel-gfx@lists.freedesktop.org
@@ -37,7 +37,7 @@ Description: RW. Sustained power limit interval (Tau in PL1/Tau) in
3737

3838
Only supported for particular Intel i915 graphics platforms.
3939

40-
What: /sys/devices/.../hwmon/hwmon<i>/power1_crit
40+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_crit
4141
Date: February 2023
4242
KernelVersion: 6.2
4343
Contact: intel-gfx@lists.freedesktop.org
@@ -50,7 +50,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts.
5050

5151
Only supported for particular Intel i915 graphics platforms.
5252

53-
What: /sys/devices/.../hwmon/hwmon<i>/curr1_crit
53+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/curr1_crit
5454
Date: February 2023
5555
KernelVersion: 6.2
5656
Contact: intel-gfx@lists.freedesktop.org
@@ -63,7 +63,7 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes.
6363

6464
Only supported for particular Intel i915 graphics platforms.
6565

66-
What: /sys/devices/.../hwmon/hwmon<i>/energy1_input
66+
What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/energy1_input
6767
Date: February 2023
6868
KernelVersion: 6.2
6969
Contact: intel-gfx@lists.freedesktop.org

‎Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max
1+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max
22
Date: September 2023
33
KernelVersion: 6.5
44
Contact: intel-xe@lists.freedesktop.org
@@ -12,15 +12,15 @@ Description: RW. Card reactive sustained (PL1) power limit in microwatts.
1212

1313
Only supported for particular Intel xe graphics platforms.
1414

15-
What: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max
15+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_rated_max
1616
Date: September 2023
1717
KernelVersion: 6.5
1818
Contact: intel-xe@lists.freedesktop.org
1919
Description: RO. Card default power limit (default TDP setting).
2020

2121
Only supported for particular Intel xe graphics platforms.
2222

23-
What: /sys/devices/.../hwmon/hwmon<i>/power1_crit
23+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit
2424
Date: September 2023
2525
KernelVersion: 6.5
2626
Contact: intel-xe@lists.freedesktop.org
@@ -33,7 +33,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts.
3333

3434
Only supported for particular Intel xe graphics platforms.
3535

36-
What: /sys/devices/.../hwmon/hwmon<i>/curr1_crit
36+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit
3737
Date: September 2023
3838
KernelVersion: 6.5
3939
Contact: intel-xe@lists.freedesktop.org
@@ -44,23 +44,23 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes.
4444
the operating frequency if the power averaged over a window
4545
exceeds this limit.
4646

47-
What: /sys/devices/.../hwmon/hwmon<i>/in0_input
47+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/in0_input
4848
Date: September 2023
4949
KernelVersion: 6.5
5050
Contact: intel-xe@lists.freedesktop.org
5151
Description: RO. Current Voltage in millivolt.
5252

5353
Only supported for particular Intel xe graphics platforms.
5454

55-
What: /sys/devices/.../hwmon/hwmon<i>/energy1_input
55+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/energy1_input
5656
Date: September 2023
5757
KernelVersion: 6.5
5858
Contact: intel-xe@lists.freedesktop.org
5959
Description: RO. Energy input of device in microjoules.
6060

6161
Only supported for particular Intel xe graphics platforms.
6262

63-
What: /sys/devices/.../hwmon/hwmon<i>/power1_max_interval
63+
What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max_interval
6464
Date: October 2023
6565
KernelVersion: 6.6
6666
Contact: intel-xe@lists.freedesktop.org

0 commit comments

Comments
 (0)