]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: octeon: set up pknd for all interfaces
authorAaro Koskinen <aaro.koskinen@iki.fi>
Wed, 31 Aug 2016 20:57:45 +0000 (23:57 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Sep 2016 12:46:53 +0000 (14:46 +0200)
RX path uses pknd to find the correct device, and we maintain 1:1
port to pknd mapping. However, this is only set for XAUI interfaces
(in the arch code). But it should be set for all interface types.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/octeon/ethernet.c

index 8d51f0584be5a0cba86fdf5974f0a11b27e0c5ee..5497facec83a3ef983741088fb2812decc49a832 100644 (file)
@@ -488,6 +488,8 @@ int cvm_oct_common_open(struct net_device *dev,
 
        gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface));
        gmx_cfg.s.en = 1;
+       if (octeon_has_feature(OCTEON_FEATURE_PKND))
+               gmx_cfg.s.pknd = priv->port;
        cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64);
 
        if (octeon_is_simulation())