Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arc Drop compat support for OpenBSD/arc disks.
details: https://anonhg.NetBSD.org/src/rev/e1f998ac0ee7
branches: trunk
changeset: 934676:e1f998ac0ee7
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Mon Jun 15 22:03:39 2020 +0000
description:
Drop compat support for OpenBSD/arc disks.
Note OpenBSD/arc was discontinued after 1998.
Tested on GXemul and ok'ed by soda@.
diffstat:
sys/arch/arc/arc/disksubr.c | 450 ---------------------------------------
sys/arch/arc/conf/files.arc | 4 +-
sys/arch/arc/include/disklabel.h | 4 +-
3 files changed, 3 insertions(+), 455 deletions(-)
diffs (truncated from 492 to 300 lines):
diff -r b9c133c3aa64 -r e1f998ac0ee7 sys/arch/arc/arc/disksubr.c
--- a/sys/arch/arc/arc/disksubr.c Mon Jun 15 21:56:49 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,450 +0,0 @@
-/* $NetBSD: disksubr.c,v 1.30 2019/04/03 22:10:49 christos Exp $ */
-/* $OpenBSD: disksubr.c,v 1.14 1997/05/08 00:14:29 deraadt Exp $ */
-/* NetBSD: disksubr.c,v 1.40 1999/05/06 15:45:51 christos Exp */
-
-/*
- * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
- *
- * @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.30 2019/04/03 22:10:49 christos Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/disk.h>
-#include <sys/disklabel.h>
-#include <sys/syslog.h>
-
-#include "opt_mbr.h"
-
-int fat_types[] = { MBR_PTYPE_FAT12, MBR_PTYPE_FAT16S,
- MBR_PTYPE_FAT16B, MBR_PTYPE_FAT32,
- MBR_PTYPE_FAT32L, MBR_PTYPE_FAT16L,
- -1 };
-
-#define NO_MBR_SIGNATURE ((struct mbr_partition *)-1)
-
-static struct mbr_partition *
-mbr_findslice(struct mbr_partition* dp, struct buf *bp);
-
-
-/*
- * Scan MBR for NetBSD partittion.
- *
- * OpenBSD source suggests MBR_MAGIC does not always exist, so,
- * assume the MBR is valid.
- *
- * Copy valid MBR partition-table into dp, and if a NetBSD
- * partition is found, return a pointer to it; else return NULL.
- */
-static
-struct mbr_partition *
-mbr_findslice(struct mbr_partition *dp, struct buf *bp)
-{
- struct mbr_partition *ourdp = NULL;
-#if 0
- uint16_t *mbrmagicp;
-#endif
- int i;
-
-#if 0
- /* Note: Magic number is little-endian. */
- mbrmagicp = (uint16_t *)(bp->b_data + MBR_MAGIC_OFFSET);
- if (*mbrmagicp != MBR_MAGIC)
- return NO_MBR_SIGNATURE;
-#endif
-
- /* XXX how do we check veracity/bounds of this? */
- memcpy(dp, (char *)bp->b_data + MBR_PART_OFFSET,
- MBR_PART_COUNT * sizeof(*dp));
-
- /* look for NetBSD partition */
- for (i = 0; i < MBR_PART_COUNT; i++) {
- if (dp[i].mbrp_type == MBR_PTYPE_NETBSD) {
- ourdp = &dp[i];
- break;
- }
- }
-
-#ifdef COMPAT_386BSD_MBRPART
- /* didn't find it -- look for 386BSD partition */
- if (!ourdp) {
- for (i = 0; i < MBR_PART_COUNT; i++) {
- if (dp[i].mbrp_type == MBR_PTYPE_386BSD) {
- printf("WARNING: old BSD partition ID!\n");
- ourdp = &dp[i];
- /*
- * If more than one matches, take last,
- * as NetBSD install tool does.
- */
-#if 0
- break;
-#endif
- }
- }
- }
-#endif /* COMPAT_386BSD_MBRPART */
-
- /* didn't find it -- look for OpenBSD partition */
- if (!ourdp) {
- for (i = 0; i < MBR_PART_COUNT; i++) {
- if (dp[i].mbrp_type == MBR_PTYPE_OPENBSD) {
- printf("WARNING: using OpenBSD partition\n");
- ourdp = &dp[i];
- break;
- }
- }
- }
-
- return ourdp;
-}
-
-
-/*
- * Attempt to read a disk label from a device
- * using the indicated strategy routine.
- * The label must be partly set up before this:
- * secpercyl, secsize and anything required for a block i/o read
- * operation in the driver's strategy/start routines
- * must be filled in before calling us.
- *
- * If dos partition table requested, attempt to load it and
- * find disklabel inside a DOS partition. Also, if bad block
- * table needed, attempt to extract it as well. Return buffer
- * for use in signalling errors if requested.
- *
- * Returns null on success and an error string on failure.
- */
-const char *
-readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
- struct cpu_disklabel *osdep)
-{
- struct mbr_partition *dp;
- struct partition *pp;
- struct dkbad *bdp;
- struct buf *bp;
- struct disklabel *dlp;
- const char *msg = NULL;
- int dospartoff, cyl, i, *ip;
- int use_openbsd_part = 0;
-
- /* minimal requirements for archtypal disk label */
- if (lp->d_secsize == 0)
- lp->d_secsize = DEV_BSIZE;
- if (lp->d_secperunit == 0)
- lp->d_secperunit = 0x1fffffff;
-#if 0
- if (lp->d_ncylinders == 16383) {
- printf("disklabel: Disk > 8G ... readjusting chs %d/%d/%d to ",
- lp->d_ncylinders, lp->d_ntracks, lp->d_nsectors);
- lp->d_ncylinders = lp->d_secperunit / lp->d_ntracks / lp->d_nsectors;
- printf("%d/%d/%d\n",
- lp->d_ncylinders, lp->d_ntracks, lp->d_nsectors);
- }
-#endif
- lp->d_npartitions = RAW_PART + 1;
- for (i = 0; i < RAW_PART; i++) {
- lp->d_partitions[i].p_size = 0;
- lp->d_partitions[i].p_offset = 0;
- }
- if (lp->d_partitions[i].p_size == 0)
- lp->d_partitions[i].p_size = 0x1fffffff;
- lp->d_partitions[i].p_offset = 0;
-
- /* get a buffer and initialize it */
- bp = geteblk((int)lp->d_secsize);
- bp->b_dev = dev;
-
- /* do dos partitions in the process of getting disklabel? */
- dospartoff = 0;
- cyl = LABELSECTOR / lp->d_secpercyl;
- if (!osdep)
- goto nombrpart;
- dp = osdep->mbrparts;
-
- /* XXX - OpenBSD supports disklabel in EXT partition, but we don't */
- /* read master boot record */
- bp->b_blkno = MBR_BBSECTOR;
- bp->b_bcount = lp->d_secsize;
- bp->b_flags |= B_READ;
- bp->b_cylinder = MBR_BBSECTOR / lp->d_secpercyl;
- (*strat)(bp);
-
- /* if successful, wander through dos partition table */
- if (biowait(bp)) {
- msg = "dos partition I/O error";
- goto done;
- } else {
- struct mbr_partition *ourdp = NULL;
-
- ourdp = mbr_findslice(dp, bp);
- if (ourdp == NO_MBR_SIGNATURE)
- goto nombrpart;
-
- for (i = 0; i < MBR_PART_COUNT; i++, dp++) {
- /* Install in partition e, f, g, or h. */
- pp = &lp->d_partitions[RAW_PART + 1 + i];
- pp->p_offset = dp->mbrp_start;
- pp->p_size = dp->mbrp_size;
- for (ip = fat_types; *ip != -1; ip++) {
- if (dp->mbrp_type == *ip)
- pp->p_fstype = FS_MSDOS;
- }
- if (dp->mbrp_type == MBR_PTYPE_LNXEXT2)
- pp->p_fstype = FS_EX2FS;
-
- if (dp->mbrp_type == MBR_PTYPE_NTFS)
- pp->p_fstype = FS_NTFS;
-
- /* is this ours? */
- if (dp == ourdp) {
- /* need sector address for SCSI/IDE,
- cylinder for ESDI/ST506/RLL */
- dospartoff = dp->mbrp_start;
- cyl = MBR_PCYL(dp->mbrp_scyl, dp->mbrp_ssect);
-
- /* update disklabel with details */
- lp->d_partitions[2].p_size =
- dp->mbrp_size;
- lp->d_partitions[2].p_offset =
- dp->mbrp_start;
-
- if (dp->mbrp_type == MBR_PTYPE_OPENBSD) {
- use_openbsd_part = 1;
- }
-#if 0
- if (lp->d_ntracks != dp->mbrp_ehd + 1 ||
- lp->d_nsectors != DPSECT(dp->mbrp_esect)) {
- printf("disklabel: BIOS sees chs "
- "%d/%d/%d as ",
- lp->d_ncylinders, lp->d_ntracks,
- lp->d_nsectors);
- lp->d_ntracks = dp->mbrp_ehd + 1;
- lp->d_nsectors = DPSECT(dp->mbrp_esect);
- lp->d_secpercyl =
- lp->d_ntracks * lp->d_nsectors;
- lp->d_ncylinders =
- lp->d_secperunit / lp->d_secpercyl;
- if (lp->d_ncylinders == 0)
- lp->d_ncylinders = 1;
- printf("%d/%d/%d\n",
- lp->d_ncylinders, lp->d_ntracks,
- lp->d_nsectors);
- }
-#endif
- }
- }
- lp->d_npartitions = RAW_PART + 1 + i;
- }
-
-nombrpart:
- /* next, dig out disk label */
- bp->b_blkno = dospartoff + LABELSECTOR;
- bp->b_cylinder = cyl;
- bp->b_bcount = lp->d_secsize;
- bp->b_oflags &= ~(BO_DONE);
- bp->b_flags |= B_READ;
- (*strat)(bp);
-
- /* if successful, locate disk label within block and validate */
- if (biowait(bp)) {
- msg = "disk label I/O error";
- goto done;
- }
- for (dlp = (struct disklabel *)bp->b_data;
- dlp <= (struct disklabel *)((char *)bp->b_data + lp->d_secsize -
- sizeof(*dlp));
- dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
- if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
- if (msg == NULL)
- msg = "no disk label";
- } else if (dlp->d_npartitions > MAXPARTITIONS ||
- dkcksum(dlp) != 0)
- msg = "disk label corrupted";
- else {
- if (use_openbsd_part) {
- if (dlp->d_npartitions < MAXPARTITIONS) {
- /* save OpenBSD d partition */
- dlp->d_partitions[dlp->d_npartitions] =
Home |
Main Index |
Thread Index |
Old Index