aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAge
* Merge branch 'master'Jeff Garzik2005-12-13
|\
| * Merge branch 'upstream-fixes' of ↵Linus Torvalds2005-12-13
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| | * [libata] mark certain hardware (or drivers) with a no-atapi flagJeff Garzik2005-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some hardware does not support the PACKET command at all. Other hardware supports ATAPI, but the driver does something nasty such as calling BUG() when an ATAPI command is issued. For these such cases, we mark them with a new flag, ATA_FLAG_NO_ATAPI. Initial version contributed by Ben Collins.
* | | Merge branch 'upstream-fixes'Jeff Garzik2005-12-13
|\| |
| * | [netdrvr skge] fix buildJeff Garzik2005-12-13
| |/
| * [PATCH] fbdev: Fix incorrect unaligned access in little-endian machinesAntonino A. Daplas2005-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The drawing function cfbfillrect does not work correctly when access is not unsigned-long aligned. It manifests as extra lines of pixels that are not complete drawn. Reversing the shift operator solves the problem, so I would presume that this bug would manifest only on little endian machines. The function cfbcopyarea may also have this bug. Aligned access should present no problems. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] fbdev: Shift pixel value before entering loop in cfbimageblitAntonino A. Daplas2005-12-13
| | | | | | | | | | | | | | | | | | | | In slow imageblit, the pixel value is shifted by a certain amount (dependent on the bpp and endianness) for each iteration. This is inefficient. Better do the shifting once before going into the loop. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] fbdev: fix switch to KD_TEXT, enhanced versionKnut Petersen2005-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every framebuffer driver relies on the assumption that the set_par() function of the driver is called before drawing functions and other functions dependent on the hardware state are executed. Whenever you switch from X to a framebuffer console for the very first time, there is a chance that a broken X system has _not_ set the mode to KD_GRAPHICS, thus the vt and framebuffer code executes a screen redraw and several other functions before a set_par() is executed. This is believed to be not a bug of linux but a bug of X/xdm. At least some X releases used by SuSE and Debian show this behaviour. There was a 2nd case, but that has been fixed by Antonino Daplas on 10-dec-2005. This patch allows drivers to set a flag to inform fbcon_switch() that they prefer a set_par() call on every console switch, working around the problems caused by the broken X releases. The flag will be used by the next release of cyblafb and might help other drivers that assume a hardware state different to the one used by X. As the default behaviour does not change, this patch should be acceptable to everybody. Signed-off-by: Knut Petersen <Knut_Petersen@t-online.de> Acked-by: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] fbcon: Avoid illegal display panningAntonino A. Daplas2005-12-13
| | | | | | | | | | | | | | | | Avoid calls to fb_pan_display when driver is suspended or not in text mode. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] fbdev: Pan display fixesAntonino A. Daplas2005-12-13
| | | | | | | | | | | | | | | | | | | | | | | | - Fix fb_pan_display rejecting yoffsets that are valid if panning mode is ywrap. - Add more robust error checking in fb_pan_display specially since this function is accessible by userland apps. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] fbcon: Add ability to save/restore graphics stateAntonino A. Daplas2005-12-13
| | | | | | | | | | | | | | | | | | | | | | | | Add hooks to save and restore the graphics state. These hooks are called in fbcon_blank() when entering/leaving KD_GRAPHICS mode. This is needed by savagefb at least so it can cooperate with savage_dri and by cyblafb. State save/restoration can be full or partial. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] fbcon: fix complement_mask() with 512 character mapAntonino A. Daplas2005-12-13
| | | | | | | | | | | | | | | | | | There is a bug in the complement_mask when you have a 512-character map. Linux boots to a default 256-character map and most probably your login profile is loading a 512-character map which results in a bad gpm cursor. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] cciss: fix for deregister_diskMike Miller2005-12-13
| | | | | | | | | | | | | | | | | | | | | | This patch adds setting our drv->queue = NULL back in deregister_disk. The drv->queue is part of our controller struct. blk_cleanup_queue works only on the queue in the gendisk struct. Signed-off-by: Mike Miller <mike.miller@hp.com> Cc: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge branch 'upstream-fixes' of ↵Linus Torvalds2005-12-13
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * \ Merge branch 'upstream-fixes' of ↵Linus Torvalds2005-12-13
| |\ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| | * | [PATCH] libata-core.c: fix parameter bug on kunmap_atomic() callsMark Lord2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect pointer usage on two calls to kunmap_atomic(). This seems to happen a lot, because kunmap() wants the struct page *, whereas kunmap_atomic() instead wants the mapped virtual address. Signed-off-by: Mark Lord <liml@rtr.ca> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [drm] fix radeon aperture issueDave Airlie2005-12-13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ben noticed that on certain cards we've landed the AGP space on top of the second aperture instead of after it.. Which messes things up a lot on those machines. This just moves the gart further out, a more correct fix is in the works from Ben for after 2.6.15. Signed-off-by: Dave Airlie <airlied@linux.ie> CC: Ben Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge branch 'upstream-fixes'Jeff Garzik2005-12-13
|\ \ \ | | |/ | |/|
| * | [PATCH] skge: get rid of warning on raceStephen Hemminger2005-12-12
| |/ | | | | | | | | | | | | | | | | Get rid of warning in case of race with ring full and lockless tx on the skge driver. It is possible to be in the transmit routine with no available slots and already stopped. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * Merge branch 'upstream-fixes' of ↵Linus Torvalds2005-12-12
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| | * [PATCH] pcnet32: use MAC address from prom also on powerpcOlaf Hering2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSR contains garbage after a coldboot on RS/6000. One some systems (like my 44p 270) the MAC address is all FF, on others (like my B50) it is ff:ff:ff:fd:ff:6b. It can eventually be fixed by loading pcnet32, set the interface into the UP state, rmmod pcnet32 and load it again. But this worked only on the 270. Only netbooting after a cold start provides the correct MAC address via prom and CSR. This makes it very unreliable. I dont know why the MAC is stored in two different places. Remove the special case for powerpc, which was added in early 2.4 development. Signed-off-by: Olaf Hering <olh@suse.de> drivers/net/pcnet32.c | 5 ----- 1 files changed, 5 deletions(-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * Merge branch 'master'Jeff Garzik2005-12-12
| | |\
| | * | [PATCH] sk98lin: rx checksum offset not setStephen Hemminger2005-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The checksum offsets for receive offload were not being set correctly. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2005-12-12
| |\ \ \
| | * | | [SBUSFB] tcx: Use FB_BLANK_UNBLANK instead of magic constant.Hareesh Nagarajan2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Hareesh Nagarajan <hnagar2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | | [SBUSFB]: Kill 'list' member from foo_par structs, totally unused.David S. Miller2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based upon a patch from Hareesh Nagarajan. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-12-12
| |\ \ \ \
| | * | | | [ARM SMP] mpcore_wdt bogus fpos checkMarcelo Tosatti2005-12-05
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/char/watchdog/mpcore_wdt.c write function contains a check for (ppos != &file->f_pos). Such check used to make sense when a pointer to file->f_pos was handed by vfs_write(), not a copy of it as it stands now. Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds2005-12-12
| |\ \ \ \
| | * | | | [MMC] Proper check of SCR error codePierre Ossman2005-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The routine reading the SCR wasn't paying proper attention to the error codes returned from the driver. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2005-12-12
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [SERIAL] 8250_pci: Remove redundant assignment, and mark fallthrough.Dave Jones2005-12-07
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | | / [PATCH] Fix SCSI scanning slab corruptionBrian King2005-12-12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a double free in the scsi scan code if a LLDD's slave_alloc() call fails. There is a direct call to scsi_free_queue and then the following put_device calls the release function, which also frees the queue. Remove the redundant scsi_free_queue. Signed-off-by: Brian King <brking@us.ibm.com> Tested-by: Nathan Lynch <ntl@pobox.com> [ Also removed some strange whitespace artifacts in that area ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | e1000: Fixes for 8357xJeff Kirsher2005-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - TSO workaround - Fixes eeprom version reporting - Fix loopback test - Fix for WOL Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
* | | | Merge branch 'e1000'Jeff Garzik2005-12-13
|\ \ \ \
| * \ \ \ Merge branch 'master'Jeff Garzik2005-12-06
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master'Jeff Garzik2005-12-03
| |\ \ \ \
| * \ \ \ \ Merge branch 'master'Jeff Garzik2005-12-01
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'linville-e1000' of git://git.tuxdriver.com/git/netdev-jwlJeff Garzik2005-11-18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [PATCH] e1000: zero-out pointers in e1000_free_desc_ringsJohn W. Linville2005-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In e1000_free_desc_rings, zero-out pointers after the memory they point to is freed. The test rings are static and get re-used, and failures during subsequent test setups can cause e1000_free_desc_rings to get called with dirty pointers. Dirty pointers can cause oopses or crashes... Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | | | | | | [PATCH] e1000: avoid leak when e1000_setup_loopback_test failsJohn W. Linville2005-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In e1000_loopback_test, make sure to call e1000_free_desc_rings if e1000_setup_loopback_test fails. Currently in that case it will not get called, causing a leak. Signed-off-by: John W. Linville <linville@tuxdriver.com>
* | | | | | | | | | [PATCH] sky2: version 0.10Stephen Hemminger2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change version number. Still don't have enough history on this to call it 1.0 yet. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | | | | | | | [PATCH] sky2: disable rx checksum on Yukon XLStephen Hemminger2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under load, my SysKonnect SK-9S22 sees duplicate checksums from earlier packets. Doesn't happen on other platforms so just disable receive checksum there. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | | | | | | | [PATCH] sky2: turn on tx flow controlStephen Hemminger2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn symmetric flow control on by default. This was an oversight in the initial versions. Signed-off-by: Stephen HEmminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | | | | | | | [PATCH] sky2: prefetch tuningStephen Hemminger2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a couple more prefetches to where we walk the rings. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | | | | | | | [PATCH] sky2: quiet ring full message in case of raceStephen Hemminger2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't print ring full message if we lose race. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | | | | | | | [PATCH] sky2: handle tx timeoutStephen Hemminger2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put more logic in to try and handle transmit timeout recovery. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | | | | | | | | [PATCH] sky2: interrupt coalescing tuningStephen Hemminger2005-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust interrupt deferral values for better performance and avoid starvation issues under stress. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>