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 09/19] brcm80211: fmac: add resetcore function for bcm4330 chip
Date: Thu, 10 Nov 2011 20:30:24 +0100 [thread overview]
Message-ID: <1320953434-16859-11-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 of 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>
---
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 5 +-
.../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 45 ++++++++++++++++++--
.../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 4 +-
3 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 0d0e283..a5d1c35 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -3108,8 +3108,7 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)
ci->coredisable(bus->sdiodev, ci, BCMA_CORE_ARM_CM3);
- brcmf_sdio_chip_resetcore(bus->sdiodev, ci,
- BCMA_CORE_INTERNAL_MEM);
+ ci->resetcore(bus->sdiodev, ci, BCMA_CORE_INTERNAL_MEM);
/* Clear the top bit of memory */
if (bus->ramsize) {
@@ -3133,7 +3132,7 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter)
w_sdreg32(bus, 0xFFFFFFFF,
offsetof(struct sdpcmd_regs, intstatus), &retries);
- brcmf_sdio_chip_resetcore(bus->sdiodev, ci, BCMA_CORE_ARM_CM3);
+ ci->resetcore(bus->sdiodev, ci, BCMA_CORE_ARM_CM3);
/* Allow HT Clock now that the ARM is running. */
bus->alp_only = false;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index d2cf8c6..cef9abb 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -278,9 +278,9 @@ brcmf_sdio_ai_coredisable(struct brcmf_sdio_dev *sdiodev,
udelay(1);
}
-void
-brcmf_sdio_chip_resetcore(struct brcmf_sdio_dev *sdiodev,
- struct chip_info *ci, u16 coreid)
+static void
+brcmf_sdio_sb_resetcore(struct brcmf_sdio_dev *sdiodev,
+ struct chip_info *ci, u16 coreid)
{
u32 regdata;
u8 idx;
@@ -291,7 +291,7 @@ brcmf_sdio_chip_resetcore(struct brcmf_sdio_dev *sdiodev,
* Must do the disable sequence first to work for
* arbitrary current core state.
*/
- ci->coredisable(sdiodev, ci, coreid);
+ brcmf_sdio_sb_coredisable(sdiodev, ci, coreid);
/*
* Now do the initialization sequence.
@@ -301,8 +301,11 @@ brcmf_sdio_chip_resetcore(struct brcmf_sdio_dev *sdiodev,
brcmf_sdcard_reg_write(sdiodev,
CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4,
SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK | SSB_TMSLOW_RESET);
+ regdata = brcmf_sdcard_reg_read(sdiodev,
+ CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
udelay(1);
+ /* clear any serror */
regdata = brcmf_sdcard_reg_read(sdiodev,
CORE_SB(ci->c_inf[idx].base, sbtmstatehigh), 4);
if (regdata & SSB_TMSHIGH_SERR)
@@ -320,12 +323,44 @@ brcmf_sdio_chip_resetcore(struct brcmf_sdio_dev *sdiodev,
brcmf_sdcard_reg_write(sdiodev,
CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4,
SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK);
+ regdata = brcmf_sdcard_reg_read(sdiodev,
+ CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
udelay(1);
/* leave clock enabled */
brcmf_sdcard_reg_write(sdiodev,
CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
4, SSB_TMSLOW_CLOCK);
+ regdata = brcmf_sdcard_reg_read(sdiodev,
+ CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);
+ udelay(1);
+}
+
+static void
+brcmf_sdio_ai_resetcore(struct brcmf_sdio_dev *sdiodev,
+ struct chip_info *ci, u16 coreid)
+{
+ u8 idx;
+ u32 regdata;
+
+ idx = brcmf_sdio_chip_getinfidx(ci, coreid);
+
+ /* must disable first to work for arbitrary current core state */
+ brcmf_sdio_ai_coredisable(sdiodev, ci, coreid);
+
+ /* now do initialization sequence */
+ brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
+ 4, BCMA_IOCTL_FGC | BCMA_IOCTL_CLK);
+ regdata = brcmf_sdcard_reg_read(sdiodev,
+ ci->c_inf[idx].wrapbase+BCMA_IOCTL, 4);
+ brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
+ 4, 0);
+ udelay(1);
+
+ brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
+ 4, BCMA_IOCTL_CLK);
+ regdata = brcmf_sdcard_reg_read(sdiodev,
+ ci->c_inf[idx].wrapbase+BCMA_IOCTL, 4);
udelay(1);
}
@@ -371,11 +406,13 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
ci->iscoreup = brcmf_sdio_sb_iscoreup;
ci->corerev = brcmf_sdio_sb_corerev;
ci->coredisable = brcmf_sdio_sb_coredisable;
+ ci->resetcore = brcmf_sdio_sb_resetcore;
break;
case SOCI_AI:
ci->iscoreup = brcmf_sdio_ai_iscoreup;
ci->corerev = brcmf_sdio_ai_corerev;
ci->coredisable = brcmf_sdio_ai_coredisable;
+ ci->resetcore = brcmf_sdio_ai_resetcore;
break;
default:
brcmf_dbg(ERROR, "socitype %u not supported\n", ci->socitype);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
index 22232a8..ce974d7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
@@ -80,6 +80,8 @@ struct chip_info {
u16 coreid);
void (*coredisable)(struct brcmf_sdio_dev *sdiodev,
struct chip_info *ci, u16 coreid);
+ void (*resetcore)(struct brcmf_sdio_dev *sdiodev,
+ struct chip_info *ci, u16 coreid);
};
struct sbconfig {
@@ -122,8 +124,6 @@ struct sbconfig {
u32 sbidhigh; /* identification */
};
-extern void brcmf_sdio_chip_resetcore(struct brcmf_sdio_dev *sdiodev,
- struct chip_info *ci, u16 coreid);
extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,
struct chip_info **ci_ptr, u32 regs);
extern void brcmf_sdio_chip_detach(struct chip_info **ci_ptr);
--
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 ` [PATCH 07/19] brcm80211: fmac: add corerev " Arend van Spriel
2011-11-10 19:30 ` [PATCH 08/19] brcm80211: fmac: add coredisable " Arend van Spriel
2011-11-10 19:30 ` Arend van Spriel [this message]
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-11-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).