diff options
| author | simokawa <simokawa@FreeBSD.org> | 2007-06-07 13:20:48 +0000 |
|---|---|---|
| committer | simokawa <simokawa@FreeBSD.org> | 2007-06-07 13:20:48 +0000 |
| commit | 18d7fd2d4371f5d79c2ac1c217e458bfda61f04d (patch) | |
| tree | 83fc5cd4b3460eb14dfa30054d61cacad953ae19 /sys/dev/firewire/fwohci.c | |
| parent | 50b46323332dccf71371a6dcce216db32734e531 (diff) | |
| download | FreeBSD-src-18d7fd2d4371f5d79c2ac1c217e458bfda61f04d.zip FreeBSD-src-18d7fd2d4371f5d79c2ac1c217e458bfda61f04d.tar.gz | |
Add a tunable hw.firewire.phydma_enable.
This is enabled by default. It should be disabled for
those who are uneasy with peeking/poking from FireWire.
Please note sbp(4) and dcons(4) over FireWire need
this feature.
Diffstat (limited to 'sys/dev/firewire/fwohci.c')
| -rw-r--r-- | sys/dev/firewire/fwohci.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c index 06bdc01..cf8dfec 100644 --- a/sys/dev/firewire/fwohci.c +++ b/sys/dev/firewire/fwohci.c @@ -79,9 +79,13 @@ #undef OHCI_DEBUG static int nocyclemaster = 0; +int firewire_phydma_enable = 1; SYSCTL_DECL(_hw_firewire); SYSCTL_INT(_hw_firewire, OID_AUTO, nocyclemaster, CTLFLAG_RW, &nocyclemaster, 0, "Do not send cycle start packets"); +SYSCTL_INT(_hw_firewire, OID_AUTO, phydma_enable, CTLFLAG_RW, + &firewire_phydma_enable, 1, "Allow physical request DMA from firewire"); +TUNABLE_INT("hw.firewire.phydma_enable", &firewire_phydma_enable); static char dbcode[16][0x10]={"OUTM", "OUTL","INPM","INPL", "STOR","LOAD","NOP ","STOP",}; @@ -1862,12 +1866,13 @@ fwohci_intr_core(struct fwohci_softc *sc, uint32_t stat, int count) /* Allow async. request to us */ OWRITE(sc, OHCI_AREQHI, 1 << 31); - /* XXX insecure ?? */ - /* allow from all nodes */ - OWRITE(sc, OHCI_PREQHI, 0x7fffffff); - OWRITE(sc, OHCI_PREQLO, 0xffffffff); - /* 0 to 4GB regison */ - OWRITE(sc, OHCI_PREQUPPER, 0x10000); + if (firewire_phydma_enable) { + /* allow from all nodes */ + OWRITE(sc, OHCI_PREQHI, 0x7fffffff); + OWRITE(sc, OHCI_PREQLO, 0xffffffff); + /* 0 to 4GB region */ + OWRITE(sc, OHCI_PREQUPPER, 0x10000); + } /* Set ATRetries register */ OWRITE(sc, OHCI_ATRETRY, 1<<(13+16) | 0xfff); |
