From patchwork Fri May 21 23:18:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53227 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 4084AB7D1C for ; Sat, 22 May 2010 09:19:12 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbUh-0005FU-Cf; Sat, 22 May 2010 00:19:07 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbUf-0005F1-98 for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:19:05 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OFbUf-0000vU-4R for ; Sat, 22 May 2010 00:19:05 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OFbUe-0006im-NU for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:19:05 +0100 Subject: [PATCH 12/13] Revert "UBUNTU: SAUCE: Guest OS does not recognize a lun with non zero target id on Vmware ESX Server" From: Leann Ogasawara To: kernel-team In-Reply-To: <1274483333.19284.3264.camel@emiko> References: <1274483333.19284.3264.camel@emiko> Date: Fri, 21 May 2010 16:18:39 -0700 Message-ID: <1274483919.19284.3337.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From bc35100527798f435d9765bd3885ae7b96f4acfb Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Fri, 21 May 2010 15:15:47 -0700 Subject: [PATCH 12/13] Revert "UBUNTU: SAUCE: Guest OS does not recognize a lun with non zero target id on Vmware ESX Server" This reverts commit 0a64e1866f999a1a10edd10eb4e929936fa26864. This is an ancient patch we've been carrying from release to release. It's believed it is only required with very old vmware. Lets drop it for Maverick and see who screams. Signed-off-by: Leann Ogasawara --- drivers/message/fusion/mptbase.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 9de2227..5382b5a 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c @@ -3233,16 +3233,6 @@ GetPortFacts(MPT_ADAPTER *ioc, int portnum, int sleepFlag) pfacts->IOCStatus = le16_to_cpu(pfacts->IOCStatus); pfacts->IOCLogInfo = le32_to_cpu(pfacts->IOCLogInfo); pfacts->MaxDevices = le16_to_cpu(pfacts->MaxDevices); - /* - * VMware emulation is broken, its PortFact's MaxDevices reports value - * programmed by IOC Init, so if you program IOC Init to 256 (which is 0, - * as that field is only 8 bit), it reports back 0 in port facts, instead - * of 256... And unfortunately using 256 triggers another bug in the - * code (parallel SCSI can have only 16 devices). - */ - if (pfacts->MaxDevices == 0) { - pfacts->MaxDevices = 16; - } pfacts->PortSCSIID = le16_to_cpu(pfacts->PortSCSIID); pfacts->ProtocolFlags = le16_to_cpu(pfacts->ProtocolFlags); pfacts->MaxPostedCmdBuffers = le16_to_cpu(pfacts->MaxPostedCmdBuffers);