From nobody Sat Jul 01 17:10:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qtdwp6Q9Gz4l3bv; Sat, 1 Jul 2023 17:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qtdwp4zNyz3hlp; Sat, 1 Jul 2023 17:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688231418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKjECQCU33rDLbalafsdHyhLAZxO+bwTS++vk/c01k4=; b=wotBEX9CFiutk3a2KVJ+oLmn73fy+V4ouoVLzg0aflGvT743GXidUy9Xai/dJkAy7CE4rW WVlSiOzgMmM7tE8TdXRUrxKnYDIr9/NWrUQP6zm4oczc9WAzCgb7I+5/TIEUp6Tt/0Ro+x hDIRaRBnpcI22ynkiq9sIgQ6B60JMZ7cs53M7sl73yGkoyn72CPRAwqsP1FssbqI5Kwagt d+n9aeaFwK0Gbzww9X5CNsYaEdVIoRh7ZZefugfhCqAb2H/s4KspTAlH1QvyEWXFuE9s0I ZvvTuXK1eDfdnu00YNOc5gPQQthui9ZyAOF/p8o+/v2VPDq8Tx31SfHeF0w0RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688231418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKjECQCU33rDLbalafsdHyhLAZxO+bwTS++vk/c01k4=; b=b90ifVtKAF63Ar+GIEaeVz67R8ytHDVEmUuLox46ZuXA1fLEhBKuH/1ypC6+wQLaFX92Y7 FsDst9+LGRrHwrdKyOnlvwmNv91N4oWdkSGEDa7emahetruXOFXjdGt2BSbQLKGBd2dTGO 1ir43Gb5bpjVuS+0BT62WZKQziM3ltwtZn4OtIzU9lHAjqz+Sl0jM+LmaLpejStg0Bukzt 4fj5PJzoCuPpdFAvLMk4MIG3cB6PNyomdh5vXgKf5C5J+Z57q3xnAtN9Lb4d+4sNgvbV9X WBXGga3Vz8nNWc+kLda3ZAGQfwcEAb+sxrYn6JmH8mK/VAsAhd3A9vuBSRyCow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688231418; a=rsa-sha256; cv=none; b=nQ5SKh6WbMMQuSAskkACZG1KL4Vl8RAKcCyQUUalW8aIXrP4M3FBLLzw0VTzXUsoXW2GSg cyw5I4KWhU+fKVJoDQP8I0sgg+n6YAkIumtESec7YtSzfg5nktZfsrOQPJh8OHxNF2XY6n y3Zz3PVCTuq6Kk0AGgV4K8jopkTvkQmQAf0+yOs1KESShWyAx2qoxJJuzNSuwhaXdQ9jWF uF1KbrgRcadsjC1ZE/xHmb+zsOHzI3/yoBd7OlkLoNI64g27WVpeJp4Z/S9VEAgS4swuOz lQ42TQ9sqAMNBQVMWfb2km7Puas4eQ3FERHPOL5x6dXCfT/bWnOpotNponlGtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qtdwp37kqzYbF; Sat, 1 Jul 2023 17:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361HAIwH047184; Sat, 1 Jul 2023 17:10:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361HAIak047183; Sat, 1 Jul 2023 17:10:18 GMT (envelope-from git) Date: Sat, 1 Jul 2023 17:10:18 GMT Message-Id: <202307011710.361HAIak047183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e4017d9b6913 - main - qlnxe: Fix building as in-kernel component List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4017d9b6913257b1ca6735ab1159f805419d2ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e4017d9b6913257b1ca6735ab1159f805419d2ec commit e4017d9b6913257b1ca6735ab1159f805419d2ec Author: Mark O'Donovan AuthorDate: 2023-07-01 17:06:51 +0000 Commit: Warner Losh CommitDate: 2023-07-01 17:06:59 +0000 qlnxe: Fix building as in-kernel component Add some extra files for building the driver as part of the kernel. Change some #defines to match those used when building as a module. PR: 268354 Signed-off-by: Mark O'Donovan Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/779 --- sys/conf/files.amd64 | 16 ++++++++++++++++ sys/dev/qlnx/qlnxe/ecore.h | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index dd80c357a502..37e069da5918 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -297,6 +297,22 @@ dev/qlnx/qlnxe/ecore_sp_commands.c optional qlnxe pci \ compile-with "${LINUXKPI_C}" dev/qlnx/qlnxe/ecore_spq.c optional qlnxe pci \ compile-with "${LINUXKPI_C}" +dev/qlnx/qlnxe/ecore_sriov.c optional qlnxe pci \ + compile-with "${LINUXKPI_C}" +dev/qlnx/qlnxe/ecore_vf.c optional qlnxe pci \ + compile-with "${LINUXKPI_C}" +dev/qlnx/qlnxe/ecore_ll2.c optional qlnxe pci \ + compile-with "${LINUXKPI_C}" +dev/qlnx/qlnxe/ecore_iwarp.c optional qlnxe pci \ + compile-with "${LINUXKPI_C}" +dev/qlnx/qlnxe/ecore_rdma.c optional qlnxe pci \ + compile-with "${LINUXKPI_C}" +dev/qlnx/qlnxe/ecore_roce.c optional qlnxe pci \ + compile-with "${LINUXKPI_C}" +dev/qlnx/qlnxe/ecore_ooo.c optional qlnxe pci \ + compile-with "${LINUXKPI_C}" +dev/qlnx/qlnxe/qlnx_rdma.c optional qlnxe pci \ + compile-with "${LINUXKPI_C}" dev/qlnx/qlnxe/qlnx_ioctl.c optional qlnxe pci \ compile-with "${LINUXKPI_C}" dev/qlnx/qlnxe/qlnx_os.c optional qlnxe pci \ diff --git a/sys/dev/qlnx/qlnxe/ecore.h b/sys/dev/qlnx/qlnxe/ecore.h index b83e777dac8e..3169e9cda6df 100644 --- a/sys/dev/qlnx/qlnxe/ecore.h +++ b/sys/dev/qlnx/qlnxe/ecore.h @@ -94,9 +94,10 @@ enum ecore_nvm_cmd { #define CONFIG_ECORE_SRIOV #define CONFIG_ECORE_ROCE #define CONFIG_ECORE_IWARP -#define CONFIG_ECORE_FCOE -#define CONFIG_ECORE_ISCSI #define CONFIG_ECORE_LL2 +#define CONFIG_ECORE_RDMA +#define ECORE_CONFIG_DIRECT_HWFN +#define QLNX_ENABLE_IWARP #endif #endif