Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ca687d9 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: add iscoreup function for bcm4330 chip 



New type of backplane interconnect support is needed
for bcm4330

Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e9ca530a

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -3120,9 +3120,7 @@ static int brcmf_sdbrcm_download_state(struct brcmf_bus *bus, bool enter) 
					 (u8 *)&zeros, 4);

					 (u8 *)&zeros, 4);

		}

		}

	} else {

	} else {

		idx = brcmf_sdio_chip_getinfidx(ci, BCMA_CORE_INTERNAL_MEM);

		if (!ci->iscoreup(bus->sdiodev, ci, BCMA_CORE_INTERNAL_MEM)) {

		if (!brcmf_sdio_chip_iscoreup(bus->sdiodev,

					      ci->c_inf[idx].base)) {

			brcmf_dbg(ERROR, "SOCRAM core is down after reset?\n");

			brcmf_dbg(ERROR, "SOCRAM core is down after reset?\n");

			bcmerror = -EBADE;

			bcmerror = -EBADE;

			goto fail;

			goto fail;

drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c

+46 −4
Original line number Original line Diff line number Diff line
@@ -45,6 +45,10 @@ 
	((((sbidh) & SSB_IDHIGH_RCHI) >> SSB_IDHIGH_RCHI_SHIFT) | \

	((((sbidh) & SSB_IDHIGH_RCHI) >> SSB_IDHIGH_RCHI_SHIFT) | \

	  ((sbidh) & SSB_IDHIGH_RCLO))

	  ((sbidh) & SSB_IDHIGH_RCLO))





/* SOC Interconnect types (aka chip types) */

#define SOCI_SB		0

#define SOCI_AI		1



#define SDIOD_DRVSTR_KEY(chip, pmu)     (((chip) << 16) | (pmu))

#define SDIOD_DRVSTR_KEY(chip, pmu)     (((chip) << 16) | (pmu))

/* SDIO Pad drive strength to select value mappings */

/* SDIO Pad drive strength to select value mappings */

struct sdiod_drive_str {

struct sdiod_drive_str {
@@ -106,19 +110,44 @@ brcmf_sdio_chip_corerev(struct brcmf_sdio_dev *sdiodev, 
	return SBCOREREV(regdata);

	return SBCOREREV(regdata);

}

}





bool

static bool

brcmf_sdio_chip_iscoreup(struct brcmf_sdio_dev *sdiodev,

brcmf_sdio_sb_iscoreup(struct brcmf_sdio_dev *sdiodev,

			 u32 corebase)

		       struct chip_info *ci, u16 coreid)

{

{

	u32 regdata;

	u32 regdata;

	u8 idx;



	idx = brcmf_sdio_chip_getinfidx(ci, coreid);





	regdata = brcmf_sdcard_reg_read(sdiodev,

	regdata = brcmf_sdcard_reg_read(sdiodev,

			CORE_SB(corebase, sbtmstatelow), 4);

			CORE_SB(ci->c_inf[idx].base, sbtmstatelow), 4);

	regdata &= (SSB_TMSLOW_RESET | SSB_TMSLOW_REJECT |

	regdata &= (SSB_TMSLOW_RESET | SSB_TMSLOW_REJECT |

		    SSB_IMSTATE_REJECT | SSB_TMSLOW_CLOCK);

		    SSB_IMSTATE_REJECT | SSB_TMSLOW_CLOCK);

	return (SSB_TMSLOW_CLOCK == regdata);

	return (SSB_TMSLOW_CLOCK == regdata);

}

}





static bool

brcmf_sdio_ai_iscoreup(struct brcmf_sdio_dev *sdiodev,

		       struct chip_info *ci, u16 coreid)

{

	u32 regdata;

	u8 idx;

	bool ret;



	idx = brcmf_sdio_chip_getinfidx(ci, coreid);



	regdata = brcmf_sdcard_reg_read(sdiodev,

					ci->c_inf[idx].wrapbase+BCMA_IOCTL, 4);

	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,

					4);

	ret = ret && ((regdata & BCMA_RESET_CTL_RESET) == 0);



	return ret;

}



void

void

brcmf_sdio_chip_coredisable(struct brcmf_sdio_dev *sdiodev, u32 corebase)

brcmf_sdio_chip_coredisable(struct brcmf_sdio_dev *sdiodev, u32 corebase)

{

{
@@ -258,6 +287,7 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, 
			CORE_CC_REG(ci->c_inf[0].base, chipid), 4);

			CORE_CC_REG(ci->c_inf[0].base, chipid), 4);

	ci->chip = regdata & CID_ID_MASK;

	ci->chip = regdata & CID_ID_MASK;

	ci->chiprev = (regdata & CID_REV_MASK) >> CID_REV_SHIFT;

	ci->chiprev = (regdata & CID_REV_MASK) >> CID_REV_SHIFT;

	ci->socitype = (regdata & CID_TYPE_MASK) >> CID_TYPE_SHIFT;





	brcmf_dbg(INFO, "chipid=0x%x chiprev=%d\n", ci->chip, ci->chiprev);

	brcmf_dbg(INFO, "chipid=0x%x chiprev=%d\n", ci->chip, ci->chiprev);
@@ -277,6 +307,18 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, 
		return -ENODEV;

		return -ENODEV;

	}

	}





	switch (ci->socitype) {

	case SOCI_SB:

		ci->iscoreup = brcmf_sdio_sb_iscoreup;

		break;

	case SOCI_AI:

		ci->iscoreup = brcmf_sdio_ai_iscoreup;

		break;

	default:

		brcmf_dbg(ERROR, "socitype %u not supported\n", ci->socitype);

		return -ENODEV;

	}



	return 0;

	return 0;

}

}

drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -65,12 +65,16 @@ struct chip_core_info { 
struct chip_info {

struct chip_info {

	u32 chip;

	u32 chip;

	u32 chiprev;

	u32 chiprev;

	u32 socitype;

	/* core info */

	/* core info */

	/* always put chipcommon core at 0, bus core at 1 */

	/* always put chipcommon core at 0, bus core at 1 */

	struct chip_core_info c_inf[BRCMF_MAX_CORENUM];

	struct chip_core_info c_inf[BRCMF_MAX_CORENUM];

	u32 pmurev;

	u32 pmurev;

	u32 pmucaps;

	u32 pmucaps;

	u32 ramsize;

	u32 ramsize;



	bool (*iscoreup)(struct brcmf_sdio_dev *sdiodev, struct chip_info *ci,

			 u16 coreid);

};

};





struct sbconfig {

struct sbconfig {
@@ -115,8 +119,6 @@ struct sbconfig { 




extern void brcmf_sdio_chip_resetcore(struct brcmf_sdio_dev *sdiodev,

extern void brcmf_sdio_chip_resetcore(struct brcmf_sdio_dev *sdiodev,

				      u32 corebase);

				      u32 corebase);

extern bool brcmf_sdio_chip_iscoreup(struct brcmf_sdio_dev *sdiodev,

				     u32 corebase);

extern void brcmf_sdio_chip_coredisable(struct brcmf_sdio_dev *sdiodev,

extern void brcmf_sdio_chip_coredisable(struct brcmf_sdio_dev *sdiodev,

					u32 corebase);

					u32 corebase);

extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,

extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,