qcacmn: Cleanup snoc interrupt controll
Remove interupt enable/disable at group level since
in register set 81, these registers are not provided.
Don't enable/disable the ce irqs at the qgic
since the interrupts are edge driven, enabling and disabling the interrupt
in the qgic should not be necessary. Also remove an unneeded read
of a status register.
Change-Id: I2c20ea26c23dc672697d53cd5433d855d9332b13
CRs-Fixed: 997176
diff --git a/hif/src/ce/ce_tasklet.c b/hif/src/ce/ce_tasklet.c
index a0553ab..43bd5b2 100644
--- a/hif/src/ce/ce_tasklet.c
+++ b/hif/src/ce/ce_tasklet.c
@@ -48,22 +48,6 @@
/**
- * ce_irq_status() - read CE IRQ status
- * @scn: struct hif_softc
- * @ce_id: ce_id
- * @host_status: host_status
- *
- * Return: IRQ status
- */
-static inline void ce_irq_status(struct hif_softc *scn,
- int ce_id, uint32_t *host_status)
-{
- uint32_t offset = HOST_IS_ADDRESS + CE_BASE_ADDRESS(ce_id);
-
- *host_status = hif_read32_mb(scn->mem + offset);
-}
-
-/**
* struct tasklet_work
*
* @id: ce_id
@@ -278,7 +262,6 @@
struct HIF_CE_state *hif_ce_state = tasklet_entry->hif_ce_state;
struct hif_softc *scn = HIF_GET_SOFTC(hif_ce_state);
struct hif_opaque_softc *hif_hdl = GET_HIF_OPAQUE_HDL(scn);
- uint32_t host_status;
int ce_id = icnss_get_ce_id(irq);
if (tasklet_entry->ce_id != ce_id) {
@@ -291,11 +274,7 @@
__func__, tasklet_entry->ce_id, CE_COUNT_MAX);
return IRQ_NONE;
}
-#ifndef HIF_PCI
- disable_irq_nosync(irq);
-#endif
hif_irq_disable(scn, ce_id);
- ce_irq_status(scn, ce_id, &host_status);
qdf_atomic_inc(&scn->active_tasklet_cnt);
hif_record_ce_desc_event(scn, ce_id, HIF_IRQ_EVENT, NULL, NULL, 0);
if (hif_napi_enabled(hif_hdl, ce_id))
@@ -390,10 +369,5 @@
}
}
-#ifndef HIF_PCI
- /* move to hif_configure_irq */
- ce_enable_irq_in_group_reg(HIF_GET_SOFTC(hif_ce_state), done_mask);
-#endif
-
return QDF_STATUS_SUCCESS;
}
diff --git a/hif/src/snoc/hif_io32_snoc.h b/hif/src/snoc/hif_io32_snoc.h
index ac4383a..70fc14d 100644
--- a/hif/src/snoc/hif_io32_snoc.h
+++ b/hif/src/snoc/hif_io32_snoc.h
@@ -42,17 +42,6 @@
#include "hif_main.h"
#include "hif_debug.h"
-/**
- * Following features are not supported for snoc bus
- * Force 0 and consider moving corresponding code into
- * pci specific files
- */
-#define ADRASTEA_CE_INTR_ENABLES 0x002F00A8
-#define ADRASTEA_CE_INTR_ENABLES_SET "COMING IN REGISTER SET36"
-#define ADRASTEA_CE_INTR_ENABLES_CLEAR "COMING IN REGISTER SET36"
-
-#define ADRASTEA_CE_INTR_STATUS 0x002F00AC
-
static inline void ce_enable_irq_in_individual_register(struct hif_softc *scn,
int ce_id)
{
@@ -70,60 +59,4 @@
hif_write32_mb(scn->mem + offset, 0);
hif_read32_mb(scn->mem + offset);
}
-
-static inline void ce_read_irq_group_status(struct hif_softc *scn)
-{
- uint32_t group_status = 0;
- group_status = hif_read32_mb(scn->mem +
- ADRASTEA_CE_INTR_STATUS);
-}
-
-static inline void ce_clear_irq_group_status(struct hif_softc *scn, int mask)
-{
- uint32_t group_status = 0;
- group_status = hif_read32_mb(scn->mem +
- ADRASTEA_CE_INTR_STATUS);
-
- hif_write32_mb(scn->mem +
- ADRASTEA_CE_INTR_STATUS, mask);
-
- group_status = hif_read32_mb(scn->mem +
- ADRASTEA_CE_INTR_STATUS);
-}
-
-/* this will need to be changed when we move to reg set 36
- * because we will have set & clear registers provided
- */
-static inline void ce_enable_irq_in_group_reg(struct hif_softc *scn,
- int mask)
-{
- int new_mask = 0;
- new_mask = hif_read32_mb(scn->mem +
- ADRASTEA_CE_INTR_ENABLES);
-
- new_mask |= mask;
-
- hif_write32_mb(scn->mem +
- ADRASTEA_CE_INTR_ENABLES, new_mask);
- mask = hif_read32_mb(scn->mem +
- ADRASTEA_CE_INTR_ENABLES);
-}
-
-/* this will need to be changed when we move to reg set 36
- * because we will have set & clear registers provided
- */
-static inline void ce_disable_irq_in_group_reg(struct hif_softc *scn,
- int mask)
-{
- int new_mask = 0;
- new_mask = hif_read32_mb(scn->mem +
- ADRASTEA_CE_INTR_ENABLES);
-
- new_mask &= ~mask;
-
- hif_write32_mb(scn->mem +
- ADRASTEA_CE_INTR_ENABLES, new_mask);
- mask = hif_read32_mb(scn->mem +
- ADRASTEA_CE_INTR_ENABLES);
-}
#endif
diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c
index a850462..f4ed0e6 100644
--- a/hif/src/snoc/if_snoc.c
+++ b/hif/src/snoc/if_snoc.c
@@ -267,9 +267,7 @@
void hif_snoc_irq_enable(struct hif_softc *scn,
int ce_id)
{
- icnss_enable_irq(ce_id);
ce_enable_irq_in_individual_register(scn, ce_id);
- ce_enable_irq_in_group_reg(scn, 1<<ce_id);
}
/**
@@ -281,7 +279,5 @@
*/
void hif_snoc_irq_disable(struct hif_softc *scn, int ce_id)
{
- ce_disable_irq_in_group_reg(scn, 1<<ce_id);
- ce_clear_irq_group_status(scn, 1<<ce_id);
ce_disable_irq_in_individual_register(scn, ce_id);
}