Commit c8c99699 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Tony Lindgren
Browse files

omap: McBSP: Introduce caching in register write operations 



Determine cache size required per McBSP port at init time, based on
processor type running on.

Allocate space for storing cached copies of McBSP register values at
port request.

Modify omap_msbcp_write() function to update the cache with every
register write operation.

Modify omap_mcbsp_read() to support reading from cache or hardware.

Update MCBSP_READ() macro for modified omap_mcbsp_read() function API.

Introduce a new macro that reads from the cache.

Tested on OMAP1510 based Amstrad Delta using linux-omap for-next, commit
fb7380d70e041e4b3892f6b19dff7efb609d15a4 (2.6.33-rc3+ dated 2010-01-11).
Compile-tested with: omap_perseus2_730_defconfig, omap_generic_1610_defconfig,
omap_generic_2420_defconfig, omap_2430sdp_defconfig, omap_3430sdp_defconfig,
omap_4430sdp_defconfig with CONFIG_OMAP_MCBSP=y selected.

Signed-off-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 8ea3200f

arch/arm/mach-omap1/mcbsp.c

+13 −3
Original line number Diff line number Diff line
@@ -99,9 +99,11 @@ static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = { 
	},

};

#define OMAP7XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap7xx_mcbsp_pdata)

#define OMAP7XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)

#else

#define omap7xx_mcbsp_pdata		NULL

#define OMAP7XX_MCBSP_PDATA_SZ		0

#define OMAP7XX_MCBSP_REG_NUM		0

#endif



#ifdef CONFIG_ARCH_OMAP15XX
@@ -132,9 +134,11 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { 
	},

};

#define OMAP15XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap15xx_mcbsp_pdata)

#define OMAP15XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)

#else

#define omap15xx_mcbsp_pdata		NULL

#define OMAP15XX_MCBSP_PDATA_SZ		0

#define OMAP15XX_MCBSP_REG_NUM		0

#endif



#ifdef CONFIG_ARCH_OMAP16XX
@@ -165,19 +169,25 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { 
	},

};

#define OMAP16XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap16xx_mcbsp_pdata)

#define OMAP16XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)

#else

#define omap16xx_mcbsp_pdata		NULL

#define OMAP16XX_MCBSP_PDATA_SZ		0

#define OMAP16XX_MCBSP_REG_NUM		0

#endif



int __init omap1_mcbsp_init(void)

{

	if (cpu_is_omap7xx())

	if (cpu_is_omap7xx()) {

		omap_mcbsp_count = OMAP7XX_MCBSP_PDATA_SZ;

	if (cpu_is_omap15xx())

		omap_mcbsp_cache_size = OMAP7XX_MCBSP_REG_NUM * sizeof(u16);

	} else if (cpu_is_omap15xx()) {

		omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ;

	if (cpu_is_omap16xx())

		omap_mcbsp_cache_size = OMAP15XX_MCBSP_REG_NUM * sizeof(u16);

	} else if (cpu_is_omap16xx()) {

		omap_mcbsp_count = OMAP16XX_MCBSP_PDATA_SZ;

		omap_mcbsp_cache_size = OMAP16XX_MCBSP_REG_NUM * sizeof(u16);

	}



	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),

								GFP_KERNEL);

arch/arm/mach-omap2/mcbsp.c

+16 −4
Original line number Diff line number Diff line
@@ -65,9 +65,11 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = { 
	},

};

#define OMAP2420_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2420_mcbsp_pdata)

#define OMAP2420_MCBSP_REG_NUM		(OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)

#else

#define omap2420_mcbsp_pdata		NULL

#define OMAP2420_MCBSP_PDATA_SZ		0

#define OMAP2420_MCBSP_REG_NUM		0

#endif



#ifdef CONFIG_ARCH_OMAP2430
@@ -114,9 +116,11 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { 
	},

};

#define OMAP2430_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2430_mcbsp_pdata)

#define OMAP2430_MCBSP_REG_NUM		(OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)

#else

#define omap2430_mcbsp_pdata		NULL

#define OMAP2430_MCBSP_PDATA_SZ		0

#define OMAP2430_MCBSP_REG_NUM		0

#endif



#ifdef CONFIG_ARCH_OMAP3
@@ -168,9 +172,11 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { 
	},

};

#define OMAP34XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap34xx_mcbsp_pdata)

#define OMAP34XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)

#else

#define omap34xx_mcbsp_pdata		NULL

#define OMAP34XX_MCBSP_PDATA_SZ		0

#define OMAP34XX_MCBSP_REG_NUM		0

#endif



static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = {
@@ -208,17 +214,23 @@ static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = { 
	},

};

#define OMAP44XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap44xx_mcbsp_pdata)

#define OMAP44XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_RCCR / sizeof(u32) + 1)



static int __init omap2_mcbsp_init(void)

{

	if (cpu_is_omap2420())

	if (cpu_is_omap2420()) {

		omap_mcbsp_count = OMAP2420_MCBSP_PDATA_SZ;

	if (cpu_is_omap2430())

		omap_mcbsp_cache_size = OMAP2420_MCBSP_REG_NUM * sizeof(u16);

	} else if (cpu_is_omap2430()) {

		omap_mcbsp_count = OMAP2430_MCBSP_PDATA_SZ;

	if (cpu_is_omap34xx())

		omap_mcbsp_cache_size = OMAP2430_MCBSP_REG_NUM * sizeof(u32);

	} else if (cpu_is_omap34xx()) {

		omap_mcbsp_count = OMAP34XX_MCBSP_PDATA_SZ;

	if (cpu_is_omap44xx())

		omap_mcbsp_cache_size = OMAP34XX_MCBSP_REG_NUM * sizeof(u32);

	} else if (cpu_is_omap44xx()) {

		omap_mcbsp_count = OMAP44XX_MCBSP_PDATA_SZ;

		omap_mcbsp_cache_size = OMAP44XX_MCBSP_REG_NUM * sizeof(u32);

	}



	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),

								GFP_KERNEL);

arch/arm/plat-omap/include/plat/mcbsp.h

+2 −1
Original line number Diff line number Diff line
@@ -414,9 +414,10 @@ struct omap_mcbsp { 
	u16 max_tx_thres;

	u16 max_rx_thres;

#endif

	void *reg_cache;

};

extern struct omap_mcbsp **mcbsp_ptr;

extern int omap_mcbsp_count;

extern int omap_mcbsp_count, omap_mcbsp_cache_size;



int omap_mcbsp_init(void);

void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,

arch/arm/plat-omap/mcbsp.c

+53 −24
Original line number Diff line number Diff line
@@ -28,28 +28,42 @@ 
#include <plat/mcbsp.h>



struct omap_mcbsp **mcbsp_ptr;

int omap_mcbsp_count;

int omap_mcbsp_count, omap_mcbsp_cache_size;



void omap_mcbsp_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val)

{

	if (cpu_class_is_omap1() || cpu_is_omap2420())

	if (cpu_class_is_omap1()) {

		((u16 *)mcbsp->reg_cache)[reg / sizeof(u16)] = (u16)val;

		__raw_writew((u16)val, mcbsp->io_base + reg);

	else

	} else if (cpu_is_omap2420()) {

		((u16 *)mcbsp->reg_cache)[reg / sizeof(u32)] = (u16)val;

		__raw_writew((u16)val, mcbsp->io_base + reg);

	} else {

		((u32 *)mcbsp->reg_cache)[reg / sizeof(u32)] = val;

		__raw_writel(val, mcbsp->io_base + reg);

	}

}



int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg)

int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, bool from_cache)

{

	if (cpu_class_is_omap1() || cpu_is_omap2420())

		return __raw_readw(mcbsp->io_base + reg);

	else

		return __raw_readl(mcbsp->io_base + reg);

	if (cpu_class_is_omap1()) {

		return !from_cache ? __raw_readw(mcbsp->io_base + reg) :

				((u16 *)mcbsp->reg_cache)[reg / sizeof(u16)];

	} else if (cpu_is_omap2420()) {

		return !from_cache ? __raw_readw(mcbsp->io_base + reg) :

				((u16 *)mcbsp->reg_cache)[reg / sizeof(u32)];

	} else {

		return !from_cache ? __raw_readl(mcbsp->io_base + reg) :

				((u32 *)mcbsp->reg_cache)[reg / sizeof(u32)];

	}

}



#define MCBSP_READ(mcbsp, reg) \

		omap_mcbsp_read(mcbsp, OMAP_MCBSP_REG_##reg)

		omap_mcbsp_read(mcbsp, OMAP_MCBSP_REG_##reg, 0)

#define MCBSP_WRITE(mcbsp, reg, val) \

		omap_mcbsp_write(mcbsp, OMAP_MCBSP_REG_##reg, val)

#define MCBSP_READ_CACHE(mcbsp, reg) \

		omap_mcbsp_read(mcbsp, OMAP_MCBSP_REG_##reg, 1)



#define omap_mcbsp_check_valid_id(id)	(id < omap_mcbsp_count)

#define id_to_mcbsp_ptr(id)		mcbsp_ptr[id];
@@ -383,6 +397,7 @@ EXPORT_SYMBOL(omap_mcbsp_set_io_type); 
int omap_mcbsp_request(unsigned int id)

{

	struct omap_mcbsp *mcbsp;

	void *reg_cache;

	int err;



	if (!omap_mcbsp_check_valid_id(id)) {
@@ -391,15 +406,21 @@ int omap_mcbsp_request(unsigned int id) 
	}

	mcbsp = id_to_mcbsp_ptr(id);



	reg_cache = kzalloc(omap_mcbsp_cache_size, GFP_KERNEL);

	if (!reg_cache) {

		return -ENOMEM;

	}



	spin_lock(&mcbsp->lock);

	if (!mcbsp->free) {

		dev_err(mcbsp->dev, "McBSP%d is currently in use\n",

			mcbsp->id);

		spin_unlock(&mcbsp->lock);

		return -EBUSY;

		err = -EBUSY;

		goto err_kfree;

	}



	mcbsp->free = 0;

	mcbsp->reg_cache = reg_cache;

	spin_unlock(&mcbsp->lock);



	if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request)
@@ -427,7 +448,7 @@ int omap_mcbsp_request(unsigned int id) 
			dev_err(mcbsp->dev, "Unable to request TX IRQ %d "

					"for McBSP%d\n", mcbsp->tx_irq,

					mcbsp->id);

			goto error;

			goto err_clk_disable;

		}



		init_completion(&mcbsp->rx_irq_completion);
@@ -437,14 +458,14 @@ int omap_mcbsp_request(unsigned int id) 
			dev_err(mcbsp->dev, "Unable to request RX IRQ %d "

					"for McBSP%d\n", mcbsp->rx_irq,

					mcbsp->id);

			goto tx_irq;

			goto err_free_irq;

		}

	}



	return 0;

tx_irq:

err_free_irq:

	free_irq(mcbsp->tx_irq, (void *)mcbsp);

error:

err_clk_disable:

	if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free)

		mcbsp->pdata->ops->free(id);
@@ -454,7 +475,12 @@ error: 
	clk_disable(mcbsp->fclk);

	clk_disable(mcbsp->iclk);



	spin_lock(&mcbsp->lock);

	mcbsp->free = 1;

	mcbsp->reg_cache = NULL;

err_kfree:

	spin_unlock(&mcbsp->lock);

	kfree(reg_cache);



	return err;

}
@@ -463,6 +489,7 @@ EXPORT_SYMBOL(omap_mcbsp_request); 
void omap_mcbsp_free(unsigned int id)

{

	struct omap_mcbsp *mcbsp;

	void *reg_cache;



	if (!omap_mcbsp_check_valid_id(id)) {

		printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1);
@@ -485,16 +512,18 @@ void omap_mcbsp_free(unsigned int id) 
		free_irq(mcbsp->tx_irq, (void *)mcbsp);

	}



	spin_lock(&mcbsp->lock);

	if (mcbsp->free) {

		dev_err(mcbsp->dev, "McBSP%d was not reserved\n",

			mcbsp->id);

		spin_unlock(&mcbsp->lock);

		return;

	}

	reg_cache = mcbsp->reg_cache;



	spin_lock(&mcbsp->lock);

	if (mcbsp->free)

		dev_err(mcbsp->dev, "McBSP%d was not reserved\n", mcbsp->id);

	else

		mcbsp->free = 1;

	mcbsp->reg_cache = NULL;

	spin_unlock(&mcbsp->lock);



	if (reg_cache)

		kfree(reg_cache);

}

EXPORT_SYMBOL(omap_mcbsp_free);

CRA Git | Maintained and supported by SUSTech CRA and CCSE