From nobody Mon Apr 28 03:25:28 2025 X-Original-To: dev-commits-src-main@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 4Zm83F4rSXz5tkqb; Mon, 28 Apr 2025 03:25:29 +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 4Zm83F0yZCz3cqf; Mon, 28 Apr 2025 03:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745810729; 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=3382en57iOhc+w7j/H7rV7DK/ofbxAGDM8d6mwC+4s8=; b=wTfy+H+BSrClmy0Tk3B9NHPgxn0FUfK0x/mM+Rti7iNEaR43IueXwIa4Rs7DN2XVwCu0Oh qt1ASq17rxgm/B9tfVrK8e7dsO8TRN7Hf7SkovEOrcSNas7NLW4i61uYWJXkWsPYL1z62M +bvGhCYj52XdowUSHbh6BuyC+kG7iv3bIRfVG+tG1YCkFXeH0KQn/Xa6ahH4b0MkE1RWlg 9fnp1urKcAvITGBVQ4XXWHbM8Uq+BnE2d8Dk1keoiMMQ14iiv71IeGsn+eDgK7SH5xEs6t XNXsZE3Y51qLvf7C6hGa9oEGcnIxQ9MHQtriPR2vBTFbkwO8zR4oBbrDQ5vm9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745810729; a=rsa-sha256; cv=none; b=kZnBTz5lLk49kAMQzor356ublbuY5M7KOiykAzaZ3hQNJNulS9bTixri4hGvYW90vNt+pL /slez6mpG/3ENgJCkAGM2z+2laJgzMOJBzCAAO2+7mfAaXe8gsvMXlBQZVNKlQM8CQyctW sPsf6AVYH7NOnBWwlv3R1G5dzc5b9KYwS5wUOn3dTrQ9XWVyPAbV/ll+Op9Uf+Iti/rhLi CQLnSEBitEFm7BGrDqFEr942P2jw4DqqsoTceSfu7RU78PS93V1EiVNcLrjUF3c8ZOa4p5 sLVNyIHpHlsClgZMmDi8fAEf90+348SmN4/11qoqzkHB+viJ1eTdtScqvhwAqw== 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=1745810729; 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=3382en57iOhc+w7j/H7rV7DK/ofbxAGDM8d6mwC+4s8=; b=VJo7S/13xKZbRDqBZQNxig9blQXsSSTDwnmPeUefgPIFB8wWRjfaVEbCexYfjaUaAxWinW YmPDs0LBKni+DxRKW3HGI/+1ybDC8wCY5qp6WTkR8IBROaPwAguUANwN2aVRRyHlbWONnE uj5iKyI6/K7IkzRMS/v4ggxwzmPg/AMDhiO4TJzqOY4uFpBsKVhcQf00C22XyyYtZKhVSt OtVQWre3X2tDS+ezLzjYrRIoMosjKBTdm7Pg+TXdaTZXgREWDAP3HXxDzGCCrCXU4/xnn8 ikWqsYTGCWrnj4NdvCxYyTTDWOn6tsXkyt0TxIX3sedN3Z5ab9pS8hMTc/lvoQ== 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 4Zm83F0GrQz3C6; Mon, 28 Apr 2025 03:25:29 +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 53S3PSP1014992; Mon, 28 Apr 2025 03:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53S3PSFp014989; Mon, 28 Apr 2025 03:25:28 GMT (envelope-from git) Date: Mon, 28 Apr 2025 03:25:28 GMT Message-Id: <202504280325.53S3PSFp014989@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: 9cdd40759617 - main - mpi3mr: Allow driver to be in-kenrel and add to GENERIC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9cdd40759617b15fdd6939d33f67aa2c9d2a6b1e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9cdd40759617b15fdd6939d33f67aa2c9d2a6b1e commit 9cdd40759617b15fdd6939d33f67aa2c9d2a6b1e Author: Chandrakanth patil AuthorDate: 2025-04-27 23:40:45 +0000 Commit: Warner Losh CommitDate: 2025-04-28 03:23:51 +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 --- 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 6921c1d73a58..1c44bc54376b 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -145,6 +145,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 081cb985c7fe..9afb04ce6ef1 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1592,6 +1592,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 d3ee52399291..66d96acedfc6 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2465,6 +2465,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