Re: svn commit: r298140 - in head/etc: . devd
On Sunday, April 17, 2016 04:12:16 AM Glen Barber wrote: > On Sat, Apr 16, 2016 at 09:01:04PM -0700, NGie Cooper wrote: > > > On Apr 16, 2016, at 20:45, Glen Barberwrote: > > > > > > Author: gjb > > > Date: Sun Apr 17 03:45:45 2016 > > > New Revision: 298140 > > > URL: https://svnweb.freebsd.org/changeset/base/298140 > > > > > > Log: > > > Fix etcupdate(8) with rc.sendmail and devd/*. It turns out > > > BIN1 and such in etc/* cannot use FILESGROUPS. > > > > > > Reported by:peter > > > Sponsored by:The FreeBSD Foundation > > > > This only applies to etc/Makefile . I offered to change that a couple > > years ago and it was met with a large number of complaints and some teeth > > gnashing. > Based on the report, etc/devd/Makefile is affected as well. > > Glen Yep. The short version is that 'make installworld' doesn't put things into /etc - that's what 'make distribution', mergemaster, etcupdate, and 3rd party tools do. Having 'make installworld' suddenly begin to partly update /etc files is quite a POLA violation and caused etcupdate to delete them as they disappeared from the 'distribution' manifest. eg: D /etc/auto_master D /etc/devd/hyperv.conf D /etc/devd/uath.conf D /etc/devd/ulpt.conf D /etc/devd/usb.conf D /etc/devd/zfs.conf D /etc/rc.sendmail U /etc/mtree/BSD.var.dist -- Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 signature.asc Description: This is a digitally signed message part.
svn commit: r298143 - in head/sys: cam cam/ata dev/ahci dev/ata dev/mvs dev/siis
Author: imp Date: Sun Apr 17 05:24:36 2016 New Revision: 298143 URL: https://svnweb.freebsd.org/changeset/base/298143 Log: Implement Auxiliary register. Add PIM_ATA_EXT flag to flag that a SIM can handle it, and add the code to add it to the FIS that's sent to the drive. The mvs driver is the only other ATA driver in the system, and its hardware doesn't appear to support setting the Auxiliary register. Differential Revision: https://reviews.freebsd.org/D5598 Modified: head/sys/cam/ata/ata_all.h head/sys/cam/ata/ata_da.c head/sys/cam/cam_ccb.h head/sys/dev/ahci/ahci.c head/sys/dev/ata/ata-all.c head/sys/dev/mvs/mvs.c head/sys/dev/siis/siis.c Modified: head/sys/cam/ata/ata_all.h == --- head/sys/cam/ata/ata_all.h Sun Apr 17 05:24:28 2016(r298142) +++ head/sys/cam/ata/ata_all.h Sun Apr 17 05:24:36 2016(r298143) @@ -46,7 +46,6 @@ struct ata_cmd { #defineCAM_ATAIO_CONTROL 0x04/* Control, not a command */ #defineCAM_ATAIO_NEEDRESULT0x08/* Request requires result. */ #defineCAM_ATAIO_DMA 0x10/* DMA command */ -#defineCAM_ATAIO_AUX_HACK 0x20/* Kludge to make FPDMA DSM TRIM work */ u_int8_tcommand; u_int8_tfeatures; Modified: head/sys/cam/ata/ata_da.c == --- head/sys/cam/ata/ata_da.c Sun Apr 17 05:24:28 2016(r298142) +++ head/sys/cam/ata/ata_da.c Sun Apr 17 05:24:36 2016(r298143) @@ -1522,7 +1522,7 @@ adaregister(struct cam_periph *periph, v * the sim do do things properly. Perhaps we should look at log 13 * dword 0 bit 0 and dword 1 bit 0 are set too... */ - if (cpi.hba_misc & PIM_NCQ_KLUDGE) + if (cpi.hba_misc & PIM_ATA_EXT) softc->flags |= ADA_FLAG_PIM_CAN_NCQ_TRIM; if ((softc->quirks & ADA_Q_NCQ_TRIM_BROKEN) == 0 && (softc->flags & ADA_FLAG_PIM_CAN_NCQ_TRIM) != 0 && @@ -1728,7 +1728,8 @@ ada_ncq_dsmtrim(struct ada_softc *softc, 0, (ranges + ATA_DSM_BLK_RANGES - 1) / ATA_DSM_BLK_RANGES); ataio->cmd.sector_count_exp = ATA_SFPDMA_DSM; - ataio->cmd.flags |= CAM_ATAIO_AUX_HACK; + ataio->ata_flags |= ATA_FLAG_AUX; + ataio->aux = 1; } static void Modified: head/sys/cam/cam_ccb.h == --- head/sys/cam/cam_ccb.h Sun Apr 17 05:24:28 2016(r298142) +++ head/sys/cam/cam_ccb.h Sun Apr 17 05:24:36 2016(r298143) @@ -581,7 +581,7 @@ typedef enum { } pi_tmflag; typedef enum { - PIM_NCQ_KLUDGE = 0x200, /* Supports the sata ncq trim kludge */ + PIM_ATA_EXT = 0x200,/* ATA requests can understand ata_ext requests */ PIM_EXTLUNS = 0x100,/* 64bit extended LUNs supported */ PIM_SCANHILO= 0x80, /* Bus scans from high ID to low ID */ PIM_NOREMOVE= 0x40, /* Removeable devices not included in scan */ @@ -745,7 +745,9 @@ struct ccb_ataio { u_int32_t dxfer_len; /* Data transfer length */ u_int32_t resid; /* Transfer residual length: 2's comp */ u_int8_t ata_flags; /* Flags for the rest of the buffer */ - uint32_t unused[2]; /* Keep the same size */ +#define ATA_FLAG_AUX 0x1 + uint32_t aux; + uint32_t unused; }; struct ccb_accept_tio { Modified: head/sys/dev/ahci/ahci.c == --- head/sys/dev/ahci/ahci.cSun Apr 17 05:24:28 2016(r298142) +++ head/sys/dev/ahci/ahci.cSun Apr 17 05:24:36 2016(r298143) @@ -2417,12 +2417,15 @@ ahci_setup_fis(struct ahci_channel *ch, fis[13] = ccb->ataio.cmd.sector_count_exp; } fis[15] = ATA_A_4BIT; - /* Gross and vile hack -- makes ncq trim work w/o changing ataio size */ - if (ccb->ataio.cmd.flags & CAM_ATAIO_AUX_HACK) - fis[16] = 1; } else { fis[15] = ccb->ataio.cmd.control; } + if (ccb->ataio.ata_flags & ATA_FLAG_AUX) { + fis[16] = ccb->ataio.aux& 0xff; + fis[17] = (ccb->ataio.aux >> 8) & 0xff; + fis[18] = (ccb->ataio.aux >> 16) & 0xff; + fis[19] = (ccb->ataio.aux >> 24) & 0xff; + } return (20); } @@ -2677,7 +2680,7 @@ ahciaction(struct cam_sim *sim, union cc if (ch->caps & AHCI_CAP_SPM) cpi->hba_inquiry |= PI_SATAPM; cpi->target_sprt = 0; - cpi->hba_misc = PIM_SEQSCAN | PIM_UNMAPPED | PIM_NCQ_KLUDGE; + cpi->hba_misc = PIM_SEQSCAN | PIM_UNMAPPED | PIM_ATA_EXT;
svn commit: r298142 - in head/sys/cam: . ata scsi
Author: imp Date: Sun Apr 17 05:24:28 2016 New Revision: 298142 URL: https://svnweb.freebsd.org/changeset/base/298142 Log: tag_action is not used at all in ata. It's set to 1 for ordered transactions, but that value isn't used. It's bogusly used to report in devstat, due to a cut and paste error from SCSI. Mark it as unused in cam_fill_ataio. Reclaim the memory as a new ata_flags. In addition, tag_id and init_id are completely unused, so reclaim those as 'unused' now too. These were needlessly copied when ata was split from scsi. This allows us, in the future, to create structures that can communicate AUXILIARY regsiter to the SIMs, which cannot be done now. Differential Revision: https://reviews.freebsd.org/D5598 Modified: head/sys/cam/ata/ata_da.c head/sys/cam/cam_ccb.h head/sys/cam/cam_periph.c head/sys/cam/scsi/scsi_pass.c Modified: head/sys/cam/ata/ata_da.c == --- head/sys/cam/ata/ata_da.c Sun Apr 17 03:57:37 2016(r298141) +++ head/sys/cam/ata/ata_da.c Sun Apr 17 05:24:28 2016(r298142) @@ -1851,7 +1851,7 @@ adastart(struct cam_periph *periph, unio ada_retry_count, adadone, rw_op, - tag_code, + 0, data_ptr, bp->bio_bcount, ada_default_timeout*1000); Modified: head/sys/cam/cam_ccb.h == --- head/sys/cam/cam_ccb.h Sun Apr 17 03:57:37 2016(r298141) +++ head/sys/cam/cam_ccb.h Sun Apr 17 05:24:28 2016(r298142) @@ -744,15 +744,8 @@ struct ccb_ataio { u_int8_t *data_ptr; /* Ptr to the data buf/SG list */ u_int32_t dxfer_len; /* Data transfer length */ u_int32_t resid; /* Transfer residual length: 2's comp */ - u_int8_t tag_action; /* What to do for tag queueing */ - /* -* The tag action should be either the define below (to send a -* non-tagged transaction) or one of the defined scsi tag messages -* from scsi_message.h. -*/ -#defineCAM_TAG_ACTION_NONE 0x00 - u_int tag_id; /* tag id from initator (target mode) */ - u_int init_id; /* initiator id of who selected */ + u_int8_t ata_flags; /* Flags for the rest of the buffer */ + uint32_t unused[2]; /* Keep the same size */ }; struct ccb_accept_tio { @@ -1298,7 +1291,7 @@ cam_fill_ctio(struct ccb_scsiio *csio, u static __inline void cam_fill_ataio(struct ccb_ataio *ataio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int32_t flags, u_int tag_action, + u_int32_t flags, u_int tag_action __unused, u_int8_t *data_ptr, u_int32_t dxfer_len, u_int32_t timeout) { @@ -1309,7 +1302,7 @@ cam_fill_ataio(struct ccb_ataio *ataio, ataio->ccb_h.timeout = timeout; ataio->data_ptr = data_ptr; ataio->dxfer_len = dxfer_len; - ataio->tag_action = tag_action; + ataio->ata_flags = 0; } static __inline void Modified: head/sys/cam/cam_periph.c == --- head/sys/cam/cam_periph.c Sun Apr 17 03:57:37 2016(r298141) +++ head/sys/cam/cam_periph.c Sun Apr 17 05:24:28 2016(r298142) @@ -1117,7 +1117,7 @@ cam_periph_runccb(union ccb *ccb, } else if (ccb->ccb_h.func_code == XPT_ATA_IO) { devstat_end_transaction(ds, ccb->ataio.dxfer_len - ccb->ataio.resid, - ccb->ataio.tag_action & 0x3, + 0, /* Not used in ATA */ ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_NONE) ? DEVSTAT_NO_DATA : (ccb->ccb_h.flags & CAM_DIR_OUT) ? Modified: head/sys/cam/scsi/scsi_pass.c == --- head/sys/cam/scsi/scsi_pass.c Sun Apr 17 03:57:37 2016 (r298141) +++ head/sys/cam/scsi/scsi_pass.c Sun Apr 17 05:24:28 2016 (r298142) @@ -945,7 +945,7 @@ passdone(struct cam_periph *periph, unio case XPT_ATA_IO: devstat_end_transaction(softc->device_stats, done_ccb->ataio.dxfer_len - done_ccb->ataio.resid, - done_ccb->ataio.tag_action & 0x3, + 0, /* Not used in ATA */ ((done_ccb->ccb_h.flags & CAM_DIR_MASK) ==
Re: svn commit: r298140 - in head/etc: . devd
On Sat, Apr 16, 2016 at 09:01:04PM -0700, NGie Cooper wrote: > > > On Apr 16, 2016, at 20:45, Glen Barberwrote: > > > > Author: gjb > > Date: Sun Apr 17 03:45:45 2016 > > New Revision: 298140 > > URL: https://svnweb.freebsd.org/changeset/base/298140 > > > > Log: > > Fix etcupdate(8) with rc.sendmail and devd/*. It turns out > > BIN1 and such in etc/* cannot use FILESGROUPS. > > > > Reported by:peter > > Sponsored by:The FreeBSD Foundation > > This only applies to etc/Makefile . I offered to change that a couple years > ago and it was met with a large number of complaints and some teeth gnashing. Based on the report, etc/devd/Makefile is affected as well. Glen signature.asc Description: PGP signature
Re: svn commit: r298140 - in head/etc: . devd
> On Apr 16, 2016, at 20:45, Glen Barberwrote: > > Author: gjb > Date: Sun Apr 17 03:45:45 2016 > New Revision: 298140 > URL: https://svnweb.freebsd.org/changeset/base/298140 > > Log: > Fix etcupdate(8) with rc.sendmail and devd/*. It turns out > BIN1 and such in etc/* cannot use FILESGROUPS. > > Reported by:peter > Sponsored by:The FreeBSD Foundation This only applies to etc/Makefile . I offered to change that a couple years ago and it was met with a large number of complaints and some teeth gnashing. > Modified: > head/etc/Makefile > head/etc/devd/Makefile > > Modified: head/etc/Makefile > == > --- head/etc/MakefileSun Apr 17 02:51:04 2016(r298139) > +++ head/etc/MakefileSun Apr 17 03:45:45 2016(r298140) > @@ -83,13 +83,8 @@ BIN1+= apmd.conf > .endif > > .if ${MK_AUTOFS} != "no" > -FILESGROUPS+=AUTOFS > -AUTOFS+=auto_master > +BIN1+=auto_master > .endif > -AUTOFSDIR=/etc > -AUTOFSMODE=${BINMODE} > -AUTOFSPACKAGE=autofs > -AUTOFSTAGS=config > > .if ${MK_FREEBSD_UPDATE} != "no" > BIN1+= freebsd-update.conf > @@ -141,12 +136,8 @@ BIN1+= pf.os > .endif > > .if ${MK_SENDMAIL} != "no" > -FILESGROUPS+=SENDMAILRC > -SENDMAILRC=rc.sendmail > +BIN1+=rc.sendmail > .endif > -SENDMAILRCDIR=/etc > -SENDMAILRCMODE=${BINMODE} > -SENDMAILRCPACKAGE=sendmail > > .if ${MK_TCSH} != "no" > BIN1+= csh.cshrc csh.login csh.logout > > Modified: head/etc/devd/Makefile > == > --- head/etc/devd/MakefileSun Apr 17 02:51:04 2016(r298139) > +++ head/etc/devd/MakefileSun Apr 17 03:45:45 2016(r298140) > @@ -10,12 +10,7 @@ FILES+=apple.conf > > .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" > .if ${MK_ACPI} != "no" > -FILESGROUPS+=ACPI > -ACPI=asus.conf > -ACPIPACKAGE=acpi > -ACPIDIR=/etc/devd > -ACPITAGS=config > -ACPIMODE=644 > +FILES+=asus.conf > .endif > .if ${MK_HYPERV} != "no" > FILES+=hyperv.conf > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298141 - head/etc/rc.d
Author: peter Date: Sun Apr 17 03:57:37 2016 New Revision: 298141 URL: https://svnweb.freebsd.org/changeset/base/298141 Log: Turn ssh_host_dsa_key back on until PR#208254 is taken care of. Modified: head/etc/rc.d/sshd Modified: head/etc/rc.d/sshd == --- head/etc/rc.d/sshd Sun Apr 17 03:45:45 2016(r298140) +++ head/etc/rc.d/sshd Sun Apr 17 03:57:37 2016(r298141) @@ -22,7 +22,7 @@ extra_commands="configtest keygen reload : ${sshd_rsa1_enable:="no"} : ${sshd_rsa_enable:="yes"} -: ${sshd_dsa_enable:="no"} +: ${sshd_dsa_enable:="yes"} : ${sshd_ecdsa_enable:="yes"} : ${sshd_ed25519_enable:="yes"} ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298140 - in head/etc: . devd
Author: gjb Date: Sun Apr 17 03:45:45 2016 New Revision: 298140 URL: https://svnweb.freebsd.org/changeset/base/298140 Log: Fix etcupdate(8) with rc.sendmail and devd/*. It turns out BIN1 and such in etc/* cannot use FILESGROUPS. Reported by: peter Sponsored by: The FreeBSD Foundation Modified: head/etc/Makefile head/etc/devd/Makefile Modified: head/etc/Makefile == --- head/etc/Makefile Sun Apr 17 02:51:04 2016(r298139) +++ head/etc/Makefile Sun Apr 17 03:45:45 2016(r298140) @@ -83,13 +83,8 @@ BIN1+= apmd.conf .endif .if ${MK_AUTOFS} != "no" -FILESGROUPS+= AUTOFS -AUTOFS+= auto_master +BIN1+= auto_master .endif -AUTOFSDIR= /etc -AUTOFSMODE=${BINMODE} -AUTOFSPACKAGE= autofs -AUTOFSTAGS=config .if ${MK_FREEBSD_UPDATE} != "no" BIN1+= freebsd-update.conf @@ -141,12 +136,8 @@ BIN1+= pf.os .endif .if ${MK_SENDMAIL} != "no" -FILESGROUPS+= SENDMAILRC -SENDMAILRC=rc.sendmail +BIN1+= rc.sendmail .endif -SENDMAILRCDIR= /etc -SENDMAILRCMODE=${BINMODE} -SENDMAILRCPACKAGE=sendmail .if ${MK_TCSH} != "no" BIN1+= csh.cshrc csh.login csh.logout Modified: head/etc/devd/Makefile == --- head/etc/devd/Makefile Sun Apr 17 02:51:04 2016(r298139) +++ head/etc/devd/Makefile Sun Apr 17 03:45:45 2016(r298140) @@ -10,12 +10,7 @@ FILES+= apple.conf .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" .if ${MK_ACPI} != "no" -FILESGROUPS+= ACPI -ACPI= asus.conf -ACPIPACKAGE= acpi -ACPIDIR= /etc/devd -ACPITAGS= config -ACPIMODE= 644 +FILES+=asus.conf .endif .if ${MK_HYPERV} != "no" FILES+=hyperv.conf ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298139 - in head: lib/libcapsicum libexec/casper
Author: gjb Date: Sun Apr 17 02:51:04 2016 New Revision: 298139 URL: https://svnweb.freebsd.org/changeset/base/298139 Log: Remove lib/libcapsicum and libexec/casper, brought back as part of a merge mishap. Reported by: junovitch Sponsored by: The FreeBSD Foundation Deleted: head/lib/libcapsicum/ head/libexec/casper/ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298138 - head/sys/dev/urtwn
Author: adrian Date: Sun Apr 17 02:39:58 2016 New Revision: 298138 URL: https://svnweb.freebsd.org/changeset/base/298138 Log: [urtwn] set the A-MPDU density to 16. Obtained from:Linux rtlwifi/rtl8xxxu Modified: head/sys/dev/urtwn/if_urtwn.c Modified: head/sys/dev/urtwn/if_urtwn.c == --- head/sys/dev/urtwn/if_urtwn.c Sun Apr 17 02:06:10 2016 (r298137) +++ head/sys/dev/urtwn/if_urtwn.c Sun Apr 17 02:39:58 2016 (r298138) @@ -791,6 +791,10 @@ urtwn_vap_create(struct ieee80211com *ic vap->iv_key_alloc = urtwn_key_alloc; vap->iv_key_set = urtwn_key_set; vap->iv_key_delete = urtwn_key_delete; + + /* 802.11n parameters */ + vap->iv_ampdu_density = IEEE80211_HTCAP_MPDUDENSITY_16; + if (opmode == IEEE80211_M_IBSS) { uvp->recv_mgmt = vap->iv_recv_mgmt; vap->iv_recv_mgmt = urtwn_ibss_recv_mgmt; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298137 - head/sys/cam/ata
Author: imp Date: Sun Apr 17 02:06:10 2016 New Revision: 298137 URL: https://svnweb.freebsd.org/changeset/base/298137 Log: Dell has an OEM drive from Samsung that has issues. NCQ Trim isn't broken on this drive, but it doesn't support it and the fallback logic is failing. Quirk it until those issues can be resolved in a more generic way. Modified: head/sys/cam/ata/ata_da.c Modified: head/sys/cam/ata/ata_da.c == --- head/sys/cam/ata/ata_da.c Sun Apr 17 02:05:45 2016(r298136) +++ head/sys/cam/ata/ata_da.c Sun Apr 17 02:06:10 2016(r298137) @@ -588,6 +588,15 @@ static struct ada_quirk_entry ada_quirk_ }, { /* +* Samsung PM851 Series SSDs Dell OEM +* device model "SAMSUNG SSD PM851 mSATA 256GB" +* 4k optimised, NCQ broken +*/ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG SSD PM851*", "*" }, + /*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN + }, + { + /* * SuperTalent TeraDrive CT SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298136 - head/sys/dev/flash
Author: adrian Date: Sun Apr 17 02:05:45 2016 New Revision: 298136 URL: https://svnweb.freebsd.org/changeset/base/298136 Log: Only compile the FDT bits when we are using FDT. Modified: head/sys/dev/flash/at45d.c head/sys/dev/flash/mx25l.c Modified: head/sys/dev/flash/at45d.c == --- head/sys/dev/flash/at45d.c Sun Apr 17 01:38:37 2016(r298135) +++ head/sys/dev/flash/at45d.c Sun Apr 17 02:05:45 2016(r298136) @@ -121,7 +121,7 @@ static int at45d_get_status(device_t dev, uint8_t *status) { uint8_t rxBuf[8], txBuf[8]; - struct spi_command cmd; + struct spi_command cmd = SPI_COMMAND_INITIALIZER; int err; memset(, 0, sizeof(cmd)); @@ -141,7 +141,7 @@ static int at45d_get_mfg_info(device_t dev, uint8_t *resp) { uint8_t rxBuf[8], txBuf[8]; - struct spi_command cmd; + struct spi_command cmd = SPI_COMMAND_INITIALIZER; int err; memset(, 0, sizeof(cmd)); @@ -303,7 +303,7 @@ at45d_task(void *arg) uint8_t rxBuf[8], txBuf[8]; struct at45d_softc *sc; struct bio *bp; - struct spi_command cmd; + struct spi_command cmd = SPI_COMMAND_INITIALIZER; device_t dev, pdev; caddr_t buf; u_long len, resid; Modified: head/sys/dev/flash/mx25l.c == --- head/sys/dev/flash/mx25l.c Sun Apr 17 01:38:37 2016(r298135) +++ head/sys/dev/flash/mx25l.c Sun Apr 17 02:05:45 2016(r298136) @@ -432,11 +432,13 @@ mx25l_set_4b_mode(device_t dev, uint8_t return (err); } +#ifdef FDT static struct ofw_compat_data compat_data[] = { { "st,m25p",1 }, { "jedec,spi-nor", 1 }, { NULL, 0 }, }; +#endif static int mx25l_probe(device_t dev) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r298060 - head/sys/dev/flash
HI! You need to wrap that ofw compat_data in #ifdef FDT . I'll do it soon, but if you see this before I've done it, this is your implied commit "ok". -adrian On 15 April 2016 at 08:26, Stanislav Galabovwrote: > Author: sgalabov > Date: Fri Apr 15 15:26:31 2016 > New Revision: 298060 > URL: https://svnweb.freebsd.org/changeset/base/298060 > > Log: > Make mx25l compatible with jedec,spi-nor as well > > A lot of dts files define the SPI flashes supported by mx25l as > compatible with 'jedec,spi-nor', so we add this to the mx25l > compat_data. > > Approved by: adrian (mentor) > Sponsored by: Smartcom - Bulgaria AD > Differential Revision:https://reviews.freebsd.org/D5962 > > Modified: > head/sys/dev/flash/mx25l.c > > Modified: head/sys/dev/flash/mx25l.c > == > --- head/sys/dev/flash/mx25l.c Fri Apr 15 15:24:42 2016(r298059) > +++ head/sys/dev/flash/mx25l.c Fri Apr 15 15:26:31 2016(r298060) > @@ -432,6 +432,12 @@ mx25l_set_4b_mode(device_t dev, uint8_t > return (err); > } > > +static struct ofw_compat_data compat_data[] = { > + { "st,m25p",1 }, > + { "jedec,spi-nor", 1 }, > + { NULL, 0 }, > +}; > + > static int > mx25l_probe(device_t dev) > { > @@ -439,7 +445,7 @@ mx25l_probe(device_t dev) > #ifdef FDT > if (!ofw_bus_status_okay(dev)) > return (ENXIO); > - if (!ofw_bus_is_compatible(dev, "st,m25p")) > + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) > return (ENXIO); > #endif > device_set_desc(dev, "M25Pxx Flash Family"); > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r298127 - head/sys/mips/mediatek
heh, I'll talk with stanislav and we'll go create a separate thing in sys/kern/ so we can eliminate the code duplication. -a On 16 April 2016 at 14:20, Bjoern A. Zeebwrote: > >> On 16 Apr 2016, at 19:44 , Stanislav Galabov wrote: >> >> Author: sgalabov >> Date: Sat Apr 16 19:44:41 2016 >> New Revision: 298127 >> URL: https://svnweb.freebsd.org/changeset/base/298127 >> >> Log: >> Add support for boot arguments specification via fdt >> > > Woh, another copy … one day someone will not paste my XXX-BZ anymore > but do what it says (I failed myself, but I might be happy to help). > > /bz > > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r298107 - in head: . bin/cat bin/cat/tests bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/date/tests bin/dd bin/dd/tests bin/df bin/domainname bin/echo bin/ed bin/expr bin/
On Sat, Apr 16, 2016 at 08:55:29PM -0400, Jason Unovitch wrote: > On Sat, Apr 16, 2016 at 07:45:31AM +, Glen Barber wrote: > > Author: gjb > > Date: Sat Apr 16 07:45:30 2016 > > New Revision: 298107 > > URL: https://svnweb.freebsd.org/changeset/base/298107 > > > > Log: > > Merge the projects/release-pkg branch to head. > > > > This allows packaging the base system with pkg(8), including > > but not limited to providing the ability to provide upstream > > binary update possibilities for non-tier-1 architectures. > > > > This merge is a requirement of the 11.0-RELEASE, and as such, > > thank you to everyone that has tested the project branch. > > > > Documentation in build(7) etc. is still somewhat sparse, but > > updates to those parts will follow. > > > > Sponsored by: The FreeBSD Foundation > > > > Added: > > head/lib/libcapsicum/ > > - copied from r298104, projects/release-pkg/lib/libcapsicum/ > > head/libexec/casper/ > > - copied from r298104, projects/release-pkg/libexec/casper/ > > > Hi Glen, > It looks like this brought back the libcapsicum and capser directories > that were removed by oshogbo@ in r296047 during the switch to libcapser. > You are correct, thank you. Build-testing with them removed now just to be sure there was nothing missed in merging between the branches. Thank you for spotting this. Glen signature.asc Description: PGP signature
Re: svn commit: r298107 - in head: . bin/cat bin/cat/tests bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/date/tests bin/dd bin/dd/tests bin/df bin/domainname bin/echo bin/ed bin/expr bin/
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On Sat, Apr 16, 2016 at 07:45:31AM +, Glen Barber wrote: > Author: gjb > Date: Sat Apr 16 07:45:30 2016 > New Revision: 298107 > URL: https://svnweb.freebsd.org/changeset/base/298107 > > Log: > Merge the projects/release-pkg branch to head. > > This allows packaging the base system with pkg(8), including > but not limited to providing the ability to provide upstream > binary update possibilities for non-tier-1 architectures. > > This merge is a requirement of the 11.0-RELEASE, and as such, > thank you to everyone that has tested the project branch. > > Documentation in build(7) etc. is still somewhat sparse, but > updates to those parts will follow. > > Sponsored by: The FreeBSD Foundation > > Added: > head/lib/libcapsicum/ > - copied from r298104, projects/release-pkg/lib/libcapsicum/ > head/libexec/casper/ > - copied from r298104, projects/release-pkg/libexec/casper/ Hi Glen, It looks like this brought back the libcapsicum and capser directories that were removed by oshogbo@ in r296047 during the switch to libcapser. See: https://svnweb.FreeBSD.org/changeset/base/296047 Thanks! -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQF8BAEBCgBmBQJXEt75XxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0NURGNTQ1OTkzQkJFMzc3OTNDQUNERUU2 RkQ0OUMzMDE2MUNBQTZFAAoJEG/UnDAWHKpuP1MH/jdd9TFtm8V/102gqKzpE7cE 8noF8v1UAUbv8absOQDQ+1hP9d4u+zPaz6tUT0tC0qpEY0o9ETZ3x13BO1r6o0W7 PcLKO7mzxjRensOzWS6h35I50HB2Pk4UWOjKMKWC+9hLBde4GcsTStnQ0tR8gXPM hbcaDMMLjbpqI87EYuDD3dmAmfINNP5R1JzC1tS1HHBDcobhyRqzV3zgMXkBdiGF Nv+wtLl7ovrSoU9UsikgKWoputNMu7zUXEYZ0KxAHi7C1GXpeS1VNRJGYATATuso B+MVYAEPP2HPX55gA4g3pnMStPOpkpaWnWk2B+YicXsIC6BEMn24UGjdg0VcSgQ= =IvQY -END PGP SIGNATURE- ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298132 - in head/sys: netinet netinet6
Author: tuexen Date: Sat Apr 16 21:34:49 2016 New Revision: 298132 URL: https://svnweb.freebsd.org/changeset/base/298132 Log: Fix the ICMP6 handling for SCTP. Keep the IPv4 code in sync. MFC after:1 week Modified: head/sys/netinet/sctp_usrreq.c head/sys/netinet/sctp_var.h head/sys/netinet6/sctp6_usrreq.c head/sys/netinet6/sctp6_var.h Modified: head/sys/netinet/sctp_usrreq.c == --- head/sys/netinet/sctp_usrreq.c Sat Apr 16 20:54:55 2016 (r298131) +++ head/sys/netinet/sctp_usrreq.c Sat Apr 16 21:34:49 2016 (r298132) @@ -143,7 +143,7 @@ sctp_pathmtu_adjustment(struct sctp_tcb } #ifdef INET -static void +void sctp_notify(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct sctp_nets *net, @@ -171,13 +171,7 @@ sctp_notify(struct sctp_inpcb *inp, (icmp_code == ICMP_UNREACH_NET_PROHIB) || (icmp_code == ICMP_UNREACH_HOST_PROHIB) || (icmp_code == ICMP_UNREACH_FILTER_PROHIB)) { - - /* -* Hmm reachablity problems we must examine closely. If its -* not reachable, we may have lost a network. Or if there is -* NO protocol at the other end named SCTP. well we consider -* it a OOTB abort. -*/ + /* Mark the net unreachable. */ if (net->dest_state & SCTP_ADDR_REACHABLE) { /* OK, that destination is NOT reachable. */ net->dest_state &= ~SCTP_ADDR_REACHABLE; @@ -189,13 +183,7 @@ sctp_notify(struct sctp_inpcb *inp, SCTP_TCB_UNLOCK(stcb); } else if ((icmp_code == ICMP_UNREACH_PROTOCOL) || (icmp_code == ICMP_UNREACH_PORT)) { - /* -* Here the peer is either playing tricks on us, including -* an address that belongs to someone who does not support -* SCTP OR was a userland implementation that shutdown and -* now is dead. In either case treat it like a OOTB abort -* with no TCB -*/ + /* Treat it like an ABORT. */ sctp_abort_notification(stcb, 1, 0, NULL, SCTP_SO_NOT_LOCKED); #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) so = SCTP_INP_SO(inp); @@ -261,7 +249,7 @@ sctp_ctlinput(int cmd, struct sockaddr * struct sctp_tcb *stcb; struct sctp_nets *net; struct sctp_init_chunk *ch; - struct sockaddr_in to, from; + struct sockaddr_in src, dst; if (sa->sa_family != AF_INET || ((struct sockaddr_in *)sa)->sin_addr.s_addr == INADDR_ANY) { @@ -278,23 +266,25 @@ sctp_ctlinput(int cmd, struct sockaddr * (sizeof(struct icmp) - sizeof(struct ip))); outer_ip = (struct ip *)((caddr_t)icmp - sizeof(struct ip)); sh = (struct sctphdr *)((caddr_t)inner_ip + (inner_ip->ip_hl << 2)); - bzero(, sizeof(to)); - bzero(, sizeof(from)); - from.sin_family = to.sin_family = AF_INET; - from.sin_len = to.sin_len = sizeof(to); - from.sin_port = sh->src_port; - from.sin_addr = inner_ip->ip_src; - to.sin_port = sh->dest_port; - to.sin_addr = inner_ip->ip_dst; + memset(, 0, sizeof(struct sockaddr_in)); + src.sin_family = AF_INET; + src.sin_len = sizeof(struct sockaddr_in); + src.sin_port = sh->src_port; + src.sin_addr = inner_ip->ip_src; + memset(, 0, sizeof(struct sockaddr_in)); + dst.sin_family = AF_INET; + dst.sin_len = sizeof(struct sockaddr_in); + dst.sin_port = sh->dest_port; + dst.sin_addr = inner_ip->ip_dst; /* -* 'to' holds the dest of the packet that failed to be sent. -* 'from' holds our local endpoint address. Thus we reverse -* the to and the from in the lookup. +* 'dst' holds the dest of the packet that failed to be +* sent. 'src' holds our local endpoint address. Thus we +* reverse the dst and the src in the lookup. */ inp = NULL; net = NULL; - stcb = sctp_findassociation_addr_sa((struct sockaddr *), - (struct sockaddr *), + stcb = sctp_findassociation_addr_sa((struct sockaddr *), + (struct sockaddr *), , , 1, SCTP_DEFAULT_VRFID); if ((stcb != NULL) && Modified: head/sys/netinet/sctp_var.h == --- head/sys/netinet/sctp_var.h Sat Apr 16 20:54:55 2016(r298131) +++ head/sys/netinet/sctp_var.h Sat Apr
Re: svn commit: r298127 - head/sys/mips/mediatek
> On 16 Apr 2016, at 19:44 , Stanislav Galabovwrote: > > Author: sgalabov > Date: Sat Apr 16 19:44:41 2016 > New Revision: 298127 > URL: https://svnweb.freebsd.org/changeset/base/298127 > > Log: > Add support for boot arguments specification via fdt > Woh, another copy … one day someone will not paste my XXX-BZ anymore but do what it says (I failed myself, but I might be happy to help). /bz ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298131 - head/sys/conf
Author: loos Date: Sat Apr 16 20:54:55 2016 New Revision: 298131 URL: https://svnweb.freebsd.org/changeset/base/298131 Log: Add Codel to NOTES. X-MFC with: r287009 Sponsored by: Rubicon Communications (Netgate) Modified: head/sys/conf/NOTES Modified: head/sys/conf/NOTES == --- head/sys/conf/NOTES Sat Apr 16 20:42:51 2016(r298130) +++ head/sys/conf/NOTES Sat Apr 16 20:54:55 2016(r298131) @@ -718,6 +718,7 @@ options ALTQ optionsALTQ_CBQ# Class Based Queueing optionsALTQ_RED# Random Early Detection optionsALTQ_RIO# RED In/Out +optionsALTQ_CODEL # CoDel Active Queueing optionsALTQ_HFSC # Hierarchical Packet Scheduler optionsALTQ_FAIRQ # Fair Packet Scheduler optionsALTQ_CDNR # Traffic conditioner ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298130 - head/etc/mtree
Author: bapt Date: Sat Apr 16 20:42:51 2016 New Revision: 298130 URL: https://svnweb.freebsd.org/changeset/base/298130 Log: Remove Big5HKSCS entries from mtree Reported by: ache Modified: head/etc/mtree/BSD.usr.dist Modified: head/etc/mtree/BSD.usr.dist == --- head/etc/mtree/BSD.usr.dist Sat Apr 16 20:41:13 2016(r298129) +++ head/etc/mtree/BSD.usr.dist Sat Apr 16 20:42:51 2016(r298130) @@ -903,16 +903,12 @@ .. zh_Hans_CN.eucCN .. -zh_Hant_HK.Big5HKSCS -.. zh_Hant_HK.UTF-8 .. zh_Hant_TW.Big5 .. zh_Hant_TW.UTF-8 .. -zh_HK.Big5HKSCS -.. zh_HK.UTF-8 .. zh_TW.Big5 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298129 - head/tools/kerneldoc/subsys
Author: netchild Date: Sat Apr 16 20:41:13 2016 New Revision: 298129 URL: https://svnweb.freebsd.org/changeset/base/298129 Log: Quote variable for architectures where we have more than one linuxulator (32/64bit) and as such may have a space between both linuxulator locations. Noticed by: Miltiadis MargaronisTested by:Miltiadis Margaronis Modified: head/tools/kerneldoc/subsys/Makefile Modified: head/tools/kerneldoc/subsys/Makefile == --- head/tools/kerneldoc/subsys/MakefileSat Apr 16 20:01:08 2016 (r298128) +++ head/tools/kerneldoc/subsys/MakefileSat Apr 16 20:41:13 2016 (r298129) @@ -58,7 +58,7 @@ ${.OBJDIR}/${target}/${target}.tag: DOXYGEN_DEST_PATH=${DOXYGEN_DEST_PATH} \ DOXYGEN_SRC_INCLUDE_PATH="${S}/sys ${S}/../include ${S}/${TARGET_ARCH}/include ${.OBJDIR}/include" \ DOXYGEN_TARGET_ARCH=${TARGET_ARCH} \ - DOXYGEN_LINUX_PATH=${DOXYGEN_LINUX_PATH} \ + DOXYGEN_LINUX_PATH="${DOXYGEN_LINUX_PATH}" \ NOTREVIEWED=${.CURDIR}/notreviewed.dox \ PATH=${LOCALBASE}/bin:${PATH} \ doxygen ${.CURDIR}/Doxyfile-${target} ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298128 - head/sys/gnu/dts/mips
Author: sgalabov Date: Sat Apr 16 20:01:08 2016 New Revision: 298128 URL: https://svnweb.freebsd.org/changeset/base/298128 Log: Import Mediatek/Ralink dts files from OpenWRT Import original OpenWRT dts files after executing the following script on them: for f in `ls [mr]t*.dtsi`; do printf "\n#include\n" >> $f done Approved by: adrian (mentor) Obtained from:OpenWRT Sponsored by: Smartcom - Bulgaria AD Differential Revision:https://reviews.freebsd.org/D5971 Added: head/sys/gnu/dts/mips/ head/sys/gnu/dts/mips/3G-6200N.dts (contents, props changed) head/sys/gnu/dts/mips/3G-6200NL.dts (contents, props changed) head/sys/gnu/dts/mips/3G150B.dts (contents, props changed) head/sys/gnu/dts/mips/3G300M.dts (contents, props changed) head/sys/gnu/dts/mips/A5-V11.dts (contents, props changed) head/sys/gnu/dts/mips/AI-BR100.dts (contents, props changed) head/sys/gnu/dts/mips/AIR3GII.dts (contents, props changed) head/sys/gnu/dts/mips/ALL0239-3G.dts (contents, props changed) head/sys/gnu/dts/mips/ALL0256N-4M.dts (contents, props changed) head/sys/gnu/dts/mips/ALL0256N-8M.dts (contents, props changed) head/sys/gnu/dts/mips/ALL5002.dts (contents, props changed) head/sys/gnu/dts/mips/ALL5003.dts (contents, props changed) head/sys/gnu/dts/mips/AR670W.dts (contents, props changed) head/sys/gnu/dts/mips/AR725W.dts (contents, props changed) head/sys/gnu/dts/mips/ASL26555-16M.dts (contents, props changed) head/sys/gnu/dts/mips/ASL26555-8M.dts (contents, props changed) head/sys/gnu/dts/mips/ATP-52B.dts (contents, props changed) head/sys/gnu/dts/mips/AWAPN2403.dts (contents, props changed) head/sys/gnu/dts/mips/AWM002-4M.dtsi (contents, props changed) head/sys/gnu/dts/mips/AWM002-8M.dtsi (contents, props changed) head/sys/gnu/dts/mips/AWM002-EVB-4M.dts (contents, props changed) head/sys/gnu/dts/mips/AWM002-EVB-8M.dts (contents, props changed) head/sys/gnu/dts/mips/AWM002.dtsi (contents, props changed) head/sys/gnu/dts/mips/AWM003-EVB.dts (contents, props changed) head/sys/gnu/dts/mips/ArcherC20i.dts (contents, props changed) head/sys/gnu/dts/mips/BC2.dts (contents, props changed) head/sys/gnu/dts/mips/BR-6425.dts (contents, props changed) head/sys/gnu/dts/mips/BR-6475ND.dts (contents, props changed) head/sys/gnu/dts/mips/BROADWAY.dts (contents, props changed) head/sys/gnu/dts/mips/CARAMBOLA.dts (contents, props changed) head/sys/gnu/dts/mips/CF-WR800N.dts (contents, props changed) head/sys/gnu/dts/mips/CY-SWR1100.dts (contents, props changed) head/sys/gnu/dts/mips/D105.dts (contents, props changed) head/sys/gnu/dts/mips/DAP-1350.dts (contents, props changed) head/sys/gnu/dts/mips/DB-WRT01.dts (contents, props changed) head/sys/gnu/dts/mips/DCS-930.dts (contents, props changed) head/sys/gnu/dts/mips/DCS-930L-B1.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-300-B1.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-300-B7.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-320-B1.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-600-B1.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-600-B2.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-610-A1.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-615-D.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-615-H1.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-620-A1.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-620-D1.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-645.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-810L.dts (contents, props changed) head/sys/gnu/dts/mips/DIR-860L-B1.dts (contents, props changed) head/sys/gnu/dts/mips/E1700.dts (contents, props changed) head/sys/gnu/dts/mips/ESR-9753.dts (contents, props changed) head/sys/gnu/dts/mips/EX2700.dts (contents, props changed) head/sys/gnu/dts/mips/F5D8235_V1.dts (contents, props changed) head/sys/gnu/dts/mips/F5D8235_V2.dts (contents, props changed) head/sys/gnu/dts/mips/F7C027.dts (contents, props changed) head/sys/gnu/dts/mips/FIREWRT.dts (contents, props changed) head/sys/gnu/dts/mips/FONERA20N.dts (contents, props changed) head/sys/gnu/dts/mips/FREESTATION5.dts (contents, props changed) head/sys/gnu/dts/mips/GL-MT300A.dts (contents, props changed) head/sys/gnu/dts/mips/GL-MT300N.dts (contents, props changed) head/sys/gnu/dts/mips/GL-MT750.dts (contents, props changed) head/sys/gnu/dts/mips/HC5661.dts (contents, props changed) head/sys/gnu/dts/mips/HC5761.dts (contents, props changed) head/sys/gnu/dts/mips/HC5861.dts (contents, props changed) head/sys/gnu/dts/mips/HC5XXX.dtsi (contents, props changed) head/sys/gnu/dts/mips/HG255D.dts (contents, props changed) head/sys/gnu/dts/mips/HLKRM04.dts (contents, props
svn commit: r298127 - head/sys/mips/mediatek
Author: sgalabov Date: Sat Apr 16 19:44:41 2016 New Revision: 298127 URL: https://svnweb.freebsd.org/changeset/base/298127 Log: Add support for boot arguments specification via fdt Add suppport for passing boot arguments via FDT for mediatek/ralink SoCs. This was taken from kan's work on CI20. Since most OpenWRT dts files have bootargs defined, we use bsdbootargs to specify FreeBSD specific arguments. Approved by: adrian (mentor) Sponsored by: Smartcom - Bulgaria AD Differential Revision:https://reviews.freebsd.org/D5979 Modified: head/sys/mips/mediatek/mtk_machdep.c Modified: head/sys/mips/mediatek/mtk_machdep.c == --- head/sys/mips/mediatek/mtk_machdep.cSat Apr 16 19:42:54 2016 (r298126) +++ head/sys/mips/mediatek/mtk_machdep.cSat Apr 16 19:44:41 2016 (r298127) @@ -192,6 +192,52 @@ mips_init(void) #endif } +static void +_parse_bootarg(char *v) +{ + char *n; + + if (*v == '-') { + while (*v != '\0') { + v++; + switch (*v) { + case 'a': boothowto |= RB_ASKNAME; break; + /* Someone should simulate that ;-) */ + case 'C': boothowto |= RB_CDROM; break; + case 'd': boothowto |= RB_KDB; break; + case 'D': boothowto |= RB_MULTIPLE; break; + case 'm': boothowto |= RB_MUTE; break; + case 'g': boothowto |= RB_GDB; break; + case 'h': boothowto |= RB_SERIAL; break; + case 'p': boothowto |= RB_PAUSE; break; + case 'r': boothowto |= RB_DFLTROOT; break; + case 's': boothowto |= RB_SINGLE; break; + case 'v': boothowto |= RB_VERBOSE; break; + } + } + } else { + n = strsep(, "="); + if (v == NULL) + kern_setenv(n, "1"); + else + kern_setenv(n, v); + } +} + +/* Parse cmd line args as env - copied from xlp_machdep. */ +/* XXX-BZ this should really be centrally provided for all (boot) code. */ +static void +_parse_bootargs(char *cmdline) +{ + char *v; + + while ((v = strsep(, " \n")) != NULL) { + if (*v == '\0') + continue; + _parse_bootarg(v); + } +} + void platform_reset(void) { @@ -209,6 +255,8 @@ platform_start(__register_t a0 __unused, char **argv = (char **)MIPS_PHYS_TO_KSEG0(a1); char **envp = (char **)MIPS_PHYS_TO_KSEG0(a2); void *dtbp; + phandle_t chosen; + char buf[2048]; /* clear the BSS and SBSS segments */ kernend = (vm_offset_t) @@ -238,6 +286,13 @@ platform_start(__register_t a0 __unused, init_static_kenv(boot1_env, sizeof(boot1_env)); + /* +* Get bsdbootargs from FDT if specified. +*/ + chosen = OF_finddevice("/chosen"); + if (OF_getprop(chosen, "bsdbootargs", buf, sizeof(buf)) != -1) + _parse_bootargs(buf); + printf("FDT DTB at: 0x%08x\n", (uint32_t)dtbp); printf("CPU clock: %4dMHz\n", mtk_soc_get_cpuclk()/(1000*1000)); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298126 - head/sys/mips/conf
Author: sgalabov Date: Sat Apr 16 19:42:54 2016 New Revision: 298126 URL: https://svnweb.freebsd.org/changeset/base/298126 Log: Change MIPS_INTRNG to INTRNG in MEDIATEK_BASE config Revision 298068 changed MIPS_INTRNG and ARM_INTRNG to simply INTRNG. MEDIATEK_BASE config was missed by this revision, so we change MIPS_INTRNG to INTRNG here. Approved by: adrian (mentor) Sponsored by: Smartcom - Bulgaria AD Differential Revision:https://reviews.freebsd.org/D5978 Modified: head/sys/mips/conf/MEDIATEK_BASE Modified: head/sys/mips/conf/MEDIATEK_BASE == --- head/sys/mips/conf/MEDIATEK_BASESat Apr 16 19:39:51 2016 (r298125) +++ head/sys/mips/conf/MEDIATEK_BASESat Apr 16 19:42:54 2016 (r298126) @@ -28,8 +28,8 @@ makeoptions KERNLOADADDR=0x80001000 optionsFDT optionsFDT_DTB_STATIC -# We rely on MIPS_INTRNG code -optionsMIPS_INTRNG +# We rely on INTRNG code +optionsINTRNG optionsMIPS_NIRQ=256 # We rely on NEW_PCIB code ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298125 - head/share/colldef
Author: bapt Date: Sat Apr 16 19:39:51 2016 New Revision: 298125 URL: https://svnweb.freebsd.org/changeset/base/298125 Log: Regenerate the Makefile so that actually the new generated collation are properly installed Modified: head/share/colldef/Makefile Modified: head/share/colldef/Makefile == --- head/share/colldef/Makefile Sat Apr 16 19:39:02 2016(r298124) +++ head/share/colldef/Makefile Sat Apr 16 19:39:51 2016(r298125) @@ -221,6 +221,7 @@ FILESDIR_${f}.LC_COLLATE= ${LOCALEDIR}/$ .for f t in ${LOCALES_MAPPED} FILES+=$t.LC_COLLATE +FILESDIR_$t.LC_COLLATE=${LOCALEDIR}/$t $t.LC_COLLATE: ${.CURDIR}/$f.src localedef -D -U -i ${.ALLSRC} \ -f ${MAPLOC}/map.${.TARGET:T:R:E} \ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298124 - head/tools/tools/locale/tools
Author: bapt Date: Sat Apr 16 19:39:02 2016 New Revision: 298124 URL: https://svnweb.freebsd.org/changeset/base/298124 Log: Do not forget to set the destination directory for the new collation Modified: head/tools/tools/locale/tools/cldr2def.pl Modified: head/tools/tools/locale/tools/cldr2def.pl == --- head/tools/tools/locale/tools/cldr2def.pl Sat Apr 16 18:10:11 2016 (r298123) +++ head/tools/tools/locale/tools/cldr2def.pl Sat Apr 16 19:39:02 2016 (r298124) @@ -820,6 +820,7 @@ sub make_makefile { $SRCOUT3 = "" . ".for f t in \${LOCALES_MAPPED}\n" . "FILES+=\t\$t.LC_COLLATE\n" . + "FILESDIR_\$t.LC_COLLATE=\t\${LOCALEDIR}/\$t\n" . "\$t.LC_COLLATE: \${.CURDIR}/\$f.src\n" . "\tlocaledef -D -U -i \${.ALLSRC} \\\n" . "\t\t-f \${MAPLOC}/map.\${.TARGET:T:R:E} \\\n" . ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298123 - head/contrib/ntp/ntpd
Author: gjb Date: Sat Apr 16 18:10:11 2016 New Revision: 298123 URL: https://svnweb.freebsd.org/changeset/base/298123 Log: Remove the RCSID line from ntp_control.c, and set the fbsd:nokeywords property. This should have been done a while back (certainly before mergeing projects/release-pkg to head), but I fixed the merge conflicts and forgot to correct the real problem afterward. Noticed by: peter Sponsored by: The FreeBSD Foundation Modified: head/contrib/ntp/ntpd/ntp_control.c (contents, props changed) Modified: head/contrib/ntp/ntpd/ntp_control.c == --- head/contrib/ntp/ntpd/ntp_control.c Sat Apr 16 18:07:44 2016 (r298122) +++ head/contrib/ntp/ntpd/ntp_control.c Sat Apr 16 18:10:11 2016 (r298123) @@ -3,10 +3,6 @@ *traps. Provides service to ntpq and others. */ -/* - * $FreeBSD: projects/release-pkg/contrib/ntp/ntpd/ntp_control.c 277386 2015-01-19 16:15:12Z gjb $ - */ - #ifdef HAVE_CONFIG_H # include #endif ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298122 - in head: . tools/build/mk
Author: bapt Date: Sat Apr 16 18:07:44 2016 New Revision: 298122 URL: https://svnweb.freebsd.org/changeset/base/298122 Log: Complete the Obsoletefiles entries Modified: head/ObsoleteFiles.inc head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sat Apr 16 17:55:11 2016(r298121) +++ head/ObsoleteFiles.inc Sat Apr 16 18:07:44 2016(r298122) @@ -46,6 +46,13 @@ OLD_FILES+=usr/share/locale/zh_HK.Big5HK OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_NUMERIC OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_TIME OLD_DIRS+=usr/share/locale/zh_HK.Big5HKSCS +OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hant_HK.Big5HKSCS # 20160317: rman_res_t size bump to uintmax_t OLD_LIBS+=usr/lib/libdevinfo.so.5 OLD_LIBS+=usr/lib32/libdevinfo.so.5 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Apr 16 17:55:11 2016(r298121) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Apr 16 18:07:44 2016(r298122) @@ -5439,12 +5439,6 @@ OLD_FILES+=usr/share/locale/zh_Hant_TW.U OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_COLLATE -OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_CTYPE -OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MESSAGES -OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MONETARY -OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_NUMERIC -OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_TIME OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_CTYPE OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_MESSAGES ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298121 - in head: . share/colldef share/ctypedef share/locale-links share/monetdef share/msgdef share/numericdef share/timedef tools/build/mk
Author: bapt Date: Sat Apr 16 17:55:11 2016 New Revision: 298121 URL: https://svnweb.freebsd.org/changeset/base/298121 Log: Regenerates locales Makefiles and locales Added: head/share/colldef/cs_CZ.ISO8859-2.src (contents, props changed) head/share/colldef/da_DK.ISO8859-1.src (contents, props changed) head/share/colldef/da_DK.ISO8859-15.src (contents, props changed) head/share/colldef/hr_HR.ISO8859-2.src (contents, props changed) head/share/colldef/hu_HU.ISO8859-2.src (contents, props changed) head/share/colldef/nb_NO.ISO8859-1.src (contents, props changed) head/share/colldef/nb_NO.ISO8859-15.src (contents, props changed) head/share/colldef/sk_SK.ISO8859-2.src (contents, props changed) head/share/colldef/zh_Hans_CN.GB2312.src (contents, props changed) head/share/colldef/zh_Hans_CN.eucCN.src (contents, props changed) head/share/ctypedef/zh_Hant_TW.Big5.src (contents, props changed) Deleted: head/share/ctypedef/zh_Hant_HK.Big5HKSCS.src head/share/msgdef/zh_Hant_HK.Big5HKSCS.src head/share/timedef/zh_Hant_HK.Big5HKSCS.src Modified: head/ObsoleteFiles.inc head/share/colldef/Makefile head/share/ctypedef/Makefile head/share/locale-links/Makefile head/share/monetdef/Makefile head/share/msgdef/Makefile head/share/numericdef/Makefile head/share/timedef/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sat Apr 16 17:52:00 2016(r298120) +++ head/ObsoleteFiles.inc Sat Apr 16 17:55:11 2016(r298121) @@ -38,6 +38,14 @@ # xargs -n1 | sort | uniq -d; # done +# 20160419: remove Big5HKSCS locales +OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_TIME +OLD_DIRS+=usr/share/locale/zh_HK.Big5HKSCS # 20160317: rman_res_t size bump to uintmax_t OLD_LIBS+=usr/lib/libdevinfo.so.5 OLD_LIBS+=usr/lib32/libdevinfo.so.5 Modified: head/share/colldef/Makefile == --- head/share/colldef/Makefile Sat Apr 16 17:52:00 2016(r298120) +++ head/share/colldef/Makefile Sat Apr 16 17:55:11 2016(r298121) @@ -9,7 +9,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/lo .src.LC_COLLATE: localedef -D -U -i ${.IMPSRC} \ - -f ${MAPLOC}/map.UTF-8 ${.OBJDIR}/${.IMPSRC:T:R} + -f ${MAPLOC}/map.${.TARGET:T:R:E} ${.OBJDIR}/${.IMPSRC:T:R} LOCALES+= af_ZA.UTF-8 LOCALES+= am_ET.UTF-8 @@ -47,162 +47,164 @@ LOCALES+= uk_UA.UTF-8 LOCALES+= zh_Hans_CN.UTF-8 LOCALES+= zh_Hant_TW.UTF-8 -SAME+= af_ZA.UTF-8 af_ZA.ISO8859-15 -SAME+= af_ZA.UTF-8 af_ZA.ISO8859-1 +LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-15 +LOCALES_MAPPED+= af_ZA.UTF-8 af_ZA.ISO8859-1 +LOCALES_MAPPED+= be_BY.UTF-8 be_BY.ISO8859-5 +LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1251 +LOCALES_MAPPED+= be_BY.UTF-8 be_BY.CP1131 +LOCALES_MAPPED+= ru_RU.UTF-8 sr_Cyrl_RS.ISO8859-5 +LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.KOI8-R +LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.ISO8859-5 +LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.CP866 +LOCALES_MAPPED+= ru_RU.UTF-8 ru_RU.CP1251 +LOCALES_MAPPED+= ru_RU.UTF-8 bg_BG.CP1251 +LOCALES_MAPPED+= ca_AD.UTF-8 ca_IT.ISO8859-15 +LOCALES_MAPPED+= ca_AD.UTF-8 ca_IT.ISO8859-1 +LOCALES_MAPPED+= ca_AD.UTF-8 ca_FR.ISO8859-15 +LOCALES_MAPPED+= ca_AD.UTF-8 ca_FR.ISO8859-1 +LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO8859-15 +LOCALES_MAPPED+= ca_AD.UTF-8 ca_ES.ISO8859-1 +LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-15 +LOCALES_MAPPED+= ca_AD.UTF-8 ca_AD.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8 sr_Latn_RS.ISO8859-2 +LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-15 +LOCALES_MAPPED+= en_US.UTF-8 pt_PT.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8 pt_BR.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8 nn_NO.ISO8859-15 +LOCALES_MAPPED+= en_US.UTF-8 nn_NO.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8 nl_NL.ISO8859-15 +LOCALES_MAPPED+= en_US.UTF-8 nl_NL.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8 nl_BE.ISO8859-15 +LOCALES_MAPPED+= en_US.UTF-8 nl_BE.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8 it_IT.ISO8859-15 +LOCALES_MAPPED+= en_US.UTF-8 it_IT.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8 it_CH.ISO8859-15 +LOCALES_MAPPED+= en_US.UTF-8 it_CH.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8 fr_FR.ISO8859-15 +LOCALES_MAPPED+= en_US.UTF-8 fr_FR.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8 fr_CH.ISO8859-15 +LOCALES_MAPPED+= en_US.UTF-8 fr_CH.ISO8859-1 +LOCALES_MAPPED+= en_US.UTF-8
svn commit: r298120 - in head/lib/libc: gen net powerpc/gen powerpc64/gen resolv xdr
Author: pfg Date: Sat Apr 16 17:52:00 2016 New Revision: 298120 URL: https://svnweb.freebsd.org/changeset/base/298120 Log: libc: make some more use of the nitems() macro. We have an nitems() macro in the header that is convenient to re-use as it makes things easier to read. Given that it is available already without adding additional headers and other parts of libc already use it, extend a bit more its use. Modified: head/lib/libc/gen/getpwent.c head/lib/libc/gen/nlist.c head/lib/libc/net/getaddrinfo.c head/lib/libc/net/name6.c head/lib/libc/powerpc/gen/syncicache.c head/lib/libc/powerpc64/gen/syncicache.c head/lib/libc/resolv/herror.c head/lib/libc/resolv/res_mkquery.c head/lib/libc/resolv/res_mkupdate.c head/lib/libc/xdr/xdr_float.c Modified: head/lib/libc/gen/getpwent.c == --- head/lib/libc/gen/getpwent.cSat Apr 16 17:46:50 2016 (r298119) +++ head/lib/libc/gen/getpwent.cSat Apr 16 17:52:00 2016 (r298120) @@ -748,7 +748,7 @@ pwdbopen(int *version) else *version = 3; if (*version < 3 || - *version >= sizeof(pwdb_versions)/sizeof(pwdb_versions[0])) { + *version >= nitems(pwdb_versions)) { syslog(LOG_CRIT, "Unsupported password database version %d", *version); res->close(res); Modified: head/lib/libc/gen/nlist.c == --- head/lib/libc/gen/nlist.c Sat Apr 16 17:46:50 2016(r298119) +++ head/lib/libc/gen/nlist.c Sat Apr 16 17:52:00 2016(r298120) @@ -93,7 +93,7 @@ __fdnlist(int fd, struct nlist *list) int n = -1; unsigned int i; - for (i = 0; i < sizeof(nlist_fn) / sizeof(nlist_fn[0]); i++) { + for (i = 0; i < nitems(nlist_fn); i++) { n = (nlist_fn[i].fn)(fd, list); if (n != -1) break; Modified: head/lib/libc/net/getaddrinfo.c == --- head/lib/libc/net/getaddrinfo.c Sat Apr 16 17:46:50 2016 (r298119) +++ head/lib/libc/net/getaddrinfo.c Sat Apr 16 17:52:00 2016 (r298120) @@ -398,7 +398,7 @@ getaddrinfo(const char *hostname, const struct addrinfo *pai; const struct afd *afd; const struct explore *ex; - struct addrinfo *afailist[sizeof(afdl)/sizeof(afdl[0])]; + struct addrinfo *afailist[nitems(afdl)]; struct addrinfo *afai_unspec; int found; int numeric = 0; @@ -736,13 +736,13 @@ get_addrselectpolicy(struct policyhead * char *buf; struct in6_addrpolicy *pol, *ep; - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, , NULL, 0) < 0) + if (sysctl(mib, nitems(mib), NULL, , NULL, 0) < 0) return (0); if (l == 0) return (0); if ((buf = malloc(l)) == NULL) return (0); - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, , NULL, 0) < 0) { + if (sysctl(mib, nitems(mib), buf, , NULL, 0) < 0) { free(buf); return (0); } Modified: head/lib/libc/net/name6.c == --- head/lib/libc/net/name6.c Sat Apr 16 17:46:50 2016(r298119) +++ head/lib/libc/net/name6.c Sat Apr 16 17:52:00 2016(r298120) @@ -735,11 +735,11 @@ get_addrselectpolicy(struct policyhead * char *buf; struct in6_addrpolicy *pol, *ep; - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, , NULL, 0) < 0) + if (sysctl(mib, nitems(mib), NULL, , NULL, 0) < 0) return (0); if ((buf = malloc(l)) == NULL) return (0); - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, , NULL, 0) < 0) { + if (sysctl(mib, nitems(mib), buf, , NULL, 0) < 0) { free(buf); return (0); } Modified: head/lib/libc/powerpc/gen/syncicache.c == --- head/lib/libc/powerpc/gen/syncicache.c Sat Apr 16 17:46:50 2016 (r298119) +++ head/lib/libc/powerpc/gen/syncicache.c Sat Apr 16 17:52:00 2016 (r298120) @@ -66,8 +66,8 @@ getcachelinesize() clen = sizeof(cacheline_size); - if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), - _size, , NULL, 0) < 0 || !cacheline_size) { + if (sysctl(cachemib, nitems(cachemib), _size, , + NULL, 0) < 0 || !cacheline_size) { abort(); } } Modified: head/lib/libc/powerpc64/gen/syncicache.c == --- head/lib/libc/powerpc64/gen/syncicache.cSat Apr 16 17:46:50 2016 (r298119) +++
svn commit: r298119 - head/tools/tools/locale/etc
Author: bapt Date: Sat Apr 16 17:46:50 2016 New Revision: 298119 URL: https://svnweb.freebsd.org/changeset/base/298119 Log: Readd the zh_hant_HK.UTF-8 removed by accident Only Big5HKSCS as been removed. Modified: head/tools/tools/locale/etc/charmaps.xml Modified: head/tools/tools/locale/etc/charmaps.xml == --- head/tools/tools/locale/etc/charmaps.xmlSat Apr 16 17:44:36 2016 (r298118) +++ head/tools/tools/locale/etc/charmaps.xmlSat Apr 16 17:46:50 2016 (r298119) @@ -187,6 +187,9 @@ countries="CN" /> + ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298118 - head/tools/tools/locale/tools
Author: bapt Date: Sat Apr 16 17:44:36 2016 New Revision: 298118 URL: https://svnweb.freebsd.org/changeset/base/298118 Log: Really stop converting map from UTF-8 to GB2312 Modified: head/tools/tools/locale/tools/finalize Modified: head/tools/tools/locale/tools/finalize == --- head/tools/tools/locale/tools/finalize Sat Apr 16 17:39:39 2016 (r298117) +++ head/tools/tools/locale/tools/finalize Sat Apr 16 17:44:36 2016 (r298118) @@ -61,7 +61,7 @@ then ${CLDRDIR}/posix/eucCN.cm \ > ${base}/../etc/final-maps/map.GB2312 CHARMAPS="ARMSCII-8 Big5 CP1131 CP1251 \ - CP866 GB2312 GBK ISCII-DEV ISO8859-1 \ + CP866 GBK ISCII-DEV ISO8859-1 \ ISO8859-13 ISO8859-15 ISO8859-2 ISO8859-4 \ ISO8859-5 ISO8859-7 ISO8859-9 KOI8-R KOI8-U \ PT154 SJIS US-ASCII eucJP eucKR" ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298117 - head/tools/tools/locale/etc/final-maps
Author: bapt Date: Sat Apr 16 17:39:39 2016 New Revision: 298117 URL: https://svnweb.freebsd.org/changeset/base/298117 Log: Replace generated maps with maps extracted from CLDR for GB3212 and eucCN Modified: head/tools/tools/locale/etc/final-maps/map.GB2312 (contents, props changed) head/tools/tools/locale/etc/final-maps/map.eucCN (contents, props changed) Modified: head/tools/tools/locale/etc/final-maps/map.GB2312 == --- head/tools/tools/locale/etc/final-maps/map.GB2312 Sat Apr 16 17:36:02 2016(r298116) +++ head/tools/tools/locale/etc/final-maps/map.GB2312 Sat Apr 16 17:39:39 2016(r298117) @@ -1,7450 +1,7710 @@ +## +# POSIX charmap +# Generated automatically from the Unicode Character Database and Common Locale Data Repository +# see http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap07.html +# charset: GB2312 +## +# +# Copyright 1991-2011 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in # +# http://www.unicode.org/copyright.html. # +# # +# Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode # +# data files and any associated documentation (the "Data Files") or Unicode software and any# +# associated documentation (the "Software") to deal in the Data Files or Software without # +# restriction, including without limitation the rights to use, copy, modify, merge, publish,# +# distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom # +# the Data Files or Software are furnished to do so, provided that (a) the above copyright # +# notice(s) and this permission notice appear with all copies of the Data Files or Software,# +# (b) both the above copyright notice(s) and this permission notice appear in associated# +# documentation, and (c) there is clear notice in each modified Data File or in the Software as # +# well as in the documentation associated with the Data File(s) or Software that the data or# +# software has been modified. # +# # +# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR# +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A# +# PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT # +# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR # +# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, # +# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # +# CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. # +# + "GB2312" - 1 - 2 +1 +2 + CHARMAP - \x21\x21 - \x21\x22 - \x21\x23 - \x21\x24 - \x21\x25 - \x21\x26 - \x21\x27 - \x21\x28 - \x21\x29 - \x21\x2a - \x21\x2b - \x21\x2c - \x21\x2d - \x21\x2e - \x21\x2f - \x21\x30 - \x21\x31 - \x21\x32 - \x21\x33 - \x21\x34 - \x21\x35 - \x21\x36 - \x21\x37 - \x21\x38 - \x21\x39 - \x21\x3a - \x21\x3b - \x21\x3c - \x21\x3d - \x21\x3e - \x21\x3f - \x21\x40 - \x21\x41 - \x21\x42 - \x21\x43 - \x21\x44 - \x21\x45 - \x21\x46 - \x21\x47 - \x21\x48 - \x21\x49 - \x21\x4a - \x21\x4b - \x21\x4c - \x21\x4d - \x21\x4e - \x21\x4f - \x21\x50 - \x21\x51 - \x21\x52 - \x21\x53 - \x21\x54 - \x21\x55 - \x21\x56 - \x21\x57 - \x21\x58 - \x21\x59 - \x21\x5a - \x21\x5b - \x21\x5c - \x21\x5d - \x21\x5e - \x21\x5f - \x21\x60 - \x21\x61 - \x21\x62 - \x21\x63 - \x21\x64 - \x21\x65 - \x21\x66 - \x21\x67 - \x21\x68 - \x21\x69 - \x21\x6a - \x21\x6b - \x21\x6c - \x21\x6d - \x21\x6e - \x21\x6f - \x21\x70 - \x21\x71 - \x21\x72 - \x21\x73 - \x21\x74 - \x21\x75 - \x21\x76 - \x21\x77 - \x21\x78 - \x21\x79 - \x21\x7a - \x21\x7b - \x21\x7c - \x21\x7d - \x21\x7e - \x22\x31 - \x22\x32 - \x22\x33 - \x22\x34 - \x22\x35 - \x22\x36 - \x22\x37 - \x22\x38 - \x22\x39 - \x22\x3a - \x22\x3b - \x22\x3c - \x22\x3d - \x22\x3e - \x22\x3f - \x22\x40 - \x22\x41 - \x22\x42 - \x22\x43 - \x22\x44 - \x22\x45 - \x22\x46 - \x22\x47 - \x22\x48 - \x22\x49 - \x22\x4a - \x22\x4b - \x22\x4c - \x22\x4d - \x22\x4e - \x22\x4f - \x22\x50 - \x22\x51 - \x22\x52 - \x22\x53 - \x22\x54 - \x22\x55 - \x22\x56 - \x22\x57 - \x22\x58 - \x22\x59 - \x22\x5a - \x22\x5b - \x22\x5c - \x22\x5d - \x22\x5e - \x22\x5f -
svn commit: r298116 - in head/tools/tools/locale: . etc etc/charmaps tools
Author: bapt Date: Sat Apr 16 17:36:02 2016 New Revision: 298116 URL: https://svnweb.freebsd.org/changeset/base/298116 Log: Rework collation generation: When building collation database for non unicode encodings use the proper unicode mapping (this fixes collation not working properly for those encodings) For locales where new characters are added but only for unicode, stop trying to map the new characters, directly extract from CLDR the collation files for the said encoding Stop trying to generate encoding map from unicode version for GB2312 and encCN It was not reliable. Instead use the map provide by the CLDR project Reported by: ache Added: head/tools/tools/locale/tools/extract-colldef.awk (contents, props changed) Modified: head/tools/tools/locale/Makefile head/tools/tools/locale/etc/charmaps.xml head/tools/tools/locale/etc/charmaps/charmaps.txt head/tools/tools/locale/tools/cldr2def.pl head/tools/tools/locale/tools/convert_map.pl head/tools/tools/locale/tools/finalize Modified: head/tools/tools/locale/Makefile == --- head/tools/tools/locale/MakefileSat Apr 16 13:41:10 2016 (r298115) +++ head/tools/tools/locale/MakefileSat Apr 16 17:36:02 2016 (r298116) @@ -22,6 +22,23 @@ KNOWN= monetdef numericdef msgdef timed TYPES?=${KNOWN} LOCALE_DESTDIR?= /tmp/generated-locales/ +COLLATION_SPECIAL?= \ + cs_CZ ISO8859-2 \ + da_DK ISO8859-1 \ + da_DK ISO8859-15 \ + hr_HR ISO8859-2 \ + hu_HU ISO8859-2 \ + nb_NO ISO8859-1 \ + nb_NO ISO8859-15 \ + sk_SK ISO8859-2 \ + zh_Hans_CN GB2312 \ + zh_Hans_CN eucCN \ + +.for area enc in ${COLLATION_SPECIAL} +COLLATIONS_SPECIAL_ENV+= ${area}.${enc} +.endfor +PASSON+= COLLATIONS_SPECIAL="${COLLATIONS_SPECIAL_ENV}" + .if defined(LC) LC:= --lc=${LC} .endif @@ -55,17 +72,26 @@ post-install: .endfor .for t in ${TYPES} -build-${t}: +gen-${t}: mkdir -p ${t} ${t}.draft perl -I tools tools/cldr2def.pl \ --cldr=$$(realpath ${CLDRDIR}) \ --unidata=$$(realpath ${UNIDATADIR}) \ --etc=$$(realpath ${ETCDIR}) \ --type=${t} ${LC} + +build-${t}: gen-${t} env ${PASSON} tools/finalize ${t} .endfor -build-ctypedef:transfer-rollup +gen-ctypedef: transfer-rollup +static-colldef: gen-colldef +build-colldef: static-colldef + +static-colldef: +.for area enc in ${COLLATION_SPECIAL} + awk -f tools/extract-colldef.awk ${CLDRDIR}/posix/${area}.${enc}.src > colldef/${area}.${enc}.src +.endfor transfer-rollup: cp ${ETCDIR}/common.UTF-8.src ${CLDRDIR}/posix/xx_Comm_US.UTF-8.src @@ -93,12 +119,34 @@ BASE_LOCALES_OF_INTEREST?= \ uk_UA \ kk_Cyrl_KZ mn_Cyrl_MN sr_Cyrl_RS sr_Latn_RS \ zh_Hans_CN zh_Hant_HK zh_Hant_TW \ - \ - \ bn_IN gu_IN or_IN ta_IN te_IN kn_IN ml_IN si_LK \ th_TH lo_LA bo_IN my_MM pa_Guru_IN ka_GE chr_US \ km_KH shi_Tfng_MA ii_CN vai_Vaii_LR vi_VN +ENCODINGS= Big5 \ + CP1251 \ + CP866 \ + CP949 \ + eucCN \ + eucJP \ + eucKR \ + GB18030 \ + GB2312 \ + GBK \ + ISO8859-1 \ + ISO8859-13 \ + ISO8859-15 \ + ISO8859-2 \ + ISO8859-5 \ + ISO8859-7 \ + ISO8859-9 \ + KOI8-R \ + KOI8-U \ + SJIS \ + US-ASCII \ + UTF-8 \ + + POSIX: .if exists (${CLDRDIR}/tools/java/cldr.jar) mkdir -p ${CLDRDIR}/posix @@ -109,11 +157,20 @@ POSIX: -d ${CLDRDIR}/posix -m ${area} -c UTF-8 .endif . endfor -. if !exists(${CLDRDIR}/posix/UTF-8.cm) +. for area encoding in ${COLLATION_SPECIAL} +.if !exists(${CLDRDIR}/posix/${area}.${encoding}.src) + java -DCLDR_DIR=${CLDRDIR:Q} -jar ${CLDRDIR}/tools/java/cldr.jar \ + org.unicode.cldr.posix.GeneratePOSIX \ + -d ${CLDRDIR}/posix -m ${area} -c ${encoding} +.endif +. endfor +. for enc in ${ENCODINGS} +. if !exists(${CLDRDIR}/posix/${enc}.cm) java -DCLDR_DIR=${CLDRDIR:Q} -jar ${CLDRDIR}/tools/java/cldr.jar \ org.unicode.cldr.posix.GenerateCharmap \ - -d ${CLDRDIR}/posix + -d ${CLDRDIR}/posix -c ${enc} . endif +. endfor .else @echo "Please install CLDR toolset for the desired release" @echo "It should go at ${CLDRDIR}/tools" Modified: head/tools/tools/locale/etc/charmaps.xml == --- head/tools/tools/locale/etc/charmaps.xmlSat Apr 16 13:41:10 2016 (r298115) +++ head/tools/tools/locale/etc/charmaps.xmlSat Apr 16
svn commit: r298114 - head/usr.sbin/inetd
Author: bapt Date: Sat Apr 16 13:10:31 2016 New Revision: 298114 URL: https://svnweb.freebsd.org/changeset/base/298114 Log: Use the SOCK_CLOEXEC flags in the socket(2) 'type' attribute instead of calling fcntl(2) MFC after:1 week Modified: head/usr.sbin/inetd/inetd.c Modified: head/usr.sbin/inetd/inetd.c == --- head/usr.sbin/inetd/inetd.c Sat Apr 16 12:49:26 2016(r298113) +++ head/usr.sbin/inetd/inetd.c Sat Apr 16 13:10:31 2016(r298114) @@ -1251,7 +1251,9 @@ setup(struct servtab *sep) { int on = 1; - if ((sep->se_fd = socket(sep->se_family, sep->se_socktype, 0)) < 0) { + /* Set all listening sockets to close-on-exec. */ + if ((sep->se_fd = socket(sep->se_family, + sep->se_socktype | SOCK_CLOEXEC, 0)) < 0) { if (debug) warn("socket failed on %s/%s", sep->se_service, sep->se_proto); @@ -1259,13 +1261,6 @@ setup(struct servtab *sep) sep->se_service, sep->se_proto); return; } - /* Set all listening sockets to close-on-exec. */ - if (fcntl(sep->se_fd, F_SETFD, FD_CLOEXEC) < 0) { - syslog(LOG_ERR, "%s/%s: fcntl (F_SETFD, FD_CLOEXEC): %m", - sep->se_service, sep->se_proto); - close(sep->se_fd); - return; - } #defineturnon(fd, opt) \ setsockopt(fd, SOL_SOCKET, opt, (char *), sizeof (on)) if (strcmp(sep->se_proto, "tcp") == 0 && (options & SO_DEBUG) && ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298113 - head/usr.bin/resizewin
Author: bapt Date: Sat Apr 16 12:49:26 2016 New Revision: 298113 URL: https://svnweb.freebsd.org/changeset/base/298113 Log: Fix a mandoc -Tlint warning Modified: head/usr.bin/resizewin/resizewin.1 Modified: head/usr.bin/resizewin/resizewin.1 == --- head/usr.bin/resizewin/resizewin.1 Sat Apr 16 12:47:23 2016 (r298112) +++ head/usr.bin/resizewin/resizewin.1 Sat Apr 16 12:49:26 2016 (r298113) @@ -24,7 +24,7 @@ .\" 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. - +.\" .\" $FreeBSD$ .\" .Dd March 17, 2016 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298112 - head/usr.bin/script
Author: bapt Date: Sat Apr 16 12:47:23 2016 New Revision: 298112 URL: https://svnweb.freebsd.org/changeset/base/298112 Log: Directly set the O_CLOEXEC flags via the open(2) attributes MFC after:1 week Modified: head/usr.bin/script/script.c Modified: head/usr.bin/script/script.c == --- head/usr.bin/script/script.cSat Apr 16 12:42:01 2016 (r298111) +++ head/usr.bin/script/script.cSat Apr 16 12:47:23 2016 (r298112) @@ -161,17 +161,14 @@ main(int argc, char *argv[]) asprintf(, "%s.filemon", fname); if (!fmfname) err(1, "%s.filemon", fname); - if ((fm_fd = open("/dev/filemon", O_RDWR)) == -1) + if ((fm_fd = open("/dev/filemon", O_RDWR | O_CLOEXEC)) == -1) err(1, "open(\"/dev/filemon\", O_RDWR)"); - if ((fm_log = open(fmfname, O_WRONLY | O_CREAT | O_TRUNC, + if ((fm_log = open(fmfname, + O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) == -1) err(1, "open(%s)", fmfname); if (ioctl(fm_fd, FILEMON_SET_FD, _log) < 0) err(1, "Cannot set filemon log file descriptor"); - - /* Set up these two fd's to close on exec. */ - (void)fcntl(fm_fd, F_SETFD, FD_CLOEXEC); - (void)fcntl(fm_log, F_SETFD, FD_CLOEXEC); } if (pflg) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298111 - head/usr.sbin/inetd
Author: bapt Date: Sat Apr 16 12:42:01 2016 New Revision: 298111 URL: https://svnweb.freebsd.org/changeset/base/298111 Log: Use pipe2(2) to directly set the close-on-exec flags directly MFC after:1 week Modified: head/usr.sbin/inetd/inetd.c Modified: head/usr.sbin/inetd/inetd.c == --- head/usr.sbin/inetd/inetd.c Sat Apr 16 12:32:26 2016(r298110) +++ head/usr.sbin/inetd/inetd.c Sat Apr 16 12:42:01 2016(r298111) @@ -539,15 +539,10 @@ main(int argc, char **argv) (void)setenv("inetd_dummy", dummy, 1); } - if (pipe(signalpipe) != 0) { + if (pipe2(signalpipe, O_CLOEXEC) != 0) { syslog(LOG_ERR, "pipe: %m"); exit(EX_OSERR); } - if (fcntl(signalpipe[0], F_SETFD, FD_CLOEXEC) < 0 || - fcntl(signalpipe[1], F_SETFD, FD_CLOEXEC) < 0) { - syslog(LOG_ERR, "signalpipe: fcntl (F_SETFD, FD_CLOEXEC): %m"); - exit(EX_OSERR); - } FD_SET(signalpipe[0], ); #ifdef SANITY_CHECK nsock++; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298110 - head/cddl/contrib/opensolaris/cmd/zdb
Author: bapt Date: Sat Apr 16 12:32:26 2016 New Revision: 298110 URL: https://svnweb.freebsd.org/changeset/base/298110 Log: Print error messages to stderr Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.c Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.c == --- head/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sat Apr 16 12:14:44 2016 (r298109) +++ head/cddl/contrib/opensolaris/cmd/zdb/zdb.c Sat Apr 16 12:32:26 2016 (r298110) @@ -2084,13 +2084,13 @@ dump_cachefile(const char *cachefile) nvlist_t *config; if ((fd = open64(cachefile, O_RDONLY)) < 0) { - (void) printf("cannot open '%s': %s\n", cachefile, + (void) fprintf(stderr, "cannot open '%s': %s\n", cachefile, strerror(errno)); exit(1); } if (fstat64(fd, ) != 0) { - (void) printf("failed to stat '%s': %s\n", cachefile, + (void) fprintf(stderr, "failed to stat '%s': %s\n", cachefile, strerror(errno)); exit(1); } ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298109 - head/bin/sh
Author: jilles Date: Sat Apr 16 12:14:44 2016 New Revision: 298109 URL: https://svnweb.freebsd.org/changeset/base/298109 Log: sh: Write LINENO value to stack string directly. Modified: head/bin/sh/parser.c Modified: head/bin/sh/parser.c == --- head/bin/sh/parser.cSat Apr 16 07:50:50 2016(r298108) +++ head/bin/sh/parser.cSat Apr 16 12:14:44 2016(r298109) @@ -1610,7 +1610,6 @@ endword: */ parsesub: { - char buf[10]; int subtype; int typeloc; int flags; @@ -1654,12 +1653,15 @@ varname: strncmp(out - length, "LINENO", length) == 0) { /* Replace the variable name with the * current line number. */ + STADJUST(-6, out); + CHECKSTRSPACE(11, out); linno = plinno; if (funclinno != 0) linno -= funclinno - 1; - snprintf(buf, sizeof(buf), "%d", linno); - STADJUST(-6, out); - STPUTS(buf, out); + length = snprintf(out, 11, "%d", linno); + if (length > 10) + length = 10; + out += length; flags |= VSLINENO; } } else if (is_digit(c)) { ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r297842 - in head/gnu/lib: csu libgcc libgcov
On Tue, Apr 12, 2016 at 02:45:19AM +, Bryan Drewery wrote: > Author: bdrewery > Date: Tue Apr 12 02:45:19 2016 > New Revision: 297842 > URL: https://svnweb.freebsd.org/changeset/base/297842 > Log: > META_MODE: Avoid changed build command every build. > Because the file is generated with -f using another Makefile, 2 > different Makefiles are trying to handle the .meta file for the > target. The obvious .NOMETA_CMP or .NOMETA on the ${MAKE} targets > don't work as they are very limited in scope in bmake. Using > .PHONY fixes the problem and ensures that the ${MAKE} command > is always ran to check if it is outdated in the sub-make. > An example of the problem in gnu/lib/libgcc (with make -dM): > /usr/obj/root/git/freebsd/gnu/lib/libgcc/tm.h.meta: 2: a build command > has changed > TARGET_CPU_DEFAULT="" HEADERS="options.h i386/biarch64.h i386/i386.h > i386/unix.h i386/att.h dbxelf.h elfos-undef.h elfos.h freebsd-native.h > freebsd-spec.h freebsd.h i386/x86-64.h i386/freebsd.h i386/freebsd64.h > defaults.h" DEFINES="" /bin/sh > /root/git/freebsd/gnu/lib/libgcc/../../../contrib/gcc/mkconfig.sh tm.h > vs > (cd /root/git/freebsd/gnu/lib/libgcc; make -f > /root/git/freebsd/gnu/lib/libgcc/../../usr.bin/cc/cc_tools/Makefile > MFILE=/root/git/freebsd/gnu/lib/libgcc/../../usr.bin/cc/cc_tools/Makefile > GCCDIR=/root/git/freebsd/gnu/lib/libgcc/../../../contrib/gcc tm.h) > Skipping meta for tm.h: .NOMETA > (cd /root/git/freebsd/gnu/lib/libgcc; make -f > /root/git/freebsd/gnu/lib/libgcc/../../usr.bin/cc/cc_tools/Makefile > MFILE=/root/git/freebsd/gnu/lib/libgcc/../../usr.bin/cc/cc_tools/Makefile > GCCDIR=/root/git/freebsd/gnu/lib/libgcc/../../../contrib/gcc tm.h) > `tm.h' is up to date. > Modified: > head/gnu/lib/csu/Makefile > head/gnu/lib/libgcc/Makefile > head/gnu/lib/libgcov/Makefile > Modified: head/gnu/lib/csu/Makefile > == > --- head/gnu/lib/csu/Makefile Tue Apr 12 02:01:16 2016(r297841) > +++ head/gnu/lib/csu/Makefile Tue Apr 12 02:45:19 2016(r297842) > @@ -71,7 +71,7 @@ crtendS.o: ${ENDSRC} > -c -o ${.TARGET} ${.ALLSRC:N*.h} > > CLEANFILES+= tm.h tconfig.h options.h optionlist cs-tconfig.h cs-tm.h > -tm.h tconfig.h options.h: ${CCDIR}/cc_tools/Makefile > +tm.h tconfig.h options.h: ${CCDIR}/cc_tools/Makefile .PHONY > (cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} > ${.TARGET}) > > .include > > Modified: head/gnu/lib/libgcc/Makefile > == > --- head/gnu/lib/libgcc/Makefile Tue Apr 12 02:01:16 2016 > (r297841) > +++ head/gnu/lib/libgcc/Makefile Tue Apr 12 02:45:19 2016 > (r297842) > @@ -343,7 +343,7 @@ ${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS > # > # Generated headers > # > -${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile > +${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile .PHONY > (cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} > ${.TARGET}) > > CLEANFILES += ${COMMONHDRS} > > Modified: head/gnu/lib/libgcov/Makefile > == > --- head/gnu/lib/libgcov/Makefile Tue Apr 12 02:01:16 2016 > (r297841) > +++ head/gnu/lib/libgcov/Makefile Tue Apr 12 02:45:19 2016 > (r297842) > @@ -45,7 +45,7 @@ CC_S = ${CC} -c ${CFLAGS} ${PICFLAG} -DS > COMMONHDRS= tm.h tconfig.h gcov-iov.h options.h > CLEANFILES+= ${COMMONHDRS} cs-tm.h cs-tconfig.h options.h optionlist > > -${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile > +${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile .PHONY > (cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} > ${.TARGET}) > > ${OBJS} beforedepend: ${COMMONHDRS} Unfortunately, this causes things to be built every time for non-metamode builds, including make installworld. I had to revert the gnu/lib/csu/Makefile part locally to get make installworld with a read-only /usr/obj to work again. -- Jilles Tjoelker ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298107 - in head: . bin/cat bin/cat/tests bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/date/tests bin/dd bin/dd/tests bin/df bin/domainname bin/echo bin/ed bin/expr bin/e...
Author: gjb Date: Sat Apr 16 07:45:30 2016 New Revision: 298107 URL: https://svnweb.freebsd.org/changeset/base/298107 Log: Merge the projects/release-pkg branch to head. This allows packaging the base system with pkg(8), including but not limited to providing the ability to provide upstream binary update possibilities for non-tier-1 architectures. This merge is a requirement of the 11.0-RELEASE, and as such, thank you to everyone that has tested the project branch. Documentation in build(7) etc. is still somewhat sparse, but updates to those parts will follow. Sponsored by: The FreeBSD Foundation Added: head/lib/libcapsicum/ - copied from r298104, projects/release-pkg/lib/libcapsicum/ head/libexec/casper/ - copied from r298104, projects/release-pkg/libexec/casper/ head/release/packages/ - copied from r298104, projects/release-pkg/release/packages/ head/release/scripts/make-pkg-package.sh - copied unchanged from r298104, projects/release-pkg/release/scripts/make-pkg-package.sh head/release/scripts/mtree-to-plist.awk - copied unchanged from r298104, projects/release-pkg/release/scripts/mtree-to-plist.awk head/share/syscons/Makefile.inc - copied unchanged from r298104, projects/release-pkg/share/syscons/Makefile.inc head/usr.sbin/bsdinstall/Makefile.inc - copied unchanged from r298104, projects/release-pkg/usr.sbin/bsdinstall/Makefile.inc Replaced: head/sys/boot/forth/Makefile - copied unchanged from r298104, projects/release-pkg/sys/boot/forth/Makefile Modified: head/Makefile head/Makefile.inc1 head/bin/cat/Makefile head/bin/cat/tests/Makefile head/bin/chflags/Makefile head/bin/chio/Makefile head/bin/chmod/Makefile head/bin/cp/Makefile head/bin/csh/Makefile head/bin/date/Makefile head/bin/date/tests/Makefile head/bin/dd/Makefile head/bin/dd/tests/Makefile head/bin/df/Makefile head/bin/domainname/Makefile head/bin/echo/Makefile head/bin/ed/Makefile head/bin/expr/Makefile head/bin/expr/tests/Makefile head/bin/freebsd-version/Makefile head/bin/getfacl/Makefile head/bin/hostname/Makefile head/bin/kenv/Makefile head/bin/kill/Makefile head/bin/ln/Makefile head/bin/ls/Makefile head/bin/ls/tests/Makefile head/bin/mkdir/Makefile head/bin/mv/Makefile head/bin/mv/tests/Makefile head/bin/pax/Makefile head/bin/pax/tests/Makefile head/bin/pkill/Makefile head/bin/pkill/tests/Makefile head/bin/ps/Makefile head/bin/pwait/Makefile head/bin/pwd/Makefile head/bin/rcp/Makefile head/bin/realpath/Makefile head/bin/rm/Makefile head/bin/rmail/Makefile head/bin/rmdir/Makefile head/bin/setfacl/Makefile head/bin/sh/Makefile head/bin/sh/tests/Makefile head/bin/sh/tests/builtins/Makefile head/bin/sh/tests/errors/Makefile head/bin/sh/tests/execution/Makefile head/bin/sh/tests/expansion/Makefile head/bin/sh/tests/parameters/Makefile head/bin/sh/tests/parser/Makefile head/bin/sh/tests/set-e/Makefile head/bin/sleep/Makefile head/bin/sleep/tests/Makefile head/bin/stty/Makefile head/bin/sync/Makefile head/bin/test/Makefile head/bin/test/tests/Makefile head/bin/tests/Makefile head/bin/uuidgen/Makefile head/cddl/lib/tests/Makefile head/cddl/sbin/tests/Makefile head/cddl/tests/Makefile head/cddl/usr.bin/tests/Makefile head/cddl/usr.sbin/tests/Makefile head/contrib/ntp/ntpd/ntp_control.c head/etc/Makefile head/etc/devd/Makefile head/etc/mtree/BSD.var.dist head/etc/pam.d/Makefile head/etc/periodic/daily/Makefile head/etc/periodic/monthly/Makefile head/etc/rc.d/Makefile head/gnu/lib/libgcc/Makefile head/gnu/lib/tests/Makefile head/gnu/tests/Makefile head/gnu/usr.bin/binutils/Makefile.inc head/gnu/usr.bin/diff/tests/Makefile head/gnu/usr.bin/gdb/Makefile.inc head/gnu/usr.bin/groff/Makefile.inc head/gnu/usr.bin/tests/Makefile head/include/Makefile head/lib/Makefile head/lib/atf/libatf-c++/tests/Makefile head/lib/atf/libatf-c++/tests/detail/Makefile head/lib/atf/libatf-c/tests/Makefile head/lib/atf/libatf-c/tests/detail/Makefile head/lib/atf/tests/Makefile head/lib/atf/tests/test-programs/Makefile head/lib/lib80211/Makefile head/lib/libalias/libalias/Makefile head/lib/libarchive/Makefile head/lib/libarchive/tests/Makefile head/lib/libauditd/Makefile head/lib/libbegemot/Makefile head/lib/libblocksruntime/Makefile head/lib/libbluetooth/Makefile head/lib/libbsdstat/Makefile head/lib/libbsm/Makefile head/lib/libbsnmp/Makefile.inc head/lib/libbz2/Makefile head/lib/libc++/Makefile head/lib/libc/Makefile head/lib/libc/tests/Makefile head/lib/libc/tests/c063/Makefile head/lib/libc/tests/db/Makefile head/lib/libc/tests/gen/Makefile head/lib/libc/tests/gen/execve/Makefile head/lib/libc/tests/gen/posix_spawn/Makefile head/lib/libc/tests/hash/Makefile head/lib/libc/tests/inet/Makefile head/lib/libc/tests/locale/Makefile
svn commit: r298106 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg Date: Sat Apr 16 07:41:56 2016 New Revision: 298106 URL: https://svnweb.freebsd.org/changeset/base/298106 Log: zfs_rezget: z_vnode can not be NULL if zp is valid MFC after:3 weeks Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Sat Apr 16 07:35:53 2016(r298105) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Sat Apr 16 07:41:56 2016(r298106) @@ -1341,7 +1341,7 @@ zfs_rezget(znode_t *zp) * recycled when the last vnode reference is dropped. */ vp = ZTOV(zp); - if (vp != NULL && vp->v_type != IFTOVT((mode_t)zp->z_mode)) { + if (vp->v_type != IFTOVT((mode_t)zp->z_mode)) { zfs_znode_dmu_fini(zp); ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); return (EIO); @@ -1349,11 +1349,9 @@ zfs_rezget(znode_t *zp) zp->z_unlinked = (zp->z_links == 0); zp->z_blksz = doi.doi_data_block_size; - if (vp != NULL) { - vn_pages_remove(vp, 0, 0); - if (zp->z_size != size) - vnode_pager_setsize(vp, zp->z_size); - } + vn_pages_remove(vp, 0, 0); + if (zp->z_size != size) + vnode_pager_setsize(vp, zp->z_size); ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298105 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: avg Date: Sat Apr 16 07:35:53 2016 New Revision: 298105 URL: https://svnweb.freebsd.org/changeset/base/298105 Log: zfs: enable vn_io_fault support Note that now we have to account for possible partial writes in dmu_write_uio_dbuf(). It seems that on illumos either all or none of the data are expected to be written. But the partial writes are quite expected when vn_io_fault support is enabled. Reviewed by: kib MFC after:7 weeks Differential Revision: https://reviews.freebsd.org/D2790 Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Sat Apr 16 07:33:42 2016(r298104) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c Sat Apr 16 07:35:53 2016(r298105) @@ -1092,8 +1092,13 @@ dmu_read_uio_dnode(dnode_t *dn, uio_t *u else XUIOSTAT_BUMP(xuiostat_rbuf_copied); } else { +#ifdef illumos err = uiomove((char *)db->db_data + bufoff, tocpy, UIO_READ, uio); +#else + err = vn_io_fault_uiomove((char *)db->db_data + bufoff, + tocpy, uio); +#endif } if (err) break; @@ -1187,6 +1192,7 @@ dmu_write_uio_dnode(dnode_t *dn, uio_t * else dmu_buf_will_dirty(db, tx); +#ifdef illumos /* * XXX uiomove could block forever (eg. nfs-backed * pages). There needs to be a uiolockdown() function @@ -1195,6 +1201,10 @@ dmu_write_uio_dnode(dnode_t *dn, uio_t * */ err = uiomove((char *)db->db_data + bufoff, tocpy, UIO_WRITE, uio); +#else + err = vn_io_fault_uiomove((char *)db->db_data + bufoff, tocpy, + uio); +#endif if (tocpy == db->db_size) dmu_buf_fill_done(db, tx); Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.cSat Apr 16 07:33:42 2016(r298104) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.cSat Apr 16 07:35:53 2016(r298105) @@ -1170,6 +1170,7 @@ zfs_domount(vfs_t *vfsp, char *osname) vfsp->mnt_kern_flag |= MNTK_LOOKUP_SHARED; vfsp->mnt_kern_flag |= MNTK_SHARED_WRITES; vfsp->mnt_kern_flag |= MNTK_EXTENDED_SHARED; + vfsp->mnt_kern_flag |= MNTK_NO_IOPF;/* vn_io_fault can be used */ /* * The fsid is 64 bits, composed of an 8-bit fs type, which Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sat Apr 16 07:33:42 2016(r298104) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Sat Apr 16 07:35:53 2016(r298105) @@ -656,7 +656,11 @@ mappedread(vnode_t *vp, int nbytes, uio_ zfs_vmobject_wunlock(obj); va = zfs_map_page(pp, ); +#ifdef illumos error = uiomove(va + off, bytes, UIO_READ, uio); +#else + error = vn_io_fault_uiomove(va + off, bytes, uio); +#endif zfs_unmap_page(sf); zfs_vmobject_wlock(obj); page_unhold(pp); @@ -1034,18 +1038,31 @@ zfs_write(vnode_t *vp, uio_t *uio, int i * holding up the transaction if the data copy hangs * up on a pagefault (e.g., from an NFS server mapping). */ +#ifdef illumos size_t cbytes; +#endif abuf = dmu_request_arcbuf(sa_get_db(zp->z_sa_hdl), max_blksz); ASSERT(abuf != NULL); ASSERT(arc_buf_size(abuf) == max_blksz); +#ifdef illumos if (error = uiocopy(abuf->b_data, max_blksz, UIO_WRITE, uio, )) { dmu_return_arcbuf(abuf); break; } ASSERT(cbytes == max_blksz); +#else + ssize_t resid = uio->uio_resid; + error = vn_io_fault_uiomove(abuf->b_data, max_blksz, uio); + if (error != 0) {
svn commit: r298103 - head/sys/dev/isp
Author: mav Date: Sat Apr 16 06:36:56 2016 New Revision: 298103 URL: https://svnweb.freebsd.org/changeset/base/298103 Log: Simplify memory allocation for NS requests. Since we no longer need additional buffers for request and response IOCBs, we can increase receive space by 192 bytes, that is enough for fetching 48 more ports. The new limit is 1020 fabric ports per virtual port. MFC after:1 month Modified: head/sys/dev/isp/isp.c Modified: head/sys/dev/isp/isp.c == --- head/sys/dev/isp/isp.c Sat Apr 16 06:10:47 2016(r298102) +++ head/sys/dev/isp/isp.c Sat Apr 16 06:36:56 2016(r298103) @@ -3465,19 +3465,14 @@ abort: * * Use the GID_FT command to get all Port IDs for FC4 SCSI devices it knows. * - * For 2100-23XX cards, we can use the SNS mailbox command to pass simple - * name server commands to the switch management server via the QLogic f/w. + * For 2100-23XX cards, we use the SNS mailbox command to pass simple name + * server commands to the switch management server via the QLogic f/w. * - * For the 24XX card, we have to use CT-Pass through run via the Execute IOCB - * mailbox command. + * For the 24XX and above card, we use CT Pass-through IOCB. */ -#defineGIDLEN (ISP_FC_SCRLEN - (3 * QENTRY_LEN)) +#defineGIDLEN ISP_FC_SCRLEN #defineNGENT ((GIDLEN - 16) >> 2) -#defineXTXOFF (ISP_FC_SCRLEN - (3 * QENTRY_LEN)) /* CT request */ -#defineCTXOFF (ISP_FC_SCRLEN - (2 * QENTRY_LEN)) /* Request IOCB */ -#defineZTXOFF (ISP_FC_SCRLEN - (1 * QENTRY_LEN)) /* Response IOCB */ - static int isp_gid_ft_sns(ispsoftc_t *isp, int chan) { @@ -3507,16 +3502,16 @@ isp_gid_ft_sns(ispsoftc_t *isp, int chan rq->snscb_mword_div_2 = NGENT; rq->snscb_fc4_type = FC4_SCSI; - isp_put_gid_ft_request(isp, rq, (sns_gid_ft_req_t *)[CTXOFF]); - MEMORYBARRIER(isp, SYNC_SFORDEV, CTXOFF, SNS_GID_FT_REQ_SIZE, chan); + isp_put_gid_ft_request(isp, rq, (sns_gid_ft_req_t *)scp); + MEMORYBARRIER(isp, SYNC_SFORDEV, 0, SNS_GID_FT_REQ_SIZE, chan); MBSINIT(, MBOX_SEND_SNS, MBLOGALL, 1000); mbs.param[0] = MBOX_SEND_SNS; mbs.param[1] = SNS_GID_FT_REQ_SIZE >> 1; - mbs.param[2] = DMA_WD1(fcp->isp_scdma + CTXOFF); - mbs.param[3] = DMA_WD0(fcp->isp_scdma + CTXOFF); - mbs.param[6] = DMA_WD3(fcp->isp_scdma + CTXOFF); - mbs.param[7] = DMA_WD2(fcp->isp_scdma + CTXOFF); + mbs.param[2] = DMA_WD1(fcp->isp_scdma); + mbs.param[3] = DMA_WD0(fcp->isp_scdma); + mbs.param[6] = DMA_WD3(fcp->isp_scdma); + mbs.param[7] = DMA_WD2(fcp->isp_scdma); isp_mboxcmd(isp, ); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { if (mbs.param[0] == MBOX_INVALID_COMMAND) { @@ -3555,8 +3550,8 @@ isp_ct_passthru(ispsoftc_t *isp, int cha pt.ctp_rsp_cnt = 1; pt.ctp_rsp_bcnt = rsp_bcnt; pt.ctp_cmd_bcnt = cmd_bcnt; - pt.ctp_dataseg[0].ds_base = DMA_LO32(fcp->isp_scdma+XTXOFF); - pt.ctp_dataseg[0].ds_basehi = DMA_HI32(fcp->isp_scdma+XTXOFF); + pt.ctp_dataseg[0].ds_base = DMA_LO32(fcp->isp_scdma); + pt.ctp_dataseg[0].ds_basehi = DMA_HI32(fcp->isp_scdma); pt.ctp_dataseg[0].ds_count = cmd_bcnt; pt.ctp_dataseg[1].ds_base = DMA_LO32(fcp->isp_scdma); pt.ctp_dataseg[1].ds_basehi = DMA_HI32(fcp->isp_scdma); @@ -3626,12 +3621,12 @@ isp_gid_ft_ct_passthru(ispsoftc_t *isp, ct.ct_fcs_subtype = CT_FC_SUBTYPE_NS; ct.ct_cmd_resp = SNS_GID_FT; ct.ct_bcnt_resid = (GIDLEN - 16) >> 2; - isp_put_ct_hdr(isp, , (ct_hdr_t *) [XTXOFF]); - rp = (uint32_t *) [XTXOFF + sizeof(ct)]; + isp_put_ct_hdr(isp, , (ct_hdr_t *)scp); + rp = (uint32_t *) [sizeof(ct)]; ISP_IOZPUT_32(isp, FC4_SCSI, rp); if (isp->isp_dblev & ISP_LOGDEBUG1) { isp_print_bytes(isp, "CT request", - sizeof(ct) + sizeof(uint32_t), [XTXOFF]); + sizeof(ct) + sizeof(uint32_t), scp); } if (isp_ct_passthru(isp, chan, sizeof(ct) + sizeof(uint32_t), GIDLEN)) { @@ -4042,9 +4037,9 @@ isp_register_fc4_type_24xx(ispsoftc_t *i rp.rftid_portid[1] = fcp->isp_portid >> 8; rp.rftid_portid[2] = fcp->isp_portid; rp.rftid_fc4types[FC4_SCSI >> 5] = 1 << (FC4_SCSI & 0x1f); - isp_put_rft_id(isp, , (rft_id_t *)[XTXOFF]); + isp_put_rft_id(isp, , (rft_id_t *)scp); if (isp->isp_dblev & ISP_LOGDEBUG1) - isp_print_bytes(isp, "CT request", sizeof(rft_id_t), [XTXOFF]); + isp_print_bytes(isp, "CT request", sizeof(rft_id_t), scp); if (isp_ct_passthru(isp, chan, sizeof(rft_id_t), sizeof(ct_hdr_t))) { FC_SCRATCH_RELEASE(isp, chan); @@ -4097,9 +4092,9 @@ isp_register_fc4_features_24xx(ispsoftc_ if (fcp->role & ISP_ROLE_INITIATOR)
svn commit: r298102 - head/sys/dev/random
Author: kib Date: Sat Apr 16 06:10:47 2016 New Revision: 298102 URL: https://svnweb.freebsd.org/changeset/base/298102 Log: Fix rdrand_rng.ko and padlock_rng.ko dependencies, making modules loadable when not compiled into the kernel. Approved by: so (delphij) Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/random/ivy.c head/sys/dev/random/nehemiah.c Modified: head/sys/dev/random/ivy.c == --- head/sys/dev/random/ivy.c Sat Apr 16 06:07:13 2016(r298101) +++ head/sys/dev/random/ivy.c Sat Apr 16 06:10:47 2016(r298102) @@ -129,4 +129,4 @@ rdrand_modevent(module_t mod, int type, DEV_MODULE(rdrand, rdrand_modevent, NULL); MODULE_VERSION(rdrand, 1); -MODULE_DEPEND(rdrand, randomdev, 1, 1, 1); +MODULE_DEPEND(rdrand, random_device, 1, 1, 1); Modified: head/sys/dev/random/nehemiah.c == --- head/sys/dev/random/nehemiah.c Sat Apr 16 06:07:13 2016 (r298101) +++ head/sys/dev/random/nehemiah.c Sat Apr 16 06:10:47 2016 (r298102) @@ -151,4 +151,4 @@ nehemiah_modevent(module_t mod, int type DEV_MODULE(nehemiah, nehemiah_modevent, NULL); MODULE_VERSION(nehemiah, 1); -MODULE_DEPEND(nehemiah, randomdev, 1, 1, 1); +MODULE_DEPEND(nehemiah, random_device, 1, 1, 1); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r298101 - in head/sys/x86: include x86
Author: kib Date: Sat Apr 16 06:07:13 2016 New Revision: 298101 URL: https://svnweb.freebsd.org/changeset/base/298101 Log: Add x86 CPU features definitions published in the Intel SDM rev. 58. Sponsored by: The FreeBSD Foundation MFC after:1 week Modified: head/sys/x86/include/specialreg.h head/sys/x86/x86/identcpu.c Modified: head/sys/x86/include/specialreg.h == --- head/sys/x86/include/specialreg.h Sat Apr 16 05:14:55 2016 (r298100) +++ head/sys/x86/include/specialreg.h Sat Apr 16 06:07:13 2016 (r298101) @@ -332,6 +332,7 @@ */ #defineCPUID_STDEXT_FSGSBASE 0x0001 #defineCPUID_STDEXT_TSC_ADJUST 0x0002 +#defineCPUID_STDEXT_SGX0x0004 #defineCPUID_STDEXT_BMI1 0x0008 #defineCPUID_STDEXT_HLE0x0010 #defineCPUID_STDEXT_AVX2 0x0020 @@ -341,7 +342,10 @@ #defineCPUID_STDEXT_ERMS 0x0200 #defineCPUID_STDEXT_INVPCID0x0400 #defineCPUID_STDEXT_RTM0x0800 +#defineCPUID_STDEXT_PQM0x1000 +#defineCPUID_STDEXT_NFPUSG 0x2000 #defineCPUID_STDEXT_MPX0x4000 +#defineCPUID_STDEXT_PQE0x8000 #defineCPUID_STDEXT_AVX512F0x0001 #defineCPUID_STDEXT_AVX512DQ 0x0002 #defineCPUID_STDEXT_RDSEED 0x0004 @@ -359,6 +363,16 @@ #defineCPUID_STDEXT_AVX512BW 0x4000 /* + * CPUID instruction 7 Structured Extended Features, leaf 0 ecx info + */ +#defineCPUID_STDEXT2_PREFETCHWT1 0x0001 +#defineCPUID_STDEXT2_UMIP 0x0004 +#defineCPUID_STDEXT2_PKU 0x0008 +#defineCPUID_STDEXT2_OSPKE 0x0010 +#defineCPUID_STDEXT2_RDPID 0x0040 +#defineCPUID_STDEXT2_SGXLC 0x4000 + +/* * CPUID manufacturers identifiers */ #defineAMD_VENDOR_ID "AuthenticAMD" Modified: head/sys/x86/x86/identcpu.c == --- head/sys/x86/x86/identcpu.c Sat Apr 16 05:14:55 2016(r298100) +++ head/sys/x86/x86/identcpu.c Sat Apr 16 06:07:13 2016(r298101) @@ -926,6 +926,7 @@ printcpuinfo(void) /* RDFSBASE/RDGSBASE/WRFSBASE/WRGSBASE */ "\001FSGSBASE" "\002TSCADJ" + "\003SGX" /* Bit Manipulation Instructions */ "\004BMI1" /* Hardware Lock Elision */ @@ -945,9 +946,9 @@ printcpuinfo(void) "\014RTM" "\015PQM" "\016NFPUSG" - "\020PQE" /* Intel Memory Protection Extensions */ "\017MPX" + "\020PQE" /* AVX512 Foundation */ "\021AVX512F" "\022AVX512DQ" @@ -976,8 +977,11 @@ printcpuinfo(void) "\020" "\001PREFETCHWT1" "\002AVX512VBMI" + "\003UMIP" "\004PKU" "\005OSPKE" + "\027RDPID" + "\037SGXLC" ); } @@ -1935,7 +1939,10 @@ print_INTEL_TLB(u_int data) printf("Instruction TLB: 4 KByte pages, fully associative, 48 entries\n"); break; case 0x63: - printf("Data TLB: 1 GByte pages, 4-way set associative, 4 entries\n"); + printf("Data TLB: 2 MByte or 4 MByte pages, 4-way set associative, 32 entries and a separate array with 1 GByte pages, 4-way set associative, 4 entries\n"); + break; + case 0x64: + printf("Data TLB: 4 KBytes pages, 4-way set associative, 512 entries\n"); break; case 0x66: printf("1st-level data cache: 8 KB, 4-way set associative, sectored cache, 64 byte line size\n"); @@ -2051,6 +2058,9 @@ print_INTEL_TLB(u_int data) case 0xc3: printf("Shared 2nd-Level TLB: 4 KByte /2 MByte pages, 6-way associative, 1536 entries. Also 1GBbyte pages, 4-way, 16 entries\n"); break; + case 0xc4: + printf("DTLB: 2M/4M Byte pages, 4-way associative, 32 entries\n"); + break;