D10709.1776860323.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10709.1776860323.diff
View Options

	Index: head/sys/arm/mv/armada38x/armada38x.c
	===================================================================
	--- head/sys/arm/mv/armada38x/armada38x.c
	+++ head/sys/arm/mv/armada38x/armada38x.c
	@@ -173,9 +173,13 @@

	/* Enable SCU */
	val = bus_space_read_4(fdtbus_bs_tag, vaddr_scu, MV_SCU_REG_CTRL);
	- if (!(val & MV_SCU_ENABLE))
	+ if (!(val & MV_SCU_ENABLE)) {
	+ /* Enable SCU Speculative linefills to L2 */
	+ val \|= MV_SCU_SL_L2_ENABLE;
	+
	bus_space_write_4(fdtbus_bs_tag, vaddr_scu, 0,
	val \| MV_SCU_ENABLE);
	+ }

	bus_space_unmap(fdtbus_bs_tag, vaddr_scu, MV_SCU_REGS_LEN);
	return (0);
	Index: head/sys/arm/mv/mvreg.h
	===================================================================
	--- head/sys/arm/mv/mvreg.h
	+++ head/sys/arm/mv/mvreg.h
	@@ -424,7 +424,8 @@
	#define MV_SCU_REGS_LEN 0x100
	#define MV_SCU_REG_CTRL 0x00
	#define MV_SCU_REG_CONFIG 0x04
	-#define MV_SCU_ENABLE 1
	+#define MV_SCU_ENABLE (1 << 0)
	+#define MV_SCU_SL_L2_ENABLE (1 << 3)
	#define SCU_CFG_REG_NCPU_MASK 0x3
	#endif