| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Minor CIS resource allocation code cleanup
Remove some fairly useless debug writes.
This finishes the work to move as much cardbus code as possible into
pci. We wind up removing 800-odd lines from cardbus.c: we go from
1285 to 400 lines.
Reviewed by: mdodd
|
|
|
|
|
|
|
|
| |
is encoded in the PCI BAR. The latter is more reliable.
This allows the sio/modem function of the Xircom RealPort ethernet+modem
card to work. Note that there still seem to be issues with sio_pci not
releasing resources on detach.
|
|
|
|
|
|
|
|
|
| |
pci busses implement this.
Also minor comment smithing in cardbus. Fix copyright to this year
with my name on it since I've been doing a lot to this file.
Reviewed by: jhb
|
| |
|
|
|
|
|
|
| |
depends on.
Pointy hat to: imp (anybody know if these things are accepted at Eco-Cycle?)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
o Use the common pci_* routines in preference to the copied and hacked
routines from an ancient pci.c.
This saves 509 lines in cardbus.c. More savings to follow when I
convert the resource code over. In the past when I've done this the
resource code conversion breaks cardbus in subtle ways so I'm doing a
1/2 way checkpoint this time. cardbus still works for me the same as
it did before.
It also looks like cardbus devices now show up as pci bus devices to
pciconf -l, but maybe that was happening before.
Inspired by a patch from Justin Gibbs many moons ago. When he
finishes his kobj multiple inheritance work, we can transition the
finished version of this work to that fairly easily.
|
|
|
|
| |
Don't complain about the Option ROM BAR type since it's perfectly valid.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Kill the slightly bogus #define for DECODE_PROTOTYPE
Be less verbose. Hide most (all I hope) of the CIS
parsing behind cardbus_debug_cis (which is set with
hw.cardbus.debug_cis=1).
This doesn't fix problems with parsing, but should make cardbus
less chatty. There appears to be some issues still with the
parsing of the CIS, but this won't fix them.
Prompted by: scottl
|
|
|
|
|
|
|
|
|
|
|
| |
Second part of the kldload patches for cardbus. This makes
kldload of a driver for a device that's inserted now appears
to work. To make it work, we only do a power cycle of the card
if there's no children drivers attached.
This likely is papering over bogosities in the power system. The
power sequence needs to be re-written, so I'll not worry about
the papering over until the re-write.
|
|
|
|
| |
Don't reach inside of rman to r_dev. Use rman_get_device instead.
|
| |
|
|
|
|
|
|
|
|
| |
unconditionally. kldloading a cardbus driver was shooting down other
attached devices because most drivers assume that one cannot
power-cycle cards w/o the driver knowning about it.
Submitted by: simokawa-san
|
|
|
|
| |
u_int*_t -> uint*_t to conform more closely with C99.
|
|
|
|
| |
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
|
|
|
|
| |
Approved by: re (blanket)
|
|
|
|
|
|
|
|
| |
sometimes, so return it when requested and it does. Also a little
more infrastructure for a few other things.
Submitted by: sam
Approved by: re (blanket for NEWCARD)
|
|
|
|
|
| |
o Add a diagnostic for an 'impossible' condition.
o Collapse common code.
|
| |
|
|
|
|
|
|
|
|
|
| |
bit in the PCI command register for the device. Otherwise, device drivers
that look at this register to see which types of BARs are usable will think
that none of them are.
This allows my Adaptec 1480A cardbus card to finally work.
Reviewed by: imp
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Fix some especially bad style in the CIS BAR tuple parsing code.
- activate Option ROMS correctly.
- de-obfuscate the Option ROM image selection code.
- Fix mis-interpretation of the PCI spec that prevented Option ROMs whose
CIS section wasn't in the first image from working.
- Fix mis-interpretation of the PCI spec that prevented CIS's mapped into
MEMIO space from working at all.
- Reject invalid CIS pointers.
Reviewed by: imp
|
|
|
|
|
|
| |
equals.
Approved by: imp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
o Always release the resources on device detach.
o Attach resources the same with driver added as we do we do in the insert
case (maybe this should be a routine).
o signal the wakeup of the thread on resume instead of trying to force an
interrupt.
o Minor debug hacks.
o use 0xffffffff instead of -1 for uint32_t items.
o Don't complain when we're asked to detach no cards. This is normal.
o Eliminate the now worthless second parameter to card_detach_card.
o minor style(9)isms
Some of these patches may be from: iwasaki-san, jhb, iadowse
|
|
|
|
|
|
|
|
|
|
|
|
| |
Note, we return the PCI pnp info, but in fact that's wrong to do
since that data is not defined for CardBus cards. CardBus says that
these registers are undefined and one should use the CIS to do
device matching. To date, all CardBus cards have had these
registered defined, no doubt because they are using common silicon
to produce both the PCI cards and the CardBus cards. However, it isn't
any worse than the rest of the system, so just note it in passing and
move on.
o Also sort prototypes while I'm here.
|
|
|
|
|
|
|
| |
complain when a is a unsigned type. So instead use the latter here
and be on our way.
Spotted by: flexlint by way of phk
|
|
|
|
|
|
| |
we're intending to shift.
Spotted by: flexlint by way of phk (should fix about 40 messages)
|
|
|
|
|
|
| |
# This code really needs a rewrite
Spotted by the eagle eyes of: phk
|
| |
|
| |
|
| |
|
|
|
|
|
| |
When casting a "const void *" to a "struct foo **" you want to actually
cast it to "struct foo * const *" not simply "const struct foo **".
|
| |
|
|
|
|
|
| |
unstable for the coming DP1 release. Instead, I'll develop that on
the IMP_CB_MERGE branch until it is more stable.
|
|
|
|
|
| |
that I introduced with -v. However, other problems still remain (including
the loss of interrupts).
|
|
|
|
| |
doesn't do that.
|
|
|
|
| |
of the cardbus problems that people may start seeing.
|
|
|
|
|
| |
- return(foo); (note parens)
- use __FBSDID()
|
|
|
|
| |
be smarter about a) cleanup and b) fallback.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
code into cardbus and s/pci/cardbus. This exposes a few pci_*
functions that are now static.
This work is similar to work Justin posted to the mobile list about a
year or two ago, which I have neglected since then.
This is a subset of his current work with the multiple inheritance
newbus architecutre. When completed, that will eliminate the need for
pci/pci_private.h.
Similar work is needed for the cardbus_cis and pccard_cis code as well.
|
|
|
|
|
| |
a card that isn't there unless we're booting verbose. It serves no
purpose.
|
|
|
|
|
|
|
| |
We really should have and use power state information, but none exists
today.
Submitted by: YAMAMOTO Shigeru-san <shigeru@iij.ad.jp>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Briefly, the significant changes include:
* Way better resource management in pccbb, pccard and cardbus.
* pccard hot-removal now appears to work.
* support pre-fetchable memory in cardbus.
* update cardbus to support new pci bus interface functions.
* Fix CIS reading to no longer use rman_get_virtual().
What's not there, but in the works:
* pccard needs to do interrupt properly and not read the ISR on single
function cards.
* real resource management for pccard
* a complete implementation of CIS parsing
* need to look into how to correctly use mutex in pccbb
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is the first part of a two-part update to NEWCARD. Changes in this
commit are non-functional, and includes the following:
* indentation and other changes to meet style(9).
* other minor style consistancy changes
* addition of comments
* renaming of device_t variables to be consistant across all of NEWCARD.
(note that not all style violations are fixed in this commit -- those that
aren't will be clobbered by the next commit.)
|
|
|
|
|
|
|
| |
mode, which is what the standard mandates.
Submitted by: Takanori Watanabe-san
Reviewed by: jhb
|
|
|
|
| |
Submitted by: Jeroen Ruigrok/Asmodai <asmodai@wxs.nl>
|
|
|
|
| |
There is no such thing as wierd in the english language.
|
|
|
|
|
|
|
|
| |
foo(int *nret)
{
for (i = 0; i < nret; i++) {
free(array[i], ....
Fix to do the logically correct thing.. (s/nret/*nret/)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- pccbb no longer needs to remember whether a card is inserted.
- pccbb reissues insertion on load of cardbus/pccard modules.
- got rid of unnecessary delays in power functions.
- Cardbus children are no longer deleted if probe/attach fails.
- non-attached child devices are reprobed at driver_added.
* CARD interface to read CIS
- added card_cis_read/card_cis_free interface to read arbitrary CIS
data. This currently is only implemented in cardbus.
* pccard begins to work
- pccard can now use higher memory space (and uses it by default).
- set_memory_offset interface changed.
- fixed ccr access, which was broken at multiple locations.
- implement an interrupt handler - pccard can now share interrupts.
- resource alloc/release/activate/deactivate functions gutted: some
resources are allocated by the bridge before the child device is
probed or attached. Thus the resource "belongs" to the bridge, and
the pccard_*_resource functions need to fudge the owner/rid.
- changed some error conditions to panics to speed debugging.
* Mutex fix - Giant is entered at the beginning of thread
|
|
|
|
| |
me in the previous round of patches. Oops.
|
|
|
|
|
|
|
|
|
| |
- Remove redundant header-type-specific support in the cardbus pcibus
clone. The bridges don't need this anymore.
- Use pcib_get_bus instead of the deprecated pci_get_secondarybus.
- Implement read/write ivar support for the pccbb, and teach it how
to report its secondary bus number. Save the subsidiary bus number
as well, although we don't use it yet.
|