Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753700Ab1BBLCS (ORCPT ); Wed, 2 Feb 2011 06:02:18 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:50640 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753230Ab1BBLA4 (ORCPT ); Wed, 2 Feb 2011 06:00:56 -0500 From: pavan_savoy@ti.com To: linux-kernel@vger.kernel.org, gregkh@suse.de Cc: Pavan Savoy Subject: [PATCH 6/7] drivers:misc: ti-st: fix hci-ll on wake_ind collision Date: Wed, 2 Feb 2011 05:00:47 -0600 Message-Id: <1296644448-29667-7-git-send-email-pavan_savoy@ti.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1296644448-29667-6-git-send-email-pavan_savoy@ti.com> References: <1296644448-29667-1-git-send-email-pavan_savoy@ti.com> <1296644448-29667-2-git-send-email-pavan_savoy@ti.com> <1296644448-29667-3-git-send-email-pavan_savoy@ti.com> <1296644448-29667-4-git-send-email-pavan_savoy@ti.com> <1296644448-29667-5-git-send-email-pavan_savoy@ti.com> <1296644448-29667-6-git-send-email-pavan_savoy@ti.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2398 Lines: 78 From: Pavan Savoy Where file-transfer stops/pauses in between, is result of a HCI-LL anamoly in ST LL driver. ST LL did not copy the contents of WaitQ into the TxQ, when a WAKEUP_IND collision happened. Make also sure, that the copying mechanism is safe, by wrapping it around spin locks inside st_int_recv(). This was easily reproduced when the sleep timeout was reduced to 100ms for HCI-LL. Signed-off-by: Pavan Savoy --- drivers/misc/ti-st/st_core.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c index dd2c879..f0d24d8 100644 --- a/drivers/misc/ti-st/st_core.c +++ b/drivers/misc/ti-st/st_core.c @@ -236,6 +236,7 @@ void st_int_recv(void *disc_data, int len = 0, type = 0; unsigned char *plen; struct st_data_s *st_gdata = (struct st_data_s *)disc_data; + unsigned long flags; ptr = (char *)data; /* tty_receive sent null ? */ @@ -248,6 +249,7 @@ void st_int_recv(void *disc_data, "rx_count %ld", count, st_gdata->rx_state, st_gdata->rx_count); + spin_lock_irqsave(&st_gdata->lock, flags); /* Decode received bytes here */ while (count) { if (st_gdata->rx_count) { @@ -308,13 +310,25 @@ void st_int_recv(void *disc_data, * sleep state received -- */ st_ll_sleep_state(st_gdata, *ptr); + /* if WAKEUP_IND collides copy from waitq to txq + * and assume chip awake + */ + spin_unlock_irqrestore(&st_gdata->lock, flags); + if (st_ll_getstate(st_gdata) == ST_LL_AWAKE) + st_wakeup_ack(st_gdata, LL_WAKE_UP_ACK); + spin_lock_irqsave(&st_gdata->lock, flags); + ptr++; count--; continue; case LL_WAKE_UP_ACK: pr_debug("PM packet"); + + spin_unlock_irqrestore(&st_gdata->lock, flags); /* wake up ack received */ st_wakeup_ack(st_gdata, *ptr); + spin_lock_irqsave(&st_gdata->lock, flags); + ptr++; count--; continue; @@ -337,6 +351,7 @@ void st_int_recv(void *disc_data, ptr++; count--; } + spin_unlock_irqrestore(&st_gdata->lock, flags); pr_debug("done %s", __func__); return; } -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/