From patchwork Wed Jul 1 10:38:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 6702701 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A7C6CC05AC for ; Wed, 1 Jul 2015 10:39:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E8BBE20605 for ; Wed, 1 Jul 2015 10:39:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 08AB820612 for ; Wed, 1 Jul 2015 10:39:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZAFQR-0003Ah-Km; Wed, 01 Jul 2015 10:39:31 +0000 Received: from wolverine02.qualcomm.com ([199.106.114.251]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZAFQQ-0005Vs-Ik for ath10k@lists.infradead.org; Wed, 01 Jul 2015 10:39:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1435747170; x=1467283170; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=s0M4J36mN8xO0y6BRpaC7O62/yA9sghZUm0WReYLwZw=; b=f7cr1LTL+g9lS8ho95nJVhIYEEVc/IboGnCWtfD0qu3zG8st7ib2hPNJ Megoe4+IPq7wfx2hZzmu8tmOXoss+l5Qn9vD3TsowXBQR8cs88jdp4KEc kcJ3VDqU7JZhiFWyCBp/x02rg87rK3zGXb9f1bB63HiWQ8TjZjJYFnPpY Q=; X-IronPort-AV: E=McAfee;i="5700,7163,7848"; a="218335365" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine02.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 01 Jul 2015 03:39:07 -0700 X-IronPort-AV: E=Sophos;i="5.15,384,1432623600"; d="scan'208";a="949342924" Received: from nasanexm01g.na.qualcomm.com ([10.85.0.33]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 01 Jul 2015 03:39:07 -0700 Received: from potku.adurom.net (10.80.80.8) by NASANEXM01G.na.qualcomm.com (10.85.0.33) with Microsoft SMTP Server (TLS) id 15.0.1076.9; Wed, 1 Jul 2015 03:39:05 -0700 From: Kalle Valo To: Raja Mani Subject: Re: [PATCH v2 5/8] ath10k: add 10.4 fw specific htt msg definitions References: <1434984747-24294-1-git-send-email-rmani@qti.qualcomm.com> <1434984747-24294-6-git-send-email-rmani@qti.qualcomm.com> Date: Wed, 1 Jul 2015 13:38:58 +0300 In-Reply-To: <1434984747-24294-6-git-send-email-rmani@qti.qualcomm.com> (Raja Mani's message of "Mon, 22 Jun 2015 20:22:24 +0530") Message-ID: <878ub0xiv1.fsf@kamboji.qca.qualcomm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01B.na.qualcomm.com (10.85.0.82) To NASANEXM01G.na.qualcomm.com (10.85.0.33) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150701_033930_656046_7980A701 X-CRM114-Status: UNSURE ( 9.52 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.6 (-------) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Raja Mani writes: > New htt event table is added for 10.4 firmware. Following new htt > events are available only 10.4. adding this to generic htt event > table, > HTT_T2H_MSG_TYPE_EN_STATS, > HTT_T2H_MSG_TYPE_TX_FETCH_IND, > HTT_T2H_MSG_TYPE_TX_FETCH_CONF, > HTT_T2H_MSG_TYPE_TX_LOW_LATENCY_IND > > Signed-off-by: Raja Mani [...] > @@ -1146,6 +1147,8 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) > ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV; > break; > case ATH10K_FW_WMI_OP_VERSION_10_4: > + ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_10_4; > + break; > case ATH10K_FW_WMI_OP_VERSION_UNSET: > case ATH10K_FW_WMI_OP_VERSION_MAX: > WARN_ON(1); So this switch block is only to support older firmware versions which do not have ATH10K_FW_IE_HTT_OP_VERSION yet. 10.4 firmware will always have it set so we don't need to have any backwards compatibility code for 10.4. I changed this part with the diff below. Please review. --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1147,8 +1147,6 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV; break; case ATH10K_FW_WMI_OP_VERSION_10_4: - ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_10_4; - break; case ATH10K_FW_WMI_OP_VERSION_UNSET: case ATH10K_FW_WMI_OP_VERSION_MAX: WARN_ON(1);