aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [SERIAL] Fix resume handling bugRussell King2006-10-01
| | | | | | | | Unfortunately, pcmcia_dev_present() returns false when a device is suspended, so checking this on resume does not work too well. Omit this test. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] Remove wrong asm/serial.h inclusionsRussell King2006-10-01
| | | | | | | | | | | | | | | | asm/serial.h is supposed to contain the definitions for the architecture specific 8250 ports for the 8250 driver. It may also define BASE_BAUD, but this is the base baud for the architecture specific ports _only_. Therefore, nothing other than the 8250 driver should be including this header file. In order to move towards this goal, here is a patch which removes some of the more obvious incorrect includes of the file. Acked-by: Paul Fulghum <paulkf@microgate.com> Acked-by: Tony Luck <tony.luck@intel.com> Acked-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] CONFIG_PM=n slim: drivers/serial/8250_pci.cAlexey Dobriyan2006-10-01
| | | | | | | | Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] OMAP1510 serial fix for 115200 baudJonathan McDowell2006-10-01
| | | | | | | | | | | | The patch below is necessary for 115200 baud on an OMAP1510 internal UART. It's been in the linux-omap tree for some time and with it applied to a vanilla Linus git tree the serial console on the Amstrad Delta (which is OMAP1510 based and whose initial bootloader runs at 115200) works fine (it doesn't without it). Signed-off-by: Jonathan McDowell <noodles@earth.li> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] returning proper error from serial core driverRam Gupta2006-10-01
| | | | | | | | | Fix the issue of returning 0 even in case of error from uart_set_info function. Now it returns the error EBUSY when it can not set new port. Signed-off-by: Ram Gupta <r.gupta@astronautics.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] Make uart_line_info() correctly tell MMIO from I/O portSergei Shtylyov2006-10-01
| | | | | | | | /proc/tty/driver/serial incorrectly claims that UARTs having iotype of UPIO_MEM32, UPIO_AU, or UPIO_TSI are I/O mapped. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] suspend/resume handlers don't have level arg anymoreSergei Shtylyov2006-10-01
| | | | | | | | 8250.c and serial_txx9.c port suspend/resume handler still have this obsolete argument documented... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] 8250 resourse management fixesSergei Shtylyov2006-10-01
| | | | | | | | | | | I think register ranges obviously need to be claimed/released for all UARTs including those with UPIO_MEM32 and UPIO_TSI iotype. Also, serial8250_request_rsa_resources() returns false positives with UPIO_MEM32, UPIO_AU, and UPIO_TSI iotype -- I don't think this makes any sense. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] serial_cs: Add quirk for brainboxes 2-port RS232 cardRussell King2006-10-01
| | | | | | | | Mauro Ziliani reports that this card has a higher clock rate. Rather than tweak the 8250 driver to handle this, add a quirk to pass the correct clock rate to the driver. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] serial_cs: handle Nokia multi->single port bodge via config quirkRussell King2006-10-01
| | | | | | | | | | According to the existing code, Nokia only make single-port cards, but are detected as multi-port cards. Handle this in roughly the same way via the config quirk - forcing it to be a real single port card (info->multi=0) changes the way we allocate the IO memory, which might stop the card working. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] serial_cs: add configuration quirkRussell King2006-10-01
| | | | | | | Add a quirk primerily to handle tweaks to the link->conf structure, eg as required for Socket cards. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] serial_cs: Convert Oxford 950 / Possio GCC wakeup quirkRussell King2006-10-01
| | | | | | | Move the Oxford Semi OX950 / Possio GCC wakeup handling to a quirk wakeup handler. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] serial_cs: convert IBM post-init handling to a quirkRussell King2006-10-01
| | | | | | | | | Move IBM quirk handling into its own quirk entry. Note that doing quirk handling after we've registered the ports is racy, but since I don't know if moving this will have an undesired effect, it's probably better to leave where it is. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] serial_cs: allow wildcarded quirksRussell King2006-10-01
| | | | | | | | Some quirks we will introduce next apply to (eg) all cards of one manufacturer. Therefore, we need a way to list these in the quirk table - use ~0 - this is not a possible device ID value. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] serial_cs: convert multi-port table to quirk tableRussell King2006-10-01
| | | | | | | | | | | - rename multi_id table to serial_quirk / quirks[] - use named initialisers - store a pointer to the quirk table in the serial_info structure so we can use the quirk table entry later. - apply multi-port quirk after the multi-port guessing code, but only if it's != -1. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] serial_cs: Use clean up multiport card detectionRussell King2006-10-01
| | | | | | | | | | - Use ARRAY_SIZE() instead of home grown based version. - use parse->manfid.card rather than le16_to_cpu(buf[1]) - manfid.card is already converted to this format. - use info->prodid in subsequent tests rather than parse->manfid.card. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [SERIAL] Remove m32r_sio dependency on asm/serial.hRussell King2006-10-01
| | | | | | | | | | | | m32r_sio re-uses a custom defined BASE_BAUD from asm/serial.h, and replaces SERIAL_PORT_DFNS with its own driver private copy. Since asm/serial.h is supposed to define 8250-based ports using these symbols, this isn't a sane idea. Hence, eliminate asm/serial.h from m32r_sio.c. Acked-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-09-29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [ATM]: [lec] use refcnt to protect lec_arp_entries outside lock [ATM]: [lec] add reference counting to lec_arp entries [ATM]: [lec] use work queue instead of timer for lec arp expiry [ATM]: [lec] old_close is no longer used [ATM]: [lec] convert lec_arp_table to hlist [ATM]: [lec] header indent, comment and whitespace cleanup [ATM]: [lec] indent, comment and whitespace cleanup [continued] [ATM]: [lec] indent, comment and whitespace cleanup [SCTP]: Do not timestamp every SCTP packet. [SCTP]: Use correct mask when disabling PMTUD. [SCTP]: Include sk_buff overhead while updating the peer's receive window. [SCTP]: Enable Nagle algorithm by default. [BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present. [NetLabel]: audit fixups due to delayed feedback
| * [ATM]: [lec] use refcnt to protect lec_arp_entries outside lockChas Williams2006-09-29
| | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [ATM]: [lec] add reference counting to lec_arp entriesChas Williams2006-09-29
| | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [ATM]: [lec] use work queue instead of timer for lec arp expiryChas Williams2006-09-29
| | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [ATM]: [lec] old_close is no longer usedChas Williams2006-09-29
| | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [ATM]: [lec] convert lec_arp_table to hlistChas Williams2006-09-29
| | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [ATM]: [lec] header indent, comment and whitespace cleanupChas Williams2006-09-29
| | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [ATM]: [lec] indent, comment and whitespace cleanup [continued]Chas Williams2006-09-29
| | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [ATM]: [lec] indent, comment and whitespace cleanupChas Williams2006-09-29
| | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SCTP]: Do not timestamp every SCTP packet.Vlad Yasevich2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | We only need the timestamp on COOKIE-ECHO chunks, so instead of always timestamping every SCTP packet, let common code timestamp if the socket option is set. For COOKIE-ECHO, simply get the time of day if we don't have a timestamp. This introduces a small possibility that the cookie may be considered expired, but it will be renegotiated. Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SCTP]: Use correct mask when disabling PMTUD.Vlad Yasevich2006-09-29
| | | | | | | | | | | | Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SCTP]: Include sk_buff overhead while updating the peer's receive window.Sridhar Samudrala2006-09-29
| | | | | | | | | | | | | | | | | | | | | | Currently if the sender is sending small messages, it can cause a receiver to run out of receive buffer space even when the advertised receive window is still open and results in packet drops and retransmissions. Including a overhead while updating the sender's view of peer receive window will reduce the chances of receive buffer space overshooting the receive window. Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SCTP]: Enable Nagle algorithm by default.Sridhar Samudrala2006-09-29
| | | | | | | | | | | | | | | | This allows more aggressive bundling of chunks when sending small messages. Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present.Michael Chan2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSI is defined to be 32-bit write. The 5706 does 64-bit MSI writes with byte enables disabled on the unused 32-bit word. This is legal but causes problems on the AMD 8132 which will eventually stop responding after a while. Without this patch, the MSI test done by the driver during open will pass, but MSI will eventually stop working after a few MSIs are written by the device. AMD believes this incompatibility is unique to the 5706, and prefers to locally disable MSI rather than globally disabling it using pci_msi_quirk. Update version to 1.4.45. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [NetLabel]: audit fixups due to delayed feedbackPaul Moore2006-09-29
| | | | | | | | | | | | | | | | | | | | Fix some issues Steve Grubb had with the way NetLabel was using the audit subsystem. This should make NetLabel more consistent with other kernel generated audit messages specifying configuration changes. Signed-off-by: Paul Moore <paul.moore@hp.com> Acked-by: Steve Grubb <sgrubb@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [SERIAL] sunzilog: Mark sunzilog_init_hw as __devinit.David S. Miller2006-09-29
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | [SPARC]: Don't zero out tail during copy_from_user_inatomic().David S. Miller2006-09-29
|/ | | | | | | | Actually, since we use the same code for all the copying types in and out of userspace, we check at runtime whether preemption is disabled. Signed-off-by: David S. Miller <davem@davemloft.net>
* [PATCH] uml build fixOllie Wild2006-09-29
| | | | | | Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] MLSXFRM: fix mis-labelling of child socketsDavid Woodhouse2006-09-29
| | | | | | | | | | | | Accepted connections of types other than AF_INET, AF_INET6, AF_UNIX won't have an appropriate label derived from the peer, so don't use it. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: James Morris <jmorris@namei.org> Acked-by: Paul Moore <paul.moore@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2006-09-29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: (33 commits) IB/ipath: Fix lockdep error upon "ifconfig ibN down" IB/ipath: Fix races with ib_resize_cq() IB/ipath: Support new PCIE device, QLE7142 IB/ipath: Set CPU affinity early IB/ipath: Fix EEPROM read when driver is compiled with -Os IB/ipath: Fix and recover TXE piobuf and PBC parity errors IB/ipath: Change HT CRC message to indicate how to resolve problem IB/ipath: Clean up module exit code IB/ipath: Call mtrr_del with correct arguments IB/ipath: Flush RWQEs if access error or invalid error seen IB/ipath: Improved support for PowerPC IB/ipath: Drop unnecessary "(void *)" casts IB/ipath: Support multiple simultaneous devices of different types IB/ipath: Fix mismatch in shifts and masks for printing debug info IB/ipath: Fix compiler warnings and errors on non-x86_64 systems IB/ipath: Print more informative parity error messages IB/ipath: Ensure that PD of MR matches PD of QP checking the Rkey IB/ipath: RC and UC should validate SLID and DLID IB/ipath: Only allow complete writes to flash IB/ipath: Count SRQs properly ...
| * IB/ipath: Fix lockdep error upon "ifconfig ibN down"Bryan O'Sullivan2006-09-28
| | | | | | | | | | Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Fix races with ib_resize_cq()Bryan O'Sullivan2006-09-28
| | | | | | | | | | | | | | | | | | The resize CQ function changes the memory used to store the queue. Other routines need to honor the lock before accessing the pointer to the queue and verify that the head and tail are in range. Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Support new PCIE device, QLE7142Bryan O'Sullivan2006-09-28
| | | | | | | | | | Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Set CPU affinity earlyBryan O'Sullivan2006-09-28
| | | | | | | | | | | | | | | | | | This change moves around port assignment so that it happens before any memory is allocated. This allows memory to be allocated on an appropriate CPU, which improves performance for users of /dev/ipath. Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Fix EEPROM read when driver is compiled with -OsBryan O'Sullivan2006-09-28
| | | | | | | | | | | | | | | | | | The EEPROM is read via programmable I/O pins. When the driver is compiled -Os, the CPU can speculatively read the I/O value before it is valid. This patch fixes the problem. Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Fix and recover TXE piobuf and PBC parity errorsBryan O'Sullivan2006-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can sometimes trigger parity errors due to processor speculative reads to our write-combined memory (mostly seen on Woodcrest). Add a stats counter for these. Factored out the sendbuffererror buffer cancellation code so it can be used in the new handling; suppress likely subsequent error messages if within two jiffies of the cancellation. Also restore 2 dropped TXE lines on hwe_bitsextant noticed while debugging. Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Change HT CRC message to indicate how to resolve problemBryan O'Sullivan2006-09-28
| | | | | | | | | | | | | | | | The system must be powercycled to clear a HT CRC error; reloading the driver is not enough. Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Clean up module exit codeBryan O'Sullivan2006-09-28
| | | | | | | | | | Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Call mtrr_del with correct argumentsBryan O'Sullivan2006-09-28
| | | | | | | | | | | | | | | | We were passing 0 for base and length, which worked on older kernels, but it doesn't seem to any longer. Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Flush RWQEs if access error or invalid error seenBryan O'Sullivan2006-09-28
| | | | | | | | | | | | | | | | If the receiver goes into the error state, we need to flush the posted receive WQEs. Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Improved support for PowerPCBryan O'Sullivan2006-09-28
| | | | | | | | | | Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Drop unnecessary "(void *)" castsBryan O'Sullivan2006-09-28
| | | | | | | | | | Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * IB/ipath: Support multiple simultaneous devices of different typesBryan O'Sullivan2006-09-28
| | | | | | | | | | | | | | | | Prior to this change, the driver was not able to support a HT and PCIE card simultaneously present in the same machine. Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>