rapidio: change inbound window size type to u64

[linux-2.6-microblaze.git] / drivers / rapidio / devices / tsi721.c

diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index 8e07cd5..53daf63 100644 (file)
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -1090,7 +1090,7 @@ static void tsi721_init_pc2sr_mapping(struct tsi721_device *priv)
  * from rstart to lstart.
  */
 static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
-               u64 rstart, u32 size, u32 flags)
+               u64 rstart, u64 size, u32 flags)
 {
        struct tsi721_device *priv = mport->priv;
        int i, avail = -1;
@@ -1103,6 +1103,10 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
        struct tsi721_ib_win_mapping *map = NULL;
        int ret = -EBUSY;
 
+       /* Max IBW size supported by HW is 16GB */
+       if (size > 0x400000000UL)
+               return -EINVAL;
+
        if (direct) {
                /* Calculate minimal acceptable window size and base address */
 
@@ -1110,15 +1114,15 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
                ibw_start = lstart & ~(ibw_size - 1);
 
                tsi_debug(IBW, &priv->pdev->dev,
-                       "Direct (RIO_0x%llx -> PCIe_%pad), size=0x%x, ibw_start = 0x%llx",
+                       "Direct (RIO_0x%llx -> PCIe_%pad), size=0x%llx, ibw_start = 0x%llx",
                        rstart, &lstart, size, ibw_start);
 
                while ((lstart + size) > (ibw_start + ibw_size)) {
                        ibw_size *= 2;
                        ibw_start = lstart & ~(ibw_size - 1);
-                       if (ibw_size > 0x80000000) { /* Limit max size to 2GB */
+                       /* Check for crossing IBW max size 16GB */
+                       if (ibw_size > 0x400000000UL)
                                return -EBUSY;
-                       }
                }
 
                loc_start = ibw_start;
@@ -1129,7 +1133,7 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
 
        } else {
                tsi_debug(IBW, &priv->pdev->dev,
-                       "Translated (RIO_0x%llx -> PCIe_%pad), size=0x%x",
+                       "Translated (RIO_0x%llx -> PCIe_%pad), size=0x%llx",
                        rstart, &lstart, size);
 
                if (!is_power_of_2(size) || size < 0x1000 ||