X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Flpfc%2Flpfc_mem.c;h=ec3bbbde6f7a397442eec29fbb477ca35a97f556;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=16e35d040d3ea5c543b318c35a61ec7b87f33bc3;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c index 16e35d040..ec3bbbde6 100644 --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c @@ -1,50 +1,42 @@ /******************************************************************* * This file is part of the Emulex Linux Device Driver for * - * Enterprise Fibre Channel Host Bus Adapters. * - * Refer to the README file included with this package for * - * driver version and adapter support. * - * Copyright (C) 2004 Emulex Corporation. * + * Fibre Channel Host Bus Adapters. * + * Copyright (C) 2004-2005 Emulex. All rights reserved. * + * EMULEX and SLI are trademarks of Emulex. * * www.emulex.com * + * Portions Copyright (C) 2004-2005 Christoph Hellwig * * * * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License * - * as published by the Free Software Foundation; either version 2 * - * of the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details, a copy of which * - * can be found in the file COPYING included with this package. * + * modify it under the terms of version 2 of the GNU General * + * Public License as published by the Free Software Foundation. * + * This program is distributed in the hope that it will be useful. * + * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * + * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * + * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * + * TO BE LEGALLY INVALID. See the GNU General Public License for * + * more details, a copy of which can be found in the file COPYING * + * included with this package. * *******************************************************************/ -/* - * $Id: lpfc_mem.c 1.69 2004/09/28 07:54:24EDT sf_support Exp $ - */ - #include #include -#include +#include + #include +#include +#include + +#include "lpfc_hw.h" #include "lpfc_sli.h" #include "lpfc_disc.h" #include "lpfc_scsi.h" #include "lpfc.h" #include "lpfc_crtn.h" -#include "lpfc_mem.h" - -static void * -lpfc_pool_kmalloc(int gfp_flags, void *data) -{ - return kmalloc((unsigned long)data, gfp_flags); -} -static void -lpfc_pool_kfree(void *obj, void *data) -{ - kfree(obj); -} +#define LPFC_MBUF_POOL_SIZE 64 /* max elements in MBUF safety pool */ +#define LPFC_MEM_POOL_SIZE 64 /* max elem in non-DMA safety pool */ int lpfc_mem_alloc(struct lpfc_hba * phba) @@ -52,18 +44,21 @@ lpfc_mem_alloc(struct lpfc_hba * phba) struct lpfc_dma_pool *pool = &phba->lpfc_mbuf_safety_pool; int i; - phba->lpfc_scsi_dma_ext_pool = pci_pool_create("lpfc_scsi_dma_ext_pool", - phba->pcidev, LPFC_SCSI_DMA_EXT_SIZE, 8, 0); - if (!phba->lpfc_scsi_dma_ext_pool) + phba->lpfc_scsi_dma_buf_pool = pci_pool_create("lpfc_scsi_dma_buf_pool", + phba->pcidev, phba->cfg_sg_dma_buf_size, 8, 0); + if (!phba->lpfc_scsi_dma_buf_pool) goto fail; phba->lpfc_mbuf_pool = pci_pool_create("lpfc_mbuf_pool", phba->pcidev, LPFC_BPL_SIZE, 8,0); if (!phba->lpfc_mbuf_pool) - goto fail_free_dma_ext_pool; + goto fail_free_dma_buf_pool; pool->elements = kmalloc(sizeof(struct lpfc_dmabuf) * LPFC_MBUF_POOL_SIZE, GFP_KERNEL); + if (!pool->elements) + goto fail_free_lpfc_mbuf_pool; + pool->max_count = 0; pool->current_count = 0; for ( i = 0; i < LPFC_MBUF_POOL_SIZE; i++) { @@ -75,54 +70,29 @@ lpfc_mem_alloc(struct lpfc_hba * phba) pool->current_count++; } - phba->iocb_mem_pool = mempool_create(LPFC_MEM_POOL_SIZE, - lpfc_pool_kmalloc, lpfc_pool_kfree, - (void *)(unsigned long)sizeof(struct lpfc_iocbq)); - if (!phba->iocb_mem_pool) - goto fail_free_mbuf_pool; - - phba->scsibuf_mem_pool = mempool_create(LPFC_MEM_POOL_SIZE, - lpfc_pool_kmalloc, lpfc_pool_kfree, - (void *)(unsigned long)sizeof(struct lpfc_scsi_buf)); - if (!phba->scsibuf_mem_pool) - goto fail_free_iocb_pool; - - phba->mbox_mem_pool = mempool_create(LPFC_MEM_POOL_SIZE, - lpfc_pool_kmalloc, lpfc_pool_kfree, - (void *)(unsigned long)sizeof(LPFC_MBOXQ_t)); + phba->mbox_mem_pool = mempool_create_kmalloc_pool(LPFC_MEM_POOL_SIZE, + sizeof(LPFC_MBOXQ_t)); if (!phba->mbox_mem_pool) - goto fail_free_scsibuf_pool; + goto fail_free_mbuf_pool; - phba->nlp_mem_pool = mempool_create(LPFC_MEM_POOL_SIZE, - lpfc_pool_kmalloc, lpfc_pool_kfree, - (void *)(unsigned long)sizeof(struct lpfc_nodelist)); + phba->nlp_mem_pool = mempool_create_kmalloc_pool(LPFC_MEM_POOL_SIZE, + sizeof(struct lpfc_nodelist)); if (!phba->nlp_mem_pool) goto fail_free_mbox_pool; - phba->bind_mem_pool = mempool_create(LPFC_MEM_POOL_SIZE, - lpfc_pool_kmalloc, lpfc_pool_kfree, - (void *)(unsigned long)sizeof(struct lpfc_bindlist)); - if (!phba->bind_mem_pool) - goto fail_free_nlp_pool; - return 0; - fail_free_nlp_pool: - mempool_destroy(phba->nlp_mem_pool); fail_free_mbox_pool: mempool_destroy(phba->mbox_mem_pool); - fail_free_scsibuf_pool: - mempool_destroy(phba->scsibuf_mem_pool); - fail_free_iocb_pool: - mempool_destroy(phba->iocb_mem_pool); fail_free_mbuf_pool: - while (--i) + while (i--) pci_pool_free(phba->lpfc_mbuf_pool, pool->elements[i].virt, pool->elements[i].phys); kfree(pool->elements); + fail_free_lpfc_mbuf_pool: pci_pool_destroy(phba->lpfc_mbuf_pool); - fail_free_dma_ext_pool: - pci_pool_destroy(phba->lpfc_scsi_dma_ext_pool); + fail_free_dma_buf_pool: + pci_pool_destroy(phba->lpfc_scsi_dma_buf_pool); fail: return -ENOMEM; } @@ -133,16 +103,28 @@ lpfc_mem_free(struct lpfc_hba * phba) struct lpfc_sli *psli = &phba->sli; struct lpfc_dma_pool *pool = &phba->lpfc_mbuf_safety_pool; LPFC_MBOXQ_t *mbox, *next_mbox; + struct lpfc_dmabuf *mp; int i; list_for_each_entry_safe(mbox, next_mbox, &psli->mboxq, list) { + mp = (struct lpfc_dmabuf *) (mbox->context1); + if (mp) { + lpfc_mbuf_free(phba, mp->virt, mp->phys); + kfree(mp); + } list_del(&mbox->list); mempool_free(mbox, phba->mbox_mem_pool); } - psli->sliinit.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE; + psli->sli_flag &= ~LPFC_SLI_MBOX_ACTIVE; if (psli->mbox_active) { - mempool_free(psli->mbox_active, phba->mbox_mem_pool); + mbox = psli->mbox_active; + mp = (struct lpfc_dmabuf *) (mbox->context1); + if (mp) { + lpfc_mbuf_free(phba, mp->virt, mp->phys); + kfree(mp); + } + mempool_free(mbox, phba->mbox_mem_pool); psli->mbox_active = NULL; } @@ -150,14 +132,16 @@ lpfc_mem_free(struct lpfc_hba * phba) pci_pool_free(phba->lpfc_mbuf_pool, pool->elements[i].virt, pool->elements[i].phys); kfree(pool->elements); - mempool_destroy(phba->bind_mem_pool); mempool_destroy(phba->nlp_mem_pool); mempool_destroy(phba->mbox_mem_pool); - mempool_destroy(phba->scsibuf_mem_pool); - mempool_destroy(phba->iocb_mem_pool); - pci_pool_destroy(phba->lpfc_scsi_dma_ext_pool); + pci_pool_destroy(phba->lpfc_scsi_dma_buf_pool); pci_pool_destroy(phba->lpfc_mbuf_pool); + + /* Free the iocb lookup array */ + kfree(psli->iocbq_lookup); + psli->iocbq_lookup = NULL; + } void * @@ -166,7 +150,7 @@ lpfc_mbuf_alloc(struct lpfc_hba *phba, int mem_flags, dma_addr_t *handle) struct lpfc_dma_pool *pool = &phba->lpfc_mbuf_safety_pool; void *ret; - ret = pci_pool_alloc(phba->lpfc_mbuf_pool, GFP_ATOMIC, handle); + ret = pci_pool_alloc(phba->lpfc_mbuf_pool, GFP_KERNEL, handle); if (!ret && ( mem_flags & MEM_PRI) && pool->current_count) { pool->current_count--;