Hello community, here is the log from the commit of package itrace checked in at Tue Oct 16 02:26:51 CEST 2007. -------- --- arch/ppc/itrace/itrace.changes 2007-08-05 23:02:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/itrace/itrace.changes 2007-10-15 11:00:37.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 15 10:32:25 CEST 2007 - olh@suse.de + +- add power6 support (333483, fate 302745) + +------------------------------------------------------------------- New: ---- itrace.power6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ itrace.spec ++++++ --- /var/tmp/diff_new_pack.XS4121/_old 2007-10-16 02:26:17.000000000 +0200 +++ /var/tmp/diff_new_pack.XS4121/_new 2007-10-16 02:26:17.000000000 +0200 @@ -12,9 +12,12 @@ Name: itrace Version: 0.9 -Release: 76 -BuildRequires: binutils-devel kernel-source kernel-syms module-init-tools -URL: http://perfinsp.sourceforge.net/itrace_ppc.html +Release: 104 +%if 0%{?suse_version} > 1020 +BuildRequires: binutils-devel +%endif +BuildRequires: kernel-source kernel-syms module-init-tools +Url: http://perfinsp.sourceforge.net/itrace_ppc.html Summary: Instruction Tracing Tool License: GPL v2 or later Group: Development/Tools/Debuggers @@ -33,6 +36,7 @@ Patch11: itrace.config_h.patch Patch12: itrace.find_type_devices.patch Patch13: itrace.threads-h.patch +Patch14: itrace.power6.patch ExclusiveArch: ppc ppc64 Requires: itrace-kmp-ppc64 %suse_kernel_module_package kdump um xen xenpae default smp debug bigsmp iseries64 @@ -95,6 +99,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build autoreconf -i --force @@ -118,8 +123,6 @@ done %install -rm -rf $RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # install kernel modules export INSTALL_MOD_PATH=$RPM_BUILD_ROOT @@ -145,8 +148,9 @@ %{_prefix}/%{_lib}/lib*.so* %{_prefix}/include/* %{_mandir}/*/* - %changelog +* Mon Oct 15 2007 - olh@suse.de +- add power6 support (333483, fate 302745) * Sun Aug 05 2007 - olh@suse.de - remove inclusion of linux/threads.h * Thu Jul 05 2007 - olh@suse.de ++++++ itrace.power6.patch ++++++ --- src/driver/ppc64/pi_itrace.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/src/driver/ppc64/pi_itrace.c +++ b/src/driver/ppc64/pi_itrace.c @@ -184,6 +184,9 @@ int reservation_inst(unsigned int instr) (((instr & 0x7fe) == 40) || ((instr & 0x7fe) == 168))); } +#ifndef PV_POWER6 +#define PV_POWER6 0x003e +#endif void skip_trace_section(struct pt_regs *regs) { unsigned int mmcr0 = mfspr(SPRN_MMCR0); @@ -191,7 +194,8 @@ void skip_trace_section(struct pt_regs * mmcr0 |= 0x4000; /* set PMCjCE bit */ mtspr(SPRN_MMCR0, mmcr0); - if (__is_processor(PV_POWER5) || __is_processor(PV_POWER5p)) { + if (__is_processor(PV_POWER5) || __is_processor(PV_POWER5p) || + __is_processor(PV_POWER6)) { unsigned int mmcr1 = mfspr(SPRN_MMCR1); mmcr1 &= ~(0xff0000); /* clear out PMC2SEL */ mmcr1 |= 0x020000; /* set PMC2SEL to 00000010 bits */ @@ -580,7 +584,8 @@ void ITrace_irq(struct pt_regs *regs) mmcr0 &= ~(MMCR0_PMXE | MMCR0_PMAO); mtspr(SPRN_MMCR0, mmcr0); - if (__is_processor(PV_POWER5) || __is_processor(PV_POWER5p)) + if (__is_processor(PV_POWER5) || __is_processor(PV_POWER5p) || + __is_processor(PV_POWER6)) mtspr(SPRN_PMC2, 0); else mtspr(SPRN_PMC4, 0); @@ -772,7 +777,8 @@ static void program_perfmon() mmcr0 |= (1 << 27); /* FCM0: set mmcr0 to count when MSR_PM is on */ mmcr0 &= ~(0x80000000); /* clear the FC bit */ - if (__is_processor(PV_POWER5) || __is_processor(PV_POWER5p)) { + if (__is_processor(PV_POWER5) || __is_processor(PV_POWER5p) || + __is_processor(PV_POWER6)) { mmcr1 &= ~(0xff000000); /* clear out PMC1SEL */ mmcr1 |= 0x02000000; /* set PMC1SEL to 00000010 bits */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org