Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next

Freescale updates from Scott:

"Includes a fix for a powerpc/next mm regression on 64e, a fix for a
kernel hang on 64e when using a debugger inside a relocated kernel, a
qman fix, and misc qe improvements."

4 files changed, 30 insertions, 10 deletions

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 3f7ae9f64cd8..f77ba9fa257b 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -2594,11 +2594,10 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 } else if (ugeth->ug_info->uf_info.bd_mem_part ==
                            MEM_PART_MURAM) {
                         out_be32(&ugeth->p_send_q_mem_reg->sqqd[i].bd_ring_base,
-                                 (u32) immrbar_virt_to_phys(ugeth->
-                                                            p_tx_bd_ring[i]));
+                                 (u32)qe_muram_dma(ugeth->p_tx_bd_ring[i]));
                         out_be32(&ugeth->p_send_q_mem_reg->sqqd[i].
                                  last_bd_completed_address,
-                                 (u32) immrbar_virt_to_phys(endOfRing));
+                                 (u32)qe_muram_dma(endOfRing));
                 }
         }
 
@@ -2844,8 +2843,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 } else if (ugeth->ug_info->uf_info.bd_mem_part ==
                            MEM_PART_MURAM) {
                         out_be32(&ugeth->p_rx_bd_qs_tbl[i].externalbdbaseptr,
-                                 (u32) immrbar_virt_to_phys(ugeth->
-                                                            p_rx_bd_ring[i]));
+                                 (u32)qe_muram_dma(ugeth->p_rx_bd_ring[i]));
                 }
                 /* rest of fields handled by QE */
         }
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index 6f509f68085e..2827a65aa25a 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -1344,6 +1344,7 @@ static void qm_congestion_task(struct work_struct *work)
         if (!qm_mc_result_timeout(&p->p, &mcr)) {
                 spin_unlock(&p->cgr_lock);
                 dev_crit(p->config->dev, "QUERYCONGESTION timeout\n");
+                qman_p_irqsource_add(p, QM_PIRQ_CSCI);
                 return;
         }
         /* mask out the ones I'm not interested in */
@@ -1358,6 +1359,7 @@ static void qm_congestion_task(struct work_struct *work)
                 if (cgr->cb && qman_cgrs_get(&c, cgr->cgrid))
                         cgr->cb(p, cgr, qman_cgrs_get(&rr, cgr->cgrid));
         spin_unlock(&p->cgr_lock);
+        qman_p_irqsource_add(p, QM_PIRQ_CSCI);
 }
 
 static void qm_mr_process_task(struct work_struct *work)
@@ -1417,12 +1419,14 @@ static void qm_mr_process_task(struct work_struct *work)
         }
 
         qm_mr_cci_consume(&p->p, num);
+        qman_p_irqsource_add(p, QM_PIRQ_MRI);
         preempt_enable();
 }
 
 static u32 __poll_portal_slow(struct qman_portal *p, u32 is)
 {
         if (is & QM_PIRQ_CSCI) {
+                qman_p_irqsource_remove(p, QM_PIRQ_CSCI);
                 queue_work_on(smp_processor_id(), qm_portal_wq,
                               &p->congestion_work);
         }
@@ -1434,6 +1438,7 @@ static u32 __poll_portal_slow(struct qman_portal *p, u32 is)
         }
 
         if (is & QM_PIRQ_MRI) {
+                qman_p_irqsource_remove(p, QM_PIRQ_MRI);
                 queue_work_on(smp_processor_id(), qm_portal_wq,
                               &p->mr_work);
         }
diff --git a/drivers/soc/fsl/qe/qe.c b/drivers/soc/fsl/qe/qe.c
index ade168f5328e..2ef6fc6487c1 100644
--- a/drivers/soc/fsl/qe/qe.c
+++ b/drivers/soc/fsl/qe/qe.c
@@ -66,7 +66,7 @@ static unsigned int qe_num_of_snum;
 
 static phys_addr_t qebase = -1;
 
-phys_addr_t get_qe_base(void)
+static phys_addr_t get_qe_base(void)
 {
         struct device_node *qe;
         int ret;
@@ -90,8 +90,6 @@ phys_addr_t get_qe_base(void)
         return qebase;
 }
 
-EXPORT_SYMBOL(get_qe_base);
-
 void qe_reset(void)
 {
         if (qe_immr == NULL)
@@ -163,11 +161,15 @@ EXPORT_SYMBOL(qe_issue_cmd);
  */
 static unsigned int brg_clk = 0;
 
+#define CLK_GRAN        (1000)
+#define CLK_GRAN_LIMIT  (5)
+
 unsigned int qe_get_brg_clk(void)
 {
         struct device_node *qe;
         int size;
         const u32 *prop;
+        unsigned int mod;
 
         if (brg_clk)
                 return brg_clk;
@@ -185,10 +187,22 @@ unsigned int qe_get_brg_clk(void)
 
         of_node_put(qe);
 
+        /* round this if near to a multiple of CLK_GRAN */
+        mod = brg_clk % CLK_GRAN;
+        if (mod) {
+                if (mod < CLK_GRAN_LIMIT)
+                        brg_clk -= mod;
+                else if (mod > (CLK_GRAN - CLK_GRAN_LIMIT))
+                        brg_clk += CLK_GRAN - mod;
+        }
+
         return brg_clk;
 }
 EXPORT_SYMBOL(qe_get_brg_clk);
 
+#define PVR_VER_836x    0x8083
+#define PVR_VER_832x    0x8084
+
 /* Program the BRG to the given sampling rate and multiplier
  *
  * @brg: the BRG, QE_BRG1 - QE_BRG16
@@ -215,8 +229,9 @@ int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier)
         /* Errata QE_General4, which affects some MPC832x and MPC836x SOCs, says
            that the BRG divisor must be even if you're not using divide-by-16
            mode. */
-        if (!div16 && (divisor & 1) && (divisor > 3))
-                divisor++;
+        if (pvr_version_is(PVR_VER_836x) || pvr_version_is(PVR_VER_832x))
+                if (!div16 && (divisor & 1) && (divisor > 3))
+                        divisor++;
 
         tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) |
                 QE_BRGC_ENABLE | div16;
diff --git a/drivers/soc/fsl/qe/qe_tdm.c b/drivers/soc/fsl/qe/qe_tdm.c
index a1048b44e6b9..f744c214f680 100644
--- a/drivers/soc/fsl/qe/qe_tdm.c
+++ b/drivers/soc/fsl/qe/qe_tdm.c
@@ -177,6 +177,7 @@ err_miss_siram_property:
         devm_iounmap(&pdev->dev, utdm->si_regs);
         return ret;
 }
+EXPORT_SYMBOL(ucc_of_parse_tdm);
 
 void ucc_tdm_init(struct ucc_tdm *utdm, struct ucc_tdm_info *ut_info)
 {
@@ -274,3 +275,4 @@ void ucc_tdm_init(struct ucc_tdm *utdm, struct ucc_tdm_info *ut_info)
                 break;
         }
 }
+EXPORT_SYMBOL(ucc_tdm_init);