From patchwork Tue Jul 18 11:58:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manikanta Pubbisetty X-Patchwork-Id: 9848161 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 1B1D760392 for ; Tue, 18 Jul 2017 11:58:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 086E427FAC for ; Tue, 18 Jul 2017 11:58:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F169228497; Tue, 18 Jul 2017 11:58:44 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 B6AD627FAC for ; Tue, 18 Jul 2017 11:58:43 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=mXUrsTryqYxim9EMJB/9F8Bh2tBA81rNltUeRDFbdJQ=; b=hElQi3lubL1Rwj vxS40M+CE7g7nMVN7qSLr8HNcEsZ4ZIOlYoB/lvCce9EqndO0zCeia5jmAnw9x8haTEG/puRhuadM Ko205u6nhimAlWNbuYyFSXKhQ6BRwCnUDaE7A/YropoUKpzu2c2mcwSw5QAcF11qmhizojkEJiP0I zv1YUZwrwOU/57A3fH3NGKcPfBNmzldRj7tjvEM1CxmIszSEgqpxAAE16mYU+kmR1iITtEt0P+Bq3 TjbiWB21w2IdtvtJgxnaQTHd2/11kccAMtNNMujBKZLHbq8komxg/kW894nPzpSOD77i41xz68hTf aKqwIM9yS6Kj6ezbtOjg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dXR9C-0002pY-MK; Tue, 18 Jul 2017 11:58:38 +0000 Received: from alexa-out.qualcomm.com ([129.46.98.28] helo=alexa-out-lv-02.qualcomm.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXR9A-0002nT-ER for ath10k@lists.infradead.org; Tue, 18 Jul 2017 11:58:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1500379116; x=1531915116; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=ZfeVp5nedoEkJShzU27Qi97gMY+M1ssD7XoFkyunJgk=; b=bSy6Src/Gg+GYz8w2ZCQOyZ5DrCiOiF5bFClPbndaZmRbNckpXSeKeD3 5GwT7SFomgqQE8LTqqSCWF41pHMihTVNW4PqMuGjh5ZyifLB7ORoqTUdZ wQGvQIbPeN/lQREpLLlJK0M6J2ZSyY/pkX8YldgqCHmXa4GNzRTrFg/MJ Q=; X-IronPort-AV: E=Sophos;i="5.40,377,1496127600"; d="scan'208";a="1244065" Received: from ironmsg04-l-new.qualcomm.com (HELO Ironmsg04-L.qualcomm.com) ([10.53.140.111]) by alexa-out-lv-02.qualcomm.com with ESMTP; 18 Jul 2017 04:58:16 -0700 X-IronPort-AV: E=McAfee;i="5800,7501,8594"; a="1388931072" X-MGA-submission: =?us-ascii?q?MDFkFqRG7/aG+/wpkdYczN28lIoWyDpXbX4T6h?= =?us-ascii?q?oM93cMCvGcRklJAdqsO36TZIR9BDWtfwGWA4lD8OTF7hXPpoEFSaV/W4?= =?us-ascii?q?6K8eX8Ajeqk4HfEvMLezXMc1kp8Sulp0crcaIVs2mq+TE78ETOHDOmAN?= =?us-ascii?q?Ty?= Received: from nasanexm02e.na.qualcomm.com ([10.85.0.86]) by Ironmsg04-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 18 Jul 2017 04:58:15 -0700 Received: from aphydexm01f.ap.qualcomm.com (10.252.127.15) by nasanexm02e.na.qualcomm.com (10.85.0.86) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Tue, 18 Jul 2017 04:58:14 -0700 Received: from localhost (10.80.80.8) by aphydexm01f.ap.qualcomm.com (10.252.127.15) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Tue, 18 Jul 2017 17:28:09 +0530 From: To: Subject: [PATCHv2 1/3] ath10k: extend wmi service map to accommodate new services Date: Tue, 18 Jul 2017 17:28:12 +0530 Message-ID: <1500379094-2373-2-git-send-email-mpubbise@qti.qualcomm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1500379094-2373-1-git-send-email-mpubbise@qti.qualcomm.com> References: <1500379094-2373-1-git-send-email-mpubbise@qti.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01G.na.qualcomm.com (10.85.0.33) To aphydexm01f.ap.qualcomm.com (10.252.127.15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170718_045836_529885_3391586B X-CRM114-Status: UNSURE ( 8.02 ) X-CRM114-Notice: Please train this message. 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: linux-wireless@vger.kernel.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Manikanta Pubbisetty Though there is room to accommodate 512 services in wmi service ready event, target uses only first 4-bits of each 32-bit word for advertising wmi services thereby limiting max wmi services to 64. TDLS implementation for 10.4 firmwares introduces new wmi services by making use of remaining unused bits of each 32-bit word, therefore the wmi service mapping in host needs to be extended. This patch adds the logic to extend the wmi SVCMAP to accommodate new wmi services. Signed-off-by: Manikanta Pubbisetty --- drivers/net/wireless/ath/ath10k/wmi.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index baa38c8..3a4cbbc 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -420,9 +420,20 @@ static inline char *wmi_service_name(int service_id) __le32_to_cpu((wmi_svc_bmap)[(svc_id) / (sizeof(u32))]) & \ BIT((svc_id) % (sizeof(u32)))) +/* This extension is required to accommodate new services, current limit + * for wmi_services is 64 as target is using only 4-bits of each 32-bit + * wmi_service word. Extending this to make use of remaining unused bits + * for new services. + */ +#define WMI_EXT_SERVICE_IS_ENABLED(wmi_svc_bmap, svc_id, len) \ + ((svc_id) >= (len) && \ + __le32_to_cpu((wmi_svc_bmap)[((svc_id) - (len)) / 28]) & \ + BIT(((((svc_id) - (len)) % 28) & 0x1f) + 4)) + #define SVCMAP(x, y, len) \ do { \ - if (WMI_SERVICE_IS_ENABLED((in), (x), (len))) \ + if ((WMI_SERVICE_IS_ENABLED((in), (x), (len))) || \ + (WMI_EXT_SERVICE_IS_ENABLED((in), (x), (len)))) \ __set_bit(y, out); \ } while (0)