* ✓ CI.Patch_applied: success for drm/hwmon: Fix abi doc warnings
2024-01-27 16:50 [PATCH v2] drm/hwmon: Fix abi doc warnings Badal Nilawar
@ 2024-01-27 16:42 ` Patchwork
2024-01-27 16:42 ` ✗ CI.checkpatch: warning " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2024-01-27 16:42 UTC (permalink / raw)
To: Badal Nilawar; +Cc: intel-xe
== Series Details ==
Series: drm/hwmon: Fix abi doc warnings
URL : https://patchwork.freedesktop.org/series/129238/
State : success
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 0f1b42b9d drm-tip: 2024y-01m-27d-02h-39m-25s UTC integration manifest
=== git am output follows ===
Applying: drm/hwmon: Fix abi doc warnings
^ permalink raw reply [flat|nested] 10+ messages in thread
* ✗ CI.checkpatch: warning for drm/hwmon: Fix abi doc warnings
2024-01-27 16:50 [PATCH v2] drm/hwmon: Fix abi doc warnings Badal Nilawar
2024-01-27 16:42 ` ✓ CI.Patch_applied: success for " Patchwork
@ 2024-01-27 16:42 ` Patchwork
2024-01-27 16:42 ` ✗ CI.KUnit: failure " Patchwork
2024-01-27 20:10 ` [PATCH v2] " Dixit, Ashutosh
3 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2024-01-27 16:42 UTC (permalink / raw)
To: Badal Nilawar; +Cc: intel-xe
== Series Details ==
Series: drm/hwmon: Fix abi doc warnings
URL : https://patchwork.freedesktop.org/series/129238/
State : warning
== Summary ==
+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt
Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master
2d919ac662b2798c053d68d1cc16b758c61b55ca
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit 36aa9403c4058caaf1207d9987aaeb02aa346fcd
Author: Badal Nilawar <badal.nilawar@intel.com>
Date: Sat Jan 27 22:20:40 2024 +0530
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
Fixes: fb1b70607f73 ("drm/xe/hwmon: Expose power attributes")
Fixes: 92d44a422d0d ("drm/xe/hwmon: Expose card reactive critical power")
Fixes: fbcdc9d3bf58 ("drm/xe/hwmon: Expose input voltage attribute")
Fixes: 71d0a32524f9 ("drm/xe/hwmon: Expose hwmon energy attribute")
Fixes: 4446fcf220ce ("drm/xe/hwmon: Expose power1_max_interval")
Fixes: f8572bb67525 ("drm/i915/hwmon: Add HWMON current voltage support")
Fixes: 99f55efb7911 ("drm/i915/hwmon: Power PL1 limit and TDP setting")
Fixes: 4c2572fe0ae7 ("drm/i915/hwmon: Expose power1_max_interval")
Fixes: c8939848f7e4 ("drm/i915/hwmon: Expose card reactive critical power")
Fixes: c41b8bdcc297 ("drm/i915/hwmon: Show device level energy usage")
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Cc: Lucas Demarchi <lucas.demarchi@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
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>
+ /mt/dim checkpatch 0f1b42b9d395bd4097b2846230a13869dc638216 drm-intel
36aa9403c drm/hwmon: Fix abi doc warnings
-:8: WARNING:COMMIT_LOG_LONG_LINE: Prefer a maximum 75 chars per line (possible unwrapped commit description?)
#8:
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
-:16: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id 'fb1b70607f73', maybe rebased or not pulled?
#16:
Fixes: fb1b70607f73 ("drm/xe/hwmon: Expose power attributes")
-:17: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '92d44a422d0d', maybe rebased or not pulled?
#17:
Fixes: 92d44a422d0d ("drm/xe/hwmon: Expose card reactive critical power")
-:18: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id 'fbcdc9d3bf58', maybe rebased or not pulled?
#18:
Fixes: fbcdc9d3bf58 ("drm/xe/hwmon: Expose input voltage attribute")
-:19: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '71d0a32524f9', maybe rebased or not pulled?
#19:
Fixes: 71d0a32524f9 ("drm/xe/hwmon: Expose hwmon energy attribute")
-:20: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '4446fcf220ce', maybe rebased or not pulled?
#20:
Fixes: 4446fcf220ce ("drm/xe/hwmon: Expose power1_max_interval")
-:21: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id 'f8572bb67525', maybe rebased or not pulled?
#21:
Fixes: f8572bb67525 ("drm/i915/hwmon: Add HWMON current voltage support")
-:22: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '99f55efb7911', maybe rebased or not pulled?
#22:
Fixes: 99f55efb7911 ("drm/i915/hwmon: Power PL1 limit and TDP setting")
-:23: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '4c2572fe0ae7', maybe rebased or not pulled?
#23:
Fixes: 4c2572fe0ae7 ("drm/i915/hwmon: Expose power1_max_interval")
-:24: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id 'c8939848f7e4', maybe rebased or not pulled?
#24:
Fixes: c8939848f7e4 ("drm/i915/hwmon: Expose card reactive critical power")
-:25: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id 'c41b8bdcc297', maybe rebased or not pulled?
#25:
Fixes: c41b8bdcc297 ("drm/i915/hwmon: Show device level energy usage")
total: 0 errors, 11 warnings, 0 checks, 106 lines checked
^ permalink raw reply [flat|nested] 10+ messages in thread
* ✗ CI.KUnit: failure for drm/hwmon: Fix abi doc warnings
2024-01-27 16:50 [PATCH v2] drm/hwmon: Fix abi doc warnings Badal Nilawar
2024-01-27 16:42 ` ✓ CI.Patch_applied: success for " Patchwork
2024-01-27 16:42 ` ✗ CI.checkpatch: warning " Patchwork
@ 2024-01-27 16:42 ` Patchwork
2024-01-27 20:10 ` [PATCH v2] " Dixit, Ashutosh
3 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2024-01-27 16:42 UTC (permalink / raw)
To: Badal Nilawar; +Cc: intel-xe
== Series Details ==
Series: drm/hwmon: Fix abi doc warnings
URL : https://patchwork.freedesktop.org/series/129238/
State : failure
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
ERROR:root:../arch/x86/um/user-offsets.c:17:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes]
17 | void foo(void)
| ^~~
In file included from ../arch/um/kernel/asm-offsets.c:1:
../arch/x86/um/shared/sysdep/kernel-offsets.h:9:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes]
9 | void foo(void)
| ^~~
../arch/x86/um/bugs_64.c:9:6: warning: no previous prototype for ‘arch_check_bugs’ [-Wmissing-prototypes]
9 | void arch_check_bugs(void)
| ^~~~~~~~~~~~~~~
../arch/x86/um/bugs_64.c:13:6: warning: no previous prototype for ‘arch_examine_signal’ [-Wmissing-prototypes]
13 | void arch_examine_signal(int sig, struct uml_pt_regs *regs)
| ^~~~~~~~~~~~~~~~~~~
../arch/x86/um/fault.c:18:5: warning: no previous prototype for ‘arch_fixup’ [-Wmissing-prototypes]
18 | int arch_fixup(unsigned long address, struct uml_pt_regs *regs)
| ^~~~~~~~~~
../arch/x86/um/os-Linux/registers.c:146:15: warning: no previous prototype for ‘get_thread_reg’ [-Wmissing-prototypes]
146 | unsigned long get_thread_reg(int reg, jmp_buf *buf)
| ^~~~~~~~~~~~~~
../arch/x86/um/vdso/um_vdso.c:16:5: warning: no previous prototype for ‘__vdso_clock_gettime’ [-Wmissing-prototypes]
16 | int __vdso_clock_gettime(clockid_t clock, struct __kernel_old_timespec *ts)
| ^~~~~~~~~~~~~~~~~~~~
../arch/x86/um/vdso/um_vdso.c:30:5: warning: no previous prototype for ‘__vdso_gettimeofday’ [-Wmissing-prototypes]
30 | int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz)
| ^~~~~~~~~~~~~~~~~~~
../arch/x86/um/vdso/um_vdso.c:44:21: warning: no previous prototype for ‘__vdso_time’ [-Wmissing-prototypes]
44 | __kernel_old_time_t __vdso_time(__kernel_old_time_t *t)
| ^~~~~~~~~~~
../arch/x86/um/vdso/um_vdso.c:57:1: warning: no previous prototype for ‘__vdso_getcpu’ [-Wmissing-prototypes]
57 | __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused)
| ^~~~~~~~~~~~~
../arch/um/os-Linux/skas/process.c:107:6: warning: no previous prototype for ‘wait_stub_done’ [-Wmissing-prototypes]
107 | void wait_stub_done(int pid)
| ^~~~~~~~~~~~~~
../arch/um/os-Linux/skas/process.c:683:6: warning: no previous prototype for ‘__switch_mm’ [-Wmissing-prototypes]
683 | void __switch_mm(struct mm_id *mm_idp)
| ^~~~~~~~~~~
../arch/x86/um/os-Linux/mcontext.c:7:6: warning: no previous prototype for ‘get_regs_from_mc’ [-Wmissing-prototypes]
7 | void get_regs_from_mc(struct uml_pt_regs *regs, mcontext_t *mc)
| ^~~~~~~~~~~~~~~~
../arch/um/kernel/skas/mmu.c:17:5: warning: no previous prototype for ‘init_new_context’ [-Wmissing-prototypes]
17 | int init_new_context(struct task_struct *task, struct mm_struct *mm)
| ^~~~~~~~~~~~~~~~
../arch/um/kernel/skas/mmu.c:60:6: warning: no previous prototype for ‘destroy_context’ [-Wmissing-prototypes]
60 | void destroy_context(struct mm_struct *mm)
| ^~~~~~~~~~~~~~~
../arch/um/os-Linux/main.c:187:7: warning: no previous prototype for ‘__wrap_malloc’ [-Wmissing-prototypes]
187 | void *__wrap_malloc(int size)
| ^~~~~~~~~~~~~
../arch/um/os-Linux/main.c:208:7: warning: no previous prototype for ‘__wrap_calloc’ [-Wmissing-prototypes]
208 | void *__wrap_calloc(int n, int size)
| ^~~~~~~~~~~~~
../arch/um/os-Linux/main.c:222:6: warning: no previous prototype for ‘__wrap_free’ [-Wmissing-prototypes]
222 | void __wrap_free(void *ptr)
| ^~~~~~~~~~~
../arch/um/os-Linux/mem.c:28:6: warning: no previous prototype for ‘kasan_map_memory’ [-Wmissing-prototypes]
28 | void kasan_map_memory(void *start, size_t len)
| ^~~~~~~~~~~~~~~~
../arch/um/os-Linux/mem.c:212:13: warning: no previous prototype for ‘check_tmpexec’ [-Wmissing-prototypes]
212 | void __init check_tmpexec(void)
| ^~~~~~~~~~~~~
../arch/um/kernel/skas/process.c:36:12: warning: no previous prototype for ‘start_uml’ [-Wmissing-prototypes]
36 | int __init start_uml(void)
| ^~~~~~~~~
../arch/um/os-Linux/signal.c:75:6: warning: no previous prototype for ‘sig_handler’ [-Wmissing-prototypes]
75 | void sig_handler(int sig, struct siginfo *si, mcontext_t *mc)
| ^~~~~~~~~~~
../arch/um/os-Linux/signal.c:111:6: warning: no previous prototype for ‘timer_alarm_handler’ [-Wmissing-prototypes]
111 | void timer_alarm_handler(int sig, struct siginfo *unused_si, mcontext_t *mc)
| ^~~~~~~~~~~~~~~~~~~
../arch/um/os-Linux/start_up.c:301:12: warning: no previous prototype for ‘parse_iomem’ [-Wmissing-prototypes]
301 | int __init parse_iomem(char *str, int *add)
| ^~~~~~~~~~~
../arch/x86/um/ptrace_64.c:111:5: warning: no previous prototype for ‘poke_user’ [-Wmissing-prototypes]
111 | int poke_user(struct task_struct *child, long addr, long data)
| ^~~~~~~~~
../arch/x86/um/ptrace_64.c:171:5: warning: no previous prototype for ‘peek_user’ [-Wmissing-prototypes]
171 | int peek_user(struct task_struct *child, long addr, long data)
| ^~~~~~~~~
../arch/um/kernel/mem.c:202:8: warning: no previous prototype for ‘pgd_alloc’ [-Wmissing-prototypes]
202 | pgd_t *pgd_alloc(struct mm_struct *mm)
| ^~~~~~~~~
../arch/um/kernel/mem.c:215:7: warning: no previous prototype for ‘uml_kmalloc’ [-Wmissing-prototypes]
215 | void *uml_kmalloc(int size, int flags)
| ^~~~~~~~~~~
../arch/um/kernel/process.c:51:5: warning: no previous prototype for ‘pid_to_processor_id’ [-Wmissing-prototypes]
51 | int pid_to_processor_id(int pid)
| ^~~~~~~~~~~~~~~~~~~
../arch/um/kernel/process.c:87:7: warning: no previous prototype for ‘__switch_to’ [-Wmissing-prototypes]
87 | void *__switch_to(struct task_struct *from, struct task_struct *to)
| ^~~~~~~~~~~
../arch/um/kernel/process.c:140:6: warning: no previous prototype for ‘fork_handler’ [-Wmissing-prototypes]
140 | void fork_handler(void)
| ^~~~~~~~~~~~
../arch/um/kernel/process.c:217:6: warning: no previous prototype for ‘arch_cpu_idle’ [-Wmissing-prototypes]
217 | void arch_cpu_idle(void)
| ^~~~~~~~~~~~~
../arch/um/kernel/process.c:253:5: warning: no previous prototype for ‘copy_to_user_proc’ [-Wmissing-prototypes]
253 | int copy_to_user_proc(void __user *to, void *from, int size)
| ^~~~~~~~~~~~~~~~~
../arch/um/kernel/process.c:263:5: warning: no previous prototype for ‘clear_user_proc’ [-Wmissing-prototypes]
263 | int clear_user_proc(void __user *buf, int size)
| ^~~~~~~~~~~~~~~
../arch/um/kernel/process.c:271:6: warning: no previous prototype for ‘set_using_sysemu’ [-Wmissing-prototypes]
271 | void set_using_sysemu(int value)
| ^~~~~~~~~~~~~~~~
../arch/um/kernel/process.c:278:5: warning: no previous prototype for ‘get_using_sysemu’ [-Wmissing-prototypes]
278 | int get_using_sysemu(void)
| ^~~~~~~~~~~~~~~~
../arch/um/kernel/process.c:316:12: warning: no previous prototype for ‘make_proc_sysemu’ [-Wmissing-prototypes]
316 | int __init make_proc_sysemu(void)
| ^~~~~~~~~~~~~~~~
../arch/um/kernel/process.c:348:15: warning: no previous prototype for ‘arch_align_stack’ [-Wmissing-prototypes]
348 | unsigned long arch_align_stack(unsigned long sp)
| ^~~~~~~~~~~~~~~~
../arch/x86/um/signal.c:560:6: warning: no previous prototype for ‘sys_rt_sigreturn’ [-Wmissing-prototypes]
560 | long sys_rt_sigreturn(void)
| ^~~~~~~~~~~~~~~~
../arch/um/kernel/reboot.c:45:6: warning: no previous prototype for ‘machine_restart’ [-Wmissing-prototypes]
45 | void machine_restart(char * __unused)
| ^~~~~~~~~~~~~~~
../arch/um/kernel/reboot.c:51:6: warning: no previous prototype for ‘machine_power_off’ [-Wmissing-prototypes]
51 | void machine_power_off(void)
| ^~~~~~~~~~~~~~~~~
../arch/um/kernel/reboot.c:57:6: warning: no previous prototype for ‘machine_halt’ [-Wmissing-prototypes]
57 | void machine_halt(void)
| ^~~~~~~~~~~~
../arch/um/kernel/tlb.c:579:6: warning: no previous prototype for ‘flush_tlb_mm_range’ [-Wmissing-prototypes]
579 | void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
| ^~~~~~~~~~~~~~~~~~
../arch/um/kernel/tlb.c:594:6: warning: no previous prototype for ‘force_flush_all’ [-Wmissing-prototypes]
594 | void force_flush_all(void)
| ^~~~~~~~~~~~~~~
../arch/x86/um/syscalls_64.c:48:6: warning: no previous prototype for ‘arch_switch_to’ [-Wmissing-prototypes]
48 | void arch_switch_to(struct task_struct *to)
| ^~~~~~~~~~~~~~
../arch/um/kernel/um_arch.c:408:19: warning: no previous prototype for ‘read_initrd’ [-Wmissing-prototypes]
408 | int __init __weak read_initrd(void)
| ^~~~~~~~~~~
../arch/um/kernel/um_arch.c:461:7: warning: no previous prototype for ‘text_poke’ [-Wmissing-prototypes]
461 | void *text_poke(void *addr, const void *opcode, size_t len)
| ^~~~~~~~~
../arch/um/kernel/um_arch.c:473:6: warning: no previous prototype for ‘text_poke_sync’ [-Wmissing-prototypes]
473 | void text_poke_sync(void)
| ^~~~~~~~~~~~~~
../arch/um/kernel/kmsg_dump.c:60:12: warning: no previous prototype for ‘kmsg_dumper_stdout_init’ [-Wmissing-prototypes]
60 | int __init kmsg_dumper_stdout_init(void)
| ^~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_bo.c:41:3: error: ‘struct ttm_placement’ has no member named ‘num_busy_placement’; did you mean ‘num_placement’?
41 | .num_busy_placement = 1,
| ^~~~~~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c:41:24: warning: excess elements in struct initializer
41 | .num_busy_placement = 1,
| ^
../drivers/gpu/drm/xe/xe_bo.c:41:24: note: (near initialization for ‘sys_placement’)
../drivers/gpu/drm/xe/xe_bo.c:42:3: error: ‘struct ttm_placement’ has no member named ‘busy_placement’; did you mean ‘num_placement’?
42 | .busy_placement = &sys_placement_flags,
| ^~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c:42:20: warning: excess elements in struct initializer
42 | .busy_placement = &sys_placement_flags,
| ^
../drivers/gpu/drm/xe/xe_bo.c:42:20: note: (near initialization for ‘sys_placement’)
../drivers/gpu/drm/xe/xe_bo.c:55:3: error: ‘struct ttm_placement’ has no member named ‘num_busy_placement’; did you mean ‘num_placement’?
55 | .num_busy_placement = 1,
| ^~~~~~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c:55:24: warning: excess elements in struct initializer
55 | .num_busy_placement = 1,
| ^
../drivers/gpu/drm/xe/xe_bo.c:55:24: note: (near initialization for ‘tt_placement’)
../drivers/gpu/drm/xe/xe_bo.c:56:3: error: ‘struct ttm_placement’ has no member named ‘busy_placement’; did you mean ‘num_placement’?
56 | .busy_placement = &sys_placement_flags,
| ^~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c:56:20: warning: excess elements in struct initializer
56 | .busy_placement = &sys_placement_flags,
| ^
../drivers/gpu/drm/xe/xe_bo.c:56:20: note: (near initialization for ‘tt_placement’)
../drivers/gpu/drm/xe/xe_bo.c: In function ‘__xe_bo_placement_for_flags’:
../drivers/gpu/drm/xe/xe_bo.c:233:4: error: ‘struct ttm_placement’ has no member named ‘num_busy_placement’; did you mean ‘num_placement’?
233 | .num_busy_placement = c,
| ^~~~~~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c:233:25: warning: excess elements in struct initializer
233 | .num_busy_placement = c,
| ^
../drivers/gpu/drm/xe/xe_bo.c:233:25: note: (near initialization for ‘(anonymous)’)
../drivers/gpu/drm/xe/xe_bo.c:234:4: error: ‘struct ttm_placement’ has no member named ‘busy_placement’; did you mean ‘num_placement’?
234 | .busy_placement = bo->placements,
| ^~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c:234:21: warning: excess elements in struct initializer
234 | .busy_placement = bo->placements,
| ^~
../drivers/gpu/drm/xe/xe_bo.c:234:21: note: (near initialization for ‘(anonymous)’)
../drivers/gpu/drm/xe/xe_bo.c: In function ‘xe_evict_flags’:
../drivers/gpu/drm/xe/xe_bo.c:254:15: error: ‘struct ttm_placement’ has no member named ‘num_busy_placement’; did you mean ‘num_placement’?
254 | placement->num_busy_placement = 0;
| ^~~~~~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c: In function ‘__xe_bo_fixed_placement’:
../drivers/gpu/drm/xe/xe_bo.c:1394:4: error: ‘struct ttm_placement’ has no member named ‘num_busy_placement’; did you mean ‘num_placement’?
1394 | .num_busy_placement = 1,
| ^~~~~~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c:1394:25: warning: excess elements in struct initializer
1394 | .num_busy_placement = 1,
| ^
../drivers/gpu/drm/xe/xe_bo.c:1394:25: note: (near initialization for ‘(anonymous)’)
../drivers/gpu/drm/xe/xe_bo.c:1395:4: error: ‘struct ttm_placement’ has no member named ‘busy_placement’; did you mean ‘num_placement’?
1395 | .busy_placement = place,
| ^~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c:1395:21: warning: excess elements in struct initializer
1395 | .busy_placement = place,
| ^~~~~
../drivers/gpu/drm/xe/xe_bo.c:1395:21: note: (near initialization for ‘(anonymous)’)
../drivers/gpu/drm/xe/xe_bo.c: In function ‘xe_bo_migrate’:
../drivers/gpu/drm/xe/xe_bo.c:2153:12: error: ‘struct ttm_placement’ has no member named ‘num_busy_placement’; did you mean ‘num_placement’?
2153 | placement.num_busy_placement = 1;
| ^~~~~~~~~~~~~~~~~~
| num_placement
../drivers/gpu/drm/xe/xe_bo.c:2155:12: error: ‘struct ttm_placement’ has no member named ‘busy_placement’; did you mean ‘num_placement’?
2155 | placement.busy_placement = &requested;
| ^~~~~~~~~~~~~~
| num_placement
make[7]: *** [../scripts/Makefile.build:243: drivers/gpu/drm/xe/xe_bo.o] Error 1
make[7]: *** Waiting for unfinished jobs....
make[6]: *** [../scripts/Makefile.build:481: drivers/gpu/drm/xe] Error 2
make[5]: *** [../scripts/Makefile.build:481: drivers/gpu/drm] Error 2
make[4]: *** [../scripts/Makefile.build:481: drivers/gpu] Error 2
make[4]: *** Waiting for unfinished jobs....
../lib/iomap.c:156:5: warning: no previous prototype for ‘ioread64_lo_hi’ [-Wmissing-prototypes]
156 | u64 ioread64_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:163:5: warning: no previous prototype for ‘ioread64_hi_lo’ [-Wmissing-prototypes]
163 | u64 ioread64_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:170:5: warning: no previous prototype for ‘ioread64be_lo_hi’ [-Wmissing-prototypes]
170 | u64 ioread64be_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:178:5: warning: no previous prototype for ‘ioread64be_hi_lo’ [-Wmissing-prototypes]
178 | u64 ioread64be_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:264:6: warning: no previous prototype for ‘iowrite64_lo_hi’ [-Wmissing-prototypes]
264 | void iowrite64_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:272:6: warning: no previous prototype for ‘iowrite64_hi_lo’ [-Wmissing-prototypes]
272 | void iowrite64_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:280:6: warning: no previous prototype for ‘iowrite64be_lo_hi’ [-Wmissing-prototypes]
280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
../lib/iomap.c:288:6: warning: no previous prototype for ‘iowrite64be_hi_lo’ [-Wmissing-prototypes]
288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
make[3]: *** [../scripts/Makefile.build:481: drivers] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [/kernel/Makefile:1917: .] Error 2
make[1]: *** [/kernel/Makefile:240: __sub-make] Error 2
make: *** [Makefile:240: __sub-make] Error 2
[16:42:34] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[16:42:38] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make ARCH=um O=.kunit --jobs=48
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] drm/hwmon: Fix abi doc warnings
@ 2024-01-27 16:50 Badal Nilawar
2024-01-27 16:42 ` ✓ CI.Patch_applied: success for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Badal Nilawar @ 2024-01-27 16:50 UTC (permalink / raw)
To: intel-xe; +Cc: intel-gfx, lucas.demarchi, thomas.hellstrom, rodrigo.vivi
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
Fixes: fb1b70607f73 ("drm/xe/hwmon: Expose power attributes")
Fixes: 92d44a422d0d ("drm/xe/hwmon: Expose card reactive critical power")
Fixes: fbcdc9d3bf58 ("drm/xe/hwmon: Expose input voltage attribute")
Fixes: 71d0a32524f9 ("drm/xe/hwmon: Expose hwmon energy attribute")
Fixes: 4446fcf220ce ("drm/xe/hwmon: Expose power1_max_interval")
Fixes: f8572bb67525 ("drm/i915/hwmon: Add HWMON current voltage support")
Fixes: 99f55efb7911 ("drm/i915/hwmon: Power PL1 limit and TDP setting")
Fixes: 4c2572fe0ae7 ("drm/i915/hwmon: Expose power1_max_interval")
Fixes: c8939848f7e4 ("drm/i915/hwmon: Expose card reactive critical power")
Fixes: c41b8bdcc297 ("drm/i915/hwmon: Show device level energy usage")
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Cc: Lucas Demarchi <lucas.demarchi@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
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>
---
.../ABI/testing/sysfs-driver-intel-i915-hwmon | 14 +++++++-------
.../ABI/testing/sysfs-driver-intel-xe-hwmon | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
index 8d7d8f05f6cd..92fe7c5c5ac1 100644
--- a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
+++ b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
@@ -1,4 +1,4 @@
-What: /sys/devices/.../hwmon/hwmon<i>/in0_input
+What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input
Date: February 2023
KernelVersion: 6.2
Contact: intel-gfx@lists.freedesktop.org
@@ -6,7 +6,7 @@ Description: RO. Current Voltage in millivolt.
Only supported for particular Intel i915 graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/power1_max
+What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max
Date: February 2023
KernelVersion: 6.2
Contact: intel-gfx@lists.freedesktop.org
@@ -20,7 +20,7 @@ Description: RW. Card reactive sustained (PL1/Tau) power limit in microwatts.
Only supported for particular Intel i915 graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max
+What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_rated_max
Date: February 2023
KernelVersion: 6.2
Contact: intel-gfx@lists.freedesktop.org
@@ -28,7 +28,7 @@ Description: RO. Card default power limit (default TDP setting).
Only supported for particular Intel i915 graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/power1_max_interval
+What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_max_interval
Date: February 2023
KernelVersion: 6.2
Contact: intel-gfx@lists.freedesktop.org
@@ -37,7 +37,7 @@ Description: RW. Sustained power limit interval (Tau in PL1/Tau) in
Only supported for particular Intel i915 graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/power1_crit
+What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/power1_crit
Date: February 2023
KernelVersion: 6.2
Contact: intel-gfx@lists.freedesktop.org
@@ -50,7 +50,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts.
Only supported for particular Intel i915 graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/curr1_crit
+What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/curr1_crit
Date: February 2023
KernelVersion: 6.2
Contact: intel-gfx@lists.freedesktop.org
@@ -63,7 +63,7 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes.
Only supported for particular Intel i915 graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/energy1_input
+What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/energy1_input
Date: February 2023
KernelVersion: 6.2
Contact: intel-gfx@lists.freedesktop.org
diff --git a/Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon b/Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon
index 8c321bc9dc04..023fd82de3f7 100644
--- a/Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon
+++ b/Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon
@@ -1,4 +1,4 @@
-What: /sys/devices/.../hwmon/hwmon<i>/power1_max
+What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max
Date: September 2023
KernelVersion: 6.5
Contact: intel-xe@lists.freedesktop.org
@@ -12,7 +12,7 @@ Description: RW. Card reactive sustained (PL1) power limit in microwatts.
Only supported for particular Intel xe graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max
+What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_rated_max
Date: September 2023
KernelVersion: 6.5
Contact: intel-xe@lists.freedesktop.org
@@ -20,7 +20,7 @@ Description: RO. Card default power limit (default TDP setting).
Only supported for particular Intel xe graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/power1_crit
+What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_crit
Date: September 2023
KernelVersion: 6.5
Contact: intel-xe@lists.freedesktop.org
@@ -33,7 +33,7 @@ Description: RW. Card reactive critical (I1) power limit in microwatts.
Only supported for particular Intel xe graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/curr1_crit
+What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/curr1_crit
Date: September 2023
KernelVersion: 6.5
Contact: intel-xe@lists.freedesktop.org
@@ -44,7 +44,7 @@ Description: RW. Card reactive critical (I1) power limit in milliamperes.
the operating frequency if the power averaged over a window
exceeds this limit.
-What: /sys/devices/.../hwmon/hwmon<i>/in0_input
+What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/in0_input
Date: September 2023
KernelVersion: 6.5
Contact: intel-xe@lists.freedesktop.org
@@ -52,7 +52,7 @@ Description: RO. Current Voltage in millivolt.
Only supported for particular Intel xe graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/energy1_input
+What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/energy1_input
Date: September 2023
KernelVersion: 6.5
Contact: intel-xe@lists.freedesktop.org
@@ -60,7 +60,7 @@ Description: RO. Energy input of device in microjoules.
Only supported for particular Intel xe graphics platforms.
-What: /sys/devices/.../hwmon/hwmon<i>/power1_max_interval
+What: /sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/power1_max_interval
Date: October 2023
KernelVersion: 6.6
Contact: intel-xe@lists.freedesktop.org
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2] drm/hwmon: Fix abi doc warnings
2024-01-27 16:50 [PATCH v2] drm/hwmon: Fix abi doc warnings Badal Nilawar
` (2 preceding siblings ...)
2024-01-27 16:42 ` ✗ CI.KUnit: failure " Patchwork
@ 2024-01-27 20:10 ` Dixit, Ashutosh
2024-01-29 15:18 ` Lucas De Marchi
3 siblings, 1 reply; 10+ messages in thread
From: Dixit, Ashutosh @ 2024-01-27 20:10 UTC (permalink / raw)
To: Badal Nilawar
Cc: intel-gfx, lucas.demarchi, thomas.hellstrom, rodrigo.vivi,
intel-xe
On Sat, 27 Jan 2024 08:50:40 -0800, Badal Nilawar wrote:
>
Hi Badal,
> 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
/snip/
> diff --git a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
> index 8d7d8f05f6cd..92fe7c5c5ac1 100644
> --- a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
> +++ b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
> @@ -1,4 +1,4 @@
> -What: /sys/devices/.../hwmon/hwmon<i>/in0_input
Are the warnings happening because this path doesn't exist?
> +What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input
So this I guess could also be
/sys/class/drm/card<n>/device/hwmon/hwmon<i>/in0_input?
But no need to change, what you have is also a valid path. But maybe to
make clear:
/sys/bus/pci/drivers/i915/<device>/hwmon/hwmon<i>/in0_input
?
But anyway...
Assuming you turned on the htmldoc build option, could reproduce this and
verified that this patch is fixing these warnings, this is:
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Re: [PATCH v2] drm/hwmon: Fix abi doc warnings
2024-01-27 20:10 ` [PATCH v2] " Dixit, Ashutosh
@ 2024-01-29 15:18 ` Lucas De Marchi
2024-01-29 15:22 ` Rodrigo Vivi
2024-01-29 16:24 ` Dixit, Ashutosh
0 siblings, 2 replies; 10+ messages in thread
From: Lucas De Marchi @ 2024-01-29 15:18 UTC (permalink / raw)
To: Dixit, Ashutosh; +Cc: intel-gfx, thomas.hellstrom, rodrigo.vivi, intel-xe
On Sat, Jan 27, 2024 at 12:10:08PM -0800, Ashutosh Dixit wrote:
>On Sat, 27 Jan 2024 08:50:40 -0800, Badal Nilawar wrote:
>>
>
>Hi Badal,
>
>> 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
>
>/snip/
>
>> diff --git a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
>> index 8d7d8f05f6cd..92fe7c5c5ac1 100644
>> --- a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
>> +++ b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
>> @@ -1,4 +1,4 @@
>> -What: /sys/devices/.../hwmon/hwmon<i>/in0_input
>
>Are the warnings happening because this path doesn't exist?
>
>> +What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input
>
>So this I guess could also be
>
>/sys/class/drm/card<n>/device/hwmon/hwmon<i>/in0_input?
no. the issue is not that it doesn't exist, but that the same path is
documented in 2 different places. If the interface is exactly the same,
there could be just 1 place to document it and then reuse the same file
(without the module name). If the interfaces are not identical, then we
should differentiate them like is done here.
+i915 maintainers
Are you ok with merging this through either xe or i915 trees
instead of splitting the patch? My preference is the first option.
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
also tested that this fixes the issue when building docs.
thanks
Lucas De Marchi
>
>But no need to change, what you have is also a valid path. But maybe to
>make clear:
>
>/sys/bus/pci/drivers/i915/<device>/hwmon/hwmon<i>/in0_input
>
>?
>
>But anyway...
>
>Assuming you turned on the htmldoc build option, could reproduce this and
>verified that this patch is fixing these warnings, this is:
>
>Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Re: [PATCH v2] drm/hwmon: Fix abi doc warnings
2024-01-29 15:18 ` Lucas De Marchi
@ 2024-01-29 15:22 ` Rodrigo Vivi
2024-01-29 16:36 ` Jani Nikula
2024-01-29 16:24 ` Dixit, Ashutosh
1 sibling, 1 reply; 10+ messages in thread
From: Rodrigo Vivi @ 2024-01-29 15:22 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx, thomas.hellstrom, intel-xe
On Mon, Jan 29, 2024 at 09:18:59AM -0600, Lucas De Marchi wrote:
> On Sat, Jan 27, 2024 at 12:10:08PM -0800, Ashutosh Dixit wrote:
> > On Sat, 27 Jan 2024 08:50:40 -0800, Badal Nilawar wrote:
> > >
> >
> > Hi Badal,
> >
> > > 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
> >
> > /snip/
> >
> > > diff --git a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
> > > index 8d7d8f05f6cd..92fe7c5c5ac1 100644
> > > --- a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
> > > +++ b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
> > > @@ -1,4 +1,4 @@
> > > -What: /sys/devices/.../hwmon/hwmon<i>/in0_input
> >
> > Are the warnings happening because this path doesn't exist?
> >
> > > +What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input
> >
> > So this I guess could also be
> >
> > /sys/class/drm/card<n>/device/hwmon/hwmon<i>/in0_input?
>
> no. the issue is not that it doesn't exist, but that the same path is
> documented in 2 different places. If the interface is exactly the same,
> there could be just 1 place to document it and then reuse the same file
> (without the module name). If the interfaces are not identical, then we
> should differentiate them like is done here.
>
> +i915 maintainers
>
> Are you ok with merging this through either xe or i915 trees
> instead of splitting the patch? My preference is the first option.
it won't conflict with anything we have on our side there, so
it can go with drm-xe-next.
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
>
> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
> also tested that this fixes the issue when building docs.
>
> thanks
> Lucas De Marchi
>
> >
> > But no need to change, what you have is also a valid path. But maybe to
> > make clear:
> >
> > /sys/bus/pci/drivers/i915/<device>/hwmon/hwmon<i>/in0_input
> >
> > ?
> >
> > But anyway...
> >
> > Assuming you turned on the htmldoc build option, could reproduce this and
> > verified that this patch is fixing these warnings, this is:
> >
> > Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] drm/hwmon: Fix abi doc warnings
2024-01-29 15:18 ` Lucas De Marchi
2024-01-29 15:22 ` Rodrigo Vivi
@ 2024-01-29 16:24 ` Dixit, Ashutosh
1 sibling, 0 replies; 10+ messages in thread
From: Dixit, Ashutosh @ 2024-01-29 16:24 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx, thomas.hellstrom, rodrigo.vivi, intel-xe
On Mon, 29 Jan 2024 07:18:59 -0800, Lucas De Marchi wrote:
>
> On Sat, Jan 27, 2024 at 12:10:08PM -0800, Ashutosh Dixit wrote:
> > On Sat, 27 Jan 2024 08:50:40 -0800, Badal Nilawar wrote:
> >>
> >
> > Hi Badal,
> >
> >> 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
> >
> > /snip/
> >
> >> diff --git a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
> >> index 8d7d8f05f6cd..92fe7c5c5ac1 100644
> >> --- a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
> >> +++ b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
> >> @@ -1,4 +1,4 @@
> >> -What: /sys/devices/.../hwmon/hwmon<i>/in0_input
> >
> > Are the warnings happening because this path doesn't exist?
> >
> >> +What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon<i>/in0_input
> >
> > So this I guess could also be
> >
> > /sys/class/drm/card<n>/device/hwmon/hwmon<i>/in0_input?
>
> no. the issue is not that it doesn't exist, but that the same path is
> documented in 2 different places. If the interface is exactly the same,
> there could be just 1 place to document it and then reuse the same file
> (without the module name). If the interfaces are not identical, then we
> should differentiate them like is done here.
Ah, got it, thanks!
>
> +i915 maintainers
>
> Are you ok with merging this through either xe or i915 trees
> instead of splitting the patch? My preference is the first option.
>
>
> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
> also tested that this fixes the issue when building docs.
>
> thanks
> Lucas De Marchi
>
> >
> > But no need to change, what you have is also a valid path. But maybe to
> > make clear:
> >
> > /sys/bus/pci/drivers/i915/<device>/hwmon/hwmon<i>/in0_input
> >
> > ?
> >
> > But anyway...
> >
> > Assuming you turned on the htmldoc build option, could reproduce this and
> > verified that this patch is fixing these warnings, this is:
> >
> > Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Re: [PATCH v2] drm/hwmon: Fix abi doc warnings
2024-01-29 15:22 ` Rodrigo Vivi
@ 2024-01-29 16:36 ` Jani Nikula
2024-01-30 4:43 ` Lucas De Marchi
0 siblings, 1 reply; 10+ messages in thread
From: Jani Nikula @ 2024-01-29 16:36 UTC (permalink / raw)
To: Rodrigo Vivi, Lucas De Marchi; +Cc: intel-gfx, thomas.hellstrom, intel-xe
On Mon, 29 Jan 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Mon, Jan 29, 2024 at 09:18:59AM -0600, Lucas De Marchi wrote:
>> no. the issue is not that it doesn't exist, but that the same path is
>> documented in 2 different places. If the interface is exactly the same,
>> there could be just 1 place to document it and then reuse the same file
>> (without the module name). If the interfaces are not identical, then we
>> should differentiate them like is done here.
Completely agreed.
>>
>> +i915 maintainers
>>
>> Are you ok with merging this through either xe or i915 trees
>> instead of splitting the patch? My preference is the first option.
>
> it won't conflict with anything we have on our side there, so
> it can go with drm-xe-next.
>
> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Re: Re: [PATCH v2] drm/hwmon: Fix abi doc warnings
2024-01-29 16:36 ` Jani Nikula
@ 2024-01-30 4:43 ` Lucas De Marchi
0 siblings, 0 replies; 10+ messages in thread
From: Lucas De Marchi @ 2024-01-30 4:43 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, thomas.hellstrom, intel-xe, Rodrigo Vivi
On Mon, Jan 29, 2024 at 06:36:13PM +0200, Jani Nikula wrote:
>On Mon, 29 Jan 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
>> On Mon, Jan 29, 2024 at 09:18:59AM -0600, Lucas De Marchi wrote:
>>> no. the issue is not that it doesn't exist, but that the same path is
>>> documented in 2 different places. If the interface is exactly the same,
>>> there could be just 1 place to document it and then reuse the same file
>>> (without the module name). If the interfaces are not identical, then we
>>> should differentiate them like is done here.
>
>Completely agreed.
>
>>>
>>> +i915 maintainers
>>>
>>> Are you ok with merging this through either xe or i915 trees
>>> instead of splitting the patch? My preference is the first option.
>>
>> it won't conflict with anything we have on our side there, so
>> it can go with drm-xe-next.
>>
>> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
>Acked-by: Jani Nikula <jani.nikula@intel.com>
thank you all. Pushed to drm-xe-next.
Lucas De Marchi
>
>
>--
>Jani Nikula, Intel
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-01-30 4:43 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-27 16:50 [PATCH v2] drm/hwmon: Fix abi doc warnings Badal Nilawar
2024-01-27 16:42 ` ✓ CI.Patch_applied: success for " Patchwork
2024-01-27 16:42 ` ✗ CI.checkpatch: warning " Patchwork
2024-01-27 16:42 ` ✗ CI.KUnit: failure " Patchwork
2024-01-27 20:10 ` [PATCH v2] " Dixit, Ashutosh
2024-01-29 15:18 ` Lucas De Marchi
2024-01-29 15:22 ` Rodrigo Vivi
2024-01-29 16:36 ` Jani Nikula
2024-01-30 4:43 ` Lucas De Marchi
2024-01-29 16:24 ` Dixit, Ashutosh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox