lkml.org 
[lkml]   [2010]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 18/26] cciss: factor out cciss_find_cfg_addrs.
    From
    Date
    From: Stephen M. Cameron <scameron@beardog.cce.hp.com>

    Rationale for this is that I will also need to use this code
    in fixing kdump host reset code prior to having the hba structure.

    Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
    ---
    drivers/block/cciss.c | 35 +++++++++++++++++++++++------------
    1 files changed, 23 insertions(+), 12 deletions(-)

    diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
    index 17e420c..3cd8397 100644
    --- a/drivers/block/cciss.c
    +++ b/drivers/block/cciss.c
    @@ -4064,29 +4064,40 @@ static int __devinit cciss_wait_for_board_ready(ctlr_info_t *h)
    return -ENODEV;
    }

    +static int __devinit cciss_find_cfg_addrs(struct pci_dev *pdev,
    + void __iomem *vaddr, u32 *cfg_base_addr, u64 *cfg_base_addr_index,
    + u64 *cfg_offset)
    +{
    + *cfg_base_addr = readl(vaddr + SA5_CTCFG_OFFSET);
    + *cfg_offset = readl(vaddr + SA5_CTMEM_OFFSET);
    + *cfg_base_addr &= (u32) 0x0000ffff;
    + *cfg_base_addr_index = find_PCI_BAR_index(pdev, *cfg_base_addr);
    + if (*cfg_base_addr_index == -1) {
    + dev_warn(&pdev->dev, "cannot find cfg_base_addr_index, "
    + "*cfg_base_addr = 0x%08x\n", *cfg_base_addr);
    + return -ENODEV;
    + }
    + return 0;
    +}
    +
    static int __devinit cciss_find_cfgtables(ctlr_info_t *h)
    {
    u64 cfg_offset;
    u32 cfg_base_addr;
    u64 cfg_base_addr_index;
    u32 trans_offset;
    + int rc;

    - /* get the address index number */
    - cfg_base_addr = readl(h->vaddr + SA5_CTCFG_OFFSET);
    - cfg_base_addr &= (u32) 0x0000ffff;
    - cfg_base_addr_index = find_PCI_BAR_index(h->pdev, cfg_base_addr);
    - if (cfg_base_addr_index == -1) {
    - dev_warn(&h->pdev->dev, "cannot find cfg_base_addr_index\n");
    - return -ENODEV;
    - }
    - cfg_offset = readl(h->vaddr + SA5_CTMEM_OFFSET);
    + rc = cciss_find_cfg_addrs(h->pdev, h->vaddr, &cfg_base_addr,
    + &cfg_base_addr_index, &cfg_offset);
    + if (rc)
    + return rc;
    h->cfgtable = remap_pci_mem(pci_resource_start(h->pdev,
    - cfg_base_addr_index) + cfg_offset,
    - sizeof(h->cfgtable));
    + cfg_base_addr_index) + cfg_offset, sizeof(h->cfgtable));
    if (!h->cfgtable)
    return -ENOMEM;
    /* Find performant mode table. */
    - trans_offset = readl(&(h->cfgtable->TransMethodOffset));
    + trans_offset = readl(&h->cfgtable->TransMethodOffset);
    h->transtable = remap_pci_mem(pci_resource_start(h->pdev,
    cfg_base_addr_index)+cfg_offset+trans_offset,
    sizeof(*h->transtable));


    \
     
     \ /
      Last update: 2010-07-19 20:47    [W:0.029 / U:97.912 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site