14 files changed, 259 insertions, 237 deletions

diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index f283a9f0c23b..113f3c03c5b5 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -130,10 +130,10 @@ static int c2_tx_ring_alloc(struct c2_ring *tx_ring, void *vaddr,
                 tx_desc->status = 0;
 
                 /* Set TXP_HTXD_UNINIT */
-                __raw_writeq(cpu_to_be64(0x1122334455667788ULL),
+                __raw_writeq((__force u64) cpu_to_be64(0x1122334455667788ULL),
                              (void __iomem *) txp_desc + C2_TXP_ADDR);
                 __raw_writew(0, (void __iomem *) txp_desc + C2_TXP_LEN);
-                __raw_writew(cpu_to_be16(TXP_HTXD_UNINIT),
+                __raw_writew((__force u16) cpu_to_be16(TXP_HTXD_UNINIT),
                              (void __iomem *) txp_desc + C2_TXP_FLAGS);
 
                 elem->skb = NULL;
@@ -179,13 +179,13 @@ static int c2_rx_ring_alloc(struct c2_ring *rx_ring, void *vaddr,
                 rx_desc->status = 0;
 
                 /* Set RXP_HRXD_UNINIT */
-                __raw_writew(cpu_to_be16(RXP_HRXD_OK),
+                __raw_writew((__force u16) cpu_to_be16(RXP_HRXD_OK),
                        (void __iomem *) rxp_desc + C2_RXP_STATUS);
                 __raw_writew(0, (void __iomem *) rxp_desc + C2_RXP_COUNT);
                 __raw_writew(0, (void __iomem *) rxp_desc + C2_RXP_LEN);
-                __raw_writeq(cpu_to_be64(0x99aabbccddeeffULL),
+                __raw_writeq((__force u64) cpu_to_be64(0x99aabbccddeeffULL),
                              (void __iomem *) rxp_desc + C2_RXP_ADDR);
-                __raw_writew(cpu_to_be16(RXP_HRXD_UNINIT),
+                __raw_writew((__force u16) cpu_to_be16(RXP_HRXD_UNINIT),
                              (void __iomem *) rxp_desc + C2_RXP_FLAGS);
 
                 elem->skb = NULL;
@@ -239,10 +239,11 @@ static inline int c2_rx_alloc(struct c2_port *c2_port, struct c2_element *elem)
         rxp_hdr->flags = RXP_HRXD_READY;
 
         __raw_writew(0, elem->hw_desc + C2_RXP_STATUS);
-        __raw_writew(cpu_to_be16((u16) maplen - sizeof(*rxp_hdr)),
+        __raw_writew((__force u16) cpu_to_be16((u16) maplen - sizeof(*rxp_hdr)),
                      elem->hw_desc + C2_RXP_LEN);
-        __raw_writeq(cpu_to_be64(mapaddr), elem->hw_desc + C2_RXP_ADDR);
-        __raw_writew(cpu_to_be16(RXP_HRXD_READY), elem->hw_desc + C2_RXP_FLAGS);
+        __raw_writeq((__force u64) cpu_to_be64(mapaddr), elem->hw_desc + C2_RXP_ADDR);
+        __raw_writew((__force u16) cpu_to_be16(RXP_HRXD_READY),
+                     elem->hw_desc + C2_RXP_FLAGS);
 
         elem->skb = skb;
         elem->mapaddr = mapaddr;
@@ -290,9 +291,9 @@ static void c2_rx_clean(struct c2_port *c2_port)
                 __raw_writew(0, elem->hw_desc + C2_RXP_STATUS);
                 __raw_writew(0, elem->hw_desc + C2_RXP_COUNT);
                 __raw_writew(0, elem->hw_desc + C2_RXP_LEN);
-                __raw_writeq(cpu_to_be64(0x99aabbccddeeffULL),
+                __raw_writeq((__force u64) cpu_to_be64(0x99aabbccddeeffULL),
                              elem->hw_desc + C2_RXP_ADDR);
-                __raw_writew(cpu_to_be16(RXP_HRXD_UNINIT),
+                __raw_writew((__force u16) cpu_to_be16(RXP_HRXD_UNINIT),
                              elem->hw_desc + C2_RXP_FLAGS);
 
                 if (elem->skb) {
@@ -346,16 +347,16 @@ static void c2_tx_clean(struct c2_port *c2_port)
                                              elem->hw_desc + C2_TXP_LEN);
                                 __raw_writeq(0,
                                              elem->hw_desc + C2_TXP_ADDR);
-                                __raw_writew(cpu_to_be16(TXP_HTXD_DONE),
+                                __raw_writew((__force u16) cpu_to_be16(TXP_HTXD_DONE),
                                              elem->hw_desc + C2_TXP_FLAGS);
                                 c2_port->netstats.tx_dropped++;
                                 break;
                         } else {
                                 __raw_writew(0,
                                              elem->hw_desc + C2_TXP_LEN);
-                                __raw_writeq(cpu_to_be64(0x1122334455667788ULL),
+                                __raw_writeq((__force u64) cpu_to_be64(0x1122334455667788ULL),
                                              elem->hw_desc + C2_TXP_ADDR);
-                                __raw_writew(cpu_to_be16(TXP_HTXD_UNINIT),
+                                __raw_writew((__force u16) cpu_to_be16(TXP_HTXD_UNINIT),
                                              elem->hw_desc + C2_TXP_FLAGS);
                         }
 
@@ -390,7 +391,7 @@ static void c2_tx_interrupt(struct net_device *netdev)
         for (elem = tx_ring->to_clean; elem != tx_ring->to_use;
              elem = elem->next) {
                 txp_htxd.flags =
-                    be16_to_cpu(readw(elem->hw_desc + C2_TXP_FLAGS));
+                    be16_to_cpu((__force __be16) readw(elem->hw_desc + C2_TXP_FLAGS));
 
                 if (txp_htxd.flags != TXP_HTXD_DONE)
                         break;
@@ -398,7 +399,7 @@ static void c2_tx_interrupt(struct net_device *netdev)
                 if (netif_msg_tx_done(c2_port)) {
                         /* PCI reads are expensive in fast path */
                         txp_htxd.len =
-                            be16_to_cpu(readw(elem->hw_desc + C2_TXP_LEN));
+                            be16_to_cpu((__force __be16) readw(elem->hw_desc + C2_TXP_LEN));
                         pr_debug("%s: tx done slot %3Zu status 0x%x len "
                                 "%5u bytes\n",
                                 netdev->name, elem - tx_ring->start,
@@ -448,10 +449,12 @@ static void c2_rx_error(struct c2_port *c2_port, struct c2_element *elem)
         /* Write the descriptor to the adapter's rx ring */
         __raw_writew(0, elem->hw_desc + C2_RXP_STATUS);
         __raw_writew(0, elem->hw_desc + C2_RXP_COUNT);
-        __raw_writew(cpu_to_be16((u16) elem->maplen - sizeof(*rxp_hdr)),
+        __raw_writew((__force u16) cpu_to_be16((u16) elem->maplen - sizeof(*rxp_hdr)),
                      elem->hw_desc + C2_RXP_LEN);
-        __raw_writeq(cpu_to_be64(elem->mapaddr), elem->hw_desc + C2_RXP_ADDR);
-        __raw_writew(cpu_to_be16(RXP_HRXD_READY), elem->hw_desc + C2_RXP_FLAGS);
+        __raw_writeq((__force u64) cpu_to_be64(elem->mapaddr),
+                     elem->hw_desc + C2_RXP_ADDR);
+        __raw_writew((__force u16) cpu_to_be16(RXP_HRXD_READY),
+                     elem->hw_desc + C2_RXP_FLAGS);
 
         pr_debug("packet dropped\n");
         c2_port->netstats.rx_dropped++;
@@ -653,7 +656,7 @@ static int c2_up(struct net_device *netdev)
              i++, elem++) {
                 rxp_hdr = (struct c2_rxp_hdr *) elem->skb->data;
                 rxp_hdr->flags = 0;
-                __raw_writew(cpu_to_be16(RXP_HRXD_READY),
+                __raw_writew((__force u16) cpu_to_be16(RXP_HRXD_READY),
                              elem->hw_desc + C2_RXP_FLAGS);
         }
 
@@ -787,9 +790,12 @@ static int c2_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         elem->maplen = maplen;
 
         /* Tell HW to xmit */
-        __raw_writeq(cpu_to_be64(mapaddr), elem->hw_desc + C2_TXP_ADDR);
-        __raw_writew(cpu_to_be16(maplen), elem->hw_desc + C2_TXP_LEN);
-        __raw_writew(cpu_to_be16(TXP_HTXD_READY), elem->hw_desc + C2_TXP_FLAGS);
+        __raw_writeq((__force u64) cpu_to_be64(mapaddr),
+                     elem->hw_desc + C2_TXP_ADDR);
+        __raw_writew((__force u16) cpu_to_be16(maplen),
+                     elem->hw_desc + C2_TXP_LEN);
+        __raw_writew((__force u16) cpu_to_be16(TXP_HTXD_READY),
+                     elem->hw_desc + C2_TXP_FLAGS);
 
         c2_port->netstats.tx_packets++;
         c2_port->netstats.tx_bytes += maplen;
@@ -810,11 +816,11 @@ static int c2_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                         elem->maplen = maplen;
 
                         /* Tell HW to xmit */
-                        __raw_writeq(cpu_to_be64(mapaddr),
+                        __raw_writeq((__force u64) cpu_to_be64(mapaddr),
                                      elem->hw_desc + C2_TXP_ADDR);
-                        __raw_writew(cpu_to_be16(maplen),
+                        __raw_writew((__force u16) cpu_to_be16(maplen),
                                      elem->hw_desc + C2_TXP_LEN);
-                        __raw_writew(cpu_to_be16(TXP_HTXD_READY),
+                        __raw_writew((__force u16) cpu_to_be16(TXP_HTXD_READY),
                                      elem->hw_desc + C2_TXP_FLAGS);
 
                         c2_port->netstats.tx_packets++;
@@ -1005,7 +1011,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
         /* Remap the adapter PCI registers in BAR4 */
         mmio_regs = ioremap_nocache(reg4_start + C2_PCI_REGS_OFFSET,
                                     sizeof(struct c2_adapter_pci_regs));
-        if (mmio_regs == 0UL) {
+        if (!mmio_regs) {
                 printk(KERN_ERR PFX
                         "Unable to remap adapter PCI registers in BAR4\n");
                 ret = -EIO;
@@ -1029,10 +1035,10 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
         }
 
         /* Validate the adapter version */
-        if (be32_to_cpu(readl(mmio_regs + C2_REGS_VERS)) != C2_VERSION) {
+        if (be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_VERS)) != C2_VERSION) {
                 printk(KERN_ERR PFX "Version mismatch "
                         "[fw=%u, c2=%u], Adapter not claimed\n",
-                        be32_to_cpu(readl(mmio_regs + C2_REGS_VERS)),
+                        be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_VERS)),
                         C2_VERSION);
                 ret = -EINVAL;
                 iounmap(mmio_regs);
@@ -1040,12 +1046,12 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
         }
 
         /* Validate the adapter IVN */
-        if (be32_to_cpu(readl(mmio_regs + C2_REGS_IVN)) != C2_IVN) {
+        if (be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_IVN)) != C2_IVN) {
                 printk(KERN_ERR PFX "Downlevel FIrmware level. You should be using "
                        "the OpenIB device support kit. "
                        "[fw=0x%x, c2=0x%x], Adapter not claimed\n",
-                        be32_to_cpu(readl(mmio_regs + C2_REGS_IVN)),
-                        C2_IVN);
+                       be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_IVN)),
+                       C2_IVN);
                 ret = -EINVAL;
                 iounmap(mmio_regs);
                 goto bail2;
@@ -1068,7 +1074,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
 
         /* Get the last RX index */
         c2dev->cur_rx =
-            (be32_to_cpu(readl(mmio_regs + C2_REGS_HRX_CUR)) -
+            (be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_HRX_CUR)) -
              0xffffc000) / sizeof(struct c2_rxp_desc);
 
         /* Request an interrupt line for the driver */
@@ -1090,7 +1096,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
         }
 
         /* Save off the actual size prior to unmapping mmio_regs */
-        kva_map_size = be32_to_cpu(readl(mmio_regs + C2_REGS_PCI_WINSIZE));
+        kva_map_size = be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_PCI_WINSIZE));
 
         /* Unmap the adapter PCI registers in BAR4 */
         iounmap(mmio_regs);
@@ -1109,7 +1115,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
         /* Remap the adapter HRXDQ PA space to kernel VA space */
         c2dev->mmio_rxp_ring = ioremap_nocache(reg4_start + C2_RXP_HRXDQ_OFFSET,
                                                C2_RXP_HRXDQ_SIZE);
-        if (c2dev->mmio_rxp_ring == 0UL) {
+        if (!c2dev->mmio_rxp_ring) {
                 printk(KERN_ERR PFX "Unable to remap MMIO HRXDQ region\n");
                 ret = -EIO;
                 goto bail6;
@@ -1118,7 +1124,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
         /* Remap the adapter HTXDQ PA space to kernel VA space */
         c2dev->mmio_txp_ring = ioremap_nocache(reg4_start + C2_TXP_HTXDQ_OFFSET,
                                                C2_TXP_HTXDQ_SIZE);
-        if (c2dev->mmio_txp_ring == 0UL) {
+        if (!c2dev->mmio_txp_ring) {
                 printk(KERN_ERR PFX "Unable to remap MMIO HTXDQ region\n");
                 ret = -EIO;
                 goto bail7;
@@ -1129,7 +1135,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
 
         /* Remap the PCI registers in adapter BAR0 to kernel VA space */
         c2dev->regs = ioremap_nocache(reg0_start, reg0_len);
-        if (c2dev->regs == 0UL) {
+        if (!c2dev->regs) {
                 printk(KERN_ERR PFX "Unable to remap BAR0\n");
                 ret = -EIO;
                 goto bail8;
@@ -1139,7 +1145,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
         c2dev->pa = reg4_start + C2_PCI_REGS_OFFSET;
         c2dev->kva = ioremap_nocache(reg4_start + C2_PCI_REGS_OFFSET,
                                      kva_map_size);
-        if (c2dev->kva == 0UL) {
+        if (!c2dev->kva) {
                 printk(KERN_ERR PFX "Unable to remap BAR4\n");
                 ret = -EIO;
                 goto bail9;
diff --git a/drivers/infiniband/hw/amso1100/c2.h b/drivers/infiniband/hw/amso1100/c2.h
index fa58200217a1..ed38ab8d9c0c 100644
--- a/drivers/infiniband/hw/amso1100/c2.h
+++ b/drivers/infiniband/hw/amso1100/c2.h
@@ -346,7 +346,7 @@ struct c2_dev {
         //      spinlock_t aeq_lock;
         //      spinlock_t rnic_lock;
 
-        u16 *hint_count;
+        __be16 *hint_count;
         dma_addr_t hint_count_dma;
         u16 hints_read;
 
@@ -425,10 +425,10 @@ static inline void __raw_writeq(u64 val, void __iomem * addr)
 #endif
 
 #define C2_SET_CUR_RX(c2dev, cur_rx) \
-        __raw_writel(cpu_to_be32(cur_rx), c2dev->mmio_txp_ring + 4092)
+        __raw_writel((__force u32) cpu_to_be32(cur_rx), c2dev->mmio_txp_ring + 4092)
 
 #define C2_GET_CUR_RX(c2dev) \
-        be32_to_cpu(readl(c2dev->mmio_txp_ring + 4092))
+        be32_to_cpu((__force __be32) readl(c2dev->mmio_txp_ring + 4092))
 
 static inline struct c2_dev *to_c2dev(struct ib_device *ibdev)
 {
@@ -485,8 +485,8 @@ extern void c2_unregister_device(struct c2_dev *c2dev);
 extern int c2_rnic_init(struct c2_dev *c2dev);
 extern void c2_rnic_term(struct c2_dev *c2dev);
 extern void c2_rnic_interrupt(struct c2_dev *c2dev);
-extern int c2_del_addr(struct c2_dev *c2dev, u32 inaddr, u32 inmask);
-extern int c2_add_addr(struct c2_dev *c2dev, u32 inaddr, u32 inmask);
+extern int c2_del_addr(struct c2_dev *c2dev, __be32 inaddr, __be32 inmask);
+extern int c2_add_addr(struct c2_dev *c2dev, __be32 inaddr, __be32 inmask);
 
 /* QPs */
 extern int c2_alloc_qp(struct c2_dev *c2dev, struct c2_pd *pd,
@@ -545,7 +545,7 @@ extern void c2_ae_event(struct c2_dev *c2dev, u32 mq_index);
 extern int c2_init_mqsp_pool(struct c2_dev *c2dev, gfp_t gfp_mask,
                              struct sp_chunk **root);
 extern void c2_free_mqsp_pool(struct c2_dev *c2dev, struct sp_chunk *root);
-extern u16 *c2_alloc_mqsp(struct c2_dev *c2dev, struct sp_chunk *head,
-                          dma_addr_t *dma_addr, gfp_t gfp_mask);
-extern void c2_free_mqsp(u16 * mqsp);
+extern __be16 *c2_alloc_mqsp(struct c2_dev *c2dev, struct sp_chunk *head,
+                             dma_addr_t *dma_addr, gfp_t gfp_mask);
+extern void c2_free_mqsp(__be16* mqsp);
 #endif
diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c
index a31439bd3b67..62af74295dbe 100644
--- a/drivers/infiniband/hw/amso1100/c2_ae.c
+++ b/drivers/infiniband/hw/amso1100/c2_ae.c
@@ -61,7 +61,7 @@ static int c2_convert_cm_status(u32 c2_status)
         default:
                 printk(KERN_ERR PFX
                        "%s - Unable to convert CM status: %d\n",
-                       __FUNCTION__, c2_status);
+                       __func__, c2_status);
                 return -EIO;
         }
 }
@@ -193,9 +193,9 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
                 pr_debug("%s: event = %s, user_context=%llx, "
                         "resource_type=%x, "
                         "resource=%x, qp_state=%s\n",
-                        __FUNCTION__,
+                        __func__,
                         to_event_str(event_id),
-                        (unsigned long long) be64_to_cpu(wr->ae.ae_generic.user_context),
+                        (unsigned long long) wr->ae.ae_generic.user_context,
                         be32_to_cpu(wr->ae.ae_generic.resource_type),
                         be32_to_cpu(wr->ae.ae_generic.resource),
                         to_qp_state_str(be32_to_cpu(wr->ae.ae_generic.qp_state)));
@@ -259,7 +259,7 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
                         BUG_ON(1);
                         pr_debug("%s:%d Unexpected event_id=%d on QP=%p, "
                                 "CM_ID=%p\n",
-                                __FUNCTION__, __LINE__,
+                                __func__, __LINE__,
                                 event_id, qp, cm_id);
                         break;
                 }
@@ -276,7 +276,7 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
                 pr_debug("C2_RES_IND_EP event_id=%d\n", event_id);
                 if (event_id != CCAE_CONNECTION_REQUEST) {
                         pr_debug("%s: Invalid event_id: %d\n",
-                                __FUNCTION__, event_id);
+                                __func__, event_id);
                         break;
                 }
                 cm_event.event = IW_CM_EVENT_CONNECT_REQUEST;
diff --git a/drivers/infiniband/hw/amso1100/c2_alloc.c b/drivers/infiniband/hw/amso1100/c2_alloc.c
index 0315f99e4191..e9110163aeff 100644
--- a/drivers/infiniband/hw/amso1100/c2_alloc.c
+++ b/drivers/infiniband/hw/amso1100/c2_alloc.c
@@ -87,8 +87,8 @@ void c2_free_mqsp_pool(struct c2_dev *c2dev, struct sp_chunk *root)
         }
 }
 
-u16 *c2_alloc_mqsp(struct c2_dev *c2dev, struct sp_chunk *head,
-                   dma_addr_t *dma_addr, gfp_t gfp_mask)
+__be16 *c2_alloc_mqsp(struct c2_dev *c2dev, struct sp_chunk *head,
+                      dma_addr_t *dma_addr, gfp_t gfp_mask)
 {
         u16 mqsp;
 
@@ -113,14 +113,14 @@ u16 *c2_alloc_mqsp(struct c2_dev *c2dev, struct sp_chunk *head,
                 *dma_addr = head->dma_addr +
                             ((unsigned long) &(head->shared_ptr[mqsp]) -
                              (unsigned long) head);
-                pr_debug("%s addr %p dma_addr %llx\n", __FUNCTION__,
+                pr_debug("%s addr %p dma_addr %llx\n", __func__,
                          &(head->shared_ptr[mqsp]), (unsigned long long) *dma_addr);
-                return &(head->shared_ptr[mqsp]);
+                return (__force __be16 *) &(head->shared_ptr[mqsp]);
         }
         return NULL;
 }
 
-void c2_free_mqsp(u16 * mqsp)
+void c2_free_mqsp(__be16 *mqsp)
 {
         struct sp_chunk *head;
         u16 idx;
@@ -129,7 +129,7 @@ void c2_free_mqsp(u16 * mqsp)
         head = (struct sp_chunk *) ((unsigned long) mqsp & PAGE_MASK);
 
         /* Link head to new mqsp */
-        *mqsp = head->head;
+        *mqsp = (__force __be16) head->head;
 
         /* Compute the shared_ptr index */
         idx = ((unsigned long) mqsp & ~PAGE_MASK) >> 1;
diff --git a/drivers/infiniband/hw/amso1100/c2_cq.c b/drivers/infiniband/hw/amso1100/c2_cq.c
index d2b3366786d6..bb17cce3cb59 100644
--- a/drivers/infiniband/hw/amso1100/c2_cq.c
+++ b/drivers/infiniband/hw/amso1100/c2_cq.c
@@ -422,8 +422,8 @@ void c2_free_cq(struct c2_dev *c2dev, struct c2_cq *cq)
                 goto bail1;
 
         reply = (struct c2wr_cq_destroy_rep *) (unsigned long) (vq_req->reply_msg);
-
-        vq_repbuf_free(c2dev, reply);
+        if (reply)
+                vq_repbuf_free(c2dev, reply);
       bail1:
         vq_req_free(c2dev, vq_req);
       bail0:
diff --git a/drivers/infiniband/hw/amso1100/c2_intr.c b/drivers/infiniband/hw/amso1100/c2_intr.c
index 0d0bc33ca30a..3b5095470cb3 100644
--- a/drivers/infiniband/hw/amso1100/c2_intr.c
+++ b/drivers/infiniband/hw/amso1100/c2_intr.c
@@ -174,7 +174,11 @@ static void handle_vq(struct c2_dev *c2dev, u32 mq_index)
                 return;
         }
 
-        err = c2_errno(reply_msg);
+        if (reply_msg)
+                err = c2_errno(reply_msg);
+        else
+                err = -ENOMEM;
+
         if (!err) switch (req->event) {
         case IW_CM_EVENT_ESTABLISHED:
                 c2_set_qp_state(req->qp,
diff --git a/drivers/infiniband/hw/amso1100/c2_mm.c b/drivers/infiniband/hw/amso1100/c2_mm.c
index 1e4f46493fcb..b506fe22b4d4 100644
--- a/drivers/infiniband/hw/amso1100/c2_mm.c
+++ b/drivers/infiniband/hw/amso1100/c2_mm.c
@@ -45,7 +45,7 @@
  *        Reply buffer _is_ freed by this function.
  */
 static int
-send_pbl_messages(struct c2_dev *c2dev, u32 stag_index,
+send_pbl_messages(struct c2_dev *c2dev, __be32 stag_index,
                   unsigned long va, u32 pbl_depth,
                   struct c2_vq_req *vq_req, int pbl_type)
 {
diff --git a/drivers/infiniband/hw/amso1100/c2_mq.c b/drivers/infiniband/hw/amso1100/c2_mq.c
index b88a75592102..0cddc49beae1 100644
--- a/drivers/infiniband/hw/amso1100/c2_mq.c
+++ b/drivers/infiniband/hw/amso1100/c2_mq.c
@@ -64,7 +64,7 @@ void c2_mq_produce(struct c2_mq *q)
                 q->priv = (q->priv + 1) % q->q_size;
                 q->hint_count++;
                 /* Update peer's offset. */
-                __raw_writew(cpu_to_be16(q->priv), &q->peer->shared);
+                __raw_writew((__force u16) cpu_to_be16(q->priv), &q->peer->shared);
         }
 }
 
@@ -105,7 +105,7 @@ void c2_mq_free(struct c2_mq *q)
 #endif
                 q->priv = (q->priv + 1) % q->q_size;
                 /* Update peer's offset. */
-                __raw_writew(cpu_to_be16(q->priv), &q->peer->shared);
+                __raw_writew((__force u16) cpu_to_be16(q->priv), &q->peer->shared);
         }
 }
 
diff --git a/drivers/infiniband/hw/amso1100/c2_mq.h b/drivers/infiniband/hw/amso1100/c2_mq.h
index 9185bbb21658..acede007b94a 100644
--- a/drivers/infiniband/hw/amso1100/c2_mq.h
+++ b/drivers/infiniband/hw/amso1100/c2_mq.h
@@ -75,7 +75,7 @@ struct c2_mq {
         u16 hint_count;
         u16 priv;
         struct c2_mq_shared __iomem *peer;
-        u16 *shared;
+        __be16 *shared;
         dma_addr_t shared_dma;
         u32 q_size;
         u32 msg_size;
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index 7a6cece6ea9d..e10d27a6e145 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -67,7 +67,7 @@ static int c2_query_device(struct ib_device *ibdev,
 {
         struct c2_dev *c2dev = to_c2dev(ibdev);
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         *props = c2dev->props;
         return 0;
@@ -76,7 +76,7 @@ static int c2_query_device(struct ib_device *ibdev,
 static int c2_query_port(struct ib_device *ibdev,
                          u8 port, struct ib_port_attr *props)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         props->max_mtu = IB_MTU_4096;
         props->lid = 0;
@@ -102,14 +102,14 @@ static int c2_modify_port(struct ib_device *ibdev,
                           u8 port, int port_modify_mask,
                           struct ib_port_modify *props)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return 0;
 }
 
 static int c2_query_pkey(struct ib_device *ibdev,
                          u8 port, u16 index, u16 * pkey)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         *pkey = 0;
         return 0;
 }
@@ -119,7 +119,7 @@ static int c2_query_gid(struct ib_device *ibdev, u8 port,
 {
         struct c2_dev *c2dev = to_c2dev(ibdev);
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         memset(&(gid->raw[0]), 0, sizeof(gid->raw));
         memcpy(&(gid->raw[0]), c2dev->pseudo_netdev->dev_addr, 6);
 
@@ -134,7 +134,7 @@ static struct ib_ucontext *c2_alloc_ucontext(struct ib_device *ibdev,
 {
         struct c2_ucontext *context;
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         context = kmalloc(sizeof(*context), GFP_KERNEL);
         if (!context)
                 return ERR_PTR(-ENOMEM);
@@ -144,14 +144,14 @@ static struct ib_ucontext *c2_alloc_ucontext(struct ib_device *ibdev,
 
 static int c2_dealloc_ucontext(struct ib_ucontext *context)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         kfree(context);
         return 0;
 }
 
 static int c2_mmap_uar(struct ib_ucontext *context, struct vm_area_struct *vma)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return -ENOSYS;
 }
 
@@ -162,7 +162,7 @@ static struct ib_pd *c2_alloc_pd(struct ib_device *ibdev,
         struct c2_pd *pd;
         int err;
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         pd = kmalloc(sizeof(*pd), GFP_KERNEL);
         if (!pd)
@@ -187,7 +187,7 @@ static struct ib_pd *c2_alloc_pd(struct ib_device *ibdev,
 
 static int c2_dealloc_pd(struct ib_pd *pd)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         c2_pd_free(to_c2dev(pd->device), to_c2pd(pd));
         kfree(pd);
 
@@ -196,13 +196,13 @@ static int c2_dealloc_pd(struct ib_pd *pd)
 
 static struct ib_ah *c2_ah_create(struct ib_pd *pd, struct ib_ah_attr *ah_attr)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return ERR_PTR(-ENOSYS);
 }
 
 static int c2_ah_destroy(struct ib_ah *ah)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return -ENOSYS;
 }
 
@@ -230,7 +230,7 @@ struct ib_qp *c2_get_qp(struct ib_device *device, int qpn)
 
         qp = c2_find_qpn(c2dev, qpn);
         pr_debug("%s Returning QP=%p for QPN=%d, device=%p, refcount=%d\n",
-                __FUNCTION__, qp, qpn, device,
+                __func__, qp, qpn, device,
                 (qp?atomic_read(&qp->refcount):0));
 
         return (qp?&qp->ibqp:NULL);
@@ -243,13 +243,16 @@ static struct ib_qp *c2_create_qp(struct ib_pd *pd,
         struct c2_qp *qp;
         int err;
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
+
+        if (init_attr->create_flags)
+                return ERR_PTR(-EINVAL);
 
         switch (init_attr->qp_type) {
         case IB_QPT_RC:
                 qp = kzalloc(sizeof(*qp), GFP_KERNEL);
                 if (!qp) {
-                        pr_debug("%s: Unable to allocate QP\n", __FUNCTION__);
+                        pr_debug("%s: Unable to allocate QP\n", __func__);
                         return ERR_PTR(-ENOMEM);
                 }
                 spin_lock_init(&qp->lock);
@@ -266,7 +269,7 @@ static struct ib_qp *c2_create_qp(struct ib_pd *pd,
 
                 break;
         default:
-                pr_debug("%s: Invalid QP type: %d\n", __FUNCTION__,
+                pr_debug("%s: Invalid QP type: %d\n", __func__,
                         init_attr->qp_type);
                 return ERR_PTR(-EINVAL);
                 break;
@@ -285,7 +288,7 @@ static int c2_destroy_qp(struct ib_qp *ib_qp)
         struct c2_qp *qp = to_c2qp(ib_qp);
 
         pr_debug("%s:%u qp=%p,qp->state=%d\n",
-                __FUNCTION__, __LINE__,ib_qp,qp->state);
+                __func__, __LINE__, ib_qp, qp->state);
         c2_free_qp(to_c2dev(ib_qp->device), qp);
         kfree(qp);
         return 0;
@@ -300,13 +303,13 @@ static struct ib_cq *c2_create_cq(struct ib_device *ibdev, int entries, int vect
 
         cq = kmalloc(sizeof(*cq), GFP_KERNEL);
         if (!cq) {
-                pr_debug("%s: Unable to allocate CQ\n", __FUNCTION__);
+                pr_debug("%s: Unable to allocate CQ\n", __func__);
                 return ERR_PTR(-ENOMEM);
         }
 
         err = c2_init_cq(to_c2dev(ibdev), entries, NULL, cq);
         if (err) {
-                pr_debug("%s: error initializing CQ\n", __FUNCTION__);
+                pr_debug("%s: error initializing CQ\n", __func__);
                 kfree(cq);
                 return ERR_PTR(err);
         }
@@ -318,7 +321,7 @@ static int c2_destroy_cq(struct ib_cq *ib_cq)
 {
         struct c2_cq *cq = to_c2cq(ib_cq);
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         c2_free_cq(to_c2dev(ib_cq->device), cq);
         kfree(cq);
@@ -400,7 +403,7 @@ static struct ib_mr *c2_reg_phys_mr(struct ib_pd *ib_pd,
         mr->umem = NULL;
         pr_debug("%s - page shift %d, pbl_depth %d, total_len %u, "
                 "*iova_start %llx, first pa %llx, last pa %llx\n",
-                __FUNCTION__, page_shift, pbl_depth, total_len,
+                __func__, page_shift, pbl_depth, total_len,
                 (unsigned long long) *iova_start,
                 (unsigned long long) page_list[0],
                 (unsigned long long) page_list[pbl_depth-1]);
@@ -422,7 +425,7 @@ static struct ib_mr *c2_get_dma_mr(struct ib_pd *pd, int acc)
         struct ib_phys_buf bl;
         u64 kva = 0;
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         /* AMSO1100 limit */
         bl.size = 0xffffffff;
@@ -442,7 +445,7 @@ static struct ib_mr *c2_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
         struct c2_pd *c2pd = to_c2pd(pd);
         struct c2_mr *c2mr;
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         c2mr = kmalloc(sizeof(*c2mr), GFP_KERNEL);
         if (!c2mr)
@@ -506,7 +509,7 @@ static int c2_dereg_mr(struct ib_mr *ib_mr)
         struct c2_mr *mr = to_c2mr(ib_mr);
         int err;
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         err = c2_stag_dealloc(to_c2dev(ib_mr->device), ib_mr->lkey);
         if (err)
@@ -523,14 +526,14 @@ static int c2_dereg_mr(struct ib_mr *ib_mr)
 static ssize_t show_rev(struct class_device *cdev, char *buf)
 {
         struct c2_dev *dev = container_of(cdev, struct c2_dev, ibdev.class_dev);
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return sprintf(buf, "%x\n", dev->props.hw_ver);
 }
 
 static ssize_t show_fw_ver(struct class_device *cdev, char *buf)
 {
         struct c2_dev *dev = container_of(cdev, struct c2_dev, ibdev.class_dev);
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return sprintf(buf, "%x.%x.%x\n",
                        (int) (dev->props.fw_ver >> 32),
                        (int) (dev->props.fw_ver >> 16) & 0xffff,
@@ -539,13 +542,13 @@ static ssize_t show_fw_ver(struct class_device *cdev, char *buf)
 
 static ssize_t show_hca(struct class_device *cdev, char *buf)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return sprintf(buf, "AMSO1100\n");
 }
 
 static ssize_t show_board(struct class_device *cdev, char *buf)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return sprintf(buf, "%.*s\n", 32, "AMSO1100 Board ID");
 }
 
@@ -575,13 +578,13 @@ static int c2_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 
 static int c2_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return -ENOSYS;
 }
 
 static int c2_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return -ENOSYS;
 }
 
@@ -592,13 +595,13 @@ static int c2_process_mad(struct ib_device *ibdev,
                           struct ib_grh *in_grh,
                           struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         return -ENOSYS;
 }
 
 static int c2_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         /* Request a connection */
         return c2_llp_connect(cm_id, iw_param);
@@ -606,7 +609,7 @@ static int c2_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
 
 static int c2_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         /* Accept the new connection */
         return c2_llp_accept(cm_id, iw_param);
@@ -616,7 +619,7 @@ static int c2_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
 {
         int err;
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         err = c2_llp_reject(cm_id, pdata, pdata_len);
         return err;
@@ -626,10 +629,10 @@ static int c2_service_create(struct iw_cm_id *cm_id, int backlog)
 {
         int err;
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         err = c2_llp_service_create(cm_id, backlog);
         pr_debug("%s:%u err=%d\n",
-                __FUNCTION__, __LINE__,
+                __func__, __LINE__,
                 err);
         return err;
 }
@@ -637,7 +640,7 @@ static int c2_service_create(struct iw_cm_id *cm_id, int backlog)
 static int c2_service_destroy(struct iw_cm_id *cm_id)
 {
         int err;
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
 
         err = c2_llp_service_destroy(cm_id);
 
@@ -743,7 +746,7 @@ static struct net_device *c2_pseudo_netdev_init(struct c2_dev *c2dev)
         netdev = alloc_netdev(sizeof(*netdev), name, setup);
         if (!netdev) {
                 printk(KERN_ERR PFX "%s -  etherdev alloc failed",
-                        __FUNCTION__);
+                        __func__);
                 return NULL;
         }
 
@@ -780,7 +783,7 @@ int c2_register_device(struct c2_dev *dev)
         if (ret)
                 goto out2;
 
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         strlcpy(dev->ibdev.name, "amso%d", IB_DEVICE_NAME_MAX);
         dev->ibdev.owner = THIS_MODULE;
         dev->ibdev.uverbs_cmd_mask =
@@ -873,13 +876,13 @@ out1:
 out2:
         free_netdev(dev->pseudo_netdev);
 out3:
-        pr_debug("%s:%u ret=%d\n", __FUNCTION__, __LINE__, ret);
+        pr_debug("%s:%u ret=%d\n", __func__, __LINE__, ret);
         return ret;
 }
 
 void c2_unregister_device(struct c2_dev *dev)
 {
-        pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
+        pr_debug("%s:%u\n", __func__, __LINE__);
         unregister_netdev(dev->pseudo_netdev);
         free_netdev(dev->pseudo_netdev);
         ib_unregister_device(&dev->ibdev);
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index 01d07862ea86..a6d89440ad2c 100644
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -121,7 +121,7 @@ void c2_set_qp_state(struct c2_qp *qp, int c2_state)
         int new_state = to_ib_state(c2_state);
 
         pr_debug("%s: qp[%p] state modify %s --> %s\n",
-               __FUNCTION__,
+               __func__,
                 qp,
                 to_ib_state_str(qp->state),
                 to_ib_state_str(new_state));
@@ -141,7 +141,7 @@ int c2_qp_modify(struct c2_dev *c2dev, struct c2_qp *qp,
         int err;
 
         pr_debug("%s:%d qp=%p, %s --> %s\n",
-                __FUNCTION__, __LINE__,
+                __func__, __LINE__,
                 qp,
                 to_ib_state_str(qp->state),
                 to_ib_state_str(attr->qp_state));
@@ -224,7 +224,7 @@ int c2_qp_modify(struct c2_dev *c2dev, struct c2_qp *qp,
                 qp->state = next_state;
 #ifdef DEBUG
         else
-                pr_debug("%s: c2_errno=%d\n", __FUNCTION__, err);
+                pr_debug("%s: c2_errno=%d\n", __func__, err);
 #endif
         /*
          * If we're going to error and generating the event here, then
@@ -243,7 +243,7 @@ int c2_qp_modify(struct c2_dev *c2dev, struct c2_qp *qp,
         vq_req_free(c2dev, vq_req);
 
         pr_debug("%s:%d qp=%p, cur_state=%s\n",
-                __FUNCTION__, __LINE__,
+                __func__, __LINE__,
                 qp,
                 to_ib_state_str(qp->state));
         return err;
@@ -811,16 +811,24 @@ int c2_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
 
                 switch (ib_wr->opcode) {
                 case IB_WR_SEND:
-                        if (ib_wr->send_flags & IB_SEND_SOLICITED) {
-                                c2_wr_set_id(&wr, C2_WR_TYPE_SEND_SE);
-                                msg_size = sizeof(struct c2wr_send_req);
+                case IB_WR_SEND_WITH_INV:
+                        if (ib_wr->opcode == IB_WR_SEND) {
+                                if (ib_wr->send_flags & IB_SEND_SOLICITED)
+                                        c2_wr_set_id(&wr, C2_WR_TYPE_SEND_SE);
+                                else
+                                        c2_wr_set_id(&wr, C2_WR_TYPE_SEND);
+                                wr.sqwr.send.remote_stag = 0;
                         } else {
-                                c2_wr_set_id(&wr, C2_WR_TYPE_SEND);
-                                msg_size = sizeof(struct c2wr_send_req);
+                                if (ib_wr->send_flags & IB_SEND_SOLICITED)
+                                        c2_wr_set_id(&wr, C2_WR_TYPE_SEND_SE_INV);
+                                else
+                                        c2_wr_set_id(&wr, C2_WR_TYPE_SEND_INV);
+                                wr.sqwr.send.remote_stag =
+                                        cpu_to_be32(ib_wr->ex.invalidate_rkey);
                         }
 
-                        wr.sqwr.send.remote_stag = 0;
-                        msg_size += sizeof(struct c2_data_addr) * ib_wr->num_sge;
+                        msg_size = sizeof(struct c2wr_send_req) +
+                                sizeof(struct c2_data_addr) * ib_wr->num_sge;
                         if (ib_wr->num_sge > qp->send_sgl_depth) {
                                 err = -EINVAL;
                                 break;
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c
index 1687c511cb2f..9a054c6941a4 100644
--- a/drivers/infiniband/hw/amso1100/c2_rnic.c
+++ b/drivers/infiniband/hw/amso1100/c2_rnic.c
@@ -208,7 +208,7 @@ static int c2_rnic_query(struct c2_dev *c2dev, struct ib_device_attr *props)
 /*
  * Add an IP address to the RNIC interface
  */
-int c2_add_addr(struct c2_dev *c2dev, u32 inaddr, u32 inmask)
+int c2_add_addr(struct c2_dev *c2dev, __be32 inaddr, __be32 inmask)
 {
         struct c2_vq_req *vq_req;
         struct c2wr_rnic_setconfig_req *wr;
@@ -270,7 +270,7 @@ int c2_add_addr(struct c2_dev *c2dev, u32 inaddr, u32 inmask)
 /*
  * Delete an IP address from the RNIC interface
  */
-int c2_del_addr(struct c2_dev *c2dev, u32 inaddr, u32 inmask)
+int c2_del_addr(struct c2_dev *c2dev, __be32 inaddr, __be32 inmask)
 {
         struct c2_vq_req *vq_req;
         struct c2wr_rnic_setconfig_req *wr;
@@ -455,7 +455,8 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
              IB_DEVICE_CURR_QP_STATE_MOD |
              IB_DEVICE_SYS_IMAGE_GUID |
              IB_DEVICE_ZERO_STAG |
-             IB_DEVICE_SEND_W_INV | IB_DEVICE_MEM_WINDOW);
+             IB_DEVICE_MEM_WINDOW |
+             IB_DEVICE_SEND_W_INV);
 
         /* Allocate the qptr_array */
         c2dev->qptr_array = vmalloc(C2_MAX_CQS * sizeof(void *));
@@ -506,17 +507,17 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
         mmio_regs = c2dev->kva;
         /* Initialize the Verbs Request Queue */
         c2_mq_req_init(&c2dev->req_vq, 0,
-                       be32_to_cpu(readl(mmio_regs + C2_REGS_Q0_QSIZE)),
-                       be32_to_cpu(readl(mmio_regs + C2_REGS_Q0_MSGSIZE)),
+                       be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q0_QSIZE)),
+                       be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q0_MSGSIZE)),
                        mmio_regs +
-                       be32_to_cpu(readl(mmio_regs + C2_REGS_Q0_POOLSTART)),
+                       be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q0_POOLSTART)),
                        mmio_regs +
-                       be32_to_cpu(readl(mmio_regs + C2_REGS_Q0_SHARED)),
+                       be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q0_SHARED)),
                        C2_MQ_ADAPTER_TARGET);
 
         /* Initialize the Verbs Reply Queue */
-        qsize = be32_to_cpu(readl(mmio_regs + C2_REGS_Q1_QSIZE));
-        msgsize = be32_to_cpu(readl(mmio_regs + C2_REGS_Q1_MSGSIZE));
+        qsize = be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q1_QSIZE));
+        msgsize = be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q1_MSGSIZE));
         q1_pages = dma_alloc_coherent(&c2dev->pcidev->dev, qsize * msgsize,
                                       &c2dev->rep_vq.host_dma, GFP_KERNEL);
         if (!q1_pages) {
@@ -524,7 +525,7 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
                 goto bail1;
         }
         pci_unmap_addr_set(&c2dev->rep_vq, mapping, c2dev->rep_vq.host_dma);
-        pr_debug("%s rep_vq va %p dma %llx\n", __FUNCTION__, q1_pages,
+        pr_debug("%s rep_vq va %p dma %llx\n", __func__, q1_pages,
                  (unsigned long long) c2dev->rep_vq.host_dma);
         c2_mq_rep_init(&c2dev->rep_vq,
                    1,
@@ -532,12 +533,12 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
                    msgsize,
                    q1_pages,
                    mmio_regs +
-                   be32_to_cpu(readl(mmio_regs + C2_REGS_Q1_SHARED)),
+                   be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q1_SHARED)),
                    C2_MQ_HOST_TARGET);
 
         /* Initialize the Asynchronus Event Queue */
-        qsize = be32_to_cpu(readl(mmio_regs + C2_REGS_Q2_QSIZE));
-        msgsize = be32_to_cpu(readl(mmio_regs + C2_REGS_Q2_MSGSIZE));
+        qsize = be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q2_QSIZE));
+        msgsize = be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q2_MSGSIZE));
         q2_pages = dma_alloc_coherent(&c2dev->pcidev->dev, qsize * msgsize,
                                       &c2dev->aeq.host_dma, GFP_KERNEL);
         if (!q2_pages) {
@@ -545,7 +546,7 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
                 goto bail2;
         }
         pci_unmap_addr_set(&c2dev->aeq, mapping, c2dev->aeq.host_dma);
-        pr_debug("%s aeq va %p dma %llx\n", __FUNCTION__, q2_pages,
+        pr_debug("%s aeq va %p dma %llx\n", __func__, q2_pages,
                  (unsigned long long) c2dev->aeq.host_dma);
         c2_mq_rep_init(&c2dev->aeq,
                        2,
@@ -553,7 +554,7 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
                        msgsize,
                        q2_pages,
                        mmio_regs +
-                       be32_to_cpu(readl(mmio_regs + C2_REGS_Q2_SHARED)),
+                       be32_to_cpu((__force __be32) readl(mmio_regs + C2_REGS_Q2_SHARED)),
                        C2_MQ_HOST_TARGET);
 
         /* Initialize the verbs request allocator */
diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c b/drivers/infiniband/hw/amso1100/c2_vq.c
index cfdacb1ec279..9ce7819b7b2e 100644
--- a/drivers/infiniband/hw/amso1100/c2_vq.c
+++ b/drivers/infiniband/hw/amso1100/c2_vq.c
@@ -197,7 +197,7 @@ int vq_send_wr(struct c2_dev *c2dev, union c2wr *wr)
          */
         while (msg == NULL) {
                 pr_debug("%s:%d no available msg in VQ, waiting...\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                 init_waitqueue_entry(&__wait, current);
                 add_wait_queue(&c2dev->req_vq_wo, &__wait);
                 spin_unlock(&c2dev->vqlock);
diff --git a/drivers/infiniband/hw/amso1100/c2_wr.h b/drivers/infiniband/hw/amso1100/c2_wr.h
index 3ec6c43bb0ef..c65fbdd6e469 100644
--- a/drivers/infiniband/hw/amso1100/c2_wr.h
+++ b/drivers/infiniband/hw/amso1100/c2_wr.h
@@ -180,8 +180,8 @@ enum c2_wr_type {
 };
 
 struct c2_netaddr {
-        u32 ip_addr;
-        u32 netmask;
+        __be32 ip_addr;
+        __be32 netmask;
         u32 mtu;
 };
 
@@ -199,9 +199,9 @@ struct c2_route {
  * A Scatter Gather Entry.
  */
 struct c2_data_addr {
-        u32 stag;
-        u32 length;
-        u64 to;
+        __be32 stag;
+        __be32 length;
+        __be64 to;
 };
 
 /*
@@ -274,7 +274,7 @@ struct c2wr_hdr {
          * from the host to adapter by libccil, but we copy it anyway
          * to make the memcpy to the adapter better aligned.
          */
-        u32 wqe_count;
+        __be32 wqe_count;
 
         /* Put these fields next so that later 32- and 64-bit
          * quantities are naturally aligned.
@@ -316,8 +316,8 @@ enum c2_rnic_flags {
 struct c2wr_rnic_open_req {
         struct c2wr_hdr hdr;
         u64 user_context;
-        u16 flags;              /* See enum c2_rnic_flags */
-        u16 port_num;
+        __be16 flags;           /* See enum c2_rnic_flags */
+        __be16 port_num;
 } __attribute__((packed));
 
 struct c2wr_rnic_open_rep {
@@ -341,30 +341,30 @@ struct c2wr_rnic_query_req {
 struct c2wr_rnic_query_rep {
         struct c2wr_hdr hdr;
         u64 user_context;
-        u32 vendor_id;
-        u32 part_number;
-        u32 hw_version;
-        u32 fw_ver_major;
-        u32 fw_ver_minor;
-        u32 fw_ver_patch;
+        __be32 vendor_id;
+        __be32 part_number;
+        __be32 hw_version;
+        __be32 fw_ver_major;
+        __be32 fw_ver_minor;
+        __be32 fw_ver_patch;
         char fw_ver_build_str[WR_BUILD_STR_LEN];
-        u32 max_qps;
-        u32 max_qp_depth;
+        __be32 max_qps;
+        __be32 max_qp_depth;
         u32 max_srq_depth;
         u32 max_send_sgl_depth;
         u32 max_rdma_sgl_depth;
-        u32 max_cqs;
-        u32 max_cq_depth;
+        __be32 max_cqs;
+        __be32 max_cq_depth;
         u32 max_cq_event_handlers;
-        u32 max_mrs;
+        __be32 max_mrs;
         u32 max_pbl_depth;
-        u32 max_pds;
-        u32 max_global_ird;
+        __be32 max_pds;
+        __be32 max_global_ird;
         u32 max_global_ord;
-        u32 max_qp_ird;
-        u32 max_qp_ord;
+        __be32 max_qp_ird;
+        __be32 max_qp_ord;
         u32 flags;
-        u32 max_mws;
+        __be32 max_mws;
         u32 pbe_range_low;
         u32 pbe_range_high;
         u32 max_srqs;
@@ -405,7 +405,7 @@ union c2wr_rnic_getconfig {
 struct c2wr_rnic_setconfig_req {
         struct c2wr_hdr hdr;
         u32 rnic_handle;
-        u32 option;             /* See c2_setconfig_cmd_t */
+        __be32 option;          /* See c2_setconfig_cmd_t */
         /* variable data and pad. See c2_netaddr and c2_route */
         u8 data[0];
 } __attribute__((packed)) ;
@@ -441,18 +441,18 @@ union c2wr_rnic_close {
  */
 struct c2wr_cq_create_req {
         struct c2wr_hdr hdr;
-        u64 shared_ht;
+        __be64 shared_ht;
         u64 user_context;
-        u64 msg_pool;
+        __be64 msg_pool;
         u32 rnic_handle;
-        u32 msg_size;
-        u32 depth;
+        __be32 msg_size;
+        __be32 depth;
 } __attribute__((packed)) ;
 
 struct c2wr_cq_create_rep {
         struct c2wr_hdr hdr;
-        u32 mq_index;
-        u32 adapter_shared;
+        __be32 mq_index;
+        __be32 adapter_shared;
         u32 cq_handle;
 } __attribute__((packed)) ;
 
@@ -585,40 +585,40 @@ enum c2wr_qp_flags {
 
 struct c2wr_qp_create_req {
         struct c2wr_hdr hdr;
-        u64 shared_sq_ht;
-        u64 shared_rq_ht;
+        __be64 shared_sq_ht;
+        __be64 shared_rq_ht;
         u64 user_context;
         u32 rnic_handle;
         u32 sq_cq_handle;
         u32 rq_cq_handle;
-        u32 sq_depth;
-        u32 rq_depth;
+        __be32 sq_depth;
+        __be32 rq_depth;
         u32 srq_handle;
         u32 srq_limit;
-        u32 flags;              /* see enum c2wr_qp_flags */
-        u32 send_sgl_depth;
-        u32 recv_sgl_depth;
-        u32 rdma_write_sgl_depth;
-        u32 ord;
-        u32 ird;
+        __be32 flags;           /* see enum c2wr_qp_flags */
+        __be32 send_sgl_depth;
+        __be32 recv_sgl_depth;
+        __be32 rdma_write_sgl_depth;
+        __be32 ord;
+        __be32 ird;
         u32 pd_id;
 } __attribute__((packed)) ;
 
 struct c2wr_qp_create_rep {
         struct c2wr_hdr hdr;
-        u32 sq_depth;
-        u32 rq_depth;
+        __be32 sq_depth;
+        __be32 rq_depth;
         u32 send_sgl_depth;
         u32 recv_sgl_depth;
         u32 rdma_write_sgl_depth;
         u32 ord;
         u32 ird;
-        u32 sq_msg_size;
-        u32 sq_mq_index;
-        u32 sq_mq_start;
-        u32 rq_msg_size;
-        u32 rq_mq_index;
-        u32 rq_mq_start;
+        __be32 sq_msg_size;
+        __be32 sq_mq_index;
+        __be32 sq_mq_start;
+        __be32 rq_msg_size;
+        __be32 rq_mq_index;
+        __be32 rq_mq_start;
         u32 qp_handle;
 } __attribute__((packed)) ;
 
@@ -667,11 +667,11 @@ struct c2wr_qp_modify_req {
         u32 stream_msg_length;
         u32 rnic_handle;
         u32 qp_handle;
-        u32 next_qp_state;
-        u32 ord;
-        u32 ird;
-        u32 sq_depth;
-        u32 rq_depth;
+        __be32 next_qp_state;
+        __be32 ord;
+        __be32 ird;
+        __be32 sq_depth;
+        __be32 rq_depth;
         u32 llp_ep_handle;
 } __attribute__((packed)) ;
 
@@ -721,10 +721,10 @@ struct c2wr_qp_connect_req {
         struct c2wr_hdr hdr;
         u32 rnic_handle;
         u32 qp_handle;
-        u32 remote_addr;
-        u16 remote_port;
+        __be32 remote_addr;
+        __be16 remote_port;
         u16 pad;
-        u32 private_data_length;
+        __be32 private_data_length;
         u8 private_data[0];     /* Private data in-line. */
 } __attribute__((packed)) ;
 
@@ -759,25 +759,25 @@ union c2wr_nsmr_stag_alloc {
 
 struct c2wr_nsmr_register_req {
         struct c2wr_hdr hdr;
-        u64 va;
+        __be64 va;
         u32 rnic_handle;
-        u16 flags;
+        __be16 flags;
         u8 stag_key;
         u8 pad;
         u32 pd_id;
-        u32 pbl_depth;
-        u32 pbe_size;
-        u32 fbo;
-        u32 length;
-        u32 addrs_length;
+        __be32 pbl_depth;
+        __be32 pbe_size;
+        __be32 fbo;
+        __be32 length;
+        __be32 addrs_length;
         /* array of paddrs (must be aligned on a 64bit boundary) */
-        u64 paddrs[0];
+        __be64 paddrs[0];
 } __attribute__((packed)) ;
 
 struct c2wr_nsmr_register_rep {
         struct c2wr_hdr hdr;
         u32 pbl_depth;
-        u32 stag_index;
+        __be32 stag_index;
 } __attribute__((packed)) ;
 
 union c2wr_nsmr_register {
@@ -788,11 +788,11 @@ union c2wr_nsmr_register {
 struct c2wr_nsmr_pbl_req {
         struct c2wr_hdr hdr;
         u32 rnic_handle;
-        u32 flags;
-        u32 stag_index;
-        u32 addrs_length;
+        __be32 flags;
+        __be32 stag_index;
+        __be32 addrs_length;
         /* array of paddrs (must be aligned on a 64bit boundary) */
-        u64 paddrs[0];
+        __be64 paddrs[0];
 } __attribute__((packed)) ;
 
 struct c2wr_nsmr_pbl_rep {
@@ -847,7 +847,7 @@ union c2wr_mw_query {
 struct c2wr_stag_dealloc_req {
         struct c2wr_hdr hdr;
         u32 rnic_handle;
-        u32 stag_index;
+        __be32 stag_index;
 } __attribute__((packed)) ;
 
 struct c2wr_stag_dealloc_rep {
@@ -949,7 +949,7 @@ struct c2wr_ce {
         u64 qp_user_context;    /* c2_user_qp_t * */
         u32 qp_state;           /* Current QP State */
         u32 handle;             /* QPID or EP Handle */
-        u32 bytes_rcvd;         /* valid for RECV WCs */
+        __be32 bytes_rcvd;              /* valid for RECV WCs */
         u32 stag;
 } __attribute__((packed)) ;
 
@@ -984,8 +984,8 @@ struct c2_rq_hdr {
  */
 struct c2wr_send_req {
         struct c2_sq_hdr sq_hdr;
-        u32 sge_len;
-        u32 remote_stag;
+        __be32 sge_len;
+        __be32 remote_stag;
         u8 data[0];             /* SGE array */
 } __attribute__((packed));
 
@@ -996,9 +996,9 @@ union c2wr_send {
 
 struct c2wr_rdma_write_req {
         struct c2_sq_hdr sq_hdr;
-        u64 remote_to;
-        u32 remote_stag;
-        u32 sge_len;
+        __be64 remote_to;
+        __be32 remote_stag;
+        __be32 sge_len;
         u8 data[0];             /* SGE array */
 } __attribute__((packed));
 
@@ -1009,11 +1009,11 @@ union c2wr_rdma_write {
 
 struct c2wr_rdma_read_req {
         struct c2_sq_hdr sq_hdr;
-        u64 local_to;
-        u64 remote_to;
-        u32 local_stag;
-        u32 remote_stag;
-        u32 length;
+        __be64 local_to;
+        __be64 remote_to;
+        __be32 local_stag;
+        __be32 remote_stag;
+        __be32 length;
 } __attribute__((packed));
 
 union c2wr_rdma_read {
@@ -1113,9 +1113,9 @@ union c2wr_recv {
 struct c2wr_ae_hdr {
         struct c2wr_hdr hdr;
         u64 user_context;       /* user context for this res. */
-        u32 resource_type;      /* see enum c2_resource_indicator */
-        u32 resource;           /* handle for resource */
-        u32 qp_state;           /* current QP State */
+        __be32 resource_type;   /* see enum c2_resource_indicator */
+        __be32 resource;        /* handle for resource */
+        __be32 qp_state;        /* current QP State */
 } __attribute__((packed));
 
 /*
@@ -1124,11 +1124,11 @@ struct c2wr_ae_hdr {
  */
 struct c2wr_ae_active_connect_results {
         struct c2wr_ae_hdr ae_hdr;
-        u32 laddr;
-        u32 raddr;
-        u16 lport;
-        u16 rport;
-        u32 private_data_length;
+        __be32 laddr;
+        __be32 raddr;
+        __be16 lport;
+        __be16 rport;
+        __be32 private_data_length;
         u8 private_data[0];     /* data is in-line in the msg. */
 } __attribute__((packed));
 
@@ -1142,11 +1142,11 @@ struct c2wr_ae_active_connect_results {
 struct c2wr_ae_connection_request {
         struct c2wr_ae_hdr ae_hdr;
         u32 cr_handle;          /* connreq handle (sock ptr) */
-        u32 laddr;
-        u32 raddr;
-        u16 lport;
-        u16 rport;
-        u32 private_data_length;
+        __be32 laddr;
+        __be32 raddr;
+        __be16 lport;
+        __be16 rport;
+        __be32 private_data_length;
         u8 private_data[0];     /* data is in-line in the msg. */
 } __attribute__((packed));
 
@@ -1158,12 +1158,12 @@ union c2wr_ae {
 
 struct c2wr_init_req {
         struct c2wr_hdr hdr;
-        u64 hint_count;
-        u64 q0_host_shared;
-        u64 q1_host_shared;
-        u64 q1_host_msg_pool;
-        u64 q2_host_shared;
-        u64 q2_host_msg_pool;
+        __be64 hint_count;
+        __be64 q0_host_shared;
+        __be64 q1_host_shared;
+        __be64 q1_host_msg_pool;
+        __be64 q2_host_shared;
+        __be64 q2_host_msg_pool;
 } __attribute__((packed));
 
 struct c2wr_init_rep {
@@ -1276,10 +1276,10 @@ struct c2wr_ep_listen_create_req {
         struct c2wr_hdr hdr;
         u64 user_context;       /* returned in AEs. */
         u32 rnic_handle;
-        u32 local_addr;         /* local addr, or 0  */
-        u16 local_port;         /* 0 means "pick one" */
+        __be32 local_addr;              /* local addr, or 0  */
+        __be16 local_port;              /* 0 means "pick one" */
         u16 pad;
-        u32 backlog;            /* tradional tcp listen bl */
+        __be32 backlog;         /* tradional tcp listen bl */
 } __attribute__((packed));
 
 struct c2wr_ep_listen_create_rep {
@@ -1340,7 +1340,7 @@ struct c2wr_cr_accept_req {
         u32 rnic_handle;
         u32 qp_handle;          /* QP to bind to this LLP conn */
         u32 ep_handle;          /* LLP  handle to accept */
-        u32 private_data_length;
+        __be32 private_data_length;
         u8 private_data[0];     /* data in-line in msg. */
 } __attribute__((packed));
 
@@ -1508,7 +1508,7 @@ static __inline__ void c2_wr_set_sge_count(void *wr, u8 sge_count)
 {
         ((struct c2wr_hdr *) wr)->sge_count = sge_count;
 }
-static __inline__ u32 c2_wr_get_wqe_count(void *wr)
+static __inline__ __be32 c2_wr_get_wqe_count(void *wr)
 {
         return ((struct c2wr_hdr *) wr)->wqe_count;
 }