svn commit: r368382 - stable/12/sbin/camcontrol
Author: gbe (doc committer) Date: Sun Dec 6 07:57:56 2020 New Revision: 368382 URL: https://svnweb.freebsd.org/changeset/base/368382 Log: MFC r367889: camcontrol(8): Fix some warnings spotted by mandoc - skipping paragraph macro: Pp before Bl Modified: stable/12/sbin/camcontrol/camcontrol.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/camcontrol/camcontrol.8 == --- stable/12/sbin/camcontrol/camcontrol.8 Sun Dec 6 07:55:12 2020 (r368381) +++ stable/12/sbin/camcontrol/camcontrol.8 Sun Dec 6 07:57:56 2020 (r368382) @@ -2276,7 +2276,6 @@ These zones must be written sequentially. If they are not written sequentially, starting at the write pointer, the command will fail. .El -.Pp .Bl -tag -width 12n .It Fl c Ar cmd Specify the zone subcommand: @@ -2831,7 +2830,6 @@ This will read and decode the attribute values from pa in tape drive sa0, and will display any .Tn SCSI errors that result. -.Pp .Bd -literal -offset indent camcontrol zone da0 -v -c rz -P summary .Ed @@ -2842,7 +2840,6 @@ summary of the zone parameters, and display any or .Tn ATA errors that result. -.Pp .Bd -literal -offset indent camcontrol zone da0 -v -c rz -o reset .Ed @@ -2853,7 +2850,6 @@ pointer reset from the disk da0, and display any or .Tn ATA errors that result. -.Pp .Bd -literal -offset indent camcontrol zone da0 -v -c rwp -l 0x2c8 .Ed @@ -2864,7 +2860,6 @@ that starts at LBA 0x2c8 and display any or .Tn ATA errors that result. -.Pp .Bd -literal -offset indent camcontrol epc ada0 -c timer -T 60.1 -p Idle_a -e -s .Ed @@ -2873,7 +2868,6 @@ Set the timer for the Idle_a power condition on drive .Pa ada0 to 60.1 seconds, enable that particular power condition, and save the timer value and the enabled state of the power condition. -.Pp .Bd -literal -offset indent camcontrol epc da4 -c goto -p Standby_z -H .Ed @@ -2885,7 +2879,6 @@ the drive's lowest power state) and hold in that state explicitly released by another .Cm goto command. -.Pp .Bd -literal -offset indent camcontrol epc da2 -c status -P .Ed @@ -2903,7 +2896,6 @@ to only send the .Tn ATA CHECK POWER MODE command, which should not trigger a change in the drive's power state. -.Pp .Bd -literal -offset indent camcontrol epc ada0 -c list .Ed @@ -2911,7 +2903,6 @@ camcontrol epc ada0 -c list Display the ATA Power Conditions log (Log Address 0x08) for drive .Pa ada0 . -.Pp .Bd -literal -offset indent camcontrol timestamp sa0 -s -f "%a, %d %b %Y %T %z" \e -T "Wed, 26 Oct 2016 21:43:57 -0600" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368381 - stable/12/sbin/devmatch
Author: gbe (doc committer) Date: Sun Dec 6 07:55:12 2020 New Revision: 368381 URL: https://svnweb.freebsd.org/changeset/base/368381 Log: MFC r32 (by imp), r367897 r32: devmatch: First appeared in 12.0 Document that devmatch first appeared in FreeBSD 12.0. Also can't -> can not. But it doesn't help the sentence much. r367897: devmatch(8): Fix section ordering - sections out of conventional order: Sh HISTORY Modified: stable/12/sbin/devmatch/devmatch.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/devmatch/devmatch.8 == --- stable/12/sbin/devmatch/devmatch.8 Sun Dec 6 07:50:15 2020 (r368380) +++ stable/12/sbin/devmatch/devmatch.8 Sun Dec 6 07:55:12 2020 (r368381) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 16, 2018 +.Dd October 12, 2020 .Dt DEVMATCH 8 .Os .Sh NAME @@ -62,13 +62,17 @@ Parse and use a standard NOMATCH event from for matching instead of searching the device tree. .It Fl u Fl -unbound Attempt to produce a list of those drivers with PNP info whose driver -tables with that PNP info can't be found. +tables with that PNP info can not be found. .It Fl v Fl -verbose Produce more verbose output. .El .Sh SEE ALSO .Xr devinfo 8 , .Xr MODULE_PNP_INFO 9 +.Sh HISTORY +.Nm +first appeared in +.Fx 12.0 . .Sh AUTHORS .An Warner Losh Aq Mt i...@freebsd.org .Sh BUGS ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368380 - in stable/12: sbin/devmatch sbin/fsck sbin/mount_msdosfs usr.bin/chat usr.bin/du usr.bin/setchannel usr.bin/tftp usr.sbin/ctladm usr.sbin/extattrctl usr.sbin/i2c usr.sbin/moun...
Author: gbe (doc committer) Date: Sun Dec 6 07:50:15 2020 New Revision: 368380 URL: https://svnweb.freebsd.org/changeset/base/368380 Log: MFC r366572: Fix a few mandoc issues - no blank before trailing delimiter - whitespace at end of input line - sections out of conventional order - normalizing date format - AUTHORS section without An macro Modified: stable/12/sbin/devmatch/devmatch.8 stable/12/sbin/fsck/fsck.8 stable/12/sbin/mount_msdosfs/mount_msdosfs.8 stable/12/usr.bin/chat/chat.8 stable/12/usr.bin/du/du.1 stable/12/usr.bin/setchannel/setchannel.1 stable/12/usr.bin/tftp/tftp.1 stable/12/usr.sbin/ctladm/ctladm.8 stable/12/usr.sbin/extattrctl/extattrctl.8 stable/12/usr.sbin/i2c/i2c.8 stable/12/usr.sbin/mountd/exports.5 stable/12/usr.sbin/nfsuserd/nfsuserd.8 stable/12/usr.sbin/pmcstudy/pmcstudy.8 stable/12/usr.sbin/traceroute6/traceroute6.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/devmatch/devmatch.8 == --- stable/12/sbin/devmatch/devmatch.8 Sun Dec 6 07:47:10 2020 (r368379) +++ stable/12/sbin/devmatch/devmatch.8 Sun Dec 6 07:50:15 2020 (r368380) @@ -69,6 +69,8 @@ Produce more verbose output. .Sh SEE ALSO .Xr devinfo 8 , .Xr MODULE_PNP_INFO 9 +.Sh AUTHORS +.An Warner Losh Aq Mt i...@freebsd.org .Sh BUGS The kernel has hints in it, but we exclude it from the list of modules to suggest for unmatched devices. @@ -92,5 +94,3 @@ logical equivalent in USB, PCI, and others. .Pp Many drivers currently lack proper PNP table decorations and need to be updated. -.Sh AUTHORS -.An Warner Losh Aq Mt i...@freebsd.org Modified: stable/12/sbin/fsck/fsck.8 == --- stable/12/sbin/fsck/fsck.8 Sun Dec 6 07:47:10 2020(r368379) +++ stable/12/sbin/fsck/fsck.8 Sun Dec 6 07:50:15 2020(r368380) @@ -143,7 +143,7 @@ only if is compiled to support it. .It Fl f Force checking of file systems. -Running +Running .Dq Li fsck -f ignores the journal and does a full consistency check of the disk so will find and fix the errors about which the Modified: stable/12/sbin/mount_msdosfs/mount_msdosfs.8 == --- stable/12/sbin/mount_msdosfs/mount_msdosfs.8Sun Dec 6 07:47:10 2020(r368379) +++ stable/12/sbin/mount_msdosfs/mount_msdosfs.8Sun Dec 6 07:50:15 2020(r368380) @@ -202,7 +202,7 @@ and first appeared in was renamed to the more aptly-named .Nm in -.Fx 5.0. +.Fx 5.0 . The character code conversion routine was added in 2003. .Sh AUTHORS Initial implementation as Modified: stable/12/usr.bin/chat/chat.8 == --- stable/12/usr.bin/chat/chat.8 Sun Dec 6 07:47:10 2020 (r368379) +++ stable/12/usr.bin/chat/chat.8 Sun Dec 6 07:50:15 2020 (r368380) @@ -291,7 +291,8 @@ The .Dv SAY strings could be used to give progress messages in sections of the script where you want to have 'ECHO OFF' but still let the user -know what is happening. An example is: +know what is happening. +An example is: .Bd -literal -offset indent ABORT BUSY ECHO OFF Modified: stable/12/usr.bin/du/du.1 == --- stable/12/usr.bin/du/du.1 Sun Dec 6 07:47:10 2020(r368379) +++ stable/12/usr.bin/du/du.1 Sun Dec 6 07:50:15 2020(r368380) @@ -63,7 +63,7 @@ Calculate block counts in .Ar blocksize byte blocks. This is different from the -.Fl h, k, m, +.Fl h , k , m , .Fl Fl si and .Fl g @@ -172,7 +172,7 @@ options override each other and the command's actions by the last one specified. .Pp The -.Fl h, k, m +.Fl h , k , m and .Fl Fl si options all override each other; the last one specified determines @@ -183,7 +183,7 @@ the block counts used. If the environment variable .Ev BLOCKSIZE is set, and the -.Fl h, k, m +.Fl h , k , m or .Fl Fl si options are not specified, the block counts will be displayed in units of @@ -191,7 +191,7 @@ that block size. If .Ev BLOCKSIZE is not set, and the -.Fl h, k, m +.Fl h , k , m or .Fl Fl si options are not specified, the block counts will be displayed in 512-byte Modified: stable/12/usr.bin/setchannel/setchannel.1 == --- stable/12/usr.bin/setchannel/setchannel.1 Sun Dec 6 07:47:10 2020 (r368379) +++ stable/12/usr.bin/setchannel/setchannel.1 Sun Dec 6 07:50:15 2020 (r368380) @@ -61,8 +61,8 @@ Select svideo input. .It Fl t Select tuner. .It Fl g Cm geom -Select geometry. The first resolution is for NTSC, the second for -PAL. +Select geometry. +The first resolution is for NTSC, the second for PAL. .Pp VCD: 352x240 or
svn commit: r368379 - stable/12/usr.sbin/mountd
Author: gbe (doc committer) Date: Sun Dec 6 07:47:10 2020 New Revision: 368379 URL: https://svnweb.freebsd.org/changeset/base/368379 Log: MFC r344013 and r344015 (by cracauer) r344013: Clarify NFSv4 /etc/exports semantics, with working example. The existing wording has been confusing users for years. r344015: Bump .Dd for today's edit. Thank you Enji Cooper Modified: stable/12/usr.sbin/mountd/exports.5 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/mountd/exports.5 == --- stable/12/usr.sbin/mountd/exports.5 Sun Dec 6 07:38:58 2020 (r368378) +++ stable/12/usr.sbin/mountd/exports.5 Sun Dec 6 07:47:10 2020 (r368379) @@ -28,7 +28,7 @@ .\" @(#)exports.5 8.3 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd May 20, 2017 +.Dd Feb 11, 2019 .Dt EXPORTS 5 .Os .Sh NAME @@ -498,6 +498,40 @@ and any client within the 131.104.48 subnet is permitt operations on the server, so long as valid Kerberos credentials are provided. The machine grumpy.cis.uoguelph.ca is permitted to perform NFSv4 state operations on the server using AUTH_SYS credentials, as well as Kerberos ones. +.Pp +In the following example some directories are exported as NFSv3 and NFSv4: +.Bd -literal -offset indent +V4: /wingsdl/nfsv4 +/wingsdl/nfsv4/usr-ports -maproot=root -network 172.16.0.0 -mask 255.255.0.0 +/wingsdl/nfsv4/clasper -maproot=root clasper +.Ed +.Pp +Only one V4: line is needed or allowed to declare where NFSv4 is +rooted. The other lines declare specific exported directories with +their absolute paths given in /etc/exports. +.Pp +The exported directories' paths are used for both v3 and v4. +However, they are interpreted differently for v3 and v4. A client +mount command for usr-ports would use the server-absolute name when +using nfsv3: +.Bd -literal -offset indent +mount server:/wingsdl/nfsv4/usr-ports /mnt/tmp +.Ed +.Pp +A mount command using NFSv4 would use the path relative to the NFSv4 +root: +.Bd -literal -offset indent +mount server:/usr-ports /mnt/tmp +.Ed +.Pp +This also differentiates which version you want if the client can do +both v3 and v4. The former will only ever do a v3 mount and the +latter will only ever do a v4 mount. +.Pp +Note that due to different mount behavior between NFSv3 and NFSv4 a +NFSv4 mount request for a directory that the client does not have +permission for will succeed and read/write access will fail +afterwards, whereas NFSv3 rejects the mount request. .Sh SEE ALSO .Xr nfsv4 4 , .Xr netgroup 5 , ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368378 - stable/12/sbin/fsck
Author: gbe (doc committer) Date: Sun Dec 6 07:38:58 2020 New Revision: 368378 URL: https://svnweb.freebsd.org/changeset/base/368378 Log: MFC r344922 (by wosch): explain ``fsck -f'' more in detail PR: 223491 Approved by: mckusick, 0mp, imp Differential Revision:https://reviews.freebsd.org/D19437 Modified: stable/12/sbin/fsck/fsck.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/fsck/fsck.8 == --- stable/12/sbin/fsck/fsck.8 Sun Dec 6 07:22:38 2020(r368377) +++ stable/12/sbin/fsck/fsck.8 Sun Dec 6 07:38:58 2020(r368378) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 5, 2016 +.Dd March 5, 2019 .Dt FSCK 8 .Os .Sh NAME @@ -142,8 +142,12 @@ only if .Nm is compiled to support it. .It Fl f -Force checking of file systems, even when they are marked clean (for file systems -that support this). +Force checking of file systems. +Running +.Dq Li fsck -f +ignores the journal and does a full +consistency check of the disk so will find and fix the errors about which the +journal is unaware. .It Fl n Causes .Nm ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368377 - in stable/12: usr.bin/iscsictl usr.sbin/bsnmpd/modules/snmp_wlan
Author: gbe (doc committer) Date: Sun Dec 6 07:22:38 2020 New Revision: 368377 URL: https://svnweb.freebsd.org/changeset/base/368377 Log: MFC r367898, r367899 r367898: iscsi.conf(5): Fix a mandoc warning - new sentence, new line r367899: snmp_wlan(3): Fix mandoc warnings - new sentence, new line Modified: stable/12/usr.bin/iscsictl/iscsi.conf.5 stable/12/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/iscsictl/iscsi.conf.5 == --- stable/12/usr.bin/iscsictl/iscsi.conf.5 Sun Dec 6 07:09:34 2020 (r368376) +++ stable/12/usr.bin/iscsictl/iscsi.conf.5 Sun Dec 6 07:22:38 2020 (r368377) @@ -146,9 +146,9 @@ for iSCSI over RDMA, or Default is .Qq Ar iSCSI . .It Cm dscp -The DiffServ Codepoint used for sending data. The DSCP can be -set to numeric, or hexadecimal values directly, as well as the -well-defined +The DiffServ Codepoint used for sending data. +The DSCP can be set to numeric, or hexadecimal values directly, +as well as the well-defined .Qq Ar cs and .Qq Ar af Modified: stable/12/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3 == --- stable/12/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3 Sun Dec 6 07:09:34 2020(r368376) +++ stable/12/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3 Sun Dec 6 07:22:38 2020(r368377) @@ -41,8 +41,8 @@ The .Nm snmp_wlan module implements a private BEGEMOT-WIRELESS-MIB, which allows -management of virtual wireless interfaces. The MIB defines objects similar to the -state data and configuration capabilities of +management of virtual wireless interfaces. +The MIB defines objects similar to the state data and configuration capabilities of .Xr ifconfig 8 for configuring virtual wireless interfaces. Therefore one should consider adding write communities or loading the @@ -52,15 +52,15 @@ module on systems where security is crucial. A short description of the Tables and interesting objects in the MIB follows. .Bl -tag -width "X" .It Va wlanInterfaceTable -The table is used for creation and deletion of virtual wireless interfaces. To -add a new interface, a SET should be executed on the +The table is used for creation and deletion of virtual wireless interfaces. +To add a new interface, a SET should be executed on the .Va wlanIfaceName column with -value the desired name of the interface. Next the parent interface must be set -via +value the desired name of the interface. +Next the parent interface must be set via .Va wlanParentIfName -column. Any optional parameters may be set -via the +column. +Any optional parameters may be set via the .Va wlanIfaceOperatingMode , .Va wlanIfaceFlags , .Va wlanIfaceBssid @@ -78,9 +78,9 @@ The table contains information about the hardware capa a wireless interface. .It Va wlanIfaceConfigTable The table is used to get or set various configuration parameters for a virtual -wireless interface. Depending on the operating mode of the interface and the -hardware capabilities of the underlying hardware interface, not all parameters -and values may be supported. +wireless interface. +Depending on the operating mode of the interface and the hardware capabilities +of the underlying hardware interface, not all parameters and values may be supported. .It Va wlanIfacePeerTable The table contains information about the associated stations for interfaces operating as access points, or the stations identified as neighbors in the IBSS @@ -106,8 +106,9 @@ Access Control configuration for wireless interfaces o The table with Access Control MAC entries for which the configured Access Control Policy on wireless interfaces operating in Host AP mode is applied. .Va wlanMACAccessControlMACStatus -column is used to add or delete MAC ACL entries. A set with value createAndGo(4) -will add new entry, while with value destroy(6) will delete an existing one. +column is used to add or delete MAC ACL entries. +A set with value createAndGo(4) will add new entry, while with value destroy(6) +will delete an existing one. .It Va wlanMeshRoutingConfig The subtree contains system configuration related to Wireless Mesh Routing. .It Va wlanMeshInterfaceTable @@ -121,8 +122,9 @@ The mesh routing table for interfaces operating as mes forwarding packets on a mesh network. .Va wlanMeshRouteStatus column is used to add or delete entries in the mesh routing table for an -interface. A set with value createAndGo(4) will add new entry, while with value -destroy(6) will delete an existing one. +interface. +A set with value createAndGo(4) will add new entry, while with value destroy(6) +will delete an existing one. .It Va wlanMeshStatsTable Summary statistics for each virtual wireless interface operating as mesh point. .It Va wlanMeshHWMPConfig
svn commit: r368376 - in stable/12/usr.sbin: crashinfo moused syslogd
Author: gbe (doc committer) Date: Sun Dec 6 07:09:34 2020 New Revision: 368376 URL: https://svnweb.freebsd.org/changeset/base/368376 Log: MFC r367900, r367902, r367903 r367900: syslog.conf(5): Fix a few mandoc warnings - new sentence, new line - skipping paragraph macro: Pp at the end of Sh r367902: crashinfo(8): Fix a few mandoc warnings - new sentence, new line r367903: moused(8): Fix a few mandoc warnings - new sentence, new line Modified: stable/12/usr.sbin/crashinfo/crashinfo.8 stable/12/usr.sbin/moused/moused.8 stable/12/usr.sbin/syslogd/syslog.conf.5 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/crashinfo/crashinfo.8 == --- stable/12/usr.sbin/crashinfo/crashinfo.8Sun Dec 6 04:59:24 2020 (r368375) +++ stable/12/usr.sbin/crashinfo/crashinfo.8Sun Dec 6 07:09:34 2020 (r368376) @@ -89,9 +89,11 @@ and The options are as follows: .Bl -tag -width indent .It Fl b -Run in batch mode. Write most messages to the +Run in batch mode. +Write most messages to the .Pa core.txt.XX -file instead of the terminal. This flag is used when +file instead of the terminal. +This flag is used when .Nm is run during boot. .It Fl d Ar crashdir Modified: stable/12/usr.sbin/moused/moused.8 == --- stable/12/usr.sbin/moused/moused.8 Sun Dec 6 04:59:24 2020 (r368375) +++ stable/12/usr.sbin/moused/moused.8 Sun Dec 6 07:09:34 2020 (r368376) @@ -147,7 +147,8 @@ is enabled, the option can be used to set the .Ar distance (in pixels) that the mouse must move before a scroll event -is generated. This effectively controls the scrolling speed. +is generated. +This effectively controls the scrolling speed. The default .Ar distance is 2 pixels. @@ -240,20 +241,21 @@ drive the pointer quickly across the screen. The .Ar exp value specifies the exponent, which is basically -the amount of acceleration. Useful values are in the -range 1.1 to 2.0, but it depends on your mouse hardware -and your personal preference. A value of 1.0 means no -exponential acceleration. A value of 2.0 means squared -acceleration (i.e. if you move the mouse twice as fast, -the pointer will move four times as fast on the screen). +the amount of acceleration. +Useful values are in the range 1.1 to 2.0, but it depends on +your mouse hardware and your personal preference. +A value of 1.0 means no exponential acceleration. +A value of 2.0 means squared acceleration (i.e. if +you move the mouse twice as fast, the pointer will move +four times as fast on the screen). Values beyond 2.0 are possible but not recommended. A good value to start is probably 1.5. .Pp The optional .Ar offset -value specifies the distance at which the acceleration -begins. The default is 1.0, which means that the -acceleration is applied to movements larger than one unit. +value specifies the distance at which the acceleration begins. +The default is 1.0, which means that the acceleration is applied +to movements larger than one unit. If you specify a larger value, it takes more speed for the acceleration to kick in, i.e. the speed range for small and accurate movements is wider. @@ -263,8 +265,8 @@ not satisfied with the behaviour, try a value of 2.0. Note that the .Fl A option interacts badly with the X server's own acceleration, -which doesn't work very well anyway. Therefore it is -recommended to switch it off if necessary: +which doesn't work very well anyway. +Therefore it is recommended to switch it off if necessary: .Dq xset m 1 . .It Fl a Ar X Ns Op , Ns Ar Y Accelerate or decelerate the mouse input. Modified: stable/12/usr.sbin/syslogd/syslog.conf.5 == --- stable/12/usr.sbin/syslogd/syslog.conf.5Sun Dec 6 04:59:24 2020 (r368375) +++ stable/12/usr.sbin/syslogd/syslog.conf.5Sun Dec 6 07:09:34 2020 (r368376) @@ -245,7 +245,8 @@ specification is a line beginning with or .Ql \&: and the following blocks will be applied only when filter value -matches given filter propertie's value. See +matches given filter propertie's value. +See .Sx PROPERTY-BASED FILTERS section for more details. .Pp @@ -464,8 +465,8 @@ or .Ql \&: followed by three comma-separated fields .Em property , operator , \&"value\&" . -Value must be double-quoted. A double quote and backslash must be escaped by -a backslash. +Value must be double-quoted. +A double quote and backslash must be escaped by a backslash. .Pp Following .Em properties @@ -521,7 +522,6 @@ Operator may be prefixed by .Ql icase_ - to make comparison function case insensitive .El -.Pp .Sh IMPLEMENTATION NOTES The .Dq kern ___ svn-src-all@freebsd.org mailing list
svn commit: r368375 - head/sys/kern
Author: mjg
Date: Sun Dec 6 04:59:24 2020
New Revision: 368375
URL: https://svnweb.freebsd.org/changeset/base/368375
Log:
vfs: factor buffer allocation/copyin out of namei
Modified:
head/sys/kern/vfs_lookup.c
Modified: head/sys/kern/vfs_lookup.c
==
--- head/sys/kern/vfs_lookup.c Sat Dec 5 22:04:30 2020(r368374)
+++ head/sys/kern/vfs_lookup.c Sun Dec 6 04:59:24 2020(r368375)
@@ -464,6 +464,43 @@ namei_setup(struct nameidata *ndp, struct vnode **dpp,
return (0);
}
+static int
+namei_getpath(struct nameidata *ndp)
+{
+ struct componentname *cnp;
+ int error;
+
+ cnp = >ni_cnd;
+
+ /*
+* Get a buffer for the name to be translated, and copy the
+* name into the buffer.
+*/
+ cnp->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
+ if (ndp->ni_segflg == UIO_SYSSPACE) {
+ error = copystr(ndp->ni_dirp, cnp->cn_pnbuf, MAXPATHLEN,
+ >ni_pathlen);
+ } else {
+ error = copyinstr(ndp->ni_dirp, cnp->cn_pnbuf, MAXPATHLEN,
+ >ni_pathlen);
+ }
+
+ if (__predict_false(error != 0)) {
+ return (error);
+ }
+
+ /*
+* Don't allow empty pathnames.
+*/
+ if (__predict_false(*cnp->cn_pnbuf == '\0')) {
+ namei_cleanup_cnp(cnp);
+ return (ENOENT);
+ }
+
+ cnp->cn_nameptr = cnp->cn_pnbuf;
+ return (0);
+}
+
/*
* Convert a pathname into a pointer to a locked vnode.
*
@@ -531,31 +568,11 @@ namei(struct nameidata *ndp)
ndp->ni_lcf = 0;
ndp->ni_vp = NULL;
- /*
-* Get a buffer for the name to be translated, and copy the
-* name into the buffer.
-*/
- cnp->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
- if (ndp->ni_segflg == UIO_SYSSPACE)
- error = copystr(ndp->ni_dirp, cnp->cn_pnbuf, MAXPATHLEN,
- >ni_pathlen);
- else
- error = copyinstr(ndp->ni_dirp, cnp->cn_pnbuf, MAXPATHLEN,
- >ni_pathlen);
-
+ error = namei_getpath(ndp);
if (__predict_false(error != 0)) {
- namei_cleanup_cnp(cnp);
return (error);
}
- /*
-* Don't allow empty pathnames.
-*/
- if (__predict_false(*cnp->cn_pnbuf == '\0')) {
- namei_cleanup_cnp(cnp);
- return (ENOENT);
- }
-
#ifdef KTRACE
if (KTRPOINT(td, KTR_NAMEI)) {
KASSERT(cnp->cn_thread == curthread,
@@ -563,8 +580,6 @@ namei(struct nameidata *ndp)
ktrnamei(cnp->cn_pnbuf);
}
#endif
-
- cnp->cn_nameptr = cnp->cn_pnbuf;
/*
* First try looking up the target without locking any vnodes.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368374 - head/sys/dev/atkbdc
Author: cem
Date: Sat Dec 5 22:04:30 2020
New Revision: 368374
URL: https://svnweb.freebsd.org/changeset/base/368374
Log:
atkbd(4): Just use nitems() for quirk enumeration
Reviewed by: imp, wulf
X-MFC-With: r368365
Differential Revision:https://reviews.freebsd.org/D27489
Modified:
head/sys/dev/atkbdc/atkbdc.c
Modified: head/sys/dev/atkbdc/atkbdc.c
==
--- head/sys/dev/atkbdc/atkbdc.cSat Dec 5 19:44:00 2020
(r368373)
+++ head/sys/dev/atkbdc/atkbdc.cSat Dec 5 22:04:30 2020
(r368374)
@@ -119,7 +119,6 @@ static struct atkbdc_quirks quirks[] = {
KBDC_QUIRK_RESET_AFTER_PROBE | KBDC_QUIRK_SETLEDS_ON_INIT},
/* KBDC hangs on Lenovo X120e and X121e after disabling AUX MUX */
{NULL, "LENOVO", NULL, KBDC_QUIRK_DISABLE_MUX_PROBE},
-{NULL, NULL, NULL, 0}
};
#define QUIRK_STR_MATCH(s1, s2) (s1 == NULL || \
@@ -133,8 +132,7 @@ atkbdc_getquirks(void)
char* maker = kern_getenv("smbios.system.maker");
char* product = kern_getenv("smbios.system.product");
-for (i=0; quirks[i].bios_vendor != NULL || quirks[i].maker != NULL ||
- quirks[i].product != NULL; ++i)
+for (i = 0; i < nitems(quirks); i++)
if (QUIRK_STR_MATCH(quirks[i].bios_vendor, bios_vendor) &&
QUIRK_STR_MATCH(quirks[i].maker, maker) &&
QUIRK_STR_MATCH(quirks[i].product, product))
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r368159 - in head/sys: arm/conf conf
On 05.12.2020 17:18, Mateusz Guzik wrote: On 11/29/20, Michal Meloun wrote: Author: mmel Date: Sun Nov 29 17:42:32 2020 New Revision: 368159 URL: https://svnweb.freebsd.org/changeset/base/368159 Log: Remove unused options. Marvell files and their related SOC_MV_ options should be cleaned up in another pass. Since this change tinderbox fails to build VERSATILEPB and EFIKA_MX: /usr/src/sys/dev/syscons/scgfbrndr.c:35:10: fatal error: 'opt_gfb.h' file not found #include "opt_gfb.h" ^~~ Fixed in r368373. thanks for report. Michal ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368373 - in head/sys: conf dev/syscons
Author: mmel
Date: Sat Dec 5 19:44:00 2020
New Revision: 368373
URL: https://svnweb.freebsd.org/changeset/base/368373
Log:
Remove remaning definition of GFB_ options.
They are not used in source files.
This fixes build of some arm boards after r368159.
Reported by: mjg
Modified:
head/sys/conf/options.mips
head/sys/conf/options.powerpc
head/sys/dev/syscons/scgfbrndr.c
Modified: head/sys/conf/options.mips
==
--- head/sys/conf/options.mips Sat Dec 5 14:53:24 2020(r368372)
+++ head/sys/conf/options.mips Sat Dec 5 19:44:00 2020(r368373)
@@ -66,10 +66,6 @@ CFE_CONSOLE opt_global.h
CFE_ENVopt_global.h
CFE_ENV_SIZE opt_global.h
-GFB_DEBUG opt_gfb.h
-GFB_NO_FONT_LOADINGopt_gfb.h
-GFB_NO_MODE_CHANGE opt_gfb.h
-
NOFPU opt_global.h
TICK_USE_YAMON_FREQopt_global.h
Modified: head/sys/conf/options.powerpc
==
--- head/sys/conf/options.powerpc Sat Dec 5 14:53:24 2020
(r368372)
+++ head/sys/conf/options.powerpc Sat Dec 5 19:44:00 2020
(r368373)
@@ -15,10 +15,6 @@ FPU_EMU
COMPAT_FREEBSD32 opt_global.h
-GFB_DEBUG opt_gfb.h
-GFB_NO_FONT_LOADINGopt_gfb.h
-GFB_NO_MODE_CHANGE opt_gfb.h
-
MOEA64_STATS opt_pmap.h
AMIGAONE opt_platform.h
MIKROTIK opt_platform.h
Modified: head/sys/dev/syscons/scgfbrndr.c
==
--- head/sys/dev/syscons/scgfbrndr.cSat Dec 5 14:53:24 2020
(r368372)
+++ head/sys/dev/syscons/scgfbrndr.cSat Dec 5 19:44:00 2020
(r368373)
@@ -32,7 +32,6 @@
__FBSDID("$FreeBSD$");
#include "opt_syscons.h"
-#include "opt_gfb.h"
#ifdef __powerpc__
#include "opt_ofwfb.h"
#endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r368345 - head/libexec/rc/rc.d
In message , Ed Maste writes: > On Fri, 4 Dec 2020 at 14:31, Cy Schubert wrote: > > > > Author: cy > > Date: Fri Dec 4 19:31:16 2020 > > New Revision: 368345 > > URL: https://svnweb.freebsd.org/changeset/base/368345 > > > > Log: > > Revert r366857. > > HW lab CI is green again with this change: > https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-pinea64-test/8044/ > > (2 of 18 tests after r368345 failed; they timed out waiting for the > login prompt. Perhaps the timeout is just not long enough.) Unfortunately WOL is broken here. A patch to teach lagg(4) about WOL is #2 on my todo list. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r368159 - in head/sys: arm/conf conf
On 11/29/20, Michal Meloun wrote: > Author: mmel > Date: Sun Nov 29 17:42:32 2020 > New Revision: 368159 > URL: https://svnweb.freebsd.org/changeset/base/368159 > > Log: > Remove unused options. > > Marvell files and their related SOC_MV_ options should be cleaned up > in another pass. > Since this change tinderbox fails to build VERSATILEPB and EFIKA_MX: /usr/src/sys/dev/syscons/scgfbrndr.c:35:10: fatal error: 'opt_gfb.h' file not found #include "opt_gfb.h" ^~~ > Modified: > head/sys/arm/conf/NOTES > head/sys/arm/conf/std.armv6 > head/sys/arm/conf/std.armv7 > head/sys/conf/options.arm > > Modified: head/sys/arm/conf/NOTES > == > --- head/sys/arm/conf/NOTES Sun Nov 29 16:44:22 2020(r368158) > +++ head/sys/arm/conf/NOTES Sun Nov 29 17:42:32 2020(r368159) > @@ -9,7 +9,6 @@ makeoptions CONF_CFLAGS+="-march=armv7a" > > # Add options for armv7 that are not in sys/conf/NOTES... > > -options ARM_L2_PIPT # Only L2 PIPT is supported > options FDT # Flattened device tree support > options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) > options INTRNG # Include INTRNG framework > > Modified: head/sys/arm/conf/std.armv6 > == > --- head/sys/arm/conf/std.armv6 Sun Nov 29 16:44:22 2020 > (r368158) > +++ head/sys/arm/conf/std.armv6 Sun Nov 29 17:42:32 2020 > (r368159) > @@ -3,7 +3,6 @@ > # $FreeBSD$ > > options HZ=1000 > -options ARM_L2_PIPT # Only L2 PIPT is supported > options INTRNG # All arm systems use INTRNG these days > options PREEMPTION # Enable kernel thread preemption > options VIMAGE # Subsystem virtualization, e.g. VNET > > Modified: head/sys/arm/conf/std.armv7 > == > --- head/sys/arm/conf/std.armv7 Sun Nov 29 16:44:22 2020 > (r368158) > +++ head/sys/arm/conf/std.armv7 Sun Nov 29 17:42:32 2020 > (r368159) > @@ -3,7 +3,6 @@ > # $FreeBSD$ > > options HZ=1000 > -options ARM_L2_PIPT # Only L2 PIPT is supported > options INTRNG # All arm systems use INTRNG these days > options PREEMPTION # Enable kernel thread preemption > options VIMAGE # Subsystem virtualization, e.g. VNET > > Modified: head/sys/conf/options.arm > == > --- head/sys/conf/options.arm Sun Nov 29 16:44:22 2020(r368158) > +++ head/sys/conf/options.arm Sun Nov 29 17:42:32 2020(r368159) > @@ -1,13 +1,7 @@ > #$FreeBSD$ > ARMV6opt_global.h > ARMV7opt_global.h > -ARM_CACHE_LOCK_ENABLEopt_global.h > -ARM_KERN_DIRECTMAP opt_vm.h > -ARM_L2_PIPT opt_global.h > -ARM_MANY_BOARD opt_global.h > -ARM_WANT_TP_ADDRESS opt_global.h > CPSW_ETHERSWITCH opt_cpsw.h > -CPU_ARM9Eopt_global.h > CPU_ARM1176 opt_global.h > CPU_CORTEXA opt_global.h > CPU_KRAITopt_global.h > @@ -23,7 +17,6 @@ FREEBSD_BOOT_LOADER opt_global.h > KERNBASE opt_global.h > KERNVIRTADDR opt_global.h > LINUX_BOOT_ABI opt_global.h > -LOADERRAMADDRopt_global.h > LOCORE_MAP_MBopt_locore.h > NKPT2PG opt_pmap.h > PHYSADDR opt_global.h > @@ -31,7 +24,6 @@ PLATFORMopt_global.h > SOCDEV_PAopt_global.h > SOCDEV_VAopt_global.h > PV_STATS opt_pmap.h > -QEMU_WORKAROUNDS opt_global.h > SOC_ALLWINNER_A10opt_global.h > SOC_ALLWINNER_A13opt_global.h > SOC_ALLWINNER_A20opt_global.h > @@ -56,13 +48,6 @@ SOC_MV_KIRKWOODopt_global.h > SOC_MV_ORION opt_global.h > SOC_OMAP3opt_global.h > SOC_OMAP4opt_global.h > -SOC_ROCKCHIP_RK3188 opt_global.h > SOC_TI_AM335Xopt_global.h > -SOC_TEGRA2 opt_global.h > -XSCALE_CACHE_READ_WRITE_ALLOCATE opt_global.h > -VERBOSE_INIT_ARM opt_global.h > VM_MAXUSER_ADDRESS opt_global.h > -GFB_DEBUGopt_gfb.h > -GFB_NO_FONT_LOADING opt_gfb.h > -GFB_NO_MODE_CHANGE opt_gfb.h > VFP opt_global.h > ___ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org" > -- Mateusz Guzik ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send
Re: svn commit: r368345 - head/libexec/rc/rc.d
On Fri, 4 Dec 2020 at 14:31, Cy Schubert wrote: > > Author: cy > Date: Fri Dec 4 19:31:16 2020 > New Revision: 368345 > URL: https://svnweb.freebsd.org/changeset/base/368345 > > Log: > Revert r366857. HW lab CI is green again with this change: https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-pinea64-test/8044/ (2 of 18 tests after r368345 failed; they timed out waiting for the login prompt. Perhaps the timeout is just not long enough.) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368372 - in head/sys: amd64/linux32 conf modules/linux
Author: tijl
Date: Sat Dec 5 14:53:24 2020
New Revision: 368372
URL: https://svnweb.freebsd.org/changeset/base/368372
Log:
Fix i386 linux module after r367395.
In r367395 parts of machine dependent linux_dummy.c were moved to a new
machine independent file sys/compat/linux/linux_dummy.c and the existing
linux_dummy.c was renamed to linux_dummy_machdep.c.
Add linux_dummy_machdep.c to the linux module for i386.
Rename sys/amd64/linux32/linux_dummy.c for consistency.
Add the new linux_dummy.c to the linux module for i386.
Added:
head/sys/amd64/linux32/linux32_dummy_machdep.c
- copied unchanged from r368371, head/sys/amd64/linux32/linux32_dummy.c
Deleted:
head/sys/amd64/linux32/linux32_dummy.c
Modified:
head/sys/conf/files.amd64
head/sys/modules/linux/Makefile
Copied: head/sys/amd64/linux32/linux32_dummy_machdep.c (from r368371,
head/sys/amd64/linux32/linux32_dummy.c)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/amd64/linux32/linux32_dummy_machdep.c Sat Dec 5 14:53:24
2020(r368372, copy of r368371, head/sys/amd64/linux32/linux32_dummy.c)
@@ -0,0 +1,89 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 1994-1995 Søren Schmidt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+/* DTrace init */
+LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE);
+
+UNIMPLEMENTED(break);
+UNIMPLEMENTED(ftime);
+UNIMPLEMENTED(gtty);
+UNIMPLEMENTED(stty);
+UNIMPLEMENTED(lock);
+UNIMPLEMENTED(mpx);
+UNIMPLEMENTED(prof);
+UNIMPLEMENTED(profil);
+UNIMPLEMENTED(ulimit);
+
+DUMMY(stime);
+DUMMY(olduname);
+DUMMY(uname);
+DUMMY(bdflush);
+DUMMY(ptrace);
+DUMMY(mq_open);
+DUMMY(mq_unlink);
+DUMMY(mq_timedsend);
+DUMMY(mq_timedreceive);
+DUMMY(mq_notify);
+DUMMY(mq_getsetattr);
+/* Linux 4.11: */
+DUMMY(arch_prctl);
+/* Linux 5.0: */
+DUMMY(clock_gettime64);
+DUMMY(clock_settime64);
+DUMMY(clock_adjtime64);
+DUMMY(clock_getres_time64);
+DUMMY(clock_nanosleep_time64);
+DUMMY(timer_gettime64);
+DUMMY(timer_settime64);
+DUMMY(timerfd_gettime64);
+DUMMY(timerfd_settime64);
+DUMMY(utimensat_time64);
+DUMMY(pselect6_time64);
+DUMMY(ppoll_time64);
+DUMMY(io_pgetevents_time64);
+DUMMY(recvmmsg_time64);
+DUMMY(mq_timedsend_time64);
+DUMMY(mq_timedreceive_time64);
+DUMMY(semtimedop_time64);
+DUMMY(rt_sigtimedwait_time64);
+DUMMY(futex_time64);
+DUMMY(sched_rr_get_interval_time64);
Modified: head/sys/conf/files.amd64
==
--- head/sys/conf/files.amd64 Sat Dec 5 14:38:46 2020(r368371)
+++ head/sys/conf/files.amd64 Sat Dec 5 14:53:24 2020(r368372)
@@ -405,7 +405,7 @@ compat/linsysfs/linsysfs.c optionallinsysfs
#
# Linux/i386 binary support
#
-amd64/linux32/linux32_dummy.c optionalcompat_linux32
+amd64/linux32/linux32_dummy_machdep.c optionalcompat_linux32
amd64/linux32/linux32_machdep.coptionalcompat_linux32
amd64/linux32/linux32_support.soptionalcompat_linux32
\
dependency "linux32_assym.h"
Modified: head/sys/modules/linux/Makefile
==
--- head/sys/modules/linux/Makefile Sat Dec 5 14:38:46 2020
(r368371)
+++ head/sys/modules/linux/Makefile Sat Dec 5 14:53:24 2020
(r368372)
@@ -13,7 +13,7 @@ CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32
VDSO= linux${SFX}_vdso
KMOD= linux
-SRCS=
svn commit: r368371 - in head/contrib/netbsd-tests/lib/libc/regex: . data
Author: kevans
Date: Sat Dec 5 14:38:46 2020
New Revision: 368371
URL: https://svnweb.freebsd.org/changeset/base/368371
Log:
libc: regex: partial revert of r368358
Part of the libregex functionality leaked into the tests it shares with
the standard regex(3). Introduce a P flag to set the REG_POSIX cflag to
indicate that libc regex should effectively do nothing while libregex should
specifically run it in non-extended mode.
This unbreaks the libc/regex test run.
Reported by: Jenkins
Modified:
head/contrib/netbsd-tests/lib/libc/regex/README
head/contrib/netbsd-tests/lib/libc/regex/data/meta.in
head/contrib/netbsd-tests/lib/libc/regex/main.c
Modified: head/contrib/netbsd-tests/lib/libc/regex/README
==
--- head/contrib/netbsd-tests/lib/libc/regex/README Sat Dec 5 14:06:01
2020(r368370)
+++ head/contrib/netbsd-tests/lib/libc/regex/README Sat Dec 5 14:38:46
2020(r368371)
@@ -28,6 +28,7 @@ The full list of flags:
$REG_NOTEOL
#REG_STARTEND (see below)
pREG_PEND
+ PREG_POSIX
For REG_STARTEND, the start/end offsets are those of the substring
enclosed in ().
Modified: head/contrib/netbsd-tests/lib/libc/regex/data/meta.in
==
--- head/contrib/netbsd-tests/lib/libc/regex/data/meta.in Sat Dec 5
14:06:01 2020(r368370)
+++ head/contrib/netbsd-tests/lib/libc/regex/data/meta.in Sat Dec 5
14:38:46 2020(r368371)
@@ -5,7 +5,7 @@ a\*c& a*c a*c
a\\b & a\b a\b
a\\\*b & a\*ba\*b
# Begin FreeBSD
-a\bc & abc
+a\bcEESCAPE
# End FreeBSD
a\ EESCAPE
a\\bc & a\bca\bc
Modified: head/contrib/netbsd-tests/lib/libc/regex/main.c
==
--- head/contrib/netbsd-tests/lib/libc/regex/main.c Sat Dec 5 14:06:01
2020(r368370)
+++ head/contrib/netbsd-tests/lib/libc/regex/main.c Sat Dec 5 14:38:46
2020(r368371)
@@ -338,7 +338,7 @@ options(int type, char *s)
{
char *p;
int o = (type == 'c') ? copts : eopts;
- const char *legal = (type == 'c') ? "bisnmp" : "^$#tl";
+ const char *legal = (type == 'c') ? "bisnmpP" : "^$#tl";
for (p = s; *p != '\0'; p++)
if (strchr(legal, *p) != NULL)
@@ -361,6 +361,9 @@ options(int type, char *s)
break;
case 'p':
o |= REG_PEND;
+ break;
+ case 'P':
+ o |= REG_POSIX;
break;
case '^':
o |= REG_NOTBOL;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368370 - in head/sys/arm64: arm64 include
Author: mmel
Date: Sat Dec 5 14:06:01 2020
New Revision: 368370
URL: https://svnweb.freebsd.org/changeset/base/368370
Log:
Simplify startup of secondary cores and store MPIDR register to pcpu.
- record MPIDR for all started cores in pcpu, they will be used as link
between physical locality of given core, ID in external description
(FDT or ACPI) and cupid.
- because of above, cpuid can (and should) be freely assigned, only boot
CPU must have cpuid 0. Simplify startup code according this.
Please note that pure cpuid is not sufficient instrument to hold any
information about core or cluster topology, nor to determistically iterate
over subpart of cores in CPU (iterate over all cores in single cluster for
example). Situation is more complicated by fact that PSCI can reject start
of core without reporting error (because power budget for example), or by
fact that is possible that we booted on non-first core in cluster (thus with
cpuid 0 assigned to random core).
Given cores topology should be exhibited to other parts of system
(for example to scheduler for big.little or multicluster systems) by using
smp_topo interface.
Differential Revision: https://reviews.freebsd.org/D13863
Modified:
head/sys/arm64/arm64/machdep.c
head/sys/arm64/arm64/mp_machdep.c
head/sys/arm64/include/pcpu.h
Modified: head/sys/arm64/arm64/machdep.c
==
--- head/sys/arm64/arm64/machdep.c Sat Dec 5 12:08:37 2020
(r368369)
+++ head/sys/arm64/arm64/machdep.c Sat Dec 5 14:06:01 2020
(r368370)
@@ -661,6 +661,7 @@ cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t siz
{
pcpu->pc_acpi_id = 0x;
+ pcpu->pc_mpidr = 0x;
}
void
Modified: head/sys/arm64/arm64/mp_machdep.c
==
--- head/sys/arm64/arm64/mp_machdep.c Sat Dec 5 12:08:37 2020
(r368369)
+++ head/sys/arm64/arm64/mp_machdep.c Sat Dec 5 14:06:01 2020
(r368370)
@@ -125,12 +125,9 @@ static void ipi_stop(void *);
struct pcb stoppcbs[MAXCPU];
-/*
- * Not all systems boot from the first CPU in the device tree. To work around
- * this we need to find which CPU we have booted from so when we later
- * enable the secondary CPUs we skip this one.
- */
-static int cpu0 = -1;
+#ifdef FDT
+static u_int fdt_cpuid;
+#endif
void mpentry(unsigned long cpuid);
void init_secondary(uint64_t);
@@ -432,36 +429,23 @@ cpu_mp_probe(void)
}
static bool
-start_cpu(u_int id, uint64_t target_cpu)
+start_cpu(u_int cpuid, uint64_t target_cpu)
{
struct pcpu *pcpup;
vm_paddr_t pa;
- u_int cpuid;
int err, naps;
/* Check we are able to start this cpu */
- if (id > mp_maxid)
+ if (cpuid > mp_maxid)
return (false);
- KASSERT(id < MAXCPU, ("Too many CPUs"));
+ KASSERT(cpuid < MAXCPU, ("Too many CPUs"));
+ KASSERT(__pcpu[0].pc_mpidr != (target_cpu & CPU_AFF_MASK),
+ ("Start_cpu() was called on the boot CPU"));
- /* We are already running on cpu 0 */
- if (id == cpu0)
- return (true);
-
- /*
-* Rotate the CPU IDs to put the boot CPU as CPU 0. We keep the other
-* CPUs ordered as they are likely grouped into clusters so it can be
-* useful to keep that property, e.g. for the GICv3 driver to send
-* an IPI to all CPUs in the cluster.
-*/
- cpuid = id;
- if (cpuid < cpu0)
- cpuid += mp_maxid + 1;
- cpuid -= cpu0;
-
pcpup = &__pcpu[cpuid];
pcpu_init(pcpup, cpuid, sizeof(struct pcpu));
+ pcpup->pc_mpidr = target_cpu & CPU_AFF_MASK;
dpcpu[cpuid - 1] = (void *)kmem_malloc(DPCPU_SIZE, M_WAITOK | M_ZERO);
dpcpu_init(dpcpu[cpuid - 1], cpuid);
@@ -483,7 +467,7 @@ start_cpu(u_int id, uint64_t target_cpu)
KASSERT(err == PSCI_MISSING ||
(mp_quirks & MP_QUIRK_CPULIST) == MP_QUIRK_CPULIST,
("Failed to start CPU %u (%lx), error %d\n",
- id, target_cpu, err));
+ cpuid, target_cpu, err));
pcpu_destroy(pcpup);
kmem_free((vm_offset_t)dpcpu[cpuid - 1], DPCPU_SIZE);
@@ -492,9 +476,6 @@ start_cpu(u_int id, uint64_t target_cpu)
bootstacks[cpuid] = NULL;
mp_ncpus--;
- /* Notify the user that the CPU failed to start */
- printf("Failed to start CPU %u (%lx), error %d\n",
- id, target_cpu, err);
} else {
/* Wait for the AP to switch to its boot stack. */
while (atomic_load_int(_started) < naps + 1)
@@ -518,6 +499,13 @@ madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg)
intr = (ACPI_MADT_GENERIC_INTERRUPT *)entry;
cpuid = arg;
svn commit: r368369 - in head/sys: arm/freescale/vybrid arm64/qoriq arm64/qoriq/clk conf dev/ahci dev/iicbus/mux
Author: mmel
Date: Sat Dec 5 12:08:37 2020
New Revision: 368369
URL: https://svnweb.freebsd.org/changeset/base/368369
Log:
Add basic support for Freescale LX2160A SoC.
All peripherals but the network processor are supported.
Added:
head/sys/arm64/qoriq/clk/lx2160a_clkgen.c (contents, props changed)
head/sys/arm64/qoriq/qoriq_dw_pci.c (contents, props changed)
head/sys/arm64/qoriq/qoriq_therm.c (contents, props changed)
head/sys/arm64/qoriq/qoriq_therm_if.m (contents, props changed)
head/sys/dev/iicbus/mux/pca9547.c (contents, props changed)
Modified:
head/sys/arm/freescale/vybrid/vf_i2c.c
head/sys/conf/files
head/sys/conf/files.arm64
head/sys/dev/ahci/ahci_fsl_fdt.c
Modified: head/sys/arm/freescale/vybrid/vf_i2c.c
==
--- head/sys/arm/freescale/vybrid/vf_i2c.c Sat Dec 5 11:18:37 2020
(r368368)
+++ head/sys/arm/freescale/vybrid/vf_i2c.c Sat Dec 5 12:08:37 2020
(r368369)
@@ -147,7 +147,8 @@ static struct i2c_div_type vf610_div_table[] = {
{ 0x2C, 576 }, { 0x2D, 640 }, { 0x2E, 768 }, { 0x32, 896 },
{ 0x2F, 960 }, { 0x33, 1024 }, { 0x34, 1152 }, { 0x35, 1280 },
{ 0x36, 1536 }, { 0x3A, 1792 }, { 0x37, 1920 }, { 0x3B, 2048 },
- { 0x3C, 2304 }, { 0x3D, 2560 }, { 0x3E, 3072 }, { 0x3F, 3840 }
+ { 0x3C, 2304 }, { 0x3D, 2560 }, { 0x3E, 3072 }, { 0x3F, 3840 },
+ { 0x3F, 3840 }, { 0x7B, 4096 }, { 0x7D, 5120 }, { 0x7E, 6144 },
};
#endif
@@ -307,7 +308,15 @@ wait_for_icf(struct i2c_softc *sc)
return (IIC_ETIMEOUT);
}
+/* Get ACK bit from last write */
+static bool
+tx_acked(struct i2c_softc *sc)
+{
+ return (READ1(sc, I2C_IBSR) & IBSR_RXAK) ? false : true;
+
+}
+
static int
i2c_repeated_start(device_t dev, u_char slave, int timeout)
{
@@ -342,6 +351,12 @@ i2c_repeated_start(device_t dev, u_char slave, int tim
error = wait_for_iif(sc);
+ if (!tx_acked(sc)) {
+ vf_i2c_dbg(sc,
+ "cant i2c start: missing ACK after slave addres\n");
+ return (IIC_ENOACK);
+ }
+
mtx_unlock(>mutex);
if (error != 0)
@@ -384,13 +399,19 @@ i2c_start(device_t dev, u_char slave, int timeout)
WRITE1(sc, I2C_IBDR, slave);
error = wait_for_iif(sc);
-
- mtx_unlock(>mutex);
if (error != 0) {
+ mtx_unlock(>mutex);
vf_i2c_dbg(sc, "cant i2c start: iif error\n");
return (error);
}
+ mtx_unlock(>mutex);
+ if (!tx_acked(sc)) {
+ vf_i2c_dbg(sc,
+ "cant i2c start: missing QACK after slave addres\n");
+ return (IIC_ENOACK);
+ }
+
return (IIC_NOERR);
}
@@ -568,10 +589,15 @@ i2c_write(device_t dev, const char *buf, int len, int
return (error);
}
+ if (!tx_acked(sc) && (*sent = (len - 2)) ){
+ mtx_unlock(>mutex);
+ vf_i2c_dbg(sc, "no ACK on %d write\n", *sent);
+ return (IIC_ENOACK);
+ }
+
(*sent)++;
}
mtx_unlock(>mutex);
-
return (IIC_NOERR);
}
@@ -600,14 +626,8 @@ static device_method_t i2c_methods[] = {
{ 0, 0 }
};
-static driver_t i2c_driver = {
- "i2c",
- i2c_methods,
- sizeof(struct i2c_softc),
-};
-
static devclass_t i2c_devclass;
-
-DRIVER_MODULE(i2c, simplebus, i2c_driver, i2c_devclass, 0, 0);
+static DEFINE_CLASS_0(i2c, i2c_driver, i2c_methods, sizeof(struct i2c_softc));
+DRIVER_MODULE(vybrid_i2c, simplebus, i2c_driver, i2c_devclass, 0, 0);
DRIVER_MODULE(iicbus, i2c, iicbus_driver, iicbus_devclass, 0, 0);
DRIVER_MODULE(ofw_iicbus, i2c, ofw_iicbus_driver, ofw_iicbus_devclass, 0, 0);
Added: head/sys/arm64/qoriq/clk/lx2160a_clkgen.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm64/qoriq/clk/lx2160a_clkgen.c Sat Dec 5 12:08:37 2020
(r368369)
@@ -0,0 +1,211 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright 2020 Michal Meloun
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
svn commit: r368368 - head/share/man/man9
Author: gbe (doc committer) Date: Sat Dec 5 11:18:37 2020 New Revision: 368368 URL: https://svnweb.freebsd.org/changeset/base/368368 Log: epoch(9): Fix a few mandoc related issues - sections out of conventional order: Sh EXAMPLES - sections out of conventional order: Sh SEE ALSO - skipping end of block that is not open: El Modified: head/share/man/man9/epoch.9 Modified: head/share/man/man9/epoch.9 == --- head/share/man/man9/epoch.9 Sat Dec 5 11:17:54 2020(r368367) +++ head/share/man/man9/epoch.9 Sat Dec 5 11:18:37 2020(r368368) @@ -210,20 +210,6 @@ This function can sleep and is not optimized for perfo .Sh RETURN VALUES .Fn in_epoch curepoch will return 1 if curthread is in curepoch, 0 otherwise. -.Sh CAVEATS -One must be cautious when using -.Fn epoch_wait_preempt . -Threads are pinned during epoch sections, so if a thread in a section is then -preempted by a higher priority compute bound thread on that CPU, it can be -prevented from leaving the section indefinitely. -.Pp -Epochs are not a straight replacement for read locks. -Callers must use safe list and tailq traversal routines in an epoch (see ck_queue). -When modifying a list referenced from an epoch section safe removal -routines must be used and the caller can no longer modify a list entry -in place. -An item to be modified must be handled with copy on write -and frees must be deferred until after a grace period has elapsed. .Sh EXAMPLES Async free example: Thread 1: @@ -280,12 +266,6 @@ free would have to follow a call to The .Nm kernel programming interface is under development and is subject to change. -.El -.Sh HISTORY -The -.Nm -framework first appeared in -.Fx 11.0 . .Sh SEE ALSO .Xr locking 9 , .Xr mtx_pool 9 , @@ -295,3 +275,22 @@ framework first appeared in .Xr sleep 9 , .Xr sx 9 , .Xr timeout 9 +.Sh HISTORY +The +.Nm +framework first appeared in +.Fx 11.0 . +.Sh CAVEATS +One must be cautious when using +.Fn epoch_wait_preempt . +Threads are pinned during epoch sections, so if a thread in a section is then +preempted by a higher priority compute bound thread on that CPU, it can be +prevented from leaving the section indefinitely. +.Pp +Epochs are not a straight replacement for read locks. +Callers must use safe list and tailq traversal routines in an epoch (see ck_queue). +When modifying a list referenced from an epoch section safe removal +routines must be used and the caller can no longer modify a list entry +in place. +An item to be modified must be handled with copy on write +and frees must be deferred until after a grace period has elapsed. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368367 - in head/sys: arm64/conf modules/dtb/freescale
Author: mmel Date: Sat Dec 5 11:17:54 2020 New Revision: 368367 URL: https://svnweb.freebsd.org/changeset/base/368367 Log: Connect DTB files based on LX2160A SoC to build. Mainly LX2K Honeycomb and ClearFog-CX boards. Added: head/sys/modules/dtb/freescale/ head/sys/modules/dtb/freescale/Makefile (contents, props changed) Modified: head/sys/arm64/conf/GENERIC Modified: head/sys/arm64/conf/GENERIC == --- head/sys/arm64/conf/GENERIC Sat Dec 5 10:57:15 2020(r368366) +++ head/sys/arm64/conf/GENERIC Sat Dec 5 11:17:54 2020(r368367) @@ -367,4 +367,4 @@ options FDT device acpi # DTBs -makeoptionsMODULES_EXTRA="dtb/allwinner dtb/imx8 dtb/mv dtb/rockchip dtb/rpi" +makeoptionsMODULES_EXTRA="dtb/allwinner dtb/freescale dtb/imx8 dtb/mv dtb/rockchip dtb/rpi" Added: head/sys/modules/dtb/freescale/Makefile == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/modules/dtb/freescale/Makefile Sat Dec 5 11:17:54 2020 (r368367) @@ -0,0 +1,8 @@ +# $FreeBSD$ +# All the dts files for Freescale (now NXP) systems we support. +DTS= freescale/fsl-lx2160a-clearfog-cx.dts \ + freescale/fsl-lx2160a-honeycomb.dts \ + freescale/fsl-lx2160a-qds.dts \ + freescale/fsl-lx2160a-rdb.dts + +.include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368366 - head/sys/dev/ichiic
Author: wulf
Date: Sat Dec 5 10:57:15 2020
New Revision: 368366
URL: https://svnweb.freebsd.org/changeset/base/368366
Log:
ig4(4): Add PCI IDs for Intel Tiger Lake
Submitted by: Neel Chauhan
Differential Revision:https://reviews.freebsd.org/D27483
Modified:
head/sys/dev/ichiic/ig4_iic.c
head/sys/dev/ichiic/ig4_pci.c
head/sys/dev/ichiic/ig4_var.h
Modified: head/sys/dev/ichiic/ig4_iic.c
==
--- head/sys/dev/ichiic/ig4_iic.c Sat Dec 5 10:55:14 2020
(r368365)
+++ head/sys/dev/ichiic/ig4_iic.c Sat Dec 5 10:57:15 2020
(r368366)
@@ -119,6 +119,12 @@ static const struct ig4_hw ig4iic_hw[] = {
.ic_clock_rate = 216,
.sda_hold_time = 230,
},
+ [IG4_TIGERLAKE] = {
+ .ic_clock_rate = 133,
+ .sda_fall_time = 171,
+ .scl_fall_time = 208,
+ .sda_hold_time = 42,
+ },
};
static int ig4iic_set_config(ig4iic_softc_t *sc, bool reset);
Modified: head/sys/dev/ichiic/ig4_pci.c
==
--- head/sys/dev/ichiic/ig4_pci.c Sat Dec 5 10:55:14 2020
(r368365)
+++ head/sys/dev/ichiic/ig4_pci.c Sat Dec 5 10:57:15 2020
(r368366)
@@ -121,6 +121,21 @@ static int ig4iic_pci_detach(device_t dev);
#define PCI_CHIP_COMETLAKE_V_I2C_1 0xa3e18086
#define PCI_CHIP_COMETLAKE_V_I2C_2 0xa3e28086
#define PCI_CHIP_COMETLAKE_V_I2C_3 0xa3e38086
+#define PCI_CHIP_TIGERLAKE_H_I2C_0 0x43d88086
+#define PCI_CHIP_TIGERLAKE_H_I2C_1 0x43e88086
+#define PCI_CHIP_TIGERLAKE_H_I2C_2 0x43e98086
+#define PCI_CHIP_TIGERLAKE_H_I2C_3 0x43ea8086
+#define PCI_CHIP_TIGERLAKE_H_I2C_4 0x43eb8086
+#define PCI_CHIP_TIGERLAKE_H_I2C_5 0x43ad8086
+#define PCI_CHIP_TIGERLAKE_H_I2C_6 0x43ae8086
+#define PCI_CHIP_TIGERLAKE_LP_I2C_00xa0c58086
+#define PCI_CHIP_TIGERLAKE_LP_I2C_10xa0c68086
+#define PCI_CHIP_TIGERLAKE_LP_I2C_20xa0d88086
+#define PCI_CHIP_TIGERLAKE_LP_I2C_30xa0d98086
+#define PCI_CHIP_TIGERLAKE_LP_I2C_40xa0e88086
+#define PCI_CHIP_TIGERLAKE_LP_I2C_50xa0e98086
+#define PCI_CHIP_TIGERLAKE_LP_I2C_60xa0ea8086
+#define PCI_CHIP_TIGERLAKE_LP_I2C_70xa0eb8086
struct ig4iic_pci_device {
uint32_tdevid;
@@ -184,6 +199,21 @@ static struct ig4iic_pci_device ig4iic_pci_devices[] =
{ PCI_CHIP_COMETLAKE_V_I2C_1, "Intel Comet Lake-V I2C Controller-1",
IG4_CANNONLAKE},
{ PCI_CHIP_COMETLAKE_V_I2C_2, "Intel Comet Lake-V I2C Controller-2",
IG4_CANNONLAKE},
{ PCI_CHIP_COMETLAKE_V_I2C_3, "Intel Comet Lake-V I2C Controller-3",
IG4_CANNONLAKE},
+ { PCI_CHIP_TIGERLAKE_H_I2C_0, "Intel Tiger Lake-H I2C Controller-0",
IG4_TIGERLAKE},
+ { PCI_CHIP_TIGERLAKE_H_I2C_1, "Intel Tiger Lake-H I2C Controller-1",
IG4_TIGERLAKE},
+ { PCI_CHIP_TIGERLAKE_H_I2C_2, "Intel Tiger Lake-H I2C Controller-2",
IG4_TIGERLAKE},
+ { PCI_CHIP_TIGERLAKE_H_I2C_3, "Intel Tiger Lake-H I2C Controller-3",
IG4_TIGERLAKE},
+ { PCI_CHIP_TIGERLAKE_H_I2C_4, "Intel Tiger Lake-H I2C Controller-4",
IG4_TIGERLAKE},
+ { PCI_CHIP_TIGERLAKE_H_I2C_5, "Intel Tiger Lake-H I2C Controller-5",
IG4_TIGERLAKE},
+ { PCI_CHIP_TIGERLAKE_H_I2C_6, "Intel Tiger Lake-H I2C Controller-6",
IG4_TIGERLAKE},
+ { PCI_CHIP_TIGERLAKE_LP_I2C_0, "Intel Tiger Lake-LP I2C Controller-0",
IG4_SKYLAKE},
+ { PCI_CHIP_TIGERLAKE_LP_I2C_1, "Intel Tiger Lake-LP I2C Controller-1",
IG4_SKYLAKE},
+ { PCI_CHIP_TIGERLAKE_LP_I2C_2, "Intel Tiger Lake-LP I2C Controller-2",
IG4_SKYLAKE},
+ { PCI_CHIP_TIGERLAKE_LP_I2C_3, "Intel Tiger Lake-LP I2C Controller-3",
IG4_SKYLAKE},
+ { PCI_CHIP_TIGERLAKE_LP_I2C_4, "Intel Tiger Lake-LP I2C Controller-4",
IG4_SKYLAKE},
+ { PCI_CHIP_TIGERLAKE_LP_I2C_5, "Intel Tiger Lake-LP I2C Controller-5",
IG4_SKYLAKE},
+ { PCI_CHIP_TIGERLAKE_LP_I2C_6, "Intel Tiger Lake-LP I2C Controller-6",
IG4_SKYLAKE},
+ { PCI_CHIP_TIGERLAKE_LP_I2C_7, "Intel Tiger Lake-LP I2C Controller-7",
IG4_SKYLAKE},
};
static int
Modified: head/sys/dev/ichiic/ig4_var.h
==
--- head/sys/dev/ichiic/ig4_var.h Sat Dec 5 10:55:14 2020
(r368365)
+++ head/sys/dev/ichiic/ig4_var.h Sat Dec 5 10:57:15 2020
(r368366)
@@ -43,10 +43,17 @@
#include "pci_if.h"
#include "iicbus_if.h"
-enum ig4_vers { IG4_HASWELL, IG4_ATOM, IG4_SKYLAKE, IG4_APL, IG4_CANNONLAKE };
+enum ig4_vers {
+ IG4_HASWELL,
+ IG4_ATOM,
+ IG4_SKYLAKE,
+ IG4_APL,
+ IG4_CANNONLAKE,
+ IG4_TIGERLAKE
+};
+
/* Controller has additional registers */
-#defineIG4_HAS_ADDREGS(vers) ((vers) == IG4_SKYLAKE || \
- (vers) == IG4_APL || (vers) == IG4_CANNONLAKE)
+#defineIG4_HAS_ADDREGS(vers) ((vers) >= IG4_SKYLAKE)
svn commit: r368365 - head/sys/dev/atkbdc
Author: wulf
Date: Sat Dec 5 10:55:14 2020
New Revision: 368365
URL: https://svnweb.freebsd.org/changeset/base/368365
Log:
atkbd(4): Change quirk table end-of-list marker to NULL vendor/maker/product
This fixes regression introduced in r367349 which effectively resulted in
truncation of quirk table.
PR: 250711
Submitted by: grembo
Reported by: Matthias Apitz
X-MFC with: r367349
Modified:
head/sys/dev/atkbdc/atkbdc.c
Modified: head/sys/dev/atkbdc/atkbdc.c
==
--- head/sys/dev/atkbdc/atkbdc.cSat Dec 5 10:55:09 2020
(r368364)
+++ head/sys/dev/atkbdc/atkbdc.cSat Dec 5 10:55:14 2020
(r368365)
@@ -133,7 +133,8 @@ atkbdc_getquirks(void)
char* maker = kern_getenv("smbios.system.maker");
char* product = kern_getenv("smbios.system.product");
-for (i=0; quirks[i].quirk != 0; ++i)
+for (i=0; quirks[i].bios_vendor != NULL || quirks[i].maker != NULL ||
+ quirks[i].product != NULL; ++i)
if (QUIRK_STR_MATCH(quirks[i].bios_vendor, bios_vendor) &&
QUIRK_STR_MATCH(quirks[i].maker, maker) &&
QUIRK_STR_MATCH(quirks[i].product, product))
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368364 - head/sys/dev/pci
Author: mmel Date: Sat Dec 5 10:55:09 2020 New Revision: 368364 URL: https://svnweb.freebsd.org/changeset/base/368364 Log: DesignWare PCIe driver: Don't call bus_generic_attach() twice. bus_generic_attach() should be called from the attach function of the real implementation, not from the common init function. MFC after:1 week Modified: head/sys/dev/pci/pci_dw.c Modified: head/sys/dev/pci/pci_dw.c == --- head/sys/dev/pci/pci_dw.c Sat Dec 5 10:10:25 2020(r368363) +++ head/sys/dev/pci/pci_dw.c Sat Dec 5 10:55:09 2020(r368364) @@ -640,7 +640,7 @@ pci_dw_init(device_t dev) device_add_child(dev, "pci", -1); - return (bus_generic_attach(dev)); + return (0); out: /* XXX Cleanup */ return (rv); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368363 - head/sys/arm/conf
Author: mmel Date: Sat Dec 5 10:10:25 2020 New Revision: 368363 URL: https://svnweb.freebsd.org/changeset/base/368363 Log: Connect RK3288 to GENERIC kernel. Modified: head/sys/arm/conf/GENERIC Modified: head/sys/arm/conf/GENERIC == --- head/sys/arm/conf/GENERIC Sat Dec 5 10:00:39 2020(r368362) +++ head/sys/arm/conf/GENERIC Sat Dec 5 10:10:25 2020(r368363) @@ -42,6 +42,7 @@ files "../freescale/imx/files.imx6" files "../mv/files.arm7" files "../nvidia/tegra124/files.tegra124" files "../qemu/files.qemu" +files "../rockchip/files.rk32xx" files "../ti/files.ti" files "../ti/am335x/files.am335x" files "../ti/omap4/files.omap4" @@ -91,6 +92,7 @@ devicegeneric_timer device mpcore_timer # MMC/SD/SDIO Card slot support +device dwmmc device sdhci # SD controller device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards @@ -285,6 +287,7 @@ makeoptions MODULES_EXTRA+="dtb/am335x" makeoptionsMODULES_EXTRA+="dtb/imx6" makeoptionsMODULES_EXTRA+="dtb/nvidia" makeoptionsMODULES_EXTRA+="dtb/omap4" +makeoptionsMODULES_EXTRA+="dtb/rockchip" makeoptionsMODULES_EXTRA+="dtb/rpi" makeoptionsMODULES_EXTRA+="dtb/zynq" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368362 - head/sys/modules/dtb/rockchip
Author: mmel
Date: Sat Dec 5 10:00:39 2020
New Revision: 368362
URL: https://svnweb.freebsd.org/changeset/base/368362
Log:
Also build DTB files for Asus Tinker board (RK3288 based).
Modified:
head/sys/modules/dtb/rockchip/Makefile
Modified: head/sys/modules/dtb/rockchip/Makefile
==
--- head/sys/modules/dtb/rockchip/Makefile Sat Dec 5 09:08:26 2020
(r368361)
+++ head/sys/modules/dtb/rockchip/Makefile Sat Dec 5 10:00:39 2020
(r368362)
@@ -1,6 +1,12 @@
# $FreeBSD$
+# All the dts files for rockchip systems we support.
+.if ${MACHINE_ARCH} == "armv7"
DTS= \
+ rk3288-tinker.dts \
+ rk3288-tinker-s.dts
+.elif ${MACHINE_ARCH} == "aarch64"
+DTS= \
rockchip/rk3399-khadas-edge-captain.dts \
rockchip/rk3399-khadas-edge.dts \
rockchip/rk3399-khadas-edge-v.dts \
@@ -10,5 +16,6 @@ DTS= \
rockchip/rk3399-rockpro64.dts
DTSO= rk3328-dwc3.dtso
+.endif
.include
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368361 - in stable/12/lib: libc/gen libc/include libthr/thread
Author: kib
Date: Sat Dec 5 09:08:26 2020
New Revision: 368361
URL: https://svnweb.freebsd.org/changeset/base/368361
Log:
MFC r368125:
libc: Add pthread_attr_get_np(3) stub, reporting ESRCH.
PR: 251112
Modified:
stable/12/lib/libc/gen/Symbol.map
stable/12/lib/libc/gen/_pthread_stubs.c
stable/12/lib/libc/include/libc_private.h
stable/12/lib/libthr/thread/thr_init.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libc/gen/Symbol.map
==
--- stable/12/lib/libc/gen/Symbol.map Sat Dec 5 05:56:23 2020
(r368360)
+++ stable/12/lib/libc/gen/Symbol.map Sat Dec 5 09:08:26 2020
(r368361)
@@ -6,6 +6,7 @@ FBSD_1.0 {
__xuname;
pthread_atfork;
pthread_attr_destroy;
+ pthread_attr_get_np;
pthread_attr_getdetachstate;
pthread_attr_getguardsize;
pthread_attr_getinheritsched;
Modified: stable/12/lib/libc/gen/_pthread_stubs.c
==
--- stable/12/lib/libc/gen/_pthread_stubs.c Sat Dec 5 05:56:23 2020
(r368360)
+++ stable/12/lib/libc/gen/_pthread_stubs.c Sat Dec 5 09:08:26 2020
(r368361)
@@ -59,6 +59,7 @@ static intstub_zero(void);
static int stub_fail(void);
static int stub_true(void);
static voidstub_exit(void);
+static int stub_esrch(void);
#definePJT_DUAL_ENTRY(entry) \
(pthread_func_t)entry, (pthread_func_t)entry
@@ -131,6 +132,7 @@ pthread_func_entry_t __thr_jtable[PJT_MAX] = {
[PJT_MUTEXATTR_GETROBUST] = {PJT_DUAL_ENTRY(stub_zero)},
[PJT_MUTEXATTR_SETROBUST] = {PJT_DUAL_ENTRY(stub_zero)},
[PJT_GETTHREADID_NP] = {PJT_DUAL_ENTRY(stub_zero)},
+ [PJT_ATTR_GET_NP] = {PJT_DUAL_ENTRY(stub_esrch)},
};
/*
@@ -288,6 +290,7 @@ STUB_FUNC3(__pthread_cleanup_push_imp, PJT_CLEANUP_PUS
void *, void *)
STUB_FUNC1(_pthread_cancel_enter, PJT_CANCEL_ENTER, void, int)
STUB_FUNC1(_pthread_cancel_leave, PJT_CANCEL_LEAVE, void, int)
+STUB_FUNC2(pthread_attr_get_np, PJT_ATTR_GET_NP, int, pthread_t,
pthread_attr_t *)
static int
stub_zero(void)
@@ -329,4 +332,10 @@ static void
stub_exit(void)
{
exit(0);
+}
+
+static int
+stub_esrch(void)
+{
+ return (ESRCH);
}
Modified: stable/12/lib/libc/include/libc_private.h
==
--- stable/12/lib/libc/include/libc_private.h Sat Dec 5 05:56:23 2020
(r368360)
+++ stable/12/lib/libc/include/libc_private.h Sat Dec 5 09:08:26 2020
(r368361)
@@ -177,6 +177,7 @@ typedef enum {
PJT_MUTEXATTR_GETROBUST,
PJT_MUTEXATTR_SETROBUST,
PJT_GETTHREADID_NP,
+ PJT_ATTR_GET_NP,
PJT_MAX
} pjt_index_t;
Modified: stable/12/lib/libthr/thread/thr_init.c
==
--- stable/12/lib/libthr/thread/thr_init.c Sat Dec 5 05:56:23 2020
(r368360)
+++ stable/12/lib/libthr/thread/thr_init.c Sat Dec 5 09:08:26 2020
(r368361)
@@ -271,6 +271,7 @@ static pthread_func_t jmp_table[][2] = {
[PJT_MUTEXATTR_GETROBUST] = {DUAL_ENTRY(_thr_mutexattr_getrobust)},
[PJT_MUTEXATTR_SETROBUST] = {DUAL_ENTRY(_thr_mutexattr_setrobust)},
[PJT_GETTHREADID_NP] = {DUAL_ENTRY(_thr_getthreadid_np)},
+ [PJT_ATTR_GET_NP] = {DUAL_ENTRY(_thr_attr_get_np)},
};
static int init_once = 0;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
