From owner-svn-src-head@FreeBSD.ORG Mon Mar 9 23:18:37 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DCC31065672; Mon, 9 Mar 2009 23:18:37 +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 3AEE28FC21; Mon, 9 Mar 2009 23:18:37 +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 n29NIbq7040281; Mon, 9 Mar 2009 23:18:37 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n29NIbV8040279; Mon, 9 Mar 2009 23:18:37 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200903092318.n29NIbV8040279@svn.freebsd.org> From: Sam Leffler Date: Mon, 9 Mar 2009 23:18:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189608 - in head/sys: conf geom X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 23:18:37 -0000 Author: sam Date: Mon Mar 9 23:18:36 2009 New Revision: 189608 URL: http://svn.freebsd.org/changeset/base/189608 Log: add geom_redboot, a geom module that exports RedBoot FIS partitions as named slices in dev/redboot/* Added: head/sys/geom/geom_redboot.c (contents, props changed) Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Mon Mar 9 23:18:07 2009 (r189607) +++ head/sys/conf/files Mon Mar 9 23:18:36 2009 (r189608) @@ -1802,6 +1802,7 @@ geom/geom_mbr.c optional geom_mbr geom/geom_mbr_enc.c optional geom_mbr geom/geom_pc98.c optional geom_pc98 geom/geom_pc98_enc.c optional geom_pc98 +geom/geom_redboot.c optional geom_redboot geom/geom_slice.c standard geom/geom_subr.c standard geom/geom_sunlabel.c optional geom_sunlabel Added: head/sys/geom/geom_redboot.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/geom/geom_redboot.c Mon Mar 9 23:18:36 2009 (r189608) @@ -0,0 +1,321 @@ +/*- + * 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, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any + * redistribution must be conditioned upon including a substantially + * similar Disclaimer requirement for further binary redistribution. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#define REDBOOT_CLASS_NAME "REDBOOT" + +struct fis_image_desc { + uint8_t name[16]; /* null-terminated name */ + uint32_t offset; /* offset in flash */ + uint32_t addr; /* address in memory */ + uint32_t size; /* image size in bytes */ + uint32_t entry; /* offset in image for entry point */ + uint32_t dsize; /* data size in bytes */ + uint8_t pad[256-(16+7*sizeof(uint32_t)+sizeof(void*))]; + struct fis_image_desc *next; /* linked list (in memory) */ + uint32_t dsum; /* descriptor checksum */ + uint32_t fsum; /* checksum over image data */ +}; + +#define FISDIR_NAME "FIS directory" +#define REDBCFG_NAME "RedBoot config" + +#define REDBOOT_MAXSLICE 64 +#define REDBOOT_MAXOFF \ + (REDBOOT_MAXSLICE*sizeof(struct fis_image_desc)) + +struct g_redboot_softc { + uint32_t entry[REDBOOT_MAXSLICE]; + uint32_t dsize[REDBOOT_MAXSLICE]; +}; + +static void +g_redboot_print(int i, struct fis_image_desc *fd) +{ + + printf("[%2d] \"%-15.15s\" %08x:%08x", i, fd->name, + fd->offset, fd->size); + printf(" addr %08x entry %08x\n", fd->addr, fd->entry); + printf(" dsize 0x%x dsum 0x%x fsum 0x%x\n", fd->dsize, + fd->dsum, fd->fsum); +} + +static int +g_redboot_ioctl(struct g_provider *pp, u_long cmd, void *data, int fflag, struct thread *td) +{ + return (ENOIOCTL); +} + +static int +g_redboot_start(struct bio *bp) +{ + struct g_provider *pp; + struct g_geom *gp; + struct g_redboot_softc *sc; + struct g_slicer *gsp; + int idx; + + pp = bp->bio_to; + idx = pp->index; + gp = pp->geom; + gsp = gp->softc; + sc = gsp->softc; + if (bp->bio_cmd == BIO_GETATTR) { + if (g_handleattr_int(bp, REDBOOT_CLASS_NAME "::entry", + sc->entry[idx])) + return (1); + if (g_handleattr_int(bp, REDBOOT_CLASS_NAME "::dsize", + sc->dsize[idx])) + return (1); + } + + return (0); +} + +static void +g_redboot_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, + struct g_consumer *cp __unused, struct g_provider *pp) +{ + struct g_redboot_softc *sc; + struct g_slicer *gsp; + + gsp = gp->softc; + sc = gsp->softc; + g_slice_dumpconf(sb, indent, gp, cp, pp); + if (pp != NULL) { + if (indent == NULL) { + sbuf_printf(sb, " entry %d", sc->entry[pp->index]); + sbuf_printf(sb, " dsize %d", sc->dsize[pp->index]); + } else { + sbuf_printf(sb, "%s%d\n", indent, + sc->entry[pp->index]); + sbuf_printf(sb, "%s%d\n", indent, + sc->dsize[pp->index]); + } + } +} + +#include + +static int +nameok(const char name[16]) +{ + int i; + + /* descriptor names are null-terminated printable ascii */ + for (i = 0; i < 15; i++) + if (!isprint(name[i])) + break; + return (name[i] == '\0'); +} + +static struct fis_image_desc * +parse_fis_directory(u_char *buf, size_t bufsize, off_t offset, uint32_t offmask) +{ +#define match(a,b) \ + (bcmp(fd->name, FISDIR_NAME, sizeof(FISDIR_NAME)-1) == 0) + struct fis_image_desc *fd, *efd; + struct fis_image_desc *fisdir, *redbcfg; + struct fis_image_desc *head, **tail; + int i; + + fd = (struct fis_image_desc *)buf; + efd = fd + (bufsize / sizeof(struct fis_image_desc)); +#if 0 + /* + * Find the start of the FIS table. + */ + while (fd < efd && fd->name[0] != 0xff) + fd++; + if (fd == efd) + return (NULL); + if (bootverbose) + printf("RedBoot FIS table starts at 0x%jx\n", + offset + fd - (struct fis_image_desc *) buf); +#endif + /* + * Scan forward collecting entries in a list. + */ + fisdir = redbcfg = NULL; + *(tail = &head) = NULL; + for (i = 0; fd < efd && fd->name[0] != 0xff; i++, fd++) { + if (match(fd->name, FISDIR_NAME)) + fisdir = fd; + else if (match(fd->name, REDBCFG_NAME)) + redbcfg = fd; + if (nameok(fd->name)) { + /* + * NB: flash address includes platform mapping; + * strip it so we have only a flash offset. + */ + fd->offset &= offmask; + if (bootverbose) + g_redboot_print(i, fd); + *tail = fd; + *(tail = &fd->next) = NULL; + } + } + if (fisdir == NULL) { + if (bootverbose) + printf("No RedBoot FIS table located at %lu\n", + (long) offset); + return (NULL); + } + if (redbcfg != NULL && + fisdir->offset + fisdir->size == redbcfg->offset) { + /* + * Merged FIS/RedBoot config directory. + */ + if (bootverbose) + printf("FIS/RedBoot merged at 0x%jx (not yet)\n", + offset + fisdir->offset); + /* XXX */ + } + return head; +#undef match +} + +static struct g_geom * +g_redboot_taste(struct g_class *mp, struct g_provider *pp, int insist) +{ + struct g_geom *gp; + struct g_consumer *cp; + struct g_redboot_softc *sc; + int error, sectorsize, i; + struct fis_image_desc *fd, *head; + uint32_t offmask; + u_int blksize; /* NB: flash block size stored as stripesize */ + u_char *buf; + off_t offset; + + g_trace(G_T_TOPOLOGY, "redboot_taste(%s,%s)", mp->name, pp->name); + g_topology_assert(); + if (!strcmp(pp->geom->class->name, REDBOOT_CLASS_NAME)) + return (NULL); + /* XXX only taste flash providers */ + if (strncmp(pp->name, "cfi", 3)) + return (NULL); + gp = g_slice_new(mp, REDBOOT_MAXSLICE, pp, &cp, &sc, sizeof(*sc), + g_redboot_start); + if (gp == NULL) + return (NULL); + sectorsize = cp->provider->sectorsize; + blksize = cp->provider->stripesize; + if (powerof2(cp->provider->mediasize)) + offmask = cp->provider->mediasize-1; + else + offmask = 0xffffffff; /* XXX */ + if (bootverbose) + printf("%s: mediasize %ld secsize %d blksize %d offmask 0x%x\n", + __func__, (long) cp->provider->mediasize, sectorsize, + blksize, offmask); + if (sectorsize < sizeof(struct fis_image_desc) || + (sectorsize % sizeof(struct fis_image_desc))) + return (NULL); + g_topology_unlock(); + head = NULL; + offset = cp->provider->mediasize - blksize; +again: + buf = g_read_data(cp, offset, blksize, NULL); + if (buf != NULL) + head = parse_fis_directory(buf, blksize, offset, offmask); + if (head == NULL && offset != 0) { + if (buf != NULL) + g_free(buf); + offset = 0; /* check the front */ + goto again; + } + g_topology_lock(); + if (head == NULL) { + if (buf != NULL) + g_free(buf); + return NULL; + } + /* + * Craft a slice for each entry. + */ + for (fd = head, i = 0; fd != NULL; fd = fd->next) { + if (fd->name[0] == '\0') + continue; + error = g_slice_config(gp, i, G_SLICE_CONFIG_SET, + fd->offset, fd->size, sectorsize, "redboot/%s", fd->name); + if (error) + printf("%s: g_slice_config returns %d for \"%s\"\n", + __func__, error, fd->name); + sc->entry[i] = fd->entry; + sc->dsize[i] = fd->dsize; + i++; + } + g_free(buf); + g_access(cp, -1, 0, 0); + if (LIST_EMPTY(&gp->provider)) { + g_slice_spoiled(cp); + return (NULL); + } + return (gp); +} + +static void +g_redboot_config(struct gctl_req *req, struct g_class *mp, const char *verb) +{ + struct g_geom *gp; + + g_topology_assert(); + gp = gctl_get_geom(req, mp, "geom"); + if (gp == NULL) + return; + gctl_error(req, "Unknown verb"); +} + +static struct g_class g_redboot_class = { + .name = REDBOOT_CLASS_NAME, + .version = G_VERSION, + .taste = g_redboot_taste, + .dumpconf = g_redboot_dumpconf, + .ctlreq = g_redboot_config, + .ioctl = g_redboot_ioctl, +}; +DECLARE_GEOM_CLASS(g_redboot_class, g_redboot);