From patchwork Thu May 23 21:59:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1938599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vlht10FyTz20KL for ; Fri, 24 May 2024 07:59:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sAGTL-0007yl-IK; Thu, 23 May 2024 21:59:39 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sAGTJ-0007yQ-Fn for kernel-team@lists.ubuntu.com; Thu, 23 May 2024 21:59:37 +0000 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 346F1411AB for ; Thu, 23 May 2024 21:59:37 +0000 (UTC) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-43e4454be9fso6442321cf.0 for ; Thu, 23 May 2024 14:59:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716501576; x=1717106376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sSWCisWd3QzFGJJQMY0IkYRMQlk2b2OG8bP+Yrr0BYI=; b=kv9Qxh1mbRpv/hghJmSp3R2aXtDpXp/YS2tw0I9/SwkRngEUg5nFT4podH6K5jioVw pgc5/Sv11/+D8KM/PzWYbt34QikncrOFaDAs4wvMb+D8IPTLUxlYUub/sOTy9x+nxvZ9 MAyExOQzqbh65eLtHpBkxU1wbQfkuRIwjrV2Nmc/QML9NMbW+SPqKznOmpsyttKrEDuy F+V8001VMelLX34Z1+G+oBFUjd+mirkp9akY5g8mYiEL4YEj5UHHpSMr2PQc5b8QLAO3 wlSgOFJlOixv8jK7TFIFVcTXo6IkzBYh0oM8HgbPXuMxTLAAWuQ9gY9bq3BhWRj9fx2g w8yA== X-Gm-Message-State: AOJu0YzRpVPtmc3hSIMDa3beATSftQbqgPmWuuSGvaJYZvuQaPBKJXwu 47RZ2LCMcYV6sQhq/atbOlx8u3CpHoBoJYE94uIZeLgX6zWcoyxbEG+MxndRhl3EhqLG64XDlgc X7RlAWiEUzWKQLMzVRcSyEz0TwkvivGMgUWYteX9j7Be0DcCC7riWHLdhhoOGKYPGAZLn7XYANJ YAkTw2Z2G3Vw== X-Received: by 2002:ac8:5712:0:b0:43a:db77:100a with SMTP id d75a77b69052e-43fb0e8e1a9mr4126231cf.34.1716501576198; Thu, 23 May 2024 14:59:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExtbXa6qWQR8hvryObKuUaqrzYvEDMO3WkNIk9cKT2Dxn2MyBLqbsGbFkzFMRxrCMe2NzeYg== X-Received: by 2002:ac8:5712:0:b0:43a:db77:100a with SMTP id d75a77b69052e-43fb0e8e1a9mr4126101cf.34.1716501575867; Thu, 23 May 2024 14:59:35 -0700 (PDT) Received: from smtp.gmail.com (h208-73-92-250.mdtnwi.broadband.dynamic.tds.net. [208.73.92.250]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43fb16b97b5sm883421cf.18.2024.05.23.14.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 14:59:35 -0700 (PDT) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][jammy:linux-azure][PATCH 1/1] net: mana: Enable MANA driver on ARM64 with 4K page size Date: Thu, 23 May 2024 16:59:30 -0500 Message-Id: <20240523215933.1422346-2-john.cabaj@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240523215933.1422346-1-john.cabaj@canonical.com> References: <20240523215933.1422346-1-john.cabaj@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Haiyang Zhang 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 Link: https://lore.kernel.org/r/1715632141-8089-1-git-send-email-haiyangz@microsoft.com Signed-off-by: Jakub Kicinski (cherry picked from commit 40a1d11fc670ac03c5dc2e5a9724b330e74f38b0) Signed-off-by: John Cabaj --- 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