From: Kalle Valo <kalle.valo@iki.fi>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 06/33] wl12xx: allocate buffer the spi busy word from struct wl12xx
Date: Fri, 12 Jun 2009 14:14:55 +0300 [thread overview]
Message-ID: <20090612111454.8877.38762.stgit@tikku> (raw)
In-Reply-To: <20090612110225.8877.92418.stgit@tikku>
From: Kalle Valo <kalle.valo@nokia.com>
Needed for DMA transfers.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
---
drivers/net/wireless/wl12xx/spi.c | 5 +++--
drivers/net/wireless/wl12xx/spi.h | 3 +--
drivers/net/wireless/wl12xx/wl12xx.h | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c
index 9392742..bcdcfbc 100644
--- a/drivers/net/wireless/wl12xx/spi.c
+++ b/drivers/net/wireless/wl12xx/spi.c
@@ -262,10 +262,11 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,
{
struct spi_transfer t[3];
struct spi_message m;
- char busy_buf[TNETWIF_READ_OFFSET_BYTES];
+ u8 *busy_buf;
u32 *cmd;
cmd = &wl->buffer_cmd;
+ busy_buf = wl->buffer_busyword;
*cmd = 0;
*cmd |= WSPI_CMD_READ;
@@ -281,7 +282,7 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,
/* Busy and non busy words read */
t[1].rx_buf = busy_buf;
- t[1].len = TNETWIF_READ_OFFSET_BYTES;
+ t[1].len = WL12XX_BUSY_WORD_LEN;
spi_message_add_tail(&t[1], &m);
t[2].rx_buf = buf;
diff --git a/drivers/net/wireless/wl12xx/spi.h b/drivers/net/wireless/wl12xx/spi.h
index 7edb218..1a19557 100644
--- a/drivers/net/wireless/wl12xx/spi.h
+++ b/drivers/net/wireless/wl12xx/spi.h
@@ -65,9 +65,8 @@
#define WSPI_INIT_CMD_LEN 8
-#define TNETWIF_READ_OFFSET_BYTES 8
#define HW_ACCESS_WSPI_FIXED_BUSY_LEN \
- ((TNETWIF_READ_OFFSET_BYTES - 4) / sizeof(u32))
+ ((WL12XX_BUSY_WORD_LEN - 4) / sizeof(u32))
#define HW_ACCESS_WSPI_INIT_CMD_MASK 0
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 5865935..b811020 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -105,6 +105,7 @@ enum {
CFG_RX_AUTH_EN | \
CFG_RX_ASSOC_EN)
+#define WL12XX_BUSY_WORD_LEN 8
struct boot_attr {
u32 radio_type;
@@ -385,6 +386,7 @@ struct wl12xx {
u32 buffer_32;
u32 buffer_cmd;
+ u8 buffer_busyword[WL12XX_BUSY_WORD_LEN];
};
int wl12xx_plt_start(struct wl12xx *wl);
next prev parent reply other threads:[~2009-06-12 11:15 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-12 11:14 [PATCH 00/33] wl12xx update for 2.6.32 Kalle Valo
2009-06-12 11:14 ` [PATCH 01/33] wl12xx: cmd and acx interface rework Kalle Valo
2009-06-12 11:14 ` [PATCH 02/33] wl12xx: reserver buffer for read32()/write32() in struct wl12xx Kalle Valo
2009-06-12 11:14 ` [PATCH 03/33] wl12xx: fix error handling in wl12xx_probe() Kalle Valo
2009-06-12 11:14 ` [PATCH 04/33] wl12xx: reserve buffer for partition command in struct wl12xx Kalle Valo
2009-06-12 11:14 ` [PATCH 05/33] wl12xx: allocate buffer spi read/write command buffer kzalloc() Kalle Valo
2009-06-12 11:14 ` Kalle Valo [this message]
2009-06-12 11:15 ` [PATCH 07/33] wl12xx: use wl12xx_mem_read32() to read the rx counter Kalle Valo
2009-06-12 11:15 ` [PATCH 08/33] wl12xx: fix rx descriptor use Kalle Valo
2009-06-12 11:15 ` [PATCH 09/33] wl12xx: removed chipset interrupt source configuration from fw wakeup Kalle Valo
2009-06-12 11:15 ` [PATCH 10/33] wl12xx: add wl12xx_spi_reg_read() and wl12xx_spi_reg_write() functions Kalle Valo
2009-06-12 11:15 ` [PATCH 11/33] wl12xx: moved firmware version reading routine to chip-specific functions Kalle Valo
2009-06-12 11:15 ` [PATCH 12/33] wl12xx: add support for new WL1271 chip revision Kalle Valo
2009-06-12 11:15 ` [PATCH 13/33] wl12xx: add support for fixed address in wl12xx_spi_read Kalle Valo
2009-06-12 11:15 ` [PATCH 14/33] wl12xx: pass the wake up condition when configuring the wake up event Kalle Valo
2009-06-12 11:15 ` [PATCH 15/33] wl12xx: Moved wl1251 TX path implementation into chip specific files Kalle Valo
2009-06-12 11:16 ` [PATCH 16/33] wl12xx: Add support for block reading from a fixed register address Kalle Valo
2009-06-12 11:16 ` [PATCH 17/33] wl12xx: Fix incorrect warning message Kalle Valo
2009-06-12 11:16 ` [PATCH 18/33] wl12xx: Fix CMD_TEST regression via netlink Kalle Valo
2009-06-12 11:16 ` [PATCH 19/33] wl12xx: protect wl12xx_op_set_rts_threshold() Kalle Valo
2009-06-12 11:16 ` [PATCH 20/33] wl12xx: optimise elp wakeup and sleep calls Kalle Valo
2009-06-12 11:16 ` [PATCH 21/33] wl12xx: check if elp wakeup failed Kalle Valo
2009-06-12 11:16 ` [PATCH 22/33] wl12xx: enable ELP mode Kalle Valo
2009-06-12 11:16 ` [PATCH 23/33] wl12xx: Assign value to rx msdu lifetime variable Kalle Valo
2009-06-12 11:16 ` [PATCH 24/33] wl12xx: Use chipset specific join commands Kalle Valo
2009-06-12 11:16 ` [PATCH 25/33] wl12xx: rename wl1251.c wl1251_ops.c Kalle Valo
2009-06-12 11:17 ` [PATCH 26/33] wl12xx: rename driver to wl1251 Kalle Valo
2009-06-12 11:17 ` [PATCH 27/33] wl1251: remove wl1271_setup() Kalle Valo
2009-06-12 11:17 ` [PATCH 28/33] wl1251: add wl1251 prefix to all 1251 files Kalle Valo
2009-06-12 11:17 ` [PATCH 29/33] wl1251: rename wl12xx.h to wl1251.h Kalle Valo
2009-06-12 11:17 ` [PATCH 30/33] wl12xx: remove unused wl12xx_hw_init_mem_config() Kalle Valo
2009-06-12 11:17 ` [PATCH 31/33] wl1251: use wl1251 prefix everywhere Kalle Valo
2009-06-12 11:17 ` [PATCH 32/33] wl1251: fix a checkpatch warning Kalle Valo
2009-06-12 11:17 ` [PATCH 33/33] wl1251: change psm enabled/disabled info to debug Kalle Valo
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=20090612111454.8877.38762.stgit@tikku \
--to=kalle.valo@iki.fi \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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).