Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1278391

Re: [PATCH v2 net 1/6] net: mvneta: add configuration for MBUS windows access protection

Show all headers | View raw

Marcin,

On Thu, 26 Nov 2015 19:08:08 +0100, Marcin Wojtas wrote:
> This commit adds missing configuration of MBUS windows access protection
> in mvneta_conf_mbus_windows function - a dedicated variable for that
> purpose remained there unused since v3.8 initial mvneta support. Because
> of that the register contents were inherited from the bootloader.
> 
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> Reviewed-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Cc: <stable@vger.kernel.org> # v3.8+
> Fixes: c5aff18204da ("net: mvneta: driver for Marvell Armada 370/XP network
> unit")

Is this actually fixing a user visible problem? If not, then I am not
sure it qualifies for stable.

> diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
> index e84c7f2..c4327b9 100644
> --- a/drivers/net/ethernet/marvell/mvneta.c
> +++ b/drivers/net/ethernet/marvell/mvneta.c
> @@ -62,6 +62,7 @@
>  #define MVNETA_WIN_SIZE(w)                      (0x2204 + ((w) << 3))
>  #define MVNETA_WIN_REMAP(w)                     (0x2280 + ((w) << 2))
>  #define MVNETA_BASE_ADDR_ENABLE                 0x2290
> +#define MVNETA_ACCESS_PROTECT_ENABLE		0x2294

Spaces are used for indentation in the definitions of all other
constants in this driver, so I think you should stick with this
convention, at least to remain consistent.

>  #define MVNETA_PORT_CONFIG                      0x2400
>  #define      MVNETA_UNI_PROMISC_MODE            BIT(0)
>  #define      MVNETA_DEF_RXQ(q)                  ((q) << 1)
> @@ -3188,9 +3189,11 @@ static void mvneta_conf_mbus_windows(struct mvneta_port *pp,
>  
>  		win_enable &= ~(1 << i);
>  		win_protect |= 3 << (2 * i);
> +

Unneeded change.

>  	}
>  
>  	mvreg_write(pp, MVNETA_BASE_ADDR_ENABLE, win_enable);
> +	mvreg_write(pp, MVNETA_ACCESS_PROTECT_ENABLE, win_protect);
>  }

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 net 0/6] Marvell Armada XP/370/38X Neta fixes Marcin Wojtas <mw@semihalf.com> - 2015-11-26 19:10 +0100
  [PATCH v2 net 6/6] net: mvneta: enable IP checksum with jumbo frames for Armada 38x on Port0 Marcin Wojtas <mw@semihalf.com> - 2015-11-26 19:10 +0100
    Re: [PATCH v2 net 6/6] net: mvneta: enable IP checksum with jumbo  frames for Armada 38x on Port0 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - 2015-11-26 19:40 +0100
      Re: [PATCH v2 net 6/6] net: mvneta: enable IP checksum with jumbo  frames for Armada 38x on Port0 Marcin Wojtas <mw@semihalf.com> - 2015-11-26 19:50 +0100
  [PATCH v2 net 1/6] net: mvneta: add configuration for MBUS windows access protection Marcin Wojtas <mw@semihalf.com> - 2015-11-26 19:20 +0100
    Re: [PATCH v2 net 1/6] net: mvneta: add configuration for MBUS  windows access protection Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - 2015-11-26 19:30 +0100
      Re: [PATCH v2 net 1/6] net: mvneta: add configuration for MBUS  windows access protection Marcin Wojtas <mw@semihalf.com> - 2015-11-26 19:40 +0100
  [PATCH v2 net 2/6] net: mvneta: fix bit assignment in MVNETA_RXQ_CONFIG_REG Marcin Wojtas <mw@semihalf.com> - 2015-11-26 19:20 +0100
    Re: [PATCH v2 net 2/6] net: mvneta: fix bit assignment in  MVNETA_RXQ_CONFIG_REG Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - 2015-11-26 19:30 +0100

csiph-web