From nobody Wed Apr 30 17:22:01 2025 X-Original-To: dev-commits-src-branches@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 4ZnkWZ18GNz5tj26; Wed, 30 Apr 2025 17:22:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZnkWY5n8tz3Mkc; Wed, 30 Apr 2025 17:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033721; 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=Tota2aTDl+pMDdZGdDjEXj6XIEKakYpB6Q1YoKLpImM=; b=HbdMhSxcwQkx1UpKuElc84THHew6LuHg7x6n39R5Yqnjwl3n048R4ejkfzR/B3G4Stda5H nH8vIoPKe/3Vy2mwegrUpzBQAoLANhmTVa3DL9ebGtNdBaUfrv1BgZY7hoGpTiLR9KUC7l A6tQbAkREBPBtXYk/ve2OvX5AYETQPonG+H67dPffaRTTskT4WRG5wnXDfYwcC1d03h5JT brK0L2e2Uw3HN5KpHl07XaUpdyOe4641zO6mTskMALFe47Vo2jFq67mCWCjRVqgd6Yjfps 9PTwpIdGk/fFjKTLCsmSLfLGLphr4wwJUEsU7yvUSUEu2nSy3Jq54c4yn728Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746033721; a=rsa-sha256; cv=none; b=ssEi3qkHxW3/xrxS/SZASvaa0tAWc4T/KzhafYV6uhF9kcqMy6vgtog7ASUrk4+ru3IwuC 5kOqHQcDY17bfiHQcRSdjvmQhpZHFKNSUAeHtuti0i4GuHyUw+X1Qhfhyu6YUAPhCwdFIB Sf1yx+P3LKEsJnysI/ZCovc9wzYmCpiCaSfv2emDZFqFUn9PM2Hr7zBIck1YzJJBkVmDi5 DhyqXtdiZkhRnorZ5sNRecDenToJ2bEJ2sxgBmL2T1eW09nnqXV+JazZp5MXD44TxaSgV2 wFJ/50Y7OQ5DbbjLP3ASvPN9oBS2NFOh5hBxKuApMMtWUnNXFOI82qD7yDGKpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033721; 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=Tota2aTDl+pMDdZGdDjEXj6XIEKakYpB6Q1YoKLpImM=; b=HCDTGihqMCpGw1fWT81Ao1L8iGK5LPf0r8LOEcusAVrTd7XgVVgNAMUye0E8ujojRf8Wzk LRan6Z6D+g/vsB0QzT3yuOAhTJPsEN9+NRMlgsZImSDazNFJ6JFJ6J5iLLN/gFiNWlUrPf 8z2tXiUJZzfehv4Keovh/9ujtg6IQaFQylm/ENJ63ASFNv+H+O5FUWR5CPpYOT2nCpkYiX 3ngFSAL5ZLe0bhU9bQ4PryMVK4LBII8QP6w4CxNnypdVuM6HSVjMqQwJyPKUKPyQwUK7RY 5FB+qHT5JwxlY6+qlrgc1Vqs6cIYJqdqzELeVznTmgtQw8ahIsKx54T+clZT5w== 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 4ZnkWY5HlxzyL; Wed, 30 Apr 2025 17:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53UHM1Cw095633; Wed, 30 Apr 2025 17:22:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53UHM1Nx095630; Wed, 30 Apr 2025 17:22:01 GMT (envelope-from git) Date: Wed, 30 Apr 2025 17:22:01 GMT Message-Id: <202504301722.53UHM1Nx095630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e2b8fb2202c2 - stable/14 - mpi3mr: Allow driver to be in-kenrel and add to GENERIC List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: e2b8fb2202c224bb9b0e0f3333d5be5343267e89 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e2b8fb2202c224bb9b0e0f3333d5be5343267e89 commit e2b8fb2202c224bb9b0e0f3333d5be5343267e89 Author: Chandrakanth patil AuthorDate: 2025-04-27 23:40:45 +0000 Commit: Warner Losh CommitDate: 2025-04-30 17:06:54 +0000 mpi3mr: Allow driver to be in-kenrel and add to GENERIC Registered the mpi3mr driver source files in sys/conf/files, enabling it to be compiled into the base kernel image. This matches the approach used for existing Broadcom drivers such as mrsas, mps, and mpr. Add mpi3mr to sys/conf/NOTES. With this change, the mpi3mr driver will be built as part of the base kernel, allowing automatic loading during boot when supported hardware is detected. Below changes are suggested by chs@: - Corrected the file name typo mistake in /sys/conf/files from mpi3mr_app.c.c to mpi3mr_app.c - Added mpi3mr driver entries in "sys/amd64/conf/GENERIC" and "sys/i386/conf/GENERIC" Reviewed by: ssaxena, chs, imp Differential Revision: https://reviews.freebsd.org/D49754 (cherry picked from commit 9cdd40759617b15fdd6939d33f67aa2c9d2a6b1e) --- sys/amd64/conf/GENERIC | 1 + sys/conf/NOTES | 1 + sys/conf/files | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 8ad3a3ccd425..c4177429c999 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -148,6 +148,7 @@ device isp # Qlogic family device mpt # LSI-Logic MPT-Fusion device mps # LSI-Logic MPT-Fusion 2 device mpr # LSI-Logic MPT-Fusion 3 +device mpi3mr # LSI-Logic MPT-Fusion 4 device sym # NCR/Symbios Logic device isci # Intel C600 SAS controller device ocs_fc # Emulex FC adapters diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 20465d9aaf32..695bcb5f3ef6 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1588,6 +1588,7 @@ envvar hint.isp.0.topology="nport-only" envvar hint.isp.0.portwnn="w50000000aaaa0000" envvar hint.isp.0.nodewnn="w50000000aaaa0001" device ispfw +device mpi3mr # LSI-Logic MPT-Fusion 4 device mpr # LSI-Logic MPT-Fusion 3 device mps # LSI-Logic MPT-Fusion 2 device mpt # LSI-Logic MPT-Fusion diff --git a/sys/conf/files b/sys/conf/files index 34f57c32361a..c793c0814fde 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2479,6 +2479,11 @@ dev/mrsas/mrsas.c optional mrsas dev/mrsas/mrsas_cam.c optional mrsas dev/mrsas/mrsas_ioctl.c optional mrsas dev/mrsas/mrsas_fp.c optional mrsas +dev/mpi3mr/mpi3mr.c optional mpi3mr +dev/mpi3mr/mpi3mr_pci.c optional mpi3mr +dev/mpi3mr/mpi3mr_app.c optional mpi3mr +dev/mpi3mr/mpi3mr_cam.c optional mpi3mr \ + compile-with "${LINUXKPI_C}" dev/msk/if_msk.c optional msk dev/mvs/mvs.c optional mvs dev/mvs/mvs_if.m optional mvs