projects / firefly-linux-kernel-4.4.55.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
brcmfmac: replace brcmf_sdcard_reg_read with brcmf_sdio_regrl
[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / brcm80211 / brcmfmac / sdio_chip.c
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index d4b390c2acfde69c35756fc2e70866aa2c22b770..c2ec99c5d648ee9eaee6f9fefef3cfb3cadfc8a7 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -93,8 +93,9 @@ brcmf_sdio_sb_corerev(struct brcmf_sdio_dev *sdiodev,
 
        idx = brcmf_sdio_chip_getinfidx(ci, coreid);
 
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_SB(ci->c_inf[idx].base, sbidhigh));
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  CORE_SB(ci->c_inf[idx].base, sbidhigh),
+                                  NULL);
        return SBCOREREV(regdata);
 }
 
@@ -118,8 +119,9 @@ brcmf_sdio_sb_iscoreup(struct brcmf_sdio_dev *sdiodev,
 
        idx = brcmf_sdio_chip_getinfidx(ci, coreid);
 
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_SB(ci->c_inf[idx].base, sbtmstatelow));
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
+                                  NULL);
        regdata &= (SSB_TMSLOW_RESET | SSB_TMSLOW_REJECT |
                    SSB_IMSTATE_REJECT | SSB_TMSLOW_CLOCK);
        return (SSB_TMSLOW_CLOCK == regdata);
@@ -135,12 +137,13 @@ brcmf_sdio_ai_iscoreup(struct brcmf_sdio_dev *sdiodev,
 
        idx = brcmf_sdio_chip_getinfidx(ci, coreid);
 
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                                       ci->c_inf[idx].wrapbase+BCMA_IOCTL);
+       regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
+                                  NULL);
        ret = (regdata & (BCMA_IOCTL_FGC | BCMA_IOCTL_CLK)) == BCMA_IOCTL_CLK;
 
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                                       ci->c_inf[idx].wrapbase+BCMA_RESET_CTL);
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
+                                  NULL);
        ret = ret && ((regdata & BCMA_RESET_CTL_RESET) == 0);
 
        return ret;
@@ -150,55 +153,59 @@ static void
 brcmf_sdio_sb_coredisable(struct brcmf_sdio_dev *sdiodev,
                          struct chip_info *ci, u16 coreid)
 {
-       u32 regdata;
+       u32 regdata, base;
        u8 idx;
 
        idx = brcmf_sdio_chip_getinfidx(ci, coreid);
+       base = ci->c_inf[idx].base;
 
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_SB(ci->c_inf[idx].base, sbtmstatelow));
+       regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow), NULL);
        if (regdata & SSB_TMSLOW_RESET)
                return;
 
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_SB(ci->c_inf[idx].base, sbtmstatelow));
+       regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow), NULL);
        if ((regdata & SSB_TMSLOW_CLOCK) != 0) {
                /*
                 * set target reject and spin until busy is clear
                 * (preserve core-specific bits)
                 */
-               regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbtmstatelow));
+               regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow),
+                                          NULL);
                brcmf_sdcard_reg_write(sdiodev,
                                CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
                                regdata | SSB_TMSLOW_REJECT);
 
-               regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbtmstatelow));
+               regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow),
+                                          NULL);
                udelay(1);
-               SPINWAIT((brcmf_sdcard_reg_read(sdiodev,
-                       CORE_SB(ci->c_inf[idx].base, sbtmstatehigh)) &
+               SPINWAIT((brcmf_sdio_regrl(sdiodev,
+                                          CORE_SB(base, sbtmstatehigh),
+                                          NULL) &
                        SSB_TMSHIGH_BUSY), 100000);
 
-               regdata = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_SB(ci->c_inf[idx].base, sbtmstatehigh));
+               regdata = brcmf_sdio_regrl(sdiodev,
+                                          CORE_SB(base, sbtmstatehigh),
+                                          NULL);
                if (regdata & SSB_TMSHIGH_BUSY)
                        brcmf_dbg(ERROR, "core state still busy\n");
 
-               regdata = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_SB(ci->c_inf[idx].base, sbidlow));
+               regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbidlow),
+                                          NULL);
                if (regdata & SSB_IDLOW_INITIATOR) {
-                       regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbimstate)) |
-                               SSB_IMSTATE_REJECT;
+                       regdata = brcmf_sdio_regrl(sdiodev,
+                                                  CORE_SB(base, sbimstate),
+                                                  NULL);
+                       regdata |= SSB_IMSTATE_REJECT;
                        brcmf_sdcard_reg_write(sdiodev,
                                CORE_SB(ci->c_inf[idx].base, sbimstate),
                                regdata);
-                       regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbimstate));
+                       regdata = brcmf_sdio_regrl(sdiodev,
+                                                  CORE_SB(base, sbimstate),
+                                                  NULL);
                        udelay(1);
-                       SPINWAIT((brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbimstate)) &
+                       SPINWAIT((brcmf_sdio_regrl(sdiodev,
+                                                  CORE_SB(base, sbimstate),
+                                                  NULL) &
                                SSB_IMSTATE_BUSY), 100000);
                }
 
@@ -207,17 +214,18 @@ brcmf_sdio_sb_coredisable(struct brcmf_sdio_dev *sdiodev,
                        CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
                        (SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK |
                        SSB_TMSLOW_REJECT | SSB_TMSLOW_RESET));
-               regdata = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_SB(ci->c_inf[idx].base, sbtmstatelow));
+               regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbtmstatelow),
+                                          NULL);
                udelay(10);
 
                /* clear the initiator reject bit */
-               regdata = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_SB(ci->c_inf[idx].base, sbidlow));
+               regdata = brcmf_sdio_regrl(sdiodev, CORE_SB(base, sbidlow),
+                                          NULL);
                if (regdata & SSB_IDLOW_INITIATOR) {
-                       regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbimstate)) &
-                               ~SSB_IMSTATE_REJECT;
+                       regdata = brcmf_sdio_regrl(sdiodev,
+                                                  CORE_SB(base, sbimstate),
+                                                  NULL);
+                       regdata &= ~SSB_IMSTATE_REJECT;
                        brcmf_sdcard_reg_write(sdiodev,
                                CORE_SB(ci->c_inf[idx].base, sbimstate),
                                regdata);
@@ -241,14 +249,15 @@ brcmf_sdio_ai_coredisable(struct brcmf_sdio_dev *sdiodev,
        idx = brcmf_sdio_chip_getinfidx(ci, coreid);
 
        /* if core is already in reset, just return */
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                                       ci->c_inf[idx].wrapbase+BCMA_RESET_CTL);
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
+                                  NULL);
        if ((regdata & BCMA_RESET_CTL_RESET) != 0)
                return;
 
        brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL, 0);
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                                       ci->c_inf[idx].wrapbase+BCMA_IOCTL);
+       regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
+                                  NULL);
        udelay(10);
 
        brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
@@ -279,19 +288,22 @@ brcmf_sdio_sb_resetcore(struct brcmf_sdio_dev *sdiodev,
        brcmf_sdcard_reg_write(sdiodev,
                        CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
                        SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK | SSB_TMSLOW_RESET);
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbtmstatelow));
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
+                                  NULL);
        udelay(1);
 
        /* clear any serror */
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbtmstatehigh));
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  CORE_SB(ci->c_inf[idx].base, sbtmstatehigh),
+                                  NULL);
        if (regdata & SSB_TMSHIGH_SERR)
                brcmf_sdcard_reg_write(sdiodev,
                        CORE_SB(ci->c_inf[idx].base, sbtmstatehigh), 0);
 
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbimstate));
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  CORE_SB(ci->c_inf[idx].base, sbimstate),
+                                  NULL);
        if (regdata & (SSB_IMSTATE_IBE | SSB_IMSTATE_TO))
                brcmf_sdcard_reg_write(sdiodev,
                        CORE_SB(ci->c_inf[idx].base, sbimstate),
@@ -301,16 +313,18 @@ brcmf_sdio_sb_resetcore(struct brcmf_sdio_dev *sdiodev,
        brcmf_sdcard_reg_write(sdiodev,
                CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
                SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK);
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbtmstatelow));
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
+                                  NULL);
        udelay(1);
 
        /* leave clock enabled */
        brcmf_sdcard_reg_write(sdiodev,
                               CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
                               SSB_TMSLOW_CLOCK);
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[idx].base, sbtmstatelow));
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  CORE_SB(ci->c_inf[idx].base, sbtmstatelow),
+                                  NULL);
        udelay(1);
 }
 
@@ -329,16 +343,16 @@ brcmf_sdio_ai_resetcore(struct brcmf_sdio_dev *sdiodev,
        /* now do initialization sequence */
        brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
                               BCMA_IOCTL_FGC | BCMA_IOCTL_CLK);
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                                       ci->c_inf[idx].wrapbase+BCMA_IOCTL);
+       regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
+                                  NULL);
        brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_RESET_CTL,
                               0);
        udelay(1);
 
        brcmf_sdcard_reg_write(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
                               BCMA_IOCTL_CLK);
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                                       ci->c_inf[idx].wrapbase+BCMA_IOCTL);
+       regdata = brcmf_sdio_regrl(sdiodev, ci->c_inf[idx].wrapbase+BCMA_IOCTL,
+                                  NULL);
        udelay(1);
 }
 
@@ -355,8 +369,9 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
         */
        ci->c_inf[0].id = BCMA_CORE_CHIPCOMMON;
        ci->c_inf[0].base = regs;
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_CC_REG(ci->c_inf[0].base, chipid));
+       regdata = brcmf_sdio_regrl(sdiodev,
+                                  CORE_CC_REG(ci->c_inf[0].base, chipid),
+                                  NULL);
        ci->chip = regdata & CID_ID_MASK;
        ci->chiprev = (regdata & CID_REV_MASK) >> CID_REV_SHIFT;
        ci->socitype = (regdata & CID_TYPE_MASK) >> CID_TYPE_SHIFT;
@@ -466,18 +481,22 @@ static void
 brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,
                             struct chip_info *ci)
 {
+       u32 base = ci->c_inf[0].base;
+
        /* get chipcommon rev */
        ci->c_inf[0].rev = ci->corerev(sdiodev, ci, ci->c_inf[0].id);
 
        /* get chipcommon capabilites */
-       ci->c_inf[0].caps =
-               brcmf_sdcard_reg_read(sdiodev,
-               CORE_CC_REG(ci->c_inf[0].base, capabilities));
+       ci->c_inf[0].caps = brcmf_sdio_regrl(sdiodev,
+                                            CORE_CC_REG(base, capabilities),
+                                            NULL);
 
        /* get pmu caps & rev */
        if (ci->c_inf[0].caps & CC_CAP_PMU) {
-               ci->pmucaps = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_CC_REG(ci->c_inf[0].base, pmucapabilities));
+               ci->pmucaps =
+                       brcmf_sdio_regrl(sdiodev,
+                                        CORE_CC_REG(base, pmucapabilities),
+                                        NULL);
                ci->pmurev = ci->pmucaps & PCAP_REV_MASK;
        }
 
@@ -556,6 +575,7 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,
        u32 str_mask = 0;
        u32 str_shift = 0;
        char chn[8];
+       u32 base = ci->c_inf[0].base;
 
        if (!(ci->c_inf[0].caps & CC_CAP_PMU))
                return;
@@ -588,8 +608,10 @@ brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,
                brcmf_sdcard_reg_write(sdiodev,
                        CORE_CC_REG(ci->c_inf[0].base, chipcontrol_addr),
                        1);
-               cc_data_temp = brcmf_sdcard_reg_read(sdiodev,
-                       CORE_CC_REG(ci->c_inf[0].base, chipcontrol_addr));
+               cc_data_temp =
+                       brcmf_sdio_regrl(sdiodev,
+                                        CORE_CC_REG(base, chipcontrol_addr),
+                                        NULL);
                cc_data_temp &= ~str_mask;
                drivestrength_sel <<= str_shift;
                cc_data_temp |= drivestrength_sel;
Unnamed repository; edit this file 'description' to name the repository.