From patchwork Fri Jan 13 21:20:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 9516421 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 D75D1607D4 for ; Fri, 13 Jan 2017 21:20:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C806828780 for ; Fri, 13 Jan 2017 21:20:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCB9C28790; Fri, 13 Jan 2017 21:20:43 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 1F57628783 for ; Fri, 13 Jan 2017 21:20:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751013AbdAMVUl (ORCPT ); Fri, 13 Jan 2017 16:20:41 -0500 Received: from fudo.makrotopia.org ([185.142.180.71]:53636 "EHLO fudo.makrotopia.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750914AbdAMVUl (ORCPT ); Fri, 13 Jan 2017 16:20:41 -0500 Received: from local by fudo.makrotopia.org with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.88) (envelope-from ) id 1cS9H5-0000rB-2v; Fri, 13 Jan 2017 22:20:39 +0100 Date: Fri, 13 Jan 2017 22:20:32 +0100 From: Daniel Golle To: linux-wireless@vger.kernel.org Cc: Johannes Berg , Stanislaw Gruszka , roman@advem.lv, michel.stempin@wanadoo.fr, c.mignanti@gmail.com, evaxige@qq.com, Kalle Valo , Felix Fietkau , John Crispin , Gabor Juhos Subject: [PATCH 04/40] rt2x00: rt2800lib: fix beacon generation on RT3593 Message-ID: <20170113212027.GA3372@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.7.2 (2016-11-26) 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: Gabor Juhos On the RT3593 chipset, the beacon registers are located in the high 8KB part of the shared memory. The high part of the shared memory is only accessible if it is explicitly selected. Add a helper function in order to be able to control the SHR_MSEL bit in the PBF_SYS_CTRL register. Also add a few more helper functions and use those to select the correct part of the shared memory before and after accessing the beacon registers. The base addresses of the beacon registers are also different from the actually used values, so fix the 'rt2800_hw_beacon_base' function to return the correct values. Signed-off-by: Gabor Juhos --- drivers/net/wireless/ralink/rt2x00/rt2800.h | 3 ++ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 44 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h index 2371896c1e99..a81852cfb4f9 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h @@ -574,6 +574,7 @@ #define PBF_SYS_CTRL 0x0400 #define PBF_SYS_CTRL_READY FIELD32(0x00000080) #define PBF_SYS_CTRL_HOST_RAM_WRITE FIELD32(0x00010000) +#define PBF_SYS_CTRL_SHR_MSEL FIELD32(0x00080000) /* * HOST-MCU shared memory @@ -2026,6 +2027,8 @@ struct mac_iveiv_entry { (((__index) < 6) ? (HW_BEACON_BASE4 + ((__index - 4) * 0x0200)) : \ (HW_BEACON_BASE6 - ((__index - 6) * 0x0200)))) +#define HW_BEACON_BASE_HIGH(__index) (0x4000 + (__index) * 512) + #define BEACON_BASE_TO_OFFSET(_base) (((_base) - 0x4000) / 64) /* diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 0fd67026f806..dcacfa54b3d6 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -82,6 +82,39 @@ static inline bool rt2800_is_305x_soc(struct rt2x00_dev *rt2x00dev) return false; } +static inline void rt2800_shared_mem_select(struct rt2x00_dev *rt2x00dev, + bool high) +{ + u32 reg; + + if (WARN_ON_ONCE(!rt2800_has_high_shared_mem(rt2x00dev))) + return; + + rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, ®); + rt2x00_set_field32(®, PBF_SYS_CTRL_SHR_MSEL, high); + rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, reg); +} + +static inline bool rt2800_beacon_uses_high_mem(struct rt2x00_dev *rt2x00dev) +{ + if (rt2x00_rt(rt2x00dev, RT3593)) + return true; + + return false; +} + +static inline void rt2800_select_beacon_mem(struct rt2x00_dev *rt2x00dev) +{ + if (rt2800_beacon_uses_high_mem(rt2x00dev)) + rt2800_shared_mem_select(rt2x00dev, true); +} + +static inline void rt2800_deselect_beacon_mem(struct rt2x00_dev *rt2x00dev) +{ + if (rt2800_beacon_uses_high_mem(rt2x00dev)) + rt2800_shared_mem_select(rt2x00dev, false); +} + static void rt2800_bbp_write(struct rt2x00_dev *rt2x00dev, const unsigned int word, const u8 value) { @@ -948,6 +981,9 @@ EXPORT_SYMBOL_GPL(rt2800_txdone_entry); static unsigned int rt2800_hw_beacon_base(struct rt2x00_dev *rt2x00dev, unsigned int index) { + if (rt2x00_rt(rt2x00dev, RT3593)) + return HW_BEACON_BASE_HIGH(index); + return HW_BEACON_BASE(index); } @@ -1046,8 +1082,12 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc) beacon_base = rt2800_hw_beacon_base(rt2x00dev, entry->entry_idx); rt2800_shared_mem_lock(rt2x00dev); + + rt2800_select_beacon_mem(rt2x00dev); rt2800_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data, entry->skb->len + padding_len); + rt2800_deselect_beacon_mem(rt2x00dev); + rt2800_shared_mem_unlock(rt2x00dev); __set_bit(ENTRY_BCN_ENABLED, &entry->flags); @@ -1080,6 +1120,8 @@ static inline void rt2800_clear_beacon_register(struct rt2x00_dev *rt2x00dev, rt2800_shared_mem_lock(rt2x00dev); + rt2800_select_beacon_mem(rt2x00dev); + /* * For the Beacon base registers we only need to clear * the whole TXWI which (when set to 0) will invalidate @@ -1088,6 +1130,8 @@ static inline void rt2800_clear_beacon_register(struct rt2x00_dev *rt2x00dev, for (i = 0; i < txwi_desc_size; i += sizeof(__le32)) rt2800_register_write(rt2x00dev, beacon_base + i, 0); + rt2800_deselect_beacon_mem(rt2x00dev); + rt2800_shared_mem_unlock(rt2x00dev); }