Prevent the rp driver from panic'ing on first access and make at

least the pci device unloadable

- Use ttymalloc() rather than a plain  malloc to allocate the
  rp->rp_tty ttys.  This is now required due to the recent locking
  changes to ttys and prevents a panic due to locking an unitialized
  t_mtx.

- Allow the pci driver to be unloaded.  This involved moving
  the call rp_releaseresource() to the end of rp_pcireleaseresource(),
  since rp_pcireleaseresource() uses ctlp->dev, which is freed
  by rp_releaseresource().

- Allow the generic part of the driver to be unattached by providing
  a hook to cancel timeouts.

Glanced at by: obrien

1 files changed, 6 insertions, 7 deletions

diff --git a/sys/dev/rp/rp_pci.c b/sys/dev/rp/rp_pci.c
index ca7494b..70aaa5b 100644
--- a/sys/dev/rp/rp_pci.c
+++ b/sys/dev/rp/rp_pci.c
@@ -208,7 +208,6 @@ nogo:
 	return (retval);
 }
 
-#if notdef
 static int
 rp_pcidetach(device_t dev)
 {
@@ -238,20 +237,22 @@ rp_pcishutdown(device_t dev)
 
 	return (0);
 }
-#endif /* notdef */
 
 static void
 rp_pcireleaseresource(CONTROLLER_t *ctlp)
 {
-	rp_releaseresource(ctlp);
-
+	rp_untimeout();
 	if (ctlp->io != NULL) {
 		if (ctlp->io[0] != NULL)
 			bus_release_resource(ctlp->dev, SYS_RES_IOPORT, ctlp->io_rid[0], ctlp->io[0]);
 		free(ctlp->io, M_DEVBUF);
+		ctlp->io = NULL;
 	}
-	if (ctlp->io_rid != NULL)
+	if (ctlp->io_rid != NULL) {
 		free(ctlp->io_rid, M_DEVBUF);
+		ctlp->io = NULL;
+	}
+	rp_releaseresource(ctlp);
 }
 
 static int
@@ -351,10 +352,8 @@ static device_method_t rp_pcimethods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		rp_pciprobe),
 	DEVMETHOD(device_attach,	rp_pciattach),
-#if notdef
 	DEVMETHOD(device_detach,	rp_pcidetach),
 	DEVMETHOD(device_shutdown,	rp_pcishutdown),
-#endif /* notdef */
 
 	{ 0, 0 }
 };