From patchwork Mon Nov 14 16:33:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Stromdahl X-Patchwork-Id: 9427949 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 72C7C60471 for ; Mon, 14 Nov 2016 16:36:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F26428A35 for ; Mon, 14 Nov 2016 16:36:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63A6C28A49; Mon, 14 Nov 2016 16:36:25 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id D3BF428A35 for ; Mon, 14 Nov 2016 16:36:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c6KF2-0000k5-Ge; Mon, 14 Nov 2016 16:36:20 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c6KEV-0000Rw-Q0 for ath10k@lists.infradead.org; Mon, 14 Nov 2016 16:35:51 +0000 Received: by mail-lf0-x243.google.com with SMTP id o141so7513715lff.1 for ; Mon, 14 Nov 2016 08:35:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=40BvICqFWqagjCChai/WXDJZC2+8aXIhD+4f4K7lEQM=; b=th6Tx1x+HxwW4DHpyosYhsQcipCfIQwYniBCIABMlVigGMwGpo12ThgCbipDk2Mj6l CaeFqXPWlWunekGkbfbMj2QWcRK/xfRWLKJ5UgGkg60CeHh4jZOoEd2diANcfnGfg9ft 5cV0Ea4euker9FfNnpou+YAERhx2WppbxQwjlMxGpvcJJdf/HgCxiZX+OqZdD5qsdsBQ 8EhvVrFDsory2KVI3lHfCyxpxc8Xs46ab98ZJKEltBh6/lJt5V+kvp7Zo2SUIuuZYLm4 869OAPw7bi+Rvzi0lu4LzUun8g+68QC6dGiHMT22A1XZ7tOpJnQFC6TstZ57isRJxNMW LGLw== 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=40BvICqFWqagjCChai/WXDJZC2+8aXIhD+4f4K7lEQM=; b=Xgl70hRbu5r5zhMVPK/suWrOWYCMfzlDwObvYBVNCUzhSj6iMZsVHxSt0SbfXVdgBk 2jGErxIjB5hFTgW9XhgdxxIp+9Q8g+Yq8nUzzNVDGiTJjdtvg+Qck+pM0ktmOSeoKPo8 LG4zXQAnVD+NRRH74yMbxmdLyAS8tdKKyf2PlfV2LH8kZOIBbg9RVyNEysEvY9Kf3pDZ VCK/nsi6UTY8U1tHcow4dqq2lmN8GOGFLvcrFwWMZqXb7DiOsehAvkf6gW7T+9cJgv8a 0a35M3hNtu8IkPpcsAkhf+Xqj58OCBvPViwjGZuPhcZ8VqFsvwVYP7R5hG8erx5PZjnL X8HA== X-Gm-Message-State: ABUngvcs7IAnRO1kYrJ4EWO3COxCwrXObcMohvtOaNpIhYIK0zb1yCuVmbALazkMI3m+Vw== X-Received: by 10.25.221.82 with SMTP id u79mr8643787lfg.52.1479141329985; Mon, 14 Nov 2016 08:35:29 -0800 (PST) Received: from erik-desktop.lan (81-233-218-8-no25.tbcn.telia.com. [81.233.218.8]) by smtp.gmail.com with ESMTPSA id w67sm5105849lff.16.2016.11.14.08.35.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 08:35:29 -0800 (PST) From: Erik Stromdahl To: kvalo@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Subject: [RFC 06/12] ath10k: bmi: Added SOC reg read/write functions Date: Mon, 14 Nov 2016 17:33:36 +0100 Message-Id: <1479141222-8493-7-git-send-email-erik.stromdahl@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1479141222-8493-1-git-send-email-erik.stromdahl@gmail.com> References: <1479141222-8493-1-git-send-email-erik.stromdahl@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161114_083548_189363_D3FD2795 X-CRM114-Status: GOOD ( 10.12 ) 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: Erik Stromdahl MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Added functions implementing the following BMI commands: BMI_READ_SOC_REGISTER BMI_WRITE_SOC_REGISTER Reading and writing BMI registers is sometimes needed for SDIO chipsets. Signed-off-by: Erik Stromdahl --- drivers/net/wireless/ath/ath10k/bmi.c | 79 ++++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/bmi.h | 4 ++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c index 2872d34..1c378a2 100644 --- a/drivers/net/wireless/ath/ath10k/bmi.c +++ b/drivers/net/wireless/ath/ath10k/bmi.c @@ -97,7 +97,8 @@ int ath10k_bmi_read_memory(struct ath10k *ar, u32 rxlen; int ret; - ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi read address 0x%x length %d\n", + ath10k_dbg(ar, ATH10K_DBG_BMI, + "bmi read memory address 0x%x length %d\n", address, length); if (ar->bmi.done_sent) { @@ -137,7 +138,8 @@ int ath10k_bmi_write_memory(struct ath10k *ar, u32 txlen; int ret; - ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi write address 0x%x length %d\n", + ath10k_dbg(ar, ATH10K_DBG_BMI, + "bmi write memory address 0x%x length %d\n", address, length); if (ar->bmi.done_sent) { @@ -175,6 +177,79 @@ int ath10k_bmi_write_memory(struct ath10k *ar, return 0; } +int ath10k_bmi_read_soc_reg(struct ath10k *ar, + u32 address, u32 *regval) +{ + struct bmi_cmd cmd; + union bmi_resp resp; + u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.read_soc_reg); + u32 rxlen; + int ret; + + ath10k_dbg(ar, ATH10K_DBG_BMI, + "bmi read SOC register address 0x%x\n", + address); + + if (ar->bmi.done_sent) { + ath10k_warn(ar, "command disallowed\n"); + return -EBUSY; + } + + rxlen = sizeof(resp.read_soc_reg.value); + + cmd.id = __cpu_to_le32(BMI_READ_SOC_REGISTER); + cmd.read_soc_reg.addr = __cpu_to_le32(address); + + ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, + &resp, &rxlen); + if (ret) { + ath10k_warn(ar, "unable to read from the device (%d)\n", + ret); + return ret; + } + + if (rxlen != sizeof(resp.read_soc_reg.value)) { + ath10k_warn(ar, "Unexpected read len: %u (expected %u)\n", + rxlen, sizeof(resp.read_soc_reg.value)); + return ret; + } + + *regval = __le32_to_cpu(resp.read_soc_reg.value); + + return 0; +} + +int ath10k_bmi_write_soc_reg(struct ath10k *ar, + u32 address, u32 regval) +{ + struct bmi_cmd cmd; + u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.write_soc_reg); + int ret; + + ath10k_dbg(ar, ATH10K_DBG_BMI, + "bmi write SOC register address 0x%x\n", + address); + + if (ar->bmi.done_sent) { + ath10k_warn(ar, "command disallowed\n"); + return -EBUSY; + } + + cmd.id = __cpu_to_le32(BMI_WRITE_SOC_REGISTER); + cmd.write_soc_reg.addr = __cpu_to_le32(address); + cmd.write_soc_reg.value = __cpu_to_le32(regval); + + ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, + NULL, NULL); + if (ret) { + ath10k_warn(ar, "unable to write to the device (%d)\n", + ret); + return ret; + } + + return 0; +} + int ath10k_bmi_execute(struct ath10k *ar, u32 address, u32 param, u32 *result) { struct bmi_cmd cmd; diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h index 7d3231a..a867867 100644 --- a/drivers/net/wireless/ath/ath10k/bmi.h +++ b/drivers/net/wireless/ath/ath10k/bmi.h @@ -201,6 +201,10 @@ int ath10k_bmi_read_memory(struct ath10k *ar, u32 address, void *buffer, u32 length); int ath10k_bmi_write_memory(struct ath10k *ar, u32 address, const void *buffer, u32 length); +int ath10k_bmi_read_soc_reg(struct ath10k *ar, + u32 address, u32 *regval); +int ath10k_bmi_write_soc_reg(struct ath10k *ar, + u32 address, u32 regval); #define ath10k_bmi_read32(ar, item, val) \ ({ \