4e57b68178
I recently picked up my older work to remove unnecessary #includes of sched.h, starting from a patch by Dave Jones to not include sched.h from module.h. This reduces the number of indirect includes of sched.h by ~300. Another ~400 pointless direct includes can be removed after this disentangling (patch to follow later). However, quite a few indirect includes need to be fixed up for this. In order to feed the patches through -mm with as little disturbance as possible, I've split out the fixes I accumulated up to now (complete for i386 and x86_64, more archs to follow later) and post them before the real patch. This way this large part of the patch is kept simple with only adding #includes, and all hunks are independent of each other. So if any hunk rejects or gets in the way of other patches, just drop it. My scripts will pick it up again in the next round. Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
81 lines
2.4 KiB
C
81 lines
2.4 KiB
C
/*
|
|
* Copyright (c) 2005 Topspin Communications. All rights reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*
|
|
* $Id$
|
|
*/
|
|
|
|
#include <asm/page.h> /* PAGE_SHIFT */
|
|
|
|
#include "mthca_dev.h"
|
|
#include "mthca_memfree.h"
|
|
|
|
int mthca_uar_alloc(struct mthca_dev *dev, struct mthca_uar *uar)
|
|
{
|
|
uar->index = mthca_alloc(&dev->uar_table.alloc);
|
|
if (uar->index == -1)
|
|
return -ENOMEM;
|
|
|
|
uar->pfn = (pci_resource_start(dev->pdev, 2) >> PAGE_SHIFT) + uar->index;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void mthca_uar_free(struct mthca_dev *dev, struct mthca_uar *uar)
|
|
{
|
|
mthca_free(&dev->uar_table.alloc, uar->index);
|
|
}
|
|
|
|
int mthca_init_uar_table(struct mthca_dev *dev)
|
|
{
|
|
int ret;
|
|
|
|
ret = mthca_alloc_init(&dev->uar_table.alloc,
|
|
dev->limits.num_uars,
|
|
dev->limits.num_uars - 1,
|
|
dev->limits.reserved_uars);
|
|
if (ret)
|
|
return ret;
|
|
|
|
ret = mthca_init_db_tab(dev);
|
|
if (ret)
|
|
mthca_alloc_cleanup(&dev->uar_table.alloc);
|
|
|
|
return ret;
|
|
}
|
|
|
|
void mthca_cleanup_uar_table(struct mthca_dev *dev)
|
|
{
|
|
mthca_cleanup_db_tab(dev);
|
|
|
|
/* XXX check if any UARs are still allocated? */
|
|
mthca_alloc_cleanup(&dev->uar_table.alloc);
|
|
}
|