Commit graph android_kernel_sony_sdm845/drivers
Message SHA1
Automatic merge of rsync://www.fr.zoreil.com/linux-2.6.git branch HEAD
  authored and   Jeff Garzik   commited 2005-05-27 20:12:17 -04:00
befc9e10d6
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
  authored and   Jeff Garzik   commited 2005-05-27 20:09:40 -04:00
07b08a1618
[PATCH] r8169: minor cleanup
- more consistent prototypes;
- rtl8169_rx_interrupt()
  o the error condition should be rare;
  o goto removal.

Signed-off-by: Richard Dawe <rich@phekda.gotadsl.co.uk>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Richard Dawe   authored and   Francois Romieu   commited 2005-05-27 21:12:00 +02:00
4dcb7d3377
[PATCH] r8169: add ethtool support for dumping the chip statistics
There aren't lots of statistics available, but this is what is available
according to the RealTek documentation.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Stephen Hemminger   authored and   Francois Romieu   commited 2005-05-27 21:11:56 +02:00
d4a3a0fc9c
[PATCH] r8169: ethtool message level control support
Also:
- ratelimit the too much work at interrupt message, so if under massive
  packet load the console doesn't get flooded;
- removal of a few PFX used in contexts where dev->name is available;
- s/->slot_name/pci_name/;
- printed_version is redundant with the debug option. Remove it and let
  the user decide.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Stephen Hemminger   authored and   Francois Romieu   commited 2005-05-27 21:11:52 +02:00
b57b7e5a11
[PATCH] r8169: add module parameter (media)
Add module parameter description for the media option.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Francois Romieu   commited 2005-05-27 21:11:49 +02:00
df0a1bf634
[PATCH] r8169: add module parameter (copybreak)
Add module parameter description for copybreak.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Stephen Hemminger   authored and   Francois Romieu   commited 2005-05-27 21:11:45 +02:00
1b7efd58bb
[PATCH] r8169: identify the napi version
To tell if driver is configured for NAPI or not, put -NAPI on driver
version. Remove the NAPI printk since the complete version information
is displayed once in the pci probe routine or returned via ethtool.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Stephen Hemminger   authored and   Francois Romieu   commited 2005-05-27 21:11:41 +02:00
f7ccf420e5
[PATCH] r8169: de-obfuscate supported PCI ID
De-obfuscate supported PCI ID

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Francois Romieu   commited 2005-05-27 21:11:37 +02:00
53456f607a
[PATCH] r8169: new PCI id
The USR 997902 is based on the 8169 chipset.

The value has been extracted from the sources of the driver which
comes with the manufacturer's cdrom. Heads-up and test by TommyDrum
<mycooc@yahoo.it>.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Francois Romieu   commited 2005-05-27 21:11:33 +02:00
a7b6459de1
[PATCH] ACPI build fix
Fix 2.6.12 CONFIG_ACPI=n build regression.
CONFIG_ACPI_BOOT shall be set only if CONFIG_ACPI.

Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Len Brown   authored and   Linus Torvalds   commited 2005-05-27 08:15:05 -07:00
3e11c3ce0a
[PATCH] Fixup VIA IRQ quirk
quirk_via_irqpic can't be __devinit for swsuspend

Signed-off-by: Alexander Nyberg <alexn@telia.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Alexander Nyberg   authored and   Linus Torvalds   commited 2005-05-27 08:15:05 -07:00
9920e91450
[PATCH] VIA IRQ quirk
Delete quirk_via_bridge(), restore quirk_via_irqpic() -- but now
improved to be invoked upon device ENABLE, and now only for VIA devices
-- not all devices behind VIA bridges.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Len Brown   authored and   Linus Torvalds   commited 2005-05-27 08:15:04 -07:00
25be5e6ccc
[PATCH] remove non-cleanroom pwc driver compression
The original pwc author raised some questions about the reverse
engineering of the decompressor algorithms used in the pwc driver.
Having done some detailed investigation it appears those concerns that
clean room policy was not followed are reasonable.  I've also had a
friendly discussion with Philips to ask their view on this.

This removes the problem items of code which reduces the pwc
functionality in the kernel a little but leaves all the framework for
setup that will be needed for decompressors in user space (where they
eventually belong).  This change set is designed to be the minimal risk
change set given that 2.6.12 is hopefully close to hand, with a view to
merging the much updated pwc code in 2.6.13 series kernels.

Someone else can then redo the decompressors properly (clean room) in
user space.

Note that while its easy to say that it should have been caught earlier,
but the violation was really only obvious to someone who had access to
both the proprietary source and the 'GPL' source.

Alan Cox   authored and   Linus Torvalds   commited 2005-05-27 07:45:21 -07:00
88c1834633
ide-cd: revert DMA mask test change
The change to require the DMA length to be only word-aligned was not
safe.

Linus Torvalds   commited 2005-05-27 07:36:17 -07:00
5d9e4ea55a
[MTD] NAND: Add Hynix to manufacturer list
Signed-off-by: Nicolas S. Dade <daden@symbol.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Nicolas S. Dade   authored and   Thomas Gleixner   commited 2005-05-27 10:40:27 +02:00
f1f67a9874
libata: Fix use-after-iounmap
Jens Axboe pointed out that the iounmap() call in libata was occurring
too early, and some drivers (ahci, probably others) were using ioremap'd
memory after it had been unmapped.

The patch should address that problem by way of improving the libata
driver API:

* move ->host_stop() call after all ->port_stop() calls have occurred.

* create default helper function ata_host_stop(), and move iounmap()
call there.

* add ->host_stop_prewalk() hook, use it in sata_qstor.c (hi Mark).
sata_qstor appears to require the host-stop-before-port-stop ordering
that existed prior to applying the attached patch.

Jeff Garzik   commited 2005-05-26 21:54:27 -04:00
aa8f0dc6c3
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
  authored and   Jeff Garzik   commited 2005-05-26 21:40:25 -04:00
462cee2964
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds   commited 2005-05-26 13:54:33 -07:00
4ec5240ec3
[BNX2]: New Broadcom gigabit network driver.
A new driver bnx2 for Broadcom bcm5706 is available.

The patch also includes new 1000BASE-X advertisement bit definitions in
mii.h

Thanks to David Miller and Jeff Garzik for reviewing and their valuable
feedback.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Michael Chan   authored and   David S. Miller   commited 2005-05-26 13:03:09 -07:00
b6016b7673
[BONDING]: bonding using arp_ip_target may stay down with active path
Correcting the list traversal makes the problem go away.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Jay Vosburgh   authored and   David S. Miller   commited 2005-05-26 12:56:59 -07:00
2f872f0401
[SCSI] aic7xxx: remove separate target and device allocations
Since the aic driver is now taught to speak in terms of the generic
linux devices, we can now also dispense with the transport class get
routines (since we update the parameters when the driver sees they
change) and also plumb it into the spi transport transfer agreement
reporting infrastructure.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

James Bottomley   commited 2005-05-26 14:28:31 -04:00
b1abb4d67f
Automatic merge of ../scsi-misc-2.6-old/
James Bottomley   commited 2005-05-26 14:14:55 -04:00
153b1e1fd9
Automatic merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Linus Torvalds   commited 2005-05-26 10:27:39 -07:00
f49809fe9b
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
  authored and   Jeff Garzik   commited 2005-05-26 13:03:24 -04:00
8973a585ae
Merge of 'misc-fixes' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Linus Torvalds   commited 2005-05-26 10:02:30 -07:00
cdbbde14cb
[SCSI] git-scsi-misc-sbp2-warning-fix
drivers/ieee1394/sbp2.c: In function `sbp2_check_sbp2_response':
drivers/ieee1394/sbp2.c:2154: warning: unused variable `device_type'

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Andrew Morton   authored and   James Bottomley   commited 2005-05-26 11:30:57 -04:00
644e02ea14
[SCSI] Add target alloc/destroy callbacks to the host template
This gives the HBA driver notice when a target is created and
destroyed to allow it to manage its own target based allocations
accordingly.

This is a much reduced verson of the original patch sent in by
James.Smart@Emulex.com

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

James Bottomley   commited 2005-05-26 11:27:53 -04:00
a283bd37d0
[PATCH] timeout at boottime with NEC3500A (and possibly others) when inserted a CD in it
From: Marcello Maggioni <hayarms@gmail.com>

Problem: Some drives (NEC 3500, TDK 1616N, Mad-dog MD-16XDVD9, RICOH
MP5163DA, Memorex DVD9 drive and IO-DATA's too for sure), if a
CD/DVD is inserted into the tray when the system is booted and if
before the OS bootup the BIOS checked for the presence of a bootable
CD/DVD into the drive, during the IDE probe phase the drive may
result busy and remain so for the next 25/30 seconds . This cause the
drive to be skipped during the booting phase and not begin usable
until the next reboot (if the reboot goes well and the drive doesn't
timeout again).

Solution: Rising the timeout time from 10 seconds to 35 seconds
(during these 35 seconds every drive should wake up for sure
according to the tests I've done).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

Marcello Maggioni   authored and   Bartlomiej Zolnierkiewicz   commited 2005-05-26 15:47:35 +02:00
284e423811
[SCSI] TYPE_RBC cache fixes (sbp2.c affected)
a) TYPE_SDAD renamed to TYPE_RBC and taken to scsi.h
	b) in sbp2.c remapping of TYPE_RPB to TYPE_DISK turned off
	c) relevant places in midlayer and sd.c taught to accept TYPE_RBC
	d) sd.c::sd_read_cache_type() looks into page 6 when dealing with
TYPE_RBC - these guys have writeback cache flag there and are not guaranteed
to have page 8 at all.
	e) sd_read_cache_type() got an extra sanity check - it checks that
it got the page it asked for before using its contents.  And screams if
mismatch had happened.  Rationale: there are broken devices out there that
are "helpful" enough to go for "I don't have a page you've asked for, here,
have another one".  For example, PL3507 had been caught doing just that...
	f) sbp2 sets sdev->use_10_for_rw and sdev->use_10_for_ms instead
of bothering to remap READ6/WRITE6/MOD_SENSE, so most of the conversions
in there are gone now.

	Incidentally, I wonder if USB storage devices that have no
mode page 8 are simply RBC ones.  I haven't touched that, but it might
be interesting to check...

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Al Viro   authored and   James Bottomley   commited 2005-05-26 08:41:15 -05:00
631e8a1398
[SCSI] sym2 version 2.2.1
sym2 version 2.2.1:
 - Fix MMIO BAR detection (Thanks to Bob Picco)
 - Fix odd-sized transfers with a wide bus (Thanks to Larry Stephens)
 - Write posting fixes (Thanks to Thibaut Varene)
 - Change one of the GFP_KERNEL allocations back into a GFP_ATOMIC
 - Make CCB_BA() return a script-endian address
 - Move range checks and disabling of devices from the queuecommand path
   to slave_alloc()
 - Remove a warning in sym_setup_cdb()
 - Keep a pointer to the scsi_target instead of the scsi_dev in the tcb
 - Remove a check for the upper layers passing an oversized cmd
 - Replace CAM_REQ_ constants with the Linux DID_ constants
 - Replace CAM_DIR_ constants with the Linux DMA_ constants
 - Inline sym_read_parisc_pdc() on non-parisc systems

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Matthew Wilcox   authored and   James Bottomley   commited 2005-05-26 08:41:14 -05:00
53222b9069
[PATCH] ide-scsi: kmap scatter/gather before doing PIO
From: Stuart Hayes <Stuart_Hayes@dell.com>

The system can panic with a null pointer dereference using ide-scsi if
PIO is being done on scatter gather pages that are in high memory,
because page_address() returns 0.  We are actually seeing this using a
tape drive.  This patch will kmap_atomic() the pages before performing
PIO.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

Stuart Hayes   authored and   Bartlomiej Zolnierkiewicz   commited 2005-05-26 15:38:45 +02:00
41bb4c43b3
[PATCH] convert IDE device drivers to driver-model
* add ide_bus_match() and export ide_bus_type
* split ide_remove_driver_from_hwgroup() out of ide_unregister()
* move device cleanup from ide_unregister() to drive_release_dev()
* convert ide_driver_t->name to driver->name
* convert ide_driver_t->{attach,cleanup} to driver->{probe,remove}
* remove ide_driver_t->busy as ide_bus_type->subsys.rwsem
  protects against concurrent ->{probe,remove} calls
* make ide_{un}register_driver() void as it cannot fail now
* use driver_{un}register() directly, remove ide_{un}register_driver()
* use device_register() instead of ata_attach(), remove ata_attach()
* add proc_print_driver() and ide_drivers_show(), remove ide_drivers_op
* fix ide_replace_subdriver() and move it to ide-proc.c
* remove ide_driver_t->drives, ide_drives and drives_lock
* remove ide_driver_t->drivers, drivers and drivers_lock
* remove ide_drive_t->driver and DRIVER() macro

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

Bartlomiej Zolnierkiewicz   commited 2005-05-26 14:55:34 +02:00
8604affde9
[PATCH] libata: Fix zero sg_dma_len() on 64-bit platform
When testing ATAPI PIO data transfer on the ppc64 platform,  __atapi_pio_bytes() got zero when
sg_dma_len() is used. I checked the <asm-ppc64/scatterlish.h>, the struct scatterlist is defined as:

struct scatterlist {
	struct page *page;
	unsigned int offset;
	unsigned int length;

	/* For TCE support */
	u32 dma_address;
	u32 dma_length;
};

#define sg_dma_address(sg)	((sg)->dma_address)
#define sg_dma_len(sg)		((sg)->dma_length)

So, if the scatterlist is not DMA mapped, sg_dma_len() will return zero on ppc64.
The same problem should occur on the x86-64 platform.
On the i386 platform, sg_dma_len() returns sg->length, that's why the problem does not occur on an i386.

Changes:
- Use sg->length if the scatterlist is not DMA mapped (yet).

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>

Albert Lee   authored and   Jeff Garzik   commited 2005-05-26 03:49:42 -04:00
32529e0128
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
  authored and   Jeff Garzik   commited 2005-05-26 02:17:16 -04:00
c1ef1f351d
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
  authored and   Jeff Garzik   commited 2005-05-26 01:47:10 -04:00
949d33e70f
Automatic merge of /spare/repo/netdev-2.6 branch tlan
  authored and   Jeff Garzik   commited 2005-05-25 22:11:38 -04:00
ad6a9984ee
Automatic merge of /spare/repo/netdev-2.6 branch sis900
  authored and   Jeff Garzik   commited 2005-05-25 22:11:28 -04:00
38778204a1
Automatic merge of /spare/repo/netdev-2.6 branch veth
  authored and   Jeff Garzik   commited 2005-05-25 22:11:14 -04:00
8cf0d9d075
Automatic merge of /spare/repo/netdev-2.6 branch qeth
  authored and   Jeff Garzik   commited 2005-05-25 22:11:06 -04:00
8a75e7d644
Automatic merge of /spare/repo/netdev-2.6 branch ns83820
  authored and   Jeff Garzik   commited 2005-05-25 22:10:53 -04:00
f5a702b26a
Automatic merge of /spare/repo/netdev-2.6 branch natsemi
  authored and   Jeff Garzik   commited 2005-05-25 22:10:38 -04:00
5ea6f2c33f
Automatic merge of /spare/repo/netdev-2.6 branch forcedeth
  authored and   Jeff Garzik   commited 2005-05-25 22:10:25 -04:00
acb969560d
Automatic merge of /spare/repo/netdev-2.6 branch airo
  authored and   Jeff Garzik   commited 2005-05-25 22:09:52 -04:00
ee03a68c10
Automatic merge of /spare/repo/netdev-2.6 branch atmel
  authored and   Jeff Garzik   commited 2005-05-25 22:07:51 -04:00
0c2fc10901
Merge of 'new-ids' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Linus Torvalds   commited 2005-05-25 17:56:57 -07:00
3db602bdcd
[PATCH] sata_svw: Add support for new device IDs
BCM5785 (HT1000) is a new southbridge from Serverworks/Broadcom that
incorporates 4 SATA ports in a single PCIX function. Functionally these
ports are similar to that in older devices like the Apple K2 and the
Frodo4/8. This patch adds support for the new PCI device ID along with a
blurb on what the various device IDs mean. Additionally in all devices
based on this SATA controller, the SATA ports appear as a single PCI
function. This is true for older Frodo8 devices as well. Hence the init
function should init all the ports present in the detected controller
(which could be 4 or 8).

Signed-off-by: Narendra Sankar <nsankar@broadcom.com>

Narendra Sankar   authored and   Jeff Garzik   commited 2005-05-25 20:10:58 -04:00
60bf09a366
[PATCH] sata_promise: add PCI ID for FastTrak TX2200 2-ports
Francisco Javier   authored and   Jeff Garzik   commited 2005-05-25 19:29:37 -04:00
4c3a53d410
[PATCH] sata_sil: new ID 1002:437A for ATI IXP400
NAKAMURA Kenta   authored and   Jeff Garzik   commited 2005-05-25 19:28:38 -04:00
525a099771
[PATCH] therm_adt746x: show correct sensor locations
This patch shows the correct locations of the heat sensors present in iBook
and PowerBooks G4, instead of displaying them as being on CPU and GPU
(which is not always the case).

Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Colin Leroy   authored and   Linus Torvalds   commited 2005-05-25 15:31:29 -07:00
d20c507f28