From owner-svn-src-all@FreeBSD.ORG  Wed Oct 31 04:23:37 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9ADE3FFE;
 Wed, 31 Oct 2012 04:23:37 +0000 (UTC)
 (envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 801E48FC1B;
 Wed, 31 Oct 2012 04:23:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9V4NbB2046747;
 Wed, 31 Oct 2012 04:23:37 GMT
 (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9V4NbKZ046745;
 Wed, 31 Oct 2012 04:23:37 GMT
 (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201210310423.q9V4NbKZ046745@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 31 Oct 2012 04:23:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242389 - head/sys/mips/cavium
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Oct 2012 04:23:37 -0000

Author: jmallett
Date: Wed Oct 31 04:23:36 2012
New Revision: 242389
URL: http://svn.freebsd.org/changeset/base/242389

Log:
  If the CF physical base is 0, attach no CF devices.  This fixes a warning
  about a 0 passed to cvmx_phys_to_ptr on systems without a CF interface,
  such as the RSYS4GBE.

Modified:
  head/sys/mips/cavium/octeon_ebt3000_cf.c

Modified: head/sys/mips/cavium/octeon_ebt3000_cf.c
==============================================================================
--- head/sys/mips/cavium/octeon_ebt3000_cf.c	Wed Oct 31 04:07:52 2012	(r242388)
+++ head/sys/mips/cavium/octeon_ebt3000_cf.c	Wed Oct 31 04:23:36 2012	(r242389)
@@ -622,6 +622,8 @@ static void cf_identify (driver_t *drv, 
 		return;
 
 	phys_base = cvmx_sysinfo_get()->compact_flash_common_base_addr;
+	if (phys_base == 0)
+		return;
 	base_addr = cvmx_phys_to_ptr(phys_base);
 
         for (bus_region = 0; bus_region < 8; bus_region++)