diff mbox series

[SRU,noble:linux-azure,1/1] net: mana: Enable MANA driver on ARM64 with 4K page size

Message ID 20240523215933.1422346-4-john.cabaj@canonical.com
State New
Headers show
Series [SRU,noble:linux-azure,1/1] net: mana: Enable MANA driver on ARM64 with 4K page size | expand

Commit Message

John Cabaj May 23, 2024, 9:59 p.m. UTC 
From: Haiyang Zhang <haiyangz@microsoft.com>

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

Change the Kconfig dependency, so this driver can be built and run on ARM64
with 4K page size.
16/64K page sizes are not supported yet.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Link: https://lore.kernel.org/r/1715632141-8089-1-git-send-email-haiyangz@microsoft.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 40a1d11fc670ac03c5dc2e5a9724b330e74f38b0)
Signed-off-by: John Cabaj <john.cabaj@canonical.com>
---
 debian.azure/config/annotations        | 7 +++++--
 drivers/net/ethernet/microsoft/Kconfig | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index cc8835726066..3baab4c215c3 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -104,8 +104,11 @@  CONFIG_IWLMEI                                   note<'LP: #1987312'>
 CONFIG_KERNEL_ZSTD                              policy<{'amd64': 'y', 'arm64': 'n'}>
 CONFIG_KERNEL_ZSTD                              note<'LP: #1931725'>
 
-CONFIG_MICROSOFT_MANA                           policy<{'amd64': 'y'}>
-CONFIG_MICROSOFT_MANA                           note<'LP:1949357'>
+CONFIG_MICROSOFT_MANA                           policy<{'amd64': 'y', 'arm64': 'y'}>
+CONFIG_MICROSOFT_MANA                           note<'LP:1949357, LP:2066982'>
+
+CONFIG_MANA_INFINIBAND                          policy<{'amd64': 'm', 'arm64': 'm'}>
+CONFIG_MANA_INFINIBAND                          note<'LP: #2024917, LP:2066982'>
 
 CONFIG_MMC_BLOCK                                policy<{'amd64': '-', 'arm64': 'y'}>
 CONFIG_MMC_BLOCK                                note<'boot essential on armhf/arm64'>
diff --git a/drivers/net/ethernet/microsoft/Kconfig b/drivers/net/ethernet/microsoft/Kconfig
index 01eb7445ead9..286f0d5697a1 100644
--- a/drivers/net/ethernet/microsoft/Kconfig
+++ b/drivers/net/ethernet/microsoft/Kconfig
@@ -17,7 +17,8 @@  if NET_VENDOR_MICROSOFT
 
 config MICROSOFT_MANA
 	tristate "Microsoft Azure Network Adapter (MANA) support"
-	depends on PCI_MSI && X86_64
+	depends on PCI_MSI
+	depends on X86_64 || (ARM64 && !CPU_BIG_ENDIAN && ARM64_4K_PAGES)
 	depends on PCI_HYPERV
 	select AUXILIARY_BUS
 	select PAGE_POOL