|
@@ -9,6 +9,7 @@
|
|
|
#include <linux/types.h>
|
|
|
#include <linux/interrupt.h>
|
|
|
#include <linux/pci.h>
|
|
|
+#include <linux/bitmap.h>
|
|
|
#include <asm/sn/sn_sal.h>
|
|
|
#include <asm/sn/addrs.h>
|
|
|
#include <asm/sn/io.h>
|
|
@@ -369,7 +370,7 @@ tioca_dma_d48(struct pci_dev *pdev, u64 paddr)
|
|
|
static dma_addr_t
|
|
|
tioca_dma_mapped(struct pci_dev *pdev, unsigned long paddr, size_t req_size)
|
|
|
{
|
|
|
- int i, ps, ps_shift, entry, entries, mapsize, last_entry;
|
|
|
+ int ps, ps_shift, entry, entries, mapsize;
|
|
|
u64 xio_addr, end_xio_addr;
|
|
|
struct tioca_common *tioca_common;
|
|
|
struct tioca_kernel *tioca_kern;
|
|
@@ -410,23 +411,13 @@ tioca_dma_mapped(struct pci_dev *pdev, unsigned long paddr, size_t req_size)
|
|
|
map = tioca_kern->ca_pcigart_pagemap;
|
|
|
mapsize = tioca_kern->ca_pcigart_entries;
|
|
|
|
|
|
- entry = find_first_zero_bit(map, mapsize);
|
|
|
- while (entry < mapsize) {
|
|
|
- last_entry = find_next_bit(map, mapsize, entry);
|
|
|
-
|
|
|
- if (last_entry - entry >= entries)
|
|
|
- break;
|
|
|
-
|
|
|
- entry = find_next_zero_bit(map, mapsize, last_entry);
|
|
|
- }
|
|
|
-
|
|
|
- if (entry > mapsize) {
|
|
|
+ entry = bitmap_find_next_zero_area(map, mapsize, 0, entries, 0);
|
|
|
+ if (entry >= mapsize) {
|
|
|
kfree(ca_dmamap);
|
|
|
goto map_return;
|
|
|
}
|
|
|
|
|
|
- for (i = 0; i < entries; i++)
|
|
|
- set_bit(entry + i, map);
|
|
|
+ bitmap_set(map, entry, entries);
|
|
|
|
|
|
bus_addr = tioca_kern->ca_pciap_base + (entry * ps);
|
|
|
|