Commit a14b8203 authored by Vivek Gautam's avatar Vivek Gautam Committed by Bjorn Andersson
Browse files

soc: qcom: llcc cleanup to get rid of sdm845 specific driver file 



A single file should suffice the need to program the llcc for
various platforms. Get rid of sdm845 specific driver file to
make way for a more generic driver.

Signed-off-by: default avatarVivek Gautam <vivek.gautam@codeaurora.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 54ecb8f7

drivers/soc/qcom/Kconfig

+3 −11
Original line number Diff line number Diff line
@@ -58,17 +58,9 @@ config QCOM_LLCC 
	depends on ARCH_QCOM || COMPILE_TEST

	help

	  Qualcomm Technologies, Inc. platform specific

	  Last Level Cache Controller(LLCC) driver. This provides interfaces

	  to clients that use the LLCC. Say yes here to enable LLCC slice

	  driver.



config QCOM_SDM845_LLCC

	tristate "Qualcomm Technologies, Inc. SDM845 LLCC driver"

	depends on QCOM_LLCC

	help

	  Say yes here to enable the LLCC driver for SDM845. This provides

	  data required to configure LLCC so that clients can start using the

	  LLCC slices.

	  Last Level Cache Controller(LLCC) driver for platforms such as,

	  SDM845. This provides interfaces to clients that use the LLCC.

	  Say yes here to enable LLCC slice driver.



config QCOM_MDT_LOADER

	tristate

drivers/soc/qcom/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -22,6 +22,5 @@ obj-$(CONFIG_QCOM_SOCINFO) += socinfo.o 
obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o

obj-$(CONFIG_QCOM_APR) += apr.o

obj-$(CONFIG_QCOM_LLCC) += llcc-slice.o

obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o

obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o

obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o

drivers/soc/qcom/llcc-sdm845.c

deleted100644 → 0
+0 −100
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/soc/qcom/llcc-qcom.h>



/*

 * SCT(System Cache Table) entry contains of the following members:

 * usecase_id: Unique id for the client's use case

 * slice_id: llcc slice id for each client

 * max_cap: The maximum capacity of the cache slice provided in KB

 * priority: Priority of the client used to select victim line for replacement

 * fixed_size: Boolean indicating if the slice has a fixed capacity

 * bonus_ways: Bonus ways are additional ways to be used for any slice,

 *		if client ends up using more than reserved cache ways. Bonus

 *		ways are allocated only if they are not reserved for some

 *		other client.

 * res_ways: Reserved ways for the cache slice, the reserved ways cannot

 *		be used by any other client than the one its assigned to.

 * cache_mode: Each slice operates as a cache, this controls the mode of the

 *             slice: normal or TCM(Tightly Coupled Memory)

 * probe_target_ways: Determines what ways to probe for access hit. When

 *                    configured to 1 only bonus and reserved ways are probed.

 *                    When configured to 0 all ways in llcc are probed.

 * dis_cap_alloc: Disable capacity based allocation for a client

 * retain_on_pc: If this bit is set and client has maintained active vote

 *               then the ways assigned to this client are not flushed on power

 *               collapse.

 * activate_on_init: Activate the slice immediately after the SCT is programmed

 */

#define SCT_ENTRY(uid, sid, mc, p, fs, bway, rway, cmod, ptw, dca, rp, a) \

	{					\

		.usecase_id = uid,		\

		.slice_id = sid,		\

		.max_cap = mc,			\

		.priority = p,			\

		.fixed_size = fs,		\

		.bonus_ways = bway,		\

		.res_ways = rway,		\

		.cache_mode = cmod,		\

		.probe_target_ways = ptw,	\

		.dis_cap_alloc = dca,		\

		.retain_on_pc = rp,		\

		.activate_on_init = a,		\

	}



static struct llcc_slice_config sdm845_data[] =  {

	SCT_ENTRY(LLCC_CPUSS,    1,  2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 1),

	SCT_ENTRY(LLCC_VIDSC0,   2,  512,  2, 1, 0x0,   0x0f0, 0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_VIDSC1,   3,  512,  2, 1, 0x0,   0x0f0, 0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_ROTATOR,  4,  563,  2, 1, 0x0,   0x00e, 2, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_VOICE,    5,  2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_AUDIO,    6,  2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_MDMHPGRW, 7,  1024, 2, 0, 0xfc,  0xf00, 0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_MDM,      8,  2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_CMPT,     10, 2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_GPUHTW,   11, 512,  1, 1, 0xc,   0x0,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_GPU,      12, 2304, 1, 0, 0xff0, 0x2,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_MMUHWT,   13, 256,  2, 0, 0x0,   0x1,   0, 0, 1, 0, 1),

	SCT_ENTRY(LLCC_CMPTDMA,  15, 2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_DISP,     16, 2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_VIDFW,    17, 2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_MDMHPFX,  20, 1024, 2, 1, 0x0,   0xf00, 0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_MDMPNG,   21, 1024, 0, 1, 0x1e,  0x0,   0, 0, 1, 1, 0),

	SCT_ENTRY(LLCC_AUDHW,    22, 1024, 1, 1, 0xffc, 0x2,   0, 0, 1, 1, 0),

};



static int sdm845_qcom_llcc_remove(struct platform_device *pdev)

{

	return qcom_llcc_remove(pdev);

}



static int sdm845_qcom_llcc_probe(struct platform_device *pdev)

{

	return qcom_llcc_probe(pdev, sdm845_data, ARRAY_SIZE(sdm845_data));

}



static const struct of_device_id sdm845_qcom_llcc_of_match[] = {

	{ .compatible = "qcom,sdm845-llcc", },

	{ }

};



static struct platform_driver sdm845_qcom_llcc_driver = {

	.driver = {

		.name = "sdm845-llcc",

		.of_match_table = sdm845_qcom_llcc_of_match,

	},

	.probe = sdm845_qcom_llcc_probe,

	.remove = sdm845_qcom_llcc_remove,

};

module_platform_driver(sdm845_qcom_llcc_driver);



MODULE_DESCRIPTION("QCOM sdm845 LLCC driver");

MODULE_LICENSE("GPL v2");

drivers/soc/qcom/llcc-slice.c

+53 −7
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 *

 */
@@ -11,6 +11,7 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/regmap.h>

#include <linux/sizes.h>
@@ -46,6 +47,27 @@ 


#define BANK_OFFSET_STRIDE	      0x80000



static struct llcc_slice_config sdm845_data[] =  {

	{ LLCC_CPUSS,    1,  2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 1 },

	{ LLCC_VIDSC0,   2,  512,  2, 1, 0x0,   0x0f0, 0, 0, 1, 1, 0 },

	{ LLCC_VIDSC1,   3,  512,  2, 1, 0x0,   0x0f0, 0, 0, 1, 1, 0 },

	{ LLCC_ROTATOR,  4,  563,  2, 1, 0x0,   0x00e, 2, 0, 1, 1, 0 },

	{ LLCC_VOICE,    5,  2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0 },

	{ LLCC_AUDIO,    6,  2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0 },

	{ LLCC_MDMHPGRW, 7,  1024, 2, 0, 0xfc,  0xf00, 0, 0, 1, 1, 0 },

	{ LLCC_MDM,      8,  2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0 },

	{ LLCC_CMPT,     10, 2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0 },

	{ LLCC_GPUHTW,   11, 512,  1, 1, 0xc,   0x0,   0, 0, 1, 1, 0 },

	{ LLCC_GPU,      12, 2304, 1, 0, 0xff0, 0x2,   0, 0, 1, 1, 0 },

	{ LLCC_MMUHWT,   13, 256,  2, 0, 0x0,   0x1,   0, 0, 1, 0, 1 },

	{ LLCC_CMPTDMA,  15, 2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0 },

	{ LLCC_DISP,     16, 2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0 },

	{ LLCC_VIDFW,    17, 2816, 1, 0, 0xffc, 0x2,   0, 0, 1, 1, 0 },

	{ LLCC_MDMHPFX,  20, 1024, 2, 1, 0x0,   0xf00, 0, 0, 1, 1, 0 },

	{ LLCC_MDMPNG,   21, 1024, 0, 1, 0x1e,  0x0,   0, 0, 1, 1, 0 },

	{ LLCC_AUDHW,    22, 1024, 1, 1, 0xffc, 0x2,   0, 0, 1, 1, 0 },

};



static struct llcc_drv_data *drv_data = (void *) -EPROBE_DEFER;



static const struct regmap_config llcc_regmap_config = {
@@ -301,13 +323,12 @@ static int qcom_llcc_cfg_program(struct platform_device *pdev) 
	return ret;

}



int qcom_llcc_remove(struct platform_device *pdev)

static int qcom_llcc_remove(struct platform_device *pdev)

{

	/* Set the global pointer to a error code to avoid referencing it */

	drv_data = ERR_PTR(-ENODEV);

	return 0;

}

EXPORT_SYMBOL_GPL(qcom_llcc_remove);



static struct regmap *qcom_llcc_init_mmio(struct platform_device *pdev,

		const char *name)
@@ -326,7 +347,7 @@ static struct regmap *qcom_llcc_init_mmio(struct platform_device *pdev, 
	return devm_regmap_init_mmio(&pdev->dev, base, &llcc_regmap_config);

}



int qcom_llcc_probe(struct platform_device *pdev,

static int qcom_llcc_probe(struct platform_device *pdev,

			   const struct llcc_slice_config *llcc_cfg, u32 sz)

{

	u32 num_banks;
@@ -407,6 +428,31 @@ int qcom_llcc_probe(struct platform_device *pdev, 
	drv_data = ERR_PTR(-ENODEV);

	return ret;

}

EXPORT_SYMBOL_GPL(qcom_llcc_probe);



static int sdm845_qcom_llcc_remove(struct platform_device *pdev)

{

	return qcom_llcc_remove(pdev);

}



static int sdm845_qcom_llcc_probe(struct platform_device *pdev)

{

	return qcom_llcc_probe(pdev, sdm845_data, ARRAY_SIZE(sdm845_data));

}



static const struct of_device_id sdm845_qcom_llcc_of_match[] = {

	{ .compatible = "qcom,sdm845-llcc", },

	{ }

};



static struct platform_driver sdm845_qcom_llcc_driver = {

	.driver = {

		.name = "sdm845-llcc",

		.of_match_table = sdm845_qcom_llcc_of_match,

	},

	.probe = sdm845_qcom_llcc_probe,

	.remove = sdm845_qcom_llcc_remove,

};

module_platform_driver(sdm845_qcom_llcc_driver);



MODULE_DESCRIPTION("QCOM sdm845 LLCC driver");

MODULE_LICENSE("GPL v2");
 
MODULE_DESCRIPTION("Qualcomm Last Level Cache Controller");

include/linux/soc/qcom/llcc-qcom.h

+21 −36
Original line number Diff line number Diff line
@@ -39,18 +39,27 @@ struct llcc_slice_desc { 


/**

 * llcc_slice_config - Data associated with the llcc slice

 * @usecase_id: usecase id for which the llcc slice is used

 * @slice_id: llcc slice id assigned to each slice

 * @max_cap: maximum capacity of the llcc slice

 * @priority: priority of the llcc slice

 * @fixed_size: whether the llcc slice can grow beyond its size

 * @bonus_ways: bonus ways associated with llcc slice

 * @res_ways: reserved ways associated with llcc slice

 * @cache_mode: mode of the llcc slice

 * @probe_target_ways: Probe only reserved and bonus ways on a cache miss

 * @dis_cap_alloc: Disable capacity based allocation

 * @retain_on_pc: Retain through power collapse

 * @activate_on_init: activate the slice on init

 * @usecase_id: Unique id for the client's use case

 * @slice_id: llcc slice id for each client

 * @max_cap: The maximum capacity of the cache slice provided in KB

 * @priority: Priority of the client used to select victim line for replacement

 * @fixed_size: Boolean indicating if the slice has a fixed capacity

 * @bonus_ways: Bonus ways are additional ways to be used for any slice,

 *		if client ends up using more than reserved cache ways. Bonus

 *		ways are allocated only if they are not reserved for some

 *		other client.

 * @res_ways: Reserved ways for the cache slice, the reserved ways cannot

 *		be used by any other client than the one its assigned to.

 * @cache_mode: Each slice operates as a cache, this controls the mode of the

 *             slice: normal or TCM(Tightly Coupled Memory)

 * @probe_target_ways: Determines what ways to probe for access hit. When

 *                    configured to 1 only bonus and reserved ways are probed.

 *                    When configured to 0 all ways in llcc are probed.

 * @dis_cap_alloc: Disable capacity based allocation for a client

 * @retain_on_pc: If this bit is set and client has maintained active vote

 *               then the ways assigned to this client are not flushed on power

 *               collapse.

 * @activate_on_init: Activate the slice immediately after it is programmed

 */

struct llcc_slice_config {

	u32 usecase_id;
@@ -154,20 +163,6 @@ int llcc_slice_activate(struct llcc_slice_desc *desc); 
 */

int llcc_slice_deactivate(struct llcc_slice_desc *desc);



/**

 * qcom_llcc_probe - program the sct table

 * @pdev: platform device pointer

 * @table: soc sct table

 * @sz: Size of the config table

 */

int qcom_llcc_probe(struct platform_device *pdev,

		      const struct llcc_slice_config *table, u32 sz);



/**

 * qcom_llcc_remove - remove the sct table

 * @pdev: Platform device pointer

 */

int qcom_llcc_remove(struct platform_device *pdev);

#else

static inline struct llcc_slice_desc *llcc_slice_getd(u32 uid)

{
@@ -197,16 +192,6 @@ static inline int llcc_slice_deactivate(struct llcc_slice_desc *desc) 
{

	return -EINVAL;

}

static inline int qcom_llcc_probe(struct platform_device *pdev,

		      const struct llcc_slice_config *table, u32 sz)

{

	return -ENODEV;

}



static inline int qcom_llcc_remove(struct platform_device *pdev)

{

	return -ENODEV;

}

#endif



#endif