[PATCH] IB/mthca: Align FW command mailboxes to 4K

Future versions of Mellanox HCA firmware will require command mailboxes to be
aligned to 4K.  Support this by using a pci_pool to allocate all mailboxes.
This has the added benefit of shrinking the source and text of mthca.

Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 32 insertions, 31 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c
index 70a6553a588e..5be7d949dbf6 100644
--- a/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -66,22 +66,23 @@ static const u8 zero_gid[16];	/* automatically initialized to 0 */
  * entry in hash chain and *mgm holds end of hash chain.
  */
 static int find_mgm(struct mthca_dev *dev,
-                    u8 *gid, struct mthca_mgm *mgm,
+                    u8 *gid, struct mthca_mailbox *mgm_mailbox,
                     u16 *hash, int *prev, int *index)
 {
-        void *mailbox;
+        struct mthca_mailbox *mailbox;
+        struct mthca_mgm *mgm = mgm_mailbox->buf;
         u8 *mgid;
         int err;
         u8 status;
 
-        mailbox = kmalloc(16 + MTHCA_CMD_MAILBOX_EXTRA, GFP_KERNEL);
-        if (!mailbox)
+        mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
+        if (IS_ERR(mailbox))
                 return -ENOMEM;
-        mgid = MAILBOX_ALIGN(mailbox);
+        mgid = mailbox->buf;
 
         memcpy(mgid, gid, 16);
 
-        err = mthca_MGID_HASH(dev, mgid, hash, &status);
+        err = mthca_MGID_HASH(dev, mailbox, hash, &status);
         if (err)
                 goto out;
         if (status) {
@@ -103,7 +104,7 @@ static int find_mgm(struct mthca_dev *dev,
         *prev  = -1;
 
         do {
-                err = mthca_READ_MGM(dev, *index, mgm, &status);
+                err = mthca_READ_MGM(dev, *index, mgm_mailbox, &status);
                 if (err)
                         goto out;
                 if (status) {
@@ -129,14 +130,14 @@ static int find_mgm(struct mthca_dev *dev,
         *index = -1;
 
  out:
-        kfree(mailbox);
+        mthca_free_mailbox(dev, mailbox);
         return err;
 }
 
 int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 {
         struct mthca_dev *dev = to_mdev(ibqp->device);
-        void *mailbox;
+        struct mthca_mailbox *mailbox;
         struct mthca_mgm *mgm;
         u16 hash;
         int index, prev;
@@ -145,15 +146,15 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         int err;
         u8 status;
 
-        mailbox = kmalloc(sizeof *mgm + MTHCA_CMD_MAILBOX_EXTRA, GFP_KERNEL);
-        if (!mailbox)
-                return -ENOMEM;
-        mgm = MAILBOX_ALIGN(mailbox);
+        mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        mgm = mailbox->buf;
 
         if (down_interruptible(&dev->mcg_table.sem))
                 return -EINTR;
 
-        err = find_mgm(dev, gid->raw, mgm, &hash, &prev, &index);
+        err = find_mgm(dev, gid->raw, mailbox, &hash, &prev, &index);
         if (err)
                 goto out;
 
@@ -170,7 +171,7 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                         goto out;
                 }
 
-                err = mthca_READ_MGM(dev, index, mgm, &status);
+                err = mthca_READ_MGM(dev, index, mailbox, &status);
                 if (err)
                         goto out;
                 if (status) {
@@ -195,7 +196,7 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 goto out;
         }
 
-        err = mthca_WRITE_MGM(dev, index, mgm, &status);
+        err = mthca_WRITE_MGM(dev, index, mailbox, &status);
         if (err)
                 goto out;
         if (status) {
@@ -206,7 +207,7 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         if (!link)
                 goto out;
 
-        err = mthca_READ_MGM(dev, prev, mgm, &status);
+        err = mthca_READ_MGM(dev, prev, mailbox, &status);
         if (err)
                 goto out;
         if (status) {
@@ -217,7 +218,7 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 
         mgm->next_gid_index = cpu_to_be32(index << 5);
 
-        err = mthca_WRITE_MGM(dev, prev, mgm, &status);
+        err = mthca_WRITE_MGM(dev, prev, mailbox, &status);
         if (err)
                 goto out;
         if (status) {
@@ -227,14 +228,14 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 
  out:
         up(&dev->mcg_table.sem);
-        kfree(mailbox);
+        mthca_free_mailbox(dev, mailbox);
         return err;
 }
 
 int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 {
         struct mthca_dev *dev = to_mdev(ibqp->device);
-        void *mailbox;
+        struct mthca_mailbox *mailbox;
         struct mthca_mgm *mgm;
         u16 hash;
         int prev, index;
@@ -242,15 +243,15 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         int err;
         u8 status;
 
-        mailbox = kmalloc(sizeof *mgm + MTHCA_CMD_MAILBOX_EXTRA, GFP_KERNEL);
-        if (!mailbox)
-                return -ENOMEM;
-        mgm = MAILBOX_ALIGN(mailbox);
+        mailbox = mthca_alloc_mailbox(dev, GFP_KERNEL);
+        if (IS_ERR(mailbox))
+                return PTR_ERR(mailbox);
+        mgm = mailbox->buf;
 
         if (down_interruptible(&dev->mcg_table.sem))
                 return -EINTR;
 
-        err = find_mgm(dev, gid->raw, mgm, &hash, &prev, &index);
+        err = find_mgm(dev, gid->raw, mailbox, &hash, &prev, &index);
         if (err)
                 goto out;
 
@@ -285,7 +286,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         mgm->qp[loc]   = mgm->qp[i - 1];
         mgm->qp[i - 1] = 0;
 
-        err = mthca_WRITE_MGM(dev, index, mgm, &status);
+        err = mthca_WRITE_MGM(dev, index, mailbox, &status);
         if (err)
                 goto out;
         if (status) {
@@ -304,7 +305,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 if (be32_to_cpu(mgm->next_gid_index) >> 5) {
                         err = mthca_READ_MGM(dev,
                                              be32_to_cpu(mgm->next_gid_index) >> 5,
-                                             mgm, &status);
+                                             mailbox, &status);
                         if (err)
                                 goto out;
                         if (status) {
@@ -316,7 +317,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 } else
                         memset(mgm->gid, 0, 16);
 
-                err = mthca_WRITE_MGM(dev, index, mgm, &status);
+                err = mthca_WRITE_MGM(dev, index, mailbox, &status);
                 if (err)
                         goto out;
                 if (status) {
@@ -327,7 +328,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         } else {
                 /* Remove entry from AMGM */
                 index = be32_to_cpu(mgm->next_gid_index) >> 5;
-                err = mthca_READ_MGM(dev, prev, mgm, &status);
+                err = mthca_READ_MGM(dev, prev, mailbox, &status);
                 if (err)
                         goto out;
                 if (status) {
@@ -338,7 +339,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 
                 mgm->next_gid_index = cpu_to_be32(index << 5);
 
-                err = mthca_WRITE_MGM(dev, prev, mgm, &status);
+                err = mthca_WRITE_MGM(dev, prev, mailbox, &status);
                 if (err)
                         goto out;
                 if (status) {
@@ -350,7 +351,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 
  out:
         up(&dev->mcg_table.sem);
-        kfree(mailbox);
+        mthca_free_mailbox(dev, mailbox);
         return err;
 }