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)
----------------------------------------------------------------
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%)
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%)
On 01/03/2014 01:59 PM, Alex Shi wrote:
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 correctlycommit df8bb91dd87b31ffb0367d541e6aa63bdc1c49bc Author: Jon Medhurst tixy@linaro.org Date: Thu Dec 19 09:23:06 2013 +0000
gator: Version 5.17Signed-off-by: Jon Medhurst tixy@linaro.org Conflicts: drivers/gator/Makefile
And the conflicts file change is following, Could you like take a look?
Hi, tixy. I tried to compile CONFIG_GATOR_MALI_400MP, but failed at: drivers/gator/gator_events_mali_4xx.c:15:36: fatal error: linux/mali_linux_trace.h: No such file or directory compilation terminated.
Checked your original git tree, failed for same reason, no mali_linux_trace.h file. Is there sth missed?
On Fri, 2014-01-03 at 15:24 +0800, Alex Shi wrote:
On 01/03/2014 01:59 PM, Alex Shi wrote:
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 correctlycommit df8bb91dd87b31ffb0367d541e6aa63bdc1c49bc Author: Jon Medhurst tixy@linaro.org Date: Thu Dec 19 09:23:06 2013 +0000
gator: Version 5.17Signed-off-by: Jon Medhurst tixy@linaro.org Conflicts: drivers/gator/Makefile
And the conflicts file change is following, Could you like take a look?
Hi, tixy. I tried to compile CONFIG_GATOR_MALI_400MP, but failed at: drivers/gator/gator_events_mali_4xx.c:15:36: fatal error: linux/mali_linux_trace.h: No such file or directory compilation terminated.
Checked your original git tree, failed for same reason, no mali_linux_trace.h file. Is there sth missed?
We don't have any Mali drivers in Linaro kernel trees so this error would be expected. Also, as vendors get Mali drivers direct from ARM as standalone source there isn't a standard way of integrating them into a kernel source tree, hence we can't add a relevant depends on this config option, and we need the hack with CONFIG_GATOR_MALI_PATH.
On 01/03/2014 05:37 PM, Jon Medhurst (Tixy) wrote:
On Fri, 2014-01-03 at 15:24 +0800, Alex Shi wrote:
On 01/03/2014 01:59 PM, Alex Shi wrote:
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 correctlycommit df8bb91dd87b31ffb0367d541e6aa63bdc1c49bc Author: Jon Medhurst tixy@linaro.org Date: Thu Dec 19 09:23:06 2013 +0000
gator: Version 5.17Signed-off-by: Jon Medhurst tixy@linaro.org Conflicts: drivers/gator/Makefile
And the conflicts file change is following, Could you like take a look?
Hi, tixy. I tried to compile CONFIG_GATOR_MALI_400MP, but failed at: drivers/gator/gator_events_mali_4xx.c:15:36: fatal error: linux/mali_linux_trace.h: No such file or directory compilation terminated.
Checked your original git tree, failed for same reason, no mali_linux_trace.h file. Is there sth missed?
We don't have any Mali drivers in Linaro kernel trees so this error would be expected. Also, as vendors get Mali drivers direct from ARM as standalone source there isn't a standard way of integrating them into a kernel source tree, hence we can't add a relevant depends on this config option, and we need the hack with CONFIG_GATOR_MALI_PATH.
I see, thanks. The patchset passed the pre-merge testing, so it is added into formal lsk and lsk-andorid.
Naresh, Do we need to testing the gator feature manually? or wait until monthly release?
On Fri, 2014-01-03 at 13:59 +0800, Alex Shi wrote:
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:
When I do a merge I get the 5 commits mentioned in my pull request, these are the five commits which are new since the last time gator was pulled into LSK. The result you have in lsk-test has different SHA1's for the two commits you have and history is lost, it's almost as if you have managed to do some sort of rebase. I am just cloning a fresh repo to see if I can work out if pull behaves different from merge, but as you have already updated the main LSK branch, I guess this is too late now to sort out anyway...
On Fri, 2014-01-03 at 10:17 +0000, Jon Medhurst (Tixy) wrote:
On Fri, 2014-01-03 at 13:59 +0800, Alex Shi wrote:
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:
When I do a merge I get the 5 commits mentioned in my pull request, these are the five commits which are new since the last time gator was pulled into LSK. The result you have in lsk-test has different SHA1's for the two commits you have and history is lost, it's almost as if you have managed to do some sort of rebase. I am just cloning a fresh repo to see if I can work out if pull behaves different from merge
Nope, when I pull the gator branch I get the 5 commits merged in, see: https://git.linaro.org/people/tixy/kernel.git/shortlog/refs/heads/lsk-test2
I did this with:
git clone git://git.linaro.org/kernel/linux-linaro-stable.git cd linux-linaro-stable git checkout 3c6556b1a9c2f9c91aacbc57bac938691fedda81 # LSK before new gator git pull git://git.linaro.org/landing-teams/working/arm/kernel.git lsk-3.10-gator
so I guess if you get different it must be a git config issue.
Tixy, The patchset was pushed to lsk-test branch for testing now. Only 2 commits are new for lsk:
When I do a merge I get the 5 commits mentioned in my pull request, these are the five commits which are new since the last time gator was pulled into LSK. The result you have in lsk-test has different SHA1's for the two commits you have and history is lost, it's almost as if you have managed to do some sort of rebase. I am just cloning a fresh repo to see if I can work out if pull behaves different from merge
Nope, when I pull the gator branch I get the 5 commits merged in, see: https://git.linaro.org/people/tixy/kernel.git/shortlog/refs/heads/lsk-test2
I did this with:
git clone git://git.linaro.org/kernel/linux-linaro-stable.git cd linux-linaro-stable git checkout 3c6556b1a9c2f9c91aacbc57bac938691fedda81 # LSK before new gator git pull git://git.linaro.org/landing-teams/working/arm/kernel.git lsk-3.10-gator
so I guess if you get different it must be a git config issue.
yes, my git pull 'rebase = true' generate some conflicts.
And as I said there are only 2 'new' commits for lsk, since other commit already merged into lsk with different commit number SHA, like on landing-teams tree:
commit 45030a56ba386e4ea0597b8f167f494b2d4ee259 Author: Jon Medhurst tixy@linaro.org Date: Fri May 18 09:06:15 2012 +0100
gator: Revert #error about lack of CONFIG_PERF_EVENTS
on lsk: commit c42c789617224c9ea2e7c68e616975554a49f946 Author: Jon Medhurst tixy@linaro.org Date: Fri May 18 09:06:15 2012 +0100
gator: Revert #error about lack of CONFIG_PERF_EVENTS
Now lsk is exact same as your merge way from code level.
BTW, Tixy, I saw above commit appeared 3 times in landing-teams tree. Do you have some suggestion to reduce above redundant-commit when we do pull?
On Sun, 2014-01-05 at 20:00 +0800, Alex Shi wrote:
Tixy, The patchset was pushed to lsk-test branch for testing now. Only 2 commits are new for lsk:
When I do a merge I get the 5 commits mentioned in my pull request, these are the five commits which are new since the last time gator was pulled into LSK. The result you have in lsk-test has different SHA1's for the two commits you have and history is lost, it's almost as if you have managed to do some sort of rebase. I am just cloning a fresh repo to see if I can work out if pull behaves different from merge
Nope, when I pull the gator branch I get the 5 commits merged in, see: https://git.linaro.org/people/tixy/kernel.git/shortlog/refs/heads/lsk-test2
I did this with:
git clone git://git.linaro.org/kernel/linux-linaro-stable.git cd linux-linaro-stable git checkout 3c6556b1a9c2f9c91aacbc57bac938691fedda81 # LSK before new gator git pull git://git.linaro.org/landing-teams/working/arm/kernel.git lsk-3.10-gator
so I guess if you get different it must be a git config issue.
yes, my git pull 'rebase = true' generate some conflicts.
OK, I won't bother trying to keep a clean history of changes at my end then if they're going to get lost after merge anyway.
[...]
BTW, Tixy, I saw above commit appeared 3 times in landing-teams tree. Do you have some suggestion to reduce above redundant-commit when we do pull?
If for LSK I stop trying to keep the upstream history of the gator code then I will just give you a single patch next time. And I might just drop that patch anyway, it was needed to get Pandaboard working, but I assume that doesn't matter for LSK anyway?
On 6 January 2014 09:52, Jon Medhurst (Tixy) tixy@linaro.org wrote:
BTW, Tixy, I saw above commit appeared 3 times in landing-teams tree. Do you have some suggestion to reduce above redundant-commit when we do pull?
then I will just give you a single patch next time. And I might just drop that patch anyway, it was needed to get Pandaboard working, but I assume that doesn't matter for LSK anyway?
Panda is included in our test coverage, though it's not got any out of tree patches applied so depending on why the fix was needed we may not need it even so.
On Mon, 2014-01-06 at 12:07 +0000, Mark Brown wrote:
On 6 January 2014 09:52, Jon Medhurst (Tixy) tixy@linaro.org wrote:
BTW, Tixy, I saw above commit appeared 3 times in landing-teams tree. Do you have some suggestion to reduce above redundant-commit when we do pull?
then I will just give you a single patch next time. And I might just drop that patch anyway, it was needed to get Pandaboard working, but I assume that doesn't matter for LSK anyway?
Panda is included in our test coverage, though it's not got any out of tree patches applied so depending on why the fix was needed
To stop a #error during compilation. I'll check if it's still needed, what Panda config does LSK use, omap2plus_defconfig or one based on Linaro's config fragments?
On 6 January 2014 12:36, Jon Medhurst (Tixy) tixy@linaro.org wrote:
On Mon, 2014-01-06 at 12:07 +0000, Mark Brown wrote:
Panda is included in our test coverage, though it's not got any out of
tree
patches applied so depending on why the fix was needed
To stop a #error during compilation. I'll check if it's still needed, what Panda config does LSK use, omap2plus_defconfig or one based on Linaro's config fragments?
Linaro fragments. Depending on where the issue is if it's something that could be triggered by options we might want to include it anyway in case users trigger it with their configs.
On 01/06/2014 08:41 PM, Mark Brown wrote:
On 6 January 2014 12:36, Jon Medhurst (Tixy) <tixy@linaro.org mailto:tixy@linaro.org> wrote:
On Mon, 2014-01-06 at 12:07 +0000, Mark Brown wrote:> Panda is included in our test coverage, though it's not got any out of tree > patches applied so depending on why the fix was needed To stop a #error during compilation. I'll check if it's still needed, what Panda config does LSK use, omap2plus_defconfig or one based on Linaro's config fragments?
BTW, we generate panda board config like following in testing:
ARCH=arm scripts/kconfig/merge_config.sh linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap4.conf
Linaro fragments. Depending on where the issue is if it's something that could be triggered by options we might want to include it anyway in case users trigger it with their configs.
linaro-kernel mailing list linaro-kernel@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-kernel
On Mon, 2014-01-06 at 12:41 +0000, Mark Brown wrote:
On 6 January 2014 12:36, Jon Medhurst (Tixy) tixy@linaro.org wrote: On Mon, 2014-01-06 at 12:07 +0000, Mark Brown wrote: > Panda is included in our test coverage, though it's not got any out of tree > patches applied so depending on why the fix was needed To stop a #error during compilation. I'll check if it's still needed, what Panda config does LSK use, omap2plus_defconfig or one based on Linaro's config fragments?
Linaro fragments. Depending on where the issue is if it's something that could be triggered by options we might want to include it anyway in case users trigger it with their configs.
Actually, digging through two year old emails, the TI Landing team said of CONFIG_PERF_EVENTS "We turned this off in part to avoid errata in the core for which we have no workaround."
Now gator has an #error if this isn't enabled because it expects to use this feature, though it does compile and works - with much reduced functionality - if this config isn't available. So as a compromise, I downgraded the #error to a #warning and didn't make the KConfig for Gator depend on {HW_}PERF_EVENTS.
Looking at the config fragments I see that omap4.conf doesn't disable the {HW_}PERF_EVENTS configs set in linaro-base.conf so it is in fact now not hitting this code #error/#warning lines anyway.
So I would say that this hack should go now and I'll update the KConfig for gator to depend on the right configs to avoid the #error.
For LSK, I'll probably leave this change until the next Gator release, as it's not doing any harm at the moment.
Actually, digging through two year old emails, the TI Landing team said of CONFIG_PERF_EVENTS "We turned this off in part to avoid errata in the core for which we have no workaround."
Now gator has an #error if this isn't enabled because it expects to use this feature, though it does compile and works - with much reduced functionality - if this config isn't available. So as a compromise, I downgraded the #error to a #warning and didn't make the KConfig for Gator depend on {HW_}PERF_EVENTS.
Looking at the config fragments I see that omap4.conf doesn't disable the {HW_}PERF_EVENTS configs set in linaro-base.conf so it is in fact now not hitting this code #error/#warning lines anyway.
So I would say that this hack should go now and I'll update the KConfig for gator to depend on the right configs to avoid the #error.
For LSK, I'll probably leave this change until the next Gator release, as it's not doing any harm at the moment.
Got it. It's OK for me.
On 5 January 2014 12:00, Alex Shi alex.shi@linaro.org wrote:
so I guess if you get different it must be a git config issue.
yes, my git pull 'rebase = true' generate some conflicts.
You shouldn't be using pull --rebase for LSK unless there is a specific reason to do so - it means that what we're applying isn't exactly what got sent so we loose some history about what people sent us and also any testing they did on those specific revisions. If you do need to use --rebase remember to add your signoff to the commits you pulled in as it's just like applying patches.
On 01/06/2014 08:06 PM, Mark Brown wrote:
On 5 January 2014 12:00, Alex Shi <alex.shi@linaro.org mailto:alex.shi@linaro.org> wrote:
> so I guess if you get different it must be a git config issue. yes, my git pull 'rebase = true' generate some conflicts.You shouldn't be using pull --rebase for LSK unless there is a specific reason to do so - it means that what we're applying isn't exactly what got sent so we loose some history about what people sent us and also any testing they did on those specific revisions. If you do need to use --rebase remember to add your signoff to the commits you pulled in as it's just like applying patches.
I removed this configure from my user git configuration ~/.gitconfig. It's a mistaken to add there. :(
linaro-kernel@lists.linaro.org
-
Alex Shi -
Jon Medhurst (Tixy) -
Mark Brown