From patchwork Tue Apr 11 21:04:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ryanhsu@qti.qualcomm.com X-Patchwork-Id: 9676093 X-Patchwork-Delegate: kvalo@adurom.com 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 57A7160234 for ; Tue, 11 Apr 2017 21:11:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DF2C284BC for ; Tue, 11 Apr 2017 21:11:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42EAE28550; Tue, 11 Apr 2017 21:11:19 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8BD1284BC for ; Tue, 11 Apr 2017 21:11:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753360AbdDKVLR (ORCPT ); Tue, 11 Apr 2017 17:11:17 -0400 Received: from sabertooth02.qualcomm.com ([65.197.215.38]:48767 "EHLO sabertooth02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752951AbdDKVLQ (ORCPT ); Tue, 11 Apr 2017 17:11:16 -0400 X-Greylist: delayed 388 seconds by postgrey-1.27 at vger.kernel.org; Tue, 11 Apr 2017 17:11:16 EDT DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1491945076; x=1523481076; h=from:cc:to:subject:date:message-id:mime-version; bh=v+ay2rNRJK74AqaujyEoaw699K7WrpsyV4srAJ5Il8o=; b=Vh7ttHcNeqa4ACTSuBm2TYKfGxYIgKUMWk/MAJ38nKjnAR1SxbfQ4G86 eGqocMnNMxNus96eI6yPPlLmGjDaAJHcSfuOHDt1/ZcN715y9CoSuWdCq 1gL22jW1mxap0dqFeN3WWJ9vK2hP0FnftD5UKTePqldryqIyK5EfW3EKc o=; X-IronPort-AV: E=Sophos;i="5.37,187,1488873600"; d="scan'208";a="108651089" Received: from lv1-pdmz-css.qualcomm.com (HELO ironmsg10-lv.qulacomm.com) ([65.197.215.5]) by sabertooth02.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 11 Apr 2017 14:04:46 -0700 From: Cc: X-IronPort-AV: E=McAfee;i="5800,7501,8495"; a="729765" X-MGA-submission: =?us-ascii?q?MDHz0FPYK/CDJQp0yStkrnl2THduhRKqXx5pf5?= =?us-ascii?q?+QHoWj/vfraKmjkhZuac95va7LwSFQUXihIwCvjw0959nRAcB2KrKdLw?= =?us-ascii?q?mlrzyvLT/HD211ccATZCHIOSpqrql1U8JbEP7pNRjkwy8Dji3q4TRSze?= =?us-ascii?q?n3?= Received: from nalasexr01g.na.qualcomm.com ([10.49.56.53]) by ironmsg10-lv.qulacomm.com with ESMTP/TLS/RC4-SHA; 11 Apr 2017 14:04:46 -0700 Received: from ryanhsu-linux2.qualcomm.com (10.80.80.8) by NALASEXR01G.na.qualcomm.com (10.49.56.53) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Tue, 11 Apr 2017 14:04:45 -0700 To: , Subject: [PATCH] ath10k: ath10k: bump up FW API to 6 Date: Tue, 11 Apr 2017 14:04:48 -0700 Message-ID: <1491944688-5795-1-git-send-email-ryanhsu@qca.qualcomm.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01C.na.qualcomm.com (10.85.0.83) To NALASEXR01G.na.qualcomm.com (10.49.56.53) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ryan Hsu For QCA6174 hw3.0, since WLAN.RM.4.4-00022-QCARMSWPZ-2, it starts to support the board ID information from otp, with some devices released on the market that didn't calibrated with OTP, will have 0 for board ID information, which cause the backward compatibility issue and was fixed in commit 'd2e202c06ca4 ("ath10k: ignore configuring the incorrect board_id")' So bump the fw api version to differentiate the latest firmware support. Signed-off-by: Ryan Hsu --- drivers/net/wireless/ath/ath10k/hw.h | 5 ++++- drivers/net/wireless/ath/ath10k/pci.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index f7c5c13..cd3dd11 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -129,7 +129,7 @@ enum qca9377_chip_id_rev { #define QCA4019_HW_1_0_PATCH_LOAD_ADDR 0x1234 #define ATH10K_FW_FILE_BASE "firmware" -#define ATH10K_FW_API_MAX 5 +#define ATH10K_FW_API_MAX 6 #define ATH10K_FW_API_MIN 2 #define ATH10K_FW_API2_FILE "firmware-2.bin" @@ -141,6 +141,9 @@ enum qca9377_chip_id_rev { /* HTT id conflict fix for management frames over HTT */ #define ATH10K_FW_API5_FILE "firmware-5.bin" +/* the firmware-6.bin blob */ +#define ATH10K_FW_API6_FILE "firmware-6.bin" + #define ATH10K_FW_UTF_FILE "utf.bin" #define ATH10K_FW_UTF_API2_FILE "utf-2.bin" diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 5d2f9b9..66e27a3 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -3429,6 +3429,7 @@ static void __exit ath10k_pci_exit(void) /* QCA6174 3.1 firmware files */ MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API4_FILE); MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API5_FILE); +MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API6_FILE); MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" QCA6174_HW_3_0_BOARD_DATA_FILE); MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);