+++ /dev/null
-This patch backports the interface of the b43 and b43legacy driver from
-the new to the old ssb API. This patch is needed as long the old ssb
-version is used in the kernel for broadcom devices. After upgrading to
-ssb version out of kernel 2.6.27 or later this patch is not needed any more.
-
---- a/drivers/net/wireless/b43/dma.c
-+++ b/drivers/net/wireless/b43/dma.c
-@@ -328,11 +328,11 @@ static inline
- dma_addr_t dmaaddr;
-
- if (tx) {
-- dmaaddr = ssb_dma_map_single(ring->dev->dev,
-- buf, len, DMA_TO_DEVICE);
-+ dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
-+ buf, len, DMA_TO_DEVICE);
- } else {
-- dmaaddr = ssb_dma_map_single(ring->dev->dev,
-- buf, len, DMA_FROM_DEVICE);
-+ dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
-+ buf, len, DMA_FROM_DEVICE);
- }
-
- return dmaaddr;
-@@ -343,11 +343,11 @@ static inline
- dma_addr_t addr, size_t len, int tx)
- {
- if (tx) {
-- ssb_dma_unmap_single(ring->dev->dev,
-- addr, len, DMA_TO_DEVICE);
-+ dma_unmap_single(ring->dev->dev->dma_dev,
-+ addr, len, DMA_TO_DEVICE);
- } else {
-- ssb_dma_unmap_single(ring->dev->dev,
-- addr, len, DMA_FROM_DEVICE);
-+ dma_unmap_single(ring->dev->dev->dma_dev,
-+ addr, len, DMA_FROM_DEVICE);
- }
- }
-
-@@ -356,8 +356,8 @@ static inline
- dma_addr_t addr, size_t len)
- {
- B43_WARN_ON(ring->tx);
-- ssb_dma_sync_single_for_cpu(ring->dev->dev,
-- addr, len, DMA_FROM_DEVICE);
-+ dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
-+ addr, len, DMA_FROM_DEVICE);
- }
-
- static inline
-@@ -365,8 +365,8 @@ static inline
- dma_addr_t addr, size_t len)
- {
- B43_WARN_ON(ring->tx);
-- ssb_dma_sync_single_for_device(ring->dev->dev,
-- addr, len, DMA_FROM_DEVICE);
-+ dma_sync_single_for_device(ring->dev->dev->dma_dev,
-+ addr, len, DMA_FROM_DEVICE);
- }
-
- static inline
-@@ -381,6 +381,7 @@ static inline
-
- static int alloc_ringmemory(struct b43_dmaring *ring)
- {
-+ struct device *dma_dev = ring->dev->dev->dma_dev;
- gfp_t flags = GFP_KERNEL;
-
- /* The specs call for 4K buffers for 30- and 32-bit DMA with 4K
-@@ -391,14 +392,11 @@ static int alloc_ringmemory(struct b43_d
- * For unknown reasons - possibly a hardware error - the BCM4311 rev
- * 02, which uses 64-bit DMA, needs the ring buffer in very low memory,
- * which accounts for the GFP_DMA flag below.
-- *
-- * The flags here must match the flags in free_ringmemory below!
- */
- if (ring->type == B43_DMA_64BIT)
- flags |= GFP_DMA;
-- ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
-- B43_DMA_RINGMEMSIZE,
-- &(ring->dmabase), flags);
-+ ring->descbase = dma_alloc_coherent(dma_dev, B43_DMA_RINGMEMSIZE,
-+ &(ring->dmabase), flags);
- if (!ring->descbase) {
- b43err(ring->dev->wl, "DMA ringmemory allocation failed\n");
- return -ENOMEM;
-@@ -410,13 +408,10 @@ static int alloc_ringmemory(struct b43_d
-
- static void free_ringmemory(struct b43_dmaring *ring)
- {
-- gfp_t flags = GFP_KERNEL;
--
-- if (ring->type == B43_DMA_64BIT)
-- flags |= GFP_DMA;
-+ struct device *dma_dev = ring->dev->dev->dma_dev;
-
-- ssb_dma_free_consistent(ring->dev->dev, B43_DMA_RINGMEMSIZE,
-- ring->descbase, ring->dmabase, flags);
-+ dma_free_coherent(dma_dev, B43_DMA_RINGMEMSIZE,
-+ ring->descbase, ring->dmabase);
- }
-
- /* Reset the RX DMA channel */
-@@ -523,7 +518,7 @@ static bool b43_dma_mapping_error(struct
- dma_addr_t addr,
- size_t buffersize, bool dma_to_device)
- {
-- if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
-+ if (unlikely(dma_mapping_error(addr)))
- return 1;
-
- switch (ring->type) {
-@@ -849,10 +844,10 @@ struct b43_dmaring *b43_setup_dmaring(st
- goto err_kfree_meta;
-
- /* test for ability to dma to txhdr_cache */
-- dma_test = ssb_dma_map_single(dev->dev,
-- ring->txhdr_cache,
-- b43_txhdr_size(dev),
-- DMA_TO_DEVICE);
-+ dma_test = dma_map_single(dev->dev->dma_dev,
-+ ring->txhdr_cache,
-+ b43_txhdr_size(dev),
-+ DMA_TO_DEVICE);
-
- if (b43_dma_mapping_error(ring, dma_test,
- b43_txhdr_size(dev), 1)) {
-@@ -864,10 +859,10 @@ struct b43_dmaring *b43_setup_dmaring(st
- if (!ring->txhdr_cache)
- goto err_kfree_meta;
-
-- dma_test = ssb_dma_map_single(dev->dev,
-- ring->txhdr_cache,
-- b43_txhdr_size(dev),
-- DMA_TO_DEVICE);
-+ dma_test = dma_map_single(dev->dev->dma_dev,
-+ ring->txhdr_cache,
-+ b43_txhdr_size(dev),
-+ DMA_TO_DEVICE);
-
- if (b43_dma_mapping_error(ring, dma_test,
- b43_txhdr_size(dev), 1)) {
-@@ -878,9 +873,9 @@ struct b43_dmaring *b43_setup_dmaring(st
- }
- }
-
-- ssb_dma_unmap_single(dev->dev,
-- dma_test, b43_txhdr_size(dev),
-- DMA_TO_DEVICE);
-+ dma_unmap_single(dev->dev->dma_dev,
-+ dma_test, b43_txhdr_size(dev),
-+ DMA_TO_DEVICE);
- }
-
- err = alloc_ringmemory(ring);
---- a/drivers/net/wireless/b43legacy/dma.c
-+++ b/drivers/net/wireless/b43legacy/dma.c
-@@ -393,13 +393,13 @@ dma_addr_t map_descbuffer(struct b43lega
- dma_addr_t dmaaddr;
-
- if (tx)
-- dmaaddr = ssb_dma_map_single(ring->dev->dev,
-- buf, len,
-- DMA_TO_DEVICE);
-+ dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
-+ buf, len,
-+ DMA_TO_DEVICE);
- else
-- dmaaddr = ssb_dma_map_single(ring->dev->dev,
-- buf, len,
-- DMA_FROM_DEVICE);
-+ dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
-+ buf, len,
-+ DMA_FROM_DEVICE);
-
- return dmaaddr;
- }
-@@ -411,13 +411,13 @@ void unmap_descbuffer(struct b43legacy_d
- int tx)
- {
- if (tx)
-- ssb_dma_unmap_single(ring->dev->dev,
-- addr, len,
-- DMA_TO_DEVICE);
-+ dma_unmap_single(ring->dev->dev->dma_dev,
-+ addr, len,
-+ DMA_TO_DEVICE);
- else
-- ssb_dma_unmap_single(ring->dev->dev,
-- addr, len,
-- DMA_FROM_DEVICE);
-+ dma_unmap_single(ring->dev->dev->dma_dev,
-+ addr, len,
-+ DMA_FROM_DEVICE);
- }
-
- static inline
-@@ -427,8 +427,8 @@ void sync_descbuffer_for_cpu(struct b43l
- {
- B43legacy_WARN_ON(ring->tx);
-
-- ssb_dma_sync_single_for_cpu(ring->dev->dev,
-- addr, len, DMA_FROM_DEVICE);
-+ dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
-+ addr, len, DMA_FROM_DEVICE);
- }
-
- static inline
-@@ -438,8 +438,8 @@ void sync_descbuffer_for_device(struct b
- {
- B43legacy_WARN_ON(ring->tx);
-
-- ssb_dma_sync_single_for_device(ring->dev->dev,
-- addr, len, DMA_FROM_DEVICE);
-+ dma_sync_single_for_device(ring->dev->dev->dma_dev,
-+ addr, len, DMA_FROM_DEVICE);
- }
-
- static inline
-@@ -458,11 +458,10 @@ void free_descriptor_buffer(struct b43le
-
- static int alloc_ringmemory(struct b43legacy_dmaring *ring)
- {
-- /* GFP flags must match the flags in free_ringmemory()! */
-- ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
-- B43legacy_DMA_RINGMEMSIZE,
-- &(ring->dmabase),
-- GFP_KERNEL);
-+ struct device *dma_dev = ring->dev->dev->dma_dev;
-+
-+ ring->descbase = dma_alloc_coherent(dma_dev, B43legacy_DMA_RINGMEMSIZE,
-+ &(ring->dmabase), GFP_KERNEL);
- if (!ring->descbase) {
- b43legacyerr(ring->dev->wl, "DMA ringmemory allocation"
- " failed\n");
-@@ -475,8 +474,10 @@ static int alloc_ringmemory(struct b43le
-
- static void free_ringmemory(struct b43legacy_dmaring *ring)
- {
-- ssb_dma_free_consistent(ring->dev->dev, B43legacy_DMA_RINGMEMSIZE,
-- ring->descbase, ring->dmabase, GFP_KERNEL);
-+ struct device *dma_dev = ring->dev->dev->dma_dev;
-+
-+ dma_free_coherent(dma_dev, B43legacy_DMA_RINGMEMSIZE,
-+ ring->descbase, ring->dmabase);
- }
-
- /* Reset the RX DMA channel */
-@@ -588,7 +589,7 @@ static bool b43legacy_dma_mapping_error(
- size_t buffersize,
- bool dma_to_device)
- {
-- if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
-+ if (unlikely(dma_mapping_error(addr)))
- return 1;
-
- switch (ring->type) {
-@@ -905,9 +906,9 @@ struct b43legacy_dmaring *b43legacy_setu
- goto err_kfree_meta;
-
- /* test for ability to dma to txhdr_cache */
-- dma_test = ssb_dma_map_single(dev->dev, ring->txhdr_cache,
-- sizeof(struct b43legacy_txhdr_fw3),
-- DMA_TO_DEVICE);
-+ dma_test = dma_map_single(dev->dev->dma_dev, ring->txhdr_cache,
-+ sizeof(struct b43legacy_txhdr_fw3),
-+ DMA_TO_DEVICE);
-
- if (b43legacy_dma_mapping_error(ring, dma_test,
- sizeof(struct b43legacy_txhdr_fw3), 1)) {
-@@ -919,7 +920,7 @@ struct b43legacy_dmaring *b43legacy_setu
- if (!ring->txhdr_cache)
- goto err_kfree_meta;
-
-- dma_test = ssb_dma_map_single(dev->dev,
-+ dma_test = dma_map_single(dev->dev->dma_dev,
- ring->txhdr_cache,
- sizeof(struct b43legacy_txhdr_fw3),
- DMA_TO_DEVICE);
-@@ -929,9 +930,9 @@ struct b43legacy_dmaring *b43legacy_setu
- goto err_kfree_txhdr_cache;
- }
-
-- ssb_dma_unmap_single(dev->dev, dma_test,
-- sizeof(struct b43legacy_txhdr_fw3),
-- DMA_TO_DEVICE);
-+ dma_unmap_single(dev->dev->dma_dev,
-+ dma_test, sizeof(struct b43legacy_txhdr_fw3),
-+ DMA_TO_DEVICE);
- }
-
- ring->nr_slots = nr_slots;
projects / openwrt / svn-archive / archive.git / blobdiff