From patchwork Thu Apr 12 12:16:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manikanta Pubbisetty X-Patchwork-Id: 10338445 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AA194604D4 for ; Thu, 12 Apr 2018 12:18:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B08026E76 for ; Thu, 12 Apr 2018 12:18:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FC5228112; Thu, 12 Apr 2018 12:18:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EF56626E76 for ; Thu, 12 Apr 2018 12:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=xMwiGi8PJ1SgkygzIQj9R9xBvUr+7vSc7aXRiZGhtho=; b=Z7n 5orw1CSNIZQnwmgq1Q+XpxE8NRH6A2hrnNqMaE8+qANfKhiS+4raeF/ykV5tFob/aEP7VJavMHAZo M/5gUNrVFm6PhYvf9xUJGWmJeg8y0L1aAFlJ/p872d7bt5p3CcElH/1v5C/Do+HS9SfuVhefOlmsU b8APsF2XWiSq16JP6vrbBllAkJ+kGjUh5O7bU2agfcGIZy7eadH8Sorx/ZencIFyHMnOr4fwaIEEl iKWrWV5JHrObkkMoKHWh4VsoK+m5PicPJ9RzS0gxsNeg8j0lIueB/Kt1T0Axbu4TK9ywIOeBz+Rf+ AbPRjZhxPf1TDoZ8OnpBGLQFaJRhPMA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6bAp-0005m3-It; Thu, 12 Apr 2018 12:17:55 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6bAm-0005lH-Km for ath10k@lists.infradead.org; Thu, 12 Apr 2018 12:17:53 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5220460F92; Thu, 12 Apr 2018 12:17:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523535462; bh=rPFiqBUI2kzMz5KqGiF8Nu4lYBt8ok0miDa/k1ky0ZU=; h=From:To:Cc:Subject:Date:From; b=GQqtBq8hXzBEilP7Hl0hc7nuD9/lCdw5XoJo359A6zqJtIfq1ccULnMWG7sp1ecn5 01gKbgPyoPAmfi3orxsz2TKJ/PUnhXKxyeeIf9JKoXg5hEWzcgbDTnUkdYlhwUG61F AC3pl3E1hM3iRUMYAJDyDv15/aR0k5un1jdmBHbc= Received: from localhost (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mpubbise@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 0AFAD6030D; Thu, 12 Apr 2018 12:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523535461; bh=rPFiqBUI2kzMz5KqGiF8Nu4lYBt8ok0miDa/k1ky0ZU=; h=From:To:Cc:Subject:Date:From; b=k1JTPAgme2zmRm2aLimt4Pg+eOaajKdcNOKnf+iyKbBhnYezpLfVQJYnPMh25/0aK G5p29Jy7XLUWKj7rfk1o0pZZqoJkoUzMW2CwjntWRieC3EQT3XE9ASgfI3cO50HjHv YeOpXQERRpw0fpz45bJP+XN/lwTueBF/Zkn4Mn1c= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 0AFAD6030D Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=mpubbise@codeaurora.org From: mpubbise@codeaurora.org To: ath10k@lists.infradead.org Subject: [PATCH] ath10k: correct target assert problem due to CE5 stuck Date: Thu, 12 Apr 2018 17:46:50 +0530 Message-Id: <1523535410-29333-1-git-send-email-mpubbise@codeaurora.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180412_051752_702745_B1D2BD41 X-CRM114-Status: GOOD ( 12.32 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Manikanta Pubbisetty , linux-wireless@vger.kernel.org MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Manikanta Pubbisetty Correct a minor bug in the commit 0628467f97b5 ("ath10k: fix copy engine 5 destination ring stuck") which introduced a change to fix firmware assert that happens when ring indices of copy engine 5 are stuck for a specific duration, problem with this fix is that it did not use ring arithmatic. As a result,firmware asserts did not go away entirely athough the frequency of occurrence has reduced. Using ring arithmatic to fix the issue. Tested on QCA9984(fw version-10.4-3.4-00082). Fixes: 0628467f97b5 ("ath10k: fix copy engine 5 destination ring stuck) Signed-off-by: Manikanta Pubbisetty --- drivers/net/wireless/ath/ath10k/ce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c index b9def7b..6efa69e 100644 --- a/drivers/net/wireless/ath/ath10k/ce.c +++ b/drivers/net/wireless/ath/ath10k/ce.c @@ -615,7 +615,7 @@ void ath10k_ce_rx_update_write_idx(struct ath10k_ce_pipe *pipe, u32 nentries) /* Prevent CE ring stuck issue that will occur when ring is full. * Make sure that write index is 1 less than read index. */ - if ((cur_write_idx + nentries) == dest_ring->sw_index) + if (((cur_write_idx + nentries) & nentries_mask) == dest_ring->sw_index) nentries -= 1; write_index = CE_RING_IDX_ADD(nentries_mask, write_index, nentries);