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

Commit 9bc22239 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: OCTEON: Don't attempt to use nonexistent registers on OCTEON III models. 



Attempts to read the nonexistent registers results in bus errors.
Either use registers that exist, or don't do the access as appropriate.

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12502/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 182a6d1c

arch/mips/cavium-octeon/csrc-octeon.c

+9 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/octeon/cvmx-ipd-defs.h>

#include <asm/octeon/cvmx-mio-defs.h>

#include <asm/octeon/cvmx-rst-defs.h>

#include <asm/octeon/cvmx-fpa-defs.h>



static u64 f;

static u64 rdiv;
@@ -65,9 +66,13 @@ void __init octeon_setup_delays(void) 
 */

void octeon_init_cvmcount(void)

{

	u64 clk_reg;

	unsigned long flags;

	unsigned loops = 2;



	clk_reg = octeon_has_feature(OCTEON_FEATURE_FPA3) ?

		CVMX_FPA_CLK_COUNT : CVMX_IPD_CLK_COUNT;



	/* Clobber loops so GCC will not unroll the following while loop. */

	asm("" : "+r" (loops));
@@ -77,18 +82,18 @@ void octeon_init_cvmcount(void) 
	 * which should give more deterministic timing.

	 */

	while (loops--) {

		u64 ipd_clk_count = cvmx_read_csr(CVMX_IPD_CLK_COUNT);

		u64 clk_count = cvmx_read_csr(clk_reg);

		if (rdiv != 0) {

			ipd_clk_count *= rdiv;

			clk_count *= rdiv;

			if (f != 0) {

				asm("dmultu\t%[cnt],%[f]\n\t"

				    "mfhi\t%[cnt]"

				    : [cnt] "+r" (ipd_clk_count)

				    : [cnt] "+r" (clk_count)

				    : [f] "r" (f)

				    : "hi", "lo");

			}

		}

		write_c0_cvmcount(ipd_clk_count);

		write_c0_cvmcount(clk_count);

	}

	local_irq_restore(flags);

}

arch/mips/cavium-octeon/setup.c

+21 −13
Original line number Diff line number Diff line
@@ -492,8 +492,6 @@ const char *get_system_type(void) 
void octeon_user_io_init(void)

{

	union octeon_cvmemctl cvmmemctl;

	union cvmx_iob_fau_timeout fau_timeout;

	union cvmx_pow_nw_tim nm_tim;



	/* Get the current settings for CP0_CVMMEMCTL_REG */

	cvmmemctl.u64 = read_c0_cvmmemctl();
@@ -595,17 +593,27 @@ void octeon_user_io_init(void) 
			  CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE,

			  CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE * 128);



	if (octeon_has_feature(OCTEON_FEATURE_FAU)) {

		union cvmx_iob_fau_timeout fau_timeout;



		/* Set a default for the hardware timeouts */

		fau_timeout.u64 = 0;

		fau_timeout.s.tout_val = 0xfff;

		/* Disable tagwait FAU timeout */

		fau_timeout.s.tout_enb = 0;

		cvmx_write_csr(CVMX_IOB_FAU_TIMEOUT, fau_timeout.u64);

	}



	if ((!OCTEON_IS_MODEL(OCTEON_CN68XX) &&

	     !OCTEON_IS_MODEL(OCTEON_CN7XXX)) ||

	    OCTEON_IS_MODEL(OCTEON_CN70XX)) {

		union cvmx_pow_nw_tim nm_tim;



		nm_tim.u64 = 0;

		/* 4096 cycles */

		nm_tim.s.nw_tim = 3;

		cvmx_write_csr(CVMX_POW_NW_TIM, nm_tim.u64);

	}



	write_octeon_c0_icacheerr(0);

	write_c0_derraddr1(0);