Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=84c21e254205ecac98f75b01589996440c6a6db0
Commit:     84c21e254205ecac98f75b01589996440c6a6db0
Parent:     1b1c5f0d96eb05cf6cd4702dabf4e003eded08c2
Author:     Dmitri Vorobiev <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 8 06:44:00 2008 +0300
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Fri Jan 11 17:05:41 2008 +0000

    [MIPS] Malta: Fix software reset on big endian
    
    I noticed that the commit f197465384bf7ef1af184c2ed1a4e268911a91e3
    (MIPS Tech: Get rid of volatile in core code) broke the software
    reset functionality for MIPS Malta boards in big-endian mode.
    
    According to the MIPS Malta board user's manual, writing the magic
    32-bit GORESET value into the SOFTRES register initiates board soft
    reset. My experimentation has shown that the endianness of the GORESET
    integer should thereby be the same as the endianness, which has been
    set for the CPU itself. The writew() function used to write the magic
    value in the code introduced by the commit mentioned above, however,
    swaps bytes for big-endian kernels and transfers 16 bits instead of 32.
    
    The patch below replaces the writew() function by the __raw_writel()
    routine, which leaves the byte order intact and transfers the whole
    MIPS machine word. Trivial code cleanup (replacing spaces by a tab
    and cutting oversized lines to make checkpatch.pl happy) is also
    included.
    
    The patch was tested using a Malta evaluation board running in both
    BE and LE modes. For both modes, software reset was fully functional
    after the change.
    
    P.S. I suspect that the same commit broke the "standby" functionality
    for MIPS Atlas boards. However, I did not touch the Atlas code as I
    don't have such board at my disposal and also because the linux-mips.org
    Web site claims that Atlas support is scheduled for removal.
    
    Signed-off-by: Dmitri Vorobiev <[EMAIL PROTECTED]>
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 arch/mips/mips-boards/generic/reset.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/mips/mips-boards/generic/reset.c 
b/arch/mips/mips-boards/generic/reset.c
index 7a1bb51..583d468 100644
--- a/arch/mips/mips-boards/generic/reset.c
+++ b/arch/mips/mips-boards/generic/reset.c
@@ -39,16 +39,18 @@ static void atlas_machine_power_off(void);
 
 static void mips_machine_restart(char *command)
 {
-       unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, 
sizeof(unsigned int));
+       unsigned int __iomem *softres_reg =
+               ioremap(SOFTRES_REG, sizeof(unsigned int));
 
-       writew(GORESET, softres_reg);
+       __raw_writel(GORESET, softres_reg);
 }
 
 static void mips_machine_halt(void)
 {
-        unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, 
sizeof(unsigned int));
+       unsigned int __iomem *softres_reg =
+               ioremap(SOFTRES_REG, sizeof(unsigned int));
 
-       writew(GORESET, softres_reg);
+       __raw_writel(GORESET, softres_reg);
 }
 
 #if defined(CONFIG_MIPS_ATLAS)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to