]> www.infradead.org Git - users/jedix/linux-maple.git/log
users/jedix/linux-maple.git
12 years agokabi: add ocfs2 white list fuction
Maxim Uvarov [Mon, 3 Dec 2012 11:26:50 +0000 (03:26 -0800)]
kabi: add ocfs2 white list fuction

Bug-db: 13803
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
12 years agoMerge tag 'v2.6.39-400#qla2xxx' of git://ca-git.us.oracle.com/linux-snits-public
Maxim Uvarov [Fri, 30 Nov 2012 08:50:34 +0000 (00:50 -0800)]
Merge tag 'v2.6.39-400#qla2xxx' of git://ca-git.us.oracle.com/linux-snits-public

OLdev v2.6.39-400#qla2xxx

12 years agoqla2xxx: Update driver version to 8.04.00.10.39.0-k.
Saurav Kashyap [Fri, 12 Oct 2012 11:02:55 +0000 (16:32 +0530)]
qla2xxx: Update driver version to 8.04.00.10.39.0-k.

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Ramp down queue depth for attached SCSI devices when driver resources are...
Chad Dupuis [Fri, 12 Oct 2012 10:16:34 +0000 (15:46 +0530)]
qla2xxx: Ramp down queue depth for attached SCSI devices when driver resources are low.

JIRA Key: V2632FC-266

Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Add acquiring of risc semaphore before doing ISP reset.
Joe Carnuccio [Sat, 29 Sep 2012 01:28:24 +0000 (18:28 -0700)]
qla2xxx: Add acquiring of risc semaphore before doing ISP reset.

Before performing ISP reset, attempt to acquire the RISC semaphore;
this attempts to avoid killing the I2C access state of the other PCI function.

Try to acquire the semaphore; if semaphore is hung then acquire it by force.

The ISP reset clears the semaphore, thereby implicitly releasing it.

JIRA Key: V2632FC-289

Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by; Chad Dupuis <chad.dupuis@qlogic.com>

Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Determine the number of outstanding commands based on available resources.
Chad Dupuis [Tue, 24 Jul 2012 18:11:24 +0000 (14:11 -0400)]
qla2xxx: Determine the number of outstanding commands based on available resources.

Base the number of outstanding requests the driver will keep track of on the
available resources instead of being hard-coded.

JIRA Key: V2632FC-267

Acked-by: Armen Baloyan <armen.baloyan@qlogic.com>
Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Fix for kernel crash when external loopback diagnostic is run through BSG...
Armen Baloyan [Fri, 12 Oct 2012 09:53:25 +0000 (15:23 +0530)]
qla2xxx: Fix for kernel crash when external loopback diagnostic is run through BSG interface.

JIRA Key: V2632FC-290
ER: 93343

Acked-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Ignore driver ack bit if corresponding presence bit is not set.
Saurav Kashyap [Mon, 8 Oct 2012 09:12:19 +0000 (14:42 +0530)]
qla2xxx: Ignore driver ack bit if corresponding presence bit is not set.

JIRA Key: V2632FC-286

Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Acked-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Fix typo in qla83xx_fw_dump function.
Saurav Kashyap [Tue, 9 Oct 2012 07:32:16 +0000 (13:02 +0530)]
qla2xxx: Fix typo in qla83xx_fw_dump function.

JIRA Key: V2632FC-288

Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Acked-by: Armen Baloyan <armen.baloyan@qlogic.com>
Acked-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Add Gen3 PCIe speed 8GT/s to the log message.
Saurav Kashyap [Tue, 9 Oct 2012 06:44:33 +0000 (12:14 +0530)]
qla2xxx: Add Gen3 PCIe speed 8GT/s to the log message.

JIRA Key: V2632FC-287

Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Acked By: Giridhar Malavali  <giridhar.malavali@qlogic.com>
Acked-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Use correct Request-Q-Out register during bidirectional request processing
Andrew Vasquez [Mon, 8 Oct 2012 07:13:26 +0000 (12:43 +0530)]
qla2xxx: Use correct Request-Q-Out register during bidirectional request processing

Original code was not corrected for ISP83xx support. Instead code should used
the cached reference from the req_que structure, rather than the legacy
'if (ISP-TYPE(X))... else if (ISP-TYPE(Y))...' codes.

JIRA Key: V2632FC-284

Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Test and clear FCPORT_UPDATE_NEEDED atomically.
David Jeffery [Thu, 11 Oct 2012 00:09:24 +0000 (05:39 +0530)]
qla2xxx: Test and clear FCPORT_UPDATE_NEEDED atomically.

When the qla2xxx driver loses access to multiple, remote ports, there is a race
condition which can occur which will keep the request stuck on a scsi request
queue indefinitely.

While testing path loss, a customer encountered a case where the loss of the FC
connection could result in a process which sent a command through the sg driver
becoming hung and unresponsive.  It had sent a command to one of the now
unreachable LUNs, and the command and its request never completes.

But this isn't a case of the target and LUNs being blocked.  From a vmcore, the
FC transport still considered the port as in a working, FC_PORTSTATE_ONLINE
state.  Instead, the request was on the queue, but the target structure was in
blocked state.  qla2xxx's queuecommand function was returning
SCSI_MLQUEUE_TARGET_BUSY, causing the request to keep being requeued and retried
without ever advancing.  The qla2xxx driver was rejecting the command with
SCSI_MLQUEUE_TARGET_BUSY because its internal port state for this port was in
FCS_DEVICE_LOST state.  This should not happen.  qla2xxx should not think the
port is lost while the fc transport thinks the device is in good, working order.

This bad state occurred do to a race condition with how the FCPORT_UPDATE_NEEDED
bit is set in qla2x00_schedule_rport_del(), and how it is cleared in
qla2x00_do_dpc().  The problem port has its drport pointer set, but it has never
been processed by the driver to inform the fc transport that the port has been
lost.  qla2x00_schedule_rport_del() sets drport, and then sets the
FCPORT_UPDATE_NEEDED bit.  In qla2x00_do_dpc(), the port lists are walked and
any drport pointer is handled and the fc transport informed of the port loss,
then the FCPORT_UPDATE_NEEDED bit is cleared.  This leaves a race where the
dpc thread is processing one port removal, another port removal is marked
with a call to qla2x00_schedule_rport_del(), and the dpc thread clears the
bit for both removals, even though only the first removal was actually
handled.  Until another event occurs to set FCPORT_UPDATE_NEEDED, the later
port removal is never finished and qla2xxx stays in a bad state which causes
requests to become stuck on request queues.

The attached patch updates the driver to test and clear FCPORT_UPDATE_NEEDED
atomically.  This ensures the port state changes are processed and not lost.
If a race occurs, the dpc thread will walk the ports an extra time as
FCPORT_UPDATE_NEEDED will have become set again.

JIRA Key: V2632FC-283

Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Move noisy Start scsi failed messages to verbose logging level.
Chad Dupuis [Wed, 10 Oct 2012 23:59:39 +0000 (05:29 +0530)]
qla2xxx: Move noisy Start scsi failed messages to verbose logging level.

This message can fill up the system logs and is not a common occurrence so move
it to the verbose logging level.

JIRA Key: V2632FC-282

Acked-by: Armen Baloyan <armen.baloyan@qlogic.com>
Acked-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Acked-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Honor status value of 2 for report-id acquistion.
Saurav Kashyap [Mon, 24 Sep 2012 10:54:33 +0000 (16:24 +0530)]
qla2xxx: Honor status value of 2 for report-id acquistion.

The value of 2 is informational message and it means that prot id have changed.
The driver should honor this value and continue its normal course.

JIRA Key: V2632FC-280

Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Acked-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Fix coccinelle warnings in qla2x00_relogin.
Saurav Kashyap [Wed, 10 Oct 2012 23:50:25 +0000 (05:20 +0530)]
qla2xxx: Fix coccinelle warnings in qla2x00_relogin.

JIRA Key: V2632FC-278

Reported-by: Fengguang Wu <Fengguang.wu@intel.com>
Acked-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Fix for warning reported by sparse.
Saurav Kashyap [Fri, 12 Oct 2012 09:45:42 +0000 (15:15 +0530)]
qla2xxx: Fix for warning reported by sparse.

JIRA Key: V2632FC-273

Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Acked-by: Atul Deshmukh <atul.deshmukh@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Update the driver verion to 8.04.00.09.39.0-k.
Saurav Kashyap [Mon, 24 Sep 2012 06:39:38 +0000 (12:09 +0530)]
qla2xxx: Update the driver verion to 8.04.00.09.39.0-k.

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: No fcport FC-4 type assignment in GA_NXT response.
Armen Baloyan [Thu, 20 Sep 2012 00:15:09 +0000 (05:45 +0530)]
qla2xxx: No fcport FC-4 type assignment in GA_NXT response.

JIRA Key: V2632FC-275

Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Acked-by: Joe Carnuccio <joe.carnuccio@qlogi.com>
Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Fix checkpatch error in qla2xxx_mctp_dump.
Chad Dupuis [Thu, 20 Sep 2012 00:06:24 +0000 (05:36 +0530)]
qla2xxx: Fix checkpatch error in qla2xxx_mctp_dump.

Fix checkpatch.pl violation where an assignment is done directly in a if
statement.

JIRA Key: V2632FC-276

Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Change in setting UNLOADING flag and FC vports logout sequence while unloadi...
Giridhar Malavali [Wed, 19 Sep 2012 23:55:18 +0000 (05:25 +0530)]
qla2xxx: Change in setting UNLOADING flag and FC vports logout sequence while unloading qla2xxx driver.

JIRA Key: V2632FC-277
ER: ER97319

Acked-by: Chad Dupuis <chad.dupuis@qlogi.com>
Acked-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Remove spurious taking of ha->vport_slock spinlock.
Chad Dupuis [Wed, 19 Sep 2012 23:36:10 +0000 (05:06 +0530)]
qla2xxx: Remove spurious taking of ha->vport_slock spinlock.

JIRA Key: V2632FC-269

Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Clear unsupported 'states' during Get-FW-State queries.
Andrew Vasquez [Wed, 19 Sep 2012 23:31:09 +0000 (05:01 +0530)]
qla2xxx: Clear unsupported 'states' during Get-FW-State queries.

Rather than returning stale mailbox values.

JIRA Key: V2632FC-264

Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoqla2xxx: Bind to ISP8031.
Saurav Kashyap [Tue, 11 Sep 2012 08:21:45 +0000 (13:51 +0530)]
qla2xxx: Bind to ISP8031.

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
12 years agoip_options: git meerge fix: do not duplicate setting of daddr
Maxim Uvarov [Thu, 29 Nov 2012 07:23:49 +0000 (23:23 -0800)]
ip_options: git meerge fix: do not duplicate setting of daddr

Orabug: 15929855
Git merge duplicated line of setting daddr. This is not critical
but doing clean up here.
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
12 years agoext4: race-condition protection for ext4_convert_unwritten_extents_endio
Dmitry Monakhov [Wed, 10 Oct 2012 05:04:58 +0000 (01:04 -0400)]
ext4: race-condition protection for ext4_convert_unwritten_extents_endio

Orabug: 14774219
This fixes: CVE-2012-4508
We assumed that at the time we call ext4_convert_unwritten_extents_endio()
extent in question is fully inside [map.m_lblk, map->m_len] because
it was already split during submission.  But this may not be true due to
a race between writeback vs fallocate.

If extent in question is larger than requested we will split it again.
Special precautions should being done if zeroout required because
[map.m_lblk, map->m_len] already contains valid data.

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
Conflicts:
fs/ext4/extents.c

12 years agoNFS: fix bug in legacy DNS resolver.
NeilBrown [Wed, 31 Oct 2012 01:16:01 +0000 (12:16 +1100)]
NFS: fix bug in legacy DNS resolver.

Orabug: 14769650
The DNS resolver's use of the sunrpc cache involves a 'ttl' number
(relative) rather that a timeout (absolute).  This confused me when
I wrote
  commit c5b29f885afe890f953f7f23424045cdad31d3e4
     "sunrpc: use seconds since boot in expiry cache"

and I managed to break it.  The effect is that any TTL is interpreted
as 0, and nothing useful gets into the cache.

This patch removes the use of get_expiry() - which really expects an
expiry time - and uses get_uint() instead, treating the int correctly
as a ttl.

This fixes a regression that has been present since 2.6.37, causing
certain NFS accesses in certain environments to incorrectly fail.

Reported-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Chuck Lever <chuck.lever@oracle.com>
Cc: stable@vger.kernel.org
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
12 years ago[libata] Add " 2GB ATA Flash Disk"/"ADMA428M" to DMA blacklist
Prarit Bhargava [Tue, 8 May 2012 13:08:02 +0000 (09:08 -0400)]
[libata] Add " 2GB ATA Flash Disk"/"ADMA428M" to DMA blacklist

Orabug: 15929836
A user has several systems with a couple of models of flash disks with IDE
connectors.  These disks work fine in 2.6.18-ish kernels but corrupt data on
new kernels.

The difference appears to be with the default I/O method used by the IDE
controller driver between the kernels.  In the older kernels, the
configuration is very conservative and the driver stays in PIO mode.  With
new kernels, the ata driver (pata_serverworks) attempts to use UDMA/66
which the drive claims to support.  This mode, however, does not appear to
work in DMA mode.  The drive does work correctly and no corruption is
seen if the kernel parameter "libata.force=5:pio0,6:pio0" is used to force
the driver to use PIO instead of DMA mode.

Blacklist these drives.  Unfortunately the model name of the drive is very
generic, " 2GB ATA Flash Disk", but the revision is specific, "ADMA428M".

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
(cherry picked from commit d70e551c8e1ecb6f20422f8db6bfe6a0049edcb8)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
12 years agoNFS: Map minor mismatch error to protocol not support error.
Steve Dickson [Wed, 6 Jun 2012 18:12:07 +0000 (14:12 -0400)]
NFS: Map minor mismatch error to protocol not support error.

Orabug: 15929836
Sservers that only have NFSv4.1 support the
NFS4ERR_MINOR_VERS_MISMATCH error is return on
v4.0 mounts. Mapping that error to EPROTONOSUPPORT
will cause the mount to back off to v3 instead of
failing.

Signed-off-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
(cherry picked from commit f25efd851cc8c0f63d74334bc784a437f4df8ee4)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
12 years agotg3: fix VLAN tagging regression
Kasper Pedersen [Tue, 20 Sep 2011 12:41:17 +0000 (12:41 +0000)]
tg3: fix VLAN tagging regression

Orabug: 15929836
commit 92cd3a17ce9c719abb4c28dee3438e0c641f8de4
    tg3: Simplify tx bd assignments

broke VLAN tagging on outbound packets.
It ifdef'ed BCM_KERNEL_SUPPORTS_8021Q, but this
is not set anywhere. So vlan never gets set, and
all packets are sent with vlan=0.

v2: We can just remove the test. vlan_tx_tag_present
is valid regardless of whether the 802.1q module
is built.

Tested on BCM5721 rev 11.

Signed-off-by: Kasper Pedersen <kernel@kasperkp.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 5c1e688388f629e8d8e88183b5ebc21e209252aa)

Conflicts:
drivers/net/tg3.c

Signed-off-by: Joe Jin <joe.jin@oracle.com>
12 years agoext4: Fix overflow caused by missing cast in ext4_fallocate()
Utako Kusaka [Thu, 28 Jul 2011 02:11:20 +0000 (22:11 -0400)]
ext4: Fix overflow caused by missing cast in ext4_fallocate()

Orabug: 15929836
The logical block number in map.l_blk is a __u32, and so before we
shift it left, by the block size, we neeed cast it to a 64-bit size.

Otherwise i_size can be corrupted on an ENOSPC.

Filesystem    Type   1K-blocks      Used Available Use% Mounted on
/dev/sda6     ext4     9843276    153056   9190200   2% /mnt/mp1
fallocate: /mnt/mp1/testfile: fallocate failed: No space left on device
  File: `/mnt/mp1/testfile'
  Size: 4293656576 Blocks: 19380440   IO Block: 4096   regular file
Device: 806h/2054d Inode: 12          Links: 1
Access: (0644/-rw-r--r--)  Uid: (    0/    root)   Gid: (    0/    root)
Access: 2011-07-25 13:01:31.414490496 +0900
Modify: 2011-07-25 13:01:31.414490496 +0900
Change: 2011-07-25 13:01:31.454490495 +0900

Signed-off-by: Utako Kusaka <u-kusaka@wm.jp.nec.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
--
 fs/ext4/extents.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

12 years agointel_idle: initial IVB support
Len Brown [Fri, 1 Jun 2012 23:45:32 +0000 (19:45 -0400)]
intel_idle: initial IVB support

Orabug: 15919684
(backport from mainline commits:
6edab08c24f9141d69cfa4683a0a027d86ab303e
23795e580cad5d6b73d47d51b9074ce3e58bf334 )
From an OS point of view, IVB looks like SNB, but quicker.

Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
Conflicts:
drivers/idle/intel_idle.c

12 years agooracleasm: Introduce module parameter for block size selection
Martin K. Petersen [Wed, 28 Nov 2012 14:36:23 +0000 (06:36 -0800)]
oracleasm: Introduce module parameter for block size selection

Orabug: 15924773
We have encountered a few devices which after a firmware update
communicate different characteristics to the OS. In particular, some
devices begin to report their physical block size. This in turn will
cause oracleasm to report a different block size to ASM and mounting the
disk group will fail.

Introduce a module parameter which permits the logical block size to be
reported instead of the physical.

Signed-off-by: Martin K. Petersen<martin.petersen@oracle.com>
12 years agoMerge tag 'v2.6.39-400#lpfc' of git://ca-git.us.oracle.com/linux-snits-public
Maxim Uvarov [Tue, 27 Nov 2012 20:19:03 +0000 (12:19 -0800)]
Merge tag 'v2.6.39-400#lpfc' of git://ca-git.us.oracle.com/linux-snits-public

OLdev v2.6.39-400#lpfc

12 years agolpfc: Update lpfc version for 8.3.5.86.2p driver release
James Smart [Mon, 26 Nov 2012 22:59:32 +0000 (15:59 -0700)]
lpfc: Update lpfc version for 8.3.5.86.2p driver release

Signed-off-by: James Smart <james.smart@emulex.com>
12 years agolpfc: Fixed setting sequential delivery bit in a service class that is not valid
James Smart [Mon, 26 Nov 2012 22:58:28 +0000 (15:58 -0700)]
lpfc: Fixed setting sequential delivery bit in a service class that is not valid

http://marc.info/?l=linux-scsi&m=135170914726116

Signed-off-by: James Smart <james.smart@emulex.com>
12 years agolpfc: fix boot from san failure
James Smart [Mon, 26 Nov 2012 22:57:10 +0000 (15:57 -0700)]
lpfc: fix boot from san failure

Fixed boot from san failure when SLI4 FC device presented on the same PCI bus

http://marc.info/?l=linux-scsi&m=135170912526110

The request_firmware interface can induce delays while looking
for firmware files, even if no fw file is present. In some situations
the delays exceeded scan_wait timeouts, resulting in situations in which
the boot device had not been discovered in time.  Boot Device does not
need to be on a lpfc device.

Change request_firmware use to be module paramater driven. Default is to
not attempt firmware download on boot. Add sysfs parameter to invoke
firmware update.

Signed-off-by: James Smart <james.smart@emulex.com>
12 years ago[SCSI] lpfc 8.3.34: Add LOGO support after ABTS compliance
James Smart [Mon, 26 Nov 2012 22:55:55 +0000 (15:55 -0700)]
[SCSI] lpfc 8.3.34: Add LOGO support after ABTS compliance

Make compliant with FC specs by sending LOGO after ABTS timeouts

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.35: Fixed not reporting logical link speed to SCSI midlayer when...
James Smart [Mon, 26 Nov 2012 22:55:18 +0000 (15:55 -0700)]
[SCSI] lpfc 8.3.35: Fixed not reporting logical link speed to SCSI midlayer when QoS not on

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.35: Fixed SCSI host create showing wrong link speed on SLI3 HBA ports
James Smart [Mon, 26 Nov 2012 22:54:34 +0000 (15:54 -0700)]
[SCSI] lpfc 8.3.35: Fixed SCSI host create showing wrong link speed on SLI3 HBA ports

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.35: Fixed Linux generic firmware download on SLI4 devices with longer...
James Smart [Mon, 26 Nov 2012 22:54:03 +0000 (15:54 -0700)]
[SCSI] lpfc 8.3.35: Fixed Linux generic firmware download on SLI4 devices with longer module names

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.35: Fix error with fabric service parameters causing performance...
James Smart [Mon, 26 Nov 2012 22:53:26 +0000 (15:53 -0700)]
[SCSI] lpfc 8.3.35: Fix error with fabric service parameters causing performance issues

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.35: Fixed messages for misconfigured port errors
James Smart [Mon, 26 Nov 2012 22:52:36 +0000 (15:52 -0700)]
[SCSI] lpfc 8.3.35: Fixed messages for misconfigured port errors

Fixed messages for misconfigured port errors to be consistent for
all OS platforms.

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.35: Fix FCP2 Retries for non-r/w commands.
James Smart [Mon, 26 Nov 2012 22:51:52 +0000 (15:51 -0700)]
[SCSI] lpfc 8.3.35: Fix FCP2 Retries for non-r/w commands.

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.35: Fix incorrect comment in T10 DIF attributes
James Smart [Mon, 26 Nov 2012 22:51:17 +0000 (15:51 -0700)]
[SCSI] lpfc 8.3.35: Fix incorrect comment in T10 DIF attributes

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.35: Correct missing queue destroy on function reset
James Smart [Mon, 26 Nov 2012 22:50:31 +0000 (15:50 -0700)]
[SCSI] lpfc 8.3.35: Correct missing queue destroy on function reset

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.35: Added checking BMBX register for RDY bit before writing the first...
James Smart [Mon, 26 Nov 2012 22:49:54 +0000 (15:49 -0700)]
[SCSI] lpfc 8.3.35: Added checking BMBX register for RDY bit before writing the first address in

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years ago[SCSI] lpfc 8.3.33: Misc changes to optimize critical path
James Smart [Mon, 26 Nov 2012 22:49:02 +0000 (15:49 -0700)]
[SCSI] lpfc 8.3.33: Misc changes to optimize critical path

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years agonbd: clear waiting_queue on shutdown
Paul Clements [Mon, 17 Sep 2012 21:09:02 +0000 (14:09 -0700)]
nbd: clear waiting_queue on shutdown

Bug-db: 13690
Backport upstream commit: fded4e090c60100d709318896c79816d68d5b47d
Fix a serious but uncommon bug in nbd which occurs when there is heavy
I/O going to the nbd device while, at the same time, a failure (server,
network) or manual disconnect of the nbd connection occurs.

There is a small window between the time that the nbd_thread is stopped
and the socket is shutdown where requests can continue to be queued to
nbd's internal waiting_queue.  When this happens, those requests are
never completed or freed.

The fix is to clear the waiting_queue on shutdown of the nbd device, in
the same way that the nbd request queue (queue_head) is already being
cleared.

Signed-off-by: Paul Clements <paul.clements@steeleye.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
Conflicts:
drivers/block/nbd.c

12 years agokernel posttrans remove all crashkernel=*
Jason Luan [Thu, 22 Nov 2012 01:42:32 +0000 (09:42 +0800)]
kernel posttrans remove all crashkernel=*

Orabug: 15882974
kernel posttrans's script will call new-kernel-page (which will call grubby endly) with
the paramter --remove-args="crashkernel=auto", and grubby remove-args will ingore the
parts after '=' and  remove all crashkernel=<*>. So some manually corrent config, such
as crashkernel=128M@, will be removed.

12 years agoMerge branch '2.6.39-400#bug15879754' of git://ca-git.us.oracle.com/linux-guasun...
Maxim Uvarov [Wed, 21 Nov 2012 14:28:51 +0000 (06:28 -0800)]
Merge branch '2.6.39-400#bug15879754' of git://ca-git.us.oracle.com/linux-guasun-public

12 years agovmxnet3: must split too big fragments
Eric Dumazet [Mon, 29 Oct 2012 07:30:49 +0000 (07:30 +0000)]
vmxnet3: must split too big fragments

commit a4d7e485bca65bd516fced77b03f92419308df72 upstream

vmxnet3 has a 16Kbytes limit per tx descriptor, that happened to work
as long as we provided PAGE_SIZE fragments.

Our stack can now build larger fragments, so we need to split them to
the 16kbytes boundary.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: jongman heo <jongman.heo@samsung.com>
Tested-by: jongman heo <jongman.heo@samsung.com>
Cc: Shreyas Bhatewara <sbhatewara@vmware.com>
Reviewed-by: Bhavesh Davda <bhavesh@vmware.com>
Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Conflicts:

drivers/net/vmxnet3/vmxnet3_drv.c

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agovmxnet3: convert to SKB paged frag API.
Ian Campbell [Wed, 21 Sep 2011 21:53:28 +0000 (21:53 +0000)]
vmxnet3: convert to SKB paged frag API.

commit ebcf564688a8d873d46cba8ff1ac0a097b12221e upstream

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Shreyas Bhatewara <sbhatewara@vmware.com>
Cc: "VMware, Inc." <pv-drivers@vmware.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agovmxnet3: Fix race between dev_open() and register_netdev()
Steve Hodgson [Tue, 14 Aug 2012 16:13:36 +0000 (17:13 +0100)]
vmxnet3: Fix race between dev_open() and register_netdev()

commit e3bc4ffb814c847bde7706a80d5684d12c676a8b upstream

dev_open() can complete before register_netdev() returns.
Fix vmxnet3_probe_device() to support this.

Signed-off-by: Steve Hodgson <steve@purestorage.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agovmxnet3: Fix log messages and corrects some typos
Shreyas Bhatewara [Tue, 28 Feb 2012 22:08:39 +0000 (22:08 +0000)]
vmxnet3: Fix log messages and corrects some typos

commit 4c1dc80a74384829e467ba078260094d1ffdd963 upstream

Fix log messages and corrects some typos

Change logging of failure to enable MSI/MSI-X to display device's PCI
address instead of eth%d. Rectify a typo.

Signed-off-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
Reviewed-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agovmxnet3: Fix typo in vmxnet3_drv.c
Masanari Iida [Wed, 1 Feb 2012 03:13:59 +0000 (03:13 +0000)]
vmxnet3: Fix typo in vmxnet3_drv.c

commit c3ca881f0a6e6421f167d3938f4b1e1d008cb505 upstream

Correct spelling in "uncommited" to "uncommitted" in
drivers/net/vmxnet3/vmxnet3_drv.c

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agovmxnet3: cleanup tso headers manipulation
Eric Dumazet [Tue, 24 Jan 2012 19:47:21 +0000 (19:47 +0000)]
vmxnet3: cleanup tso headers manipulation

commit 8bca5d1ebb8bf18187256845ba3aaff5fbc01934 upstream

Use existing helpers to clarify skb headers manipulation.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Shreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Conflicts:

drivers/net/vmxnet3/vmxnet3_drv.c

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agovmxnet3" make ethtool ops const
stephen hemminger [Wed, 4 Jan 2012 11:58:13 +0000 (11:58 +0000)]
vmxnet3" make ethtool ops const

commit c8b88efc3047063f98eba26d8d08d9a6b968c73a upstream

All tables of function pointers should be const to make hacks
more difficult. Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agoSweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of...
Guangyu Sun [Thu, 15 Nov 2012 20:24:55 +0000 (12:24 -0800)]
Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers

commit 84b405011166e663fe9ef56c29b1d76f59b35568 upstream

Per discussion with Ben Hutchings and David Miller, go through and
remove assignments of "N/A" to fw_version in various drivers'
.get_drvinfo routines.  While there clean-up some use of bare
constants and such.

Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agoSPEC: v2.6.39-400.3.0
Maxim Uvarov [Fri, 16 Nov 2012 09:04:27 +0000 (01:04 -0800)]
SPEC: v2.6.39-400.3.0

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
12 years agovmxnet3: fix skb truesize underestimation
Eric Dumazet [Thu, 13 Oct 2011 11:38:17 +0000 (11:38 +0000)]
vmxnet3: fix skb truesize underestimation

commit 5e6c355c47e75314fd2282d087616069d4093ecf upstream

vmxnet3 allocates a page per skb fragment. We must account
PAGE_SIZE increments on skb->truesize, not the actual frag length.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Shreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agovmxnet3: Don't enable vlan filters in promiscuous mode.
Jesse Gross [Sun, 7 Aug 2011 23:15:47 +0000 (23:15 +0000)]
vmxnet3: Don't enable vlan filters in promiscuous mode.

commit f6957f88e59df5008f7b2169400be657f81cdb80 upstream

The vmxnet3 driver enables vlan filters if filtering is enabled for
any vlan.  In promiscuous mode the filter table is cleared to in
order to disable filtering.  However, if a vlan device is subsequently
created that vlan will be added to the filter, re-engaging it.  As a
result, not only do we not see all the vlans in promiscuous mode, we
don't even see vlans for which a filter was previously created.

CC: Scott J. Goldman <scottjg@vmware.com>
CC: Shreyas Bhatewara <sbhatewara@vmware.com>
CC: VMware PV-Drivers <pv-drivers@vmware.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Conflicts:

drivers/net/vmxnet3/vmxnet3_drv.c

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agoMerge tag 'v2.6.39-400.2.0#btrfs_reb' of git://ca-git.us.oracle.com/linux-muvarov...
Maxim Uvarov [Thu, 15 Nov 2012 10:46:16 +0000 (02:46 -0800)]
Merge tag 'v2.6.39-400.2.0#btrfs_reb' of git://ca-git.us.oracle.com/linux-muvarov-public

12 years agoMerge branch '2.6.39-400#bug15861301' of git://ca-git.us.oracle.com/linux-guasun...
Maxim Uvarov [Thu, 15 Nov 2012 09:30:00 +0000 (01:30 -0800)]
Merge branch '2.6.39-400#bug15861301' of git://ca-git.us.oracle.com/linux-guasun-public

12 years agomm: hugetlbfs: assign return value of huge_pmd_share() to pte
Guangyu Sun [Thu, 15 Nov 2012 03:12:46 +0000 (19:12 -0800)]
mm: hugetlbfs: assign return value of huge_pmd_share() to pte

Orabug: 15861301

fix merge error in commit 5778cdb5a3b3bab9152ae9d18c44660bad05fee7
Author: Michal Hocko <mhocko@suse.cz>
Date:   Mon Oct 8 03:36:54 2012 -0700

    mm: hugetlbfs: correctly populate shared pmd

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
12 years agoAdded suspend and resume support
Cathy Avery [Tue, 13 Nov 2012 15:05:58 +0000 (10:05 -0500)]
Added suspend and resume support

Orabug: 14801157
The ovmapi driver was not supporting power management suspend and resume
and therefore was not supporting vm migration. Added call backs to support
syscore_ops suspend and resume.
Signed-off-by: Cathy Avery <cathy.avery@oracle.com>
12 years agorcu: Fix wrong check in list_splice_init_rcu()
Jan H. Schönherr [Tue, 19 Jul 2011 19:10:26 +0000 (21:10 +0200)]
rcu: Fix wrong check in list_splice_init_rcu()

If the list to be spliced is empty, then list_splice_init_rcu() has
nothing to do.  Unfortunately, list_splice_init_rcu() does not check
the list to be spliced; it instead checks the list to be spliced into.
This results in memory leaks given current usage.  This commit
therefore fixes the empty-list check.

Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
(cherry picked from commit 7f70893173b056df691b2ee7546bb44fd9abae6a)

12 years agobtrfs: ->submit_bio_hook error push-up
Jeff Mahoney [Tue, 4 Oct 2011 03:23:14 +0000 (23:23 -0400)]
btrfs: ->submit_bio_hook error push-up

This pushes failures from the submit_bio_hook callbacks,
btrfs_submit_bio_hook and btree_submit_bio_hook into the callers, including
callers of submit_one_bio where it catches the failures with BUG_ON.

It also pushes up through the ->readpage_io_failed_hook to
end_bio_extent_writepage where the error is already caught with BUG_ON.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
(cherry picked from commit 355808c296c6923db6705f43639969a80b16d15d)

Conflicts:

fs/btrfs/extent_io.c
fs/btrfs/inode.c

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
12 years agobtrfs: Don't BUG_ON() errors in update_ref_for_cow()
Mark Fasheh [Mon, 8 Aug 2011 20:20:18 +0000 (13:20 -0700)]
btrfs: Don't BUG_ON() errors in update_ref_for_cow()

The only caller of update_ref_for_cow() is __btrfs_cow_block() which was
originally ignoring any return values. update_ref_for_cow() however doesn't
look like a candidate to become a void function - there are a few places
where errors can occur.

So instead I changed update_ref_for_cow() to bubble all errors up (instead
of BUG_ON). __btrfs_cow_block() was then updated to catch and BUG_ON() any
errors from update_ref_for_cow(). The end effect is that we have no change
in behavior, but about 8 different places where a BUG_ON(ret) was removed.

Obviously a future patch will have to address the BUG_ON() in
__btrfs_cow_block().

Signed-off-by: Mark Fasheh <mfasheh@suse.de>
(cherry picked from commit be1a5564fd39fa2ca6adbb41c75fb08f96a1ffcb)

Conflicts:

fs/btrfs/ctree.c

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
12 years agobtrfs: add varargs to btrfs_error
Jeff Mahoney [Thu, 1 Mar 2012 13:57:30 +0000 (14:57 +0100)]
btrfs: add varargs to btrfs_error

 btrfs currently handles most errors with BUG_ON. This patch is a work-in-
 progress but aims to handle most errors other than internal logic
 errors and ENOMEM more gracefully.

 This iteration prevents most crashes but can run into lockups with
 the page lock on occasion when the timing "works out."

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
12 years agoBtrfs: Fix space checking during fs resize
Daniel J Blueman [Fri, 27 Apr 2012 16:41:46 +0000 (12:41 -0400)]
Btrfs: Fix space checking during fs resize

Fix out-of-space checking, addressing a warning and potential resource
leak when resizing the filesystem down while allocating blocks.

Signed-off-by: Daniel J Blueman <daniel@quora.org>
Reviewed-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
(cherry picked from commit 7654b72417e10e294563496e25211200f9b8b6d3)

12 years agoBtrfs: avoid setting ->d_op twice
Li Zefan [Tue, 21 Feb 2012 09:04:28 +0000 (17:04 +0800)]
Btrfs: avoid setting ->d_op twice

Follow those instructions, and you'll trigger a warning in the
beginning of d_set_d_op():

  # mkfs.btrfs /dev/loop3
  # mount /dev/loop3 /mnt
  # btrfs sub create /mnt/sub
  # btrfs sub snap /mnt /mnt/snap
  # touch /mnt/snap/sub
  touch: cannot touch `tmp': Permission denied

__d_alloc() set d_op to sb->s_d_op (btrfs_dentry_operations), and
then simple_lookup() reset it to simple_dentry_operations, which
triggered the warning.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
(cherry picked from commit 848cce0d4102b5b4b26b0987b43e1919d462afe2)

12 years agobtrfs: replace many BUG_ONs with proper error handling
Jeff Mahoney [Mon, 12 Mar 2012 15:03:00 +0000 (16:03 +0100)]
btrfs: replace many BUG_ONs with proper error handling

 btrfs currently handles most errors with BUG_ON. This patch is a work-in-
 progress but aims to handle most errors other than internal logic
 errors and ENOMEM more gracefully.

 This iteration prevents most crashes but can run into lockups with
 the page lock on occasion when the timing "works out."

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
(cherry picked from commit 79787eaab46121d4713ed03c8fc63b9ec3eaec76)

Conflicts:

fs/btrfs/ctree.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/file.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/relocation.c

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
12 years agobtrfs: enhance transaction abort infrastructure
Jeff Mahoney [Thu, 1 Mar 2012 16:24:58 +0000 (17:24 +0100)]
btrfs: enhance transaction abort infrastructure

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
(cherry picked from commit 49b25e0540904be0bf558b84475c69d72e4de66e)

Conflicts:

fs/btrfs/ctree.h
fs/btrfs/disk-io.c
fs/btrfs/super.c

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
12 years agosfc: Replace some literal constants with EFX_PAGE_SIZE/EFX_BUF_SIZE
Maxim Uvarov [Wed, 14 Nov 2012 16:22:39 +0000 (08:22 -0800)]
sfc: Replace some literal constants with EFX_PAGE_SIZE/EFX_BUF_SIZE

Mainline commit 5b6262d0ccf759a16fabe11d904a2531125a4b71

The 'page size' for PCIe DMA, i.e. the alignment of boundaries at
which DMA must be broken, is 4KB.  Name this value as EFX_PAGE_SIZE
and use it in efx_max_tx_len().  Redefine EFX_BUF_SIZE as
EFX_PAGE_SIZE since its value is also a result of that requirement,
and use it in efx_init_special_buffer().

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Orabug: 14769994
Signed-off-by: Chuck Anderson <chuck.anderson@oracle.com>
(cherry picked from commit 0d66c9ee8813a35eb5ce78ac0b2fb0286cd088ea)

Conflicts:
drivers/net/sfc/nic.h

12 years agoqla4xxx: Updated driver version to 5.03.00.00.06.02-uek2
Tej Parkash [Fri, 9 Nov 2012 13:29:45 +0000 (18:59 +0530)]
qla4xxx: Updated driver version to 5.03.00.00.06.02-uek2

Signed-off-by: Tej Parkash <tej.parkash@qlogic.com>
12 years agoscsi: fix various printk and comment typos
Masanari Iida [Tue, 24 Apr 2012 15:24:16 +0000 (00:24 +0900)]
scsi: fix various printk and comment typos

Correct spelling typo within drivers/scsi

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit b3505c7804ca2e7b1160183942956324a842bbb3)

12 years agoqla4xxx: Disable generating pause frames for ISP83XX
Tej Parkash [Fri, 9 Nov 2012 09:41:15 +0000 (15:11 +0530)]
qla4xxx: Disable generating pause frames for ISP83XX

In case of FW hung ISP83XX generates continuous pause frames
which causes switch to disable port.
Added fix to disable generating pause frames in case of
FW hung

Signed-off-by: Tej Parkash <tej.parkash@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years agoqla4xxx: Fix double clearing of risc_intr for ISP83XX
Manish Dusane [Thu, 20 Sep 2012 11:35:11 +0000 (07:35 -0400)]
qla4xxx: Fix double clearing of risc_intr for ISP83XX

Issue:
For ISP83XX risc_intr getting clear two times in case of polling mode.
risc_intr getting clear from interrupt_service_routine() as well
from process_mbox_intr() because of this driver may clear risc_intr
without processing interrupt.

Fix:
Do not clear risc_intr from process_mbox_intr().

Signed-off-by: Manish Dusane <manish.dusane@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit dcb69474a79b5317c72414d4ba919dd442644a79)

12 years agoqla4xxx: IDC implementation for Loopback
Nilesh Javali [Thu, 20 Sep 2012 11:35:10 +0000 (07:35 -0400)]
qla4xxx: IDC implementation for Loopback

Handle IDC Request Notify AEN and post IDC Acknowledgement
while participating in Loopback IDC.

Signed-off-by: Nilesh Javali <nilesh.javali@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 6de67c31b577ab2a195ad8b029674b93f0d73b9d)

12 years agoqla4xxx: Fix panic while rmmod
Vikas Chaudhary [Thu, 20 Sep 2012 11:35:08 +0000 (07:35 -0400)]
qla4xxx: Fix panic while rmmod

Issue:
System panic on rmmod if probe_adapter had failed during driver load.

Call Trace:
 [<ffffffffa071aa5a>] qla4xxx_abort_active_cmds+0x4a/0xa0 [qla4xxx]
 [<ffffffffa07224db>] qla4xxx_free_adapter+0x1b/0x1b0 [qla4xxx]
 [<ffffffffa073991f>] qla4xxx_remove_adapter+0x294/0x2c7 [qla4xxx]
 [<ffffffff812930b7>] pci_device_remove+0x37/0x70
 [<ffffffff8135006f>] __device_release_driver+0x6f/0xe0
 [<ffffffff813501a8>] driver_detach+0xc8/0xd0
 [<ffffffff8134ef0e>] bus_remove_driver+0x8e/0x110
 [<ffffffff81350972>] driver_unregister+0x62/0xa0
 [<ffffffff812933c4>] pci_unregister_driver+0x44/0xb0
 [<ffffffffa0739659>] qla4xxx_module_exit+0x15/0x47 [qla4xxx]
 [<ffffffff810addd4>] sys_delete_module+0x194/0x260
 [<ffffffff8150326e>] ? do_page_fault+0x3e/0xa0
 [<ffffffff8100b0f2>] system_call_fastpath+0x16/0x1b

Fix:
Do not cleanup resources on remove_adapter as they are cleaned up during
probe_adapter exit.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 0dabb3ee61bcf30679b625b8d79de0c5bc32b74a)

12 years agoqla4xxx: Fail probe_adapter if IRQ allocation fails
Poornima Vonti [Thu, 20 Sep 2012 11:35:07 +0000 (07:35 -0400)]
qla4xxx: Fail probe_adapter if IRQ allocation fails

If IRQ allocation fails, it means system has run out of interrupt
vectors, so fail probe_adapter in case of IRQ allocation failure
and dont retry adapter initialization.

Signed-off-by: Poornima Vonti <poornima.vonti@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit a5d0ef50abf7a0fb3a1df4f731824695c36dede1)

12 years agoqla4xxx: Prevent MSI/MSI-X falling back to INTx for ISP82XX
Vikas Chaudhary [Thu, 20 Sep 2012 11:35:06 +0000 (07:35 -0400)]
qla4xxx: Prevent MSI/MSI-X falling back to INTx for ISP82XX

For ISP82xx mixed interrupt mode is not supported.
Hence prevent MSI/MSI-x from falling back to INTx mode.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 796b031e1d0f544f3a4848aee35ab35a18abeb7f)

12 years agoqla4xxx: Update idc reg in case of PCI AER
Vikas Chaudhary [Thu, 20 Sep 2012 11:35:05 +0000 (07:35 -0400)]
qla4xxx: Update idc reg in case of PCI AER

Camram is reset by FW to default values after reboot/cold boot/pci reset.
In case of AER, PCI may need to reset so we need to set correct idc reg value
after PCIE error.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 45b3b5e2e83a1f70b29a671a060ad3154a22481d)

12 years agoqla4xxx: Fix double IDC locking in qla4_8xxx_error_recovery
Poornima Vonti [Thu, 20 Sep 2012 11:35:04 +0000 (07:35 -0400)]
qla4xxx: Fix double IDC locking in qla4_8xxx_error_recovery

Issue:
In qla4_8xxx_error_recovery() IDC lock recovery is initiated as
IDC lock is held while enabling the interrupts

Fix:
Correctly handle IDC locking mechanism in qla4_8xxx_error_recovery().

Signed-off-by: Poornima Vonti <poornima.vonti@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 019253a0203ce67a4a90d41f18498c6ab8ab0932)

12 years agoqla4xxx: Clear interrupt while unloading driver for ISP83XX
Vikas Chaudhary [Thu, 20 Sep 2012 11:35:03 +0000 (07:35 -0400)]
qla4xxx: Clear interrupt while unloading driver for ISP83XX

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 08ccee5d924b8ed563a41e5275bbcc77fc5fc40a)

12 years agoqla4xxx: Print correct IDC version
Vikas Chaudhary [Thu, 20 Sep 2012 11:35:02 +0000 (07:35 -0400)]
qla4xxx: Print correct IDC version

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit fcc52b9b015f08adcaa2094d49336235b968e06f)

12 years agoqla4xxx: Added new mbox cmd to pass driver version to FW
Manish Dusane [Thu, 20 Sep 2012 11:35:01 +0000 (07:35 -0400)]
qla4xxx: Added new mbox cmd to pass driver version to FW

Signed-off-by: Manish Dusane <manish.dusane@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 08500027cc9b397685b85c5ff242ed9ab6cdfa48)

12 years agoqla4xxx: Update Copyright header
Vikas Chaudhary [Fri, 9 Nov 2012 08:37:00 +0000 (14:07 +0530)]
qla4xxx: Update Copyright header

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years agoqla4xxx: Added support for ISP83XX
Vikas Chaudhary [Wed, 22 Aug 2012 11:55:08 +0000 (07:55 -0400)]
qla4xxx: Added support for ISP83XX

Signed-off-by: Poornima Vonti <poornima.vonti@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 5c166b5f0defcc6e23b0b9a4494c464b1c6b13b6)

12 years agoqla4xxx: Added new function qla4_8xxx_get_minidump
Vikas Chaudhary [Wed, 22 Aug 2012 11:55:07 +0000 (07:55 -0400)]
qla4xxx: Added new function qla4_8xxx_get_minidump

Move minidump code from qla4_8xxx_device_bootstrap() to
new function qla4_8xxx_get_minidump() to make code more
modular.

Signed-off-by: Lalit Chandivade <lalit.chandivade@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 6ef2778ce853d87c30a2d14f4e2d6083af311354)

12 years agoqla4xxx: Set IDC version in correct way
Vikas Chaudhary [Wed, 22 Aug 2012 11:55:06 +0000 (07:55 -0400)]
qla4xxx: Set IDC version in correct way

Issue:
   Device can go to READY state from COLD and skip INITIALIZATION,
   In this case driver will never set IDC version from function
   qla4_8xxx_device_bootstrap().

Fix:
1. Set IDC version at start of function qla4_82xx_need_reset_handler().
2. Set IDC version only if we are 1st driver to load.
3. Added new function qla4_8xxx_update_idc_reg() to set all idc reg at one
   place.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit aaeef189498373e5d2a34d88002c0bd3308ccda2)

12 years agoqla4xxx: Replace all !is_qla8022() with is_qla40XX()
Vikas Chaudhary [Wed, 22 Aug 2012 11:55:05 +0000 (07:55 -0400)]
qla4xxx: Replace all !is_qla8022() with is_qla40XX()

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit c401d5868453612000e9740ebd0c554506316eb3)

12 years agoqla4xxx: Added new functions in isp_ops
Vikas Chaudhary [Wed, 22 Aug 2012 11:55:04 +0000 (07:55 -0400)]
qla4xxx: Added new functions in isp_ops

Signed-off-by: Poornima Vonti <poornima.vonti@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 0ba8bb7ae66816b17df60f5f05ef2ff094fe6d6b)

12 years agoqla4xxx: Clean-up and optimize macros
Vikas Chaudhary [Wed, 22 Aug 2012 11:55:03 +0000 (07:55 -0400)]
qla4xxx: Clean-up and optimize macros

Remove following unused define:-

QLA82XX_MINIDUMP_OCM0_SIZE
QLA82XX_MINIDUMP_L1C_SIZE
QLA82XX_MINIDUMP_L2C_SIZE
QLA82XX_MINIDUMP_COMMON_STR_SIZE
QLA82XX_MINIDUMP_FCOE_STR_SIZE
QLA82XX_MINIDUMP_MEM_SIZE
QLA82XX_MAX_ENTRY_HDR

Added following new define to optimize code:-

MIU_TA_CTL_WRITE_ENABLE
MIU_TA_CTL_WRITE_START
MIU_TA_CTL_START_ENABLE

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit 4d26897d129879127cce0707343ae011dab5b4b8)

12 years agoqla4xxx: Rename 82XX macros
Vikas Chaudhary [Wed, 22 Aug 2012 13:14:24 +0000 (09:14 -0400)]
qla4xxx: Rename 82XX macros

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
(cherry picked from commit d386106cdcd3e55c3418157ed76935672bc54f78)

12 years agoqla4xxx: Update func name from ql4_ to qla4_
Vikas Chaudhary [Wed, 22 Aug 2012 11:55:01 +0000 (07:55 -0400)]
qla4xxx: Update func name from ql4_ to qla4_

ql4_8xxx_mark_entry_skipped to qla4_8xxx_mark_entry_skipped
ql4_attr_is_visible to qla4_attr_is_visible

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years agoqla4xxx: Update structure and variable names
Vikas Chaudhary [Wed, 22 Aug 2012 11:55:00 +0000 (07:55 -0400)]
qla4xxx: Update structure and variable names

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years agoqla4xxx: Update function name from 8xxx to 82xx
Vikas Chaudhary [Fri, 9 Nov 2012 08:07:13 +0000 (13:37 +0530)]
qla4xxx: Update function name from 8xxx to 82xx

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years agoqla4xxx: Wait for cmd to complete before chip reset for ISP40XX
Vikas Chaudhary [Wed, 22 Aug 2012 11:45:26 +0000 (07:45 -0400)]
qla4xxx: Wait for cmd to complete before chip reset for ISP40XX

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
12 years agoqla4xxx: Clear interrupt while unloading driver.
Vikas Chaudhary [Wed, 22 Aug 2012 11:45:25 +0000 (07:45 -0400)]
qla4xxx: Clear interrupt while unloading driver.

while processing the stop firmware mailbox command on driver unload,
a interrupt is processed which causes kernel panic as the response
queue is not valid.

Fix is to clear the interrupt in free_adapter call just after
disabling the interrupts.

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>