[F][PATCH 1/1] UBUNTU: [Config] Increase CONFIG_PCI_NR_FUNCTIONS from 64 to 512 starting with focal on s390x

[frank.heimes at canonical.com]

From: Frank Heimes <frank.heimes at canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1866056

The current CONFIG_PCI_NR_FUNCTIONS setting of 64 is no longer sufficient for network adapters that support SRIOV and up to 130 PCI functions.
Therefore the CONFIG_PCI_NR_FUNCTIONS kernel config option need to be increased to a value of 512, starting with focal.

Signed-off-by: Frank Heimes <frank.heimes at canonical.com>
---
 debian.master/config/annotations          | 4 +++-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index bec875bb7182..8af1d985cd66 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10492,7 +10492,9 @@ CONFIG_SCM_BUS                                  policy<{'s390x': 'y'}>
 CONFIG_EADM_SCH                                 policy<{'s390x': 'm'}>
 CONFIG_VFIO_CCW                                 policy<{'s390x': 'm'}>
 CONFIG_VFIO_AP                                  policy<{'s390x': 'm'}>
-CONFIG_PCI_NR_FUNCTIONS                         policy<{'s390x': '64'}>
+CONFIG_PCI_NR_FUNCTIONS                         policy<{'s390x': '512'}>
+
+CONFIG_PCI_NR_FUNCTIONS                         mark<ENFORCED> note<LP:1866056>
 
 # Menu: Kernel hacking
 CONFIG_MAGIC_SYSRQ                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8b928b46401f..acb9a8697726 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7031,7 +7031,7 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MVEBU=y
-CONFIG_PCI_NR_FUNCTIONS=64
+CONFIG_PCI_NR_FUNCTIONS=512
 # CONFIG_PCI_P2PDMA is not set
 CONFIG_PCI_PF_STUB=m
 CONFIG_PCI_RCAR_GEN2=y
-- 
2.25.0