commit abb5a5cc6bba1516403146c5b79036fe843beb70 tree f7a1a4cc9381a1fc38be60cfe9428d9c7bd0aabe parent aa95387774039096c11803c04011f1aa42d85758 author Paul Jackson Sun, 23 Jul 2006 11:36:08 -0700 committer Linus Torvalds Sun, 23 Jul 2006 13:03:05 -0700 [PATCH] Cpuset: fix ABBA deadlock with cpu hotplug lock Fix ABBA deadlock between lock_cpu_hotplug() and the cpuset callback_mutex lock. It only happens on cpu_exclusive cpusets, due to the dynamic sched domain code trying to take the cpu hotplug lock inside the cpuset callback_mutex lock. This bug has apparently been here for several months, but didn't get hit until the right customer load on a large system. This fix appears right from inspection, but it will take a few more days running it on that customers workload to be confident we nailed it. We don't have any other reproducible test case. The cpu_hotplug_lock() tends to cover large runs of code. The other places that hold both that lock and the cpuset callback mutex lock always nest the cpuset lock inside the hotplug lock. This place tries to do the reverse, risking an ABBA deadlock. This is in the cpuset_rmdir() code, where we: * take the callback_mutex lock * mark the cpuset CS_REMOVED * call update_cpu_domains for cpu_exclusive cpusets * in that call, take the cpu_hotplug lock if the cpuset is marked for removal. Thanks to Jack Steiner for identifying this deadlock. The fix is to tear down the dynamic sched domain before we grab the cpuset callback_mutex lock. This way, the two locks are serialized, with the hotplug lock taken and released before trying for the cpuset lock. I suspect that this bug was introduced when I changed the cpuset locking from one lock to two. The dynamic sched domain dependency on cpu_exclusive cpusets and its hotplug hooks were added to this code earlier, when cpusets had only a single lock. It may well have been fine then. Signed-off-by: Paul Jackson Signed-off-by: Linus Torvalds commit aa95387774039096c11803c04011f1aa42d85758 tree b8d3c845efedc2d67bcaff0038b4306fa375379c parent 2cd7cbdf4bd0d0fe58e4dc903e8b413412595504 author Linus Torvalds Sun, 23 Jul 2006 12:12:16 -0700 committer Linus Torvalds Sun, 23 Jul 2006 12:12:16 -0700 cpu hotplug: simplify and hopefully fix locking The CPU hotplug locking was quite messy, with a recursive lock to handle the fact that both the actual up/down sequence wanted to protect itself from being re-entered, but the callbacks that it called also tended to want to protect themselves from CPU events. This splits the lock into two (one to serialize the whole hotplug sequence, the other to protect against the CPU present bitmaps changing). The latter still allows recursive usage because some subsystems (ondemand policy for cpufreq at least) had already gotten too used to the lax locking, but the locking mistakes are hopefully now less fundamental, and we now warn about recursive lock usage when we see it, in the hope that it can be fixed. Signed-off-by: Linus Torvalds commit 2cd7cbdf4bd0d0fe58e4dc903e8b413412595504 tree ad368b1f9a26d06be6e8bd26d821f17670ad2ef4 parent 12157a8d78af50842774bedb80b7b84a87f60951 author Linus Torvalds Sun, 23 Jul 2006 12:05:00 -0700 committer Linus Torvalds Sun, 23 Jul 2006 12:05:00 -0700 [cpufreq] ondemand: make shutdown sequence more robust Shutting down the ondemand policy was fraught with potential problems, causing issues for SMP suspend (which wants to hot- unplug) all but the last CPU. This should fix at least the worst problems (divide-by-zero and infinite wait for the workqueue to shut down). Signed-off-by: Linus Torvalds commit 12157a8d78af50842774bedb80b7b84a87f60951 tree 7e1c3ec5eb07b212cc6f6b4663ae6dff1ae78eb9 parent efab4cbe99f9b73d208ad9e5ec9388524005e095 parent 9df3f3d28bca0157e2bab2f3171d2ad4f0930634 author Linus Torvalds Fri, 21 Jul 2006 16:44:45 -0700 committer Linus Torvalds Fri, 21 Jul 2006 16:44:45 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits) [TIPC]: Removing useless casts [IPV4]: Fix nexthop realm dumping for multipath routes [DUMMY]: Avoid an oops when dummy_init_one() failed [IFB] After ifb_init_one() failed, i is increased. Decrease [NET]: Fix reversed error test in netif_tx_trylock [MAINTAINERS]: Mark LAPB as Oprhan. [NET]: Conversions from kmalloc+memset to k(z|c)alloc. [NET]: sun happymeal, little pci cleanup [IrDA]: Use alloc_skb() in IrDA TX path [I/OAT]: Remove pci_module_init() from Intel I/OAT DMA engine [I/OAT]: net/core/user_dma.c should #include [SCTP]: ADDIP: Don't use an address as source until it is ASCONF-ACKed [SCTP]: Set chunk->data_accepted only if we are going to accept it. [SCTP]: Verify all the paths to a peer via heartbeat before using them. [SCTP]: Unhash the endpoint in sctp_endpoint_free(). [SCTP]: Check for NULL arg to sctp_bucket_destroy(). [PKT_SCHED] netem: Fix slab corruption with netem (2nd try) [WAN]: Converted synclink drivers to use netif_carrier_*() [WAN]: Cosmetic changes to N2 and C101 drivers [WAN]: Added missing netif_dormant_off() to generic HDLC ... commit 9df3f3d28bca0157e2bab2f3171d2ad4f0930634 tree b7cc30698bd9e30846bdce547115ad409ef3d97f parent 8265abc082d2283b4ef20237efadb71c6f16ed0c author Panagiotis Issaris Fri, 21 Jul 2006 15:52:20 -0700 committer David S. Miller Fri, 21 Jul 2006 15:52:20 -0700 [TIPC]: Removing useless casts Removing useless casts Signed-off-by: Panagiotis Issaris Signed-off-by: David S. Miller commit 8265abc082d2283b4ef20237efadb71c6f16ed0c tree 58522a854a0233dfb9d2420bfea5748053471497 parent 9ed36279f68c990d65cd3d64f27d81313474a118 author Patrick McHardy Fri, 21 Jul 2006 15:09:55 -0700 committer David S. Miller Fri, 21 Jul 2006 15:09:55 -0700 [IPV4]: Fix nexthop realm dumping for multipath routes Routing realms exist per nexthop, but are only returned to userspace for the first nexthop. This is due to the fact that iproute2 only allows to set the realm for the first nexthop and the kernel refuses multipath routes where only a single realm is present. Dump all realms for multipath routes to enable iproute to correctly display them. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 9ed36279f68c990d65cd3d64f27d81313474a118 tree d79111b110792eee5462a845e2655b09c4da156e parent 4a9c74e5830444c1c3235848e06402c1d2ece1ea author Nicolas Dichtel Fri, 21 Jul 2006 15:09:07 -0700 committer David S. Miller Fri, 21 Jul 2006 15:09:07 -0700 [DUMMY]: Avoid an oops when dummy_init_one() failed Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller commit 4a9c74e5830444c1c3235848e06402c1d2ece1ea tree 7a2e828379c30b31b5a458dc4b533c8dc71a19ba parent 53c4b2cc7a05c034fd21d104d2ab43ea8cc0e075 author Nicolas Dichtel Fri, 21 Jul 2006 14:56:02 -0700 committer David S. Miller Fri, 21 Jul 2006 14:56:02 -0700 [IFB] After ifb_init_one() failed, i is increased. Decrease It before entering in the loop for freeing the other ifb devices. Signed-off-by: Nicolas Dichtel Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 53c4b2cc7a05c034fd21d104d2ab43ea8cc0e075 tree ede0678aaf5f3262773f10f64a221bef671cda55 parent bf9915cc55cb8d18d4e3a8de3d1578a9af4a2e8b author Herbert Xu Fri, 21 Jul 2006 14:55:38 -0700 committer David S. Miller Fri, 21 Jul 2006 14:55:38 -0700 [NET]: Fix reversed error test in netif_tx_trylock A non-zero return value indicates success from spin_trylock, not error. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bf9915cc55cb8d18d4e3a8de3d1578a9af4a2e8b tree 42a6b388b40fe1456a69b41dcec12ab3a1d0fae4 parent 0da974f4f303a6842516b764507e3c0a03f41e5a author David S. Miller Fri, 21 Jul 2006 14:55:17 -0700 committer David S. Miller Fri, 21 Jul 2006 14:55:17 -0700 [MAINTAINERS]: Mark LAPB as Oprhan. Maintainer email not longer exists. Signed-off-by: David S. Miller commit 0da974f4f303a6842516b764507e3c0a03f41e5a tree 8872aec792f02040269c6769dd1009b20f71d186 parent a0ee7c70b22f78593957f99faa06acb4747b8bc0 author Panagiotis Issaris Fri, 21 Jul 2006 14:51:30 -0700 committer David S. Miller Fri, 21 Jul 2006 14:51:30 -0700 [NET]: Conversions from kmalloc+memset to k(z|c)alloc. Signed-off-by: Panagiotis Issaris Signed-off-by: David S. Miller commit a0ee7c70b22f78593957f99faa06acb4747b8bc0 tree 5fdc034ab3aee7bcc67ef820a9f69d5e0eb9b8dd parent 485fb2c998a37d5c3c6aa082aa451e66db90f34a author Jiri Slaby Fri, 21 Jul 2006 14:51:02 -0700 committer David S. Miller Fri, 21 Jul 2006 14:51:02 -0700 [NET]: sun happymeal, little pci cleanup Use pci_register_driver instead of pci_module_init. Use PCI_DEVICE macro. Signed-off-by: Jiri Slaby Signed-off-by: David S. Miller commit 485fb2c998a37d5c3c6aa082aa451e66db90f34a tree 6adc0e5c935072d82143e7354bc633eac7feed9b parent b82631581372dc00b3507cedc3ad47af29efe962 author Samuel Ortiz Fri, 21 Jul 2006 14:50:41 -0700 committer David S. Miller Fri, 21 Jul 2006 14:50:41 -0700 [IrDA]: Use alloc_skb() in IrDA TX path As pointed out by Christoph Hellwig, dev_alloc_skb() is not intended to be used for allocating TX sk_buff. The IrDA stack was exclusively calling dev_alloc_skb() on the TX path, and this patch fixes that. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit b82631581372dc00b3507cedc3ad47af29efe962 tree b8bcf35b3c7e9efe755da4e2bad38b7a6384e082 parent 64d2f0855e50a7185546ee1fbc03c2badc31330f author Henrik Kretzschmar Fri, 21 Jul 2006 14:50:13 -0700 committer David S. Miller Fri, 21 Jul 2006 14:50:13 -0700 [I/OAT]: Remove pci_module_init() from Intel I/OAT DMA engine Changes pci_module_init() to pci_register_driver(). Signed-off-by: Henrik Kretzschmar Signed-off-by: David S. Miller commit 64d2f0855e50a7185546ee1fbc03c2badc31330f tree 108da81ade6ad9b20301f1d20f22c8fc9e4a7808 parent dc022a9874d026c7d1635ae66d1afafc5f053731 author Adrian Bunk Fri, 21 Jul 2006 14:49:49 -0700 committer David S. Miller Fri, 21 Jul 2006 14:49:49 -0700 [I/OAT]: net/core/user_dma.c should #include Every file should #include the headers containing the prototypes for its global functions. Especially in cases like this one where gcc can tell us through a compile error that the prototype was wrong... Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit dc022a9874d026c7d1635ae66d1afafc5f053731 tree 3a1feddee57eabd788311e2433e922b59036e903 parent 9faa730f1cbb951e95cb18e71b0fe265014c2450 author Sridhar Samudrala Fri, 21 Jul 2006 14:49:25 -0700 committer David S. Miller Fri, 21 Jul 2006 14:49:25 -0700 [SCTP]: ADDIP: Don't use an address as source until it is ASCONF-ACKed This implements Rules D1 and D4 of Sec 4.3 in the ADDIP draft. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 9faa730f1cbb951e95cb18e71b0fe265014c2450 tree 9474ff995e1cd8ddc6fb44974a4dde7b3d68f14b parent ad8fec1720e000ba2384de6408076a60fc92a981 author Sridhar Samudrala Fri, 21 Jul 2006 14:49:07 -0700 committer David S. Miller Fri, 21 Jul 2006 14:49:07 -0700 [SCTP]: Set chunk->data_accepted only if we are going to accept it. Currently there is a code path in sctp_eat_data() where it is possible to set this flag even when we are dropping this chunk. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit ad8fec1720e000ba2384de6408076a60fc92a981 tree 52fd2f7af583b95db6db369c6b3ea3d6adc26d69 parent cfdeef3282705a4b872d3559c4e7d2561251363c author Sridhar Samudrala Fri, 21 Jul 2006 14:48:50 -0700 committer David S. Miller Fri, 21 Jul 2006 14:48:50 -0700 [SCTP]: Verify all the paths to a peer via heartbeat before using them. This patch implements Path Initialization procedure as described in Sec 2.36 of RFC4460. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit cfdeef3282705a4b872d3559c4e7d2561251363c tree 09d11c52f22b383284f5beb17e63965a6e9ea78f parent 37fa6878bcd54c25fbe6ebb3da5cf0d3a4bc7a65 author Vlad Yasevich Fri, 21 Jul 2006 14:48:26 -0700 committer David S. Miller Fri, 21 Jul 2006 14:48:26 -0700 [SCTP]: Unhash the endpoint in sctp_endpoint_free(). This prevents a race between the close of a socket and receive of an incoming packet. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 37fa6878bcd54c25fbe6ebb3da5cf0d3a4bc7a65 tree 87fab13350732feb446b474f00103a8d0dab829c parent 89e1df74f841fc31e81838d30594c4eff01859f8 author Sridhar Samudrala Fri, 21 Jul 2006 14:45:47 -0700 committer David S. Miller Fri, 21 Jul 2006 14:45:47 -0700 [SCTP]: Check for NULL arg to sctp_bucket_destroy(). Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 89e1df74f841fc31e81838d30594c4eff01859f8 tree a9a8069feccad982642f932ccef01f64a1391796 parent fbeff3c1d35d07b1f967e47fcfb00cd16b7ecd02 author Guillaume Chazarain Fri, 21 Jul 2006 14:45:25 -0700 committer David S. Miller Fri, 21 Jul 2006 14:45:25 -0700 [PKT_SCHED] netem: Fix slab corruption with netem (2nd try) CONFIG_DEBUG_SLAB found the following bug: netem_enqueue() in sch_netem.c gets a pointer inside a slab object: struct netem_skb_cb *cb = (struct netem_skb_cb *)skb->cb; But then, the slab object may be freed: skb = skb_unshare(skb, GFP_ATOMIC) cb is still pointing inside the freed skb, so here is a patch to initialize cb later, and make it clear that initializing it sooner is a bad idea. [From Stephen Hemminger: leave cb unitialized in order to let gcc complain in case of use before initialization] Signed-off-by: Guillaume Chazarain Signed-off-by: David S. Miller commit fbeff3c1d35d07b1f967e47fcfb00cd16b7ecd02 tree 4b7514b804e31b5e354ce6499256300917d1bf54 parent 41b1d174442d0845e58af4b1b171930fc09872c7 author Krzysztof Halasa Fri, 21 Jul 2006 14:44:55 -0700 committer David S. Miller Fri, 21 Jul 2006 14:44:55 -0700 [WAN]: Converted synclink drivers to use netif_carrier_*() WAN: Converted synclink drivers to use netif_carrier_*() instead of hdlc_set_carrier(). Signed-off-by: Krzysztof Halasa Signed-off-by: David S. Miller commit 41b1d174442d0845e58af4b1b171930fc09872c7 tree a3d0c3dc16b31859960c75edfc205413dffa91d5 parent 4bc83b4d409edacb33db6c71d03e963d9728476c author Krzysztof Halasa Fri, 21 Jul 2006 14:41:36 -0700 committer David S. Miller Fri, 21 Jul 2006 14:41:36 -0700 [WAN]: Cosmetic changes to N2 and C101 drivers WAN: Cosmetic changes to N2 and C101 drivers Signed-off-by: Krzysztof Halasa Signed-off-by: David S. Miller commit 4bc83b4d409edacb33db6c71d03e963d9728476c tree 97b3601ffe80b2fd4efdcdbe7d92bc1829cd6da6 parent 5d9c5a32920c5c0e6716b0f6ed16157783dc56a4 author Krzysztof Halasa Fri, 21 Jul 2006 14:41:01 -0700 committer David S. Miller Fri, 21 Jul 2006 14:41:01 -0700 [WAN]: Added missing netif_dormant_off() to generic HDLC WAN: Fixed a problem with PPP/raw HDLC/X.25 protocols not doing netif_dormant_off() at startup. Signed-off-by: Krzysztof Halasa Signed-off-by: David S. Miller commit 5d9c5a32920c5c0e6716b0f6ed16157783dc56a4 tree c2a4c05ece938a8166d850cefb281f17615f95ef parent 00ab956f2fefd3673edc16df55beed21834b7bdd author Herbert Xu Fri, 21 Jul 2006 14:29:53 -0700 committer David S. Miller Fri, 21 Jul 2006 14:29:53 -0700 [IPV4]: Get rid of redundant IPCB->opts initialisation Now that we always zero the IPCB->opts in ip_rcv, it is no longer necessary to do so before calling netif_rx for tunneled packets. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit efab4cbe99f9b73d208ad9e5ec9388524005e095 tree aae6b3e1d8c1366bcdcbaa7715fb4d16adfa36a3 parent 8310a32c15c76623bbe2425d38688a9d5b3e50a9 author David S. Miller Fri, 21 Jul 2006 14:19:45 -0700 committer David S. Miller Fri, 21 Jul 2006 14:19:45 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 8310a32c15c76623bbe2425d38688a9d5b3e50a9 tree 47e565ab0f2d04abb32ac8a0a1f0753616fc0607 parent 8a84eb164cc44a7604a27f8118473a82b45472a8 author David S. Miller Fri, 21 Jul 2006 14:12:39 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:27 -0700 [SPARC]: Fix length parameter verification in sys_getdomainname(). Found by scrashme. Signed-off-by: David S. Miller commit 8a84eb164cc44a7604a27f8118473a82b45472a8 tree b80fe22fe3a3a2e8767ec001292394c7e7d8d91c parent b77d35b7229164304d6fb8f047b9bcd3da2c9592 author David S. Miller Wed, 19 Jul 2006 22:55:08 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:25 -0700 [SERIAL] sunzilog: Fix instance enumeration. Just do a linear enumeration so that we handle sun4d systems correctly. As a consequence, eliminate the hard coded keyboard and mouse channel line values, use the CONS_{KEYB,MS} flags instead. Also, report the keyboard/mouse Zilog channels just like the uart ones do. Signed-off-by: David S. Miller commit b77d35b7229164304d6fb8f047b9bcd3da2c9592 tree abc1aeef78696312d4eba710292de7330776d42f parent 8b3c848cc89e62904e6d9c8f9fed13d5c225572d author David S. Miller Wed, 19 Jul 2006 21:04:04 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:22 -0700 [SERIAL] sunzilog: Remove duplicate IRQ registry in zs_probe(). We do it now in sunzilog_init() after all devices have been probed. Signed-off-by: David S. Miller commit 8b3c848cc89e62904e6d9c8f9fed13d5c225572d tree 7549671e3e19f5553e75898d430a298979e05b36 parent 198c167c5424d30d4f6687aed6e54ef71036f8e9 author Raymond Burns Mon, 17 Jul 2006 21:57:09 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:20 -0700 [SPARC]: Get sun4d SMP building again. Signed-off-by: David S. Miller commit 198c167c5424d30d4f6687aed6e54ef71036f8e9 tree 2cfa81ce483398a7ab2f220122b88a3a005683fe parent c2d3bffebc2cb651ed33abae2434f85cd503a498 author Raymond Burns Mon, 17 Jul 2006 21:50:55 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:18 -0700 [SPARC]: Do not call sun4m_irq_rotate on sun4d. Signed-off-by: David S. Miller commit c2d3bffebc2cb651ed33abae2434f85cd503a498 tree 2e9d456da9b1dc7437edca0dcb6b7069f24ed5ae parent 2f72ba43581890d003427053ebe4dfaa14e5f4b0 author David S. Miller Mon, 17 Jul 2006 21:49:58 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:15 -0700 [SPARC]: Simplify and correct __cpu_find_by() By using for_each_node_by_type(). Also, correct a spurioud test in check_cpu_node() on sparc64. It is only called with nodes that have device_type "cpu". Signed-off-by: David S. Miller commit 2f72ba43581890d003427053ebe4dfaa14e5f4b0 tree 05c213214f9a30370dbe1cd10293f71878e0a032 parent 9d7ab1f4d56dffcddc1177b3cd55b6da6620e1e1 author Raymond Burns Mon, 17 Jul 2006 21:40:27 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:13 -0700 [SPARC]: Initialize iounit spinlock in iounit_init(). Signed-off-by: David S. Miller commit 9d7ab1f4d56dffcddc1177b3cd55b6da6620e1e1 tree a551efc605c7b4d10af4df101470c17308b7822e parent 67e23a1e60b6bc0a090407d0fc060166ab558b72 author David S. Miller Mon, 17 Jul 2006 21:39:09 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:11 -0700 [SPARC]: Fix initialization of sun4d SBUS interrupts. 1) Explicitly traverse to the root looking for the "sbi". 2) Grab the "board#" property from the sbi's parent and verify that this parent is an "io-unit" node. 3) Skip IRQ initialization when device lacks "reg" property. Signed-off-by: David S. Miller commit 67e23a1e60b6bc0a090407d0fc060166ab558b72 tree a690bed9a849ba177b046e76cb85f3209650ae55 parent 39329329565a5e24f0a5523eef3a9dd941e0b29d author David S. Miller Mon, 17 Jul 2006 21:07:17 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:08 -0700 [SERIAL] sunzilog: Register IRQ after all devices have been probed. Otherwise we will deref half-initialized channel pointers and crash in the interrupt handler. Signed-off-by: David S. Miller commit 39329329565a5e24f0a5523eef3a9dd941e0b29d tree 9b2a6207d73701d375e2cc4f57a34f72994071c7 parent f7785a64d117951e4c2bf9418d8c1dd59fe53b36 author David S. Miller Mon, 17 Jul 2006 21:06:15 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:06 -0700 [SPARC] sbus: Make sure sbus nodes are named uniquely. Just name them "sbus%d" otherwise on sun4d we try to register multiple entries named "sbi@0,0" which does not work. Based upon a report from Raymond Burns. Signed-off-by: David S. Miller commit f7785a64d117951e4c2bf9418d8c1dd59fe53b36 tree 47a563ea748f158a024f47a5b1c519329e61f599 parent bda2f7b4801964351253706d1a87e4d2110829a5 author Bob Breuer Mon, 17 Jul 2006 17:05:56 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:04 -0700 [SPARC]: Fix property name acquisition in prom.c On sparc32 the prom_{first,next}prop() interfaces work a little differently. The buffer argument is ignored on sparc32 and the firmware just returns a raw pointer to the property name. Signed-off-by: David S. Miller commit bda2f7b4801964351253706d1a87e4d2110829a5 tree c9da15652f91efb4ba0932d407200aa4d718d6aa parent 44f2650b134b423128063ded29a11454b924390e author David S. Miller Mon, 17 Jul 2006 16:40:26 -0700 committer David S. Miller Fri, 21 Jul 2006 14:18:01 -0700 [SERIAL] sunsab: Get line numbers and table sizing correct. Table sizing code should look for "se" not "su" nodes. The chip at the lower address should get the first index. Signed-off-by: David S. Miller commit 44f2650b134b423128063ded29a11454b924390e tree 4d66896d3235c77dc0b6f1871fee911eedc1f879 parent 06ffd7956e4790d824b4b5575b56def8448ec6d4 author Marc Zyngier Mon, 17 Jul 2006 15:53:32 -0700 committer David S. Miller Fri, 21 Jul 2006 14:17:57 -0700 [SPARC64] Fix sunsab ports ordering Register second SAB port before the first one, as serial A is wired to it, and expected to appear as ttyS0. Signed-off-by: Marc Zyngier Signed-off-by: David S. Miller commit 06ffd7956e4790d824b4b5575b56def8448ec6d4 tree 14a1f29fdfa257e79b2bb79aab69509104b5a19a parent 46ba6d7d8b0486e9d565729880ddfb2b84d3af31 author David S. Miller Sun, 16 Jul 2006 22:19:40 -0700 committer David S. Miller Fri, 21 Jul 2006 14:17:55 -0700 [SPARC]: Kill prom_getname, unused and not implemented properly. The m68k port's sun3 asm/oplib.h had a stray reference too, so I killed that off as well. Signed-off-by: David S. Miller commit 46ba6d7d8b0486e9d565729880ddfb2b84d3af31 tree 53f6eb1eb20d9adb45af5a78b440ae7ae3257990 parent 00ab956f2fefd3673edc16df55beed21834b7bdd author David S. Miller Sun, 16 Jul 2006 22:10:44 -0700 committer David S. Miller Fri, 21 Jul 2006 14:17:52 -0700 [SPARC64]: Fix more of_device layer IRQ bugs, and correct PROMREG_MAX. Sabre and Psycho PCI controllers can have partial interrupt-map properties, meaning that on-board devices don't match up to any entries. Instead, they are fully specified from the beginning and we should pass them directly to the IRQ translator as-is. Also, fill in the necessary translator slots for the "graphics" and "expansion UPA" interrupts on Sabre, Psycho, and SYSIO SBUS. Increase PROMREG_MAX to 24, as seen on SUNW,ffb devices. Finally, prevent accidentally writing past the end of the of_device struct resource[] and irqs[] arrays. Spit out a log message when we ignore some entries because there are too many of them. Signed-off-by: David S. Miller commit 00ab956f2fefd3673edc16df55beed21834b7bdd tree b703a595bbedaccd63b30d048b2f1cbc32ce0519 parent 53a4998229efbf5cb79ec7ca7c18f4c86f66755d parent 79bd3f8563a275d1d068bbb9189a746dc6e96f3e author Linus Torvalds Fri, 21 Jul 2006 12:04:53 -0700 committer Linus Torvalds Fri, 21 Jul 2006 12:04:53 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (38 commits) [SCSI] More buffer->request_buffer changes [SCSI] mptfusion: bump version to 3.04.01 [SCSI] mptfusion: misc fix's [SCSI] mptfusion: firmware download boot fix's [SCSI] mptfusion: task abort fix's [SCSI] mptfusion: sas nexus loss support [SCSI] mptfusion: sas loginfo update [SCSI] mptfusion: mptctl panic when loading [SCSI] mptfusion: sas enclosures with smart drive [SCSI] NCR_D700: misc fixes (section and argument ordering) [SCSI] scsi_debug: must_check fixes [SCSI] scsi_transport_sas: kill the use of channel [SCSI] scsi_transport_sas: add expander backlink [SCSI] hide EH backup data outside the scsi_cmnd [SCSI] ibmvscsi: handle inactive SCSI target during probe [SCSI] ibmvscsi: allocate lpevents for ibmvscsi on iseries [SCSI] aic7[9x]xx: Remove last vestiges of reverse_scan [SCSI] aha152x: stop poking at saved scsi_cmnd members [SCSI] st.c: Improve sense output [SCSI] lpfc 8.1.7: Change version number to 8.1.7 ... commit 53a4998229efbf5cb79ec7ca7c18f4c86f66755d tree e6c9be05fe944b70fa4ede3849a55b273ec068bd parent 3bda2418b94243d5e43fcfe48d9de70cb0d2423e parent d7cf0d57ef9e07cf0f65c58c19a8e7c4a9db72b5 author Linus Torvalds Fri, 21 Jul 2006 12:03:57 -0700 committer Linus Torvalds Fri, 21 Jul 2006 12:03:57 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] sysfs_create_xxx return values. [S390] .align 4096 statements in head.S [S390] get_clock inline assembly. [S390] channel measurement interval display. [S390] xpram module parameter parsing - take 2. [S390] Fix gcc warning about unused return values. commit 3bda2418b94243d5e43fcfe48d9de70cb0d2423e tree b03a0174f2368e1e5d7a66e28e69ee8875a1c60f parent f5beec49636bf8d5a34065c8ab030cd4ea84516f parent bdd01503c3e4e9827df015bc7e440d5498308fdd author Linus Torvalds Fri, 21 Jul 2006 12:03:32 -0700 committer Linus Torvalds Fri, 21 Jul 2006 12:03:32 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] spidernet: rework tx queue handling [PATCH] spidernet: bug fix for init code [PATCH] sky2: NAPI poll fix [NET] ethtool: fix oops by testing correct struct member e1000: bump version to 7.1.9-k4 e1000: fix panic on large frame receive when mtu=default e1000: remove CRC bytes from measured packet length e1000: Redo netpoll fix to address community concerns commit d7cf0d57ef9e07cf0f65c58c19a8e7c4a9db72b5 tree 2715e0badd8e5fbf6b787f8ff3120c2a87551688 parent dc8f5d21dd6bdd94e5c5bf9bbcc616d00f0cc839 author Heiko Carstens Tue, 18 Jul 2006 13:46:58 +0200 committer Martin Schwidefsky Tue, 18 Jul 2006 13:46:58 +0200 [S390] sysfs_create_xxx return values. Take return values of sysfs_create_group & friends into account. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit dc8f5d21dd6bdd94e5c5bf9bbcc616d00f0cc839 tree 2ff887cc01285669caf20260f78df70bb3bec0a2 parent 53ba5e09fe37518683ff8b3f28410ce0b9ed2f74 author Heiko Carstens Tue, 18 Jul 2006 13:44:57 +0200 committer Martin Schwidefsky Tue, 18 Jul 2006 13:44:57 +0200 [S390] .align 4096 statements in head.S SLES9 binutils don't like .align 4096 statements in head.S. Work around this by using .org statements. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit bdd01503c3e4e9827df015bc7e440d5498308fdd tree df479cded65bfcd23bdb2b46ad17f20bb5c8660c parent ee962a5cee5b534666dbfa5e3ec3c633c90c6b1a author Jens Osterkamp Thu, 13 Jul 2006 11:54:08 +0200 committer Jeff Garzik Mon, 17 Jul 2006 13:30:12 -0400 [PATCH] spidernet: rework tx queue handling With this patch TX queue descriptors are not chained per default any more. The pointer to next descriptor is set only when next descriptor is prepaired for transfer. Also the mechanism of checking wether Spider is ready has been changed: it checks not for CARDOWNED flag in status of previous descriptor but for a TXDMAENABLED flag in Spider's register. Signed-off-by: Maxim Shchetynin Signed-off-by: Arnd Bergmann Signed-off-by: Jens Osterkamp Signed-off-by: Jeff Garzik commit ee962a5cee5b534666dbfa5e3ec3c633c90c6b1a tree 34fa0b475ab7e8632bca67c406b6c82df1db7bcb parent caa0371e8b7391919d984672c887f660a6117f67 author Jens Osterkamp Thu, 13 Jul 2006 11:54:23 +0200 committer Jeff Garzik Mon, 17 Jul 2006 13:30:12 -0400 [PATCH] spidernet: bug fix for init code We want to intitialize addr instead of data register first. Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit caa0371e8b7391919d984672c887f660a6117f67 tree 514508473e8a8f73a59bca9defc7cd32139b00b2 parent 83b0fe818cd2f6cc03365440f2b7cca297a45b4f author Stephen Hemminger Mon, 17 Jul 2006 09:54:34 -0400 committer Jeff Garzik Mon, 17 Jul 2006 13:27:46 -0400 [PATCH] sky2: NAPI poll fix When sky2 driver gets lots of received packets at once, it can get stuck. The NAPI poll routine gets called back to keep going, but since no IRQ bits are set it doesn't make progress. Increase version, since this is serious enough problem that I want to be able to tell new from old problems. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 83b0fe818cd2f6cc03365440f2b7cca297a45b4f tree 6a430963b0348884625ffbe7ba6a6b141f246bbb parent e1b90c416d6e6b71fc63974c1798e3cf55bba77f parent 36902f2e35b132442746df6034462b7cdb7d82ab author Jeff Garzik Mon, 17 Jul 2006 13:26:52 -0400 committer Jeff Garzik Mon, 17 Jul 2006 13:26:52 -0400 Merge branch 'upstream-fixes-jgarzik' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream-fixes commit e1b90c416d6e6b71fc63974c1798e3cf55bba77f tree 3ae537a5af8ee37f21b169c3de45ae29eca7c80f parent 82d6897fefca6206bca7153805b4c5359ce97fc4 author Jeff Garzik Mon, 17 Jul 2006 12:54:40 -0400 committer Jeff Garzik Mon, 17 Jul 2006 12:54:40 -0400 [NET] ethtool: fix oops by testing correct struct member Noticed by Willy Tarreau. Signed-off-by: Jeff Garzik commit 53ba5e09fe37518683ff8b3f28410ce0b9ed2f74 tree ad6a9bab92764cded45b812ea441da73caa54970 parent 13ffa927abb74d4365b0e22f186befe4746b5897 author Andreas Krebbel Mon, 17 Jul 2006 16:09:42 +0200 committer Martin Schwidefsky Mon, 17 Jul 2006 16:09:42 +0200 [S390] get_clock inline assembly. Add missing volatile to the get_clock / get_cycles inline assemblies to avoid that consecutive calls get optimized away. Signed-off-by: Andreas Krebbel Signed-off-by: Martin Schwidefsky commit 13ffa927abb74d4365b0e22f186befe4746b5897 tree 606a37bd8acfdbf2280c4ed301ef42e2d0b62899 parent f257b06322c8a30c050a286c45fda68f23b9bc44 author Cornelia Huck Mon, 17 Jul 2006 16:09:28 +0200 committer Martin Schwidefsky Mon, 17 Jul 2006 16:09:28 +0200 [S390] channel measurement interval display. Display avg_sample_interval in nanoseconds, like it is documented. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit f257b06322c8a30c050a286c45fda68f23b9bc44 tree 06b9610f5e03e04671ff4568392efacb6869e0d0 parent 5a651c93d3a823af63b1b15bb94fdc951670fb2f author Heiko Carstens Mon, 17 Jul 2006 16:09:23 +0200 committer Martin Schwidefsky Mon, 17 Jul 2006 16:09:23 +0200 [S390] xpram module parameter parsing - take 2. Don't use memparse since the default size modifier is 'k'. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 5a651c93d3a823af63b1b15bb94fdc951670fb2f tree be47b1958b286a786adc0bc205dcb4ab6a84e083 parent 82d6897fefca6206bca7153805b4c5359ce97fc4 author Heiko Carstens Mon, 17 Jul 2006 16:09:18 +0200 committer Martin Schwidefsky Mon, 17 Jul 2006 16:09:18 +0200 [S390] Fix gcc warning about unused return values. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f5beec49636bf8d5a34065c8ab030cd4ea84516f tree f287dd3c48776f653098bf74e6b85670a041c551 parent 73291a1cb68bb62be62a927a9d67fe417b3cfe35 author Jeff Garzik Tue, 11 Jul 2006 15:28:12 -0400 committer Jeff Garzik Sun, 16 Jul 2006 11:48:28 -0400 [libata] ata_piix: correct 'invalid MAP value' typo-caused error Signed-off-by: Jeff Garzik commit 73291a1cb68bb62be62a927a9d67fe417b3cfe35 tree 543d6a1beede76124926eaf5afebdc634c6e45de parent 08f12edc335d24a89ba2f50b0a5b9d12295ce198 author Jeff Garzik Tue, 11 Jul 2006 13:11:17 -0400 committer Jeff Garzik Sun, 16 Jul 2006 11:48:28 -0400 [libata] ata_piix: minor cleanups noticed in prior patch run * delete unused PIIX_FLAG_COMBINED* * port_enable should be u16 rather than u32 Signed-off-by: Jeff Garzik commit 08f12edc335d24a89ba2f50b0a5b9d12295ce198 tree 5d329f7c0baa0bfd3d46481fb2a5a12e23b02a21 parent ea35d29e2fa8b3d766a2ce8fbcce599dce8d2734 author Jeff Garzik Tue, 11 Jul 2006 11:57:44 -0400 committer Jeff Garzik Sun, 16 Jul 2006 11:48:28 -0400 [libata] ata_piix: attempt to fix ICH8 support Take into account the fact that ICH8 changed the register layout of the MAP and PCS register bits. Signed-off-by: Jeff Garzik commit ea35d29e2fa8b3d766a2ce8fbcce599dce8d2734 tree 533e0cac2fd8b9ce860ce6260ef5feb9a3f8e817 parent d96715c1acb119cef4b2443ba9b3777b730139e6 author Jeff Garzik Tue, 11 Jul 2006 11:48:50 -0400 committer Jeff Garzik Sun, 16 Jul 2006 11:48:28 -0400 [libata] ata_piix: Consolidate PCS register writing Prior to this patch, the driver would do this for each port: read 8-bit PCS write 8-bit PCS read 8-bit PCS write 8-bit PCS In the field, flaky behavior has been observed related to this register. In particular, these overzealous register writes can cause misdetection problems. Update to do the following once (not once per port) at boot: read 16-bit PCS if needs changing, write 16-bit PCS And thereafter, we only perform a 'read 16-bit PCS' per port. This should eliminate all PCS writes in many cases, and be more friendly in the cases where we do need to enable ports. Signed-off-by: Jeff Garzik commit d96715c1acb119cef4b2443ba9b3777b730139e6 tree 232ff826587a342b0dc290c180b843d84446bef0 parent 82d6897fefca6206bca7153805b4c5359ce97fc4 author Tejun Heo Thu, 29 Jun 2006 01:58:28 +0900 committer Jeff Garzik Sun, 16 Jul 2006 11:48:28 -0400 [PATCH] ata_piix: add host_set private structure Add host_set private structure piix_host_priv. Currently the only field is ->map which used to be stored directly at host_set->private_data. This change allows more host_set private fields to be added. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 36902f2e35b132442746df6034462b7cdb7d82ab tree bc3fe5a6d60a8367a5ef3de2e70e811bfe9eafe3 parent eb0f8054dd2e8b3cdf3af4771583b1dc2e1327cc author Auke Kok Fri, 14 Jul 2006 16:14:55 -0700 committer Auke Kok Fri, 14 Jul 2006 16:14:55 -0700 e1000: bump version to 7.1.9-k4 Bump the version to 7.1.9-k4 to indicate three extra changes. Signed-off-by: Auke Kok commit eb0f8054dd2e8b3cdf3af4771583b1dc2e1327cc tree 3b8acdf0f6ba42afcaceb3fa552d06ef44a01630 parent f235a2abb27b9396d2108dd2987fb8262cb508a3 author Auke Kok Fri, 14 Jul 2006 16:14:48 -0700 committer Auke Kok Fri, 14 Jul 2006 16:14:48 -0700 e1000: fix panic on large frame receive when mtu=default A panic was reported when receiving 1522 size packets if using the default MTU. we should set the initial rx buffer length to the value that e1000changemtu sets so that we can receive any packet that would not be dropped by LPE=0. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit f235a2abb27b9396d2108dd2987fb8262cb508a3 tree a4ac7f791627169a9087916a5a42e867f136a456 parent d3d9e484b2ca502c87156b69fa6b8f8fd5fa18a0 author Auke Kok Fri, 14 Jul 2006 16:14:34 -0700 committer Auke Kok Fri, 14 Jul 2006 16:14:34 -0700 e1000: remove CRC bytes from measured packet length After removing the hardware CRC stripping which causes problems with SOL and related issues, we need to compensate for this changed size. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit d3d9e484b2ca502c87156b69fa6b8f8fd5fa18a0 tree 25cc750bb3a88599645c0415110e8ed9a6086f64 parent 22e1170310ec6afa41e0dc7ac9dfac735d82dcab author Auke Kok Fri, 14 Jul 2006 16:14:23 -0700 committer Auke Kok Fri, 14 Jul 2006 16:14:23 -0700 e1000: Redo netpoll fix to address community concerns The original suggested fix for netpoll was found to be racy on SMP kernels. While it is highly unlikely that this race would ever be seen in the real world due to current netpoll usage models, we implemented this updated fix to address concerns. Signed-off-by: Mitch Williams Signed-off-by: Auke Kok commit 79bd3f8563a275d1d068bbb9189a746dc6e96f3e tree e4139f1bdf0b32ac05aeb225709272e03ac1f302 parent 92c0bfea9ba61ec2d3a6d4fb1af39358d5e52b71 author Christoph Hellwig Fri, 14 Jul 2006 10:29:34 +0200 committer James Bottomley Fri, 14 Jul 2006 09:41:13 -0500 [SCSI] More buffer->request_buffer changes Seem like quite a few splipped through the cracks. Here's a patch to update all references I could find: Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 92c0bfea9ba61ec2d3a6d4fb1af39358d5e52b71 tree 66e476bdc847ca6b697cd578ebca3a70686bfeec parent ba856d32f2cede67fd2a59a53bc662360f17c7b5 author Eric Moore Tue, 11 Jul 2006 17:34:43 -0600 committer James Bottomley Thu, 13 Jul 2006 09:32:43 -0400 [SCSI] mptfusion: bump version to 3.04.01 bump version to 3.04.01 Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit ba856d32f2cede67fd2a59a53bc662360f17c7b5 tree 790a9cd086302e86f249bdcdd489691f46013dd6 parent 0ccdb007596642dae8d7b323127d8840939b844a author Eric Moore Tue, 11 Jul 2006 17:34:01 -0600 committer James Bottomley Thu, 13 Jul 2006 09:32:09 -0400 [SCSI] mptfusion: misc fix's * removing obsolete 1066, 1066E from Kconfig * initializing aen_event_read_flag after host reset * remove oem references * remove obsolete mpt_pq_filter command line option Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 0ccdb007596642dae8d7b323127d8840939b844a tree 45262779ff81234ef36e80b397ccdc350824edaf parent 3dc0b03fec73339199a995acd5a47478da0b4dc4 author Eric Moore Tue, 11 Jul 2006 17:33:13 -0600 committer James Bottomley Thu, 13 Jul 2006 09:31:23 -0400 [SCSI] mptfusion: firmware download boot fix's Fix's to insure download boot could occur when either channel of 1030 is reset. Necessary in order for onboard controller in flashless environment to become operational. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 3dc0b03fec73339199a995acd5a47478da0b4dc4 tree 4ab936aea919f385c095e336f366fd59081e6651 parent bf4515227c36fde1887f3fc0afc25a9bb4726842 author Eric Moore Tue, 11 Jul 2006 17:32:33 -0600 committer James Bottomley Thu, 13 Jul 2006 09:30:49 -0400 [SCSI] mptfusion: task abort fix's Fix's to insure proper status is returned to midlayer when a task abort failed to be aborted by controller firmware. Also sanity checks to prevent scsi cmd from being double completed during error recovery. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit bf4515227c36fde1887f3fc0afc25a9bb4726842 tree a16efb1aa29fef58c7983c390f394cd0079ff9e8 parent 4f766dc6d30ab0d958cbeafaeab5ed2538ec7015 author Eric Moore Tue, 11 Jul 2006 17:25:35 -0600 committer James Bottomley Thu, 13 Jul 2006 09:27:18 -0400 [SCSI] mptfusion: sas nexus loss support sas nexus loss support for systems that suport failover. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 4f766dc6d30ab0d958cbeafaeab5ed2538ec7015 tree 783a7f8ef8650c66cc22ab95d3176dbdc47b38c5 parent d58b2725d28041ff9412fecb109bebf76b1a9b26 author Eric Moore Tue, 11 Jul 2006 17:24:07 -0600 committer James Bottomley Thu, 13 Jul 2006 09:19:05 -0400 [SCSI] mptfusion: sas loginfo update Adding more sas loginfo strings. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit d58b2725d28041ff9412fecb109bebf76b1a9b26 tree b0eafa2d64aeda3eab7111ab0730ce847529f875 parent 786899b013cdf7aeb2aaaf7390c442f02bba24af author Eric Moore Tue, 11 Jul 2006 17:23:23 -0600 committer James Bottomley Thu, 13 Jul 2006 09:18:22 -0400 [SCSI] mptfusion: mptctl panic when loading Fix panic for when mptctl is loading at the same time when one of the fusion llds (mptsas/mptfc/mptspi) is loading. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 786899b013cdf7aeb2aaaf7390c442f02bba24af tree 5b191f6ab2c7c471c3a57cf053095458caf006da parent 3bb056eb1df236f3344426860e584a8981486334 author Eric Moore Tue, 11 Jul 2006 17:22:22 -0600 committer James Bottomley Thu, 13 Jul 2006 09:13:13 -0400 [SCSI] mptfusion: sas enclosures with smart drive Adding support for sas enclosures with smart drives. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit 3bb056eb1df236f3344426860e584a8981486334 tree 365afef73df7b9bc19baa5bcf743713b3529d167 parent 6ecaff7fe84eb64796d8dfe667439290b4acfad0 author James Bottomley Wed, 12 Jul 2006 11:55:39 -0400 committer James Bottomley Wed, 12 Jul 2006 12:03:43 -0400 [SCSI] NCR_D700: misc fixes (section and argument ordering) Apparently the D700 has had an argument ordering issue for quite a while which can cause it to get the wrong scsi_id (I just got an unbootable voyager system because of this). Hopefully this patch also fixes up all the sectional mismatches within the driver. Signed-off-by: James Bottomley commit 6ecaff7fe84eb64796d8dfe667439290b4acfad0 tree 452bde38c122e65d036149b3ff7c41d76d766d68 parent e8bf39417b578a11e2ee2cd16e794a5b2d40757b author Randy Dunlap Tue, 11 Jul 2006 20:53:22 -0700 committer James Bottomley Wed, 12 Jul 2006 11:57:28 -0400 [SCSI] scsi_debug: must_check fixes Check all __must_check warnings in scsi_debug. Signed-off-by: Randy Dunlap Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit e8bf39417b578a11e2ee2cd16e794a5b2d40757b tree 7e20aa4b9c483b62a91cf3e5f6a2bc51074c507c parent a0e1b6ef3b851fe6f1dcc259432e83de79ce5e7f author James Bottomley Tue, 11 Jul 2006 17:49:34 -0400 committer James Bottomley Wed, 12 Jul 2006 09:20:01 -0400 [SCSI] scsi_transport_sas: kill the use of channel Using the port_id for the channel is completely unnecessary since the host_id/target_id are constructed to be globally unique. Also move the mptsas driver on to virtual channel 1 for its raid devices. Acked-by: "Moore, Eric" Signed-off-by: James Bottomley commit a0e1b6ef3b851fe6f1dcc259432e83de79ce5e7f tree 4e62bf64d66e2a07cdad6480441a2a443246e3cb parent 631c228cd09bd5b93090fa60bd9803ec14aa0586 author James Bottomley Sun, 09 Jul 2006 12:38:19 -0500 committer James Bottomley Wed, 12 Jul 2006 09:03:20 -0400 [SCSI] scsi_transport_sas: add expander backlink This patch adds the ability to add a backlink to a particular port. The idea is to represent properly ports on expanders that are used specifically for linking to the parent device in the topology. Signed-off-by: James Bottomley commit 631c228cd09bd5b93090fa60bd9803ec14aa0586 tree 3d15819bbdc30e291c342e06a0694184b1616996 parent ae0fda0cdf009731a33f031f86df8566f1977ffe author Christoph Hellwig Sat, 08 Jul 2006 20:42:15 +0200 committer James Bottomley Sun, 09 Jul 2006 11:56:44 -0500 [SCSI] hide EH backup data outside the scsi_cmnd Currently struct scsi_cmnd has various fields that are used to backup original data after the corresponding fields have been overridden for EH commands. This means drivers can easily get at it and misuse it. Due to the old_ naming this doesn't happen for most of them, but two that have different names have been used wrong a lot (see previous patch). Another downside is that they unessecarily bloat the scsi_cmnd size. This patch moves them onstack in scsi_send_eh_cmnd to fix those two issues aswell as allowing future EH fixes like moving the EH command submissions to use SG lists like everything else. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit ae0fda0cdf009731a33f031f86df8566f1977ffe tree 397016e9b52ef94086e5acc16a40a41595d9a45b parent 6c51fe10475eda9f5c535f337411e1ed0e6915b9 author Dave C Boutcher Thu, 06 Jul 2006 22:08:49 -0500 committer James Bottomley Sun, 09 Jul 2006 11:28:58 -0500 [SCSI] ibmvscsi: handle inactive SCSI target during probe Without this patch we register an interrupt with request_irq, but then return a bad return code from the module probe. Signed-off-by: James Bottomley commit 6c51fe10475eda9f5c535f337411e1ed0e6915b9 tree 2c02961223f15997313db9ad50b8e40a36470e28 parent d14164316d48a4319d8da9dc24be8663b2472bae author Dave C Boutcher Thu, 06 Jul 2006 22:07:47 -0500 committer James Bottomley Sun, 09 Jul 2006 11:28:38 -0500 [SCSI] ibmvscsi: allocate lpevents for ibmvscsi on iseries Allocate the correct number of lp events when running ibmvscsi on legacy iseries Signed-off-by: Dave Boutcher Signed-off-by: James Bottomley commit d14164316d48a4319d8da9dc24be8663b2472bae tree c16ebcbd295a7bcd77109954f9babf8eb82d5201 parent 5e13cdfa5ba94724d6ab11de26b3ec3c94b88b00 author Matthew Wilcox Sat, 08 Jul 2006 14:02:26 -0600 committer James Bottomley Sun, 09 Jul 2006 11:27:43 -0500 [SCSI] aic7[9x]xx: Remove last vestiges of reverse_scan Remove last vestiges of the reverse_scan paramater from aic7xxx and aic79xx. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley commit 5e13cdfa5ba94724d6ab11de26b3ec3c94b88b00 tree 7f6ec288f314dda60b825a2ded8e8eb7e5bde647 parent 4e73ea7b02a8d2759b20ab52f13f40d5f5421044 author Christoph Hellwig Sat, 08 Jul 2006 20:39:30 +0200 committer James Bottomley Sun, 09 Jul 2006 11:27:23 -0500 [SCSI] aha152x: stop poking at saved scsi_cmnd members Stop poking into the old_ & co scsi_cmnd fields that should only be used in the EH code. Untested, but this is required to move ahead with the EH fixes. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 4e73ea7b02a8d2759b20ab52f13f40d5f5421044 tree 7d24ec863d5761ab5425505c44e989a109819c18 parent 035bff20bff2b6779ed3ad0a24a51a1a96828bc8 author Luben Tuikov Fri, 07 Jul 2006 00:02:18 -0700 committer James Bottomley Sun, 09 Jul 2006 11:27:03 -0500 [SCSI] st.c: Improve sense output Convert this: st0: Error with sense data: <6>st: Current: sense key: Illegal Request Additional sense: Invalid field in cdb To this: st0: Current: sense key: Illegal Request Additional sense: Invalid field in cdb Signed-off-by: Luben Tuikov Acked-by: Kai Makisara Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 035bff20bff2b6779ed3ad0a24a51a1a96828bc8 tree 1484fa332866ec3923762a8ea71d993fec5f10b5 parent 65a29c166fe331574880a375559405ac802b027a author James Smart Thu, 06 Jul 2006 15:50:58 -0400 committer James Bottomley Sun, 09 Jul 2006 10:49:39 -0500 [SCSI] lpfc 8.1.7: Change version number to 8.1.7 Change version number to 8.1.7 Signed-off-by: James Smart Signed-off-by: James Bottomley commit 65a29c166fe331574880a375559405ac802b027a tree c1dc8856dd84347d900aa4b11bdffde685529f04 parent b4c026520ff0a4cb838a941bb0ed8996075e3d8c author James Smart Thu, 06 Jul 2006 15:50:50 -0400 committer James Bottomley Sun, 09 Jul 2006 10:49:14 -0500 [SCSI] lpfc 8.1.7: Misc Fixes Misc Fixes: - Fix some sparse warnings - casts of address space - Fix handling of the adapter registration string. Each invocation was byteswapping, so every other adapter init attempt failed. - Correct comments and default value for the lpfc_max_luns parameter Signed-off-by: James Smart Signed-off-by: James Bottomley commit b4c026520ff0a4cb838a941bb0ed8996075e3d8c tree c280062f59f802cfbc92d967e54cdd0191ce4e36 parent ce8b3ce55bb0bd9318954efab0f714b088178978 author James Smart Thu, 06 Jul 2006 15:50:43 -0400 committer James Bottomley Sun, 09 Jul 2006 10:48:38 -0500 [SCSI] lpfc 8.1.7: Add lpfc_sli_flush_mbox_queue() function Add lpfc_sli_flush_mbox_queue() function and use it in lpfc_offline() call to avoid deadlock on thread block. Signed-off-by: James Smart Signed-off-by: James Bottomley commit ce8b3ce55bb0bd9318954efab0f714b088178978 tree 3a330ebbf376d97e55a4720671775e916c83d743 parent 5e0b43385559bfe78c1f80d71ec203effe244d9a author James Smart Thu, 06 Jul 2006 15:50:36 -0400 committer James Bottomley Sun, 09 Jul 2006 10:48:11 -0500 [SCSI] lpfc 8.1.7: Correct the wait in attachment that delays for topology discovery Correct the wait in attachment that delays for topology discovery Signed-off-by: James Smart Signed-off-by: James Bottomley commit 5e0b43385559bfe78c1f80d71ec203effe244d9a tree 6a6ab5f69d49c5aa11d08c9f7e73122c9e5a48a9 parent 40496f073ffe75c59414a7236f95ecbc49562596 author James Smart Thu, 06 Jul 2006 15:50:29 -0400 committer James Bottomley Sun, 09 Jul 2006 10:47:34 -0500 [SCSI] lpfc 8.1.7: Remove depricated sysfs attribute board_online Remove depricated sysfs attribute board_online, as it's replaced by the new issue_reset attribute Signed-off-by: James Smart Signed-off-by: James Bottomley commit 40496f073ffe75c59414a7236f95ecbc49562596 tree 7f29d920f041be13f78e63186f9e5196b6f36f1e parent 420b630d6e9ff41dc3e2a2a2808b67907951e094 author James Smart Thu, 06 Jul 2006 15:50:22 -0400 committer James Bottomley Sun, 09 Jul 2006 10:44:08 -0500 [SCSI] lpfc 8.1.7: Adding new issue_reset sysfs attribute Adding new issue_reset sysfs attribute Signed-off-by: James Smart Signed-off-by: James Bottomley commit 420b630d6e9ff41dc3e2a2a2808b67907951e094 tree ea841e7d646a7cfd37358321e922f63e48d70ed7 parent bcf4dbfaf38502d3919e0601c06afac7d5e42685 author James Smart Thu, 06 Jul 2006 15:50:16 -0400 committer James Bottomley Sun, 09 Jul 2006 10:43:43 -0500 [SCSI] lpfc 8.1.7: Fix panic in lpfc_sli_validate_fcp_iocb Fix panic in lpfc_sli_validate_fcp_iocb due to access of scsi_cmnd after returning it to the midlayer Signed-off-by: James Smart Signed-off-by: James Bottomley commit bcf4dbfaf38502d3919e0601c06afac7d5e42685 tree 32a29d9b1b006a85d7a4b2b08a3afd1b785c8b00 parent 9279565046f39f3ab338818c9923a23b9f25be5f author James Smart Thu, 06 Jul 2006 15:50:08 -0400 committer James Bottomley Sun, 09 Jul 2006 10:25:27 -0500 [SCSI] lpfc 8.1.7: Consolidate dma buf cleanup into a separate function Consolidate dma buf cleanup into a separate function Signed-off-by: James Smart Signed-off-by: James Bottomley commit 9279565046f39f3ab338818c9923a23b9f25be5f tree ae096286fae5558b59c90aea0b2c4548187609a7 parent 688a88635f9d0d9251d35198e931eaac8816abef author James Smart Thu, 06 Jul 2006 15:50:02 -0400 committer James Bottomley Sun, 09 Jul 2006 10:23:29 -0500 [SCSI] lpfc 8.1.7: Correct bogus nodev_tmo message on NPort that changes its NPort Id Correct bogus nodev_tmo message on NPort that changes its NPort Id Signed-off-by: James Smart Signed-off-by: James Bottomley commit 688a88635f9d0d9251d35198e931eaac8816abef tree a7a78fee8bfb6bf1552484235be17ce406d76b70 parent 4db621e0f3817e14c79513b42c0479d44d8467de author James Smart Thu, 06 Jul 2006 15:49:56 -0400 committer James Bottomley Sun, 09 Jul 2006 10:21:28 -0500 [SCSI] lpfc 8.1.7: Fix txcmplq related panics on heavy IO while downloading firmware Fix txcmplq related panics on heavy IO while downloading firmware Signed-off-by: James Smart Signed-off-by: James Bottomley commit 4db621e0f3817e14c79513b42c0479d44d8467de tree 610af45ade8fe6d9e16cc039fe263ae47c0888d3 parent d0e56dad5c10e2a34a830e02dfd3aca20e63e387 author James Smart Thu, 06 Jul 2006 15:49:49 -0400 committer James Bottomley Sun, 09 Jul 2006 10:21:00 -0500 [SCSI] lpfc 8.1.7: Issue DOWN_LINK prior to INIT_LINK to work around link failure issue Issue DOWN_LINK prior to INIT_LINK to work around link failure issue Signed-off-by: James Smart Signed-off-by: James Bottomley commit d0e56dad5c10e2a34a830e02dfd3aca20e63e387 tree f5cfa0e5d760b5416ea9f6ae5f8fd53fc6c0a90e parent 9f49d3b05f092b89e774be20c654ceb0c64a7d19 author James Smart Thu, 06 Jul 2006 15:49:42 -0400 committer James Bottomley Sun, 09 Jul 2006 10:20:30 -0500 [SCSI] lpfc 8.1.7: Fixed infinite retry of REG_LOGIN mailbox failed due to MBXERR_RPI_FULL Fixed infinite retry of REG_LOGIN mailbox failed due to MBXERR_RPI_FULL Signed-off-by: James Smart Signed-off-by: James Bottomley commit 9f49d3b05f092b89e774be20c654ceb0c64a7d19 tree df6e51ed79ec213090c6940aa8b827e4b2efbd3a parent e17da18e2f78845899467d6e580146ef673f5330 author James Smart Thu, 06 Jul 2006 15:49:34 -0400 committer James Bottomley Sun, 09 Jul 2006 10:19:55 -0500 [SCSI] lpfc 8.1.7: Fix memory leak and cleanup code related to per ring lookup array Fix memory leak and cleanup code related to per ring lookup array. Signed-off-by: James Smart Signed-off-by: James Bottomley commit e17da18e2f78845899467d6e580146ef673f5330 tree 756b7a096f86eaa05b93f5fb5f3c90dc3b65cee4 parent 5a0e326dfa6d87a1ac6929a7d6d327e8803b7aef author James Smart Thu, 06 Jul 2006 15:49:25 -0400 committer James Bottomley Sun, 09 Jul 2006 10:19:03 -0500 [SCSI] lpfc 8.1.7: Standardize the driver on a single define for the maximum supported targets Standardize the driver on a single define for the maximum supported targets. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 5a0e326dfa6d87a1ac6929a7d6d327e8803b7aef tree 3d257f038e84f46051666b279289b3393cc06a66 parent dc22f16d4e46cee699c3835cc6e2a8005023517f author James Smart Thu, 06 Jul 2006 15:49:16 -0400 committer James Bottomley Sun, 09 Jul 2006 10:18:28 -0500 [SCSI] lpfc 8.1.7: Use mod_timer instead of add_timer in lpfc_els_timeout_handler Use mod_timer instead of add_timer in lpfc_els_timeout_handler This patch was formerly posted by Mark Haverkamp. http://marc.theaimsgroup.com/?l=linux-scsi&m=114246089015681&w=2 Signed-off-by: Mark Haverkamp Signed-off-by: James Smart Signed-off-by: James Bottomley commit dc22f16d4e46cee699c3835cc6e2a8005023517f tree 14494814ee6e3581ad5b6e2399bb562ac7f9b58e parent a507c6a2d91c52615bd3bb5a8ff439d9e8530939 author Eric Moore Thu, 06 Jul 2006 11:23:14 -0600 committer James Bottomley Sun, 09 Jul 2006 10:17:21 -0500 [SCSI] mptsas: use unnumbered port API and remove driver porttracking This allows us to be rid of the machinery in mptsas for creating and tracking port numbers. Since mptsas is merely inventing the numbers, the SAS transport class may as well do it instead. Signed-off-by: Eric Moore Signed-off-by: James Bottomley commit a507c6a2d91c52615bd3bb5a8ff439d9e8530939 tree a942daa3204fda6e0f07e30fbe258257bd3d63f0 parent c9fefeb26457b87f4a767faefcf77321bb90db52 author Douglas Gilbert Sun, 02 Jul 2006 13:48:10 -0400 committer James Bottomley Sun, 09 Jul 2006 09:10:06 -0500 [SCSI] update additional sense codes and some opcode names Following on from my post titled: "additional sense codes need update" see the attachment against lk 2.6.17 . ChangeLog: - update additional sense codes table to agree with SPC-4 revision 5a (14 June 2006) - adjust some of the opcode names Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit c9fefeb26457b87f4a767faefcf77321bb90db52 tree 4b961b944e3cd51581c832134eccc4f6d4c4eef7 parent 24f6d2fd314f8580fcfd96391ce9689727d55572 author James Bottomley Sun, 02 Jul 2006 11:10:18 -0500 committer James Bottomley Sun, 09 Jul 2006 09:06:24 -0500 [SCSI] scsi_transport_sas: add unindexed ports Some SAS HBAs don't want to go to the trouble of tracking port numbers, so they'd simply like to say "add this port and give it a number". This is especially beneficial from the hotplug point of view, since tracking ports and the available number space can be a real pain. The current implementation uses an incrementing number per expander to add the port on. However, since there can never be more ports than there are phys, a later implementation will try to be more intelligent about this. Signed-off-by: James Bottomley commit 24f6d2fd314f8580fcfd96391ce9689727d55572 tree 6ed4ecd7257d5706d29cf4729f0106adc7b95207 parent b862f3b099f3ea672c7438c0b282ce8201d39dfc author Adrian Bunk Fri, 30 Jun 2006 02:33:07 -0700 committer James Bottomley Sun, 09 Jul 2006 09:05:37 -0500 [SCSI] aic79xx: make ahd_done_with_status() static This patch makes a needlessly global function static. Signed-off-by: Adrian Bunk Acked-by: Hannes Reinecke Signed-off-by: Andrew Morton Signed-off-by: James Bottomley