diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-26 10:48:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-26 10:48:27 -0500 |
| commit | 98c1fc934c097d84dc30c639e9bdb0b992ef53e2 (patch) | |
| tree | 69150e7ca6b4a0eb842d5135164ee1d40a4dabbe /Documentation | |
| parent | 7c811e4b6af424c295e3c6438fdc9b647fe6595f (diff) | |
| parent | fae603121428ba83b7343c88e68a7144525ab3eb (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: fix NULL pointer deref. and resource leak
Documentation: correction to debugging-via-ohci1394
ieee1394: sbp2: fix rescan-scsi-bus
firewire: fw-sbp2: fix NULL pointer deref. in scsi_remove_device
firewire: fw-sbp2: fix NULL pointer deref. in slave_alloc
firewire: fw-sbp2: (try to) avoid I/O errors during reconnect
firewire: fw-sbp2: enforce a retry of __scsi_add_device if bus generation changed
firewire: fw-sbp2: sort includes
firewire: fw-sbp2: logout and login after failed reconnect
firewire: fw-sbp2: don't add scsi_device twice
firewire: fw-sbp2: log bus_id at management request failures
firewire: fw-sbp2: wait for completion of fetch agent reset
ieee1394: sbp2: add INQUIRY delay workaround
firewire: fw-sbp2: add INQUIRY delay workaround
firewire: log GUID of new devices
firewire: fw-sbp2: don't retry login or reconnect after unplug
firewire: fix "kobject_add failed for fw* with -EEXIST"
firewire: fw-sbp2: fix logout before login retry
firewire: fw-sbp2: unsigned int vs. unsigned
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/debugging-via-ohci1394.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Documentation/debugging-via-ohci1394.txt b/Documentation/debugging-via-ohci1394.txt index de4804e8b396..c360d4e91b48 100644 --- a/Documentation/debugging-via-ohci1394.txt +++ b/Documentation/debugging-via-ohci1394.txt | |||
| @@ -36,14 +36,15 @@ available (notebooks) or too slow for extensive debug information (like ACPI). | |||
| 36 | Drivers | 36 | Drivers |
| 37 | ------- | 37 | ------- |
| 38 | 38 | ||
| 39 | The OHCI-1394 drivers in drivers/firewire and drivers/ieee1394 initialize | 39 | The ohci1394 driver in drivers/ieee1394 initializes the OHCI-1394 controllers |
| 40 | the OHCI-1394 controllers to a working state and can be used to enable | 40 | to a working state and enables physical DMA by default for all remote nodes. |
| 41 | physical DMA. By default you only have to load the driver, and physical | 41 | This can be turned off by ohci1394's module parameter phys_dma=0. |
| 42 | DMA access will be granted to all remote nodes, but it can be turned off | 42 | |
| 43 | when using the ohci1394 driver. | 43 | The alternative firewire-ohci driver in drivers/firewire uses filtered physical |
| 44 | 44 | DMA, hence is not yet suitable for remote debugging. | |
| 45 | Because these drivers depend on the PCI enumeration to be completed, an | 45 | |
| 46 | initialization routine which can runs pretty early (long before console_init(), | 46 | Because ohci1394 depends on the PCI enumeration to be completed, an |
| 47 | initialization routine which runs pretty early (long before console_init() | ||
| 47 | which makes the printk buffer appear on the console can be called) was written. | 48 | which makes the printk buffer appear on the console can be called) was written. |
| 48 | 49 | ||
| 49 | To activate it, enable CONFIG_PROVIDE_OHCI1394_DMA_INIT (Kernel hacking menu: | 50 | To activate it, enable CONFIG_PROVIDE_OHCI1394_DMA_INIT (Kernel hacking menu: |