MIPS: Octeon: Set up 1:1 mapping between CN68XX PKO queues and ports

Use the internal port number also as the queue number on CN68XX.

Signed-off-by: Janne Huttunen <[email protected]>
Signed-off-by: Aaro Koskinen <[email protected]>
Acked-by: David Daney <[email protected]>
Cc: David Daney <[email protected]>
Cc: [email protected]
Cc: Janne Huttunen <[email protected]>
Cc: Aaro Koskinen <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/10962/
Signed-off-by: Ralf Baechle <[email protected]>

diff --git a/arch/mips/include/asm/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h
index 3da59bb8ce24fbb4c14b15f539d074805ddfde75..5f47f76ed510a53dd760bedf911d3d1414d8a4de 100644 (file)
--- a/arch/mips/include/asm/octeon/cvmx-pko.h
+++ b/arch/mips/include/asm/octeon/cvmx-pko.h
@@ -542,6 +542,9 @@ static inline int cvmx_pko_get_base_queue_per_core(int port, int core)
  */
 static inline int cvmx_pko_get_base_queue(int port)
 {
+       if (OCTEON_IS_MODEL(OCTEON_CN68XX))
+               return port;
+
        return cvmx_pko_get_base_queue_per_core(port, 0);
 }