dm: cache: add dm cache driver
Subsystems (4)
Dinh Nguyen
maintainercover dm: cache: add dm cache driver
Hi,
Add a UCLASS_CACHE dm driver to handling the configuration of cache settings. Place this new driver under /drivers/cache. In this initial revision, the driver is only configuring what I think are essential cache settings. The more comprehensive cache settings can be done in the OS.
Dinh
Dinh Nguyen (4):
ARM: pl310: Add macro's for handling tag and data latency mask
dm: cache: Create a uclass for cache controller
configs: socfpga: add imply pl310 cache controller
ARM: socfpga: use the pl310 driver to configure the cache
arch/arm/Kconfig | 1 + arch/arm/include/asm/pl310.h | 3 ++ arch/arm/mach-socfpga/misc.c | 16 ++----- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/cache/Kconfig | 22 ++++++++++ drivers/cache/Makefile | 3 ++ drivers/cache/cache-l2x0.c | 82 ++++++++++++++++++++++++++++++++++++ drivers/cache/cache-uclass.c | 13 ++++++ include/dm/uclass-id.h | 1 + 10 files changed, 131 insertions(+), 13 deletions(-) create mode 100644 drivers/cache/Kconfig create mode 100644 drivers/cache/Makefile create mode 100644 drivers/cache/cache-l2x0.c create mode 100644 drivers/cache/cache-uclass.c
Signature · 1 line
2.20.0
Dinh Nguyen
maintainerPATCH 1/4 ARM: pl310: Add macro's for handling tag and data latency mask
Add the PL310 macros for latency control setup, read and write bits.
--- arch/arm/include/asm/pl310.h | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/include/asm/pl310.h +3 -0
@@ -18,6 +18,9 @@#define L310_SHARED_ATT_OVERRIDE_ENABLE (1 << 22)#define L310_AUX_CTRL_DATA_PREFETCH_MASK (1 << 28)#define L310_AUX_CTRL_INST_PREFETCH_MASK (1 << 29) +#define L310_LATENCY_CTRL_SETUP (n) ((n) << 0) +#define L310_LATENCY_CTRL_RD (n) ((n) << 4) +#define L310_LATENCY_CTRL_WR (n) ((n) << 8)#define L2X0_CACHE_ID_PART_MASK (0xf << 6)#define L2X0_CACHE_ID_PART_L310 (3 << 6)
Signature · 1 line
2.20.0
PATCH 1/4 ARM: pl310: Add macro's for handling tag and data latency mask
Quoted 13 lines · Dinh Nguyen
Add the PL310 macros for latency control setup, read and write bits.
Signed-off-by Dinh Nguyen <[email protected]>--- arch/arm/include/asm/pl310.h | 3 +++ 1 file changed, 3 insertions(+)arch/arm/include/asm/pl310.h +0
-0
arch/arm/include/asm/pl310.h line 26
Quoted 9 lines
arch/arm/include/asm/pl310.h +3
-0@@ -18,6 +18,9 @@#define L310_SHARED_ATT_OVERRIDE_ENABLE (1 << 22)#define L310_AUX_CTRL_DATA_PREFETCH_MASK (1 << 28)#define L310_AUX_CTRL_INST_PREFETCH_MASK (1 << 29) +#define L310_LATENCY_CTRL_SETUP (n) ((n) << 0) +#define L310_LATENCY_CTRL_RD (n) ((n) << 4) +#define L310_LATENCY_CTRL_WR (n) ((n) << 8)#define L2X0_CACHE_ID_PART_MASK (0xf << 6)#define L2X0_CACHE_ID_PART_L310 (3 << 6)
Signature · 2 lines
Best regards, Marek Vasut
Dinh Nguyen
maintainerPATCH 2/4 dm: cache: Create a uclass for cache controller
In reply to Dinh NguyenThe cache controller driver configures the cache settings that can be found in the device tree files.
This initial revision only configures basic settings(data & instruction prefetch, shared-override, data & tag latency). I believe these are the settings that affect performance the most. Comprehensive settings can be done by the OS.
--- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/cache/Kconfig | 22 ++++++++++ drivers/cache/Makefile | 3 ++ drivers/cache/cache-l2x0.c | 82 ++++++++++++++++++++++++++++++++++++ drivers/cache/cache-uclass.c | 13 ++++++ include/dm/uclass-id.h | 1 + 7 files changed, 124 insertions(+) create mode 100644 drivers/cache/Kconfig create mode 100644 drivers/cache/Makefile create mode 100644 drivers/cache/cache-l2x0.c create mode 100644 drivers/cache/cache-uclass.c
drivers/Kconfig +2 -0
@@ -14,6 +14,8 @@ source "drivers/block/Kconfig" source "drivers/bootcount/Kconfig" +source "drivers/cache/Kconfig" + source "drivers/clk/Kconfig" source "drivers/cpu/Kconfig"
drivers/Makefile +1 -0
@@ -77,6 +77,7 @@ obj-$(CONFIG_BIOSEMU) += bios_emulator/ obj-y += block/ obj-y += board/ obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/ +obj-y += cache/ obj-$(CONFIG_CPU) += cpu/ obj-y += crypto/ obj-$(CONFIG_FASTBOOT) += fastboot/
drivers/cache/Kconfig new file +22 -0
@@ -0,0 +1,22 @@ +# +# Cache controllers +# + +menu "Cache Controller drivers" + +config CACHE + bool "Enable Driver Model for Cache drivers" + depends on DM + help + Enable driver model for cache controllers. + +config L2X0_CACHE + tristate "PL310 cache driver" + select CACHE + depends on ARM + help + This driver is for the PL310 cache controller commonly found on + ARMv7(32-bit) devices. The driver configures the cache settings + found in the device tree. + +endmenu
drivers/cache/Makefile new file +3 -0
@@ -0,0 +1,3 @@ + +obj-$(CONFIG_CACHE) += cache-uclass.o +obj-$(CONFIG_L2X0_CACHE) += cache-l2x0.o
drivers/cache/cache-l2x0.c new file +82 -0
82 lines not on this page · raw message
drivers/cache/cache-uclass.c new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright Intel +*/ + +#include <common.h> +#include <dm.h> + +UCLASS_DRIVER (cache) = { + .id =UCLASS_CACHE , + .name ="cache" , + .post_bind = dm_scan_fdt_dev, +};
include/dm/uclass-id.h +1 -0
@@ -34,6 +34,7 @@ enum uclass_id {UCLASS_BLK ,/* Block device */ UCLASS_BOARD ,/* Device information from hardware */ UCLASS_BOOTCOUNT ,/* Bootcount backing store */ +UCLASS_CACHE ,/* Cache controller*/ UCLASS_CLK ,/* Clock source, e.g. used by peripherals */ UCLASS_CPU ,/* CPU, typically part of an SoC */ UCLASS_CROS_EC, /* Chrome OS EC */
Signature · 1 line
2.20.0
PATCH 2/4 dm: cache: Create a uclass for cache controller
Quoted 197 lines · Dinh Nguyen
The cache controller driver configures the cache settings that can be found in the device tree files.
This initial revision only configures basic
settings(data & instruction prefetch, shared-override, data & tag latency). I believe these are the settings that affect performance the most. Comprehensive settings can be done by the OS.Signed-off-by Dinh Nguyen <[email protected]>--- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/cache/Kconfig | 22 ++++++++++ drivers/cache/Makefile | 3 ++ drivers/cache/cache-l2x0.c | 82 ++++++++++++++++++++++++++++++++++++ drivers/cache/cache-uclass.c | 13 ++++++ include/dm/uclass-id.h | 1 + 7 files changed, 124 insertions(+) create mode 100644 drivers/cache/Kconfig create mode 100644 drivers/cache/Makefile create mode 100644 drivers/cache/cache-l2x0.c create mode 100644 drivers/cache/cache-uclass.cdrivers/Kconfig +2
-0@@ -14,6 +14,8 @@ source "drivers/block/Kconfig" source "drivers/bootcount/Kconfig" +source "drivers/cache/Kconfig" + source "drivers/clk/Kconfig" source "drivers/cpu/Kconfig"drivers/Makefile +1
-0@@ -77,6 +77,7 @@ obj-$(CONFIG_BIOSEMU) += bios_emulator/ obj-y += block/ obj-y += board/ obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/ +obj-y += cache/ obj-$(CONFIG_CPU) += cpu/ obj-y += crypto/ obj-$(CONFIG_FASTBOOT) += fastboot/drivers/cache/Kconfig new file +22
-0@@ -0,0 +1,22 @@ +# +# Cache controllers +# + +menu "Cache Controller drivers" + +config CACHE + bool "Enable Driver Model for Cache drivers" + depends on DM + help + Enable driver model for cache controllers. + +config L2X0_CACHE + tristate "PL310 cache driver" + select CACHE + depends on ARM + help + This driver is for the PL310 cache controller commonly found on + ARMv7(32-bit) devices. The driver configures the cache settings + found in the device tree. + +endmenudrivers/cache/Makefile new file +3
-0@@ -0,0 +1,3 @@ + +obj-$(CONFIG_CACHE) += cache-uclass.o +obj-$(CONFIG_L2X0_CACHE) += cache-l2x0.odrivers/cache/cache-l2x0.c new file +82
-0@@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2019 Intel Corporation <www.intel.com> +*/ +#include <common.h> +#include <command.h> +#include <dm.h> + +#include <asm/io.h> +#include <asm/pl310.h> + +static void l2c310_of_parse (struct udevice *dev) +{ +u32 tag[3 ] = {0 ,0 ,0 }; +u32 saved_reg, prefetch; +int ret; +struct pl310_regs *regs = (struct pl310_regs *)devfdt_get_addr (dev); + +/*Disable the L2 Cache */ +clrbits_le32 (®s->pl310_ctrl,L2X0_CTRL_EN ); + + saved_reg =readl (®s->pl310_aux_ctrl); +if (dev_read_u32 (dev,"prefetch-data" , &prefetch) ==0 ) { +if (prefetch) + saved_reg |=L310_AUX_CTRL_DATA_PREFETCH_MASK ; +else + saved_reg &= ~L310_AUX_CTRL_DATA_PREFETCH_MASK ; + } + +if (dev_read_u32 (dev,"prefetch-instr" , &prefetch) ==0 ) { +if (prefetch) + saved_reg |=L310_AUX_CTRL_INST_PREFETCH_MASK ; +else + saved_reg &= ~L310_AUX_CTRL_INST_PREFETCH_MASK ; + } + + saved_reg |=dev_read_bool (dev,"arm,shared-override" ); +writel (saved_reg, ®s->pl310_aux_ctrl); + + saved_reg =readl (®s->pl310_tag_latency_ctrl); +if (dev_read_u32_array (dev,"arm,tag-latency" , tag,3 ) ==0 ) + saved_reg |=L310_LATENCY_CTRL_RD (tag[0 ] -1 ) | +L310_LATENCY_CTRL_WR (tag[1 ] -1 ) | +L310_LATENCY_CTRL_SETUP (tag[2 ] -1 ); +writel (saved_reg, ®s->pl310_tag_latency_ctrl); + + saved_reg =readl (®s->pl310_data_latency_ctrl); +if (dev_read_u32_array (dev,"arm,data-latency" , tag,3 ) ==0 ) + saved_reg |=L310_LATENCY_CTRL_RD (tag[0 ] -1 ) | +L310_LATENCY_CTRL_WR (tag[1 ] -1 ) | +L310_LATENCY_CTRL_SETUP (tag[2 ] -1 ); +writel (saved_reg, ®s->pl310_data_latency_ctrl); + +/* Enable the L2 cache */ +setbits_le32 (®s->pl310_ctrl,L2X0_CTRL_EN ); +} + +static int l2x0_ofdata_to_platdata (struct udevice *dev) +{ +return 0 ; +} + +static int l2x0_probe (struct udevice *dev) +{ +l2c310_of_parse (dev); +return 0 ; +} + + +static const struct udevice_id l2x0_ids[] = { + { .compatible ="arm,pl310-cache" }, + {} +}; + +U_BOOT_DRIVER (pl310_cache) = { + .name ="pl310_cache" , + .id =UCLASS_CACHE , + .of_match = l2x0_ids, + .probe = l2x0_probe, + .ofdata_to_platdata = l2x0_ofdata_to_platdata, + .flags =DM_FLAG_PRE_RELOC , +};drivers/cache/cache-uclass.c new file +13
-0@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright Intel +*/ + +#include <common.h> +#include <dm.h> + +UCLASS_DRIVER (cache) = { + .id =UCLASS_CACHE , + .name ="cache" , + .post_bind = dm_scan_fdt_dev, +};include/dm/uclass-id.h +0
-0
include/dm/uclass-id.h enum uclass_id { · line 37
Quoted 4 lines
include/dm/uclass-id.h +1
-0@@ -34,6 +34,7 @@ enum uclass_id {UCLASS_BLK ,/* Block device */ UCLASS_BOARD ,/* Device information from hardware */ UCLASS_BOOTCOUNT ,/* Bootcount backing store */ + UCLASS_CACHE, /* Cache controller*/
Maybe we can recycle UCLASS_CPU or something for this ?
Quoted 4 lines
include/dm/uclass-id.h +0
-0UCLASS_CLK ,/* Clock source, e.g. used by peripherals */ UCLASS_CPU ,/* CPU, typically part of an SoC */ UCLASS_CROS_EC, /* Chrome OS EC */
Signature · 2 lines
Best regards, Marek Vasut
PATCH 2/4 dm: cache: Create a uclass for cache controller
In reply to Dinh NguyenHi Dinh,
Quoted 9 lines · Dinh Nguyen
The cache controller driver configures the cache settings that can be found in the device tree files.
This initial revision only configures basic
settings(data & instruction prefetch, shared-override, data & tag latency). I believe these are the settings that affect performance the most. Comprehensive settings can be done by the OS.
Quoted 7 lines
Signed-off-by Dinh Nguyen <[email protected]>--- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/cache/Kconfig | 22 ++++++++++ drivers/cache/Makefile | 3 ++ drivers/cache/cache-l2x0.c | 82 ++++++++++++++++++++++++++++++++++++
This looks like a driver, rather than the uclass itself, so should go in a separate patch.
Quoted 7 lines
drivers/cache/cache-uclass.c | 13 ++++++ include/dm/uclass-id.h | 1 + 7 files changed, 124 insertions(+) create mode 100644 drivers/cache/Kconfig create mode 100644 drivers/cache/Makefile create mode 100644 drivers/cache/cache-l2x0.c create mode 100644 drivers/cache/cache-uclass.c
Also please add a sandbox cache driver and some tests in test/dm/cache.c
Quoted 33 lines
drivers/Kconfig +2
-0@@ -14,6 +14,8 @@ source "drivers/block/Kconfig" source "drivers/bootcount/Kconfig" +source "drivers/cache/Kconfig" + source "drivers/clk/Kconfig" source "drivers/cpu/Kconfig"drivers/Makefile +1
-0@@ -77,6 +77,7 @@ obj-$(CONFIG_BIOSEMU) += bios_emulator/ obj-y += block/ obj-y += board/ obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/ +obj-y += cache/ obj-$(CONFIG_CPU) += cpu/ obj-y += crypto/ obj-$(CONFIG_FASTBOOT) += fastboot/drivers/cache/Kconfig new file +1
-0@@ -0,0 +1,22 @@ +#
drivers/cache/Kconfig line 11
Quoted 10 lines
drivers/cache/Kconfig new file +10
-0+# Cache controllers +# + +menu "Cache Controller drivers" + +config CACHE + bool "Enable Driver Model for Cache drivers" + depends on DM + help + Enable driver model for cache controllers.
Please add more documentation here. What exactly is a cache controller (for CPU?) and what can you control with it?
Normally the uclass documentation goes in its header file. Since you don't have one, you could put it in the uclass file. You should mention that the settings can come from the DT and that there are no uclass operations supported, only setting up the cache.
drivers/cache/Kconfig line 20
Quoted 9 lines
drivers/cache/Kconfig new file +9
-0+ +config L2X0_CACHE + tristate "PL310 cache driver" + select CACHE + depends on ARM + help + This driver is for the PL310 cache controller commonly found on + ARMv7(32-bit) devices. The driver configures the cache settings + found in the device tree.
Again this should be in another patch.
Quoted 24 lines
drivers/cache/Kconfig new file +2
-0+ +endmenudrivers/cache/Makefile new file +3
-0@@ -0,0 +1,3 @@ + +obj-$(CONFIG_CACHE) += cache-uclass.o +obj-$(CONFIG_L2X0_CACHE) += cache-l2x0.odrivers/cache/cache-l2x0.c new file +7
-0@@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2019 Intel Corporation <www.intel.com> +*/ +#include <common.h> +#include <command.h> +#include <dm.h>
drivers/cache/cache-l2x0.c line 17
Quoted 10 lines
drivers/cache/cache-l2x0.c new file +10
-0+ +#include <asm/io.h> +#include <asm/pl310.h> + +static void l2c310_of_parse (struct udevice *dev) +{ +u32 tag[3 ] = {0 ,0 ,0 }; +u32 saved_reg, prefetch; +int ret; +struct pl310_regs *regs = (struct pl310_regs *)devfdt_get_addr (dev);
This should normally be read (perhaps into struct l2c310_priv *) in l2x0_ofdata_to_platdata().
However in this case you don't need the setting later, so it seems OK to do this. Please use dev_read_...() API always (not devfdt which doesn't work on livetree).
drivers/cache/cache-l2x0.c line 19
Quoted 2 lines
drivers/cache/cache-l2x0.c new file +2
-0+ +/*Disable the L2 Cache */
Space after /*
drivers/cache/cache-l2x0.c line 23
Quoted 4 lines
drivers/cache/cache-l2x0.c new file +4
-0+clrbits_le32 (®s->pl310_ctrl,L2X0_CTRL_EN ); + + saved_reg =readl (®s->pl310_aux_ctrl); +if (dev_read_u32 (dev,"prefetch-data" , &prefetch) ==0 ) {
I'm not sure about your error handling here. Are these properties optional? Is there a binding file you can bring in from Linux?
If these are just optional, then this is OK, but please:
if (!dev_read...())
Quoted 28 lines
drivers/cache/cache-l2x0.c new file +28
-0+if (prefetch) + saved_reg |=L310_AUX_CTRL_DATA_PREFETCH_MASK ; +else + saved_reg &= ~L310_AUX_CTRL_DATA_PREFETCH_MASK ; + } + +if (dev_read_u32 (dev,"prefetch-instr" , &prefetch) ==0 ) { +if (prefetch) + saved_reg |=L310_AUX_CTRL_INST_PREFETCH_MASK ; +else + saved_reg &= ~L310_AUX_CTRL_INST_PREFETCH_MASK ; + } + + saved_reg |=dev_read_bool (dev,"arm,shared-override" ); +writel (saved_reg, ®s->pl310_aux_ctrl); + + saved_reg =readl (®s->pl310_tag_latency_ctrl); +if (dev_read_u32_array (dev,"arm,tag-latency" , tag,3 ) ==0 ) + saved_reg |=L310_LATENCY_CTRL_RD (tag[0 ] -1 ) | +L310_LATENCY_CTRL_WR (tag[1 ] -1 ) | +L310_LATENCY_CTRL_SETUP (tag[2 ] -1 ); +writel (saved_reg, ®s->pl310_tag_latency_ctrl); + + saved_reg =readl (®s->pl310_data_latency_ctrl); +if (dev_read_u32_array (dev,"arm,data-latency" , tag,3 ) ==0 ) + saved_reg |=L310_LATENCY_CTRL_RD (tag[0 ] -1 ) | +L310_LATENCY_CTRL_WR (tag[1 ] -1 ) | +L310_LATENCY_CTRL_SETUP (tag[2 ] -1 );
drivers/cache/cache-l2x0.c line 61
Quoted 10 lines
drivers/cache/cache-l2x0.c new file +10
-0+writel (saved_reg, ®s->pl310_data_latency_ctrl); + +/* Enable the L2 cache */ +setbits_le32 (®s->pl310_ctrl,L2X0_CTRL_EN ); +} + +static int l2x0_ofdata_to_platdata (struct udevice *dev) +{ +return 0 ; +}
You can drop this function.
Quoted 27 lines
drivers/cache/cache-l2x0.c new file +21
-0+ +static int l2x0_probe (struct udevice *dev) +{ +l2c310_of_parse (dev); +return 0 ; +} + + +static const struct udevice_id l2x0_ids[] = { + { .compatible ="arm,pl310-cache" }, + {} +}; + +U_BOOT_DRIVER (pl310_cache) = { + .name ="pl310_cache" , + .id =UCLASS_CACHE , + .of_match = l2x0_ids, + .probe = l2x0_probe, + .ofdata_to_platdata = l2x0_ofdata_to_platdata, + .flags =DM_FLAG_PRE_RELOC , +};drivers/cache/cache-uclass.c new file +0
-0
drivers/cache/cache-uclass.c line 3
Quoted 3 lines
drivers/cache/cache-uclass.c new file +3
-0@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright Intel
??
Quoted 15 lines
drivers/cache/cache-uclass.c new file +10
-0+*/ + +#include <common.h> +#include <dm.h> + +UCLASS_DRIVER (cache) = { + .id =UCLASS_CACHE , + .name ="cache" , + .post_bind = dm_scan_fdt_dev, +};include/dm/uclass-id.h +0
-0
include/dm/uclass-id.h enum uclass_id { · line 37
Quoted 4 lines
include/dm/uclass-id.h +1
-0@@ -34,6 +34,7 @@ enum uclass_id {UCLASS_BLK ,/* Block device */ UCLASS_BOARD ,/* Device information from hardware */ UCLASS_BOOTCOUNT ,/* Bootcount backing store */ + UCLASS_CACHE, /* Cache controller*/
space before *.
Quoted 6 lines
include/dm/uclass-id.h +0
-1UCLASS_CLK ,/* Clock source, e.g. used by peripherals */ UCLASS_CPU ,/* CPU, typically part of an SoC */ UCLASS_CROS_EC, /* Chrome OS EC */ --2.20.0
Dinh Nguyen
maintainerPATCH 3/4 configs: socfpga: add imply pl310 cache controller
In reply to Dinh NguyenSelect the PL310 UCLASS_CACHE driver for SoCFPGA.
--- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/Kconfig +1 -0
@@ -845,6 +845,7 @@ config ARCH_SOCFPGA imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE imply SPL_SPI_FLASH_SUPPORT imply SPL_SPI_SUPPORT + imply L2X0_CACHE config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs"
Signature · 1 line
2.20.0
PATCH 3/4 configs: socfpga: add imply pl310 cache controller
Quoted 13 lines · Dinh Nguyen
Select the PL310
UCLASS_CACHEdriver for SoCFPGA.Signed-off-by Dinh Nguyen <[email protected]>--- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+)arch/arm/Kconfig +0
-0
arch/arm/Kconfig config ARCH_SOCFPGA · line 851
Quoted 7 lines
arch/arm/Kconfig +1
-0@@ -845,6 +845,7 @@ config ARCH_SOCFPGA imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE imply SPL_SPI_FLASH_SUPPORT imply SPL_SPI_SUPPORT + imply L2X0_CACHE config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs"
Signature · 2 lines
Best regards, Marek Vasut
Dinh Nguyen
maintainerPATCH 4/4 ARM: socfpga: use the pl310 driver to configure the cache
In reply to Dinh NguyenFind the UCLASS_CACHE driver to configure the cache controller's settings.
--- arch/arm/mach-socfpga/misc.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
arch/arm/mach-socfpga/misc.c +3 -13
@@ -59,20 +59,10 @@ void enable_caches(void)#ifdef CONFIG_SYS_L2_PL310 void v7_outer_cache_enable (void ) { -/* Disable the L2 cache */ -clrbits_le32 (&pl310->pl310_ctrl,L2X0_CTRL_EN ); - -writel (0x111 , &pl310->pl310_tag_latency_ctrl); -writel (0x121 , &pl310->pl310_data_latency_ctrl); - -/* enable BRESP, instruction and data prefetch, full line of zeroes */ -setbits_le32 (&pl310->pl310_aux_ctrl, -L310_AUX_CTRL_DATA_PREFETCH_MASK | -L310_AUX_CTRL_INST_PREFETCH_MASK | -L310_SHARED_ATT_OVERRIDE_ENABLE ); +struct udevice *dev; -/* Enable the L2 cache */ -setbits_le32 (&pl310->pl310_ctrl,L2X0_CTRL_EN ); +if (uclass_get_device (UCLASS_CACHE ,0 , &dev)) +pr_err ("cache controller driver NOT found!\n" ); }void v7_outer_cache_disable (void )
Signature · 1 line
2.20.0
PATCH 4/4 ARM: socfpga: use the pl310 driver to configure the cache
Quoted 27 lines · Dinh Nguyen
Find the
UCLASS_CACHEdriver to configure the cache controller's settings.Signed-off-by Dinh Nguyen <[email protected]>--- arch/arm/mach-socfpga/misc.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)arch/arm/mach-socfpga/misc.c +0
-10@@ -59,20 +59,10 @@ void enable_caches(void)#ifdef CONFIG_SYS_L2_PL310 void v7_outer_cache_enable (void ) { -/* Disable the L2 cache */ -clrbits_le32 (&pl310->pl310_ctrl,L2X0_CTRL_EN ); - -writel (0x111 , &pl310->pl310_tag_latency_ctrl); -writel (0x121 , &pl310->pl310_data_latency_ctrl); - -/* enable BRESP, instruction and data prefetch, full line of zeroes */ - setbits_le32(&pl310->pl310_aux_ctrl, - L310_AUX_CTRL_DATA_PREFETCH_MASK | - L310_AUX_CTRL_INST_PREFETCH_MASK |
arch/arm/mach-socfpga/misc.c void enable_caches(void) · line 68
Quoted 10 lines
arch/arm/mach-socfpga/misc.c +3
-3- L310_SHARED_ATT_OVERRIDE_ENABLE); +struct udevice *dev; -/* Enable the L2 cache */ -setbits_le32 (&pl310->pl310_ctrl,L2X0_CTRL_EN ); +if (uclass_get_device (UCLASS_CACHE ,0 , &dev)) +pr_err ("cache controller driver NOT found!\n" ); }void v7_outer_cache_disable (void )
Signature · 2 lines
Best regards, Marek Vasut
cover dm: cache: add dm cache driver
In reply to Dinh NguyenQuoted 15 lines · Dinh Nguyen
Hi,
Add a
UCLASS_CACHEdm driver to handling the configuration of cache settings. Place this new driver under /drivers/cache. In this initial revision, the driver is only configuring what I think are essential cache settings. The more comprehensive cache settings can be done in the OS.Dinh
Dinh Nguyen (4):
ARM: pl310: Add macro's for handling tag and data latency mask
dm: cache: Create a uclass for cache controller
configs: socfpga: add imply pl310 cache controller
ARM: socfpga: use the pl310 driver to configure the cache
Quoted 16 lines
arch/arm/Kconfig | 1 + arch/arm/include/asm/pl310.h | 3 ++ arch/arm/mach-socfpga/misc.c | 16 ++----- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/cache/Kconfig | 22 ++++++++++ drivers/cache/Makefile | 3 ++ drivers/cache/cache-l2x0.c | 82 ++++++++++++++++++++++++++++++++++++ drivers/cache/cache-uclass.c | 13 ++++++ include/dm/uclass-id.h | 1 + 10 files changed, 131 insertions(+), 13 deletions(-) create mode 100644 drivers/cache/Kconfig create mode 100644 drivers/cache/Makefile create mode 100644 drivers/cache/cache-l2x0.c create mode 100644 drivers/cache/cache-uclass.c
Looks OK to me
Signature · 2 lines
Best regards, Marek Vasut