mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-12 23:24:37 +03:00
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23033 3c298f89-4303-0410-b956-a3cf2f4a3e73
682 lines
21 KiB
Diff
682 lines
21 KiB
Diff
---
|
|
drivers/net/b44.c | 146 +++++++++++++++------------------
|
|
drivers/ssb/driver_chipcommon.c | 24 +++++
|
|
drivers/ssb/driver_chipcommon_pmu.c | 17 +--
|
|
drivers/ssb/main.c | 76 -----------------
|
|
include/linux/ssb/ssb.h | 159 ------------------------------------
|
|
5 files changed, 104 insertions(+), 318 deletions(-)
|
|
|
|
--- a/drivers/net/b44.c
|
|
+++ b/drivers/net/b44.c
|
|
@@ -135,7 +135,6 @@ static void b44_init_rings(struct b44 *)
|
|
|
|
static void b44_init_hw(struct b44 *, int);
|
|
|
|
-static int dma_desc_align_mask;
|
|
static int dma_desc_sync_size;
|
|
static int instance;
|
|
|
|
@@ -150,9 +149,8 @@ static inline void b44_sync_dma_desc_for
|
|
unsigned long offset,
|
|
enum dma_data_direction dir)
|
|
{
|
|
- ssb_dma_sync_single_range_for_device(sdev, dma_base,
|
|
- offset & dma_desc_align_mask,
|
|
- dma_desc_sync_size, dir);
|
|
+ dma_sync_single_for_device(sdev->dma_dev, dma_base + offset,
|
|
+ dma_desc_sync_size, dir);
|
|
}
|
|
|
|
static inline void b44_sync_dma_desc_for_cpu(struct ssb_device *sdev,
|
|
@@ -160,9 +158,8 @@ static inline void b44_sync_dma_desc_for
|
|
unsigned long offset,
|
|
enum dma_data_direction dir)
|
|
{
|
|
- ssb_dma_sync_single_range_for_cpu(sdev, dma_base,
|
|
- offset & dma_desc_align_mask,
|
|
- dma_desc_sync_size, dir);
|
|
+ dma_sync_single_for_cpu(sdev->dma_dev, dma_base + offset,
|
|
+ dma_desc_sync_size, dir);
|
|
}
|
|
|
|
static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
|
|
@@ -608,10 +605,10 @@ static void b44_tx(struct b44 *bp)
|
|
|
|
BUG_ON(skb == NULL);
|
|
|
|
- ssb_dma_unmap_single(bp->sdev,
|
|
- rp->mapping,
|
|
- skb->len,
|
|
- DMA_TO_DEVICE);
|
|
+ dma_unmap_single(bp->sdev->dma_dev,
|
|
+ rp->mapping,
|
|
+ skb->len,
|
|
+ DMA_TO_DEVICE);
|
|
rp->skb = NULL;
|
|
dev_kfree_skb_irq(skb);
|
|
}
|
|
@@ -648,29 +645,29 @@ static int b44_alloc_rx_skb(struct b44 *
|
|
if (skb == NULL)
|
|
return -ENOMEM;
|
|
|
|
- mapping = ssb_dma_map_single(bp->sdev, skb->data,
|
|
- RX_PKT_BUF_SZ,
|
|
- DMA_FROM_DEVICE);
|
|
+ mapping = dma_map_single(bp->sdev->dma_dev, skb->data,
|
|
+ RX_PKT_BUF_SZ,
|
|
+ DMA_FROM_DEVICE);
|
|
|
|
/* Hardware bug work-around, the chip is unable to do PCI DMA
|
|
to/from anything above 1GB :-( */
|
|
- if (ssb_dma_mapping_error(bp->sdev, mapping) ||
|
|
+ if (dma_mapping_error(bp->sdev->dma_dev, mapping) ||
|
|
mapping + RX_PKT_BUF_SZ > DMA_BIT_MASK(30)) {
|
|
/* Sigh... */
|
|
- if (!ssb_dma_mapping_error(bp->sdev, mapping))
|
|
- ssb_dma_unmap_single(bp->sdev, mapping,
|
|
+ if (!dma_mapping_error(bp->sdev->dma_dev, mapping))
|
|
+ dma_unmap_single(bp->sdev->dma_dev, mapping,
|
|
RX_PKT_BUF_SZ, DMA_FROM_DEVICE);
|
|
dev_kfree_skb_any(skb);
|
|
skb = __netdev_alloc_skb(bp->dev, RX_PKT_BUF_SZ, GFP_ATOMIC|GFP_DMA);
|
|
if (skb == NULL)
|
|
return -ENOMEM;
|
|
- mapping = ssb_dma_map_single(bp->sdev, skb->data,
|
|
- RX_PKT_BUF_SZ,
|
|
- DMA_FROM_DEVICE);
|
|
- if (ssb_dma_mapping_error(bp->sdev, mapping) ||
|
|
- mapping + RX_PKT_BUF_SZ > DMA_BIT_MASK(30)) {
|
|
- if (!ssb_dma_mapping_error(bp->sdev, mapping))
|
|
- ssb_dma_unmap_single(bp->sdev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
|
+ mapping = dma_map_single(bp->sdev->dma_dev, skb->data,
|
|
+ RX_PKT_BUF_SZ,
|
|
+ DMA_FROM_DEVICE);
|
|
+ if (dma_mapping_error(bp->sdev->dma_dev, mapping) ||
|
|
+ mapping + RX_PKT_BUF_SZ > DMA_BIT_MASK(30)) {
|
|
+ if (!dma_mapping_error(bp->sdev->dma_dev, mapping))
|
|
+ dma_unmap_single(bp->sdev->dma_dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
|
dev_kfree_skb_any(skb);
|
|
return -ENOMEM;
|
|
}
|
|
@@ -745,9 +742,9 @@ static void b44_recycle_rx(struct b44 *b
|
|
dest_idx * sizeof(*dest_desc),
|
|
DMA_BIDIRECTIONAL);
|
|
|
|
- ssb_dma_sync_single_for_device(bp->sdev, dest_map->mapping,
|
|
- RX_PKT_BUF_SZ,
|
|
- DMA_FROM_DEVICE);
|
|
+ dma_sync_single_for_device(bp->sdev->dma_dev, dest_map->mapping,
|
|
+ RX_PKT_BUF_SZ,
|
|
+ DMA_FROM_DEVICE);
|
|
}
|
|
|
|
static int b44_rx(struct b44 *bp, int budget)
|
|
@@ -767,9 +764,9 @@ static int b44_rx(struct b44 *bp, int bu
|
|
struct rx_header *rh;
|
|
u16 len;
|
|
|
|
- ssb_dma_sync_single_for_cpu(bp->sdev, map,
|
|
- RX_PKT_BUF_SZ,
|
|
- DMA_FROM_DEVICE);
|
|
+ dma_sync_single_for_cpu(bp->sdev->dma_dev, map,
|
|
+ RX_PKT_BUF_SZ,
|
|
+ DMA_FROM_DEVICE);
|
|
rh = (struct rx_header *) skb->data;
|
|
len = le16_to_cpu(rh->len);
|
|
if ((len > (RX_PKT_BUF_SZ - RX_PKT_OFFSET)) ||
|
|
@@ -801,8 +798,8 @@ static int b44_rx(struct b44 *bp, int bu
|
|
skb_size = b44_alloc_rx_skb(bp, cons, bp->rx_prod);
|
|
if (skb_size < 0)
|
|
goto drop_it;
|
|
- ssb_dma_unmap_single(bp->sdev, map,
|
|
- skb_size, DMA_FROM_DEVICE);
|
|
+ dma_unmap_single(bp->sdev->dma_dev, map,
|
|
+ skb_size, DMA_FROM_DEVICE);
|
|
/* Leave out rx_header */
|
|
skb_put(skb, len + RX_PKT_OFFSET);
|
|
skb_pull(skb, RX_PKT_OFFSET);
|
|
@@ -954,24 +951,24 @@ static netdev_tx_t b44_start_xmit(struct
|
|
goto err_out;
|
|
}
|
|
|
|
- mapping = ssb_dma_map_single(bp->sdev, skb->data, len, DMA_TO_DEVICE);
|
|
- if (ssb_dma_mapping_error(bp->sdev, mapping) || mapping + len > DMA_BIT_MASK(30)) {
|
|
+ mapping = dma_map_single(bp->sdev->dma_dev, skb->data, len, DMA_TO_DEVICE);
|
|
+ if (dma_mapping_error(bp->sdev->dma_dev, mapping) || mapping + len > DMA_BIT_MASK(30)) {
|
|
struct sk_buff *bounce_skb;
|
|
|
|
/* Chip can't handle DMA to/from >1GB, use bounce buffer */
|
|
- if (!ssb_dma_mapping_error(bp->sdev, mapping))
|
|
- ssb_dma_unmap_single(bp->sdev, mapping, len,
|
|
+ if (!dma_mapping_error(bp->sdev->dma_dev, mapping))
|
|
+ dma_unmap_single(bp->sdev->dma_dev, mapping, len,
|
|
DMA_TO_DEVICE);
|
|
|
|
bounce_skb = __netdev_alloc_skb(dev, len, GFP_ATOMIC | GFP_DMA);
|
|
if (!bounce_skb)
|
|
goto err_out;
|
|
|
|
- mapping = ssb_dma_map_single(bp->sdev, bounce_skb->data,
|
|
- len, DMA_TO_DEVICE);
|
|
- if (ssb_dma_mapping_error(bp->sdev, mapping) || mapping + len > DMA_BIT_MASK(30)) {
|
|
- if (!ssb_dma_mapping_error(bp->sdev, mapping))
|
|
- ssb_dma_unmap_single(bp->sdev, mapping,
|
|
+ mapping = dma_map_single(bp->sdev->dma_dev, bounce_skb->data,
|
|
+ len, DMA_TO_DEVICE);
|
|
+ if (dma_mapping_error(bp->sdev->dma_dev, mapping) || mapping + len > DMA_BIT_MASK(30)) {
|
|
+ if (!dma_mapping_error(bp->sdev->dma_dev, mapping))
|
|
+ dma_unmap_single(bp->sdev->dma_dev, mapping,
|
|
len, DMA_TO_DEVICE);
|
|
dev_kfree_skb_any(bounce_skb);
|
|
goto err_out;
|
|
@@ -1068,8 +1065,8 @@ static void b44_free_rings(struct b44 *b
|
|
|
|
if (rp->skb == NULL)
|
|
continue;
|
|
- ssb_dma_unmap_single(bp->sdev, rp->mapping, RX_PKT_BUF_SZ,
|
|
- DMA_FROM_DEVICE);
|
|
+ dma_unmap_single(bp->sdev->dma_dev, rp->mapping, RX_PKT_BUF_SZ,
|
|
+ DMA_FROM_DEVICE);
|
|
dev_kfree_skb_any(rp->skb);
|
|
rp->skb = NULL;
|
|
}
|
|
@@ -1080,8 +1077,8 @@ static void b44_free_rings(struct b44 *b
|
|
|
|
if (rp->skb == NULL)
|
|
continue;
|
|
- ssb_dma_unmap_single(bp->sdev, rp->mapping, rp->skb->len,
|
|
- DMA_TO_DEVICE);
|
|
+ dma_unmap_single(bp->sdev->dma_dev, rp->mapping, rp->skb->len,
|
|
+ DMA_TO_DEVICE);
|
|
dev_kfree_skb_any(rp->skb);
|
|
rp->skb = NULL;
|
|
}
|
|
@@ -1103,14 +1100,12 @@ static void b44_init_rings(struct b44 *b
|
|
memset(bp->tx_ring, 0, B44_TX_RING_BYTES);
|
|
|
|
if (bp->flags & B44_FLAG_RX_RING_HACK)
|
|
- ssb_dma_sync_single_for_device(bp->sdev, bp->rx_ring_dma,
|
|
- DMA_TABLE_BYTES,
|
|
- DMA_BIDIRECTIONAL);
|
|
+ dma_sync_single_for_device(bp->sdev->dma_dev, bp->rx_ring_dma,
|
|
+ DMA_TABLE_BYTES, DMA_BIDIRECTIONAL);
|
|
|
|
if (bp->flags & B44_FLAG_TX_RING_HACK)
|
|
- ssb_dma_sync_single_for_device(bp->sdev, bp->tx_ring_dma,
|
|
- DMA_TABLE_BYTES,
|
|
- DMA_TO_DEVICE);
|
|
+ dma_sync_single_for_device(bp->sdev->dma_dev, bp->tx_ring_dma,
|
|
+ DMA_TABLE_BYTES, DMA_TO_DEVICE);
|
|
|
|
for (i = 0; i < bp->rx_pending; i++) {
|
|
if (b44_alloc_rx_skb(bp, -1, i) < 0)
|
|
@@ -1130,27 +1125,23 @@ static void b44_free_consistent(struct b
|
|
bp->tx_buffers = NULL;
|
|
if (bp->rx_ring) {
|
|
if (bp->flags & B44_FLAG_RX_RING_HACK) {
|
|
- ssb_dma_unmap_single(bp->sdev, bp->rx_ring_dma,
|
|
- DMA_TABLE_BYTES,
|
|
- DMA_BIDIRECTIONAL);
|
|
+ dma_unmap_single(bp->sdev->dma_dev, bp->rx_ring_dma,
|
|
+ DMA_TABLE_BYTES, DMA_BIDIRECTIONAL);
|
|
kfree(bp->rx_ring);
|
|
} else
|
|
- ssb_dma_free_consistent(bp->sdev, DMA_TABLE_BYTES,
|
|
- bp->rx_ring, bp->rx_ring_dma,
|
|
- GFP_KERNEL);
|
|
+ dma_free_coherent(bp->sdev->dma_dev, DMA_TABLE_BYTES,
|
|
+ bp->rx_ring, bp->rx_ring_dma);
|
|
bp->rx_ring = NULL;
|
|
bp->flags &= ~B44_FLAG_RX_RING_HACK;
|
|
}
|
|
if (bp->tx_ring) {
|
|
if (bp->flags & B44_FLAG_TX_RING_HACK) {
|
|
- ssb_dma_unmap_single(bp->sdev, bp->tx_ring_dma,
|
|
- DMA_TABLE_BYTES,
|
|
- DMA_TO_DEVICE);
|
|
+ dma_unmap_single(bp->sdev->dma_dev, bp->tx_ring_dma,
|
|
+ DMA_TABLE_BYTES, DMA_TO_DEVICE);
|
|
kfree(bp->tx_ring);
|
|
} else
|
|
- ssb_dma_free_consistent(bp->sdev, DMA_TABLE_BYTES,
|
|
- bp->tx_ring, bp->tx_ring_dma,
|
|
- GFP_KERNEL);
|
|
+ dma_free_coherent(bp->sdev->dma_dev, DMA_TABLE_BYTES,
|
|
+ bp->tx_ring, bp->tx_ring_dma);
|
|
bp->tx_ring = NULL;
|
|
bp->flags &= ~B44_FLAG_TX_RING_HACK;
|
|
}
|
|
@@ -1175,7 +1166,8 @@ static int b44_alloc_consistent(struct b
|
|
goto out_err;
|
|
|
|
size = DMA_TABLE_BYTES;
|
|
- bp->rx_ring = ssb_dma_alloc_consistent(bp->sdev, size, &bp->rx_ring_dma, gfp);
|
|
+ bp->rx_ring = dma_alloc_coherent(bp->sdev->dma_dev, size,
|
|
+ &bp->rx_ring_dma, gfp);
|
|
if (!bp->rx_ring) {
|
|
/* Allocation may have failed due to pci_alloc_consistent
|
|
insisting on use of GFP_DMA, which is more restrictive
|
|
@@ -1187,11 +1179,11 @@ static int b44_alloc_consistent(struct b
|
|
if (!rx_ring)
|
|
goto out_err;
|
|
|
|
- rx_ring_dma = ssb_dma_map_single(bp->sdev, rx_ring,
|
|
- DMA_TABLE_BYTES,
|
|
- DMA_BIDIRECTIONAL);
|
|
+ rx_ring_dma = dma_map_single(bp->sdev->dma_dev, rx_ring,
|
|
+ DMA_TABLE_BYTES,
|
|
+ DMA_BIDIRECTIONAL);
|
|
|
|
- if (ssb_dma_mapping_error(bp->sdev, rx_ring_dma) ||
|
|
+ if (dma_mapping_error(bp->sdev->dma_dev, rx_ring_dma) ||
|
|
rx_ring_dma + size > DMA_BIT_MASK(30)) {
|
|
kfree(rx_ring);
|
|
goto out_err;
|
|
@@ -1202,7 +1194,8 @@ static int b44_alloc_consistent(struct b
|
|
bp->flags |= B44_FLAG_RX_RING_HACK;
|
|
}
|
|
|
|
- bp->tx_ring = ssb_dma_alloc_consistent(bp->sdev, size, &bp->tx_ring_dma, gfp);
|
|
+ bp->tx_ring = dma_alloc_coherent(bp->sdev->dma_dev, size,
|
|
+ &bp->tx_ring_dma, gfp);
|
|
if (!bp->tx_ring) {
|
|
/* Allocation may have failed due to ssb_dma_alloc_consistent
|
|
insisting on use of GFP_DMA, which is more restrictive
|
|
@@ -1214,11 +1207,11 @@ static int b44_alloc_consistent(struct b
|
|
if (!tx_ring)
|
|
goto out_err;
|
|
|
|
- tx_ring_dma = ssb_dma_map_single(bp->sdev, tx_ring,
|
|
- DMA_TABLE_BYTES,
|
|
- DMA_TO_DEVICE);
|
|
+ tx_ring_dma = dma_map_single(bp->sdev->dma_dev, tx_ring,
|
|
+ DMA_TABLE_BYTES,
|
|
+ DMA_TO_DEVICE);
|
|
|
|
- if (ssb_dma_mapping_error(bp->sdev, tx_ring_dma) ||
|
|
+ if (dma_mapping_error(bp->sdev->dma_dev, tx_ring_dma) ||
|
|
tx_ring_dma + size > DMA_BIT_MASK(30)) {
|
|
kfree(tx_ring);
|
|
goto out_err;
|
|
@@ -2176,12 +2169,14 @@ static int __devinit b44_init_one(struct
|
|
"Failed to powerup the bus\n");
|
|
goto err_out_free_dev;
|
|
}
|
|
- err = ssb_dma_set_mask(sdev, DMA_BIT_MASK(30));
|
|
- if (err) {
|
|
+
|
|
+ if (dma_set_mask(sdev->dma_dev, DMA_BIT_MASK(30)) ||
|
|
+ dma_set_coherent_mask(sdev->dma_dev, DMA_BIT_MASK(30))) {
|
|
dev_err(sdev->dev,
|
|
"Required 30BIT DMA mask unsupported by the system\n");
|
|
goto err_out_powerdown;
|
|
}
|
|
+
|
|
err = b44_get_invariants(bp);
|
|
if (err) {
|
|
dev_err(sdev->dev,
|
|
@@ -2344,7 +2339,6 @@ static int __init b44_init(void)
|
|
int err;
|
|
|
|
/* Setup paramaters for syncing RX/TX DMA descriptors */
|
|
- dma_desc_align_mask = ~(dma_desc_align_size - 1);
|
|
dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));
|
|
|
|
err = b44_pci_init();
|
|
--- a/drivers/ssb/driver_chipcommon.c
|
|
+++ b/drivers/ssb/driver_chipcommon.c
|
|
@@ -209,6 +209,24 @@ static void chipco_powercontrol_init(str
|
|
}
|
|
}
|
|
|
|
+/* http://bcm-v4.sipsolutions.net/802.11/PmuFastPwrupDelay */
|
|
+static u16 pmu_fast_powerup_delay(struct ssb_chipcommon *cc)
|
|
+{
|
|
+ struct ssb_bus *bus = cc->dev->bus;
|
|
+
|
|
+ switch (bus->chip_id) {
|
|
+ case 0x4312:
|
|
+ case 0x4322:
|
|
+ case 0x4328:
|
|
+ return 7000;
|
|
+ case 0x4325:
|
|
+ /* TODO: */
|
|
+ default:
|
|
+ return 15000;
|
|
+ }
|
|
+}
|
|
+
|
|
+/* http://bcm-v4.sipsolutions.net/802.11/ClkctlFastPwrupDelay */
|
|
static void calc_fast_powerup_delay(struct ssb_chipcommon *cc)
|
|
{
|
|
struct ssb_bus *bus = cc->dev->bus;
|
|
@@ -218,6 +236,12 @@ static void calc_fast_powerup_delay(stru
|
|
|
|
if (bus->bustype != SSB_BUSTYPE_PCI)
|
|
return;
|
|
+
|
|
+ if (cc->capabilities & SSB_CHIPCO_CAP_PMU) {
|
|
+ cc->fast_pwrup_delay = pmu_fast_powerup_delay(cc);
|
|
+ return;
|
|
+ }
|
|
+
|
|
if (!(cc->capabilities & SSB_CHIPCO_CAP_PCTL))
|
|
return;
|
|
|
|
--- a/drivers/ssb/driver_chipcommon_pmu.c
|
|
+++ b/drivers/ssb/driver_chipcommon_pmu.c
|
|
@@ -502,9 +502,9 @@ static void ssb_pmu_resources_init(struc
|
|
chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
|
|
}
|
|
|
|
+/* http://bcm-v4.sipsolutions.net/802.11/SSB/PmuInit */
|
|
void ssb_pmu_init(struct ssb_chipcommon *cc)
|
|
{
|
|
- struct ssb_bus *bus = cc->dev->bus;
|
|
u32 pmucap;
|
|
|
|
if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
|
|
@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon
|
|
ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
|
|
cc->pmu.rev, pmucap);
|
|
|
|
- if (cc->pmu.rev >= 1) {
|
|
- if ((bus->chip_id == 0x4325) && (bus->chip_rev < 2)) {
|
|
- chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
|
|
- ~SSB_CHIPCO_PMU_CTL_NOILPONW);
|
|
- } else {
|
|
- chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
|
|
- SSB_CHIPCO_PMU_CTL_NOILPONW);
|
|
- }
|
|
- }
|
|
+ if (cc->pmu.rev == 1)
|
|
+ chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
|
|
+ ~SSB_CHIPCO_PMU_CTL_NOILPONW);
|
|
+ else
|
|
+ chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
|
|
+ SSB_CHIPCO_PMU_CTL_NOILPONW);
|
|
ssb_pmu_pll_init(cc);
|
|
ssb_pmu_resources_init(cc);
|
|
}
|
|
--- a/drivers/ssb/main.c
|
|
+++ b/drivers/ssb/main.c
|
|
@@ -486,6 +486,7 @@ static int ssb_devices_register(struct s
|
|
#ifdef CONFIG_SSB_PCIHOST
|
|
sdev->irq = bus->host_pci->irq;
|
|
dev->parent = &bus->host_pci->dev;
|
|
+ sdev->dma_dev = dev->parent;
|
|
#endif
|
|
break;
|
|
case SSB_BUSTYPE_PCMCIA:
|
|
@@ -501,6 +502,7 @@ static int ssb_devices_register(struct s
|
|
break;
|
|
case SSB_BUSTYPE_SSB:
|
|
dev->dma_mask = &dev->coherent_dma_mask;
|
|
+ sdev->dma_dev = dev;
|
|
break;
|
|
}
|
|
|
|
@@ -1226,80 +1228,6 @@ u32 ssb_dma_translation(struct ssb_devic
|
|
}
|
|
EXPORT_SYMBOL(ssb_dma_translation);
|
|
|
|
-int ssb_dma_set_mask(struct ssb_device *dev, u64 mask)
|
|
-{
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- int err;
|
|
-#endif
|
|
-
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- err = pci_set_dma_mask(dev->bus->host_pci, mask);
|
|
- if (err)
|
|
- return err;
|
|
- err = pci_set_consistent_dma_mask(dev->bus->host_pci, mask);
|
|
- return err;
|
|
-#endif
|
|
- case SSB_BUSTYPE_SSB:
|
|
- return dma_set_mask(dev->dev, mask);
|
|
- default:
|
|
- __ssb_dma_not_implemented(dev);
|
|
- }
|
|
- return -ENOSYS;
|
|
-}
|
|
-EXPORT_SYMBOL(ssb_dma_set_mask);
|
|
-
|
|
-void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,
|
|
- dma_addr_t *dma_handle, gfp_t gfp_flags)
|
|
-{
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- if (gfp_flags & GFP_DMA) {
|
|
- /* Workaround: The PCI API does not support passing
|
|
- * a GFP flag. */
|
|
- return dma_alloc_coherent(&dev->bus->host_pci->dev,
|
|
- size, dma_handle, gfp_flags);
|
|
- }
|
|
- return pci_alloc_consistent(dev->bus->host_pci, size, dma_handle);
|
|
-#endif
|
|
- case SSB_BUSTYPE_SSB:
|
|
- return dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags);
|
|
- default:
|
|
- __ssb_dma_not_implemented(dev);
|
|
- }
|
|
- return NULL;
|
|
-}
|
|
-EXPORT_SYMBOL(ssb_dma_alloc_consistent);
|
|
-
|
|
-void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,
|
|
- void *vaddr, dma_addr_t dma_handle,
|
|
- gfp_t gfp_flags)
|
|
-{
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- if (gfp_flags & GFP_DMA) {
|
|
- /* Workaround: The PCI API does not support passing
|
|
- * a GFP flag. */
|
|
- dma_free_coherent(&dev->bus->host_pci->dev,
|
|
- size, vaddr, dma_handle);
|
|
- return;
|
|
- }
|
|
- pci_free_consistent(dev->bus->host_pci, size,
|
|
- vaddr, dma_handle);
|
|
- return;
|
|
-#endif
|
|
- case SSB_BUSTYPE_SSB:
|
|
- dma_free_coherent(dev->dev, size, vaddr, dma_handle);
|
|
- return;
|
|
- default:
|
|
- __ssb_dma_not_implemented(dev);
|
|
- }
|
|
-}
|
|
-EXPORT_SYMBOL(ssb_dma_free_consistent);
|
|
-
|
|
int ssb_bus_may_powerdown(struct ssb_bus *bus)
|
|
{
|
|
struct ssb_chipcommon *cc;
|
|
--- a/include/linux/ssb/ssb.h
|
|
+++ b/include/linux/ssb/ssb.h
|
|
@@ -167,7 +167,7 @@ struct ssb_device {
|
|
* is an optimization. */
|
|
const struct ssb_bus_ops *ops;
|
|
|
|
- struct device *dev;
|
|
+ struct device *dev, *dma_dev;
|
|
|
|
struct ssb_bus *bus;
|
|
struct ssb_device_id id;
|
|
@@ -470,14 +470,6 @@ extern u32 ssb_dma_translation(struct ss
|
|
#define SSB_DMA_TRANSLATION_MASK 0xC0000000
|
|
#define SSB_DMA_TRANSLATION_SHIFT 30
|
|
|
|
-extern int ssb_dma_set_mask(struct ssb_device *dev, u64 mask);
|
|
-
|
|
-extern void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,
|
|
- dma_addr_t *dma_handle, gfp_t gfp_flags);
|
|
-extern void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,
|
|
- void *vaddr, dma_addr_t dma_handle,
|
|
- gfp_t gfp_flags);
|
|
-
|
|
static inline void __cold __ssb_dma_not_implemented(struct ssb_device *dev)
|
|
{
|
|
#ifdef CONFIG_SSB_DEBUG
|
|
@@ -486,155 +478,6 @@ static inline void __cold __ssb_dma_not_
|
|
#endif /* DEBUG */
|
|
}
|
|
|
|
-static inline int ssb_dma_mapping_error(struct ssb_device *dev, dma_addr_t addr)
|
|
-{
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- return pci_dma_mapping_error(dev->bus->host_pci, addr);
|
|
-#endif
|
|
- break;
|
|
- case SSB_BUSTYPE_SSB:
|
|
- return dma_mapping_error(dev->dev, addr);
|
|
- default:
|
|
- break;
|
|
- }
|
|
- __ssb_dma_not_implemented(dev);
|
|
- return -ENOSYS;
|
|
-}
|
|
-
|
|
-static inline dma_addr_t ssb_dma_map_single(struct ssb_device *dev, void *p,
|
|
- size_t size, enum dma_data_direction dir)
|
|
-{
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- return pci_map_single(dev->bus->host_pci, p, size, dir);
|
|
-#endif
|
|
- break;
|
|
- case SSB_BUSTYPE_SSB:
|
|
- return dma_map_single(dev->dev, p, size, dir);
|
|
- default:
|
|
- break;
|
|
- }
|
|
- __ssb_dma_not_implemented(dev);
|
|
- return 0;
|
|
-}
|
|
-
|
|
-static inline void ssb_dma_unmap_single(struct ssb_device *dev, dma_addr_t dma_addr,
|
|
- size_t size, enum dma_data_direction dir)
|
|
-{
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- pci_unmap_single(dev->bus->host_pci, dma_addr, size, dir);
|
|
- return;
|
|
-#endif
|
|
- break;
|
|
- case SSB_BUSTYPE_SSB:
|
|
- dma_unmap_single(dev->dev, dma_addr, size, dir);
|
|
- return;
|
|
- default:
|
|
- break;
|
|
- }
|
|
- __ssb_dma_not_implemented(dev);
|
|
-}
|
|
-
|
|
-static inline void ssb_dma_sync_single_for_cpu(struct ssb_device *dev,
|
|
- dma_addr_t dma_addr,
|
|
- size_t size,
|
|
- enum dma_data_direction dir)
|
|
-{
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- pci_dma_sync_single_for_cpu(dev->bus->host_pci, dma_addr,
|
|
- size, dir);
|
|
- return;
|
|
-#endif
|
|
- break;
|
|
- case SSB_BUSTYPE_SSB:
|
|
- dma_sync_single_for_cpu(dev->dev, dma_addr, size, dir);
|
|
- return;
|
|
- default:
|
|
- break;
|
|
- }
|
|
- __ssb_dma_not_implemented(dev);
|
|
-}
|
|
-
|
|
-static inline void ssb_dma_sync_single_for_device(struct ssb_device *dev,
|
|
- dma_addr_t dma_addr,
|
|
- size_t size,
|
|
- enum dma_data_direction dir)
|
|
-{
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- pci_dma_sync_single_for_device(dev->bus->host_pci, dma_addr,
|
|
- size, dir);
|
|
- return;
|
|
-#endif
|
|
- break;
|
|
- case SSB_BUSTYPE_SSB:
|
|
- dma_sync_single_for_device(dev->dev, dma_addr, size, dir);
|
|
- return;
|
|
- default:
|
|
- break;
|
|
- }
|
|
- __ssb_dma_not_implemented(dev);
|
|
-}
|
|
-
|
|
-static inline void ssb_dma_sync_single_range_for_cpu(struct ssb_device *dev,
|
|
- dma_addr_t dma_addr,
|
|
- unsigned long offset,
|
|
- size_t size,
|
|
- enum dma_data_direction dir)
|
|
-{
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- /* Just sync everything. That's all the PCI API can do. */
|
|
- pci_dma_sync_single_for_cpu(dev->bus->host_pci, dma_addr,
|
|
- offset + size, dir);
|
|
- return;
|
|
-#endif
|
|
- break;
|
|
- case SSB_BUSTYPE_SSB:
|
|
- dma_sync_single_range_for_cpu(dev->dev, dma_addr, offset,
|
|
- size, dir);
|
|
- return;
|
|
- default:
|
|
- break;
|
|
- }
|
|
- __ssb_dma_not_implemented(dev);
|
|
-}
|
|
-
|
|
-static inline void ssb_dma_sync_single_range_for_device(struct ssb_device *dev,
|
|
- dma_addr_t dma_addr,
|
|
- unsigned long offset,
|
|
- size_t size,
|
|
- enum dma_data_direction dir)
|
|
-{
|
|
- switch (dev->bus->bustype) {
|
|
- case SSB_BUSTYPE_PCI:
|
|
-#ifdef CONFIG_SSB_PCIHOST
|
|
- /* Just sync everything. That's all the PCI API can do. */
|
|
- pci_dma_sync_single_for_device(dev->bus->host_pci, dma_addr,
|
|
- offset + size, dir);
|
|
- return;
|
|
-#endif
|
|
- break;
|
|
- case SSB_BUSTYPE_SSB:
|
|
- dma_sync_single_range_for_device(dev->dev, dma_addr, offset,
|
|
- size, dir);
|
|
- return;
|
|
- default:
|
|
- break;
|
|
- }
|
|
- __ssb_dma_not_implemented(dev);
|
|
-}
|
|
-
|
|
-
|
|
#ifdef CONFIG_SSB_PCIHOST
|
|
/* PCI-host wrapper driver */
|
|
extern int ssb_pcihost_register(struct pci_driver *driver);
|