Skip to content

Commit

Permalink
[POWERPC] perfmon2: make pm_interval register read/write
Browse files Browse the repository at this point in the history
The pm_interval register in the Cell PMU is read/write, but was implemented in
the kernel as write-only. Previously, the written value was saved in a "shadow"
copy so calls to cbe_read_pm() could return the value.

Perfmon2 needs to be able to read the current values of pm_interval, so change
cbe_read_pm() to read the actual register instead of the "shadow" copy. There
is currently no code in the kernel that tries to read the pm_interval register
with cbe_read_pm() (expecting to receive the "shadow" value), so this should
not break any existing code.

Signed-off-by: Kevin Corry <kevcorry@us.ibm.com>
Signed-off-by: Carl Love <carll@us.ibm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Kevin Corry authored and Arnd Bergmann committed Dec 19, 2007
1 parent 7ee1746 commit 29641ce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/cell/pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ u32 cbe_read_pm(u32 cpu, enum pm_reg_name reg)
break;

case pm_interval:
READ_SHADOW_REG(val, pm_interval);
READ_MMIO_UPPER32(val, pm_interval);
break;

case pm_start_stop:
Expand Down

0 comments on commit 29641ce

Please sign in to comment.