From patchwork Tue Jun 5 12:34:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Govind Singh X-Patchwork-Id: 10448165 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 25A0760467 for ; Tue, 5 Jun 2018 12:35:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15DAD29123 for ; Tue, 5 Jun 2018 12:35:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09F30290C2; Tue, 5 Jun 2018 12:35:00 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 C8370285A9 for ; Tue, 5 Jun 2018 12:34:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751958AbeFEMe5 (ORCPT ); Tue, 5 Jun 2018 08:34:57 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:53964 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751865AbeFEMe4 (ORCPT ); Tue, 5 Jun 2018 08:34:56 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E0A37601D9; Tue, 5 Jun 2018 12:34:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1528202095; bh=QcX8326wPjZDJPziF8TAtrZu569ZlmSUjnCk4/5UsJk=; h=From:To:Cc:Subject:Date:From; b=GnTzRd6oBgbj2EvuEuVSR7S8lXuHKkyobHBL2zvuruo1nXlEDEgYXw+YfeXfapvob 3Gw2fplHpAvhMVXzrezr3DxVQgFU+oGWt6RSWnH1RZSionTesf0yskQay1pE78gLVX 01KvuJyHK+zlL4rbX2+q3s3eNsx4HUhO9Q7m5zxs= Received: from govinds-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: govinds@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4D232601A8; Tue, 5 Jun 2018 12:34:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1528202095; bh=QcX8326wPjZDJPziF8TAtrZu569ZlmSUjnCk4/5UsJk=; h=From:To:Cc:Subject:Date:From; b=GnTzRd6oBgbj2EvuEuVSR7S8lXuHKkyobHBL2zvuruo1nXlEDEgYXw+YfeXfapvob 3Gw2fplHpAvhMVXzrezr3DxVQgFU+oGWt6RSWnH1RZSionTesf0yskQay1pE78gLVX 01KvuJyHK+zlL4rbX2+q3s3eNsx4HUhO9Q7m5zxs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4D232601A8 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=govinds@codeaurora.org From: Govind Singh To: andy.gross@linaro.org, bjorn.andersson@linaro.org, david.brown@linaro.org, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Cc: Rakesh Pillai , Govind Singh Subject: [PATCH v2 2/6] ath10k: Add support to create boardname for non-bmi target Date: Tue, 5 Jun 2018 18:04:48 +0530 Message-Id: <20180605123448.32331-1-govinds@codeaurora.org> X-Mailer: git-send-email 2.17.0 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: Rakesh Pillai Add support to create the boardname for non-bmi targets like WCN3990, which uses qmi for bdf download. This boardname is used to parse the board data from board-2.bin. Signed-off-by: Rakesh Pillai Signed-off-by: Govind Singh Acked-by: Niklas Cassel --- drivers/net/wireless/ath/ath10k/core.c | 14 ++++++++++++++ drivers/net/wireless/ath/ath10k/core.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 4cf54a7ef09a..8a592019cc4d 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1429,6 +1429,20 @@ static int ath10k_core_create_board_name(struct ath10k *ar, char *name, goto out; } + if (ar->id.qmi_ids_valid) { + if (ar->id.qmi_board_id > 0x99) + scnprintf(name, name_len, + "bus=%s,qmi-board-id=%03x", + ath10k_bus_str(ar->hif.bus), + ar->id.qmi_board_id); + else + scnprintf(name, name_len, + "bus=%s,qmi-board-id=b%02x", + ath10k_bus_str(ar->hif.bus), + ar->id.qmi_board_id); + goto out; + } + scnprintf(name, name_len, "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x%s", ath10k_bus_str(ar->hif.bus), diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 951dbdd1c9eb..0a2e4a5c3612 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -940,7 +940,9 @@ struct ath10k { u32 subsystem_device; bool bmi_ids_valid; + bool qmi_ids_valid; u8 bmi_board_id; + u8 qmi_board_id; u8 bmi_chip_id; char bdf_ext[ATH10K_SMBIOS_BDF_EXT_STR_LENGTH];