summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorAmaury Pouly <pamaury@rockbox.org>2011-12-15 17:06:55 +0000
committerAmaury Pouly <pamaury@rockbox.org>2011-12-15 17:06:55 +0000
commit489296afa3c0ad3a7b557355545322cc05b8b494 (patch)
tree35832248b8aac1b131672b4b8ee42faa004ce740 /firmware/target/arm
parentddd594b03ea7209f1b17b1ce918e585c48bd1df8 (diff)
downloadrockbox-489296afa3c0ad3a7b557355545322cc05b8b494.tar.gz
rockbox-489296afa3c0ad3a7b557355545322cc05b8b494.tar.bz2
rockbox-489296afa3c0ad3a7b557355545322cc05b8b494.zip
imx233/fuze+: add support for sd card, enable FAT16 support because it's common on sd cards
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31268 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/imx233/sd-imx233.c279
-rw-r--r--firmware/target/arm/imx233/ssp-imx233.c41
-rw-r--r--firmware/target/arm/imx233/ssp-imx233.h6
3 files changed, 250 insertions, 76 deletions
diff --git a/firmware/target/arm/imx233/sd-imx233.c b/firmware/target/arm/imx233/sd-imx233.c
index 1f2653131e..c17681828f 100644
--- a/firmware/target/arm/imx233/sd-imx233.c
+++ b/firmware/target/arm/imx233/sd-imx233.c
@@ -51,56 +51,193 @@ static int last_disk_activity;
static void sd_detect_callback(int ssp)
{
(void)ssp;
-
/* This is called only if the state was stable for 300ms - check state
* and post appropriate event. */
if(imx233_ssp_sdmmc_detect(SD_SSP))
queue_broadcast(SYS_HOTSWAP_INSERTED, 0);
else
queue_broadcast(SYS_HOTSWAP_EXTRACTED, 0);
- imx233_ssp_sdmmc_setup_detect(SD_SSP, true, sd_detect_callback);
+ imx233_ssp_sdmmc_setup_detect(SD_SSP, true, sd_detect_callback, false);
+}
+
+void sd_power(bool on)
+{
+ #ifdef SANSA_FUZEPLUS
+ /* The Fuze+ uses pin B0P8 for whatever reason, power ? */
+ imx233_set_pin_function(0, 8, PINCTRL_FUNCTION_GPIO);
+ imx233_enable_gpio_output(0, 8, true);
+ imx233_set_gpio_output(0, 8, !on);
+ /* disable pull ups when not needed to save power */
+ imx233_ssp_setup_ssp1_sd_mmc_pins(on, 4, PINCTRL_DRIVE_4mA, false);
+ /* It also setups pin B1P30, unknown purpose */
+ imx233_set_pin_function(1, 30, PINCTRL_FUNCTION_GPIO);
+ imx233_enable_gpio_output(1, 30, false);
+ #endif
}
void sd_enable(bool on)
{
- static bool sd_enable = false;
+ static int sd_enable = 2; /* 2 means not on and not off, for init purpose */
if(sd_enable == on)
return;
-
- mutex_lock(&sd_mutex);
- if(on)
- imx233_ssp_start(SD_SSP);
- else
- imx233_ssp_stop(SD_SSP);
- mutex_unlock(&sd_mutex);
+
sd_enable = on;
}
+#define MCI_NO_RESP 0
+#define MCI_RESP (1<<0)
+#define MCI_LONG_RESP (1<<1)
+#define MCI_ACMD (1<<2)
+#define MCI_NOCRC (1<<3)
+#define MCI_BUSY (1<<4)
+
+static bool send_cmd(uint8_t cmd, uint32_t arg, uint32_t flags, uint32_t *resp)
+{
+ if((flags & MCI_ACMD) && !send_cmd(SD_APP_CMD, card_info.rca, MCI_RESP, resp))
+ return false;
+
+ enum imx233_ssp_resp_t resp_type = (flags & MCI_LONG_RESP) ? SSP_LONG_RESP :
+ (flags & MCI_RESP) ? SSP_SHORT_RESP : SSP_NO_RESP;
+ enum imx233_ssp_error_t ret = imx233_ssp_sd_mmc_transfer(SD_SSP, cmd, arg,
+ resp_type, NULL, 0, !!(flags & MCI_BUSY), false, resp);
+ if(resp_type == SSP_LONG_RESP)
+ {
+ /* Our SD codes assume most significant word first, so reverse resp */
+ uint32_t tmp = resp[0];
+ resp[0] = resp[3];
+ resp[3] = tmp;
+ tmp = resp[1];
+ resp[1] = resp[2];
+ resp[2] = tmp;
+ }
+ return ret == SSP_SUCCESS;
+}
+
+static int sd_wait_for_tran_state(void)
+{
+ unsigned long response;
+ unsigned int timeout = current_tick + 5*HZ;
+ int cmd_retry = 10;
+
+ while (1)
+ {
+ while(!send_cmd(SD_SEND_STATUS, card_info.rca, SSP_SHORT_RESP, &response) && cmd_retry > 0)
+ cmd_retry--;
+
+ if(cmd_retry <= 0)
+ return -1;
+
+ if(((response >> 9) & 0xf) == SD_TRAN)
+ return 0;
+
+ if(TIME_AFTER(current_tick, timeout))
+ return -10 * ((response >> 9) & 0xf);
+
+ last_disk_activity = current_tick;
+ }
+}
+
static int sd_init_card(void)
{
+ sd_enable(false);
+ sd_power(false);
+ sd_power(true);
+ sd_enable(true);
imx233_ssp_start(SD_SSP);
imx233_ssp_softreset(SD_SSP);
imx233_ssp_set_mode(SD_SSP, HW_SSP_CTRL1__SSP_MODE__SD_MMC);
/* SSPCLK @ 96MHz
* gives bitrate of 96000 / 240 / 1 = 400kHz */
imx233_ssp_set_timings(SD_SSP, 240, 0, 0xffff);
+
+ imx233_ssp_sd_mmc_power_up_sequence(SD_SSP);
imx233_ssp_set_bus_width(SD_SSP, 1);
imx233_ssp_set_block_size(SD_SSP, 9);
card_info.rca = 0;
- bool is_v2 = false;
+ bool sd_v2 = false;
uint32_t resp;
+ long init_timeout;
/* go to idle state */
- int ret = imx233_ssp_sd_mmc_transfer(SD_SSP, SD_GO_IDLE_STATE, 0, SSP_NO_RESP, NULL, 0, false, false, NULL);
- if(ret != 0)
+ if(!send_cmd(SD_GO_IDLE_STATE, 0, MCI_NO_RESP, NULL))
return -1;
/* CMD8 Check for v2 sd card. Must be sent before using ACMD41
- Non v2 cards will not respond to this command*/
- ret = imx233_ssp_sd_mmc_transfer(SD_SSP, SD_SEND_IF_COND, 0x1AA, SSP_SHORT_RESP, NULL, 0, false, false, &resp);
- if(ret == 0 && (resp & 0xFFF) == 0x1AA)
- is_v2 = true;
+ Non v2 cards will not respond to this command */
+ if(send_cmd(SD_SEND_IF_COND, 0x1AA, MCI_RESP, &resp))
+ if((resp & 0xFFF) == 0x1AA)
+ sd_v2 = true;
+ /* timeout for initialization is 1sec, from SD Specification 2.00 */
+ init_timeout = current_tick + HZ;
+ do
+ {
+ /* this timeout is the only valid error for this loop*/
+ if(TIME_AFTER(current_tick, init_timeout))
+ return -2;
+
+ /* ACMD41 For v2 cards set HCS bit[30] & send host voltage range to all */
+ if(!send_cmd(SD_APP_OP_COND, (0x00FF8000 | (sd_v2 ? 1<<30 : 0)),
+ MCI_ACMD|MCI_NOCRC|MCI_RESP, &card_info.ocr))
+ return -100;
+ } while(!(card_info.ocr & (1<<31)));
+
+ /* CMD2 send CID */
+ if(!send_cmd(SD_ALL_SEND_CID, 0, MCI_RESP|MCI_LONG_RESP, card_info.cid))
+ return -3;
+
+ /* CMD3 send RCA */
+ if(!send_cmd(SD_SEND_RELATIVE_ADDR, 0, MCI_RESP, &card_info.rca))
+ return -4;
+
+ /* Try to switch V2 cards to HS timings, non HS seem to ignore this */
+ if(sd_v2)
+ {
+ /* CMD7 w/rca: Select card to put it in TRAN state */
+ if(!send_cmd(SD_SELECT_CARD, card_info.rca, MCI_RESP, NULL))
+ return -5;
+
+ if(sd_wait_for_tran_state())
+ return -6;
+
+ /* CMD6 */
+ if(!send_cmd(SD_SWITCH_FUNC, 0x80fffff1, MCI_NO_RESP, NULL))
+ return -7;
+ sleep(HZ/10);
+
+ /* go back to STBY state so we can read csd */
+ /* CMD7 w/rca=0: Deselect card to put it in STBY state */
+ if(!send_cmd(SD_DESELECT_CARD, 0, MCI_NO_RESP, NULL))
+ return -8;
+ }
+
+ /* CMD9 send CSD */
+ if(!send_cmd(SD_SEND_CSD, card_info.rca, MCI_RESP|MCI_LONG_RESP, card_info.csd))
+ return -9;
+
+ sd_parse_csd(&card_info);
+
+ /* SSPCLK @ 96MHz
+ * gives bitrate of 96 / 4 / 1 = 24MHz */
+ imx233_ssp_set_timings(SD_SSP, 4, 0, 0xffff);
+
+ /* CMD7 w/rca: Select card to put it in TRAN state */
+ if(!send_cmd(SD_SELECT_CARD, card_info.rca, MCI_RESP, &resp))
+ return -12;
+ if(sd_wait_for_tran_state() < 0)
+ return -13;
+
+ /* ACMD6: set bus width to 4-bit */
+ if(!send_cmd(SD_SET_BUS_WIDTH, 2, MCI_RESP|MCI_ACMD, &resp))
+ return -15;
+ /* ACMD42: disconnect the pull-up resistor on CD/DAT3 */
+ if(!send_cmd(SD_SET_CLR_CARD_DETECT, 0, MCI_RESP|MCI_ACMD, &resp))
+ return -17;
+
+ /* Switch to 4-bit */
+ imx233_ssp_set_bus_width(SD_SSP, 4);
+
+ card_info.initialized = 1;
- return -10;
+ return 0;
}
static void sd_thread(void) NORETURN_ATTR;
@@ -117,6 +254,7 @@ static void sd_thread(void)
case SYS_HOTSWAP_INSERTED:
case SYS_HOTSWAP_EXTRACTED:
{
+ int microsd_init = 1;
fat_lock(); /* lock-out FAT activity first -
prevent deadlocking via disk_mount that
would cause a reverse-order attempt with
@@ -135,29 +273,25 @@ static void sd_thread(void)
if(ev.id == SYS_HOTSWAP_INSERTED)
{
- int ret = sd_init_card();
- if(ret == 0)
- {
- ret = disk_mount(sd_first_drive); /* 0 if fail */
- if(ret < 0)
- DEBUGF("disk_mount failed: %d", ret);
- }
- else
- DEBUGF("sd_init_card failed: %d", ret);
- }
+ microsd_init = sd_init_card();
+ if(microsd_init < 0) /* initialisation failed */
+ panicf("microSD init failed : %d", microsd_init);
+ microsd_init = disk_mount(sd_first_drive); /* 0 if fail */
+ }
/*
* Mount succeeded, or this was an EXTRACTED event,
* in both cases notify the system about the changed filesystems
*/
- if(card_info.initialized)
+ if(microsd_init)
queue_broadcast(SYS_FS_CHANGED, 0);
+ sd_enable(false);
/* Access is now safe */
mutex_unlock(&sd_mutex);
fat_unlock();
- }
break;
+ }
case SYS_TIMEOUT:
if(!TIME_BEFORE(current_tick, last_disk_activity+(3*HZ)))
sd_enable(false);
@@ -177,42 +311,89 @@ int sd_init(void)
queue_init(&sd_queue, true);
create_thread(sd_thread, sd_stack, sizeof(sd_stack), 0,
sd_thread_name IF_PRIO(, PRIORITY_USER_INTERFACE) IF_COP(, CPU));
+ sd_enable(false);
+ imx233_ssp_sdmmc_setup_detect(SD_SSP, true, sd_detect_callback, false);
+
+ return 0;
+}
- #ifdef SANSA_FUZEPLUS
- imx233_ssp_setup_ssp1_sd_mmc_pins(true, 4, PINCTRL_DRIVE_8mA, false);
- #endif
- imx233_ssp_sdmmc_setup_detect(SD_SSP, true, sd_detect_callback);
+static int transfer_sectors(IF_MD2(int drive,) unsigned long start, int count, void *buf, bool read)
+{
+ IF_MD((void) drive);
+ int ret = 0;
+ uint32_t resp;
+ unsigned long old_start = start;
+ int old_count = count;
- if(imx233_ssp_sdmmc_detect(SD_SSP))
- queue_broadcast(SYS_HOTSWAP_INSERTED, 0);
+ last_disk_activity = current_tick;
+
+ mutex_lock(&sd_mutex);
+ sd_enable(true);
+
+ if(card_info.initialized <= 0)
+ {
+ ret = sd_init_card();
+ if(card_info.initialized <= 0)
+ goto Lend;
+ }
- return 0;
+ if(!send_cmd(SD_SELECT_CARD, card_info.rca, SSP_NO_RESP, NULL))
+ {
+ ret = -20;
+ goto Lend;
+ }
+ ret = sd_wait_for_tran_state();
+ if(ret < 0)
+ goto Ldeselect;
+ while(count != 0)
+ {
+ int this_count = MIN(count, IMX233_MAX_SSP_XFER_SIZE / 512);
+ /* Set bank_start to the correct unit (blocks or bytes) */
+ int bank_start = start;
+ if(!(card_info.ocr & (1<<30))) /* not SDHC */
+ bank_start *= SD_BLOCK_SIZE;
+ ret = imx233_ssp_sd_mmc_transfer(SD_SSP, read ? SD_READ_MULTIPLE_BLOCK : SD_WRITE_MULTIPLE_BLOCK,
+ bank_start, SSP_SHORT_RESP, buf, this_count, false, read, &resp);
+ if(ret != SSP_SUCCESS)
+ break;
+ if(!send_cmd(SD_STOP_TRANSMISSION, 0, SSP_SHORT_RESP|MCI_BUSY, &resp))
+ {
+ ret = -15;
+ break;
+ }
+ count -= this_count;
+ start += this_count;
+ buf += this_count * 512;
+ }
+
+ Ldeselect:
+ /* CMD7 w/rca =0 : deselects card & puts it in STBY state */
+ if(!send_cmd(SD_DESELECT_CARD, 0, SSP_NO_RESP, NULL))
+ ret = -23;
+ Lend:
+ mutex_unlock(&sd_mutex);
+ if(ret != 0)
+ panicf("transfer_sectors(%d,%d,%d,%d,%d,%d)", drive, start, count, read,
+ old_start, old_count);
+ return ret;
}
int sd_read_sectors(IF_MD2(int drive,) unsigned long start, int count,
void* buf)
{
- IF_MD((void) drive);
- (void) start;
- (void) count;
- (void) buf;
- return -1;
+ return transfer_sectors(IF_MD2(drive,) start, count, buf, true);
}
int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count,
const void* buf)
{
- IF_MD((void) drive);
- (void) start;
- (void) count;
- (void) buf;
- return -1;
+ return transfer_sectors(IF_MD2(drive,) start, count, (void *)buf, false);
}
tCardInfo *card_get_info_target(int card_no)
{
(void)card_no;
- return NULL;
+ return &card_info;
}
int sd_num_drives(int first_drive)
@@ -235,6 +416,6 @@ bool sd_removable(IF_MD(int drive))
long sd_last_disk_activity(void)
{
- return 0;
+ return last_disk_activity;
}
diff --git a/firmware/target/arm/imx233/ssp-imx233.c b/firmware/target/arm/imx233/ssp-imx233.c
index 21d5658392..eb7a3a2ad4 100644
--- a/firmware/target/arm/imx233/ssp-imx233.c
+++ b/firmware/target/arm/imx233/ssp-imx233.c
@@ -38,7 +38,8 @@ struct ssp_dma_command_t
uint32_t cmd1;
};
-static int ssp_in_use = 0;
+static bool ssp_in_use[2];
+static int ssp_nr_in_use = 0;
static struct mutex ssp_mutex[2];
static struct semaphore ssp_sema[2];
static struct ssp_dma_command_t ssp_dma_cmd[2];
@@ -82,7 +83,7 @@ void imx233_ssp_init(void)
__REG_SET(HW_SSP_CTRL0(1)) = __BLOCK_CLKGATE;
__REG_SET(HW_SSP_CTRL0(2)) = __BLOCK_CLKGATE;
- ssp_in_use = 0;
+ ssp_nr_in_use = 0;
semaphore_init(&ssp_sema[0], 1, 0);
semaphore_init(&ssp_sema[1], 1, 0);
mutex_init(&ssp_mutex[0]);
@@ -92,12 +93,15 @@ void imx233_ssp_init(void)
void imx233_ssp_start(int ssp)
{
+ if(ssp_in_use[ssp - 1])
+ return;
+ ssp_in_use[ssp - 1] = true;
/* Gate block */
imx233_reset_block(&HW_SSP_CTRL0(ssp));
/* Gate dma channel */
imx233_dma_clkgate_channel(APB_SSP(ssp), true);
/* If first block to start, start SSP clock */
- if(ssp_in_use == 0)
+ if(ssp_nr_in_use == 0)
{
/** 2.3.1: the clk_ssp maximum frequency is 102.858 MHz */
/* fracdiv = 18 => clk_io = pll = 480Mhz
@@ -108,18 +112,21 @@ void imx233_ssp_start(int ssp)
imx233_set_bypass_pll(CLK_SSP, false); /* use IO */
imx233_enable_clock(CLK_SSP, true);
}
- ssp_in_use++;
+ ssp_nr_in_use++;
}
void imx233_ssp_stop(int ssp)
{
+ if(!ssp_in_use[ssp - 1])
+ return;
+ ssp_in_use[ssp - 1] = false;
/* Gate off */
__REG_SET(HW_SSP_CTRL0(ssp)) = __BLOCK_CLKGATE;
/* Gate off dma */
imx233_dma_clkgate_channel(APB_SSP(ssp), false);
/* If last block to stop, stop SSP clock */
- ssp_in_use--;
- if(ssp_in_use == 0)
+ ssp_nr_in_use--;
+ if(ssp_nr_in_use == 0)
{
imx233_enable_clock(CLK_SSP, false);
imx233_set_fractional_divisor(CLK_IO, 0);
@@ -137,24 +144,6 @@ void imx233_ssp_set_timings(int ssp, int divide, int rate, int timeout)
timeout << HW_SSP_TIMING__CLOCK_TIMEOUT_BP;
}
-#if 0
-static void setup_ssp_sd_pins(int ssp)
-{
- imx233_set_pin_function(1, 29, PINCTRL_FUNCTION_GPIO);
- imx233_enable_gpio_output(1, 29, true);
- imx233_set_gpio_output(1, 29, false);
-
- if(ssp == 1)
- {
-
- }
- else
- {
-
- }
-}
-#endif
-
void imx233_ssp_setup_ssp1_sd_mmc_pins(bool enable_pullups, unsigned bus_width,
unsigned drive_strength, bool use_alt)
{
@@ -352,7 +341,7 @@ static void detect_irq(int bank, int pin)
timeout_register(&ssp2_detect_oneshot, ssp2_detect_oneshot_callback, (3*HZ/10), 0);
}
-void imx233_ssp_sdmmc_setup_detect(int ssp, bool enable, ssp_detect_cb_t fn)
+void imx233_ssp_sdmmc_setup_detect(int ssp, bool enable, ssp_detect_cb_t fn, bool first_time)
{
int bank = ssp == 1 ? 2 : 0;
int pin = ssp == 1 ? 1 : 19;
@@ -362,6 +351,8 @@ void imx233_ssp_sdmmc_setup_detect(int ssp, bool enable, ssp_detect_cb_t fn)
imx233_set_pin_function(bank, pin, PINCTRL_FUNCTION_GPIO);
imx233_enable_gpio_output(bank, pin, false);
}
+ if(first_time && imx233_ssp_sdmmc_detect(ssp))
+ detect_irq(bank, pin);
imx233_setup_pin_irq(bank, pin, enable, true, !imx233_ssp_sdmmc_detect(ssp), detect_irq);
}
diff --git a/firmware/target/arm/imx233/ssp-imx233.h b/firmware/target/arm/imx233/ssp-imx233.h
index 42aa2550a6..a463c04a20 100644
--- a/firmware/target/arm/imx233/ssp-imx233.h
+++ b/firmware/target/arm/imx233/ssp-imx233.h
@@ -168,8 +168,10 @@ void imx233_ssp_setup_ssp1_sd_mmc_pins(bool enable_pullups, unsigned bus_width,
void imx233_ssp_setup_ssp2_sd_mmc_pins(bool enable_pullups, unsigned bus_width,
unsigned drive_strength);
/* after callback is fired, imx233_ssp_sdmmc_setup_detect needs to be called
- * to enable detection again */
-void imx233_ssp_sdmmc_setup_detect(int ssp, bool enable, ssp_detect_cb_t fn);
+ * to enable detection again. If first_time is true, the callback will
+ * be called if the sd card is inserted when the function is called, otherwise
+ * it will be called on the next insertion change. */
+void imx233_ssp_sdmmc_setup_detect(int ssp, bool enable, ssp_detect_cb_t fn, bool first_time);
bool imx233_ssp_sdmmc_detect(int ssp);
/* SD/MMC requires that the card be provided the clock during an init sequence of
* at least 1msec (or 74 clocks). Does NOT touch the clock so it has to be correct. */