From 2731fb4f2596280b1167c4b96fdcd394265899b0 Mon Sep 17 00:00:00 2001 From: Stan Smith Date: Tue, 14 Sep 2010 16:13:11 +0000 Subject: [PATCH] [MLX4] incorporate trunk commit #'s 2921, 2922 git-svn-id: svn://openib.tc.cornell.edu/gen1@2925 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- branches/WOF2-3/hw/mlx4/kernel/bus/ib/main.c | 2 +- branches/WOF2-3/hw/mlx4/kernel/bus/net/catas.c | 2 +- branches/WOF2-3/hw/mlx4/kernel/bus/net/cmd.c | 2 +- branches/WOF2-3/hw/mlx4/kernel/bus/net/eq.c | 4 ++-- branches/WOF2-3/hw/mlx4/kernel/bus/net/main.c | 2 +- branches/WOF2-3/hw/mlx4/kernel/hca/hverbs.c | 2 +- branches/WOF2-3/hw/mlx4/kernel/inc/l2w_memory.h | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/branches/WOF2-3/hw/mlx4/kernel/bus/ib/main.c b/branches/WOF2-3/hw/mlx4/kernel/bus/ib/main.c index 98d38e46..53dd8ee5 100644 --- a/branches/WOF2-3/hw/mlx4/kernel/bus/ib/main.c +++ b/branches/WOF2-3/hw/mlx4/kernel/bus/ib/main.c @@ -631,7 +631,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) if (mlx4_uar_alloc(dev, &ibdev->priv_uar)) goto err_pd; - ibdev->uar_map = ioremap((u64)ibdev->priv_uar.pfn << PAGE_SHIFT, PAGE_SIZE); + ibdev->uar_map = ioremap((u64)ibdev->priv_uar.pfn << PAGE_SHIFT, PAGE_SIZE, MmNonCached); if (!ibdev->uar_map) goto err_uar; diff --git a/branches/WOF2-3/hw/mlx4/kernel/bus/net/catas.c b/branches/WOF2-3/hw/mlx4/kernel/bus/net/catas.c index 29b184c2..b1ae6e10 100644 --- a/branches/WOF2-3/hw/mlx4/kernel/bus/net/catas.c +++ b/branches/WOF2-3/hw/mlx4/kernel/bus/net/catas.c @@ -189,7 +189,7 @@ int mlx4_start_catas_poll(struct mlx4_dev *dev) addr = pci_resource_start(dev->pdev, priv->fw.catas_bar) + priv->fw.catas_offset; - priv->catas_err.map = ioremap(addr, priv->fw.catas_size * 4); + priv->catas_err.map = ioremap(addr, priv->fw.catas_size * 4, MmNonCached); if (!priv->catas_err.map) { mlx4_warn(dev, "Failed to map internal error buffer at 0x%lx\n", addr); diff --git a/branches/WOF2-3/hw/mlx4/kernel/bus/net/cmd.c b/branches/WOF2-3/hw/mlx4/kernel/bus/net/cmd.c index fe9b9807..31752a69 100644 --- a/branches/WOF2-3/hw/mlx4/kernel/bus/net/cmd.c +++ b/branches/WOF2-3/hw/mlx4/kernel/bus/net/cmd.c @@ -493,7 +493,7 @@ int mlx4_cmd_init(struct mlx4_dev *dev) priv->cmd.toggle = 1; priv->cmd.hcr = ioremap(pci_resource_start(dev->pdev, 0) + MLX4_HCR_BASE, - MLX4_HCR_SIZE); + MLX4_HCR_SIZE, MmNonCached); if (!priv->cmd.hcr) { mlx4_err(dev, "Couldn't map command register."); return -ENOMEM; diff --git a/branches/WOF2-3/hw/mlx4/kernel/bus/net/eq.c b/branches/WOF2-3/hw/mlx4/kernel/bus/net/eq.c index 89471121..dc8dd41c 100644 --- a/branches/WOF2-3/hw/mlx4/kernel/bus/net/eq.c +++ b/branches/WOF2-3/hw/mlx4/kernel/bus/net/eq.c @@ -432,7 +432,7 @@ static void __iomem *mlx4_get_eq_uar(struct mlx4_dev *dev, struct mlx4_eq *eq) priv->eq_table.uar_map[index] = ioremap(pci_resource_start(dev->pdev, 2) + ((eq->eqn / 4) << PAGE_SHIFT), - PAGE_SIZE); + PAGE_SIZE, MmNonCached); if (!priv->eq_table.uar_map[index]) { mlx4_err(dev, "Couldn't map EQ doorbell for EQN 0x%06x\n", eq->eqn); @@ -672,7 +672,7 @@ static int mlx4_map_clr_int(struct mlx4_dev *dev) struct mlx4_priv *priv = mlx4_priv(dev); priv->clr_base = ioremap(pci_resource_start(dev->pdev, priv->fw.clr_int_bar) + - priv->fw.clr_int_base, MLX4_CLR_INT_SIZE); + priv->fw.clr_int_base, MLX4_CLR_INT_SIZE, MmNonCached); if (!priv->clr_base) { mlx4_err(dev, "Couldn't map interrupt clear register, aborting.\n"); return -ENOMEM; diff --git a/branches/WOF2-3/hw/mlx4/kernel/bus/net/main.c b/branches/WOF2-3/hw/mlx4/kernel/bus/net/main.c index 54fd42c6..77a72d2f 100644 --- a/branches/WOF2-3/hw/mlx4/kernel/bus/net/main.c +++ b/branches/WOF2-3/hw/mlx4/kernel/bus/net/main.c @@ -780,7 +780,7 @@ static int mlx4_setup_hca(struct mlx4_dev *dev) goto err_uar_table_free; } - priv->kar = ioremap((u64)priv->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE); + priv->kar = ioremap((u64)priv->driver_uar.pfn << PAGE_SHIFT, PAGE_SIZE, MmNonCached); if (!priv->kar) { mlx4_err(dev, "Couldn't map kernel access region, " "aborting.\n"); diff --git a/branches/WOF2-3/hw/mlx4/kernel/hca/hverbs.c b/branches/WOF2-3/hw/mlx4/kernel/hca/hverbs.c index 4fcf5b14..34c6ff98 100644 --- a/branches/WOF2-3/hw/mlx4/kernel/hca/hverbs.c +++ b/branches/WOF2-3/hw/mlx4/kernel/hca/hverbs.c @@ -479,7 +479,7 @@ static NTSTATUS __map_memory_for_user( p_map->mapped = 0; // map UAR to kernel - p_map->kva = ioremap(addr, size); + p_map->kva = ioremap(addr, size, mem_type); if (!p_map->kva) { HCA_PRINT( TRACE_LEVEL_ERROR, HCA_DBG_LOW , ("Couldn't map kernel access region, aborting.\n") ); diff --git a/branches/WOF2-3/hw/mlx4/kernel/inc/l2w_memory.h b/branches/WOF2-3/hw/mlx4/kernel/inc/l2w_memory.h index b10242cb..ca6ca86e 100644 --- a/branches/WOF2-3/hw/mlx4/kernel/inc/l2w_memory.h +++ b/branches/WOF2-3/hw/mlx4/kernel/inc/l2w_memory.h @@ -145,14 +145,14 @@ static inline void kfree (const void *pobj) * address is not guaranteed to be usable directly as a virtual * address. */ -static inline void *ioremap(io_addr_t addr, SIZE_T size) +static inline void *ioremap(io_addr_t addr, SIZE_T size, MEMORY_CACHING_TYPE cache_type) { PHYSICAL_ADDRESS pa; void *va; ASSERT( KeGetCurrentIrql() <= DISPATCH_LEVEL ); pa.QuadPart = addr; - va = MmMapIoSpace( pa, size, MmNonCached ); + va = MmMapIoSpace( pa, size, cache_type ); return va; } -- 2.46.0