honor any interface width (e.g. setup by the bus shim) and don't probe;
this is needed for the moment to workaround bus shim issues
This commit is contained in:
parent
3a114d1f92
commit
e73090b5d3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=188087
79
sys/dev/cfi/cfi_bus_ixp4xx.c
Normal file
79
sys/dev/cfi/cfi_bus_ixp4xx.c
Normal file
@ -0,0 +1,79 @@
|
||||
/*-
|
||||
* Copyright (c) 2009 Sam Leffler, Errno Consulting
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/module.h>
|
||||
#include <sys/rman.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
#include <dev/cfi/cfi_var.h>
|
||||
|
||||
#include <arm/xscale/ixp425/ixp425reg.h>
|
||||
#include <arm/xscale/ixp425/ixp425var.h>
|
||||
|
||||
static int
|
||||
cfi_ixp4xx_probe(device_t dev)
|
||||
{
|
||||
struct cfi_softc *sc = device_get_softc(dev);
|
||||
/*
|
||||
* NB: we assume the boot loader sets up EXP_TIMING_CS0_OFFSET
|
||||
* according to the flash on the board. If it does not then it
|
||||
* can be done here.
|
||||
*/
|
||||
if (bootverbose) {
|
||||
struct ixp425_softc *sa =
|
||||
device_get_softc(device_get_parent(dev));
|
||||
device_printf(dev, "EXP_TIMING_CS0_OFFSET 0x%x\n",
|
||||
EXP_BUS_READ_4(sa, EXP_TIMING_CS0_OFFSET));
|
||||
}
|
||||
sc->sc_width = 2; /* NB: don't probe interface width */
|
||||
return cfi_probe(dev);
|
||||
}
|
||||
|
||||
static device_method_t cfi_ixp4xx_methods[] = {
|
||||
/* device interface */
|
||||
DEVMETHOD(device_probe, cfi_ixp4xx_probe),
|
||||
DEVMETHOD(device_attach, cfi_attach),
|
||||
DEVMETHOD(device_detach, cfi_detach),
|
||||
|
||||
{0, 0}
|
||||
};
|
||||
|
||||
static driver_t cfi_ixp4xx_driver = {
|
||||
cfi_driver_name,
|
||||
cfi_ixp4xx_methods,
|
||||
sizeof(struct cfi_softc),
|
||||
};
|
||||
DRIVER_MODULE (cfi, ixp, cfi_ixp4xx_driver, cfi_devclass, 0, 0);
|
@ -150,11 +150,16 @@ cfi_probe(device_t dev)
|
||||
sc->sc_tag = rman_get_bustag(sc->sc_res);
|
||||
sc->sc_handle = rman_get_bushandle(sc->sc_res);
|
||||
|
||||
sc->sc_width = 1;
|
||||
while (sc->sc_width <= 4) {
|
||||
if (cfi_read_qry(sc, CFI_QRY_IDENT) == 'Q')
|
||||
break;
|
||||
sc->sc_width <<= 1;
|
||||
if (sc->sc_width == 0) {
|
||||
sc->sc_width = 1;
|
||||
while (sc->sc_width <= 4) {
|
||||
if (cfi_read_qry(sc, CFI_QRY_IDENT) == 'Q')
|
||||
break;
|
||||
sc->sc_width <<= 1;
|
||||
}
|
||||
} else if (cfi_read_qry(sc, CFI_QRY_IDENT) != 'Q') {
|
||||
error = ENXIO;
|
||||
goto out;
|
||||
}
|
||||
if (sc->sc_width > 4) {
|
||||
error = ENXIO;
|
||||
|
Loading…
Reference in New Issue
Block a user