From: Arik Nemtsov <arik@wizery.com>
To: <linux-wireless@vger.kernel.org>
Cc: Luciano Coelho <coelho@ti.com>, Arik Nemtsov <arik@wizery.com>
Subject: [PATCH 65/78] wlcore: create private static_data area and add operation to parse it
Date: Thu, 10 May 2012 12:14:10 +0300 [thread overview]
Message-ID: <1336641263-5761-66-git-send-email-arik@wizery.com> (raw)
In-Reply-To: <1336641263-5761-1-git-send-email-arik@wizery.com>
From: Luciano Coelho <coelho@ti.com>
The wl18xx firmware has more information in the static_data than
wl12xx. To be able to parse that in an abstracted way, this patch
adds a priv area to the static data struct and an operation that
allows the lower driver to parse it if necessary.
Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
drivers/net/wireless/ti/wlcore/boot.c | 53 +++++++++++++++++--------------
drivers/net/wireless/ti/wlcore/boot.h | 1 +
drivers/net/wireless/ti/wlcore/hw_ops.h | 9 ++++++
drivers/net/wireless/ti/wlcore/wlcore.h | 6 ++++
4 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
index 9b98230..ed718f7 100644
--- a/drivers/net/wireless/ti/wlcore/boot.c
+++ b/drivers/net/wireless/ti/wlcore/boot.c
@@ -45,10 +45,17 @@ static void wl1271_boot_set_ecpu_ctrl(struct wl1271 *wl, u32 flag)
wlcore_write_reg(wl, REG_ECPU_CONTROL, cpu_ctrl);
}
-static int wlcore_parse_fw_ver(struct wl1271 *wl)
+static int wlcore_boot_parse_fw_ver(struct wl1271 *wl,
+ struct wl1271_static_data *static_data)
{
int ret;
+ strncpy(wl->chip.fw_ver_str, static_data->fw_version,
+ sizeof(wl->chip.fw_ver_str));
+
+ /* make sure the string is NULL-terminated */
+ wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';
+
ret = sscanf(wl->chip.fw_ver_str + 4, "%u.%u.%u.%u.%u",
&wl->chip.fw_ver[0], &wl->chip.fw_ver[1],
&wl->chip.fw_ver[2], &wl->chip.fw_ver[3],
@@ -57,43 +64,43 @@ static int wlcore_parse_fw_ver(struct wl1271 *wl)
if (ret != 5) {
wl1271_warning("fw version incorrect value");
memset(wl->chip.fw_ver, 0, sizeof(wl->chip.fw_ver));
- return -EINVAL;
+ ret = -EINVAL;
+ goto out;
}
ret = wlcore_identify_fw(wl);
if (ret < 0)
- return ret;
-
- return 0;
+ goto out;
+out:
+ return ret;
}
-static int wlcore_boot_fw_version(struct wl1271 *wl)
+static int wlcore_boot_static_data(struct wl1271 *wl)
{
struct wl1271_static_data *static_data;
+ size_t len = sizeof(*static_data) + wl->static_data_priv_len;
int ret;
- static_data = kmalloc(sizeof(*static_data), GFP_KERNEL | GFP_DMA);
+ static_data = kmalloc(len, GFP_KERNEL);
if (!static_data) {
- wl1271_error("Couldn't allocate memory for static data!");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto out;
}
- wl1271_read(wl, wl->cmd_box_addr, static_data, sizeof(*static_data),
- false);
+ wl1271_read(wl, wl->cmd_box_addr, static_data, len, false);
- strncpy(wl->chip.fw_ver_str, static_data->fw_version,
- sizeof(wl->chip.fw_ver_str));
-
- kfree(static_data);
-
- /* make sure the string is NULL-terminated */
- wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';
+ ret = wlcore_boot_parse_fw_ver(wl, static_data);
+ if (ret < 0)
+ goto out_free;
- ret = wlcore_parse_fw_ver(wl);
+ ret = wlcore_handle_static_data(wl, static_data);
if (ret < 0)
- return ret;
+ goto out_free;
- return 0;
+out_free:
+ kfree(static_data);
+out:
+ return ret;
}
static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
@@ -400,9 +407,9 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
wl1271_debug(DEBUG_MAILBOX, "MBOX ptrs: 0x%x 0x%x",
wl->mbox_ptr[0], wl->mbox_ptr[1]);
- ret = wlcore_boot_fw_version(wl);
+ ret = wlcore_boot_static_data(wl);
if (ret < 0) {
- wl1271_error("couldn't boot firmware");
+ wl1271_error("error getting static data");
return ret;
}
diff --git a/drivers/net/wireless/ti/wlcore/boot.h b/drivers/net/wireless/ti/wlcore/boot.h
index 094981d..a525225 100644
--- a/drivers/net/wireless/ti/wlcore/boot.h
+++ b/drivers/net/wireless/ti/wlcore/boot.h
@@ -40,6 +40,7 @@ struct wl1271_static_data {
u8 fw_version[WL1271_FW_VERSION_MAX_LEN];
u32 hw_version;
u8 tx_power_table[WL1271_NO_SUBBANDS][WL1271_NO_POWER_LEVELS];
+ u8 priv[0];
};
/* number of times we try to read the INIT interrupt */
diff --git a/drivers/net/wireless/ti/wlcore/hw_ops.h b/drivers/net/wireless/ti/wlcore/hw_ops.h
index 1555c3e..c590b6f 100644
--- a/drivers/net/wireless/ti/wlcore/hw_ops.h
+++ b/drivers/net/wireless/ti/wlcore/hw_ops.h
@@ -158,4 +158,13 @@ wlcore_debugfs_init(struct wl1271 *wl, struct dentry *rootdir)
return 0;
}
+static inline int
+wlcore_handle_static_data(struct wl1271 *wl, void *static_data)
+{
+ if (wl->ops->handle_static_data)
+ return wl->ops->handle_static_data(wl, static_data);
+
+ return 0;
+}
+
#endif
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 85fd3d9..1967873 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -26,6 +26,7 @@
#include "wlcore_i.h"
#include "event.h"
+#include "boot.h"
/* The maximum number of Tx descriptors in all chip families */
#define WLCORE_MAX_TX_DESCRIPTORS 32
@@ -72,6 +73,8 @@ struct wlcore_ops {
u32 (*ap_get_mimo_wide_rate_mask)(struct wl1271 *wl,
struct wl12xx_vif *wlvif);
int (*debugfs_init)(struct wl1271 *wl, struct dentry *rootdir);
+ int (*handle_static_data)(struct wl1271 *wl,
+ struct wl1271_static_data *static_data);
};
enum wlcore_partitions {
@@ -373,6 +376,9 @@ struct wl1271 {
/* RX Data filter rule state - enabled/disabled */
bool rx_filter_enabled[WL1271_MAX_RX_FILTERS];
+ /* size of the private static data */
+ size_t static_data_priv_len;
+
/* the current channel type */
enum nl80211_channel_type channel_type;
};
--
1.7.9.5
next prev parent reply other threads:[~2012-05-10 9:16 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 9:13 [PATCH 00/78] 18xx chip support Arik Nemtsov
2012-05-10 9:13 ` [PATCH 01/78] wl18xx: add new module Arik Nemtsov
2012-05-10 9:13 ` [PATCH 02/78] wlcore_sdio/wl18xx: use SDIO revision number to identify wl18xx chips Arik Nemtsov
2012-05-10 9:13 ` [PATCH 03/78] wl18xx: add empty operations struct Arik Nemtsov
2012-05-10 9:13 ` [PATCH 04/78] wl18xx: add partition table Arik Nemtsov
2012-05-10 9:13 ` [PATCH 05/78] wl18xx: add register table Arik Nemtsov
2012-05-10 9:13 ` [PATCH 06/78] wl18xx: add identify chip operation Arik Nemtsov
2012-05-10 9:13 ` [PATCH 07/78] wl18xx: add some boot operations and hw-specific configurations Arik Nemtsov
2012-05-10 9:13 ` [PATCH 08/78] wl18xx: add trigger command and ack event operations Arik Nemtsov
2012-05-10 9:13 ` [PATCH 09/78] wl18xx: create per-chip-family private storage Arik Nemtsov
2012-05-10 9:13 ` [PATCH 10/78] wl18xx: set the number of Tx descriptors Arik Nemtsov
2012-05-10 9:13 ` [PATCH 11/78] wl18xx: set normal/GEM Tx spare block counts Arik Nemtsov
2012-05-10 9:13 ` [PATCH 12/78] wl18xx: implement hw op for calculating hw block count per packet Arik Nemtsov
2012-05-10 9:13 ` [PATCH 13/78] wl18xx: implement hw op for setting blocks in hw_tx_desc Arik Nemtsov
2012-05-10 9:13 ` [PATCH 14/78] wl18xx: implement hw op for setting frame length in tx_hw_desc Arik Nemtsov
2012-05-10 9:13 ` [PATCH 15/78] wl18xx: define HW-rate translation elements/tables Arik Nemtsov
2012-05-10 9:13 ` [PATCH 16/78] wl18xx: add fw_status private data Arik Nemtsov
2012-05-10 9:13 ` [PATCH 17/78] wl18xx: set Rx block-size alignment quirk Arik Nemtsov
2012-05-10 9:13 ` [PATCH 18/78] wl18xx: implement hw op for getting rx buffer data alignment Arik Nemtsov
2012-05-10 9:13 ` [PATCH 19/78] wl18xx: implement hw op for getting rx packet data length Arik Nemtsov
2012-05-10 9:13 ` [PATCH 20/78] wl18xx: implement immediate Tx completion Arik Nemtsov
2012-05-10 9:13 ` [PATCH 21/78] wl18xx: add hw_init operation Arik Nemtsov
2012-05-10 9:13 ` [PATCH 22/78] wlcore/wl18xx: add hw op for setting Tx HW checksum Arik Nemtsov
2012-05-10 9:13 ` [PATCH 23/78] wlcore/wl18xx: add hw op for Rx " Arik Nemtsov
2012-05-10 9:13 ` [PATCH 24/78] wl18xx: add runtime configuration parameters Arik Nemtsov
2012-05-10 9:13 ` [PATCH 25/78] wlcore: track current channel type per vif Arik Nemtsov
2012-05-10 9:13 ` [PATCH 26/78] wl18xx: send channel type to FW on role start Arik Nemtsov
2012-05-10 9:13 ` [PATCH 27/78] wl18xx: ipmlement ap_rate_mask hw op Arik Nemtsov
2012-05-10 9:13 ` [PATCH 28/78] wlcore: support peer MIMO rates Arik Nemtsov
2012-05-10 9:13 ` [PATCH 29/78] wlcore/wl18xx: enable MIMO/wide-chan rates in AP-mode rate config Arik Nemtsov
2012-05-10 9:13 ` [PATCH 30/78] wl18xx: set HT capabilities Arik Nemtsov
2012-05-10 9:13 ` [PATCH 31/78] wl18xx: add module param for overriding HT caps Arik Nemtsov
2012-05-10 9:13 ` [PATCH 32/78] wl18xx: add board type module argument Arik Nemtsov
2012-05-10 9:13 ` [PATCH 33/78] wl18xx: translate and write the board type to SCR_PAD2 Arik Nemtsov
2012-05-10 9:13 ` [PATCH 34/78] wl18xx: read FW pc on recovery Arik Nemtsov
2012-05-10 9:13 ` [PATCH 35/78] wl18xx: disable FW log functionality Arik Nemtsov
2012-05-10 9:13 ` [PATCH 36/78] wl18xx: read clock frequency and do top init accordingly Arik Nemtsov
2012-05-10 9:13 ` [PATCH 37/78] wlcore: rename wl12xx.h to wlcore_i.h Arik Nemtsov
2012-05-10 9:13 ` [PATCH 38/78] wlcore/wl12xx: move ref_clock and tcxo_clock elements to wl12xx Arik Nemtsov
2012-05-10 9:13 ` [PATCH 39/78] wl18xx: implement hw op to read PG version Arik Nemtsov
2012-05-10 9:13 ` [PATCH 40/78] wlcore/wl12xx: move rx_mem_pool_addr element to wl12xx Arik Nemtsov
2012-05-10 9:13 ` [PATCH 41/78] wl18xx: init Tx-released index to 0 on HW init Arik Nemtsov
2012-05-10 9:13 ` [PATCH 42/78] wl18xx: don't upload NVS to FW Arik Nemtsov
2012-05-10 9:13 ` [PATCH 43/78] wl18xx: change board type enum according to new FW Arik Nemtsov
2012-05-10 9:13 ` [PATCH 44/78] wlcore/wl12xx: add plt_init op and move the code to wl12xx Arik Nemtsov
2012-05-10 9:13 ` [PATCH 45/78] wl18xx: add plt_init operation Arik Nemtsov
2012-05-10 9:13 ` [PATCH 46/78] wl18xx: change the low_band_component_type for HDK boards Arik Nemtsov
2012-05-10 9:13 ` [PATCH 47/78] wl18xx: add number of antennas and dc2dc type as module params Arik Nemtsov
2012-05-10 9:13 ` [PATCH 48/78] wl18xx: add module parameter to disable TCP checksum Arik Nemtsov
2012-05-10 9:13 ` [PATCH 49/78] wlcore/wl12xx/18xx: split fw_status struct into two Arik Nemtsov
2012-05-10 9:13 ` [PATCH 50/78] wl18xx: derive the MAC address from the BD_ADDR in fuse ROM Arik Nemtsov
2012-05-10 9:13 ` [PATCH 51/78] wl18xx: add a module parameter to control 11a support Arik Nemtsov
2012-05-10 9:13 ` [PATCH 52/78] wlcore: add module parameter to dump SDIO reads and writes Arik Nemtsov
2012-05-10 9:13 ` [PATCH 53/78] wl18xx: copy the default configuration before checking the board_type Arik Nemtsov
2012-05-10 9:13 ` [PATCH 54/78] wl18xx: changed default board_type to HDK Arik Nemtsov
2012-05-10 9:14 ` [PATCH 55/78] wlcore: add space for private area when allocating fw_status Arik Nemtsov
2012-05-10 9:14 ` [PATCH 56/78] wl18xx: change low_band_component_type value for COM8 Arik Nemtsov
2012-05-10 9:14 ` [PATCH 57/78] wlcore: reorder identify_chip and get_hw_info Arik Nemtsov
2012-05-10 9:14 ` [PATCH 58/78] wl18xx: disable MCS_13 for wl18xx PG 1.0 Arik Nemtsov
2012-05-10 9:14 ` [PATCH 59/78] wlcore: update beacon and probe_resp templates when rates change Arik Nemtsov
2012-05-10 9:14 ` [PATCH 60/78] wlcore: use all AP basic rates as default Arik Nemtsov
2012-05-10 9:14 ` [PATCH 61/78] wlcore: abstract debugfs fw_stats to be handled by the lower drivers Arik Nemtsov
2012-05-10 9:14 ` [PATCH 62/78] wlcore: add debugfs macro to help print fw statistics arrays Arik Nemtsov
2012-05-10 9:14 ` [PATCH 63/78] wl12xx: implement fw status debugfs entries Arik Nemtsov
2012-05-10 9:14 ` [PATCH 64/78] wl18xx: " Arik Nemtsov
2012-05-10 9:14 ` Arik Nemtsov [this message]
2012-05-10 9:14 ` [PATCH 66/78] wl18xx: print the PHY firmware version from the private static data Arik Nemtsov
2012-05-10 9:14 ` [PATCH 67/78] wlcore: print the interrupt status when recovery is triggered Arik Nemtsov
2012-05-10 9:14 ` [PATCH 68/78] wl18xx: don't use MIMO when ht_mode is set to wide Arik Nemtsov
2012-05-10 9:14 ` [PATCH 69/78] wlcore: use proper values for supported local rates Arik Nemtsov
2012-05-10 9:14 ` [PATCH 70/78] wl18xx: add module parameter to force SISO 20MHz Arik Nemtsov
2012-05-10 9:14 ` [PATCH 71/78] wl18xx: add power limit reference value to mac_and_phy settings Arik Nemtsov
2012-05-10 9:14 ` [PATCH 72/78] wl18xx: export low/high band component values as module params Arik Nemtsov
2012-05-10 9:14 ` [PATCH 73/78] wl18xx: export pwr_limit_reference_11_abg value as a module parameter Arik Nemtsov
2012-05-10 9:14 ` [PATCH 74/78] wlcore/wl12xx/wl18xx: move lower driver debugfs to a subdir Arik Nemtsov
2012-05-10 9:14 ` [PATCH 75/78] wlcore: increase aggregation buffer size by one page Arik Nemtsov
2012-05-10 9:14 ` [PATCH 76/78] wl18xx: increase tx_ba_win_size to 64 Arik Nemtsov
2012-05-10 9:14 ` [PATCH 77/78] wl18xx: use new fw stats structures Arik Nemtsov
2012-05-10 9:14 ` [PATCH 78/78] wl18xx: change default tcp_checksum to false Arik Nemtsov
2012-05-10 9:50 ` [PATCH 00/78] 18xx chip support Kalle Valo
2012-05-10 10:11 ` Arik Nemtsov
2012-05-10 10:15 ` Kalle Valo
2012-05-10 10:25 ` Arik Nemtsov
2012-05-11 5:57 ` Luciano Coelho
2012-05-11 9:03 ` Kalle Valo
2012-06-05 14:04 ` Luciano Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336641263-5761-66-git-send-email-arik@wizery.com \
--to=arik@wizery.com \
--cc=coelho@ti.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).