Commit e2dc9eea authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: combine bcmsdh source files into one 



The driver has four files specific to SDIO host interface handling.
This commit reduces that by merging two closely related source files.

Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4d5504ec

drivers/net/wireless/brcm80211/brcmfmac/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ brcmfmac-objs += \ 
brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \

		dhd_sdio.o \

		bcmsdh.o \

		bcmsdh_sdmmc.o \

		sdio_chip.o

brcmfmac-$(CONFIG_BRCMFMAC_USB) += \

		usb.o

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

+521 −0
Original line number Diff line number Diff line
@@ -23,9 +23,17 @@ 
#include <linux/completion.h>

#include <linux/scatterlist.h>

#include <linux/mmc/sdio.h>

#include <linux/mmc/core.h>

#include <linux/mmc/sdio_func.h>

#include <linux/mmc/sdio_ids.h>

#include <linux/mmc/card.h>

#include <linux/mmc/host.h>

#include <linux/platform_device.h>

#include <linux/platform_data/brcmfmac-sdio.h>

#include <linux/suspend.h>

#include <linux/errno.h>

#include <linux/module.h>

#include <net/cfg80211.h>



#include <defs.h>

#include <brcm_hw_ids.h>
@@ -35,6 +43,7 @@ 
#include "dhd_bus.h"

#include "dhd_dbg.h"

#include "sdio_host.h"

#include "sdio_chip.h"



#define SDIOH_API_ACCESS_RETRY_LIMIT	2
@@ -797,3 +806,515 @@ void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev, bool enable) 
	else

		brcmf_sdbrcm_wd_timer(sdiodev->bus, 0);

}



#define SDIO_VENDOR_ID_BROADCOM		0x02d0



#define DMA_ALIGN_MASK	0x03



#define SDIO_FUNC1_BLOCKSIZE		64

#define SDIO_FUNC2_BLOCKSIZE		512



/* devices we support, null terminated */

static const struct sdio_device_id brcmf_sdmmc_ids[] = {

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43143)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_43241)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334)},

	{SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM,

		     SDIO_DEVICE_ID_BROADCOM_4335_4339)},

	{ /* end: all zeroes */ },

};

MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);



static struct brcmfmac_sdio_platform_data *brcmfmac_sdio_pdata;





bool

brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev)

{

	bool is_err = false;

#ifdef CONFIG_PM_SLEEP

	is_err = atomic_read(&sdiodev->suspend);

#endif

	return is_err;

}



void

brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev, wait_queue_head_t *wq)

{

#ifdef CONFIG_PM_SLEEP

	int retry = 0;

	while (atomic_read(&sdiodev->suspend) && retry++ != 30)

		wait_event_timeout(*wq, false, HZ/100);

#endif

}



static inline int brcmf_sdioh_f0_write_byte(struct brcmf_sdio_dev *sdiodev,

					    uint regaddr, u8 *byte)

{

	struct sdio_func *sdfunc = sdiodev->func[0];

	int err_ret;



	/*

	 * Can only directly write to some F0 registers.

	 * Handle F2 enable/disable and Abort command

	 * as a special case.

	 */

	if (regaddr == SDIO_CCCR_IOEx) {

		sdfunc = sdiodev->func[2];

		if (sdfunc) {

			if (*byte & SDIO_FUNC_ENABLE_2) {

				/* Enable Function 2 */

				err_ret = sdio_enable_func(sdfunc);

				if (err_ret)

					brcmf_err("enable F2 failed:%d\n",

						  err_ret);

			} else {

				/* Disable Function 2 */

				err_ret = sdio_disable_func(sdfunc);

				if (err_ret)

					brcmf_err("Disable F2 failed:%d\n",

						  err_ret);

			}

		} else {

			err_ret = -ENOENT;

		}

	} else if ((regaddr == SDIO_CCCR_ABORT) ||

		   (regaddr == SDIO_CCCR_IENx)) {

		sdfunc = kmemdup(sdiodev->func[0], sizeof(struct sdio_func),

				 GFP_KERNEL);

		if (!sdfunc)

			return -ENOMEM;

		sdfunc->num = 0;

		sdio_writeb(sdfunc, *byte, regaddr, &err_ret);

		kfree(sdfunc);

	} else if (regaddr < 0xF0) {

		brcmf_err("F0 Wr:0x%02x: write disallowed\n", regaddr);

		err_ret = -EPERM;

	} else {

		sdio_f0_writeb(sdfunc, *byte, regaddr, &err_ret);

	}



	return err_ret;

}



int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func,

			     uint regaddr, u8 *byte)

{

	int err_ret;



	brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x\n", rw, func, regaddr);



	brcmf_pm_resume_wait(sdiodev, &sdiodev->request_byte_wait);

	if (brcmf_pm_resume_error(sdiodev))

		return -EIO;



	if (rw && func == 0) {

		/* handle F0 separately */

		err_ret = brcmf_sdioh_f0_write_byte(sdiodev, regaddr, byte);

	} else {

		if (rw) /* CMD52 Write */

			sdio_writeb(sdiodev->func[func], *byte, regaddr,

				    &err_ret);

		else if (func == 0) {

			*byte = sdio_f0_readb(sdiodev->func[func], regaddr,

					      &err_ret);

		} else {

			*byte = sdio_readb(sdiodev->func[func], regaddr,

					   &err_ret);

		}

	}



	if (err_ret) {

		/*

		 * SleepCSR register access can fail when

		 * waking up the device so reduce this noise

		 * in the logs.

		 */

		if (regaddr != SBSDIO_FUNC1_SLEEPCSR)

			brcmf_err("Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n",

				  rw ? "write" : "read", func, regaddr, *byte,

				  err_ret);

		else

			brcmf_dbg(SDIO, "Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n",

				  rw ? "write" : "read", func, regaddr, *byte,

				  err_ret);

	}

	return err_ret;

}



int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,

			     uint rw, uint func, uint addr, u32 *word,

			     uint nbytes)

{

	int err_ret = -EIO;



	if (func == 0) {

		brcmf_err("Only CMD52 allowed to F0\n");

		return -EINVAL;

	}



	brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",

		  rw, func, addr, nbytes);



	brcmf_pm_resume_wait(sdiodev, &sdiodev->request_word_wait);

	if (brcmf_pm_resume_error(sdiodev))

		return -EIO;



	if (rw) {		/* CMD52 Write */

		if (nbytes == 4)

			sdio_writel(sdiodev->func[func], *word, addr,

				    &err_ret);

		else if (nbytes == 2)

			sdio_writew(sdiodev->func[func], (*word & 0xFFFF),

				    addr, &err_ret);

		else

			brcmf_err("Invalid nbytes: %d\n", nbytes);

	} else {		/* CMD52 Read */

		if (nbytes == 4)

			*word = sdio_readl(sdiodev->func[func], addr, &err_ret);

		else if (nbytes == 2)

			*word = sdio_readw(sdiodev->func[func], addr,

					   &err_ret) & 0xFFFF;

		else

			brcmf_err("Invalid nbytes: %d\n", nbytes);

	}



	if (err_ret)

		brcmf_err("Failed to %s word, Err: 0x%08x\n",

			  rw ? "write" : "read", err_ret);



	return err_ret;

}



static int brcmf_sdioh_get_cisaddr(struct brcmf_sdio_dev *sdiodev, u32 regaddr)

{

	/* read 24 bits and return valid 17 bit addr */

	int i, ret;

	u32 scratch, regdata;

	__le32 scratch_le;

	u8 *ptr = (u8 *)&scratch_le;



	for (i = 0; i < 3; i++) {

		regdata = brcmf_sdio_regrl(sdiodev, regaddr, &ret);

		if (ret != 0)

			brcmf_err("Can't read!\n");



		*ptr++ = (u8) regdata;

		regaddr++;

	}



	/* Only the lower 17-bits are valid */

	scratch = le32_to_cpu(scratch_le);

	scratch &= 0x0001FFFF;

	return scratch;

}



static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev)

{

	int err_ret;

	u32 fbraddr;

	u8 func;



	brcmf_dbg(SDIO, "\n");



	/* Get the Card's common CIS address */

	sdiodev->func_cis_ptr[0] = brcmf_sdioh_get_cisaddr(sdiodev,

							   SDIO_CCCR_CIS);

	brcmf_dbg(SDIO, "Card's Common CIS Ptr = 0x%x\n",

		  sdiodev->func_cis_ptr[0]);



	/* Get the Card's function CIS (for each function) */

	for (fbraddr = SDIO_FBR_BASE(1), func = 1;

	     func <= sdiodev->num_funcs; func++, fbraddr += SDIOD_FBR_SIZE) {

		sdiodev->func_cis_ptr[func] =

		    brcmf_sdioh_get_cisaddr(sdiodev, SDIO_FBR_CIS + fbraddr);

		brcmf_dbg(SDIO, "Function %d CIS Ptr = 0x%x\n",

			  func, sdiodev->func_cis_ptr[func]);

	}



	/* Enable Function 1 */

	err_ret = sdio_enable_func(sdiodev->func[1]);

	if (err_ret)

		brcmf_err("Failed to enable F1 Err: 0x%08x\n", err_ret);



	return false;

}



/*

 *	Public entry points & extern's

 */

int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev)

{

	int err_ret = 0;

	struct mmc_host *host;

	struct sdio_func *func;

	uint max_blocks;



	brcmf_dbg(SDIO, "\n");



	sdiodev->num_funcs = 2;



	sdio_claim_host(sdiodev->func[1]);



	err_ret = sdio_set_block_size(sdiodev->func[1], SDIO_FUNC1_BLOCKSIZE);

	if (err_ret) {

		brcmf_err("Failed to set F1 blocksize\n");

		goto out;

	}



	err_ret = sdio_set_block_size(sdiodev->func[2], SDIO_FUNC2_BLOCKSIZE);

	if (err_ret) {

		brcmf_err("Failed to set F2 blocksize\n");

		goto out;

	}



	brcmf_sdioh_enablefuncs(sdiodev);



	/*

	 * determine host related variables after brcmf_sdio_probe()

	 * as func->cur_blksize is properly set and F2 init has been

	 * completed successfully.

	 */

	func = sdiodev->func[2];

	host = func->card->host;

	sdiodev->sg_support = host->max_segs > 1;

	max_blocks = min_t(uint, host->max_blk_count, 511u);

	sdiodev->max_request_size = min_t(uint, host->max_req_size,

					  max_blocks * func->cur_blksize);

	sdiodev->max_segment_count = min_t(uint, host->max_segs,

					   SG_MAX_SINGLE_ALLOC);

	sdiodev->max_segment_size = host->max_seg_size;

out:

	sdio_release_host(sdiodev->func[1]);

	brcmf_dbg(SDIO, "Done\n");

	return err_ret;

}



void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev)

{

	brcmf_dbg(SDIO, "\n");



	/* Disable Function 2 */

	sdio_claim_host(sdiodev->func[2]);

	sdio_disable_func(sdiodev->func[2]);

	sdio_release_host(sdiodev->func[2]);



	/* Disable Function 1 */

	sdio_claim_host(sdiodev->func[1]);

	sdio_disable_func(sdiodev->func[1]);

	sdio_release_host(sdiodev->func[1]);



}



static int brcmf_ops_sdio_probe(struct sdio_func *func,

				const struct sdio_device_id *id)

{

	int err;

	struct brcmf_sdio_dev *sdiodev;

	struct brcmf_bus *bus_if;



	brcmf_dbg(SDIO, "Enter\n");

	brcmf_dbg(SDIO, "Class=%x\n", func->class);

	brcmf_dbg(SDIO, "sdio vendor ID: 0x%04x\n", func->vendor);

	brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);

	brcmf_dbg(SDIO, "Function#: %d\n", func->num);



	/* Consume func num 1 but dont do anything with it. */

	if (func->num == 1)

		return 0;



	/* Ignore anything but func 2 */

	if (func->num != 2)

		return -ENODEV;



	bus_if = kzalloc(sizeof(struct brcmf_bus), GFP_KERNEL);

	if (!bus_if)

		return -ENOMEM;

	sdiodev = kzalloc(sizeof(struct brcmf_sdio_dev), GFP_KERNEL);

	if (!sdiodev) {

		kfree(bus_if);

		return -ENOMEM;

	}



	sdiodev->func[0] = func->card->sdio_func[0];

	sdiodev->func[1] = func->card->sdio_func[0];

	sdiodev->func[2] = func;



	sdiodev->bus_if = bus_if;

	bus_if->bus_priv.sdio = sdiodev;

	dev_set_drvdata(&func->dev, bus_if);

	dev_set_drvdata(&sdiodev->func[1]->dev, bus_if);

	sdiodev->dev = &sdiodev->func[1]->dev;

	sdiodev->pdata = brcmfmac_sdio_pdata;



	atomic_set(&sdiodev->suspend, false);

	init_waitqueue_head(&sdiodev->request_byte_wait);

	init_waitqueue_head(&sdiodev->request_word_wait);

	init_waitqueue_head(&sdiodev->request_buffer_wait);



	brcmf_dbg(SDIO, "F2 found, calling brcmf_sdio_probe...\n");

	err = brcmf_sdio_probe(sdiodev);

	if (err) {

		brcmf_err("F2 error, probe failed %d...\n", err);

		goto fail;

	}



	brcmf_dbg(SDIO, "F2 init completed...\n");

	return 0;



fail:

	dev_set_drvdata(&func->dev, NULL);

	dev_set_drvdata(&sdiodev->func[1]->dev, NULL);

	kfree(sdiodev);

	kfree(bus_if);

	return err;

}



static void brcmf_ops_sdio_remove(struct sdio_func *func)

{

	struct brcmf_bus *bus_if;

	struct brcmf_sdio_dev *sdiodev;



	brcmf_dbg(SDIO, "Enter\n");

	brcmf_dbg(SDIO, "sdio vendor ID: 0x%04x\n", func->vendor);

	brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);

	brcmf_dbg(SDIO, "Function: %d\n", func->num);



	if (func->num != 1 && func->num != 2)

		return;



	bus_if = dev_get_drvdata(&func->dev);

	if (bus_if) {

		sdiodev = bus_if->bus_priv.sdio;

		brcmf_sdio_remove(sdiodev);



		dev_set_drvdata(&sdiodev->func[1]->dev, NULL);

		dev_set_drvdata(&sdiodev->func[2]->dev, NULL);



		kfree(bus_if);

		kfree(sdiodev);

	}



	brcmf_dbg(SDIO, "Exit\n");

}



#ifdef CONFIG_PM_SLEEP

static int brcmf_sdio_suspend(struct device *dev)

{

	mmc_pm_flag_t sdio_flags;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;

	int ret = 0;



	brcmf_dbg(SDIO, "\n");



	atomic_set(&sdiodev->suspend, true);



	sdio_flags = sdio_get_host_pm_caps(sdiodev->func[1]);

	if (!(sdio_flags & MMC_PM_KEEP_POWER)) {

		brcmf_err("Host can't keep power while suspended\n");

		return -EINVAL;

	}



	ret = sdio_set_host_pm_flags(sdiodev->func[1], MMC_PM_KEEP_POWER);

	if (ret) {

		brcmf_err("Failed to set pm_flags\n");

		return ret;

	}



	brcmf_sdio_wdtmr_enable(sdiodev, false);



	return ret;

}



static int brcmf_sdio_resume(struct device *dev)

{

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;



	brcmf_sdio_wdtmr_enable(sdiodev, true);

	atomic_set(&sdiodev->suspend, false);

	return 0;

}



static const struct dev_pm_ops brcmf_sdio_pm_ops = {

	.suspend	= brcmf_sdio_suspend,

	.resume		= brcmf_sdio_resume,

};

#endif	/* CONFIG_PM_SLEEP */



static struct sdio_driver brcmf_sdmmc_driver = {

	.probe = brcmf_ops_sdio_probe,

	.remove = brcmf_ops_sdio_remove,

	.name = BRCMFMAC_SDIO_PDATA_NAME,

	.id_table = brcmf_sdmmc_ids,

#ifdef CONFIG_PM_SLEEP

	.drv = {

		.pm = &brcmf_sdio_pm_ops,

	},

#endif	/* CONFIG_PM_SLEEP */

};



static int brcmf_sdio_pd_probe(struct platform_device *pdev)

{

	brcmf_dbg(SDIO, "Enter\n");



	brcmfmac_sdio_pdata = dev_get_platdata(&pdev->dev);



	if (brcmfmac_sdio_pdata->power_on)

		brcmfmac_sdio_pdata->power_on();



	return 0;

}



static int brcmf_sdio_pd_remove(struct platform_device *pdev)

{

	brcmf_dbg(SDIO, "Enter\n");



	if (brcmfmac_sdio_pdata->power_off)

		brcmfmac_sdio_pdata->power_off();



	sdio_unregister_driver(&brcmf_sdmmc_driver);



	return 0;

}



static struct platform_driver brcmf_sdio_pd = {

	.remove		= brcmf_sdio_pd_remove,

	.driver		= {

		.name	= BRCMFMAC_SDIO_PDATA_NAME,

		.owner	= THIS_MODULE,

	}

};



void brcmf_sdio_register(void)

{

	int ret;



	ret = sdio_register_driver(&brcmf_sdmmc_driver);

	if (ret)

		brcmf_err("sdio_register_driver failed: %d\n", ret);

}



void brcmf_sdio_exit(void)

{

	brcmf_dbg(SDIO, "Enter\n");



	if (brcmfmac_sdio_pdata)

		platform_driver_unregister(&brcmf_sdio_pd);

	else

		sdio_unregister_driver(&brcmf_sdmmc_driver);

}



void __init brcmf_sdio_init(void)

{

	int ret;



	brcmf_dbg(SDIO, "Enter\n");



	ret = platform_driver_probe(&brcmf_sdio_pd, brcmf_sdio_pd_probe);

	if (ret == -ENODEV)

		brcmf_dbg(SDIO, "No platform data available.\n");

}

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

deleted100644 → 0
+0 −552

File deleted.

Preview size limit exceeded, changes collapsed.