- Use the newly introduced pcib_mtx spin lock to lock psycho_ce(),

  allowing it to be a filter/"fast" handler. Locking the interrupt
  handlers with a spin lock is mainly a requirement in schizo(4)
  but as we ought to register the spin lock anyway it should not
  hurt to take advantage of it in psycho(4).
- Pass both a driver_filter_t and a driver_intr_t argument to
  psycho_set_intr(), allowing to get rid of the FAST interrupt
  flag hack.
- Don't register the over-temperature interrupt handler as filter/
  "fast" handler so shutdown_nice() can acquire the process lock.
- Use bus_{read,write}_8() instead of bus_space_{read,write}_8()
  in order to get rid of sc_bushandle and sc_bustag in the softc.
- Correct the debug output for adjusting the subordinate bus number.
- Remove the banal and outdated above psycho_filter_stub().
- Fix some white space nits.

1 files changed, 2 insertions, 4 deletions

diff --git a/sys/sparc64/pci/psychovar.h b/sys/sparc64/pci/psychovar.h
index fe20fe6..ddb4661 100644
--- a/sys/sparc64/pci/psychovar.h
+++ b/sys/sparc64/pci/psychovar.h
@@ -40,13 +40,11 @@
 struct psycho_softc {
 	device_t			sc_dev;
 
+	struct mtx			*sc_mtx;
+
 	/* Interrupt Group Number for this device */
 	int				sc_ign;
 
-	/* Our tags (from parent) */
-	bus_space_tag_t			sc_bustag;
-	bus_space_handle_t		sc_bushandle;
-
 	bus_addr_t			sc_pcictl;
 
 	phandle_t			sc_node;	/* Firmware node */