5 files changed, 1 insertions, 428 deletions

diff --git a/drivers/dma/ioat/dca.c b/drivers/dma/ioat/dca.c
index b1cffd2429e4..540d94ce9736 100644
--- a/drivers/dma/ioat/dca.c
+++ b/drivers/dma/ioat/dca.c
@@ -118,30 +118,6 @@ struct ioat_dca_priv {
         struct ioat_dca_slot     req_slots[0];
 };
 
-static u8 ioat_dca_get_tag(struct dca_provider *dca,
-                           struct device *dev,
-                           int cpu)
-{
-        struct ioat_dca_priv *ioatdca = dca_priv(dca);
-        int i, apic_id, bit, value;
-        u8 entry, tag;
-
-        tag = 0;
-        apic_id = cpu_physical_id(cpu);
-
-        for (i = 0; i < IOAT_TAG_MAP_LEN; i++) {
-                entry = ioatdca->tag_map[i];
-                if (entry & DCA_TAG_MAP_VALID) {
-                        bit = entry & ~DCA_TAG_MAP_VALID;
-                        value = (apic_id & (1 << bit)) ? 1 : 0;
-                } else {
-                        value = entry ? 1 : 0;
-                }
-                tag |= (value << i);
-        }
-        return tag;
-}
-
 static int ioat_dca_dev_managed(struct dca_provider *dca,
                                 struct device *dev)
 {
@@ -157,182 +133,6 @@ static int ioat_dca_dev_managed(struct dca_provider *dca,
         return 0;
 }
 
-static int ioat2_dca_add_requester(struct dca_provider *dca, struct device *dev)
-{
-        struct ioat_dca_priv *ioatdca = dca_priv(dca);
-        struct pci_dev *pdev;
-        int i;
-        u16 id;
-        u16 global_req_table;
-
-        /* This implementation only supports PCI-Express */
-        if (!dev_is_pci(dev))
-                return -ENODEV;
-        pdev = to_pci_dev(dev);
-        id = dcaid_from_pcidev(pdev);
-
-        if (ioatdca->requester_count == ioatdca->max_requesters)
-                return -ENODEV;
-
-        for (i = 0; i < ioatdca->max_requesters; i++) {
-                if (ioatdca->req_slots[i].pdev == NULL) {
-                        /* found an empty slot */
-                        ioatdca->requester_count++;
-                        ioatdca->req_slots[i].pdev = pdev;
-                        ioatdca->req_slots[i].rid = id;
-                        global_req_table =
-                              readw(ioatdca->dca_base + IOAT_DCA_GREQID_OFFSET);
-                        writel(id | IOAT_DCA_GREQID_VALID,
-                               ioatdca->iobase + global_req_table + (i * 4));
-                        return i;
-                }
-        }
-        /* Error, ioatdma->requester_count is out of whack */
-        return -EFAULT;
-}
-
-static int ioat2_dca_remove_requester(struct dca_provider *dca,
-                                      struct device *dev)
-{
-        struct ioat_dca_priv *ioatdca = dca_priv(dca);
-        struct pci_dev *pdev;
-        int i;
-        u16 global_req_table;
-
-        /* This implementation only supports PCI-Express */
-        if (!dev_is_pci(dev))
-                return -ENODEV;
-        pdev = to_pci_dev(dev);
-
-        for (i = 0; i < ioatdca->max_requesters; i++) {
-                if (ioatdca->req_slots[i].pdev == pdev) {
-                        global_req_table =
-                              readw(ioatdca->dca_base + IOAT_DCA_GREQID_OFFSET);
-                        writel(0, ioatdca->iobase + global_req_table + (i * 4));
-                        ioatdca->req_slots[i].pdev = NULL;
-                        ioatdca->req_slots[i].rid = 0;
-                        ioatdca->requester_count--;
-                        return i;
-                }
-        }
-        return -ENODEV;
-}
-
-static u8 ioat2_dca_get_tag(struct dca_provider *dca,
-                            struct device *dev,
-                            int cpu)
-{
-        u8 tag;
-
-        tag = ioat_dca_get_tag(dca, dev, cpu);
-        tag = (~tag) & 0x1F;
-        return tag;
-}
-
-static struct dca_ops ioat2_dca_ops = {
-        .add_requester          = ioat2_dca_add_requester,
-        .remove_requester       = ioat2_dca_remove_requester,
-        .get_tag                = ioat2_dca_get_tag,
-        .dev_managed            = ioat_dca_dev_managed,
-};
-
-static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset)
-{
-        int slots = 0;
-        u32 req;
-        u16 global_req_table;
-
-        global_req_table = readw(iobase + dca_offset + IOAT_DCA_GREQID_OFFSET);
-        if (global_req_table == 0)
-                return 0;
-        do {
-                req = readl(iobase + global_req_table + (slots * sizeof(u32)));
-                slots++;
-        } while ((req & IOAT_DCA_GREQID_LASTID) == 0);
-
-        return slots;
-}
-
-struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase)
-{
-        struct dca_provider *dca;
-        struct ioat_dca_priv *ioatdca;
-        int slots;
-        int i;
-        int err;
-        u32 tag_map;
-        u16 dca_offset;
-        u16 csi_fsb_control;
-        u16 pcie_control;
-        u8 bit;
-
-        if (!system_has_dca_enabled(pdev))
-                return NULL;
-
-        dca_offset = readw(iobase + IOAT_DCAOFFSET_OFFSET);
-        if (dca_offset == 0)
-                return NULL;
-
-        slots = ioat2_dca_count_dca_slots(iobase, dca_offset);
-        if (slots == 0)
-                return NULL;
-
-        dca = alloc_dca_provider(&ioat2_dca_ops,
-                                 sizeof(*ioatdca)
-                                      + (sizeof(struct ioat_dca_slot) * slots));
-        if (!dca)
-                return NULL;
-
-        ioatdca = dca_priv(dca);
-        ioatdca->iobase = iobase;
-        ioatdca->dca_base = iobase + dca_offset;
-        ioatdca->max_requesters = slots;
-
-        /* some bios might not know to turn these on */
-        csi_fsb_control = readw(ioatdca->dca_base + IOAT_FSB_CAP_ENABLE_OFFSET);
-        if ((csi_fsb_control & IOAT_FSB_CAP_ENABLE_PREFETCH) == 0) {
-                csi_fsb_control |= IOAT_FSB_CAP_ENABLE_PREFETCH;
-                writew(csi_fsb_control,
-                       ioatdca->dca_base + IOAT_FSB_CAP_ENABLE_OFFSET);
-        }
-        pcie_control = readw(ioatdca->dca_base + IOAT_PCI_CAP_ENABLE_OFFSET);
-        if ((pcie_control & IOAT_PCI_CAP_ENABLE_MEMWR) == 0) {
-                pcie_control |= IOAT_PCI_CAP_ENABLE_MEMWR;
-                writew(pcie_control,
-                       ioatdca->dca_base + IOAT_PCI_CAP_ENABLE_OFFSET);
-        }
-
-
-        /* TODO version, compatibility and configuration checks */
-
-        /* copy out the APIC to DCA tag map */
-        tag_map = readl(ioatdca->dca_base + IOAT_APICID_TAG_MAP_OFFSET);
-        for (i = 0; i < 5; i++) {
-                bit = (tag_map >> (4 * i)) & 0x0f;
-                if (bit < 8)
-                        ioatdca->tag_map[i] = bit | DCA_TAG_MAP_VALID;
-                else
-                        ioatdca->tag_map[i] = 0;
-        }
-
-        if (!dca2_tag_map_valid(ioatdca->tag_map)) {
-                WARN_TAINT_ONCE(1, TAINT_FIRMWARE_WORKAROUND,
-                                "%s %s: APICID_TAG_MAP set incorrectly by BIOS, disabling DCA\n",
-                                dev_driver_string(&pdev->dev),
-                                dev_name(&pdev->dev));
-                free_dca_provider(dca);
-                return NULL;
-        }
-
-        err = register_dca_provider(dca, &pdev->dev);
-        if (err) {
-                free_dca_provider(dca);
-                return NULL;
-        }
-
-        return dca;
-}
-
 static int ioat3_dca_add_requester(struct dca_provider *dca, struct device *dev)
 {
         struct ioat_dca_priv *ioatdca = dca_priv(dca);
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index f40768dfc3e6..fe63ff8c1c00 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -31,7 +31,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/workqueue.h>
 #include <linux/prefetch.h>
-#include <linux/i7300_idle.h>
 #include "dma.h"
 #include "registers.h"
 #include "hw.h"
diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c
index 0fba93c2feb4..2467298843ea 100644
--- a/drivers/dma/ioat/dma_v2.c
+++ b/drivers/dma/ioat/dma_v2.c
@@ -31,7 +31,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/workqueue.h>
 #include <linux/prefetch.h>
-#include <linux/i7300_idle.h>
 #include "dma.h"
 #include "dma_v2.h"
 #include "registers.h"
@@ -124,76 +123,6 @@ static void ioat2_start_null_desc(struct ioat2_dma_chan *ioat)
         spin_unlock_bh(&ioat->prep_lock);
 }
 
-static void __cleanup(struct ioat2_dma_chan *ioat, dma_addr_t phys_complete)
-{
-        struct ioat_chan_common *chan = &ioat->base;
-        struct dma_async_tx_descriptor *tx;
-        struct ioat_ring_ent *desc;
-        bool seen_current = false;
-        u16 active;
-        int idx = ioat->tail, i;
-
-        dev_dbg(to_dev(chan), "%s: head: %#x tail: %#x issued: %#x\n",
-                __func__, ioat->head, ioat->tail, ioat->issued);
-
-        active = ioat2_ring_active(ioat);
-        for (i = 0; i < active && !seen_current; i++) {
-                smp_read_barrier_depends();
-                prefetch(ioat2_get_ring_ent(ioat, idx + i + 1));
-                desc = ioat2_get_ring_ent(ioat, idx + i);
-                tx = &desc->txd;
-                dump_desc_dbg(ioat, desc);
-                if (tx->cookie) {
-                        dma_descriptor_unmap(tx);
-                        dma_cookie_complete(tx);
-                        if (tx->callback) {
-                                tx->callback(tx->callback_param);
-                                tx->callback = NULL;
-                        }
-                }
-
-                if (tx->phys == phys_complete)
-                        seen_current = true;
-        }
-        smp_mb(); /* finish all descriptor reads before incrementing tail */
-        ioat->tail = idx + i;
-        BUG_ON(active && !seen_current); /* no active descs have written a completion? */
-
-        chan->last_completion = phys_complete;
-        if (active - i == 0) {
-                dev_dbg(to_dev(chan), "%s: cancel completion timeout\n",
-                        __func__);
-                clear_bit(IOAT_COMPLETION_PENDING, &chan->state);
-                mod_timer(&chan->timer, jiffies + IDLE_TIMEOUT);
-        }
-}
-
-/**
- * ioat2_cleanup - clean finished descriptors (advance tail pointer)
- * @chan: ioat channel to be cleaned up
- */
-static void ioat2_cleanup(struct ioat2_dma_chan *ioat)
-{
-        struct ioat_chan_common *chan = &ioat->base;
-        dma_addr_t phys_complete;
-
-        spin_lock_bh(&chan->cleanup_lock);
-        if (ioat_cleanup_preamble(chan, &phys_complete))
-                __cleanup(ioat, phys_complete);
-        spin_unlock_bh(&chan->cleanup_lock);
-}
-
-void ioat2_cleanup_event(unsigned long data)
-{
-        struct ioat2_dma_chan *ioat = to_ioat2_chan((void *) data);
-        struct ioat_chan_common *chan = &ioat->base;
-
-        ioat2_cleanup(ioat);
-        if (!test_bit(IOAT_RUN, &chan->state))
-                return;
-        writew(IOAT_CHANCTRL_RUN, ioat->base.reg_base + IOAT_CHANCTRL_OFFSET);
-}
-
 void __ioat2_restart_chan(struct ioat2_dma_chan *ioat)
 {
         struct ioat_chan_common *chan = &ioat->base;
@@ -256,110 +185,6 @@ int ioat2_reset_sync(struct ioat_chan_common *chan, unsigned long tmo)
         return err;
 }
 
-static void ioat2_restart_channel(struct ioat2_dma_chan *ioat)
-{
-        struct ioat_chan_common *chan = &ioat->base;
-        dma_addr_t phys_complete;
-
-        ioat2_quiesce(chan, 0);
-        if (ioat_cleanup_preamble(chan, &phys_complete))
-                __cleanup(ioat, phys_complete);
-
-        __ioat2_restart_chan(ioat);
-}
-
-static void check_active(struct ioat2_dma_chan *ioat)
-{
-        struct ioat_chan_common *chan = &ioat->base;
-
-        if (ioat2_ring_active(ioat)) {
-                mod_timer(&chan->timer, jiffies + COMPLETION_TIMEOUT);
-                return;
-        }
-
-        if (test_and_clear_bit(IOAT_CHAN_ACTIVE, &chan->state))
-                mod_timer(&chan->timer, jiffies + IDLE_TIMEOUT);
-        else if (ioat->alloc_order > ioat_get_alloc_order()) {
-                /* if the ring is idle, empty, and oversized try to step
-                 * down the size
-                 */
-                reshape_ring(ioat, ioat->alloc_order - 1);
-
-                /* keep shrinking until we get back to our minimum
-                 * default size
-                 */
-                if (ioat->alloc_order > ioat_get_alloc_order())
-                        mod_timer(&chan->timer, jiffies + IDLE_TIMEOUT);
-        }
-
-}
-
-void ioat2_timer_event(unsigned long data)
-{
-        struct ioat2_dma_chan *ioat = to_ioat2_chan((void *) data);
-        struct ioat_chan_common *chan = &ioat->base;
-        dma_addr_t phys_complete;
-        u64 status;
-
-        status = ioat_chansts(chan);
-
-        /* when halted due to errors check for channel
-         * programming errors before advancing the completion state
-         */
-        if (is_ioat_halted(status)) {
-                u32 chanerr;
-
-                chanerr = readl(chan->reg_base + IOAT_CHANERR_OFFSET);
-                dev_err(to_dev(chan), "%s: Channel halted (%x)\n",
-                        __func__, chanerr);
-                if (test_bit(IOAT_RUN, &chan->state))
-                        BUG_ON(is_ioat_bug(chanerr));
-                else /* we never got off the ground */
-                        return;
-        }
-
-        /* if we haven't made progress and we have already
-         * acknowledged a pending completion once, then be more
-         * forceful with a restart
-         */
-        spin_lock_bh(&chan->cleanup_lock);
-        if (ioat_cleanup_preamble(chan, &phys_complete))
-                __cleanup(ioat, phys_complete);
-        else if (test_bit(IOAT_COMPLETION_ACK, &chan->state)) {
-                spin_lock_bh(&ioat->prep_lock);
-                ioat2_restart_channel(ioat);
-                spin_unlock_bh(&ioat->prep_lock);
-                spin_unlock_bh(&chan->cleanup_lock);
-                return;
-        } else {
-                set_bit(IOAT_COMPLETION_ACK, &chan->state);
-                mod_timer(&chan->timer, jiffies + COMPLETION_TIMEOUT);
-        }
-
-
-        if (ioat2_ring_active(ioat))
-                mod_timer(&chan->timer, jiffies + COMPLETION_TIMEOUT);
-        else {
-                spin_lock_bh(&ioat->prep_lock);
-                check_active(ioat);
-                spin_unlock_bh(&ioat->prep_lock);
-        }
-        spin_unlock_bh(&chan->cleanup_lock);
-}
-
-static int ioat2_reset_hw(struct ioat_chan_common *chan)
-{
-        /* throw away whatever the channel was doing and get it initialized */
-        u32 chanerr;
-
-        ioat2_quiesce(chan, msecs_to_jiffies(100));
-
-        chanerr = readl(chan->reg_base + IOAT_CHANERR_OFFSET);
-        writel(chanerr, chan->reg_base + IOAT_CHANERR_OFFSET);
-
-        return ioat2_reset_sync(chan, msecs_to_jiffies(200));
-}
-
 /**
  * ioat2_enumerate_channels - find and initialize the device's channels
  * @device: the device to be enumerated
@@ -386,11 +211,6 @@ int ioat2_enumerate_channels(struct ioatdma_device *device)
                 return 0;
         dev_dbg(dev, "%s: xfercap = %d\n", __func__, 1 << xfercap_log);
 
-        /* FIXME which i/oat version is i7300? */
-#ifdef CONFIG_I7300_IDLE_IOAT_CHANNEL
-        if (i7300_idle_platform_probe(NULL, NULL, 1) == 0)
-                dma->chancnt--;
-#endif
         for (i = 0; i < dma->chancnt; i++) {
                 ioat = devm_kzalloc(dev, sizeof(*ioat), GFP_KERNEL);
                 if (!ioat)
@@ -872,45 +692,3 @@ struct kobj_type ioat2_ktype = {
         .sysfs_ops = &ioat_sysfs_ops,
         .default_attrs = ioat2_attrs,
 };
-
-int ioat2_dma_probe(struct ioatdma_device *device, int dca)
-{
-        struct pci_dev *pdev = device->pdev;
-        struct dma_device *dma;
-        struct dma_chan *c;
-        struct ioat_chan_common *chan;
-        int err;
-
-        device->enumerate_channels = ioat2_enumerate_channels;
-        device->reset_hw = ioat2_reset_hw;
-        device->cleanup_fn = ioat2_cleanup_event;
-        device->timer_fn = ioat2_timer_event;
-        device->self_test = ioat_dma_self_test;
-        dma = &device->common;
-        dma->device_prep_dma_memcpy = ioat2_dma_prep_memcpy_lock;
-        dma->device_issue_pending = ioat2_issue_pending;
-        dma->device_alloc_chan_resources = ioat2_alloc_chan_resources;
-        dma->device_free_chan_resources = ioat2_free_chan_resources;
-        dma->device_tx_status = ioat_dma_tx_status;
-
-        err = ioat_probe(device);
-        if (err)
-                return err;
-
-        list_for_each_entry(c, &dma->channels, device_node) {
-                chan = to_chan_common(c);
-                writel(IOAT_DCACTRL_CMPL_WRITE_ENABLE | IOAT_DMA_DCA_ANY_CPU,
-                       chan->reg_base + IOAT_DCACTRL_OFFSET);
-        }
-
-        err = ioat_register(device);
-        if (err)
-                return err;
-
-        ioat_kobject_add(device, &ioat2_ktype);
-
-        if (dca)
-                device->dca = ioat2_dca_init(pdev, device->reg_base);
-
-        return err;
-}
diff --git a/drivers/dma/ioat/dma_v2.h b/drivers/dma/ioat/dma_v2.h
index bf24ebe874b0..b7d35839e68b 100644
--- a/drivers/dma/ioat/dma_v2.h
+++ b/drivers/dma/ioat/dma_v2.h
@@ -153,7 +153,6 @@ static inline void ioat2_set_chainaddr(struct ioat2_dma_chan *ioat, u64 addr)
 
 int ioat2_dma_probe(struct ioatdma_device *dev, int dca);
 int ioat3_dma_probe(struct ioatdma_device *dev, int dca);
-struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase);
 struct dca_provider *ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase);
 int ioat2_check_space_lock(struct ioat2_dma_chan *ioat, int num_descs);
 int ioat2_enumerate_channels(struct ioatdma_device *device);
@@ -166,7 +165,6 @@ void ioat2_free_chan_resources(struct dma_chan *c);
 void __ioat2_restart_chan(struct ioat2_dma_chan *ioat);
 bool reshape_ring(struct ioat2_dma_chan *ioat, int order);
 void __ioat2_issue_pending(struct ioat2_dma_chan *ioat);
-void ioat2_cleanup_event(unsigned long data);
 void ioat2_timer_event(unsigned long data);
 int ioat2_quiesce(struct ioat_chan_common *chan, unsigned long tmo);
 int ioat2_reset_sync(struct ioat_chan_common *chan, unsigned long tmo);
diff --git a/drivers/dma/ioat/pci.c b/drivers/dma/ioat/pci.c
index 130db77120aa..b979a667f501 100644
--- a/drivers/dma/ioat/pci.c
+++ b/drivers/dma/ioat/pci.c
@@ -210,9 +210,7 @@ static int ioat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         pci_set_drvdata(pdev, device);
 
         device->version = readb(device->reg_base + IOAT_VER_OFFSET);
-        if (device->version == IOAT_VER_2_0)
-                err = ioat2_dma_probe(device, ioat_dca_enabled);
-        else if (device->version >= IOAT_VER_3_0)
+        if (device->version >= IOAT_VER_3_0)
                 err = ioat3_dma_probe(device, ioat_dca_enabled);
         else
                 return -ENODEV;