Commit 1b8ee916 authored by Vijay Kumar's avatar Vijay Kumar Committed by Greg Kroah-Hartman

Staging: poch: Fine grained locking

Lock only the portion of code that does register access.
Signed-off-by: default avatarVijay Kumar <vijaykumar@bravegnu.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bf437012
...@@ -485,27 +485,30 @@ static void channel_dma_init(struct channel_info *channel) ...@@ -485,27 +485,30 @@ static void channel_dma_init(struct channel_info *channel)
/* The DMA address page register is shared between the RX and /* The DMA address page register is shared between the RX and
* TX channels, so acquire lock. * TX channels, so acquire lock.
*/ */
spin_lock(channel->iomem_lock);
for (i = 0; i < channel->group_count; i++) { for (i = 0; i < channel->group_count; i++) {
page = i / 32; page = i / 32;
group_in_page = i % 32; group_in_page = i % 32;
group_reg = group_regs_base + (group_in_page * 4); group_reg = group_regs_base + (group_in_page * 4);
spin_lock(channel->iomem_lock);
iowrite32(page, fpga + FPGA_DMA_ADR_PAGE_REG); iowrite32(page, fpga + FPGA_DMA_ADR_PAGE_REG);
iowrite32(channel->groups[i].dma_addr, fpga + group_reg); iowrite32(channel->groups[i].dma_addr, fpga + group_reg);
spin_unlock(channel->iomem_lock);
} }
for (i = 0; i < channel->group_count; i++) { for (i = 0; i < channel->group_count; i++) {
page = i / 32; page = i / 32;
group_in_page = i % 32; group_in_page = i % 32;
group_reg = group_regs_base + (group_in_page * 4); group_reg = group_regs_base + (group_in_page * 4);
spin_lock(channel->iomem_lock);
iowrite32(page, fpga + FPGA_DMA_ADR_PAGE_REG); iowrite32(page, fpga + FPGA_DMA_ADR_PAGE_REG);
printk(KERN_INFO PFX "%ld: read dma_addr: 0x%x\n", i, printk(KERN_INFO PFX "%ld: read dma_addr: 0x%x\n", i,
ioread32(fpga + group_reg)); ioread32(fpga + group_reg));
}
spin_unlock(channel->iomem_lock); spin_unlock(channel->iomem_lock);
}
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment