cvs commit: src/sys/dev/bktr bktr_i2c.c src/sys/dev/ichsmb
ichsmb.c src/sys/dev/iicbus iicsmb.c src/sys/dev/smbus smb.c smb.h
smbconf.c smbconf.h smbus.c smbus.h smbus_if.m src/sys/pci alpm.c
amdpm.c amdsmb.c intpm.c nfsmb.c viapm.c
jhb at FreeBSD.org
Mon Sep 11 13:52:46 PDT 2006
jhb 2006-09-11 20:52:41 UTC
FreeBSD src repository
sys/dev/smbus smb.c smb.h smbconf.c smbconf.h smbus.c
sys/pci alpm.c amdpm.c amdsmb.c intpm.c nfsmb.c
Minor overhaul of SMBus support:
- Change smbus_callback() to pass a void * rather than caddr_t.
- Change smbus_bread() to pass a pointer to the count and have it be an
in/out parameter. The input is the size of the buffer (same as before),
but on return it will contain the actual amount of data read back from
the bus. Note that this value may be larger than the input value. It
is up to the caller to treat this as an error if desired.
- Change the SMB_BREAD ioctl to write out the updated struct smbcmd which
will contain the actual number of bytes read in the 'count' field. To
preserve the previous ABI, the old ioctl value is mapped to SMB_OLD_BREAD
which doesn't copy the updated smbcmd back out to userland. I doubt anyone
actually used the old BREAD anyway as it was rediculous to do a bulk-read
but not tell the using program how much data was actually read.
- Make the smbus driver and devclass public in the smbus module and
push all the DRIVER_MODULE()'s for attaching the smbus driver to
various foosmb drivers out into the foosmb modules. This makes all
the foosmb logic centralized and allows new foosmb modules to be
self-contained w/o having to hack smbus.c everytime a new smbus driver
- Add a new SMB_EINVAL error bit and use it in place of EINVAL to return
an error for bad arguments (such as invalid counts for bread and bwrite).
- Map SMB bus error bits to EIO in smbus_error().
- Make the smbus driver call bus_generic_probe() and require child drivers
such as smb(4) to create device_t's via identify routines. Previously,
smbus just created one anonymous device during attach, and if you had
multiple drivers that could attach it was just random chance as to which
driver got to probe for the sole device_t first.
- Add a mutex to the smbus(4) softc and use it in place of dummy splhigh()
to protect the 'owner' field and perform necessary synchronization for
smbus_request_bus() and smbus_release_bus().
- Change the bread() and bwrite() methods of alpm(4), amdpm(4), and
viapm(4) to only perform a single transaction and not try to use a
loop of multiple transactions for a large request. The framing and
commands to use for a large transaction depend on the upper-layer
protocol (such as SSIF for IPMI over SMBus) from what I can tell, and the
smb(4) driver never allowed bulk read/writes of more than 32-bytes
anyway. The other smb drivers only performed single transactions.
- Fix buffer overflows in the bread() methods of ichsmb(4), alpm(4),
amdpm(4), amdsmb(4), intpm(4), and nfsmb(4).
- Use SMB_xxx errors in viapm(4).
- Destroy ichsmb(4)'s mutex after bus_generic_detach() to avoid problems
from child devices making smb upcalls that would use the mutex during
their detach methods.
MFC after: 1 week
Reviewed by: jmg (mostly)
Revision Changes Path
1.28 +3 -1 src/sys/dev/bktr/bktr_i2c.c
1.16 +21 -12 src/sys/dev/ichsmb/ichsmb.c
1.14 +7 -5 src/sys/dev/iicbus/iicsmb.c
1.37 +17 -4 src/sys/dev/smbus/smb.c
1.5 +2 -1 src/sys/dev/smbus/smb.h
1.14 +48 -44 src/sys/dev/smbus/smbconf.c
1.8 +11 -7 src/sys/dev/smbus/smbconf.h
1.22 +27 -19 src/sys/dev/smbus/smbus.c
1.4 +2 -2 src/sys/dev/smbus/smbus.h
1.8 +2 -2 src/sys/dev/smbus/smbus_if.m
1.25 +43 -48 src/sys/pci/alpm.c
1.20 +45 -50 src/sys/pci/amdpm.c
1.3 +18 -11 src/sys/pci/amdsmb.c
1.34 +17 -13 src/sys/pci/intpm.c
1.4 +18 -11 src/sys/pci/nfsmb.c
1.15 +49 -54 src/sys/pci/viapm.c
More information about the cvs-src