D61383.1794443047.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D61383.1794443047.diff
View Options

	diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
	--- a/sys/dev/asmc/asmc.c
	+++ b/sys/dev/asmc/asmc.c
	@@ -557,13 +557,17 @@
	uint8_t len;
	char type[ASMC_TYPELEN + 1];

	- /* SMS: require all keys used by asmc_sms_init() */
	- sc->sc_has_sms = 1;
	- for (unsigned int k = 0; k < nitems(asmc_sms_required_keys); k++) {
	- if (asmc_key_getinfo(dev, asmc_sms_required_keys[k],
	- &len, type) != 0) {
	- sc->sc_has_sms = 0;
	- break;
	+ /* SMS: PIO only, the filter reads the PIO interrupt port. */
	+ sc->sc_has_sms = 0;
	+ if (!sc->sc_is_mmio) {
	+ sc->sc_has_sms = 1;
	+ for (unsigned int k = 0;
	+ k < nitems(asmc_sms_required_keys); k++) {
	+ if (asmc_key_getinfo(dev, asmc_sms_required_keys[k],
	+ &len, type) != 0) {
	+ sc->sc_has_sms = 0;
	+ break;
	+ }
	}
	}

	@@ -1001,7 +1005,8 @@
	uint8_t type;
	device_t dev = (device_t)arg;
	struct asmc_softc *sc = device_get_softc(dev);
	- if (!sc->sc_sms_intr_works)
	+
	+ if (sc->sc_is_mmio \|\| !sc->sc_sms_intr_works)
	return (FILTER_HANDLED);

	mtx_lock_spin(&sc->sc_mtx);