From patchwork Sat Aug 17 17:56:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabor Juhos X-Patchwork-Id: 2846015 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C89489F271 for ; Sat, 17 Aug 2013 17:56:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F14F020218 for ; Sat, 17 Aug 2013 17:56:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B32520200 for ; Sat, 17 Aug 2013 17:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754136Ab3HQR4W (ORCPT ); Sat, 17 Aug 2013 13:56:22 -0400 Received: from arrakis.dune.hu ([78.24.191.176]:53095 "EHLO arrakis.dune.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754018Ab3HQR4V (ORCPT ); Sat, 17 Aug 2013 13:56:21 -0400 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 70D7A284502; Sat, 17 Aug 2013 19:55:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost.localdomain (catvpool-576570d8.szarvasnet.hu [87.101.112.216]) by arrakis.dune.hu (Postfix) with ESMTPSA; Sat, 17 Aug 2013 19:55:56 +0200 (CEST) From: Gabor Juhos To: "John W. Linville" Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com, Gabor Juhos Subject: [PATCH 2/6] rt2x00: rt2800lib: introduce RT2800_HAS_HIGH_SHARED_MEM flag Date: Sat, 17 Aug 2013 19:56:03 +0200 Message-Id: <1376762167-24583-3-git-send-email-juhosg@openwrt.org> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1376762167-24583-1-git-send-email-juhosg@openwrt.org> References: <1376762167-24583-1-git-send-email-juhosg@openwrt.org> 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 Some chipsets have more than 16KB of shared memory. Introduce a new rt2800 specific flag to indicate that and add a helper function which helps to check the presence of the new flag. Also enable the new flag for the RT3593 chipset which has 24KB of shared memory. The flag can also be used for other chipsets, but none of those has been tested yet. Signed-off-by: Gabor Juhos --- drivers/net/wireless/rt2x00/rt2800lib.c | 9 +++++++++ drivers/net/wireless/rt2x00/rt2800lib.h | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index aa6b6b0..2d409e0 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -7697,6 +7697,7 @@ static int rt2800_probe_rt(struct rt2x00_dev *rt2x00dev) int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) { + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data; int retval; u32 reg; @@ -7704,6 +7705,14 @@ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) if (retval) return retval; + switch (rt2x00dev->chip.rt) { + case RT3071: + case RT3593: + case RT5592: + __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags); + break; + } + /* * Allocate eeprom data. */ diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/rt2x00/rt2800lib.h index 9b3e8ef..f89d413 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.h +++ b/drivers/net/wireless/rt2x00/rt2800lib.h @@ -22,6 +22,10 @@ #ifndef RT2800LIB_H #define RT2800LIB_H +enum rt2800_flag { + RT2800_HAS_HIGH_SHARED_MEM, +}; + /* RT2800 driver data structure */ struct rt2800_drv_data { u8 calibration_bw20; @@ -31,6 +35,8 @@ struct rt2800_drv_data { u8 txmixer_gain_24g; u8 txmixer_gain_5g; unsigned int tbtt_tick; + + unsigned long rt2800_flags; }; struct rt2800_ops { @@ -63,6 +69,13 @@ struct rt2800_ops { __le32 *(*drv_get_txwi)(struct queue_entry *entry); }; +static inline bool rt2800_has_high_shared_mem(struct rt2x00_dev *rt2x00dev) +{ + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data; + + return test_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags); +} + static inline void rt2800_register_read(struct rt2x00_dev *rt2x00dev, const unsigned int offset, u32 *value)