[SRU][jammy:linux-azure][PATCH 1/1] net: mana: Enable MANA driver on ARM64 with 4K page size
John Cabaj
john.cabaj at canonical.com
Thu May 23 21:59:30 UTC 2024
From: Haiyang Zhang <haiyangz at 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 at microsoft.com>
Link: https://lore.kernel.org/r/1715632141-8089-1-git-send-email-haiyangz@microsoft.com
Signed-off-by: Jakub Kicinski <kuba at kernel.org>
(cherry picked from commit 40a1d11fc670ac03c5dc2e5a9724b330e74f38b0)
Signed-off-by: John Cabaj <john.cabaj at canonical.com>
---
debian.azure/config/annotations | 8 +++++---
drivers/net/ethernet/microsoft/Kconfig | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations
index 617a79ac7b13..3d8b04584a39 100644
--- a/debian.azure/config/annotations
+++ b/debian.azure/config/annotations
@@ -96,9 +96,11 @@ CONFIG_INFINIBAND_IPOIB_DEBUG note<'LP:#1798185'>
CONFIG_INPUT_LEDS policy<{'amd64': 'n', 'arm64': 'n'}>
CONFIG_INPUT_LEDS note<'modules reduction'>
-CONFIG_MANA_INFINIBAND policy<{'amd64': 'm'}> note<'LP: #2024917'>
-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': '-'}>
CONFIG_MMC_BLOCK note<'boot essential on armhf/arm64'>
diff --git a/drivers/net/ethernet/microsoft/Kconfig b/drivers/net/ethernet/microsoft/Kconfig
index 9aa4a2980755..f896a6d7e445 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 PAGE_POOL
select AUXILIARY_BUS
--
2.34.1
More information about the kernel-team
mailing list