Re: [3/4] Re: Add support for Meinberg DCF600USB to umbg(4)
On Tue, Mar 26, 2019 at 08:34:11AM +0100, Paul de Weerd wrote: > This may have gotten lost in the noise - but I forgot to update the > DESCRIPTION section of the umbg(4) manpage. > > Diff again: > > Index: umbg.4 > === > RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v > retrieving revision 1.5 > diff -u -p -r1.5 umbg.4 > --- umbg.422 Mar 2019 12:04:25 - 1.5 > +++ umbg.422 Mar 2019 14:47:14 - > @@ -25,8 +25,9 @@ > .Sh DESCRIPTION > The > .Nm > -driver provides support for the Meinberg Funkuhren USB5131, a time signal > -station receiver for the German DCF77 station. > +driver provides support for the Meinberg Funkuhren USB5131 and the > +Meinberg Funkuhren DCF600USB, two time signal station receivers for > +the German DCF77 station. > .Nm > implements a timedelta sensor and the delta (in nanoseconds) between the > received time information and the local time can be accessed through the > you could shorten this a little: The .Nm driver provides support for Meinberg Funkuhren USB5131 and DCF600USB time signal receivers for the German DCF77 station. but i'm ok either way. jmc
Re: [3/4] Re: Add support for Meinberg DCF600USB to umbg(4)
This may have gotten lost in the noise - but I forgot to update the DESCRIPTION section of the umbg(4) manpage. Diff again: Index: umbg.4 === RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v retrieving revision 1.5 diff -u -p -r1.5 umbg.4 --- umbg.4 22 Mar 2019 12:04:25 - 1.5 +++ umbg.4 22 Mar 2019 14:47:14 - @@ -25,8 +25,9 @@ .Sh DESCRIPTION The .Nm -driver provides support for the Meinberg Funkuhren USB5131, a time signal -station receiver for the German DCF77 station. +driver provides support for the Meinberg Funkuhren USB5131 and the +Meinberg Funkuhren DCF600USB, two time signal station receivers for +the German DCF77 station. .Nm implements a timedelta sensor and the delta (in nanoseconds) between the received time information and the local time can be accessed through the Thanks, Paul On Fri, Mar 22, 2019 at 04:00:06PM +0100, Paul de Weerd wrote: | Whoops. I had missed one change to the manpage that's still needed: | the DESCRIPTION section also mentions the supported devices. This now | supports two models, but I don't think it makes sense to turn this | into a list of supported hardware just yet. | | | Index: umbg.4 | === | RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v | retrieving revision 1.5 | diff -u -p -r1.5 umbg.4 | --- umbg.422 Mar 2019 12:04:25 - 1.5 | +++ umbg.422 Mar 2019 14:47:14 - | @@ -25,8 +25,9 @@ | .Sh DESCRIPTION | The | .Nm | -driver provides support for the Meinberg Funkuhren USB5131, a time signal | -station receiver for the German DCF77 station. | +driver provides support for the Meinberg Funkuhren USB5131 and the | +Meinberg Funkuhren DCF600USB, two time signal station receivers for | +the German DCF77 station. | .Nm | implements a timedelta sensor and the delta (in nanoseconds) between the | received time information and the local time can be accessed through the | | | On Fri, Mar 22, 2019 at 10:04:19AM +0100, Paul de Weerd wrote: | | | | Index: share/man/man4/umbg.4 | | === | | RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v | | retrieving revision 1.4 | | diff -u -p -r1.4 umbg.4 | | --- share/man/man4/umbg.4 16 Jul 2013 16:05:49 - 1.4 | | +++ share/man/man4/umbg.4 20 Mar 2019 12:16:03 - | | @@ -19,7 +19,7 @@ | | .Os | | .Sh NAME | | .Nm umbg | | -.Nd Meinberg Funkuhren USB5131 timedelta sensor | | +.Nd Meinberg Funkuhren USB5131 and DCF600USB timedelta sensors | | .Sh SYNOPSIS | | .Cd "umbg* at uhub?" | | .Sh DESCRIPTION | | Index: sys/dev/usb/umbg.c | | === | | RCS file: /home/OpenBSD/cvs/src/sys/dev/usb/umbg.c,v | | retrieving revision 1.25 | | diff -u -p -r1.25 umbg.c | | --- sys/dev/usb/umbg.c 30 Dec 2017 20:47:00 - 1.25 | | +++ sys/dev/usb/umbg.c 22 Mar 2019 08:29:40 - | | @@ -156,8 +156,9 @@ umbg_match(struct device *parent, void * | | if (uaa->iface == NULL) | | return UMATCH_NONE; | | | | - return uaa->vendor == USB_VENDOR_MEINBERG && | | - uaa->product == USB_PRODUCT_MEINBERG_USB5131 ? | | + return uaa->vendor == USB_VENDOR_MEINBERG && ( | | + uaa->product == USB_PRODUCT_MEINBERG_USB5131 || | | + uaa->product == USB_PRODUCT_MEINBERG_DCF600USB) ? | | UMATCH_VENDOR_PRODUCT : UMATCH_NONE; | | } | | | | @@ -172,6 +173,7 @@ umbg_attach(struct device *parent, struc | | usb_endpoint_descriptor_t *ed; | | usbd_status err; | | int signal; | | + const char *desc; | | #ifdef UMBG_DEBUG | | char fw_id[MBG_ID_LEN]; | | #endif | | @@ -182,7 +184,18 @@ umbg_attach(struct device *parent, struc | | | | sc->sc_timedelta.type = SENSOR_TIMEDELTA; | | sc->sc_timedelta.status = SENSOR_S_UNKNOWN; | | - strlcpy(sc->sc_timedelta.desc, "USB5131", | | + | | + switch (uaa->product) { | | + case USB_PRODUCT_MEINBERG_DCF600USB: | | + desc = "DCF600USB"; | | + break; | | + case USB_PRODUCT_MEINBERG_USB5131: | | + desc = "USB5131"; | | + break; | | + default: | | + desc = "Unspecified Radio clock"; | | + } | | + strlcpy(sc->sc_timedelta.desc, desc, | | sizeof(sc->sc_timedelta.desc)); | | sensor_attach(>sc_sensordev, >sc_timedelta); | | | | | | -- | | >[<++>-]<+++.>+++[<-->-]<.>+++[<+ | | +++>-]<.>++[<>-]<+.--.[-] | | http://www.weirdnet.nl/ | | | | -- | >[<++>-]<+++.>+++[<-->-]<.>+++[<+ | +++>-]<.>++[<>-]<+.--.[-] | http://www.weirdnet.nl/ | -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-]
Re: usb drivers & arches (Re: [4/4] Re: Add support for Meinberg DCF600USB to umbg(4))
Paul de Weerd wrote: > On Fri, Mar 22, 2019 at 11:53:20AM +, Stuart Henderson wrote: > | This is a more general thing actually, the list of USB drivers is rather > | haphazard at the moment. List below (to fit <80 cols I've snipped i386 > | which has all drivers present in any other GENERIC config, amd64 which > | is only missing umbg, and sgi with all its various different configs). > | > | Would it make sense to try unifying these for all/some arches? are > | there particular space constraints for some (IIRC maybe the case on sgi, > | not sure about others) or other reasons to restrict them? > > One thing that could be considered is putting all USB devices into a > separate file that gets included from the various arch-specific > GENERIC config files. That would look a bit like the below for amd64 > (although the 'USB' file would then probably move to sys/conf/). > > This has some obvious downsides, so this is probably not such a hot > idea. There's some upsides too, though. Obviously, this is above my > pay-grade - I cannot oversee the full implications. This has been looked at before, and we decided against it.
Re: usb drivers & arches (Re: [4/4] Re: Add support for Meinberg DCF600USB to umbg(4))
On Fri, Mar 22, 2019 at 11:53:20AM +, Stuart Henderson wrote: | This is a more general thing actually, the list of USB drivers is rather | haphazard at the moment. List below (to fit <80 cols I've snipped i386 | which has all drivers present in any other GENERIC config, amd64 which | is only missing umbg, and sgi with all its various different configs). | | Would it make sense to try unifying these for all/some arches? are | there particular space constraints for some (IIRC maybe the case on sgi, | not sure about others) or other reasons to restrict them? One thing that could be considered is putting all USB devices into a separate file that gets included from the various arch-specific GENERIC config files. That would look a bit like the below for amd64 (although the 'USB' file would then probably move to sys/conf/). This has some obvious downsides, so this is probably not such a hot idea. There's some upsides too, though. Obviously, this is above my pay-grade - I cannot oversee the full implications. Index: GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/amd64/conf/GENERIC,v retrieving revision 1.467 diff -u -p -r1.467 GENERIC --- GENERIC 22 Mar 2019 12:05:45 - 1.467 +++ GENERIC 22 Mar 2019 16:08:19 - @@ -89,7 +89,6 @@ hvn* at hyperv? # Hyper-V NetVSC hvs* at hyperv? # Hyper-V StorVSC option PCIVERBOSE -option USBVERBOSE pchb* at pci? # PCI-Host bridges aapic* at pci? # AMD 8131 IO apic @@ -211,120 +210,7 @@ usb* at ehci? usb* at uhci? usb* at ohci? -# USB devices -uhub* at usb? # USB Hubs -uhub* at uhub?# USB Hubs -urng* at uhub?# USB Random Number Generator -uonerng* at uhub? # Moonbase Otago OneRNG -umodem*at uhub?# USB Modems/Serial -ucom* at umodem? -uvisor*at uhub?# Handspring Visor -ucom* at uvisor? -uvscom*at uhub?# SUNTAC Slipper U VS-10U serial -ucom* at uvscom? -ubsa* at uhub?# Belkin serial adapter -ucom* at ubsa? -uftdi* at uhub?# FTDI FT8U100AX serial adapter -ucom* at uftdi? -uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? -umct* at uhub?# MCT USB-RS232 serial adapter -ucom* at umct? -uslcom*at uhub?# Silicon Laboratories CP210x serial -ucom* at uslcom? -uscom* at uhub?# Simple USB serial adapters -ucom* at uscom? -uark* at uhub?# Arkmicro ARK3116 serial -ucom* at uark? -moscom*at uhub?# MosChip MCS7703 serial -ucom* at moscom? -umcs* at uhub?# MosChip MCS78x0 serial -ucom* at umcs? -uipaq* at uhub?# iPAQ serial adapter -ucom* at uipaq? -umsm* at uhub?# Qualcomm MSM EVDO -ucom* at umsm? -uchcom*at uhub?# WinChipHead CH341/340 serial -ucom* at uchcom? -uticom*at uhub?# TI serial -ucom* at uticom? -uaudio* at uhub? # USB Audio -audio* at uaudio? -umidi* at uhub?# USB MIDI -midi* at umidi? -ulpt* at uhub?# USB Printers -umass* at uhub?# USB Mass Storage devices -ubcmtp*at uhub?# Broadcom USB trackpad -wsmouse* at ubcmtp? mux 0 -uhidev*at uhub?# Human Interface Devices -ums* at uhidev? # USB mouse -wsmouse* at ums? mux 0 -umt* at uhidev? # USB multitouch touchpad -wsmouse* at umt? mux 0 -uts* at uhub?# USB touchscreen -wsmouse* at uts? mux 0 -uwacom*at uhidev? # USB Wacom tablet -wsmouse* at uwacom? mux 0 -ukbd* at uhidev? # USB keyboard -wskbd* at ukbd? mux 1 -ucycom*at uhidev? # Cypress serial -ucom* at ucycom? -uslhcom* at uhidev?# Silicon Labs CP2110 USB HID UART -ucom* at uslhcom? -uhid* at uhidev? # USB generic HID support -upd* at uhidev? # USB Power Devices sensors -aue* at uhub?# ADMtek AN986 Pegasus Ethernet -atu* at uhub?# Atmel AT76c50x based 802.11b -axe* at uhub?# ASIX Electronics AX88172 USB Ethernet -axen* at uhub?# ASIX Electronics AX88179 USB Ethernet -cue* at uhub?# CATC USB-EL1201A based Ethernet -kue* at uhub?# Kawasaki KL5KUSB101B based Ethernet -smsc* at uhub?# SMSC LAN95xx Ethernet -cdce* at uhub?# CDC Ethernet -urndis*at uhub?# Remote NDIS Ethernet -upl* at uhub?# Prolific PL2301/PL2302 host-to-host `network' -ugl* at uhub?# Genesys Logic GL620USB-A host-to-host `network' -udav* at uhub?
Re: [3/4] Re: Add support for Meinberg DCF600USB to umbg(4)
Whoops. I had missed one change to the manpage that's still needed: the DESCRIPTION section also mentions the supported devices. This now supports two models, but I don't think it makes sense to turn this into a list of supported hardware just yet. Index: umbg.4 === RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v retrieving revision 1.5 diff -u -p -r1.5 umbg.4 --- umbg.4 22 Mar 2019 12:04:25 - 1.5 +++ umbg.4 22 Mar 2019 14:47:14 - @@ -25,8 +25,9 @@ .Sh DESCRIPTION The .Nm -driver provides support for the Meinberg Funkuhren USB5131, a time signal -station receiver for the German DCF77 station. +driver provides support for the Meinberg Funkuhren USB5131 and the +Meinberg Funkuhren DCF600USB, two time signal station receivers for +the German DCF77 station. .Nm implements a timedelta sensor and the delta (in nanoseconds) between the received time information and the local time can be accessed through the On Fri, Mar 22, 2019 at 10:04:19AM +0100, Paul de Weerd wrote: | | Index: share/man/man4/umbg.4 | === | RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v | retrieving revision 1.4 | diff -u -p -r1.4 umbg.4 | --- share/man/man4/umbg.4 16 Jul 2013 16:05:49 - 1.4 | +++ share/man/man4/umbg.4 20 Mar 2019 12:16:03 - | @@ -19,7 +19,7 @@ | .Os | .Sh NAME | .Nm umbg | -.Nd Meinberg Funkuhren USB5131 timedelta sensor | +.Nd Meinberg Funkuhren USB5131 and DCF600USB timedelta sensors | .Sh SYNOPSIS | .Cd "umbg* at uhub?" | .Sh DESCRIPTION | Index: sys/dev/usb/umbg.c | === | RCS file: /home/OpenBSD/cvs/src/sys/dev/usb/umbg.c,v | retrieving revision 1.25 | diff -u -p -r1.25 umbg.c | --- sys/dev/usb/umbg.c30 Dec 2017 20:47:00 - 1.25 | +++ sys/dev/usb/umbg.c22 Mar 2019 08:29:40 - | @@ -156,8 +156,9 @@ umbg_match(struct device *parent, void * | if (uaa->iface == NULL) | return UMATCH_NONE; | | - return uaa->vendor == USB_VENDOR_MEINBERG && | - uaa->product == USB_PRODUCT_MEINBERG_USB5131 ? | + return uaa->vendor == USB_VENDOR_MEINBERG && ( | + uaa->product == USB_PRODUCT_MEINBERG_USB5131 || | + uaa->product == USB_PRODUCT_MEINBERG_DCF600USB) ? | UMATCH_VENDOR_PRODUCT : UMATCH_NONE; | } | | @@ -172,6 +173,7 @@ umbg_attach(struct device *parent, struc | usb_endpoint_descriptor_t *ed; | usbd_status err; | int signal; | + const char *desc; | #ifdef UMBG_DEBUG | char fw_id[MBG_ID_LEN]; | #endif | @@ -182,7 +184,18 @@ umbg_attach(struct device *parent, struc | | sc->sc_timedelta.type = SENSOR_TIMEDELTA; | sc->sc_timedelta.status = SENSOR_S_UNKNOWN; | - strlcpy(sc->sc_timedelta.desc, "USB5131", | + | + switch (uaa->product) { | + case USB_PRODUCT_MEINBERG_DCF600USB: | + desc = "DCF600USB"; | + break; | + case USB_PRODUCT_MEINBERG_USB5131: | + desc = "USB5131"; | + break; | + default: | + desc = "Unspecified Radio clock"; | + } | + strlcpy(sc->sc_timedelta.desc, desc, | sizeof(sc->sc_timedelta.desc)); | sensor_attach(>sc_sensordev, >sc_timedelta); | | | -- | >[<++>-]<+++.>+++[<-->-]<.>+++[<+ | +++>-]<.>++[<>-]<+.--.[-] | http://www.weirdnet.nl/ | -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-] http://www.weirdnet.nl/
Re: [4/4] Re: Add support for Meinberg DCF600USB to umbg(4)
OK On 2019 Mar 22 (Fri) at 10:04:37 +0100 (+0100), Paul de Weerd wrote: :Index: GENERIC :=== :RCS file: /home/OpenBSD/cvs/src/sys/arch/amd64/conf/GENERIC,v :retrieving revision 1.466 :diff -u -p -r1.466 GENERIC :--- GENERIC19 Jan 2019 03:24:18 - 1.466 :+++ GENERIC22 Mar 2019 08:10:33 - :@@ -306,6 +306,7 @@ urtw* at uhub?# Realtek 8187 : rsu* at uhub?# Realtek RTL8188SU/RTL8191SU/RTL8192SU : urtwn*at uhub?# Realtek RTL8188CU/RTL8192CU : udcf* at uhub?# Gude Expert mouseCLOCK :+umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB : umb* at uhub?# Mobile Broadband Interface Model : uthum*at uhidev? # TEMPerHUM sensor : ugold*at uhidev? # gold TEMPer sensor : : :-- :>[<++>-]<+++.>+++[<-->-]<.>+++[<+ :+++>-]<.>++[<>-]<+.--.[-] : http://www.weirdnet.nl/ :
Re: [3/4] Re: Add support for Meinberg DCF600USB to umbg(4)
OK On 2019 Mar 22 (Fri) at 10:04:19 +0100 (+0100), Paul de Weerd wrote: : :Index: share/man/man4/umbg.4 :=== :RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v :retrieving revision 1.4 :diff -u -p -r1.4 umbg.4 :--- share/man/man4/umbg.4 16 Jul 2013 16:05:49 - 1.4 :+++ share/man/man4/umbg.4 20 Mar 2019 12:16:03 - :@@ -19,7 +19,7 @@ : .Os : .Sh NAME : .Nm umbg :-.Nd Meinberg Funkuhren USB5131 timedelta sensor :+.Nd Meinberg Funkuhren USB5131 and DCF600USB timedelta sensors : .Sh SYNOPSIS : .Cd "umbg* at uhub?" : .Sh DESCRIPTION :Index: sys/dev/usb/umbg.c :=== :RCS file: /home/OpenBSD/cvs/src/sys/dev/usb/umbg.c,v :retrieving revision 1.25 :diff -u -p -r1.25 umbg.c :--- sys/dev/usb/umbg.c 30 Dec 2017 20:47:00 - 1.25 :+++ sys/dev/usb/umbg.c 22 Mar 2019 08:29:40 - :@@ -156,8 +156,9 @@ umbg_match(struct device *parent, void * : if (uaa->iface == NULL) : return UMATCH_NONE; : :- return uaa->vendor == USB_VENDOR_MEINBERG && :- uaa->product == USB_PRODUCT_MEINBERG_USB5131 ? :+ return uaa->vendor == USB_VENDOR_MEINBERG && ( :+ uaa->product == USB_PRODUCT_MEINBERG_USB5131 || :+ uaa->product == USB_PRODUCT_MEINBERG_DCF600USB) ? : UMATCH_VENDOR_PRODUCT : UMATCH_NONE; : } : :@@ -172,6 +173,7 @@ umbg_attach(struct device *parent, struc : usb_endpoint_descriptor_t *ed; : usbd_status err; : int signal; :+ const char *desc; : #ifdef UMBG_DEBUG : char fw_id[MBG_ID_LEN]; : #endif :@@ -182,7 +184,18 @@ umbg_attach(struct device *parent, struc : : sc->sc_timedelta.type = SENSOR_TIMEDELTA; : sc->sc_timedelta.status = SENSOR_S_UNKNOWN; :- strlcpy(sc->sc_timedelta.desc, "USB5131", :+ :+ switch (uaa->product) { :+ case USB_PRODUCT_MEINBERG_DCF600USB: :+ desc = "DCF600USB"; :+ break; :+ case USB_PRODUCT_MEINBERG_USB5131: :+ desc = "USB5131"; :+ break; :+ default: :+ desc = "Unspecified Radio clock"; :+ } :+ strlcpy(sc->sc_timedelta.desc, desc, : sizeof(sc->sc_timedelta.desc)); : sensor_attach(>sc_sensordev, >sc_timedelta); : : :-- :>[<++>-]<+++.>+++[<-->-]<.>+++[<+ :+++>-]<.>++[<>-]<+.--.[-] : http://www.weirdnet.nl/ :
usb drivers & arches (Re: [4/4] Re: Add support for Meinberg DCF600USB to umbg(4))
On 2019/03/22 11:55, Paul de Weerd wrote: > On Fri, Mar 22, 2019 at 10:22:15AM +, Stuart Henderson wrote: > | $ for i in */conf/GENERIC; do grep -q ^udcf $i && grep -q ^umbg $i || echo > ${i%%/*}; done > > Did you want to only find archs which DO have udcf(4) but not umbg(4)? > Because not all of those in your list have udcf. This adds ubmg where > we already have udcf. Oops yes, trying to be too clever. $ for i in `grep -l ^udcf */conf/GENERIC`; do grep -q ^umbg $i || echo ${i%%/*}; done amd64 arm64 armv7 landisk loongson :-) > As mentioned, this has not been tested at all. This is a more general thing actually, the list of USB drivers is rather haphazard at the moment. List below (to fit <80 cols I've snipped i386 which has all drivers present in any other GENERIC config, amd64 which is only missing umbg, and sgi with all its various different configs). Would it make sense to try unifying these for all/some arches? are there particular space constraints for some (IIRC maybe the case on sgi, not sure about others) or other reasons to restrict them? ubcmtp (i386/amd64 only) umb (i386/amd64 only) athn: arm64 armv7 landisk loongson macppc octeon socppc sparc64 atu: arm64 armv7 hppa landisk loongson macppc octeonsparc64 aue: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 bwfm: arm64 armv7 loongson macppc cdce:alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 cue: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 kue: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 mos: arm64 armv7 loongson macppc octeon socppc sparc64 moscom:arm64 armv7 landisk loongson macppc octeon mue: arm64 armv7 otus: arm64 armv7 loongson macppc octeon rsu: arm64 armv7 hppa landisk loongson macppc octeon socppc sparc64 uark:alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 uath:alpha arm64 armv7 landisk loongson macppc octeon socppc sparc64 uaudio: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 uberry:arm64 armv7 loongson macppc octeon ubsa:alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 uchcom: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 udav:alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 udcf: arm64 armv7 landisk loongson macppc octeonsparc64 udl: arm64 armv7 hppa landisk loongson macppcsocppc udsbr: alpha arm64 armv7 hppa landisk macppc octeonsparc64 uftdi: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 ugl: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 uipaq: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 umbg:macppc octeonsparc64 umcs: arm64 armv7 landisk loongson macppc octeon umct:alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 umidi: alpha arm64 armv7 hppa loongson macppc sparc64 umodem: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 umsm: arm64 armv7 hppa landisk loongson macppc octeon uonerng: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 uow: alpha arm64 armv7 hppa macppc octeonsparc64 upgt: arm64 armv7 loongson macppc octeon upl: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 uplcom: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 ure: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 url: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 urndis: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 urng:alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 urtw: arm64 armv7 loongson macppc octeon urtwn: arm64 armv7 landisk loongson macppc octeon socppc sparc64 uscom: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 uslcom: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 uticom:arm64 armv7 octeon uts: arm64 armv7 macppc utvfu: alpha arm64 armv7 loongson macppc octeonsparc64 uvideo: alpha arm64 armv7 loongson macppc octeonsparc64 uvisor: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 uvscom: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 wi: alpha arm64 armv7 hppa landisk loongson macppc octeonsparc64 zyd: arm64 armv7 hppa landisk loongson macppc octeon socppc sparc64
Re: [4/4] Re: Add support for Meinberg DCF600USB to umbg(4)
On Fri, Mar 22, 2019 at 10:22:15AM +, Stuart Henderson wrote: | $ for i in */conf/GENERIC; do grep -q ^udcf $i && grep -q ^umbg $i || echo ${i%%/*}; done Did you want to only find archs which DO have udcf(4) but not umbg(4)? Because not all of those in your list have udcf. This adds ubmg where we already have udcf. As mentioned, this has not been tested at all. Index: arm64/conf/GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/arm64/conf/GENERIC,v retrieving revision 1.96 diff -u -p -r1.96 GENERIC --- arm64/conf/GENERIC 3 Feb 2019 14:03:36 - 1.96 +++ arm64/conf/GENERIC 22 Mar 2019 10:50:20 - @@ -299,6 +299,7 @@ urtw* at uhub?# Realtek 8187 rsu* at uhub?# Realtek RTL8188SU/RTL8191SU/RTL8192SU urtwn* at uhub?# Realtek RTL8188CU/RTL8192CU udcf* at uhub?# Gude Expert mouseCLOCK +umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB uthum* at uhidev? # TEMPerHUM sensor ugold* at uhidev? # gold TEMPer sensor utrh* at uhidev? # USBRH sensor Index: armv7/conf/GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/armv7/conf/GENERIC,v retrieving revision 1.121 diff -u -p -r1.121 GENERIC --- armv7/conf/GENERIC 12 Jan 2019 19:37:16 - 1.121 +++ armv7/conf/GENERIC 22 Mar 2019 10:50:34 - @@ -326,6 +326,7 @@ urtw* at uhub?# Realtek 8187 rsu* at uhub?# Realtek RTL8188SU/RTL8191SU/RTL8192SU urtwn* at uhub?# Realtek RTL8188CU/RTL8192CU udcf* at uhub?# Gude Expert mouseCLOCK +umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB uthum* at uhidev? # TEMPerHUM sensor ugold* at uhidev? # gold TEMPer sensor utrh* at uhidev? # USBRH sensor Index: landisk/conf/GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/landisk/conf/GENERIC,v retrieving revision 1.53 diff -u -p -r1.53 GENERIC --- landisk/conf/GENERIC22 Aug 2018 15:38:46 - 1.53 +++ landisk/conf/GENERIC22 Mar 2019 10:50:53 - @@ -162,6 +162,7 @@ rsu*at uhub?# Realtek RTL8188SU/RTL81 urtwn* at uhub?# Realtek RTL8188CU/RTL8192CU zyd* at uhub?# Zydas ZD1211 udcf* at uhub?# Gude Expert mouseCLOCK +umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB uthum* at uhidev? # TEMPerHUM sensor ugold* at uhidev? # gold TEMPer sensor utwitch* at uhidev?# YUREX BBU sensor Index: loongson/conf/GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/loongson/conf/GENERIC,v retrieving revision 1.59 diff -u -p -r1.59 GENERIC --- loongson/conf/GENERIC 22 Aug 2018 15:38:46 - 1.59 +++ loongson/conf/GENERIC 22 Mar 2019 10:51:09 - @@ -192,6 +192,7 @@ wi* at uhub?# WaveLAN IEEE 802.11DS zyd* at uhub?# Zydas ZD1211 uberry*at uhub?# Research In Motion BlackBerry udcf* at uhub?# Gude Expert mouseCLOCK +umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB uthum* at uhidev? # TEMPerHUM sensor ugold* at uhidev? # gold TEMPer sensor utwitch* at uhidev? # YUREX BBU sensor -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-] http://www.weirdnet.nl/
Re: [4/4] Re: Add support for Meinberg DCF600USB to umbg(4)
On Fri, Mar 22, 2019 at 10:22:15AM +, Stuart Henderson wrote: | it's missing on some others too; | | $ for i in */conf/GENERIC; do grep -q ^udcf $i && grep -q ^umbg $i || echo ${i%%/*}; done | alpha | amd64 | arm64 | armv7 | hppa | landisk | loongson | luna88k | socppc Yes. I have some of those (some even in a working condition), but haven't tried yet. My amd64 is the fastest machine (platform) I have, the others I would first need to dig out, update and get a source tree on. That'll take me a lot more time - I wanted to send this out before going down that route. Paul -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-] http://www.weirdnet.nl/
Re: [4/4] Re: Add support for Meinberg DCF600USB to umbg(4)
On 2019/03/22 10:04, Paul de Weerd wrote: > Index: GENERIC > === > RCS file: /home/OpenBSD/cvs/src/sys/arch/amd64/conf/GENERIC,v > retrieving revision 1.466 > diff -u -p -r1.466 GENERIC > --- GENERIC 19 Jan 2019 03:24:18 - 1.466 > +++ GENERIC 22 Mar 2019 08:10:33 - > @@ -306,6 +306,7 @@ urtw* at uhub?# Realtek 8187 > rsu* at uhub?# Realtek RTL8188SU/RTL8191SU/RTL8192SU > urtwn* at uhub?# Realtek RTL8188CU/RTL8192CU > udcf*at uhub?# Gude Expert mouseCLOCK > +umbg*at uhub?# Meinberg Funkuhren USB5131/DCF600USB > umb* at uhub?# Mobile Broadband Interface Model > uthum* at uhidev? # TEMPerHUM sensor > ugold* at uhidev? # gold TEMPer sensor > > > -- > >[<++>-]<+++.>+++[<-->-]<.>+++[<+ > +++>-]<.>++[<>-]<+.--.[-] > http://www.weirdnet.nl/ > it's missing on some others too; $ for i in */conf/GENERIC; do grep -q ^udcf $i && grep -q ^umbg $i || echo ${i%%/*}; done alpha amd64 arm64 armv7 hppa landisk loongson luna88k socppc
[5/4] Re: Add support for Meinberg DCF600USB to umbg(4)
Bonus diff - make explicit in the GENERIC configs that already have umbg(4), that this driver now supports DCF600USB too Index: i386/conf/GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/i386/conf/GENERIC,v retrieving revision 1.839 diff -u -p -r1.839 GENERIC --- i386/conf/GENERIC 18 Jan 2019 01:34:50 - 1.839 +++ i386/conf/GENERIC 22 Mar 2019 09:08:51 - @@ -318,7 +318,7 @@ urtw* at uhub?# Realtek 8187 rsu* at uhub?# Realtek RTL8188SU/RTL8191SU/RTL8192SU urtwn* at uhub?# Realtek RTL8188CU/RTL8192CU udcf* at uhub?# Gude Expert mouseCLOCK -umbg* at uhub?# Meinberg Funkuhren USB5131 +umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB umb* at uhub?# Mobile Broadband Interface Model uthum* at uhidev? # TEMPerHUM sensor ugold* at uhidev? # gold TEMPer sensor Index: macppc/conf/GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/macppc/conf/GENERIC,v retrieving revision 1.266 diff -u -p -r1.266 GENERIC --- macppc/conf/GENERIC 21 Sep 2018 12:42:34 - 1.266 +++ macppc/conf/GENERIC 22 Mar 2019 09:08:56 - @@ -293,7 +293,7 @@ zyd*at uhub?# Zydas ZD1211 upgt* at uhub?# Conexant/Intersil PrismGT SoftMAC USB urtw* at uhub?# Realtek 8187 udcf* at uhub?# Gude Expert mouseCLOCK -umbg* at uhub?# Meinberg Funkuhren USB5131 +umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB uthum* at uhidev? # TEMPerHUM sensor ugold* at uhidev? # gold TEMPer sensor utrh* at uhidev? # USBRH sensor Index: octeon/conf/GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/octeon/conf/GENERIC,v retrieving revision 1.45 diff -u -p -r1.45 GENERIC --- octeon/conf/GENERIC 12 Jan 2019 16:59:38 - 1.45 +++ octeon/conf/GENERIC 22 Mar 2019 09:08:58 - @@ -175,7 +175,7 @@ urtw* at uhub?# Realtek 8187 rsu* at uhub?# Realtek RTL8188SU/RTL8191SU/RTL8192SU urtwn* at uhub?# Realtek RTL8188CU/RTL8192CU udcf* at uhub?# Gude Expert mouseCLOCK -umbg* at uhub?# Meinberg Funkuhren USB5131 +umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB uthum* at uhidev? # TEMPerHUM sensor ugold* at uhidev? # gold TEMPer sensor utrh* at uhidev? # USBRH sensor Index: sparc64/conf/GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/sparc64/conf/GENERIC,v retrieving revision 1.309 diff -u -p -r1.309 GENERIC --- sparc64/conf/GENERIC29 Jan 2019 02:43:05 - 1.309 +++ sparc64/conf/GENERIC22 Mar 2019 09:09:04 - @@ -247,7 +247,7 @@ udsbr* at uhub?# D-Link DSB-R100 radio radio* at udsbr? # USB radio ugen* at uhub?# USB Generic driver udcf* at uhub?# Gude Expert mouseCLOCK -umbg* at uhub?# Meinberg Funkuhren USB5131 +umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB uthum* at uhidev? # TEMPerHUM sensor ugold* at uhidev? # gold TEMPer sensor utwitch* at uhidev?# UYUREX BBU sensor -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-] http://www.weirdnet.nl/
[2/4] Re: Add support for Meinberg DCF600USB to umbg(4)
Index: usbdevs.h === RCS file: /home/OpenBSD/cvs/src/sys/dev/usb/usbdevs.h,v retrieving revision 1.707 diff -u -p -r1.707 usbdevs.h --- usbdevs.h 24 Feb 2019 17:35:44 - 1.707 +++ usbdevs.h 22 Mar 2019 07:48:28 - @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.707 2019/02/24 17:35:44 patrick Exp $ */ +/* $OpenBSD$ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.694 2019/01/14 03:28:03 jmatthew Exp + * OpenBSD: usbdevs,v 1.695 2019/02/24 17:35:29 patrick Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -2931,6 +2931,7 @@ /* Meinberg Funkuhren products */ #defineUSB_PRODUCT_MEINBERG_USB51310x0301 /* USB 5131 DCF77 - Radio Clock */ +#defineUSB_PRODUCT_MEINBERG_DCF600USB 0x0302 /* DCF600USB - Radio Clock */ /* Melco, Inc products */ #defineUSB_PRODUCT_MELCO_LUATX10x0001 /* LUA-TX Ethernet */ Index: usbdevs_data.h === RCS file: /home/OpenBSD/cvs/src/sys/dev/usb/usbdevs_data.h,v retrieving revision 1.701 diff -u -p -r1.701 usbdevs_data.h --- usbdevs_data.h 24 Feb 2019 17:35:44 - 1.701 +++ usbdevs_data.h 22 Mar 2019 07:48:28 - @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs_data.h,v 1.701 2019/02/24 17:35:44 patrick Exp $ */ +/* $OpenBSD$ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.694 2019/01/14 03:28:03 jmatthew Exp + * OpenBSD: usbdevs,v 1.695 2019/02/24 17:35:29 patrick Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -7016,6 +7016,10 @@ const struct usb_known_product usb_known { USB_VENDOR_MEINBERG, USB_PRODUCT_MEINBERG_USB5131, "USB 5131 DCF77 - Radio Clock", + }, + { + USB_VENDOR_MEINBERG, USB_PRODUCT_MEINBERG_DCF600USB, + "DCF600USB - Radio Clock", }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1, -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-] http://www.weirdnet.nl/
[4/4] Re: Add support for Meinberg DCF600USB to umbg(4)
Index: GENERIC === RCS file: /home/OpenBSD/cvs/src/sys/arch/amd64/conf/GENERIC,v retrieving revision 1.466 diff -u -p -r1.466 GENERIC --- GENERIC 19 Jan 2019 03:24:18 - 1.466 +++ GENERIC 22 Mar 2019 08:10:33 - @@ -306,6 +306,7 @@ urtw* at uhub?# Realtek 8187 rsu* at uhub?# Realtek RTL8188SU/RTL8191SU/RTL8192SU urtwn* at uhub?# Realtek RTL8188CU/RTL8192CU udcf* at uhub?# Gude Expert mouseCLOCK +umbg* at uhub?# Meinberg Funkuhren USB5131/DCF600USB umb* at uhub?# Mobile Broadband Interface Model uthum* at uhidev? # TEMPerHUM sensor ugold* at uhidev? # gold TEMPer sensor -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-] http://www.weirdnet.nl/
[3/4] Re: Add support for Meinberg DCF600USB to umbg(4)
Index: share/man/man4/umbg.4 === RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v retrieving revision 1.4 diff -u -p -r1.4 umbg.4 --- share/man/man4/umbg.4 16 Jul 2013 16:05:49 - 1.4 +++ share/man/man4/umbg.4 20 Mar 2019 12:16:03 - @@ -19,7 +19,7 @@ .Os .Sh NAME .Nm umbg -.Nd Meinberg Funkuhren USB5131 timedelta sensor +.Nd Meinberg Funkuhren USB5131 and DCF600USB timedelta sensors .Sh SYNOPSIS .Cd "umbg* at uhub?" .Sh DESCRIPTION Index: sys/dev/usb/umbg.c === RCS file: /home/OpenBSD/cvs/src/sys/dev/usb/umbg.c,v retrieving revision 1.25 diff -u -p -r1.25 umbg.c --- sys/dev/usb/umbg.c 30 Dec 2017 20:47:00 - 1.25 +++ sys/dev/usb/umbg.c 22 Mar 2019 08:29:40 - @@ -156,8 +156,9 @@ umbg_match(struct device *parent, void * if (uaa->iface == NULL) return UMATCH_NONE; - return uaa->vendor == USB_VENDOR_MEINBERG && - uaa->product == USB_PRODUCT_MEINBERG_USB5131 ? + return uaa->vendor == USB_VENDOR_MEINBERG && ( + uaa->product == USB_PRODUCT_MEINBERG_USB5131 || + uaa->product == USB_PRODUCT_MEINBERG_DCF600USB) ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE; } @@ -172,6 +173,7 @@ umbg_attach(struct device *parent, struc usb_endpoint_descriptor_t *ed; usbd_status err; int signal; + const char *desc; #ifdef UMBG_DEBUG char fw_id[MBG_ID_LEN]; #endif @@ -182,7 +184,18 @@ umbg_attach(struct device *parent, struc sc->sc_timedelta.type = SENSOR_TIMEDELTA; sc->sc_timedelta.status = SENSOR_S_UNKNOWN; - strlcpy(sc->sc_timedelta.desc, "USB5131", + + switch (uaa->product) { + case USB_PRODUCT_MEINBERG_DCF600USB: + desc = "DCF600USB"; + break; + case USB_PRODUCT_MEINBERG_USB5131: + desc = "USB5131"; + break; + default: + desc = "Unspecified Radio clock"; + } + strlcpy(sc->sc_timedelta.desc, desc, sizeof(sc->sc_timedelta.desc)); sensor_attach(>sc_sensordev, >sc_timedelta); -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-] http://www.weirdnet.nl/
[1/4] Re: Add support for Meinberg DCF600USB to umbg(4)
Index: usbdevs === RCS file: /home/OpenBSD/cvs/src/sys/dev/usb/usbdevs,v retrieving revision 1.695 diff -u -p -r1.695 usbdevs --- usbdevs 24 Feb 2019 17:35:29 - 1.695 +++ usbdevs 20 Mar 2019 11:55:44 - @@ -2924,6 +2924,7 @@ product MEI S2000 0x1101 Series 2000 /* Meinberg Funkuhren products */ product MEINBERG USB5131 0x0301 USB 5131 DCF77 - Radio Clock +product MEINBERG DCF600USB 0x0302 DCF600USB - Radio Clock /* Melco, Inc products */ product MELCO LUATX1 0x0001 LUA-TX Ethernet -- >[<++>-]<+++.>+++[<-->-]<.>+++[<+ +++>-]<.>++[<>-]<+.--.[-] http://www.weirdnet.nl/
Add support for Meinberg DCF600USB to umbg(4)
Hi all, After Peter J. Philipp asked about Meinberg DCF clock support on misc@ in https://marc.info/?l=openbsd-misc=155205024420585=2 I was also interested in the question he asked. After some consideration, I decided to try, so I bought a Meinberg DCF600USB which was delivered yesterday. I unpacked it this morning and hooked it up to find the kernel reporting: 2019-03-22T07:46:55.515Z pom /bsd: ugen0 at uhub3 port 2 "Meinberg DCF600USB" rev 2.00/1.13 addr 7 After that I 1/3: added the USB product ID (0x0302) to usbdevs 2/3: ran `make usbdevs` to update usbdevs{_data,}.h 3/3: updated the driver (and manpage) to support DCF600USB Unfortunately, after a reboot I still got 2019-03-22T08:00:48.096Z pom /bsd: ugen0 at uhub3 port 2 "Meinberg DCF600USB" rev 2.00/1.13 addr 3 Turns out umbg(4) was never added to GENERIC for amd64. So after 4/3: add umbg(4) to amd64 GENERIC kernel config I now have [weerd@pom] $ dmesg | grep umbg0 umbg0 at uhub3 port 2 configuration 1 interface 0 "Meinberg DCF600USB" rev 2.00/1.13 addr 3 umbg0: not synchronized, freerun (full dmesg at the bottom of this mail) Immediately after boot, it's not synced: [weerd@pom] $ sysctl hw.sensors.umbg0 hw.sensors.umbg0.percent0=100.00% (Signal), WARNING, Fri Mar 22 09:39:18.964 hw.sensors.umbg0.timedelta0=-0.436787 secs (DCF600USB), OK, Fri Mar 22 09:39:18.964 but after some uptime: [weerd@pom] $ sysctl hw.sensors.umbg0 hw.sensors.umbg0.percent0=100.00% (Signal), OK, Fri Mar 22 09:58:14.412 hw.sensors.umbg0.timedelta0=-0.008610 secs (DCF600USB), OK, Fri Mar 22 09:58:14.412 And ntpd is happy with this sensor: [weerd@pom] $ ntpctl -s Sensors sensor wt gd st next poll offset correction umbg0 1 1 0 15s 15s 8.598ms 0.000ms I'm sending the 4 diffs in separate e-mails; comments and/or commits very welcome. Paul OpenBSD 6.5-beta (GENERIC.MP) #14: Fri Mar 22 09:32:08 CET 2019 we...@pom.alm.weirdnet.nl:/usr/src/sys/arch/amd64/compile/GENERIC.MP real mem = 34243903488 (32657MB) avail mem = 33195778048 (31657MB) mpath0 at root scsibus0 at mpath0: 256 targets mainbus0 at root bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xec410 (88 entries) bios0: vendor Dell Inc. version "A22" date 02/01/2018 bios0: Dell Inc. OptiPlex 9020 acpi0 at bios0: rev 2 acpi0: sleep states S0 S3 S4 S5 acpi0: tables DSDT FACP APIC FPDT SLIC LPIT SSDT SSDT SSDT HPET SSDT MCFG SSDT ASF! DMAR acpi0: wakeup devices UAR1(S3) PXSX(S4) RP01(S4) PXSX(S4) PXSX(S4) PXSX(S4) RP05(S4) PXSX(S4) PXSX(S4) PXSX(S4) GLAN(S4) EHC1(S3) EHC2(S3) XHC_(S4) HDEF(S4) PEG0(S4) [...] acpitimer0 at acpi0: 3579545 Hz, 24 bits acpimadt0 at acpi0 addr 0xfee0: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) cpu0: Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz, 3692.03 MHz, 06-3c-03 cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN cpu0: 256KB 64b/line 8-way L2 cache cpu0: smt 0, core 0, package 0 mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges cpu0: apic clock running at 99MHz cpu0: mwait min=64, max=64, C-substates=0.2.1.2.4, IBE cpu1 at mainbus0: apid 2 (application processor) cpu1: Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz, 3691.46 MHz, 06-3c-03 cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN cpu1: 256KB 64b/line 8-way L2 cache cpu1: smt 0, core 1, package 0 cpu2 at mainbus0: apid 4 (application processor) cpu2: Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz, 3691.46 MHz, 06-3c-03 cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,PERF,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN cpu2: 256KB 64b/line 8-way L2 cache cpu2: smt 0, core 2, package 0 cpu3 at mainbus0: apid 6 (application processor) cpu3: Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz, 3691.46 MHz, 06-3c-03 cpu3: