From 36bd3dbdd185b324c0e5352c76c1aa55641c7815 Mon Sep 17 00:00:00 2001
From: Brian King <brking@linux.vnet.ibm.com>
Date: Thu, 24 Jul 2008 04:35:48 +1000
Subject: [PATCH] --- yaml --- r: 106111 b: refs/heads/master c:
 39c1ffecc6aabcc8105602a95ce769f27bcf6048 h: refs/heads/master i:   106109:
 dc09ce0194de6956dc4575321011667aa7a1238f   106107:
 d5a74b7bedff8389f2b323f00b035c67529cc4d0   106103:
 8ecbb234ded73e5118bfc3b50702dcf4408fb8e4   106095:
 58318a94495e9cd79bb408fa8913b899e3d2fd69   106079:
 20a76128d78b2a65d44fb724ff3101906d4e6179   106047:
 5d4f6e98715730801930b4da3fda7a8ca19579e2   105983:
 9be9cc827446e03ee670ab54363b28620e5521c5 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/scsi/ibmvscsi/ibmvfc.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8536c29b12e9..69c6a122d665 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7912a0ac5907df1f8b214b3ca15ccf96129daae0
+refs/heads/master: 39c1ffecc6aabcc8105602a95ce769f27bcf6048
diff --git a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c
index eb702b96d57c..c4a7c06793c5 100644
--- a/trunk/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/trunk/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -3819,6 +3819,20 @@ static int ibmvfc_remove(struct vio_dev *vdev)
 	return 0;
 }
 
+/**
+ * ibmvfc_get_desired_dma - Calculate DMA resources needed by the driver
+ * @vdev:	vio device struct
+ *
+ * Return value:
+ *	Number of bytes the driver will need to DMA map at the same time in
+ *	order to perform well.
+ */
+static unsigned long ibmvfc_get_desired_dma(struct vio_dev *vdev)
+{
+	unsigned long pool_dma = max_requests * sizeof(union ibmvfc_iu);
+	return pool_dma + ((512 * 1024) * driver_template.cmd_per_lun);
+}
+
 static struct vio_device_id ibmvfc_device_table[] __devinitdata = {
 	{"fcp", "IBM,vfc-client"},
 	{ "", "" }
@@ -3829,6 +3843,7 @@ static struct vio_driver ibmvfc_driver = {
 	.id_table = ibmvfc_device_table,
 	.probe = ibmvfc_probe,
 	.remove = ibmvfc_remove,
+	.get_desired_dma = ibmvfc_get_desired_dma,
 	.driver = {
 		.name = IBMVFC_NAME,
 		.owner = THIS_MODULE,