Author: marius
Date: Mon Oct 22 10:42:59 2012
New Revision: 241874
URL: http://svn.freebsd.org/changeset/base/241874
Log:
After r241858, remove the remainder of FreeBSD ~4 support from mpt(4).
MFC after: 1 week
Modified:
head/sys/dev/mpt/mpt.c
head/sys/dev/mpt/mpt.h
head/sys/dev/mpt/mpt_cam.c
head/sys/dev/mpt/mpt_debug.c
head/sys/dev/mpt/mpt_raid.c
Modified: head/sys/dev/mpt/mpt.c
==============================================================================
--- head/sys/dev/mpt/mpt.c Mon Oct 22 10:31:28 2012 (r241873)
+++ head/sys/dev/mpt/mpt.c Mon Oct 22 10:42:59 2012 (r241874)
@@ -286,10 +286,8 @@ mpt_modevent(module_t mod, int type, voi
}
case MOD_SHUTDOWN:
break;
-#if __FreeBSD_version >= 500000
case MOD_QUIESCE:
break;
-#endif
case MOD_UNLOAD:
error = pers->unload(pers);
mpt_personalities[pers->id] = NULL;
@@ -1471,15 +1469,9 @@ mpt_recv_handshake_reply(struct mpt_soft
*/
if ((reply_len >> 1) != hdr->MsgLength &&
(hdr->Function != MPI_FUNCTION_IOC_FACTS)){
-#if __FreeBSD_version >= 500000
mpt_prt(mpt, "reply length does not match message length: "
"got %x; expected %zx for function %x\n",
hdr->MsgLength << 2, reply_len << 1, hdr->Function);
-#else
- mpt_prt(mpt, "reply length does not match message length: "
- "got %x; expected %x for function %x\n",
- hdr->MsgLength << 2, reply_len << 1, hdr->Function);
-#endif
}
/* Get rest of the reply; but don't overflow the provided buffer */
@@ -2155,7 +2147,6 @@ mpt_disable_ints(struct mpt_softc *mpt)
static void
mpt_sysctl_attach(struct mpt_softc *mpt)
{
-#if __FreeBSD_version >= 500000
struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(mpt->dev);
struct sysctl_oid *tree = device_get_sysctl_tree(mpt->dev);
@@ -2170,7 +2161,6 @@ mpt_sysctl_attach(struct mpt_softc *mpt)
"failure_id", CTLFLAG_RW, &mpt->failure_id, -1,
"Next Target to Fail");
#endif
-#endif
}
int
Modified: head/sys/dev/mpt/mpt.h
==============================================================================
--- head/sys/dev/mpt/mpt.h Mon Oct 22 10:31:28 2012 (r241873)
+++ head/sys/dev/mpt/mpt.h Mon Oct 22 10:42:59 2012 (r241874)
@@ -100,52 +100,34 @@
#define _MPT_H_
/********************************* OS Includes
********************************/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/condvar.h>
#include <sys/endian.h>
#include <sys/eventhandler.h>
-#if __FreeBSD_version < 500000
#include <sys/kernel.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/devicestat.h>
-#else
#include <sys/lock.h>
-#include <sys/kernel.h>
-#include <sys/queue.h>
#include <sys/malloc.h>
+#include <sys/module.h>
#include <sys/mutex.h>
-#include <sys/condvar.h>
-#endif
#include <sys/proc.h>
-#include <sys/bus.h>
-#include <sys/module.h>
+#include <sys/queue.h>
+#include <sys/rman.h>
+#include <sys/types.h>
+#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/resource.h>
-#if __FreeBSD_version < 500000
-#include <machine/bus.h>
-#include <machine/clock.h>
-#endif
-
#ifdef __sparc64__
#include <dev/ofw/openfirm.h>
#include <machine/ofw_machdep.h>
#endif
-#include <sys/rman.h>
-
-#if __FreeBSD_version < 500000
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
-#else
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#endif
-#include <machine/bus.h>
#include "opt_ddb.h"
/**************************** Register Definitions
****************************/
@@ -241,7 +223,6 @@ int mpt_modevent(module_t, int, void *);
#if __FreeBSD_version < 600000
#define bus_get_dma_tag(x) NULL
#endif
-#if __FreeBSD_version >= 501102
#define mpt_dma_tag_create(mpt, parent_tag, alignment, boundary, \
lowaddr, highaddr, filter, filterarg, \
maxsize, nsegments, maxsegsz, flags, \
@@ -251,17 +232,6 @@ int mpt_modevent(module_t, int, void *);
maxsize, nsegments, maxsegsz, flags, \
busdma_lock_mutex, &(mpt)->mpt_lock, \
dma_tagp)
-#else
-#define mpt_dma_tag_create(mpt, parent_tag, alignment, boundary, \
- lowaddr, highaddr, filter, filterarg, \
- maxsize, nsegments, maxsegsz, flags, \
- dma_tagp) \
- bus_dma_tag_create(parent_tag, alignment, boundary, \
- lowaddr, highaddr, filter, filterarg, \
- maxsize, nsegments, maxsegsz, flags, \
- dma_tagp)
-#endif
-
struct mpt_map_info {
struct mpt_softc *mpt;
int error;
@@ -291,14 +261,9 @@ void mpt_map_rquest(void *, bus_dma_segm
kproc_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
#define mpt_kthread_exit(status) \
kproc_exit(status)
-#elif __FreeBSD_version > 500005
-#define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
\
- kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
-#define mpt_kthread_exit(status) \
- kthread_exit(status)
#else
#define mpt_kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
\
- kthread_create(func, farg, proc_ptr, fmtstr, arg)
+ kthread_create(func, farg, proc_ptr, flags, stackpgs, fmtstr, arg)
#define mpt_kthread_exit(status) \
kthread_exit(status)
#endif
@@ -599,13 +564,8 @@ struct mptsas_portinfo {
struct mpt_softc {
device_t dev;
-#if __FreeBSD_version < 500000
- uint32_t mpt_islocked;
- int mpt_splsaved;
-#else
struct mtx mpt_lock;
int mpt_locksetup;
-#endif
uint32_t mpt_pers_mask;
uint32_t
: 7,
@@ -676,7 +636,6 @@ struct mpt_softc {
#define mpt_fcport_speed cfg.fc._port_speed
} fc;
} cfg;
-#if __FreeBSD_version >= 500000
/*
* Device config information stored up for sysctl to access
*/
@@ -689,7 +648,6 @@ struct mpt_softc {
char wwpn[19];
} fc;
} scinfo;
-#endif
/* Controller Info for RAID information */
CONFIG_PAGE_IOC_2 * ioc_page2;
@@ -830,74 +788,6 @@ mpt_assign_serno(struct mpt_softc *mpt,
}
/***************************** Locking Primitives
*****************************/
-#if __FreeBSD_version < 500000
-#define MPT_IFLAGS INTR_TYPE_CAM
-#define MPT_LOCK(mpt) mpt_lockspl(mpt)
-#define MPT_UNLOCK(mpt) mpt_unlockspl(mpt)
-#define MPT_OWNED(mpt) mpt->mpt_islocked
-#define MPT_LOCK_ASSERT(mpt)
-#define MPTLOCK_2_CAMLOCK MPT_UNLOCK
-#define CAMLOCK_2_MPTLOCK MPT_LOCK
-#define MPT_LOCK_SETUP(mpt)
-#define MPT_LOCK_DESTROY(mpt)
-
-static __inline void mpt_lockspl(struct mpt_softc *mpt);
-static __inline void mpt_unlockspl(struct mpt_softc *mpt);
-
-static __inline void
-mpt_lockspl(struct mpt_softc *mpt)
-{
- int s;
-
- s = splcam();
- if (mpt->mpt_islocked++ == 0) {
- mpt->mpt_splsaved = s;
- } else {
- splx(s);
- panic("Recursed lock with mask: 0x%x", s);
- }
-}
-
-static __inline void
-mpt_unlockspl(struct mpt_softc *mpt)
-{
- if (mpt->mpt_islocked) {
- if (--mpt->mpt_islocked == 0) {
- splx(mpt->mpt_splsaved);
- }
- } else
- panic("Negative lock count");
-}
-
-static __inline int
-mpt_sleep(struct mpt_softc *mpt, void *ident, int priority,
- const char *wmesg, int timo)
-{
- int saved_cnt;
- int saved_spl;
- int error;
-
- KASSERT(mpt->mpt_islocked <= 1, ("Invalid lock count on tsleep"));
- saved_cnt = mpt->mpt_islocked;
- saved_spl = mpt->mpt_splsaved;
- mpt->mpt_islocked = 0;
- error = tsleep(ident, priority, wmesg, timo);
- KASSERT(mpt->mpt_islocked == 0, ("Invalid lock count on wakeup"));
- mpt->mpt_islocked = saved_cnt;
- mpt->mpt_splsaved = saved_spl;
- return (error);
-}
-
-#define mpt_req_timeout(req, ticks, func, arg) \
- callout_reset(&(req)->callout, (ticks), (func), (arg));
-#define mpt_req_untimeout(req, func, arg) \
- callout_stop(&(req)->callout)
-#define mpt_callout_init(mpt, c) \
- callout_init(c)
-#define mpt_callout_drain(mpt, c) \
- callout_stop(c)
-
-#else
#if 1
#define MPT_IFLAGS INTR_TYPE_CAM | INTR_ENTROPY |
INTR_MPSAFE
#define MPT_LOCK_SETUP(mpt)
\
@@ -957,7 +847,6 @@ mpt_sleep(struct mpt_softc *mpt, void *i
return (r);
}
#endif
-#endif
/******************************* Register Access
******************************/
static __inline void mpt_write(struct mpt_softc *, size_t, uint32_t);
@@ -1098,7 +987,6 @@ enum {
MPT_PRT_NONE=100
};
-#if __FreeBSD_version > 500000
#define mpt_lprt(mpt, level, ...) \
do { \
if (level <= (mpt)->verbose) \
@@ -1112,14 +1000,7 @@ do { \
mpt_prtc(mpt, __VA_ARGS__); \
} while (0)
#endif
-#else
-void mpt_lprt(struct mpt_softc *, int, const char *, ...)
- __printflike(3, 4);
-#if 0
-void mpt_lprtc(struct mpt_softc *, int, const char *, ...)
- __printflike(3, 4);
-#endif
-#endif
+
void mpt_prt(struct mpt_softc *, const char *, ...)
__printflike(2, 3);
void mpt_prtc(struct mpt_softc *, const char *, ...)
Modified: head/sys/dev/mpt/mpt_cam.c
==============================================================================
--- head/sys/dev/mpt/mpt_cam.c Mon Oct 22 10:31:28 2012 (r241873)
+++ head/sys/dev/mpt/mpt_cam.c Mon Oct 22 10:42:59 2012 (r241874)
@@ -105,11 +105,10 @@ __FBSDID("$FreeBSD$");
#include "dev/mpt/mpilib/mpi_targ.h"
#include "dev/mpt/mpilib/mpi_fc.h"
#include "dev/mpt/mpilib/mpi_sas.h"
-#if __FreeBSD_version >= 500000
-#include <sys/sysctl.h>
-#endif
+
#include <sys/callout.h>
#include <sys/kthread.h>
+#include <sys/sysctl.h>
#if __FreeBSD_version >= 700025
#ifndef CAM_NEW_TRAN_CODE
@@ -125,7 +124,6 @@ mpt_get_spi_settings(struct mpt_softc *,
static void mpt_setwidth(struct mpt_softc *, int, int);
static void mpt_setsync(struct mpt_softc *, int, int, int);
static int mpt_update_spi_config(struct mpt_softc *, int);
-static void mpt_calc_geometry(struct ccb_calc_geometry *ccg, int extended);
static mpt_reply_handler_t mpt_scsi_reply_handler;
static mpt_reply_handler_t mpt_scsi_tmf_reply_handler;
@@ -416,6 +414,8 @@ cleanup:
static int
mpt_read_config_info_fc(struct mpt_softc *mpt)
{
+ struct sysctl_ctx_list *ctx;
+ struct sysctl_oid *tree;
char *topology = NULL;
int rv;
@@ -473,33 +473,27 @@ mpt_read_config_info_fc(struct mpt_softc
mpt->mpt_fcport_page0.WWPN.High,
mpt->mpt_fcport_page0.WWPN.Low,
mpt->mpt_fcport_speed);
-#if __FreeBSD_version >= 500000
MPT_UNLOCK(mpt);
- {
- struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(mpt->dev);
- struct sysctl_oid *tree = device_get_sysctl_tree(mpt->dev);
+ ctx = device_get_sysctl_ctx(mpt->dev);
+ tree = device_get_sysctl_tree(mpt->dev);
- snprintf(mpt->scinfo.fc.wwnn,
- sizeof (mpt->scinfo.fc.wwnn), "0x%08x%08x",
- mpt->mpt_fcport_page0.WWNN.High,
- mpt->mpt_fcport_page0.WWNN.Low);
-
- snprintf(mpt->scinfo.fc.wwpn,
- sizeof (mpt->scinfo.fc.wwpn), "0x%08x%08x",
- mpt->mpt_fcport_page0.WWPN.High,
- mpt->mpt_fcport_page0.WWPN.Low);
-
- SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "wwnn", CTLFLAG_RD, mpt->scinfo.fc.wwnn, 0,
- "World Wide Node Name");
-
- SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
- "wwpn", CTLFLAG_RD, mpt->scinfo.fc.wwpn, 0,
- "World Wide Port Name");
+ snprintf(mpt->scinfo.fc.wwnn, sizeof (mpt->scinfo.fc.wwnn),
+ "0x%08x%08x", mpt->mpt_fcport_page0.WWNN.High,
+ mpt->mpt_fcport_page0.WWNN.Low);
+
+ snprintf(mpt->scinfo.fc.wwpn, sizeof (mpt->scinfo.fc.wwpn),
+ "0x%08x%08x", mpt->mpt_fcport_page0.WWPN.High,
+ mpt->mpt_fcport_page0.WWPN.Low);
+
+ SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ "wwnn", CTLFLAG_RD, mpt->scinfo.fc.wwnn, 0,
+ "World Wide Node Name");
+
+ SYSCTL_ADD_STRING(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+ "wwpn", CTLFLAG_RD, mpt->scinfo.fc.wwpn, 0,
+ "World Wide Port Name");
- }
MPT_LOCK(mpt);
-#endif
return (0);
}
@@ -1246,9 +1240,6 @@ mpt_timeout(void *arg)
ccb = (union ccb *)arg;
mpt = ccb->ccb_h.ccb_mpt_ptr;
-#if __FreeBSD_version < 500000
- MPT_LOCK(mpt);
-#endif
MPT_LOCK_ASSERT(mpt);
req = ccb->ccb_h.ccb_req_ptr;
mpt_prt(mpt, "request %p:%u timed out for ccb %p (req->ccb %p)\n", req,
@@ -1260,9 +1251,6 @@ mpt_timeout(void *arg)
req->state |= REQ_STATE_TIMEDOUT;
mpt_wakeup_recovery_thread(mpt);
}
-#if __FreeBSD_version < 500000
- MPT_UNLOCK(mpt);
-#endif
}
/*
@@ -3660,7 +3648,7 @@ mpt_action(struct cam_sim *sim, union cc
mpt_set_ccb_status(ccb, CAM_REQ_INVALID);
break;
}
- mpt_calc_geometry(ccg, /*extended*/1);
+ cam_calc_geometry(ccg, /* extended */ 1);
KASSERT(ccb->ccb_h.status, ("zero ccb sts at %d", __LINE__));
break;
}
@@ -4022,33 +4010,6 @@ mpt_update_spi_config(struct mpt_softc *
return (0);
}
-static void
-mpt_calc_geometry(struct ccb_calc_geometry *ccg, int extended)
-{
-#if __FreeBSD_version >= 500000
- cam_calc_geometry(ccg, extended);
-#else
- uint32_t size_mb;
- uint32_t secs_per_cylinder;
-
- if (ccg->block_size == 0) {
- ccg->ccb_h.status = CAM_REQ_INVALID;
- return;
- }
- size_mb = ccg->volume_size / ((1024L * 1024L) / ccg->block_size);
- if (size_mb > 1024 && extended) {
- ccg->heads = 255;
- ccg->secs_per_track = 63;
- } else {
- ccg->heads = 64;
- ccg->secs_per_track = 32;
- }
- secs_per_cylinder = ccg->heads * ccg->secs_per_track;
- ccg->cylinders = ccg->volume_size / secs_per_cylinder;
- ccg->ccb_h.status = CAM_REQ_CMP;
-#endif
-}
-
/****************************** Timeout Recovery
******************************/
static int
mpt_spawn_recovery_thread(struct mpt_softc *mpt)
Modified: head/sys/dev/mpt/mpt_debug.c
==============================================================================
--- head/sys/dev/mpt/mpt_debug.c Mon Oct 22 10:31:28 2012
(r241873)
+++ head/sys/dev/mpt/mpt_debug.c Mon Oct 22 10:42:59 2012
(r241874)
@@ -518,6 +518,7 @@ mpt_print_reply(void *vmsg)
static void
mpt_print_request_hdr(MSG_REQUEST_HEADER *req)
{
+
printf("%s @ %p\n", mpt_ioc_function(req->Function), req);
printf("\tChain Offset 0x%02x\n", req->ChainOffset);
printf("\tMsgFlags 0x%02x\n", req->MsgFlags);
@@ -841,13 +842,8 @@ mpt_dump_request(struct mpt_softc *mpt,
uint32_t *pReq = req->req_vbuf;
int o;
-#if __FreeBSD_version >= 500000
mpt_prt(mpt, "Send Request %d (%jx):",
req->index, (uintmax_t) req->req_pbuf);
-#else
- mpt_prt(mpt, "Send Request %d (%llx):",
- req->index, (unsigned long long) req->req_pbuf);
-#endif
for (o = 0; o < mpt->ioc_facts.RequestFrameSize; o++) {
if ((o & 0x7) == 0) {
mpt_prtc(mpt, "\n");
@@ -858,33 +854,6 @@ mpt_dump_request(struct mpt_softc *mpt,
mpt_prtc(mpt, "\n");
}
-#if __FreeBSD_version < 500000
-void
-mpt_lprt(struct mpt_softc *mpt, int level, const char *fmt, ...)
-{
- va_list ap;
- if (level <= mpt->verbose) {
- printf("%s: ", device_get_nameunit(mpt->dev));
- va_start(ap, fmt);
- vprintf(fmt, ap);
- va_end(ap);
- }
-}
-
-#if 0
-void
-mpt_lprtc(struct mpt_softc *mpt, int level, const char *fmt, ...)
-{
- va_list ap;
- if (level <= mpt->verbose) {
- va_start(ap, fmt);
- vprintf(fmt, ap);
- va_end(ap);
- }
-}
-#endif
-#endif
-
void
mpt_prt(struct mpt_softc *mpt, const char *fmt, ...)
{
Modified: head/sys/dev/mpt/mpt_raid.c
==============================================================================
--- head/sys/dev/mpt/mpt_raid.c Mon Oct 22 10:31:28 2012 (r241873)
+++ head/sys/dev/mpt/mpt_raid.c Mon Oct 22 10:42:59 2012 (r241874)
@@ -51,15 +51,10 @@ __FBSDID("$FreeBSD$");
#include <cam/cam.h>
#include <cam/cam_ccb.h>
+#include <cam/cam_periph.h>
#include <cam/cam_sim.h>
#include <cam/cam_xpt_sim.h>
-#if __FreeBSD_version < 500000
-#include <sys/devicestat.h>
-#define GIANT_REQUIRED
-#endif
-#include <cam/cam_periph.h>
-
#include <sys/callout.h>
#include <sys/kthread.h>
#include <sys/sysctl.h>
@@ -118,11 +113,7 @@ static void mpt_enable_vol(struct mpt_so
static void mpt_verify_mwce(struct mpt_softc *, struct mpt_raid_volume *);
static void mpt_adjust_queue_depth(struct mpt_softc *, struct mpt_raid_volume
*,
struct cam_path *);
-#if __FreeBSD_version < 500000
-#define mpt_raid_sysctl_attach(x) do { } while (0)
-#else
static void mpt_raid_sysctl_attach(struct mpt_softc *);
-#endif
static const char *mpt_vol_type(struct mpt_raid_volume *vol);
static const char *mpt_vol_state(struct mpt_raid_volume *vol);
@@ -1520,15 +1511,9 @@ mpt_refresh_raid_data(struct mpt_softc *
mpt_vol_prt(mpt, mpt_vol, "%s Priority Re-Sync\n",
prio ? "High" : "Low");
}
-#if __FreeBSD_version >= 500000
mpt_vol_prt(mpt, mpt_vol, "%ju of %ju "
"blocks remaining\n", (uintmax_t)left,
(uintmax_t)total);
-#else
- mpt_vol_prt(mpt, mpt_vol, "%llu of %llu "
- "blocks remaining\n", (uint64_t)left,
- (uint64_t)total);
-#endif
/* Periodically report on sync progress. */
mpt_schedule_raid_refresh(mpt);
@@ -1593,14 +1578,8 @@ mpt_raid_timer(void *arg)
struct mpt_softc *mpt;
mpt = (struct mpt_softc *)arg;
-#if __FreeBSD_version < 500000
- MPT_LOCK(mpt);
-#endif
MPT_LOCK_ASSERT(mpt);
mpt_raid_wakeup(mpt);
-#if __FreeBSD_version < 500000
- MPT_UNLOCK(mpt);
-#endif
}
static void
@@ -1644,7 +1623,6 @@ mpt_raid_free_mem(struct mpt_softc *mpt)
mpt->raid_max_disks = 0;
}
-#if __FreeBSD_version >= 500000
static int
mpt_raid_set_vol_resync_rate(struct mpt_softc *mpt, u_int rate)
{
@@ -1869,4 +1847,3 @@ mpt_raid_sysctl_attach(struct mpt_softc
&mpt->raid_nonopt_volumes, 0,
"number of nonoptimal volumes");
}
-#endif
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
