Commit 7d79cee2 authored by Alexey Brodkin's avatar Alexey Brodkin Committed by Vineet Gupta
Browse files

ARCv2: PAE40: Explicitly set MSB counterpart of SLC region ops addresses 



It is necessary to explicitly set both SLC_AUX_RGN_START1 and SLC_AUX_RGN_END1
which hold MSB bits of the physical address correspondingly of region start
and end otherwise SLC region operation is executed in unpredictable manner

Without this patch, SLC flushes on HSDK (IOC disabled) were taking
seconds.

Cc: stable@vger.kernel.org   #4.4+
Reported-by: default avatarVladimir Kondratiev <vladimir.kondratiev@intel.com>
Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
[vgupta: PAR40 regs only written if PAE40 exist]
parent 2e332fec

arch/arc/include/asm/cache.h

+2 −0
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ extern unsigned long perip_base, perip_end; 
#define ARC_REG_SLC_FLUSH	0x904

#define ARC_REG_SLC_INVALIDATE	0x905

#define ARC_REG_SLC_RGN_START	0x914

#define ARC_REG_SLC_RGN_START1	0x915

#define ARC_REG_SLC_RGN_END	0x916

#define ARC_REG_SLC_RGN_END1	0x917



/* Bit val in SLC_CONTROL */

#define SLC_CTRL_DIS		0x001

arch/arc/mm/cache.c

+11 −2
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ noinline void slc_op(phys_addr_t paddr, unsigned long sz, const int op) 
	static DEFINE_SPINLOCK(lock);

	unsigned long flags;

	unsigned int ctrl;

	phys_addr_t end;



	spin_lock_irqsave(&lock, flags);
@@ -694,8 +695,16 @@ noinline void slc_op(phys_addr_t paddr, unsigned long sz, const int op) 
	 * END needs to be setup before START (latter triggers the operation)

	 * END can't be same as START, so add (l2_line_sz - 1) to sz

	 */

	write_aux_reg(ARC_REG_SLC_RGN_END, (paddr + sz + l2_line_sz - 1));

	write_aux_reg(ARC_REG_SLC_RGN_START, paddr);

	end = paddr + sz + l2_line_sz - 1;

	if (is_pae40_enabled())

		write_aux_reg(ARC_REG_SLC_RGN_END1, upper_32_bits(end));



	write_aux_reg(ARC_REG_SLC_RGN_END, lower_32_bits(end));



	if (is_pae40_enabled())

		write_aux_reg(ARC_REG_SLC_RGN_START1, upper_32_bits(paddr));



	write_aux_reg(ARC_REG_SLC_RGN_START, lower_32_bits(paddr));



	/* Make sure "busy" bit reports correct stataus, see STAR 9001165532 */

	read_aux_reg(ARC_REG_SLC_CTRL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE