[bionic/azure,v2] UBUNTU: [Config] azure: Ensure CONFIG_MLX5_INFINIBAND=y

Message ID 20180807141228.15740-1-marcelo.cerri@canonical.com
State New
Headers show
Series
  • [bionic/azure,v2] UBUNTU: [Config] azure: Ensure CONFIG_MLX5_INFINIBAND=y
Related show

Commit Message

Marcelo Henrique Cerri Aug. 7, 2018, 2:12 p.m.
BugLink: http://bugs.launchpad.net/bugs/1785822

Recent commit "infiniband: mlx5: fix build errors when
INFINIBAND_USER_ACCESS=m" changed the Kconfig dependencies for
CONFIG_MLX5_INFINIBAND, which caused it to revert to "m".

Force CONFIG_INFINIBAND_USER_ACCESS=y, to keep
CONFIG_MLX5_INFINIBAND=y, as requested by Bug #1759656.

Also enforce CONFIG_MLX4_INFINIBAND and CONFIG_MLX5_INFINIBAND to "y"
in the annotations file.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
---
 debian.azure/config/annotations          | 7 +++++--
 debian.azure/config/config.common.ubuntu | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

Comments

Stefan Bader Aug. 8, 2018, 10:06 a.m. | #1
On 07.08.2018 16:12, Marcelo Henrique Cerri wrote:
> BugLink: http://bugs.launchpad.net/bugs/1785822
> 
> Recent commit "infiniband: mlx5: fix build errors when
> INFINIBAND_USER_ACCESS=m" changed the Kconfig dependencies for
> CONFIG_MLX5_INFINIBAND, which caused it to revert to "m".
> 
> Force CONFIG_INFINIBAND_USER_ACCESS=y, to keep
> CONFIG_MLX5_INFINIBAND=y, as requested by Bug #1759656.
> 
> Also enforce CONFIG_MLX4_INFINIBAND and CONFIG_MLX5_INFINIBAND to "y"
> in the annotations file.
> 
> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  debian.azure/config/annotations          | 7 +++++--
>  debian.azure/config/config.common.ubuntu | 2 +-
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
> index 7e353e930dac..b206dc21ca74 100644
> --- a/debian.azure/config/annotations
> +++ b/debian.azure/config/annotations
> @@ -3070,8 +3070,8 @@ CONFIG_INFINIBAND_CXGB3                         policy<{'amd64': 'm', 'arm64': '
>  CONFIG_INFINIBAND_CXGB3_DEBUG                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
>  CONFIG_INFINIBAND_CXGB4                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
>  CONFIG_INFINIBAND_I40IW                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
> -CONFIG_MLX4_INFINIBAND                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> -CONFIG_MLX5_INFINIBAND                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_MLX4_INFINIBAND                          policy<{'amd64': 'y'}>
> +CONFIG_MLX5_INFINIBAND                          policy<{'amd64': 'y'}>
>  CONFIG_INFINIBAND_NES                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
>  CONFIG_INFINIBAND_NES_DEBUG                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
>  CONFIG_INFINIBAND_OCRDMA                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
> @@ -3096,6 +3096,9 @@ CONFIG_SDMA_VERBOSITY                           policy<{'amd64': 'n'}>
>  CONFIG_INFINIBAND_QEDR                          policy<{'amd64': 'm', 'arm64': 'm', 'ppc64el': 'm'}>
>  CONFIG_INFINIBAND_BNXT_RE                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
>  
> +CONFIG_MLX4_INFINIBAND                          mark<ENFORCED> note<LP:1759656>
> +CONFIG_MLX5_INFINIBAND                          mark<ENFORCED> note<LP:1759656>
> +
>  # Menu: Device Drivers >> Input device support
>  
>  # Menu: Device Drivers >> Input device support >> Generic input layer (needed for keyboard, mouse, ...)
> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
> index 8ea51473f3dd..a5230477f7a5 100644
> --- a/debian.azure/config/config.common.ubuntu
> +++ b/debian.azure/config/config.common.ubuntu
> @@ -1971,7 +1971,7 @@ CONFIG_INFINIBAND_OPA_VNIC=m
>  # CONFIG_INFINIBAND_RDMAVT is not set
>  CONFIG_INFINIBAND_SRP=m
>  # CONFIG_INFINIBAND_SRPT is not set
> -CONFIG_INFINIBAND_USER_ACCESS=m
> +CONFIG_INFINIBAND_USER_ACCESS=y
>  # CONFIG_INFINIBAND_USER_MAD is not set
>  CONFIG_INFINIBAND_USER_MEM=y
>  CONFIG_INFINIBAND_USNIC=m
>
Thadeu Lima de Souza Cascardo Aug. 8, 2018, 12:46 p.m. | #2
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Andy Whitcroft Aug. 8, 2018, 12:57 p.m. | #3
On Tue, Aug 07, 2018 at 11:12:28AM -0300, Marcelo Henrique Cerri wrote:
> BugLink: http://bugs.launchpad.net/bugs/1785822
> 
> Recent commit "infiniband: mlx5: fix build errors when
> INFINIBAND_USER_ACCESS=m" changed the Kconfig dependencies for
> CONFIG_MLX5_INFINIBAND, which caused it to revert to "m".
> 
> Force CONFIG_INFINIBAND_USER_ACCESS=y, to keep
> CONFIG_MLX5_INFINIBAND=y, as requested by Bug #1759656.
> 
> Also enforce CONFIG_MLX4_INFINIBAND and CONFIG_MLX5_INFINIBAND to "y"
> in the annotations file.
> 
> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
> ---
>  debian.azure/config/annotations          | 7 +++++--
>  debian.azure/config/config.common.ubuntu | 2 +-
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
> index 7e353e930dac..b206dc21ca74 100644
> --- a/debian.azure/config/annotations
> +++ b/debian.azure/config/annotations
> @@ -3070,8 +3070,8 @@ CONFIG_INFINIBAND_CXGB3                         policy<{'amd64': 'm', 'arm64': '
>  CONFIG_INFINIBAND_CXGB3_DEBUG                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
>  CONFIG_INFINIBAND_CXGB4                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
>  CONFIG_INFINIBAND_I40IW                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
> -CONFIG_MLX4_INFINIBAND                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> -CONFIG_MLX5_INFINIBAND                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_MLX4_INFINIBAND                          policy<{'amd64': 'y'}>
> +CONFIG_MLX5_INFINIBAND                          policy<{'amd64': 'y'}>
>  CONFIG_INFINIBAND_NES                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
>  CONFIG_INFINIBAND_NES_DEBUG                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
>  CONFIG_INFINIBAND_OCRDMA                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
> @@ -3096,6 +3096,9 @@ CONFIG_SDMA_VERBOSITY                           policy<{'amd64': 'n'}>
>  CONFIG_INFINIBAND_QEDR                          policy<{'amd64': 'm', 'arm64': 'm', 'ppc64el': 'm'}>
>  CONFIG_INFINIBAND_BNXT_RE                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
>  

IIRC this blank line should actually be a comment line with no contents.
The sorting by menu update expects this form though it has not effect on
its effectivness.

> +CONFIG_MLX4_INFINIBAND                          mark<ENFORCED> note<LP:1759656>
> +CONFIG_MLX5_INFINIBAND                          mark<ENFORCED> note<LP:1759656>
> +
>  # Menu: Device Drivers >> Input device support
>  
>  # Menu: Device Drivers >> Input device support >> Generic input layer (needed for keyboard, mouse, ...)
> diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
> index 8ea51473f3dd..a5230477f7a5 100644
> --- a/debian.azure/config/config.common.ubuntu
> +++ b/debian.azure/config/config.common.ubuntu
> @@ -1971,7 +1971,7 @@ CONFIG_INFINIBAND_OPA_VNIC=m
>  # CONFIG_INFINIBAND_RDMAVT is not set
>  CONFIG_INFINIBAND_SRP=m
>  # CONFIG_INFINIBAND_SRPT is not set
> -CONFIG_INFINIBAND_USER_ACCESS=m
> +CONFIG_INFINIBAND_USER_ACCESS=y
>  # CONFIG_INFINIBAND_USER_MAD is not set
>  CONFIG_INFINIBAND_USER_MEM=y
>  CONFIG_INFINIBAND_USNIC=m

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw

Patch

diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 7e353e930dac..b206dc21ca74 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -3070,8 +3070,8 @@  CONFIG_INFINIBAND_CXGB3                         policy<{'amd64': 'm', 'arm64': '
 CONFIG_INFINIBAND_CXGB3_DEBUG                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_INFINIBAND_CXGB4                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_INFINIBAND_I40IW                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
-CONFIG_MLX4_INFINIBAND                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_MLX5_INFINIBAND                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_MLX4_INFINIBAND                          policy<{'amd64': 'y'}>
+CONFIG_MLX5_INFINIBAND                          policy<{'amd64': 'y'}>
 CONFIG_INFINIBAND_NES                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_INFINIBAND_NES_DEBUG                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 CONFIG_INFINIBAND_OCRDMA                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
@@ -3096,6 +3096,9 @@  CONFIG_SDMA_VERBOSITY                           policy<{'amd64': 'n'}>
 CONFIG_INFINIBAND_QEDR                          policy<{'amd64': 'm', 'arm64': 'm', 'ppc64el': 'm'}>
 CONFIG_INFINIBAND_BNXT_RE                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 
+CONFIG_MLX4_INFINIBAND                          mark<ENFORCED> note<LP:1759656>
+CONFIG_MLX5_INFINIBAND                          mark<ENFORCED> note<LP:1759656>
+
 # Menu: Device Drivers >> Input device support
 
 # Menu: Device Drivers >> Input device support >> Generic input layer (needed for keyboard, mouse, ...)
diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu
index 8ea51473f3dd..a5230477f7a5 100644
--- a/debian.azure/config/config.common.ubuntu
+++ b/debian.azure/config/config.common.ubuntu
@@ -1971,7 +1971,7 @@  CONFIG_INFINIBAND_OPA_VNIC=m
 # CONFIG_INFINIBAND_RDMAVT is not set
 CONFIG_INFINIBAND_SRP=m
 # CONFIG_INFINIBAND_SRPT is not set
-CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_ACCESS=y
 # CONFIG_INFINIBAND_USER_MAD is not set
 CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_USNIC=m