On 31 October 2014 09:58, Jon Medhurst (Tixy) tixy@linaro.org wrote:

Hi Mark, Alex

ARM have released a new version of DS-5 and I have a pull request below to update the version of gator in LSK...

Pulled and pushed, thanks.

The following changes since commit ed30f24e8d07d30aa3e69d1f508f4d7bd2e8ea14:

Merge branch 'lsk-3.10-gator-5.19' into lsk-3.10-gator (2014-08-04 15:52:55 +0100)

are available in the git repository at:

git://git.linaro.org/landing-teams/working/arm/kernel.git lsk-3.10-gator

for you to fetch changes up to 715db954c8f2d97a6742ff13be91c99db22135e9:

Merge branch 'lsk-3.10-gator-5.20' into lsk-3.10-gator (2014-10-30 18:07:34 +0000)

---

Jon Medhurst (3): gator: Version 5.20 gator: Add config for building the module in-tree Merge branch 'lsk-3.10-gator-5.20' into lsk-3.10-gator

drivers/gator/Kconfig | 4 +- drivers/gator/Makefile | 22 +- drivers/gator/gator.h | 41 +- drivers/gator/gator_annotate.c | 67 +-- drivers/gator/gator_annotate_kernel.c | 30 +- drivers/gator/gator_backtrace.c | 66 +-- drivers/gator/gator_buffer.c | 71 +-- drivers/gator/gator_buffer_write.c | 19 +- drivers/gator/gator_cookies.c | 67 +-- drivers/gator/gator_events_armv6.c | 47 +- drivers/gator/gator_events_armv7.c | 90 ++-- drivers/gator/gator_events_block.c | 29 +- drivers/gator/gator_events_ccn-504.c | 346 --------------- drivers/gator/gator_events_irq.c | 14 +- drivers/gator/gator_events_l2c-310.c | 6 +- drivers/gator/gator_events_mali_4xx.c | 181 +++----- drivers/gator/gator_events_mali_common.c | 21 +- drivers/gator/gator_events_mali_common.h | 17 +- ...nts_mali_t6xx.c => gator_events_mali_midgard.c} | 147 +++--- ...li_t6xx_hw.c => gator_events_mali_midgard_hw.c} | 492 ++++++++++++--------- ..._test.c => gator_events_mali_midgard_hw_test.c} | 8 +- drivers/gator/gator_events_meminfo.c | 197 ++++++--- drivers/gator/gator_events_mmapped.c | 6 +- drivers/gator/gator_events_net.c | 22 +- drivers/gator/gator_events_perf_pmu.c | 207 ++++----- drivers/gator/gator_events_sched.c | 14 +- drivers/gator/gator_events_scorpion.c | 81 ++-- drivers/gator/gator_events_threads.c | 115 ----- drivers/gator/gator_fs.c | 9 +- drivers/gator/gator_hrtimer_gator.c | 8 +- drivers/gator/gator_iks.c | 22 +- drivers/gator/gator_main.c | 349 ++++++++------- drivers/gator/gator_marshaling.c | 75 ++-- drivers/gator/gator_trace_gpu.c | 88 ++-- drivers/gator/gator_trace_power.c | 61 ++- drivers/gator/gator_trace_sched.c | 104 +++-- drivers/gator/mali/mali_dd_gator_api.h | 40 -- drivers/gator/mali/mali_kbase_gator_api.h | 219 +++++++++ .../gator/mali/mali_mjollnir_profiling_gator_api.h | 192 ++++---- .../gator/mali/mali_utgard_profiling_gator_api.h | 214 +++++---- drivers/gator/{mali_t6xx.mk => mali_midgard.mk} | 4 +- tools/gator/daemon/Android.mk | 17 +- tools/gator/daemon/AnnotateListener.cpp | 69 +++ tools/gator/daemon/AnnotateListener.h | 31 ++ tools/gator/daemon/Application.mk | 2 + tools/gator/daemon/Buffer.cpp | 215 +++++---- tools/gator/daemon/Buffer.h | 38 +- tools/gator/daemon/CCNDriver.cpp | 295 ++++++++++++ tools/gator/daemon/CCNDriver.h | 43 ++ tools/gator/daemon/CPUFreqDriver.cpp | 58 +++ tools/gator/daemon/CPUFreqDriver.h | 34 ++ tools/gator/daemon/CapturedXML.cpp | 17 +- tools/gator/daemon/CapturedXML.h | 4 +- tools/gator/daemon/Child.cpp | 82 +++- tools/gator/daemon/Child.h | 4 +- tools/gator/daemon/Command.cpp | 172 +++++++ tools/gator/daemon/Command.h | 14 + tools/gator/daemon/Config.h | 13 +- tools/gator/daemon/DiskIODriver.cpp | 125 ++++++ tools/gator/daemon/DiskIODriver.h | 39 ++ tools/gator/daemon/Driver.cpp | 81 ++++ tools/gator/daemon/Driver.h | 76 +++- tools/gator/daemon/DriverSource.cpp | 19 +- tools/gator/daemon/DynBuf.cpp | 2 +- tools/gator/daemon/EventsXML.cpp | 2 +- tools/gator/daemon/ExternalSource.cpp | 87 +++- tools/gator/daemon/ExternalSource.h | 8 +- tools/gator/daemon/FSDriver.cpp | 140 ++---- tools/gator/daemon/FSDriver.h | 19 +- tools/gator/daemon/Fifo.cpp | 5 +- tools/gator/daemon/Fifo.h | 10 +- tools/gator/daemon/FtraceDriver.cpp | 118 +++++ tools/gator/daemon/FtraceDriver.h | 31 ++ tools/gator/daemon/FtraceSource.cpp | 158 +++++++ tools/gator/daemon/FtraceSource.h | 43 ++ tools/gator/daemon/Hwmon.h | 45 -- tools/gator/daemon/{Hwmon.cpp => HwmonDriver.cpp} | 213 +++------ tools/gator/daemon/HwmonDriver.h | 31 ++ tools/gator/daemon/KMod.cpp | 9 + tools/gator/daemon/KMod.h | 7 +- tools/gator/daemon/LocalCapture.h | 4 +- tools/gator/daemon/Logging.cpp | 18 +- tools/gator/daemon/Logging.h | 12 +- tools/gator/daemon/Makefile | 5 +- tools/gator/daemon/MaliVideoDriver.cpp | 148 ++----- tools/gator/daemon/MaliVideoDriver.h | 17 +- tools/gator/daemon/MemInfoDriver.cpp | 93 ++++ tools/gator/daemon/MemInfoDriver.h | 37 ++ tools/gator/daemon/Monitor.cpp | 14 + tools/gator/daemon/NetDriver.cpp | 129 ++++++ tools/gator/daemon/NetDriver.h | 39 ++ tools/gator/daemon/OlySocket.cpp | 54 ++- tools/gator/daemon/OlySocket.h | 9 + tools/gator/daemon/PerfBuffer.cpp | 65 ++- tools/gator/daemon/PerfBuffer.h | 4 +- tools/gator/daemon/PerfDriver.cpp | 194 +++----- tools/gator/daemon/PerfDriver.h | 15 +- tools/gator/daemon/PerfGroup.cpp | 66 ++- tools/gator/daemon/PerfGroup.h | 14 +- tools/gator/daemon/PerfSource.cpp | 306 ++++++++++--- tools/gator/daemon/PerfSource.h | 3 +- tools/gator/daemon/Proc.cpp | 137 +++++- tools/gator/daemon/Proc.h | 6 +- tools/gator/daemon/Sender.cpp | 7 +- tools/gator/daemon/Sender.h | 4 +- tools/gator/daemon/SessionData.cpp | 91 +++- tools/gator/daemon/SessionData.h | 44 +- tools/gator/daemon/SessionXML.cpp | 40 +- tools/gator/daemon/SessionXML.h | 12 +- tools/gator/daemon/Setup.cpp | 232 ++++++++++ tools/gator/daemon/Setup.h | 18 + tools/gator/daemon/StreamlineSetup.h | 4 +- tools/gator/daemon/UEvent.cpp | 3 +- tools/gator/daemon/UserSpaceSource.cpp | 23 +- tools/gator/daemon/defaults.xml | 33 +- ...events-Cortex-A12.xml => events-Cortex-A17.xml} | 8 +- tools/gator/daemon/events-Filesystem.xml | 12 +- tools/gator/daemon/events-Linux.xml | 11 +- tools/gator/daemon/events-Mali-Midgard.xml | 46 ++ tools/gator/daemon/events-Mali-Midgard_hw.xml | 91 ++++ tools/gator/daemon/events-Mali-T60x_hw.xml | 108 +++++ tools/gator/daemon/events-Mali-T62x_hw.xml | 109 +++++ tools/gator/daemon/events-Mali-T6xx.xml | 46 -- tools/gator/daemon/events-Mali-T6xx_hw.xml | 91 ---- tools/gator/daemon/events-Mali-T72x_hw.xml | 95 ++++ tools/gator/daemon/events-Mali-T76x_hw.xml | 108 +++++ tools/gator/daemon/events-Mali-V500.xml | 55 +-- tools/gator/daemon/events-ftrace.xml | 7 + tools/gator/daemon/main.cpp | 95 ++-- tools/gator/daemon/mxml/config.h | 10 +- tools/gator/daemon/mxml/mxml-attr.c | 19 +- tools/gator/daemon/mxml/mxml-entity.c | 19 +- tools/gator/daemon/mxml/mxml-file.c | 104 ++--- tools/gator/daemon/mxml/mxml-get.c | 27 +- tools/gator/daemon/mxml/mxml-index.c | 11 +- tools/gator/daemon/mxml/mxml-node.c | 31 +- tools/gator/daemon/mxml/mxml-private.c | 42 +- tools/gator/daemon/mxml/mxml-private.h | 8 +- tools/gator/daemon/mxml/mxml-search.c | 17 +- tools/gator/daemon/mxml/mxml-set.c | 20 +- tools/gator/daemon/mxml/mxml-string.c | 21 +- tools/gator/daemon/mxml/mxml.h | 17 +- 142 files changed, 5885 insertions(+), 3431 deletions(-) delete mode 100644 drivers/gator/gator_events_ccn-504.c rename drivers/gator/{gator_events_mali_t6xx.c => gator_events_mali_midgard.c} (78%) rename drivers/gator/{gator_events_mali_t6xx_hw.c => gator_events_mali_midgard_hw.c} (59%) rename drivers/gator/{gator_events_mali_t6xx_hw_test.c => gator_events_mali_midgard_hw_test.c} (88%) delete mode 100644 drivers/gator/gator_events_threads.c delete mode 100644 drivers/gator/mali/mali_dd_gator_api.h create mode 100644 drivers/gator/mali/mali_kbase_gator_api.h rename drivers/gator/{mali_t6xx.mk => mali_midgard.mk} (91%) create mode 100644 tools/gator/daemon/AnnotateListener.cpp create mode 100644 tools/gator/daemon/AnnotateListener.h create mode 100644 tools/gator/daemon/CCNDriver.cpp create mode 100644 tools/gator/daemon/CCNDriver.h create mode 100644 tools/gator/daemon/CPUFreqDriver.cpp create mode 100644 tools/gator/daemon/CPUFreqDriver.h create mode 100644 tools/gator/daemon/Command.cpp create mode 100644 tools/gator/daemon/Command.h create mode 100644 tools/gator/daemon/DiskIODriver.cpp create mode 100644 tools/gator/daemon/DiskIODriver.h create mode 100644 tools/gator/daemon/FtraceDriver.cpp create mode 100644 tools/gator/daemon/FtraceDriver.h create mode 100644 tools/gator/daemon/FtraceSource.cpp create mode 100644 tools/gator/daemon/FtraceSource.h delete mode 100644 tools/gator/daemon/Hwmon.h rename tools/gator/daemon/{Hwmon.cpp => HwmonDriver.cpp} (51%) create mode 100644 tools/gator/daemon/HwmonDriver.h create mode 100644 tools/gator/daemon/MemInfoDriver.cpp create mode 100644 tools/gator/daemon/MemInfoDriver.h create mode 100644 tools/gator/daemon/NetDriver.cpp create mode 100644 tools/gator/daemon/NetDriver.h create mode 100644 tools/gator/daemon/Setup.cpp create mode 100644 tools/gator/daemon/Setup.h rename tools/gator/daemon/{events-Cortex-A12.xml => events-Cortex-A17.xml} (97%) create mode 100644 tools/gator/daemon/events-Mali-Midgard.xml create mode 100644 tools/gator/daemon/events-Mali-Midgard_hw.xml create mode 100644 tools/gator/daemon/events-Mali-T60x_hw.xml create mode 100644 tools/gator/daemon/events-Mali-T62x_hw.xml delete mode 100644 tools/gator/daemon/events-Mali-T6xx.xml delete mode 100644 tools/gator/daemon/events-Mali-T6xx_hw.xml create mode 100644 tools/gator/daemon/events-Mali-T72x_hw.xml create mode 100644 tools/gator/daemon/events-Mali-T76x_hw.xml create mode 100644 tools/gator/daemon/events-ftrace.xml