From patchwork Wed Nov 4 11:53:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Markowski X-Patchwork-Id: 7549211 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5A8DC9F506 for ; Wed, 4 Nov 2015 11:54:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 810CF206DD for ; Wed, 4 Nov 2015 11:54:39 +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 B32FA206D2 for ; Wed, 4 Nov 2015 11:54: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 1Ztwds-00014R-CR; Wed, 04 Nov 2015 11:54:16 +0000 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ztwdp-0000r8-FD for ath10k@lists.infradead.org; Wed, 04 Nov 2015 11:54:14 +0000 Received: by wmec75 with SMTP id c75so110983635wme.1 for ; Wed, 04 Nov 2015 03:53:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mSa6oxDMg0tezffVBeVfA85exZJVt/YXMcfB1ELjlkw=; b=PxXog7IzlndwMjcAnsLk2qi2C0yyQYCdsoo+ZRZIwvdYgvGDUmSMI1jCr+T42fXfoe Xgfl1IkKSdQTkVsEoSov7YYE0j00bnxUmVxmFGZqovVChKuxk19xRJEnZbsyQrcPjIYD 0F6FtPtDjbTYy9pqt5iVHK9nZo58MjNg8ZP3U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mSa6oxDMg0tezffVBeVfA85exZJVt/YXMcfB1ELjlkw=; b=M7fmSa4mWpT1QdfYLg1R3j2yfoRvqQjAWIP0ExX6M39uJme5MjtkNRQGSu8rEBkK79 UQllRlYG5YevTW9z/vOUtHMi5mYLR4TdVCbkQW4K8EUxMpNENcdvG91VpJhv6SSGfTDw k192NqBD50c5peTFEn+Hm/POK47vWQsdEJxqlCZnVJPsXt6ljuWWciEhTF4C7veEXZQR YWFDUBDQSMwx7Jd0nK4V0pKDDTfbfKfeEkZCCN4yV2eEXvm9fvIYDCOcQFWPjPJD7TW8 0CZyrpGzXYl7hAcVO0eTVmqkyZ5Fx/3y9ttNdEJgZfXOsWsVRzUe+q4L0ZCRlRGcofE2 SxQw== X-Gm-Message-State: ALoCoQmqyIDq/NS0t/QWizAAQMuz4bP0oDBeg+XkZ6f+IhfHy4IHMpvBHHpARs2wh1riPlnin1+Q3WwtO4SiAy+Q/MFyMJQeY2Z3/4ldUk0g+GBl+kyDOaOfbtlaRPzSk21XLDq1EI1BbY9etAAOzxRdEZIIGsPaNS4YWXBXMG/Qz1deo9zQ59YGD6mlhW7zNwz8vejgtfIL X-Received: by 10.28.54.211 with SMTP id y80mr3067982wmh.3.1446638028020; Wed, 04 Nov 2015 03:53:48 -0800 (PST) Received: from uw000975.homerouter.cpe ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id q1sm1197869wjy.31.2015.11.04.03.53.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Nov 2015 03:53:47 -0800 (PST) From: Bartosz Markowski To: ath10k@lists.infradead.org Subject: [PATCH 1/4] ath10k: fix the currently supported QCA9377 target version name Date: Wed, 4 Nov 2015 12:53:32 +0100 Message-Id: <1446638015-23310-2-git-send-email-bartosz.markowski@tieto.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1446638015-23310-1-git-send-email-bartosz.markowski@tieto.com> References: <1446638015-23310-1-git-send-email-bartosz.markowski@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151104_035413_671909_B9FFEA5C X-CRM114-Status: GOOD ( 13.47 ) X-Spam-Score: -2.0 (--) 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, Bartosz Markowski MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 When introducing the original QCA9377 support, the chip target version was wrongly picked. The chip advertising itself with bmi target value equal to 0x05020001 is in fact a 1.1 revision. I realized this once I got a real 1.1 hw to play with. Signed-off-by: Bartosz Markowski --- drivers/net/wireless/ath/ath10k/core.c | 4 ++-- drivers/net/wireless/ath/ath10k/hw.h | 8 ++++++-- drivers/net/wireless/ath/ath10k/pci.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index aa9bd92ac4ed..c8f6ca284b9d 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -138,8 +138,8 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { }, }, { - .id = QCA9377_HW_1_0_DEV_VERSION, - .name = "qca9377 hw1.0", + .id = QCA9377_HW_1_1_DEV_VERSION, + .name = "qca9377 hw1.1", .patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR, .uart_pin = 7, .otp_exe_param = 0, diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index 39966a05c1cc..01bf2244f54c 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -42,6 +42,8 @@ #define QCA6174_HW_3_0_VERSION 0x05020000 #define QCA6174_HW_3_2_VERSION 0x05030000 +#define QCA9377_HW_1_1_DEV_VERSION 0x05020001 + enum qca6174_pci_rev { QCA6174_PCI_REV_1_1 = 0x11, QCA6174_PCI_REV_1_3 = 0x13, @@ -60,6 +62,10 @@ enum qca6174_chip_id_rev { QCA6174_HW_3_2_CHIP_ID_REV = 10, }; +enum qca9377_chip_id_rev { + QCA9377_HW_1_1_CHIP_ID_REV = 0x1, +}; + #define QCA6174_HW_2_1_FW_DIR "ath10k/QCA6174/hw2.1" #define QCA6174_HW_2_1_FW_FILE "firmware.bin" #define QCA6174_HW_2_1_OTP_FILE "otp.bin" @@ -85,8 +91,6 @@ enum qca6174_chip_id_rev { #define QCA99X0_HW_2_0_PATCH_LOAD_ADDR 0x1234 /* QCA9377 1.0 definitions */ -#define QCA9377_HW_1_0_DEV_VERSION 0x05020001 -#define QCA9377_HW_1_0_CHIP_ID_REV 0x1 #define QCA9377_HW_1_0_FW_DIR ATH10K_FW_DIR "/QCA9377/hw1.0" #define QCA9377_HW_1_0_FW_FILE "firmware.bin" #define QCA9377_HW_1_0_OTP_FILE "otp.bin" diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 3fca200b986c..c444b43f183d 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -92,7 +92,7 @@ static const struct ath10k_pci_supp_chip ath10k_pci_supp_chips[] = { { QCA6174_2_1_DEVICE_ID, QCA6174_HW_3_2_CHIP_ID_REV }, { QCA99X0_2_0_DEVICE_ID, QCA99X0_HW_2_0_CHIP_ID_REV }, - { QCA9377_1_0_DEVICE_ID, QCA9377_HW_1_0_CHIP_ID_REV }, + { QCA9377_1_0_DEVICE_ID, QCA9377_HW_1_1_CHIP_ID_REV }, }; static void ath10k_pci_buffer_cleanup(struct ath10k *ar);