Piteball/android_kernel_samsung_msm8226
1
0
Fork 0
mirror of https://github.com/S3NEO/android_kernel_samsung_msm8226.git synced 2024-11-07 03:47:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

spi: spi_qsd: Prevent transfer grouping

Browse source 
Prevent spi transfers from being grouped together.
Grouping multiple transfers together causes invalid
write then read transactions. This patch prevents
the transactions from being grouped and ensures the
chipselect toggles appropriately.

CRs-Fixed: 661007
Change-Id: I1962cc95fde196295f37c64ecd54e490a7285bc4
Signed-off-by: Dan Sneddon <dsneddon@codeaurora.org>
This commit is contained in:
Dan Sneddon 2014-05-07 11:34:39 -06:00 committed by Kiran Gunda
parent 4b0ea7aba4
commit b4af303ad2
1 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/spi/spi_qsd.c
View file

@ -2029,8 +2029,6 @@ static inline void write_force_cs(struct msm_spi *dd, bool set_flag)
static inline int combine_transfers(struct msm_spi *dd)
{
struct spi_transfer *t = dd->cur_transfer;
struct spi_transfer *nxt;
int xfrs_grped = 1;
dd->xfrs_delay_usec = 0;
@ -2043,30 +2041,7 @@ static inline int combine_transfers(struct msm_spi *dd)
if (dd->cur_transfer->rx_buf)
dd->bam.bam_rx_len += dd->cur_transfer->len;
while (t->transfer_list.next != &dd->cur_msg->transfers) {
nxt = list_entry(t->transfer_list.next,
struct spi_transfer,
transfer_list);
if (t->cs_change != nxt->cs_change)
return xfrs_grped;
if (t->delay_usecs) {
dd->xfrs_delay_usec = t->delay_usecs;
dev_info(dd->dev, "SPI slave requests delay per txn :%d usecs",
t->delay_usecs);
return xfrs_grped;
}
if (nxt->tx_buf)
dd->bam.bam_tx_len += nxt->len;
if (nxt->rx_buf)
dd->bam.bam_rx_len += nxt->len;
dd->cur_msg_len += nxt->len;
xfrs_grped++;
t = nxt;
}
if (1 == xfrs_grped)
dd->xfrs_delay_usec = dd->cur_transfer->delay_usecs;
dd->xfrs_delay_usec = dd->cur_transfer->delay_usecs;
return xfrs_grped;
}
@ -2116,7 +2091,7 @@ static void msm_spi_process_message(struct msm_spi *dd)
dd->cur_tx_transfer = dd->cur_transfer;
dd->cur_rx_transfer = dd->cur_transfer;
msm_spi_process_transfer(dd);
if (dd->qup_ver && !dd->xfrs_delay_usec)
if (dd->qup_ver && dd->cur_transfer->cs_change)
write_force_cs(dd, 0);
xfrs_grped--;
}
@ -2140,7 +2115,8 @@ static void msm_spi_process_message(struct msm_spi *dd)
dd->num_xfrs_grped = 1;
msm_spi_process_transfer(dd);
}
if (dd->qup_ver)
write_force_cs(dd, 0);
return;
error: