Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 27 Apr 2010 20:50:32 +0000 (UTC)
From:      Juli Mallett <jmallett@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r207293 - user/jmallett/octeon/sys/mips/cavium
Message-ID:  <201004272050.o3RKoWOO018977@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jmallett
Date: Tue Apr 27 20:50:32 2010
New Revision: 207293
URL: http://svn.freebsd.org/changeset/base/207293

Log:
  o) Use structures from the SDK rather than local copies.
  o) Get the CF base address from the bootloader rather than hard-coding it.

Deleted:
  user/jmallett/octeon/sys/mips/cavium/octeon_ebt3000_cf.h
Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_ebt3000_cf.c

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_ebt3000_cf.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_ebt3000_cf.c	Tue Apr 27 20:18:54 2010	(r207292)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_ebt3000_cf.c	Tue Apr 27 20:50:32 2010	(r207293)
@@ -66,9 +66,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/cpuregs.h>
 
-#include "octeon_ebt3000_cf.h"
 #include <mips/cavium/octeon_pcmap_regs.h>
 
+#include <contrib/octeon-sdk/cvmx.h>
+
 /* ATA Commands */
 #define CMD_READ_SECTOR		0x20
 #define CMD_WRITE_SECTOR	0x30
@@ -99,6 +100,8 @@ __FBSDID("$FreeBSD$");
 #define SWAP_SHORT(x)		((x << 8) | (x >> 8))
 #define MODEL_STR_SIZE		40
 
+/* XXX */
+extern cvmx_bootinfo_t *octeon_bootinfo;
 
 /* Globals */
 int	bus_width;
@@ -582,19 +585,19 @@ static void cf_identify (driver_t *drv, 
 	uint8_t status;
         int bus_region;
 	int count = 0;
-        octeon_mio_boot_reg_cfgx_t cfg;
+        cvmx_mio_boot_reg_cfgx_t cfg;
 
     	if (octeon_is_simulation())
 		return;
 
-	base_addr = (void *) MIPS_PHYS_TO_KSEG0(OCTEON_CF_COMMON_BASE_ADDR);
+	base_addr = cvmx_phys_to_ptr(octeon_bootinfo->compact_flash_common_base_addr);
 
         for (bus_region = 0; bus_region < 8; bus_region++)
         {
-                cfg.word64 = oct_read64(OCTEON_MIO_BOOT_REG_CFGX(bus_region));
-                if (cfg.bits.base == OCTEON_CF_COMMON_BASE_ADDR >> 16)
+                cfg.u64 = oct_read64(CVMX_MIO_BOOT_REG_CFGX(bus_region));
+                if (cfg.s.base == octeon_bootinfo->compact_flash_common_base_addr >> 16)
                 {
-                        bus_width = (cfg.bits.width) ? 16: 8;
+                        bus_width = (cfg.s.width) ? 16: 8;
                         printf("Compact flash found in bootbus region %d (%d bit).\n", bus_region, bus_width);
                         break;
                 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004272050.o3RKoWOO018977>