linux-mips
[Top] [All Lists]

Re: [PATCH] 2/7 AU1100 MMC support

To: Rodolfo Giometti <giometti@linux.it>
Subject: Re: [PATCH] 2/7 AU1100 MMC support
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Thu, 10 Aug 2006 17:29:38 +0400
Cc: linux-mips@linux-mips.org
In-reply-to: <20060809210843.GC13145@enneenne.com>
Organization: MontaVista Software Inc.
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20060809210843.GC13145@enneenne.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.7.2) Gecko/20040803
Hello.

Rodolfo Giometti wrote:
Protect code on "BCSR" device.

Signed-off-by: Rodolfo Giometti <giometti@linux.it>

------------------------------------------------------------------------

diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c
index b0dc1d0..6084bb8 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
@@ -65,8 +65,8 @@ #endif
 const struct {
        u32 iobase;
        u32 tx_devid, rx_devid;
-       u16 bcsrpwr;
-       u16 bcsrstatus;
+       u16 power;
+       u16 status;
        u16 wpstatus;
 } au1xmmc_card_table[] = {
        { SD0_BASE, DSCR_CMD0_SDMS_TX0, DSCR_CMD0_SDMS_RX0,
@@ -138,24 +138,42 @@ static inline void SEND_STOP(struct au1x
 static void au1xmmc_set_power(struct au1xmmc_host *host, int state)
 {
- u32 val = au1xmmc_card_table[host->id].bcsrpwr;
+       u32 val;
+ val = au1xmmc_card_table[host->id].power;
+
+#if defined(CONFIG_MIPS_DB1200)
        bcsr->board &= ~val;
        if (state) bcsr->board |= val;
+#endif
au_sync_delay(1);
 }

If DBAu1100 doesn't allow to control slot power, then I don't think pretending it does is a good thing. Shouldn't these #ifdef's be in au1xmmc_set_ios() instead (the function is void anyway but that would allow us to save on the code size a bit more)?

 static inline int au1xmmc_card_inserted(struct au1xmmc_host *host)
 {
-       return (bcsr->sig_status & au1xmmc_card_table[host->id].bcsrstatus)
-               ? 1 : 0;
+       u32 val, data = 1;
+
+       val = au1xmmc_card_table[host->id].status;
+
+#if defined(CONFIG_MIPS_DB1200)
+       data = bcsr->sig_status & val;
+#endif
+
+       return !!data;
 }

Hrm, are you sure there's no way to sense that the card is *really* inserted or not?

 static inline int au1xmmc_card_readonly(struct au1xmmc_host *host)
 {
-       return (bcsr->status & au1xmmc_card_table[host->id].wpstatus)
-               ? 1 : 0;
+       u32 val, data = 0;
+
+       val = au1xmmc_card_table[host->id].wpstatus;
+
+#if defined(CONFIG_MIPS_DB1200)
+       data = bcsr->status & val;
+#endif
+
+       return !!data;
 }

   Ditto.

WBR, Sergei

<Prev in Thread] Current Thread [Next in Thread>