Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d965b0fc authored by Russell King's avatar Russell King
Browse files

ARM: l2c: restore the behaviour documented above l2c_enable() 



l2c_enable() is documented that it must not be called if the cache has
already been enabled.  Unfortunately, commit 6b49241a ("ARM: 8259/1:
l2c: Refactor the driver to use commit-like interface") changed this
without updating the comment, for very little reason.  Revert this
change and restore the expected behaviour.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3f599875

arch/arm/mm/cache-l2x0.c

+5 −5
Original line number Diff line number Diff line
@@ -129,10 +129,6 @@ static void l2c_enable(void __iomem *base, u32 aux, unsigned num_lock) 
{

	unsigned long flags;



	/* Do not touch the controller if already enabled. */

	if (readl_relaxed(base + L2X0_CTRL) & L2X0_CTRL_EN)

		return;



	l2x0_saved_regs.aux_ctrl = aux;

	l2c_configure(base);
@@ -163,7 +159,11 @@ static void l2c_save(void __iomem *base) 


static void l2c_resume(void)

{

	l2c_enable(l2x0_base, l2x0_saved_regs.aux_ctrl, l2x0_data->num_lock);

	void __iomem *base = l2x0_base;



	/* Do not touch the controller if already enabled. */

	if (!(readl_relaxed(base + L2X0_CTRL) & L2X0_CTRL_EN))

		l2c_enable(base, l2x0_saved_regs.aux_ctrl, l2x0_data->num_lock);

}



/*