5 files changed, 31 insertions, 160 deletions

diff --git a/arch/mips/include/asm/octeon/cvmx-cmd-queue.h b/arch/mips/include/asm/octeon/cvmx-cmd-queue.h
index 024a71b2bff9..75739c83f07e 100644
--- a/arch/mips/include/asm/octeon/cvmx-cmd-queue.h
+++ b/arch/mips/include/asm/octeon/cvmx-cmd-queue.h
@@ -76,6 +76,8 @@
 
 #include <linux/prefetch.h>
 
+#include <asm/compiler.h>
+
 #include <asm/octeon/cvmx-fpa.h>
 /**
  * By default we disable the max depth support. Most programs
@@ -273,7 +275,7 @@ static inline void __cvmx_cmd_queue_lock(cvmx_cmd_queue_id_t queue_id,
                 " lbu   %[ticket], %[now_serving]\n"
                 "4:\n"
                 ".set pop\n" :
-                [ticket_ptr] "=m"(__cvmx_cmd_queue_state_ptr->ticket[__cvmx_cmd_queue_get_index(queue_id)]),
+                [ticket_ptr] "=" GCC_OFF12_ASM()(__cvmx_cmd_queue_state_ptr->ticket[__cvmx_cmd_queue_get_index(queue_id)]),
                 [now_serving] "=m"(qptr->now_serving), [ticket] "=r"(tmp),
                 [my_ticket] "=r"(my_ticket)
             );
diff --git a/arch/mips/include/asm/octeon/cvmx-pow.h b/arch/mips/include/asm/octeon/cvmx-pow.h
index 4b4d0ecfd9eb..2188e65afb86 100644
--- a/arch/mips/include/asm/octeon/cvmx-pow.h
+++ b/arch/mips/include/asm/octeon/cvmx-pow.h
@@ -1066,7 +1066,7 @@ static inline void __cvmx_pow_warn_if_pending_switch(const char *function)
         uint64_t switch_complete;
         CVMX_MF_CHORD(switch_complete);
         if (!switch_complete)
-                pr_warning("%s called with tag switch in progress\n", function);
+                pr_warn("%s called with tag switch in progress\n", function);
 }
 
 /**
@@ -1084,8 +1084,7 @@ static inline void cvmx_pow_tag_sw_wait(void)
                 if (unlikely(switch_complete))
                         break;
                 if (unlikely(cvmx_get_cycle() > start_cycle + MAX_CYCLES)) {
-                        pr_warning("Tag switch is taking a long time, "
-                                   "possible deadlock\n");
+                        pr_warn("Tag switch is taking a long time, possible deadlock\n");
                         start_cycle = -MAX_CYCLES - 1;
                 }
         }
@@ -1296,19 +1295,16 @@ static inline void cvmx_pow_tag_sw_nocheck(uint32_t tag,
                 __cvmx_pow_warn_if_pending_switch(__func__);
                 current_tag = cvmx_pow_get_current_tag();
                 if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL_NULL)
-                        pr_warning("%s called with NULL_NULL tag\n",
-                                   __func__);
+                        pr_warn("%s called with NULL_NULL tag\n", __func__);
                 if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL)
-                        pr_warning("%s called with NULL tag\n", __func__);
+                        pr_warn("%s called with NULL tag\n", __func__);
                 if ((current_tag.s.type == tag_type)
                    && (current_tag.s.tag == tag))
-                        pr_warning("%s called to perform a tag switch to the "
-                                   "same tag\n",
-                             __func__);
+                        pr_warn("%s called to perform a tag switch to the same tag\n",
+                                __func__);
                 if (tag_type == CVMX_POW_TAG_TYPE_NULL)
-                        pr_warning("%s called to perform a tag switch to "
-                                   "NULL. Use cvmx_pow_tag_sw_null() instead\n",
-                             __func__);
+                        pr_warn("%s called to perform a tag switch to NULL. Use cvmx_pow_tag_sw_null() instead\n",
+                                __func__);
         }
 
         /*
@@ -1407,23 +1403,19 @@ static inline void cvmx_pow_tag_sw_full_nocheck(cvmx_wqe_t *wqp, uint32_t tag,
                 __cvmx_pow_warn_if_pending_switch(__func__);
                 current_tag = cvmx_pow_get_current_tag();
                 if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL_NULL)
-                        pr_warning("%s called with NULL_NULL tag\n",
-                                   __func__);
+                        pr_warn("%s called with NULL_NULL tag\n", __func__);
                 if ((current_tag.s.type == tag_type)
                    && (current_tag.s.tag == tag))
-                        pr_warning("%s called to perform a tag switch to "
-                                   "the same tag\n",
-                             __func__);
+                        pr_warn("%s called to perform a tag switch to the same tag\n",
+                                __func__);
                 if (tag_type == CVMX_POW_TAG_TYPE_NULL)
-                        pr_warning("%s called to perform a tag switch to "
-                                   "NULL. Use cvmx_pow_tag_sw_null() instead\n",
-                             __func__);
+                        pr_warn("%s called to perform a tag switch to NULL. Use cvmx_pow_tag_sw_null() instead\n",
+                                __func__);
                 if (wqp != cvmx_phys_to_ptr(0x80))
                         if (wqp != cvmx_pow_get_current_wqp())
-                                pr_warning("%s passed WQE(%p) doesn't match "
-                                           "the address in the POW(%p)\n",
-                                     __func__, wqp,
-                                     cvmx_pow_get_current_wqp());
+                                pr_warn("%s passed WQE(%p) doesn't match the address in the POW(%p)\n",
+                                        __func__, wqp,
+                                        cvmx_pow_get_current_wqp());
         }
 
         /*
@@ -1507,12 +1499,10 @@ static inline void cvmx_pow_tag_sw_null_nocheck(void)
                 __cvmx_pow_warn_if_pending_switch(__func__);
                 current_tag = cvmx_pow_get_current_tag();
                 if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL_NULL)
-                        pr_warning("%s called with NULL_NULL tag\n",
-                                   __func__);
+                        pr_warn("%s called with NULL_NULL tag\n", __func__);
                 if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL)
-                        pr_warning("%s called when we already have a "
-                                   "NULL tag\n",
-                             __func__);
+                        pr_warn("%s called when we already have a NULL tag\n",
+                                __func__);
         }
 
         tag_req.u64 = 0;
@@ -1725,17 +1715,14 @@ static inline void cvmx_pow_tag_sw_desched_nocheck(
                 __cvmx_pow_warn_if_pending_switch(__func__);
                 current_tag = cvmx_pow_get_current_tag();
                 if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL_NULL)
-                        pr_warning("%s called with NULL_NULL tag\n",
-                                   __func__);
+                        pr_warn("%s called with NULL_NULL tag\n", __func__);
                 if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL)
-                        pr_warning("%s called with NULL tag. Deschedule not "
-                                   "allowed from NULL state\n",
-                             __func__);
+                        pr_warn("%s called with NULL tag. Deschedule not allowed from NULL state\n",
+                                __func__);
                 if ((current_tag.s.type != CVMX_POW_TAG_TYPE_ATOMIC)
                         && (tag_type != CVMX_POW_TAG_TYPE_ATOMIC))
-                        pr_warning("%s called where neither the before or "
-                                   "after tag is ATOMIC\n",
-                             __func__);
+                        pr_warn("%s called where neither the before or after tag is ATOMIC\n",
+                                __func__);
         }
 
         tag_req.u64 = 0;
@@ -1832,12 +1819,10 @@ static inline void cvmx_pow_desched(uint64_t no_sched)
                 __cvmx_pow_warn_if_pending_switch(__func__);
                 current_tag = cvmx_pow_get_current_tag();
                 if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL_NULL)
-                        pr_warning("%s called with NULL_NULL tag\n",
-                                   __func__);
+                        pr_warn("%s called with NULL_NULL tag\n", __func__);
                 if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL)
-                        pr_warning("%s called with NULL tag. Deschedule not "
-                                   "expected from NULL state\n",
-                             __func__);
+                        pr_warn("%s called with NULL tag. Deschedule not expected from NULL state\n",
+                                __func__);
         }
 
         /* Need to make sure any writes to the work queue entry are complete */
diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h
index f991e7701d3d..33db1c806b01 100644
--- a/arch/mips/include/asm/octeon/cvmx.h
+++ b/arch/mips/include/asm/octeon/cvmx.h
@@ -451,67 +451,4 @@ static inline uint32_t cvmx_octeon_num_cores(void)
         return cvmx_pop(ciu_fuse);
 }
 
-/**
- * Read a byte of fuse data
- * @byte_addr:   address to read
- *
- * Returns fuse value: 0 or 1
- */
-static uint8_t cvmx_fuse_read_byte(int byte_addr)
-{
-        union cvmx_mio_fus_rcmd read_cmd;
-
-        read_cmd.u64 = 0;
-        read_cmd.s.addr = byte_addr;
-        read_cmd.s.pend = 1;
-        cvmx_write_csr(CVMX_MIO_FUS_RCMD, read_cmd.u64);
-        while ((read_cmd.u64 = cvmx_read_csr(CVMX_MIO_FUS_RCMD))
-               && read_cmd.s.pend)
-                ;
-        return read_cmd.s.dat;
-}
-
-/**
- * Read a single fuse bit
- *
- * @fuse:   Fuse number (0-1024)
- *
- * Returns fuse value: 0 or 1
- */
-static inline int cvmx_fuse_read(int fuse)
-{
-        return (cvmx_fuse_read_byte(fuse >> 3) >> (fuse & 0x7)) & 1;
-}
-
-static inline int cvmx_octeon_model_CN36XX(void)
-{
-        return OCTEON_IS_MODEL(OCTEON_CN38XX)
-                && !cvmx_octeon_is_pass1()
-                && cvmx_fuse_read(264);
-}
-
-static inline int cvmx_octeon_zip_present(void)
-{
-        return octeon_has_feature(OCTEON_FEATURE_ZIP);
-}
-
-static inline int cvmx_octeon_dfa_present(void)
-{
-        if (!OCTEON_IS_MODEL(OCTEON_CN38XX)
-            && !OCTEON_IS_MODEL(OCTEON_CN31XX)
-            && !OCTEON_IS_MODEL(OCTEON_CN58XX))
-                return 0;
-        else if (OCTEON_IS_MODEL(OCTEON_CN3020))
-                return 0;
-        else if (cvmx_octeon_is_pass1())
-                return 1;
-        else
-                return !cvmx_fuse_read(120);
-}
-
-static inline int cvmx_octeon_crypto_present(void)
-{
-        return octeon_has_feature(OCTEON_FEATURE_CRYPTO);
-}
-
 #endif /*  __CVMX_H__  */
diff --git a/arch/mips/include/asm/octeon/octeon-feature.h b/arch/mips/include/asm/octeon/octeon-feature.h
index 90e05a8d4b15..c4fe81f47f53 100644
--- a/arch/mips/include/asm/octeon/octeon-feature.h
+++ b/arch/mips/include/asm/octeon/octeon-feature.h
@@ -86,8 +86,6 @@ enum octeon_feature {
         OCTEON_MAX_FEATURE
 };
 
-static inline int cvmx_fuse_read(int fuse);
-
 /**
  * Determine if the current Octeon supports a specific feature. These
  * checks have been optimized to be fairly quick, but they should still
@@ -105,33 +103,6 @@ static inline int octeon_has_feature(enum octeon_feature feature)
         case OCTEON_FEATURE_SAAD:
                 return !OCTEON_IS_MODEL(OCTEON_CN3XXX);
 
-        case OCTEON_FEATURE_ZIP:
-                if (OCTEON_IS_MODEL(OCTEON_CN30XX)
-                    || OCTEON_IS_MODEL(OCTEON_CN50XX)
-                    || OCTEON_IS_MODEL(OCTEON_CN52XX))
-                        return 0;
-                else if (OCTEON_IS_MODEL(OCTEON_CN38XX_PASS1))
-                        return 1;
-                else
-                        return !cvmx_fuse_read(121);
-
-        case OCTEON_FEATURE_CRYPTO:
-                if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
-                        union cvmx_mio_fus_dat2 fus_2;
-                        fus_2.u64 = cvmx_read_csr(CVMX_MIO_FUS_DAT2);
-                        if (fus_2.s.nocrypto || fus_2.s.nomul) {
-                                return 0;
-                        } else if (!fus_2.s.dorm_crypto) {
-                                return 1;
-                        } else {
-                                union cvmx_rnm_ctl_status st;
-                                st.u64 = cvmx_read_csr(CVMX_RNM_CTL_STATUS);
-                                return st.s.eer_val;
-                        }
-                } else {
-                        return !cvmx_fuse_read(90);
-                }
-
         case OCTEON_FEATURE_DORM_CRYPTO:
                 if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
                         union cvmx_mio_fus_dat2 fus_2;
@@ -188,29 +159,6 @@ static inline int octeon_has_feature(enum octeon_feature feature)
                           && !OCTEON_IS_MODEL(OCTEON_CN56XX_PASS1_X)
                           && !OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X);
 
-        case OCTEON_FEATURE_DFA:
-                if (!OCTEON_IS_MODEL(OCTEON_CN38XX)
-                    && !OCTEON_IS_MODEL(OCTEON_CN31XX)
-                    && !OCTEON_IS_MODEL(OCTEON_CN58XX))
-                        return 0;
-                else if (OCTEON_IS_MODEL(OCTEON_CN3020))
-                        return 0;
-                else
-                        return !cvmx_fuse_read(120);
-
-        case OCTEON_FEATURE_HFA:
-                if (!OCTEON_IS_MODEL(OCTEON_CN6XXX))
-                        return 0;
-                else
-                        return !cvmx_fuse_read(90);
-
-        case OCTEON_FEATURE_DFM:
-                if (!(OCTEON_IS_MODEL(OCTEON_CN63XX)
-                      || OCTEON_IS_MODEL(OCTEON_CN66XX)))
-                        return 0;
-                else
-                        return !cvmx_fuse_read(90);
-
         case OCTEON_FEATURE_MDIO_CLAUSE_45:
                 return !(OCTEON_IS_MODEL(OCTEON_CN3XXX)
                          || OCTEON_IS_MODEL(OCTEON_CN58XX)
diff --git a/arch/mips/include/asm/octeon/octeon-model.h b/arch/mips/include/asm/octeon/octeon-model.h
index e2c122c6a657..e8a1c2fd52cd 100644
--- a/arch/mips/include/asm/octeon/octeon-model.h
+++ b/arch/mips/include/asm/octeon/octeon-model.h
@@ -326,8 +326,7 @@ static inline int __octeon_is_model_runtime__(uint32_t model)
 #define OCTEON_IS_COMMON_BINARY() 1
 #undef OCTEON_MODEL
 
-const char *octeon_model_get_string(uint32_t chip_id);
-const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);
+const char *__init octeon_model_get_string(uint32_t chip_id);
 
 /*
  * Return the octeon family, i.e., ProcessorID of the PrID register.