From patchwork Thu May 23 21:59:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1938601 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 4Vlht11Wdjz20dw 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 1sAGTP-00081C-Mn; Thu, 23 May 2024 21:59:43 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sAGTM-0007zA-9y for kernel-team@lists.ubuntu.com; Thu, 23 May 2024 21:59:40 +0000 Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) (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-1.canonical.com (Postfix) with ESMTPS id C9D393F62E for ; Thu, 23 May 2024 21:59:39 +0000 (UTC) Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-627e9a500faso39939187b3.1 for ; Thu, 23 May 2024 14:59:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716501578; x=1717106378; 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=Lc4jFkNEhLyp91XerblvGmUCb5yfto/talVaKgjXOIU=; b=hJEjuS01Wqj+iwqKd8O35UZty7W5VSNBc0jg7mjUo45KbyYCNr9iTfrslSoVDTLp// YiCnR9Ivy/Znv+wX0HLZObK4DSGaRI4yYQBDf0V+st0ifdEjfR+1k50VcZL/fDizON12 wLCbQIX/38kxScMSUfT5YUlz7ydKd9LP6pW7lcKhbHTeFSAXNNEmHZ3C8yPXURnRsYAI OFfeO1vZUESSEoNUzFjCoJ6HhjV8NalTSggUKf3+NTpM2DBZlzQ/pA/VD7Rqo5Ux2RDC JlyqRTs27PjyylnDoMM/hTBfgpMGvOU3Jlnx7fGBrClrYcsYnb90BaEchhj4qUEe8Kxw UypQ== X-Gm-Message-State: AOJu0YzLVpSB1gpftq5v+5dAYz46pZVuM4Eo1d423VvN1RfUjCO74/Qp DmjBzfjjWUJKPPhTrmrsBSGcrRhILJEsm9mUOu+vrRoWBoJSN+PqW0ci/H+XZCLD2rjQPpps77m YetHZN+rxhKFR/vW/mZRHpDGe6bAUJWsGtgw5MqmKIchqJ4SqG8CJikTW8ax62oPIIHir29RjIu eXM3suunNfbw== X-Received: by 2002:a81:a052:0:b0:627:dfbd:89f with SMTP id 00721157ae682-62a08d291b9mr4545887b3.6.1716501578283; Thu, 23 May 2024 14:59:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHQkFNxtTYc7fB66FQowe6h2H1C53LCvNQPO9Jd47uvdghl7G3DL9B0+dahR/jalfbTOQ/S9Q== X-Received: by 2002:a81:a052:0:b0:627:dfbd:89f with SMTP id 00721157ae682-62a08d291b9mr4545727b3.6.1716501578008; Thu, 23 May 2024 14:59:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 14:59:37 -0700 (PDT) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][oracular:linux-azure][PATCH 1/1] net: mana: Enable MANA driver on ARM64 with 4K page size Date: Thu, 23 May 2024 16:59:33 -0500 Message-Id: <20240523215933.1422346-5-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 | 7 +++++-- drivers/net/ethernet/microsoft/Kconfig | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 120e647fb834..891bfd3e3729 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