From: "Arend van Spriel" <arend@broadcom.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
"Franky Lin" <frankyl@broadcom.com>,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 07/19] brcm80211: fmac: add corerev function for bcm4330 chip
Date: Thu, 10 Nov 2011 20:30:22 +0100 [thread overview]
Message-ID: <1320953434-16859-9-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1320953434-16859-1-git-send-email-arend@broadcom.com>
From: Franky Lin <frankyl@broadcom.com>
This patch is part of the series adding new backplane support
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
.../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 31 ++++++++++++++++----
.../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 3 ++
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index 263ad0c..85b665e 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -49,6 +49,10 @@
#define SOCI_SB 0
#define SOCI_AI 1
+/* EROM CompIdentB */
+#define CIB_REV_MASK 0xff000000
+#define CIB_REV_SHIFT 24
+
#define SDIOD_DRVSTR_KEY(chip, pmu) (((chip) << 16) | (pmu))
/* SDIO Pad drive strength to select value mappings */
struct sdiod_drive_str {
@@ -100,16 +104,30 @@ brcmf_sdio_chip_getinfidx(struct chip_info *ci, u16 coreid)
}
static u32
-brcmf_sdio_chip_corerev(struct brcmf_sdio_dev *sdiodev,
- u32 corebase)
+brcmf_sdio_sb_corerev(struct brcmf_sdio_dev *sdiodev,
+ struct chip_info *ci, u16 coreid)
{
u32 regdata;
+ u8 idx;
+
+ idx = brcmf_sdio_chip_getinfidx(ci, coreid);
regdata = brcmf_sdcard_reg_read(sdiodev,
- CORE_SB(corebase, sbidhigh), 4);
+ CORE_SB(ci->c_inf[idx].base, sbidhigh), 4);
return SBCOREREV(regdata);
}
+static u32
+brcmf_sdio_ai_corerev(struct brcmf_sdio_dev *sdiodev,
+ struct chip_info *ci, u16 coreid)
+{
+ u8 idx;
+
+ idx = brcmf_sdio_chip_getinfidx(ci, coreid);
+
+ return (ci->c_inf[idx].cib & CIB_REV_MASK) >> CIB_REV_SHIFT;
+}
+
static bool
brcmf_sdio_sb_iscoreup(struct brcmf_sdio_dev *sdiodev,
struct chip_info *ci, u16 coreid)
@@ -310,9 +328,11 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
switch (ci->socitype) {
case SOCI_SB:
ci->iscoreup = brcmf_sdio_sb_iscoreup;
+ ci->corerev = brcmf_sdio_sb_corerev;
break;
case SOCI_AI:
ci->iscoreup = brcmf_sdio_ai_iscoreup;
+ ci->corerev = brcmf_sdio_ai_corerev;
break;
default:
brcmf_dbg(ERROR, "socitype %u not supported\n", ci->socitype);
@@ -378,8 +398,7 @@ brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,
u8 idx;
/* get chipcommon rev */
- ci->c_inf[0].rev =
- brcmf_sdio_chip_corerev(sdiodev, ci->c_inf[0].base);
+ ci->c_inf[0].rev = ci->corerev(sdiodev, ci, ci->c_inf[0].id);
/* get chipcommon capabilites */
ci->c_inf[0].caps =
@@ -393,7 +412,7 @@ brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,
ci->pmurev = ci->pmucaps & PCAP_REV_MASK;
}
- ci->c_inf[1].rev = brcmf_sdio_chip_corerev(sdiodev, ci->c_inf[1].base);
+ ci->c_inf[1].rev = ci->corerev(sdiodev, ci, ci->c_inf[1].id);
regdata = brcmf_sdcard_reg_read(sdiodev,
CORE_SB(ci->c_inf[1].base, sbidhigh), 4);
ci->c_inf[1].id = (regdata & SSB_IDHIGH_CC) >> SSB_IDHIGH_CC_SHIFT;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
index 557c80d..ea91e60 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
@@ -60,6 +60,7 @@ struct chip_core_info {
u32 base;
u32 wrapbase;
u32 caps;
+ u32 cib;
};
struct chip_info {
@@ -75,6 +76,8 @@ struct chip_info {
bool (*iscoreup)(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci,
u16 coreid);
+ u32 (*corerev)(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci,
+ u16 coreid);
};
struct sbconfig {
--
1.7.5.4
next prev parent reply other threads:[~2011-11-10 19:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-10 19:30 [PATCH 00/19] brcm80211: cleanup and preparing for new chip Arend van Spriel
2011-11-10 19:30 ` Arend van Spriel
2011-11-10 19:34 ` Arend van Spriel
2011-11-10 19:30 ` [PATCH 01/19] brcm80211: smac: fix endianess issue for OTP memory access Arend van Spriel
2011-11-10 19:30 ` [PATCH 02/19] brcm80211: smac: remove code under unused macro definitions Arend van Spriel
2011-11-10 19:30 ` [PATCH 03/19] brcm80211: smac: replace own access category definitions with mac80211 enum Arend van Spriel
2011-11-10 19:30 ` [PATCH 04/19] brcm80211: smac: remove duplicate definition of D11_PHY_HDR_LEN Arend van Spriel
2011-11-10 19:30 ` [PATCH 05/19] brcm80211: smac: don't modify sta parameters when adding sta Arend van Spriel
2011-11-10 19:30 ` [PATCH 06/19] brcm80211: fmac: add iscoreup function for bcm4330 chip Arend van Spriel
2011-11-10 19:30 ` Arend van Spriel [this message]
2011-11-10 19:30 ` [PATCH 08/19] brcm80211: fmac: add coredisable " Arend van Spriel
2011-11-10 19:30 ` [PATCH 09/19] brcm80211: fmac: add resetcore " Arend van Spriel
2011-11-10 19:30 ` [PATCH 10/19] brcm80211: fmac: remove id retrieve code Arend van Spriel
2011-11-10 19:30 ` [PATCH 11/19] brcm80211: smac: remove usage of brcmu_pkttotlen Arend van Spriel
2011-11-10 19:30 ` [PATCH 12/19] brcm80211: util: use sk_buff_head in precedence queue functions Arend van Spriel
2011-11-10 19:30 ` [PATCH 13/19] brcm80211: smac: combine promiscuous mode functionality Arend van Spriel
2011-11-10 19:30 ` [PATCH 14/19] brcm80211: util: move brcmu_pkttotlen() function to brcmfmac Arend van Spriel
2011-11-10 19:30 ` [PATCH 15/19] brcm80211: util: remove pointer traversal from brcmu_pkt_buf_free_skb Arend van Spriel
2011-11-10 19:30 ` [PATCH 16/19] brcm80211: fmac: add function to free the glom skb queue Arend van Spriel
2011-11-10 19:30 ` [PATCH 17/19] brcm80211: fmac: stop using hard coded firmware/nvram name Arend van Spriel
2011-11-11 17:35 ` John W. Linville
2011-11-11 19:49 ` Franky Lin
2011-11-10 19:30 ` [PATCH 18/19] brcm80211: fmac: remove PCMCIA core related code Arend van Spriel
2011-11-10 19:30 ` [PATCH 19/19] brcm80211: fmac: release bss struct returned from cfg80211_inform_bss Arend van Spriel
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=1320953434-16859-9-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=frankyl@broadcom.com \
--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).