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: 9676073 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 9FF18600CB for ; Tue, 11 Apr 2017 21:05:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 951422850F for ; Tue, 11 Apr 2017 21:05:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 895042852D; Tue, 11 Apr 2017 21:05:45 +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 8E1B32850F for ; Tue, 11 Apr 2017 21:05:44 +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: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=P0MLqgBhlA0HDRxMo4QuDsTSXyJVZ/FnadWhBa42uH0=; b=AFxtCnev++eVgB s/dppqwJYzEvFhtUBYgwDYiRd0HLWJQt2gFDicsp1sn5qG/U2KjZQ0g54UaLPHh1rMhpjL1ddnn9G HcXf0zvohefLYBw7VTFVxbuHZeieIMGzGKTkFdtqvEHfkGWHo6wynHTYbMfqcwu2rGTi0X5NuZPh0 BG5Jkg5gozQjWwhYnxFGTCx8tNBqOCQJn7GpCEbYnROU1QrNcLuygmGfqqC6Nh7x+4WTsd5O75eBM cpO5SBS5giWIq9aSdvpZb6GEw7PvpNuD0SHLs+JjVFRVcTyeUklrJC3HHM1iE2/TQ1IW9jtfxQTfU MdDPXZAMRpL97nht8dEA==; 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 1cy2ym-00062j-Bx; Tue, 11 Apr 2017 21:05:36 +0000 Received: from sabertooth01.qualcomm.com ([65.197.215.72]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cy2yj-00060J-AN for ath10k@lists.infradead.org; Tue, 11 Apr 2017 21:05:35 +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=1491944733; x=1523480733; h=from:cc:to:subject:date:message-id:mime-version; bh=v+ay2rNRJK74AqaujyEoaw699K7WrpsyV4srAJ5Il8o=; b=ASvAO4h0iTzG/kfUPsHZuO7xpwWHeFwpf9LbwqTfeJvZkWb0YfDQAX+j kq9X7EfXlYgSnP2GuPzCuQgVRJYloLaMLmnpCa6YvqEiSVN7ANhbFaZV1 mqnLvHeTAOuiTulNm7jMYBg+hhEYB4L2fKSX4MdJkXOCsO8stBRzh5gfD A=; X-IronPort-AV: E=Sophos;i="5.37,187,1488873600"; d="scan'208";a="107497273" Received: from lv1-pdmz-css.qualcomm.com (HELO ironmsg10-lv.qulacomm.com) ([65.197.215.5]) by sabertooth01.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 11 Apr 2017 14:04:46 -0700 From: 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) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170411_140533_427457_57C5B763 X-CRM114-Status: UNSURE ( 8.30 ) 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: ryanhsu@qti.qualcomm.com Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.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);