From patchwork Thu Jan 8 11:29:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5592211 Return-Path: X-Original-To: patchwork-linux-wireless@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 0C0579F357 for ; Thu, 8 Jan 2015 11:29:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FCA62037F for ; Thu, 8 Jan 2015 11:29:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 339562037D for ; Thu, 8 Jan 2015 11:29:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755778AbbAHL3w (ORCPT ); Thu, 8 Jan 2015 06:29:52 -0500 Received: from mail-wg0-f51.google.com ([74.125.82.51]:40867 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754141AbbAHL3v (ORCPT ); Thu, 8 Jan 2015 06:29:51 -0500 Received: by mail-wg0-f51.google.com with SMTP id x12so2045877wgg.10 for ; Thu, 08 Jan 2015 03:29:50 -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; bh=DmZajR3D8Dar+JPp3zPJlt1bJV8QAWWze5EjFNc3yUg=; b=Jdnu/ATdjY5xNaUa3NvXJu2yzMBsX4oIhUr6/lU/pVD/bx4Us6OZX2lV2lWpFpp9qK CA5wDBtY1RtgFVDguf+YlqCHXvfjpVvKt5d9IlMZq9wY6P3WDMdv5Z2B9OG4HoMGPx/h PKuvwmXRoLHA0LZ51AxbPdlwo7NLgG/DOyG8c= 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; bh=DmZajR3D8Dar+JPp3zPJlt1bJV8QAWWze5EjFNc3yUg=; b=kE9WKngDLO1kx/xQM8LXaIfRxzemaU5NtvAPR3rYvovFiDPnN9ZxxCEBHf4BEjY+oi fIQE/Fe3q1MD6UMuOCfeJoNS9FAqZGPFNJ2lsz65pBJeuLgf+XWGkTOBH1rv1yipljnW 1l6hzl77VMZxNrBd+pnYK230mAe2oKxnmF85Abwatu7zgAoX3tcShbMI+bNOdEuyIy9X 1XX9P6pRDlNwTgWXuyxJSr/dynm3dTXBwl+GRDadnIM+wQpLKixNfK6zqBkdXGaTgdqT Vi7jZ3qbtgd+J7eQRI+w7Q0Za6KOkAt82RzNiaN7Ngz4LILcnjUIgDCIrrp16Fm6SECh BQTA== X-Gm-Message-State: ALoCoQnfLokOGsycuovtrkZgQm4xJ5TGfnO4Q3D1AnhjZM8tN8cj3DHst+T+yX7gkSj+pzmg/B2Zf8Zd3IkXyQES0D+ibmn3jV9CWB3gMWix31Y07RVzcmRYeeafGM1aPp8cdrzTNru4 X-Received: by 10.180.101.98 with SMTP id ff2mr59363626wib.83.1420716590292; Thu, 08 Jan 2015 03:29:50 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id s9sm6192574wiz.12.2015.01.08.03.29.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jan 2015 03:29:49 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH] ath10k: add additional fw build version to info print Date: Thu, 8 Jan 2015 12:29:32 +0100 Message-Id: <1420716572-23826-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 The wmi-tlv firmware contains additional versioning info. It may help reporting/debugging. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/core.h | 4 ++++ drivers/net/wireless/ath/ath10k/debug.c | 8 ++++++-- drivers/net/wireless/ath/ath10k/wmi.c | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 7b6d9e4..aa12c8a 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -458,6 +458,10 @@ struct ath10k { u32 fw_version_minor; u16 fw_version_release; u16 fw_version_build; + u32 fw_build_major; + u32 fw_build_minor; + u32 fw_build_si; + u32 fw_build_crm; u32 phy_capability; u32 hw_min_tx_power; u32 hw_max_tx_power; diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index 6ca2442..9a6b358 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -124,7 +124,7 @@ EXPORT_SYMBOL(ath10k_info); void ath10k_print_driver_info(struct ath10k *ar) { - ath10k_info(ar, "%s (0x%08x, 0x%08x) fw %s api %d htt %d.%d wmi %d cal %s max_sta %d\n", + ath10k_info(ar, "%s (0x%08x, 0x%08x) fw %s api %d htt %d.%d wmi %d cal %s max_sta %d build %u.%u.%u.%u\n", ar->hw_params.name, ar->target_version, ar->chip_id, @@ -134,7 +134,11 @@ void ath10k_print_driver_info(struct ath10k *ar) ar->htt.target_version_minor, ar->wmi.op_version, ath10k_cal_mode_str(ar->cal_mode), - ar->max_num_stations); + ar->max_num_stations, + ar->fw_build_major, + ar->fw_build_minor, + ar->fw_build_si, + ar->fw_build_crm); ath10k_info(ar, "debug %d debugfs %d tracing %d dfs %d testmode %d\n", config_enabled(CONFIG_ATH10K_DEBUG), config_enabled(CONFIG_ATH10K_DEBUGFS), diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index ac74290..8c26c2a 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -2907,6 +2907,10 @@ void ath10k_wmi_event_service_ready(struct ath10k *ar, struct sk_buff *skb) ar->fw_version_release = (__le32_to_cpu(arg.sw_ver1) & 0xffff0000) >> 16; ar->fw_version_build = (__le32_to_cpu(arg.sw_ver1) & 0x0000ffff); + ar->fw_build_major = (__le32_to_cpu(arg.fw_build) & 0xf0000000) >> 28; + ar->fw_build_minor = (__le32_to_cpu(arg.fw_build) & 0x0f000000) >> 24; + ar->fw_build_si = (__le32_to_cpu(arg.fw_build) & 0x00f00000) >> 20; + ar->fw_build_crm = (__le32_to_cpu(arg.fw_build) & 0x00007fff) >> 0; ar->phy_capability = __le32_to_cpu(arg.phy_capab); ar->num_rf_chains = __le32_to_cpu(arg.num_rf_chains); ar->ath_common.regulatory.current_rd = __le32_to_cpu(arg.eeprom_rd);