summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Huttunen <janne.huttunen@nokia.com>2015-08-13 16:21:44 +0300
committerRalf Baechle <ralf@linux-mips.org>2015-09-03 12:08:10 +0200
commit85847d8033b66c2f36e9a992ff3873fb10d72b80 (patch)
treeace0de466dae56a52b97e7d1b9334f8b874fb25b
parent153bfe381356226ed4c330bb2dff957a6e6c3986 (diff)
downloadlinux-stable-85847d8033b66c2f36e9a992ff3873fb10d72b80.tar.gz
linux-stable-85847d8033b66c2f36e9a992ff3873fb10d72b80.tar.bz2
linux-stable-85847d8033b66c2f36e9a992ff3873fb10d72b80.zip
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 <janne.huttunen@nokia.com> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> Acked-by: David Daney <david.daney@cavium.com> Cc: David Daney <ddaney.cavm@gmail.com> Cc: linux-mips@linux-mips.org Cc: Janne Huttunen <janne.huttunen@nokia.com> Cc: Aaro Koskinen <aaro.koskinen@nokia.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: devel@driverdev.osuosl.org Patchwork: https://patchwork.linux-mips.org/patch/10962/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/include/asm/octeon/cvmx-pko.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/include/asm/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h
index 3da59bb8ce24..5f47f76ed510 100644
--- 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);
}