On 01/02/2014 08:03 PM, Jon Medhurst (Tixy) wrote:
The following changes since commit 01239d6842a2e2653b7b42736cf2c10b69d0face:
Merge in gator version 5.16 (2013-10-11 12:53:06 +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 dffc698f098d93044e28f4f97206eca6373c7cdf:
Merge in gator version 5.17 (2013-12-19 09:36:46 +0000)
Tixy, The patchset was pushed to lsk-test branch for testing now. Only 2 commits are new for lsk:
commit 5117405fd2f65a2ad717085a4e03b3eea349cb37 Author: Drew Richardson drew.richardson@arm.com Date: Tue Dec 17 23:40:56 2013 +0000
gator-driver: Handle task struct correctly
commit df8bb91dd87b31ffb0367d541e6aa63bdc1c49bc Author: Jon Medhurst tixy@linaro.org Date: Thu Dec 19 09:23:06 2013 +0000
gator: Version 5.17
Signed-off-by: Jon Medhurst tixy@linaro.org
Conflicts: drivers/gator/Makefile
And the conflicts file change is following, Could you like take a look?
------ diff --git a/drivers/gator/Makefile b/drivers/gator/Makefile index 942e415..3dc9d05 100644 --- a/drivers/gator/Makefile +++ b/drivers/gator/Makefile @@ -12,24 +12,40 @@ gator-y := gator_main.o \ gator_events_net.o \ gator_events_block.o \ gator_events_meminfo.o \ - gator_events_perf_pmu.o - -gator-y += gator_events_mmaped.o + gator_events_perf_pmu.o \ + gator_events_mmapped.o \ + +# Convert the old GATOR_WITH_MALI_SUPPORT to the new kernel flags +ifneq ($(GATOR_WITH_MALI_SUPPORT),) + CONFIG_GATOR_WITH_MALI_SUPPORT := y + ifeq ($(GATOR_WITH_MALI_SUPPORT),MALI_T6xx) + CONFIG_GATOR_MALI_4XXMP := n + CONFIG_GATOR_MALI_T6XX := y + else + CONFIG_GATOR_MALI_4XXMP := y + CONFIG_GATOR_MALI_T6XX := n + endif + EXTRA_CFLAGS += -DMALI_SUPPORT=$(GATOR_WITH_MALI_SUPPORT) + ifneq ($(GATOR_MALI_INTERFACE_STYLE),) + EXTRA_CFLAGS += -DGATOR_MALI_INTERFACE_STYLE=$(GATOR_MALI_INTERFACE_STYLE) + endif +endif
ifeq ($(CONFIG_GATOR_WITH_MALI_SUPPORT),y) - -ifeq ($(CONFIG_GATOR_MALI_T6XX),y) -gator-y += gator_events_mali_t6xx.o \ + ifeq ($(CONFIG_GATOR_MALI_T6XX),y) + gator-y += gator_events_mali_t6xx.o \ gator_events_mali_t6xx_hw.o -include $(M)/mali_t6xx.mk -else -gator-y += gator_events_mali_4xx.o -endif -gator-y += gator_events_mali_common.o - -ccflags-y += -I$(CONFIG_GATOR_MALI_PATH) -ccflags-$(CONFIG_GATOR_MALI_400MP) += -DMALI_SUPPORT=MALI_400 -ccflags-$(CONFIG_GATOR_MALI_T6XX) += -DMALI_SUPPORT=MALI_T6xx + include $(src)/mali_t6xx.mk + else + gator-y += gator_events_mali_4xx.o + endif + gator-y += gator_events_mali_common.o + + ifneq ($(CONFIG_GATOR_MALI_PATH),) + ccflags-y += -I$(CONFIG_GATOR_MALI_PATH) + endif + ccflags-$(CONFIG_GATOR_MALI_4XXMP) += -DMALI_SUPPORT=MALI_4xx + ccflags-$(CONFIG_GATOR_MALI_T6XX) += -DMALI_SUPPORT=MALI_T6xx endif
# GATOR_TEST controls whether to include (=1) or exclude (=0) test code. @@ -44,22 +60,6 @@ gator-$(CONFIG_ARM) += gator_events_armv6.o \
gator-$(CONFIG_ARM64) += gator_events_ccn-504.o
-$(obj)/gator_main.o: $(obj)/gator_events.h - -clean-files := gator_events.h - -# Note, in the recipe below we use "cd $(srctree) && cd $(src)" rather than -# "cd $(srctree)/$(src)" because under DKMS $(src) is an absolute path, and we -# can't just use $(src) because for normal kernel builds this is relative to -# $(srctree) - - chk_events.h = : - quiet_chk_events.h = echo ' CHK $@' -silent_chk_events.h = : -$(obj)/gator_events.h: FORCE - @$($(quiet)chk_events.h) - $(Q)cd $(srctree) && cd $(src) ; $(CONFIG_SHELL) gator_events.sh $(abspath $ - else
all: @@ -70,7 +70,7 @@ all: $(error)
clean: - rm -f *.o .*.cmd gator_events.h modules.order Module.symvers gator.ko gator. + rm -f *.o .*.cmd modules.order Module.symvers gator.ko gator.mod.c rm -rf .tmp_versions
endif
Drew Richardson (1): gator-driver: Handle task struct correctly
Jon Medhurst (4): gator: Version 5.17 gator: Revert #error about lack of CONFIG_PERF_EVENTS gator: Add config for building the module in-tree Merge in gator version 5.17
drivers/gator/Makefile | 64 ++--- drivers/gator/gator.h | 6 +- drivers/gator/gator_annotate_kernel.c | 107 ++++--- drivers/gator/gator_backtrace.c | 10 +- drivers/gator/gator_cookies.c | 102 ++++--- drivers/gator/gator_events.sh | 19 -- drivers/gator/gator_events_armv6.c | 7 - drivers/gator/gator_events_armv7.c | 7 - drivers/gator/gator_events_block.c | 2 - drivers/gator/gator_events_ccn-504.c | 192 ++++++++----- drivers/gator/gator_events_irq.c | 2 - drivers/gator/gator_events_l2c-310.c | 2 - drivers/gator/gator_events_mali_4xx.c | 30 +- drivers/gator/gator_events_mali_common.c | 9 +- drivers/gator/gator_events_mali_common.h | 4 +- drivers/gator/gator_events_mali_t6xx.c | 60 +++- drivers/gator/gator_events_mali_t6xx_hw.c | 46 ++- drivers/gator/gator_events_meminfo.c | 301 +++++++++++++++----- ...ator_events_mmaped.c => gator_events_mmapped.c} | 124 ++++---- drivers/gator/gator_events_net.c | 5 +- drivers/gator/gator_events_perf_pmu.c | 83 +++++- drivers/gator/gator_events_sched.c | 2 - drivers/gator/gator_events_scorpion.c | 7 - drivers/gator/gator_iks.c | 2 + drivers/gator/gator_main.c | 108 ++++++- drivers/gator/gator_marshaling.c | 19 ++ drivers/gator/gator_trace_gpu.c | 6 +- drivers/gator/gator_trace_sched.c | 20 +- .../gator/mali/mali_mjollnir_profiling_gator_api.h | 15 +- .../gator/mali/mali_utgard_profiling_gator_api.h | 15 +- drivers/gator/mali_t6xx.mk | 11 +- tools/gator/daemon/Buffer.cpp | 11 + tools/gator/daemon/Buffer.h | 5 + tools/gator/daemon/Child.cpp | 13 +- tools/gator/daemon/Child.h | 4 + tools/gator/daemon/ConfigurationXML.h | 4 + tools/gator/daemon/Driver.h | 6 +- tools/gator/daemon/Fifo.h | 4 + tools/gator/daemon/Hwmon.cpp | 4 + tools/gator/daemon/Hwmon.h | 4 + tools/gator/daemon/OlySocket.cpp | 23 +- tools/gator/daemon/Sender.h | 4 + tools/gator/daemon/SessionData.cpp | 12 +- tools/gator/daemon/SessionData.h | 6 +- tools/gator/daemon/SessionXML.h | 4 + tools/gator/daemon/StreamlineSetup.h | 4 + tools/gator/daemon/common.mk | 2 +- tools/gator/daemon/events-CCI-400.xml | 62 +++- tools/gator/daemon/events-Linux.xml | 10 +- tools/gator/daemon/events-Mali-T6xx.xml | 10 + tools/gator/daemon/events-Mali-T6xx_hw.xml | 5 +- tools/gator/daemon/main.cpp | 25 +- 52 files changed, 1102 insertions(+), 507 deletions(-) delete mode 100755 drivers/gator/gator_events.sh rename drivers/gator/{gator_events_mmaped.c => gator_events_mmapped.c} (56%)