History

Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6: spi-topcliff-pch: Fix overrun issue spi-topcliff-pch: Add recovery processing in case FIFO overrun error occurs spi-topcliff-pch: Fix CPU read complete condition issue spi-topcliff-pch: Fix SSN Control issue spi-topcliff-pch: add tx-memory clear after complete transmitting

Linus Torvalds committed 15 years ago

Commit f8451c32 parents 5f39e67 f3e03e21 file · +66 −27Browse files

Unified · Split

drivers/spi/spi-topcliff-pch.c+66−27
@@ -50,6 +50,8 @@ · 49 unmodified lines
5050 #define PCH_RX_THOLD 7
5151 #define PCH_RX_THOLD_MAX 15
5252
53+#define PCH_TX_THOLD 2
54+
5355 #define PCH_MAX_BAUDRATE 5000000
5456 #define PCH_MAX_FIFO_DEPTH 16
5557
@@ -58,6 +60,7 @@ · 2 unmodified lines
5860 #define PCH_SLEEP_TIME 10
5961
6062 #define SSN_LOW 0x02U
63+#define SSN_HIGH 0x03U
6164 #define SSN_NO_CONTROL 0x00U
6265 #define PCH_MAX_CS 0xFF
6366 #define PCI_DEVICE_ID_GE_SPI 0x8816
@@ -316,16 +319,19 @@ static void pch_spi_handler_sub(struct pch_spi_data *data, u32 reg_spsr_val, · 252 unmodified lines
316319
317320 /* if transfer complete interrupt */
318321 if (reg_spsr_val & SPSR_FI_BIT) {
319− if (tx_index < bpw_len)
322+ if ((tx_index == bpw_len) && (rx_index == tx_index)) {
323+ /* disable interrupts */
324+ pch_spi_setclr_reg(data->master, PCH_SPCR, 0, PCH_ALL);
325+
326+ /* transfer is completed;
327+ inform pch_spi_process_messages */
328+ data->transfer_complete = true;
329+ data->transfer_active = false;
330+ wake_up(&data->wait);
331+ } else {
320332 dev_err(&data->master->dev,
321333 "%s : Transfer is not completed", __func__);
322− /* disable interrupts */
323− pch_spi_setclr_reg(data->master, PCH_SPCR, 0, PCH_ALL);
324−
325− /* transfer is completed;inform pch_spi_process_messages */
326− data->transfer_complete = true;
327− data->transfer_active = false;
328− wake_up(&data->wait);
334+ }
329335 }
330336 }
331337
@@ -348,16 +354,26 @@ static irqreturn_t pch_spi_handler(int irq, void *dev_id) · 16 unmodified lines
348354 "%s returning due to suspend\n", __func__);
349355 return IRQ_NONE;
350356 }
351− if (data->use_dma)
352− return IRQ_NONE;
353357
354358 io_remap_addr = data->io_remap_addr;
355359 spsr = io_remap_addr + PCH_SPSR;
356360
357361 reg_spsr_val = ioread32(spsr);
358362
359− if (reg_spsr_val & SPSR_ORF_BIT)
360− dev_err(&board_dat->pdev->dev, "%s Over run error", __func__);
363+ if (reg_spsr_val & SPSR_ORF_BIT) {
364+ dev_err(&board_dat->pdev->dev, "%s Over run error\n", __func__);
365+ if (data->current_msg->complete != 0) {
366+ data->transfer_complete = true;
367+ data->current_msg->status = -EIO;
368+ data->current_msg->complete(data->current_msg->context);
369+ data->bcurrent_msg_processing = false;
370+ data->current_msg = NULL;
371+ data->cur_trans = NULL;
372+ }
373+ }
374+
375+ if (data->use_dma)
376+ return IRQ_NONE;
361377
362378 /* Check if the interrupt is for SPI device */
363379 if (reg_spsr_val & (SPSR_FI_BIT | SPSR_RFI_BIT)) {
@@ -756,10 +772,6 @@ static void pch_spi_set_ir(struct pch_spi_data *data) · 392 unmodified lines
756772
757773 wait_event_interruptible(data->wait, data->transfer_complete);
758774
759− pch_spi_writereg(data->master, PCH_SSNXCR, SSN_NO_CONTROL);
760− dev_dbg(&data->master->dev,
761− "%s:no more control over SSN-writing 0 to SSNXCR.", __func__);
762−
763775 /* clear all interrupts */
764776 pch_spi_writereg(data->master, PCH_SPSR,
765777 pch_spi_readreg(data->master, PCH_SPSR));
@@ -815,10 +827,11 @@ static void pch_spi_copy_rx_data_for_dma(struct pch_spi_data *data, int bpw) · 49 unmodified lines
815827 }
816828 }
817829
818−static void pch_spi_start_transfer(struct pch_spi_data *data)
830+static int pch_spi_start_transfer(struct pch_spi_data *data)
819831 {
820832 struct pch_spi_dma_ctrl *dma;
821833 unsigned long flags;
834+ int rtn;
822835
823836 dma = &data->dma;
824837
@@ -833,19 +846,23 @@ static void pch_spi_start_transfer(struct pch_spi_data *data) · 8 unmodified lines
833846 initiating the transfer. */
834847 dev_dbg(&data->master->dev,
835848 "%s:waiting for transfer to get over\n", __func__);
836− wait_event_interruptible(data->wait, data->transfer_complete);
849+ rtn = wait_event_interruptible_timeout(data->wait,
850+ data->transfer_complete,
851+ msecs_to_jiffies(2 * HZ));
837852
838853 dma_sync_sg_for_cpu(&data->master->dev, dma->sg_rx_p, dma->nent,
839854 DMA_FROM_DEVICE);
855+
856+ dma_sync_sg_for_cpu(&data->master->dev, dma->sg_tx_p, dma->nent,
857+ DMA_FROM_DEVICE);
858+ memset(data->dma.tx_buf_virt, 0, PAGE_SIZE);
859+
840860 async_tx_ack(dma->desc_rx);
841861 async_tx_ack(dma->desc_tx);
842862 kfree(dma->sg_tx_p);
843863 kfree(dma->sg_rx_p);
844864
845865 spin_lock_irqsave(&data->lock, flags);
846− pch_spi_writereg(data->master, PCH_SSNXCR, SSN_NO_CONTROL);
847− dev_dbg(&data->master->dev,
848− "%s:no more control over SSN-writing 0 to SSNXCR.", __func__);
849866
850867 /* clear fifo threshold, disable interrupts, disable SPI transfer */
851868 pch_spi_setclr_reg(data->master, PCH_SPCR, 0,
@@ -858,6 +875,8 @@ static void pch_spi_start_transfer(struct pch_spi_data *data) · 6 unmodified lines
858875 pch_spi_clear_fifo(data->master);
859876
860877 spin_unlock_irqrestore(&data->lock, flags);
878+
879+ return rtn;
861880 }
862881
863882 static void pch_dma_rx_complete(void *arg)
@@ -1023,8 +1042,7 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw) · 159 unmodified lines
10231042 /* set receive fifo threshold and transmit fifo threshold */
10241043 pch_spi_setclr_reg(data->master, PCH_SPCR,
10251044 ((size - 1) << SPCR_RFIC_FIELD) |
1026− ((PCH_MAX_FIFO_DEPTH - PCH_DMA_TRANS_SIZE) <<
1027− SPCR_TFIC_FIELD),
1045+ (PCH_TX_THOLD << SPCR_TFIC_FIELD),
10281046 MASK_RFIC_SPCR_BITS | MASK_TFIC_SPCR_BITS);
10291047
10301048 spin_unlock_irqrestore(&data->lock, flags);
@@ -1035,13 +1053,20 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw) · 4 unmodified lines
10351053 /* offset, length setting */
10361054 sg = dma->sg_rx_p;
10371055 for (i = 0; i < num; i++, sg++) {
1038− if (i == 0) {
1039− sg->offset = 0;
1056+ if (i == (num - 2)) {
1057+ sg->offset = size * i;
1058+ sg->offset = sg->offset * (*bpw / 8);
10401059 sg_set_page(sg, virt_to_page(dma->rx_buf_virt), rem,
10411060 sg->offset);
10421061 sg_dma_len(sg) = rem;
1062+ } else if (i == (num - 1)) {
1063+ sg->offset = size * (i - 1) + rem;
1064+ sg->offset = sg->offset * (*bpw / 8);
1065+ sg_set_page(sg, virt_to_page(dma->rx_buf_virt), size,
1066+ sg->offset);
1067+ sg_dma_len(sg) = size;
10431068 } else {
1044− sg->offset = rem + size * (i - 1);
1069+ sg->offset = size * i;
10451070 sg->offset = sg->offset * (*bpw / 8);
10461071 sg_set_page(sg, virt_to_page(dma->rx_buf_virt), size,
10471072 sg->offset);
@@ -1065,6 +1090,16 @@ static void pch_spi_handle_dma(struct pch_spi_data *data, int *bpw) · 17 unmodified lines
10651090 dma->desc_rx = desc_rx;
10661091
10671092 /* TX */
1093+ if (data->bpw_len > PCH_DMA_TRANS_SIZE) {
1094+ num = data->bpw_len / PCH_DMA_TRANS_SIZE;
1095+ size = PCH_DMA_TRANS_SIZE;
1096+ rem = 16;
1097+ } else {
1098+ num = 1;
1099+ size = data->bpw_len;
1100+ rem = data->bpw_len;
1101+ }
1102+
10681103 dma->sg_tx_p = kzalloc(sizeof(struct scatterlist)*num, GFP_ATOMIC);
10691104 sg_init_table(dma->sg_tx_p, num); /* Initialize SG table */
10701105 /* offset, length setting */
@@ -1162,6 +1197,7 @@ static void pch_spi_process_messages(struct work_struct *pwork) · 91 unmodified lines
11621197 if (data->use_dma)
11631198 pch_spi_request_dma(data,
11641199 data->current_msg->spi->bits_per_word);
1200+ pch_spi_writereg(data->master, PCH_SSNXCR, SSN_NO_CONTROL);
11651201 do {
11661202 /* If we are already processing a message get the next
11671203 transfer structure from the message otherwise retrieve
@@ -1184,7 +1220,8 @@ static void pch_spi_process_messages(struct work_struct *pwork) · 16 unmodified lines
11841220
11851221 if (data->use_dma) {
11861222 pch_spi_handle_dma(data, &bpw);
1187− pch_spi_start_transfer(data);
1223+ if (!pch_spi_start_transfer(data))
1224+ goto out;
11881225 pch_spi_copy_rx_data_for_dma(data, bpw);
11891226 } else {
11901227 pch_spi_set_tx(data, &bpw);
@@ -1222,6 +1259,8 @@ static void pch_spi_process_messages(struct work_struct *pwork) · 31 unmodified lines
12221259
12231260 } while (data->cur_trans != NULL);
12241261
1262+out:
1263+ pch_spi_writereg(data->master, PCH_SSNXCR, SSN_HIGH);
12251264 if (data->use_dma)
12261265 pch_spi_release_dma(data);
12271266 }