d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Write the soft reset bit in the cavium core to reset. [1]

Browse Source 
o panic if the board boot descriptor is too old...

Obtained from:	[1] looking at the cavium sdk's executive code
This commit is contained in:
Warner Losh 2010-01-24 18:05:38 +00:00
parent 93ec7edca7
commit e7f82fbbaf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/mips/cavium/octeon_machdep.c
View File

@ -109,7 +109,7 @@ platform_cpu_init()
void void
platform_reset(void) platform_reset(void)
{ {
mips_generic_reset(); oct_write64(OCTEON_CIU_SOFT_RST, 1);
} }
@ -961,7 +961,9 @@ octeon_boot_params_init(register_t ptr)
if (ptr != 0 && ptr < MAX_APP_DESC_ADDR) { if (ptr != 0 && ptr < MAX_APP_DESC_ADDR) {
app_desc_ptr = (octeon_boot_descriptor_t *)(intptr_t)ptr; app_desc_ptr = (octeon_boot_descriptor_t *)(intptr_t)ptr;
octeon_bd_ver = app_desc_ptr->desc_version; octeon_bd_ver = app_desc_ptr->desc_version;
if (app_desc_ptr->desc_version == 6) if (app_desc_ptr->desc_version < 6)
panic("Your boot code is too old to be supported.\n");
if (app_desc_ptr->desc_version >= 6)
bad_desc = octeon_process_app_desc_ver_6(); bad_desc = octeon_process_app_desc_ver_6();
} }
if (bad_desc) if (bad_desc)

4
sys/mips/cavium/octeon_pcmap_regs.h
View File

@ -597,11 +597,9 @@ static inline mipsx_addr_size octeon_ptr_to_phys (void *ptr)
#define OCTEON_CIU_PP_RST OCTEON_ADD_IO_SEG(0x0001070000000700ull) #define OCTEON_CIU_PP_RST OCTEON_ADD_IO_SEG(0x0001070000000700ull)
#define OCTEON_CIU_SOFT_RST OCTEON_ADD_IO_SEG(0x0001070000000740ull)
#define OCTEON_OCTEON_DID_TAG 12ULL #define OCTEON_OCTEON_DID_TAG 12ULL
/* /*
* octeon_addr_t * octeon_addr_t
*/ */