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

MFP4 @222836

Browse Source 
Add support for partitioning CFI disks from FDT using geom_flashmap.

Sponsored by:	DARPA, AFRL
This commit is contained in:
Brooks Davis 2013-05-30 01:19:02 +00:00
parent 8fce673c58
commit 444e780150
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=251117
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/dev/cfi/cfi_disk.c
View File

@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include <dev/cfi/cfi_var.h>
#include <geom/geom.h>
#include <geom/geom_disk.h>
struct cfi_disk_softc {
@ -64,6 +65,7 @@ static int cfi_disk_detach(device_t);
static int cfi_disk_open(struct disk *);
static int cfi_disk_close(struct disk *);
static void cfi_io_proc(void *, int);
static int cfi_disk_getattr(struct bio *);
static void cfi_disk_strategy(struct bio *);
static int cfi_disk_ioctl(struct disk *, u_long, void *, int, struct thread *);
@ -95,6 +97,7 @@ cfi_disk_attach(device_t dev)
sc->disk->d_strategy = cfi_disk_strategy;
sc->disk->d_ioctl = cfi_disk_ioctl;
sc->disk->d_dump = NULL; /* NB: no dumps */
sc->disk->d_getattr = cfi_disk_getattr;
sc->disk->d_sectorsize = CFI_DISK_SECSIZE;
sc->disk->d_mediasize = sc->parent->sc_size;
sc->disk->d_maxsize = CFI_DISK_MAXIOSIZE;
@ -275,6 +278,31 @@ cfi_io_proc(void *arg, int pending)
}
}
static int
cfi_disk_getattr(struct bio *bp)
{
struct cfi_disk_softc *dsc;
struct cfi_softc *sc;
device_t dev;
if (bp->bio_disk == NULL || bp->bio_disk->d_drv1 == NULL)
return (ENXIO);
dsc = bp->bio_disk->d_drv1;
sc = dsc->parent;
dev = sc->sc_dev;
do {
if (g_handleattr(bp, "CFI::device", &dev, sizeof(device_t)))
break;
return (ERESTART);
} while(0);
return (EJUSTRETURN);
}
static void
cfi_disk_strategy(struct bio *bp)
{

7
sys/geom/geom_flashmap.c
View File

@ -186,8 +186,11 @@ g_flashmap_taste(struct g_class *mp, struct g_provider *pp, int flags)
do {
size = sizeof(device_t);
if (g_io_getattr("NAND::device", cp, &size, &dev))
break;
if (g_io_getattr("NAND::device", cp, &size, &dev)) {
size = sizeof(device_t);
if (g_io_getattr("CFI::device", cp, &size, &dev))
break;
}
nslices = g_flashmap_load(dev, &head);
if (nslices == 0)