From owner-svn-src-projects@FreeBSD.ORG Sun Dec 21 20:29:47 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1CE61065675; Sun, 21 Dec 2008 20:29:47 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A26F48FC12; Sun, 21 Dec 2008 20:29:47 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBLKTlI7041635; Sun, 21 Dec 2008 20:29:47 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBLKTlT6041633; Sun, 21 Dec 2008 20:29:47 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200812212029.mBLKTlT6041633@svn.freebsd.org> From: Sam Leffler Date: Sun, 21 Dec 2008 20:29:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186380 - projects/cambria/sys/arm/xscale/ixp425 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Dec 2008 20:29:47 -0000 Author: sam Date: Sun Dec 21 20:29:47 2008 New Revision: 186380 URL: http://svn.freebsd.org/changeset/base/186380 Log: o add ixp4xx_read_feature_bits to return the mask of feature control bits so drivers can do a better job configuring optional features o display features on attach Modified: projects/cambria/sys/arm/xscale/ixp425/ixp425.c projects/cambria/sys/arm/xscale/ixp425/ixp425var.h Modified: projects/cambria/sys/arm/xscale/ixp425/ixp425.c ============================================================================== --- projects/cambria/sys/arm/xscale/ixp425/ixp425.c Sun Dec 21 20:27:50 2008 (r186379) +++ projects/cambria/sys/arm/xscale/ixp425/ixp425.c Sun Dec 21 20:29:47 2008 (r186380) @@ -68,6 +68,21 @@ static int ixp425_probe(device_t); static void ixp425_identify(driver_t *, device_t); static int ixp425_attach(device_t); +/* + * Return a mask of the "fuse" bits that identify + * which h/w features are present. + * NB: assumes the expansion bus is mapped. + */ +uint32_t +ixp4xx_read_feature_bits(void) +{ + uint32_t bits = ~IXPREG(IXP425_EXP_VBASE + EXP_FCTRL_OFFSET); + bits &= ~EXP_FCTRL_RESVD; + if (!cpu_is_ixp46x()) + bits &= ~EXP_FCTRL_IXP46X_ONLY; + return bits; +} + struct arm32_dma_range * bus_dma_get_range(void) { @@ -190,6 +205,8 @@ ixp425_attach(device_t dev) { struct ixp425_softc *sc; + device_printf(dev, "%b\n", ixp4xx_read_feature_bits(), EXP_FCTRL_BITS); + sc = device_get_softc(dev); sc->sc_iot = &ixp425_bs_tag; KASSERT(ixp425_softc == NULL, ("%s called twice?", __func__)); Modified: projects/cambria/sys/arm/xscale/ixp425/ixp425var.h ============================================================================== --- projects/cambria/sys/arm/xscale/ixp425/ixp425var.h Sun Dec 21 20:27:50 2008 (r186379) +++ projects/cambria/sys/arm/xscale/ixp425/ixp425var.h Sun Dec 21 20:29:47 2008 (r186380) @@ -48,6 +48,7 @@ #include /* NB: cputype is setup by set_cpufuncs */ +#define cpu_is_ixp42x() (cputype == CPU_ID_IXP425) #define cpu_is_ixp43x() (cputype == CPU_ID_IXP435) #define cpu_is_ixp46x() (cputype == CPU_ID_IXP465) @@ -99,6 +100,7 @@ void ixp425_mem_bs_init(bus_space_tag_t, uint32_t ixp425_sdram_size(void); uint32_t ixp435_ddram_size(void); +uint32_t ixp4xx_read_feature_bits(void); int ixp425_md_route_interrupt(device_t, device_t, int); void ixp425_md_attach(device_t); @@ -115,5 +117,4 @@ enum { IXP425_IVAR_ADDR, /* base physical address */ IXP425_IVAR_IRQ /* irq/gpio pin assignment */ }; - #endif /* _IXP425VAR_H_ */