From owner-svn-src-all@freebsd.org Fri Nov 22 18:50:54 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BCC571BE4DF; Fri, 22 Nov 2019 18:50:54 +0000 (UTC) (envelope-from scottl@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47KQVk4cTKz45WL; Fri, 22 Nov 2019 18:50:54 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 819F827DF1; Fri, 22 Nov 2019 18:50:54 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAMIosnI063260; Fri, 22 Nov 2019 18:50:54 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAMIospb063258; Fri, 22 Nov 2019 18:50:54 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201911221850.xAMIospb063258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Fri, 22 Nov 2019 18:50:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355012 - in head: share/man/man4 sys/dev/trm X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: in head: share/man/man4 sys/dev/trm X-SVN-Commit-Revision: 355012 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Nov 2019 18:50:54 -0000 Author: scottl Date: Fri Nov 22 18:50:53 2019 New Revision: 355012 URL: https://svnweb.freebsd.org/changeset/base/355012 Log: Schedule the trm(4) driver for removal. It relies on Giant and thus has required compat shims in CAM for 12 years. Relnotes: yes Modified: head/share/man/man4/trm.4 head/sys/dev/trm/trm.c Modified: head/share/man/man4/trm.4 ============================================================================== --- head/share/man/man4/trm.4 Fri Nov 22 18:41:09 2019 (r355011) +++ head/share/man/man4/trm.4 Fri Nov 22 18:50:53 2019 (r355012) @@ -48,6 +48,9 @@ module at boot time, place the following line in .Bd -literal -offset indent trm_load="YES" .Ed +.Sh DEPRECATION NOTICE +This driver is scheduled for removal prior to the release of +.Fx 13.0 .Sh DESCRIPTION The .Nm Modified: head/sys/dev/trm/trm.c ============================================================================== --- head/sys/dev/trm/trm.c Fri Nov 22 18:41:09 2019 (r355011) +++ head/sys/dev/trm/trm.c Fri Nov 22 18:50:53 2019 (r355012) @@ -3376,7 +3376,9 @@ trm_attach(device_t dev) PACB pACB = 0; int rid = 0; int unit = device_get_unit(dev); - + + gone_in(13, "Giant locked CAM drivers"); + device_id = pci_get_devid(dev); /* * These cards do not allow memory mapped accesses