From e2b8fb2202c224bb9b0e0f3333d5be5343267e89 Mon Sep 17 00:00:00 2001 From: Chandrakanth patil Date: Sun, 27 Apr 2025 17:40:45 -0600 Subject: [PATCH] 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 8ad3a3ccd42..c4177429c99 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 20465d9aaf3..695bcb5f3ef 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 34f57c32361..c793c0814fd 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