Impact: cosmetic change in Kconfig menu layout This patch was originally suggested by Peter Zijlstra, but seems it was forgotten. CONFIG_MMIOTRACE and CONFIG_MMIOTRACE_TEST were selectable directly under the Kernel hacking / debugging menu in the kernel configuration system. They were present only for x86 and x86_64. Other tracers that use the ftrace tracing framework are in their own sub-menu. This patch moves the mmiotrace configuration options there. Since the Kconfig file, where the tracer menu is, is not architecture specific, HAVE_MMIOTRACE_SUPPORT is introduced and provided only by x86/x86_64. CONFIG_MMIOTRACE now depends on it.
Unified · Split
| @@ -174,28 +174,8 @@ config IOMMU_LEAK · 173 unmodified lines | ||
| 174 | 174 | Add a simple leak tracer to the IOMMU code. This is useful when you |
| 175 | 175 | are debugging a buggy device driver that leaks IOMMU mappings. |
| 176 | 176 | |
| 177 | −config MMIOTRACE | |
| 178 | − bool "Memory mapped IO tracing" | |
| 179 | − depends on DEBUG_KERNEL && PCI | |
| 180 | − select TRACING | |
| 181 | − help | |
| 182 | − Mmiotrace traces Memory Mapped I/O access and is meant for | |
| 183 | − debugging and reverse engineering. It is called from the ioremap | |
| 184 | − implementation and works via page faults. Tracing is disabled by | |
| 185 | − default and can be enabled at run-time. | |
| 186 | − | |
| 187 | − See Documentation/tracers/mmiotrace.txt. | |
| 188 | − If you are not helping to develop drivers, say N. | |
| 189 | − | |
| 190 | −config MMIOTRACE_TEST | |
| 191 | − tristate "Test module for mmiotrace" | |
| 192 | − depends on MMIOTRACE && m | |
| 193 | − help | |
| 194 | − This is a dumb module for testing mmiotrace. It is very dangerous | |
| 195 | − as it will write garbage to IO memory starting at a given address. | |
| 196 | − However, it should be safe to use on e.g. unused portion of VRAM. | |
| 197 | − | |
| 198 | − Say N, unless you absolutely know what you are doing. | |
| 177 | +config HAVE_MMIOTRACE_SUPPORT | |
| 178 | + def_bool y | |
| 199 | 179 | |
| 200 | 180 | # |
| 201 | 181 | # IO delay types: |
| @@ -323,4 +323,27 @@ config FTRACE_STARTUP_TEST · 322 unmodified lines | ||
| 323 | 323 | functioning properly. It will do tests on all the configured |
| 324 | 324 | tracers of ftrace. |
| 325 | 325 | |
| 326 | +config MMIOTRACE | |
| 327 | + bool "Memory mapped IO tracing" | |
| 328 | + depends on HAVE_MMIOTRACE_SUPPORT && DEBUG_KERNEL && PCI | |
| 329 | + select TRACING | |
| 330 | + help | |
| 331 | + Mmiotrace traces Memory Mapped I/O access and is meant for | |
| 332 | + debugging and reverse engineering. It is called from the ioremap | |
| 333 | + implementation and works via page faults. Tracing is disabled by | |
| 334 | + default and can be enabled at run-time. | |
| 335 | + | |
| 336 | + See Documentation/tracers/mmiotrace.txt. | |
| 337 | + If you are not helping to develop drivers, say N. | |
| 338 | + | |
| 339 | +config MMIOTRACE_TEST | |
| 340 | + tristate "Test module for mmiotrace" | |
| 341 | + depends on MMIOTRACE && m | |
| 342 | + help | |
| 343 | + This is a dumb module for testing mmiotrace. It is very dangerous | |
| 344 | + as it will write garbage to IO memory starting at a given address. | |
| 345 | + However, it should be safe to use on e.g. unused portion of VRAM. | |
| 346 | + | |
| 347 | + Say N, unless you absolutely know what you are doing. | |
| 348 | + | |
| 326 | 349 | endmenu |