Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 87516
b: refs/heads/master
c: ead7077
h: refs/heads/master
v: v3
  • Loading branch information
Alex Dubov authored and Linus Torvalds committed Mar 20, 2008
1 parent 97748fd commit 5db791b
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9df130392fb642ecd5564163b574ce69ffda1afa
refs/heads/master: ead70773608a5d97f81cb492f117d20b5e9f323e
9 changes: 3 additions & 6 deletions trunk/drivers/memstick/core/memstick.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,6 @@ void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc,
mrq->need_card_int = 1;
else
mrq->need_card_int = 0;

mrq->get_int_reg = 0;
}
EXPORT_SYMBOL(memstick_init_req_sg);

Expand Down Expand Up @@ -311,8 +309,6 @@ void memstick_init_req(struct memstick_request *mrq, unsigned char tpc,
mrq->need_card_int = 1;
else
mrq->need_card_int = 0;

mrq->get_int_reg = 0;
}
EXPORT_SYMBOL(memstick_init_req);

Expand Down Expand Up @@ -342,6 +338,7 @@ static int h_memstick_read_dev_id(struct memstick_dev *card,
card->id.class = id_reg.class;
}
complete(&card->mrq_complete);
dev_dbg(&card->dev, "if_mode = %02x\n", id_reg.if_mode);
return -EAGAIN;
}
}
Expand Down Expand Up @@ -422,7 +419,6 @@ static void memstick_power_on(struct memstick_host *host)
{
host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_ON);
host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_SERIAL);
msleep(1);
}

static void memstick_check(struct work_struct *work)
Expand Down Expand Up @@ -579,7 +575,8 @@ EXPORT_SYMBOL(memstick_suspend_host);
void memstick_resume_host(struct memstick_host *host)
{
mutex_lock(&host->lock);
host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_ON);
if (host->card)
memstick_power_on(host);
mutex_unlock(&host->lock);
memstick_detect_change(host);
}
Expand Down
15 changes: 9 additions & 6 deletions trunk/drivers/memstick/core/mspro_block.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ struct mspro_devinfo {
struct mspro_block_data {
struct memstick_dev *card;
unsigned int usage_count;
unsigned int caps;
struct gendisk *disk;
struct request_queue *queue;
spinlock_t q_lock;
Expand Down Expand Up @@ -577,7 +578,6 @@ static int h_mspro_block_wait_for_ced(struct memstick_dev *card,
static int h_mspro_block_transfer_data(struct memstick_dev *card,
struct memstick_request **mrq)
{
struct memstick_host *host = card->host;
struct mspro_block_data *msb = memstick_get_drvdata(card);
unsigned char t_val = 0;
struct scatterlist t_sg = { 0 };
Expand All @@ -591,12 +591,12 @@ static int h_mspro_block_transfer_data(struct memstick_dev *card,
switch ((*mrq)->tpc) {
case MS_TPC_WRITE_REG:
memstick_init_req(*mrq, MS_TPC_SET_CMD, &msb->transfer_cmd, 1);
(*mrq)->get_int_reg = 1;
(*mrq)->need_card_int = 1;
return 0;
case MS_TPC_SET_CMD:
t_val = (*mrq)->int_reg;
memstick_init_req(*mrq, MS_TPC_GET_INT, NULL, 1);
if (host->caps & MEMSTICK_CAP_AUTO_GET_INT)
if (msb->caps & MEMSTICK_CAP_AUTO_GET_INT)
goto has_int_reg;
return 0;
case MS_TPC_GET_INT:
Expand Down Expand Up @@ -646,12 +646,12 @@ static int h_mspro_block_transfer_data(struct memstick_dev *card,
? MS_TPC_READ_LONG_DATA
: MS_TPC_WRITE_LONG_DATA,
&t_sg);
(*mrq)->get_int_reg = 1;
(*mrq)->need_card_int = 1;
return 0;
case MS_TPC_READ_LONG_DATA:
case MS_TPC_WRITE_LONG_DATA:
msb->current_page++;
if (host->caps & MEMSTICK_CAP_AUTO_GET_INT) {
if (msb->caps & MEMSTICK_CAP_AUTO_GET_INT) {
t_val = (*mrq)->int_reg;
goto has_int_reg;
} else {
Expand Down Expand Up @@ -1052,7 +1052,8 @@ static int mspro_block_init_card(struct memstick_dev *card)
if (memstick_set_rw_addr(card))
return -EIO;

if (host->caps & MEMSTICK_CAP_PAR4) {
msb->caps = host->caps;
if (msb->caps & MEMSTICK_CAP_PAR4) {
if (mspro_block_switch_to_parallel(card))
printk(KERN_WARNING "%s: could not switch to "
"parallel interface\n", card->dev.bus_id);
Expand All @@ -1062,6 +1063,8 @@ static int mspro_block_init_card(struct memstick_dev *card)
if (rc)
return rc;
dev_dbg(&card->dev, "card activated\n");
if (msb->system != MEMSTICK_SYS_SERIAL)
msb->caps |= MEMSTICK_CAP_AUTO_GET_INT;

card->next_request = h_mspro_block_req_init;
msb->mrq_handler = h_mspro_block_get_ro;
Expand Down
48 changes: 27 additions & 21 deletions trunk/drivers/memstick/host/jmb38x_ms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ struct jmb38x_ms_host {
unsigned long timeout_jiffies;
struct timer_list timer;
struct memstick_request *req;
unsigned char eject:1,
use_dma:1;
unsigned char cmd_flags;
unsigned char io_pos;
unsigned int io_word[2];
Expand Down Expand Up @@ -95,9 +93,22 @@ struct jmb38x_ms {
#define HOST_CONTROL_IF_PAR4 0x1
#define HOST_CONTROL_IF_PAR8 0x3

#define STATUS_BUSY 0x00080000
#define STATUS_MS_DAT7 0x00040000
#define STATUS_MS_DAT6 0x00020000
#define STATUS_MS_DAT5 0x00010000
#define STATUS_MS_DAT4 0x00008000
#define STATUS_MS_DAT3 0x00004000
#define STATUS_MS_DAT2 0x00002000
#define STATUS_MS_DAT1 0x00001000
#define STATUS_MS_DAT0 0x00000800
#define STATUS_HAS_MEDIA 0x00000400
#define STATUS_FIFO_EMPTY 0x00000200
#define STATUS_FIFO_FULL 0x00000100
#define STATUS_MS_CED 0x00000080
#define STATUS_MS_ERR 0x00000040
#define STATUS_MS_BRQ 0x00000020
#define STATUS_MS_CNK 0x00000001

#define INT_STATUS_TPC_ERR 0x00080000
#define INT_STATUS_CRC_ERR 0x00040000
Expand All @@ -124,7 +135,7 @@ enum {
CMD_READY = 0x01,
FIFO_READY = 0x02,
REG_DATA = 0x04,
AUTO_GET_INT = 0x08
DMA_DATA = 0x08
};

static unsigned int jmb38x_ms_read_data(struct jmb38x_ms_host *host,
Expand Down Expand Up @@ -367,28 +378,27 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)
cmd |= TPC_DIR;
if (host->req->need_card_int)
cmd |= TPC_WAIT_INT;
if (host->req->get_int_reg)
cmd |= TPC_GET_INT;

data = host->req->data;

host->use_dma = !no_dma;
if (!no_dma)
host->cmd_flags |= DMA_DATA;

if (host->req->long_data) {
data_len = host->req->sg.length;
} else {
data_len = host->req->data_len;
host->use_dma = 0;
host->cmd_flags &= ~DMA_DATA;
}

if (data_len <= 8) {
cmd &= ~(TPC_DATA_SEL | 0xf);
host->cmd_flags |= REG_DATA;
cmd |= data_len & 0xf;
host->use_dma = 0;
host->cmd_flags &= ~DMA_DATA;
}

if (host->use_dma) {
if (host->cmd_flags & DMA_DATA) {
if (1 != pci_map_sg(host->chip->pdev, &host->req->sg, 1,
host->req->data_dir == READ
? PCI_DMA_FROMDEVICE
Expand Down Expand Up @@ -451,13 +461,12 @@ static void jmb38x_ms_complete_cmd(struct memstick_host *msh, int last)
readl(host->addr + INT_STATUS));
dev_dbg(msh->cdev.dev, "c hstatus %08x\n", readl(host->addr + STATUS));

if (host->req->get_int_reg) {
t_val = readl(host->addr + TPC_P0);
host->req->int_reg = (t_val & 0xff);
}
host->req->int_reg = readl(host->addr + STATUS) & 0xff;

writel(0, host->addr + BLOCK);
writel(0, host->addr + DMA_CONTROL);

if (host->use_dma) {
writel(0, host->addr + DMA_CONTROL);
if (host->cmd_flags & DMA_DATA) {
pci_unmap_sg(host->chip->pdev, &host->req->sg, 1,
host->req->data_dir == READ
? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE);
Expand Down Expand Up @@ -509,7 +518,7 @@ static irqreturn_t jmb38x_ms_isr(int irq, void *dev_id)
else
host->req->error = -ETIME;
} else {
if (host->use_dma) {
if (host->cmd_flags & DMA_DATA) {
if (irq_status & INT_STATUS_EOTRAN)
host->cmd_flags |= FIFO_READY;
} else {
Expand Down Expand Up @@ -775,13 +784,10 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt)
snprintf(host->host_id, DEVICE_ID_SIZE, DRIVER_NAME ":slot%d",
host->id);
host->irq = jm->pdev->irq;
host->timeout_jiffies = msecs_to_jiffies(4000);
host->timeout_jiffies = msecs_to_jiffies(1000);
msh->request = jmb38x_ms_request;
msh->set_param = jmb38x_ms_set_param;
/*
msh->caps = MEMSTICK_CAP_AUTO_GET_INT | MEMSTICK_CAP_PAR4
| MEMSTICK_CAP_PAR8;
*/

msh->caps = MEMSTICK_CAP_PAR4 | MEMSTICK_CAP_PAR8;

setup_timer(&host->timer, jmb38x_ms_abort, (unsigned long)msh);
Expand Down
17 changes: 10 additions & 7 deletions trunk/drivers/memstick/host/tifm_ms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,11 +340,20 @@ static void tifm_ms_complete_cmd(struct tifm_ms *host)

del_timer(&host->timer);

if (host->use_dma)
host->req->int_reg = readl(sock->addr + SOCK_MS_STATUS) & 0xff;
host->req->int_reg = (host->req->int_reg & 1)
| ((host->req->int_reg << 4) & 0xe0);

writel(TIFM_FIFO_INT_SETALL,
sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
writel(TIFM_DMA_RESET, sock->addr + SOCK_DMA_CONTROL);

if (host->use_dma) {
tifm_unmap_sg(sock, &host->req->sg, 1,
host->req->data_dir == READ
? PCI_DMA_FROMDEVICE
: PCI_DMA_TODEVICE);
}

writel((~TIFM_CTRL_LED) & readl(sock->addr + SOCK_CONTROL),
sock->addr + SOCK_CONTROL);
Expand Down Expand Up @@ -424,12 +433,6 @@ static void tifm_ms_card_event(struct tifm_dev *sock)
else if (host_status & TIFM_MS_STAT_CRC)
host->req->error = -EILSEQ;

if (host->req->error) {
writel(TIFM_FIFO_INT_SETALL,
sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
writel(TIFM_DMA_RESET, sock->addr + SOCK_DMA_CONTROL);
}

if (host_status & TIFM_MS_STAT_RDY)
host->cmd_flags |= CMD_READY;

Expand Down
1 change: 0 additions & 1 deletion trunk/include/linux/memstick.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ struct memstick_request {
unsigned char tpc;
unsigned char data_dir:1,
need_card_int:1,
get_int_reg:1,
long_data:1;
unsigned char int_reg;
int error;
Expand Down

0 comments on commit 5db791b

Please sign in to comment.