From owner-svn-src-all@freebsd.org Sun Aug 30 02:26:44 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 373013C49CA; Sun, 30 Aug 2020 02:26:44 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfHK00jWDz4PMH; Sun, 30 Aug 2020 02:26:44 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F0DF7F980; Sun, 30 Aug 2020 02:26:43 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07U2QhnH026126; Sun, 30 Aug 2020 02:26:43 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07U2QhAr026125; Sun, 30 Aug 2020 02:26:43 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202008300226.07U2QhAr026125@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Sun, 30 Aug 2020 02:26:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364972 - stable/12/sys/netgraph/bluetooth/drivers/ubt X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/netgraph/bluetooth/drivers/ubt X-SVN-Commit-Revision: 364972 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 02:26:44 -0000 Author: markj Date: Sun Aug 30 02:26:43 2020 New Revision: 364972 URL: https://svnweb.freebsd.org/changeset/base/364972 Log: MFC r364509: ng_ubt: Add a device ID. PR: 248838 Modified: stable/12/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c ============================================================================== --- stable/12/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Sun Aug 30 01:09:15 2020 (r364971) +++ stable/12/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Sun Aug 30 02:26:43 2020 (r364972) @@ -508,6 +508,7 @@ static const STRUCT_USB_HOST_ID ubt_devs[] = { USB_VPI(USB_VENDOR_LITEON, 0x2003, 0) }, { USB_VPI(USB_VENDOR_FOXCONN, 0xe042, 0) }, { USB_VPI(USB_VENDOR_DELL, 0x8197, 0) }, + { USB_VPI(USB_VENDOR_BELKIN, 0x065a, 0) }, }; /* From owner-svn-src-all@freebsd.org Sun Aug 30 07:34:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 14CB13A86C0; Sun, 30 Aug 2020 07:34:34 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfQ8B05JTz4qnc; Sun, 30 Aug 2020 07:34:34 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C05C0132AE; Sun, 30 Aug 2020 07:34:33 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07U7YX3N024416; Sun, 30 Aug 2020 07:34:33 GMT (envelope-from zec@FreeBSD.org) Received: (from zec@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07U7YWVs024410; Sun, 30 Aug 2020 07:34:32 GMT (envelope-from zec@FreeBSD.org) Message-Id: <202008300734.07U7YWVs024410@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zec set sender to zec@FreeBSD.org using -f From: Marko Zec Date: Sun, 30 Aug 2020 07:34:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364973 - in head: share/man/man4 sys/conf sys/dev/sume sys/modules sys/modules/sume X-SVN-Group: head X-SVN-Commit-Author: zec X-SVN-Commit-Paths: in head: share/man/man4 sys/conf sys/dev/sume sys/modules sys/modules/sume X-SVN-Commit-Revision: 364973 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 07:34:34 -0000 Author: zec Date: Sun Aug 30 07:34:32 2020 New Revision: 364973 URL: https://svnweb.freebsd.org/changeset/base/364973 Log: Driver for 4x10Gb Ethernet reference NIC FPGA design for NetFPGA SUME development board. Submitted by: Denis Salopek Reported by: zec, bz (src); rgrimes, bcr (manpages) MFC after: 7 days Sponsored by: Google Summer of Code 2020 Differential Revision: https://reviews.freebsd.org/D26074 Added: head/share/man/man4/sume.4 (contents, props changed) head/sys/dev/sume/ head/sys/dev/sume/adapter.h (contents, props changed) head/sys/dev/sume/if_sume.c (contents, props changed) head/sys/modules/sume/ head/sys/modules/sume/Makefile (contents, props changed) Modified: head/share/man/man4/Makefile head/sys/conf/files.amd64 head/sys/modules/Makefile Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Sun Aug 30 02:26:43 2020 (r364972) +++ head/share/man/man4/Makefile Sun Aug 30 07:34:32 2020 (r364973) @@ -514,6 +514,7 @@ MAN= aac.4 \ ste.4 \ stf.4 \ stge.4 \ + ${_sume.4} \ ${_superio.4} \ sym.4 \ syncache.4 \ @@ -851,6 +852,7 @@ _qlxgbe.4= qlxgbe.4 _qlnxe.4= qlnxe.4 _sfxge.4= sfxge.4 _smartpqi.4= smartpqi.4 +_sume.4= sume.4 _vmd.4= vmd.4 MLINKS+=qlxge.4 if_qlxge.4 @@ -858,6 +860,7 @@ MLINKS+=qlxgb.4 if_qlxgb.4 MLINKS+=qlxgbe.4 if_qlxgbe.4 MLINKS+=qlnxe.4 if_qlnxe.4 MLINKS+=sfxge.4 if_sfxge.4 +MLINKS+=sume.4 if_sume.4 .if ${MK_BHYVE} != "no" _bhyve.4= bhyve.4 Added: head/share/man/man4/sume.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/sume.4 Sun Aug 30 07:34:32 2020 (r364973) @@ -0,0 +1,98 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" +.\" Copyright (c) 2020 Denis Salopek +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +.\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd August 30, 2020 +.Dt SUME 4 +.Os +.Sh NAME +.Nm sume +.Nd "NetFPGA SUME 4x10Gb Ethernet driver" +.Sh SYNOPSIS +To compile this driver into the kernel, place the following lines +in your kernel configuration file: +.Bd -ragged -offset indent +.Cd "device sume" +.Ed +.Pp +Alternatively, to load the driver as a module at boot time, place +the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_sume_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for NetFPGA SUME Virtex-7 FPGA Development Board +with the reference NIC bitstream loaded onto it. +The HDL design for the reference NIC project uses the RIFFA based DMA +engine to communicate with the host machine over PCIe. +Every packet is transmitted to / from the board via a single DMA +transaction, taking up to two or three interrupts per one transaction +which yields low performance. +.Pp +There is no support for Jumbo frames as the hardware is capable of +dealing only with frames with maximum size of 1514 bytes. +The hardware does not support multicast filtering, provides no checksums, +and offers no other offloading. +.Sh SEE ALSO +.Xr arp 4 , +.Xr netgraph 4 , +.Xr netintro 4 , +.Xr ng_ether 4 , +.Xr vlan 4 , +.Xr ifconfig 8 +.Sh AUTHORS +The Linux +.Nm +driver was originally written by +.An -nosplit +.An Bjoern A. Zeeb . +The +.Fx version and this manual page were written by +.An Denis Salopek +as a GSoC project. +More information about the project can be found here: +.Pa https://wiki.freebsd.org/SummerOfCode2020Projects/NetFPGA_SUME_Driver +.Sh BUGS +The reference NIC hardware design provides no mechanism for quiescing +inbound traffic from interfaces configured as DOWN. +All packets from administratively disabled interfaces are transferred to +main memory, leaving the driver with the task of dropping such packets, +thus consuming PCI bandwidth, interrupts and CPU cycles in vain. +.Pp +Pre-built FPGA bitstream from the NetFPGA project may not work correctly. +At higher RX packet rates, the newly incoming packets can overwrite the +ones in an internal FIFO so the packets would arrive in main memory +corrupted, until a physical reset of the board. +.Pp +Occasionally, the driver can get stuck in a non-IDLE TX state due to +a missed interrupt. +The driver includes a watchdog function which monitors for such a +condition and resets the board automatically. +For more details, visit the NetFPGA SUME project site. Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Sun Aug 30 02:26:43 2020 (r364972) +++ head/sys/conf/files.amd64 Sun Aug 30 07:34:32 2020 (r364973) @@ -355,6 +355,7 @@ dev/smartpqi/smartpqi_response.c optional smartpqi dev/smartpqi/smartpqi_sis.c optional smartpqi dev/smartpqi/smartpqi_tag.c optional smartpqi dev/speaker/spkr.c optional speaker +dev/sume/if_sume.c optional sume dev/superio/superio.c optional superio isa dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/scvesactl.c optional sc vga vesa Added: head/sys/dev/sume/adapter.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/sume/adapter.h Sun Aug 30 07:34:32 2020 (r364973) @@ -0,0 +1,242 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2015 Bjoern A. Zeeb + * Copyright (c) 2020 Denis Salopek + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-11-C-0249 + * ("MRC2"), as part of the DARPA MRC research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* $FreeBSD$ */ + +#define DEFAULT_ETHER_ADDRESS "\02SUME\00" +#define SUME_ETH_DEVICE_NAME "sume" +#define MAX_IFC_NAME_LEN 8 + +#define SUME_NPORTS 4 + +#define SUME_IOCTL_CMD_WRITE_REG (SIOCGPRIVATE_0) +#define SUME_IOCTL_CMD_READ_REG (SIOCGPRIVATE_1) + +#define SUME_LOCK(adapter) mtx_lock(&adapter->lock); +#define SUME_UNLOCK(adapter) mtx_unlock(&adapter->lock); + +/* Currently SUME only uses 2 fixed channels for all port traffic and regs. */ +#define SUME_RIFFA_CHANNEL_DATA 0 +#define SUME_RIFFA_CHANNEL_REG 1 +#define SUME_RIFFA_CHANNELS 2 + +/* RIFFA constants. */ +#define RIFFA_MAX_CHNLS 12 +#define RIFFA_MAX_BUS_WIDTH_PARAM 4 +#define RIFFA_SG_BUF_SIZE (4*1024) +#define RIFFA_SG_ELEMS 200 + +/* RIFFA register offsets. */ +#define RIFFA_RX_SG_LEN_REG_OFF 0x0 +#define RIFFA_RX_SG_ADDR_LO_REG_OFF 0x1 +#define RIFFA_RX_SG_ADDR_HI_REG_OFF 0x2 +#define RIFFA_RX_LEN_REG_OFF 0x3 +#define RIFFA_RX_OFFLAST_REG_OFF 0x4 +#define RIFFA_TX_SG_LEN_REG_OFF 0x5 +#define RIFFA_TX_SG_ADDR_LO_REG_OFF 0x6 +#define RIFFA_TX_SG_ADDR_HI_REG_OFF 0x7 +#define RIFFA_TX_LEN_REG_OFF 0x8 +#define RIFFA_TX_OFFLAST_REG_OFF 0x9 +#define RIFFA_INFO_REG_OFF 0xA +#define RIFFA_IRQ_REG0_OFF 0xB +#define RIFFA_IRQ_REG1_OFF 0xC +#define RIFFA_RX_TNFR_LEN_REG_OFF 0xD +#define RIFFA_TX_TNFR_LEN_REG_OFF 0xE + +#define RIFFA_CHNL_REG(c, o) ((c << 4) + o) + +/* + * RIFFA state machine; + * rather than using complex circular buffers for 1 transaction. + */ +#define SUME_RIFFA_CHAN_STATE_IDLE 0x01 +#define SUME_RIFFA_CHAN_STATE_READY 0x02 +#define SUME_RIFFA_CHAN_STATE_READ 0x04 +#define SUME_RIFFA_CHAN_STATE_LEN 0x08 + +/* Accessor macros. */ +#define SUME_OFFLAST ((0 << 1) | (1 & 0x01)) +#define SUME_RIFFA_LAST(offlast) ((offlast) & 0x01) +#define SUME_RIFFA_OFFSET(offlast) ((uint64_t)((offlast) >> 1) << 2) +#define SUME_RIFFA_LEN(len) ((uint64_t)(len) << 2) + +#define SUME_RIFFA_LO_ADDR(addr) (addr & 0xFFFFFFFF) +#define SUME_RIFFA_HI_ADDR(addr) ((addr >> 32) & 0xFFFFFFFF) + +/* Vector bits. */ +#define SUME_MSI_RXQUE (1 << 0) +#define SUME_MSI_RXBUF (1 << 1) +#define SUME_MSI_RXDONE (1 << 2) +#define SUME_MSI_TXBUF (1 << 3) +#define SUME_MSI_TXDONE (1 << 4) + +/* Invalid vector. */ +#define SUME_INVALID_VECT 0xc0000000 + +/* Module register data (packet counters, link status...) */ +#define SUME_MOD0_REG_BASE 0x44040000 +#define SUME_MOD_REG(port) (SUME_MOD0_REG_BASE + 0x10000 * port) + +#define SUME_RESET_OFFSET 0x8 +#define SUME_PKTIN_OFFSET 0x18 +#define SUME_PKTOUT_OFFSET 0x1c +#define SUME_STATUS_OFFSET 0x48 + +#define SUME_RESET_ADDR(p) (SUME_MOD_REG(p) + SUME_RESET_OFFSET) +#define SUME_STAT_RX_ADDR(p) (SUME_MOD_REG(p) + SUME_PKTIN_OFFSET) +#define SUME_STAT_TX_ADDR(p) (SUME_MOD_REG(p) + SUME_PKTOUT_OFFSET) +#define SUME_STATUS_ADDR(p) (SUME_MOD_REG(p) + SUME_STATUS_OFFSET) + +#define SUME_LINK_STATUS(val) ((val >> 12) & 0x1) + +/* Various bits and pieces. */ +#define SUME_RIFFA_MAGIC 0xcafe +#define SUME_MR_WRITE 0x1f +#define SUME_MR_READ 0x00 +#define SUME_INIT_RTAG -3 +#define SUME_DPORT_MASK 0xaa +#define SUME_MIN_PKT_SIZE (ETHER_MIN_LEN - ETHER_CRC_LEN) + +struct irq { + uint32_t rid; + struct resource *res; + void *tag; +} __aligned(CACHE_LINE_SIZE); + +struct nf_stats { + uint64_t hw_rx_packets; + uint64_t hw_tx_packets; + uint64_t ifc_down_bytes; + uint64_t ifc_down_packets; + uint64_t rx_bytes; + uint64_t rx_dropped; + uint64_t rx_packets; + uint64_t tx_bytes; + uint64_t tx_dropped; + uint64_t tx_packets; +}; + +struct riffa_chnl_dir { + uint32_t state; + bus_dma_tag_t ch_tag; + bus_dmamap_t ch_map; + char *buf_addr; /* bouncebuf addresses+len. */ + bus_addr_t buf_hw_addr; /* -- " -- mapped. */ + uint32_t num_sg; + uint32_t event; /* Used for modreg r/w */ + uint32_t len; /* words */ + uint32_t offlast; + uint32_t recovery; + uint32_t rtag; +}; + +struct sume_ifreq { + uint32_t addr; + uint32_t val; +}; + +struct nf_priv { + struct sume_adapter *adapter; + struct ifmedia media; + struct nf_stats stats; + uint32_t unit; + uint32_t port; + uint32_t link_up; +}; + +struct sume_adapter { + struct mtx lock; + uint32_t running; + uint32_t rid; + struct riffa_chnl_dir **recv; + struct riffa_chnl_dir **send; + device_t dev; + struct ifnet *ifp[SUME_NPORTS]; + struct resource *bar0_addr; + bus_space_tag_t bt; + bus_space_handle_t bh; + bus_size_t bar0_len; + struct irq irq; + struct callout timer; + struct task stat_task; + struct taskqueue *tq; + uint64_t bytes_err; + uint64_t packets_err; + uint32_t last_ifc; + uint32_t num_sg; + uint32_t sg_buf_size; + uint32_t sume_debug; + uint32_t wd_counter; +}; + +/* SUME metadata: + * sport - not used for RX. For TX, set to 0x02, 0x08, 0x20, 0x80, depending on + * the sending interface (nf0, nf1, nf2 or nf3). + * dport - For RX, is set to 0x02, 0x08, 0x20, 0x80, depending on the receiving + * interface (nf0, nf1, nf2 or nf3). For TX, set to 0x01, 0x04, 0x10, 0x40, + * depending on the sending HW interface (nf0, nf1, nf2 or nf3). + * plen - length of the send/receive packet data (in bytes) + * magic - SUME hardcoded magic number which should be 0xcafe + * t1, t1 - could be used for timestamping by SUME + */ +struct nf_metadata { + uint16_t sport; + uint16_t dport; + uint16_t plen; + uint16_t magic; + uint32_t t1; + uint32_t t2; +}; + +/* Used for ioctl communication with the rwaxi program used to read/write SUME + * internally defined register data. + * addr - address of the SUME module register to read/write + * val - value to write/read to/from the register + * rtag - returned on read: transaction tag, for syncronization + * optype - 0x1f when writing, 0x00 for reading + */ +struct nf_regop_data { + uint32_t addr; + uint32_t val; + uint32_t rtag; + uint32_t optype; +}; + +/* Our bouncebuffer "descriptor". This holds our physical address (lower and + * upper values) of the beginning of the DMA data to RX/TX. The len is number + * of words to transmit. + */ +struct nf_bb_desc { + uint32_t lower; + uint32_t upper; + uint32_t len; +}; Added: head/sys/dev/sume/if_sume.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/sume/if_sume.c Sun Aug 30 07:34:32 2020 (r364973) @@ -0,0 +1,1602 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2015 Bjoern A. Zeeb + * Copyright (c) 2020 Denis Salopek + * + * This software was developed by SRI International and the University of + * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-11-C-0249 + * ("MRC2"), as part of the DARPA MRC research programme. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include + +#include "adapter.h" + +#define PCI_VENDOR_ID_XILINX 0x10ee +#define PCI_DEVICE_ID_SUME 0x7028 + +/* SUME bus driver interface */ +static int sume_probe(device_t); +static int sume_attach(device_t); +static int sume_detach(device_t); + +static device_method_t sume_methods[] = { + DEVMETHOD(device_probe, sume_probe), + DEVMETHOD(device_attach, sume_attach), + DEVMETHOD(device_detach, sume_detach), + DEVMETHOD_END +}; + +static driver_t sume_driver = { + "sume", + sume_methods, + sizeof(struct sume_adapter) +}; + +/* + * The DMA engine for SUME generates interrupts for each RX/TX transaction. + * Depending on the channel (0 if packet transaction, 1 if register transaction) + * the used bits of the interrupt vector will be the lowest or the second lowest + * 5 bits. + * + * When receiving packets from SUME (RX): + * (1) SUME received a packet on one of the interfaces. + * (2) SUME generates an interrupt vector, bit 00001 is set (channel 0 - new RX + * transaction). + * (3) We read the length of the incoming packet and the offset along with the + * 'last' flag from the SUME registers. + * (4) We prepare for the DMA transaction by setting the bouncebuffer on the + * address buf_addr. For now, this is how it's done: + * - First 3*sizeof(uint32_t) bytes are: lower and upper 32 bits of physical + * address where we want the data to arrive (buf_addr[0] and buf_addr[1]), + * and length of incoming data (buf_addr[2]). + * - Data will start right after, at buf_addr+3*sizeof(uint32_t). The + * physical address buf_hw_addr is a block of contiguous memory mapped to + * buf_addr, so we can set the incoming data's physical address (buf_addr[0] + * and buf_addr[1]) to buf_hw_addr+3*sizeof(uint32_t). + * (5) We notify SUME that the bouncebuffer is ready for the transaction by + * writing the lower/upper physical address buf_hw_addr to the SUME + * registers RIFFA_TX_SG_ADDR_LO_REG_OFF and RIFFA_TX_SG_ADDR_HI_REG_OFF as + * well as the number of segments to the register RIFFA_TX_SG_LEN_REG_OFF. + * (6) SUME generates an interrupt vector, bit 00010 is set (channel 0 - + * bouncebuffer received). + * (7) SUME generates an interrupt vector, bit 00100 is set (channel 0 - + * transaction is done). + * (8) SUME can do both steps (6) and (7) using the same interrupt. + * (8) We read the first 16 bytes (metadata) of the received data and note the + * incoming interface so we can later forward it to the right one in the OS + * (sume0, sume1, sume2 or sume3). + * (10) We create an mbuf and copy the data from the bouncebuffer to the mbuf + * and set the mbuf rcvif to the incoming interface. + * (11) We forward the mbuf to the appropriate interface via ifp->if_input. + * + * When sending packets to SUME (TX): + * (1) The OS calls sume_if_start() function on TX. + * (2) We get the mbuf packet data and copy it to the + * buf_addr+3*sizeof(uint32_t) + metadata 16 bytes. + * (3) We create the metadata based on the output interface and copy it to the + * buf_addr+3*sizeof(uint32_t). + * (4) We write the offset/last and length of the packet to the SUME registers + * RIFFA_RX_OFFLAST_REG_OFF and RIFFA_RX_LEN_REG_OFF. + * (5) We fill the bouncebuffer by filling the first 3*sizeof(uint32_t) bytes + * with the physical address and length just as in RX step (4). + * (6) We notify SUME that the bouncebuffer is ready by writing to SUME + * registers RIFFA_RX_SG_ADDR_LO_REG_OFF, RIFFA_RX_SG_ADDR_HI_REG_OFF and + * RIFFA_RX_SG_LEN_REG_OFF just as in RX step (5). + * (7) SUME generates an interrupt vector, bit 01000 is set (channel 0 - + * bouncebuffer is read). + * (8) SUME generates an interrupt vector, bit 10000 is set (channel 0 - + * transaction is done). + * (9) SUME can do both steps (7) and (8) using the same interrupt. + * + * Internal registers + * Every module in the SUME hardware has its own set of internal registers + * (IDs, for debugging and statistic purposes, etc.). Their base addresses are + * defined in 'projects/reference_nic/hw/tcl/reference_nic_defines.tcl' and the + * offsets to different memory locations of every module are defined in their + * corresponding folder inside the library. These registers can be RO/RW and + * there is a special method to fetch/change this data over 1 or 2 DMA + * transactions. For writing, by calling the sume_module_reg_write(). For + * reading, by calling the sume_module_reg_write() and then + * sume_module_reg_read(). Check those functions for more information. + */ + +MALLOC_DECLARE(M_SUME); +MALLOC_DEFINE(M_SUME, "sume", "NetFPGA SUME device driver"); + +static void check_tx_queues(struct sume_adapter *); +static void sume_fill_bb_desc(struct sume_adapter *, struct riffa_chnl_dir *, + uint64_t); + +static struct unrhdr *unr; + +static struct { + uint16_t device; + char *desc; +} sume_pciids[] = { + {PCI_DEVICE_ID_SUME, "NetFPGA SUME reference NIC"}, +}; + +static inline uint32_t +read_reg(struct sume_adapter *adapter, int offset) +{ + + return (bus_space_read_4(adapter->bt, adapter->bh, offset << 2)); +} + +static inline void +write_reg(struct sume_adapter *adapter, int offset, uint32_t val) +{ + + bus_space_write_4(adapter->bt, adapter->bh, offset << 2, val); +} + +static int +sume_probe(device_t dev) +{ + int i; + uint16_t v = pci_get_vendor(dev); + uint16_t d = pci_get_device(dev); + + if (v != PCI_VENDOR_ID_XILINX) + return (ENXIO); + + for (i = 0; i < nitems(sume_pciids); i++) { + if (d == sume_pciids[i].device) { + device_set_desc(dev, sume_pciids[i].desc); + return (BUS_PROBE_DEFAULT); + } + } + + return (ENXIO); +} + +/* + * Building mbuf for packet received from SUME. We expect to receive 'len' + * bytes of data (including metadata) written from the bouncebuffer address + * buf_addr+3*sizeof(uint32_t). Metadata will tell us which SUME interface + * received the packet (sport will be 1, 2, 4 or 8), the packet length (plen), + * and the magic word needs to be 0xcafe. When we have the packet data, we + * create an mbuf and copy the data to it using m_copyback() function, set the + * correct interface to rcvif and return the mbuf to be later sent to the OS + * with if_input. + */ +static struct mbuf * +sume_rx_build_mbuf(struct sume_adapter *adapter, uint32_t len) +{ + struct nf_priv *nf_priv; + struct mbuf *m; + struct ifnet *ifp = NULL; + int np; + uint16_t dport, plen, magic; + device_t dev = adapter->dev; + uint8_t *indata = (uint8_t *) + adapter->recv[SUME_RIFFA_CHANNEL_DATA]->buf_addr + + sizeof(struct nf_bb_desc); + struct nf_metadata *mdata = (struct nf_metadata *) indata; + + /* The metadata header is 16 bytes. */ + if (len < sizeof(struct nf_metadata)) { + device_printf(dev, "short frame (%d)\n", len); + adapter->packets_err++; + adapter->bytes_err += len; + return (NULL); + } + + dport = le16toh(mdata->dport); + plen = le16toh(mdata->plen); + magic = le16toh(mdata->magic); + + if (sizeof(struct nf_metadata) + plen > len || + magic != SUME_RIFFA_MAGIC) { + device_printf(dev, "corrupted packet (%zd + %d > %d || magic " + "0x%04x != 0x%04x)\n", sizeof(struct nf_metadata), plen, + len, magic, SUME_RIFFA_MAGIC); + return (NULL); + } + + /* We got the packet from one of the even bits */ + np = (ffs(dport & SUME_DPORT_MASK) >> 1) - 1; + if (np > SUME_NPORTS) { + device_printf(dev, "invalid destination port 0x%04x (%d)\n", + dport, np); + adapter->packets_err++; + adapter->bytes_err += plen; + return (NULL); + } + ifp = adapter->ifp[np]; + nf_priv = ifp->if_softc; + nf_priv->stats.rx_packets++; + nf_priv->stats.rx_bytes += plen; + + /* If the interface is down, well, we are done. */ + if (!(ifp->if_flags & IFF_UP)) { + nf_priv->stats.ifc_down_packets++; + nf_priv->stats.ifc_down_bytes += plen; + return (NULL); + } + + if (adapter->sume_debug) + printf("Building mbuf with length: %d\n", plen); + + m = m_getm(NULL, plen, M_NOWAIT, MT_DATA); + if (m == NULL) { + adapter->packets_err++; + adapter->bytes_err += plen; + return (NULL); + } + + /* Copy the data in at the right offset. */ + m_copyback(m, 0, plen, (void *) (indata + sizeof(struct nf_metadata))); + m->m_pkthdr.rcvif = ifp; + + return (m); +} + +/* + * SUME interrupt handler for when we get a valid interrupt from the board. + * Theoretically, we can receive interrupt for any of the available channels, + * but RIFFA DMA uses only 2: 0 and 1, so we use only vect0. The vector is a 32 + * bit number, using 5 bits for every channel, the least significant bits + * correspond to channel 0 and the next 5 bits correspond to channel 1. Vector + * bits for RX/TX are: + * RX + * bit 0 - new transaction from SUME + * bit 1 - SUME received our bouncebuffer address + * bit 2 - SUME copied the received data to our bouncebuffer, transaction done + * TX + * bit 3 - SUME received our bouncebuffer address + * bit 4 - SUME copied the data from our bouncebuffer, transaction done + * + * There are two finite state machines (one for TX, one for RX). We loop + * through channels 0 and 1 to check and our current state and which interrupt + * bit is set. + * TX + * SUME_RIFFA_CHAN_STATE_IDLE: waiting for the first TX transaction. + * SUME_RIFFA_CHAN_STATE_READY: we prepared (filled with data) the bouncebuffer + * and triggered the SUME for the TX transaction. Waiting for interrupt bit 3 + * to go to the next state. + * SUME_RIFFA_CHAN_STATE_READ: waiting for interrupt bit 4 (for SUME to send + * our packet). Then we get the length of the sent data and go back to the + * IDLE state. + * RX + * SUME_RIFFA_CHAN_STATE_IDLE: waiting for the interrupt bit 0 (new RX + * transaction). When we get it, we prepare our bouncebuffer for reading and + * trigger the SUME to start the transaction. Go to the next state. + * SUME_RIFFA_CHAN_STATE_READY: waiting for the interrupt bit 1 (SUME got our + * bouncebuffer). Go to the next state. + * SUME_RIFFA_CHAN_STATE_READ: SUME copied data and our bouncebuffer is ready, + * we can build the mbuf and go back to the IDLE state. + */ +static void +sume_intr_handler(void *arg) +{ + struct sume_adapter *adapter = arg; + uint32_t vect, vect0, len; + int ch, loops; + device_t dev = adapter->dev; + struct mbuf *m = NULL; + struct ifnet *ifp = NULL; + struct riffa_chnl_dir *send, *recv; + + SUME_LOCK(adapter); + + vect0 = read_reg(adapter, RIFFA_IRQ_REG0_OFF); + if ((vect0 & SUME_INVALID_VECT) != 0) { + SUME_UNLOCK(adapter); + return; + } + + /* + * We only have one interrupt for all channels and no way + * to quickly lookup for which channel(s) we got an interrupt? + */ + for (ch = 0; ch < SUME_RIFFA_CHANNELS; ch++) { + vect = vect0 >> (5 * ch); + send = adapter->send[ch]; + recv = adapter->recv[ch]; + + loops = 0; + while ((vect & (SUME_MSI_TXBUF | SUME_MSI_TXDONE)) && + loops <= 5) { + if (adapter->sume_debug) + device_printf(dev, "TX ch %d state %u vect = " + "0x%08x\n", ch, send->state, vect); + switch (send->state) { + case SUME_RIFFA_CHAN_STATE_IDLE: + break; + case SUME_RIFFA_CHAN_STATE_READY: + if (!(vect & SUME_MSI_TXBUF)) { + device_printf(dev, "ch %d unexpected " + "interrupt in send+3 state %u: " + "vect = 0x%08x\n", ch, send->state, + vect); + send->recovery = 1; + break; + } + send->state = SUME_RIFFA_CHAN_STATE_READ; + vect &= ~SUME_MSI_TXBUF; + break; + case SUME_RIFFA_CHAN_STATE_READ: + if (!(vect & SUME_MSI_TXDONE)) { + device_printf(dev, "ch %d unexpected " + "interrupt in send+4 state %u: " + "vect = 0x%08x\n", ch, send->state, + vect); + send->recovery = 1; + break; + } + send->state = SUME_RIFFA_CHAN_STATE_LEN; + + len = read_reg(adapter, RIFFA_CHNL_REG(ch, + RIFFA_RX_TNFR_LEN_REG_OFF)); + if (ch == SUME_RIFFA_CHANNEL_DATA) { + send->state = + SUME_RIFFA_CHAN_STATE_IDLE; + check_tx_queues(adapter); + } else if (ch == SUME_RIFFA_CHANNEL_REG) + wakeup(&send->event); + else { + device_printf(dev, "ch %d unexpected " + "interrupt in send+4 state %u: " + "vect = 0x%08x\n", ch, send->state, + vect); + send->recovery = 1; + } + vect &= ~SUME_MSI_TXDONE; + break; + case SUME_RIFFA_CHAN_STATE_LEN: + break; + default: + device_printf(dev, "unknown TX state!\n"); + } + loops++; + } + + if ((vect & (SUME_MSI_TXBUF | SUME_MSI_TXDONE)) && + send->recovery) + device_printf(dev, "ch %d ignoring vect = 0x%08x " + "during TX; not in recovery; state = %d loops = " + "%d\n", ch, vect, send->state, loops); + + loops = 0; + while ((vect & (SUME_MSI_RXQUE | SUME_MSI_RXBUF | + SUME_MSI_RXDONE)) && loops < 5) { + if (adapter->sume_debug) + device_printf(dev, "RX ch %d state %u vect = " + "0x%08x\n", ch, recv->state, vect); + switch (recv->state) { + case SUME_RIFFA_CHAN_STATE_IDLE: + if (!(vect & SUME_MSI_RXQUE)) { + device_printf(dev, "ch %d unexpected " + "interrupt in recv+0 state %u: " + "vect = 0x%08x\n", ch, recv->state, + vect); + recv->recovery = 1; + break; + } + uint32_t max_ptr; + + /* Clear recovery state. */ + recv->recovery = 0; + + /* Get offset and length. */ + recv->offlast = read_reg(adapter, + RIFFA_CHNL_REG(ch, + RIFFA_TX_OFFLAST_REG_OFF)); + recv->len = read_reg(adapter, RIFFA_CHNL_REG(ch, + RIFFA_TX_LEN_REG_OFF)); + + /* Boundary checks. */ + max_ptr = (uint32_t)((uintptr_t)recv->buf_addr + + SUME_RIFFA_OFFSET(recv->offlast) + + SUME_RIFFA_LEN(recv->len) - 1); + if (max_ptr < + (uint32_t)((uintptr_t)recv->buf_addr)) + device_printf(dev, "receive buffer " + "wrap-around overflow.\n"); + if (SUME_RIFFA_OFFSET(recv->offlast) + + SUME_RIFFA_LEN(recv->len) > + adapter->sg_buf_size) + device_printf(dev, "receive buffer too" + " small.\n"); + + /* Fill the bouncebuf "descriptor". */ + sume_fill_bb_desc(adapter, recv, + SUME_RIFFA_LEN(recv->len)); + + bus_dmamap_sync(recv->ch_tag, recv->ch_map, + BUS_DMASYNC_PREREAD | + BUS_DMASYNC_PREWRITE); + write_reg(adapter, RIFFA_CHNL_REG(ch, + RIFFA_TX_SG_ADDR_LO_REG_OFF), + SUME_RIFFA_LO_ADDR(recv->buf_hw_addr)); + write_reg(adapter, RIFFA_CHNL_REG(ch, + RIFFA_TX_SG_ADDR_HI_REG_OFF), + SUME_RIFFA_HI_ADDR(recv->buf_hw_addr)); + write_reg(adapter, RIFFA_CHNL_REG(ch, + RIFFA_TX_SG_LEN_REG_OFF), + 4 * recv->num_sg); + bus_dmamap_sync(recv->ch_tag, recv->ch_map, + BUS_DMASYNC_POSTREAD | + BUS_DMASYNC_POSTWRITE); + + recv->state = SUME_RIFFA_CHAN_STATE_READY; + vect &= ~SUME_MSI_RXQUE; + break; + case SUME_RIFFA_CHAN_STATE_READY: + if (!(vect & SUME_MSI_RXBUF)) { + device_printf(dev, "ch %d unexpected " + "interrupt in recv+1 state %u: " + "vect = 0x%08x\n", ch, recv->state, + vect); + recv->recovery = 1; + break; + } + recv->state = SUME_RIFFA_CHAN_STATE_READ; + vect &= ~SUME_MSI_RXBUF; + break; + case SUME_RIFFA_CHAN_STATE_READ: + if (!(vect & SUME_MSI_RXDONE)) { + device_printf(dev, "ch %d unexpected " + "interrupt in recv+2 state %u: " + "vect = 0x%08x\n", ch, recv->state, + vect); + recv->recovery = 1; + break; + } + len = read_reg(adapter, RIFFA_CHNL_REG(ch, + RIFFA_TX_TNFR_LEN_REG_OFF)); + + /* Remember, len and recv->len are words. */ + if (ch == SUME_RIFFA_CHANNEL_DATA) { + m = sume_rx_build_mbuf(adapter, + len << 2); + recv->state = + SUME_RIFFA_CHAN_STATE_IDLE; + } else if (ch == SUME_RIFFA_CHANNEL_REG) + wakeup(&recv->event); + else { + device_printf(dev, "ch %d unexpected " + "interrupt in recv+2 state %u: " + "vect = 0x%08x\n", ch, recv->state, + vect); + recv->recovery = 1; + } + vect &= ~SUME_MSI_RXDONE; + break; + case SUME_RIFFA_CHAN_STATE_LEN: + break; + default: + device_printf(dev, "unknown RX state!\n"); + } + loops++; + } + + if ((vect & (SUME_MSI_RXQUE | SUME_MSI_RXBUF | + SUME_MSI_RXDONE)) && recv->recovery) { + device_printf(dev, "ch %d ignoring vect = 0x%08x " + "during RX; not in recovery; state = %d, loops = " + "%d\n", ch, vect, recv->state, loops); + + /* Clean the unfinished transaction. */ + if (ch == SUME_RIFFA_CHANNEL_REG && + vect & SUME_MSI_RXDONE) { + read_reg(adapter, RIFFA_CHNL_REG(ch, + RIFFA_TX_TNFR_LEN_REG_OFF)); + recv->recovery = 0; + } + } + } + SUME_UNLOCK(adapter); + + if (m != NULL) { + ifp = m->m_pkthdr.rcvif; + (*ifp->if_input)(ifp, m); + } +} + +/* + * As we cannot disable interrupt generation, ignore early interrupts by waiting + * for the adapter to go into the 'running' state. + */ +static int +sume_intr_filter(void *arg) +{ + struct sume_adapter *adapter = arg; + + if (adapter->running == 0) + return (FILTER_STRAY); + + return (FILTER_SCHEDULE_THREAD); +} + +static int +sume_probe_riffa_pci(struct sume_adapter *adapter) +{ + device_t dev = adapter->dev; + int error, count, capmem; + uint32_t reg, devctl, linkctl; + + pci_enable_busmaster(dev); + + adapter->rid = PCIR_BAR(0); + adapter->bar0_addr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &adapter->rid, RF_ACTIVE); + if (adapter->bar0_addr == NULL) { + device_printf(dev, "unable to allocate bus resource: " + "BAR0 address\n"); + return (ENXIO); + } + adapter->bt = rman_get_bustag(adapter->bar0_addr); + adapter->bh = rman_get_bushandle(adapter->bar0_addr); + adapter->bar0_len = rman_get_size(adapter->bar0_addr); + if (adapter->bar0_len != 1024) { + device_printf(dev, "BAR0 resource length %lu != 1024\n", + adapter->bar0_len); + return (ENXIO); + } + + count = pci_msi_count(dev); + error = pci_alloc_msi(dev, &count); + if (error) { + device_printf(dev, "unable to allocate bus resource: PCI " + "MSI\n"); + return (error); + } + + adapter->irq.rid = 1; /* Should be 1, thus says pci_alloc_msi() */ + adapter->irq.res = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &adapter->irq.rid, RF_SHAREABLE | RF_ACTIVE); + if (adapter->irq.res == NULL) { + device_printf(dev, "unable to allocate bus resource: IRQ " + "memory\n"); + return (ENXIO); + } + + error = bus_setup_intr(dev, adapter->irq.res, INTR_MPSAFE | + INTR_TYPE_NET, sume_intr_filter, sume_intr_handler, adapter, + &adapter->irq.tag); + if (error) { + device_printf(dev, "failed to setup interrupt for rid %d, name" + " %s: %d\n", adapter->irq.rid, "SUME_INTR", error); + return (ENXIO); + } + + if (pci_find_cap(dev, PCIY_EXPRESS, &capmem) != 0) { + device_printf(dev, "PCI not PCIe capable\n"); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Sun Aug 30 07:42:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D91453A8DC1; Sun, 30 Aug 2020 07:42:27 +0000 (UTC) (envelope-from zec@fer.hr) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::60c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "GlobalSign Organization Validation CA - SHA256 - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfQKH2RKJz4rlM; Sun, 30 Aug 2020 07:42:26 +0000 (UTC) (envelope-from zec@fer.hr) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nHeCw9oja3GbmvJMYC7Acd4jRjiqr0uG1E2J2j9cculxVACES+zzqHWnhHRrBOaYRy6baZCjs+Ajlr6tYczj6FO6wV5RU/07qnCnzVgIvCCQ/G47+V0jGklSLLXiEVJRKzYeGpc0TPI5s/CaoTsEfdhhysl76/YWlCe7uynD67tjoGsaHkXvXJy60JcBNkRTA56a1CMjEqw5vnDNt6uzl30U/iFpG0fgK//GmDh5FMDs0ElbsnZLvaEo0FeoJ0fwKLwrNPSsvEunynFzb1Pn/JVON2Dr89M/om5cwUmvN5Svcn/BXDoa/neFAVfgVhylNlWOUJviJNaWTrSDr71/MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DgckBPq0PcWt1vrIlI5DQAEpNutaKgozlBea5hWLbfg=; b=ku9Ll1vPt1RaWDVaD9elJYuv1P0+4yk6fxs7tqmVU1sbWUzEhn78tUfYjloE/H/RpmVV4Yzo6TpeEeuiJJtT5tUB4AQvw/EKBV2+i4T8/3oLhsGDLfwa/l6qXcKvLyvtMFn5T8qMXtnUe31xyUPJdOom+I6AY+vx9w9xqOWQ8/YgHViILU+vkpK3RWQbU/2s+AO10MEc29oKt4Rc6twUB+eqMIl0GFhRoBEWT7KZbivUytM5nZNa0axNmuMD3NNWpGtwgjp8QmlObjx/dhFiNJZ3i8MY/IoAzFrBVXltXBfeNhLt9yL8l61pyGoU/v5WSkanAHd0PIFSHdk/Pdyuig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fer.hr; dmarc=pass action=none header.from=fer.hr; dkim=pass header.d=fer.hr; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ferhr.onmicrosoft.com; s=selector2-ferhr-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DgckBPq0PcWt1vrIlI5DQAEpNutaKgozlBea5hWLbfg=; b=U6lnsJNnTSLWcRgNJ8g7dSscgjv6+YsbkSr0jU4H3mW/+bx/OrvmtNXBVTpFjwufVRNF17Zh9i8t9AeogPileWGJpq6gm+t14gN4CTu2CXe8bCX2V2edWLvg+SSsS4RbSQPLbCeoZIsvUipbLzdzTCZNEGbvtidUW3dIjZFzr7A= Received: from VE1PR08MB4783.eurprd08.prod.outlook.com (2603:10a6:802:a9::16) by VI1PR0802MB2365.eurprd08.prod.outlook.com (2603:10a6:800:9f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.24; Sun, 30 Aug 2020 07:42:22 +0000 Received: from VE1PR08MB4783.eurprd08.prod.outlook.com ([fe80::f8f2:29a2:4263:4647]) by VE1PR08MB4783.eurprd08.prod.outlook.com ([fe80::f8f2:29a2:4263:4647%6]) with mapi id 15.20.3326.025; Sun, 30 Aug 2020 07:42:22 +0000 Date: Sun, 30 Aug 2020 09:42:19 +0200 From: Marko Zec To: Marko Zec Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r364973 - in head: share/man/man4 sys/conf sys/dev/sume sys/modules sys/modules/sume Message-ID: <20200830094219.45ffb56c@x23> In-Reply-To: <202008300734.07U7YWVs024410@repo.freebsd.org> References: <202008300734.07U7YWVs024410@repo.freebsd.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; amd64-portbld-freebsd11.3) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: VI1PR0502CA0030.eurprd05.prod.outlook.com (2603:10a6:803:1::43) To VE1PR08MB4783.eurprd08.prod.outlook.com (2603:10a6:802:a9::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from x23 (31.147.11.0) by VI1PR0502CA0030.eurprd05.prod.outlook.com (2603:10a6:803:1::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3326.19 via Frontend Transport; Sun, 30 Aug 2020 07:42:20 +0000 X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; amd64-portbld-freebsd11.3) X-Originating-IP: [31.147.11.0] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9cccd4e8-a2c5-4aeb-d673-08d84cb83b25 X-MS-TrafficTypeDiagnostic: VI1PR0802MB2365: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2201; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fbzi9Wr65QFuze5RTNGNS0F5ZmWpPm4j1sLQ9d6vLwwqwOLrV+peAZdL2dnFQfSNRJ0vFoEhlbT0WqWCnDBahm7xKRU3Lam7D0Nv0ylP2lzKavWO5OGXNIpM7p97+E58c38jkj4fiBV887nPAhVIY3VnqsU1814+BrbyoEi32PjPE2RQ7ZiyMn4VYmFqSm8LltnpN93hqw32gwDVYiu5yN3SHF6mwFD1pDYo/OKIfO7dw1pLgLbt+O+hwoHtRf7/qA8DqvRT3VVsVdbrZJTlbjQlWT7R61gDKQLWcXo2IhVj5i7BVj2beNIqYXybTTdNr+46a9MJ8Q51JZ8XwH6LN8Cf9xnaNS+YIPWKCLNeeOAo3XXxyc8+dUeri0TUjcKcexaSmjiBxch0DEXMdYnu2A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR08MB4783.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(136003)(39840400004)(376002)(346002)(366004)(4326008)(186003)(52116002)(8676002)(6496006)(4744005)(26005)(9576002)(86362001)(8936002)(66476007)(5660300002)(66556008)(956004)(1076003)(55016002)(66946007)(33716001)(6916009)(16526019)(450100002)(316002)(786003)(2906002)(9686003)(478600001)(966005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 9V6lt4g5UF/YjE4SADoHoGa3a2d59ldJGJQDtFbv8lp6C0cd8CBGimHIq+HNmWbyEHknChguW0BUj+SDkTjOQRne7i+LQF/LNSFIsf63Uf6X4AwYvO7F1FKYh5YPM7S+kpujZp+uN5bsiYm9pFBOTcj8ljvqCq81M+wqJ3xsmjB7kWTHBCEkGIM53hRW008R4rptBfCafJ5RqUcCNuJzHcXGYdYz/4BZjqv0bttK6ScirVvfOMoCwKyyhpDK9eA+epfPmWSuHHeDdIu+K/V31l3PDNNZ7ZfkTefXq8e+BYzKU7JlVCdEDJPNPxyXOKk7Bju1oz/h8Uut/Ar7s0j51QhyxZLWLC4JPLIaVFf15C6sE7i6+vZiQgCQuIHP9d/pnFgqWfXcXroaE95Oq4S6f4GfO9H9QLODARbzctPzoBev8iGdYeP9OVg6uu2+qkbFvX1JCjNsE0mQgN9zkXn8xImcGrfuKDQFJ/1bKVeiwz0HV/3F1aUReaxgJ7TT9Jji0gfS+4MjTqCVYh9Y/8crJrnLyuPaveuTEE9eVJCT4qcfqNHl/RGBfmxpw5Cbi6ExxPdamgwuE5z76NmIQdgTnoNgyeT5wPHSrbEMzcxQb1WF6JNVM40yJdc3s7JwZDXhWfUYmvIe4NsjYTqq7cbB6Q== X-OriginatorOrg: fer.hr X-MS-Exchange-CrossTenant-Network-Message-Id: 9cccd4e8-a2c5-4aeb-d673-08d84cb83b25 X-MS-Exchange-CrossTenant-AuthSource: VE1PR08MB4783.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2020 07:42:22.5222 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: ca71eddc-cc7b-4e5b-95bd-55b658e696be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FeBci4DLGfYRP4h+SnBckZutS1jz4qub/zMYcLhlInOGw7tEGLq0iNz1TVVcwEsC X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2365 X-Rspamd-Queue-Id: 4BfQKH2RKJz4rlM X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:8075, ipnet:2a01:111:f000::/36, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 07:42:27 -0000 On Sun, 30 Aug 2020 07:34:32 +0000 (UTC) Marko Zec wrote: > Author: zec > Date: Sun Aug 30 07:34:32 2020 > New Revision: 364973 > URL: https://svnweb.freebsd.org/changeset/base/364973 > > Log: > Driver for 4x10Gb Ethernet reference NIC FPGA design for NetFPGA > SUME development board. > > Submitted by: Denis Salopek > Reported by: zec, bz (src); rgrimes, bcr (manpages) Should have been "Reviewed by:", sorry... Marko > MFC after: 7 days > Sponsored by: Google Summer of Code 2020 > Differential Revision: https://reviews.freebsd.org/D26074 > > Added: > head/share/man/man4/sume.4 (contents, props changed) > head/sys/dev/sume/ > head/sys/dev/sume/adapter.h (contents, props changed) > head/sys/dev/sume/if_sume.c (contents, props changed) > head/sys/modules/sume/ > head/sys/modules/sume/Makefile (contents, props changed) > Modified: > head/share/man/man4/Makefile > head/sys/conf/files.amd64 > head/sys/modules/Makefile From owner-svn-src-all@freebsd.org Sun Aug 30 16:27:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0C71E3C05ED; Sun, 30 Aug 2020 16:27:59 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bfdzf6WGFz49Zl; Sun, 30 Aug 2020 16:27:58 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C2EA219579; Sun, 30 Aug 2020 16:27:58 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07UGRwdR050678; Sun, 30 Aug 2020 16:27:58 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07UGRwQY050677; Sun, 30 Aug 2020 16:27:58 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <202008301627.07UGRwQY050677@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 30 Aug 2020 16:27:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364974 - stable/12/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-12 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/12/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 364974 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 16:27:59 -0000 Author: asomers Date: Sun Aug 30 16:27:58 2020 New Revision: 364974 URL: https://svnweb.freebsd.org/changeset/base/364974 Log: MFC r364412: zfs: fix EIO accessing dataset after resuming interrupted receive ZFS unmounts a dataset while receiving into it and remounts it afterwards. But if ZFS is resuming an incomplete receive, it screws up and ends up with a dataset that is mounted, but returns EIO for every access. This commit fixes that condition. While the vulnerable code also exists in OpenZFS, the problem is not reproducible there. Apparently OpenZFS doesn't unmount the destination dataset during receive, like FreeBSD does. PR: 248606 Reviewed by: mmacy Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D26034 Modified: stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Directory Properties: stable/12/ (props changed) Modified: stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Sun Aug 30 07:34:32 2020 (r364973) +++ stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Sun Aug 30 16:27:58 2020 (r364974) @@ -3433,7 +3433,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const } if (!flags->dryrun && zhp->zfs_type == ZFS_TYPE_FILESYSTEM && - stream_wantsnewfs) { + (stream_wantsnewfs || resuming)) { /* We can't do online recv in this case */ clp = changelist_gather(zhp, ZFS_PROP_NAME, 0, 0); if (clp == NULL) { From owner-svn-src-all@freebsd.org Sun Aug 30 17:13:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4D2663C2111; Sun, 30 Aug 2020 17:13:05 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bffzj1Hc6z4DWk; Sun, 30 Aug 2020 17:13:05 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0FE421A1AC; Sun, 30 Aug 2020 17:13:05 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07UHD4CZ081030; Sun, 30 Aug 2020 17:13:04 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07UHD4Cv081029; Sun, 30 Aug 2020 17:13:04 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <202008301713.07UHD4Cv081029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 30 Aug 2020 17:13:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364975 - head/sys/dev/mn X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: head/sys/dev/mn X-SVN-Commit-Revision: 364975 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 17:13:05 -0000 Author: glebius Date: Sun Aug 30 17:13:04 2020 New Revision: 364975 URL: https://svnweb.freebsd.org/changeset/base/364975 Log: Followup on r364922. Old comment said that the only reason to put the hook at queue mode was that mn_rx_intr() doesn't run at splnet level. In today's netgraph the only legitimate reason for queue mode is recursion avoidance. So I see no reason for queue mode here. Not tested! Modified: head/sys/dev/mn/if_mn.c Modified: head/sys/dev/mn/if_mn.c ============================================================================== --- head/sys/dev/mn/if_mn.c Sun Aug 30 16:27:58 2020 (r364974) +++ head/sys/dev/mn/if_mn.c Sun Aug 30 17:13:04 2020 (r364975) @@ -743,8 +743,6 @@ ngmn_connect(hook_p hook) if (!(u & 1)) printf("%s: init chan %d stat %08x\n", sc->name, chan, u); sc->m32x->stat = 1; - /* force outward queueing */ - NG_HOOK_FORCE_QUEUE(NG_HOOK_PEER(hook)); return (0); } From owner-svn-src-all@freebsd.org Sun Aug 30 17:37:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C10443C25F5; Sun, 30 Aug 2020 17:37:56 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfgXN4jQ8z4FW3; Sun, 30 Aug 2020 17:37:56 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 85DC51A3E9; Sun, 30 Aug 2020 17:37:56 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07UHbuw9093295; Sun, 30 Aug 2020 17:37:56 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07UHbu8A093294; Sun, 30 Aug 2020 17:37:56 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202008301737.07UHbu8A093294@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Sun, 30 Aug 2020 17:37:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364976 - head/usr.bin/tsort X-SVN-Group: head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: head/usr.bin/tsort X-SVN-Commit-Revision: 364976 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 17:37:56 -0000 Author: fernape (ports committer) Date: Sun Aug 30 17:37:56 2020 New Revision: 364976 URL: https://svnweb.freebsd.org/changeset/base/364976 Log: tsort(1): Add EXAMPLES section Add a couple of simple examples to the man page Approved by: manpages (gbe@) Differential Revision: https://reviews.freebsd.org/D25883 Modified: head/usr.bin/tsort/tsort.1 Modified: head/usr.bin/tsort/tsort.1 ============================================================================== --- head/usr.bin/tsort/tsort.1 Sun Aug 30 17:13:04 2020 (r364975) +++ head/usr.bin/tsort/tsort.1 Sun Aug 30 17:37:56 2020 (r364976) @@ -31,7 +31,7 @@ .\" @(#)tsort.1 8.3 (Berkeley) 4/1/94 .\" $FreeBSD$ .\" -.Dd December 27, 2006 +.Dd August 30, 2020 .Dt TSORT 1 .Os .Sh NAME @@ -75,6 +75,71 @@ This is primarily intended for building libraries, where optimal ordering is not critical, and cycles occur often. .El +.Sh EXAMPLES +Assuming a file named +.Pa dag +with the following contents representing a directed acyclic graph: +.Bd -literal -offset indent +A B +A F +B C +B D +D E +.Ed +.Pp +Sort the nodes of the graph: +.Bd -literal -offset indent +$ tsort dag +A +F +B +D +C +E +.Ed +.Pp +White spaces and new line characters are considered equal. +This file for example is considered equal to the one we defined before: +.Bd -literal -offset indent +$ cat dga +A B A F B C B D D E +.Ed +.Pp +Assume we add a new directed arc from D to A creating a cycle: +.Bd -literal -offset indent +A B +A F +B C +B D +D E +D A +.Ed +.Pp +Ordering the graph detects the cycle: +.Bd -literal -offset indent +$ tsort dag +tsort: cycle in data +tsort: A +tsort: B +tsort: D +D +E +A +F +B +C +.Ed +.Pp +Same as above but silencing the warning about the cycle: +.Bd -literal -offset indent +$ tsort -q dag +D +E +A +F +B +C +.Ed .Sh SEE ALSO .Xr ar 1 .Sh HISTORY From owner-svn-src-all@freebsd.org Sun Aug 30 17:41:00 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7CC6C3C2A56; Sun, 30 Aug 2020 17:41:00 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bfgbw2knWz4FrK; Sun, 30 Aug 2020 17:41:00 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 415B41A7B0; Sun, 30 Aug 2020 17:41:00 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07UHf0Cv095022; Sun, 30 Aug 2020 17:41:00 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07UHf0aw095021; Sun, 30 Aug 2020 17:41:00 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202008301741.07UHf0aw095021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Sun, 30 Aug 2020 17:41:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364977 - head/usr.bin/who X-SVN-Group: head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: head/usr.bin/who X-SVN-Commit-Revision: 364977 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 17:41:00 -0000 Author: fernape (ports committer) Date: Sun Aug 30 17:40:59 2020 New Revision: 364977 URL: https://svnweb.freebsd.org/changeset/base/364977 Log: who(1): Add EXAMPLES section Add EXAMPLES section covering all the flags except -m and -bTu covered by other flags. Approved by: manpages (bcr@) Differential Revision: https://reviews.freebsd.org/D26219 Modified: head/usr.bin/who/who.1 Modified: head/usr.bin/who/who.1 ============================================================================== --- head/usr.bin/who/who.1 Sun Aug 30 17:37:56 2020 (r364976) +++ head/usr.bin/who/who.1 Sun Aug 30 17:40:59 2020 (r364977) @@ -28,7 +28,7 @@ .\" @(#)who.1 8.2 (Berkeley) 12/30/93 .\" $FreeBSD$ .\" -.Dd February 11, 2012 +.Dd August 30, 2020 .Dt WHO 1 .Os .Sh NAME @@ -80,7 +80,7 @@ An error occurred. .El .It Fl u Show idle time for each user in hours and minutes as -.Ar hh Ns : Ns Ar mm , +.Ar hh : Ns Ar mm , .Ql \&. if the user has been idle less than a minute, and .Dq Li old @@ -140,6 +140,47 @@ as described in .El .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +Show a brief summary of who is logged in: +.Bd -literal -offset indent +$ who -q +fernape root root +# users = 3 +.Ed +.Pp +Show who is logged in along with the line and time fields (without the headers): +.Bd -literal -offset indent +$ who -s +fernape ttyv0 Aug 26 16:23 +root ttyv1 Aug 26 16:23 +root ttyv2 Aug 26 16:23 +.Ed +.Pp +Show information about the terminal attached to standard input: +.Bd -literal -offset indent +$ who am i +fernape Aug 26 16:24 +.Ed +.Pp +Show time and date of the last system reboot, whether the users accept messages +and the idle time for each of them: +.Bd -literal -offset indent +$ who -a + - system boot Aug 26 16:23 . +fernape - ttyv0 Aug 26 16:23 . +root - ttyv1 Aug 26 16:23 . +root - ttyv2 Aug 26 16:23 . +.Ed +.Pp +Same as above but showing headers: +.Bd -literal -offset indent +$ who -aH +NAME S LINE TIME IDLE FROM + - system boot Aug 26 16:23 . +fernape - ttyv0 Aug 26 16:23 . +root - ttyv1 Aug 26 16:23 00:01 +root - ttyv2 Aug 26 16:23 00:01 +.Ed .Sh SEE ALSO .Xr last 1 , .Xr users 1 , From owner-svn-src-all@freebsd.org Sun Aug 30 17:44:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C67353C312A; Sun, 30 Aug 2020 17:44:40 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bfgh82LW9z4GCH; Sun, 30 Aug 2020 17:44:40 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.16.1/8.16.1) with ESMTPS id 07UHiVKh029729 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 30 Aug 2020 10:44:32 -0700 (PDT) (envelope-from glebius@freebsd.org) Received: (from glebius@localhost) by cell.glebi.us (8.16.1/8.16.1/Submit) id 07UHiVUh029728; Sun, 30 Aug 2020 10:44:31 -0700 (PDT) (envelope-from glebius@freebsd.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@freebsd.org using -f Date: Sun, 30 Aug 2020 10:44:31 -0700 From: Gleb Smirnoff To: Oleksandr Tymoshenko Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r353419 - head/sys/net Message-ID: <20200830174431.GB5338@FreeBSD.org> References: <201910102342.x9ANguvu083989@repo.freebsd.org> <20200828213130.GA74775@bluezbox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200828213130.GA74775@bluezbox.com> X-Rspamd-Queue-Id: 4Bfgh82LW9z4GCH X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US]; local_wl_from(0.00)[freebsd.org] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 17:44:40 -0000 On Fri, Aug 28, 2020 at 02:31:30PM -0700, Oleksandr Tymoshenko wrote: O> Gleb Smirnoff (glebius@FreeBSD.org) wrote: O> > Author: glebius O> > Date: Thu Oct 10 23:42:55 2019 O> > New Revision: 353419 O> > URL: https://svnweb.freebsd.org/changeset/base/353419 O> > O> > Log: O> > Provide new KPI for network drivers to access lists of interface O> > addresses. The KPI doesn't reveal neither how addresses are stored, O> > how the access to them is synchronized, neither reveal struct ifaddr O> > and struct ifmaddr. O> > O> > Reviewed by: gallatin, erj, hselasky, philip, stevek O> > Differential Revision: https://reviews.freebsd.org/D21943 O> O> Hi Gleb, O> O> Are there any plans to MFC this change and the subsequent API consumer changes? O> Lack of this API in 12 makes MFCing unrelated eth driver fixes hard. I don't plan to MFC it, but there is nothing that would blocks such MFC. Of course internals of the functions would be different - using mutex instead of the epoch to sync access to address lists. I can provide patch for you, but you would be responsive for MFC. I don't have any 12-based systems to test changes. -- Gleb Smirnoff From owner-svn-src-all@freebsd.org Sun Aug 30 18:21:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 178293C446C; Sun, 30 Aug 2020 18:21:55 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfhW66z7Pz4JWm; Sun, 30 Aug 2020 18:21:54 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2A9E1B00F; Sun, 30 Aug 2020 18:21:54 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07UILspX021478; Sun, 30 Aug 2020 18:21:54 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07UILshB021477; Sun, 30 Aug 2020 18:21:54 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <202008301821.07UILshB021477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 30 Aug 2020 18:21:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r364978 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Group: stable-11 X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/lib/libzfs/common X-SVN-Commit-Revision: 364978 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 18:21:55 -0000 Author: asomers Date: Sun Aug 30 18:21:54 2020 New Revision: 364978 URL: https://svnweb.freebsd.org/changeset/base/364978 Log: MFC r364412: zfs: fix EIO accessing dataset after resuming interrupted receive ZFS unmounts a dataset while receiving into it and remounts it afterwards. But if ZFS is resuming an incomplete receive, it screws up and ends up with a dataset that is mounted, but returns EIO for every access. This commit fixes that condition. While the vulnerable code also exists in OpenZFS, the problem is not reproducible there. Apparently OpenZFS doesn't unmount the destination dataset during receive, like FreeBSD does. PR: 248606 Reviewed by: mmacy Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D26034 Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Sun Aug 30 17:40:59 2020 (r364977) +++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Sun Aug 30 18:21:54 2020 (r364978) @@ -3415,7 +3415,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const } if (!flags->dryrun && zhp->zfs_type == ZFS_TYPE_FILESYSTEM && - stream_wantsnewfs) { + (stream_wantsnewfs || resuming)) { /* We can't do online recv in this case */ clp = changelist_gather(zhp, ZFS_PROP_NAME, 0, 0); if (clp == NULL) { From owner-svn-src-all@freebsd.org Sun Aug 30 20:20:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 59FEC3C80DF; Sun, 30 Aug 2020 20:20:18 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bfl7h3qd8z4Rgw; Sun, 30 Aug 2020 20:20:16 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lj1-f174.google.com with SMTP id c2so280889ljj.12; Sun, 30 Aug 2020 13:20:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=kDsYz9M4wOJ36gIWBO37gPsiEBcI5y34gwRNLPp8+Qo=; b=PD8rEo/FcPmrE/8kcJnK6JblUGM6lCzb02tRWNYosW+o/uQoL22j8KGQzngtOjtd9r iyAfJXg9VNbXq75/CaUYzW1T/KPJfY5h8KsEZ2XUnNKLiwpJ6xULooDYZFRG+Mu4kCvY lD1nelnq3R02rah7/A51j5K4UqU+EIjH57GaZPa7NasTF4K2hJvk9xGpv16JPgyelz6J pd7KgcMS2Xw5d9pdZRpiE+HfI+CFpRCqc32XwGWWsWnsM99NZQOOzK22bWCII+qaV2rh 6qcGGaSafutTSU69Ict5l6XNwm2t985wO1yc63oN5Ks8Rfdbs8CW1sdE9Ta/Drle3JV3 L0HA== X-Gm-Message-State: AOAM531c+jxHmFZy/Kw6H5OZVCzZy6BnVuedkfR0vFk1+qcR7jy1HvNd Z6SamXcwd51tAH+LcKAts6HtR+A8cgs= X-Google-Smtp-Source: ABdhPJynCBhPP9llu+17yaxQu/gBwlpea3jfE6T3MjZ7sHqvPR6iMh7BCK7h3WE2AN1OIv6bOjCEig== X-Received: by 2002:a05:651c:204f:: with SMTP id t15mr4120961ljo.308.1598818810813; Sun, 30 Aug 2020 13:20:10 -0700 (PDT) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id x14sm1131526lfc.93.2020.08.30.13.20.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 30 Aug 2020 13:20:09 -0700 (PDT) Subject: Re: svn commit: r364927 - head/sys/arm/allwinner/clkng To: Emmanuel Vadot , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008281825.07SIPkBa029646@repo.freebsd.org> From: Andriy Gapon Openpgp: preference=signencrypt Autocrypt: addr=avg@FreeBSD.org; prefer-encrypt=mutual; keydata= mQINBFm4LIgBEADNB/3lT7f15UKeQ52xCFQx/GqHkSxEdVyLFZTmY3KyNPQGBtyvVyBfprJ7 mAeXZWfhat6cKNRAGZcL5EmewdQuUfQfBdYmKjbw3a9GFDsDNuhDA2QwFt8BmkiVMRYyvI7l N0eVzszWCUgdc3qqM6qqcgBaqsVmJluwpvwp4ZBXmch5BgDDDb1MPO8AZ2QZfIQmplkj8Y6Z AiNMknkmgaekIINSJX8IzRzKD5WwMsin70psE8dpL/iBsA2cpJGzWMObVTtCxeDKlBCNqM1i gTXta1ukdUT7JgLEFZk9ceYQQMJJtUwzWu1UHfZn0Fs29HTqawfWPSZVbulbrnu5q55R4PlQ /xURkWQUTyDpqUvb4JK371zhepXiXDwrrpnyyZABm3SFLkk2bHlheeKU6Yql4pcmSVym1AS4 dV8y0oHAfdlSCF6tpOPf2+K9nW1CFA8b/tw4oJBTtfZ1kxXOMdyZU5fiG7xb1qDgpQKgHUX8 7Rd2T1UVLVeuhYlXNw2F+a2ucY+cMoqz3LtpksUiBppJhw099gEXehcN2JbUZ2TueJdt1FdS ztnZmsHUXLxrRBtGwqnFL7GSd6snpGIKuuL305iaOGODbb9c7ne1JqBbkw1wh8ci6vvwGlzx rexzimRaBzJxlkjNfMx8WpCvYebGMydNoeEtkWldtjTNVsUAtQARAQABtB5BbmRyaXkgR2Fw b24gPGF2Z0BGcmVlQlNELm9yZz6JAlQEEwEIAD4WIQS+LEO7ngQnXA4Bjr538m7TUc1yjwUC WbgsiAIbIwUJBaOagAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRB38m7TUc1yj+JAEACV l9AK/nOWAt/9cufV2fRj0hdOqB1aCshtSrwHk/exXsDa4/FkmegxXQGY+3GWX3deIyesbVRL rYdtdK0dqJyT1SBqXK1h3/at9rxr9GQA6KWOxTjUFURsU7ok/6SIlm8uLRPNKO+yq0GDjgaO LzN+xykuBA0FlhQAXJnpZLcVfPJdWv7sSHGedL5ln8P8rxR+XnmsA5TUaaPcbhTB+mG+iKFj GghASDSfGqLWFPBlX/fpXikBDZ1gvOr8nyMY9nXhgfXpq3B6QCRYKPy58ChrZ5weeJZ29b7/ QdEO8NFNWHjSD9meiLdWQaqo9Y7uUxN3wySc/YUZxtS0bhAd8zJdNPsJYG8sXgKjeBQMVGuT eCAJFEYJqbwWvIXMfVWop4+O4xB+z2YE3jAbG/9tB/GSnQdVSj3G8MS80iLS58frnt+RSEw/ psahrfh0dh6SFHttE049xYiC+cM8J27Aaf0i9RflyITq57NuJm+AHJoU9SQUkIF0nc6lfA+o JRiyRlHZHKoRQkIg4aiKaZSWjQYRl5Txl0IZUP1dSWMX4s3XTMurC/pnja45dge/4ESOtJ9R 8XuIWg45Oq6MeIWdjKddGhRj3OohsltKgkEU3eLKYtB6qRTQypHHUawCXz88uYt5e3w4V16H lCpSTZV/EVHnNe45FVBlvK7k7HFfDDkryLkCDQRZuCyIARAAlq0slcsVboY/+IUJdcbEiJRW be9HKVz4SUchq0z9MZPX/0dcnvz/gkyYA+OuM78dNS7Mbby5dTvOqfpLJfCuhaNYOhlE0wY+ 1T6Tf1f4c/uA3U/YiadukQ3+6TJuYGAdRZD5EqYFIkreARTVWg87N9g0fT9BEqLw9lJtEGDY EWUE7L++B8o4uu3LQFEYxcrb4K/WKmgtmFcm77s0IKDrfcX4doV92QTIpLiRxcOmCC/OCYuO jB1oaaqXQzZrCutXRK0L5XN1Y1PYjIrEzHMIXmCDlLYnpFkK+itlXwlE2ZQxkfMruCWdQXye syl2fynAe8hvp7Mms9qU2r2K9EcJiR5N1t1C2/kTKNUhcRv7Yd/vwusK7BqJbhlng5ZgRx0m WxdntU/JLEntz3QBsBsWM9Y9wf2V4tLv6/DuDBta781RsCB/UrU2zNuOEkSixlUiHxw1dccI 6CVlaWkkJBxmHX22GdDFrcjvwMNIbbyfQLuBq6IOh8nvu9vuItup7qemDG3Ms6TVwA7BD3j+ 3fGprtyW8Fd/RR2bW2+LWkMrqHffAr6Y6V3h5kd2G9Q8ZWpEJk+LG6Mk3fhZhmCnHhDu6CwN MeUvxXDVO+fqc3JjFm5OxhmfVeJKrbCEUJyM8ESWLoNHLqjywdZga4Q7P12g8DUQ1mRxYg/L HgZY3zfKOqcAEQEAAYkCPAQYAQgAJhYhBL4sQ7ueBCdcDgGOvnfybtNRzXKPBQJZuCyIAhsM BQkFo5qAAAoJEHfybtNRzXKPBVwQAKfFy9P7N3OsLDMB56A4Kf+ZT+d5cIx0Yiaf4n6w7m3i ImHHHk9FIetI4Xe54a2IXh4Bq5UkAGY0667eIs+Z1Ea6I2i27Sdo7DxGwq09Qnm/Y65ADvXs 3aBvokCcm7FsM1wky395m8xUos1681oV5oxgqeRI8/76qy0hD9WR65UW+HQgZRIcIjSel9vR XDaD2HLGPTTGr7u4v00UeTMs6qvPsa2PJagogrKY8RXdFtXvweQFz78NbXhluwix2Tb9ETPk LIpDrtzV73CaE2aqBG/KrboXT2C67BgFtnk7T7Y7iKq4/XvEdDWscz2wws91BOXuMMd4c/c4 OmGW9m3RBLufFrOag1q5yUS9QbFfyqL6dftJP3Zq/xe+mr7sbWbhPVCQFrH3r26mpmy841ym dwQnNcsbIGiBASBSKksOvIDYKa2Wy8htPmWFTEOPRpFXdGQ27awcjjnB42nngyCK5ukZDHi6 w0qK5DNQQCkiweevCIC6wc3p67jl1EMFY5+z+zdTPb3h7LeVnGqW0qBQl99vVFgzLxchKcl0 R/paSFgwqXCZhAKMuUHncJuynDOP7z5LirUeFI8qsBAJi1rXpQoLJTVcW72swZ42IdPiboqx NbTMiNOiE36GqMcTPfKylCbF45JNX4nF9ElM0E+Y8gi4cizJYBRr2FBJgay0b9Cp Message-ID: <31f105d3-e67a-7b81-8670-55a19237569e@FreeBSD.org> Date: Sun, 30 Aug 2020 23:20:08 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Firefox/60.0 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <202008281825.07SIPkBa029646@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Bfl7h3qd8z4Rgw X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of agapon@gmail.com designates 209.85.208.174 as permitted sender) smtp.mailfrom=agapon@gmail.com X-Spamd-Result: default: False [-2.14 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; ARC_NA(0.00)[]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-0.71)[-0.710]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-0.74)[-0.740]; NEURAL_HAM_SHORT(-0.69)[-0.691]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.174:from]; RECEIVED_SPAMHAUS_PBL(0.00)[93.72.151.96:received]; FORGED_SENDER(0.30)[avg@FreeBSD.org,agapon@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.174:from]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[avg@FreeBSD.org,agapon@gmail.com]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 20:20:18 -0000 On 28/08/2020 21:25, Emmanuel Vadot wrote: > Author: manu > Date: Fri Aug 28 18:25:45 2020 > New Revision: 364927 > URL: https://svnweb.freebsd.org/changeset/base/364927 > > Log: > arm: allwinner: clk: Add printfs when we cannot set the correct freq > > For some unknown reason this seems to fix this function when we printf > the best variable. This isn't a delay problem as doing a printf without > it doesn't solve this problem. > This is way above my pay grade so add some printf that shouldn't be printed > in 99% of the case anyway. > Fix booting on most Allwinner boards as the mmc IP uses a NM clock. Just so that our IRC conversation does not get lost to time. I think that the real problem with the code is that it passes a difference between two uint64_t-s, which is uint64_t itself, to abs() which takes an int and returns an int. I am not sure what liberties compilers (especially, clang) can take with that incorrect code -- and they have some options, because abs() is an inline function -- and how the magic printf-s affect those liberties, but I think that it is better to make the code correct. I think that abs(x - y) can be replaced with a local function like: static inline uint64_t distance(uint64_t x, uint64_t y) { return (x >= y ? x - y : y - x); } > Reported by: Alexander Mishin > MFC after: 3 days > X-MFC-With: 363887 > > Modified: > head/sys/arm/allwinner/clkng/aw_clk_nm.c > > Modified: head/sys/arm/allwinner/clkng/aw_clk_nm.c > ============================================================================== > --- head/sys/arm/allwinner/clkng/aw_clk_nm.c Fri Aug 28 17:55:54 2020 (r364926) > +++ head/sys/arm/allwinner/clkng/aw_clk_nm.c Fri Aug 28 18:25:45 2020 (r364927) > @@ -221,11 +221,15 @@ aw_clk_nm_set_freq(struct clknode *clk, uint64_t fpare > if ((best < *fout) && > ((flags & CLK_SET_ROUND_DOWN) == 0)) { > *stop = 1; > + printf("best freq (%llu) < requested freq(%llu)\n", > + best, *fout); > return (ERANGE); > } > if ((best > *fout) && > ((flags & CLK_SET_ROUND_UP) == 0)) { > *stop = 1; > + printf("best freq (%llu) > requested freq(%llu)\n", > + best, *fout); > return (ERANGE); > } > > -- Andriy Gapon From owner-svn-src-all@freebsd.org Sun Aug 30 21:21:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 097E53CB061; Sun, 30 Aug 2020 21:21:59 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfmVt6Xnhz4b1c; Sun, 30 Aug 2020 21:21:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3E841D31F; Sun, 30 Aug 2020 21:21:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07ULLwdv043263; Sun, 30 Aug 2020 21:21:58 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07ULLw2V043254; Sun, 30 Aug 2020 21:21:58 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202008302121.07ULLw2V043254@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 30 Aug 2020 21:21:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364979 - head/usr.sbin/mountd X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/usr.sbin/mountd X-SVN-Commit-Revision: 364979 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 21:21:59 -0000 Author: rmacklem Date: Sun Aug 30 21:21:58 2020 New Revision: 364979 URL: https://svnweb.freebsd.org/changeset/base/364979 Log: Add support for the NFS over TLS exports to mountd. Three new export flags are added to mountd that will restrict exported file system mounts to use TLS. Without these flags, TLS is allowed, but not required. The exports(5) man page will be updated in a future commit. Modified: head/usr.sbin/mountd/mountd.c Modified: head/usr.sbin/mountd/mountd.c ============================================================================== --- head/usr.sbin/mountd/mountd.c Sun Aug 30 18:21:54 2020 (r364978) +++ head/usr.sbin/mountd/mountd.c Sun Aug 30 21:21:58 2020 (r364979) @@ -2795,6 +2795,13 @@ do_opt(char **cpp, char **endcpp, struct exportlist *e return (1); opt_flags |= OP_SEC; usedarg++; + } else if (!strcmp(cpopt, "tls")) { + *exflagsp |= MNT_EXTLS; + } else if (!strcmp(cpopt, "tlscert")) { + *exflagsp |= (MNT_EXTLS | MNT_EXTLSCERT); + } else if (!strcmp(cpopt, "tlscertuser")) { + *exflagsp |= (MNT_EXTLS | MNT_EXTLSCERT | + MNT_EXTLSCERTUSER); } else { syslog(LOG_ERR, "bad opt %s", cpopt); return (1); From owner-svn-src-all@freebsd.org Sun Aug 30 21:46:30 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 868CE3CBF4F; Sun, 30 Aug 2020 21:46:30 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bfn3B32h5z4cLX; Sun, 30 Aug 2020 21:46:30 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CD971D93C; Sun, 30 Aug 2020 21:46:30 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07ULkUqZ055903; Sun, 30 Aug 2020 21:46:30 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07ULkUZC055902; Sun, 30 Aug 2020 21:46:30 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202008302146.07ULkUZC055902@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 30 Aug 2020 21:46:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364980 - head X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 364980 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 21:46:30 -0000 Author: rmacklem Date: Sun Aug 30 21:46:29 2020 New Revision: 364980 URL: https://svnweb.freebsd.org/changeset/base/364980 Log: Add an entry to RELNOTES for the NFS over TLS kernel support. Modified: head/RELNOTES Modified: head/RELNOTES ============================================================================== --- head/RELNOTES Sun Aug 30 21:21:58 2020 (r364979) +++ head/RELNOTES Sun Aug 30 21:46:29 2020 (r364980) @@ -10,6 +10,17 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +r364896: + A series of commits ending with r364896 added NFS over TLS + to the kernel. This is believed to be compatible with + the Internet Draft titled "Towards Remote Procedure Call Encryption + By Default" (expected to soon become an RFC). + The mount_nfs(8) and exports(5) man pages describe the mount and + export option(s) related to NFS over TLS. + For NFS over TLS to work, the rpctlscd(8) { client } or rpctlssd(8) + { server } must be running on a kernel built with "options KERN_TLS" + on an architecture where PMAP_HAS_DMAP != 0. + r364725: Changes to one obscure devd event generated on resume need to be documented. The old form will still be generated in 13, but not From owner-svn-src-all@freebsd.org Mon Aug 31 00:59:03 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F18EF3D111A; Mon, 31 Aug 2020 00:59:03 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfsKM63bjz3Z58; Mon, 31 Aug 2020 00:59:03 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B309E1F5E9; Mon, 31 Aug 2020 00:59:03 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07V0x3Ln072567; Mon, 31 Aug 2020 00:59:03 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07V0x37I072565; Mon, 31 Aug 2020 00:59:03 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202008310059.07V0x37I072565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 31 Aug 2020 00:59:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364981 - stable/12/sys/cam/scsi X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/12/sys/cam/scsi X-SVN-Commit-Revision: 364981 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 00:59:04 -0000 Author: mav Date: Mon Aug 31 00:59:02 2020 New Revision: 364981 URL: https://svnweb.freebsd.org/changeset/base/364981 Log: MFC r364309: Extend EIIOE field handling according to ses4r5 draft. It should not affect any existing systems. Modified: stable/12/sys/cam/scsi/scsi_enc_ses.c stable/12/sys/cam/scsi/scsi_ses.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cam/scsi/scsi_enc_ses.c ============================================================================== --- stable/12/sys/cam/scsi/scsi_enc_ses.c Sun Aug 30 21:46:29 2020 (r364980) +++ stable/12/sys/cam/scsi/scsi_enc_ses.c Mon Aug 31 00:59:02 2020 (r364981) @@ -1797,7 +1797,7 @@ ses_process_elm_addlstatus(enc_softc_t *enc, struct en ses_elem_index_type_t index_type; eip_hdr = (struct ses_elm_addlstatus_eip_hdr *)elm_hdr; - if (eip_hdr->byte2 & SES_ADDL_EIP_EIIOE) { + if (SES_ADDL_EIP_EIIOE_EI_GLOB(eip_hdr->byte2)) { index_type = SES_ELEM_INDEX_GLOBAL; expected_index = iter.global_element_index; } else { @@ -1807,8 +1807,8 @@ ses_process_elm_addlstatus(enc_softc_t *enc, struct en if (eip_hdr->element_index < expected_index) { ENC_VLOG(enc, "%s: provided %selement index " "%d is lower then expected %d\n", - __func__, (eip_hdr->byte2 & - SES_ADDL_EIP_EIIOE) ? "global " : "", + __func__, SES_ADDL_EIP_EIIOE_EI_GLOB( + eip_hdr->byte2) ? "global " : "", eip_hdr->element_index, expected_index); goto badindex; } @@ -1818,7 +1818,7 @@ ses_process_elm_addlstatus(enc_softc_t *enc, struct en if (telement == NULL) { ENC_VLOG(enc, "%s: provided %selement index " "%d does not exist\n", __func__, - (eip_hdr->byte2 & SES_ADDL_EIP_EIIOE) ? + SES_ADDL_EIP_EIIOE_EI_GLOB(eip_hdr->byte2) ? "global " : "", eip_hdr->element_index); goto badindex; } @@ -1827,7 +1827,7 @@ ses_process_elm_addlstatus(enc_softc_t *enc, struct en ENC_VLOG(enc, "%s: provided %selement index " "%d can't have additional status\n", __func__, - (eip_hdr->byte2 & SES_ADDL_EIP_EIIOE) ? + SES_ADDL_EIP_EIIOE_EI_GLOB(eip_hdr->byte2) ? "global " : "", eip_hdr->element_index); badindex: /* @@ -1843,7 +1843,7 @@ badindex: element = telement; } - if (eip_hdr->byte2 & SES_ADDL_EIP_EIIOE) + if (SES_ADDL_EIP_EIIOE_EI_GLOB(eip_hdr->byte2)) index = iter.global_element_index; else index = iter.individual_element_index; @@ -1852,8 +1852,8 @@ badindex: ENC_VLOG(enc, "%s: provided %s element" "index %d skips mandatory status " " element at index %d\n", - __func__, (eip_hdr->byte2 & - SES_ADDL_EIP_EIIOE) ? "global " : "", + __func__, SES_ADDL_EIP_EIIOE_EI_GLOB( + eip_hdr->byte2) ? "global " : "", index, expected_index); } } Modified: stable/12/sys/cam/scsi/scsi_ses.h ============================================================================== --- stable/12/sys/cam/scsi/scsi_ses.h Sun Aug 30 21:46:29 2020 (r364980) +++ stable/12/sys/cam/scsi/scsi_ses.h Mon Aug 31 00:59:02 2020 (r364981) @@ -2439,7 +2439,13 @@ int ses_elm_addlstatus_invalid(struct ses_elm_addlstat struct ses_elm_addlstatus_eip_hdr { struct ses_elm_addlstatus_base_hdr base; uint8_t byte2; -#define SES_ADDL_EIP_EIIOE 1 +#define SES_ADDL_EIP_EIIOE_MASK 3 +#define SES_ADDL_EIP_EIIOE_SES2 0 +#define SES_ADDL_EIP_EIIOE_GLOB 1 +#define SES_ADDL_EIP_EIIOE_IND 2 +#define SES_ADDL_EIP_EIIOE_MIX 3 +#define SES_ADDL_EIP_EIIOE_EI_GLOB(x) \ + (((x) & SES_ADDL_EIP_EIIOE_MASK) == SES_ADDL_EIP_EIIOE_GLOB) uint8_t element_index; /* NB: This define (currently) applies to all eip=1 headers */ #define SES_EIP_HDR_EXTRA_LEN 2 From owner-svn-src-all@freebsd.org Mon Aug 31 01:33:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A66153D2117; Mon, 31 Aug 2020 01:33:49 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bft5S5G9Gz3byD; Mon, 31 Aug 2020 01:33:48 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f41.google.com with SMTP id b16so4351986ioj.4; Sun, 30 Aug 2020 18:33:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=w5nwVzZ/aF2JtDBxx1K0tmsWwWH8+kLQgoGv+vhGdnk=; b=aVYk5SMNiblelu6BM4wH4u8HhnlZAn1xlYs0XoLi4B9ueEm5+eHIbTF3MDu3am9mMf ixubYDoq+fU1/nW9a5T9qYNzjfL8WXgknoqZF4fBM+lCnFVHJ+lYqFFEvzD5/N5nPFSd CmsaT24d4j8hNfa9HaynqyCboz1UI5PcA1ZhedFLgzsHTy+2Jo7wUsKw9niNpAGxDJ8I S/ABhxbiOxvP1ricnige/DQOcWkuwFG1NfFwZSgyyUmSo0Fm80ltHp6pQSOo3TVj79ad ex4UPVCXgktwoKKvG5xdrph61Looqvav5+0CGdCS2FbPMB3rfUVrRvQBE9PSElzX8cP1 rf0Q== X-Gm-Message-State: AOAM533Q72KnM34sAj7cX8VIBOMp9RRebtEvYotTyKAYnvdnyGrBdQor ksL/z7HSVATpfWCXQzaK56NI6eMNLH02ribBLmGQo2EnvyQ= X-Google-Smtp-Source: ABdhPJxGbYg9meU2/i627J5AkjD6RvJTp6RuRxuoOWc4x2wNz7a/J+xgxFPlojbC3mKZWEjgj/fQyPWxF/sn5kdxta0= X-Received: by 2002:a05:6638:2595:: with SMTP id s21mr9730358jat.12.1598837626012; Sun, 30 Aug 2020 18:33:46 -0700 (PDT) MIME-Version: 1.0 References: <202008171853.07HIrNAC082123@repo.freebsd.org> <202008172023.07HKNh1q061925@gndrsh.dnsmgr.net> In-Reply-To: <202008172023.07HKNh1q061925@gndrsh.dnsmgr.net> From: Ed Maste Date: Sun, 30 Aug 2020 21:33:31 -0400 Message-ID: Subject: Re: svn commit: r364321 - head/sbin/ipfw To: "Rodney W. Grimes" Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Bft5S5G9Gz3byD X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.41 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-1.14 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-0.83)[-0.834]; NEURAL_SPAM_SHORT(0.41)[0.411]; NEURAL_HAM_MEDIUM(-0.71)[-0.714]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.41:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.41:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 01:33:49 -0000 Hrm, it seems this reply ended up in my spam folder; sorry for not replying until now. > > *strchr(timestr, '\n') = '\0'; > > bprintf(bp, "%s ", timestr); > ^ Isnt this the +1 space? > > > } else { > > - bprintf(bp, "%*s", twidth, " "); > > + bprintf(bp, "%*s", twidth + 1, " "); > ^missing from this string? Inserting an extra space in the format string would also work, sure. I considered doing it that way but in the end decided it's not materially more clear one way or another, so used the patch as submitted. From owner-svn-src-all@freebsd.org Mon Aug 31 01:45:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D7983D25A0; Mon, 31 Aug 2020 01:45:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BftMK1rWxz3cs4; Mon, 31 Aug 2020 01:45:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 241F3203A5; Mon, 31 Aug 2020 01:45:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07V1jnp5003693; Mon, 31 Aug 2020 01:45:49 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07V1jn1e003692; Mon, 31 Aug 2020 01:45:49 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202008310145.07V1jn1e003692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 31 Aug 2020 01:45:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364982 - head/sys/netinet6 X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/sys/netinet6 X-SVN-Commit-Revision: 364982 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 01:45:49 -0000 Author: kevans Date: Mon Aug 31 01:45:48 2020 New Revision: 364982 URL: https://svnweb.freebsd.org/changeset/base/364982 Log: ipv6: quit dropping packets looping back on p2p interfaces To paraphrase the below-referenced PR: This logic originated in the KAME project, and was even controversial when it was enabled there by default in 2001. No such equivalent logic exists in the IPv4 stack, and it turns out that this leads to us dropping valid traffic when the "point to point" interface is actually a 1:many tun interface, e.g. with the wireguard userland stack. Even in the case of true point-to-point links, this logic only avoids transient looping of packets sent by misconfigured applications or attackers, which can be subverted by proper route configuration rather than hardcoded logic in the kernel to drop packets. In the review, melifaro goes on to note that the kernel can't fix it, so it perhaps shouldn't try to be 'smart' about it. Additionally, that TTL will still kick in even with incorrect route configuration. PR: 247718 Reviewed by: melifaro, rgrimes MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D25567 Modified: head/sys/netinet6/ip6_forward.c Modified: head/sys/netinet6/ip6_forward.c ============================================================================== --- head/sys/netinet6/ip6_forward.c Mon Aug 31 00:59:02 2020 (r364981) +++ head/sys/netinet6/ip6_forward.c Mon Aug 31 01:45:48 2020 (r364982) @@ -260,24 +260,8 @@ again: * modified by a redirect. */ if (V_ip6_sendredirects && nh->nh_ifp == m->m_pkthdr.rcvif && !srcrt && - (nh->nh_flags & NHF_REDIRECT) == 0) { - if ((nh->nh_ifp->if_flags & IFF_POINTOPOINT) != 0) { - /* - * If the incoming interface is equal to the outgoing - * one, and the link attached to the interface is - * point-to-point, then it will be highly probable - * that a routing loop occurs. Thus, we immediately - * drop the packet and send an ICMPv6 error message. - * - * type/code is based on suggestion by Rich Draves. - * not sure if it is the best pick. - */ - icmp6_error(mcopy, ICMP6_DST_UNREACH, - ICMP6_DST_UNREACH_ADDR, 0); - goto bad; - } + (nh->nh_flags & NHF_REDIRECT) == 0) type = ND_REDIRECT; - } /* * Fake scoped addresses. Note that even link-local source or From owner-svn-src-all@freebsd.org Mon Aug 31 05:25:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C3E83D63B7; Mon, 31 Aug 2020 05:25:14 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfzDV0t8wz44JS; Mon, 31 Aug 2020 05:25:14 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0154F22AD5; Mon, 31 Aug 2020 05:25:14 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07V5PDU1039747; Mon, 31 Aug 2020 05:25:13 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07V5PD1w039746; Mon, 31 Aug 2020 05:25:13 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <202008310525.07V5PD1w039746@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Mon, 31 Aug 2020 05:25:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364983 - stable/12/sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: stable/12/sys/kern X-SVN-Commit-Revision: 364983 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 05:25:14 -0000 Author: mckusick Date: Mon Aug 31 05:25:13 2020 New Revision: 364983 URL: https://svnweb.freebsd.org/changeset/base/364983 Log: MFC of 364895 Comment on when and why pathnames are deleted from the name cache. Modified: stable/12/sys/kern/vfs_lookup.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/vfs_lookup.c ============================================================================== --- stable/12/sys/kern/vfs_lookup.c Mon Aug 31 01:45:48 2020 (r364982) +++ stable/12/sys/kern/vfs_lookup.c Mon Aug 31 05:25:13 2020 (r364983) @@ -663,6 +663,16 @@ lookup(struct nameidata *ndp) wantparent = cnp->cn_flags & (LOCKPARENT | WANTPARENT); KASSERT(cnp->cn_nameiop == LOOKUP || wantparent, ("CREATE, DELETE, RENAME require LOCKPARENT or WANTPARENT.")); + /* + * When set to zero, docache causes the last component of the + * pathname to be deleted from the cache and the full lookup + * of the name to be done (via VOP_CACHEDLOOKUP()). Often + * filesystems need some pre-computed values that are made + * during the full lookup, for instance UFS sets dp->i_offset. + * + * The docache variable is set to zero when requested by the + * NOCACHE flag and for all modifying operations except CREATE. + */ docache = (cnp->cn_flags & NOCACHE) ^ NOCACHE; if (cnp->cn_nameiop == DELETE || (wantparent && cnp->cn_nameiop != CREATE && From owner-svn-src-all@freebsd.org Mon Aug 31 09:05:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7DC143BAF5F; Mon, 31 Aug 2020 09:05:46 +0000 (UTC) (envelope-from whu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bg46y2np3z4H4x; Mon, 31 Aug 2020 09:05:46 +0000 (UTC) (envelope-from whu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 434B925533; Mon, 31 Aug 2020 09:05:46 +0000 (UTC) (envelope-from whu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07V95kHj074263; Mon, 31 Aug 2020 09:05:46 GMT (envelope-from whu@FreeBSD.org) Received: (from whu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07V95jOW074261; Mon, 31 Aug 2020 09:05:45 GMT (envelope-from whu@FreeBSD.org) Message-Id: <202008310905.07V95jOW074261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: whu set sender to whu@FreeBSD.org using -f From: Wei Hu Date: Mon, 31 Aug 2020 09:05:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364984 - head/sys/dev/hyperv/storvsc X-SVN-Group: head X-SVN-Commit-Author: whu X-SVN-Commit-Paths: head/sys/dev/hyperv/storvsc X-SVN-Commit-Revision: 364984 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 09:05:46 -0000 Author: whu Date: Mon Aug 31 09:05:45 2020 New Revision: 364984 URL: https://svnweb.freebsd.org/changeset/base/364984 Log: Hyper-V: storvsc: Enhance srb_status code handling. In hv_storvsc_io_request() when coring, prevent changing of the send channel from the base channel to another one. storvsc_poll always probes on the base channel. Based upon conversations with Microsoft, changed the handling of srb_status codes. Most we should never get, others yes. All are treated as retry-able except for two. We should not get these statuses, but if we ever do, the I/O state is not known. Submitted by: Alexander Sideropoulos Reviewed by: trasz, allanjude, whu MFC after: 1 week Sponsored by: Netapp Inc Differential Revision: https://reviews.freebsd.org/D25756 Modified: head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c head/sys/dev/hyperv/storvsc/hv_vstorage.h Modified: head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c ============================================================================== --- head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Mon Aug 31 05:25:13 2020 (r364983) +++ head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Mon Aug 31 09:05:45 2020 (r364984) @@ -151,6 +151,12 @@ SYSCTL_UINT(_hw_storvsc, OID_AUTO, max_io, CTLFLAG_RDT static int hv_storvsc_chan_cnt = 0; SYSCTL_INT(_hw_storvsc, OID_AUTO, chan_cnt, CTLFLAG_RDTUN, &hv_storvsc_chan_cnt, 0, "# of channels to use"); +#ifdef DIAGNOSTIC +static int hv_storvsc_srb_status = -1; +SYSCTL_INT(_hw_storvsc, OID_AUTO, srb_status, CTLFLAG_RW, + &hv_storvsc_srb_status, 0, "srb_status to inject"); +TUNABLE_INT("hw_storvsc.srb_status", &hv_storvsc_srb_status); +#endif /* DIAGNOSTIC */ #define STORVSC_MAX_IO \ vmbus_chan_prplist_nelem(hv_storvsc_ringbuffer_size, \ @@ -704,7 +710,16 @@ hv_storvsc_io_request(struct storvsc_softc *sc, vstor_packet->operation = VSTOR_OPERATION_EXECUTESRB; ch_sel = (vstor_packet->u.vm_srb.lun + curcpu) % sc->hs_nchan; - outgoing_channel = sc->hs_sel_chan[ch_sel]; + /* + * If we are panic'ing, then we are dumping core. Since storvsc_polls + * always uses sc->hs_chan, then we must send to that channel or a poll + * timeout will occur. + */ + if (panicstr) { + outgoing_channel = sc->hs_chan; + } else { + outgoing_channel = sc->hs_sel_chan[ch_sel]; + } mtx_unlock(&request->softc->hs_lock); if (request->prp_list.gpa_range.gpa_len) { @@ -2155,26 +2170,133 @@ storvsc_io_done(struct hv_storvsc_request *reqp) ccb->ccb_h.status &= ~CAM_SIM_QUEUED; ccb->ccb_h.status &= ~CAM_STATUS_MASK; int srb_status = SRB_STATUS(vm_srb->srb_status); +#ifdef DIAGNOSTIC + if (hv_storvsc_srb_status != -1) { + srb_status = SRB_STATUS(hv_storvsc_srb_status & 0x3f); + hv_storvsc_srb_status = -1; + } +#endif /* DIAGNOSTIC */ if (vm_srb->scsi_status == SCSI_STATUS_OK) { if (srb_status != SRB_STATUS_SUCCESS) { - /* - * If there are errors, for example, invalid LUN, - * host will inform VM through SRB status. - */ - if (bootverbose) { - if (srb_status == SRB_STATUS_INVALID_LUN) { - xpt_print(ccb->ccb_h.path, - "invalid LUN %d for op: %s\n", - vm_srb->lun, - scsi_op_desc(cmd->opcode, NULL)); - } else { - xpt_print(ccb->ccb_h.path, - "Unknown SRB flag: %d for op: %s\n", - srb_status, - scsi_op_desc(cmd->opcode, NULL)); - } + bool log_error = true; + switch (srb_status) { + case SRB_STATUS_PENDING: + /* We should never get this */ + panic("storvsc_io_done: SRB_STATUS_PENDING"); + break; + case SRB_STATUS_ABORTED: + /* + * storvsc doesn't support aborts yet + * but if we ever get this status + * the I/O is complete - treat it as a + * timeout + */ + ccb->ccb_h.status |= CAM_CMD_TIMEOUT; + break; + case SRB_STATUS_ABORT_FAILED: + /* We should never get this */ + panic("storvsc_io_done: SRB_STATUS_ABORT_FAILED"); + break; + case SRB_STATUS_ERROR: + /* + * We should never get this. + * Treat it as a CAM_UNREC_HBA_ERROR. + * It will be retried + */ + ccb->ccb_h.status |= CAM_UNREC_HBA_ERROR; + break; + case SRB_STATUS_BUSY: + /* Host is busy. Delay and retry */ + ccb->ccb_h.status |= CAM_BUSY; + break; + case SRB_STATUS_INVALID_REQUEST: + case SRB_STATUS_INVALID_PATH_ID: + case SRB_STATUS_NO_DEVICE: + case SRB_STATUS_INVALID_TARGET_ID: + /* + * These indicate an invalid address + * and really should never be seen. + * A CAM_PATH_INVALID could be + * used here but I want to run + * down retries. Do a CAM_BUSY + * since the host might be having issues. + */ + ccb->ccb_h.status |= CAM_BUSY; + break; + case SRB_STATUS_TIMEOUT: + case SRB_STATUS_COMMAND_TIMEOUT: + /* The backend has timed this out */ + ccb->ccb_h.status |= CAM_BUSY; + break; + /* Some old pSCSI errors below */ + case SRB_STATUS_SELECTION_TIMEOUT: + case SRB_STATUS_MESSAGE_REJECTED: + case SRB_STATUS_PARITY_ERROR: + case SRB_STATUS_NO_HBA: + case SRB_STATUS_DATA_OVERRUN: + case SRB_STATUS_UNEXPECTED_BUS_FREE: + case SRB_STATUS_PHASE_SEQUENCE_FAILURE: + /* + * Old pSCSI responses, should never get. + * If we do treat as a CAM_UNREC_HBA_ERROR + * which will be retried + */ + ccb->ccb_h.status |= CAM_UNREC_HBA_ERROR; + break; + case SRB_STATUS_BUS_RESET: + ccb->ccb_h.status |= CAM_SCSI_BUS_RESET; + break; + case SRB_STATUS_BAD_SRB_BLOCK_LENGTH: + /* + * The request block is malformed and + * I doubt it is from the guest. Just retry. + */ + ccb->ccb_h.status |= CAM_UNREC_HBA_ERROR; + break; + /* Not used statuses just retry */ + case SRB_STATUS_REQUEST_FLUSHED: + case SRB_STATUS_BAD_FUNCTION: + case SRB_STATUS_NOT_POWERED: + ccb->ccb_h.status |= CAM_UNREC_HBA_ERROR; + break; + case SRB_STATUS_INVALID_LUN: + /* + * Don't log an EMS for this response since + * there is no device at this LUN. This is a + * normal and expected response when a device + * is detached. + */ + ccb->ccb_h.status |= CAM_DEV_NOT_THERE; + log_error = false; + break; + case SRB_STATUS_ERROR_RECOVERY: + case SRB_STATUS_LINK_DOWN: + /* + * I don't ever expect these from + * the host but if we ever get + * retry after a delay + */ + ccb->ccb_h.status |= CAM_BUSY; + break; + default: + /* + * An undefined response assert on + * on debug builds else retry + */ + ccb->ccb_h.status |= CAM_UNREC_HBA_ERROR; + KASSERT(srb_status <= SRB_STATUS_LINK_DOWN, + ("storvsc: %s, unexpected srb_status of 0x%x", + __func__, srb_status)); + break; } - ccb->ccb_h.status |= CAM_DEV_NOT_THERE; + if (log_error) { + xpt_print(ccb->ccb_h.path, "The hypervisor's I/O adapter " + "driver received an unexpected response code 0x%x " + "for operation: %s. If this continues to occur, " + "report the condition to your hypervisor vendor so " + "they can rectify the issue.\n", srb_status, + scsi_op_desc(cmd->opcode, NULL)); + } } else { ccb->ccb_h.status |= CAM_REQ_CMP; } Modified: head/sys/dev/hyperv/storvsc/hv_vstorage.h ============================================================================== --- head/sys/dev/hyperv/storvsc/hv_vstorage.h Mon Aug 31 05:25:13 2020 (r364983) +++ head/sys/dev/hyperv/storvsc/hv_vstorage.h Mon Aug 31 09:05:45 2020 (r364984) @@ -241,12 +241,34 @@ struct vstor_packet { /** * SRB (SCSI Request Block) Status Codes */ -#define SRB_STATUS_PENDING 0x00 -#define SRB_STATUS_SUCCESS 0x01 -#define SRB_STATUS_ABORTED 0x02 -#define SRB_STATUS_ERROR 0x04 -#define SRB_STATUS_DATA_OVERRUN 0x12 -#define SRB_STATUS_INVALID_LUN 0x20 +#define SRB_STATUS_PENDING 0x00 +#define SRB_STATUS_SUCCESS 0x01 +#define SRB_STATUS_ABORTED 0x02 +#define SRB_STATUS_ABORT_FAILED 0x03 +#define SRB_STATUS_ERROR 0x04 +#define SRB_STATUS_BUSY 0x05 +#define SRB_STATUS_INVALID_REQUEST 0x06 +#define SRB_STATUS_INVALID_PATH_ID 0x07 +#define SRB_STATUS_NO_DEVICE 0x08 +#define SRB_STATUS_TIMEOUT 0x09 +#define SRB_STATUS_SELECTION_TIMEOUT 0x0A +#define SRB_STATUS_COMMAND_TIMEOUT 0x0B +#define SRB_STATUS_MESSAGE_REJECTED 0x0D +#define SRB_STATUS_BUS_RESET 0x0E +#define SRB_STATUS_PARITY_ERROR 0x0F +#define SRB_STATUS_REQUEST_SENSE_FAILED 0x10 +#define SRB_STATUS_NO_HBA 0x11 +#define SRB_STATUS_DATA_OVERRUN 0x12 +#define SRB_STATUS_UNEXPECTED_BUS_FREE 0x13 +#define SRB_STATUS_PHASE_SEQUENCE_FAILURE 0x14 +#define SRB_STATUS_BAD_SRB_BLOCK_LENGTH 0x15 +#define SRB_STATUS_REQUEST_FLUSHED 0x16 +#define SRB_STATUS_INVALID_LUN 0x20 +#define SRB_STATUS_INVALID_TARGET_ID 0x21 +#define SRB_STATUS_BAD_FUNCTION 0x22 +#define SRB_STATUS_ERROR_RECOVERY 0x23 +#define SRB_STATUS_NOT_POWERED 0x24 +#define SRB_STATUS_LINK_DOWN 0x25 /** * SRB Status Masks (can be combined with above status codes) */ From owner-svn-src-all@freebsd.org Mon Aug 31 12:14:20 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DCBF93BFC7D; Mon, 31 Aug 2020 12:14:20 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bg8JX5SK1z4RF8; Mon, 31 Aug 2020 12:14:20 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9F28E2767A; Mon, 31 Aug 2020 12:14:20 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VCEKQr091306; Mon, 31 Aug 2020 12:14:20 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VCEKao091305; Mon, 31 Aug 2020 12:14:20 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202008311214.07VCEKao091305@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 31 Aug 2020 12:14:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364985 - stable/12/libexec/rc/rc.d X-SVN-Group: stable-12 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: stable/12/libexec/rc/rc.d X-SVN-Commit-Revision: 364985 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 12:14:20 -0000 Author: trasz Date: Mon Aug 31 12:14:20 2020 New Revision: 364985 URL: https://svnweb.freebsd.org/changeset/base/364985 Log: In 13-CURRENT, the linux rc script uses "nocover" mount option to avoid mounting required filesystems twice. However, this option hasn't been MFC'd. Implement its functionality in a different way, by stating the mount point. Submitted by: sigsys@gmail.com Differential Revision: https://reviews.freebsd.org/D26217 Modified: stable/12/libexec/rc/rc.d/linux Modified: stable/12/libexec/rc/rc.d/linux ============================================================================== --- stable/12/libexec/rc/rc.d/linux Mon Aug 31 09:05:45 2020 (r364984) +++ stable/12/libexec/rc/rc.d/linux Mon Aug 31 12:14:20 2020 (r364985) @@ -15,6 +15,12 @@ rcvar="linux_enable" start_cmd="${name}_start" stop_cmd=":" +unmounted() +{ + [ `stat -f "%d" "$1"` == `stat -f "%d" "$1/.."` -a \ + `stat -f "%i" "$1"` != `stat -f "%i" "$1/.."` ] +} + linux_start() { local _emul_path _tmpdir @@ -48,11 +54,12 @@ linux_start() if checkyesno linux_mounts_enable; then _emul_path="/compat/linux" - mount -t linprocfs linprocfs "${_emul_path}/proc" - mount -t linsysfs linsysfs "${_emul_path}/sys" - mount -t devfs devfs "${_emul_path}/dev" - mount -o linrdlnk -t fdescfs fdescfs "${_emul_path}/dev/fd" - mount -o mode=1777 -t tmpfs tmpfs "${_emul_path}/dev/shm" + unmounted "${_emul_path}/proc" && mount -t linprocfs linprocfs "${_emul_path}/proc" + unmounted "${_emul_path}/sys" && mount -t linsysfs linsysfs "${_emul_path}/sys" + unmounted "${_emul_path}/dev" && mount -t devfs devfs "${_emul_path}/dev" + unmounted "${_emul_path}/dev/fd" && mount -o linrdlnk -t fdescfs fdescfs "${_emul_path}/dev/fd" + unmounted "${_emul_path}/dev/shm" && mount -o mode=1777 -t tmpfs tmpfs "${_emul_path}/dev/shm" + true fi } From owner-svn-src-all@freebsd.org Mon Aug 31 13:53:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5677B3C22A0; Mon, 31 Aug 2020 13:53:15 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgBVg1Z7Hz4Xg9; Mon, 31 Aug 2020 13:53:15 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18C638BDA; Mon, 31 Aug 2020 13:53:15 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VDrETo054084; Mon, 31 Aug 2020 13:53:14 GMT (envelope-from gallatin@FreeBSD.org) Received: (from gallatin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VDrEoi054083; Mon, 31 Aug 2020 13:53:14 GMT (envelope-from gallatin@FreeBSD.org) Message-Id: <202008311353.07VDrEoi054083@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gallatin set sender to gallatin@FreeBSD.org using -f From: Andrew Gallatin Date: Mon, 31 Aug 2020 13:53:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364986 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: gallatin X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 364986 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 13:53:15 -0000 Author: gallatin Date: Mon Aug 31 13:53:14 2020 New Revision: 364986 URL: https://svnweb.freebsd.org/changeset/base/364986 Log: make m_getm2() resilient to zone_jumbop exhaustion When the zone_jumbop is exhausted, most things using using sosend* (like sshd) will eventually fail or hang if allocations are limited to the depleted jumbop zone. This makes it imossible to communicate with a box which is under an attach which exhausts the jumbop zone. Rather than depending on the page size zone, also try cluster allocations to satisfy larger requests. This allows me to ssh to, and serve 100Gb/s of traffic from a server which under attack and has had its page-sized zone exhausted. Reviewed by: glebius, markj, rmacklem Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D26150 Modified: head/sys/kern/kern_mbuf.c Modified: head/sys/kern/kern_mbuf.c ============================================================================== --- head/sys/kern/kern_mbuf.c Mon Aug 31 12:14:20 2020 (r364985) +++ head/sys/kern/kern_mbuf.c Mon Aug 31 13:53:14 2020 (r364986) @@ -1423,21 +1423,28 @@ m_getm2(struct mbuf *m, int len, int how, short type, /* Loop and append maximum sized mbufs to the chain tail. */ while (len > 0) { - if (len > MCLBYTES) - mb = m_getjcl(how, type, (flags & M_PKTHDR), + mb = NULL; + if (len > MCLBYTES) { + mb = m_getjcl(M_NOWAIT, type, (flags & M_PKTHDR), MJUMPAGESIZE); - else if (len >= MINCLSIZE) - mb = m_getcl(how, type, (flags & M_PKTHDR)); - else if (flags & M_PKTHDR) - mb = m_gethdr(how, type); - else - mb = m_get(how, type); - /* Fail the whole operation if one mbuf can't be allocated. */ + } if (mb == NULL) { - if (nm != NULL) + if (len >= MINCLSIZE) + mb = m_getcl(how, type, (flags & M_PKTHDR)); + else if (flags & M_PKTHDR) + mb = m_gethdr(how, type); + else + mb = m_get(how, type); + + /* + * Fail the whole operation if one mbuf can't be + * allocated. + */ + if (mb == NULL) { m_freem(nm); - return (NULL); + return (NULL); + } } /* Book keeping. */ From owner-svn-src-all@freebsd.org Mon Aug 31 14:09:20 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 976A73C23EB; Mon, 31 Aug 2020 14:09:20 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgBsD1BwFz4YK1; Mon, 31 Aug 2020 14:09:19 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 07VE9C06033207; Mon, 31 Aug 2020 07:09:12 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 07VE9Ch9033206; Mon, 31 Aug 2020 07:09:12 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202008311409.07VE9Ch9033206@gndrsh.dnsmgr.net> Subject: Re: svn commit: r364321 - head/sbin/ipfw In-Reply-To: To: Ed Maste Date: Mon, 31 Aug 2020 07:09:12 -0700 (PDT) CC: "Rodney W. Grimes" , src-committers , svn-src-all , svn-src-head Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4BgBsD1BwFz4YK1 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 14:09:20 -0000 > Hrm, it seems this reply ended up in my spam folder; sorry for not > replying until now. lol Oh, bad filter :-) > > > *strchr(timestr, '\n') = '\0'; > > > bprintf(bp, "%s ", timestr); > > ^ Isnt this the +1 space? > > > > > } else { > > > - bprintf(bp, "%*s", twidth, " "); > > > + bprintf(bp, "%*s", twidth + 1, " "); > > ^missing from this string? > > Inserting an extra space in the format string would also work, sure. I > considered doing it that way but in the end decided it's not > materially more clear one way or another, so used the patch as > submitted. For me the + 1 leads to a "why is this here", where as the space in the format string clearly matches the other condition of the else. Also + 1 causes a run time computation, the extra space does not. -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Mon Aug 31 14:23:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9131E3C2D17; Mon, 31 Aug 2020 14:23:43 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgC9q3NXXz4Z83; Mon, 31 Aug 2020 14:23:43 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 57E7491D0; Mon, 31 Aug 2020 14:23:43 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VENhaZ072383; Mon, 31 Aug 2020 14:23:43 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VENgqr072378; Mon, 31 Aug 2020 14:23:42 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202008311423.07VENgqr072378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 31 Aug 2020 14:23:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364987 - stable/12/sys/vm X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/vm X-SVN-Commit-Revision: 364987 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 14:23:43 -0000 Author: markj Date: Mon Aug 31 14:23:41 2020 New Revision: 364987 URL: https://svnweb.freebsd.org/changeset/base/364987 Log: MFC r364302, r364306: Remove the VM map zone. Modified: stable/12/sys/vm/vm_extern.h stable/12/sys/vm/vm_init.c stable/12/sys/vm/vm_kern.c stable/12/sys/vm/vm_kern.h stable/12/sys/vm/vm_map.c stable/12/sys/vm/vm_map.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/vm/vm_extern.h ============================================================================== --- stable/12/sys/vm/vm_extern.h Mon Aug 31 13:53:14 2020 (r364986) +++ stable/12/sys/vm/vm_extern.h Mon Aug 31 14:23:41 2020 (r364987) @@ -77,8 +77,8 @@ void kmem_unback(vm_object_t, vm_offset_t, vm_size_t); /* Bootstrapping. */ void kmem_bootstrap_free(vm_offset_t, vm_size_t); -vm_map_t kmem_suballoc(vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t, - boolean_t); +void kmem_subinit(vm_map_t, vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t, + bool); void kmem_init(vm_offset_t, vm_offset_t); void kmem_init_zero_region(void); void kmeminit(void); Modified: stable/12/sys/vm/vm_init.c ============================================================================== --- stable/12/sys/vm/vm_init.c Mon Aug 31 13:53:14 2020 (r364986) +++ stable/12/sys/vm/vm_init.c Mon Aug 31 14:23:41 2020 (r364987) @@ -273,8 +273,8 @@ again: exec_map_entries = 2 * mp_ncpus + 4; #endif exec_map_entry_size = round_page(PATH_MAX + ARG_MAX); - exec_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, - exec_map_entries * exec_map_entry_size + 64 * PAGE_SIZE, FALSE); - pipe_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, maxpipekva, - FALSE); + kmem_subinit(exec_map, kernel_map, &minaddr, &maxaddr, + exec_map_entries * exec_map_entry_size + 64 * PAGE_SIZE, false); + kmem_subinit(pipe_map, kernel_map, &minaddr, &maxaddr, maxpipekva, + false); } Modified: stable/12/sys/vm/vm_kern.c ============================================================================== --- stable/12/sys/vm/vm_kern.c Mon Aug 31 13:53:14 2020 (r364986) +++ stable/12/sys/vm/vm_kern.c Mon Aug 31 14:23:41 2020 (r364987) @@ -97,9 +97,9 @@ __FBSDID("$FreeBSD$"); #include #include -vm_map_t kernel_map; -vm_map_t exec_map; -vm_map_t pipe_map; +struct vm_map kernel_map_store; +struct vm_map exec_map_store; +struct vm_map pipe_map_store; const void *zero_region; CTASSERT((ZERO_REGION_SIZE & PAGE_MASK) == 0); @@ -357,9 +357,9 @@ kmem_alloc_contig_domainset(struct domainset *ds, vm_s } /* - * kmem_suballoc: + * kmem_subinit: * - * Allocates a map to manage a subrange + * Initializes a map to manage a subrange * of the kernel virtual address space. * * Arguments are as follows: @@ -369,12 +369,11 @@ kmem_alloc_contig_domainset(struct domainset *ds, vm_s * size Size of range to find * superpage_align Request that min is superpage aligned */ -vm_map_t -kmem_suballoc(vm_map_t parent, vm_offset_t *min, vm_offset_t *max, - vm_size_t size, boolean_t superpage_align) +void +kmem_subinit(vm_map_t map, vm_map_t parent, vm_offset_t *min, vm_offset_t *max, + vm_size_t size, bool superpage_align) { int ret; - vm_map_t result; size = round_page(size); @@ -383,14 +382,11 @@ kmem_suballoc(vm_map_t parent, vm_offset_t *min, vm_of VMFS_SUPER_SPACE : VMFS_ANY_SPACE, VM_PROT_ALL, VM_PROT_ALL, MAP_ACC_NO_CHARGE); if (ret != KERN_SUCCESS) - panic("kmem_suballoc: bad status return of %d", ret); + panic("kmem_subinit: bad status return of %d", ret); *max = *min + size; - result = vm_map_create(vm_map_pmap(parent), *min, *max); - if (result == NULL) - panic("kmem_suballoc: cannot create submap"); - if (vm_map_submap(parent, *min, *max, result) != KERN_SUCCESS) - panic("kmem_suballoc: unable to change range to submap"); - return (result); + vm_map_init(map, vm_map_pmap(parent), *min, *max); + if (vm_map_submap(parent, *min, *max, map) != KERN_SUCCESS) + panic("kmem_subinit: unable to change range to submap"); } /* @@ -746,15 +742,13 @@ kva_import_domain(void *arena, vmem_size_t size, int f void kmem_init(vm_offset_t start, vm_offset_t end) { - vm_map_t m; int domain; - m = vm_map_create(kernel_pmap, VM_MIN_KERNEL_ADDRESS, end); - m->system_map = 1; - vm_map_lock(m); + vm_map_init(kernel_map, kernel_pmap, VM_MIN_KERNEL_ADDRESS, end); + kernel_map->system_map = 1; + vm_map_lock(kernel_map); /* N.B.: cannot use kgdb to debug, starting with this assignment ... */ - kernel_map = m; - (void) vm_map_insert(m, NULL, (vm_ooffset_t) 0, + (void) vm_map_insert(kernel_map, NULL, (vm_ooffset_t) 0, #ifdef __amd64__ KERNBASE, #else @@ -762,7 +756,7 @@ kmem_init(vm_offset_t start, vm_offset_t end) #endif start, VM_PROT_ALL, VM_PROT_ALL, MAP_NOFAULT); /* ... and ending with the completion of the above `insert' */ - vm_map_unlock(m); + vm_map_unlock(kernel_map); /* * Initialize the kernel_arena. This can grow on demand. Modified: stable/12/sys/vm/vm_kern.h ============================================================================== --- stable/12/sys/vm/vm_kern.h Mon Aug 31 13:53:14 2020 (r364986) +++ stable/12/sys/vm/vm_kern.h Mon Aug 31 14:23:41 2020 (r364987) @@ -66,9 +66,12 @@ #define _VM_VM_KERN_H_ /* Kernel memory management definitions. */ -extern vm_map_t kernel_map; -extern vm_map_t exec_map; -extern vm_map_t pipe_map; +extern struct vm_map kernel_map_store; +#define kernel_map (&kernel_map_store) +extern struct vm_map exec_map_store; +#define exec_map (&exec_map_store) +extern struct vm_map pipe_map_store; +#define pipe_map (&pipe_map_store) extern struct vmem *kernel_arena; extern struct vmem *kmem_arena; extern struct vmem *buffer_arena; Modified: stable/12/sys/vm/vm_map.c ============================================================================== --- stable/12/sys/vm/vm_map.c Mon Aug 31 13:53:14 2020 (r364986) +++ stable/12/sys/vm/vm_map.c Mon Aug 31 14:23:41 2020 (r364987) @@ -128,10 +128,8 @@ __FBSDID("$FreeBSD$"); static struct mtx map_sleep_mtx; static uma_zone_t mapentzone; static uma_zone_t kmapentzone; -static uma_zone_t mapzone; static uma_zone_t vmspace_zone; static int vmspace_zinit(void *mem, int size, int flags); -static int vm_map_zinit(void *mem, int ize, int flags); static void _vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max); static void vm_map_entry_deallocate(vm_map_entry_t entry, boolean_t system_map); @@ -142,7 +140,6 @@ static int vm_map_growstack(vm_map_t map, vm_offset_t static void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags); #ifdef INVARIANTS -static void vm_map_zdtor(void *mem, int size, void *arg); static void vmspace_zdtor(void *mem, int size, void *arg); #endif static int vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, @@ -198,14 +195,6 @@ void vm_map_startup(void) { mtx_init(&map_sleep_mtx, "vm map sleep mutex", NULL, MTX_DEF); - mapzone = uma_zcreate("MAP", sizeof(struct vm_map), NULL, -#ifdef INVARIANTS - vm_map_zdtor, -#else - NULL, -#endif - vm_map_zinit, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_prealloc(mapzone, MAX_KMAP); kmapentzone = uma_zcreate("KMAP ENTRY", sizeof(struct vm_map_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_MTXCLASS | UMA_ZONE_VM); @@ -224,24 +213,16 @@ static int vmspace_zinit(void *mem, int size, int flags) { struct vmspace *vm; + vm_map_t map; vm = (struct vmspace *)mem; + map = &vm->vm_map; - vm->vm_map.pmap = NULL; - (void)vm_map_zinit(&vm->vm_map, sizeof(vm->vm_map), flags); - PMAP_LOCK_INIT(vmspace_pmap(vm)); - return (0); -} - -static int -vm_map_zinit(void *mem, int size, int flags) -{ - vm_map_t map; - - map = (vm_map_t)mem; memset(map, 0, sizeof(*map)); - mtx_init(&map->system_mtx, "vm map (system)", NULL, MTX_DEF | MTX_DUPOK); + mtx_init(&map->system_mtx, "vm map (system)", NULL, + MTX_DEF | MTX_DUPOK); sx_init(&map->lock, "vm map (user)"); + PMAP_LOCK_INIT(vmspace_pmap(vm)); return (0); } @@ -252,29 +233,16 @@ vmspace_zdtor(void *mem, int size, void *arg) struct vmspace *vm; vm = (struct vmspace *)mem; - - vm_map_zdtor(&vm->vm_map, sizeof(vm->vm_map), arg); + KASSERT(vm->vm_map.nentries == 0, + ("vmspace %p nentries == %d on free", vm, vm->vm_map.nentries)); + KASSERT(vm->vm_map.size == 0, + ("vmspace %p size == %ju on free", vm, (uintmax_t)vm->vm_map.size)); } -static void -vm_map_zdtor(void *mem, int size, void *arg) -{ - vm_map_t map; - - map = (vm_map_t)mem; - KASSERT(map->nentries == 0, - ("map %p nentries == %d on free.", - map, map->nentries)); - KASSERT(map->size == 0, - ("map %p size == %lu on free.", - map, (unsigned long)map->size)); -} #endif /* INVARIANTS */ /* * Allocate a vmspace structure, including a vm_map and pmap, * and initialize those structures. The refcnt is set to 1. - * - * If 'pinit' is NULL then the embedded pmap is initialized via pmap_pinit(). */ struct vmspace * vmspace_alloc(vm_offset_t min, vm_offset_t max, pmap_pinit_t pinit) @@ -878,24 +846,6 @@ vmspace_resident_count(struct vmspace *vmspace) } /* - * vm_map_create: - * - * Creates and returns a new empty VM map with - * the given physical map structure, and having - * the given lower and upper address bounds. - */ -vm_map_t -vm_map_create(pmap_t pmap, vm_offset_t min, vm_offset_t max) -{ - vm_map_t result; - - result = uma_zalloc(mapzone, M_WAITOK); - CTR1(KTR_VM, "vm_map_create: %p", result); - _vm_map_init(result, pmap, min, max); - return (result); -} - -/* * Initialize an existing vm_map structure * such as that in the vmspace structure. */ @@ -922,8 +872,9 @@ vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min { _vm_map_init(map, pmap, min, max); - mtx_init(&map->system_mtx, "system map", NULL, MTX_DEF | MTX_DUPOK); - sx_init(&map->lock, "user map"); + mtx_init(&map->system_mtx, "vm map (system)", NULL, + MTX_DEF | MTX_DUPOK); + sx_init(&map->lock, "vm map (user)"); } /* Modified: stable/12/sys/vm/vm_map.h ============================================================================== --- stable/12/sys/vm/vm_map.h Mon Aug 31 13:53:14 2020 (r364986) +++ stable/12/sys/vm/vm_map.h Mon Aug 31 14:23:41 2020 (r364987) @@ -346,10 +346,6 @@ bool vm_map_range_valid_KBI(vm_map_t map, vm_offset_t long vmspace_resident_count(struct vmspace *vmspace); #endif /* _KERNEL */ - -/* XXX: number of kernel maps to statically allocate */ -#define MAX_KMAP 10 - /* * Copy-on-write flags for vm_map operations */ @@ -413,7 +409,6 @@ long vmspace_resident_count(struct vmspace *vmspace); #ifdef _KERNEL boolean_t vm_map_check_protection (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t); -vm_map_t vm_map_create(pmap_t, vm_offset_t, vm_offset_t); int vm_map_delete(vm_map_t, vm_offset_t, vm_offset_t); int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, vm_size_t, vm_offset_t, int, vm_prot_t, vm_prot_t, int); From owner-svn-src-all@freebsd.org Mon Aug 31 14:44:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 31EBA3C3A90; Mon, 31 Aug 2020 14:44:58 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgCfL0bNzz4bSJ; Mon, 31 Aug 2020 14:44:58 +0000 (UTC) (envelope-from se@freebsd.org) Received: from Stefans-MBP-WLAN.fritz.box (p200300cd5f1a2a00693712683f862fe0.dip0.t-ipconnect.de [IPv6:2003:cd:5f1a:2a00:6937:1268:3f86:2fe0]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 347C82EEAB; Mon, 31 Aug 2020 14:44:57 +0000 (UTC) (envelope-from se@freebsd.org) To: rgrimes@freebsd.org Cc: src-committers , svn-src-all , svn-src-head , Ed Maste References: <202008311409.07VE9Ch9033206@gndrsh.dnsmgr.net> From: Stefan Esser Subject: Re: svn commit: r364321 - head/sbin/ipfw Message-ID: <4e233a60-33cc-69db-3f2a-faf3b0c8d4f0@freebsd.org> Date: Mon, 31 Aug 2020 16:44:55 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.2.1 MIME-Version: 1.0 In-Reply-To: <202008311409.07VE9Ch9033206@gndrsh.dnsmgr.net> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0gFKOi6mQqYhil7lFogP9OYGYXnfkj6Tl" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 14:44:58 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0gFKOi6mQqYhil7lFogP9OYGYXnfkj6Tl Content-Type: multipart/mixed; boundary="7gs3ivT7ODwDWMxtCYESrYXquYtN34LIB"; protected-headers="v1" From: Stefan Esser To: rgrimes@freebsd.org Cc: src-committers , svn-src-all , svn-src-head , Ed Maste Message-ID: <4e233a60-33cc-69db-3f2a-faf3b0c8d4f0@freebsd.org> Subject: Re: svn commit: r364321 - head/sbin/ipfw References: <202008311409.07VE9Ch9033206@gndrsh.dnsmgr.net> In-Reply-To: <202008311409.07VE9Ch9033206@gndrsh.dnsmgr.net> --7gs3ivT7ODwDWMxtCYESrYXquYtN34LIB Content-Type: multipart/mixed; boundary="------------99325335DA063CBDB4C12FA2" Content-Language: en-US This is a multi-part message in MIME format. --------------99325335DA063CBDB4C12FA2 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: quoted-printable Am 31.08.20 um 16:09 schrieb Rodney W. Grimes: >> Hrm, it seems this reply ended up in my spam folder; sorry for not >> replying until now. >=20 > lol Oh, bad filter :-) >=20 >>>> *strchr(timestr, '\n') =3D '\0'; >>>> bprintf(bp, "%s ", timestr); >>> ^ Isnt this the +1 space? >>> >>>> } else { >>>> - bprintf(bp, "%*s", twidth, " "); >>>> + bprintf(bp, "%*s", twidth + 1, " "); >>> ^missing from this string? >> >> Inserting an extra space in the format string would also work, sure. I= >> considered doing it that way but in the end decided it's not >> materially more clear one way or another, so used the patch as >> submitted. >=20 > For me the + 1 leads to a "why is this here", where as the space > in the format string clearly matches the other condition of the else. In this case it doesn't seem to make much of a difference, since the string passed is just a blank character (and it does not make any difference whether a blank is inserted before or behind it). But in general, I'd rather see "%*s " as the format (which makes it clear, that the blank is inserted behind the string argument referenced by %s, not to the left of it - or " %*s" for the other placement of the extra blank). But in this particular case I'd use printf(bp, "%*s ", twidth, ""); since there is no need to pass a non-zero length argument for %s and I'd think that the purpose of the format string is to make the columns line up and then to provide one additional blank as a separator for maximum length values. Adding 1 to the width argument of "%*s" adds blanks to the left of the string, which is obvious given the semantics of the format string, but still takes some thinking compared to trivially seeing the place where the extra blank is put in a format string ... > Also + 1 causes a run time computation, the extra space does not. Well, the parsing of the extra blank in the format string can be assumed to cost more cycles than the increment of a variable plus the extra loop iteration it causes for the alignment blanks that are written. But the code length will be shorter with the blank in the format string and the extra cycles will be irrelevant ... Regards, STefan --------------99325335DA063CBDB4C12FA2-- --7gs3ivT7ODwDWMxtCYESrYXquYtN34LIB-- --0gFKOi6mQqYhil7lFogP9OYGYXnfkj6Tl Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFqEEo3HqZZwL7MgrcVMTR+u171r99UQFAl9NDOcFAwAAAAAACgkQR+u171r99UTX Uwf/XuZej6pwHQTRPhhEmaI2kgkVK+2j1RXeZJX6fFqpCKM0f2aGMpQuVeNIeBXaZKoJQH2yPv0x GowThwwF94r06wU/1LP8xtVSnwdFWUtXvUNLAneyTtGGUuP9T9/KXxarQO/QDWM7ajlvunXG1Bve zFxUc/sWZVaTcSBfLsb9Y+KnnMGIJc8J9c+Wab6bWdkmBTosBv6oeodzlh3kBNja+I+TdlDhP02X 2/d6+qFzMbWRiXF+BtR2/uS9aHhEUq9fRfXlzbHteLSg2fnX2nPUAcCRH8VQ/glZARfdKJZNzdB6 ckZIOQVD1K5iNBBQkHkiA6W66tj8BxV/wfFWKvTgTg== =ec9/ -----END PGP SIGNATURE----- --0gFKOi6mQqYhil7lFogP9OYGYXnfkj6Tl-- From owner-svn-src-all@freebsd.org Mon Aug 31 14:47:23 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DE7A73C3AA9; Mon, 31 Aug 2020 14:47:23 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgCj75Ysqz4bmW; Mon, 31 Aug 2020 14:47:23 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A245596AD; Mon, 31 Aug 2020 14:47:23 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VElN4Y085288; Mon, 31 Aug 2020 14:47:23 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VElNVt085287; Mon, 31 Aug 2020 14:47:23 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202008311447.07VElNVt085287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 31 Aug 2020 14:47:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364988 - stable/12/sys/vm X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/vm X-SVN-Commit-Revision: 364988 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 14:47:23 -0000 Author: markj Date: Mon Aug 31 14:47:23 2020 New Revision: 364988 URL: https://svnweb.freebsd.org/changeset/base/364988 Log: Stop accounting for MAX_KMAP when allocating UMA boot pages. With r364987 kernel maps are allocated statically. In head, a different mechanism is used to bootstrap UMA. This is a direct commit to stable/12. Reported by: Jenkins Modified: stable/12/sys/vm/vm_page.c Modified: stable/12/sys/vm/vm_page.c ============================================================================== --- stable/12/sys/vm/vm_page.c Mon Aug 31 14:23:41 2020 (r364987) +++ stable/12/sys/vm/vm_page.c Mon Aug 31 14:47:23 2020 (r364988) @@ -590,9 +590,6 @@ vm_page_startup(vm_offset_t vaddr) #ifndef UMA_MD_SMALL_ALLOC /* vmem_startup() calls uma_prealloc(). */ boot_pages += vmem_startup_count(); - /* vm_map_startup() calls uma_prealloc(). */ - boot_pages += howmany(MAX_KMAP, - UMA_SLAB_SPACE / sizeof(struct vm_map)); /* * Before going fully functional kmem_init() does allocation From owner-svn-src-all@freebsd.org Mon Aug 31 15:03:24 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9CC093C3C67; Mon, 31 Aug 2020 15:03:24 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgD3c3hpPz4cLB; Mon, 31 Aug 2020 15:03:24 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 625199C8E; Mon, 31 Aug 2020 15:03:24 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VF3Opo097328; Mon, 31 Aug 2020 15:03:24 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VF3OrC097327; Mon, 31 Aug 2020 15:03:24 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <202008311503.07VF3OrC097327@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Mon, 31 Aug 2020 15:03:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364989 - head/sys/dev/jedec_dimm X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head/sys/dev/jedec_dimm X-SVN-Commit-Revision: 364989 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 15:03:24 -0000 Author: vangyzen Date: Mon Aug 31 15:03:23 2020 New Revision: 364989 URL: https://svnweb.freebsd.org/changeset/base/364989 Log: jedec_dimm: fix array overrun Coverity detected the overrunning of sc->part_str. Submitted by: bret_ketchum@dell.com Reported by: Coverity MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D26145 Modified: head/sys/dev/jedec_dimm/jedec_dimm.c Modified: head/sys/dev/jedec_dimm/jedec_dimm.c ============================================================================== --- head/sys/dev/jedec_dimm/jedec_dimm.c Mon Aug 31 14:47:23 2020 (r364988) +++ head/sys/dev/jedec_dimm/jedec_dimm.c Mon Aug 31 15:03:23 2020 (r364989) @@ -795,7 +795,7 @@ jedec_dimm_field_to_str(struct jedec_dimm_softc *sc, c /* If we're dealing with ASCII, convert trailing spaces to NULs. */ if (ascii) { - for (i = dstsz; i > 0; i--) { + for (i = dstsz - 1; i > 0; i--) { if (dst[i] == ' ') { dst[i] = 0; } else if (dst[i] == 0) { From owner-svn-src-all@freebsd.org Mon Aug 31 15:07:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BAE973C4121; Mon, 31 Aug 2020 15:07:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgD842C19z4cyl; Mon, 31 Aug 2020 15:07:16 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E45029A5B; Mon, 31 Aug 2020 15:07:15 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VF7Fcm097926; Mon, 31 Aug 2020 15:07:15 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VF7Fcf097925; Mon, 31 Aug 2020 15:07:15 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202008311507.07VF7Fcf097925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 31 Aug 2020 15:07:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364990 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 364990 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 15:07:16 -0000 Author: kevans Date: Mon Aug 31 15:07:15 2020 New Revision: 364990 URL: https://svnweb.freebsd.org/changeset/base/364990 Log: posixshm: fix setting of shm_flags Noted in D24652, we currently set shmfd->shm_flags on every shm_open()/shm_open2(). This wasn't properly thought out; one shouldn't be able to specify incompatible flags on subsequent opens of non-anon shm. Move setting of shm_flags explicitly to the two places shmfd are created, as we do with seals, and validate when we're opening a pre-existing mapping that we've either passed no flags or we've passed the exact same flags as the first time. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D26242 Modified: head/sys/kern/uipc_shm.c Modified: head/sys/kern/uipc_shm.c ============================================================================== --- head/sys/kern/uipc_shm.c Mon Aug 31 15:03:23 2020 (r364989) +++ head/sys/kern/uipc_shm.c Mon Aug 31 15:07:15 2020 (r364990) @@ -833,6 +833,7 @@ kern_shm_open2(struct thread *td, const char *userpath } shmfd = shm_alloc(td->td_ucred, cmode); shmfd->shm_seals = initial_seals; + shmfd->shm_flags = shmflags; } else { error = shm_copyin_path(td, userpath, &path); if (error != 0) { @@ -855,6 +856,7 @@ kern_shm_open2(struct thread *td, const char *userpath #endif shmfd = shm_alloc(td->td_ucred, cmode); shmfd->shm_seals = initial_seals; + shmfd->shm_flags = shmflags; shm_insert(path, fnv, shmfd); #ifdef MAC } @@ -898,6 +900,8 @@ kern_shm_open2(struct thread *td, const char *userpath else if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) error = EEXIST; + else if (shmflags != 0 && shmflags != shmfd->shm_flags) + error = EINVAL; else { #ifdef MAC error = mac_posixshm_check_open(td->td_ucred, @@ -947,7 +951,6 @@ kern_shm_open2(struct thread *td, const char *userpath } } - shmfd->shm_flags = shmflags; finit(fp, FFLAGS(flags & O_ACCMODE), DTYPE_SHM, shmfd, &shm_ops); td->td_retval[0] = fd; From owner-svn-src-all@freebsd.org Mon Aug 31 15:26:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 865853C42ED; Mon, 31 Aug 2020 15:26:02 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgDYk2tKRz4f5J; Mon, 31 Aug 2020 15:26:02 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41B519F28; Mon, 31 Aug 2020 15:26:02 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VFQ29F010174; Mon, 31 Aug 2020 15:26:02 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VFQ2Bo010173; Mon, 31 Aug 2020 15:26:02 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <202008311526.07VFQ2Bo010173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Mon, 31 Aug 2020 15:26:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364991 - head/contrib/ofed/opensm/opensm X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head/contrib/ofed/opensm/opensm X-SVN-Commit-Revision: 364991 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 15:26:02 -0000 Author: vangyzen Date: Mon Aug 31 15:26:01 2020 New Revision: 364991 URL: https://svnweb.freebsd.org/changeset/base/364991 Log: opensm: Fix a possible dereference of a NULL pointer Reported by: Coverity Reviewed by: hselasky, kib MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D26233 Modified: head/contrib/ofed/opensm/opensm/osm_perfmgr.c Modified: head/contrib/ofed/opensm/opensm/osm_perfmgr.c ============================================================================== --- head/contrib/ofed/opensm/opensm/osm_perfmgr.c Mon Aug 31 15:07:15 2020 (r364990) +++ head/contrib/ofed/opensm/opensm/osm_perfmgr.c Mon Aug 31 15:26:01 2020 (r364991) @@ -1311,6 +1311,14 @@ static void perfmgr_check_overflow(osm_perfmgr_t * pm, cl_plock_acquire(&pm->osm->lock); p_node = osm_get_node_by_guid(pm->subn, cl_hton64(mon_node->guid)); + if (!p_node) { + OSM_LOG(pm->log, OSM_LOG_ERROR, + "ERR 5407: Node \"%s\" (guid 0x%" PRIx64 + ") no longer exists so removing from PerfMgr" + " monitoring\n", + mon_node->name, mon_node->guid); + goto Exit; + } lid = get_lid(p_node, port, mon_node); cl_plock_release(&pm->osm->lock); if (lid == 0) { @@ -1402,6 +1410,14 @@ static void perfmgr_check_pce_overflow(osm_perfmgr_t * cl_plock_acquire(&pm->osm->lock); p_node = osm_get_node_by_guid(pm->subn, cl_hton64(mon_node->guid)); + if (!p_node) { + OSM_LOG(pm->log, OSM_LOG_ERROR, + "ERR 5407: Node \"%s\" (guid 0x%" PRIx64 + ") no longer exists so removing from PerfMgr" + " monitoring\n", + mon_node->name, mon_node->guid); + goto Exit; + } lid = get_lid(p_node, port, mon_node); cl_plock_release(&pm->osm->lock); if (lid == 0) { From owner-svn-src-all@freebsd.org Mon Aug 31 15:30:26 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 73A543C4735; Mon, 31 Aug 2020 15:30:26 +0000 (UTC) (envelope-from eric@vangyzen.net) Received: from smtp.vangyzen.net (hotblack.vangyzen.net [IPv6:2607:fc50:1000:7400:216:3eff:fe72:314f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgDfn52Vtz4fDm; Mon, 31 Aug 2020 15:30:25 +0000 (UTC) (envelope-from eric@vangyzen.net) Received: from disco.vangyzen.net (unknown [70.97.188.230]) by smtp.vangyzen.net (Postfix) with ESMTPSA id C2D1156487; Mon, 31 Aug 2020 10:30:17 -0500 (CDT) Subject: Re: svn commit: r364991 - head/contrib/ofed/opensm/opensm To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008311526.07VFQ2Bo010173@repo.freebsd.org> From: Eric van Gyzen Message-ID: <99751146-ed8f-b901-e02a-e94c898e8cd0@vangyzen.net> Date: Mon, 31 Aug 2020 10:30:13 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: <202008311526.07VFQ2Bo010173@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BgDfn52Vtz4fDm X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of eric@vangyzen.net designates 2607:fc50:1000:7400:216:3eff:fe72:314f as permitted sender) smtp.mailfrom=eric@vangyzen.net X-Spamd-Result: default: False [-2.43 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[eric]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; R_SPF_ALLOW(-0.20)[+a]; NEURAL_HAM_LONG(-0.94)[-0.937]; DMARC_NA(0.00)[vangyzen.net]; NEURAL_HAM_SHORT(-0.21)[-0.214]; NEURAL_HAM_MEDIUM(-0.97)[-0.975]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:36236, ipnet:2607:fc50:1000::/36, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 15:30:26 -0000 On 8/31/20 10:26 AM, Eric van Gyzen wrote: > Author: vangyzen > Date: Mon Aug 31 15:26:01 2020 > New Revision: 364991 > URL: https://svnweb.freebsd.org/changeset/base/364991 > > Log: > opensm: Fix a possible dereference of a NULL pointer > Submitted by: bret_ketchum@dell.com > Reported by: Coverity > Reviewed by: hselasky, kib > MFC after: 2 weeks > Sponsored by: Dell EMC Isilon > Differential Revision: https://reviews.freebsd.org/D26233 > > Modified: > head/contrib/ofed/opensm/opensm/osm_perfmgr.c > > Modified: head/contrib/ofed/opensm/opensm/osm_perfmgr.c > ============================================================================== > --- head/contrib/ofed/opensm/opensm/osm_perfmgr.c Mon Aug 31 15:07:15 2020 (r364990) > +++ head/contrib/ofed/opensm/opensm/osm_perfmgr.c Mon Aug 31 15:26:01 2020 (r364991) > @@ -1311,6 +1311,14 @@ static void perfmgr_check_overflow(osm_perfmgr_t * pm, > cl_plock_acquire(&pm->osm->lock); > p_node = > osm_get_node_by_guid(pm->subn, cl_hton64(mon_node->guid)); > + if (!p_node) { > + OSM_LOG(pm->log, OSM_LOG_ERROR, > + "ERR 5407: Node \"%s\" (guid 0x%" PRIx64 > + ") no longer exists so removing from PerfMgr" > + " monitoring\n", > + mon_node->name, mon_node->guid); > + goto Exit; > + } > lid = get_lid(p_node, port, mon_node); > cl_plock_release(&pm->osm->lock); > if (lid == 0) { > @@ -1402,6 +1410,14 @@ static void perfmgr_check_pce_overflow(osm_perfmgr_t * > cl_plock_acquire(&pm->osm->lock); > p_node = > osm_get_node_by_guid(pm->subn, cl_hton64(mon_node->guid)); > + if (!p_node) { > + OSM_LOG(pm->log, OSM_LOG_ERROR, > + "ERR 5407: Node \"%s\" (guid 0x%" PRIx64 > + ") no longer exists so removing from PerfMgr" > + " monitoring\n", > + mon_node->name, mon_node->guid); > + goto Exit; > + } > lid = get_lid(p_node, port, mon_node); > cl_plock_release(&pm->osm->lock); > if (lid == 0) { > From owner-svn-src-all@freebsd.org Mon Aug 31 15:31:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1BB553C4749; Mon, 31 Aug 2020 15:31:18 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgDgn6fnzz4fT5; Mon, 31 Aug 2020 15:31:17 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7E389FA5; Mon, 31 Aug 2020 15:31:17 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VFVHWT011162; Mon, 31 Aug 2020 15:31:17 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VFVHo4011161; Mon, 31 Aug 2020 15:31:17 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <202008311531.07VFVHo4011161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Mon, 31 Aug 2020 15:31:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364992 - head/sys/fs/nfsserver X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head/sys/fs/nfsserver X-SVN-Commit-Revision: 364992 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 15:31:18 -0000 Author: vangyzen Date: Mon Aug 31 15:31:17 2020 New Revision: 364992 URL: https://svnweb.freebsd.org/changeset/base/364992 Log: Fix nfsrvd_locku memory leak Coverity detected memory leak fix. Submitted by: bret_ketchum@dell.com Reported by: Coverity Reviewed by: rmacklem MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D26231 Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdserv.c Mon Aug 31 15:26:01 2020 (r364991) +++ head/sys/fs/nfsserver/nfs_nfsdserv.c Mon Aug 31 15:31:17 2020 (r364992) @@ -2720,6 +2720,8 @@ nfsrvd_locku(struct nfsrv_descript *nd, __unused int i stp->ls_stateid.seqid = 0; } else { nd->nd_repstat = NFSERR_BADSTATEID; + free(stp, M_NFSDSTATE); + free(lop, M_NFSDLOCK); goto nfsmout; } } From owner-svn-src-all@freebsd.org Mon Aug 31 15:32:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C48C13C467F; Mon, 31 Aug 2020 15:32:46 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgDjV4VvGz4fvb; Mon, 31 Aug 2020 15:32:46 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7EC37A121; Mon, 31 Aug 2020 15:32:46 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VFWkBQ016024; Mon, 31 Aug 2020 15:32:46 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VFWkDi016023; Mon, 31 Aug 2020 15:32:46 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202008311532.07VFWkDi016023@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 31 Aug 2020 15:32:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364993 - in head/sys/dev: rtwn/usb usb X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head/sys/dev: rtwn/usb usb X-SVN-Commit-Revision: 364993 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 15:32:46 -0000 Author: markj Date: Mon Aug 31 15:32:45 2020 New Revision: 364993 URL: https://svnweb.freebsd.org/changeset/base/364993 Log: rtwn(4): Add support for the Belkin N300. PR: 249034 Submitted by: Salvador Martínez Mármol MFC after: 1 week Modified: head/sys/dev/rtwn/usb/rtwn_usb_attach.h head/sys/dev/usb/usbdevs Modified: head/sys/dev/rtwn/usb/rtwn_usb_attach.h ============================================================================== --- head/sys/dev/rtwn/usb/rtwn_usb_attach.h Mon Aug 31 15:31:17 2020 (r364992) +++ head/sys/dev/rtwn/usb/rtwn_usb_attach.h Mon Aug 31 15:32:45 2020 (r364993) @@ -49,6 +49,7 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = { RTWN_RTL8192CU_DEV(AZUREWAVE, RTL8188CE_2), RTWN_RTL8192CU_DEV(AZUREWAVE, RTL8188CU), RTWN_RTL8192CU_DEV(BELKIN, F7D2102), + RTWN_RTL8192CU_DEV(BELKIN, F9L1004V1), RTWN_RTL8192CU_DEV(BELKIN, RTL8188CU), RTWN_RTL8192CU_DEV(BELKIN, RTL8192CU), RTWN_RTL8192CU_DEV(CHICONY, RTL8188CUS_1), Modified: head/sys/dev/usb/usbdevs ============================================================================== --- head/sys/dev/usb/usbdevs Mon Aug 31 15:31:17 2020 (r364992) +++ head/sys/dev/usb/usbdevs Mon Aug 31 15:32:45 2020 (r364993) @@ -1378,6 +1378,7 @@ product BELKIN F6C900UNV 0x0900 F6C900-UNV product BELKIN F6C100UNV 0x0910 F6C100-UNV product BELKIN F6C120UNV 0x0912 F6C120-UNV UPS product BELKIN F6C800UNV 0x0980 F6C800-UNV +product BELKIN F9L1004V1 0x1004 N300 Wireless Adapter product BELKIN F6C1100UNV 0x1100 F6C1100-UNV, F6C1200-UNV product BELKIN F5U120 0x1203 F5U120-PC Hub product BELKIN RTL8188CU 0x1102 RTL8188CU Wireless Adapter From owner-svn-src-all@freebsd.org Mon Aug 31 15:55:29 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC7563C532E; Mon, 31 Aug 2020 15:55:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgFCj63HYz3S7W; Mon, 31 Aug 2020 15:55:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE4D49F7D; Mon, 31 Aug 2020 15:55:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VFtTnm028658; Mon, 31 Aug 2020 15:55:29 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VFtT8o028657; Mon, 31 Aug 2020 15:55:29 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202008311555.07VFtT8o028657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 31 Aug 2020 15:55:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364994 - head/sbin/dhclient X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sbin/dhclient X-SVN-Commit-Revision: 364994 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 15:55:30 -0000 Author: emaste Date: Mon Aug 31 15:55:29 2020 New Revision: 364994 URL: https://svnweb.freebsd.org/changeset/base/364994 Log: dhclient: improve error handling parsing option 119 Reported by: Shlomi Oberman, JSOF Submitted by: delphij Reviewed by: markj Tested by: markj Modified: head/sbin/dhclient/options.c Modified: head/sbin/dhclient/options.c ============================================================================== --- head/sbin/dhclient/options.c Mon Aug 31 15:32:45 2020 (r364993) +++ head/sbin/dhclient/options.c Mon Aug 31 15:55:29 2020 (r364994) @@ -298,6 +298,8 @@ find_search_domain_name_len(struct option_data *option pointed_len = find_search_domain_name_len(option, &pointer); + if (pointed_len < 0) + return (-1); domain_name_len += pointed_len; *offset = i + 2; From owner-svn-src-all@freebsd.org Mon Aug 31 15:59:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 41F0B3C562D; Mon, 31 Aug 2020 15:59:18 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgFJ6031jz3SYV; Mon, 31 Aug 2020 15:59:18 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C1973A5EC; Mon, 31 Aug 2020 15:59:17 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VFxH3g028992; Mon, 31 Aug 2020 15:59:17 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VFxHa8028991; Mon, 31 Aug 2020 15:59:17 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202008311559.07VFxHa8028991@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 31 Aug 2020 15:59:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364995 - head/sbin/ggate/ggated X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sbin/ggate/ggated X-SVN-Commit-Revision: 364995 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 15:59:18 -0000 Author: markj Date: Mon Aug 31 15:59:17 2020 New Revision: 364995 URL: https://svnweb.freebsd.org/changeset/base/364995 Log: ggated(8): Avoid doubly opening the requested disk device. - Initialize the disk device fd field in connection_new(). - Close the disk device after handing the connection over to a child worker. - Avoid re-opening a disk device for each connection from the same client, avoiding an fd leak. PR: 132845 Submitted by: Yoshihiro Ota MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D26168 Modified: head/sbin/ggate/ggated/ggated.c Modified: head/sbin/ggate/ggated/ggated.c ============================================================================== --- head/sbin/ggate/ggated/ggated.c Mon Aug 31 15:55:29 2020 (r364994) +++ head/sbin/ggate/ggated/ggated.c Mon Aug 31 15:59:17 2020 (r364995) @@ -349,6 +349,16 @@ exports_check(struct ggd_export *ex, struct g_gate_cin flags = O_WRONLY; else flags = O_RDWR; + if (conn->c_diskfd != -1) { + if (strcmp(conn->c_path, ex->e_path) != 0) { + g_gate_log(LOG_ERR, "old %s and new %s: " + "Path mismatch during handshakes.", + conn->c_path, ex->e_path); + return (EPERM); + } + return (0); + } + conn->c_diskfd = open(ex->e_path, flags); if (conn->c_diskfd == -1) { error = errno; @@ -455,7 +465,7 @@ connection_new(struct g_gate_cinit *cinit, struct sock conn->c_token = cinit->gc_token; ip = htonl(((struct sockaddr_in *)(void *)s)->sin_addr.s_addr); conn->c_srcip = ip; - conn->c_sendfd = conn->c_recvfd = -1; + conn->c_diskfd = conn->c_sendfd = conn->c_recvfd = -1; if ((cinit->gc_flags & GGATE_FLAG_SEND) != 0) conn->c_sendfd = sfd; else @@ -510,6 +520,8 @@ connection_remove(struct ggd_connection *conn) LIST_REMOVE(conn, c_next); g_gate_log(LOG_DEBUG, "Connection removed [%s %s].", ip2str(conn->c_srcip), conn->c_path); + if (conn->c_diskfd != -1) + close(conn->c_diskfd); if (conn->c_sendfd != -1) close(conn->c_sendfd); if (conn->c_recvfd != -1) From owner-svn-src-all@freebsd.org Mon Aug 31 16:06:23 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F9F93C56FB for ; Mon, 31 Aug 2020 16:06:23 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgFSG6kYSz3T7M for ; Mon, 31 Aug 2020 16:06:22 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id C2AA82F496 for ; Mon, 31 Aug 2020 16:06:22 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f54.google.com with SMTP id di5so2599159qvb.13 for ; Mon, 31 Aug 2020 09:06:22 -0700 (PDT) X-Gm-Message-State: AOAM533QOAF8q2gnAUBtPpSIJn15HqKpaeURovW/9+wcdvxmBUQVM11+ 5W+Ov706Plwd15mNSBpaGwdxFDQXbhwpuzgMIis= X-Received: by 2002:ad4:4cce:: with SMTP id i14mt931289qvz.241.1598889982278; Mon, 31 Aug 2020 09:06:22 -0700 (PDT) MIME-Version: 1.0 References: <202008310145.07V1jn1e003692@repo.freebsd.org> In-Reply-To: <202008310145.07V1jn1e003692@repo.freebsd.org> From: Kyle Evans Date: Mon, 31 Aug 2020 11:06:10 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r364982 - head/sys/netinet6 Cc: src-committers , svn-src-all , svn-src-head , Mira Ressel Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 16:06:23 -0000 On Sun, Aug 30, 2020 at 8:45 PM Kyle Evans wrote: > > Author: kevans > Date: Mon Aug 31 01:45:48 2020 > New Revision: 364982 > URL: https://svnweb.freebsd.org/changeset/base/364982 > > Log: > ipv6: quit dropping packets looping back on p2p interfaces > > To paraphrase the below-referenced PR: > > This logic originated in the KAME project, and was even controversial when > it was enabled there by default in 2001. No such equivalent logic exists in > the IPv4 stack, and it turns out that this leads to us dropping valid > traffic when the "point to point" interface is actually a 1:many tun > interface, e.g. with the wireguard userland stack. > > Even in the case of true point-to-point links, this logic only avoids > transient looping of packets sent by misconfigured applications or > attackers, which can be subverted by proper route configuration rather than > hardcoded logic in the kernel to drop packets. > > In the review, melifaro goes on to note that the kernel can't fix it, so it > perhaps shouldn't try to be 'smart' about it. Additionally, that TTL will > still kick in even with incorrect route configuration. > > PR: 247718 > Reviewed by: melifaro, rgrimes > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D25567 > I should note that this was: Submitted by: Mira Ressel It was then put into review form by Lutz Donnerhacke to help guide the patch into the correct hands. Apologies for the omission- Kyle Evans From owner-svn-src-all@freebsd.org Mon Aug 31 16:07:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 914E53C5A2B; Mon, 31 Aug 2020 16:07:41 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgFTn3NCRz3TMF; Mon, 31 Aug 2020 16:07:41 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 572C9A717; Mon, 31 Aug 2020 16:07:41 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VG7flY035196; Mon, 31 Aug 2020 16:07:41 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VG7fFA035195; Mon, 31 Aug 2020 16:07:41 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <202008311607.07VG7fFA035195@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Mon, 31 Aug 2020 16:07:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364996 - head/lib/libpmc/pmu-events X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head/lib/libpmc/pmu-events X-SVN-Commit-Revision: 364996 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 16:07:41 -0000 Author: vangyzen Date: Mon Aug 31 16:07:40 2020 New Revision: 364996 URL: https://svnweb.freebsd.org/changeset/base/364996 Log: libpmc: Fix memory leak in process_mapfile Coverity detected memory leak fix. Submitted by: bret_ketchum@dell.com Reported by: Coverity Reviewed by: cem MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D26230 Modified: head/lib/libpmc/pmu-events/jevents.c Modified: head/lib/libpmc/pmu-events/jevents.c ============================================================================== --- head/lib/libpmc/pmu-events/jevents.c Mon Aug 31 15:59:17 2020 (r364995) +++ head/lib/libpmc/pmu-events/jevents.c Mon Aug 31 16:07:40 2020 (r364996) @@ -794,6 +794,7 @@ process_mapfile(FILE *outfp, char *fpath) if (!mapfp) { pr_info("%s: Error %s opening %s\n", prog, strerror(errno), fpath); + free(line); return -1; } @@ -850,6 +851,8 @@ process_mapfile(FILE *outfp, char *fpath) out: print_mapping_table_suffix(outfp); + free(line); + fclose(mapfp); return 0; } From owner-svn-src-all@freebsd.org Mon Aug 31 16:17:30 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F6563C5D8C; Mon, 31 Aug 2020 16:17:30 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgFj56d7Sz3V0W; Mon, 31 Aug 2020 16:17:29 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C260CAA16; Mon, 31 Aug 2020 16:17:29 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VGHTd8041534; Mon, 31 Aug 2020 16:17:29 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VGHTGO041531; Mon, 31 Aug 2020 16:17:29 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <202008311617.07VGHTGO041531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Mon, 31 Aug 2020 16:17:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364997 - in head/sys/ofed: drivers/infiniband/core include/rdma X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: in head/sys/ofed: drivers/infiniband/core include/rdma X-SVN-Commit-Revision: 364997 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 16:17:30 -0000 Author: vangyzen Date: Mon Aug 31 16:17:28 2020 New Revision: 364997 URL: https://svnweb.freebsd.org/changeset/base/364997 Log: infiniband: Appease Coverty Coverity claims the call to rdma_gid2ip in cma_igmp_send overwrites addr. Use a consistent definition of sockaddr to prevent detections and code changes in the future. Submitted by: bret_ketchum@dell.com Reported by: Coverity Reviewed by: hselasky, kib MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D26229 Modified: head/sys/ofed/drivers/infiniband/core/ib_addr.c head/sys/ofed/drivers/infiniband/core/ib_cma.c head/sys/ofed/drivers/infiniband/core/ib_sa_query.c head/sys/ofed/include/rdma/ib_addr.h Modified: head/sys/ofed/drivers/infiniband/core/ib_addr.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/ib_addr.c Mon Aug 31 16:07:40 2020 (r364996) +++ head/sys/ofed/drivers/infiniband/core/ib_addr.c Mon Aug 31 16:17:28 2020 (r364997) @@ -860,11 +860,7 @@ int rdma_addr_find_l2_eth_by_grh(const union ib_gid *s struct rdma_dev_addr dev_addr; struct resolve_cb_context ctx; - union { - struct sockaddr _sockaddr; - struct sockaddr_in _sockaddr_in; - struct sockaddr_in6 _sockaddr_in6; - } sgid_addr, dgid_addr; + union rdma_sockaddr sgid_addr, dgid_addr; rdma_gid2ip(&sgid_addr._sockaddr, sgid); rdma_gid2ip(&dgid_addr._sockaddr, dgid); Modified: head/sys/ofed/drivers/infiniband/core/ib_cma.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/ib_cma.c Mon Aug 31 16:07:40 2020 (r364996) +++ head/sys/ofed/drivers/infiniband/core/ib_cma.c Mon Aug 31 16:17:28 2020 (r364997) @@ -450,18 +450,15 @@ static int cma_igmp_send(struct net_device *ndev, cons int retval; if (ndev) { - union { - struct sockaddr sock; - struct sockaddr_storage storage; - } addr; + union rdma_sockaddr addr; - rdma_gid2ip(&addr.sock, mgid); + rdma_gid2ip(&addr._sockaddr, mgid); CURVNET_SET_QUIET(ndev->if_vnet); if (join) - retval = -if_addmulti(ndev, &addr.sock, NULL); + retval = -if_addmulti(ndev, &addr._sockaddr, NULL); else - retval = -if_delmulti(ndev, &addr.sock); + retval = -if_delmulti(ndev, &addr._sockaddr); CURVNET_RESTORE(); } else { retval = -ENODEV; Modified: head/sys/ofed/drivers/infiniband/core/ib_sa_query.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/ib_sa_query.c Mon Aug 31 16:07:40 2020 (r364996) +++ head/sys/ofed/drivers/infiniband/core/ib_sa_query.c Mon Aug 31 16:17:28 2020 (r364997) @@ -668,11 +668,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 struct rdma_dev_addr dev_addr = {.bound_dev_if = rec->ifindex, .net = rec->net ? rec->net : &init_net}; - union { - struct sockaddr _sockaddr; - struct sockaddr_in _sockaddr_in; - struct sockaddr_in6 _sockaddr_in6; - } sgid_addr, dgid_addr; + union rdma_sockaddr sgid_addr, dgid_addr; if (!device->get_netdev) return -EOPNOTSUPP; Modified: head/sys/ofed/include/rdma/ib_addr.h ============================================================================== --- head/sys/ofed/include/rdma/ib_addr.h Mon Aug 31 16:07:40 2020 (r364996) +++ head/sys/ofed/include/rdma/ib_addr.h Mon Aug 31 16:17:28 2020 (r364997) @@ -57,6 +57,13 @@ struct rdma_addr_client { struct completion comp; }; +union rdma_sockaddr { + struct sockaddr _sockaddr; + struct sockaddr_in _sockaddr_in; + struct sockaddr_in6 _sockaddr_in6; + struct sockaddr_storage _sockaddr_ss; +}; + /** * rdma_addr_register_client - Register an address client. */ From owner-svn-src-all@freebsd.org Mon Aug 31 16:18:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B97183C5D3A; Mon, 31 Aug 2020 16:18:48 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgFkc4H7Wz3V8d; Mon, 31 Aug 2020 16:18:48 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7622AAB1F; Mon, 31 Aug 2020 16:18:48 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VGImfJ041644; Mon, 31 Aug 2020 16:18:48 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VGIm90041643; Mon, 31 Aug 2020 16:18:48 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <202008311618.07VGIm90041643@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Mon, 31 Aug 2020 16:18:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364998 - head/contrib/ofed/infiniband-diags/src X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head/contrib/ofed/infiniband-diags/src X-SVN-Commit-Revision: 364998 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 16:18:48 -0000 Author: vangyzen Date: Mon Aug 31 16:18:48 2020 New Revision: 364998 URL: https://svnweb.freebsd.org/changeset/base/364998 Log: infiniband-diags: Fix memory leak in dump_multicast_tables Coverity detected leak. Submitted by: bret_ketchum@dell.com Reported by: Coverity Reviewed by: hselasky, kib MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D26228 Modified: head/contrib/ofed/infiniband-diags/src/ibroute.c Modified: head/contrib/ofed/infiniband-diags/src/ibroute.c ============================================================================== --- head/contrib/ofed/infiniband-diags/src/ibroute.c Mon Aug 31 16:17:28 2020 (r364997) +++ head/contrib/ofed/infiniband-diags/src/ibroute.c Mon Aug 31 16:18:48 2020 (r364998) @@ -222,6 +222,7 @@ char *dump_multicast_tables(ib_portid_t * portid, unsi fprintf(stderr, "SubnGet() failed" "; MAD status 0x%x AM 0x%x\n", status, mod); + free(mapnd); return NULL; } } From owner-svn-src-all@freebsd.org Mon Aug 31 16:23:52 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85C053C5FEB; Mon, 31 Aug 2020 16:23:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgFrS30sLz3VjJ; Mon, 31 Aug 2020 16:23:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B59CAC8B; Mon, 31 Aug 2020 16:23:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VGNqGo047562; Mon, 31 Aug 2020 16:23:52 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VGNp1U047560; Mon, 31 Aug 2020 16:23:51 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202008311623.07VGNp1U047560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 31 Aug 2020 16:23:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364999 - in head/sys/dev/mlx5: . mlx5_core X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys/dev/mlx5: . mlx5_core X-SVN-Commit-Revision: 364999 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 16:23:52 -0000 Author: kib Date: Mon Aug 31 16:23:51 2020 New Revision: 364999 URL: https://svnweb.freebsd.org/changeset/base/364999 Log: mlx5_core: Import PDDR register definitions PDDR (Port Diagnostics Database Register) is used to read the physical layer debug database, which contains helpful troubleshooting information regarding the state of the link. PDDR register can only be queried when PCAM register reports it as supported in its register mask. A new helper macro was added to the MLX5_CAP_* infrastructure in order to access this mask. Sponsored by: Mellanox Technologies - Nvidia MFC after: 1 week Modified: head/sys/dev/mlx5/driver.h head/sys/dev/mlx5/mlx5_core/mlx5_core.h head/sys/dev/mlx5/mlx5_ifc.h Modified: head/sys/dev/mlx5/driver.h ============================================================================== --- head/sys/dev/mlx5/driver.h Mon Aug 31 16:18:48 2020 (r364998) +++ head/sys/dev/mlx5/driver.h Mon Aug 31 16:23:51 2020 (r364999) @@ -145,6 +145,7 @@ enum { MLX5_REG_PMPE = 0x5010, MLX5_REG_PMAOS = 0x5012, MLX5_REG_PPLM = 0x5023, + MLX5_REG_PDDR = 0x5031, MLX5_REG_PBSR = 0x5038, MLX5_REG_PCAM = 0x507f, MLX5_REG_NODE_DESC = 0x6001, Modified: head/sys/dev/mlx5/mlx5_core/mlx5_core.h ============================================================================== --- head/sys/dev/mlx5/mlx5_core/mlx5_core.h Mon Aug 31 16:18:48 2020 (r364998) +++ head/sys/dev/mlx5/mlx5_core/mlx5_core.h Mon Aug 31 16:23:51 2020 (r364999) @@ -79,6 +79,35 @@ enum mlx5_semaphore_space_address { struct mlx5_core_dev; +enum mlx5_pddr_page_select { + MLX5_PDDR_OPERATIONAL_INFO_PAGE = 0x0, + MLX5_PDDR_TROUBLESHOOTING_INFO_PAGE = 0x1, + MLX5_PDDR_MODULE_INFO_PAGE = 0x3, +}; + +enum mlx5_pddr_monitor_opcodes { + MLX5_LINK_NO_ISSUE_OBSERVED = 0x0, + MLX5_LINK_PORT_CLOSED = 0x1, + MLX5_LINK_AN_FAILURE = 0x2, + MLX5_LINK_TRAINING_FAILURE = 0x5, + MLX5_LINK_LOGICAL_MISMATCH = 0x9, + MLX5_LINK_REMOTE_FAULT_INDICATION = 0xe, + MLX5_LINK_BAD_SIGNAL_INTEGRITY = 0xf, + MLX5_LINK_CABLE_COMPLIANCE_CODE_MISMATCH = 0x10, + MLX5_LINK_INTERNAL_ERR = 0x17, + MLX5_LINK_INFO_NOT_AVAIL = 0x3ff, + MLX5_LINK_CABLE_UNPLUGGED = 0x400, + MLX5_LINK_LONG_RANGE_FOR_NON_MLX_CABLE = 0x401, + MLX5_LINK_BUS_STUCK = 0x402, + MLX5_LINK_UNSUPP_EEPROM = 0x403, + MLX5_LINK_PART_NUM_LIST = 0x404, + MLX5_LINK_UNSUPP_CABLE = 0x405, + MLX5_LINK_MODULE_TEMP_SHUTDOWN = 0x406, + MLX5_LINK_SHORTED_CABLE = 0x407, + MLX5_LINK_POWER_BUDGET_EXCEEDED = 0x408, + MLX5_LINK_MNG_FORCED_DOWN = 0x409, +}; + int mlx5_query_hca_caps(struct mlx5_core_dev *dev); int mlx5_query_board_id(struct mlx5_core_dev *dev); int mlx5_query_qcam_reg(struct mlx5_core_dev *mdev, u32 *qcam, Modified: head/sys/dev/mlx5/mlx5_ifc.h ============================================================================== --- head/sys/dev/mlx5/mlx5_ifc.h Mon Aug 31 16:18:48 2020 (r364998) +++ head/sys/dev/mlx5/mlx5_ifc.h Mon Aug 31 16:23:51 2020 (r364999) @@ -872,23 +872,6 @@ struct mlx5_ifc_pddr_module_info_bits { u8 reserved_at_4c0[0x300]; }; -union mlx5_ifc_pddr_operation_info_page_pddr_phy_info_page_pddr_troubleshooting_page_pddr_module_info_auto_bits { - struct mlx5_ifc_pddr_module_info_bits pddr_module_info; - u8 reserved_at_0[0x7c0]; -}; - -struct mlx5_ifc_pddr_reg_bits { - u8 reserved_at_0[0x8]; - u8 local_port[0x8]; - u8 pnat[0x2]; - u8 reserved_at_12[0xe]; - - u8 reserved_at_20[0x18]; - u8 page_select[0x8]; - - union mlx5_ifc_pddr_operation_info_page_pddr_phy_info_page_pddr_troubleshooting_page_pddr_module_info_auto_bits page_data; -}; - struct mlx5_ifc_per_protocol_networking_offload_caps_bits { u8 csum_cap[0x1]; u8 vlan_cap[0x1]; @@ -8755,7 +8738,10 @@ struct mlx5_ifc_pcam_regs_5000_to_507f_bits { u8 port_access_reg_cap_mask_127_to_96[0x20]; u8 port_access_reg_cap_mask_95_to_64[0x20]; - u8 port_access_reg_cap_mask_63_to_36[0x1c]; + u8 reserved_at_40[0xe]; + u8 pddr[0x1]; + u8 reserved_at_4f[0xd]; + u8 pplm[0x1]; u8 port_access_reg_cap_mask_34_to_32[0x3]; @@ -10345,6 +10331,46 @@ struct mlx5_ifc_mpcnt_reg_ext_bits { u8 reserved_at_21[0x1f]; union mlx5_ifc_mpcnt_reg_counter_set_auto_ext_bits counter_set; +}; + +struct mlx5_ifc_monitor_opcodes_layout_bits { + u8 reserved_at_0[0x10]; + u8 monitor_opcode[0x10]; +}; + +union mlx5_ifc_pddr_status_opcode_bits { + struct mlx5_ifc_monitor_opcodes_layout_bits monitor_opcodes; + u8 reserved_at_0[0x20]; +}; + +struct mlx5_ifc_troubleshooting_info_page_layout_bits { + u8 reserved_at_0[0x10]; + u8 group_opcode[0x10]; + + union mlx5_ifc_pddr_status_opcode_bits status_opcode; + + u8 user_feedback_data[0x10]; + u8 user_feedback_index[0x10]; + + u8 status_message[0x760]; +}; + +union mlx5_ifc_pddr_page_data_bits { + struct mlx5_ifc_troubleshooting_info_page_layout_bits troubleshooting_info_page; + struct mlx5_ifc_pddr_module_info_bits pddr_module_info; + u8 reserved_at_0[0x7c0]; +}; + +struct mlx5_ifc_pddr_reg_bits { + u8 reserved_at_0[0x8]; + u8 local_port[0x8]; + u8 pnat[0x2]; + u8 reserved_at_12[0xe]; + + u8 reserved_at_20[0x18]; + u8 page_select[0x8]; + + union mlx5_ifc_pddr_page_data_bits page_data; }; enum { From owner-svn-src-all@freebsd.org Mon Aug 31 16:25:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7FC673C6313; Mon, 31 Aug 2020 16:25:56 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgFtr2rxyz3Vsl; Mon, 31 Aug 2020 16:25:56 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41138A7DF; Mon, 31 Aug 2020 16:25:56 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VGPuO2047726; Mon, 31 Aug 2020 16:25:56 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VGPt9t047725; Mon, 31 Aug 2020 16:25:55 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202008311625.07VGPt9t047725@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 31 Aug 2020 16:25:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365000 - in head/sys/dev/mlx5: . mlx5_core X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys/dev/mlx5: . mlx5_core X-SVN-Commit-Revision: 365000 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 16:25:56 -0000 Author: kib Date: Mon Aug 31 16:25:55 2020 New Revision: 365000 URL: https://svnweb.freebsd.org/changeset/base/365000 Log: mlx5_core: add mlx5_query_pddr(). And use it in mlx5_query_pddr_range_info() instead of direct register access. Sponsored by: Mellanox Technologies - Nvidia MFC after: 1 week Modified: head/sys/dev/mlx5/mlx5_core/mlx5_port.c head/sys/dev/mlx5/mlx5_ifc.h Modified: head/sys/dev/mlx5/mlx5_core/mlx5_port.c ============================================================================== --- head/sys/dev/mlx5/mlx5_core/mlx5_port.c Mon Aug 31 16:23:51 2020 (r364999) +++ head/sys/dev/mlx5/mlx5_core/mlx5_port.c Mon Aug 31 16:25:55 2020 (r365000) @@ -1175,19 +1175,29 @@ out: return err; } +static int mlx5_query_pddr(struct mlx5_core_dev *mdev, + u8 local_port, int page_select, u32 *out, int outlen) +{ + u32 in[MLX5_ST_SZ_DW(pddr_reg)] = {0}; + + if (!MLX5_CAP_PCAM_REG(mdev, pddr)) + return -EOPNOTSUPP; + + MLX5_SET(pddr_reg, in, local_port, local_port); + MLX5_SET(pddr_reg, in, page_select, page_select); + + return mlx5_core_access_reg(mdev, in, sizeof(in), out, outlen, MLX5_REG_PDDR, 0, 0); +} + int mlx5_query_pddr_range_info(struct mlx5_core_dev *mdev, u8 local_port, u8 *is_er_type) { u32 pddr_reg[MLX5_ST_SZ_DW(pddr_reg)] = {}; - int sz = MLX5_ST_SZ_BYTES(pddr_reg); int error; u8 ecc; u8 ci; - MLX5_SET(pddr_reg, pddr_reg, local_port, local_port); - MLX5_SET(pddr_reg, pddr_reg, page_select, 3 /* module info page */); - - error = mlx5_core_access_reg(mdev, pddr_reg, sz, pddr_reg, sz, - MLX5_ACCESS_REG_SUMMARY_CTRL_ID_PDDR, 0, 0); + error = mlx5_query_pddr(mdev, local_port, MLX5_PDDR_MODULE_INFO_PAGE, + pddr_reg, sizeof(pddr_reg)); if (error != 0) return (error); Modified: head/sys/dev/mlx5/mlx5_ifc.h ============================================================================== --- head/sys/dev/mlx5/mlx5_ifc.h Mon Aug 31 16:23:51 2020 (r364999) +++ head/sys/dev/mlx5/mlx5_ifc.h Mon Aug 31 16:25:55 2020 (r365000) @@ -780,10 +780,6 @@ struct mlx5_ifc_flow_table_nic_cap_bits { u8 reserved_1[0x7200]; }; -enum { - MLX5_ACCESS_REG_SUMMARY_CTRL_ID_PDDR = 0x5031, -}; - struct mlx5_ifc_pddr_module_info_bits { u8 cable_technology[0x8]; u8 cable_breakout[0x8]; From owner-svn-src-all@freebsd.org Mon Aug 31 16:27:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 01CBA3C622D; Mon, 31 Aug 2020 16:27:05 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgFw85l0hz3VyX; Mon, 31 Aug 2020 16:27:04 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A7D0DA9B4; Mon, 31 Aug 2020 16:27:04 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VGR477047838; Mon, 31 Aug 2020 16:27:04 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VGR4gX047834; Mon, 31 Aug 2020 16:27:04 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202008311627.07VGR4gX047834@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 31 Aug 2020 16:27:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365001 - in head/sys/dev/mlx5: mlx5_core mlx5_en X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys/dev/mlx5: mlx5_core mlx5_en X-SVN-Commit-Revision: 365001 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 16:27:05 -0000 Author: kib Date: Mon Aug 31 16:27:03 2020 New Revision: 365001 URL: https://svnweb.freebsd.org/changeset/base/365001 Log: mlx5en: Implement SIOCGIFDOWNREASON. Sponsored by: Mellanox Technologies - Nvidia MFC after: 1 week Modified: head/sys/dev/mlx5/mlx5_core/mlx5_core.h head/sys/dev/mlx5/mlx5_core/mlx5_port.c head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Modified: head/sys/dev/mlx5/mlx5_core/mlx5_core.h ============================================================================== --- head/sys/dev/mlx5/mlx5_core/mlx5_core.h Mon Aug 31 16:25:55 2020 (r365000) +++ head/sys/dev/mlx5/mlx5_core/mlx5_core.h Mon Aug 31 16:27:03 2020 (r365001) @@ -127,6 +127,9 @@ void mlx5_core_event(struct mlx5_core_dev *dev, enum m void mlx5_enter_error_state(struct mlx5_core_dev *dev, bool force); void mlx5_disable_device(struct mlx5_core_dev *dev); void mlx5_recover_device(struct mlx5_core_dev *dev); +int mlx5_query_pddr_troubleshooting_info(struct mlx5_core_dev *mdev, + u16 *monitor_opcode, + u8 *status_message, size_t sm_len); int mlx5_register_device(struct mlx5_core_dev *dev); void mlx5_unregister_device(struct mlx5_core_dev *dev); Modified: head/sys/dev/mlx5/mlx5_core/mlx5_port.c ============================================================================== --- head/sys/dev/mlx5/mlx5_core/mlx5_port.c Mon Aug 31 16:25:55 2020 (r365000) +++ head/sys/dev/mlx5/mlx5_core/mlx5_port.c Mon Aug 31 16:27:03 2020 (r365001) @@ -1221,6 +1221,31 @@ int mlx5_query_pddr_range_info(struct mlx5_core_dev *m } EXPORT_SYMBOL_GPL(mlx5_query_pddr_range_info); +int mlx5_query_pddr_troubleshooting_info(struct mlx5_core_dev *mdev, + u16 *monitor_opcode, u8 *status_message, size_t sm_len) +{ + int outlen = MLX5_ST_SZ_BYTES(pddr_reg); + u32 out[MLX5_ST_SZ_DW(pddr_reg)] = {0}; + int err; + + err = mlx5_query_pddr(mdev, MLX5_PDDR_TROUBLESHOOTING_INFO_PAGE, 1, + out, outlen); + if (err != 0) + return err; + if (monitor_opcode != NULL) { + *monitor_opcode = MLX5_GET(pddr_reg, out, + page_data.troubleshooting_info_page.status_opcode. + monitor_opcodes); + } + if (status_message != NULL) { + strlcpy(status_message, + MLX5_ADDR_OF(pddr_reg, out, + page_data.troubleshooting_info_page.status_message), + sm_len); + } + return (0); +} + int mlx5_query_mfrl_reg(struct mlx5_core_dev *mdev, u8 *reset_level) { Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c ============================================================================== --- head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Aug 31 16:25:55 2020 (r365000) +++ head/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Mon Aug 31 16:27:03 2020 (r365001) @@ -3233,6 +3233,7 @@ mlx5e_ioctl(struct ifnet *ifp, u_long command, caddr_t { struct mlx5e_priv *priv; struct ifreq *ifr; + struct ifdownreason *ifdr; struct ifi2creq i2c; int error = 0; int mask = 0; @@ -3500,6 +3501,16 @@ out: error = copyout(&i2c, ifr_data_get_ptr(ifr), sizeof(i2c)); err_i2c: PRIV_UNLOCK(priv); + break; + case SIOCGIFDOWNREASON: + ifdr = (struct ifdownreason *)data; + bzero(ifdr->ifdr_msg, sizeof(ifdr->ifdr_msg)); + PRIV_LOCK(priv); + error = -mlx5_query_pddr_troubleshooting_info(priv->mdev, NULL, + ifdr->ifdr_msg, sizeof(ifdr->ifdr_msg)); + PRIV_UNLOCK(priv); + if (error == 0) + ifdr->ifdr_reason = IFDR_REASON_MSG; break; default: From owner-svn-src-all@freebsd.org Mon Aug 31 16:30:52 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DB5613C65A6; Mon, 31 Aug 2020 16:30:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgG0X5X7xz3W7W; Mon, 31 Aug 2020 16:30:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1397AD7C; Mon, 31 Aug 2020 16:30:52 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VGUqm6048120; Mon, 31 Aug 2020 16:30:52 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VGUqaO048119; Mon, 31 Aug 2020 16:30:52 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202008311630.07VGUqaO048119@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 31 Aug 2020 16:30:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365002 - head/sys/dev/mlx5/mlx5_core X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/dev/mlx5/mlx5_core X-SVN-Commit-Revision: 365002 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 16:30:52 -0000 Author: kib Date: Mon Aug 31 16:30:52 2020 New Revision: 365002 URL: https://svnweb.freebsd.org/changeset/base/365002 Log: mlx5 sriov: add error message for failed MAC programming on VF. Sponsored by: Mellanox Technologies - Nvidia MFC after: 1 week Modified: head/sys/dev/mlx5/mlx5_core/mlx5_main.c Modified: head/sys/dev/mlx5/mlx5_core/mlx5_main.c ============================================================================== --- head/sys/dev/mlx5/mlx5_core/mlx5_main.c Mon Aug 31 16:27:03 2020 (r365001) +++ head/sys/dev/mlx5/mlx5_core/mlx5_main.c Mon Aug 31 16:30:52 2020 (r365002) @@ -1839,6 +1839,11 @@ mlx5_iov_add_vf(device_t dev, uint16_t vfnum, const nv &mac_size); error = -mlx5_eswitch_set_vport_mac(priv->eswitch, vfnum + 1, __DECONST(u8 *, mac)); + if (error != 0) { + mlx5_core_err(core_dev, + "setting MAC for VF %d failed, error %d\n", + vfnum + 1, error); + } } error = -mlx5_eswitch_set_vport_state(priv->eswitch, vfnum + 1, From owner-svn-src-all@freebsd.org Mon Aug 31 16:32:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E8B873C64C4; Mon, 31 Aug 2020 16:32:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgG295TC6z3WnK; Mon, 31 Aug 2020 16:32:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9FD2CA75E; Mon, 31 Aug 2020 16:32:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VGWH5F050565; Mon, 31 Aug 2020 16:32:17 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VGWH20050564; Mon, 31 Aug 2020 16:32:17 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202008311632.07VGWH20050564@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 31 Aug 2020 16:32:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365003 - head/sys/dev/mlx5/mlx5_core X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/dev/mlx5/mlx5_core X-SVN-Commit-Revision: 365003 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 16:32:18 -0000 Author: kib Date: Mon Aug 31 16:32:17 2020 New Revision: 365003 URL: https://svnweb.freebsd.org/changeset/base/365003 Log: mlx5 sriov: Add controls for VFs to set port/node GUIDs. Setting GUIDs make RoCE offloads functional on VFs. Reported and tested by: chuck Sponsored by: Mellanox Technologies - Nvidia MFC after: 1 week Modified: head/sys/dev/mlx5/mlx5_core/mlx5_main.c Modified: head/sys/dev/mlx5/mlx5_core/mlx5_main.c ============================================================================== --- head/sys/dev/mlx5/mlx5_core/mlx5_main.c Mon Aug 31 16:30:52 2020 (r365002) +++ head/sys/dev/mlx5/mlx5_core/mlx5_main.c Mon Aug 31 16:32:17 2020 (r365003) @@ -180,6 +180,8 @@ static struct mlx5_profile profiles[] = { #ifdef PCI_IOV static const char iov_mac_addr_name[] = "mac-addr"; +static const char iov_node_guid_name[] = "node-guid"; +static const char iov_port_guid_name[] = "port-guid"; #endif static int set_dma_caps(struct pci_dev *pdev) @@ -1624,6 +1626,10 @@ static int init_one(struct pci_dev *pdev, vf_schema = pci_iov_schema_alloc_node(); pci_iov_schema_add_unicast_mac(vf_schema, iov_mac_addr_name, 0, NULL); + pci_iov_schema_add_uint64(vf_schema, iov_node_guid_name, + 0, 0); + pci_iov_schema_add_uint64(vf_schema, iov_port_guid_name, + 0, 0); err = pci_iov_attach(bsddev, pf_schema, vf_schema); if (err != 0) { device_printf(bsddev, @@ -1825,6 +1831,7 @@ mlx5_iov_add_vf(device_t dev, uint16_t vfnum, const nv struct mlx5_priv *priv; const void *mac; size_t mac_size; + uint64_t node_guid, port_guid; int error; pdev = device_get_softc(dev); @@ -1842,6 +1849,28 @@ mlx5_iov_add_vf(device_t dev, uint16_t vfnum, const nv if (error != 0) { mlx5_core_err(core_dev, "setting MAC for VF %d failed, error %d\n", + vfnum + 1, error); + } + } + + if (nvlist_exists_number(vf_config, iov_node_guid_name)) { + node_guid = nvlist_get_number(vf_config, iov_node_guid_name); + error = -mlx5_modify_nic_vport_node_guid(core_dev, vfnum + 1, + node_guid); + if (error != 0) { + mlx5_core_err(core_dev, + "modifying node GUID for VF %d failed, error %d\n", + vfnum + 1, error); + } + } + + if (nvlist_exists_number(vf_config, iov_port_guid_name)) { + port_guid = nvlist_get_number(vf_config, iov_port_guid_name); + error = -mlx5_modify_nic_vport_port_guid(core_dev, vfnum + 1, + port_guid); + if (error != 0) { + mlx5_core_err(core_dev, + "modifying port GUID for VF %d failed, error %d\n", vfnum + 1, error); } } From owner-svn-src-all@freebsd.org Mon Aug 31 18:47:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 37A6A3CA1D4; Mon, 31 Aug 2020 18:47:57 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgK2j0lvqz3fr3; Mon, 31 Aug 2020 18:47:57 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2C55C78F; Mon, 31 Aug 2020 18:47:56 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VIluwU034438; Mon, 31 Aug 2020 18:47:56 GMT (envelope-from gbe@FreeBSD.org) Received: (from gbe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VIluOc034437; Mon, 31 Aug 2020 18:47:56 GMT (envelope-from gbe@FreeBSD.org) Message-Id: <202008311847.07VIluOc034437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gbe set sender to gbe@FreeBSD.org using -f From: Gordon Bergling Date: Mon, 31 Aug 2020 18:47:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365004 - head/bin/ls X-SVN-Group: head X-SVN-Commit-Author: gbe X-SVN-Commit-Paths: head/bin/ls X-SVN-Commit-Revision: 365004 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 18:47:57 -0000 Author: gbe (doc committer) Date: Mon Aug 31 18:47:56 2020 New Revision: 365004 URL: https://svnweb.freebsd.org/changeset/base/365004 Log: ls(1): Update all POSIX references and correct the STANDARDS section - Update the POSIX references for non-standard ls(1) options - Simplify the STANDARDS section by mention both supported POSIX versions Reported by: hrs Reviewed by: hrs, bcr Approved by: hrs, bcr MFC after: 3 days X-MFC-With: r364449 Differential Revision: https://reviews.freebsd.org/D26210 Modified: head/bin/ls/ls.1 Modified: head/bin/ls/ls.1 ============================================================================== --- head/bin/ls/ls.1 Mon Aug 31 16:32:17 2020 (r365003) +++ head/bin/ls/ls.1 Mon Aug 31 18:47:56 2020 (r365004) @@ -32,7 +32,7 @@ .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" $FreeBSD$ .\" -.Dd August 21, 2020 +.Dd August 31, 2020 .Dt LS 1 .Os .Sh NAME @@ -197,7 +197,7 @@ This option is not defined in Display each file's MAC label; see .Xr maclabel 7 . This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl a Include directory entries whose names begin with a dot @@ -209,7 +209,7 @@ but use .Tn C escape codes whenever possible. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl c Use time when file status was last changed for sorting or printing. .It Fl -color Ns = Ns Ar when @@ -292,7 +292,7 @@ and .Fl t options. As allowed by -.St -p1003.1-2001 , +.St -p1003.1-2008 , this option has no effect on the .Fl d , .Fl l , @@ -308,7 +308,7 @@ where it was used to display the group name in the lon .Pq Fl l format output. This option is incompatible with -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl h When used with the .Fl l @@ -316,7 +316,7 @@ option, use unit suffixes: Byte, Kilobyte, Megabyte, G and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl i For each file, print the file's file serial number (inode number). .It Fl k @@ -343,7 +343,7 @@ Include the file flags in a long .Pq Fl l output. This option is incompatible with -.St -p1003.1-2001 . +.St -p1003.1-2008 . See .Xr chflags 1 for a list of file flags and their meanings. @@ -895,13 +895,14 @@ and the .Nm utility conforms to +.St -p1003.1-2001 +and .St -p1003.1-2008 . The options .Fl B , D , G , I , T , U , W , Z , b , h , w , y and .Fl , -are compatible extensions not defined in -.St -p1003.1-2008 . +are non-standard extensions. .Pp The ACL support is compatible with .Tn IEEE From owner-svn-src-all@freebsd.org Mon Aug 31 18:58:12 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E1E803CA757; Mon, 31 Aug 2020 18:58:12 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgKGX4Lryz3gFk; Mon, 31 Aug 2020 18:58:12 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f45.google.com with SMTP id b16so7169981ioj.4; Mon, 31 Aug 2020 11:58:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vsJq1+xCxeoZnNY7RRc7G/ERkIM2cseLusO9FcdNgK8=; b=FKgMEgvHjX6pDlb89OQXpn/by/ONoK2NHbO3Ge/YenEGVZPCbKMQ77CkC1q0/I4XPW QLD6JD7uXSHzISr8ru+YbN/ieG7zT1nJ6AbcVeZeOervoRFlR4qllsDA71gSFqXlc6QE TQgp4Ep6qxMbc3wx5OhLyoImd0je3V7rL1DU46mg9tu0F0PFQmX5wpOIp5oxVpqIHvzj iaFFLcpTxA8EcOmIkkHkRBNUzv9uHjEfyKN4H0BZykodKLJZJvCdwgAvHZtQlxgMcT3f 2i7AQGT5uKGSRVBRQeejrBQI3uJeFV/Kr07iuQTczMt/zZlObYhBh+wpnHa2NSOgvSTx 3Riw== X-Gm-Message-State: AOAM530xwW7Ic3z7op2xR2hMPtlFLSKMdSQZ1M//VHG3Yw/qQBAwTnMb Pz7L5mBYRguTAs93ZUyhubM7hscjGsXo52qwIwKU05gL X-Google-Smtp-Source: ABdhPJyS596x9KXYfBEixNfhwVnJqu6MJNBFeIlZtBVrPyyQRkZBiprSZk/MW6/b4dU7rf+hSzOgqmXN9VK5HCByD8I= X-Received: by 2002:a02:85e1:: with SMTP id d88mr2585149jai.8.1598900290559; Mon, 31 Aug 2020 11:58:10 -0700 (PDT) MIME-Version: 1.0 References: <202008311409.07VE9Ch9033206@gndrsh.dnsmgr.net> In-Reply-To: <202008311409.07VE9Ch9033206@gndrsh.dnsmgr.net> From: Ed Maste Date: Mon, 31 Aug 2020 14:57:58 -0400 Message-ID: Subject: Re: svn commit: r364321 - head/sbin/ipfw To: "Rodney W. Grimes" Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4BgKGX4Lryz3gFk X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 18:58:12 -0000 On Mon, 31 Aug 2020 at 10:09, Rodney W. Grimes wrote: > > > Hrm, it seems this reply ended up in my spam folder; sorry for not > > replying until now. > > lol Oh, bad filter :-) > > > > > *strchr(timestr, '\n') = '\0'; > > > > bprintf(bp, "%s ", timestr); > > > ^ Isnt this the +1 space? > > > > > > > } else { > > > > - bprintf(bp, "%*s", twidth, " "); > > > > + bprintf(bp, "%*s", twidth + 1, " "); > > > ^missing from this string? > > > > Inserting an extra space in the format string would also work, sure. I > > considered doing it that way but in the end decided it's not > > materially more clear one way or another, so used the patch as > > submitted. > > For me the + 1 leads to a "why is this here", where as the space > in the format string clearly matches the other condition of the else. > Also + 1 causes a run time computation, the extra space does not. No, but the extra space adds a format string character which will be more costly than the +1. I would have used "%*s " if twidth was already used in the other case, to keep them consistent. Anyhow, I think this isn't worth bikeshedding; I have no objection if anyone feels "%*s " is more clear and wants to commit that change. From owner-svn-src-all@freebsd.org Mon Aug 31 19:38:04 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3B0953CB528; Mon, 31 Aug 2020 19:38:04 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgL8X0r8xz40NZ; Mon, 31 Aug 2020 19:38:04 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F120ED10C; Mon, 31 Aug 2020 19:38:03 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VJc3gQ064815; Mon, 31 Aug 2020 19:38:03 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VJc3NO064814; Mon, 31 Aug 2020 19:38:03 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202008311938.07VJc3NO064814@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 31 Aug 2020 19:38:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365005 - head/sys/dev/nvme X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/nvme X-SVN-Commit-Revision: 365005 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 19:38:04 -0000 Author: imp Date: Mon Aug 31 19:38:03 2020 New Revision: 365005 URL: https://svnweb.freebsd.org/changeset/base/365005 Log: Use symbolic names for asych events Rather than |= 0x300, define and use asyn event names for the name space changes and the firmware activations that we're asking for. Modified: head/sys/dev/nvme/nvme.h head/sys/dev/nvme/nvme_ctrlr.c Modified: head/sys/dev/nvme/nvme.h ============================================================================== --- head/sys/dev/nvme/nvme.h Mon Aug 31 18:47:56 2020 (r365004) +++ head/sys/dev/nvme/nvme.h Mon Aug 31 19:38:03 2020 (r365005) @@ -454,6 +454,8 @@ enum nvme_critical_warning_state { NVME_CRIT_WARN_ST_VOLATILE_MEMORY_BACKUP = 0x10, }; #define NVME_CRIT_WARN_ST_RESERVED_MASK (0xE0) +#define NVME_ASYNC_EVENT_NS_ATTRIBUTE (0x100) +#define NVME_ASYNC_EVENT_FW_ACTIVATE (0x200) /* slot for current FW */ #define NVME_FIRMWARE_PAGE_AFI_SLOT_SHIFT (0) Modified: head/sys/dev/nvme/nvme_ctrlr.c ============================================================================== --- head/sys/dev/nvme/nvme_ctrlr.c Mon Aug 31 18:47:56 2020 (r365004) +++ head/sys/dev/nvme/nvme_ctrlr.c Mon Aug 31 19:38:03 2020 (r365005) @@ -835,7 +835,8 @@ nvme_ctrlr_configure_aer(struct nvme_controller *ctrlr NVME_CRIT_WARN_ST_READ_ONLY | NVME_CRIT_WARN_ST_VOLATILE_MEMORY_BACKUP; if (ctrlr->cdata.ver >= NVME_REV(1, 2)) - ctrlr->async_event_config |= 0x300; + ctrlr->async_event_config |= NVME_ASYNC_EVENT_NS_ATTRIBUTE | + NVME_ASYNC_EVENT_FW_ACTIVATE; status.done = 0; nvme_ctrlr_cmd_get_feature(ctrlr, NVME_FEAT_TEMPERATURE_THRESHOLD, From owner-svn-src-all@freebsd.org Mon Aug 31 19:47:32 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69D143CBC85; Mon, 31 Aug 2020 19:47:32 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgLMS27sxz41LQ; Mon, 31 Aug 2020 19:47:32 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 22C05CFD3; Mon, 31 Aug 2020 19:47:32 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VJlV5s070908; Mon, 31 Aug 2020 19:47:31 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VJlUO1070902; Mon, 31 Aug 2020 19:47:30 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202008311947.07VJlUO1070902@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 31 Aug 2020 19:47:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365006 - in head/tools/tools/tinybsd/conf: bridge default firewall minimal vpn wireless X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/tools/tools/tinybsd/conf: bridge default firewall minimal vpn wireless X-SVN-Commit-Revision: 365006 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 19:47:32 -0000 Author: imp Date: Mon Aug 31 19:47:30 2020 New Revision: 365006 URL: https://svnweb.freebsd.org/changeset/base/365006 Log: gc pmtimer and apm pmtimer was removed from base some time ago. apm hasn't been relevant for these devices in a long time (and was commented out). Remove them both from these config files. Modified: head/tools/tools/tinybsd/conf/bridge/TINYBSD head/tools/tools/tinybsd/conf/default/TINYBSD head/tools/tools/tinybsd/conf/firewall/TINYBSD head/tools/tools/tinybsd/conf/minimal/TINYBSD head/tools/tools/tinybsd/conf/vpn/TINYBSD head/tools/tools/tinybsd/conf/wireless/TINYBSD Modified: head/tools/tools/tinybsd/conf/bridge/TINYBSD ============================================================================== --- head/tools/tools/tinybsd/conf/bridge/TINYBSD Mon Aug 31 19:38:03 2020 (r365005) +++ head/tools/tools/tinybsd/conf/bridge/TINYBSD Mon Aug 31 19:47:30 2020 (r365006) @@ -63,11 +63,6 @@ device sc device agp # support several AGP chipsets -# Power management support (see NOTES for more options) -#device apm -# Add suspend/resume support for the i8254. -device pmtimer - # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support device cbb # cardbus (yenta) bridge Modified: head/tools/tools/tinybsd/conf/default/TINYBSD ============================================================================== --- head/tools/tools/tinybsd/conf/default/TINYBSD Mon Aug 31 19:38:03 2020 (r365005) +++ head/tools/tools/tinybsd/conf/default/TINYBSD Mon Aug 31 19:47:30 2020 (r365006) @@ -73,11 +73,6 @@ device sc device agp # support several AGP chipsets -# Power management support (see NOTES for more options) -#device apm -# Add suspend/resume support for the i8254. -device pmtimer - # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support device cbb # cardbus (yenta) bridge Modified: head/tools/tools/tinybsd/conf/firewall/TINYBSD ============================================================================== --- head/tools/tools/tinybsd/conf/firewall/TINYBSD Mon Aug 31 19:38:03 2020 (r365005) +++ head/tools/tools/tinybsd/conf/firewall/TINYBSD Mon Aug 31 19:47:30 2020 (r365006) @@ -62,11 +62,6 @@ device sc device agp # support several AGP chipsets -# Power management support (see NOTES for more options) -#device apm -# Add suspend/resume support for the i8254. -device pmtimer - # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support #device cbb # cardbus (yenta) bridge Modified: head/tools/tools/tinybsd/conf/minimal/TINYBSD ============================================================================== --- head/tools/tools/tinybsd/conf/minimal/TINYBSD Mon Aug 31 19:38:03 2020 (r365005) +++ head/tools/tools/tinybsd/conf/minimal/TINYBSD Mon Aug 31 19:47:30 2020 (r365006) @@ -58,11 +58,6 @@ device sc device agp # support several AGP chipsets -# Power management support (see NOTES for more options) -#device apm -# Add suspend/resume support for the i8254. -device pmtimer - # Pseudo devices. device loop # Network loopback device ether # Ethernet support Modified: head/tools/tools/tinybsd/conf/vpn/TINYBSD ============================================================================== --- head/tools/tools/tinybsd/conf/vpn/TINYBSD Mon Aug 31 19:38:03 2020 (r365005) +++ head/tools/tools/tinybsd/conf/vpn/TINYBSD Mon Aug 31 19:47:30 2020 (r365006) @@ -63,11 +63,6 @@ device sc device agp # support several AGP chipsets -# Power management support (see NOTES for more options) -#device apm -# Add suspend/resume support for the i8254. -device pmtimer - # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support #device cbb # cardbus (yenta) bridge Modified: head/tools/tools/tinybsd/conf/wireless/TINYBSD ============================================================================== --- head/tools/tools/tinybsd/conf/wireless/TINYBSD Mon Aug 31 19:38:03 2020 (r365005) +++ head/tools/tools/tinybsd/conf/wireless/TINYBSD Mon Aug 31 19:47:30 2020 (r365006) @@ -63,11 +63,6 @@ device sc device agp # support several AGP chipsets -# Power management support (see NOTES for more options) -#device apm -# Add suspend/resume support for the i8254. -device pmtimer - # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support device cbb # cardbus (yenta) bridge From owner-svn-src-all@freebsd.org Mon Aug 31 19:59:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AF9D53CBDFF; Mon, 31 Aug 2020 19:59:07 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgLcq4Dfwz42HM; Mon, 31 Aug 2020 19:59:07 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7455ED487; Mon, 31 Aug 2020 19:59:07 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VJx7n4077137; Mon, 31 Aug 2020 19:59:07 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VJx5Io077130; Mon, 31 Aug 2020 19:59:05 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202008311959.07VJx5Io077130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 31 Aug 2020 19:59:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365007 - stable/12/sys/vm X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/vm X-SVN-Commit-Revision: 365007 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 19:59:07 -0000 Author: markj Date: Mon Aug 31 19:59:05 2020 New Revision: 365007 URL: https://svnweb.freebsd.org/changeset/base/365007 Log: Revert r364987, r364988. The removal of the kernel_map symbol breaks at least one out-of-tree module, the nvidia binary driver. Revert the removal for now to maintain KBI compatibility. Reported by: np Modified: stable/12/sys/vm/vm_extern.h stable/12/sys/vm/vm_init.c stable/12/sys/vm/vm_kern.c stable/12/sys/vm/vm_kern.h stable/12/sys/vm/vm_map.c stable/12/sys/vm/vm_map.h stable/12/sys/vm/vm_page.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/vm/vm_extern.h ============================================================================== --- stable/12/sys/vm/vm_extern.h Mon Aug 31 19:47:30 2020 (r365006) +++ stable/12/sys/vm/vm_extern.h Mon Aug 31 19:59:05 2020 (r365007) @@ -77,8 +77,8 @@ void kmem_unback(vm_object_t, vm_offset_t, vm_size_t); /* Bootstrapping. */ void kmem_bootstrap_free(vm_offset_t, vm_size_t); -void kmem_subinit(vm_map_t, vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t, - bool); +vm_map_t kmem_suballoc(vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t, + boolean_t); void kmem_init(vm_offset_t, vm_offset_t); void kmem_init_zero_region(void); void kmeminit(void); Modified: stable/12/sys/vm/vm_init.c ============================================================================== --- stable/12/sys/vm/vm_init.c Mon Aug 31 19:47:30 2020 (r365006) +++ stable/12/sys/vm/vm_init.c Mon Aug 31 19:59:05 2020 (r365007) @@ -273,8 +273,8 @@ again: exec_map_entries = 2 * mp_ncpus + 4; #endif exec_map_entry_size = round_page(PATH_MAX + ARG_MAX); - kmem_subinit(exec_map, kernel_map, &minaddr, &maxaddr, - exec_map_entries * exec_map_entry_size + 64 * PAGE_SIZE, false); - kmem_subinit(pipe_map, kernel_map, &minaddr, &maxaddr, maxpipekva, - false); + exec_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, + exec_map_entries * exec_map_entry_size + 64 * PAGE_SIZE, FALSE); + pipe_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, maxpipekva, + FALSE); } Modified: stable/12/sys/vm/vm_kern.c ============================================================================== --- stable/12/sys/vm/vm_kern.c Mon Aug 31 19:47:30 2020 (r365006) +++ stable/12/sys/vm/vm_kern.c Mon Aug 31 19:59:05 2020 (r365007) @@ -97,9 +97,9 @@ __FBSDID("$FreeBSD$"); #include #include -struct vm_map kernel_map_store; -struct vm_map exec_map_store; -struct vm_map pipe_map_store; +vm_map_t kernel_map; +vm_map_t exec_map; +vm_map_t pipe_map; const void *zero_region; CTASSERT((ZERO_REGION_SIZE & PAGE_MASK) == 0); @@ -357,9 +357,9 @@ kmem_alloc_contig_domainset(struct domainset *ds, vm_s } /* - * kmem_subinit: + * kmem_suballoc: * - * Initializes a map to manage a subrange + * Allocates a map to manage a subrange * of the kernel virtual address space. * * Arguments are as follows: @@ -369,11 +369,12 @@ kmem_alloc_contig_domainset(struct domainset *ds, vm_s * size Size of range to find * superpage_align Request that min is superpage aligned */ -void -kmem_subinit(vm_map_t map, vm_map_t parent, vm_offset_t *min, vm_offset_t *max, - vm_size_t size, bool superpage_align) +vm_map_t +kmem_suballoc(vm_map_t parent, vm_offset_t *min, vm_offset_t *max, + vm_size_t size, boolean_t superpage_align) { int ret; + vm_map_t result; size = round_page(size); @@ -382,11 +383,14 @@ kmem_subinit(vm_map_t map, vm_map_t parent, vm_offset_ VMFS_SUPER_SPACE : VMFS_ANY_SPACE, VM_PROT_ALL, VM_PROT_ALL, MAP_ACC_NO_CHARGE); if (ret != KERN_SUCCESS) - panic("kmem_subinit: bad status return of %d", ret); + panic("kmem_suballoc: bad status return of %d", ret); *max = *min + size; - vm_map_init(map, vm_map_pmap(parent), *min, *max); - if (vm_map_submap(parent, *min, *max, map) != KERN_SUCCESS) - panic("kmem_subinit: unable to change range to submap"); + result = vm_map_create(vm_map_pmap(parent), *min, *max); + if (result == NULL) + panic("kmem_suballoc: cannot create submap"); + if (vm_map_submap(parent, *min, *max, result) != KERN_SUCCESS) + panic("kmem_suballoc: unable to change range to submap"); + return (result); } /* @@ -742,13 +746,15 @@ kva_import_domain(void *arena, vmem_size_t size, int f void kmem_init(vm_offset_t start, vm_offset_t end) { + vm_map_t m; int domain; - vm_map_init(kernel_map, kernel_pmap, VM_MIN_KERNEL_ADDRESS, end); - kernel_map->system_map = 1; - vm_map_lock(kernel_map); + m = vm_map_create(kernel_pmap, VM_MIN_KERNEL_ADDRESS, end); + m->system_map = 1; + vm_map_lock(m); /* N.B.: cannot use kgdb to debug, starting with this assignment ... */ - (void) vm_map_insert(kernel_map, NULL, (vm_ooffset_t) 0, + kernel_map = m; + (void) vm_map_insert(m, NULL, (vm_ooffset_t) 0, #ifdef __amd64__ KERNBASE, #else @@ -756,7 +762,7 @@ kmem_init(vm_offset_t start, vm_offset_t end) #endif start, VM_PROT_ALL, VM_PROT_ALL, MAP_NOFAULT); /* ... and ending with the completion of the above `insert' */ - vm_map_unlock(kernel_map); + vm_map_unlock(m); /* * Initialize the kernel_arena. This can grow on demand. Modified: stable/12/sys/vm/vm_kern.h ============================================================================== --- stable/12/sys/vm/vm_kern.h Mon Aug 31 19:47:30 2020 (r365006) +++ stable/12/sys/vm/vm_kern.h Mon Aug 31 19:59:05 2020 (r365007) @@ -66,12 +66,9 @@ #define _VM_VM_KERN_H_ /* Kernel memory management definitions. */ -extern struct vm_map kernel_map_store; -#define kernel_map (&kernel_map_store) -extern struct vm_map exec_map_store; -#define exec_map (&exec_map_store) -extern struct vm_map pipe_map_store; -#define pipe_map (&pipe_map_store) +extern vm_map_t kernel_map; +extern vm_map_t exec_map; +extern vm_map_t pipe_map; extern struct vmem *kernel_arena; extern struct vmem *kmem_arena; extern struct vmem *buffer_arena; Modified: stable/12/sys/vm/vm_map.c ============================================================================== --- stable/12/sys/vm/vm_map.c Mon Aug 31 19:47:30 2020 (r365006) +++ stable/12/sys/vm/vm_map.c Mon Aug 31 19:59:05 2020 (r365007) @@ -128,8 +128,10 @@ __FBSDID("$FreeBSD$"); static struct mtx map_sleep_mtx; static uma_zone_t mapentzone; static uma_zone_t kmapentzone; +static uma_zone_t mapzone; static uma_zone_t vmspace_zone; static int vmspace_zinit(void *mem, int size, int flags); +static int vm_map_zinit(void *mem, int ize, int flags); static void _vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min, vm_offset_t max); static void vm_map_entry_deallocate(vm_map_entry_t entry, boolean_t system_map); @@ -140,6 +142,7 @@ static int vm_map_growstack(vm_map_t map, vm_offset_t static void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags); #ifdef INVARIANTS +static void vm_map_zdtor(void *mem, int size, void *arg); static void vmspace_zdtor(void *mem, int size, void *arg); #endif static int vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, @@ -195,6 +198,14 @@ void vm_map_startup(void) { mtx_init(&map_sleep_mtx, "vm map sleep mutex", NULL, MTX_DEF); + mapzone = uma_zcreate("MAP", sizeof(struct vm_map), NULL, +#ifdef INVARIANTS + vm_map_zdtor, +#else + NULL, +#endif + vm_map_zinit, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + uma_prealloc(mapzone, MAX_KMAP); kmapentzone = uma_zcreate("KMAP ENTRY", sizeof(struct vm_map_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_MTXCLASS | UMA_ZONE_VM); @@ -213,16 +224,24 @@ static int vmspace_zinit(void *mem, int size, int flags) { struct vmspace *vm; - vm_map_t map; vm = (struct vmspace *)mem; - map = &vm->vm_map; + vm->vm_map.pmap = NULL; + (void)vm_map_zinit(&vm->vm_map, sizeof(vm->vm_map), flags); + PMAP_LOCK_INIT(vmspace_pmap(vm)); + return (0); +} + +static int +vm_map_zinit(void *mem, int size, int flags) +{ + vm_map_t map; + + map = (vm_map_t)mem; memset(map, 0, sizeof(*map)); - mtx_init(&map->system_mtx, "vm map (system)", NULL, - MTX_DEF | MTX_DUPOK); + mtx_init(&map->system_mtx, "vm map (system)", NULL, MTX_DEF | MTX_DUPOK); sx_init(&map->lock, "vm map (user)"); - PMAP_LOCK_INIT(vmspace_pmap(vm)); return (0); } @@ -233,16 +252,29 @@ vmspace_zdtor(void *mem, int size, void *arg) struct vmspace *vm; vm = (struct vmspace *)mem; - KASSERT(vm->vm_map.nentries == 0, - ("vmspace %p nentries == %d on free", vm, vm->vm_map.nentries)); - KASSERT(vm->vm_map.size == 0, - ("vmspace %p size == %ju on free", vm, (uintmax_t)vm->vm_map.size)); + + vm_map_zdtor(&vm->vm_map, sizeof(vm->vm_map), arg); } +static void +vm_map_zdtor(void *mem, int size, void *arg) +{ + vm_map_t map; + + map = (vm_map_t)mem; + KASSERT(map->nentries == 0, + ("map %p nentries == %d on free.", + map, map->nentries)); + KASSERT(map->size == 0, + ("map %p size == %lu on free.", + map, (unsigned long)map->size)); +} #endif /* INVARIANTS */ /* * Allocate a vmspace structure, including a vm_map and pmap, * and initialize those structures. The refcnt is set to 1. + * + * If 'pinit' is NULL then the embedded pmap is initialized via pmap_pinit(). */ struct vmspace * vmspace_alloc(vm_offset_t min, vm_offset_t max, pmap_pinit_t pinit) @@ -846,6 +878,24 @@ vmspace_resident_count(struct vmspace *vmspace) } /* + * vm_map_create: + * + * Creates and returns a new empty VM map with + * the given physical map structure, and having + * the given lower and upper address bounds. + */ +vm_map_t +vm_map_create(pmap_t pmap, vm_offset_t min, vm_offset_t max) +{ + vm_map_t result; + + result = uma_zalloc(mapzone, M_WAITOK); + CTR1(KTR_VM, "vm_map_create: %p", result); + _vm_map_init(result, pmap, min, max); + return (result); +} + +/* * Initialize an existing vm_map structure * such as that in the vmspace structure. */ @@ -872,9 +922,8 @@ vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min { _vm_map_init(map, pmap, min, max); - mtx_init(&map->system_mtx, "vm map (system)", NULL, - MTX_DEF | MTX_DUPOK); - sx_init(&map->lock, "vm map (user)"); + mtx_init(&map->system_mtx, "system map", NULL, MTX_DEF | MTX_DUPOK); + sx_init(&map->lock, "user map"); } /* Modified: stable/12/sys/vm/vm_map.h ============================================================================== --- stable/12/sys/vm/vm_map.h Mon Aug 31 19:47:30 2020 (r365006) +++ stable/12/sys/vm/vm_map.h Mon Aug 31 19:59:05 2020 (r365007) @@ -346,6 +346,10 @@ bool vm_map_range_valid_KBI(vm_map_t map, vm_offset_t long vmspace_resident_count(struct vmspace *vmspace); #endif /* _KERNEL */ + +/* XXX: number of kernel maps to statically allocate */ +#define MAX_KMAP 10 + /* * Copy-on-write flags for vm_map operations */ @@ -409,6 +413,7 @@ long vmspace_resident_count(struct vmspace *vmspace); #ifdef _KERNEL boolean_t vm_map_check_protection (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t); +vm_map_t vm_map_create(pmap_t, vm_offset_t, vm_offset_t); int vm_map_delete(vm_map_t, vm_offset_t, vm_offset_t); int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, vm_size_t, vm_offset_t, int, vm_prot_t, vm_prot_t, int); Modified: stable/12/sys/vm/vm_page.c ============================================================================== --- stable/12/sys/vm/vm_page.c Mon Aug 31 19:47:30 2020 (r365006) +++ stable/12/sys/vm/vm_page.c Mon Aug 31 19:59:05 2020 (r365007) @@ -590,6 +590,9 @@ vm_page_startup(vm_offset_t vaddr) #ifndef UMA_MD_SMALL_ALLOC /* vmem_startup() calls uma_prealloc(). */ boot_pages += vmem_startup_count(); + /* vm_map_startup() calls uma_prealloc(). */ + boot_pages += howmany(MAX_KMAP, + UMA_SLAB_SPACE / sizeof(struct vm_map)); /* * Before going fully functional kmem_init() does allocation From owner-svn-src-all@freebsd.org Mon Aug 31 20:02:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B77853CC7BB; Mon, 31 Aug 2020 20:02:33 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgLhn2GX1z42xw; Mon, 31 Aug 2020 20:02:33 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09251D4B2; Mon, 31 Aug 2020 20:02:33 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VK2Wha083683; Mon, 31 Aug 2020 20:02:32 GMT (envelope-from gbe@FreeBSD.org) Received: (from gbe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VK2WEG083682; Mon, 31 Aug 2020 20:02:32 GMT (envelope-from gbe@FreeBSD.org) Message-Id: <202008312002.07VK2WEG083682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gbe set sender to gbe@FreeBSD.org using -f From: Gordon Bergling Date: Mon, 31 Aug 2020 20:02:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365008 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: gbe X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 365008 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 20:02:34 -0000 Author: gbe (doc committer) Date: Mon Aug 31 20:02:32 2020 New Revision: 365008 URL: https://svnweb.freebsd.org/changeset/base/365008 Log: vtnet(4): improve the wording PR: 247936 Submitted by: PauAmma Reported by: PauAmma MFC after: 7 days Differential Revision: https://reviews.freebsd.org/D26244 Modified: head/share/man/man4/vtnet.4 Modified: head/share/man/man4/vtnet.4 ============================================================================== --- head/share/man/man4/vtnet.4 Mon Aug 31 19:59:05 2020 (r365007) +++ head/share/man/man4/vtnet.4 Mon Aug 31 20:02:32 2020 (r365008) @@ -49,7 +49,7 @@ The .Nm device driver provides support for VirtIO Ethernet devices. .Pp -If the hypervisor advertises the appreciate features, the +If the hypervisor advertises the appropriate features, the .Nm driver supports TCP/UDP checksum offload for both transmit and receive, TCP segmentation offload (TSO), TCP large receive offload (LRO), From owner-svn-src-all@freebsd.org Mon Aug 31 21:04:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5889D3CE493; Mon, 31 Aug 2020 21:04:01 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgN3j1jbSz46Z0; Mon, 31 Aug 2020 21:04:01 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E118DE53; Mon, 31 Aug 2020 21:04:01 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VL41Do020761; Mon, 31 Aug 2020 21:04:01 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VL40oR020759; Mon, 31 Aug 2020 21:04:00 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202008312104.07VL40oR020759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 31 Aug 2020 21:04:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365009 - in head: share/man/man4/man4.i386 sys/i386/bios X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: share/man/man4/man4.i386 sys/i386/bios X-SVN-Commit-Revision: 365009 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 21:04:01 -0000 Author: imp Date: Mon Aug 31 21:04:00 2020 New Revision: 365009 URL: https://svnweb.freebsd.org/changeset/base/365009 Log: Add deprecation notice for apm BIOS Add deprecation notice for apm bios, aka the apm(4) device. The apm(8) command will remain, at least for a while, since ACPI emulates the apm ioctl interface. Discussed on: arch@ Relnotes: yes MFC After: 3 days Modified: head/share/man/man4/man4.i386/apm.4 head/sys/i386/bios/apm.c Modified: head/share/man/man4/man4.i386/apm.4 ============================================================================== --- head/share/man/man4/man4.i386/apm.4 Mon Aug 31 20:02:32 2020 (r365008) +++ head/share/man/man4/man4.i386/apm.4 Mon Aug 31 21:04:00 2020 (r365009) @@ -19,6 +19,9 @@ .Nd APM BIOS interface .Sh SYNOPSIS .Cd device apm +.Sh DEPRECATION NOTICE +This driver is scheduled for removal prior to the release of +.Fx 13.0 . .Sh DESCRIPTION .Nm is an interface to the Intel / Microsoft APM (Advanced Power Management) BIOS Modified: head/sys/i386/bios/apm.c ============================================================================== --- head/sys/i386/bios/apm.c Mon Aug 31 20:02:32 2020 (r365008) +++ head/sys/i386/bios/apm.c Mon Aug 31 21:04:00 2020 (r365009) @@ -1214,6 +1214,8 @@ apm_attach(device_t dev) sc->sc_resume.ah_arg = sc; apm_hook_establish(APM_HOOK_RESUME, &sc->sc_resume); + gone_in_dev(dev, 13, "APM support has been removed."); + return 0; } From owner-svn-src-all@freebsd.org Mon Aug 31 21:28:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 391393CEB27; Mon, 31 Aug 2020 21:28:10 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgNbZ0l40z47fp; Mon, 31 Aug 2020 21:28:10 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1766E4F2; Mon, 31 Aug 2020 21:28:09 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VLS9gE032890; Mon, 31 Aug 2020 21:28:09 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VLS9tD032889; Mon, 31 Aug 2020 21:28:09 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202008312128.07VLS9tD032889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 31 Aug 2020 21:28:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365010 - stable/12/sbin/dhclient X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sbin/dhclient X-SVN-Commit-Revision: 365010 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 21:28:10 -0000 Author: emaste Date: Mon Aug 31 21:28:09 2020 New Revision: 365010 URL: https://svnweb.freebsd.org/changeset/base/365010 Log: MFC r364994: dhclient: improve error handling parsing option 119 Reported by: Shlomi Oberman, JSOF Submitted by: delphij Reviewed by: markj Tested by: markj Modified: stable/12/sbin/dhclient/options.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/dhclient/options.c ============================================================================== --- stable/12/sbin/dhclient/options.c Mon Aug 31 21:04:00 2020 (r365009) +++ stable/12/sbin/dhclient/options.c Mon Aug 31 21:28:09 2020 (r365010) @@ -298,6 +298,8 @@ find_search_domain_name_len(struct option_data *option pointed_len = find_search_domain_name_len(option, &pointer); + if (pointed_len < 0) + return (-1); domain_name_len += pointed_len; *offset = i + 2; From owner-svn-src-all@freebsd.org Mon Aug 31 21:28:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3AF5F3CEDA1; Mon, 31 Aug 2020 21:28:58 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgNcV0qmRz47XR; Mon, 31 Aug 2020 21:28:58 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F3C90E35B; Mon, 31 Aug 2020 21:28:57 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VLSvVe032978; Mon, 31 Aug 2020 21:28:57 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VLSvV5032977; Mon, 31 Aug 2020 21:28:57 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202008312128.07VLSvV5032977@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 31 Aug 2020 21:28:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365011 - stable/11/sbin/dhclient X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/11/sbin/dhclient X-SVN-Commit-Revision: 365011 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 21:28:58 -0000 Author: emaste Date: Mon Aug 31 21:28:57 2020 New Revision: 365011 URL: https://svnweb.freebsd.org/changeset/base/365011 Log: MFC r364994: dhclient: improve error handling parsing option 119 Reported by: Shlomi Oberman, JSOF Submitted by: delphij Reviewed by: markj Tested by: markj Modified: stable/11/sbin/dhclient/options.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/dhclient/options.c ============================================================================== --- stable/11/sbin/dhclient/options.c Mon Aug 31 21:28:09 2020 (r365010) +++ stable/11/sbin/dhclient/options.c Mon Aug 31 21:28:57 2020 (r365011) @@ -296,6 +296,8 @@ find_search_domain_name_len(struct option_data *option pointed_len = find_search_domain_name_len(option, &pointer); + if (pointed_len < 0) + return (-1); domain_name_len += pointed_len; *offset = i + 2; From owner-svn-src-all@freebsd.org Mon Aug 31 21:55:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BBB173CFB08; Mon, 31 Aug 2020 21:55:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgPC14d3Rz49tt; Mon, 31 Aug 2020 21:55:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7DE77E2FC; Mon, 31 Aug 2020 21:55:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VLtPPU051132; Mon, 31 Aug 2020 21:55:25 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VLtPSA051131; Mon, 31 Aug 2020 21:55:25 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202008312155.07VLtPSA051131@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 31 Aug 2020 21:55:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365012 - head/lib/libc/gen X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/lib/libc/gen X-SVN-Commit-Revision: 365012 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 21:55:25 -0000 Author: jhb Date: Mon Aug 31 21:55:25 2020 New Revision: 365012 URL: https://svnweb.freebsd.org/changeset/base/365012 Log: Fix the build of scandir_b with GCC. Use explicit typedefs for block thunk structures as in r264143. Reviewed by: kib, adrian MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D26256 Modified: head/lib/libc/gen/scandir.c Modified: head/lib/libc/gen/scandir.c ============================================================================== --- head/lib/libc/gen/scandir.c Mon Aug 31 21:28:57 2020 (r365011) +++ head/lib/libc/gen/scandir.c Mon Aug 31 21:55:25 2020 (r365012) @@ -56,15 +56,18 @@ void qsort_b(void *, size_t, size_t, void *); #define SELECT(x) select(x) #endif -#ifndef I_AM_SCANDIR_B +#ifdef I_AM_SCANDIR_B +typedef DECLARE_BLOCK(int, select_block, const struct dirent *); +typedef DECLARE_BLOCK(int, dcomp_block, const struct dirent **, + const struct dirent **); +#else static int alphasort_thunk(void *thunk, const void *p1, const void *p2); #endif int #ifdef I_AM_SCANDIR_B -scandir_b(const char *dirname, struct dirent ***namelist, - DECLARE_BLOCK(int, select, const struct dirent *), - DECLARE_BLOCK(int, dcomp, const struct dirent **, const struct dirent **)) +scandir_b(const char *dirname, struct dirent ***namelist, select_block select, + dcomp_block dcomp) #else scandir(const char *dirname, struct dirent ***namelist, int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **, From owner-svn-src-all@freebsd.org Mon Aug 31 21:57:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6627B3CF7F5; Mon, 31 Aug 2020 21:57:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgPDt22b5z4BHb; Mon, 31 Aug 2020 21:57:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 29419EB8C; Mon, 31 Aug 2020 21:57:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VLv27e051249; Mon, 31 Aug 2020 21:57:02 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VLv239051248; Mon, 31 Aug 2020 21:57:02 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202008312157.07VLv239051248@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 31 Aug 2020 21:57:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365013 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 365013 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 21:57:02 -0000 Author: jhb Date: Mon Aug 31 21:57:01 2020 New Revision: 365013 URL: https://svnweb.freebsd.org/changeset/base/365013 Log: Suppress -Wempty-body warnings in GCC 6.x and later. libc++ in LLVM 11 uses an empty else clause in include/c++/v1/__thread_support which triggers this warning. Reviewed by: dim, emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D26257 Modified: head/share/mk/bsd.sys.mk Modified: head/share/mk/bsd.sys.mk ============================================================================== --- head/share/mk/bsd.sys.mk Mon Aug 31 21:55:25 2020 (r365012) +++ head/share/mk/bsd.sys.mk Mon Aug 31 21:57:01 2020 (r365013) @@ -150,7 +150,8 @@ CWARNFLAGS+= -Wno-error=address \ # GCC 6.1.0 .if ${COMPILER_VERSION} >= 60100 -CWARNFLAGS+= -Wno-error=maybe-uninitialized \ +CWARNFLAGS+= -Wno-error=empty-body \ + -Wno-error=maybe-uninitialized \ -Wno-error=nonnull-compare \ -Wno-error=redundant-decls \ -Wno-error=shift-negative-value \ From owner-svn-src-all@freebsd.org Mon Aug 31 22:05:51 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A02323CFF3B; Mon, 31 Aug 2020 22:05:51 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgPR32Mvcz4Cst; Mon, 31 Aug 2020 22:05:50 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 07VM5h3b008830 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 1 Sep 2020 01:05:47 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 07VM5h3b008830 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 07VM5hoL008829; Tue, 1 Sep 2020 01:05:43 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 1 Sep 2020 01:05:43 +0300 From: Konstantin Belousov To: Edward Tomasz Napierala Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: Re: svn commit: r364985 - stable/12/libexec/rc/rc.d Message-ID: <20200831220543.GT2713@kib.kiev.ua> References: <202008311214.07VCEKao091305@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202008311214.07VCEKao091305@repo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 4BgPR32Mvcz4Cst X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 22:05:51 -0000 On Mon, Aug 31, 2020 at 12:14:20PM +0000, Edward Tomasz Napierala wrote: > Author: trasz > Date: Mon Aug 31 12:14:20 2020 > New Revision: 364985 > URL: https://svnweb.freebsd.org/changeset/base/364985 > > Log: > In 13-CURRENT, the linux rc script uses "nocover" mount option to avoid > mounting required filesystems twice. However, this option hasn't been MFC'd. > Implement its functionality in a different way, by stating the mount point. So why not merge nocover instead ? From owner-svn-src-all@freebsd.org Mon Aug 31 22:45:00 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1DCF53D055A; Mon, 31 Aug 2020 22:45:00 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgQJC75m2z4F5B; Mon, 31 Aug 2020 22:44:59 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D706AF14C; Mon, 31 Aug 2020 22:44:59 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VMixmF081649; Mon, 31 Aug 2020 22:44:59 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VMixcV081648; Mon, 31 Aug 2020 22:44:59 GMT (envelope-from np@FreeBSD.org) Message-Id: <202008312244.07VMixcV081648@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Mon, 31 Aug 2020 22:44:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365014 - head/sys/dev/cxgbe X-SVN-Group: head X-SVN-Commit-Author: np X-SVN-Commit-Paths: head/sys/dev/cxgbe X-SVN-Commit-Revision: 365014 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 22:45:00 -0000 Author: np Date: Mon Aug 31 22:44:59 2020 New Revision: 365014 URL: https://svnweb.freebsd.org/changeset/base/365014 Log: cxgbe(4): Check for descriptors before writing a TLS or raw work request. This fixes a regression in r362905. Submitted by: jhb@ Sponsored by: Chelsio Communications Modified: head/sys/dev/cxgbe/t4_sge.c Modified: head/sys/dev/cxgbe/t4_sge.c ============================================================================== --- head/sys/dev/cxgbe/t4_sge.c Mon Aug 31 21:57:01 2020 (r365013) +++ head/sys/dev/cxgbe/t4_sge.c Mon Aug 31 22:44:59 2020 (r365014) @@ -3004,6 +3004,14 @@ eth_tx(struct mp_ring *r, u_int cidx, u_int pidx, bool MPASS(rc != 0 && rc != EAGAIN); MPASS(txp->npkt == 0); + + n = tx_len16_to_desc(mbuf_len16(m0)); + if (__predict_false(avail < n)) { + avail += reclaim_tx_descs(txq, min(n, 32)); + if (avail < n) + break; /* out of descriptors */ + } + wr = &eq->desc[eq->pidx]; if (mbuf_cflags(m0) & MC_RAW_WR) { n = write_raw_wr(txq, wr, m0, avail); @@ -3014,12 +3022,6 @@ eth_tx(struct mp_ring *r, u_int cidx, u_int pidx, bool avail); #endif } else { - n = tx_len16_to_desc(mbuf_len16(m0)); - if (__predict_false(avail < n)) { - avail += reclaim_tx_descs(txq, 32); - if (avail < n) - break; /* out of descriptors */ - } ETHER_BPF_MTAP(ifp, m0); if (sc->flags & IS_VF) n = write_txpkt_vm_wr(sc, txq, m0); From owner-svn-src-all@freebsd.org Mon Aug 31 23:31:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AFB103D14C3; Mon, 31 Aug 2020 23:31:18 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgRKf4HCxz4HGp; Mon, 31 Aug 2020 23:31:18 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7624CF9D1; Mon, 31 Aug 2020 23:31:18 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VNVI1n006418; Mon, 31 Aug 2020 23:31:18 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VNVHlb006413; Mon, 31 Aug 2020 23:31:17 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202008312331.07VNVHlb006413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 31 Aug 2020 23:31:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365015 - in head/sys/dev: an wi X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/dev: an wi X-SVN-Commit-Revision: 365015 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 23:31:18 -0000 Author: imp Date: Mon Aug 31 23:31:16 2020 New Revision: 365015 URL: https://svnweb.freebsd.org/changeset/base/365015 Log: Warn for the non pccard attachments These devices have non-pccard attachments. Warn for those as well. Both an and wi don't do the modern cyrpto needed to use these cards on secure wifi networks. an needs firmware from Cisco, which I don't think was ever produced. wi could in theory do it with raw frames and on-host encryption, but nobody has written that in the 15 years since WEP was cracked. MFC After: 3 days Noticed by: rgrimes Differential Revision: https://reviews.freebsd.org/D26138 Modified: head/sys/dev/an/if_an_isa.c head/sys/dev/an/if_an_pccard.c head/sys/dev/an/if_an_pci.c head/sys/dev/wi/if_wi_macio.c head/sys/dev/wi/if_wi_pccard.c head/sys/dev/wi/if_wi_pci.c Modified: head/sys/dev/an/if_an_isa.c ============================================================================== --- head/sys/dev/an/if_an_isa.c Mon Aug 31 22:44:59 2020 (r365014) +++ head/sys/dev/an/if_an_isa.c Mon Aug 31 23:31:16 2020 (r365015) @@ -127,6 +127,7 @@ an_attach_isa(device_t dev) an_release_resources(dev); return (error); } + gone_in_dev(dev, 13, "pccard removed, an doesn't support modern crypto"); return (0); } Modified: head/sys/dev/an/if_an_pccard.c ============================================================================== --- head/sys/dev/an/if_an_pccard.c Mon Aug 31 22:44:59 2020 (r365014) +++ head/sys/dev/an/if_an_pccard.c Mon Aug 31 23:31:16 2020 (r365015) @@ -157,6 +157,6 @@ fail: if (error) an_release_resources(dev); else - gone_in_dev(dev, 13, "pccard removed"); + gone_in_dev(dev, 13, "pccard removed, an doesn't support modern crypto"); return (error); } Modified: head/sys/dev/an/if_an_pci.c ============================================================================== --- head/sys/dev/an/if_an_pci.c Mon Aug 31 22:44:59 2020 (r365014) +++ head/sys/dev/an/if_an_pci.c Mon Aug 31 23:31:16 2020 (r365015) @@ -230,7 +230,8 @@ an_attach_pci(dev) NULL, an_intr, sc, &sc->irq_handle); if (error) device_printf(dev, "couldn't setup interrupt\n"); - + else + gone_in_dev(dev, 13, "pccard removed, an doesn't support modern crypto"); fail: if (error) an_release_resources(dev); Modified: head/sys/dev/wi/if_wi_macio.c ============================================================================== --- head/sys/dev/wi/if_wi_macio.c Mon Aug 31 22:44:59 2020 (r365014) +++ head/sys/dev/wi/if_wi_macio.c Mon Aug 31 23:31:16 2020 (r365015) @@ -142,6 +142,8 @@ wi_macio_attach(device_t dev) error = wi_attach(dev); if (error != 0) wi_free(dev); + else + gone_in_dev(dev, 13, "pccard removed, wi doesn't support modern crypto"); } return error; } Modified: head/sys/dev/wi/if_wi_pccard.c ============================================================================== --- head/sys/dev/wi/if_wi_pccard.c Mon Aug 31 22:44:59 2020 (r365014) +++ head/sys/dev/wi/if_wi_pccard.c Mon Aug 31 23:31:16 2020 (r365015) @@ -200,7 +200,7 @@ wi_pccard_attach(device_t dev) error = wi_attach(dev); if (error != 0) wi_free(dev); - gone_in_dev(dev, 13, "pccard removed"); + gone_in_dev(dev, 13, "pccard removed, wi doesn't support modern crypto"); } return error; } Modified: head/sys/dev/wi/if_wi_pci.c ============================================================================== --- head/sys/dev/wi/if_wi_pci.c Mon Aug 31 22:44:59 2020 (r365014) +++ head/sys/dev/wi/if_wi_pci.c Mon Aug 31 23:31:16 2020 (r365015) @@ -233,6 +233,8 @@ wi_pci_attach(device_t dev) error = wi_attach(dev); if (error != 0) wi_free(dev); + else + gone_in_dev(dev, 13, "pccard removed, wi doesn't support modern crypto"); return (error); } From owner-svn-src-all@freebsd.org Mon Aug 31 23:48:23 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D8C913D1561; Mon, 31 Aug 2020 23:48:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgRjM4sRHz4Hhb; Mon, 31 Aug 2020 23:48:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 85DE4FE55; Mon, 31 Aug 2020 23:48:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VNmN0s018542; Mon, 31 Aug 2020 23:48:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VNmNNe018541; Mon, 31 Aug 2020 23:48:23 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202008312348.07VNmNNe018541@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 31 Aug 2020 23:48:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365016 - head/sbin/devd X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sbin/devd X-SVN-Commit-Revision: 365016 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 23:48:23 -0000 Author: imp Date: Mon Aug 31 23:48:23 2020 New Revision: 365016 URL: https://svnweb.freebsd.org/changeset/base/365016 Log: Add documentation for ETHERNET events. Modified: head/sbin/devd/devd.conf.5 Modified: head/sbin/devd/devd.conf.5 ============================================================================== --- head/sbin/devd/devd.conf.5 Mon Aug 31 23:31:16 2020 (r365015) +++ head/sbin/devd/devd.conf.5 Mon Aug 31 23:48:23 2020 (r365016) @@ -432,6 +432,14 @@ node is destroyed. .Pp .Bl -column "System" "Subsystem" "1234567" -compact .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" +.It Li ETHERNET Ta Ar inet Ta IFATTACH Ta +Notification when the default VNET instance of the +.Ar inet +interface is attached. +.El +.Pp +.Bl -column "System" "Subsystem" "1234567" -compact +.Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" .It Li GEOM Ta Ta Ta Events related to the .Xr geom 4 From owner-svn-src-all@freebsd.org Mon Aug 31 23:48:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ABC083D16D3; Mon, 31 Aug 2020 23:48:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgRjS3gQ3z4Hnh; Mon, 31 Aug 2020 23:48:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 15B3A1000C; Mon, 31 Aug 2020 23:48:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VNmRNT018598; Mon, 31 Aug 2020 23:48:27 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VNmRCG018597; Mon, 31 Aug 2020 23:48:27 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202008312348.07VNmRCG018597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 31 Aug 2020 23:48:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365017 - head/sbin/devd X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sbin/devd X-SVN-Commit-Revision: 365017 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 23:48:29 -0000 Author: imp Date: Mon Aug 31 23:48:27 2020 New Revision: 365017 URL: https://svnweb.freebsd.org/changeset/base/365017 Log: Sort IFNET alphabetically Modified: head/sbin/devd/devd.conf.5 Modified: head/sbin/devd/devd.conf.5 ============================================================================== --- head/sbin/devd/devd.conf.5 Mon Aug 31 23:48:23 2020 (r365016) +++ head/sbin/devd/devd.conf.5 Mon Aug 31 23:48:27 2020 (r365017) @@ -401,24 +401,6 @@ String containing the temperature of the core that has .Pp .Bl -column "System" "Subsystem" "1234567" -compact .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" -.It Li IFNET -.It Li IFNET Ta Ar inet Ta Ta -The -.Dq subsystem -is the actual name of the network interface on which the event -took place. -.It Li IFNET Ta Ar inet Ta Li LINK_UP Ta -Carrier status changed to UP. -.It Li IFNET Ta Ar inet Ta Li LINK_DOWN Ta -Carrier status changed to DOWN. -.It Li IFNET Ta Ar inet Ta Li ATTACH Ta -The network interface is attached to the system. -.It Li IFNET Ta Ar inet Ta Li DETACH Ta -The network interface is detached from the system. -.El -.Pp -.Bl -column "System" "Subsystem" "1234567" -compact -.Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" .It Li DEVFS .It Li DEVFS Ta Li CDEV Ta Li CREATE Ta The @@ -471,12 +453,29 @@ provider size has changed. .Pp .Bl -column "System" "Subsystem" "1234567" -compact .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" +.It Li IFNET +.It Li IFNET Ta Ar inet Ta Ta +The +.Dq subsystem +is the actual name of the network interface on which the event +took place. +.It Li IFNET Ta Ar inet Ta Li LINK_UP Ta +Carrier status changed to UP. +.It Li IFNET Ta Ar inet Ta Li LINK_DOWN Ta +Carrier status changed to DOWN. +.It Li IFNET Ta Ar inet Ta Li ATTACH Ta +The network interface is attached to the system. +.It Li IFNET Ta Ar inet Ta Li DETACH Ta +The network interface is detached from the system. +.El +.Pp +.Bl -column "System" "Subsystem" "1234567" -compact +.Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" .It Li kern Ta Li power Ta Li resume Ta Notification that the system has woken from the suspended state. Note: this notification is deprecated and will be removed in .Fx 14.0 . .El -.Pp .Pp .Bl -column "System" "Subsystem" "1234567" -compact .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" From owner-svn-src-all@freebsd.org Tue Sep 1 00:14:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B12973D21C1; Tue, 1 Sep 2020 00:14:40 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgSHh4Dpdz4K9v; Tue, 1 Sep 2020 00:14:40 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74BE21051D; Tue, 1 Sep 2020 00:14:40 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0810EeJg036760; Tue, 1 Sep 2020 00:14:40 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0810Ee8M036759; Tue, 1 Sep 2020 00:14:40 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202009010014.0810Ee8M036759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 1 Sep 2020 00:14:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365018 - head X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 365018 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 00:14:40 -0000 Author: emaste Date: Tue Sep 1 00:14:40 2020 New Revision: 365018 URL: https://svnweb.freebsd.org/changeset/base/365018 Log: Makefile.inc1: comment .endif to ease finding matching .if Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Aug 31 23:48:27 2020 (r365017) +++ head/Makefile.inc1 Tue Sep 1 00:14:40 2020 (r365018) @@ -1436,7 +1436,7 @@ distributeworld installworld stageworld: _installcheck DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs ${INSTALL_SYMLINK} ${INSTALLFLAGS} usr/src/sys ${INSTALL_DDIR}/base/sys -.endif +.endif # make(distributeworld) ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} .if make(distributeworld) @@ -1465,7 +1465,7 @@ distributeworld installworld stageworld: _installcheck ${DESTDIR}/${DISTDIR}/${dist}.debug.meta .endfor .endif -.endif +.endif # make(distributeworld) packageworld: .PHONY .for dist in base ${EXTRA_DISTRIBUTIONS} From owner-svn-src-all@freebsd.org Tue Sep 1 01:10:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85F013D428B; Tue, 1 Sep 2020 01:10:17 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgTWs32KBz4P5y; Tue, 1 Sep 2020 01:10:17 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B8C710954; Tue, 1 Sep 2020 01:10:17 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0811AHg9068652; Tue, 1 Sep 2020 01:10:17 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0811AHqm068651; Tue, 1 Sep 2020 01:10:17 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202009010110.0811AHqm068651@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Tue, 1 Sep 2020 01:10:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365019 - head/sys/fs/nfsclient X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/sys/fs/nfsclient X-SVN-Commit-Revision: 365019 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 01:10:17 -0000 Author: rmacklem Date: Tue Sep 1 01:10:16 2020 New Revision: 365019 URL: https://svnweb.freebsd.org/changeset/base/365019 Log: Add a check to test for the case of the "tls" option being used with "udp". The KERN_TLS only supports TCP, so use of the "tls" option with "udp" will not work. This patch adds a test for this case, so that the mount is not attempted when both "tls" and "udp" are specified. Modified: head/sys/fs/nfsclient/nfs_clvfsops.c Modified: head/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clvfsops.c Tue Sep 1 00:14:40 2020 (r365018) +++ head/sys/fs/nfsclient/nfs_clvfsops.c Tue Sep 1 01:10:16 2020 (r365019) @@ -1419,7 +1419,9 @@ mountnfs(struct nfs_args *argp, struct mount *mp, stru if ((newflag & NFSMNT_TLS) != 0) { error = EINVAL; #ifdef KERN_TLS - if (rpctls_getinfo(&maxlen, true, false)) + /* KERN_TLS is only supported for TCP. */ + if (argp->sotype == SOCK_STREAM && + rpctls_getinfo(&maxlen, true, false)) error = 0; #endif if (error != 0) { From owner-svn-src-all@freebsd.org Tue Sep 1 01:57:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 073C73D6E43; Tue, 1 Sep 2020 01:57:57 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgVZr6Wtlz4SxQ; Tue, 1 Sep 2020 01:57:56 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C337D11998; Tue, 1 Sep 2020 01:57:56 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0811vu1S099668; Tue, 1 Sep 2020 01:57:56 GMT (envelope-from bdragon@FreeBSD.org) Received: (from bdragon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0811vumT099667; Tue, 1 Sep 2020 01:57:56 GMT (envelope-from bdragon@FreeBSD.org) Message-Id: <202009010157.0811vumT099667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdragon set sender to bdragon@FreeBSD.org using -f From: Brandon Bergren Date: Tue, 1 Sep 2020 01:57:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365021 - head/sys/powerpc/powerpc X-SVN-Group: head X-SVN-Commit-Author: bdragon X-SVN-Commit-Paths: head/sys/powerpc/powerpc X-SVN-Commit-Revision: 365021 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 01:57:57 -0000 Author: bdragon Date: Tue Sep 1 01:57:56 2020 New Revision: 365021 URL: https://svnweb.freebsd.org/changeset/base/365021 Log: [PowerPC] Remove unused openpic_set_priority(). When SMP support for powerpc was added in r178628, the last callers of this function were removed. All code that needs to manipulate the task priority just does it directly instead. Noticed while reading through the lint logs. Sponsored by: Tag1 Consulting, Inc. Modified: head/sys/powerpc/powerpc/openpic.c Modified: head/sys/powerpc/powerpc/openpic.c ============================================================================== --- head/sys/powerpc/powerpc/openpic.c Tue Sep 1 01:12:55 2020 (r365020) +++ head/sys/powerpc/powerpc/openpic.c Tue Sep 1 01:57:56 2020 (r365021) @@ -73,21 +73,6 @@ openpic_write(struct openpic_softc *sc, u_int reg, uin bus_space_write_4(sc->sc_bt, sc->sc_bh, reg, val); } -static __inline void -openpic_set_priority(struct openpic_softc *sc, int pri) -{ - u_int tpr; - uint32_t x; - - sched_pin(); - tpr = OPENPIC_PCPU_TPR((sc->sc_dev == root_pic) ? PCPU_GET(cpuid) : 0); - x = openpic_read(sc, tpr); - x &= ~OPENPIC_TPR_MASK; - x |= pri; - openpic_write(sc, tpr, x); - sched_unpin(); -} - int openpic_common_attach(device_t dev, uint32_t node) { From owner-svn-src-all@freebsd.org Tue Sep 1 04:37:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A9FF53DAB6E; Tue, 1 Sep 2020 04:37:56 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgZ7S3zyWz4cYC; Tue, 1 Sep 2020 04:37:56 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 676C7137AD; Tue, 1 Sep 2020 04:37:56 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0814buSW098369; Tue, 1 Sep 2020 04:37:56 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0814buhY098368; Tue, 1 Sep 2020 04:37:56 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009010437.0814buhY098368@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 1 Sep 2020 04:37:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365022 - head/sys/libkern X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/libkern X-SVN-Commit-Revision: 365022 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 04:37:56 -0000 Author: imp Date: Tue Sep 1 04:37:55 2020 New Revision: 365022 URL: https://svnweb.freebsd.org/changeset/base/365022 Log: Smaller crc for the boot loader. Save 7k of text space by using simpler crc32 for standalone case. we don't need all that fancy optimization in the boot loader, so use a simplified version of the CRC function. We could save more by doing it one bit at a time rather than 32, but this is the biggest savings at the smallest performance hit. With LUA and verfied exec, gptboot, gptzfsboot and friends are pushing the ~530k limit and every little bit helps. Reviewed By: allanjude Differential Revision: https://reviews.freebsd.org/D24225 Modified: head/sys/libkern/gsb_crc32.c Modified: head/sys/libkern/gsb_crc32.c ============================================================================== --- head/sys/libkern/gsb_crc32.c Tue Sep 1 01:57:56 2020 (r365021) +++ head/sys/libkern/gsb_crc32.c Tue Sep 1 04:37:55 2020 (r365022) @@ -227,6 +227,7 @@ singletable_crc32c(uint32_t crc, const void *buf, size return crc; } +#ifndef _STANDALONE /* * Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved @@ -788,3 +789,10 @@ calculate_crc32c(uint32_t crc32c, return (multitable_crc32c(crc32c, buffer, length)); } } +#else +uint32_t +calculate_crc32c(uint32_t crc32c, const unsigned char *buffer, unsigned int length) +{ + return (singletable_crc32c(crc32c, buffer, length)); +} +#endif From owner-svn-src-all@freebsd.org Tue Sep 1 05:27:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD2F23CD0F6; Tue, 1 Sep 2020 05:27:31 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgbDg51J5z3ZT5; Tue, 1 Sep 2020 05:27:31 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from [192.168.1.10] (unknown [IPv6:2601:641:300:6e9f:f87d:2e2e:d2ef:2a35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id EB97115981; Tue, 1 Sep 2020 05:27:30 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.40.20081000 Date: Mon, 31 Aug 2020 22:27:27 -0700 Subject: Re: svn commit: r364989 - head/sys/dev/jedec_dimm From: Ravi Pokala To: Eric van Gyzen , , , , Message-ID: Thread-Topic: svn commit: r364989 - head/sys/dev/jedec_dimm References: <202008311503.07VF3OrC097327@repo.freebsd.org> In-Reply-To: <202008311503.07VF3OrC097327@repo.freebsd.org> Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 05:27:31 -0000 -----Original Message----- From: on behalf of Eric van Gyzen Date: 2020-08-31, Monday at 08:03 To: , , Subject: svn commit: r364989 - head/sys/dev/jedec_dimm Author: vangyzen Date: Mon Aug 31 15:03:23 2020 New Revision: 364989 URL: https://svnweb.freebsd.org/changeset/base/364989 Log: jedec_dimm: fix array overrun Coverity detected the overrunning of sc->part_str. Submitted by: bret_ketchum@dell.com Reported by: Coverity MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D26145 Pointy-hat to: rpokala@ Bah, sorry, I completely missed this review. Thanks for the fix, Bret. Thanks for reviewing and committing it, Eric. -Ravi (rpokala@) Modified: head/sys/dev/jedec_dimm/jedec_dimm.c Modified: head/sys/dev/jedec_dimm/jedec_dimm.c ============================================================================== --- head/sys/dev/jedec_dimm/jedec_dimm.c Mon Aug 31 14:47:23 2020 (r364988) +++ head/sys/dev/jedec_dimm/jedec_dimm.c Mon Aug 31 15:03:23 2020 (r364989) @@ -795,7 +795,7 @@ jedec_dimm_field_to_str(struct jedec_dimm_softc *sc, c /* If we're dealing with ASCII, convert trailing spaces to NULs. */ if (ascii) { - for (i = dstsz; i > 0; i--) { + for (i = dstsz - 1; i > 0; i--) { if (dst[i] == ' ') { dst[i] = 0; } else if (dst[i] == 0) { From owner-svn-src-all@freebsd.org Tue Sep 1 05:46:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A39393B8DC4; Tue, 1 Sep 2020 05:46:07 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgbf64dMSz3yKS; Tue, 1 Sep 2020 05:46:06 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lj1-f175.google.com with SMTP id k25so5508ljg.9; Mon, 31 Aug 2020 22:46:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=24GArG/xMpMinog5Aqhuqjd5nD8DEasH25lpzLaQXjQ=; b=mEAjPWOH5irNBgbKk1zY05K0kS9YZ065wMH2WR96Z7SgorbsAgRxcDLrjuO1w2Nfua t+Jyp/v9MKKDsWgbC8Z4l7wBOPsrot6r2x0Q+m3mPRjvjTfN53yQYKn7Cmyb0u1BbuQE W0AW0mBzcKBU7iKQ6KiI3R60jAOUARmnDYxPZVHo+x/yQSNZPmMDnGNcHelM98gQEkX7 wFQmUcgN7AxYSi/xUwl97AM/b6VBXDK7xPD/XFqBOtSFZV/ex4KfDkjcHB1giYjjVmhH dAPldKv6CgTbYwaaxwCh8mcFgTE2dSl/mPZEE2B5EGbgOzN91WvrF8fjqplqHZuOoaVE tdhQ== X-Gm-Message-State: AOAM5328/gyiIfZ5tfcntw9l2YC4ZXWOjt+S1+mYCP8PxqB7HwY5xqQj bwH7T59ONTJvwao3bY8OFiNwIRhZ5Hc= X-Google-Smtp-Source: ABdhPJyAR7r4IhrDJ1X7B1d3OW3jwvfLwHptlyrvcVaMk1I+c03P2+0yJSK1jPDy0Ckfdw+CYsFHJw== X-Received: by 2002:a2e:871a:: with SMTP id m26mr103044lji.45.1598939164367; Mon, 31 Aug 2020 22:46:04 -0700 (PDT) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id u9sm44263ljh.20.2020.08.31.22.46.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 Aug 2020 22:46:03 -0700 (PDT) Subject: Re: svn commit: r364989 - head/sys/dev/jedec_dimm To: Eric van Gyzen , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008311503.07VF3OrC097327@repo.freebsd.org> From: Andriy Gapon Openpgp: preference=signencrypt Autocrypt: addr=avg@FreeBSD.org; prefer-encrypt=mutual; keydata= mQINBFm4LIgBEADNB/3lT7f15UKeQ52xCFQx/GqHkSxEdVyLFZTmY3KyNPQGBtyvVyBfprJ7 mAeXZWfhat6cKNRAGZcL5EmewdQuUfQfBdYmKjbw3a9GFDsDNuhDA2QwFt8BmkiVMRYyvI7l N0eVzszWCUgdc3qqM6qqcgBaqsVmJluwpvwp4ZBXmch5BgDDDb1MPO8AZ2QZfIQmplkj8Y6Z AiNMknkmgaekIINSJX8IzRzKD5WwMsin70psE8dpL/iBsA2cpJGzWMObVTtCxeDKlBCNqM1i gTXta1ukdUT7JgLEFZk9ceYQQMJJtUwzWu1UHfZn0Fs29HTqawfWPSZVbulbrnu5q55R4PlQ /xURkWQUTyDpqUvb4JK371zhepXiXDwrrpnyyZABm3SFLkk2bHlheeKU6Yql4pcmSVym1AS4 dV8y0oHAfdlSCF6tpOPf2+K9nW1CFA8b/tw4oJBTtfZ1kxXOMdyZU5fiG7xb1qDgpQKgHUX8 7Rd2T1UVLVeuhYlXNw2F+a2ucY+cMoqz3LtpksUiBppJhw099gEXehcN2JbUZ2TueJdt1FdS ztnZmsHUXLxrRBtGwqnFL7GSd6snpGIKuuL305iaOGODbb9c7ne1JqBbkw1wh8ci6vvwGlzx rexzimRaBzJxlkjNfMx8WpCvYebGMydNoeEtkWldtjTNVsUAtQARAQABtB5BbmRyaXkgR2Fw b24gPGF2Z0BGcmVlQlNELm9yZz6JAlQEEwEIAD4WIQS+LEO7ngQnXA4Bjr538m7TUc1yjwUC WbgsiAIbIwUJBaOagAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRB38m7TUc1yj+JAEACV l9AK/nOWAt/9cufV2fRj0hdOqB1aCshtSrwHk/exXsDa4/FkmegxXQGY+3GWX3deIyesbVRL rYdtdK0dqJyT1SBqXK1h3/at9rxr9GQA6KWOxTjUFURsU7ok/6SIlm8uLRPNKO+yq0GDjgaO LzN+xykuBA0FlhQAXJnpZLcVfPJdWv7sSHGedL5ln8P8rxR+XnmsA5TUaaPcbhTB+mG+iKFj GghASDSfGqLWFPBlX/fpXikBDZ1gvOr8nyMY9nXhgfXpq3B6QCRYKPy58ChrZ5weeJZ29b7/ QdEO8NFNWHjSD9meiLdWQaqo9Y7uUxN3wySc/YUZxtS0bhAd8zJdNPsJYG8sXgKjeBQMVGuT eCAJFEYJqbwWvIXMfVWop4+O4xB+z2YE3jAbG/9tB/GSnQdVSj3G8MS80iLS58frnt+RSEw/ psahrfh0dh6SFHttE049xYiC+cM8J27Aaf0i9RflyITq57NuJm+AHJoU9SQUkIF0nc6lfA+o JRiyRlHZHKoRQkIg4aiKaZSWjQYRl5Txl0IZUP1dSWMX4s3XTMurC/pnja45dge/4ESOtJ9R 8XuIWg45Oq6MeIWdjKddGhRj3OohsltKgkEU3eLKYtB6qRTQypHHUawCXz88uYt5e3w4V16H lCpSTZV/EVHnNe45FVBlvK7k7HFfDDkryLkCDQRZuCyIARAAlq0slcsVboY/+IUJdcbEiJRW be9HKVz4SUchq0z9MZPX/0dcnvz/gkyYA+OuM78dNS7Mbby5dTvOqfpLJfCuhaNYOhlE0wY+ 1T6Tf1f4c/uA3U/YiadukQ3+6TJuYGAdRZD5EqYFIkreARTVWg87N9g0fT9BEqLw9lJtEGDY EWUE7L++B8o4uu3LQFEYxcrb4K/WKmgtmFcm77s0IKDrfcX4doV92QTIpLiRxcOmCC/OCYuO jB1oaaqXQzZrCutXRK0L5XN1Y1PYjIrEzHMIXmCDlLYnpFkK+itlXwlE2ZQxkfMruCWdQXye syl2fynAe8hvp7Mms9qU2r2K9EcJiR5N1t1C2/kTKNUhcRv7Yd/vwusK7BqJbhlng5ZgRx0m WxdntU/JLEntz3QBsBsWM9Y9wf2V4tLv6/DuDBta781RsCB/UrU2zNuOEkSixlUiHxw1dccI 6CVlaWkkJBxmHX22GdDFrcjvwMNIbbyfQLuBq6IOh8nvu9vuItup7qemDG3Ms6TVwA7BD3j+ 3fGprtyW8Fd/RR2bW2+LWkMrqHffAr6Y6V3h5kd2G9Q8ZWpEJk+LG6Mk3fhZhmCnHhDu6CwN MeUvxXDVO+fqc3JjFm5OxhmfVeJKrbCEUJyM8ESWLoNHLqjywdZga4Q7P12g8DUQ1mRxYg/L HgZY3zfKOqcAEQEAAYkCPAQYAQgAJhYhBL4sQ7ueBCdcDgGOvnfybtNRzXKPBQJZuCyIAhsM BQkFo5qAAAoJEHfybtNRzXKPBVwQAKfFy9P7N3OsLDMB56A4Kf+ZT+d5cIx0Yiaf4n6w7m3i ImHHHk9FIetI4Xe54a2IXh4Bq5UkAGY0667eIs+Z1Ea6I2i27Sdo7DxGwq09Qnm/Y65ADvXs 3aBvokCcm7FsM1wky395m8xUos1681oV5oxgqeRI8/76qy0hD9WR65UW+HQgZRIcIjSel9vR XDaD2HLGPTTGr7u4v00UeTMs6qvPsa2PJagogrKY8RXdFtXvweQFz78NbXhluwix2Tb9ETPk LIpDrtzV73CaE2aqBG/KrboXT2C67BgFtnk7T7Y7iKq4/XvEdDWscz2wws91BOXuMMd4c/c4 OmGW9m3RBLufFrOag1q5yUS9QbFfyqL6dftJP3Zq/xe+mr7sbWbhPVCQFrH3r26mpmy841ym dwQnNcsbIGiBASBSKksOvIDYKa2Wy8htPmWFTEOPRpFXdGQ27awcjjnB42nngyCK5ukZDHi6 w0qK5DNQQCkiweevCIC6wc3p67jl1EMFY5+z+zdTPb3h7LeVnGqW0qBQl99vVFgzLxchKcl0 R/paSFgwqXCZhAKMuUHncJuynDOP7z5LirUeFI8qsBAJi1rXpQoLJTVcW72swZ42IdPiboqx NbTMiNOiE36GqMcTPfKylCbF45JNX4nF9ElM0E+Y8gi4cizJYBRr2FBJgay0b9Cp Message-ID: <5709d5bb-6f52-711b-cc4b-bed175cdb7d8@FreeBSD.org> Date: Tue, 1 Sep 2020 08:46:02 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Firefox/60.0 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <202008311503.07VF3OrC097327@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Bgbf64dMSz3yKS X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of agapon@gmail.com designates 209.85.208.175 as permitted sender) smtp.mailfrom=agapon@gmail.com X-Spamd-Result: default: False [-1.25 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-0.71)[-0.710]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-0.69)[-0.690]; NEURAL_SPAM_SHORT(0.15)[0.154]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.175:from]; RECEIVED_SPAMHAUS_PBL(0.00)[93.72.151.96:received]; FORGED_SENDER(0.30)[avg@FreeBSD.org,agapon@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.175:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[avg@FreeBSD.org,agapon@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 05:46:07 -0000 On 31/08/2020 18:03, Eric van Gyzen wrote: > Author: vangyzen > Date: Mon Aug 31 15:03:23 2020 > New Revision: 364989 > URL: https://svnweb.freebsd.org/changeset/base/364989 > > Log: > jedec_dimm: fix array overrun > > Coverity detected the overrunning of sc->part_str. > > Submitted by: bret_ketchum@dell.com > Reported by: Coverity > MFC after: 2 weeks > Sponsored by: Dell EMC Isilon > Differential Revision: https://reviews.freebsd.org/D26145 > > Modified: > head/sys/dev/jedec_dimm/jedec_dimm.c > > Modified: head/sys/dev/jedec_dimm/jedec_dimm.c > ============================================================================== > --- head/sys/dev/jedec_dimm/jedec_dimm.c Mon Aug 31 14:47:23 2020 (r364988) > +++ head/sys/dev/jedec_dimm/jedec_dimm.c Mon Aug 31 15:03:23 2020 (r364989) > @@ -795,7 +795,7 @@ jedec_dimm_field_to_str(struct jedec_dimm_softc *sc, c > > /* If we're dealing with ASCII, convert trailing spaces to NULs. */ > if (ascii) { > - for (i = dstsz; i > 0; i--) { > + for (i = dstsz - 1; i > 0; i--) { If 'i' is an index into the array, then shouldn't the condition be greater-equal? > if (dst[i] == ' ') { > dst[i] = 0; > } else if (dst[i] == 0) { > -- Andriy Gapon From owner-svn-src-all@freebsd.org Tue Sep 1 06:06:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 468563B96BE; Tue, 1 Sep 2020 06:06:34 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgc5k11vjz40N1; Tue, 1 Sep 2020 06:06:34 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 020A81484C; Tue, 1 Sep 2020 06:06:34 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08166Xkf054340; Tue, 1 Sep 2020 06:06:33 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08166XFY054337; Tue, 1 Sep 2020 06:06:33 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202009010606.08166XFY054337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Tue, 1 Sep 2020 06:06:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365023 - head/lib/libnetmap X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: head/lib/libnetmap X-SVN-Commit-Revision: 365023 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 06:06:34 -0000 Author: vmaffione Date: Tue Sep 1 06:06:32 2020 New Revision: 365023 URL: https://svnweb.freebsd.org/changeset/base/365023 Log: lib: libnetmap: add missing copyright headers MFC after: 2 weeks Modified: head/lib/libnetmap/nmctx-pthreads.c head/lib/libnetmap/nmctx.c head/lib/libnetmap/nmport.c head/lib/libnetmap/nmreq.c Modified: head/lib/libnetmap/nmctx-pthreads.c ============================================================================== --- head/lib/libnetmap/nmctx-pthreads.c Tue Sep 1 04:37:55 2020 (r365022) +++ head/lib/libnetmap/nmctx-pthreads.c Tue Sep 1 06:06:32 2020 (r365023) @@ -1,4 +1,34 @@ -/* $FreeBSD$ */ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (C) 2018 Universita` di Pisa + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + #include #include #include Modified: head/lib/libnetmap/nmctx.c ============================================================================== --- head/lib/libnetmap/nmctx.c Tue Sep 1 04:37:55 2020 (r365022) +++ head/lib/libnetmap/nmctx.c Tue Sep 1 06:06:32 2020 (r365023) @@ -1,4 +1,34 @@ -/* $FreeBSD$ */ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (C) 2018 Universita` di Pisa + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + #include #include #include Modified: head/lib/libnetmap/nmport.c ============================================================================== --- head/lib/libnetmap/nmport.c Tue Sep 1 04:37:55 2020 (r365022) +++ head/lib/libnetmap/nmport.c Tue Sep 1 06:06:32 2020 (r365023) @@ -1,4 +1,34 @@ -/* $FreeBSD$ */ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (C) 2018 Universita` di Pisa + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + #include #include #include Modified: head/lib/libnetmap/nmreq.c ============================================================================== --- head/lib/libnetmap/nmreq.c Tue Sep 1 04:37:55 2020 (r365022) +++ head/lib/libnetmap/nmreq.c Tue Sep 1 06:06:32 2020 (r365023) @@ -1,4 +1,34 @@ -/* $FreeBSD$ */ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (C) 2018 Universita` di Pisa + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + #include #include #include From owner-svn-src-all@freebsd.org Tue Sep 1 07:46:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4F4343BBD16; Tue, 1 Sep 2020 07:46:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgfK01SyXz44nP; Tue, 1 Sep 2020 07:46:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 128DB159DA; Tue, 1 Sep 2020 07:46:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0817kR3N015687; Tue, 1 Sep 2020 07:46:27 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0817kRAq015686; Tue, 1 Sep 2020 07:46:27 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009010746.0817kRAq015686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 1 Sep 2020 07:46:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365024 - head/stand/man X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/stand/man X-SVN-Commit-Revision: 365024 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 07:46:28 -0000 Author: imp Date: Tue Sep 1 07:46:27 2020 New Revision: 365024 URL: https://svnweb.freebsd.org/changeset/base/365024 Log: Document boot1.efi Crude man page for boo1.efi. Added: head/stand/man/boot1.efi.8 (contents, props changed) Modified: head/stand/man/Makefile Modified: head/stand/man/Makefile ============================================================================== --- head/stand/man/Makefile Tue Sep 1 06:06:32 2020 (r365023) +++ head/stand/man/Makefile Tue Sep 1 07:46:27 2020 (r365024) @@ -2,6 +2,9 @@ .include +.if ${MK_EFI} != "no" +MAN+= boot1.efi.8 +.endif MAN+= loader.8 .include Added: head/stand/man/boot1.efi.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/stand/man/boot1.efi.8 Tue Sep 1 07:46:27 2020 (r365024) @@ -0,0 +1,99 @@ +.\" +.\" Copyright (c) 2020 Netflix, Inc +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd September 1, 2020 +.Dt BOOT1.EFI 8 +.Os +.Sh NAME +.Nm boot1.efi +.Nd UEFI chain loader +.Sh DESCRIPTION +.Nm +has been deprecated and will be removed from a future release. +.Xr loader.efi 8 handles all its former use cases with more flexibility. +.Pp +On UEFI systems, +.Nm +loads +.Pa /boot/loader.efi +from the default root file system and transfers execution there. +.Ss Initialization +Before looking for the boot device, +.Nm +does the following initialization +.Bl -bullet +.It +Sets up the console using the default UEFI console routines. +.It +Discovers all possible block devices on the system. +.It +Initializes all file system modules to read files from those devices +.El +.Ss Boot Device Selection +.Nm +uses the following sequence to determine the root file system for +booting: +.Bl -bullet +.It +If ZFS is configured, +.Nm +will search the for zpools that are bootable, preferring the zpool on +the boot device over the others. +.It +If UFS is configured, +.Nm +will search all UFS partitions for a bootable partition. +It will prefer the lowest numbered bootable partition on the boot +device over all other choices. +It will fall back to partitions on other devices if none are found. +.El +.Pp +A partition is considered bootable if it can load +.Pa /boot/loader.efi +from it. +Command line arguments to the next boot stage are +read from the first existing file of +.Pa /boot.config +or +.Pa /boot/config +in that order. +.Ss Caveats +.Bl -bullet +.It +The order in which file systems are tried is undefined. +.It +No encryption support is available. +.It +There's no way to interrupt the boot process to select booting from some +other location. +.It +When configuring a serial console for FreeBSD, but not for UEFI, no output +will show up on the serial console from boot1.efi. +.It +There's no support for marking partitions as the preferred one. +.It +There's no support for boot-once functionality. +.El From owner-svn-src-all@freebsd.org Tue Sep 1 07:54:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A3AC43BBFC0; Tue, 1 Sep 2020 07:54:10 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgfTt3v15z459x; Tue, 1 Sep 2020 07:54:10 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 699C315CB7; Tue, 1 Sep 2020 07:54:10 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0817sAil021489; Tue, 1 Sep 2020 07:54:10 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0817s9Xt021487; Tue, 1 Sep 2020 07:54:09 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009010754.0817s9Xt021487@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 1 Sep 2020 07:54:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365025 - head/stand/man X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/stand/man X-SVN-Commit-Revision: 365025 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 07:54:10 -0000 Author: imp Date: Tue Sep 1 07:54:09 2020 New Revision: 365025 URL: https://svnweb.freebsd.org/changeset/base/365025 Log: Very preliminary loader.efi(8) man page Added: head/stand/man/loader.efi.8 (contents, props changed) Modified: head/stand/man/Makefile Modified: head/stand/man/Makefile ============================================================================== --- head/stand/man/Makefile Tue Sep 1 07:46:27 2020 (r365024) +++ head/stand/man/Makefile Tue Sep 1 07:54:09 2020 (r365025) @@ -6,5 +6,8 @@ MAN+= boot1.efi.8 .endif MAN+= loader.8 +.if ${MK_EFI} != "no" +MAN+= loader.efi.8 +.endif .include Added: head/stand/man/loader.efi.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/stand/man/loader.efi.8 Tue Sep 1 07:54:09 2020 (r365025) @@ -0,0 +1,52 @@ +.\" +.\" Copyright (c) 2019 Netflix, Inc +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd April 25, 2019 +.Dt LOADER.EFI 8 +.Os +.Sh NAME +.Nm loader.efi +.Nd UEFI kernel loader +.Sh DESCRIPTION +On UEFI systems, +.Nm +loads the kernel. +It is installed into the ESP (EFI System Partition), either in the +default location of +.Pa /efi/boot/bootXXX.efi +within the ESP, in the +.Fx +reserved area as +.Pa /efi/freebsd/loader.efi +within the ESP , +or within the system as +.Pa /boot/loader.efi . +.Xr boot1.efi 8 +is used to load +.Nm +when it is placed within the system. + + From owner-svn-src-all@freebsd.org Tue Sep 1 07:54:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5DA093BBD45; Tue, 1 Sep 2020 07:54:15 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgfTy6dDxz453p; Tue, 1 Sep 2020 07:54:14 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD20E15BCF; Tue, 1 Sep 2020 07:54:14 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0817sE1C021541; Tue, 1 Sep 2020 07:54:14 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0817sEbr021540; Tue, 1 Sep 2020 07:54:14 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009010754.0817sEbr021540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 1 Sep 2020 07:54:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365026 - head/stand X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/stand X-SVN-Commit-Revision: 365026 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 07:54:16 -0000 Author: imp Date: Tue Sep 1 07:54:14 2020 New Revision: 365026 URL: https://svnweb.freebsd.org/changeset/base/365026 Log: Add defines for OpenZFS variables OZFS is the top of the OpenZFS tree (aka src/sys/contrib/openzfs). ZFSOSSRC is the path to the OepnZFS sources ZFSOSINC is the path to the OepnZFS includes MFC After: 3 days Modified: head/stand/defs.mk Modified: head/stand/defs.mk ============================================================================== --- head/stand/defs.mk Tue Sep 1 07:54:09 2020 (r365025) +++ head/stand/defs.mk Tue Sep 1 07:54:14 2020 (r365026) @@ -35,6 +35,9 @@ SASRC= ${BOOTSRC}/libsa SYSDIR= ${SRCTOP}/sys UBOOTSRC= ${BOOTSRC}/uboot ZFSSRC= ${SASRC}/zfs +OZFS= ${SRCTOP}/sys/contrib/openzfs +ZFSOSSRC= ${OZFS}/module/os/freebsd/ +ZFSOSINC= ${OZFS}/include/os/freebsd LIBCSRC= ${SRCTOP}/lib/libc BOOTOBJ= ${OBJTOP}/stand From owner-svn-src-all@freebsd.org Tue Sep 1 07:56:29 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2C0953BC39C; Tue, 1 Sep 2020 07:56:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgfXY0MTrz45V1; Tue, 1 Sep 2020 07:56:29 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3DF715FFA; Tue, 1 Sep 2020 07:56:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0817uSYa021712; Tue, 1 Sep 2020 07:56:28 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0817uS6u021711; Tue, 1 Sep 2020 07:56:28 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009010756.0817uS6u021711@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 1 Sep 2020 07:56:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365027 - head/stand/man X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/stand/man X-SVN-Commit-Revision: 365027 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 07:56:29 -0000 Author: imp Date: Tue Sep 1 07:56:28 2020 New Revision: 365027 URL: https://svnweb.freebsd.org/changeset/base/365027 Log: Update to today's date Also, fix a whitespace botch Modified: head/stand/man/loader.efi.8 Modified: head/stand/man/loader.efi.8 ============================================================================== --- head/stand/man/loader.efi.8 Tue Sep 1 07:54:14 2020 (r365026) +++ head/stand/man/loader.efi.8 Tue Sep 1 07:56:28 2020 (r365027) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 25, 2019 +.Dd September 1, 2020 .Dt LOADER.EFI 8 .Os .Sh NAME @@ -48,5 +48,3 @@ or within the system as is used to load .Nm when it is placed within the system. - - From owner-svn-src-all@freebsd.org Tue Sep 1 08:02:13 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9EF2B3BC6A8; Tue, 1 Sep 2020 08:02:13 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgfg93mklz45w9; Tue, 1 Sep 2020 08:02:13 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65A8115CD5; Tue, 1 Sep 2020 08:02:13 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08182DxC025185; Tue, 1 Sep 2020 08:02:13 GMT (envelope-from markm@FreeBSD.org) Received: (from markm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08182DCr025184; Tue, 1 Sep 2020 08:02:13 GMT (envelope-from markm@FreeBSD.org) Message-Id: <202009010802.08182DCr025184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markm set sender to markm@FreeBSD.org using -f From: Mark Murray Date: Tue, 1 Sep 2020 08:02:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365028 - head X-SVN-Group: head X-SVN-Commit-Author: markm X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 365028 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 08:02:13 -0000 Author: markm Date: Tue Sep 1 08:02:12 2020 New Revision: 365028 URL: https://svnweb.freebsd.org/changeset/base/365028 Log: Add a pointer to csprng@ for the CSPRNG driver. This is enforced anyway by subversion. Modified: head/MAINTAINERS Modified: head/MAINTAINERS ============================================================================== --- head/MAINTAINERS Tue Sep 1 07:56:28 2020 (r365027) +++ head/MAINTAINERS Tue Sep 1 08:02:12 2020 (r365028) @@ -82,6 +82,8 @@ pci bus imp,jhb Pre-commit review requested. pmcstudy(8) rrs Pre-commit review requested. procfs des Pre-commit review requested, email only. pseudofs des Pre-commit review requested, email only. +random(4), +random(9) csprng Pre-commit discussion and review required, release/release.sh gjb,re Pre-commit review and regression tests requested. sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). From owner-svn-src-all@freebsd.org Tue Sep 1 08:14:47 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D95033BC93F; Tue, 1 Sep 2020 08:14:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgfxg5XhFz46Pr; Tue, 1 Sep 2020 08:14:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A055216367; Tue, 1 Sep 2020 08:14:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0818ElZ1034006; Tue, 1 Sep 2020 08:14:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0818EleU034004; Tue, 1 Sep 2020 08:14:47 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009010814.0818EleU034004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 1 Sep 2020 08:14:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365029 - head/sys/dev/usb/controller X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/dev/usb/controller X-SVN-Commit-Revision: 365029 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 08:14:47 -0000 Author: hselasky Date: Tue Sep 1 08:14:46 2020 New Revision: 365029 URL: https://svnweb.freebsd.org/changeset/base/365029 Log: Fully revert r364379. The "Intel Sunrise Point-LP USB 3.0 controller" doesn't update the wMaxPacket field in the control endpoint context automatically causing a BABBLE error code on the initial first USB device descriptor read, when the bMaxPacketSize is not 8 bytes. Reported by: wulf@ PR: 248784 MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/dev/usb/controller/xhci.c head/sys/dev/usb/controller/xhci.h Modified: head/sys/dev/usb/controller/xhci.c ============================================================================== --- head/sys/dev/usb/controller/xhci.c Tue Sep 1 08:02:12 2020 (r365028) +++ head/sys/dev/usb/controller/xhci.c Tue Sep 1 08:14:46 2020 (r365029) @@ -2398,6 +2398,8 @@ xhci_configure_endpoint(struct usb_device *udev, /* store endpoint mode */ pepext->trb_ep_mode = ep_mode; + /* store bMaxPacketSize for control endpoints */ + pepext->trb_ep_maxp = edesc->wMaxPacketSize[0]; usb_pc_cpu_flush(pepext->page_cache); if (ep_mode == USB_EP_MODE_STREAMS) { @@ -2925,6 +2927,17 @@ xhci_transfer_insert(struct usb_xfer *xfer) if (pepext->trb_used[id] >= trb_limit) { DPRINTFN(8, "Too many TDs queued.\n"); return (USB_ERR_NOMEM); + } + + /* check if bMaxPacketSize changed */ + if (xfer->flags_int.control_xfr != 0 && + pepext->trb_ep_maxp != xfer->endpoint->edesc->wMaxPacketSize[0]) { + + DPRINTFN(8, "Reconfigure control endpoint\n"); + + /* force driver to reconfigure endpoint */ + pepext->trb_halted = 1; + pepext->trb_running = 0; } /* check for stopped condition, after putting transfer on interrupt queue */ Modified: head/sys/dev/usb/controller/xhci.h ============================================================================== --- head/sys/dev/usb/controller/xhci.h Tue Sep 1 08:02:12 2020 (r365028) +++ head/sys/dev/usb/controller/xhci.h Tue Sep 1 08:14:46 2020 (r365029) @@ -393,6 +393,7 @@ struct xhci_endpoint_ext { uint8_t trb_halted; uint8_t trb_running; uint8_t trb_ep_mode; + uint8_t trb_ep_maxp; }; enum { From owner-svn-src-all@freebsd.org Tue Sep 1 09:02:44 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5580F3BEF10; Tue, 1 Sep 2020 09:02:44 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgh101cwpz4Cw7; Tue, 1 Sep 2020 09:02:44 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B22B16B26; Tue, 1 Sep 2020 09:02:44 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08192hgR064882; Tue, 1 Sep 2020 09:02:43 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08192hge064881; Tue, 1 Sep 2020 09:02:43 GMT (envelope-from se@FreeBSD.org) Message-Id: <202009010902.08192hge064881@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Tue, 1 Sep 2020 09:02:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365030 - head/sbin/ipfw X-SVN-Group: head X-SVN-Commit-Author: se X-SVN-Commit-Paths: head/sbin/ipfw X-SVN-Commit-Revision: 365030 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 09:02:44 -0000 Author: se Date: Tue Sep 1 09:02:43 2020 New Revision: 365030 URL: https://svnweb.freebsd.org/changeset/base/365030 Log: Change printf format string to include the extra blank This is a follow up change to r364321 after a discussion about the style. All near by places use extra blanks in format strings, and while use of the format string to provide the extra blank may need more cycles than adding 1 to twidth, it generates shorter code and is clearer in the opinion of some reviewers of the previous change. Not objected to by: emaste MFC after: 3 days Modified: head/sbin/ipfw/ipfw2.c Modified: head/sbin/ipfw/ipfw2.c ============================================================================== --- head/sbin/ipfw/ipfw2.c Tue Sep 1 08:14:46 2020 (r365029) +++ head/sbin/ipfw/ipfw2.c Tue Sep 1 09:02:43 2020 (r365030) @@ -2199,7 +2199,7 @@ show_static_rule(struct cmdline_opts *co, struct forma *strchr(timestr, '\n') = '\0'; bprintf(bp, "%s ", timestr); } else { - bprintf(bp, "%*s", twidth + 1, " "); + bprintf(bp, "%*s ", twidth, ""); } } From owner-svn-src-all@freebsd.org Tue Sep 1 11:02:44 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1584D3C27AF; Tue, 1 Sep 2020 11:02:44 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgkgR6tX6z4LGN; Tue, 1 Sep 2020 11:02:43 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D097618485; Tue, 1 Sep 2020 11:02:43 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081B2hmt039842; Tue, 1 Sep 2020 11:02:43 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081B2hCZ039841; Tue, 1 Sep 2020 11:02:43 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <202009011102.081B2hCZ039841@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 1 Sep 2020 11:02:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365031 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 365031 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 11:02:44 -0000 Author: andrew Date: Tue Sep 1 11:02:43 2020 New Revision: 365031 URL: https://svnweb.freebsd.org/changeset/base/365031 Log: Support stage 2 arm64 pmap in more places Add support for stage 2 pmap to pmap_pte_dirty, pmap_release, and more of pmap_enter. This adds support in all placess I have hit while testing bhyve ehile faulting pages in as needed. Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D26065 Modified: head/sys/arm64/arm64/pmap.c Modified: head/sys/arm64/arm64/pmap.c ============================================================================== --- head/sys/arm64/arm64/pmap.c Tue Sep 1 09:02:43 2020 (r365030) +++ head/sys/arm64/arm64/pmap.c Tue Sep 1 11:02:43 2020 (r365031) @@ -662,13 +662,18 @@ static inline int pmap_pte_dirty(pmap_t pmap, pt_entry_t pte) { - PMAP_ASSERT_STAGE1(pmap); KASSERT((pte & ATTR_SW_MANAGED) != 0, ("pte %#lx is unmanaged", pte)); - KASSERT((pte & (ATTR_S1_AP_RW_BIT | ATTR_SW_DBM)) != 0, - ("pte %#lx is writeable and missing ATTR_SW_DBM", pte)); - return ((pte & (ATTR_S1_AP_RW_BIT | ATTR_SW_DBM)) == - (ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_SW_DBM)); + if (pmap->pm_stage == PM_STAGE1) { + KASSERT((pte & (ATTR_S1_AP_RW_BIT | ATTR_SW_DBM)) != 0, + ("pte %#lx is writeable and missing ATTR_SW_DBM", pte)); + + return ((pte & (ATTR_S1_AP_RW_BIT | ATTR_SW_DBM)) == + (ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_SW_DBM)); + } + + return ((pte & ATTR_S2_S2AP(ATTR_S2_S2AP_WRITE)) == + ATTR_S2_S2AP(ATTR_S2_S2AP_WRITE)); } static __inline void @@ -1940,20 +1945,27 @@ pmap_release(pmap_t pmap) pmap->pm_stats.resident_count)); KASSERT(vm_radix_is_empty(&pmap->pm_root), ("pmap_release: pmap has reserved page table page(s)")); - PMAP_ASSERT_STAGE1(pmap); set = pmap->pm_asid_set; KASSERT(set != NULL, ("%s: NULL asid set", __func__)); - mtx_lock_spin(&set->asid_set_mutex); - if (COOKIE_TO_EPOCH(pmap->pm_cookie) == set->asid_epoch) { - asid = COOKIE_TO_ASID(pmap->pm_cookie); - KASSERT(asid >= ASID_FIRST_AVAILABLE && - asid < set->asid_set_size, - ("pmap_release: pmap cookie has out-of-range asid")); - bit_clear(set->asid_set, asid); + /* + * Allow the ASID to be reused. In stage 2 VMIDs we don't invalidate + * the entries when removing them so rely on a later tlb invalidation. + * this will happen when updating the VMID generation. Because of this + * we don't reuse VMIDs within a generation. + */ + if (pmap->pm_stage == PM_STAGE1) { + mtx_lock_spin(&set->asid_set_mutex); + if (COOKIE_TO_EPOCH(pmap->pm_cookie) == set->asid_epoch) { + asid = COOKIE_TO_ASID(pmap->pm_cookie); + KASSERT(asid >= ASID_FIRST_AVAILABLE && + asid < set->asid_set_size, + ("pmap_release: pmap cookie has out-of-range asid")); + bit_clear(set->asid_set, asid); + } + mtx_unlock_spin(&set->asid_set_mutex); } - mtx_unlock_spin(&set->asid_set_mutex); m = PHYS_TO_VM_PAGE(pmap->pm_l0_paddr); vm_page_unwire_noq(m); @@ -3464,8 +3476,11 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, v if ((prot & VM_PROT_WRITE) != 0) { new_l3 |= ATTR_SW_DBM; if ((flags & VM_PROT_WRITE) == 0) { - PMAP_ASSERT_STAGE1(pmap); - new_l3 |= ATTR_S1_AP(ATTR_S1_AP_RO); + if (pmap->pm_stage == PM_STAGE1) + new_l3 |= ATTR_S1_AP(ATTR_S1_AP_RO); + else + new_l3 &= + ~ATTR_S2_S2AP(ATTR_S2_S2AP_WRITE); } } } From owner-svn-src-all@freebsd.org Tue Sep 1 11:30:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2CAC93C2FC8; Tue, 1 Sep 2020 11:30:40 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BglHh0KZBz4Mfg; Tue, 1 Sep 2020 11:30:40 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E302D18717; Tue, 1 Sep 2020 11:30:39 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081BUdkg052316; Tue, 1 Sep 2020 11:30:39 GMT (envelope-from luporl@FreeBSD.org) Received: (from luporl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081BUdcs052315; Tue, 1 Sep 2020 11:30:39 GMT (envelope-from luporl@FreeBSD.org) Message-Id: <202009011130.081BUdcs052315@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: luporl set sender to luporl@FreeBSD.org using -f From: Leandro Lupori Date: Tue, 1 Sep 2020 11:30:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365032 - head/sys/powerpc/powerpc X-SVN-Group: head X-SVN-Commit-Author: luporl X-SVN-Commit-Paths: head/sys/powerpc/powerpc X-SVN-Commit-Revision: 365032 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 11:30:40 -0000 Author: luporl Date: Tue Sep 1 11:30:39 2020 New Revision: 365032 URL: https://svnweb.freebsd.org/changeset/base/365032 Log: [PowerPC] Move pmc_hook out of critical section Calling pmc_hook inside a critical section may result in a panic. This happens when the user callchain is fetched, because it uses pmap_map_user_ptr, that tries to get the (sleepable) pmap lock when the needed vsid is not found. Judging by the implementation in other platforms, intr_irq_handler in kern/subr_intr.c and what pmc_hook do, it seems safe to move pmc_hook outside the critical section. Sponsored by: Eldorado Research Institute (eldorado.org.br) Differential Revision: https://reviews.freebsd.org/D26111 Modified: head/sys/powerpc/powerpc/interrupt.c Modified: head/sys/powerpc/powerpc/interrupt.c ============================================================================== --- head/sys/powerpc/powerpc/interrupt.c Tue Sep 1 11:02:43 2020 (r365031) +++ head/sys/powerpc/powerpc/interrupt.c Tue Sep 1 11:30:39 2020 (r365032) @@ -118,9 +118,9 @@ powerpc_interrupt(struct trapframe *framep) critical_enter(); KASSERT(pmc_intr != NULL, ("Performance exception, but no handler!")); (*pmc_intr)(framep); + critical_exit(); if (pmc_hook && (PCPU_GET(curthread)->td_pflags & TDP_CALLCHAIN)) pmc_hook(PCPU_GET(curthread), PMC_FN_USER_CALLCHAIN, framep); - critical_exit(); break; #endif From owner-svn-src-all@freebsd.org Tue Sep 1 11:34:06 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 131B13C3327; Tue, 1 Sep 2020 11:34:06 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BglMd6r4fz4NBf; Tue, 1 Sep 2020 11:34:05 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEDEC18861; Tue, 1 Sep 2020 11:34:05 +0000 (UTC) (envelope-from luporl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081BY5iq058283; Tue, 1 Sep 2020 11:34:05 GMT (envelope-from luporl@FreeBSD.org) Received: (from luporl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081BY5ob058282; Tue, 1 Sep 2020 11:34:05 GMT (envelope-from luporl@FreeBSD.org) Message-Id: <202009011134.081BY5ob058282@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: luporl set sender to luporl@FreeBSD.org using -f From: Leandro Lupori Date: Tue, 1 Sep 2020 11:34:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365033 - head/sys/powerpc/include X-SVN-Group: head X-SVN-Commit-Author: luporl X-SVN-Commit-Paths: head/sys/powerpc/include X-SVN-Commit-Revision: 365033 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 11:34:06 -0000 Author: luporl Date: Tue Sep 1 11:34:05 2020 New Revision: 365033 URL: https://svnweb.freebsd.org/changeset/base/365033 Log: [PowerPC] Fix PMCLOG address width PMCLOG macros were always using 32-bit addresses, even on PPC64. This resulted in truncated addresses in logs, when running on 64-bit PPC machines. Sponsored by: Eldorado Research Institute (eldorado.org.br) Differential Revision: https://reviews.freebsd.org/D26112 Modified: head/sys/powerpc/include/pmc_mdep.h Modified: head/sys/powerpc/include/pmc_mdep.h ============================================================================== --- head/sys/powerpc/include/pmc_mdep.h Tue Sep 1 11:30:39 2020 (r365032) +++ head/sys/powerpc/include/pmc_mdep.h Tue Sep 1 11:34:05 2020 (r365033) @@ -14,8 +14,13 @@ union pmc_md_op_pmcallocate { }; /* Logging */ +#ifdef __powerpc64__ +#define PMCLOG_READADDR PMCLOG_READ64 +#define PMCLOG_EMITADDR PMCLOG_EMIT64 +#else #define PMCLOG_READADDR PMCLOG_READ32 #define PMCLOG_EMITADDR PMCLOG_EMIT32 +#endif #define mtpmr(reg, val) \ __asm __volatile("mtpmr %0,%1" : : "K"(reg), "r"(val)) From owner-svn-src-all@freebsd.org Tue Sep 1 12:09:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C510D3C5329; Tue, 1 Sep 2020 12:09:15 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgm8C4pBpz4Q3y; Tue, 1 Sep 2020 12:09:15 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8805618A6C; Tue, 1 Sep 2020 12:09:15 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081C9FHp076793; Tue, 1 Sep 2020 12:09:15 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081C9DlF076785; Tue, 1 Sep 2020 12:09:13 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202009011209.081C9DlF076785@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 1 Sep 2020 12:09:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365034 - in stable/12/sys: amd64/linux amd64/linux32 arm64/linux compat/linux i386/linux X-SVN-Group: stable-12 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in stable/12/sys: amd64/linux amd64/linux32 arm64/linux compat/linux i386/linux X-SVN-Commit-Revision: 365034 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 12:09:15 -0000 Author: trasz Date: Tue Sep 1 12:09:13 2020 New Revision: 365034 URL: https://svnweb.freebsd.org/changeset/base/365034 Log: MFC r363304: Add a trivial linux(4) splice(2) implementation, which simply returns EINVAL. Fixes grep (grep-3.1-2build1). PR: 218699 Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/amd64/linux/linux_dummy.c stable/12/sys/amd64/linux/syscalls.master stable/12/sys/amd64/linux32/linux32_dummy.c stable/12/sys/amd64/linux32/syscalls.master stable/12/sys/arm64/linux/linux_dummy.c stable/12/sys/arm64/linux/syscalls.master stable/12/sys/compat/linux/linux_file.c stable/12/sys/i386/linux/linux_dummy.c stable/12/sys/i386/linux/syscalls.master Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/amd64/linux/linux_dummy.c ============================================================================== --- stable/12/sys/amd64/linux/linux_dummy.c Tue Sep 1 11:34:05 2020 (r365033) +++ stable/12/sys/amd64/linux/linux_dummy.c Tue Sep 1 12:09:13 2020 (r365034) @@ -106,7 +106,6 @@ DUMMY(inotify_rm_watch); DUMMY(migrate_pages); DUMMY(unshare); /* Linux 2.6.17: */ -DUMMY(splice); DUMMY(tee); DUMMY(vmsplice); /* Linux 2.6.18: */ Modified: stable/12/sys/amd64/linux/syscalls.master ============================================================================== --- stable/12/sys/amd64/linux/syscalls.master Tue Sep 1 11:34:05 2020 (r365033) +++ stable/12/sys/amd64/linux/syscalls.master Tue Sep 1 12:09:13 2020 (r365034) @@ -465,7 +465,8 @@ l_size_t len); } 274 AUE_NULL STD { int linux_get_robust_list(l_int pid, \ struct linux_robust_list_head **head, l_size_t *len); } -275 AUE_NULL STD { int linux_splice(void); } +275 AUE_NULL STD { int linux_splice(int fd_in, l_loff_t *off_in, \ + int fd_out, l_loff_t *off_out, l_size_t len, l_uint flags); } 276 AUE_NULL STD { int linux_tee(void); } 277 AUE_NULL STD { int linux_sync_file_range(l_int fd, l_loff_t offset, l_loff_t nbytes, unsigned int flags); } Modified: stable/12/sys/amd64/linux32/linux32_dummy.c ============================================================================== --- stable/12/sys/amd64/linux32/linux32_dummy.c Tue Sep 1 11:34:05 2020 (r365033) +++ stable/12/sys/amd64/linux32/linux32_dummy.c Tue Sep 1 12:09:13 2020 (r365034) @@ -103,7 +103,6 @@ DUMMY(inotify_rm_watch); DUMMY(migrate_pages); DUMMY(unshare); /* Linux 2.6.17: */ -DUMMY(splice); DUMMY(tee); DUMMY(vmsplice); /* Linux 2.6.18: */ Modified: stable/12/sys/amd64/linux32/syscalls.master ============================================================================== --- stable/12/sys/amd64/linux32/syscalls.master Tue Sep 1 11:34:05 2020 (r365033) +++ stable/12/sys/amd64/linux32/syscalls.master Tue Sep 1 12:09:13 2020 (r365034) @@ -524,7 +524,8 @@ l_size_t len); } 312 AUE_NULL STD { int linux_get_robust_list(l_int pid, \ struct linux_robust_list_head **head, l_size_t *len); } -313 AUE_NULL STD { int linux_splice(void); } +313 AUE_NULL STD { int linux_splice(int fd_in, l_loff_t *off_in, \ + int fd_out, l_loff_t *off_out, l_size_t len, l_uint flags); } 314 AUE_NULL STD { int linux_sync_file_range(l_int fd, uint32_t offset1, uint32_t offset2, uint32_t nbytes1, uint32_t nbytes2, unsigned int flags); } Modified: stable/12/sys/arm64/linux/linux_dummy.c ============================================================================== --- stable/12/sys/arm64/linux/linux_dummy.c Tue Sep 1 11:34:05 2020 (r365033) +++ stable/12/sys/arm64/linux/linux_dummy.c Tue Sep 1 12:09:13 2020 (r365034) @@ -99,7 +99,6 @@ DUMMY(inotify_rm_watch); DUMMY(migrate_pages); DUMMY(unshare); /* Linux 2.6.17: */ -DUMMY(splice); DUMMY(tee); DUMMY(vmsplice); /* Linux 2.6.18: */ Modified: stable/12/sys/arm64/linux/syscalls.master ============================================================================== --- stable/12/sys/arm64/linux/syscalls.master Tue Sep 1 11:34:05 2020 (r365033) +++ stable/12/sys/arm64/linux/syscalls.master Tue Sep 1 12:09:13 2020 (r365034) @@ -413,7 +413,14 @@ int linux_vmsplice(void); } 76 AUE_NULL STD { - int linux_splice(void); + int linux_splice( + int fd_in, + l_loff_t *off_in, + int fd_out, + l_loff_t *off_out, + l_size_t len, + l_uint flags + ); } 77 AUE_NULL STD { int linux_tee(void); Modified: stable/12/sys/compat/linux/linux_file.c ============================================================================== --- stable/12/sys/compat/linux/linux_file.c Tue Sep 1 11:34:05 2020 (r365033) +++ stable/12/sys/compat/linux/linux_file.c Tue Sep 1 12:09:13 2020 (r365034) @@ -1618,3 +1618,17 @@ linux_fallocate(struct thread *td, struct linux_falloc return (kern_posix_fallocate(td, args->fd, offset, len)); } + +int +linux_splice(struct thread *td, struct linux_splice_args *args) +{ + + linux_msg(td, "syscall splice not really implemented"); + + /* + * splice(2) is documented to return EINVAL in various circumstances; + * returning it instead of ENOSYS should hint the caller to use fallback + * instead. + */ + return (EINVAL); +} Modified: stable/12/sys/i386/linux/linux_dummy.c ============================================================================== --- stable/12/sys/i386/linux/linux_dummy.c Tue Sep 1 11:34:05 2020 (r365033) +++ stable/12/sys/i386/linux/linux_dummy.c Tue Sep 1 12:09:13 2020 (r365034) @@ -99,7 +99,6 @@ DUMMY(inotify_rm_watch); DUMMY(migrate_pages); DUMMY(unshare); /* Linux 2.6.17: */ -DUMMY(splice); DUMMY(tee); DUMMY(vmsplice); /* Linux 2.6.18: */ Modified: stable/12/sys/i386/linux/syscalls.master ============================================================================== --- stable/12/sys/i386/linux/syscalls.master Tue Sep 1 11:34:05 2020 (r365033) +++ stable/12/sys/i386/linux/syscalls.master Tue Sep 1 12:09:13 2020 (r365034) @@ -532,7 +532,8 @@ l_size_t len); } 312 AUE_NULL STD { int linux_get_robust_list(l_int pid, \ struct linux_robust_list_head **head, l_size_t *len); } -313 AUE_NULL STD { int linux_splice(void); } +313 AUE_NULL STD { int linux_splice(int fd_in, l_loff_t *off_in, \ + int fd_out, l_loff_t *off_out, l_size_t len, l_uint flags); } 314 AUE_NULL STD { int linux_sync_file_range(l_int fd, l_loff_t offset, l_loff_t nbytes, unsigned int flags); } 315 AUE_NULL STD { int linux_tee(void); } From owner-svn-src-all@freebsd.org Tue Sep 1 12:12:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8A3963C5701; Tue, 1 Sep 2020 12:12:02 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgmCQ3Yn6z4QbV; Tue, 1 Sep 2020 12:12:02 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D8B81911C; Tue, 1 Sep 2020 12:12:02 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081CC2oP081085; Tue, 1 Sep 2020 12:12:02 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081CBxFd081068; Tue, 1 Sep 2020 12:11:59 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202009011211.081CBxFd081068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 1 Sep 2020 12:11:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365035 - in stable/12/sys: amd64/linux amd64/linux32 arm64/linux i386/linux X-SVN-Group: stable-12 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in stable/12/sys: amd64/linux amd64/linux32 arm64/linux i386/linux X-SVN-Commit-Revision: 365035 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 12:12:02 -0000 Author: trasz Date: Tue Sep 1 12:11:59 2020 New Revision: 365035 URL: https://svnweb.freebsd.org/changeset/base/365035 Log: MFC r363305: Regen after r363304. Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/amd64/linux/linux_proto.h stable/12/sys/amd64/linux/linux_sysent.c stable/12/sys/amd64/linux/linux_systrace_args.c stable/12/sys/amd64/linux32/linux32_proto.h stable/12/sys/amd64/linux32/linux32_sysent.c stable/12/sys/amd64/linux32/linux32_systrace_args.c stable/12/sys/arm64/linux/linux_proto.h stable/12/sys/arm64/linux/linux_sysent.c stable/12/sys/arm64/linux/linux_systrace_args.c stable/12/sys/i386/linux/linux_proto.h stable/12/sys/i386/linux/linux_sysent.c stable/12/sys/i386/linux/linux_systrace_args.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/amd64/linux/linux_proto.h ============================================================================== --- stable/12/sys/amd64/linux/linux_proto.h Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/amd64/linux/linux_proto.h Tue Sep 1 12:11:59 2020 (r365035) @@ -966,7 +966,12 @@ struct linux_get_robust_list_args { char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)]; }; struct linux_splice_args { - register_t dummy; + char fd_in_l_[PADL_(int)]; int fd_in; char fd_in_r_[PADR_(int)]; + char off_in_l_[PADL_(l_loff_t *)]; l_loff_t * off_in; char off_in_r_[PADR_(l_loff_t *)]; + char fd_out_l_[PADL_(int)]; int fd_out; char fd_out_r_[PADR_(int)]; + char off_out_l_[PADL_(l_loff_t *)]; l_loff_t * off_out; char off_out_r_[PADR_(l_loff_t *)]; + char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; }; struct linux_tee_args { register_t dummy; Modified: stable/12/sys/amd64/linux/linux_sysent.c ============================================================================== --- stable/12/sys/amd64/linux/linux_sysent.c Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/amd64/linux/linux_sysent.c Tue Sep 1 12:11:59 2020 (r365035) @@ -292,7 +292,7 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = linux_unshare */ { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 273 = linux_set_robust_list */ { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 274 = linux_get_robust_list */ - { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 275 = linux_splice */ + { AS(linux_splice_args), (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 275 = linux_splice */ { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 276 = linux_tee */ { AS(linux_sync_file_range_args), (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 277 = linux_sync_file_range */ { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 278 = linux_vmsplice */ Modified: stable/12/sys/amd64/linux/linux_systrace_args.c ============================================================================== --- stable/12/sys/amd64/linux/linux_systrace_args.c Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/amd64/linux/linux_systrace_args.c Tue Sep 1 12:11:59 2020 (r365035) @@ -2012,7 +2012,14 @@ systrace_args(int sysnum, void *params, uint64_t *uarg } /* linux_splice */ case 275: { - *n_args = 0; + struct linux_splice_args *p = params; + iarg[0] = p->fd_in; /* int */ + uarg[1] = (intptr_t) p->off_in; /* l_loff_t * */ + iarg[2] = p->fd_out; /* int */ + uarg[3] = (intptr_t) p->off_out; /* l_loff_t * */ + iarg[4] = p->len; /* l_size_t */ + iarg[5] = p->flags; /* l_uint */ + *n_args = 6; break; } /* linux_tee */ @@ -5624,6 +5631,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; /* linux_splice */ case 275: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland l_loff_t *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "userland l_loff_t *"; + break; + case 4: + p = "l_size_t"; + break; + case 5: + p = "l_uint"; + break; + default: + break; + }; break; /* linux_tee */ case 276: @@ -7616,6 +7645,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char * break; /* linux_splice */ case 275: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_tee */ case 276: /* linux_sync_file_range */ Modified: stable/12/sys/amd64/linux32/linux32_proto.h ============================================================================== --- stable/12/sys/amd64/linux32/linux32_proto.h Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/amd64/linux32/linux32_proto.h Tue Sep 1 12:11:59 2020 (r365035) @@ -1029,7 +1029,12 @@ struct linux_get_robust_list_args { char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)]; }; struct linux_splice_args { - register_t dummy; + char fd_in_l_[PADL_(int)]; int fd_in; char fd_in_r_[PADR_(int)]; + char off_in_l_[PADL_(l_loff_t *)]; l_loff_t * off_in; char off_in_r_[PADR_(l_loff_t *)]; + char fd_out_l_[PADL_(int)]; int fd_out; char fd_out_r_[PADR_(int)]; + char off_out_l_[PADL_(l_loff_t *)]; l_loff_t * off_out; char off_out_r_[PADR_(l_loff_t *)]; + char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; }; struct linux_sync_file_range_args { char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; Modified: stable/12/sys/amd64/linux32/linux32_sysent.c ============================================================================== --- stable/12/sys/amd64/linux32/linux32_sysent.c Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/amd64/linux32/linux32_sysent.c Tue Sep 1 12:11:59 2020 (r365035) @@ -330,7 +330,7 @@ struct sysent linux32_sysent[] = { { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 310 = linux_unshare */ { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 311 = linux_set_robust_list */ { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 312 = linux_get_robust_list */ - { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 313 = linux_splice */ + { AS(linux_splice_args), (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 313 = linux_splice */ { AS(linux_sync_file_range_args), (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 314 = linux_sync_file_range */ { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 315 = linux_tee */ { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 316 = linux_vmsplice */ Modified: stable/12/sys/amd64/linux32/linux32_systrace_args.c ============================================================================== --- stable/12/sys/amd64/linux32/linux32_systrace_args.c Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/amd64/linux32/linux32_systrace_args.c Tue Sep 1 12:11:59 2020 (r365035) @@ -2120,7 +2120,14 @@ systrace_args(int sysnum, void *params, uint64_t *uarg } /* linux_splice */ case 313: { - *n_args = 0; + struct linux_splice_args *p = params; + iarg[0] = p->fd_in; /* int */ + uarg[1] = (intptr_t) p->off_in; /* l_loff_t * */ + iarg[2] = p->fd_out; /* int */ + uarg[3] = (intptr_t) p->off_out; /* l_loff_t * */ + iarg[4] = p->len; /* l_size_t */ + iarg[5] = p->flags; /* l_uint */ + *n_args = 6; break; } /* linux_sync_file_range */ @@ -6202,6 +6209,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; /* linux_splice */ case 313: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland l_loff_t *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "userland l_loff_t *"; + break; + case 4: + p = "l_size_t"; + break; + case 5: + p = "l_uint"; + break; + default: + break; + }; break; /* linux_sync_file_range */ case 314: @@ -8734,6 +8763,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char * break; /* linux_splice */ case 313: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_sync_file_range */ case 314: if (ndx == 0 || ndx == 1) Modified: stable/12/sys/arm64/linux/linux_proto.h ============================================================================== --- stable/12/sys/arm64/linux/linux_proto.h Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/arm64/linux/linux_proto.h Tue Sep 1 12:11:59 2020 (r365035) @@ -292,7 +292,12 @@ struct linux_vmsplice_args { register_t dummy; }; struct linux_splice_args { - register_t dummy; + char fd_in_l_[PADL_(int)]; int fd_in; char fd_in_r_[PADR_(int)]; + char off_in_l_[PADL_(l_loff_t *)]; l_loff_t * off_in; char off_in_r_[PADR_(l_loff_t *)]; + char fd_out_l_[PADL_(int)]; int fd_out; char fd_out_r_[PADR_(int)]; + char off_out_l_[PADL_(l_loff_t *)]; l_loff_t * off_out; char off_out_r_[PADR_(l_loff_t *)]; + char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; }; struct linux_tee_args { register_t dummy; Modified: stable/12/sys/arm64/linux/linux_sysent.c ============================================================================== --- stable/12/sys/arm64/linux/linux_sysent.c Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/arm64/linux/linux_sysent.c Tue Sep 1 12:11:59 2020 (r365035) @@ -93,7 +93,7 @@ struct sysent linux_sysent[] = { { AS(linux_ppoll_args), (sy_call_t *)linux_ppoll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 73 = linux_ppoll */ { 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 74 = linux_signalfd4 */ { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 75 = linux_vmsplice */ - { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 76 = linux_splice */ + { AS(linux_splice_args), (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 76 = linux_splice */ { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 77 = linux_tee */ { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_READLINKAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 78 = linux_readlinkat */ { AS(linux_newfstatat_args), (sy_call_t *)linux_newfstatat, AUE_FSTATAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 79 = linux_newfstatat */ Modified: stable/12/sys/arm64/linux/linux_systrace_args.c ============================================================================== --- stable/12/sys/arm64/linux/linux_systrace_args.c Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/arm64/linux/linux_systrace_args.c Tue Sep 1 12:11:59 2020 (r365035) @@ -545,7 +545,14 @@ systrace_args(int sysnum, void *params, uint64_t *uarg } /* linux_splice */ case 76: { - *n_args = 0; + struct linux_splice_args *p = params; + iarg[0] = p->fd_in; /* int */ + uarg[1] = (intptr_t) p->off_in; /* l_loff_t * */ + iarg[2] = p->fd_out; /* int */ + uarg[3] = (intptr_t) p->off_out; /* l_loff_t * */ + iarg[4] = p->len; /* l_size_t */ + iarg[5] = p->flags; /* l_uint */ + *n_args = 6; break; } /* linux_tee */ @@ -2953,6 +2960,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; /* linux_splice */ case 76: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland l_loff_t *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "userland l_loff_t *"; + break; + case 4: + p = "l_size_t"; + break; + case 5: + p = "l_uint"; + break; + default: + break; + }; break; /* linux_tee */ case 77: @@ -5765,6 +5794,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char * case 75: /* linux_splice */ case 76: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_tee */ case 77: /* linux_readlinkat */ Modified: stable/12/sys/i386/linux/linux_proto.h ============================================================================== --- stable/12/sys/i386/linux/linux_proto.h Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/i386/linux/linux_proto.h Tue Sep 1 12:11:59 2020 (r365035) @@ -1040,7 +1040,12 @@ struct linux_get_robust_list_args { char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)]; }; struct linux_splice_args { - register_t dummy; + char fd_in_l_[PADL_(int)]; int fd_in; char fd_in_r_[PADR_(int)]; + char off_in_l_[PADL_(l_loff_t *)]; l_loff_t * off_in; char off_in_r_[PADR_(l_loff_t *)]; + char fd_out_l_[PADL_(int)]; int fd_out; char fd_out_r_[PADR_(int)]; + char off_out_l_[PADL_(l_loff_t *)]; l_loff_t * off_out; char off_out_r_[PADR_(l_loff_t *)]; + char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)]; + char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)]; }; struct linux_sync_file_range_args { char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)]; Modified: stable/12/sys/i386/linux/linux_sysent.c ============================================================================== --- stable/12/sys/i386/linux/linux_sysent.c Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/i386/linux/linux_sysent.c Tue Sep 1 12:11:59 2020 (r365035) @@ -330,7 +330,7 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 310 = linux_unshare */ { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 311 = linux_set_robust_list */ { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 312 = linux_get_robust_list */ - { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 313 = linux_splice */ + { AS(linux_splice_args), (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 313 = linux_splice */ { AS(linux_sync_file_range_args), (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 314 = linux_sync_file_range */ { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 315 = linux_tee */ { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 316 = linux_vmsplice */ Modified: stable/12/sys/i386/linux/linux_systrace_args.c ============================================================================== --- stable/12/sys/i386/linux/linux_systrace_args.c Tue Sep 1 12:09:13 2020 (r365034) +++ stable/12/sys/i386/linux/linux_systrace_args.c Tue Sep 1 12:11:59 2020 (r365035) @@ -2189,7 +2189,14 @@ systrace_args(int sysnum, void *params, uint64_t *uarg } /* linux_splice */ case 313: { - *n_args = 0; + struct linux_splice_args *p = params; + iarg[0] = p->fd_in; /* int */ + uarg[1] = (intptr_t) p->off_in; /* l_loff_t * */ + iarg[2] = p->fd_out; /* int */ + uarg[3] = (intptr_t) p->off_out; /* l_loff_t * */ + iarg[4] = p->len; /* l_size_t */ + iarg[5] = p->flags; /* l_uint */ + *n_args = 6; break; } /* linux_sync_file_range */ @@ -6401,6 +6408,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d break; /* linux_splice */ case 313: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland l_loff_t *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "userland l_loff_t *"; + break; + case 4: + p = "l_size_t"; + break; + case 5: + p = "l_uint"; + break; + default: + break; + }; break; /* linux_sync_file_range */ case 314: @@ -8968,6 +8997,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char * break; /* linux_splice */ case 313: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_sync_file_range */ case 314: if (ndx == 0 || ndx == 1) From owner-svn-src-all@freebsd.org Tue Sep 1 12:21:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E05543C59C0; Tue, 1 Sep 2020 12:21:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgmQ55Yyzz4RQ3; Tue, 1 Sep 2020 12:21:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8AA0319404; Tue, 1 Sep 2020 12:21:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081CLH06084751; Tue, 1 Sep 2020 12:21:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081CLHvJ084750; Tue, 1 Sep 2020 12:21:17 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009011221.081CLHvJ084750@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Tue, 1 Sep 2020 12:21:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365036 - head/sys/dev/mlx5/mlx5_en X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/dev/mlx5/mlx5_en X-SVN-Commit-Revision: 365036 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 12:21:17 -0000 Author: hselasky Date: Tue Sep 1 12:21:17 2020 New Revision: 365036 URL: https://svnweb.freebsd.org/changeset/base/365036 Log: Make hardware TLS send tag allocation synchronous in mlx5en(4). Previously the send tag was setup in the background, and all packets for the given send tag were dropped until ready. Change this to be blocking behaviour so that once the setsocketopt() for enabling TLS completes, the socket is ready to send packets. Do this by simply flushing the work request which does the needed firmware programming during send tag allocation. MFC after: 1 week Sponsored by: Mellanox Technologies // Nvidia Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c ============================================================================== --- head/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c Tue Sep 1 12:11:59 2020 (r365035) +++ head/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c Tue Sep 1 12:21:17 2020 (r365036) @@ -188,7 +188,7 @@ mlx5e_tls_work(struct work_struct *work) priv = container_of(ptag->tls, struct mlx5e_priv, tls); switch (ptag->state) { - case MLX5E_TLS_ST_SETUP: + case MLX5E_TLS_ST_INIT: /* try to open TIS, if not present */ if (ptag->tisn == 0) { err = mlx5_tls_open_tis(priv->mdev, 0, priv->tdn, @@ -215,8 +215,8 @@ mlx5e_tls_work(struct work_struct *work) ptag->dek_index_ok = 1; MLX5E_TLS_TAG_LOCK(ptag); - if (ptag->state == MLX5E_TLS_ST_SETUP) - ptag->state = MLX5E_TLS_ST_TXRDY; + if (ptag->state == MLX5E_TLS_ST_INIT) + ptag->state = MLX5E_TLS_ST_SETUP; MLX5E_TLS_TAG_UNLOCK(ptag); break; @@ -413,6 +413,10 @@ mlx5e_tls_snd_tag_alloc(struct ifnet *ifp, MPASS(ptag->tag.m_snd_tag.refcount == 0); m_snd_tag_init(&ptag->tag.m_snd_tag, ifp); *ppmt = &ptag->tag.m_snd_tag; + + queue_work(priv->tls.wq, &ptag->work); + flush_work(&ptag->work); + return (0); failure: @@ -736,16 +740,11 @@ mlx5e_sq_tls_xmit(struct mlx5e_sq *sq, struct mlx5e_xm MLX5E_TLS_TAG_LOCK(ptls_tag); switch (ptls_tag->state) { case MLX5E_TLS_ST_INIT: - queue_work(sq->priv->tls.wq, &ptls_tag->work); - ptls_tag->state = MLX5E_TLS_ST_SETUP; - ptls_tag->expected_seq = ~mb_seq; /* force setup */ MLX5E_TLS_TAG_UNLOCK(ptls_tag); return (MLX5E_TLS_FAILURE); - case MLX5E_TLS_ST_SETUP: - MLX5E_TLS_TAG_UNLOCK(ptls_tag); - return (MLX5E_TLS_FAILURE); - + ptls_tag->state = MLX5E_TLS_ST_TXRDY; + ptls_tag->expected_seq = ~mb_seq; /* force setup */ default: MLX5E_TLS_TAG_UNLOCK(ptls_tag); break; From owner-svn-src-all@freebsd.org Tue Sep 1 13:13:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C4CE03C75E5; Tue, 1 Sep 2020 13:13:55 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgnZp4LCCz4VN9; Tue, 1 Sep 2020 13:13:54 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Received: by mail-wr1-x429.google.com with SMTP id c15so1462979wrs.11; Tue, 01 Sep 2020 06:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:reply-to:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Xd/Lu0OPBX8SE4Os0JMwBcJCetk1WD5ps7GvOhjW6Vs=; b=Su85Ovml8dA38xo96qQXX4OwfrPSdNRAMeIn+Alx+abzwvcE+M0c5by+gk9QcAHXsW 8g6GZmsMJLM0tzjvPpQFpBWvkMSl/B+Dko3JakHT6l6pZe+SFCqfQtLQ0tWo3Eashn5L eNzqKK9ZjxKKFnEqXBGmY5u0/cRkk5K5VQjE5q+haZKw7CoryVIwyakJ6Z6ZZP9rg9s0 xisrZF3SJare9u3VICTyYKKerAOjlD7vksaFjcJmjnPi5uHZYYTyD6H11PcqS3kfd9x6 MlRYmBx9aaDMGF/ThJuECtymSAXGIlprMhbkiGKl1DBkUM2vl0t4cQYCK9lkPrD+hwTX qRBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:reply-to:subject:to:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=Xd/Lu0OPBX8SE4Os0JMwBcJCetk1WD5ps7GvOhjW6Vs=; b=OHrGFnGv/WiJCbuWQcMUNuGnpavr8hyJh5opeUzUe86hoUiibe8cHSGg+VuId0a5Ec SC5NhJqaUgCNTerB/m1QC29mvGIgZUPwGfDiofZiTsOTq4EgoTLOvdXVU027ES5l3MH8 btQxsbYeKM3QA+j4S2dmFYomq/z7Gdcj6l5fGaUHzdCW97XJUwV0vLPAoKPsF8G2yxPo U14KUPP74a1Hr66jk7fz0NOWSce6Uw86I2EsXfEkIu9mkXgAJp5pRdXcT3vGM2wpP16/ 13AQk8CN0QK1/HUwM5e+P5PAAoiK9rebTyr2eqjtYwSRhGpF9b5bggi30wTL1dnInjmc 6bew== X-Gm-Message-State: AOAM5332sjmMhvxOddgCU2CCeSyJ5ytgW8InJrnP65+RFS1tZMhEz3sF cTopdwTol+K3kpkr8H2yNfBYikFsN1o= X-Google-Smtp-Source: ABdhPJxE+GSSJv35VbYQZxnJvbayKqsb6ekPprKFkyzYZhS0tQe5Qc+hw5qaRukoGIpKZt1WzEADcA== X-Received: by 2002:adf:f101:: with SMTP id r1mr1885969wro.314.1598966032811; Tue, 01 Sep 2020 06:13:52 -0700 (PDT) Received: from [88.208.79.100] (halouny.humusoft.cz. [88.208.79.100]) by smtp.gmail.com with ESMTPSA id c4sm2289464wrp.85.2020.09.01.06.13.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Sep 2020 06:13:52 -0700 (PDT) Sender: Michal Meloun Reply-To: meloun.michal@gmail.com Subject: Re: svn commit: r364737 - head/sys/dev/drm2 To: Niclas Zeising , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008242253.07OMrNO2016612@repo.freebsd.org> From: Michal Meloun Message-ID: <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> Date: Tue, 1 Sep 2020 15:13:53 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <202008242253.07OMrNO2016612@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BgnZp4LCCz4VN9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=Su85Ovml; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of melounmichal@gmail.com designates 2a00:1450:4864:20::429 as permitted sender) smtp.mailfrom=melounmichal@gmail.com X-Spamd-Result: default: False [-2.79 / 15.00]; HAS_REPLYTO(0.00)[meloun.michal@gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.988]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.01)[-1.015]; MIME_GOOD(-0.10)[text/plain]; FREEMAIL_REPLYTO(0.00)[gmail.com]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; NEURAL_SPAM_SHORT(0.21)[0.208]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::429:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 13:13:55 -0000 On 25.08.2020 0:53, Niclas Zeising wrote: > Author: zeising (doc,ports committer) > Date: Mon Aug 24 22:53:23 2020 > New Revision: 364737 > URL: https://svnweb.freebsd.org/changeset/base/364737 > > Log: > drm2: Update deprecation message > > Update the deprecation message in the drm2 (aka legacy drm) drivers to point > towards the graphics/drm-kmod ports for all architectures, not just amd64. Only known user of drm2 is arm/tegra124 based boards. How graphics/drm-kmod can help for these? Or be more specific - drm2 allows me to hot-plug monitor to tegra based board an use 2 scaled overlay planes (which is exactly whats I want for my application). Which alternative can you offer me? Btw, as you can see, the maintenance cost of drm2 is close to zero and the dev/drm2 code does not inherit with any of the major architectures. Michal > drm-kmod has support for more architectures these days, and the > graphics/drm-legacy-kmod port is being deprecated. > > Approved by: imp > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D26174 > > Modified: > head/sys/dev/drm2/drm_os_freebsd.h > > Modified: head/sys/dev/drm2/drm_os_freebsd.h > ============================================================================== > --- head/sys/dev/drm2/drm_os_freebsd.h Mon Aug 24 22:48:19 2020 (r364736) > +++ head/sys/dev/drm2/drm_os_freebsd.h Mon Aug 24 22:53:23 2020 (r364737) > @@ -154,16 +154,12 @@ typedef void irqreturn_t; > *(volatile u_int64_t *)(((vm_offset_t)(map)->handle) + \ > (vm_offset_t)(offset)) = htole64(val) > > -#ifdef amd64 > #define DRM_PORT "graphics/drm-kmod" > -#else > -#define DRM_PORT "graphics/drm-legacy-kmod" > -#endif > > #define DRM_OBSOLETE(dev) \ > do { \ > device_printf(dev, "=======================================================\n"); \ > - device_printf(dev, "This code is obsolete abandonware. Install the " DRM_PORT " pkg\n"); \ > + device_printf(dev, "This code is deprecated. Install the " DRM_PORT " pkg\n"); \ > device_printf(dev, "=======================================================\n"); \ > gone_in_dev(dev, 13, "drm2 drivers"); \ > } while (0) > From owner-svn-src-all@freebsd.org Tue Sep 1 13:16:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 67EAF3C77C9; Tue, 1 Sep 2020 13:16:45 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgnf40BVgz4VRM; Tue, 1 Sep 2020 13:16:43 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1598966195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GLtXsUkoaqDkQnY+WFvCrYwMohRz/4zCJfka8Uu+yrc=; b=p6wkyoJNdu5P0RtX85Flne8EQgmdUkkrzhmXfNZx0RdP06RqHQizOes4iZSaGwR7vrRMYt gJBSpzfTqsd3I8KtFr3uoYV05l3wjmf2eCbtbpeaO47bUpWtiCKUqw7MywPuONz31Vomkf cuAcCiJofRAX4QZlzQv7e9aF1s0Cdng= Received: from amy.home (lfbn-idf2-1-1138-237.w90-92.abo.wanadoo.fr [90.92.20.237]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 80f13350 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 1 Sep 2020 13:16:35 +0000 (UTC) Date: Tue, 1 Sep 2020 15:16:35 +0200 From: Emmanuel Vadot To: meloun.michal@gmail.com Cc: Niclas Zeising , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r364737 - head/sys/dev/drm2 Message-Id: <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> In-Reply-To: <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> References: <202008242253.07OMrNO2016612@repo.freebsd.org> <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Bgnf40BVgz4VRM X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=p6wkyoJN; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-1.64 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; RCPT_COUNT_FIVE(0.00)[5]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-0.57)[-0.574]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.03)[-1.029]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; FREEFALL_USER(0.00)[manu]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.04)[-1.040]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; SUSPICIOUS_RECIPS(1.50)[]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 13:16:45 -0000 On Tue, 1 Sep 2020 15:13:53 +0200 Michal Meloun wrote: > > > On 25.08.2020 0:53, Niclas Zeising wrote: > > Author: zeising (doc,ports committer) > > Date: Mon Aug 24 22:53:23 2020 > > New Revision: 364737 > > URL: https://svnweb.freebsd.org/changeset/base/364737 > > > > Log: > > drm2: Update deprecation message > > > > Update the deprecation message in the drm2 (aka legacy drm) drivers to point > > towards the graphics/drm-kmod ports for all architectures, not just amd64. > Only known user of drm2 is arm/tegra124 based boards. How > graphics/drm-kmod can help for these? > Or be more specific - drm2 allows me to hot-plug monitor to tegra based > board an use 2 scaled overlay planes (which is exactly whats I want for > my application). Which alternative can you offer me? > Btw, as you can see, the maintenance cost of drm2 is close to zero and > the dev/drm2 code does not inherit with any of the major architectures. > > Michal I think that the goal was only to mfc this to warn users before 12.2 is branched, maybe a direct commit to 12 would have been better. > > > drm-kmod has support for more architectures these days, and the > > graphics/drm-legacy-kmod port is being deprecated. > > > > > Approved by: imp > > MFC after: 1 week > > Differential Revision: https://reviews.freebsd.org/D26174 > > > > Modified: > > head/sys/dev/drm2/drm_os_freebsd.h > > > > Modified: head/sys/dev/drm2/drm_os_freebsd.h > > ============================================================================== > > --- head/sys/dev/drm2/drm_os_freebsd.h Mon Aug 24 22:48:19 2020 (r364736) > > +++ head/sys/dev/drm2/drm_os_freebsd.h Mon Aug 24 22:53:23 2020 (r364737) > > @@ -154,16 +154,12 @@ typedef void irqreturn_t; > > *(volatile u_int64_t *)(((vm_offset_t)(map)->handle) + \ > > (vm_offset_t)(offset)) = htole64(val) > > > > -#ifdef amd64 > > #define DRM_PORT "graphics/drm-kmod" > > -#else > > -#define DRM_PORT "graphics/drm-legacy-kmod" > > -#endif > > > > #define DRM_OBSOLETE(dev) \ > > do { \ > > device_printf(dev, "=======================================================\n"); \ > > - device_printf(dev, "This code is obsolete abandonware. Install the " DRM_PORT " pkg\n"); \ > > + device_printf(dev, "This code is deprecated. Install the " DRM_PORT " pkg\n"); \ > > device_printf(dev, "=======================================================\n"); \ > > gone_in_dev(dev, 13, "drm2 drivers"); \ > > } while (0) > > -- Emmanuel Vadot From owner-svn-src-all@freebsd.org Tue Sep 1 13:19:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DFB1B3C75FD; Tue, 1 Sep 2020 13:19:16 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgnj05h41z4VxL; Tue, 1 Sep 2020 13:19:16 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A637419C94; Tue, 1 Sep 2020 13:19:16 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081DJGFH020390; Tue, 1 Sep 2020 13:19:16 GMT (envelope-from jilles@FreeBSD.org) Received: (from jilles@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081DJFlS020384; Tue, 1 Sep 2020 13:19:15 GMT (envelope-from jilles@FreeBSD.org) Message-Id: <202009011319.081DJFlS020384@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jilles set sender to jilles@FreeBSD.org using -f From: Jilles Tjoelker Date: Tue, 1 Sep 2020 13:19:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365037 - in head/bin/sh: . tests/builtins X-SVN-Group: head X-SVN-Commit-Author: jilles X-SVN-Commit-Paths: in head/bin/sh: . tests/builtins X-SVN-Commit-Revision: 365037 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 13:19:16 -0000 Author: jilles Date: Tue Sep 1 13:19:15 2020 New Revision: 365037 URL: https://svnweb.freebsd.org/changeset/base/365037 Log: sh: Write absolute path in command -vV and type POSIX is pretty clear that command -v, command -V and type shall write absolute pathnames. Therefore, we need to prepend the current directory's name to relative pathnames. This can happen either when PATH contains a relative pathname or when the operand contains a slash but is not an absolute pathname. Added: head/bin/sh/tests/builtins/command13.0 (contents, props changed) head/bin/sh/tests/builtins/command14.0 (contents, props changed) head/bin/sh/tests/builtins/type4.0 (contents, props changed) Modified: head/bin/sh/exec.c head/bin/sh/tests/builtins/Makefile Modified: head/bin/sh/exec.c ============================================================================== --- head/bin/sh/exec.c Tue Sep 1 12:21:17 2020 (r365036) +++ head/bin/sh/exec.c Tue Sep 1 13:19:15 2020 (r365037) @@ -679,6 +679,21 @@ isfunc(const char *name) } +static void +print_absolute_path(const char *name) +{ + const char *pwd; + + if (*name != '/' && (pwd = lookupvar("PWD")) != NULL && *pwd != '\0') { + out1str(pwd); + if (strcmp(pwd, "/") != 0) + outcslow('/', out1); + } + out1str(name); + outcslow('\n', out1); +} + + /* * Shared code for the following builtin commands: * type, command -v, command -V @@ -745,20 +760,16 @@ typecmd_impl(int argc, char **argv, int cmd, const cha name = padvance(&path2, &opt2, argv[i]); stunalloc(name); } while (--j >= 0); - if (cmd == TYPECMD_SMALLV) - out1fmt("%s\n", name); - else - out1fmt("%s is%s %s\n", argv[i], + if (cmd != TYPECMD_SMALLV) + out1fmt("%s is%s ", argv[i], (cmdp && cmd == TYPECMD_TYPE) ? - " a tracked alias for" : "", - name); + " a tracked alias for" : ""); + print_absolute_path(name); } else { if (eaccess(argv[i], X_OK) == 0) { - if (cmd == TYPECMD_SMALLV) - out1fmt("%s\n", argv[i]); - else - out1fmt("%s is %s\n", argv[i], - argv[i]); + if (cmd != TYPECMD_SMALLV) + out1fmt("%s is ", argv[i]); + print_absolute_path(argv[i]); } else { if (cmd != TYPECMD_SMALLV) outfmt(out2, "%s: %s\n", Modified: head/bin/sh/tests/builtins/Makefile ============================================================================== --- head/bin/sh/tests/builtins/Makefile Tue Sep 1 12:21:17 2020 (r365036) +++ head/bin/sh/tests/builtins/Makefile Tue Sep 1 13:19:15 2020 (r365037) @@ -69,6 +69,8 @@ ${PACKAGE}FILES+= command9.0 ${PACKAGE}FILES+= command10.0 ${PACKAGE}FILES+= command11.0 ${PACKAGE}FILES+= command12.0 +${PACKAGE}FILES+= command13.0 +${PACKAGE}FILES+= command14.0 ${PACKAGE}FILES+= dot1.0 ${PACKAGE}FILES+= dot2.0 ${PACKAGE}FILES+= dot3.0 @@ -170,6 +172,7 @@ ${PACKAGE}FILES+= trap9.0 ${PACKAGE}FILES+= type1.0 type1.0.stderr ${PACKAGE}FILES+= type2.0 ${PACKAGE}FILES+= type3.0 +${PACKAGE}FILES+= type4.0 ${PACKAGE}FILES+= unalias.0 ${PACKAGE}FILES+= var-assign.0 ${PACKAGE}FILES+= var-assign2.0 Added: head/bin/sh/tests/builtins/command13.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/builtins/command13.0 Tue Sep 1 13:19:15 2020 (r365037) @@ -0,0 +1,21 @@ +# $FreeBSD$ + +failures=0 + +check() { + if [ "$1" != "$2" ] && { [ "$#" -lt 3 ] || [ "$1" != "$3" ]; } then + echo "Mismatch found" + echo "Expected: $2" + if [ "$#" -ge 3 ]; then + echo "Alternative expected: $3" + fi + echo "Actual: $1" + : $((failures += 1)) + fi +} + +check "$(cd /bin && PATH=. command -v ls)" /bin/ls /bin/./ls +check "$(cd /bin && PATH=:/var/empty/nosuch command -v ls)" /bin/ls /bin/./ls +check "$(cd / && PATH=bin command -v ls)" /bin/ls +check "$(cd / && command -v bin/ls)" /bin/ls +check "$(cd /bin && command -v ./ls)" /bin/ls /bin/./ls Added: head/bin/sh/tests/builtins/command14.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/builtins/command14.0 Tue Sep 1 13:19:15 2020 (r365037) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +r=`cd /bin && PATH=. command -V ls` +case $r in +*/bin/ls*|*/bin/./ls*) ;; +*) + echo "Unexpected result: $r" + exit 1 +esac Added: head/bin/sh/tests/builtins/type4.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/bin/sh/tests/builtins/type4.0 Tue Sep 1 13:19:15 2020 (r365037) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +r=`cd /bin && PATH=. type ls` +case $r in +*/bin/ls*|*/bin/./ls*) ;; +*) + echo "Unexpected result: $r" + exit 1 +esac From owner-svn-src-all@freebsd.org Tue Sep 1 13:32:23 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 51DBD3C805F; Tue, 1 Sep 2020 13:32:23 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2607:f740:d:20::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgp066pvPz4Wjj; Tue, 1 Sep 2020 13:32:22 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from cid.daemonic.se (localhost [IPv6:::1]) by mail.daemonic.se (Postfix) with ESMTP id 4Bgp0458xrz3n4B; Tue, 1 Sep 2020 13:32:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mail.daemonic.se ([127.0.0.1]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256) by cid.daemonic.se (mailscanner.daemonic.se [127.0.0.1]) (amavisd-new, port 10587) with ESMTPS id VxsfGw5y030g; Tue, 1 Sep 2020 13:32:20 +0000 (UTC) Received: from garnet.daemonic.se (unknown [94.136.80.38]) by mail.daemonic.se (Postfix) with ESMTPSA id 4Bgp036jqsz3myt; Tue, 1 Sep 2020 13:32:19 +0000 (UTC) Subject: Re: svn commit: r364737 - head/sys/dev/drm2 To: Emmanuel Vadot , meloun.michal@gmail.com Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008242253.07OMrNO2016612@repo.freebsd.org> <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> From: Niclas Zeising Message-ID: <235f7f25-4e38-9154-e990-11aa6f8464d4@freebsd.org> Date: Tue, 1 Sep 2020 15:32:18 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Bgp066pvPz4Wjj X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:36236, ipnet:2607:f740:d::/48, country:US]; TAGGED_RCPT(0.00)[]; local_wl_from(0.00)[freebsd.org] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 13:32:23 -0000 On 2020-09-01 15:16, Emmanuel Vadot wrote: > On Tue, 1 Sep 2020 15:13:53 +0200 > Michal Meloun wrote: > >> >> >> On 25.08.2020 0:53, Niclas Zeising wrote: >>> Author: zeising (doc,ports committer) >>> Date: Mon Aug 24 22:53:23 2020 >>> New Revision: 364737 >>> URL: https://svnweb.freebsd.org/changeset/base/364737 >>> >>> Log: >>> drm2: Update deprecation message >>> >>> Update the deprecation message in the drm2 (aka legacy drm) drivers to point >>> towards the graphics/drm-kmod ports for all architectures, not just amd64. >> Only known user of drm2 is arm/tegra124 based boards. How >> graphics/drm-kmod can help for these? >> Or be more specific - drm2 allows me to hot-plug monitor to tegra based >> board an use 2 scaled overlay planes (which is exactly whats I want for >> my application). Which alternative can you offer me? >> Btw, as you can see, the maintenance cost of drm2 is close to zero and >> the dev/drm2 code does not inherit with any of the major architectures. >> >> Michal > > I think that the goal was only to mfc this to warn users before 12.2 > is branched, maybe a direct commit to 12 would have been better. > No, the change is correct. drm-legacy-kmod (the port) is going away, especially on FreeBSD 13, since it is preventing updates to the FreeBSD VM subsystem. I sent an-email about this to a variety of lists about a week ago. I do know that there are a few special users of drm2 in FreeBSD current, I do not know how those are affected. Since, on FreeBSD current, most architectures can use drm-kmod, I believe it is good to point everyone towards that ports, instead of pointing everyone except amd64 users to drm-legacy-kmod. Regards -- Niclas Zeising From owner-svn-src-all@freebsd.org Tue Sep 1 13:34:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 46DEA3C8351; Tue, 1 Sep 2020 13:34:57 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgp344JxMz4WlK; Tue, 1 Sep 2020 13:34:56 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Received: by mail-ed1-x543.google.com with SMTP id w1so1463879edr.3; Tue, 01 Sep 2020 06:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:reply-to:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Stn48hCWgLrDcv67QKeJOCnXn0r27cybTo6KUMrdrEI=; b=SLKJiYp5AU8SkKCHGr4KbspPvuq3n27kWrrSxu/NB3xv7QTpK6ttvZYokAhgNbqtMv s2wTIcN7kn6bM16VpPWD2p7CQDNo0Zz5Cw9VNjW5OZmM9R61p8C0kA3Z/aGjHs85UQVP LFpDjA1kpQZsl7/kGYy609vdoqw9aYguXdK+yi2TPQgV8u+KewISprO7zcRrzbmaZrFV OqOSV0SXCNroahr/l6OeiiOEpJS3G2iWTGk7u4YGkEn9gYB+maU58SdCWrkN7aMOgWcA 6Cqf+r+3w/+YPmeCwYxygWgdlGn3vIv9g1kkjv4kxJhgRHw2PqAcaEZ7KvCsjphTPkLf 2xaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=Stn48hCWgLrDcv67QKeJOCnXn0r27cybTo6KUMrdrEI=; b=dys1l00uoJMxab2wkmdjgnX9T/2jnhP/9EWc+iwhq5W9HDSl/MZxaLE4JEtdwvQ2dC VDh0UL0KlGNbD0a7Bwv2fYAFQnzdOM0yyBDgmzmafs1hzzg91xUrVQQecX9mMUOyru90 hwYjjHrfRiG25V+ienO7i5RTXxrBGEc7Pmwb6G18/x0gtEE/y0hs31wyzfw8iWlBPu2O eS7M4GD1ZQFInWcn5CPtwykGElUVXksPBkKHb8mQhI495xovw4yzg4DnNOoYRr7lz4ze Z9aigF0aZ9JinUo4+ncRGe363qzxKNfP/8kc3ax6eBwWc0a6JPZPrkMLOEwVEGNjK+h1 aIfQ== X-Gm-Message-State: AOAM5332qE3RvDEaZpVDHrmqvPU8ZoL9sfLIkx24qLFr+GraY3LP0JBA llVUK1KbkPI3qr7C6ThRTgXHVRC5MnsaLA== X-Google-Smtp-Source: ABdhPJw6yrxEQu3ivPUlsfWTUbsOa4MFuRkH4JnF0hM5QYogSH5yYwZBrRrKFUCHWlqRPmxH7+uLxw== X-Received: by 2002:a05:6402:6d6:: with SMTP id n22mr1711023edy.79.1598967294985; Tue, 01 Sep 2020 06:34:54 -0700 (PDT) Received: from [88.208.79.100] (halouny.humusoft.cz. [88.208.79.100]) by smtp.gmail.com with ESMTPSA id mb16sm1287652ejb.45.2020.09.01.06.34.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Sep 2020 06:34:54 -0700 (PDT) Sender: Michal Meloun Reply-To: meloun.michal@gmail.com Subject: Re: svn commit: r364737 - head/sys/dev/drm2 To: Emmanuel Vadot Cc: Niclas Zeising , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008242253.07OMrNO2016612@repo.freebsd.org> <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> From: Michal Meloun Message-ID: <6ce33c1a-a268-dbaa-a434-e4769827b168@gmail.com> Date: Tue, 1 Sep 2020 15:34:55 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Bgp344JxMz4WlK X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=SLKJiYp5; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of melounmichal@gmail.com designates 2a00:1450:4864:20::543 as permitted sender) smtp.mailfrom=melounmichal@gmail.com X-Spamd-Result: default: False [-4.20 / 15.00]; HAS_REPLYTO(0.00)[meloun.michal@gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.16)[-1.161]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.02)[-1.020]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.02)[-1.021]; MIME_GOOD(-0.10)[text/plain]; FREEMAIL_REPLYTO(0.00)[gmail.com]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::543:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 13:34:57 -0000 On 01.09.2020 15:16, Emmanuel Vadot wrote: > On Tue, 1 Sep 2020 15:13:53 +0200 > Michal Meloun wrote: > >> >> >> On 25.08.2020 0:53, Niclas Zeising wrote: >>> Author: zeising (doc,ports committer) >>> Date: Mon Aug 24 22:53:23 2020 >>> New Revision: 364737 >>> URL: https://svnweb.freebsd.org/changeset/base/364737 >>> >>> Log: >>> drm2: Update deprecation message >>> >>> Update the deprecation message in the drm2 (aka legacy drm) drivers to point >>> towards the graphics/drm-kmod ports for all architectures, not just amd64. >> Only known user of drm2 is arm/tegra124 based boards. How >> graphics/drm-kmod can help for these? >> Or be more specific - drm2 allows me to hot-plug monitor to tegra based >> board an use 2 scaled overlay planes (which is exactly whats I want for >> my application). Which alternative can you offer me? >> Btw, as you can see, the maintenance cost of drm2 is close to zero and >> the dev/drm2 code does not inherit with any of the major architectures. >> >> Michal > > I think that the goal was only to mfc this to warn users before 12.2 > is branched, maybe a direct commit to 12 would have been better. > My main concern is #ifdef removal (thus expanding the removal message also on QARM). I understand that drm2 code is very old, but it works, is used, and have very minimal impact on other architectures or rest of kernel. Within these conditions, I don't see single reason to remove (on ARM) drm2 code in 13. >> >>> drm-kmod has support for more architectures these days, and the >>> graphics/drm-legacy-kmod port is being deprecated. >> >>> >>> Approved by: imp >>> MFC after: 1 week >>> Differential Revision: https://reviews.freebsd.org/D26174 >>> >>> Modified: >>> head/sys/dev/drm2/drm_os_freebsd.h >>> >>> Modified: head/sys/dev/drm2/drm_os_freebsd.h >>> ============================================================================== >>> --- head/sys/dev/drm2/drm_os_freebsd.h Mon Aug 24 22:48:19 2020 (r364736) >>> +++ head/sys/dev/drm2/drm_os_freebsd.h Mon Aug 24 22:53:23 2020 (r364737) >>> @@ -154,16 +154,12 @@ typedef void irqreturn_t; >>> *(volatile u_int64_t *)(((vm_offset_t)(map)->handle) + \ >>> (vm_offset_t)(offset)) = htole64(val) >>> >>> -#ifdef amd64 >>> #define DRM_PORT "graphics/drm-kmod" >>> -#else >>> -#define DRM_PORT "graphics/drm-legacy-kmod" >>> -#endif >>> >>> #define DRM_OBSOLETE(dev) \ >>> do { \ >>> device_printf(dev, "=======================================================\n"); \ >>> - device_printf(dev, "This code is obsolete abandonware. Install the " DRM_PORT " pkg\n"); \ >>> + device_printf(dev, "This code is deprecated. Install the " DRM_PORT " pkg\n"); \ >>> device_printf(dev, "=======================================================\n"); \ >>> gone_in_dev(dev, 13, "drm2 drivers"); \ >>> } while (0) >>> > > From owner-svn-src-all@freebsd.org Tue Sep 1 13:41:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 42CE73C8A88; Tue, 1 Sep 2020 13:41:15 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgpBL5Tqgz4X7s; Tue, 1 Sep 2020 13:41:14 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 081DfB45037922; Tue, 1 Sep 2020 06:41:11 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 081DfBMb037921; Tue, 1 Sep 2020 06:41:11 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202009011341.081DfBMb037921@gndrsh.dnsmgr.net> Subject: Re: svn commit: r364989 - head/sys/dev/jedec_dimm In-Reply-To: <5709d5bb-6f52-711b-cc4b-bed175cdb7d8@FreeBSD.org> To: Andriy Gapon Date: Tue, 1 Sep 2020 06:41:11 -0700 (PDT) CC: Eric van Gyzen , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4BgpBL5Tqgz4X7s X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 13:41:15 -0000 > On 31/08/2020 18:03, Eric van Gyzen wrote: > > Author: vangyzen > > Date: Mon Aug 31 15:03:23 2020 > > New Revision: 364989 > > URL: https://svnweb.freebsd.org/changeset/base/364989 > > > > Log: > > jedec_dimm: fix array overrun > > > > Coverity detected the overrunning of sc->part_str. > > > > Submitted by: bret_ketchum@dell.com > > Reported by: Coverity > > MFC after: 2 weeks > > Sponsored by: Dell EMC Isilon > > Differential Revision: https://reviews.freebsd.org/D26145 > > > > Modified: > > head/sys/dev/jedec_dimm/jedec_dimm.c > > > > Modified: head/sys/dev/jedec_dimm/jedec_dimm.c > > ============================================================================== > > --- head/sys/dev/jedec_dimm/jedec_dimm.c Mon Aug 31 14:47:23 2020 (r364988) > > +++ head/sys/dev/jedec_dimm/jedec_dimm.c Mon Aug 31 15:03:23 2020 (r364989) > > @@ -795,7 +795,7 @@ jedec_dimm_field_to_str(struct jedec_dimm_softc *sc, c > > > > /* If we're dealing with ASCII, convert trailing spaces to NULs. */ > > if (ascii) { > > - for (i = dstsz; i > 0; i--) { > > + for (i = dstsz - 1; i > 0; i--) { > > If 'i' is an index into the array, then shouldn't the condition be greater-equal? Looks that way to me too, and this corner case only occurs if the string is all spaces, which is probably rare but may exist. > > > > if (dst[i] == ' ') { > > dst[i] = 0; > > } else if (dst[i] == 0) { > > > > > -- > Andriy Gapon > -- Rod Grimes rgrimes@freebsd.org From owner-svn-src-all@freebsd.org Tue Sep 1 13:58:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 44FD43C8EC7; Tue, 1 Sep 2020 13:58:18 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgpZ217rwz4YHF; Tue, 1 Sep 2020 13:58:18 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A3391A6DB; Tue, 1 Sep 2020 13:58:18 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081DwHnB044596; Tue, 1 Sep 2020 13:58:17 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081DwHBs044594; Tue, 1 Sep 2020 13:58:17 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009011358.081DwHBs044594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 1 Sep 2020 13:58:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365038 - in stable/12: share/man/man4 sys/dev/sdhci X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12: share/man/man4 sys/dev/sdhci X-SVN-Commit-Revision: 365038 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 13:58:18 -0000 Author: markj Date: Tue Sep 1 13:58:17 2020 New Revision: 365038 URL: https://svnweb.freebsd.org/changeset/base/365038 Log: MFC r364779: sdhci(4): Recognize the Texas Instruments PCIxx12 card reader. PR: 248650 Modified: stable/12/share/man/man4/sdhci.4 stable/12/sys/dev/sdhci/sdhci_pci.c Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man4/sdhci.4 ============================================================================== --- stable/12/share/man/man4/sdhci.4 Tue Sep 1 13:19:15 2020 (r365037) +++ stable/12/share/man/man4/sdhci.4 Tue Sep 1 13:58:17 2020 (r365038) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 9, 2012 +.Dd August 25, 2020 .Dt SDHCI 4 .Os .Sh NAME @@ -71,7 +71,7 @@ RICOH R5C822 .It RICOH R5CE823 .It -TI PCIXX21/XX11 +TI PCIXX21/XX11/XX12 .El .Sh SEE ALSO .Xr mmc 4 , Modified: stable/12/sys/dev/sdhci/sdhci_pci.c ============================================================================== --- stable/12/sys/dev/sdhci/sdhci_pci.c Tue Sep 1 13:19:15 2020 (r365037) +++ stable/12/sys/dev/sdhci/sdhci_pci.c Tue Sep 1 13:58:17 2020 (r365038) @@ -90,6 +90,9 @@ static const struct sdhci_device { SDHCI_QUIRK_LOWER_FREQUENCY }, { 0x8034104c, 0xffff, "TI XX21/XX11 SD", SDHCI_QUIRK_FORCE_DMA }, + { 0x803c104c, 0xffff, "TI XX12 SD", + SDHCI_QUIRK_FORCE_DMA | + SDHCI_QUIRK_WAITFOR_RESET_ASSERTED }, { 0x05501524, 0xffff, "ENE CB712 SD", SDHCI_QUIRK_BROKEN_TIMINGS }, { 0x05511524, 0xffff, "ENE CB712 SD 2", From owner-svn-src-all@freebsd.org Tue Sep 1 14:10:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27B653C972B; Tue, 1 Sep 2020 14:10:36 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgprB70xyz4YxB; Tue, 1 Sep 2020 14:10:34 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Received: by mail-ej1-x633.google.com with SMTP id lo4so1856901ejb.8; Tue, 01 Sep 2020 07:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:reply-to:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=44HDYl12T+RilG4mNUvMa82vIEPLQ0ImCDrymKH2Jq8=; b=VMcXlKsBkCM9PHdr+x2BAd4Kpu6MWWzcsOtdXXufq4qAfPm5orDOj0S1vX7a3lc1s8 4SFN5sDqca1IEQqNR/tTNBOCaAx5bDdQqj5fvDlgjOzcXYe80NHDTv3UUU9x9QomZ6hM CgbYdXFVzuEtG1n0ngeCnzGvCRmlu1LeOfeM+axoQCeCW6U1cu2HT01dCu7A0kq3N7HZ J06pcE0WmJRsOwigLMk3J5v6aWmUixgbvUS7kS3CoWysLRrmOeZSrH4ANDad5gFOPBqV Wv4BQBjgD8Rrl4zCzsodljmmwiPs+aMnh04/faswHxkx1+Hffsqnri0N9y7mVkqfyow7 sxIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=44HDYl12T+RilG4mNUvMa82vIEPLQ0ImCDrymKH2Jq8=; b=REwPdt4D7799OTxWJQkAF9ll5j2+8KiLXadSnd/296hNoxr2GhSVCC+OnvFS4jyeGw bu8rq99zUIcQduWE4fXezu82ybtwxYHFo+Y6qcbYU204m5fC8vqtQt7LoQ7McTm7muBY HB16e8Lyvc17uNMfVGhahcvqCTnJlwNGHL3ZhdCe/c6O3PQnWKx23UeTeZD2l5L4E+fd tlLD12jzWT5fDG+qNW80pN3Aj5uoV5I/X+QyUGwPPuoW3CwxJ8HJvuNvlKFaCnrOLzih W2qiYS51OZ/tbYQrPiutoI+6gdfmz3aEYervF05a2PMjNtm1jI5iyP9WqNtcd5eXrQL4 XCfg== X-Gm-Message-State: AOAM533Own5h4HfnVH9/95AU/nMCBq87aeacciOGjBDtHdYW3nG2T8Z/ Pm6v1ai4FxM0L3F9PKSIIwoaJq1wFLNeuw== X-Google-Smtp-Source: ABdhPJyP61Mra4sFmjp9hFMNlNMaagcc4oFGBtC8roaag9iTKKCud1n4RAqUeBALNBSc/umpCt7itg== X-Received: by 2002:a17:906:84f7:: with SMTP id zp23mr1590423ejb.203.1598969432632; Tue, 01 Sep 2020 07:10:32 -0700 (PDT) Received: from [88.208.79.100] (halouny.humusoft.cz. [88.208.79.100]) by smtp.gmail.com with ESMTPSA id k1sm1375640eji.20.2020.09.01.07.10.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Sep 2020 07:10:31 -0700 (PDT) Sender: Michal Meloun Reply-To: meloun.michal@gmail.com Subject: Re: svn commit: r364737 - head/sys/dev/drm2 To: Niclas Zeising , Emmanuel Vadot Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008242253.07OMrNO2016612@repo.freebsd.org> <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> <235f7f25-4e38-9154-e990-11aa6f8464d4@freebsd.org> From: Michal Meloun Message-ID: <6a57348b-213a-8535-e36b-b09be14eb934@gmail.com> Date: Tue, 1 Sep 2020 16:10:30 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <235f7f25-4e38-9154-e990-11aa6f8464d4@freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4BgprB70xyz4YxB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=VMcXlKsB; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of melounmichal@gmail.com designates 2a00:1450:4864:20::633 as permitted sender) smtp.mailfrom=melounmichal@gmail.com X-Spamd-Result: default: False [-4.18 / 15.00]; HAS_REPLYTO(0.00)[meloun.michal@gmail.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.14)[-1.135]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.02)[-1.020]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.02)[-1.020]; MIME_GOOD(-0.10)[text/plain]; FREEMAIL_REPLYTO(0.00)[gmail.com]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::633:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 14:10:36 -0000 On 01.09.2020 15:32, Niclas Zeising wrote: > On 2020-09-01 15:16, Emmanuel Vadot wrote: >> On Tue, 1 Sep 2020 15:13:53 +0200 >> Michal Meloun wrote: >> >>> >>> >>> On 25.08.2020 0:53, Niclas Zeising wrote: >>>> Author: zeising (doc,ports committer) >>>> Date: Mon Aug 24 22:53:23 2020 >>>> New Revision: 364737 >>>> URL: https://svnweb.freebsd.org/changeset/base/364737 >>>> >>>> Log: >>>>    drm2: Update deprecation message >>>>       Update the deprecation message in the drm2 (aka legacy drm) >>>> drivers to point >>>>    towards the graphics/drm-kmod ports for all architectures, not >>>> just amd64. >>> Only known user of drm2 is arm/tegra124 based boards. How >>> graphics/drm-kmod can help for these? >>> Or be more specific - drm2 allows me to hot-plug monitor to tegra based >>> board an use 2 scaled overlay planes (which is exactly whats I want for >>>   my application). Which alternative can you offer me? >>> Btw, as you can see, the maintenance cost of drm2 is close to zero and >>> the dev/drm2 code does not inherit with any of the major architectures. >>> >>> Michal >> >>   I think that the goal was only to mfc this to warn users before 12.2 >> is branched, maybe a direct commit to 12 would have been better. >> > > No, the change is correct. > drm-legacy-kmod (the port) is going away, especially on FreeBSD 13, > since it is preventing updates to the FreeBSD VM subsystem.  I sent > an-email about this to a variety of lists about a week ago. > I do know that there are a few special users of drm2 in FreeBSD current, > I do not know how those are affected.  Since, on FreeBSD current, most > architectures can use drm-kmod, I believe it is good to point everyone > towards that ports, instead of pointing everyone except amd64 users to > drm-legacy-kmod. No, this change is not correct. You *newly* point ARM drm2 users to use a port marked with "ONLY_FOR_ARCHS= amd64 i386 powerpc64" Do you think that this is correct behavior? So again. I have not a single problem with drm-legacy-kmod removal, I have not a problem with pointing users of supported architectures (by kmod-*) to right port. But I have problem with marking drm2 driver as obsolete for ARM architecture (without single rational reason) and/or by pointing ARM users of drm2 driver to not-existent port. Michal From owner-svn-src-all@freebsd.org Tue Sep 1 14:19:08 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AA6A63C9C39; Tue, 1 Sep 2020 14:19:08 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgq234n8Rz4ZW7; Tue, 1 Sep 2020 14:19:07 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1598969945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qWflUVCqN+W1INPJCA4uUnkZCL4VgY7g72r+OjYhZug=; b=VHgTk4xrkq71NwrurMPqPNp31Ky78Zi+1I2S9O6NPK20geSJYwZi9u5IKs1Ag8Vpc6Ry6H GXETN4R3vTYkgv7T02VJpj02DQCdRGyORYu6cIW7/OqTQFqwaO/vZWICUEoM6NZYpvfPlM vRzUS0pRF/ZpuhxFPCcgGZCGheNplws= Received: from amy.home (lfbn-idf2-1-1138-237.w90-92.abo.wanadoo.fr [90.92.20.237]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 5d16e2bd (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 1 Sep 2020 14:19:05 +0000 (UTC) Date: Tue, 1 Sep 2020 16:19:04 +0200 From: Emmanuel Vadot To: Niclas Zeising Cc: meloun.michal@gmail.com, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r364737 - head/sys/dev/drm2 Message-Id: <20200901161904.16e1ea156f622989df3d261a@bidouilliste.com> In-Reply-To: <235f7f25-4e38-9154-e990-11aa6f8464d4@freebsd.org> References: <202008242253.07OMrNO2016612@repo.freebsd.org> <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> <235f7f25-4e38-9154-e990-11aa6f8464d4@freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Bgq234n8Rz4ZW7 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=VHgTk4xr; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-3.63 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; FREEFALL_USER(0.00)[manu]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-1.01)[-1.014]; TO_MATCH_ENVRCPT_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; DKIM_TRACE(0.00)[bidouilliste.com:+]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-1.09)[-1.090]; NEURAL_HAM_MEDIUM(-1.02)[-1.022]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 14:19:08 -0000 On Tue, 1 Sep 2020 15:32:18 +0200 Niclas Zeising wrote: > On 2020-09-01 15:16, Emmanuel Vadot wrote: > > On Tue, 1 Sep 2020 15:13:53 +0200 > > Michal Meloun wrote: > > > >> > >> > >> On 25.08.2020 0:53, Niclas Zeising wrote: > >>> Author: zeising (doc,ports committer) > >>> Date: Mon Aug 24 22:53:23 2020 > >>> New Revision: 364737 > >>> URL: https://svnweb.freebsd.org/changeset/base/364737 > >>> > >>> Log: > >>> drm2: Update deprecation message > >>> > >>> Update the deprecation message in the drm2 (aka legacy drm) drivers to point > >>> towards the graphics/drm-kmod ports for all architectures, not just amd64. > >> Only known user of drm2 is arm/tegra124 based boards. How > >> graphics/drm-kmod can help for these? > >> Or be more specific - drm2 allows me to hot-plug monitor to tegra based > >> board an use 2 scaled overlay planes (which is exactly whats I want for > >> my application). Which alternative can you offer me? > >> Btw, as you can see, the maintenance cost of drm2 is close to zero and > >> the dev/drm2 code does not inherit with any of the major architectures. > >> > >> Michal > > > > I think that the goal was only to mfc this to warn users before 12.2 > > is branched, maybe a direct commit to 12 would have been better. > > > > No, the change is correct. > drm-legacy-kmod (the port) is going away, especially on FreeBSD 13, > since it is preventing updates to the FreeBSD VM subsystem. I sent > an-email about this to a variety of lists about a week ago. > I do know that there are a few special users of drm2 in FreeBSD current, > I do not know how those are affected. Since, on FreeBSD current, most > architectures can use drm-kmod, I believe it is good to point everyone > towards that ports, instead of pointing everyone except amd64 users to > drm-legacy-kmod. > Regards > -- > Niclas Zeising drm2 in src is only used for arm, so as Michal wrote in another email the warning will be seen only for tegra users, the mfc'ed commit will be seen by intel/amd ones though. -- Emmanuel Vadot From owner-svn-src-all@freebsd.org Tue Sep 1 14:30:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ED91E3CA174; Tue, 1 Sep 2020 14:30:43 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2607:f740:d:20::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgqHR5pCHz4b5w; Tue, 1 Sep 2020 14:30:43 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from cid.daemonic.se (localhost [IPv6:::1]) by mail.daemonic.se (Postfix) with ESMTP id 4BgqHQ4brcz3n08; Tue, 1 Sep 2020 14:30:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mail.daemonic.se ([127.0.0.1]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256) by cid.daemonic.se (mailscanner.daemonic.se [127.0.0.1]) (amavisd-new, port 10587) with ESMTPS id ihNuJXmT_f5t; Tue, 1 Sep 2020 14:30:42 +0000 (UTC) Received: from vivi.daemonic.se (vivi.daemonic.se [IPv6:2001:470:dca9:1200::4]) by mail.daemonic.se (Postfix) with ESMTPSA id 4BgqHP5jYRz3myt; Tue, 1 Sep 2020 14:30:41 +0000 (UTC) Subject: Re: svn commit: r364737 - head/sys/dev/drm2 To: meloun.michal@gmail.com, Emmanuel Vadot Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008242253.07OMrNO2016612@repo.freebsd.org> <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> <235f7f25-4e38-9154-e990-11aa6f8464d4@freebsd.org> <6a57348b-213a-8535-e36b-b09be14eb934@gmail.com> From: Niclas Zeising Message-ID: Date: Tue, 1 Sep 2020 16:30:40 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <6a57348b-213a-8535-e36b-b09be14eb934@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4BgqHR5pCHz4b5w X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:36236, ipnet:2607:f740:d::/48, country:US]; TAGGED_RCPT(0.00)[]; local_wl_from(0.00)[freebsd.org] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 14:30:44 -0000 On 2020-09-01 16:10, Michal Meloun wrote: >=20 >=20 > On 01.09.2020 15:32, Niclas Zeising wrote: >> On 2020-09-01 15:16, Emmanuel Vadot wrote: >>> On Tue, 1 Sep 2020 15:13:53 +0200 >>> Michal Meloun wrote: >>> >>>> >>>> >>>> On 25.08.2020 0:53, Niclas Zeising wrote: >>>>> Author: zeising (doc,ports committer) >>>>> Date: Mon Aug 24 22:53:23 2020 >>>>> New Revision: 364737 >>>>> URL: https://svnweb.freebsd.org/changeset/base/364737 >>>>> >>>>> Log: >>>>> =C2=A0=C2=A0 drm2: Update deprecation message >>>>> =C2=A0=C2=A0 =C2=A0=C2=A0 Update the deprecation message in the dr= m2 (aka legacy drm) >>>>> drivers to point >>>>> =C2=A0=C2=A0 towards the graphics/drm-kmod ports for all architect= ures, not >>>>> just amd64. >>>> Only known user of drm2 is arm/tegra124 based boards. How >>>> graphics/drm-kmod can help for these? >>>> Or be more specific - drm2 allows me to hot-plug monitor to tegra ba= sed >>>> board an use 2 scaled overlay planes (which is exactly whats I want = for >>>> =C2=A0 my application). Which alternative can you offer me? >>>> Btw, as you can see, the maintenance cost of drm2 is close to zero a= nd >>>> the dev/drm2 code does not inherit with any of the major architectur= es. >>>> >>>> Michal >>> >>> =C2=A0 I think that the goal was only to mfc this to warn users befo= re 12.2 >>> is branched, maybe a direct commit to 12 would have been better. >>> >> >> No, the change is correct. >> drm-legacy-kmod (the port) is going away, especially on FreeBSD 13, >> since it is preventing updates to the FreeBSD VM subsystem.=C2=A0 I se= nt >> an-email about this to a variety of lists about a week ago. >> I do know that there are a few special users of drm2 in FreeBSD curren= t, >> I do not know how those are affected.=C2=A0 Since, on FreeBSD current,= most >> architectures can use drm-kmod, I believe it is good to point everyone >> towards that ports, instead of pointing everyone except amd64 users to >> drm-legacy-kmod. >=20 > No, this change is not correct. > You *newly* point ARM drm2 users to use a port marked with > "ONLY_FOR_ARCHS=3D amd64 i386 powerpc64" > Do you think that this is correct behavior? >=20 > So again. I have not a single problem with drm-legacy-kmod removal, > I have not a problem with pointing users of supported architectures (by > kmod-*) to right port. > But I have problem with marking drm2 driver as obsolete for ARM > architecture (without single rational reason) and/or by pointing ARM > users of drm2 driver to not-existent port. > Michal >=20 I am only improving an already existing message. Previously, it would=20 point people to drm-legacy-kmod on all architectures except amd64. This=20 is wrong, since drm-legacy-kmod will be removed. drm-legacy-kmod is=20 causing issues and preventing updates to other areas of FreeBSD, as I=20 clearly stated in an email sent to current, ports, x11 and stable=20 mailing lists. drm-current-kmod is only available on i386, amd64 and=20 powerpc64. drm-devel-kmod is available on further architectures,=20 covering almost all of the FreeBSD on desktop segment. With the work manu is doing, this will improve further. For FreeBSD 12, the situation is slightly different, since=20 drm-fbsd12.1-kmod has less support. However, drm-legacy is available in=20 base there, and once again, with the work manu is doing, support for=20 further architectures might be possible even on FreeBSD 12. I have no objections if you want to opt out of the message on your tegra=20 boards, but I do not want us to point users to a port that is deprecated=20 and slated for removal. Regards --=20 Niclas Zeising From owner-svn-src-all@freebsd.org Tue Sep 1 14:32:06 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA7D93CA4B7; Tue, 1 Sep 2020 14:32:06 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.daemonic.se (mail.daemonic.se [176.58.89.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgqK22zhzz4bNk; Tue, 1 Sep 2020 14:32:06 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from cid.daemonic.se (localhost [IPv6:::1]) by mail.daemonic.se (Postfix) with ESMTP id 4BgqJv5Rqnz3n08; Tue, 1 Sep 2020 14:31:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mail.daemonic.se ([127.0.0.1]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256) by cid.daemonic.se (mailscanner.daemonic.se [127.0.0.1]) (amavisd-new, port 10587) with ESMTPS id 5I4kg22HM_34; Tue, 1 Sep 2020 14:31:59 +0000 (UTC) Received: from vivi.daemonic.se (vivi.daemonic.se [IPv6:2001:470:dca9:1200::4]) by mail.daemonic.se (Postfix) with ESMTPSA id 4BgqJv0wdqz3myt; Tue, 1 Sep 2020 14:31:59 +0000 (UTC) Subject: Re: svn commit: r364737 - head/sys/dev/drm2 To: Emmanuel Vadot Cc: meloun.michal@gmail.com, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008242253.07OMrNO2016612@repo.freebsd.org> <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> <235f7f25-4e38-9154-e990-11aa6f8464d4@freebsd.org> <20200901161904.16e1ea156f622989df3d261a@bidouilliste.com> From: Niclas Zeising Message-ID: <588309ba-8387-f3b7-0381-f80bdfef7e6d@freebsd.org> Date: Tue, 1 Sep 2020 16:31:58 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200901161904.16e1ea156f622989df3d261a@bidouilliste.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BgqK22zhzz4bNk X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:36236, ipnet:176.58.89.0/24, country:US]; TAGGED_RCPT(0.00)[]; local_wl_from(0.00)[freebsd.org] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 14:32:06 -0000 On 2020-09-01 16:19, Emmanuel Vadot wrote: > On Tue, 1 Sep 2020 15:32:18 +0200 > Niclas Zeising wrote: > >> On 2020-09-01 15:16, Emmanuel Vadot wrote: >>> On Tue, 1 Sep 2020 15:13:53 +0200 >>> Michal Meloun wrote: >>> >>>> >>>> >>>> On 25.08.2020 0:53, Niclas Zeising wrote: >>>>> Author: zeising (doc,ports committer) >>>>> Date: Mon Aug 24 22:53:23 2020 >>>>> New Revision: 364737 >>>>> URL: https://svnweb.freebsd.org/changeset/base/364737 >>>>> >>>>> Log: >>>>> drm2: Update deprecation message >>>>> >>>>> Update the deprecation message in the drm2 (aka legacy drm) drivers to point >>>>> towards the graphics/drm-kmod ports for all architectures, not just amd64. >>>> Only known user of drm2 is arm/tegra124 based boards. How >>>> graphics/drm-kmod can help for these? >>>> Or be more specific - drm2 allows me to hot-plug monitor to tegra based >>>> board an use 2 scaled overlay planes (which is exactly whats I want for >>>> my application). Which alternative can you offer me? >>>> Btw, as you can see, the maintenance cost of drm2 is close to zero and >>>> the dev/drm2 code does not inherit with any of the major architectures. >>>> >>>> Michal >>> >>> I think that the goal was only to mfc this to warn users before 12.2 >>> is branched, maybe a direct commit to 12 would have been better. >>> >> >> No, the change is correct. >> drm-legacy-kmod (the port) is going away, especially on FreeBSD 13, >> since it is preventing updates to the FreeBSD VM subsystem. I sent >> an-email about this to a variety of lists about a week ago. >> I do know that there are a few special users of drm2 in FreeBSD current, >> I do not know how those are affected. Since, on FreeBSD current, most >> architectures can use drm-kmod, I believe it is good to point everyone >> towards that ports, instead of pointing everyone except amd64 users to >> drm-legacy-kmod. >> Regards >> -- >> Niclas Zeising > > drm2 in src is only used for arm, so as Michal wrote in another email > the warning will be seen only for tegra users, the mfc'ed commit will > be seen by intel/amd ones though. > I still have to make a general change that can be MFCd. And pointing arm tegra users to drm-legacy-kmod is equally wrong. Regards -- Niclas Zeising From owner-svn-src-all@freebsd.org Tue Sep 1 14:37:04 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C295D3C9F63; Tue, 1 Sep 2020 14:37:04 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgqQl5ZlNz4bbH; Tue, 1 Sep 2020 14:37:03 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1598971022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4wJOL/lAdwCIsS+wNJ++CemEfCarZHFUbqgp1nEn6zA=; b=LLcA0n10ejg+raUUAjlhp3DAqOLdRjjIfBmCbCbPax1OW1xtve0puSJf/BZfOWduwxC7lO wEZd5fHtwArc9TghRDy/7EM7Whne3AvvYbKFbW6m73fh+Lvh/eqphGfGjS5B7wX3+3TjsG dNRiR+C6jA967hXe91dLfuV9VLMDnhE= Received: from amy.home (lfbn-idf2-1-1138-237.w90-92.abo.wanadoo.fr [90.92.20.237]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 965ac4cb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 1 Sep 2020 14:37:01 +0000 (UTC) Date: Tue, 1 Sep 2020 16:37:01 +0200 From: Emmanuel Vadot To: Niclas Zeising Cc: meloun.michal@gmail.com, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r364737 - head/sys/dev/drm2 Message-Id: <20200901163701.112d951b9df563e31cf682b3@bidouilliste.com> In-Reply-To: <588309ba-8387-f3b7-0381-f80bdfef7e6d@freebsd.org> References: <202008242253.07OMrNO2016612@repo.freebsd.org> <790db2ea-0877-671e-e48f-ec6da42c7437@gmail.com> <20200901151635.91c121acb2bf58e9282aa6ae@bidouilliste.com> <235f7f25-4e38-9154-e990-11aa6f8464d4@freebsd.org> <20200901161904.16e1ea156f622989df3d261a@bidouilliste.com> <588309ba-8387-f3b7-0381-f80bdfef7e6d@freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BgqQl5ZlNz4bbH X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=LLcA0n10; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [-3.62 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; FREEFALL_USER(0.00)[manu]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx:c]; MV_CASE(0.50)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-1.01)[-1.014]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; RCVD_TLS_ALL(0.00)[]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; NEURAL_HAM_SHORT(-1.09)[-1.087]; NEURAL_HAM_MEDIUM(-1.02)[-1.021]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 14:37:04 -0000 On Tue, 1 Sep 2020 16:31:58 +0200 Niclas Zeising wrote: > On 2020-09-01 16:19, Emmanuel Vadot wrote: > > On Tue, 1 Sep 2020 15:32:18 +0200 > > Niclas Zeising wrote: > > > >> On 2020-09-01 15:16, Emmanuel Vadot wrote: > >>> On Tue, 1 Sep 2020 15:13:53 +0200 > >>> Michal Meloun wrote: > >>> > >>>> > >>>> > >>>> On 25.08.2020 0:53, Niclas Zeising wrote: > >>>>> Author: zeising (doc,ports committer) > >>>>> Date: Mon Aug 24 22:53:23 2020 > >>>>> New Revision: 364737 > >>>>> URL: https://svnweb.freebsd.org/changeset/base/364737 > >>>>> > >>>>> Log: > >>>>> drm2: Update deprecation message > >>>>> > >>>>> Update the deprecation message in the drm2 (aka legacy drm) drivers to point > >>>>> towards the graphics/drm-kmod ports for all architectures, not just amd64. > >>>> Only known user of drm2 is arm/tegra124 based boards. How > >>>> graphics/drm-kmod can help for these? > >>>> Or be more specific - drm2 allows me to hot-plug monitor to tegra based > >>>> board an use 2 scaled overlay planes (which is exactly whats I want for > >>>> my application). Which alternative can you offer me? > >>>> Btw, as you can see, the maintenance cost of drm2 is close to zero and > >>>> the dev/drm2 code does not inherit with any of the major architectures. > >>>> > >>>> Michal > >>> > >>> I think that the goal was only to mfc this to warn users before 12.2 > >>> is branched, maybe a direct commit to 12 would have been better. > >>> > >> > >> No, the change is correct. > >> drm-legacy-kmod (the port) is going away, especially on FreeBSD 13, > >> since it is preventing updates to the FreeBSD VM subsystem. I sent > >> an-email about this to a variety of lists about a week ago. > >> I do know that there are a few special users of drm2 in FreeBSD current, > >> I do not know how those are affected. Since, on FreeBSD current, most > >> architectures can use drm-kmod, I believe it is good to point everyone > >> towards that ports, instead of pointing everyone except amd64 users to > >> drm-legacy-kmod. > >> Regards > >> -- > >> Niclas Zeising > > > > drm2 in src is only used for arm, so as Michal wrote in another email > > the warning will be seen only for tegra users, the mfc'ed commit will > > be seen by intel/amd ones though. > > > > I still have to make a general change that can be MFCd. I think that for this case a direct commit to 12 would have been ok. > And pointing arm tegra users to drm-legacy-kmod is equally wrong. True, pointing them to any port is wrong anyway, none of them will work, it would be better to remove the warning now. > Regards > -- > Niclas Zeising -- Emmanuel Vadot From owner-svn-src-all@freebsd.org Tue Sep 1 14:50:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E0DF83CA530; Tue, 1 Sep 2020 14:50:43 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgqkW5hM5z4cXF; Tue, 1 Sep 2020 14:50:43 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A66CC1AC76; Tue, 1 Sep 2020 14:50:43 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Eohx2075975; Tue, 1 Sep 2020 14:50:43 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081EohTT075974; Tue, 1 Sep 2020 14:50:43 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <202009011450.081EohTT075974@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 1 Sep 2020 14:50:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365039 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 365039 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 14:50:43 -0000 Author: andrew Date: Tue Sep 1 14:50:43 2020 New Revision: 365039 URL: https://svnweb.freebsd.org/changeset/base/365039 Log: Ensure the tlbi has completed before setting SCTLR When enabling the MMU on arm64 we need to ensure the tlb invalidation has completed before setting the enable bit in the SCTLR register. Reported by: alc Sponsored by: Innovate UK Modified: head/sys/arm64/arm64/locore.S Modified: head/sys/arm64/arm64/locore.S ============================================================================== --- head/sys/arm64/arm64/locore.S Tue Sep 1 13:58:17 2020 (r365038) +++ head/sys/arm64/arm64/locore.S Tue Sep 1 14:50:43 2020 (r365039) @@ -677,6 +677,8 @@ start_mmu: /* Invalidate the TLB */ tlbi vmalle1is + dsb ish + isb ldr x2, mair msr mair_el1, x2 From owner-svn-src-all@freebsd.org Tue Sep 1 14:52:35 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C2D5A3CAC57; Tue, 1 Sep 2020 14:52:35 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgqmg4sGfz4cgj; Tue, 1 Sep 2020 14:52:35 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B0791B300; Tue, 1 Sep 2020 14:52:35 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081EqZC8081013; Tue, 1 Sep 2020 14:52:35 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081EqZc7081012; Tue, 1 Sep 2020 14:52:35 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202009011452.081EqZc7081012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 1 Sep 2020 14:52:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365040 - head/usr.sbin/iscsid X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/usr.sbin/iscsid X-SVN-Commit-Revision: 365040 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 14:52:35 -0000 Author: trasz Date: Tue Sep 1 14:52:35 2020 New Revision: 365040 URL: https://svnweb.freebsd.org/changeset/base/365040 Log: Fix string overflow that could occur during redirection due to passing the wrong length to strlcpy(3). It looks like it could overflow into the next field, isc_user, which is properly long to accomodate for it; I don't think it could cause any harm other than breaking the connection. Reviewed by: mav MFC after: 2 weeks Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D26247 Modified: head/usr.sbin/iscsid/login.c Modified: head/usr.sbin/iscsid/login.c ============================================================================== --- head/usr.sbin/iscsid/login.c Tue Sep 1 14:50:43 2020 (r365039) +++ head/usr.sbin/iscsid/login.c Tue Sep 1 14:52:35 2020 (r365040) @@ -170,7 +170,7 @@ kernel_modify(const struct connection *conn, const cha ism.ism_session_id = conn->conn_session_id; memcpy(&ism.ism_conf, &conn->conn_conf, sizeof(ism.ism_conf)); strlcpy(ism.ism_conf.isc_target_addr, target_address, - sizeof(ism.ism_conf.isc_target)); + sizeof(ism.ism_conf.isc_target_addr)); error = ioctl(conn->conn_iscsi_fd, ISCSISMODIFY, &ism); if (error != 0) { log_err(1, "failed to redirect to %s: ISCSISMODIFY", From owner-svn-src-all@freebsd.org Tue Sep 1 14:52:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8084F3CAE91; Tue, 1 Sep 2020 14:52:41 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgqmm4HD2z4csh; Tue, 1 Sep 2020 14:52:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 148F51AED1; Tue, 1 Sep 2020 14:52:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081EqdBu081059; Tue, 1 Sep 2020 14:52:39 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081EqdM8081058; Tue, 1 Sep 2020 14:52:39 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202009011452.081EqdM8081058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 1 Sep 2020 14:52:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365041 - head/usr.bin/diff X-SVN-Group: head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/usr.bin/diff X-SVN-Commit-Revision: 365041 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 14:52:41 -0000 Author: bapt Date: Tue Sep 1 14:52:39 2020 New Revision: 365041 URL: https://svnweb.freebsd.org/changeset/base/365041 Log: diff: always properly kill pr(1) When diff is invoked with -l it will spawn the pr(1) program. In some circumpstances the pr(1) was not properly killed when diff program exits. Submitted by: Bret Ketchum MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D26232 Modified: head/usr.bin/diff/diffreg.c Modified: head/usr.bin/diff/diffreg.c ============================================================================== --- head/usr.bin/diff/diffreg.c Tue Sep 1 14:52:35 2020 (r365040) +++ head/usr.bin/diff/diffreg.c Tue Sep 1 14:52:39 2020 (r365041) @@ -412,10 +412,10 @@ diffreg(char *file1, char *file2, int flags, int capsi ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew)); check(f1, f2, flags); output(file1, f1, file2, f2, flags); - if (pr != NULL) - stop_pr(pr); closem: + if (pr != NULL) + stop_pr(pr); if (anychange) { status |= 1; if (rval == D_SAME) @@ -1704,4 +1704,4 @@ print_space(int nc, int n, int flags) { } } diff_output("%*s", col, ""); -} \ No newline at end of file +} From owner-svn-src-all@freebsd.org Tue Sep 1 14:58:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E05663CB180; Tue, 1 Sep 2020 14:58:57 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgqw15dcnz4dTr; Tue, 1 Sep 2020 14:58:57 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A47C51AED7; Tue, 1 Sep 2020 14:58:57 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Ewv9I081412; Tue, 1 Sep 2020 14:58:57 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Ewvor081411; Tue, 1 Sep 2020 14:58:57 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202009011458.081Ewvor081411@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 1 Sep 2020 14:58:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365042 - head/usr.sbin/ctld X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/usr.sbin/ctld X-SVN-Commit-Revision: 365042 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 14:58:57 -0000 Author: trasz Date: Tue Sep 1 14:58:57 2020 New Revision: 365042 URL: https://svnweb.freebsd.org/changeset/base/365042 Log: Make sure not to pass NULL to strtoul(3). The values come from the kernel, but let's try to be on the safe side. Reviewed by: mav MFC after: 2 weeks Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D26246 Modified: head/usr.sbin/ctld/kernel.c Modified: head/usr.sbin/ctld/kernel.c ============================================================================== --- head/usr.sbin/ctld/kernel.c Tue Sep 1 14:52:39 2020 (r365041) +++ head/usr.sbin/ctld/kernel.c Tue Sep 1 14:58:57 2020 (r365042) @@ -238,10 +238,16 @@ cctl_end_element(void *user_data, const char *name) cur_lun->backend_type = str; str = NULL; } else if (strcmp(name, "lun_type") == 0) { + if (str == NULL) + log_errx(1, "%s: %s missing its argument", __func__, name); cur_lun->device_type = strtoull(str, NULL, 0); } else if (strcmp(name, "size") == 0) { + if (str == NULL) + log_errx(1, "%s: %s missing its argument", __func__, name); cur_lun->size_blocks = strtoull(str, NULL, 0); } else if (strcmp(name, "blocksize") == 0) { + if (str == NULL) + log_errx(1, "%s: %s missing its argument", __func__, name); cur_lun->blocksize = strtoul(str, NULL, 0); } else if (strcmp(name, "serial_number") == 0) { cur_lun->serial_number = str; @@ -357,15 +363,23 @@ cctl_end_pelement(void *user_data, const char *name) cur_port->port_name = str; str = NULL; } else if (strcmp(name, "physical_port") == 0) { + if (str == NULL) + log_errx(1, "%s: %s missing its argument", __func__, name); cur_port->pp = strtoul(str, NULL, 0); } else if (strcmp(name, "virtual_port") == 0) { + if (str == NULL) + log_errx(1, "%s: %s missing its argument", __func__, name); cur_port->vp = strtoul(str, NULL, 0); } else if (strcmp(name, "cfiscsi_target") == 0) { cur_port->cfiscsi_target = str; str = NULL; } else if (strcmp(name, "cfiscsi_state") == 0) { + if (str == NULL) + log_errx(1, "%s: %s missing its argument", __func__, name); cur_port->cfiscsi_state = strtoul(str, NULL, 0); } else if (strcmp(name, "cfiscsi_portal_group_tag") == 0) { + if (str == NULL) + log_errx(1, "%s: %s missing its argument", __func__, name); cur_port->cfiscsi_portal_group_tag = strtoul(str, NULL, 0); } else if (strcmp(name, "ctld_portal_group_name") == 0) { cur_port->ctld_portal_group_name = str; From owner-svn-src-all@freebsd.org Tue Sep 1 15:14:13 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B386D3CB756; Tue, 1 Sep 2020 15:14:13 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgrFd4Kqwz4fcV; Tue, 1 Sep 2020 15:14:13 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 780511B1FF; Tue, 1 Sep 2020 15:14:13 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081FED3j093442; Tue, 1 Sep 2020 15:14:13 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081FEDW3093441; Tue, 1 Sep 2020 15:14:13 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009011514.081FEDW3093441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 1 Sep 2020 15:14:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365043 - head/usr.sbin/pw X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/usr.sbin/pw X-SVN-Commit-Revision: 365043 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 15:14:13 -0000 Author: markj Date: Tue Sep 1 15:14:13 2020 New Revision: 365043 URL: https://svnweb.freebsd.org/changeset/base/365043 Log: pw: Fix terminal handling when setting a group password. Reported by: Coverity MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Modified: head/usr.sbin/pw/pw_group.c Modified: head/usr.sbin/pw/pw_group.c ============================================================================== --- head/usr.sbin/pw/pw_group.c Tue Sep 1 14:58:57 2020 (r365042) +++ head/usr.sbin/pw/pw_group.c Tue Sep 1 15:14:13 2020 (r365043) @@ -66,13 +66,18 @@ grp_set_passwd(struct group *grp, bool update, int fd, } if ((istty = isatty(fd))) { - n = t; - /* Disable echo */ - n.c_lflag &= ~(ECHO); - tcsetattr(fd, TCSANOW, &n); - printf("%sassword for group %s:", update ? "New p" : "P", - grp->gr_name); - fflush(stdout); + if (tcgetattr(fd, &t) == -1) + istty = 0; + else { + n = t; + /* Disable echo */ + n.c_lflag &= ~(ECHO); + tcsetattr(fd, TCSANOW, &n); + printf("%sassword for group %s:", + update ? "New p" : "P", + grp->gr_name); + fflush(stdout); + } } b = read(fd, line, sizeof(line) - 1); if (istty) { /* Restore state */ From owner-svn-src-all@freebsd.org Tue Sep 1 15:14:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 353D83CB99D; Tue, 1 Sep 2020 15:14:27 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgrFt6cm8z4fTw; Tue, 1 Sep 2020 15:14:26 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7BB51B615; Tue, 1 Sep 2020 15:14:26 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081FEQ5r093493; Tue, 1 Sep 2020 15:14:26 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081FEQHX093492; Tue, 1 Sep 2020 15:14:26 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009011514.081FEQHX093492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 1 Sep 2020 15:14:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365044 - head/usr.sbin/pw X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/usr.sbin/pw X-SVN-Commit-Revision: 365044 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 15:14:27 -0000 Author: markj Date: Tue Sep 1 15:14:26 2020 New Revision: 365044 URL: https://svnweb.freebsd.org/changeset/base/365044 Log: pw: Remove unnecessary errp checks. The caller-supplied pointer is unconditionally dereferenced at the beginning of the function, so there is no point in comparing it with NULL thereafter. Reported by: Coverity MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Modified: head/usr.sbin/pw/strtounum.c Modified: head/usr.sbin/pw/strtounum.c ============================================================================== --- head/usr.sbin/pw/strtounum.c Tue Sep 1 15:14:13 2020 (r365043) +++ head/usr.sbin/pw/strtounum.c Tue Sep 1 15:14:26 2020 (r365044) @@ -44,28 +44,24 @@ strtounum(const char * __restrict np, uintmax_t minval *errpp = NULL; if (minval > maxval) { errno = EINVAL; - if (errpp != NULL) - *errpp = "invalid"; + *errpp = "invalid"; return (0); } errno = 0; ret = strtoumax(np, &endp, 10); if (endp == np || *endp != '\0') { errno = EINVAL; - if (errpp != NULL) - *errpp = "invalid"; + *errpp = "invalid"; return (0); } if (ret < minval) { errno = ERANGE; - if (errpp != NULL) - *errpp = "too small"; + *errpp = "too small"; return (0); } if (errno == ERANGE || ret > maxval) { errno = ERANGE; - if (errpp != NULL) - *errpp = "too large"; + *errpp = "too large"; return (0); } return (ret); From owner-svn-src-all@freebsd.org Tue Sep 1 15:14:51 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E53B93CB771; Tue, 1 Sep 2020 15:14:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgrGM5pPxz4fVk; Tue, 1 Sep 2020 15:14:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA70E1B33D; Tue, 1 Sep 2020 15:14:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081FEp1Y093553; Tue, 1 Sep 2020 15:14:51 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081FEp2Q093552; Tue, 1 Sep 2020 15:14:51 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009011514.081FEp2Q093552@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 1 Sep 2020 15:14:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365045 - head/usr.sbin/pw X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/usr.sbin/pw X-SVN-Commit-Revision: 365045 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 15:14:52 -0000 Author: markj Date: Tue Sep 1 15:14:51 2020 New Revision: 365045 URL: https://svnweb.freebsd.org/changeset/base/365045 Log: pw: Fix a resource leak. Reported by: Coverity MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Modified: head/usr.sbin/pw/rm_r.c Modified: head/usr.sbin/pw/rm_r.c ============================================================================== --- head/usr.sbin/pw/rm_r.c Tue Sep 1 15:14:26 2020 (r365044) +++ head/usr.sbin/pw/rm_r.c Tue Sep 1 15:14:51 2020 (r365045) @@ -57,6 +57,10 @@ rm_r(int rootfd, const char *path, uid_t uid) } d = fdopendir(dirfd); + if (d == NULL) { + (void)close(dirfd); + return; + } while ((e = readdir(d)) != NULL) { if (strcmp(e->d_name, ".") == 0 || strcmp(e->d_name, "..") == 0) continue; From owner-svn-src-all@freebsd.org Tue Sep 1 15:15:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0426B3CB7F0; Tue, 1 Sep 2020 15:15:10 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgrGj6N7Gz4fhm; Tue, 1 Sep 2020 15:15:09 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE1211B700; Tue, 1 Sep 2020 15:15:09 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081FF9Vt093623; Tue, 1 Sep 2020 15:15:09 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081FF9DX093622; Tue, 1 Sep 2020 15:15:09 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009011515.081FF9DX093622@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 1 Sep 2020 15:15:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365046 - head/usr.sbin/pw X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/usr.sbin/pw X-SVN-Commit-Revision: 365046 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 15:15:10 -0000 Author: markj Date: Tue Sep 1 15:15:09 2020 New Revision: 365046 URL: https://svnweb.freebsd.org/changeset/base/365046 Log: pw: Handle errors from ftell() when removing records from /etc/opiekeys. Reported by: Coverity MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Modified: head/usr.sbin/pw/pw_user.c Modified: head/usr.sbin/pw/pw_user.c ============================================================================== --- head/usr.sbin/pw/pw_user.c Tue Sep 1 15:14:51 2020 (r365045) +++ head/usr.sbin/pw/pw_user.c Tue Sep 1 15:15:09 2020 (r365046) @@ -712,24 +712,24 @@ rmopie(char const * name) { char tmp[1014]; FILE *fp; - int fd; size_t len; - off_t atofs = 0; - + long atofs; + int fd; + if ((fd = openat(conf.rootfd, "etc/opiekeys", O_RDWR)) == -1) return; fp = fdopen(fd, "r+"); len = strlen(name); - while (fgets(tmp, sizeof(tmp), fp) != NULL) { + for (atofs = 0; fgets(tmp, sizeof(tmp), fp) != NULL && atofs >= 0; + atofs = ftell(fp)) { if (strncmp(name, tmp, len) == 0 && tmp[len]==' ') { /* Comment username out */ if (fseek(fp, atofs, SEEK_SET) == 0) fwrite("#", 1, 1, fp); break; } - atofs = ftell(fp); } /* * If we got an error of any sort, don't update! From owner-svn-src-all@freebsd.org Tue Sep 1 15:15:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ED6583CBB10; Tue, 1 Sep 2020 15:15:22 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgrGy5VNqz4fyl; Tue, 1 Sep 2020 15:15:22 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D6171B5F6; Tue, 1 Sep 2020 15:15:22 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081FFMCI093674; Tue, 1 Sep 2020 15:15:22 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081FFMbx093673; Tue, 1 Sep 2020 15:15:22 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009011515.081FFMbx093673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 1 Sep 2020 15:15:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365047 - head/cddl/lib/libdtrace X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/cddl/lib/libdtrace X-SVN-Commit-Revision: 365047 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 15:15:23 -0000 Author: markj Date: Tue Sep 1 15:15:22 2020 New Revision: 365047 URL: https://svnweb.freebsd.org/changeset/base/365047 Log: Correct the D definition for EINTEGRITY. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Modified: head/cddl/lib/libdtrace/errno.d Modified: head/cddl/lib/libdtrace/errno.d ============================================================================== --- head/cddl/lib/libdtrace/errno.d Tue Sep 1 15:15:09 2020 (r365046) +++ head/cddl/lib/libdtrace/errno.d Tue Sep 1 15:15:22 2020 (r365047) @@ -225,7 +225,7 @@ inline int ENOTRECOVERABLE = 95; #pragma D binding "1.13" ENOTRECOVERABLE inline int EOWNERDEAD = 96; #pragma D binding "1.13" EOWNERDEAD -inline int EINTEGRITY = 96; +inline int EINTEGRITY = 97; #pragma D binding "1.13" EINTEGRITY inline int ELAST = 97; #pragma D binding "1.0" ELAST From owner-svn-src-all@freebsd.org Tue Sep 1 15:15:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 35A493CBC0B; Tue, 1 Sep 2020 15:15:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgrHP0h4Pz4g9g; Tue, 1 Sep 2020 15:15:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EEE531B4B9; Tue, 1 Sep 2020 15:15:44 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081FFiOi093731; Tue, 1 Sep 2020 15:15:44 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081FFiEP093730; Tue, 1 Sep 2020 15:15:44 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009011515.081FFiEP093730@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 1 Sep 2020 15:15:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365048 - head/sys/cddl/dev/dtrace/amd64 X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/cddl/dev/dtrace/amd64 X-SVN-Commit-Revision: 365048 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 15:15:45 -0000 Author: markj Date: Tue Sep 1 15:15:44 2020 New Revision: 365048 URL: https://svnweb.freebsd.org/changeset/base/365048 Log: Tighten frame pointer checking in DTrace's amd64 stack unwinder. Avoid assuming that the kernel was compiled with -fno-omit-frame-pointer. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_isa.c Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_isa.c ============================================================================== --- head/sys/cddl/dev/dtrace/amd64/dtrace_isa.c Tue Sep 1 15:15:22 2020 (r365047) +++ head/sys/cddl/dev/dtrace/amd64/dtrace_isa.c Tue Sep 1 15:15:44 2020 (r365048) @@ -56,6 +56,7 @@ void dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes, uint32_t *intrpc) { + struct thread *td; int depth = 0; register_t rbp; struct amd64_frame *frame; @@ -70,10 +71,16 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in __asm __volatile("movq %%rbp,%0" : "=r" (rbp)); frame = (struct amd64_frame *)rbp; + td = curthread; while (depth < pcstack_limit) { if (!INKERNEL((long) frame)) break; + if ((vm_offset_t)frame >= + td->td_kstack + ptoa(td->td_kstack_pages) || + (vm_offset_t)frame < td->td_kstack) + break; + callpc = frame->f_retaddr; if (!INKERNEL(callpc)) @@ -84,14 +91,11 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in if ((aframes == 0) && (caller != 0)) { pcstack[depth++] = caller; } - } - else { + } else { pcstack[depth++] = callpc; } - if (frame->f_frame <= frame || - (vm_offset_t)frame->f_frame >= curthread->td_kstack + - curthread->td_kstack_pages * PAGE_SIZE) + if ((vm_offset_t)frame->f_frame <= (vm_offset_t)frame) break; frame = frame->f_frame; } From owner-svn-src-all@freebsd.org Tue Sep 1 15:30:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3FC053CC370; Tue, 1 Sep 2020 15:30:41 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgrcd0pq7z3SNj; Tue, 1 Sep 2020 15:30:41 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 004AE1B913; Tue, 1 Sep 2020 15:30:41 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081FUeVt001555; Tue, 1 Sep 2020 15:30:40 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081FUeZW001554; Tue, 1 Sep 2020 15:30:40 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202009011530.081FUeZW001554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 1 Sep 2020 15:30:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365049 - head/share/man/man7 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/share/man/man7 X-SVN-Commit-Revision: 365049 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 15:30:41 -0000 Author: emaste Date: Tue Sep 1 15:30:40 2020 New Revision: 365049 URL: https://svnweb.freebsd.org/changeset/base/365049 Log: release.7: update for current context It's no longer unusual to be able to build a release with a single command, so drop "actually" that hints at a surprise. Also just use "network install directory" instead of referencing FTP; it's more likely to be HTTP now. Reviewed by: gjb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26260 Modified: head/share/man/man7/release.7 Modified: head/share/man/man7/release.7 ============================================================================== --- head/share/man/man7/release.7 Tue Sep 1 15:15:44 2020 (r365048) +++ head/share/man/man7/release.7 Tue Sep 1 15:30:40 2020 (r365049) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 16, 2020 +.Dd September 1, 2020 .Dt RELEASE 7 .Os .Sh NAME @@ -40,9 +40,9 @@ All of the tools necessary to build a release are avai .Fx source code repository in .Pa src/release . -A complete release can actually be built with only a single command, +A complete release can be built with only a single command, including the creation of ISO images suitable for burning to CD-ROM, -memory stick images, and an FTP install directory. +memory stick images, and a network install directory. This command is aptly named .Dq Li "make release" . .Pp @@ -96,7 +96,7 @@ assurance, or other aspects of the release engineering .Sh CLEAN RELEASE GENERATION Official releases of .Fx -are produced in a totally clean environment to +are produced in a clean environment to ensure consistency between the versions of the src, ports, and doc trees and to avoid contamination from the host system .Po such as local patches, changes From owner-svn-src-all@freebsd.org Tue Sep 1 15:33:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A02BE3CC16F; Tue, 1 Sep 2020 15:33:58 +0000 (UTC) (envelope-from takawata@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgrhQ3mGxz3TKf; Tue, 1 Sep 2020 15:33:58 +0000 (UTC) (envelope-from takawata@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 647CF1B7B3; Tue, 1 Sep 2020 15:33:58 +0000 (UTC) (envelope-from takawata@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081FXw87007090; Tue, 1 Sep 2020 15:33:58 GMT (envelope-from takawata@FreeBSD.org) Received: (from takawata@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081FXwaJ007089; Tue, 1 Sep 2020 15:33:58 GMT (envelope-from takawata@FreeBSD.org) Message-Id: <202009011533.081FXwaJ007089@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: takawata set sender to takawata@FreeBSD.org using -f From: Takanori Watanabe Date: Tue, 1 Sep 2020 15:33:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365050 - head/sys/dev/intel X-SVN-Group: head X-SVN-Commit-Author: takawata X-SVN-Commit-Paths: head/sys/dev/intel X-SVN-Commit-Revision: 365050 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 15:33:58 -0000 Author: takawata Date: Tue Sep 1 15:33:57 2020 New Revision: 365050 URL: https://svnweb.freebsd.org/changeset/base/365050 Log: Add Cannon Point PCH Thermal Controller Device ID. PR: 249047 Reported by: Dries Michiels --This line, and those below, will be ignored-- > Description of fields to fill in above: 76 columns --| > PR: If and which Problem Report is related. > Submitted by: If someone else sent in the change. > Reported by: If someone else reported the issue. > Reviewed by: If someone else reviewed your modification. > Approved by: If you needed approval for this commit. > Obtained from: If the change is from a third party. > MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. > MFH: Ports tree branch name. Request approval for merge. > Relnotes: Set to 'yes' for mention in release notes. > Security: Vulnerability reference (one per line) or description. > Sponsored by: If the change was sponsored by an organization (each collaborator). > Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed). > Empty fields above will be automatically removed. M pchtherm.c Modified: head/sys/dev/intel/pchtherm.c Modified: head/sys/dev/intel/pchtherm.c ============================================================================== --- head/sys/dev/intel/pchtherm.c Tue Sep 1 15:30:40 2020 (r365049) +++ head/sys/dev/intel/pchtherm.c Tue Sep 1 15:33:57 2020 (r365050) @@ -95,6 +95,8 @@ static const struct pci_device_table pchtherm_devices[ PCI_DESCR("Skylake PCH Thermal Subsystem")}, { PCI_DEV(0x8086, 0xa131), PCI_DESCR("Skylake PCH 100 Thermal Subsystem")}, + { PCI_DEV(0x8086, 0x9df9), + PCI_DESCR("Cannon Lake PCH Thermal Controller")}, }; static int pchtherm_probe(device_t dev) From owner-svn-src-all@freebsd.org Tue Sep 1 15:52:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E74F33CCAFB; Tue, 1 Sep 2020 15:52:18 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgs5Z5t2yz3VQM; Tue, 1 Sep 2020 15:52:18 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD0A81BE94; Tue, 1 Sep 2020 15:52:18 +0000 (UTC) (envelope-from vangyzen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081FqIDc019436; Tue, 1 Sep 2020 15:52:18 GMT (envelope-from vangyzen@FreeBSD.org) Received: (from vangyzen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081FqIXK019435; Tue, 1 Sep 2020 15:52:18 GMT (envelope-from vangyzen@FreeBSD.org) Message-Id: <202009011552.081FqIXK019435@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vangyzen set sender to vangyzen@FreeBSD.org using -f From: Eric van Gyzen Date: Tue, 1 Sep 2020 15:52:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365051 - head/usr.sbin/pmc X-SVN-Group: head X-SVN-Commit-Author: vangyzen X-SVN-Commit-Paths: head/usr.sbin/pmc X-SVN-Commit-Revision: 365051 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 15:52:19 -0000 Author: vangyzen Date: Tue Sep 1 15:52:18 2020 New Revision: 365051 URL: https://svnweb.freebsd.org/changeset/base/365051 Log: pmc: Fix freed internal location read Coverity detected this error. The fix duplicates the assignment on line 171. Submitted by: bret_ketchum@dell.com Reported by: Coverity MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D26227 Modified: head/usr.sbin/pmc/cmd_pmc_summary.cc Modified: head/usr.sbin/pmc/cmd_pmc_summary.cc ============================================================================== --- head/usr.sbin/pmc/cmd_pmc_summary.cc Tue Sep 1 15:33:57 2020 (r365050) +++ head/usr.sbin/pmc/cmd_pmc_summary.cc Tue Sep 1 15:52:18 2020 (r365051) @@ -156,7 +156,7 @@ pmc_summary_handler(int logfd, int k, bool do_full) auto rate = ratemap[kv.first]; std::cout << "idx: " << kv.first << " name: " << name << " rate: " << rate << std::endl; while (!kv.second.empty()) { - auto &val = kv.second.back(); + auto val = kv.second.back(); kv.second.pop_back(); std::cout << val.second << ": " << val.first << std::endl; } From owner-svn-src-all@freebsd.org Tue Sep 1 16:11:24 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20F3F3CD5C3; Tue, 1 Sep 2020 16:11:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgsWc05tSz3WR7; Tue, 1 Sep 2020 16:11:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DAD981C124; Tue, 1 Sep 2020 16:11:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081GBN9d025987; Tue, 1 Sep 2020 16:11:23 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081GBN9M025984; Tue, 1 Sep 2020 16:11:23 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009011611.081GBN9M025984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 1 Sep 2020 16:11:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365052 - head/usr.bin/script X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/usr.bin/script X-SVN-Commit-Revision: 365052 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:11:24 -0000 Author: imp Date: Tue Sep 1 16:11:23 2020 New Revision: 365052 URL: https://svnweb.freebsd.org/changeset/base/365052 Log: Have script accept and ignore -e for Linux compat In the util-linux version of script, it will always exit with succes. Except when run with -e, in which case it will have the exit value of the child. BSD Script already uses the child's exit value for its exit value. Some config and other helper scripts depend on being able to specify -e. Accept it for compatibility since we'll already to the right thing, but otherwise we ignore it. Modified: head/usr.bin/script/script.1 head/usr.bin/script/script.c Modified: head/usr.bin/script/script.1 ============================================================================== --- head/usr.bin/script/script.1 Tue Sep 1 15:52:18 2020 (r365051) +++ head/usr.bin/script/script.1 Tue Sep 1 16:11:23 2020 (r365052) @@ -36,7 +36,7 @@ .Nd make typescript of terminal session .Sh SYNOPSIS .Nm -.Op Fl adfkpqr +.Op Fl adefkpqr .Op Fl F Ar pipe .Op Fl t Ar time .Op Ar file Op Ar command ... @@ -77,6 +77,12 @@ retaining the prior contents. When playing back a session with the .Fl p flag, do not sleep between records when playing back a timestamped session. +.It Fl e +Accepted for compatibility with +.Em util-linux +.Nm . +The child command exit status is always the exit status of +.Nm . .It Fl F Ar pipe Immediately flush output after each write. This will allow a user to create a named pipe using Modified: head/usr.bin/script/script.c ============================================================================== --- head/usr.bin/script/script.c Tue Sep 1 15:52:18 2020 (r365051) +++ head/usr.bin/script/script.c Tue Sep 1 16:11:23 2020 (r365052) @@ -111,13 +111,15 @@ main(int argc, char *argv[]) warning. (not needed w/clang) */ showexit = 0; - while ((ch = getopt(argc, argv, "adFfkpqrt:")) != -1) + while ((ch = getopt(argc, argv, "adeFfkpqrt:")) != -1) switch(ch) { case 'a': aflg = 1; break; case 'd': usesleep = 0; + break; + case 'e': /* Default behaior, accepted for linux compat */ break; case 'F': Fflg = 1; From owner-svn-src-all@freebsd.org Tue Sep 1 16:13:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 676D93CDB08; Tue, 1 Sep 2020 16:13:10 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgsYf27c6z3XBQ; Tue, 1 Sep 2020 16:13:10 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D2971BEEC; Tue, 1 Sep 2020 16:13:10 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081GDAJM031453; Tue, 1 Sep 2020 16:13:10 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081GDAfC031452; Tue, 1 Sep 2020 16:13:10 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009011613.081GDAfC031452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 1 Sep 2020 16:13:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365053 - head/usr.bin/script X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/usr.bin/script X-SVN-Commit-Revision: 365053 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:13:10 -0000 Author: imp Date: Tue Sep 1 16:13:09 2020 New Revision: 365053 URL: https://svnweb.freebsd.org/changeset/base/365053 Log: Bump date for r365052 Modified: head/usr.bin/script/script.1 Modified: head/usr.bin/script/script.1 ============================================================================== --- head/usr.bin/script/script.1 Tue Sep 1 16:11:23 2020 (r365052) +++ head/usr.bin/script/script.1 Tue Sep 1 16:13:09 2020 (r365053) @@ -28,7 +28,7 @@ .\" @(#)script.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd December 4, 2013 +.Dd September 1, 2020 .Dt SCRIPT 1 .Os .Sh NAME From owner-svn-src-all@freebsd.org Tue Sep 1 16:17:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D5DC3CD9BE; Tue, 1 Sep 2020 16:17:22 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgsfV2BLKz3XNX; Tue, 1 Sep 2020 16:17:22 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2E70F1C136; Tue, 1 Sep 2020 16:17:22 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081GHMWx031674; Tue, 1 Sep 2020 16:17:22 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081GHL8e031671; Tue, 1 Sep 2020 16:17:21 GMT (envelope-from mw@FreeBSD.org) Message-Id: <202009011617.081GHL8e031671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Tue, 1 Sep 2020 16:17:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365054 - in head/sys: conf dev/sdhci X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: in head/sys: conf dev/sdhci X-SVN-Commit-Revision: 365054 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:17:22 -0000 Author: mw Date: Tue Sep 1 16:17:21 2020 New Revision: 365054 URL: https://svnweb.freebsd.org/changeset/base/365054 Log: Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs Implement support for an eSDHC controller found in NXP QorIQ Layerscape SoCs. This driver has been tested with NXP LS1046A and LX2160A (Honeycomb board), which is incompatible with the existing sdhci_fsl driver (aiming at older chips from this family). As such, it is not intended as replacement for the old driver, but rather serves as an improved alternative for SoCs that support it. It comes with support for both PIO and Single DMA modes and samples the clock from the extres clk API. Submitted by: Artur Rojek Reviewed by: manu, mmel, kibab Obtained from: Semihalf Sponsored by: Alstom Group Differential Revision: https://reviews.freebsd.org/D26153 Added: head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed) Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Sep 1 16:13:09 2020 (r365053) +++ head/sys/conf/files Tue Sep 1 16:17:21 2020 (r365054) @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optional scc dev/sdhci/sdhci.c optional sdhci dev/sdhci/sdhci_fdt.c optional sdhci fdt dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio +dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio dev/sdhci/sdhci_if.m optional sdhci dev/sdhci/sdhci_acpi.c optional sdhci acpi dev/sdhci/sdhci_pci.c optional sdhci pci Added: head/sys/dev/sdhci/sdhci_fsl_fdt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/sdhci/sdhci_fsl_fdt.c Tue Sep 1 16:17:21 2020 (r365054) @@ -0,0 +1,680 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2020 Alstom Group. + * Copyright (c) 2020 Semihalf. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* eSDHC controller driver for NXP QorIQ Layerscape SoCs. */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "mmcbr_if.h" +#include "sdhci_if.h" + +#define RD4 (sc->read) +#define WR4 (sc->write) + +#define SDHCI_FSL_PRES_STATE 0x24 +#define SDHCI_FSL_PRES_SDSTB (1 << 3) +#define SDHCI_FSL_PRES_COMPAT_MASK 0x000f0f07 + +#define SDHCI_FSL_PROT_CTRL 0x28 +#define SDHCI_FSL_PROT_CTRL_WIDTH_1BIT (0 << 1) +#define SDHCI_FSL_PROT_CTRL_WIDTH_4BIT (1 << 1) +#define SDHCI_FSL_PROT_CTRL_WIDTH_8BIT (2 << 1) +#define SDHCI_FSL_PROT_CTRL_WIDTH_MASK (3 << 1) +#define SDHCI_FSL_PROT_CTRL_BYTE_SWAP (0 << 4) +#define SDHCI_FSL_PROT_CTRL_BYTE_NATIVE (2 << 4) +#define SDHCI_FSL_PROT_CTRL_BYTE_MASK (3 << 4) +#define SDHCI_FSL_PROT_CTRL_DMA_MASK (3 << 8) + +#define SDHCI_FSL_SYS_CTRL 0x2c +#define SDHCI_FSL_CLK_IPGEN (1 << 0) +#define SDHCI_FSL_CLK_SDCLKEN (1 << 3) +#define SDHCI_FSL_CLK_DIVIDER_MASK 0x000000f0 +#define SDHCI_FSL_CLK_DIVIDER_SHIFT 4 +#define SDHCI_FSL_CLK_PRESCALE_MASK 0x0000ff00 +#define SDHCI_FSL_CLK_PRESCALE_SHIFT 8 + +#define SDHCI_FSL_WTMK_LVL 0x44 +#define SDHCI_FSL_WTMK_RD_512B (0 << 0) +#define SDHCI_FSL_WTMK_WR_512B (0 << 15) + +#define SDHCI_FSL_HOST_VERSION 0xfc +#define SDHCI_FSL_CAPABILITIES2 0x114 + +#define SDHCI_FSL_ESDHC_CTRL 0x40c +#define SDHCI_FSL_ESDHC_CTRL_SNOOP (1 << 6) +#define SDHCI_FSL_ESDHC_CTRL_CLK_DIV2 (1 << 19) + +struct sdhci_fsl_fdt_softc { + device_t dev; + const struct sdhci_fsl_fdt_soc_data *soc_data; + struct resource *mem_res; + struct resource *irq_res; + void *irq_cookie; + uint32_t baseclk_hz; + struct sdhci_fdt_gpio *gpio; + struct sdhci_slot slot; + bool slot_init_done; + uint32_t cmd_and_mode; + uint16_t sdclk_bits; + + uint32_t (* read)(struct sdhci_fsl_fdt_softc *, bus_size_t); + void (* write)(struct sdhci_fsl_fdt_softc *, bus_size_t, uint32_t); +}; + +struct sdhci_fsl_fdt_soc_data { + int quirks; +}; + +static const struct sdhci_fsl_fdt_soc_data sdhci_fsl_fdt_ls1046a_soc_data = { + .quirks = SDHCI_QUIRK_DONT_SET_HISPD_BIT | SDHCI_QUIRK_BROKEN_AUTO_STOP +}; + +static const struct sdhci_fsl_fdt_soc_data sdhci_fsl_fdt_gen_data = { + .quirks = 0, +}; + +static const struct ofw_compat_data sdhci_fsl_fdt_compat_data[] = { + {"fsl,ls1046a-esdhc", (uintptr_t)&sdhci_fsl_fdt_ls1046a_soc_data}, + {"fsl,esdhc", (uintptr_t)&sdhci_fsl_fdt_gen_data}, + {NULL, 0} +}; + +static uint32_t +read_be(struct sdhci_fsl_fdt_softc *sc, bus_size_t off) +{ + + return (be32toh(bus_read_4(sc->mem_res, off))); +} + +static void +write_be(struct sdhci_fsl_fdt_softc *sc, bus_size_t off, uint32_t val) +{ + + bus_write_4(sc->mem_res, off, htobe32(val)); +} + +static uint32_t +read_le(struct sdhci_fsl_fdt_softc *sc, bus_size_t off) +{ + + return (bus_read_4(sc->mem_res, off)); +} + +static void +write_le(struct sdhci_fsl_fdt_softc *sc, bus_size_t off, uint32_t val) +{ + + bus_write_4(sc->mem_res, off, val); +} + + +static uint16_t +sdhci_fsl_fdt_get_clock(struct sdhci_fsl_fdt_softc *sc) +{ + uint16_t val; + + val = sc->sdclk_bits | SDHCI_CLOCK_INT_EN; + if (RD4(sc, SDHCI_FSL_PRES_STATE) & SDHCI_FSL_PRES_SDSTB) + val |= SDHCI_CLOCK_INT_STABLE; + if (RD4(sc, SDHCI_FSL_SYS_CTRL) & SDHCI_FSL_CLK_SDCLKEN) + val |= SDHCI_CLOCK_CARD_EN; + + return (val); +} + +static void +fsl_sdhc_fdt_set_clock(struct sdhci_fsl_fdt_softc *sc, uint16_t val) +{ + uint32_t div, freq, prescale, val32; + + sc->sdclk_bits = val & SDHCI_DIVIDERS_MASK; + val32 = RD4(sc, SDHCI_CLOCK_CONTROL); + + if ((val & SDHCI_CLOCK_CARD_EN) == 0) { + WR4(sc, SDHCI_CLOCK_CONTROL, val32 & ~SDHCI_FSL_CLK_SDCLKEN); + return; + } + + div = ((val >> SDHCI_DIVIDER_SHIFT) & SDHCI_DIVIDER_MASK) | + ((val >> SDHCI_DIVIDER_HI_SHIFT) & SDHCI_DIVIDER_HI_MASK) << + SDHCI_DIVIDER_MASK_LEN; + if (div == 0) + freq = sc->baseclk_hz; + else + freq = sc->baseclk_hz / (2 * div); + + for (prescale = 2; freq < sc->baseclk_hz / (prescale * 16); ) + prescale <<= 1; + for (div = 1; freq < sc->baseclk_hz / (prescale * div); ) + ++div; + +#ifdef DEBUG + device_printf(sc->dev, + "Desired SD/MMC freq: %d, actual: %d; base %d prescale %d divisor %d\n", + freq, sc->baseclk_hz / (prescale * div), + sc->baseclk_hz, prescale, div); +#endif + + prescale >>= 1; + div -= 1; + + val32 &= ~(SDHCI_FSL_CLK_DIVIDER_MASK | SDHCI_FSL_CLK_PRESCALE_MASK); + val32 |= div << SDHCI_FSL_CLK_DIVIDER_SHIFT; + val32 |= prescale << SDHCI_FSL_CLK_PRESCALE_SHIFT; + val32 |= SDHCI_FSL_CLK_IPGEN | SDHCI_FSL_CLK_SDCLKEN; + WR4(sc, SDHCI_CLOCK_CONTROL, val32); +} + +static uint8_t +sdhci_fsl_fdt_read_1(device_t dev, struct sdhci_slot *slot, bus_size_t off) +{ + struct sdhci_fsl_fdt_softc *sc; + uint32_t wrk32, val32; + + sc = device_get_softc(dev); + + switch (off) { + case SDHCI_HOST_CONTROL: + wrk32 = RD4(sc, SDHCI_FSL_PROT_CTRL); + val32 = wrk32 & (SDHCI_CTRL_LED | SDHCI_CTRL_CARD_DET | + SDHCI_CTRL_FORCE_CARD); + if (wrk32 & SDHCI_FSL_PROT_CTRL_WIDTH_4BIT) + val32 |= SDHCI_CTRL_4BITBUS; + else if (wrk32 & SDHCI_FSL_PROT_CTRL_WIDTH_8BIT) + val32 |= SDHCI_CTRL_8BITBUS; + return (val32); + case SDHCI_POWER_CONTROL: + return (SDHCI_POWER_ON | SDHCI_POWER_300); + default: + break; + } + + return ((RD4(sc, off & ~3) >> (off & 3) * 8) & UINT8_MAX); +} + +static uint16_t +sdhci_fsl_fdt_read_2(device_t dev, struct sdhci_slot *slot, bus_size_t off) +{ + struct sdhci_fsl_fdt_softc *sc; + uint32_t val32; + + sc = device_get_softc(dev); + + switch (off) { + case SDHCI_CLOCK_CONTROL: + return (sdhci_fsl_fdt_get_clock(sc)); + case SDHCI_HOST_VERSION: + return (RD4(sc, SDHCI_FSL_HOST_VERSION) & UINT16_MAX); + case SDHCI_TRANSFER_MODE: + return (sc->cmd_and_mode & UINT16_MAX); + case SDHCI_COMMAND_FLAGS: + return (sc->cmd_and_mode >> 16); + case SDHCI_SLOT_INT_STATUS: + /* + * eSDHC hardware manages only a single slot. + * Synthesize a slot interrupt status register for slot 1 below. + */ + val32 = RD4(sc, SDHCI_INT_STATUS); + val32 &= RD4(sc, SDHCI_SIGNAL_ENABLE); + return (!!val32); + default: + return ((RD4(sc, off & ~3) >> (off & 3) * 8) & UINT16_MAX); + } +} + +static uint32_t +sdhci_fsl_fdt_read_4(device_t dev, struct sdhci_slot *slot, bus_size_t off) +{ + struct sdhci_fsl_fdt_softc *sc; + uint32_t wrk32, val32; + + sc = device_get_softc(dev); + + if (off == SDHCI_BUFFER) + return (bus_read_4(sc->mem_res, off)); + if (off == SDHCI_CAPABILITIES2) + off = SDHCI_FSL_CAPABILITIES2; + + val32 = RD4(sc, off); + + switch (off) { + case SDHCI_CAPABILITIES: + val32 &= ~(SDHCI_CAN_DO_SUSPEND | SDHCI_CAN_VDD_180); + break; + case SDHCI_PRESENT_STATE: + wrk32 = val32; + val32 &= SDHCI_FSL_PRES_COMPAT_MASK; + val32 |= (wrk32 >> 4) & SDHCI_STATE_DAT_MASK; + val32 |= (wrk32 << 1) & SDHCI_STATE_CMD; + break; + default: + break; + } + + return (val32); +} + +static void +sdhci_fsl_fdt_read_multi_4(device_t dev, struct sdhci_slot *slot, bus_size_t off, + uint32_t *data, bus_size_t count) +{ + struct sdhci_fsl_fdt_softc *sc; + + sc = device_get_softc(dev); + bus_read_multi_4(sc->mem_res, off, data, count); +} + +static void +sdhci_fsl_fdt_write_1(device_t dev, struct sdhci_slot *slot, bus_size_t off, + uint8_t val) +{ + struct sdhci_fsl_fdt_softc *sc; + uint32_t val32; + + sc = device_get_softc(dev); + + switch (off) { + case SDHCI_HOST_CONTROL: + val32 = RD4(sc, SDHCI_FSL_PROT_CTRL); + val32 &= ~SDHCI_FSL_PROT_CTRL_WIDTH_MASK; + val32 |= (val & SDHCI_CTRL_LED); + + if (val & SDHCI_CTRL_8BITBUS) + val32 |= SDHCI_FSL_PROT_CTRL_WIDTH_8BIT; + else + /* Bus width is 1-bit when this flag is not set. */ + val32 |= (val & SDHCI_CTRL_4BITBUS); + /* Enable SDMA by masking out this field. */ + val32 &= ~SDHCI_FSL_PROT_CTRL_DMA_MASK; + val32 &= ~(SDHCI_CTRL_CARD_DET | SDHCI_CTRL_FORCE_CARD); + val32 |= (val & (SDHCI_CTRL_CARD_DET | + SDHCI_CTRL_FORCE_CARD)); + WR4(sc, SDHCI_FSL_PROT_CTRL, val32); + return; + case SDHCI_POWER_CONTROL: + return; + case SDHCI_SOFTWARE_RESET: + val &= ~SDHCI_RESET_ALL; + /* FALLTHROUGH. */ + default: + val32 = RD4(sc, off & ~3); + val32 &= ~(UINT8_MAX << (off & 3) * 8); + val32 |= (val << (off & 3) * 8); + WR4(sc, off & ~3, val32); + return; + } +} + +static void +sdhci_fsl_fdt_write_2(device_t dev, struct sdhci_slot *slot, bus_size_t off, + uint16_t val) +{ + struct sdhci_fsl_fdt_softc *sc; + uint32_t val32; + + sc = device_get_softc(dev); + + switch (off) { + case SDHCI_CLOCK_CONTROL: + fsl_sdhc_fdt_set_clock(sc, val); + return; + /* + * eSDHC hardware combines command and mode into a single + * register. Cache it here, so that command isn't written + * until after mode. + */ + case SDHCI_TRANSFER_MODE: + sc->cmd_and_mode = val; + return; + case SDHCI_COMMAND_FLAGS: + sc->cmd_and_mode = + (sc->cmd_and_mode & UINT16_MAX) | (val << 16); + WR4(sc, SDHCI_TRANSFER_MODE, sc->cmd_and_mode); + sc->cmd_and_mode = 0; + return; + default: + val32 = RD4(sc, off & ~3); + val32 &= ~(UINT16_MAX << (off & 3) * 8); + val32 |= ((val & UINT16_MAX) << (off & 3) * 8); + WR4(sc, off & ~3, val32); + return; + } +} + +static void +sdhci_fsl_fdt_write_4(device_t dev, struct sdhci_slot *slot, bus_size_t off, + uint32_t val) +{ + struct sdhci_fsl_fdt_softc *sc; + + sc = device_get_softc(dev); + + switch (off) { + case SDHCI_BUFFER: + bus_write_4(sc->mem_res, off, val); + return; + /* + * eSDHC hardware lacks support for the SDMA buffer boundary + * feature and instead generates SDHCI_INT_DMA_END interrupts + * after each completed DMA data transfer. + * Since this duplicates the SDHCI_INT_DATA_END functionality, + * mask out the unneeded SDHCI_INT_DMA_END interrupt. + */ + case SDHCI_INT_ENABLE: + case SDHCI_SIGNAL_ENABLE: + val &= ~SDHCI_INT_DMA_END; + /* FALLTHROUGH. */ + default: + WR4(sc, off, val); + return; + } +} + +static void +sdhci_fsl_fdt_write_multi_4(device_t dev, struct sdhci_slot *slot, + bus_size_t off, uint32_t *data, bus_size_t count) +{ + struct sdhci_fsl_fdt_softc *sc; + + sc = device_get_softc(dev); + bus_write_multi_4(sc->mem_res, off, data, count); +} + +static void +sdhci_fsl_fdt_irq(void *arg) +{ + struct sdhci_fsl_fdt_softc *sc; + + sc = arg; + sdhci_generic_intr(&sc->slot); + return; +} + +static int +sdhci_fsl_fdt_get_ro(device_t bus, device_t child) +{ + struct sdhci_fsl_fdt_softc *sc; + + sc = device_get_softc(bus); + return (sdhci_fdt_gpio_get_readonly(sc->gpio)); +} + +static bool +sdhci_fsl_fdt_get_card_present(device_t dev, struct sdhci_slot *slot) +{ + struct sdhci_fsl_fdt_softc *sc; + + sc = device_get_softc(dev); + return (sdhci_fdt_gpio_get_present(sc->gpio)); +} + +static int +sdhci_fsl_fdt_attach(device_t dev) +{ + struct sdhci_fsl_fdt_softc *sc; + uint32_t val, buf_order; + uintptr_t ocd_data; + uint64_t clk_hz; + phandle_t node; + int rid, ret; + clk_t clk; + + node = ofw_bus_get_node(dev); + sc = device_get_softc(dev); + ocd_data = ofw_bus_search_compatible(dev, + sdhci_fsl_fdt_compat_data)->ocd_data; + sc->soc_data = (struct sdhci_fsl_fdt_soc_data *)ocd_data; + sc->dev = dev; + sc->slot.quirks = sc->soc_data->quirks; + + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) { + device_printf(dev, + "Could not allocate resources for controller\n"); + return (ENOMEM); + } + + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->irq_res == NULL) { + device_printf(dev, + "Could not allocate irq resources for controller\n"); + ret = ENOMEM; + goto err_free_mem; + } + + ret = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO | INTR_MPSAFE, + NULL, sdhci_fsl_fdt_irq, sc, &sc->irq_cookie); + if (ret != 0) { + device_printf(dev, "Could not setup IRQ handler\n"); + goto err_free_irq_res; + } + + ret = clk_get_by_ofw_index(dev, node, 0, &clk); + if (ret != 0) { + device_printf(dev, "Parent clock not found\n"); + goto err_free_irq; + } + + ret = clk_get_freq(clk, &clk_hz); + if (ret != 0) { + device_printf(dev, + "Could not get parent clock frequency\n"); + goto err_free_irq; + } + + sc->baseclk_hz = clk_hz / 2; + + /* Figure out eSDHC block endianness before we touch any HW regs. */ + if (OF_hasprop(node, "little-endian")) { + sc->read = read_le; + sc->write = write_le; + buf_order = SDHCI_FSL_PROT_CTRL_BYTE_NATIVE; + } else { + sc->read = read_be; + sc->write = write_be; + buf_order = SDHCI_FSL_PROT_CTRL_BYTE_SWAP; + } + + /* + * Setting this register affects byte order in SDHCI_BUFFER only. + * If the eSDHC block is connected over a big-endian bus, the data + * read from/written to the buffer will be already byte swapped. + * In such a case, setting SDHCI_FSL_PROT_CTRL_BYTE_SWAP will convert + * the byte order again, resulting in a native byte order. + * The read/write callbacks accommodate for this behavior. + */ + val = RD4(sc, SDHCI_FSL_PROT_CTRL); + val &= ~SDHCI_FSL_PROT_CTRL_BYTE_MASK; + WR4(sc, SDHCI_FSL_PROT_CTRL, val | buf_order); + + /* + * Gate the SD clock and set its source to peripheral clock / 2. + * The frequency in baseclk_hz is set to match this. + */ + val = RD4(sc, SDHCI_CLOCK_CONTROL); + WR4(sc, SDHCI_CLOCK_CONTROL, val & ~SDHCI_FSL_CLK_SDCLKEN); + val = RD4(sc, SDHCI_FSL_ESDHC_CTRL); + WR4(sc, SDHCI_FSL_ESDHC_CTRL, val | SDHCI_FSL_ESDHC_CTRL_CLK_DIV2); + sc->slot.max_clk = sc->baseclk_hz; + sc->gpio = sdhci_fdt_gpio_setup(dev, &sc->slot); + + /* + * Set the buffer watermark level to 128 words (512 bytes) for both + * read and write. The hardware has a restriction that when the read or + * write ready status is asserted, that means you can read exactly the + * number of words set in the watermark register before you have to + * re-check the status and potentially wait for more data. The main + * sdhci driver provides no hook for doing status checking on less than + * a full block boundary, so we set the watermark level to be a full + * block. Reads and writes where the block size is less than the + * watermark size will work correctly too, no need to change the + * watermark for different size blocks. However, 128 is the maximum + * allowed for the watermark, so PIO is limitted to 512 byte blocks. + */ + WR4(sc, SDHCI_FSL_WTMK_LVL, SDHCI_FSL_WTMK_WR_512B | + SDHCI_FSL_WTMK_RD_512B); + + ret = sdhci_init_slot(dev, &sc->slot, 0); + if (ret != 0) + goto err_free_gpio; + sc->slot_init_done = true; + sdhci_start_slot(&sc->slot); + + return (bus_generic_attach(dev)); + +err_free_gpio: + sdhci_fdt_gpio_teardown(sc->gpio); +err_free_irq: + bus_teardown_intr(dev, sc->irq_res, sc->irq_cookie); +err_free_irq_res: + bus_free_resource(dev, SYS_RES_IRQ, sc->irq_res); +err_free_mem: + bus_free_resource(dev, SYS_RES_MEMORY, sc->mem_res); + return (ret); +} + +static int +sdhci_fsl_fdt_detach(device_t dev) +{ + struct sdhci_fsl_fdt_softc *sc; + + sc = device_get_softc(dev); + if (sc->slot_init_done) + sdhci_cleanup_slot(&sc->slot); + if (sc->gpio != NULL) + sdhci_fdt_gpio_teardown(sc->gpio); + if (sc->irq_cookie != NULL) + bus_teardown_intr(dev, sc->irq_res, sc->irq_cookie); + if (sc->irq_res != NULL) + bus_free_resource(dev, SYS_RES_IRQ, sc->irq_res); + if (sc->mem_res != NULL) + bus_free_resource(dev, SYS_RES_MEMORY, sc->mem_res); + return (0); +} + +static int +sdhci_fsl_fdt_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (!ofw_bus_search_compatible(dev, + sdhci_fsl_fdt_compat_data)->ocd_data) + return (ENXIO); + + device_set_desc(dev, "NXP QorIQ Layerscape eSDHC controller"); + return (BUS_PROBE_DEFAULT); +} + +static int +sdhci_fsl_fdt_read_ivar(device_t bus, device_t child, int which, + uintptr_t *result) +{ + struct sdhci_slot *slot = device_get_ivars(child); + + if (which == MMCBR_IVAR_MAX_DATA && (slot->opt & SDHCI_HAVE_DMA)) { + /* + * In the absence of SDMA buffer boundary functionality, + * limit the maximum data length per read/write command + * to bounce buffer size. + */ + *result = howmany(slot->sdma_bbufsz, 512); + return (0); + } + return (sdhci_generic_read_ivar(bus, child, which, result)); +} + +static const device_method_t sdhci_fsl_fdt_methods[] = { + /* Device interface. */ + DEVMETHOD(device_probe, sdhci_fsl_fdt_probe), + DEVMETHOD(device_attach, sdhci_fsl_fdt_attach), + DEVMETHOD(device_detach, sdhci_fsl_fdt_detach), + + /* Bus interface. */ + DEVMETHOD(bus_read_ivar, sdhci_fsl_fdt_read_ivar), + DEVMETHOD(bus_write_ivar, sdhci_generic_write_ivar), + + /* MMC bridge interface. */ + DEVMETHOD(mmcbr_update_ios, sdhci_generic_update_ios), + DEVMETHOD(mmcbr_request, sdhci_generic_request), + DEVMETHOD(mmcbr_get_ro, sdhci_fsl_fdt_get_ro), + DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host), + DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host), + + /* SDHCI accessors. */ + DEVMETHOD(sdhci_read_1, sdhci_fsl_fdt_read_1), + DEVMETHOD(sdhci_read_2, sdhci_fsl_fdt_read_2), + DEVMETHOD(sdhci_read_4, sdhci_fsl_fdt_read_4), + DEVMETHOD(sdhci_read_multi_4, sdhci_fsl_fdt_read_multi_4), + DEVMETHOD(sdhci_write_1, sdhci_fsl_fdt_write_1), + DEVMETHOD(sdhci_write_2, sdhci_fsl_fdt_write_2), + DEVMETHOD(sdhci_write_4, sdhci_fsl_fdt_write_4), + DEVMETHOD(sdhci_write_multi_4, sdhci_fsl_fdt_write_multi_4), + DEVMETHOD(sdhci_get_card_present, sdhci_fsl_fdt_get_card_present), + DEVMETHOD_END +}; + +static devclass_t sdhci_fsl_fdt_devclass; +static driver_t sdhci_fsl_fdt_driver = { + "sdhci_fsl_fdt", + sdhci_fsl_fdt_methods, + sizeof(struct sdhci_fsl_fdt_softc), +}; + +DRIVER_MODULE(sdhci_fsl_fdt, simplebus, sdhci_fsl_fdt_driver, + sdhci_fsl_fdt_devclass, NULL, NULL); +SDHCI_DEPEND(sdhci_fsl_fdt); + +#ifndef MMCCAM +MMC_DECLARE_BRIDGE(sdhci_fsl_fdt); +#endif From owner-svn-src-all@freebsd.org Tue Sep 1 16:18:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 409C03CDCCC; Tue, 1 Sep 2020 16:18:25 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgsgh3rsvz3XN0; Tue, 1 Sep 2020 16:18:24 +0000 (UTC) (envelope-from bjkfbsd@gmail.com) Received: by mail-oi1-x22c.google.com with SMTP id x19so1656758oix.3; Tue, 01 Sep 2020 09:18:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=523Y6D+dfQeYbLTxKt6LZBIiWRE+KxKxhuJR63qLaMU=; b=Ipja0d8FzfTWps1Tvr53aS+xmFpJHdTgsABYTNkgR4k5V/9a0MgBDh9Zm5QxZFtZ/J velONlxs9n6EvQmff5/mE7LeRy79dW4YvvgXwEGxfV7HMEIYq+Ehdjc5I/aeNCFogX33 H+wyn+Vb18uN3VGkOc7opVzveDKHFbHFmwY90jaK2UTkQieAc5uQtxm1szkKVhYdRwN8 1bPH5rWRbx6G7Wctb4kFnwb18iR/vYq8vbe2RSeRmZBZxZAwCo4wLmet1ApZ0ZGUeBcl 8MvzYffosexuiBmcxuFFc9bc5OeerkaXu/kGW9wjxQ/QS+j5BbvFaT2SW52vF5qRu05A JQKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=523Y6D+dfQeYbLTxKt6LZBIiWRE+KxKxhuJR63qLaMU=; b=W0RV6oa5HYGDff0db4QVS35Q0ulOf6QXI2lcLOxMZbqUJoGQrQ0q4UIi6BhURJ2siE NDJ34DX7ZkE+aXsJJypzXEK+NjVEFmRz6MiLanCXPi7GIJ0gBxUc8ieD9PoAODMtkctk Oa0aSL7lq5tv2kEON3fl83X1osM0SVLZWKxUR4hnlaaHnZqKvzuddhEB/YbTioc290Eg vy0ZrdsVRYhW6wtqH8T4XijhRaz1H5W4UF/KRRltBf2ILBtLi5xIiyMLT6Hqi6UVLkSC 0MD6d91gB95W1TTfSrHKzI6gQkPklVAvQU5uvHydt6PZUaQoCQ/75rzkGq/kB39vBtVP EKKw== X-Gm-Message-State: AOAM533tVKDwRg6zVlfWAiMSQHxm/C0yQQSb3STub90IKGS2c/+P3TBT p3hoFmBZ8ipAXrsUD9xo+l0kGobFk8wNu9uXN3xd1AQJBR8= X-Google-Smtp-Source: ABdhPJw+33bH1BonVxlnbcTx3ZrNX9Wew3ZzQEv4g/vc9XmJxPbeMR8spNP25FGyrOQeTdJLDw7zzKYOE6kpgiujELw= X-Received: by 2002:aca:b48b:: with SMTP id d133mr1671887oif.47.1598977103227; Tue, 01 Sep 2020 09:18:23 -0700 (PDT) MIME-Version: 1.0 References: <202009011611.081GBN9M025984@repo.freebsd.org> In-Reply-To: <202009011611.081GBN9M025984@repo.freebsd.org> From: Benjamin Kaduk Date: Tue, 1 Sep 2020 09:18:12 -0700 Message-ID: Subject: Re: svn commit: r365052 - head/usr.bin/script To: Warner Losh Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 4Bgsgh3rsvz3XN0 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:18:25 -0000 On Tue, Sep 1, 2020 at 9:11 AM Warner Losh wrote: > Author: imp > Date: Tue Sep 1 16:11:23 2020 > New Revision: 365052 > URL: https://svnweb.freebsd.org/changeset/base/365052 > > Log: > Have script accept and ignore -e for Linux compat > > In the util-linux version of script, it will always exit with succes. > Except when run with -e, in which case it will have the exit value of > the child. BSD Script already uses the child's exit value for its exit > value. Some config and other helper scripts depend on being able to > specify -e. Accept it for compatibility since we'll already to the > right thing, but otherwise we ignore it. > > What kind of usage is not currently portable but becomes portable as a result of this change? I thought the BSD and GNU syntax was inherently pretty different, e.g., with '-c' for the command to run vs. implicit positional arguments, and would love to be able to retrain myself to something that works everywhere... -Ben From owner-svn-src-all@freebsd.org Tue Sep 1 16:20:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C401F3CDDC9; Tue, 1 Sep 2020 16:20:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgskM4hyRz3Xmj; Tue, 1 Sep 2020 16:20:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 85F101C3E1; Tue, 1 Sep 2020 16:20:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081GKhlU031891; Tue, 1 Sep 2020 16:20:43 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081GKhgO031890; Tue, 1 Sep 2020 16:20:43 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009011620.081GKhgO031890@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 1 Sep 2020 16:20:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365055 - head/lib/libc/tests/resolv X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/lib/libc/tests/resolv X-SVN-Commit-Revision: 365055 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:20:43 -0000 Author: jhb Date: Tue Sep 1 16:20:42 2020 New Revision: 365055 URL: https://svnweb.freebsd.org/changeset/base/365055 Log: Fix a buffer overrun. getln() returns 'len' valid characters. line[len] is out of bounds. Reported by: CHERI Reviewed by: brooks Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26197 Modified: head/lib/libc/tests/resolv/resolv_test.c Modified: head/lib/libc/tests/resolv/resolv_test.c ============================================================================== --- head/lib/libc/tests/resolv/resolv_test.c Tue Sep 1 16:17:21 2020 (r365054) +++ head/lib/libc/tests/resolv/resolv_test.c Tue Sep 1 16:20:42 2020 (r365055) @@ -76,15 +76,15 @@ load(const char *fname) if ((fp = fopen(fname, "r")) == NULL) ATF_REQUIRE(fp != NULL); while ((line = fgetln(fp, &len)) != NULL) { - char c = line[len]; + char c = line[len - 1]; char *ptr; - line[len] = '\0'; + line[len - 1] = '\0'; for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) { if (ptr == '\0' || ptr[0] == '#') continue; sl_add(hosts, strdup(ptr)); } - line[len] = c; + line[len - 1] = c; } (void)fclose(fp); From owner-svn-src-all@freebsd.org Tue Sep 1 16:22:35 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B21163CDF30; Tue, 1 Sep 2020 16:22:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgsmW4LHwz3Y2w; Tue, 1 Sep 2020 16:22:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from ivaldir.etoilebsd.net (etoilebsd.net [178.32.217.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 65F211A975; Tue, 1 Sep 2020 16:22:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by ivaldir.etoilebsd.net (Postfix, from userid 1001) id 1F384E35E1; Tue, 1 Sep 2020 18:22:33 +0200 (CEST) Date: Tue, 1 Sep 2020 18:22:33 +0200 From: Baptiste Daroussin To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r365052 - head/usr.bin/script Message-ID: <20200901162233.efcoqkrpb6setch5@ivaldir.net> References: <202009011611.081GBN9M025984@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="drp5iphc2q3ph7kk" Content-Disposition: inline In-Reply-To: <202009011611.081GBN9M025984@repo.freebsd.org> X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:22:35 -0000 --drp5iphc2q3ph7kk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 01, 2020 at 04:11:23PM +0000, Warner Losh wrote: > Author: imp > Date: Tue Sep 1 16:11:23 2020 > New Revision: 365052 > URL: https://svnweb.freebsd.org/changeset/base/365052 >=20 > Log: > Have script accept and ignore -e for Linux compat > =20 > In the util-linux version of script, it will always exit with succes. > Except when run with -e, in which case it will have the exit value of > the child. BSD Script already uses the child's exit value for its exit > value. Some config and other helper scripts depend on being able to > specify -e. Accept it for compatibility since we'll already to the > right thing, but otherwise we ignore it. >=20 > Modified: > head/usr.bin/script/script.1 > head/usr.bin/script/script.c >=20 > Modified: head/usr.bin/script/script.1 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.bin/script/script.1 Tue Sep 1 15:52:18 2020 (r365051) > +++ head/usr.bin/script/script.1 Tue Sep 1 16:11:23 2020 (r365052) > @@ -36,7 +36,7 @@ > .Nd make typescript of terminal session > .Sh SYNOPSIS > .Nm > -.Op Fl adfkpqr > +.Op Fl adefkpqr > .Op Fl F Ar pipe > .Op Fl t Ar time > .Op Ar file Op Ar command ... > @@ -77,6 +77,12 @@ retaining the prior contents. > When playing back a session with the > .Fl p > flag, do not sleep between records when playing back a timestamped sessi= on. > +.It Fl e > +Accepted for compatibility with > +.Em util-linux > +.Nm . > +The child command exit status is always the exit status of > +.Nm . > .It Fl F Ar pipe > Immediately flush output after each write. > This will allow a user to create a named pipe using >=20 > Modified: head/usr.bin/script/script.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.bin/script/script.c Tue Sep 1 15:52:18 2020 (r365051) > +++ head/usr.bin/script/script.c Tue Sep 1 16:11:23 2020 (r365052) > @@ -111,13 +111,15 @@ main(int argc, char *argv[]) > warning. (not needed w/clang) */ > showexit =3D 0; > =20 > - while ((ch =3D getopt(argc, argv, "adFfkpqrt:")) !=3D -1) > + while ((ch =3D getopt(argc, argv, "adeFfkpqrt:")) !=3D -1) > switch(ch) { > case 'a': > aflg =3D 1; > break; > case 'd': > usesleep =3D 0; > + break; > + case 'e': /* Default behaior, accepted for linux compat */ ^^^^^^^ You have a typo here, Best regards, Bapt --drp5iphc2q3ph7kk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAl9OdUYACgkQY4mL3PG3 PlrAhQ/8DEJWYzlgZfI+l0m4vtuu6oKbE2Ne8W1XWxm+2DY5Q4MrQyVNvSSU59AG Ni89kAcWaMl4DBWVP4C0OHJrKFC4ZppSUFJVwUih/x5e8UGJ9J9NmrzMjQ8UjQLc V7uzgvlHLiqGPqjY+fvZ7iq/EgCjuDyE15zyhacquBPLUhS3WFJ7zP4tcPD3/0jI RUcMGyeduwvkcVkK4Hb/4Uf0OvwFO9NDKcfmFN8YSQzh2LNCn4/ovUwtV1JCjr54 y/v1I3TDfSnEuJPTdDGc+0vjWHAuIZj9fhFo8pPLsNPRxTFC6Htjl1PIU8g6dF95 yOjWI4XaH4sCmvIigtp8KAqlTdDZXnTGGj6pNL9Y2hUdefAdyC5F2kgv9Iitcley m4LYZHYkyFpEFXckEYbY2gv2Gxju8kPjGPmiNOx0jTrG5J1aRzhqlD39ElR6h46n ZIQIwFMLIldKKeu0lTunxwP5SzzqBCHEMUbv3IuFPQotZPeIITXFBfw9FHZlO0hD rVv0JHKi+us4JulmbmkDzQtwzf9Y8SfKrQkcVmbgLEQc+8AaS8rnesnq8RriKyyz O6GgAhq7bSJzUq2Vp6/uxhbmxpmh5vew60lAotkOtwu4VZwmPJVIj9I7Qtxoknwy IJI4jolYHinESCwMBCA02G9LxpyeA4HLCoCLAg20nlvYoah/k80= =3JWW -----END PGP SIGNATURE----- --drp5iphc2q3ph7kk-- From owner-svn-src-all@freebsd.org Tue Sep 1 16:28:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 585F63CE36F; Tue, 1 Sep 2020 16:28:17 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from fry.fubar.geek.nz (fry.fubar.geek.nz [139.59.165.16]) by mx1.freebsd.org (Postfix) with ESMTP id 4Bgsv509Lqz3YY5; Tue, 1 Sep 2020 16:28:16 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from [192.168.42.12] (cpc91220-cmbg18-2-0-cust60.5-4.cable.virginm.net [81.104.142.61]) by fry.fubar.geek.nz (Postfix) with ESMTPSA id 9FFEE4E720; Tue, 1 Sep 2020 16:27:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fubar.geek.nz; s=mail; t=1598977658; bh=sKJ2dBljsQOigNpnavMZBlz/6O0BpG1mdNbPkOQoObE=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=qmgpnMTjwlnMaF/E3sc7h3O+7rwJoQFdP+1SgCHxU/vwG1XsuPKg3lgrUY9WnNshX 67xLKN7MqQgxgtMDDUTAtQ1sa3CxDNAI6EK8x5eqM5IBN90pAo7Z7jWyf7qyCQdiVi zMFm2ljKy/tunhQbaMdodGzg4j0OPH7qB5Ek+rM9WqXIecjuMprHbGLuQkVUi3XZa5 pv4Ly6VdN3p7kzHNSh9wh9Q9mFtu44q0BYaTiAuOSxYXNJ1hyTo/M5i3Yd1pbZLkXU BvKgGyJHI8vqDq/UvM1MVhxvazGUa05TRZaujZ8hovzn9+3aAm6OwI8juKDR2PQpQX w1ZJN2nuIJWUtZc+DehUlCDi7tiHhzOtCGHgKxlRL4quSMLM1NeTDD5+tUSJRUD/qj 9Y+y7qVzpbX8F/KJSt2Q64DMPLmWwmp7UAfF0RupPfTchYM1lu/iQG3Cw4q5OU/XTn 5Hnidz6d5yP6Rs0qZUosZgBrQ3LasYXhHgzrs9OMUi441PCGHTL7/g0s/gylVASDo9 TeRZkkMAcHd9WGvvJ7GCizma41EqnOj66A+x97N+LZh2O2DFpJSj0/OJfNcMicoXJl kxU4p0zg//rOsZT0+uCIoeusPi0k2qbp/2KRTCY1chAX5JRVVdJUZaqvbUXUVAJ31i 4X7+V4X1jZKjJPyIImxUUfZc= Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.15\)) Subject: Re: svn commit: r365054 - in head/sys: conf dev/sdhci From: Andrew Turner In-Reply-To: <202009011617.081GHL8e031671@repo.freebsd.org> Date: Tue, 1 Sep 2020 17:27:35 +0100 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <874D5323-F0DB-44E9-8779-7C18832A98B4@fubar.geek.nz> References: <202009011617.081GHL8e031671@repo.freebsd.org> To: Marcin Wojtas X-Mailer: Apple Mail (2.3445.104.15) X-Rspamd-Queue-Id: 4Bgsv509Lqz3YY5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14061, ipnet:139.59.160.0/20, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:28:17 -0000 > On 1 Sep 2020, at 17:17, Marcin Wojtas wrote: >=20 > Author: mw > Date: Tue Sep 1 16:17:21 2020 > New Revision: 365054 > URL: https://svnweb.freebsd.org/changeset/base/365054 >=20 > Log: > Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs >=20 > Implement support for an eSDHC controller found in NXP QorIQ = Layerscape SoCs. >=20 > This driver has been tested with NXP LS1046A and LX2160A (Honeycomb = board), > which is incompatible with the existing sdhci_fsl driver (aiming at = older > chips from this family). As such, it is not intended as replacement = for > the old driver, but rather serves as an improved alternative for SoCs = that > support it. > It comes with support for both PIO and Single DMA modes and samples = the > clock from the extres clk API. >=20 > Submitted by: Artur Rojek > Reviewed by: manu, mmel, kibab > Obtained from: Semihalf > Sponsored by: Alstom Group > Differential Revision: https://reviews.freebsd.org/D26153 >=20 > Added: > head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed) > Modified: > head/sys/conf/files >=20 > Modified: head/sys/conf/files > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/conf/files Tue Sep 1 16:13:09 2020 = (r365053) > +++ head/sys/conf/files Tue Sep 1 16:17:21 2020 = (r365054) > @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optional scc > dev/sdhci/sdhci.c optional sdhci > dev/sdhci/sdhci_fdt.c optional sdhci fdt > dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio > +dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio This looks wrong. It should be using an NXP specific option, not gpio. Andrew= From owner-svn-src-all@freebsd.org Tue Sep 1 16:44:03 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 614BA3CEE4D for ; Tue, 1 Sep 2020 16:44:03 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound2k.ore.mailhop.org (outbound2k.ore.mailhop.org [54.148.219.64]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgtFG6ctYz3bFw for ; Tue, 1 Sep 2020 16:44:02 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1598978641; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=eT+jSGzpG0q5KHXLK0UZscI8cYIHm0I4ZXsK8XGbwy1s6xYgZhBu+YKoasdaLcZAGjinjjRd9syWC Y4xUw7dAXnSytwe+B8y2P1+Y2Ek4E8rOoq3cnrW6lrXeUA6ORNNjVks37ryR0spSWNRe/tQwEPKeTX r50OTvyNj1trf9G1/KRyXpzlgfUG2ryfRGaRP1EG8kAZbvyO8iYouJaHmN3xQ+yN2W2aLPzHVcB90J s8kOJPjOeQVQTo0g8PknizIL0RQE55V9Tiz9gMOe63uIjTsaH3buqOYJQuulnpJCzums+iQJABaA/E 3eIqHzq5aeo8PPvj9fleHJyqrkqsQGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:dkim-signature:from; bh=j9Uv8S27IsA6N/NS7OUPTmkagLXjdJTOKQGytniHF1I=; b=hHRdjhrundI7EzeSDZ9YfpZjo9OTq14f4iWU01MaA9JXib176/QNeVjxIP0S8Onggf6ZlJ1ZEF5Xu pvcpSXMgtl8qpgQkQls0Gev5pwU+9Xe5D+O98o7s1aXTF1rNy9an7eUcNc+P6GqQXG6bmGc/AUsN8x PLhUt4nFjrno4vEfCF0dJRIWrb+aOE+3+tnPEMDrO2xwu+SUspHTsmJqwHyc0SUDF9hCC0pemibysp bZazdoBOVPjJczaWD/iVciN0bWtoqtcz3DjhpLgCz7/Xv5nNSi/fFdr3qijhSwQPU+QGC0LbQOhh9V 5PIhvP/wUryhn1WrMna7VTqDqdqE1Qg== ARC-Authentication-Results: i=1; outbound4.ore.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:from; bh=j9Uv8S27IsA6N/NS7OUPTmkagLXjdJTOKQGytniHF1I=; b=ANkGoC+o1XIsvIR+DYyDrz3iznQYU9VhkQ9FmNOjaeFl4/QpfYPny2Txf48lj1ydXkk6U0h+kveB2 CcON+zN2qCxMPLLY9Yn4OfdkNqd9IjMll7rZKkls4DFbNtUoygkfMT338hOU+X65V59r2aYUxB2Kjd BUCag8GGKo0WKvMvMloBDIhdakQ3KiFCy+7l32IV1VzElqgc+iD5gCg99g1ARgsFxnI+yPCtfGtXxB DMpHKUM9LsH05n5I90HpMT1vavX9qxhoWrley6Rt/7+o56e7djYFi/41phUDmvL09UbBSISX78BlOy o+8N5dPHb8OIlD4QYF46OmnGAHp9F4w== X-MHO-RoutePath: aGlwcGll X-MHO-User: 5475bb09-ec72-11ea-9e11-df46ed8f892f X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (c-67-177-211-60.hsd1.co.comcast.net [67.177.211.60]) by outbound4.ore.mailhop.org (Halon) with ESMTPSA id 5475bb09-ec72-11ea-9e11-df46ed8f892f; Tue, 01 Sep 2020 16:44:00 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id 081GhvRA041730; Tue, 1 Sep 2020 10:43:57 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <6f92de5317993ba978276a0fbf8ecff01f73537d.camel@freebsd.org> Subject: Re: svn commit: r365054 - in head/sys: conf dev/sdhci From: Ian Lepore To: Andrew Turner , Marcin Wojtas Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Tue, 01 Sep 2020 10:43:57 -0600 In-Reply-To: <874D5323-F0DB-44E9-8779-7C18832A98B4@fubar.geek.nz> References: <202009011617.081GHL8e031671@repo.freebsd.org> <874D5323-F0DB-44E9-8779-7C18832A98B4@fubar.geek.nz> Content-Type: text/plain; charset="ASCII" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BgtFG6ctYz3bFw X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:16509, ipnet:54.148.0.0/15, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 16:44:03 -0000 On Tue, 2020-09-01 at 17:27 +0100, Andrew Turner wrote: > > On 1 Sep 2020, at 17:17, Marcin Wojtas wrote: > > > > Author: mw > > Date: Tue Sep 1 16:17:21 2020 > > New Revision: 365054 > > URL: https://svnweb.freebsd.org/changeset/base/365054 > > > > Log: > > Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs > > > > Implement support for an eSDHC controller found in NXP QorIQ > > Layerscape SoCs. > > > > This driver has been tested with NXP LS1046A and LX2160A > > (Honeycomb board), > > which is incompatible with the existing sdhci_fsl driver (aiming > > at older > > chips from this family). As such, it is not intended as > > replacement for > > the old driver, but rather serves as an improved alternative for > > SoCs that > > support it. > > It comes with support for both PIO and Single DMA modes and > > samples the > > clock from the extres clk API. > > > > Submitted by: Artur Rojek > > Reviewed by: manu, mmel, kibab > > Obtained from: Semihalf > > Sponsored by: Alstom Group > > Differential Revision: https://reviews.freebsd.org/D26153 > > > > Added: > > head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed) > > Modified: > > head/sys/conf/files > > > > Modified: head/sys/conf/files > > =================================================================== > > =========== > > --- head/sys/conf/files Tue Sep 1 16:13:09 2020 (r365053) > > +++ head/sys/conf/files Tue Sep 1 16:17:21 2020 (r365054) > > @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optiona > > l scc > > dev/sdhci/sdhci.c optional sdhci > > dev/sdhci/sdhci_fdt.c optional sdhci fdt > > dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio > > +dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio > > This looks wrong. It should be using an NXP specific option, not > gpio. > > Andrew In addition to gpio, not instead of it (the new driver uses the fdt gpio helper stuff for card detect and write protect). -- Ian From owner-svn-src-all@freebsd.org Tue Sep 1 18:50:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7ED123D341C; Tue, 1 Sep 2020 18:50:27 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgx372mDfz42Bm; Tue, 1 Sep 2020 18:50:27 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41E711DF52; Tue, 1 Sep 2020 18:50:27 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081IoR96024008; Tue, 1 Sep 2020 18:50:27 GMT (envelope-from chs@FreeBSD.org) Received: (from chs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081IoQqj024006; Tue, 1 Sep 2020 18:50:26 GMT (envelope-from chs@FreeBSD.org) Message-Id: <202009011850.081IoQqj024006@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: chs set sender to chs@FreeBSD.org using -f From: Chuck Silvers Date: Tue, 1 Sep 2020 18:50:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365056 - head/sbin/fsck_ffs X-SVN-Group: head X-SVN-Commit-Author: chs X-SVN-Commit-Paths: head/sbin/fsck_ffs X-SVN-Commit-Revision: 365056 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 18:50:27 -0000 Author: chs Date: Tue Sep 1 18:50:26 2020 New Revision: 365056 URL: https://svnweb.freebsd.org/changeset/base/365056 Log: Move all of the error prints in readsb() from stderr to stdout. The only output from fsck that should go to stderr is the usage message. if setup() fails then exit with EEXIT rather than 0. Reviewed by: mckusick Sponsored by: Netflix Modified: head/sbin/fsck_ffs/main.c head/sbin/fsck_ffs/setup.c Modified: head/sbin/fsck_ffs/main.c ============================================================================== --- head/sbin/fsck_ffs/main.c Tue Sep 1 16:20:42 2020 (r365055) +++ head/sbin/fsck_ffs/main.c Tue Sep 1 18:50:26 2020 (r365056) @@ -408,7 +408,7 @@ checkfilesys(char *filesys) case 0: if (preen) pfatal("CAN'T CHECK FILE SYSTEM."); - return (0); + return (EEXIT); case -1: clean: pwarn("clean, %ld free ", (long)(sblock.fs_cstotal.cs_nffree + Modified: head/sbin/fsck_ffs/setup.c ============================================================================== --- head/sbin/fsck_ffs/setup.c Tue Sep 1 16:20:42 2020 (r365055) +++ head/sbin/fsck_ffs/setup.c Tue Sep 1 18:50:26 2020 (r365056) @@ -339,15 +339,15 @@ readsb(int listerr) return (0); case ENOENT: if (bflag) - fprintf(stderr, "%jd is not a file system " + printf("%jd is not a file system " "superblock\n", super / dev_bsize); else - fprintf(stderr, "Cannot find file system " + printf("Cannot find file system " "superblock\n"); return (0); case EIO: default: - fprintf(stderr, "I/O error reading %jd\n", + printf("I/O error reading %jd\n", super / dev_bsize); return (0); } From owner-svn-src-all@freebsd.org Tue Sep 1 19:02:08 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6334F3D3CED; Tue, 1 Sep 2020 19:02:08 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgxJc21fvz43g8; Tue, 1 Sep 2020 19:02:08 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2856A1E223; Tue, 1 Sep 2020 19:02:08 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081J28Oj035203; Tue, 1 Sep 2020 19:02:08 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081J28Ls035202; Tue, 1 Sep 2020 19:02:08 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202009011902.081J28Ls035202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Tue, 1 Sep 2020 19:02:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365057 - head/cddl/usr.bin X-SVN-Group: head X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: head/cddl/usr.bin X-SVN-Commit-Revision: 365057 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 19:02:08 -0000 Author: freqlabs Date: Tue Sep 1 19:02:07 2020 New Revision: 365057 URL: https://svnweb.freebsd.org/changeset/base/365057 Log: Ensure zstreamdump subdir can be visited Reported by: Thomas Laus Sponsored by: iXsystems, Inc. Modified: head/cddl/usr.bin/Makefile Modified: head/cddl/usr.bin/Makefile ============================================================================== --- head/cddl/usr.bin/Makefile Tue Sep 1 18:50:26 2020 (r365056) +++ head/cddl/usr.bin/Makefile Tue Sep 1 19:02:07 2020 (r365057) @@ -18,6 +18,7 @@ _zinject= zinject .if ${MK_LIBTHR} != "no" _ztest= ztest _zstream = zstream +_zstreamdump = zstreamdump .endif .endif From owner-svn-src-all@freebsd.org Tue Sep 1 19:06:08 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C94783D41B5; Tue, 1 Sep 2020 19:06:08 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgxPD4qfQz4448; Tue, 1 Sep 2020 19:06:08 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A6D81DFB5; Tue, 1 Sep 2020 19:06:08 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081J68Wa036193; Tue, 1 Sep 2020 19:06:08 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081J68Rb036192; Tue, 1 Sep 2020 19:06:08 GMT (envelope-from ian@FreeBSD.org) Message-Id: <202009011906.081J68Rb036192@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Tue, 1 Sep 2020 19:06:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365058 - head/share/man/man4 X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: head/share/man/man4 X-SVN-Commit-Revision: 365058 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 19:06:08 -0000 Author: ian Date: Tue Sep 1 19:06:08 2020 New Revision: 365058 URL: https://svnweb.freebsd.org/changeset/base/365058 Log: Document the fact that you must set an i2c slave address as well as the upstream iicbus to configure this device using hints. Modified: head/share/man/man4/ltc430x.4 Modified: head/share/man/man4/ltc430x.4 ============================================================================== --- head/share/man/man4/ltc430x.4 Tue Sep 1 19:02:07 2020 (r365057) +++ head/share/man/man4/ltc430x.4 Tue Sep 1 19:06:08 2020 (r365058) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 1, 2020 +.Dd September 1, 2020 .Dt LTC430X 4 .Os .Sh NAME @@ -97,6 +97,10 @@ The upstream the .Nm instance is attached to. +.It Va hint.ltc430x..addr +The slave address of the +.Nm +instance on the upstream bus. .El .Pp When configured via hints, the driver automatically adds an iicbus From owner-svn-src-all@freebsd.org Tue Sep 1 19:54:44 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF1C53D5589; Tue, 1 Sep 2020 19:54:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgyTJ5b1bz46gG; Tue, 1 Sep 2020 19:54:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A2DF71E770; Tue, 1 Sep 2020 19:54:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081JsiHf067496; Tue, 1 Sep 2020 19:54:44 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Jsi2w067493; Tue, 1 Sep 2020 19:54:44 GMT (envelope-from bz@FreeBSD.org) Message-Id: <202009011954.081Jsi2w067493@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Tue, 1 Sep 2020 19:54:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365059 - in stable/12/sys: netinet netinet6 sys X-SVN-Group: stable-12 X-SVN-Commit-Author: bz X-SVN-Commit-Paths: in stable/12/sys: netinet netinet6 sys X-SVN-Commit-Revision: 365059 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 19:54:44 -0000 Author: bz Date: Tue Sep 1 19:54:43 2020 New Revision: 365059 URL: https://svnweb.freebsd.org/changeset/base/365059 Log: MFC r364018: IPV6_PKTINFO support for v4-mapped IPv6 sockets When using v4-mapped IPv6 sockets with IPV6_PKTINFO we do not respect the given v4-mapped src address on the IPv4 socket. Implement the needed functionality. This allows single-socket UDP applications (such as OpenVPN) to work better on FreeBSD. Requested by: Gert Doering (gert greenie.net), pfsense Tested by: Gert Doering (gert greenie.net) Modified: stable/12/sys/netinet/udp_usrreq.c stable/12/sys/netinet6/udp6_usrreq.c stable/12/sys/sys/protosw.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netinet/udp_usrreq.c ============================================================================== --- stable/12/sys/netinet/udp_usrreq.c Tue Sep 1 19:06:08 2020 (r365058) +++ stable/12/sys/netinet/udp_usrreq.c Tue Sep 1 19:54:43 2020 (r365059) @@ -162,7 +162,7 @@ VNET_PCPUSTAT_SYSUNINIT(udpstat); #ifdef INET static void udp_detach(struct socket *so); static int udp_output(struct inpcb *, struct mbuf *, struct sockaddr *, - struct mbuf *, struct thread *); + struct mbuf *, struct thread *, int); #endif static void @@ -1114,13 +1114,69 @@ udp_ctloutput(struct socket *so, struct sockopt *sopt) return (error); } +#ifdef INET6 +/* The logic here is derived from ip6_setpktopt(). See comments there. */ +static int +udp_v4mapped_pktinfo(struct cmsghdr *cm, struct sockaddr_in * src, + struct inpcb *inp, int flags) +{ + struct ifnet *ifp; + struct in6_pktinfo *pktinfo; + struct in_addr ia; + + if ((flags & PRUS_IPV6) == 0) + return (0); + + if (cm->cmsg_level != IPPROTO_IPV6) + return (0); + + if (cm->cmsg_type != IPV6_2292PKTINFO && + cm->cmsg_type != IPV6_PKTINFO) + return (0); + + if (cm->cmsg_len != + CMSG_LEN(sizeof(struct in6_pktinfo))) + return (EINVAL); + + pktinfo = (struct in6_pktinfo *)CMSG_DATA(cm); + if (!IN6_IS_ADDR_V4MAPPED(&pktinfo->ipi6_addr) && + !IN6_IS_ADDR_UNSPECIFIED(&pktinfo->ipi6_addr)) + return (EINVAL); + + /* Validate the interface index if specified. */ + if (pktinfo->ipi6_ifindex > V_if_index) + return (ENXIO); + + ifp = NULL; + if (pktinfo->ipi6_ifindex) { + ifp = ifnet_byindex(pktinfo->ipi6_ifindex); + if (ifp == NULL) + return (ENXIO); + } + if (ifp != NULL && !IN6_IS_ADDR_UNSPECIFIED(&pktinfo->ipi6_addr)) { + + ia.s_addr = pktinfo->ipi6_addr.s6_addr32[3]; + if (in_ifhasaddr(ifp, ia) == 0) + return (EADDRNOTAVAIL); + } + + bzero(src, sizeof(*src)); + src->sin_family = AF_INET; + src->sin_len = sizeof(*src); + src->sin_port = inp->inp_lport; + src->sin_addr.s_addr = pktinfo->ipi6_addr.s6_addr32[3]; + + return (0); +} +#endif + #ifdef INET #define UH_WLOCKED 2 #define UH_RLOCKED 1 #define UH_UNLOCKED 0 static int udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr, - struct mbuf *control, struct thread *td) + struct mbuf *control, struct thread *td, int flags) { struct udpiphdr *ui; int len = m->m_pkthdr.len; @@ -1201,6 +1257,11 @@ retry: error = EINVAL; break; } +#ifdef INET6 + error = udp_v4mapped_pktinfo(cm, &src, inp, flags); + if (error != 0) + break; +#endif if (cm->cmsg_level != IPPROTO_IP) continue; @@ -1816,7 +1877,7 @@ udp_send(struct socket *so, int flags, struct mbuf *m, inp = sotoinpcb(so); KASSERT(inp != NULL, ("udp_send: inp == NULL")); - return (udp_output(inp, m, addr, control, td)); + return (udp_output(inp, m, addr, control, td, flags)); } #endif /* INET */ Modified: stable/12/sys/netinet6/udp6_usrreq.c ============================================================================== --- stable/12/sys/netinet6/udp6_usrreq.c Tue Sep 1 19:06:08 2020 (r365058) +++ stable/12/sys/netinet6/udp6_usrreq.c Tue Sep 1 19:54:43 2020 (r365059) @@ -804,7 +804,7 @@ retry: in6_sin6_2_sin_in_sock((struct sockaddr *)sin6); pru = inetsw[ip_protox[nxt]].pr_usrreqs; /* addr will just be freed in sendit(). */ - return ((*pru->pru_send)(so, flags_arg, m, + return ((*pru->pru_send)(so, flags_arg | PRUS_IPV6, m, (struct sockaddr *)sin6, control, td)); } } else Modified: stable/12/sys/sys/protosw.h ============================================================================== --- stable/12/sys/sys/protosw.h Tue Sep 1 19:06:08 2020 (r365058) +++ stable/12/sys/sys/protosw.h Tue Sep 1 19:54:43 2020 (r365059) @@ -210,6 +210,7 @@ struct pr_usrreqs { #define PRUS_EOF 0x2 #define PRUS_MORETOCOME 0x4 #define PRUS_NOTREADY 0x8 +#define PRUS_IPV6 0x10 int (*pru_ready)(struct socket *so, struct mbuf *m, int count); int (*pru_sense)(struct socket *so, struct stat *sb); int (*pru_shutdown)(struct socket *so); From owner-svn-src-all@freebsd.org Tue Sep 1 20:13:51 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 96C9C3D6D21; Tue, 1 Sep 2020 20:13:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgyvM3YP9z49X2; Tue, 1 Sep 2020 20:13:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D51B1F10E; Tue, 1 Sep 2020 20:13:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081KDpoG079611; Tue, 1 Sep 2020 20:13:51 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081KDprF079610; Tue, 1 Sep 2020 20:13:51 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009012013.081KDprF079610@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 1 Sep 2020 20:13:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365060 - head/sys/dev/qlxgb X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/dev/qlxgb X-SVN-Commit-Revision: 365060 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 20:13:51 -0000 Author: markj Date: Tue Sep 1 20:13:50 2020 New Revision: 365060 URL: https://svnweb.freebsd.org/changeset/base/365060 Log: qlxgb: Initialize if_mtu before setting max_frame_size. Previously we were relying on ether_ifattach() to set if_mtu, but max_frame_size is initialized earlier. This fixes a regression introduced by r250375. PR: 249050 Submitted by: Christian Vallières MFC after: 3 days Modified: head/sys/dev/qlxgb/qla_os.c Modified: head/sys/dev/qlxgb/qla_os.c ============================================================================== --- head/sys/dev/qlxgb/qla_os.c Tue Sep 1 19:54:43 2020 (r365059) +++ head/sys/dev/qlxgb/qla_os.c Tue Sep 1 20:13:50 2020 (r365060) @@ -671,6 +671,7 @@ qla_init_ifnet(device_t dev, qla_host_t *ha) if_initname(ifp, device_get_name(dev), device_get_unit(dev)); + ifp->if_mtu = ETHERMTU; ifp->if_baudrate = IF_Gbps(10); ifp->if_init = qla_init; ifp->if_softc = ha; From owner-svn-src-all@freebsd.org Tue Sep 1 20:37:24 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7ECBD3D788D; Tue, 1 Sep 2020 20:37:24 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgzQX11Mhz4CZ0; Tue, 1 Sep 2020 20:37:23 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wm1-x342.google.com with SMTP id a9so2445121wmm.2; Tue, 01 Sep 2020 13:37:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=3gom0Zl3vR/jsW2vtMR53FEa1RKm5gpaUVS3YD6VTa4=; b=faL6wwehAEWAEXuctEYRnKVnVChKNkOf4qL6bet9T/aXISkmPCe78U2RdH4410euhh Q4xgVtCcUHboCaq9riYXzn8qDKj9Y+o1IAoV9OuSJCPv36iHfAlhavmPS2tcVl4E7sX1 Jvq7X3IaP73QochoLaScCq/DkagBPaXeAIqneQFWSTY7qIhzrixZMWR/qHPRiNYQnIbz UGaiosXZxqoedSYeAUmtZAQTyC1V8ErGdK0vK9F1hT6KIIZ/RyepkZyOt7d1g6g2B+kF 9mzJqe/vBnLhEiZ4boodqj/L/mpqX9RkyVAiO0d73JZx5T2/BR5CzFkP9NTSWnOvdpn5 gEfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=3gom0Zl3vR/jsW2vtMR53FEa1RKm5gpaUVS3YD6VTa4=; b=lKGHcnJCsMkYWSMi4MVtn0+iBVFrmG5A9qVy78HKLF50gmfgrK8P0spBmsXr0BDd2U i1GKwFmLX1a5m+fY4pDIq+gvXLIRdeQkbq7i98Mr4lh5G77dPLGWM3g3BJzdYzdRBwX1 GdtdFzkyyzl7W6UAy1cBdykdQaZo2Amw54BB5mDByf0UJwZew2/NbQfVbtqvnwfxyMsm eXvhHDbX4sR6rkrHHybbggdS9Ow4hGis6hDLTZmO6Ymt6lvEOxyughV9JUwxjxP40NcF /FjmrLAuZkX0v7s80Q1KKbuToa3ZdCdwNve2lKxXZIGQ6c9xUMmAKQjite+rk9TvGHZ2 JuMg== X-Gm-Message-State: AOAM531ERh7jYJkDI3JtUnPkz1qWc6O32bt+RZy1gYd8PEdMq9eTvaLt 0yvcVC71fOgAfbb+tjqpolXIx/T3ab8LDq4QqpuCWfcj X-Google-Smtp-Source: ABdhPJzGmru8kkk3H16tLrEzMhQFFxU+vlF0+zwbJ35TOm8IkaIC5QJnpEaxZ6FL/84aezCeiyYZaqEycZgrEdKXu9U= X-Received: by 2002:a7b:ce0d:: with SMTP id m13mr3635164wmc.83.1598992641911; Tue, 01 Sep 2020 13:37:21 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6000:187:0:0:0:0 with HTTP; Tue, 1 Sep 2020 13:37:21 -0700 (PDT) In-Reply-To: <202009011617.081GHL8e031671@repo.freebsd.org> References: <202009011617.081GHL8e031671@repo.freebsd.org> From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:37:21 +0200 Message-ID: Subject: Re: svn commit: r365054 - in head/sys: conf dev/sdhci To: Marcin Wojtas Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4BgzQX11Mhz4CZ0 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 20:37:24 -0000 This commit breaks numerous kernels, e.g. _.arm.RPI-B: In file included from /usr/src/sys/dev/sdhci/sdhci_fsl_fdt.c:45: /usr/src/sys/dev/extres/clk/clk.h:37:10: fatal error: 'clknode_if.h' file not found #include "clknode_if.h" On 9/1/20, Marcin Wojtas wrote: > Author: mw > Date: Tue Sep 1 16:17:21 2020 > New Revision: 365054 > URL: https://svnweb.freebsd.org/changeset/base/365054 > > Log: > Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs > > Implement support for an eSDHC controller found in NXP QorIQ Layerscape > SoCs. > > This driver has been tested with NXP LS1046A and LX2160A (Honeycomb > board), > which is incompatible with the existing sdhci_fsl driver (aiming at older > chips from this family). As such, it is not intended as replacement for > the old driver, but rather serves as an improved alternative for SoCs > that > support it. > It comes with support for both PIO and Single DMA modes and samples the > clock from the extres clk API. > > Submitted by: Artur Rojek > Reviewed by: manu, mmel, kibab > Obtained from: Semihalf > Sponsored by: Alstom Group > Differential Revision: https://reviews.freebsd.org/D26153 > > Added: > head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed) > Modified: > head/sys/conf/files > > Modified: head/sys/conf/files > ============================================================================== > --- head/sys/conf/files Tue Sep 1 16:13:09 2020 (r365053) > +++ head/sys/conf/files Tue Sep 1 16:17:21 2020 (r365054) > @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optional scc > dev/sdhci/sdhci.c optional sdhci > dev/sdhci/sdhci_fdt.c optional sdhci fdt > dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio > +dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio > dev/sdhci/sdhci_if.m optional sdhci > dev/sdhci/sdhci_acpi.c optional sdhci acpi > dev/sdhci/sdhci_pci.c optional sdhci pci > > Added: head/sys/dev/sdhci/sdhci_fsl_fdt.c > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sys/dev/sdhci/sdhci_fsl_fdt.c Tue Sep 1 16:17:21 2020 (r365054) > @@ -0,0 +1,680 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2020 Alstom Group. > + * Copyright (c) 2020 Semihalf. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY > WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +/* eSDHC controller driver for NXP QorIQ Layerscape SoCs. */ > + > +#include > +__FBSDID("$FreeBSD$"); > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mmcbr_if.h" > +#include "sdhci_if.h" > + > +#define RD4 (sc->read) > +#define WR4 (sc->write) > + > +#define SDHCI_FSL_PRES_STATE 0x24 > +#define SDHCI_FSL_PRES_SDSTB (1 << 3) > +#define SDHCI_FSL_PRES_COMPAT_MASK 0x000f0f07 > + > +#define SDHCI_FSL_PROT_CTRL 0x28 > +#define SDHCI_FSL_PROT_CTRL_WIDTH_1BIT (0 << 1) > +#define SDHCI_FSL_PROT_CTRL_WIDTH_4BIT (1 << 1) > +#define SDHCI_FSL_PROT_CTRL_WIDTH_8BIT (2 << 1) > +#define SDHCI_FSL_PROT_CTRL_WIDTH_MASK (3 << 1) > +#define SDHCI_FSL_PROT_CTRL_BYTE_SWAP (0 << 4) > +#define SDHCI_FSL_PROT_CTRL_BYTE_NATIVE (2 << 4) > +#define SDHCI_FSL_PROT_CTRL_BYTE_MASK (3 << 4) > +#define SDHCI_FSL_PROT_CTRL_DMA_MASK (3 << 8) > + > +#define SDHCI_FSL_SYS_CTRL 0x2c > +#define SDHCI_FSL_CLK_IPGEN (1 << 0) > +#define SDHCI_FSL_CLK_SDCLKEN (1 << 3) > +#define SDHCI_FSL_CLK_DIVIDER_MASK 0x000000f0 > +#define SDHCI_FSL_CLK_DIVIDER_SHIFT 4 > +#define SDHCI_FSL_CLK_PRESCALE_MASK 0x0000ff00 > +#define SDHCI_FSL_CLK_PRESCALE_SHIFT 8 > + > +#define SDHCI_FSL_WTMK_LVL 0x44 > +#define SDHCI_FSL_WTMK_RD_512B (0 << 0) > +#define SDHCI_FSL_WTMK_WR_512B (0 << 15) > + > +#define SDHCI_FSL_HOST_VERSION 0xfc > +#define SDHCI_FSL_CAPABILITIES2 0x114 > + > +#define SDHCI_FSL_ESDHC_CTRL 0x40c > +#define SDHCI_FSL_ESDHC_CTRL_SNOOP (1 << 6) > +#define SDHCI_FSL_ESDHC_CTRL_CLK_DIV2 (1 << 19) > + > +struct sdhci_fsl_fdt_softc { > + device_t dev; > + const struct sdhci_fsl_fdt_soc_data *soc_data; > + struct resource *mem_res; > + struct resource *irq_res; > + void *irq_cookie; > + uint32_t baseclk_hz; > + struct sdhci_fdt_gpio *gpio; > + struct sdhci_slot slot; > + bool slot_init_done; > + uint32_t cmd_and_mode; > + uint16_t sdclk_bits; > + > + uint32_t (* read)(struct sdhci_fsl_fdt_softc *, bus_size_t); > + void (* write)(struct sdhci_fsl_fdt_softc *, bus_size_t, uint32_t); > +}; > + > +struct sdhci_fsl_fdt_soc_data { > + int quirks; > +}; > + > +static const struct sdhci_fsl_fdt_soc_data sdhci_fsl_fdt_ls1046a_soc_data = > { > + .quirks = SDHCI_QUIRK_DONT_SET_HISPD_BIT | SDHCI_QUIRK_BROKEN_AUTO_STOP > +}; > + > +static const struct sdhci_fsl_fdt_soc_data sdhci_fsl_fdt_gen_data = { > + .quirks = 0, > +}; > + > +static const struct ofw_compat_data sdhci_fsl_fdt_compat_data[] = { > + {"fsl,ls1046a-esdhc", (uintptr_t)&sdhci_fsl_fdt_ls1046a_soc_data}, > + {"fsl,esdhc", (uintptr_t)&sdhci_fsl_fdt_gen_data}, > + {NULL, 0} > +}; > + > +static uint32_t > +read_be(struct sdhci_fsl_fdt_softc *sc, bus_size_t off) > +{ > + > + return (be32toh(bus_read_4(sc->mem_res, off))); > +} > + > +static void > +write_be(struct sdhci_fsl_fdt_softc *sc, bus_size_t off, uint32_t val) > +{ > + > + bus_write_4(sc->mem_res, off, htobe32(val)); > +} > + > +static uint32_t > +read_le(struct sdhci_fsl_fdt_softc *sc, bus_size_t off) > +{ > + > + return (bus_read_4(sc->mem_res, off)); > +} > + > +static void > +write_le(struct sdhci_fsl_fdt_softc *sc, bus_size_t off, uint32_t val) > +{ > + > + bus_write_4(sc->mem_res, off, val); > +} > + > + > +static uint16_t > +sdhci_fsl_fdt_get_clock(struct sdhci_fsl_fdt_softc *sc) > +{ > + uint16_t val; > + > + val = sc->sdclk_bits | SDHCI_CLOCK_INT_EN; > + if (RD4(sc, SDHCI_FSL_PRES_STATE) & SDHCI_FSL_PRES_SDSTB) > + val |= SDHCI_CLOCK_INT_STABLE; > + if (RD4(sc, SDHCI_FSL_SYS_CTRL) & SDHCI_FSL_CLK_SDCLKEN) > + val |= SDHCI_CLOCK_CARD_EN; > + > + return (val); > +} > + > +static void > +fsl_sdhc_fdt_set_clock(struct sdhci_fsl_fdt_softc *sc, uint16_t val) > +{ > + uint32_t div, freq, prescale, val32; > + > + sc->sdclk_bits = val & SDHCI_DIVIDERS_MASK; > + val32 = RD4(sc, SDHCI_CLOCK_CONTROL); > + > + if ((val & SDHCI_CLOCK_CARD_EN) == 0) { > + WR4(sc, SDHCI_CLOCK_CONTROL, val32 & ~SDHCI_FSL_CLK_SDCLKEN); > + return; > + } > + > + div = ((val >> SDHCI_DIVIDER_SHIFT) & SDHCI_DIVIDER_MASK) | > + ((val >> SDHCI_DIVIDER_HI_SHIFT) & SDHCI_DIVIDER_HI_MASK) << > + SDHCI_DIVIDER_MASK_LEN; > + if (div == 0) > + freq = sc->baseclk_hz; > + else > + freq = sc->baseclk_hz / (2 * div); > + > + for (prescale = 2; freq < sc->baseclk_hz / (prescale * 16); ) > + prescale <<= 1; > + for (div = 1; freq < sc->baseclk_hz / (prescale * div); ) > + ++div; > + > +#ifdef DEBUG > + device_printf(sc->dev, > + "Desired SD/MMC freq: %d, actual: %d; base %d prescale %d divisor > %d\n", > + freq, sc->baseclk_hz / (prescale * div), > + sc->baseclk_hz, prescale, div); > +#endif > + > + prescale >>= 1; > + div -= 1; > + > + val32 &= ~(SDHCI_FSL_CLK_DIVIDER_MASK | SDHCI_FSL_CLK_PRESCALE_MASK); > + val32 |= div << SDHCI_FSL_CLK_DIVIDER_SHIFT; > + val32 |= prescale << SDHCI_FSL_CLK_PRESCALE_SHIFT; > + val32 |= SDHCI_FSL_CLK_IPGEN | SDHCI_FSL_CLK_SDCLKEN; > + WR4(sc, SDHCI_CLOCK_CONTROL, val32); > +} > + > +static uint8_t > +sdhci_fsl_fdt_read_1(device_t dev, struct sdhci_slot *slot, bus_size_t > off) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + uint32_t wrk32, val32; > + > + sc = device_get_softc(dev); > + > + switch (off) { > + case SDHCI_HOST_CONTROL: > + wrk32 = RD4(sc, SDHCI_FSL_PROT_CTRL); > + val32 = wrk32 & (SDHCI_CTRL_LED | SDHCI_CTRL_CARD_DET | > + SDHCI_CTRL_FORCE_CARD); > + if (wrk32 & SDHCI_FSL_PROT_CTRL_WIDTH_4BIT) > + val32 |= SDHCI_CTRL_4BITBUS; > + else if (wrk32 & SDHCI_FSL_PROT_CTRL_WIDTH_8BIT) > + val32 |= SDHCI_CTRL_8BITBUS; > + return (val32); > + case SDHCI_POWER_CONTROL: > + return (SDHCI_POWER_ON | SDHCI_POWER_300); > + default: > + break; > + } > + > + return ((RD4(sc, off & ~3) >> (off & 3) * 8) & UINT8_MAX); > +} > + > +static uint16_t > +sdhci_fsl_fdt_read_2(device_t dev, struct sdhci_slot *slot, bus_size_t > off) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + uint32_t val32; > + > + sc = device_get_softc(dev); > + > + switch (off) { > + case SDHCI_CLOCK_CONTROL: > + return (sdhci_fsl_fdt_get_clock(sc)); > + case SDHCI_HOST_VERSION: > + return (RD4(sc, SDHCI_FSL_HOST_VERSION) & UINT16_MAX); > + case SDHCI_TRANSFER_MODE: > + return (sc->cmd_and_mode & UINT16_MAX); > + case SDHCI_COMMAND_FLAGS: > + return (sc->cmd_and_mode >> 16); > + case SDHCI_SLOT_INT_STATUS: > + /* > + * eSDHC hardware manages only a single slot. > + * Synthesize a slot interrupt status register for slot 1 below. > + */ > + val32 = RD4(sc, SDHCI_INT_STATUS); > + val32 &= RD4(sc, SDHCI_SIGNAL_ENABLE); > + return (!!val32); > + default: > + return ((RD4(sc, off & ~3) >> (off & 3) * 8) & UINT16_MAX); > + } > +} > + > +static uint32_t > +sdhci_fsl_fdt_read_4(device_t dev, struct sdhci_slot *slot, bus_size_t > off) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + uint32_t wrk32, val32; > + > + sc = device_get_softc(dev); > + > + if (off == SDHCI_BUFFER) > + return (bus_read_4(sc->mem_res, off)); > + if (off == SDHCI_CAPABILITIES2) > + off = SDHCI_FSL_CAPABILITIES2; > + > + val32 = RD4(sc, off); > + > + switch (off) { > + case SDHCI_CAPABILITIES: > + val32 &= ~(SDHCI_CAN_DO_SUSPEND | SDHCI_CAN_VDD_180); > + break; > + case SDHCI_PRESENT_STATE: > + wrk32 = val32; > + val32 &= SDHCI_FSL_PRES_COMPAT_MASK; > + val32 |= (wrk32 >> 4) & SDHCI_STATE_DAT_MASK; > + val32 |= (wrk32 << 1) & SDHCI_STATE_CMD; > + break; > + default: > + break; > + } > + > + return (val32); > +} > + > +static void > +sdhci_fsl_fdt_read_multi_4(device_t dev, struct sdhci_slot *slot, > bus_size_t off, > + uint32_t *data, bus_size_t count) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + > + sc = device_get_softc(dev); > + bus_read_multi_4(sc->mem_res, off, data, count); > +} > + > +static void > +sdhci_fsl_fdt_write_1(device_t dev, struct sdhci_slot *slot, bus_size_t > off, > + uint8_t val) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + uint32_t val32; > + > + sc = device_get_softc(dev); > + > + switch (off) { > + case SDHCI_HOST_CONTROL: > + val32 = RD4(sc, SDHCI_FSL_PROT_CTRL); > + val32 &= ~SDHCI_FSL_PROT_CTRL_WIDTH_MASK; > + val32 |= (val & SDHCI_CTRL_LED); > + > + if (val & SDHCI_CTRL_8BITBUS) > + val32 |= SDHCI_FSL_PROT_CTRL_WIDTH_8BIT; > + else > + /* Bus width is 1-bit when this flag is not set. */ > + val32 |= (val & SDHCI_CTRL_4BITBUS); > + /* Enable SDMA by masking out this field. */ > + val32 &= ~SDHCI_FSL_PROT_CTRL_DMA_MASK; > + val32 &= ~(SDHCI_CTRL_CARD_DET | SDHCI_CTRL_FORCE_CARD); > + val32 |= (val & (SDHCI_CTRL_CARD_DET | > + SDHCI_CTRL_FORCE_CARD)); > + WR4(sc, SDHCI_FSL_PROT_CTRL, val32); > + return; > + case SDHCI_POWER_CONTROL: > + return; > + case SDHCI_SOFTWARE_RESET: > + val &= ~SDHCI_RESET_ALL; > + /* FALLTHROUGH. */ > + default: > + val32 = RD4(sc, off & ~3); > + val32 &= ~(UINT8_MAX << (off & 3) * 8); > + val32 |= (val << (off & 3) * 8); > + WR4(sc, off & ~3, val32); > + return; > + } > +} > + > +static void > +sdhci_fsl_fdt_write_2(device_t dev, struct sdhci_slot *slot, bus_size_t > off, > + uint16_t val) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + uint32_t val32; > + > + sc = device_get_softc(dev); > + > + switch (off) { > + case SDHCI_CLOCK_CONTROL: > + fsl_sdhc_fdt_set_clock(sc, val); > + return; > + /* > + * eSDHC hardware combines command and mode into a single > + * register. Cache it here, so that command isn't written > + * until after mode. > + */ > + case SDHCI_TRANSFER_MODE: > + sc->cmd_and_mode = val; > + return; > + case SDHCI_COMMAND_FLAGS: > + sc->cmd_and_mode = > + (sc->cmd_and_mode & UINT16_MAX) | (val << 16); > + WR4(sc, SDHCI_TRANSFER_MODE, sc->cmd_and_mode); > + sc->cmd_and_mode = 0; > + return; > + default: > + val32 = RD4(sc, off & ~3); > + val32 &= ~(UINT16_MAX << (off & 3) * 8); > + val32 |= ((val & UINT16_MAX) << (off & 3) * 8); > + WR4(sc, off & ~3, val32); > + return; > + } > +} > + > +static void > +sdhci_fsl_fdt_write_4(device_t dev, struct sdhci_slot *slot, bus_size_t > off, > + uint32_t val) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + > + sc = device_get_softc(dev); > + > + switch (off) { > + case SDHCI_BUFFER: > + bus_write_4(sc->mem_res, off, val); > + return; > + /* > + * eSDHC hardware lacks support for the SDMA buffer boundary > + * feature and instead generates SDHCI_INT_DMA_END interrupts > + * after each completed DMA data transfer. > + * Since this duplicates the SDHCI_INT_DATA_END functionality, > + * mask out the unneeded SDHCI_INT_DMA_END interrupt. > + */ > + case SDHCI_INT_ENABLE: > + case SDHCI_SIGNAL_ENABLE: > + val &= ~SDHCI_INT_DMA_END; > + /* FALLTHROUGH. */ > + default: > + WR4(sc, off, val); > + return; > + } > +} > + > +static void > +sdhci_fsl_fdt_write_multi_4(device_t dev, struct sdhci_slot *slot, > + bus_size_t off, uint32_t *data, bus_size_t count) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + > + sc = device_get_softc(dev); > + bus_write_multi_4(sc->mem_res, off, data, count); > +} > + > +static void > +sdhci_fsl_fdt_irq(void *arg) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + > + sc = arg; > + sdhci_generic_intr(&sc->slot); > + return; > +} > + > +static int > +sdhci_fsl_fdt_get_ro(device_t bus, device_t child) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + > + sc = device_get_softc(bus); > + return (sdhci_fdt_gpio_get_readonly(sc->gpio)); > +} > + > +static bool > +sdhci_fsl_fdt_get_card_present(device_t dev, struct sdhci_slot *slot) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + > + sc = device_get_softc(dev); > + return (sdhci_fdt_gpio_get_present(sc->gpio)); > +} > + > +static int > +sdhci_fsl_fdt_attach(device_t dev) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + uint32_t val, buf_order; > + uintptr_t ocd_data; > + uint64_t clk_hz; > + phandle_t node; > + int rid, ret; > + clk_t clk; > + > + node = ofw_bus_get_node(dev); > + sc = device_get_softc(dev); > + ocd_data = ofw_bus_search_compatible(dev, > + sdhci_fsl_fdt_compat_data)->ocd_data; > + sc->soc_data = (struct sdhci_fsl_fdt_soc_data *)ocd_data; > + sc->dev = dev; > + sc->slot.quirks = sc->soc_data->quirks; > + > + rid = 0; > + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, > + RF_ACTIVE); > + if (sc->mem_res == NULL) { > + device_printf(dev, > + "Could not allocate resources for controller\n"); > + return (ENOMEM); > + } > + > + rid = 0; > + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, > + RF_ACTIVE); > + if (sc->irq_res == NULL) { > + device_printf(dev, > + "Could not allocate irq resources for controller\n"); > + ret = ENOMEM; > + goto err_free_mem; > + } > + > + ret = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO | INTR_MPSAFE, > + NULL, sdhci_fsl_fdt_irq, sc, &sc->irq_cookie); > + if (ret != 0) { > + device_printf(dev, "Could not setup IRQ handler\n"); > + goto err_free_irq_res; > + } > + > + ret = clk_get_by_ofw_index(dev, node, 0, &clk); > + if (ret != 0) { > + device_printf(dev, "Parent clock not found\n"); > + goto err_free_irq; > + } > + > + ret = clk_get_freq(clk, &clk_hz); > + if (ret != 0) { > + device_printf(dev, > + "Could not get parent clock frequency\n"); > + goto err_free_irq; > + } > + > + sc->baseclk_hz = clk_hz / 2; > + > + /* Figure out eSDHC block endianness before we touch any HW regs. */ > + if (OF_hasprop(node, "little-endian")) { > + sc->read = read_le; > + sc->write = write_le; > + buf_order = SDHCI_FSL_PROT_CTRL_BYTE_NATIVE; > + } else { > + sc->read = read_be; > + sc->write = write_be; > + buf_order = SDHCI_FSL_PROT_CTRL_BYTE_SWAP; > + } > + > + /* > + * Setting this register affects byte order in SDHCI_BUFFER only. > + * If the eSDHC block is connected over a big-endian bus, the data > + * read from/written to the buffer will be already byte swapped. > + * In such a case, setting SDHCI_FSL_PROT_CTRL_BYTE_SWAP will convert > + * the byte order again, resulting in a native byte order. > + * The read/write callbacks accommodate for this behavior. > + */ > + val = RD4(sc, SDHCI_FSL_PROT_CTRL); > + val &= ~SDHCI_FSL_PROT_CTRL_BYTE_MASK; > + WR4(sc, SDHCI_FSL_PROT_CTRL, val | buf_order); > + > + /* > + * Gate the SD clock and set its source to peripheral clock / 2. > + * The frequency in baseclk_hz is set to match this. > + */ > + val = RD4(sc, SDHCI_CLOCK_CONTROL); > + WR4(sc, SDHCI_CLOCK_CONTROL, val & ~SDHCI_FSL_CLK_SDCLKEN); > + val = RD4(sc, SDHCI_FSL_ESDHC_CTRL); > + WR4(sc, SDHCI_FSL_ESDHC_CTRL, val | SDHCI_FSL_ESDHC_CTRL_CLK_DIV2); > + sc->slot.max_clk = sc->baseclk_hz; > + sc->gpio = sdhci_fdt_gpio_setup(dev, &sc->slot); > + > + /* > + * Set the buffer watermark level to 128 words (512 bytes) for both > + * read and write. The hardware has a restriction that when the read or > + * write ready status is asserted, that means you can read exactly the > + * number of words set in the watermark register before you have to > + * re-check the status and potentially wait for more data. The main > + * sdhci driver provides no hook for doing status checking on less than > + * a full block boundary, so we set the watermark level to be a full > + * block. Reads and writes where the block size is less than the > + * watermark size will work correctly too, no need to change the > + * watermark for different size blocks. However, 128 is the maximum > + * allowed for the watermark, so PIO is limitted to 512 byte blocks. > + */ > + WR4(sc, SDHCI_FSL_WTMK_LVL, SDHCI_FSL_WTMK_WR_512B | > + SDHCI_FSL_WTMK_RD_512B); > + > + ret = sdhci_init_slot(dev, &sc->slot, 0); > + if (ret != 0) > + goto err_free_gpio; > + sc->slot_init_done = true; > + sdhci_start_slot(&sc->slot); > + > + return (bus_generic_attach(dev)); > + > +err_free_gpio: > + sdhci_fdt_gpio_teardown(sc->gpio); > +err_free_irq: > + bus_teardown_intr(dev, sc->irq_res, sc->irq_cookie); > +err_free_irq_res: > + bus_free_resource(dev, SYS_RES_IRQ, sc->irq_res); > +err_free_mem: > + bus_free_resource(dev, SYS_RES_MEMORY, sc->mem_res); > + return (ret); > +} > + > +static int > +sdhci_fsl_fdt_detach(device_t dev) > +{ > + struct sdhci_fsl_fdt_softc *sc; > + > + sc = device_get_softc(dev); > + if (sc->slot_init_done) > + sdhci_cleanup_slot(&sc->slot); > + if (sc->gpio != NULL) > + sdhci_fdt_gpio_teardown(sc->gpio); > + if (sc->irq_cookie != NULL) > + bus_teardown_intr(dev, sc->irq_res, sc->irq_cookie); > + if (sc->irq_res != NULL) > + bus_free_resource(dev, SYS_RES_IRQ, sc->irq_res); > + if (sc->mem_res != NULL) > + bus_free_resource(dev, SYS_RES_MEMORY, sc->mem_res); > + return (0); > +} > + > +static int > +sdhci_fsl_fdt_probe(device_t dev) > +{ > + > + if (!ofw_bus_status_okay(dev)) > + return (ENXIO); > + > + if (!ofw_bus_search_compatible(dev, > + sdhci_fsl_fdt_compat_data)->ocd_data) > + return (ENXIO); > + > + device_set_desc(dev, "NXP QorIQ Layerscape eSDHC controller"); > + return (BUS_PROBE_DEFAULT); > +} > + > +static int > +sdhci_fsl_fdt_read_ivar(device_t bus, device_t child, int which, > + uintptr_t *result) > +{ > + struct sdhci_slot *slot = device_get_ivars(child); > + > + if (which == MMCBR_IVAR_MAX_DATA && (slot->opt & SDHCI_HAVE_DMA)) { > + /* > + * In the absence of SDMA buffer boundary functionality, > + * limit the maximum data length per read/write command > + * to bounce buffer size. > + */ > + *result = howmany(slot->sdma_bbufsz, 512); > + return (0); > + } > + return (sdhci_generic_read_ivar(bus, child, which, result)); > +} > + > +static const device_method_t sdhci_fsl_fdt_methods[] = { > + /* Device interface. */ > + DEVMETHOD(device_probe, sdhci_fsl_fdt_probe), > + DEVMETHOD(device_attach, sdhci_fsl_fdt_attach), > + DEVMETHOD(device_detach, sdhci_fsl_fdt_detach), > + > + /* Bus interface. */ > + DEVMETHOD(bus_read_ivar, sdhci_fsl_fdt_read_ivar), > + DEVMETHOD(bus_write_ivar, sdhci_generic_write_ivar), > + > + /* MMC bridge interface. */ > + DEVMETHOD(mmcbr_update_ios, sdhci_generic_update_ios), > + DEVMETHOD(mmcbr_request, sdhci_generic_request), > + DEVMETHOD(mmcbr_get_ro, sdhci_fsl_fdt_get_ro), > + DEVMETHOD(mmcbr_acquire_host, sdhci_generic_acquire_host), > + DEVMETHOD(mmcbr_release_host, sdhci_generic_release_host), > + > + /* SDHCI accessors. */ > + DEVMETHOD(sdhci_read_1, sdhci_fsl_fdt_read_1), > + DEVMETHOD(sdhci_read_2, sdhci_fsl_fdt_read_2), > + DEVMETHOD(sdhci_read_4, sdhci_fsl_fdt_read_4), > + DEVMETHOD(sdhci_read_multi_4, sdhci_fsl_fdt_read_multi_4), > + DEVMETHOD(sdhci_write_1, sdhci_fsl_fdt_write_1), > + DEVMETHOD(sdhci_write_2, sdhci_fsl_fdt_write_2), > + DEVMETHOD(sdhci_write_4, sdhci_fsl_fdt_write_4), > + DEVMETHOD(sdhci_write_multi_4, sdhci_fsl_fdt_write_multi_4), > + DEVMETHOD(sdhci_get_card_present, sdhci_fsl_fdt_get_card_present), > + DEVMETHOD_END > +}; > + > +static devclass_t sdhci_fsl_fdt_devclass; > +static driver_t sdhci_fsl_fdt_driver = { > + "sdhci_fsl_fdt", > + sdhci_fsl_fdt_methods, > + sizeof(struct sdhci_fsl_fdt_softc), > +}; > + > +DRIVER_MODULE(sdhci_fsl_fdt, simplebus, sdhci_fsl_fdt_driver, > + sdhci_fsl_fdt_devclass, NULL, NULL); > +SDHCI_DEPEND(sdhci_fsl_fdt); > + > +#ifndef MMCCAM > +MMC_DECLARE_BRIDGE(sdhci_fsl_fdt); > +#endif > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" > -- Mateusz Guzik From owner-svn-src-all@freebsd.org Tue Sep 1 20:37:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9753E3D76AB for ; Tue, 1 Sep 2020 20:37:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgzQf0X78z4CyW for ; Tue, 1 Sep 2020 20:37:29 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x834.google.com with SMTP id d27so1993613qtg.4 for ; Tue, 01 Sep 2020 13:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=5gGikeCzqYISDQ2l7bjkL9TSGBGgBbGLqc3yC31Ze2c=; b=gNQJq+1/wFlITcb4KAR7AArx0dFIcQ+cHZ2cg5FNbydKaRvrI/lZDOFnGkucMQ0yNN l4jgEBWErWA/AgYBTxn8DIUGAFqGfaTzK3YEiNozy5P/XvGJtgB1gFRFuBHuPUqstX9q A3s5oMNBke0gHp1BamuzrMrM6B/LWTEx3K4AtmNNrpHEAdtutqdje2vXOak6aEIoVdML o+GOegNZ25BdorxdOlJfU8lFxlHk9R+lWputmlAsDuAIcQFIS2UnLcvctgkmy9MaaC4M hgjHMMW5eshyTCYok5LKmuHCLtyAdWTwPtLBumQu00dhipsUJYFJJZvryVWhPsglK2cQ 9iqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=5gGikeCzqYISDQ2l7bjkL9TSGBGgBbGLqc3yC31Ze2c=; b=aHZuKWdhL/vLl96QUnQuoekol9z8K4RSZ6sCAopqUhxzqrzv30pVhpZCN/UEnTcjCe QKqlILQkQZSyWqfrK22ICUf4hCbhA9vizofH8LkXPGcHShWgHDLZFTMN4aqUmqX+nKyr zwKiYeIbobpcq3o9SwnjJjvWscR4XMVcS7RxSbF6tVLFHyFXgl4eTt1RhsjvQ1jxH84q SVCrAN9uaqxue0MYWNX9S+zHulGTe4q4GuIMaS0c1l1cbtwxL3BWDO/FF8vZTprsSYog c4tFdUiIeRoZwJDDyaTtfLP1nqDEM528bCOYrRhTXX61I1aLPc+yr4YenD9EZ96xn0m9 /eoQ== X-Gm-Message-State: AOAM532cfgbNp5S3e2NB2z2GVtvpGcVynxUXHTamcK7ZHDtoS2VbOEie eaN5BuZF5aerCxdUxQOPBGuf4dLgmEosEyETtFVh8w== X-Google-Smtp-Source: ABdhPJzc/15w/61prHm1DyBS1zTwB6LzrvlEZ9X8KSBkc8jdfXkbN62cQpdVWITdkbcl7OwPE0cNGaOefwZ0VqUFwg4= X-Received: by 2002:ac8:4548:: with SMTP id z8mr3688143qtn.291.1598992648691; Tue, 01 Sep 2020 13:37:28 -0700 (PDT) MIME-Version: 1.0 References: <202009011611.081GBN9M025984@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 1 Sep 2020 14:37:16 -0600 Message-ID: Subject: Re: svn commit: r365052 - head/usr.bin/script To: Benjamin Kaduk Cc: Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 4BgzQf0X78z4CyW X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=gNQJq+1/; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::834) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.93 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.97)[-0.974]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.10)[0.103]; NEURAL_HAM_LONG(-1.06)[-1.057]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::834:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[svn-src-all] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 20:37:31 -0000 On Tue, Sep 1, 2020, 10:18 AM Benjamin Kaduk wrote: > On Tue, Sep 1, 2020 at 9:11 AM Warner Losh wrote: > >> Author: imp >> Date: Tue Sep 1 16:11:23 2020 >> New Revision: 365052 >> URL: https://svnweb.freebsd.org/changeset/base/365052 >> >> Log: >> Have script accept and ignore -e for Linux compat >> >> In the util-linux version of script, it will always exit with succes. >> Except when run with -e, in which case it will have the exit value of >> the child. BSD Script already uses the child's exit value for its exit >> value. Some config and other helper scripts depend on being able to >> specify -e. Accept it for compatibility since we'll already to the >> right thing, but otherwise we ignore it. >> >> > What kind of usage is not currently portable but becomes portable as a > result > of this change? I thought the BSD and GNU syntax was inherently pretty > different, > e.g., with '-c' for the command to run vs. implicit positional arguments, > and would > love to be able to retrain myself to something that works everywhere... > -c is also in my queue :). Warner > From owner-svn-src-all@freebsd.org Tue Sep 1 20:41:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B44AA3D7A99; Tue, 1 Sep 2020 20:41:48 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgzWc4Ntcz4DHW; Tue, 1 Sep 2020 20:41:48 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B43B1F1E7; Tue, 1 Sep 2020 20:41:48 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Kfm9w098075; Tue, 1 Sep 2020 20:41:48 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081KflZN098070; Tue, 1 Sep 2020 20:41:47 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202009012041.081KflZN098070@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Tue, 1 Sep 2020 20:41:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365061 - in head/sys: dev/bnxt dev/mgb dev/vmware/vmxnet3 net X-SVN-Group: head X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: in head/sys: dev/bnxt dev/mgb dev/vmware/vmxnet3 net X-SVN-Commit-Revision: 365061 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 20:41:48 -0000 Author: vmaffione Date: Tue Sep 1 20:41:47 2020 New Revision: 365061 URL: https://svnweb.freebsd.org/changeset/base/365061 Log: iflib: leave only 1 receive descriptor unused The pidx argument of isc_rxd_flush() indicates which is the last valid receive descriptor to be used by the NIC. However, current code has multiple issues: - Intel drivers write pidx to their RDT register, which means that NICs will only use the descriptors up to pidx-1 (modulo ring size N), and won't actually use the one pointed by pidx. This does not break reception, but it is anyway confusing and suboptimal (the NIC will actually see only N-2 descriptors as available, rather than N-1). Other drivers (if_vmx, if_bnxt, if_mgb) adhere to this semantic). - The semantic used by Intel (RDT is one descriptor past the last valid one) is used by most (if not all) NICs, and it is also used on the TX side (also in iflib). Since iflib is not currently using this semantic for RX, it must decrement fl->ifl_pidx (modulo N) before calling isc_rxd_flush(), and then the per-driver callback implementation must increment the index again (to match the real semantic). This is confusing and suboptimal. - The iflib refill function is also called at initialization. However, in case the ring size is smaller than 128 (e.g. if_mgb), the refill function will actually prepare all the receive descriptors (N), without leaving one unused, as most of NICs assume (e.g. to avoid RDT to overrun RDH). I can speculate that the code looks like this right now because this issue showed up during testing (e.g. with if_mgb), and it was easy to workaround by decrementing pidx before isc_rxd_flush(). The goal of this change is to simplify the code (removing a bunch of instructions from the RX fast path), and to make the semantic of isc_rxd_flush() consistent across drivers. To achieve this, we: - change the semantics of the pidx argument to the usual one (that is the index one past the last valid one), so that both iflib and drivers avoid the decrement/increment dance. - fix the initialization code to prepare at most N-1 descriptors. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D26191 Modified: head/sys/dev/bnxt/bnxt_txrx.c head/sys/dev/mgb/if_mgb.c head/sys/dev/mgb/if_mgb.h head/sys/dev/vmware/vmxnet3/if_vmx.c head/sys/net/iflib.c Modified: head/sys/dev/bnxt/bnxt_txrx.c ============================================================================== --- head/sys/dev/bnxt/bnxt_txrx.c Tue Sep 1 20:13:50 2020 (r365060) +++ head/sys/dev/bnxt/bnxt_txrx.c Tue Sep 1 20:41:47 2020 (r365061) @@ -316,10 +316,9 @@ bnxt_isc_rxd_flush(void *sc, uint16_t rxqid, uint8_t f if (softc->rx_cp_rings[rxqid].cons != UINT32_MAX) BNXT_CP_IDX_DISABLE_DB(&softc->rx_cp_rings[rxqid].ring, softc->rx_cp_rings[rxqid].cons); - /* We're given the last filled RX buffer here, not the next empty one */ - BNXT_RX_DB(rx_ring, RING_NEXT(rx_ring, pidx)); + BNXT_RX_DB(rx_ring, pidx); /* TODO: Cumulus+ doesn't need the double doorbell */ - BNXT_RX_DB(rx_ring, RING_NEXT(rx_ring, pidx)); + BNXT_RX_DB(rx_ring, pidx); return; } Modified: head/sys/dev/mgb/if_mgb.c ============================================================================== --- head/sys/dev/mgb/if_mgb.c Tue Sep 1 20:13:50 2020 (r365060) +++ head/sys/dev/mgb/if_mgb.c Tue Sep 1 20:41:47 2020 (r365061) @@ -1191,7 +1191,12 @@ mgb_isc_rxd_flush(void *xsc, uint16_t rxqid, uint8_t f sc = xsc; KASSERT(rxqid == 0, ("tried to flush RX Channel %d.\n", rxqid)); - sc->rx_ring_data.last_tail = pidx; + /* + * According to the programming guide, last_tail must be set to + * the last valid RX descriptor, rather than to the one past that. + * Note that this is not true for the TX ring! + */ + sc->rx_ring_data.last_tail = MGB_PREV_RING_IDX(pidx); CSR_WRITE_REG(sc, MGB_DMA_RX_TAIL(rxqid), sc->rx_ring_data.last_tail); return; } Modified: head/sys/dev/mgb/if_mgb.h ============================================================================== --- head/sys/dev/mgb/if_mgb.h Tue Sep 1 20:13:50 2020 (r365060) +++ head/sys/dev/mgb/if_mgb.h Tue Sep 1 20:41:47 2020 (r365061) @@ -178,7 +178,8 @@ #define MGB_DESC_GET_FRAME_LEN(_desc) \ (((_desc)->ctl & MGB_DESC_FRAME_LEN_MASK) >> 16) -#define MGB_NEXT_RING_IDX(_idx) (((_idx) + 1) % MGB_DMA_RING_SIZE) +#define MGB_NEXT_RING_IDX(_idx) (((_idx) == MGB_DMA_RING_SIZE - 1) ? 0 : ((_idx_) + 1)) +#define MGB_PREV_RING_IDX(_idx) (((_idx) == 0) ? (MGB_DMA_RING_SIZE - 1) : ((_idx_) - 1)) #define MGB_RING_SPACE(_sc) \ ((((_sc)->tx_ring_data.last_head - (_sc)->tx_ring_data.last_tail - 1) \ + MGB_DMA_RING_SIZE ) % MGB_DMA_RING_SIZE ) Modified: head/sys/dev/vmware/vmxnet3/if_vmx.c ============================================================================== --- head/sys/dev/vmware/vmxnet3/if_vmx.c Tue Sep 1 20:13:50 2020 (r365060) +++ head/sys/dev/vmware/vmxnet3/if_vmx.c Tue Sep 1 20:41:47 2020 (r365061) @@ -1744,13 +1744,6 @@ vmxnet3_isc_rxd_flush(void *vsc, uint16_t rxqid, uint8 else r = VMXNET3_BAR0_RXH2(rxqid); - /* - * pidx is the index of the last descriptor with a buffer the device - * can use, and the device needs to be told which index is one past - * that. - */ - if (++pidx == rxr->vxrxr_ndesc) - pidx = 0; vmxnet3_write_bar0(sc, r, pidx); } Modified: head/sys/net/iflib.c ============================================================================== --- head/sys/net/iflib.c Tue Sep 1 20:13:50 2020 (r365060) +++ head/sys/net/iflib.c Tue Sep 1 20:41:47 2020 (r365061) @@ -1959,7 +1959,8 @@ _rxq_refill_cb(void *arg, bus_dma_segment_t *segs, int * @count: the number of new buffers to allocate * * (Re)populate an rxq free-buffer list with up to @count new packet buffers. - * The caller must assure that @count does not exceed the queue's capacity. + * The caller must assure that @count does not exceed the queue's capacity + * minus one (since we always leave a descriptor unavailable). */ static uint8_t iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int count) @@ -1974,6 +1975,8 @@ iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int count int err, frag_idx, i, idx, n, pidx; qidx_t credits; + MPASS(count <= fl->ifl_size - fl->ifl_credits - 1); + sd_m = fl->ifl_sds.ifsd_m; sd_map = fl->ifl_sds.ifsd_map; sd_cl = fl->ifl_sds.ifsd_cl; @@ -2081,15 +2084,10 @@ iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int count fl->ifl_credits = credits; } DBG_COUNTER_INC(rxd_flush); - if (fl->ifl_pidx == 0) - pidx = fl->ifl_size - 1; - else - pidx = fl->ifl_pidx - 1; - bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_ifdi->idi_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); ctx->isc_rxd_flush(ctx->ifc_softc, fl->ifl_rxq->ifr_id, - fl->ifl_id, pidx); + fl->ifl_id, fl->ifl_pidx); if (__predict_true(bit_test(fl->ifl_rx_bitmap, frag_idx))) { fl->ifl_fragidx = frag_idx + 1; if (fl->ifl_fragidx == fl->ifl_size) @@ -2105,7 +2103,17 @@ iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int count static inline uint8_t iflib_fl_refill_all(if_ctx_t ctx, iflib_fl_t fl) { - /* we avoid allowing pidx to catch up with cidx as it confuses ixl */ + /* + * We leave an unused descriptor to avoid pidx to catch up with cidx. + * This is important as it confuses most NICs. For instance, + * Intel NICs have (per receive ring) RDH and RDT registers, where + * RDH points to the next receive descriptor to be used by the NIC, + * and RDT for the next receive descriptor to be published by the + * driver to the NIC (RDT - 1 is thus the last valid one). + * The condition RDH == RDT means no descriptors are available to + * the NIC, and thus it would be ambiguous if it also meant that + * all the descriptors are available to the NIC. + */ int32_t reclaimable = fl->ifl_size - fl->ifl_credits - 1; #ifdef INVARIANTS int32_t delta = fl->ifl_size - get_inuse(fl->ifl_size, fl->ifl_cidx, fl->ifl_pidx, fl->ifl_gen) - 1; @@ -2210,12 +2218,15 @@ iflib_fl_setup(iflib_fl_t fl) fl->ifl_zone = m_getzone(fl->ifl_buf_size); - /* avoid pre-allocating zillions of clusters to an idle card - * potentially speeding up attach + /* + * Avoid pre-allocating zillions of clusters to an idle card + * potentially speeding up attach. In any case make sure + * to leave a descriptor unavailable. See the comment in + * iflib_fl_refill_all(). */ - (void)iflib_fl_refill(ctx, fl, min(128, fl->ifl_size)); - MPASS(min(128, fl->ifl_size) == fl->ifl_credits); - if (min(128, fl->ifl_size) != fl->ifl_credits) + MPASS(fl->ifl_size > 0); + (void)iflib_fl_refill(ctx, fl, min(128, fl->ifl_size - 1)); + if (min(128, fl->ifl_size - 1) != fl->ifl_credits) return (ENOBUFS); /* * handle failure From owner-svn-src-all@freebsd.org Tue Sep 1 20:42:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D49FA3D785D; Tue, 1 Sep 2020 20:42:48 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgzXm5LWLz4DZw; Tue, 1 Sep 2020 20:42:48 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9ACF21F51E; Tue, 1 Sep 2020 20:42:48 +0000 (UTC) (envelope-from jmg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081KgmPs098171; Tue, 1 Sep 2020 20:42:48 GMT (envelope-from jmg@FreeBSD.org) Received: (from jmg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Kgm3k098170; Tue, 1 Sep 2020 20:42:48 GMT (envelope-from jmg@FreeBSD.org) Message-Id: <202009012042.081Kgm3k098170@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jmg set sender to jmg@FreeBSD.org using -f From: John-Mark Gurney Date: Tue, 1 Sep 2020 20:42:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365062 - head/share/man/man9 X-SVN-Group: head X-SVN-Commit-Author: jmg X-SVN-Commit-Paths: head/share/man/man9 X-SVN-Commit-Revision: 365062 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 20:42:48 -0000 Author: jmg Date: Tue Sep 1 20:42:48 2020 New Revision: 365062 URL: https://svnweb.freebsd.org/changeset/base/365062 Log: add Xr to device_get_sysctl(9) to make this easier to find Modified: head/share/man/man9/sysctl.9 Modified: head/share/man/man9/sysctl.9 ============================================================================== --- head/share/man/man9/sysctl.9 Tue Sep 1 20:41:47 2020 (r365061) +++ head/share/man/man9/sysctl.9 Tue Sep 1 20:42:48 2020 (r365062) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 23, 2020 +.Dd September 1, 2020 .Dt SYSCTL 9 .Os .Sh NAME @@ -1041,6 +1041,7 @@ For example: .Sh SEE ALSO .Xr sysctl 3 , .Xr sysctl 8 , +.Xr device_get_sysctl 9 , .Xr sysctl_add_oid 9 , .Xr sysctl_ctx_free 9 , .Xr sysctl_ctx_init 9 , From owner-svn-src-all@freebsd.org Tue Sep 1 20:45:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C62B3D7C2E; Tue, 1 Sep 2020 20:45:34 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgzby0tX1z4Dxk; Tue, 1 Sep 2020 20:45:34 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0211A1EFE8; Tue, 1 Sep 2020 20:45:34 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081KjXwg098378; Tue, 1 Sep 2020 20:45:33 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081KjXNF098377; Tue, 1 Sep 2020 20:45:33 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202009012045.081KjXNF098377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Tue, 1 Sep 2020 20:45:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365063 - stable/12/sys/net X-SVN-Group: stable-12 X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: stable/12/sys/net X-SVN-Commit-Revision: 365063 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 20:45:34 -0000 Author: vmaffione Date: Tue Sep 1 20:45:33 2020 New Revision: 365063 URL: https://svnweb.freebsd.org/changeset/base/365063 Log: MFC r364164 iflib: refactor netmap_fl_refill and fix off-by-one issue First, fix the initialization of the fl->ifl_rxd_idxs array, which was affected by an off-by-one bug. Once there, refactor the function to use better names for local variables, optimize the variable assignments, and merge the bus_dmamap_sync() inner loop with the outer one. PR: 248494 Modified: stable/12/sys/net/iflib.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/net/iflib.c ============================================================================== --- stable/12/sys/net/iflib.c Tue Sep 1 20:42:48 2020 (r365062) +++ stable/12/sys/net/iflib.c Tue Sep 1 20:45:33 2020 (r365063) @@ -843,39 +843,41 @@ netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring struct if_rxd_update iru; if_ctx_t ctx = rxq->ifr_ctx; iflib_fl_t fl = &rxq->ifr_fl[0]; - uint32_t refill_pidx, nic_i; + uint32_t nic_i_first, nic_i; + int i; #if IFLIB_DEBUG_COUNTERS int rf_count = 0; #endif if (nm_i == head && __predict_true(!init)) - return 0; + return (0); + iru_init(&iru, rxq, 0 /* flid */); map = fl->ifl_sds.ifsd_map; - refill_pidx = netmap_idx_k2n(kring, nm_i); + nic_i = netmap_idx_k2n(kring, nm_i); /* * IMPORTANT: we must leave one free slot in the ring, * so move head back by one unit */ head = nm_prev(head, lim); - nic_i = UINT_MAX; DBG_COUNTER_INC(fl_refills); while (nm_i != head) { #if IFLIB_DEBUG_COUNTERS if (++rf_count == 9) DBG_COUNTER_INC(fl_refills_large); #endif - for (int tmp_pidx = 0; tmp_pidx < IFLIB_MAX_RX_REFRESH && nm_i != head; tmp_pidx++) { + nic_i_first = nic_i; + for (i = 0; i < IFLIB_MAX_RX_REFRESH && nm_i != head; i++) { struct netmap_slot *slot = &ring->slot[nm_i]; - void *addr = PNMB(na, slot, &fl->ifl_bus_addrs[tmp_pidx]); - uint32_t nic_i_dma = refill_pidx; - nic_i = netmap_idx_k2n(kring, nm_i); + void *addr = PNMB(na, slot, &fl->ifl_bus_addrs[i]); - MPASS(tmp_pidx < IFLIB_MAX_RX_REFRESH); + MPASS(i < IFLIB_MAX_RX_REFRESH); if (addr == NETMAP_BUF_BASE(na)) /* bad buf */ return netmap_ring_reinit(kring); + fl->ifl_rxd_idxs[i] = nic_i; + if (__predict_false(init)) { netmap_load_map(na, fl->ifl_buf_tag, map[nic_i], addr); @@ -884,33 +886,25 @@ netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring netmap_reload_map(na, fl->ifl_buf_tag, map[nic_i], addr); } + bus_dmamap_sync(fl->ifl_buf_tag, map[nic_i], + BUS_DMASYNC_PREREAD); slot->flags &= ~NS_BUF_CHANGED; nm_i = nm_next(nm_i, lim); - fl->ifl_rxd_idxs[tmp_pidx] = nic_i = nm_next(nic_i, lim); - if (nm_i != head && tmp_pidx < IFLIB_MAX_RX_REFRESH-1) - continue; - - iru.iru_pidx = refill_pidx; - iru.iru_count = tmp_pidx+1; - ctx->isc_rxd_refill(ctx->ifc_softc, &iru); - refill_pidx = nic_i; - for (int n = 0; n < iru.iru_count; n++) { - bus_dmamap_sync(fl->ifl_buf_tag, map[nic_i_dma], - BUS_DMASYNC_PREREAD); - /* XXX - change this to not use the netmap func*/ - nic_i_dma = nm_next(nic_i_dma, lim); - } + nic_i = nm_next(nic_i, lim); } + + iru.iru_pidx = nic_i_first; + iru.iru_count = i; + ctx->isc_rxd_refill(ctx->ifc_softc, &iru); } kring->nr_hwcur = head; bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_ifdi->idi_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - if (__predict_true(nic_i != UINT_MAX)) { - ctx->isc_rxd_flush(ctx->ifc_softc, rxq->ifr_id, fl->ifl_id, nic_i); - DBG_COUNTER_INC(rxd_flush); - } + ctx->isc_rxd_flush(ctx->ifc_softc, rxq->ifr_id, fl->ifl_id, nic_i); + DBG_COUNTER_INC(rxd_flush); + return (0); } From owner-svn-src-all@freebsd.org Tue Sep 1 20:47:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F2BF13D7DA5; Tue, 1 Sep 2020 20:47:59 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgzfl5zVKz4DrF; Tue, 1 Sep 2020 20:47:59 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B1F051F59C; Tue, 1 Sep 2020 20:47:59 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081KlxHe098567; Tue, 1 Sep 2020 20:47:59 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081KlxC2098565; Tue, 1 Sep 2020 20:47:59 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202009012047.081KlxC2098565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Tue, 1 Sep 2020 20:47:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365064 - stable/12/sys/net X-SVN-Group: stable-12 X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: stable/12/sys/net X-SVN-Commit-Revision: 365064 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 20:48:00 -0000 Author: vmaffione Date: Tue Sep 1 20:47:59 2020 New Revision: 365064 URL: https://svnweb.freebsd.org/changeset/base/365064 Log: MFC r364165 iflib: netmap: improve rxsync to support IFLIB_HAS_RXCQ For drivers with IFLIB_HAS_RXCQ set, there is a separate completion queue. In this case, the netmap rxsync routine needs to update rxq->ifr_cq_cidx in the same way it is updated by iflib_rxeof(). This improves the situation for vmx(4) and bnxt(4) drivers, which use iflib and have the IFLIB_HAS_RXCQ bit set. PR: 248494 Modified: stable/12/sys/net/iflib.c stable/12/sys/net/iflib.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/net/iflib.c ============================================================================== --- stable/12/sys/net/iflib.c Tue Sep 1 20:45:33 2020 (r365063) +++ stable/12/sys/net/iflib.c Tue Sep 1 20:47:59 2020 (r365064) @@ -425,7 +425,7 @@ struct iflib_rxq { uint64_t ifr_rx_irq; /* * If there is a separate completion queue (IFLIB_HAS_RXCQ), this is - * the command queue consumer index. Otherwise it's unused. + * the completion queue consumer index. Otherwise it's unused. */ qidx_t ifr_cq_cidx; uint16_t ifr_id; @@ -1082,9 +1082,12 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR; if_ctx_t ctx = ifp->if_softc; + if_shared_ctx_t sctx = ctx->ifc_sctx; + if_softc_ctx_t scctx = &ctx->ifc_softc_ctx; iflib_rxq_t rxq = &ctx->ifc_rxqs[kring->ring_id]; iflib_fl_t fl = &rxq->ifr_fl[0]; struct if_rxd_info ri; + qidx_t *cidxp; /* * netmap only uses free list 0, to avoid out of order consumption @@ -1098,40 +1101,56 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl * First part: import newly received packets. * * nm_i is the index of the next free slot in the netmap ring, - * nic_i is the index of the next received packet in the NIC ring, - * and they may differ in case if_init() has been called while + * nic_i is the index of the next received packet in the NIC ring + * (or in the free list 0 if IFLIB_HAS_RXCQ is set), and they may + * differ in case if_init() has been called while * in netmap mode. For the receive ring we have * - * nic_i = rxr->next_check; + * nic_i = fl->ifl_cidx; * nm_i = kring->nr_hwtail (previous) * and * nm_i == (nic_i + kring->nkr_hwofs) % ring_size * - * rxr->next_check is set to 0 on a ring reinit + * fl->ifl_cidx is set to 0 on a ring reinit */ if (netmap_no_pendintr || force_update) { uint32_t hwtail_lim = nm_prev(kring->nr_hwcur, lim); + bool have_rxcq = sctx->isc_flags & IFLIB_HAS_RXCQ; int crclen = iflib_crcstrip ? 0 : 4; int error, avail; + /* + * For the free list consumer index, we use the same + * logic as in iflib_rxeof(). + */ + if (have_rxcq) + cidxp = &rxq->ifr_cq_cidx; + else + cidxp = &fl->ifl_cidx; + avail = ctx->isc_rxd_available(ctx->ifc_softc, + rxq->ifr_id, *cidxp, USHRT_MAX); + nic_i = fl->ifl_cidx; nm_i = netmap_idx_n2k(kring, nic_i); - avail = ctx->isc_rxd_available(ctx->ifc_softc, - rxq->ifr_id, nic_i, USHRT_MAX); for (n = 0; avail > 0 && nm_i != hwtail_lim; n++, avail--) { rxd_info_zero(&ri); ri.iri_frags = rxq->ifr_frags; ri.iri_qsidx = kring->ring_id; ri.iri_ifp = ctx->ifc_ifp; - ri.iri_cidx = nic_i; + ri.iri_cidx = *cidxp; error = ctx->isc_rxd_pkt_get(ctx->ifc_softc, &ri); ring->slot[nm_i].len = error ? 0 : ri.iri_len - crclen; ring->slot[nm_i].flags = 0; + if (have_rxcq) { + *cidxp = ri.iri_cidx; + while (*cidxp >= scctx->isc_nrxd[0]) + *cidxp -= scctx->isc_nrxd[0]; + } bus_dmamap_sync(fl->ifl_buf_tag, fl->ifl_sds.ifsd_map[nic_i], BUS_DMASYNC_POSTREAD); nm_i = nm_next(nm_i, lim); - nic_i = nm_next(nic_i, lim); + fl->ifl_cidx = nic_i = nm_next(nic_i, lim); } if (n) { /* update the state variables */ if (netmap_no_pendintr && !force_update) { @@ -1139,7 +1158,6 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl iflib_rx_miss ++; iflib_rx_miss_bufs += n; } - fl->ifl_cidx = nic_i; kring->nr_hwtail = nm_i; } kring->nr_kflags &= ~NKR_PENDINTR; Modified: stable/12/sys/net/iflib.h ============================================================================== --- stable/12/sys/net/iflib.h Tue Sep 1 20:45:33 2020 (r365063) +++ stable/12/sys/net/iflib.h Tue Sep 1 20:47:59 2020 (r365064) @@ -295,7 +295,7 @@ typedef enum { /* - * Interface has a separate command queue for RX + * Interface has a separate completion queue for RX */ #define IFLIB_HAS_RXCQ 0x01 /* @@ -307,7 +307,7 @@ typedef enum { */ #define IFLIB_IS_VF 0x04 /* - * Interface has a separate command queue for TX + * Interface has a separate completion queue for TX */ #define IFLIB_HAS_TXCQ 0x08 /* From owner-svn-src-all@freebsd.org Tue Sep 1 20:50:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AAC353D7CB7; Tue, 1 Sep 2020 20:50:17 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgzjP40k6z4FCj; Tue, 1 Sep 2020 20:50:17 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 692661F5A2; Tue, 1 Sep 2020 20:50:17 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081KoHXO098771; Tue, 1 Sep 2020 20:50:17 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081KoHWF098770; Tue, 1 Sep 2020 20:50:17 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202009012050.081KoHWF098770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Tue, 1 Sep 2020 20:50:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365065 - stable/12/sys/net X-SVN-Group: stable-12 X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: stable/12/sys/net X-SVN-Commit-Revision: 365065 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 20:50:17 -0000 Author: vmaffione Date: Tue Sep 1 20:50:16 2020 New Revision: 365065 URL: https://svnweb.freebsd.org/changeset/base/365065 Log: MFC r364655 iflib: fix isc_rxd_flush call in netmap_fl_refill() The semantic of the pidx argument of isc_rxd_flush() is the last valid index of in the free list, rather than the next index to be published. However, netmap was still using the old convention. While there, also refactor the netmap_fl_refill() to simplify a little bit and add an assertion. Modified: stable/12/sys/net/iflib.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/net/iflib.c ============================================================================== --- stable/12/sys/net/iflib.c Tue Sep 1 20:47:59 2020 (r365064) +++ stable/12/sys/net/iflib.c Tue Sep 1 20:50:16 2020 (r365065) @@ -762,7 +762,7 @@ iflib_num_tx_descs(if_ctx_t ctx) MODULE_DEPEND(iflib, netmap, 1, 1, 1); -static int netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, uint32_t nm_i, bool init); +static int netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, bool init); /* * device-specific sysctl variables: @@ -833,33 +833,43 @@ iflib_netmap_register(struct netmap_adapter *na, int o } static int -netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, uint32_t nm_i, bool init) +netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, bool init) { struct netmap_adapter *na = kring->na; u_int const lim = kring->nkr_num_slots - 1; u_int head = kring->rhead; + u_int nm_i = kring->nr_hwcur; struct netmap_ring *ring = kring->ring; bus_dmamap_t *map; struct if_rxd_update iru; if_ctx_t ctx = rxq->ifr_ctx; iflib_fl_t fl = &rxq->ifr_fl[0]; - uint32_t nic_i_first, nic_i; + u_int nic_i_first, nic_i; int i; #if IFLIB_DEBUG_COUNTERS int rf_count = 0; #endif - if (nm_i == head && __predict_true(!init)) + /* + * Netmap requires that we leave (at least) one free slot + * in the ring, so that it can distinguish between an empty + * ring (nr_hwcur == nr_hwtail, i.e. all the buffers owned by the + * user) and a full ring (nr_hwtail == (nr_hwcur - 1) mod N, i.e. + * all the buffers owned by the kernel). + * We thus set head (the refill limit) to nr_hwcur - 1 + * at initialization. The rest of the code will then make sure + * than nr_hwtail never overcomes nr_hwcur. + */ + if (__predict_false(init)) { + head = nm_prev(nm_i, lim); + } else if (nm_i == head) { + /* Nothing to do. We can leave early. */ return (0); + } iru_init(&iru, rxq, 0 /* flid */); map = fl->ifl_sds.ifsd_map; nic_i = netmap_idx_k2n(kring, nm_i); - /* - * IMPORTANT: we must leave one free slot in the ring, - * so move head back by one unit - */ - head = nm_prev(head, lim); DBG_COUNTER_INC(fl_refills); while (nm_i != head) { #if IFLIB_DEBUG_COUNTERS @@ -900,9 +910,13 @@ netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring } kring->nr_hwcur = head; + /* The pidx argument of isc_rxd_flush() is the index of the last valid + * slot in the free list ring. We need therefore to decrement nic_i, + * similarly to what happens in iflib_fl_refill() for ifl_pidx. */ bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_ifdi->idi_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - ctx->isc_rxd_flush(ctx->ifc_softc, rxq->ifr_id, fl->ifl_id, nic_i); + ctx->isc_rxd_flush(ctx->ifc_softc, rxq->ifr_id, fl->ifl_id, + nm_prev(nic_i, lim)); DBG_COUNTER_INC(rxd_flush); return (0); @@ -1132,6 +1146,7 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl nic_i = fl->ifl_cidx; nm_i = netmap_idx_n2k(kring, nic_i); + MPASS(nm_i == kring->nr_hwtail); for (n = 0; avail > 0 && nm_i != hwtail_lim; n++, avail--) { rxd_info_zero(&ri); ri.iri_frags = rxq->ifr_frags; @@ -1170,9 +1185,9 @@ iflib_netmap_rxsync(struct netmap_kring *kring, int fl * nic_i is the index in the NIC ring, and * nm_i == (nic_i + kring->nkr_hwofs) % ring_size */ - nm_i = kring->nr_hwcur; + netmap_fl_refill(rxq, kring, false); - return (netmap_fl_refill(rxq, kring, nm_i, false)); + return (0); } static void @@ -1244,14 +1259,12 @@ iflib_netmap_rxq_init(if_ctx_t ctx, iflib_rxq_t rxq) struct netmap_adapter *na = NA(ctx->ifc_ifp); struct netmap_kring *kring; struct netmap_slot *slot; - uint32_t nm_i; slot = netmap_reset(na, NR_RX, rxq->ifr_id, 0); if (slot == NULL) return (0); kring = na->rx_rings[rxq->ifr_id]; - nm_i = netmap_idx_n2k(kring, 0); - netmap_fl_refill(rxq, kring, nm_i, true); + netmap_fl_refill(rxq, kring, true); return (1); } From owner-svn-src-all@freebsd.org Tue Sep 1 20:58:24 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 54B9E37822F; Tue, 1 Sep 2020 20:58:24 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgztm1bj3z4G33; Tue, 1 Sep 2020 20:58:24 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 174761F7A2; Tue, 1 Sep 2020 20:58:24 +0000 (UTC) (envelope-from vmaffione@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081KwNV3005417; Tue, 1 Sep 2020 20:58:23 GMT (envelope-from vmaffione@FreeBSD.org) Received: (from vmaffione@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081KwNUE005416; Tue, 1 Sep 2020 20:58:23 GMT (envelope-from vmaffione@FreeBSD.org) Message-Id: <202009012058.081KwNUE005416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vmaffione set sender to vmaffione@FreeBSD.org using -f From: Vincenzo Maffione Date: Tue, 1 Sep 2020 20:58:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365066 - stable/12/sys/net X-SVN-Group: stable-12 X-SVN-Commit-Author: vmaffione X-SVN-Commit-Paths: stable/12/sys/net X-SVN-Commit-Revision: 365066 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 20:58:24 -0000 Author: vmaffione Date: Tue Sep 1 20:58:23 2020 New Revision: 365066 URL: https://svnweb.freebsd.org/changeset/base/365066 Log: r364770 iflib: netmap: publish all the receive buffer At initialization time, the netmap RX refill function used to prepare the NIC RX ring with N-1 buffers rather than N (with N equal to the number of descriptors in the NIC RX ring). This is not how netmap is supposed to work, as it would keep kring->nr_hwcur not in sync with the NIC "next index to refill" (i.e., fl->ifl_pidx). Instead we prepare N buffers, although we still publish (with isc_rxd_flush()) only the first N-1 buffers, to avoid the NIC producer pointer to overrun the NIC consumer pointer (for NICs where this is a real issue, e.g. Intel ones). Modified: stable/12/sys/net/iflib.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/net/iflib.c ============================================================================== --- stable/12/sys/net/iflib.c Tue Sep 1 20:50:16 2020 (r365065) +++ stable/12/sys/net/iflib.c Tue Sep 1 20:58:23 2020 (r365066) @@ -837,7 +837,6 @@ netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring { struct netmap_adapter *na = kring->na; u_int const lim = kring->nkr_num_slots - 1; - u_int head = kring->rhead; u_int nm_i = kring->nr_hwcur; struct netmap_ring *ring = kring->ring; bus_dmamap_t *map; @@ -845,39 +844,46 @@ netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring if_ctx_t ctx = rxq->ifr_ctx; iflib_fl_t fl = &rxq->ifr_fl[0]; u_int nic_i_first, nic_i; - int i; + int i, n; #if IFLIB_DEBUG_COUNTERS int rf_count = 0; #endif /* - * Netmap requires that we leave (at least) one free slot - * in the ring, so that it can distinguish between an empty - * ring (nr_hwcur == nr_hwtail, i.e. all the buffers owned by the - * user) and a full ring (nr_hwtail == (nr_hwcur - 1) mod N, i.e. - * all the buffers owned by the kernel). - * We thus set head (the refill limit) to nr_hwcur - 1 - * at initialization. The rest of the code will then make sure - * than nr_hwtail never overcomes nr_hwcur. + * This function is used both at initialization and in rxsync. + * At initialization we need to prepare (with isc_rxd_refill()) + * all the (N) netmap buffers in the ring, in such a way to keep + * fl->ifl_pidx and kring->nr_hwcur in sync (except for + * kring->nkr_hwofs); at rxsync time, both indexes point to the + * next buffer to be refilled. + * In any case we publish (with isc_rxd_flush()) up to + * (fl->ifl_pidx - 1) % N (included), to avoid the NIC tail/prod + * pointer to overrun the head/cons pointer, although this is + * not necessary for some NICs (e.g. vmx). */ - if (__predict_false(init)) { - head = nm_prev(nm_i, lim); - } else if (nm_i == head) { - /* Nothing to do. We can leave early. */ - return (0); + if (__predict_false(init)) + n = kring->nkr_num_slots; + else { + n = kring->rhead - nm_i; + if (n == 0) + return (0); /* Nothing to do. */ + if (n < 0) + n += kring->nkr_num_slots; } + /* Start to refill from nr_hwcur, publishing n buffers. */ iru_init(&iru, rxq, 0 /* flid */); map = fl->ifl_sds.ifsd_map; - nic_i = netmap_idx_k2n(kring, nm_i); + nic_i = fl->ifl_pidx; + MPASS(nic_i == netmap_idx_k2n(kring, nm_i)); DBG_COUNTER_INC(fl_refills); - while (nm_i != head) { + while (n > 0) { #if IFLIB_DEBUG_COUNTERS if (++rf_count == 9) DBG_COUNTER_INC(fl_refills_large); #endif nic_i_first = nic_i; - for (i = 0; i < IFLIB_MAX_RX_REFRESH && nm_i != head; i++) { + for (i = 0; n > 0 && i < IFLIB_MAX_RX_REFRESH; n--, i++) { struct netmap_slot *slot = &ring->slot[nm_i]; void *addr = PNMB(na, slot, &fl->ifl_bus_addrs[i]); @@ -908,11 +914,11 @@ netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring iru.iru_count = i; ctx->isc_rxd_refill(ctx->ifc_softc, &iru); } - kring->nr_hwcur = head; + fl->ifl_pidx = nic_i; + MPASS(!init || nm_i == 0); + MPASS(nm_i == kring->rhead); + kring->nr_hwcur = nm_i; - /* The pidx argument of isc_rxd_flush() is the index of the last valid - * slot in the free list ring. We need therefore to decrement nic_i, - * similarly to what happens in iflib_fl_refill() for ifl_pidx. */ bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_ifdi->idi_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); ctx->isc_rxd_flush(ctx->ifc_softc, rxq->ifr_id, fl->ifl_id, From owner-svn-src-all@freebsd.org Tue Sep 1 21:17:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A9B66378DCE; Tue, 1 Sep 2020 21:17:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0JG4PJFz4H9m; Tue, 1 Sep 2020 21:17:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 79FAF1FAC8; Tue, 1 Sep 2020 21:17:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LH2Yc017564; Tue, 1 Sep 2020 21:17:02 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LGsmb017521; Tue, 1 Sep 2020 21:16:54 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012116.081LGsmb017521@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:16:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365067 - in head/sys/amd64: acpica amd64 cloudabi64 ia32 include include/pc linux linux32 sgx vmm vmm/amd vmm/intel vmm/io X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/amd64: acpica amd64 cloudabi64 ia32 include include/pc linux linux32 sgx vmm vmm/amd vmm/intel vmm/io X-SVN-Commit-Revision: 365067 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:17:02 -0000 Author: mjg Date: Tue Sep 1 21:16:54 2020 New Revision: 365067 URL: https://svnweb.freebsd.org/changeset/base/365067 Log: amd64: clean up empty lines in .c and .h files Modified: head/sys/amd64/acpica/acpi_machdep.c head/sys/amd64/amd64/bios.c head/sys/amd64/amd64/copyout.c head/sys/amd64/amd64/db_disasm.c head/sys/amd64/amd64/db_trace.c head/sys/amd64/amd64/fpu.c head/sys/amd64/amd64/gdb_machdep.c head/sys/amd64/amd64/genassym.c head/sys/amd64/amd64/machdep.c head/sys/amd64/amd64/mem.c head/sys/amd64/amd64/mp_machdep.c head/sys/amd64/amd64/pmap.c head/sys/amd64/amd64/trap.c head/sys/amd64/cloudabi64/cloudabi64_sysvec.c head/sys/amd64/ia32/ia32_reg.c head/sys/amd64/include/param.h head/sys/amd64/include/pc/bios.h head/sys/amd64/include/vmm.h head/sys/amd64/include/vmm_snapshot.h head/sys/amd64/include/vmparam.h head/sys/amd64/linux/linux_proto.h head/sys/amd64/linux32/linux32_machdep.c head/sys/amd64/linux32/linux32_proto.h head/sys/amd64/linux32/linux32_sysvec.c head/sys/amd64/sgx/sgx.c head/sys/amd64/vmm/amd/amdvi_hw.c head/sys/amd64/vmm/amd/ivrs_drv.c head/sys/amd64/vmm/amd/npt.c head/sys/amd64/vmm/amd/svm.c head/sys/amd64/vmm/intel/vmcs.c head/sys/amd64/vmm/intel/vmx_msr.c head/sys/amd64/vmm/intel/vtd.c head/sys/amd64/vmm/io/ppt.c head/sys/amd64/vmm/io/vatpic.c head/sys/amd64/vmm/io/vatpit.c head/sys/amd64/vmm/io/vlapic.c head/sys/amd64/vmm/vmm.c head/sys/amd64/vmm/vmm_stat.h Modified: head/sys/amd64/acpica/acpi_machdep.c ============================================================================== --- head/sys/amd64/acpica/acpi_machdep.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/acpica/acpi_machdep.c Tue Sep 1 21:16:54 2020 (r365067) @@ -282,7 +282,6 @@ static device_method_t nexus_acpi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, nexus_acpi_probe), DEVMETHOD(device_attach, nexus_acpi_attach), - { 0, 0 } }; Modified: head/sys/amd64/amd64/bios.c ============================================================================== --- head/sys/amd64/amd64/bios.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/bios.c Tue Sep 1 21:16:54 2020 (r365067) @@ -85,7 +85,6 @@ bios_sigsearch(u_int32_t start, u_char *sig, int sigle /* loop searching */ while ((sp + sigofs + siglen) < end) { - /* compare here */ if (!bcmp(sp + sigofs, sig, siglen)) { /* convert back to physical address */ Modified: head/sys/amd64/amd64/copyout.c ============================================================================== --- head/sys/amd64/amd64/copyout.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/copyout.c Tue Sep 1 21:16:54 2020 (r365067) @@ -177,7 +177,6 @@ DEFINE_IFUNC(, int, copyin, (const void *, void *, siz return (copyin_smap_erms); default: return (copyin_nosmap_std); - } } Modified: head/sys/amd64/amd64/db_disasm.c ============================================================================== --- head/sys/amd64/amd64/db_disasm.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/db_disasm.c Tue Sep 1 21:16:54 2020 (r365067) @@ -992,7 +992,6 @@ struct i_addr { }; static const char * const db_reg[2][4][16] = { - {{"%al", "%cl", "%dl", "%bl", "%ah", "%ch", "%dh", "%bh", "%r8b", "%r9b", "%r10b", "%r11b", "%r12b", "%r13b", "%r14b", "%r15b" }, { "%ax", "%cx", "%dx", "%bx", "%sp", "%bp", "%si", "%di", @@ -1573,7 +1572,6 @@ db_disasm(db_addr_t loc, bool altfmt) db_printf(","); switch (i_mode & 0xFF) { - case E: db_print_address(seg, size, rex, &address); break; Modified: head/sys/amd64/amd64/db_trace.c ============================================================================== --- head/sys/amd64/amd64/db_trace.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/db_trace.c Tue Sep 1 21:16:54 2020 (r365067) @@ -454,7 +454,6 @@ amd64_set_watch(watchnum, watchaddr, size, access, d) return (watchnum); } - int amd64_clr_watch(watchnum, d) int watchnum; @@ -470,7 +469,6 @@ amd64_clr_watch(watchnum, d) return (0); } - int db_md_set_watchpoint(addr, size) db_expr_t addr; @@ -538,7 +536,6 @@ db_md_clr_watchpoint(addr, size) if (DBREG_DRX((d), i) >= addr && DBREG_DRX((d), i) < addr + size) amd64_clr_watch(i, d); - } } @@ -554,7 +551,6 @@ db_md_clr_watchpoint(addr, size) return (0); } - static const char * watchtype_str(type) int type; @@ -566,7 +562,6 @@ watchtype_str(type) default : return "invalid"; break; } } - void db_md_list_watchpoints(void) Modified: head/sys/amd64/amd64/fpu.c ============================================================================== --- head/sys/amd64/amd64/fpu.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/fpu.c Tue Sep 1 21:16:54 2020 (r365067) @@ -1002,7 +1002,6 @@ static device_method_t fpupnp_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), - { 0, 0 } }; Modified: head/sys/amd64/amd64/gdb_machdep.c ============================================================================== --- head/sys/amd64/amd64/gdb_machdep.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/gdb_machdep.c Tue Sep 1 21:16:54 2020 (r365067) @@ -138,4 +138,3 @@ gdb_end_write(void *arg) restore_wp(arg != NULL); } - Modified: head/sys/amd64/amd64/genassym.c ============================================================================== --- head/sys/amd64/amd64/genassym.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/genassym.c Tue Sep 1 21:16:54 2020 (r365067) @@ -238,7 +238,7 @@ ASSYM(PC_IBPB_SET, offsetof(struct pcpu, pc_ibpb_set)) ASSYM(PC_MDS_TMP, offsetof(struct pcpu, pc_mds_tmp)); ASSYM(PC_MDS_BUF, offsetof(struct pcpu, pc_mds_buf)); ASSYM(PC_MDS_BUF64, offsetof(struct pcpu, pc_mds_buf64)); - + ASSYM(LA_EOI, LAPIC_EOI * LAPIC_MEM_MUL); ASSYM(LA_ISR, LAPIC_ISR0 * LAPIC_MEM_MUL); Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/machdep.c Tue Sep 1 21:16:54 2020 (r365067) @@ -575,7 +575,7 @@ sys_sigreturn(td, uap) int freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap) { - + return sys_sigreturn(td, (struct sigreturn_args *)uap); } #endif @@ -1807,7 +1807,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) initializecpu(); /* Initialize CPU registers */ amd64_bsp_ist_init(pc); - + /* Set the IO permission bitmap (empty due to tss seg limit) */ pc->pc_common_tss.tss_iobase = sizeof(struct amd64tss) + IOPERM_BITMAP_SIZE; Modified: head/sys/amd64/amd64/mem.c ============================================================================== --- head/sys/amd64/amd64/mem.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/mem.c Tue Sep 1 21:16:54 2020 (r365067) @@ -193,7 +193,7 @@ memioctl(struct cdev *dev __unused, u_long cmd, caddr_ int nd, error = 0; struct mem_range_op *mo = (struct mem_range_op *)data; struct mem_range_desc *md; - + /* is this for us? */ if ((cmd != MEMRANGE_GET) && (cmd != MEMRANGE_SET)) Modified: head/sys/amd64/amd64/mp_machdep.c ============================================================================== --- head/sys/amd64/amd64/mp_machdep.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/mp_machdep.c Tue Sep 1 21:16:54 2020 (r365067) @@ -515,7 +515,6 @@ native_start_all_aps(void) return (mp_naps); } - /* * This function starts the AP (application processor) identified * by the APIC ID 'physicalCpu'. It does quite a "song and dance" Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/pmap.c Tue Sep 1 21:16:54 2020 (r365067) @@ -1521,7 +1521,7 @@ static void nkpt_init(vm_paddr_t addr) { int pt_pages; - + #ifdef NKPT pt_pages = NKPT; #else @@ -3682,7 +3682,6 @@ pmap_map(vm_offset_t *virt, vm_paddr_t start, vm_paddr return PHYS_TO_DMAP(start); } - /* * Add a list of wired pages to the kva * this routine is only used for temporary @@ -3755,7 +3754,7 @@ pmap_add_delayed_free_list(vm_page_t m, struct spglist m->flags &= ~PG_ZERO; SLIST_INSERT_HEAD(free, m, plinks.s.ss); } - + /* * Inserts the specified page table page into the specified pmap's collection * of idle page table pages. Each of a pmap's page table pages is responsible @@ -4448,7 +4447,6 @@ retry: return (m); } - /*************************************************** * Pmap allocation/deallocation routines. ***************************************************/ @@ -4645,7 +4643,6 @@ pmap_growkernel(vm_offset_t addr) } } - /*************************************************** * page management routines. ***************************************************/ @@ -5871,7 +5868,6 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t lock = NULL; for (; sva < eva; sva = va_next) { - if (pmap->pm_stats.resident_count == 0) break; @@ -6159,10 +6155,9 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t * fails. In that case, stale TLB entries are immediately * invalidated. */ - + PMAP_LOCK(pmap); for (; sva < eva; sva = va_next) { - pml4e = pmap_pml4e(pmap, sva); if ((*pml4e & PG_V) == 0) { va_next = (sva + NBPML4) & ~PML4MASK; Modified: head/sys/amd64/amd64/trap.c ============================================================================== --- head/sys/amd64/amd64/trap.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/amd64/trap.c Tue Sep 1 21:16:54 2020 (r365067) @@ -1137,7 +1137,6 @@ SYSCTL_PROC(_machdep, OID_AUTO, syscall_ret_flush_l1d, "Flush L1D on syscall return with error (0 - off, 1 - on, " "2 - use hw only, 3 - use sw only"); - /* * System call handler for native binaries. The trap frame is already * set up by the assembler trampoline and a pointer to it is saved in Modified: head/sys/amd64/cloudabi64/cloudabi64_sysvec.c ============================================================================== --- head/sys/amd64/cloudabi64/cloudabi64_sysvec.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/cloudabi64/cloudabi64_sysvec.c Tue Sep 1 21:16:54 2020 (r365067) @@ -57,7 +57,7 @@ cloudabi64_fixup_tcb(uintptr_t *stack_base, struct ima error = cloudabi64_fixup(stack_base, imgp); if (error != 0) return (error); - + /* * On x86-64, the TCB is referred to by %fs:0. Take some space * from the top of the stack to store a single element array, Modified: head/sys/amd64/ia32/ia32_reg.c ============================================================================== --- head/sys/amd64/ia32/ia32_reg.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/ia32/ia32_reg.c Tue Sep 1 21:16:54 2020 (r365067) @@ -153,7 +153,7 @@ fill_fpregs32(struct thread *td, struct fpreg32 *regs) fpugetregs(td); sv_fpu = get_pcb_user_save_td(td); penv_xmm = &sv_fpu->sv_env; - + /* FPU control/status */ penv_87->en_cw = penv_xmm->en_cw; penv_87->en_sw = penv_xmm->en_sw; Modified: head/sys/amd64/include/param.h ============================================================================== --- head/sys/amd64/include/param.h Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/include/param.h Tue Sep 1 21:16:54 2020 (r365067) @@ -41,7 +41,6 @@ * $FreeBSD$ */ - #ifndef _AMD64_INCLUDE_PARAM_H_ #define _AMD64_INCLUDE_PARAM_H_ @@ -50,7 +49,6 @@ /* * Machine dependent constants for AMD64. */ - #define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT Modified: head/sys/amd64/include/pc/bios.h ============================================================================== --- head/sys/amd64/include/pc/bios.h Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/include/pc/bios.h Tue Sep 1 21:16:54 2020 (r365067) @@ -63,7 +63,7 @@ struct bios_smap_xattr { u_int32_t type; u_int32_t xattr; } __packed; - + /* * System Management BIOS */ Modified: head/sys/amd64/include/vmm.h ============================================================================== --- head/sys/amd64/include/vmm.h Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/include/vmm.h Tue Sep 1 21:16:54 2020 (r365067) @@ -287,7 +287,6 @@ void vm_exit_reqidle(struct vm *vm, int vcpuid, uint64 int vm_snapshot_req(struct vm *vm, struct vm_snapshot_meta *meta); int vm_restore_time(struct vm *vm); - #ifdef _SYS__CPUSET_H_ /* * Rendezvous all vcpus specified in 'dest' and execute 'func(arg)'. @@ -490,7 +489,7 @@ enum vm_intr_trigger { EDGE_TRIGGER, LEVEL_TRIGGER }; - + /* * The 'access' field has the format specified in Table 21-2 of the Intel * Architecture Manual vol 3b. Modified: head/sys/amd64/include/vmm_snapshot.h ============================================================================== --- head/sys/amd64/include/vmm_snapshot.h Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/include/vmm_snapshot.h Tue Sep 1 21:16:54 2020 (r365067) @@ -100,7 +100,6 @@ struct vm_snapshot_meta { enum vm_snapshot_op op; }; - void vm_snapshot_buf_err(const char *bufname, const enum vm_snapshot_op op); int vm_snapshot_buf(volatile void *data, size_t data_size, struct vm_snapshot_meta *meta); Modified: head/sys/amd64/include/vmparam.h ============================================================================== --- head/sys/amd64/include/vmparam.h Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/include/vmparam.h Tue Sep 1 21:16:54 2020 (r365067) @@ -43,7 +43,6 @@ * $FreeBSD$ */ - #ifndef _MACHINE_VMPARAM_H_ #define _MACHINE_VMPARAM_H_ 1 Modified: head/sys/amd64/linux/linux_proto.h ============================================================================== --- head/sys/amd64/linux/linux_proto.h Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/linux/linux_proto.h Tue Sep 1 21:16:54 2020 (r365067) @@ -1615,41 +1615,35 @@ int linux_io_uring_register(struct thread *, struct li #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 #define nosys linux_nosys #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 #define nosys linux_nosys #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 #define nosys linux_nosys #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 #define nosys linux_nosys #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 #define nosys linux_nosys #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 Modified: head/sys/amd64/linux32/linux32_machdep.c ============================================================================== --- head/sys/amd64/linux32/linux32_machdep.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/linux32/linux32_machdep.c Tue Sep 1 21:16:54 2020 (r365067) @@ -89,7 +89,6 @@ struct l_old_select_argv { l_uintptr_t timeout; } __packed; - static void bsd_to_linux_rusage(struct rusage *ru, struct l_rusage *lru) { @@ -402,7 +401,6 @@ linux_set_cloned_tls(struct thread *td, void *desc) if (error) { linux_msg(td, "set_cloned_tls copyin info failed!"); } else { - /* We might copy out the entry_number as GUGS32_SEL. */ info.entry_number = GUGS32_SEL; error = copyout(&info, desc, sizeof(struct l_user_desc)); Modified: head/sys/amd64/linux32/linux32_proto.h ============================================================================== --- head/sys/amd64/linux32/linux32_proto.h Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/linux32/linux32_proto.h Tue Sep 1 21:16:54 2020 (r365067) @@ -1942,41 +1942,35 @@ int linux_io_uring_register(struct thread *, struct li #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 #define nosys linux_nosys #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 #define nosys linux_nosys #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 #define nosys linux_nosys #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 #define nosys linux_nosys #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 #define nosys linux_nosys #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 Modified: head/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysvec.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/linux32/linux32_sysvec.c Tue Sep 1 21:16:54 2020 (r365067) @@ -359,7 +359,6 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigse mtx_lock(&psp->ps_mtx); } - /* * Send an interrupt to process. * Modified: head/sys/amd64/sgx/sgx.c ============================================================================== --- head/sys/amd64/sgx/sgx.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/sgx/sgx.c Tue Sep 1 21:16:54 2020 (r365067) @@ -604,7 +604,6 @@ static struct cdev_pager_ops sgx_pg_ops = { .cdev_pg_fault = sgx_pg_fault, }; - static void sgx_insert_epc_page_by_index(vm_page_t page, vm_object_t object, vm_pindex_t pidx) Modified: head/sys/amd64/vmm/amd/amdvi_hw.c ============================================================================== --- head/sys/amd64/vmm/amd/amdvi_hw.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/amd/amdvi_hw.c Tue Sep 1 21:16:54 2020 (r365067) @@ -356,7 +356,6 @@ amdvi_cmd_inv_iommu_pages(struct amdvi_softc *softc, u cmd = amdvi_get_cmd_tail(softc); KASSERT(cmd != NULL, ("Cmd is NULL")); - cmd->opcode = AMDVI_INVD_PAGE_OPCODE; cmd->word1 = domain_id; /* @@ -729,7 +728,6 @@ amdvi_print_pci_cap(device_t dev) struct amdvi_softc *softc; uint32_t off, cap; - softc = device_get_softc(dev); off = softc->cap_off; @@ -869,7 +867,6 @@ amdvi_alloc_intr_resources(struct amdvi_softc *softc) return (0); } - static void amdvi_print_dev_cap(struct amdvi_softc *softc) { @@ -1121,7 +1118,6 @@ amdvi_free_ptp(uint64_t *ptp, int level) amdvi_free_ptp((uint64_t *)PHYS_TO_DMAP(ptp[i] & AMDVI_PT_MASK), level - 1); - } free(ptp, M_AMDVI); @@ -1304,7 +1300,7 @@ amdvi_set_dte(struct amdvi_domain *domain, uint16_t de struct amdvi_dte* temp; KASSERT(domain, ("domain is NULL for pci_rid:0x%x\n", devid)); - + softc = amdvi_find_iommu(devid); KASSERT(softc, ("softc is NULL for pci_rid:0x%x\n", devid)); Modified: head/sys/amd64/vmm/amd/ivrs_drv.c ============================================================================== --- head/sys/amd64/vmm/amd/ivrs_drv.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/amd/ivrs_drv.c Tue Sep 1 21:16:54 2020 (r365067) @@ -105,7 +105,6 @@ ivrs_hdr_iterate_tbl(ivhd_iter_t iter, void *arg) default: printf("AMD-Vi:Not IVHD/IVMD type(%d)", ivrs_hdr->Type); - } ivrs_hdr = (ACPI_IVRS_HEADER *)((uint8_t *)ivrs_hdr + @@ -424,7 +423,7 @@ ivhd_probe(device_t dev) case IVRS_TYPE_HARDWARE_EFR: device_set_desc(dev, "AMD-Vi/IOMMU ivhd with EFR"); break; - + case IVRS_TYPE_HARDWARE_MIXED: device_set_desc(dev, "AMD-Vi/IOMMU ivhd in mixed format"); break; @@ -588,7 +587,7 @@ ivhd_print_cap(struct amdvi_softc *softc, ACPI_IVRS_HA int max_ptp_level; dev = softc->dev; - + ivhd_print_flag(dev, softc->ivhd_type, softc->ivhd_flag); ivhd_print_feature(dev, softc->ivhd_type, softc->ivhd_feature); ivhd_print_ext_feature(dev, softc->ext_feature); Modified: head/sys/amd64/vmm/amd/npt.c ============================================================================== --- head/sys/amd64/vmm/amd/npt.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/amd/npt.c Tue Sep 1 21:16:54 2020 (r365067) @@ -62,7 +62,7 @@ svm_npt_init(int ipinum) TUNABLE_INT_FETCH("hw.vmm.npt.enable_superpage", &enable_superpage); if (enable_superpage) npt_flags |= PMAP_PDE_SUPERPAGE; - + return (0); } @@ -76,7 +76,7 @@ npt_pinit(pmap_t pmap) struct vmspace * svm_npt_alloc(vm_offset_t min, vm_offset_t max) { - + return (vmspace_alloc(min, max, npt_pinit)); } Modified: head/sys/amd64/vmm/amd/svm.c ============================================================================== --- head/sys/amd64/vmm/amd/svm.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/amd/svm.c Tue Sep 1 21:16:54 2020 (r365067) @@ -459,7 +459,6 @@ vmcb_init(struct svm_softc *sc, int vcpu, uint64_t iop svm_enable_intercept(sc, vcpu, VMCB_CR_INTCPT, mask); } - /* * Intercept everything when tracing guest exceptions otherwise * just intercept machine check exception. @@ -821,7 +820,7 @@ npf_fault_type(uint64_t exitinfo1) static bool svm_npf_emul_fault(uint64_t exitinfo1) { - + if (exitinfo1 & VMCB_NPF_INFO1_ID) { return (false); } Modified: head/sys/amd64/vmm/intel/vmcs.c ============================================================================== --- head/sys/amd64/vmm/intel/vmcs.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/intel/vmcs.c Tue Sep 1 21:16:54 2020 (r365067) @@ -372,7 +372,7 @@ vmcs_init(struct vmcs *vmcs) cr0 = vmm_get_host_cr0(); if ((error = vmwrite(VMCS_HOST_CR0, cr0)) != 0) goto done; - + cr4 = vmm_get_host_cr4() | CR4_VMXE; if ((error = vmwrite(VMCS_HOST_CR4, cr4)) != 0) goto done; Modified: head/sys/amd64/vmm/intel/vmx_msr.c ============================================================================== --- head/sys/amd64/vmm/intel/vmx_msr.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/intel/vmx_msr.c Tue Sep 1 21:16:54 2020 (r365067) @@ -456,7 +456,7 @@ vmx_wrmsr(struct vmx *vmx, int vcpuid, u_int num, uint uint64_t *guest_msrs; uint64_t changed; int error; - + guest_msrs = vmx->guest_msrs[vcpuid]; error = 0; Modified: head/sys/amd64/vmm/intel/vtd.c ============================================================================== --- head/sys/amd64/vmm/intel/vtd.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/intel/vtd.c Tue Sep 1 21:16:54 2020 (r365067) @@ -171,7 +171,7 @@ domain_id(void) if (dom == NULL) break; /* found it */ } - + if (id >= max_domains) panic("domain ids exhausted"); @@ -274,7 +274,7 @@ vtd_iotlb_global_invalidate(struct vtdmap *vtdmap) offset = VTD_ECAP_IRO(vtdmap->ext_cap) * 16; iotlb_reg = (volatile uint64_t *)((caddr_t)vtdmap + offset + 8); - + *iotlb_reg = VTD_IIR_IVT | VTD_IIR_IIRG_GLOBAL | VTD_IIR_DRAIN_READS | VTD_IIR_DRAIN_WRITES; @@ -753,7 +753,7 @@ static void vtd_destroy_domain(void *arg) { struct domain *dom; - + dom = arg; SLIST_REMOVE(&domhead, dom, domain, next); Modified: head/sys/amd64/vmm/io/ppt.c ============================================================================== --- head/sys/amd64/vmm/io/ppt.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/io/ppt.c Tue Sep 1 21:16:54 2020 (r365067) @@ -478,7 +478,7 @@ pptintr(void *arg) { struct pptdev *ppt; struct pptintr_arg *pptarg; - + pptarg = arg; ppt = pptarg->pptdev; @@ -556,7 +556,7 @@ ppt_setup_msi(struct vm *vm, int vcpu, int bus, int sl /* success */ } } - + ppt->msi.startrid = startrid; /* @@ -583,7 +583,7 @@ ppt_setup_msi(struct vm *vm, int vcpu, int bus, int sl if (error != 0) break; } - + if (i < numvec) { ppt_teardown_msi(ppt); return (ENXIO); @@ -676,17 +676,17 @@ ppt_setup_msix(struct vm *vm, int vcpu, int bus, int s &rid, RF_ACTIVE); if (ppt->msix.res[idx] == NULL) return (ENXIO); - + ppt->msix.arg[idx].pptdev = ppt; ppt->msix.arg[idx].addr = addr; ppt->msix.arg[idx].msg_data = msg; - + /* Setup the MSI-X interrupt */ error = bus_setup_intr(ppt->dev, ppt->msix.res[idx], INTR_TYPE_NET | INTR_MPSAFE, pptintr, NULL, &ppt->msix.arg[idx], &ppt->msix.cookie[idx]); - + if (error != 0) { bus_release_resource(ppt->dev, SYS_RES_IRQ, rid, ppt->msix.res[idx]); ppt->msix.cookie[idx] = NULL; Modified: head/sys/amd64/vmm/io/vatpic.c ============================================================================== --- head/sys/amd64/vmm/io/vatpic.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/io/vatpic.c Tue Sep 1 21:16:54 2020 (r365067) @@ -723,11 +723,11 @@ vatpic_master_handler(struct vm *vm, int vcpuid, bool if (bytes != 1) return (-1); - + if (in) { return (vatpic_read(vatpic, atpic, in, port, bytes, eax)); } - + return (vatpic_write(vatpic, atpic, in, port, bytes, eax)); } @@ -841,7 +841,6 @@ vatpic_snapshot(struct vatpic *vatpic, struct vm_snaps meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(atpic->lowprio, meta, ret, done); SNAPSHOT_VAR_OR_LEAVE(atpic->intr_raised, meta, ret, done); - } SNAPSHOT_BUF_OR_LEAVE(vatpic->elc, sizeof(vatpic->elc), Modified: head/sys/amd64/vmm/io/vatpit.c ============================================================================== --- head/sys/amd64/vmm/io/vatpit.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/io/vatpit.c Tue Sep 1 21:16:54 2020 (r365067) @@ -78,7 +78,6 @@ struct vatpit_callout_arg { int channel_num; }; - struct channel { int mode; uint16_t initial; /* initial counter value */ @@ -295,7 +294,6 @@ pit_readback(struct vatpit *vatpit, uint8_t cmd) return (error); } - static int vatpit_update_mode(struct vatpit *vatpit, uint8_t val) Modified: head/sys/amd64/vmm/io/vlapic.c ============================================================================== --- head/sys/amd64/vmm/io/vlapic.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/io/vlapic.c Tue Sep 1 21:16:54 2020 (r365067) @@ -152,7 +152,7 @@ void vlapic_id_write_handler(struct vlapic *vlapic) { struct LAPIC *lapic; - + /* * We don't allow the ID register to be modified so reset it back to * its default value. @@ -202,7 +202,7 @@ vlapic_get_ccr(struct vlapic *vlapic) struct bintime bt_now, bt_rem; struct LAPIC *lapic; uint32_t ccr; - + ccr = 0; lapic = vlapic->apic_page; @@ -233,7 +233,7 @@ vlapic_dcr_write_handler(struct vlapic *vlapic) { struct LAPIC *lapic; int divisor; - + lapic = vlapic->apic_page; VLAPIC_TIMER_LOCK(vlapic); @@ -258,7 +258,7 @@ void vlapic_esr_write_handler(struct vlapic *vlapic) { struct LAPIC *lapic; - + lapic = vlapic->apic_page; lapic->esr = vlapic->esr_pending; vlapic->esr_pending = 0; @@ -383,7 +383,7 @@ vlapic_lvt_write_handler(struct vlapic *vlapic, uint32 uint32_t *lvtptr, mask, val; struct LAPIC *lapic; int idx; - + lapic = vlapic->apic_page; lvtptr = vlapic_get_lvtptr(vlapic, offset); val = *lvtptr; @@ -613,7 +613,7 @@ static __inline int vlapic_periodic_timer(struct vlapic *vlapic) { uint32_t lvt; - + lvt = vlapic_get_lvt(vlapic, APIC_OFFSET_TIMER_LVT); return (vlapic_get_lvt_field(lvt, APIC_LVTT_TM_PERIODIC)); @@ -1215,7 +1215,7 @@ vlapic_read(struct vlapic *vlapic, int mmio_access, ui *data = 0; goto done; } - + offset &= ~3; switch(offset) { @@ -1418,7 +1418,7 @@ static void vlapic_reset(struct vlapic *vlapic) { struct LAPIC *lapic; - + lapic = vlapic->apic_page; bzero(lapic, sizeof(struct LAPIC)); Modified: head/sys/amd64/vmm/vmm.c ============================================================================== --- head/sys/amd64/vmm/vmm.c Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/vmm.c Tue Sep 1 21:16:54 2020 (r365067) @@ -363,7 +363,7 @@ vmm_init(void) error = vmm_mem_init(); if (error) return (error); - + if (vmm_is_intel()) ops = &vmm_ops_intel; else if (vmm_is_svm()) @@ -1075,7 +1075,7 @@ is_descriptor_table(int reg) static bool is_segment_register(int reg) { - + switch (reg) { case VM_REG_GUEST_ES: case VM_REG_GUEST_CS: @@ -1502,7 +1502,7 @@ vm_handle_inst_emul(struct vm *vm, int vcpuid, bool *r vcpu->nextrip += vie->num_processed; VCPU_CTR1(vm, vcpuid, "nextrip updated to %#lx after instruction " "decoding", vcpu->nextrip); - + /* return to userland unless this is an in-kernel emulated device */ if (gpa >= DEFAULT_APIC_BASE && gpa < DEFAULT_APIC_BASE + PAGE_SIZE) { mread = lapic_mmio_read; @@ -2690,7 +2690,7 @@ vm_copyin(struct vm *vm, int vcpuid, struct vm_copyinf { char *dst; int idx; - + dst = kaddr; idx = 0; while (len > 0) { Modified: head/sys/amd64/vmm/vmm_stat.h ============================================================================== --- head/sys/amd64/vmm/vmm_stat.h Tue Sep 1 20:58:23 2020 (r365066) +++ head/sys/amd64/vmm/vmm_stat.h Tue Sep 1 21:16:54 2020 (r365067) @@ -99,7 +99,7 @@ vmm_stat_array_incr(struct vm *vm, int vcpu, struct vm { #ifdef VMM_KEEP_STATS uint64_t *stats; - + stats = vcpu_stats(vm, vcpu); if (vst->index >= 0 && statidx < vst->nelems) @@ -113,7 +113,7 @@ vmm_stat_array_set(struct vm *vm, int vcpu, struct vmm { #ifdef VMM_KEEP_STATS uint64_t *stats; - + stats = vcpu_stats(vm, vcpu); if (vst->index >= 0 && statidx < vst->nelems) From owner-svn-src-all@freebsd.org Tue Sep 1 21:17:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C34FA378FC8; Tue, 1 Sep 2020 21:17:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Jy4xLwz4HFB; Tue, 1 Sep 2020 21:17:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D6FC1FB1B; Tue, 1 Sep 2020 21:17:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LHcwN017691; Tue, 1 Sep 2020 21:17:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LHOHr017623; Tue, 1 Sep 2020 21:17:24 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012117.081LHOHr017623@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:17:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365068 - in head/sys/arm: allwinner allwinner/a10 allwinner/a20 allwinner/clkng altera/socfpga amlogic/aml8726 annapurna/alpine arm broadcom/bcm2835 freescale freescale/imx freescale/v... X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/arm: allwinner allwinner/a10 allwinner/a20 allwinner/clkng altera/socfpga amlogic/aml8726 annapurna/alpine arm broadcom/bcm2835 freescale freescale/imx freescale/vybrid include linux mv mv... X-SVN-Commit-Revision: 365068 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:17:38 -0000 Author: mjg Date: Tue Sep 1 21:17:24 2020 New Revision: 365068 URL: https://svnweb.freebsd.org/changeset/base/365068 Log: arm: clean up empty lines in .c and .h files Modified: head/sys/arm/allwinner/a10/a10_intc.c head/sys/arm/allwinner/a10_ahci.c head/sys/arm/allwinner/a10_codec.c head/sys/arm/allwinner/a10_hdmiaudio.c head/sys/arm/allwinner/a10_sramc.c head/sys/arm/allwinner/a20/a20_cpu_cfg.c head/sys/arm/allwinner/aw_dwc3.c head/sys/arm/allwinner/aw_machdep.c head/sys/arm/allwinner/aw_mmc.c head/sys/arm/allwinner/aw_rtc.c head/sys/arm/allwinner/aw_usbphy.c head/sys/arm/allwinner/aw_wdog.c head/sys/arm/allwinner/aw_wdog.h head/sys/arm/allwinner/axp209.c head/sys/arm/allwinner/axp209reg.h head/sys/arm/allwinner/axp81x.c head/sys/arm/allwinner/clkng/ccu_a10.c head/sys/arm/allwinner/clkng/ccu_a13.c head/sys/arm/allwinner/clkng/ccu_a31.c head/sys/arm/allwinner/clkng/ccu_a83t.c head/sys/arm/allwinner/if_emac.c head/sys/arm/altera/socfpga/socfpga_a10_manager.c head/sys/arm/altera/socfpga/socfpga_common.c head/sys/arm/amlogic/aml8726/aml8726_ccm.c head/sys/arm/amlogic/aml8726/aml8726_ccm.h head/sys/arm/amlogic/aml8726/aml8726_clkmsr.c head/sys/arm/amlogic/aml8726/aml8726_fb.c head/sys/arm/amlogic/aml8726/aml8726_fb.h head/sys/arm/amlogic/aml8726/aml8726_gpio.c head/sys/arm/amlogic/aml8726/aml8726_i2c.c head/sys/arm/amlogic/aml8726/aml8726_mmc.c head/sys/arm/amlogic/aml8726/aml8726_mmc.h head/sys/arm/amlogic/aml8726/aml8726_mp.c head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c head/sys/arm/amlogic/aml8726/aml8726_pinctrl.h head/sys/arm/amlogic/aml8726/aml8726_rng.c head/sys/arm/amlogic/aml8726/aml8726_rtc.c head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c head/sys/arm/amlogic/aml8726/aml8726_wdt.c head/sys/arm/annapurna/alpine/alpine_ccu.c head/sys/arm/annapurna/alpine/alpine_nb_service.c head/sys/arm/arm/autoconf.c head/sys/arm/arm/bus_space_generic.c head/sys/arm/arm/busdma_machdep.c head/sys/arm/arm/cpufunc.c head/sys/arm/arm/cpuinfo.c head/sys/arm/arm/db_interface.c head/sys/arm/arm/db_trace.c head/sys/arm/arm/disassem.c head/sys/arm/arm/elf_machdep.c head/sys/arm/arm/gdb_machdep.c head/sys/arm/arm/generic_timer.c head/sys/arm/arm/gic.c head/sys/arm/arm/identcpu-v4.c head/sys/arm/arm/identcpu-v6.c head/sys/arm/arm/machdep.c head/sys/arm/arm/machdep_boot.c head/sys/arm/arm/machdep_ptrace.c head/sys/arm/arm/mpcore_timer.c head/sys/arm/arm/nexus.c head/sys/arm/arm/nexusvar.h head/sys/arm/arm/ofw_machdep.c head/sys/arm/arm/pl310.c head/sys/arm/arm/pmap-v4.c head/sys/arm/arm/pmap-v6.c head/sys/arm/arm/syscall.c head/sys/arm/arm/trap-v4.c head/sys/arm/arm/undefined.c head/sys/arm/arm/vfp.c head/sys/arm/arm/vm_machdep.c head/sys/arm/broadcom/bcm2835/bcm2835_audio.c head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c head/sys/arm/broadcom/bcm2835/bcm2835_fb.c head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c head/sys/arm/broadcom/bcm2835/bcm2835_intr.c head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c head/sys/arm/broadcom/bcm2835/bcm2835_mbox.c head/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h head/sys/arm/broadcom/bcm2835/bcm2835_pwm.c head/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c head/sys/arm/broadcom/bcm2835/bcm2838_pci.c head/sys/arm/broadcom/bcm2835/bcm2838_xhci.c head/sys/arm/freescale/fsl_ocotp.c head/sys/arm/freescale/imx/imx51_ccm.c head/sys/arm/freescale/imx/imx51_ccmreg.h head/sys/arm/freescale/imx/imx51_ipuv3.c head/sys/arm/freescale/imx/imx6_anatop.c head/sys/arm/freescale/imx/imx6_ccm.c head/sys/arm/freescale/imx/imx6_ccmreg.h head/sys/arm/freescale/imx/imx6_mp.c head/sys/arm/freescale/imx/imx6_ssi.c head/sys/arm/freescale/imx/imx6_usbphy.c head/sys/arm/freescale/imx/imx_console.c head/sys/arm/freescale/imx/imx_gpio.c head/sys/arm/freescale/imx/imx_iomux.c head/sys/arm/freescale/imx/imx_machdep.c head/sys/arm/freescale/imx/imx_machdep.h head/sys/arm/freescale/imx/imx_nop_usbphy.c head/sys/arm/freescale/imx/imx_wdogreg.h head/sys/arm/freescale/vybrid/vf_ccm.c head/sys/arm/freescale/vybrid/vf_ehci.c head/sys/arm/freescale/vybrid/vf_gpio.c head/sys/arm/freescale/vybrid/vf_i2c.c head/sys/arm/freescale/vybrid/vf_iomuxc.c head/sys/arm/freescale/vybrid/vf_port.c head/sys/arm/freescale/vybrid/vf_sai.c head/sys/arm/include/asm.h head/sys/arm/include/atomic-v4.h head/sys/arm/include/atomic-v6.h head/sys/arm/include/bus.h head/sys/arm/include/cpu-v4.h head/sys/arm/include/cpufunc.h head/sys/arm/include/cpuinfo.h head/sys/arm/include/elf.h head/sys/arm/include/frame.h head/sys/arm/include/pcb.h head/sys/arm/include/pcpu.h head/sys/arm/include/pl310.h head/sys/arm/include/pmap-v4.h head/sys/arm/include/profile.h head/sys/arm/include/ptrace.h head/sys/arm/include/swi.h head/sys/arm/include/undefined.h head/sys/arm/include/vfp.h head/sys/arm/linux/linux_proto.h head/sys/arm/mv/a37x0_gpio.c head/sys/arm/mv/armada/wdt.c head/sys/arm/mv/armada38x/armada38x_rtc.c head/sys/arm/mv/armada38x/pmsu.c head/sys/arm/mv/armadaxp/armadaxp.c head/sys/arm/mv/gpio.c head/sys/arm/mv/mv_ap806_clock.c head/sys/arm/mv/mv_ap806_gicp.c head/sys/arm/mv/mv_ap806_sei.c head/sys/arm/mv/mv_armv7_machdep.c head/sys/arm/mv/mv_common.c head/sys/arm/mv/mv_cp110_clock.c head/sys/arm/mv/mv_cp110_icu.c head/sys/arm/mv/mv_localbus.c head/sys/arm/mv/mv_pci_ctrl.c head/sys/arm/mv/mv_spi.c head/sys/arm/mv/mv_thermal.c head/sys/arm/mv/mvebu_gpio.c head/sys/arm/mv/mvebu_pinctrl.c head/sys/arm/mv/mvwin.h head/sys/arm/mv/timer.c head/sys/arm/nvidia/as3722_gpio.c head/sys/arm/nvidia/as3722_regulators.c head/sys/arm/nvidia/drm2/hdmi.h head/sys/arm/nvidia/drm2/tegra_bo.c head/sys/arm/nvidia/drm2/tegra_dc.c head/sys/arm/nvidia/drm2/tegra_dc_reg.h head/sys/arm/nvidia/drm2/tegra_drm.h head/sys/arm/nvidia/drm2/tegra_hdmi.c head/sys/arm/nvidia/drm2/tegra_hdmi_reg.h head/sys/arm/nvidia/drm2/tegra_host1x.c head/sys/arm/nvidia/tegra124/tegra124_car.c head/sys/arm/nvidia/tegra124/tegra124_car.h head/sys/arm/nvidia/tegra124/tegra124_clk_per.c head/sys/arm/nvidia/tegra124/tegra124_clk_pll.c head/sys/arm/nvidia/tegra124/tegra124_clk_super.c head/sys/arm/nvidia/tegra124/tegra124_coretemp.c head/sys/arm/nvidia/tegra124/tegra124_cpufreq.c head/sys/arm/nvidia/tegra124/tegra124_mp.c head/sys/arm/nvidia/tegra124/tegra124_mp.h head/sys/arm/nvidia/tegra124/tegra124_pmc.c head/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c head/sys/arm/nvidia/tegra_abpmisc.c head/sys/arm/nvidia/tegra_ahci.c head/sys/arm/nvidia/tegra_efuse.c head/sys/arm/nvidia/tegra_gpio.c head/sys/arm/nvidia/tegra_i2c.c head/sys/arm/nvidia/tegra_lic.c head/sys/arm/nvidia/tegra_mc.c head/sys/arm/nvidia/tegra_pcie.c head/sys/arm/nvidia/tegra_pinmux.c head/sys/arm/nvidia/tegra_rtc.c head/sys/arm/nvidia/tegra_soctherm.c head/sys/arm/nvidia/tegra_uart.c head/sys/arm/nvidia/tegra_usbphy.c head/sys/arm/nvidia/tegra_xhci.c head/sys/arm/rockchip/rk30xx_gpio.c head/sys/arm/rockchip/rk30xx_grf.c head/sys/arm/rockchip/rk30xx_machdep.c head/sys/arm/rockchip/rk30xx_pmu.c head/sys/arm/rockchip/rk30xx_wdog.h head/sys/arm/samsung/exynos/chrome_kb.c head/sys/arm/samsung/exynos/exynos5_ehci.c head/sys/arm/samsung/exynos/exynos5_i2c.c head/sys/arm/samsung/exynos/exynos5_pad.c head/sys/arm/samsung/exynos/exynos5_spi.c head/sys/arm/samsung/exynos/exynos5_xhci.c head/sys/arm/samsung/exynos/exynos_uart.c head/sys/arm/ti/aintc.c head/sys/arm/ti/am335x/am3359_cppi41.c head/sys/arm/ti/am335x/am335x_ecap.c head/sys/arm/ti/am335x/am335x_ehrpwm.c head/sys/arm/ti/am335x/am335x_lcd_syscons.c head/sys/arm/ti/am335x/am335x_reg.h head/sys/arm/ti/am335x/tda19988.c head/sys/arm/ti/clk/ti_clk_dpll.c head/sys/arm/ti/clk/ti_clk_dpll.h head/sys/arm/ti/clk/ti_clkctrl.c head/sys/arm/ti/cpsw/if_cpsw.c head/sys/arm/ti/omap4/omap4_prcm_clks.c head/sys/arm/ti/omap4/omap4_reg.h head/sys/arm/ti/omap4/omap4_scm_padconf.c head/sys/arm/ti/omap4/omap4_wugen.c head/sys/arm/ti/omap4/pandaboard/pandaboard.c head/sys/arm/ti/omap4/pandaboard/pandaboard.h head/sys/arm/ti/ti_adc.c head/sys/arm/ti/ti_edma3.c head/sys/arm/ti/ti_i2c.c head/sys/arm/ti/ti_omap4_cm.c head/sys/arm/ti/ti_pinmux.c head/sys/arm/ti/ti_pinmux.h head/sys/arm/ti/ti_prcm.c head/sys/arm/ti/ti_scm.c head/sys/arm/ti/ti_scm.h head/sys/arm/ti/ti_scm_syscon.c head/sys/arm/ti/ti_sdhci.c head/sys/arm/ti/ti_sdma.c head/sys/arm/ti/ti_smc.h head/sys/arm/ti/twl/twl.c head/sys/arm/ti/twl/twl_clks.c head/sys/arm/ti/twl/twl_clks.h head/sys/arm/ti/twl/twl_vreg.c head/sys/arm/ti/twl/twl_vreg.h head/sys/arm/ti/usb/omap_ehci.c head/sys/arm/ti/usb/omap_host.c head/sys/arm/ti/usb/omap_tll.c head/sys/arm/versatile/versatile_clcd.c head/sys/arm/versatile/versatile_common.c head/sys/arm/versatile/versatile_machdep.c head/sys/arm/xilinx/uart_dev_cdnc.c head/sys/arm/xilinx/zy7_devcfg.c head/sys/arm/xilinx/zy7_ehci.c head/sys/arm/xilinx/zy7_gpio.c head/sys/arm/xilinx/zy7_qspi.c head/sys/arm/xilinx/zy7_reg.h head/sys/arm/xilinx/zy7_spi.c Modified: head/sys/arm/allwinner/a10/a10_intc.c ============================================================================== --- head/sys/arm/allwinner/a10/a10_intc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10/a10_intc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -375,7 +375,6 @@ static device_method_t a10_aintc_methods[] = { DEVMETHOD(pic_post_filter, a10_intr_post_filter), DEVMETHOD(pic_post_ithread, a10_intr_post_ithread), DEVMETHOD(pic_pre_ithread, a10_intr_pre_ithread), - { 0, 0 } }; Modified: head/sys/arm/allwinner/a10_ahci.c ============================================================================== --- head/sys/arm/allwinner/a10_ahci.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10_ahci.c Tue Sep 1 21:17:24 2020 (r365068) @@ -355,7 +355,7 @@ ahci_a10_attach(device_t dev) device_printf(dev, "Cannot enable clk gate\n"); goto fail; } - + /* Reset controller */ if ((error = ahci_a10_ctlr_reset(dev)) != 0) goto fail; Modified: head/sys/arm/allwinner/a10_codec.c ============================================================================== --- head/sys/arm/allwinner/a10_codec.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10_codec.c Tue Sep 1 21:17:24 2020 (r365068) @@ -367,7 +367,6 @@ static kobj_method_t a10_mixer_methods[] = { }; MIXER_DECLARE(a10_mixer); - /* * H3 mixer interface */ @@ -620,7 +619,6 @@ static kobj_method_t h3_mixer_methods[] = { }; MIXER_DECLARE(h3_mixer); - /* * Channel interface */ @@ -1009,7 +1007,6 @@ static kobj_method_t a10codec_chan_methods[] = { KOBJMETHOD_END }; CHANNEL_DECLARE(a10codec_chan); - /* * Device interface Modified: head/sys/arm/allwinner/a10_hdmiaudio.c ============================================================================== --- head/sys/arm/allwinner/a10_hdmiaudio.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10_hdmiaudio.c Tue Sep 1 21:17:24 2020 (r365068) @@ -126,7 +126,6 @@ static kobj_method_t a10hdmiaudio_mixer_methods[] = { }; MIXER_DECLARE(a10hdmiaudio_mixer); - /* * Channel interface */ @@ -344,7 +343,6 @@ static kobj_method_t a10hdmiaudio_chan_methods[] = { KOBJMETHOD_END }; CHANNEL_DECLARE(a10hdmiaudio_chan); - /* * Device interface Modified: head/sys/arm/allwinner/a10_sramc.c ============================================================================== --- head/sys/arm/allwinner/a10_sramc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a10_sramc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -68,7 +68,6 @@ static struct a10_sramc_softc *a10_sramc_sc; #define sramc_write_4(sc, reg, val) \ bus_space_write_4((sc)->bst, (sc)->bsh, (reg), (val)) - static int a10_sramc_probe(device_t dev) { Modified: head/sys/arm/allwinner/a20/a20_cpu_cfg.c ============================================================================== --- head/sys/arm/allwinner/a20/a20_cpu_cfg.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/a20/a20_cpu_cfg.c Tue Sep 1 21:17:24 2020 (r365068) @@ -136,4 +136,3 @@ a20_read_counter64(void) return (((uint64_t)hi << 32) | lo); } - Modified: head/sys/arm/allwinner/aw_dwc3.c ============================================================================== --- head/sys/arm/allwinner/aw_dwc3.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_dwc3.c Tue Sep 1 21:17:24 2020 (r365068) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include Modified: head/sys/arm/allwinner/aw_machdep.c ============================================================================== --- head/sys/arm/allwinner/aw_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -291,8 +291,6 @@ static platform_method_t h3_methods[] = { FDT_PLATFORM_DEF(h3, "h3", 0, "allwinner,sun8i-h3", 200); #endif - - u_int allwinner_soc_type(void) { Modified: head/sys/arm/allwinner/aw_mmc.c ============================================================================== --- head/sys/arm/allwinner/aw_mmc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_mmc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -951,7 +951,6 @@ aw_mmc_req_ok(struct aw_mmc_softc *sc) aw_mmc_req_done(sc); } - static inline void set_mmc_error(struct aw_mmc_softc *sc, int error_code) { @@ -1499,7 +1498,6 @@ aw_mmc_update_ios(device_t bus, device_t child) if (error != 0) return (error); } - return (0); } Modified: head/sys/arm/allwinner/aw_rtc.c ============================================================================== --- head/sys/arm/allwinner/aw_rtc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_rtc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -235,7 +235,7 @@ aw_rtc_attach(device_t dev) aw_rtc_install_clocks(sc, dev); clock_register(dev, RTC_RES_US); - + return (0); } @@ -290,7 +290,7 @@ aw_rtc_gettime(device_t dev, struct timespec *ts) rdate = RTC_READ(sc, sc->conf->rtc_date); rtime = RTC_READ(sc, sc->conf->rtc_time); - + if ((rtime & TIME_MASK) == 0) rdate = RTC_READ(sc, sc->conf->rtc_date); @@ -303,7 +303,7 @@ aw_rtc_gettime(device_t dev, struct timespec *ts) ct.dow = -1; /* RTC resolution is 1 sec */ ct.nsec = 0; - + return (clock_ct_to_ts(&ct, ts)); } @@ -320,7 +320,7 @@ aw_rtc_settime(device_t dev, struct timespec *ts) ts->tv_nsec = 0; clock_ts_to_ct(ts, &ct); - + if ((ct.year < YEAR_MIN) || (ct.year > YEAR_MAX)) { device_printf(dev, "could not set time, year out of range\n"); return (EINVAL); Modified: head/sys/arm/allwinner/aw_usbphy.c ============================================================================== --- head/sys/arm/allwinner/aw_usbphy.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_usbphy.c Tue Sep 1 21:17:24 2020 (r365068) @@ -432,7 +432,6 @@ awusbphy_set_mode(struct phynode *phynode, int mode) sc->mode = mode; - out: return (0); } Modified: head/sys/arm/allwinner/aw_wdog.c ============================================================================== --- head/sys/arm/allwinner/aw_wdog.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_wdog.c Tue Sep 1 21:17:24 2020 (r365068) @@ -176,7 +176,7 @@ aw_wdog_attach(device_t dev) EVENTHANDLER_REGISTER(watchdog_list, aw_wdog_watchdog_fn, sc, 0); EVENTHANDLER_REGISTER(shutdown_final, aw_wdog_shutdown_fn, sc, SHUTDOWN_PRI_LAST - 1); - + return (0); } Modified: head/sys/arm/allwinner/aw_wdog.h ============================================================================== --- head/sys/arm/allwinner/aw_wdog.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/aw_wdog.h Tue Sep 1 21:17:24 2020 (r365068) @@ -32,4 +32,3 @@ void aw_wdog_watchdog_reset(void); #endif /*__AW_WDOG_H__*/ - Modified: head/sys/arm/allwinner/axp209.c ============================================================================== --- head/sys/arm/allwinner/axp209.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/axp209.c Tue Sep 1 21:17:24 2020 (r365068) @@ -1075,7 +1075,6 @@ axp2xx_gpio_pin_set(device_t dev, uint32_t pin, unsign return (error); } - static int axp2xx_gpio_pin_toggle(device_t dev, uint32_t pin) { Modified: head/sys/arm/allwinner/axp209reg.h ============================================================================== --- head/sys/arm/allwinner/axp209reg.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/axp209reg.h Tue Sep 1 21:17:24 2020 (r365068) @@ -204,7 +204,6 @@ #define AXP221_REG_ALDO2_VOLTAGE 0x29 #define AXP221_REG_ALDO3_VOLTAGE 0x2A - enum axp2xx_sensor { AXP209_ACVOLT, AXP209_ACCURRENT, Modified: head/sys/arm/allwinner/axp81x.c ============================================================================== --- head/sys/arm/allwinner/axp81x.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/axp81x.c Tue Sep 1 21:17:24 2020 (r365068) @@ -1317,7 +1317,6 @@ axp8xx_gpio_pin_set(device_t dev, uint32_t pin, unsign return (error); } - static int axp8xx_gpio_pin_toggle(device_t dev, uint32_t pin) { Modified: head/sys/arm/allwinner/clkng/ccu_a10.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_a10.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/clkng/ccu_a10.c Tue Sep 1 21:17:24 2020 (r365068) @@ -300,7 +300,6 @@ NM_CLK(apb1_clk, 0, /* gate */ AW_CLK_HAS_MUX); /* flags */ - NKMP_CLK(pll_ddr_other_clk, CLK_PLL_DDR_OTHER, /* id */ "pll_ddr_other", pll_parents, /* name, parents */ Modified: head/sys/arm/allwinner/clkng/ccu_a13.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_a13.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/clkng/ccu_a13.c Tue Sep 1 21:17:24 2020 (r365068) @@ -498,7 +498,6 @@ static struct aw_clk_nm_def ir_clk = { /* Missing CSI clock */ /* Missing VE clock */ - /* Clocks list */ static struct aw_ccung_clk a13_ccu_clks[] = { { .type = AW_CLK_NKMP, .clk.nkmp = &pll_core}, Modified: head/sys/arm/allwinner/clkng/ccu_a31.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_a31.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/clkng/ccu_a31.c Tue Sep 1 21:17:24 2020 (r365068) @@ -608,7 +608,6 @@ NM_CLK(spi3_clk, 31, /* gate */ AW_CLK_HAS_GATE | AW_CLK_HAS_MUX); /* flags */ - static const char *daudio_parents[] = {"pll_audio-8x", "pll_audio-4x", "pll_audio-2x", "pll_audio"}; MUX_CLK(daudio0mux_clk, 0, Modified: head/sys/arm/allwinner/clkng/ccu_a83t.c ============================================================================== --- head/sys/arm/allwinner/clkng/ccu_a83t.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/clkng/ccu_a83t.c Tue Sep 1 21:17:24 2020 (r365068) @@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$"); /* Non-exported fixed clocks */ #define CLK_OSC_12M 150 - static struct aw_ccung_reset a83t_ccu_resets[] = { CCU_RESET(RST_USB_PHY0, 0xcc, 0) CCU_RESET(RST_USB_PHY1, 0xcc, 1) Modified: head/sys/arm/allwinner/if_emac.c ============================================================================== --- head/sys/arm/allwinner/if_emac.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/allwinner/if_emac.c Tue Sep 1 21:17:24 2020 (r365068) @@ -467,7 +467,7 @@ emac_watchdog(struct emac_softc *sc) "(missed link)\n"); } else if_printf(sc->emac_ifp, "watchdog timeout -- resetting\n"); - + if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; emac_init_locked(sc); @@ -601,7 +601,6 @@ emac_init_locked(struct emac_softc *sc) callout_reset(&sc->emac_tick_ch, hz, emac_tick, sc); } - static void emac_start(struct ifnet *ifp) Modified: head/sys/arm/altera/socfpga/socfpga_a10_manager.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_a10_manager.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/altera/socfpga/socfpga_a10_manager.c Tue Sep 1 21:17:24 2020 (r365068) @@ -141,7 +141,6 @@ fpga_wait_dclk_pulses(struct fpgamgr_a10_softc *sc, in return (0); } - static int fpga_open(struct cdev *dev, int flags __unused, int fmt __unused, struct thread *td __unused) Modified: head/sys/arm/altera/socfpga/socfpga_common.c ============================================================================== --- head/sys/arm/altera/socfpga/socfpga_common.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/altera/socfpga/socfpga_common.c Tue Sep 1 21:17:24 2020 (r365068) @@ -42,4 +42,3 @@ __FBSDID("$FreeBSD$"); #include #include - Modified: head/sys/arm/amlogic/aml8726/aml8726_ccm.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_ccm.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_ccm.c Tue Sep 1 21:17:24 2020 (r365068) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - struct aml8726_ccm_softc { device_t dev; struct aml8726_ccm_function *soc; Modified: head/sys/arm/amlogic/aml8726/aml8726_ccm.h ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_ccm.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_ccm.h Tue Sep 1 21:17:24 2020 (r365068) @@ -29,7 +29,6 @@ #ifndef _ARM_AMLOGIC_AML8726_CCM_H #define _ARM_AMLOGIC_AML8726_CCM_H - struct aml8726_ccm_gate { uint32_t addr; uint32_t bits; @@ -40,7 +39,6 @@ struct aml8726_ccm_function { struct aml8726_ccm_gate *gates; }; - /* * aml8726-m3 */ @@ -109,7 +107,6 @@ struct aml8726_ccm_function aml8726_m3_ccm[] = { { NULL } }; - /* * aml8726-m6 */ @@ -178,7 +175,6 @@ struct aml8726_ccm_function aml8726_m6_ccm[] = { { NULL } }; - /* * aml8726-m8 */ @@ -249,7 +245,6 @@ struct aml8726_ccm_function aml8726_m8_ccm[] = { { "usb-b", aml8726_m8_usb_b }, { NULL } }; - /* * aml8726-m8b Modified: head/sys/arm/amlogic/aml8726/aml8726_clkmsr.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_clkmsr.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_clkmsr.c Tue Sep 1 21:17:24 2020 (r365068) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - static struct aml8726_clkmsr_clk { const char * name; uint32_t mux; @@ -216,7 +215,6 @@ aml8726_clkmsr_detach(device_t dev) return (0); } - static device_method_t aml8726_clkmsr_methods[] = { /* Device interface */ Modified: head/sys/arm/amlogic/aml8726/aml8726_fb.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_fb.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_fb.c Tue Sep 1 21:17:24 2020 (r365068) @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include "fb_if.h" - enum aml8726_fb_output { aml8726_unknown_fb_output, aml8726_cvbs_fb_output, Modified: head/sys/arm/amlogic/aml8726/aml8726_fb.h ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_fb.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_fb.h Tue Sep 1 21:17:24 2020 (r365068) @@ -29,7 +29,6 @@ #ifndef _ARM_AMLOGIC_AML8726_FB_H #define _ARM_AMLOGIC_AML8726_FB_H - #define AML_CAV_OSD1_INDEX 0x40 #define AML_CAV_LUT_DATAL_REG 0 Modified: head/sys/arm/amlogic/aml8726/aml8726_gpio.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_gpio.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_gpio.c Tue Sep 1 21:17:24 2020 (r365068) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include "gpio_if.h" - struct aml8726_gpio_softc { device_t dev; struct resource *res[3]; Modified: head/sys/arm/amlogic/aml8726/aml8726_i2c.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_i2c.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_i2c.c Tue Sep 1 21:17:24 2020 (r365068) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include "iicbb_if.h" - struct aml8726_iic_softc { device_t dev; struct resource *res[1]; Modified: head/sys/arm/amlogic/aml8726/aml8726_mmc.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_mmc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_mmc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -485,7 +485,6 @@ spurious: CSR_WRITE_4(sc, AML_MMC_MULT_CONFIG_REG, mcfgr); if ((cmdr & AML_MMC_CMD_RESP_CRC7_FROM_8) != 0) { - /* * Controller supplies 135:8 instead of * 127:0 so discard the leading 8 bits Modified: head/sys/arm/amlogic/aml8726/aml8726_mmc.h ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_mmc.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_mmc.h Tue Sep 1 21:17:24 2020 (r365068) @@ -29,7 +29,6 @@ #ifndef _ARM_AMLOGIC_AML8726_MMC_H #define _ARM_AMLOGIC_AML8726_MMC_H - #define AML_MMC_ALIGN_DMA 4 #define AML_MMC_MAX_DMA 4096 Modified: head/sys/arm/amlogic/aml8726/aml8726_mp.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_mp.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_mp.c Tue Sep 1 21:17:24 2020 (r365068) @@ -198,7 +198,6 @@ find_node_for_device(const char *device, const char ** return (0); } - static int alloc_resource_for_node(phandle_t node, struct resource *res, u_long *size) { @@ -221,7 +220,6 @@ alloc_resource_for_node(phandle_t node, struct resourc return (err); } - static void power_on_cpu(int cpu) { @@ -374,7 +372,6 @@ platform_mp_setmaxid(void) if (alloc_resource_for_node(cpucfg_node, &aml8726_smp.cpucfg_res, &aml8726_smp.cpucfg_size) != 0) panic("Could not allocate resource for CPUCONFIG"); - /* * Strictly speaking the aobus and cbus may not be required in Modified: head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c Tue Sep 1 21:17:24 2020 (r365068) @@ -172,7 +172,6 @@ aml8726_pinctrl_detach(device_t dev) return (0); } - static int aml8726_pinctrl_configure_pins(device_t dev, phandle_t cfgxref) { @@ -406,7 +405,6 @@ aml8726_pinctrl_configure_pins(device_t dev, phandle_t return (0); } - static device_method_t aml8726_pinctrl_methods[] = { /* Device interface */ Modified: head/sys/arm/amlogic/aml8726/aml8726_pinctrl.h ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_pinctrl.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_pinctrl.h Tue Sep 1 21:17:24 2020 (r365068) @@ -525,7 +525,6 @@ struct aml8726_pinctrl_function aml8726_m6_pinctrl[] = { NULL } }; - /* * aml8726-m8 * @@ -796,7 +795,6 @@ struct aml8726_pinctrl_function aml8726_m8_pinctrl[] = { "uart-ao", aml8726_m8_uart_ao }, { NULL } }; - /* * aml8726-m8b Modified: head/sys/arm/amlogic/aml8726/aml8726_rng.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_rng.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_rng.c Tue Sep 1 21:17:24 2020 (r365068) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include - struct aml8726_rng_softc { device_t dev; struct resource *res[1]; Modified: head/sys/arm/amlogic/aml8726/aml8726_rtc.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_rtc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_rtc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -290,7 +290,6 @@ aml8726_rtc_initialize(struct aml8726_rtc_softc *sc) if (sc->init.always == TRUE || (CSR_READ_4(sc, AML_RTC_1_REG) & AML_RTC_SRDY) == 0) { - /* * The RTC has a 16 bit initialization register. The upper * bits can be written directly. The lower bits are written Modified: head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c Tue Sep 1 21:17:24 2020 (r365068) @@ -480,7 +480,6 @@ aml8726_sdxc_finish_command(struct aml8726_sdxc_softc stop_cmd = (cmd->mrq->stop != cmd) ? cmd->mrq->stop : NULL; if (stop_cmd != NULL) { - /* * If the original command executed successfully, then * the hardware will also have automatically executed Modified: head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c Tue Sep 1 21:17:24 2020 (r365068) @@ -116,7 +116,7 @@ aml8726_usb_phy_mode(const char *dwcotg_path, uint32_t char *usb_mode; phandle_t node; ssize_t len; - + if ((node = OF_finddevice(dwcotg_path)) == -1) return (ENXIO); Modified: head/sys/arm/amlogic/aml8726/aml8726_wdt.c ============================================================================== --- head/sys/arm/amlogic/aml8726/aml8726_wdt.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/amlogic/aml8726/aml8726_wdt.c Tue Sep 1 21:17:24 2020 (r365068) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include - struct aml8726_wdt_softc { device_t dev; struct resource * res[2]; @@ -115,7 +114,6 @@ aml8726_wdt_watchdog(void *private, u_int cmd, int *er if (cmd != 0 && tens_of_usec <= (AML_WDT_CTRL_TERMINAL_CNT_MASK >> AML_WDT_CTRL_TERMINAL_CNT_SHIFT)) { - wcr = AML_WDT_CTRL_CPU_WDRESET_MASK | AML_WDT_CTRL_EN | ((uint32_t)tens_of_usec << AML_WDT_CTRL_TERMINAL_CNT_SHIFT); Modified: head/sys/arm/annapurna/alpine/alpine_ccu.c ============================================================================== --- head/sys/arm/annapurna/alpine/alpine_ccu.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/annapurna/alpine/alpine_ccu.c Tue Sep 1 21:17:24 2020 (r365068) @@ -62,7 +62,6 @@ static device_method_t al_ccu_methods[] = { DEVMETHOD(device_probe, al_ccu_probe), DEVMETHOD(device_attach, al_ccu_attach), DEVMETHOD(device_detach, al_ccu_detach), - { 0, 0 } }; Modified: head/sys/arm/annapurna/alpine/alpine_nb_service.c ============================================================================== --- head/sys/arm/annapurna/alpine/alpine_nb_service.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/annapurna/alpine/alpine_nb_service.c Tue Sep 1 21:17:24 2020 (r365068) @@ -61,7 +61,6 @@ static device_method_t nb_service_methods[] = { DEVMETHOD(device_probe, nb_service_probe), DEVMETHOD(device_attach, nb_service_attach), DEVMETHOD(device_detach, nb_service_detach), - { 0, 0 } }; Modified: head/sys/arm/arm/autoconf.c ============================================================================== --- head/sys/arm/arm/autoconf.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/autoconf.c Tue Sep 1 21:17:24 2020 (r365068) @@ -74,7 +74,6 @@ SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, co device_t nexus_dev; - /* * Determine i/o configuration for a machine. */ Modified: head/sys/arm/arm/bus_space_generic.c ============================================================================== --- head/sys/arm/arm/bus_space_generic.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/bus_space_generic.c Tue Sep 1 21:17:24 2020 (r365068) @@ -91,7 +91,6 @@ generic_bs_alloc(bus_space_tag_t t, bus_addr_t rstart, panic("generic_bs_alloc(): not implemented"); } - void generic_bs_unmap(bus_space_tag_t t, bus_space_handle_t h, bus_size_t size) { Modified: head/sys/arm/arm/busdma_machdep.c ============================================================================== --- head/sys/arm/arm/busdma_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/busdma_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -644,7 +644,6 @@ bus_dma_tag_destroy(bus_dma_tag_t dmat) dmat_copy = dmat; if (dmat != NULL) { - if (dmat->map_count != 0) { error = EBUSY; goto out; @@ -997,7 +996,6 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, pmap_t pma map->pagesneeded++; } vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); - } CTR1(KTR_BUSDMA, "pagesneeded= %d", map->pagesneeded); } @@ -1237,7 +1235,6 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap if (map->sync_count == 0 || (kvaddr != 0 && kvaddr != sl_vend) || (curaddr != sl_pend)) { - if (++map->sync_count > dmat->nsegments) goto cleanup; sl++; @@ -1416,7 +1413,6 @@ bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, * we're able to test direct userland dma, panic on a map mismatch. */ if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { - CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x " "performing bounce", __func__, dmat, dmat->flags, op); Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/cpufunc.c Tue Sep 1 21:17:24 2020 (r365068) @@ -196,7 +196,6 @@ struct cpu_functions sheeva_cpufuncs = { #ifdef CPU_MV_PJ4B struct cpu_functions pj4bv7_cpufuncs = { - /* Cache operations */ .cf_l2cache_wbinv_all = (void *)cpufunc_nullop, .cf_l2cache_wbinv_range = (void *)cpufunc_nullop, @@ -214,7 +213,6 @@ struct cpu_functions pj4bv7_cpufuncs = { #if defined(CPU_ARM1176) struct cpu_functions arm1176_cpufuncs = { - /* Cache operations */ .cf_l2cache_wbinv_all = (void *)cpufunc_nullop, .cf_l2cache_wbinv_range = (void *)cpufunc_nullop, @@ -232,7 +230,6 @@ struct cpu_functions arm1176_cpufuncs = { #if defined(CPU_CORTEXA) || defined(CPU_KRAIT) struct cpu_functions cortexa_cpufuncs = { - /* Cache operations */ /* Modified: head/sys/arm/arm/cpuinfo.c ============================================================================== --- head/sys/arm/arm/cpuinfo.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/cpuinfo.c Tue Sep 1 21:17:24 2020 (r365068) @@ -79,7 +79,6 @@ SYSCTL_INT(_hw_cpu_quirks, OID_AUTO, actlr_set, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &cpu_quirks_actlr_set, 0, "Bits to be set in ACTLR"); - /* Read and parse CPU id scheme */ void cpuinfo_init(void) Modified: head/sys/arm/arm/db_interface.c ============================================================================== --- head/sys/arm/arm/db_interface.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/db_interface.c Tue Sep 1 21:17:24 2020 (r365068) @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int nil = 0; int db_access_und_sp (struct db_variable *, db_expr_t *, int); @@ -252,7 +251,6 @@ db_write_bytes(vm_offset_t addr, size_t size, char *da tlb_flush_all(); return (0); } - static u_int db_fetch_reg(int reg) Modified: head/sys/arm/arm/db_trace.c ============================================================================== --- head/sys/arm/arm/db_trace.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/db_trace.c Tue Sep 1 21:17:24 2020 (r365068) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include #include @@ -102,7 +101,6 @@ db_stack_trace_cmd(struct unwind_state *state) i = 0; } else sep = " "; - } } db_printf("\n"); Modified: head/sys/arm/arm/disassem.c ============================================================================== --- head/sys/arm/arm/disassem.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/disassem.c Tue Sep 1 21:17:24 2020 (r365068) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include - #include #include #include @@ -532,7 +531,6 @@ disasm(const disasm_interface_t *di, vm_offset_t loc, return(loc + INSN_SIZE); } - static void disasm_register_shift(const disasm_interface_t *di, u_int insn) { @@ -550,7 +548,6 @@ disasm_register_shift(const disasm_interface_t *di, u_ (insn >> 7) & 0x1f); } } - static void disasm_print_reglist(const disasm_interface_t *di, u_int insn) Modified: head/sys/arm/arm/elf_machdep.c ============================================================================== --- head/sys/arm/arm/elf_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/elf_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -190,7 +190,6 @@ store_ptr(Elf_Addr *where, Elf_Addr val) } #undef RELOC_ALIGNED_P - /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, @@ -233,7 +232,6 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas } switch (rtype) { - case R_ARM_NONE: /* none */ break; Modified: head/sys/arm/arm/gdb_machdep.c ============================================================================== --- head/sys/arm/arm/gdb_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/gdb_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD$"); - #include #include #include Modified: head/sys/arm/arm/generic_timer.c ============================================================================== --- head/sys/arm/arm/generic_timer.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/generic_timer.c Tue Sep 1 21:17:24 2020 (r365068) @@ -383,7 +383,6 @@ arm_tmr_acpi_probe(device_t dev) } #endif - static int arm_tmr_attach(device_t dev) { Modified: head/sys/arm/arm/gic.c ============================================================================== --- head/sys/arm/arm/gic.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/gic.c Tue Sep 1 21:17:24 2020 (r365068) @@ -98,7 +98,6 @@ __FBSDID("$FreeBSD$"); #define GIC_SUPPORT_SECEXT(_sc) \ ((_sc->typer & GICD_TYPER_SECURITYEXT) == GICD_TYPER_SECURITYEXT) - #ifndef GIC_DEFAULT_ICFGR_INIT #define GIC_DEFAULT_ICFGR_INIT 0x00000000 #endif @@ -133,7 +132,6 @@ static struct resource_spec arm_gic_spec[] = { { -1, 0 } }; - #if defined(__arm__) && defined(INVARIANTS) static int gic_debug_spurious = 1; #else @@ -1137,7 +1135,6 @@ arm_gicv2m_alloc_msi(device_t dev, device_t child, int for (i = 0; i < count; i++) { /* Mark the interrupt as used */ psc->gic_irqs[irq + i].gi_flags |= GI_FLAG_MSI_USED; - } mtx_unlock(&sc->sc_mutex); Modified: head/sys/arm/arm/identcpu-v4.c ============================================================================== --- head/sys/arm/arm/identcpu-v4.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/identcpu-v4.c Tue Sep 1 21:17:24 2020 (r365068) @@ -198,7 +198,6 @@ const struct cpuidtab cpuids[] = { { CPU_ID_MV88FR571_VD, CPU_CLASS_MARVELL, "Feroceon 88FR571-VD", generic_steppings }, - { 0, CPU_CLASS_NONE, NULL, NULL } }; Modified: head/sys/arm/arm/identcpu-v6.c ============================================================================== --- head/sys/arm/arm/identcpu-v6.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/identcpu-v6.c Tue Sep 1 21:17:24 2020 (r365068) @@ -107,7 +107,6 @@ static struct { CPU_CLASS_KRAIT}, }; - static void print_v5_cache(void) { @@ -168,7 +167,6 @@ print_v5_cache(void) } pdcache_size = multiplier << (CPU_CT_xSIZE_SIZE(dsize) + 8); - /* Print cache info. */ if (picache_line_size == 0 && pdcache_line_size == 0) return; @@ -272,7 +270,6 @@ add_cap(char *cap) hw_buf_idx += sprintf(hw_buf + hw_buf_idx, ", "); hw_buf_newline = false; - hw_buf_idx += sprintf(hw_buf + hw_buf_idx, "%s", cap); } @@ -298,7 +295,6 @@ identify_arm_cpu(void) printf("CPU: %s\n", cpu_model); break; } - } if (i >= nitems(cpu_names)) printf("unknown CPU (ID = 0x%x)\n", cpuinfo.midr); Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -427,7 +427,6 @@ exec_setregs(struct thread *td, struct image_params *i tf->tf_spsr = PSR_USR32_MODE; } - #ifdef VFP /* * Get machine VFP context. @@ -928,7 +927,6 @@ initarm(struct arm_boot_params *abp) kernel_pt_table[i].pv_pa = kernel_pt_table[i].pv_va - KERNVIRTADDR + abp->abp_physaddr; - } } /* Modified: head/sys/arm/arm/machdep_boot.c ============================================================================== --- head/sys/arm/arm/machdep_boot.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/machdep_boot.c Tue Sep 1 21:17:24 2020 (r365068) @@ -144,7 +144,6 @@ arm_print_kenv(void) debugf(" %x %s\n", (uint32_t)cp, cp); } - #if defined(LINUX_BOOT_ABI) /* Convert the U-Boot command line into FreeBSD kenv and boot options. */ @@ -343,7 +342,6 @@ default_parse_boot_param(struct arm_boot_params *abp) * own. We just fake metadata... */ __weak_reference(default_parse_boot_param, parse_boot_param); - /* * Fake up a boot descriptor table Modified: head/sys/arm/arm/machdep_ptrace.c ============================================================================== --- head/sys/arm/arm/machdep_ptrace.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/machdep_ptrace.c Tue Sep 1 21:17:24 2020 (r365068) @@ -238,7 +238,6 @@ arm_predict_branch(void *cookie, u_int insn, register_ offset = (insn & 0xff) << (32 - offset) | (insn & 0xff) >> offset; } else { - offset = fetch_reg(cookie, insn & 0x0f); if ((insn & 0x0000ff0) != 0x00000000) { if (insn & 0x10) @@ -258,11 +257,9 @@ arm_predict_branch(void *cookie, u_int insn, register_ default: break; /* XXX */ } - } *new_pc = addr + offset; return (0); - } case 0xa: /* b ... */ Modified: head/sys/arm/arm/mpcore_timer.c ============================================================================== --- head/sys/arm/arm/mpcore_timer.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/mpcore_timer.c Tue Sep 1 21:17:24 2020 (r365068) @@ -252,9 +252,6 @@ arm_tmr_intr(void *arg) return (FILTER_HANDLED); } - - - /** * arm_tmr_probe - timer probe routine * @dev: new device Modified: head/sys/arm/arm/nexus.c ============================================================================== --- head/sys/arm/arm/nexus.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/nexus.c Tue Sep 1 21:17:24 2020 (r365068) @@ -219,7 +219,6 @@ nexus_add_child(device_t bus, u_int order, const char return (child); } - /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. @@ -470,4 +469,3 @@ nexus_ofw_map_intr(device_t dev, device_t child, phand #endif /* INTRNG */ } #endif /* FDT */ - Modified: head/sys/arm/arm/nexusvar.h ============================================================================== --- head/sys/arm/arm/nexusvar.h Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/nexusvar.h Tue Sep 1 21:17:24 2020 (r365068) @@ -33,4 +33,3 @@ void nexus_set_dma_tag(bus_dma_tag_t _tag); #endif - Modified: head/sys/arm/arm/ofw_machdep.c ============================================================================== --- head/sys/arm/arm/ofw_machdep.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/ofw_machdep.c Tue Sep 1 21:17:24 2020 (r365068) @@ -72,4 +72,3 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag return (bus_space_map(*tag, addr, size, flags, handle)); } - Modified: head/sys/arm/arm/pl310.c ============================================================================== --- head/sys/arm/arm/pl310.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/pl310.c Tue Sep 1 21:17:24 2020 (r365068) @@ -219,7 +219,6 @@ pl310_wait_background_op(uint32_t off, uint32_t mask) continue; } - /** * pl310_cache_sync - performs a cache sync operation * @@ -251,7 +250,6 @@ pl310_cache_sync(void) pl310_write4(pl310_softc, PL310_CACHE_SYNC, 0xffffffff); } - static void pl310_wbinv_all(void) { @@ -274,7 +272,6 @@ pl310_wbinv_all(void) pl310_cache_sync(); PL310_UNLOCK(pl310_softc); return; - } if (pl310_softc->sc_rtl_revision == CACHE_ID_RELEASE_r3p0) platform_pl310_write_debug(pl310_softc, 3); @@ -306,7 +303,6 @@ pl310_wbinv_range(vm_paddr_t start, vm_size_t size) size += g_l2cache_line_size; } - #ifdef PL310_ERRATA_727915 if (pl310_softc->sc_rtl_revision >= CACHE_ID_RELEASE_r2p0 && pl310_softc->sc_rtl_revision < CACHE_ID_RELEASE_r3p1) @@ -595,4 +591,3 @@ static devclass_t pl310_devclass; EARLY_DRIVER_MODULE(pl310, simplebus, pl310_driver, pl310_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE); - Modified: head/sys/arm/arm/pmap-v4.c ============================================================================== --- head/sys/arm/arm/pmap-v4.c Tue Sep 1 21:16:54 2020 (r365067) +++ head/sys/arm/arm/pmap-v4.c Tue Sep 1 21:17:24 2020 (r365068) @@ -712,7 +712,6 @@ pmap_free_l2_bucket(pmap_t pm, struct l2_bucket *l2b, pt_entry_t *ptep; u_short l1idx; - /* * Update the bucket's reference count according to how many * PTEs the caller has just invalidated. @@ -1057,9 +1056,7 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offse /* check for user uncachable conditions - order is important */ if (pm != kernel_pmap && (pv->pv_pmap == pm || pv->pv_pmap == kernel_pmap)) { - if ((uentries > 1 && uwritable) || uwritable > 1) { - /* user duplicate mapping */ if (pv->pv_pmap != kernel_pmap) pv->pv_flags |= PVF_MWC; @@ -1083,7 +1080,6 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offse (pv->pv_pmap == kernel_pmap || (pv->pv_flags & PVF_WRITE) || (pv->pv_flags & PVF_MWC)))) { - if (!(pv->pv_flags & PVF_NC)) { pv->pv_flags |= PVF_NC; pmap_set_cache_entry(pv, pm, va, -1); @@ -1094,7 +1090,6 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offse /* kernel and user are cachable */ if ((pm == kernel_pmap) && !(pv->pv_flags & PVF_MWC) && (pv->pv_flags & PVF_NC)) { - pv->pv_flags &= ~PVF_NC; if (pg->md.pv_memattr != VM_MEMATTR_UNCACHEABLE) pmap_set_cache_entry(pv, pm, va, 1); @@ -1104,7 +1099,6 @@ pmap_fix_cache(struct vm_page *pg, pmap_t pm, vm_offse if (pm != kernel_pmap && *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:18:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E2237378EEE; Tue, 1 Sep 2020 21:18:16 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Kh5vrBz4HR8; Tue, 1 Sep 2020 21:18:16 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ADDF01FAC9; Tue, 1 Sep 2020 21:18:16 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LIGEa017927; Tue, 1 Sep 2020 21:18:16 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LI7b9017875; Tue, 1 Sep 2020 21:18:07 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012118.081LI7b9017875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:18:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365069 - in head/sys/arm64: arm64 broadcom/genet cavium coresight freescale/imx freescale/imx/clk include linux qoriq qoriq/clk rockchip rockchip/clk X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/arm64: arm64 broadcom/genet cavium coresight freescale/imx freescale/imx/clk include linux qoriq qoriq/clk rockchip rockchip/clk X-SVN-Commit-Revision: 365069 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:18:16 -0000 Author: mjg Date: Tue Sep 1 21:18:06 2020 New Revision: 365069 URL: https://svnweb.freebsd.org/changeset/base/365069 Log: arm64: clean up empty lines in .c and .h files Modified: head/sys/arm64/arm64/busdma_bounce.c head/sys/arm64/arm64/freebsd32_machdep.c head/sys/arm64/arm64/gic_v3_acpi.c head/sys/arm64/arm64/gic_v3_var.h head/sys/arm64/arm64/gicv3_its.c head/sys/arm64/arm64/identcpu.c head/sys/arm64/arm64/machdep.c head/sys/arm64/arm64/machdep_boot.c head/sys/arm64/arm64/nexus.c head/sys/arm64/arm64/pmap.c head/sys/arm64/arm64/sys_machdep.c head/sys/arm64/arm64/vfp.c head/sys/arm64/broadcom/genet/if_genet.c head/sys/arm64/cavium/thunder_pcie_common.c head/sys/arm64/cavium/thunder_pcie_fdt.c head/sys/arm64/cavium/thunder_pcie_pem.c head/sys/arm64/coresight/coresight_etm4x.c head/sys/arm64/coresight/coresight_fdt.c head/sys/arm64/freescale/imx/clk/imx_clk_mux.c head/sys/arm64/freescale/imx/imx7gpc.c head/sys/arm64/freescale/imx/imx8mq_ccm.c head/sys/arm64/include/acpica_machdep.h head/sys/arm64/include/armreg.h head/sys/arm64/include/bus.h head/sys/arm64/include/cpu.h head/sys/arm64/include/endian.h head/sys/arm64/include/ieeefp.h head/sys/arm64/include/ucontext.h head/sys/arm64/include/vfp.h head/sys/arm64/linux/linux_proto.h head/sys/arm64/qoriq/clk/qoriq_clk_pll.h head/sys/arm64/qoriq/ls1046_gpio.c head/sys/arm64/rockchip/clk/rk3399_cru.c head/sys/arm64/rockchip/clk/rk3399_pmucru.c head/sys/arm64/rockchip/clk/rk_clk_fract.c head/sys/arm64/rockchip/clk/rk_clk_mux.c head/sys/arm64/rockchip/rk805reg.h head/sys/arm64/rockchip/rk_dwc3.c head/sys/arm64/rockchip/rk_i2c.c head/sys/arm64/rockchip/rk_pcie.c head/sys/arm64/rockchip/rk_pcie_phy.c head/sys/arm64/rockchip/rk_pinctrl.c head/sys/arm64/rockchip/rk_tsadc.c Modified: head/sys/arm64/arm64/busdma_bounce.c ============================================================================== --- head/sys/arm64/arm64/busdma_bounce.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/busdma_bounce.c Tue Sep 1 21:18:06 2020 (r365069) @@ -411,7 +411,6 @@ bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmam return (0); } - /* * Allocate a piece of memory that can be efficiently mapped into * bus device space based on the constraints lited in the dma tag. @@ -840,7 +839,6 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_ if (map->sync_count == 0 || (kvaddr != 0 && kvaddr != sl_vend) || (curaddr != sl_pend)) { - if (++map->sync_count > dmat->common.nsegments) goto cleanup; sl++; Modified: head/sys/arm64/arm64/freebsd32_machdep.c ============================================================================== --- head/sys/arm64/arm64/freebsd32_machdep.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/freebsd32_machdep.c Tue Sep 1 21:18:06 2020 (r365069) @@ -116,8 +116,6 @@ freebsd32_sysarch(struct thread *td, struct freebsd32_ return (EINVAL); } - - #ifdef VFP static void get_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) Modified: head/sys/arm64/arm64/gic_v3_acpi.c ============================================================================== --- head/sys/arm64/arm64/gic_v3_acpi.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/gic_v3_acpi.c Tue Sep 1 21:18:06 2020 (r365069) @@ -83,7 +83,6 @@ static devclass_t gic_v3_acpi_devclass; EARLY_DRIVER_MODULE(gic_v3, acpi, gic_v3_acpi_driver, gic_v3_acpi_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); - struct madt_table_data { device_t parent; device_t dev; Modified: head/sys/arm64/arm64/gic_v3_var.h ============================================================================== --- head/sys/arm64/arm64/gic_v3_var.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/gic_v3_var.h Tue Sep 1 21:18:06 2020 (r365069) @@ -82,7 +82,6 @@ struct gic_v3_softc { struct gic_v3_irqsrc *gic_irqs; }; - struct gic_v3_devinfo { int gic_domain; int msi_xref; Modified: head/sys/arm64/arm64/gicv3_its.c ============================================================================== --- head/sys/arm64/arm64/gicv3_its.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/gicv3_its.c Tue Sep 1 21:18:06 2020 (r365069) @@ -1575,7 +1575,6 @@ its_cmd_wait_completion(device_t dev, struct its_cmd * } } - static struct its_cmd * its_cmd_alloc_locked(device_t dev) { Modified: head/sys/arm64/arm64/identcpu.c ============================================================================== --- head/sys/arm64/arm64/identcpu.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/identcpu.c Tue Sep 1 21:18:06 2020 (r365069) @@ -263,7 +263,6 @@ struct mrs_field_value { MRS_FIELD_VALUE(13ul<< _reg ## _ ## _field ## _SHIFT, "14 "_desc "s"), \ MRS_FIELD_VALUE(14ul<< _reg ## _ ## _field ## _SHIFT, "15 "_desc "s"), \ MRS_FIELD_VALUE(15ul<< _reg ## _ ## _field ## _SHIFT, "16 "_desc "s") - #define MRS_FIELD_VALUE_END { .desc = NULL } struct mrs_field { @@ -284,7 +283,6 @@ struct mrs_field { .mask = _register ## _ ## _name ## _MASK, \ .values = (_values), \ } - #define MRS_FIELD_END { .type = MRS_INVALID, } /* ID_AA64AFR0_EL1 */ @@ -292,13 +290,11 @@ static struct mrs_field id_aa64afr0_fields[] = { MRS_FIELD_END, }; - /* ID_AA64AFR1_EL1 */ static struct mrs_field id_aa64afr1_fields[] = { MRS_FIELD_END, }; - /* ID_AA64DFR0_EL1 */ static struct mrs_field_value id_aa64dfr0_pmsver[] = { MRS_FIELD_VALUE(ID_AA64DFR0_PMSVer_NONE, ""), @@ -356,13 +352,11 @@ static struct mrs_field id_aa64dfr0_fields[] = { MRS_FIELD_END, }; - /* ID_AA64DFR1 */ static struct mrs_field id_aa64dfr1_fields[] = { MRS_FIELD_END, }; - /* ID_AA64ISAR0_EL1 */ static struct mrs_field_value id_aa64isar0_rndr[] = { MRS_FIELD_VALUE(ID_AA64ISAR0_RNDR_NONE, ""), @@ -459,7 +453,6 @@ static struct mrs_field id_aa64isar0_fields[] = { MRS_FIELD_END, }; - /* ID_AA64ISAR1_EL1 */ static struct mrs_field_value id_aa64isar1_i8mm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ISAR1, I8MM, NONE, IMPL), @@ -556,7 +549,6 @@ static struct mrs_field id_aa64isar1_fields[] = { MRS_FIELD_END, }; - /* ID_AA64MMFR0_EL1 */ static struct mrs_field_value id_aa64mmfr0_tgran4[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR0, TGran4, NONE, IMPL), @@ -622,7 +614,6 @@ static struct mrs_field id_aa64mmfr0_fields[] = { MRS_FIELD_END, }; - /* ID_AA64MMFR1_EL1 */ static struct mrs_field_value id_aa64mmfr1_xnx[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR1, XNX, NONE, IMPL), @@ -684,7 +675,6 @@ static struct mrs_field id_aa64mmfr1_fields[] = { MRS_FIELD_END, }; - /* ID_AA64MMFR2_EL1 */ static struct mrs_field_value id_aa64mmfr2_nv[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR2, NV, NONE, IMPL), @@ -735,7 +725,6 @@ static struct mrs_field id_aa64mmfr2_fields[] = { MRS_FIELD_END, }; - /* ID_AA64PFR0_EL1 */ static struct mrs_field_value id_aa64pfr0_csv3[] = { MRS_FIELD_VALUE(ID_AA64PFR0_CSV3_NONE, ""), @@ -842,7 +831,6 @@ static struct mrs_field id_aa64pfr0_fields[] = { MRS_FIELD(ID_AA64PFR0, EL0, false, MRS_LOWER, id_aa64pfr0_el0), MRS_FIELD_END, }; - /* ID_AA64PFR1_EL1 */ static struct mrs_field_value id_aa64pfr1_bt[] = { Modified: head/sys/arm64/arm64/machdep.c ============================================================================== --- head/sys/arm64/arm64/machdep.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/machdep.c Tue Sep 1 21:18:06 2020 (r365069) @@ -410,7 +410,6 @@ set_regs32(struct thread *td, struct reg32 *regs) tf->tf_elr = regs->r_pc; tf->tf_spsr = regs->r_cpsr; - return (0); } Modified: head/sys/arm64/arm64/machdep_boot.c ============================================================================== --- head/sys/arm64/arm64/machdep_boot.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/machdep_boot.c Tue Sep 1 21:18:06 2020 (r365069) @@ -55,7 +55,6 @@ extern int *end; static char *loader_envp; static char static_kenv[4096]; - #ifdef FDT #define CMDLINE_GUARD "FreeBSD:" #define LBABI_MAX_COMMAND_LINE 512 @@ -78,7 +77,6 @@ static char linux_command_line[LBABI_MAX_COMMAND_LINE size += ssize; \ size = roundup(size, sizeof(u_long)); \ } while (0) - /* Build minimal set of metatda. */ static vm_offset_t Modified: head/sys/arm64/arm64/nexus.c ============================================================================== --- head/sys/arm64/arm64/nexus.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/nexus.c Tue Sep 1 21:18:06 2020 (r365069) @@ -209,7 +209,6 @@ nexus_add_child(device_t bus, u_int order, const char return (child); } - /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. @@ -397,7 +396,6 @@ nexus_set_resource(device_t dev, device_t child, int t return(0); } - static int nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, Modified: head/sys/arm64/arm64/pmap.c ============================================================================== --- head/sys/arm64/arm64/pmap.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/pmap.c Tue Sep 1 21:18:06 2020 (r365069) @@ -600,7 +600,6 @@ pmap_l3_valid(pt_entry_t l3) return ((l3 & ATTR_DESCR_MASK) == L3_PAGE); } - CTASSERT(L1_BLOCK == L2_BLOCK); static pt_entry_t @@ -1422,7 +1421,6 @@ pmap_map(vm_offset_t *virt, vm_paddr_t start, vm_paddr return PHYS_TO_DMAP(start); } - /* * Add a list of wired pages to the kva * this routine is only used for temporary @@ -2060,7 +2058,6 @@ pmap_growkernel(vm_offset_t addr) } } - /*************************************************** * page management routines. ***************************************************/ @@ -2883,7 +2880,6 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t lock = NULL; for (; sva < eva; sva = va_next) { - if (pmap->pm_stats.resident_count == 0) break; @@ -3137,7 +3133,6 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t PMAP_LOCK(pmap); for (; sva < eva; sva = va_next) { - l0 = pmap_l0(pmap, sva); if (pmap_load(l0) == 0) { va_next = (sva + L0_SIZE) & ~L0_OFFSET; Modified: head/sys/arm64/arm64/sys_machdep.c ============================================================================== --- head/sys/arm64/arm64/sys_machdep.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/sys_machdep.c Tue Sep 1 21:18:06 2020 (r365069) @@ -37,11 +37,9 @@ __FBSDID("$FreeBSD$"); #include - int sysarch(struct thread *td, struct sysarch_args *uap) { return (ENOTSUP); } - Modified: head/sys/arm64/arm64/vfp.c ============================================================================== --- head/sys/arm64/arm64/vfp.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/arm64/vfp.c Tue Sep 1 21:18:06 2020 (r365069) @@ -218,7 +218,6 @@ vfp_restore_state(void) * cpu we need to restore the old state. */ if (PCPU_GET(fpcurthread) != curthread || cpu != curpcb->pcb_vfpcpu) { - vfp_restore(curthread->td_pcb->pcb_fpusaved); PCPU_SET(fpcurthread, curthread); curpcb->pcb_vfpcpu = cpu; Modified: head/sys/arm64/broadcom/genet/if_genet.c ============================================================================== --- head/sys/arm64/broadcom/genet/if_genet.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/broadcom/genet/if_genet.c Tue Sep 1 21:18:06 2020 (r365069) @@ -99,7 +99,6 @@ __FBSDID("$FreeBSD$"); #define TX_NEXT(n, count) (((n) + 1) & ((count) - 1)) #define RX_NEXT(n, count) (((n) + 1) & ((count) - 1)) - #define TX_MAX_SEGS 20 /* Maximum number of mbufs to send to if_input */ @@ -1258,7 +1257,6 @@ gen_intr(void *arg) if (val & GENET_IRQ_RXDMA_DONE) gen_rxintr(sc, &sc->rx_queue[DEF_RXQUEUE]); - if (val & GENET_IRQ_TXDMA_DONE) { gen_txintr(sc, &sc->tx_queue[DEF_TXQUEUE]); Modified: head/sys/arm64/cavium/thunder_pcie_common.c ============================================================================== --- head/sys/arm64/cavium/thunder_pcie_common.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/cavium/thunder_pcie_common.c Tue Sep 1 21:18:06 2020 (r365069) @@ -185,7 +185,6 @@ thunder_pcie_alloc_resource(device_t dev, device_t chi */ if (((type == SYS_RES_IOPORT) || (type == SYS_RES_MEMORY)) && RMAN_IS_DEFAULT_RANGE(start, end)) { - /* Read BAR manually to get resource address and size */ pci_read_bar(child, *rid, &map, &testval, NULL); Modified: head/sys/arm64/cavium/thunder_pcie_fdt.c ============================================================================== --- head/sys/arm64/cavium/thunder_pcie_fdt.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/cavium/thunder_pcie_fdt.c Tue Sep 1 21:18:06 2020 (r365069) @@ -90,7 +90,6 @@ DRIVER_MODULE(thunder_pcib, simplebus, thunder_pcie_fd DRIVER_MODULE(thunder_pcib, ofwbus, thunder_pcie_fdt_driver, thunder_pcie_fdt_devclass, 0, 0); - static int thunder_pcie_fdt_probe(device_t dev) { Modified: head/sys/arm64/cavium/thunder_pcie_pem.c ============================================================================== --- head/sys/arm64/cavium/thunder_pcie_pem.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/cavium/thunder_pcie_pem.c Tue Sep 1 21:18:06 2020 (r365069) @@ -648,7 +648,6 @@ thunder_pem_alloc_resource(device_t dev, device_t chil end, count, flags)); } - if (!RMAN_IS_DEFAULT_RANGE(start, end)) { /* * We might get PHYS addresses here inherited from EFI. @@ -658,7 +657,6 @@ thunder_pem_alloc_resource(device_t dev, device_t chil start = range_addr_phys_to_pci(sc->ranges, start); end = start + count - 1; } - } if (bootverbose) { Modified: head/sys/arm64/coresight/coresight_etm4x.c ============================================================================== --- head/sys/arm64/coresight/coresight_etm4x.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/coresight/coresight_etm4x.c Tue Sep 1 21:18:06 2020 (r365069) @@ -256,7 +256,6 @@ etm_attach(device_t dev) } static device_method_t etm_methods[] = { - /* Coresight interface */ DEVMETHOD(coresight_init, etm_init), DEVMETHOD(coresight_enable, etm_enable), Modified: head/sys/arm64/coresight/coresight_fdt.c ============================================================================== --- head/sys/arm64/coresight/coresight_fdt.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/coresight/coresight_fdt.c Tue Sep 1 21:18:06 2020 (r365069) @@ -71,7 +71,6 @@ coresight_fdt_get_ports(phandle_t dev_node, if (strcasecmp(name, "port") || strncasecmp(name, "port@", 6)) { - port_reg = -1; OF_getencprop(child, "reg", (void *)&port_reg, sizeof(port_reg)); Modified: head/sys/arm64/freescale/imx/clk/imx_clk_mux.c ============================================================================== --- head/sys/arm64/freescale/imx/clk/imx_clk_mux.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/freescale/imx/clk/imx_clk_mux.c Tue Sep 1 21:18:06 2020 (r365069) @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD$"); - #include #include #include @@ -73,7 +72,6 @@ static clknode_method_t imx_clk_mux_methods[] = { }; DEFINE_CLASS_1(imx_clk_mux, imx_clk_mux_class, imx_clk_mux_methods, sizeof(struct imx_clk_mux_sc), clknode_class); - static int imx_clk_mux_init(struct clknode *clk, device_t dev) Modified: head/sys/arm64/freescale/imx/imx7gpc.c ============================================================================== --- head/sys/arm64/freescale/imx/imx7gpc.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/freescale/imx/imx7gpc.c Tue Sep 1 21:18:06 2020 (r365069) @@ -142,7 +142,6 @@ imx7gpc_pre_ithread(device_t dev, struct intr_irqsrc * PIC_PRE_ITHREAD(sc->parent, isrc); } - static void imx7gpc_post_ithread(device_t dev, struct intr_irqsrc *isrc) { @@ -206,7 +205,6 @@ imx7gpc_attach(device_t dev) device_printf(dev, "Can't find parent controller\n"); return (ENXIO); } - i = 0; sc->memres = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &i, Modified: head/sys/arm64/freescale/imx/imx8mq_ccm.c ============================================================================== --- head/sys/arm64/freescale/imx/imx8mq_ccm.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/freescale/imx/imx8mq_ccm.c Tue Sep 1 21:18:06 2020 (r365069) @@ -134,7 +134,7 @@ static struct imx_clk imx_clks[] = { FIXED(IMX8MQ_SYS1_PLL_OUT, "sys1_pll_out", 800000000), FIXED(IMX8MQ_SYS2_PLL_OUT, "sys2_pll_out", 1000000000), SSCG_PLL(IMX8MQ_SYS3_PLL_OUT, "sys3_pll_out", sys3_pll_out_p, 0x48), - + MUX(IMX8MQ_ARM_PLL_REF_SEL, "arm_pll_ref_sel", pll_ref_p, 0, 0x28, 16, 2), MUX(IMX8MQ_GPU_PLL_REF_SEL, "gpu_pll_ref_sel", pll_ref_p, 0, 0x18, 16, 2), MUX(IMX8MQ_VPU_PLL_REF_SEL, "vpu_pll_ref_sel", pll_ref_p, 0, 0x20, 16, 2), Modified: head/sys/arm64/include/acpica_machdep.h ============================================================================== --- head/sys/arm64/include/acpica_machdep.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/include/acpica_machdep.h Tue Sep 1 21:18:06 2020 (r365069) @@ -36,7 +36,6 @@ #ifndef __ACPICA_MACHDEP_H__ #define __ACPICA_MACHDEP_H__ - #ifdef _KERNEL #include Modified: head/sys/arm64/include/armreg.h ============================================================================== --- head/sys/arm64/include/armreg.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/include/armreg.h Tue Sep 1 21:18:06 2020 (r365069) @@ -164,7 +164,6 @@ (ISS_MSR_OP0_MASK | ISS_MSR_OP2_MASK | ISS_MSR_OP1_MASK | \ ISS_MSR_CRn_MASK | ISS_MSR_CRm_MASK) - #define ISS_DATA_ISV_SHIFT 24 #define ISS_DATA_ISV (0x01 << ISS_DATA_ISV_SHIFT) #define ISS_DATA_SAS_SHIFT 22 Modified: head/sys/arm64/include/bus.h ============================================================================== --- head/sys/arm64/include/bus.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/include/bus.h Tue Sep 1 21:18:06 2020 (r365069) @@ -261,7 +261,6 @@ struct bus_space { bus_size_t, const u_int64_t *, bus_size_t); }; - /* * Utility macros; INTERNAL USE ONLY. */ @@ -287,7 +286,6 @@ struct bus_space { #define __bs_nonsingle_s(type, sz, t, h, o, a, c) \ (*(t)->__bs_opname_s(type,sz))((t)->bs_cookie, h, o, a, c) - /* * Mapping and unmapping operations. */ @@ -298,7 +296,6 @@ struct bus_space { #define bus_space_subregion(t, h, o, s, hp) \ (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp)) - /* * Allocation and deallocation operations. */ @@ -314,8 +311,6 @@ struct bus_space { #define bus_space_barrier(t, h, o, l, f) \ (*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f)) - - /* * Bus read (single) operations. */ @@ -350,7 +345,6 @@ struct bus_space { #define bus_space_read_multi_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(rm,8,(t),(h),(o),(a),(c)) - /* * Bus read region operations. */ @@ -372,7 +366,6 @@ struct bus_space { #define bus_space_read_region_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(rr,8,(t),(h),(o),(a),(c)) - /* * Bus write (single) operations. */ @@ -386,7 +379,6 @@ struct bus_space { #define bus_space_write_stream_4(t, h, o, v) __bs_ws_s(4,(t),(h),(o),(v)) #define bus_space_write_stream_8(t, h, o, v) __bs_ws_s(8,(t),(h),(o),(v)) - /* * Bus write multiple operations. */ @@ -408,7 +400,6 @@ struct bus_space { #define bus_space_write_multi_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(wm,8,(t),(h),(o),(a),(c)) - /* * Bus write region operations. */ @@ -430,7 +421,6 @@ struct bus_space { #define bus_space_write_region_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(wr,8,(t),(h),(o),(a),(c)) - /* * Set multiple operations. */ @@ -443,7 +433,6 @@ struct bus_space { #define bus_space_set_multi_8(t, h, o, v, c) \ __bs_set(sm,8,(t),(h),(o),(v),(c)) - /* * Set region operations. */ @@ -455,7 +444,6 @@ struct bus_space { __bs_set(sr,4,(t),(h),(o),(v),(c)) #define bus_space_set_region_8(t, h, o, v, c) \ __bs_set(sr,8,(t),(h),(o),(v),(c)) - /* * Copy operations. Modified: head/sys/arm64/include/cpu.h ============================================================================== --- head/sys/arm64/include/cpu.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/include/cpu.h Tue Sep 1 21:18:06 2020 (r365069) @@ -157,7 +157,6 @@ #define CPU_MATCH_ERRATA_CAVIUM_THUNDERX_1_1 0 #endif - extern char btext[]; extern char etext[]; Modified: head/sys/arm64/include/endian.h ============================================================================== --- head/sys/arm64/include/endian.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/include/endian.h Tue Sep 1 21:18:06 2020 (r365069) @@ -66,7 +66,7 @@ __bswap64(__uint64_t x) __asm __volatile("rev %0, %1\n" : "=&r" (ret), "+r" (x)); - + return (ret); } @@ -77,7 +77,7 @@ __bswap32_var(__uint32_t v) __asm __volatile("rev32 %x0, %x1\n" : "=&r" (ret), "+r" (v)); - + return (ret); } Modified: head/sys/arm64/include/ieeefp.h ============================================================================== --- head/sys/arm64/include/ieeefp.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/include/ieeefp.h Tue Sep 1 21:18:06 2020 (r365069) @@ -40,5 +40,4 @@ extern fp_except_t fpgetmask(void); extern fp_except_t fpsetmask(fp_except_t); __END_DECLS - #endif /* _MACHINE_IEEEFP_H_ */ Modified: head/sys/arm64/include/ucontext.h ============================================================================== --- head/sys/arm64/include/ucontext.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/include/ucontext.h Tue Sep 1 21:18:06 2020 (r365069) @@ -86,5 +86,4 @@ typedef struct __mcontext32_vfp { #endif /* COMPAT_FREEBSD32 */ - #endif /* !_MACHINE_UCONTEXT_H_ */ Modified: head/sys/arm64/include/vfp.h ============================================================================== --- head/sys/arm64/include/vfp.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/include/vfp.h Tue Sep 1 21:18:06 2020 (r365069) @@ -32,7 +32,6 @@ #ifndef _MACHINE_VFP_H_ #define _MACHINE_VFP_H_ - #ifndef LOCORE struct vfpstate { __uint128_t vfp_regs[32]; Modified: head/sys/arm64/linux/linux_proto.h ============================================================================== --- head/sys/arm64/linux/linux_proto.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/linux/linux_proto.h Tue Sep 1 21:18:06 2020 (r365069) @@ -1343,41 +1343,35 @@ int linux_pkey_free(struct thread *, struct linux_pkey #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 #define nosys linux_nosys #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 #define nosys linux_nosys #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 #define nosys linux_nosys #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 #define nosys linux_nosys #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 #define nosys linux_nosys #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 Modified: head/sys/arm64/qoriq/clk/qoriq_clk_pll.h ============================================================================== --- head/sys/arm64/qoriq/clk/qoriq_clk_pll.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/qoriq/clk/qoriq_clk_pll.h Tue Sep 1 21:18:06 2020 (r365069) @@ -50,4 +50,3 @@ int qoriq_clk_pll_register(struct clkdom *clkdom, const struct qoriq_clk_pll_def *clkdef); #endif /* _QORIQ_CLK_PLL_H_ */ - Modified: head/sys/arm64/qoriq/ls1046_gpio.c ============================================================================== --- head/sys/arm64/qoriq/ls1046_gpio.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/qoriq/ls1046_gpio.c Tue Sep 1 21:18:06 2020 (r365069) @@ -109,7 +109,6 @@ static int qoriq_gpio_pin_access_32(device_t, uint32_t uint32_t*); static int qoriq_gpio_pin_config_32(device_t, uint32_t, uint32_t, uint32_t*); - static device_method_t qoriq_gpio_methods[] = { DEVMETHOD(device_probe, qoriq_gpio_probe), DEVMETHOD(device_attach, qoriq_gpio_attach), Modified: head/sys/arm64/rockchip/clk/rk3399_cru.c ============================================================================== --- head/sys/arm64/rockchip/clk/rk3399_cru.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/clk/rk3399_cru.c Tue Sep 1 21:18:06 2020 (r365069) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #define CRU_CLKSEL_CON(x) (0x100 + (x) * 0x4) #define CRU_CLKGATE_CON(x) (0x300 + (x) * 0x4) - /* GATES */ static struct rk_cru_gate rk3399_gates[] = { @@ -106,7 +105,6 @@ static struct rk_cru_gate rk3399_gates[] = { GATE(0, "clk_ddrc_bpll_src", "bpll", 3, 1), GATE(0, "clk_ddrc_lpll_src", "lpll", 3, 0), - /* CRU_CLKGATE_CON4 */ /* 15 - 12 unused */ GATE(SCLK_PVTM_DDR, "clk_pvtm_ddr", "xin24m", 4, 11), @@ -219,7 +217,6 @@ static struct rk_cru_gate rk3399_gates[] = { GATE(SCLK_I2C5, "clk_i2c5", "clk_i2c5_c", 10, 1), GATE(SCLK_I2C1, "clk_i2c1", "clk_i2c1_c", 10, 0), - /* CRU_CLKGATE_CON11 */ GATE(SCLK_MIPIDPHY_CFG, "clk_mipidphy_cfg", "xin24m", 11, 15), GATE(SCLK_MIPIDPHY_REF, "clk_mipidphy_ref", "xin24m", 11, 14), @@ -311,7 +308,6 @@ static struct rk_cru_gate rk3399_gates[] = { GATE(ACLK_IEP_NOC, "aclk_iep_noc", "aclk_iep_pre", 16, 1), GATE(ACLK_IEP, "aclk_iep", "aclk_iep_pre", 16, 0), - /* CRU_CLKGATE_CON17 */ /* 15 - 12 unused */ GATE(HCLK_VDU_NOC, "hclk_vdu_noc", "hclk_vdu_pre", 17, 11), @@ -346,7 +342,6 @@ static struct rk_cru_gate rk3399_gates[] = { GATE(ACLK_CENTER_PERI_NOC, "aclk_center_peri_noc", "aclk_center", 19, 1), GATE(ACLK_CENTER_MAIN_NOC, "aclk_center_main_noc", "aclk_center", 19, 0), - /* CRU_CLKGATE_CON20 */ GATE(0, "hclk_ahb1tom", "hclk_perihp", 20, 15), GATE(0, "pclk_perihp_noc", "pclk_perihp", 20, 14), @@ -376,7 +371,6 @@ static struct rk_cru_gate rk3399_gates[] = { GATE(SCLK_DPHY_TX0_CFG, "clk_dphy_tx0_cfg", "clk_mipidphy_cfg", 21, 1), GATE(SCLK_DPHY_PLL, "clk_dphy_pll", "clk_mipidphy_ref", 21, 0), - /* CRU_CLKGATE_CON22 */ GATE(PCLK_EFUSE1024S, "pclk_efuse1024s", "pclk_perilp1", 22, 15), GATE(PCLK_EFUSE1024NS, "pclk_efuse1024ns", "pclk_perilp1", 22, 14), @@ -690,7 +684,6 @@ static struct rk_clk_armclk_rates rk3399_cpu_b_rates[] { 96000000, 1}, }; - /* Standard PLL. */ #define PLL(_id, _name, _base) \ { \ @@ -739,7 +732,6 @@ PLIST(dclk_vop1_p)= {"dclk_vop1_div", "dclk_vop1_frac PLIST(clk_cif_p) = {"clk_cifout_src", "xin24m"}; - PLIST(pll_src_24m_usbphy480m_p) = { "xin24m", "clk_usbphy_480m"}; PLIST(pll_src_24m_pciephy_p) = { "xin24m", "clk_pciephy_ref100m"}; PLIST(pll_src_24m_32k_cpll_gpll_p)= {"xin24m", "xin32k", "cpll", "gpll"}; @@ -781,7 +773,6 @@ PLIST(uart2_p)= {"clk_uart2_div", "clk_uart2_frac", "x PLIST(uart3_p)= {"clk_uart3_div", "clk_uart3_frac", "xin24m"}; static struct rk_clk rk3399_clks[] = { - /* External clocks */ LINK("xin24m"), FRATE(0, "xin32k", 32768), @@ -1063,7 +1054,6 @@ static struct rk_clk rk3399_clks[] = { COMP(0, "aclk_vio_c", pll_src_cpll_gpll_ppll_p, 0, 42, 0, 5, 6, 2), - /* CRU_CLKSEL_CON43 */ CDIV(0, "pclk_hdcp_c", "aclk_hdcp", 0, 43, 10, 5), @@ -1228,8 +1218,6 @@ static struct rk_clk rk3399_clks[] = { * MMC(SCLK_SDIO_DRV, "sdio_drv", "clk_sdio", RK3399_SDIO_CON0, 1), * MMC(SCLK_SDIO_SAMPLE, "sdio_sample", "clk_sdio", RK3399_SDIO_CON1, 1), */ - - }; Modified: head/sys/arm64/rockchip/clk/rk3399_pmucru.c ============================================================================== --- head/sys/arm64/rockchip/clk/rk3399_pmucru.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/clk/rk3399_pmucru.c Tue Sep 1 21:18:06 2020 (r365069) @@ -729,7 +729,6 @@ static struct rk_clk_composite_def pclk_pmu_src = { .div_width = 5, }; - #define SCLK_I2C0_PMU 9 #define SCLK_I2C4_PMU 10 #define SCLK_I2C8_PMU 11 Modified: head/sys/arm64/rockchip/clk/rk_clk_fract.c ============================================================================== --- head/sys/arm64/rockchip/clk/rk_clk_fract.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/clk/rk_clk_fract.c Tue Sep 1 21:18:06 2020 (r365069) @@ -71,7 +71,6 @@ static clknode_method_t rk_clk_fract_methods[] = { DEFINE_CLASS_1(rk_clk_fract, rk_clk_fract_class, rk_clk_fract_methods, sizeof(struct rk_clk_fract_sc), clknode_class); - /* * Compute best rational approximation of input fraction * for fixed sized fractional divider registers. Modified: head/sys/arm64/rockchip/clk/rk_clk_mux.c ============================================================================== --- head/sys/arm64/rockchip/clk/rk_clk_mux.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/clk/rk_clk_mux.c Tue Sep 1 21:18:06 2020 (r365069) @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD$"); - #include #include #include @@ -74,7 +73,6 @@ static clknode_method_t rk_clk_mux_methods[] = { }; DEFINE_CLASS_1(rk_clk_mux, rk_clk_mux_class, rk_clk_mux_methods, sizeof(struct rk_clk_mux_sc), clknode_class); - static int rk_clk_mux_init(struct clknode *clk, device_t dev) Modified: head/sys/arm64/rockchip/rk805reg.h ============================================================================== --- head/sys/arm64/rockchip/rk805reg.h Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/rk805reg.h Tue Sep 1 21:18:06 2020 (r365069) @@ -27,7 +27,6 @@ * $FreeBSD$ */ - #ifndef _RK805REG_H_ #define _RK805REG_H_ Modified: head/sys/arm64/rockchip/rk_dwc3.c ============================================================================== --- head/sys/arm64/rockchip/rk_dwc3.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/rk_dwc3.c Tue Sep 1 21:18:06 2020 (r365069) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include Modified: head/sys/arm64/rockchip/rk_i2c.c ============================================================================== --- head/sys/arm64/rockchip/rk_i2c.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/rk_i2c.c Tue Sep 1 21:18:06 2020 (r365069) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "iicbus_if.h" - #define RK_I2C_CON 0x00 #define RK_I2C_CON_EN (1 << 0) #define RK_I2C_CON_MODE_SHIFT 1 @@ -238,7 +237,6 @@ rk_i2c_fill_tx(struct rk_i2c_softc *sc) sc->cnt++; } buf32 |= buf << (j * 8); - } RK_I2C_WRITE(sc, RK_I2C_TXDATA_BASE + 4 * i, buf32); Modified: head/sys/arm64/rockchip/rk_pcie.c ============================================================================== --- head/sys/arm64/rockchip/rk_pcie.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/rk_pcie.c Tue Sep 1 21:18:06 2020 (r365069) @@ -203,7 +203,6 @@ struct rk_pcie_softc { phandle_t node; struct mtx mtx; - struct ofw_pci_range mem_range; struct ofw_pci_range pref_mem_range; struct ofw_pci_range io_range; @@ -245,7 +244,6 @@ static struct ofw_compat_data compat_data[] = { {NULL, 0}, }; - static uint32_t rk_pcie_local_cfg_read(struct rk_pcie_softc *sc, bool priv, u_int reg, int bytes) @@ -305,7 +303,6 @@ rk_pcie_local_cfg_write(struct rk_pcie_softc *sc, bool } } - static bool rk_pcie_check_dev(struct rk_pcie_softc *sc, u_int bus, u_int slot, u_int func, u_int reg) @@ -334,7 +331,6 @@ rk_pcie_check_dev(struct rk_pcie_softc *sc, u_int bus, return (true); } - static void rk_pcie_map_out_atu(struct rk_pcie_softc *sc, int idx, int type, int num_bits, uint64_t pa) @@ -342,7 +338,6 @@ rk_pcie_map_out_atu(struct rk_pcie_softc *sc, int idx, uint32_t addr0; uint64_t max_size; - /* Check HW constrains */ max_size = idx == 0 ? ATU_OB_REGION_0_SIZE: ATU_OB_REGION_SIZE; KASSERT(idx < ATU_OB_REGIONS, ("Invalid region index: %d\n", idx)); @@ -1027,7 +1022,6 @@ rk_pcie_setup_sw(struct rk_pcie_softc *sc) pcib_bridge_init(sc->dev); - /* Setup config registers */ APB_WR4(sc, PCIE_CORE_CONFIG_VENDOR, 0x1D87); /* Rockchip vendor ID*/ PRIV_CFG_WR1(sc, PCIR_CLASS, PCIC_BRIDGE); @@ -1137,7 +1131,6 @@ rk_pcie_legacy_irq(void *arg) return (FILTER_STRAY); } - static bus_dma_tag_t rk_pcie_get_dma_tag(device_t dev, device_t child) { @@ -1147,7 +1140,6 @@ rk_pcie_get_dma_tag(device_t dev, device_t child) return (sc->dmat); } - static int rk_pcie_probe(device_t dev) { @@ -1369,7 +1361,6 @@ out: /* XXX Cleanup */ return (rv); } - static device_method_t rk_pcie_methods[] = { /* Device interface */ Modified: head/sys/arm64/rockchip/rk_pcie_phy.c ============================================================================== --- head/sys/arm64/rockchip/rk_pcie_phy.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/rk_pcie_phy.c Tue Sep 1 21:18:06 2020 (r365069) @@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$"); #define PHY_CFG_SCC_LOCK 0x12 #define CLK_SCC_100M_GATE (1 << 2) - #define STATUS1_PLL_LOCKED (1 << 9) static struct ofw_compat_data compat_data[] = { @@ -81,7 +80,6 @@ static struct ofw_compat_data compat_data[] = { {NULL, 0} }; - struct rk_pcie_phy_softc { device_t dev; struct syscon *syscon; @@ -99,14 +97,12 @@ struct rk_pcie_phy_softc { #define PHY_ASSERT_LOCKED(_sc) mtx_assert(&(_sc)->mtx, MA_OWNED); #define PHY_ASSERT_UNLOCKED(_sc) mtx_assert(&(_sc)->mtx, MA_NOTOWNED); - #define RD4(sc, reg) SYSCON_READ_4((sc)->syscon, (reg)) #define WR4(sc, reg, mask, val) \ SYSCON_WRITE_4((sc)->syscon, (reg), ((mask) << GRF_HIWORD_SHIFT) | (val)) #define MAX_LANE 4 - static void cfg_write(struct rk_pcie_phy_softc *sc, uint32_t reg, uint32_t data) { @@ -254,7 +250,6 @@ rk_pcie_phy_enable(struct phynode *phynode, bool enabl return (rv); } - /* Phy class and methods. */ static int rk_pcie_phy_enable(struct phynode *phynode, bool enable); Modified: head/sys/arm64/rockchip/rk_pinctrl.c ============================================================================== --- head/sys/arm64/rockchip/rk_pinctrl.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/rk_pinctrl.c Tue Sep 1 21:18:06 2020 (r365069) @@ -87,7 +87,6 @@ struct rk_pinctrl_gpio { device_t gpio_dev; }; - struct rk_pinctrl_softc; struct rk_pinctrl_conf { @@ -467,7 +466,6 @@ static struct rk_pinctrl_pin_fixup rk3328_pin_fixup[] RK_PINFIX(2, 15, 0x28, 0, 0x7), RK_PINFIX(2, 23, 0x30, 14, 0x6000), }; - static struct rk_pinctrl_pin_drive rk3328_pin_drive[] = { /* bank sub offs val ma */ Modified: head/sys/arm64/rockchip/rk_tsadc.c ============================================================================== --- head/sys/arm64/rockchip/rk_tsadc.c Tue Sep 1 21:17:24 2020 (r365068) +++ head/sys/arm64/rockchip/rk_tsadc.c Tue Sep 1 21:18:06 2020 (r365069) @@ -387,7 +387,6 @@ tsadc_raw_to_temp(struct tsadc_softc *sc, uint32_t raw } } - /* * Translated value is between i and i - 1 table entries. * Do linear interpolation for it. From owner-svn-src-all@freebsd.org Tue Sep 1 21:18:51 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9E2DB378EF9; Tue, 1 Sep 2020 21:18:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0LM3ylXz4HRp; Tue, 1 Sep 2020 21:18:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AD331FB1C; Tue, 1 Sep 2020 21:18:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LIpA9018043; Tue, 1 Sep 2020 21:18:51 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LIevw017987; Tue, 1 Sep 2020 21:18:40 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012118.081LIevw017987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:18:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365070 - in head/sys/fs: autofs cd9660 cuse devfs ext2fs fdescfs fifofs fuse msdosfs nfs nfsclient nfsserver nullfs procfs smbfs tmpfs udf unionfs X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/fs: autofs cd9660 cuse devfs ext2fs fdescfs fifofs fuse msdosfs nfs nfsclient nfsserver nullfs procfs smbfs tmpfs udf unionfs X-SVN-Commit-Revision: 365070 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:18:51 -0000 Author: mjg Date: Tue Sep 1 21:18:40 2020 New Revision: 365070 URL: https://svnweb.freebsd.org/changeset/base/365070 Log: fs: clean up empty lines in .c and .h files Modified: head/sys/fs/autofs/autofs.c head/sys/fs/autofs/autofs_vnops.c head/sys/fs/cd9660/cd9660_node.h head/sys/fs/cd9660/cd9660_rrip.c head/sys/fs/cd9660/cd9660_vnops.c head/sys/fs/cd9660/iso_rrip.h head/sys/fs/cuse/cuse.c head/sys/fs/devfs/devfs_devs.c head/sys/fs/ext2fs/ext2_alloc.c head/sys/fs/ext2fs/ext2_balloc.c head/sys/fs/ext2fs/ext2_bmap.c head/sys/fs/ext2fs/ext2_dinode.h head/sys/fs/ext2fs/ext2_extattr.c head/sys/fs/ext2fs/ext2_extattr.h head/sys/fs/ext2fs/ext2_extents.c head/sys/fs/ext2fs/ext2_inode_cnv.c head/sys/fs/ext2fs/ext2_lookup.c head/sys/fs/ext2fs/ext2_vfsops.c head/sys/fs/ext2fs/ext2_vnops.c head/sys/fs/fdescfs/fdesc_vnops.c head/sys/fs/fifofs/fifo_vnops.c head/sys/fs/fuse/fuse_internal.c head/sys/fs/fuse/fuse_internal.h head/sys/fs/fuse/fuse_io.c head/sys/fs/fuse/fuse_ipc.c head/sys/fs/fuse/fuse_kernel.h head/sys/fs/fuse/fuse_node.c head/sys/fs/fuse/fuse_vnops.c head/sys/fs/msdosfs/msdosfs_conv.c head/sys/fs/msdosfs/msdosfs_fat.c head/sys/fs/msdosfs/msdosfsmount.h head/sys/fs/nfs/nfs.h head/sys/fs/nfs/nfs_commonkrpc.c head/sys/fs/nfs/nfs_commonport.c head/sys/fs/nfs/nfs_commonsubs.c head/sys/fs/nfs/nfs_var.h head/sys/fs/nfs/nfsdport.h head/sys/fs/nfs/nfsm_subs.h head/sys/fs/nfs/nfsproto.h head/sys/fs/nfs/rpcv2.h head/sys/fs/nfsclient/nfs_clbio.c head/sys/fs/nfsclient/nfs_clcomsubs.c head/sys/fs/nfsclient/nfs_clkdtrace.c head/sys/fs/nfsclient/nfs_clkrpc.c head/sys/fs/nfsclient/nfs_clnode.c head/sys/fs/nfsclient/nfs_clport.c head/sys/fs/nfsclient/nfs_clrpcops.c head/sys/fs/nfsclient/nfs_clstate.c head/sys/fs/nfsclient/nfs_clsubs.c head/sys/fs/nfsclient/nfs_clvfsops.c head/sys/fs/nfsclient/nfs_clvnops.c head/sys/fs/nfsclient/nfs_kdtrace.h head/sys/fs/nfsserver/nfs_fha_new.c head/sys/fs/nfsserver/nfs_nfsdcache.c head/sys/fs/nfsserver/nfs_nfsdkrpc.c head/sys/fs/nfsserver/nfs_nfsdport.c head/sys/fs/nfsserver/nfs_nfsdserv.c head/sys/fs/nfsserver/nfs_nfsdsocket.c head/sys/fs/nfsserver/nfs_nfsdstate.c head/sys/fs/nfsserver/nfs_nfsdsubs.c head/sys/fs/nullfs/null_vnops.c head/sys/fs/procfs/procfs.c head/sys/fs/procfs/procfs_rlimit.c head/sys/fs/smbfs/smbfs.h head/sys/fs/smbfs/smbfs_io.c head/sys/fs/smbfs/smbfs_node.c head/sys/fs/smbfs/smbfs_smb.c head/sys/fs/smbfs/smbfs_vfsops.c head/sys/fs/smbfs/smbfs_vnops.c head/sys/fs/tmpfs/tmpfs_subr.c head/sys/fs/tmpfs/tmpfs_vnops.c head/sys/fs/udf/udf_vfsops.c head/sys/fs/udf/udf_vnops.c head/sys/fs/unionfs/union_vfsops.c Modified: head/sys/fs/autofs/autofs.c ============================================================================== --- head/sys/fs/autofs/autofs.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/autofs/autofs.c Tue Sep 1 21:18:40 2020 (r365070) @@ -535,7 +535,6 @@ autofs_trigger(struct autofs_node *anp, "error %d", anp->an_retries, error); anp->an_retries = 0; return (error); - } AUTOFS_DEBUG("trigger failed with error %d; will retry in " "%d seconds, %d attempts left", error, autofs_retry_delay, Modified: head/sys/fs/autofs/autofs_vnops.c ============================================================================== --- head/sys/fs/autofs/autofs_vnops.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/autofs/autofs_vnops.c Tue Sep 1 21:18:40 2020 (r365070) @@ -204,7 +204,6 @@ autofs_vget_callback(struct mount *mp, void *arg, int struct vnode **vpp) { - return (autofs_node_vn(arg, mp, flags, vpp)); } Modified: head/sys/fs/cd9660/cd9660_node.h ============================================================================== --- head/sys/fs/cd9660/cd9660_node.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/cd9660/cd9660_node.h Tue Sep 1 21:18:40 2020 (r365070) @@ -57,7 +57,6 @@ typedef struct { dev_t iso_rdev; /* Major/Minor number for special */ } ISO_RRIP_INODE; - struct iso_node { struct vnode *i_vnode; /* vnode associated with this inode */ cd_ino_t i_number; /* the identity of the inode */ Modified: head/sys/fs/cd9660/cd9660_rrip.c ============================================================================== --- head/sys/fs/cd9660/cd9660_rrip.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/cd9660/cd9660_rrip.c Tue Sep 1 21:18:40 2020 (r365070) @@ -135,7 +135,6 @@ cd9660_rrip_slink(p,ana) pcomp < pcompe; pcomp = (ISO_RRIP_SLINK_COMPONENT *)((char *)pcomp + ISO_RRIP_SLSIZ + isonum_711(pcomp->clen))) { - if (!cont) { if (len < ana->maxlen) { len++; @@ -148,7 +147,6 @@ cd9660_rrip_slink(p,ana) wlen = 0; switch (*pcomp->cflag) { - case ISO_SUSP_CFLAG_CURRENT: /* Inserting Current */ wlen = 1; @@ -207,7 +205,6 @@ cd9660_rrip_slink(p,ana) memcpy(outbuf, inbuf, wlen); outbuf += wlen; len += wlen; - } ana->outbuf = outbuf; *ana->outlen = len; @@ -391,7 +388,6 @@ cd9660_rrip_tstamp(p,ana) cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_ctime); else ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime; - } ana->fields &= ~ISO_SUSP_TSTAMP; return ISO_SUSP_TSTAMP; Modified: head/sys/fs/cd9660/cd9660_vnops.c ============================================================================== --- head/sys/fs/cd9660/cd9660_vnops.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/cd9660/cd9660_vnops.c Tue Sep 1 21:18:40 2020 (r365070) @@ -181,7 +181,6 @@ cd9660_open(ap) return (0); } - static int cd9660_getattr(ap) struct vop_getattr_args /* { Modified: head/sys/fs/cd9660/iso_rrip.h ============================================================================== --- head/sys/fs/cd9660/iso_rrip.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/cd9660/iso_rrip.h Tue Sep 1 21:18:40 2020 (r365070) @@ -37,7 +37,6 @@ * $FreeBSD$ */ - /* * Analyze function flag (similar to RR field bits) */ Modified: head/sys/fs/cuse/cuse.c ============================================================================== --- head/sys/fs/cuse/cuse.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/cuse/cuse.c Tue Sep 1 21:18:40 2020 (r365070) @@ -274,7 +274,6 @@ cuse_kern_uninit(void *arg) void *ptr; while (1) { - printf("Cuse: Please exit all /dev/cuse instances " "and processes which have used this device.\n"); @@ -356,7 +355,6 @@ cuse_str_filter(char *ptr) int c; while (((c = *ptr) != 0)) { - if ((c >= 'a') && (c <= 'z')) { ptr++; continue; @@ -514,7 +512,6 @@ cuse_client_is_closing(struct cuse_client *pcc) pcc->server_dev = NULL; for (n = 0; n != CUSE_CMD_MAX; n++) { - pccmd = &pcc->cmds[n]; if (pccmd->entry.tqe_prev != NULL) { @@ -1068,7 +1065,6 @@ cuse_server_ioctl(struct cdev *dev, unsigned long cmd, cuse_server_lock(pcs); while ((pccmd = cuse_server_find_command(pcs, curthread)) != NULL) { - /* send sync command */ pccmd->entered = NULL; pccmd->error = *(int *)data; @@ -1373,7 +1369,6 @@ cuse_client_free(void *arg) cuse_server_unlock(pcs); for (n = 0; n != CUSE_CMD_MAX; n++) { - pccmd = &pcc->cmds[n]; sx_destroy(&pccmd->sx); @@ -1434,7 +1429,6 @@ cuse_client_open(struct cdev *dev, int fflags, int dev pcc->server = pcs; for (n = 0; n != CUSE_CMD_MAX; n++) { - pccmd = &pcc->cmds[n]; pccmd->sub.dev = pcd; @@ -1572,7 +1566,6 @@ cuse_client_read(struct cdev *dev, struct uio *uio, in cuse_cmd_lock(pccmd); while (uio->uio_resid != 0) { - if (uio->uio_iov->iov_len > CUSE_LENGTH_MAX) { error = ENOMEM; break; @@ -1633,7 +1626,6 @@ cuse_client_write(struct cdev *dev, struct uio *uio, i cuse_cmd_lock(pccmd); while (uio->uio_resid != 0) { - if (uio->uio_iov->iov_len > CUSE_LENGTH_MAX) { error = ENOMEM; break; Modified: head/sys/fs/devfs/devfs_devs.c ============================================================================== --- head/sys/fs/devfs/devfs_devs.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/devfs/devfs_devs.c Tue Sep 1 21:18:40 2020 (r365070) @@ -58,7 +58,6 @@ struct cdev_priv_list cdevp_list = TAILQ_HEAD_INITIALI struct unrhdr *devfs_inos; - static MALLOC_DEFINE(M_DEVFS2, "DEVFS2", "DEVFS data 2"); static MALLOC_DEFINE(M_DEVFS3, "DEVFS3", "DEVFS data 3"); static MALLOC_DEFINE(M_CDEVP, "DEVFS1", "DEVFS cdev_priv storage"); @@ -523,7 +522,6 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanu sx_assert(&dm->dm_lock, SX_XLOCKED); dev_lock(); TAILQ_FOREACH(cdp, &cdevp_list, cdp_list) { - KASSERT(cdp->cdp_dirents != NULL, ("NULL cdp_dirents")); /* @@ -575,7 +573,6 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanu continue; } - cdp->cdp_inuse++; dev_unlock(); @@ -604,7 +601,6 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanu (dd->de_flags & (DE_DOT | DE_DOTDOT)) == 0, ("%s: invalid directory (si_name=%s)", __func__, cdp->cdp_c.si_name)); - } de_flags = 0; de = devfs_find(dd, s, q - s, DT_LNK); Modified: head/sys/fs/ext2fs/ext2_alloc.c ============================================================================== --- head/sys/fs/ext2fs/ext2_alloc.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_alloc.c Tue Sep 1 21:18:40 2020 (r365070) @@ -468,7 +468,6 @@ ext2_valloc(struct vnode *pvp, int mode, struct ucred else memset(ip->i_data, 0, sizeof(ip->i_data)); - /* * Set up a new generation number for this inode. * Avoid zero values. @@ -1300,7 +1299,6 @@ ext2_fix_bitmap_tail(unsigned char *bitmap, int first, for (i = first; i <= last; i++) bitmap[i] = 0xff; } - /* * Determine whether an inode can be allocated. Modified: head/sys/fs/ext2fs/ext2_balloc.c ============================================================================== --- head/sys/fs/ext2fs/ext2_balloc.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_balloc.c Tue Sep 1 21:18:40 2020 (r365070) @@ -83,7 +83,6 @@ ext2_ext_balloc(struct inode *ip, uint32_t lbn, int si } } - bp->b_blkno = fsbtodb(fs, newblk); if (flags & BA_CLRBUF) vfs_bio_clrbuf(bp); Modified: head/sys/fs/ext2fs/ext2_bmap.c ============================================================================== --- head/sys/fs/ext2fs/ext2_bmap.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_bmap.c Tue Sep 1 21:18:40 2020 (r365070) @@ -236,7 +236,6 @@ ext2_bmaparray(struct vnode *vp, daddr_t bn, daddr_t * if (runb) *runb = 0; - ap = a; nump = # error = ext2_getlbns(vp, bn, ap, nump); Modified: head/sys/fs/ext2fs/ext2_dinode.h ============================================================================== --- head/sys/fs/ext2fs/ext2_dinode.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_dinode.h Tue Sep 1 21:18:40 2020 (r365070) @@ -140,4 +140,3 @@ struct ext2fs_dinode { }; #endif /* !_FS_EXT2FS_EXT2_DINODE_H_ */ - Modified: head/sys/fs/ext2fs/ext2_extattr.c ============================================================================== --- head/sys/fs/ext2fs/ext2_extattr.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_extattr.c Tue Sep 1 21:18:40 2020 (r365070) @@ -581,7 +581,6 @@ ext2_extattr_inode_delete(struct inode *ip, int attrna if ((EXT2_IS_LAST_ENTRY(EXT2_EXTATTR_NEXT(entry))) && (ext2_extattr_attrnamespace_to_bsd(entry->e_name_index) == attrnamespace)) { - name_len = entry->e_name_len; attr_name = ext2_extattr_name_to_bsd(entry->e_name_index, entry->e_name, &name_len); @@ -715,7 +714,6 @@ ext2_extattr_block_delete(struct inode *ip, int attrna if (EXT2_IS_LAST_ENTRY(EXT2_EXTATTR_NEXT(entry)) && (ext2_extattr_attrnamespace_to_bsd(entry->e_name_index) == attrnamespace)) { - name_len = entry->e_name_len; attr_name = ext2_extattr_name_to_bsd(entry->e_name_index, entry->e_name, &name_len); Modified: head/sys/fs/ext2fs/ext2_extattr.h ============================================================================== --- head/sys/fs/ext2fs/ext2_extattr.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_extattr.h Tue Sep 1 21:18:40 2020 (r365070) @@ -53,7 +53,6 @@ #define EXT2_EXTATTR_VALUE_HASH_SHIFT 16 #define EXT2_EXTATTR_BLOCK_HASH_SHIFT 16 - struct ext2fs_extattr_header { int32_t h_magic; /* magic number for identification */ int32_t h_refcount; /* reference count */ Modified: head/sys/fs/ext2fs/ext2_extents.c ============================================================================== --- head/sys/fs/ext2fs/ext2_extents.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_extents.c Tue Sep 1 21:18:40 2020 (r365070) @@ -192,7 +192,6 @@ ext4_index_store_pblock(struct ext4_extent_index *inde index->ei_leaf_hi = htole16((pb >> 32) & 0xffff); } - static inline e4fs_daddr_t ext4_ext_extent_pblock(struct ext4_extent *extent) { Modified: head/sys/fs/ext2fs/ext2_inode_cnv.c ============================================================================== --- head/sys/fs/ext2fs/ext2_inode_cnv.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_inode_cnv.c Tue Sep 1 21:18:40 2020 (r365070) @@ -94,7 +94,6 @@ ext2_print_inode(struct inode *in) } #endif /* EXT2FS_PRINT_EXTENTS */ - #define XTIME_TO_NSEC(x) ((le32toh(x) & EXT3_NSEC_MASK) >> 2) /* Modified: head/sys/fs/ext2fs/ext2_lookup.c ============================================================================== --- head/sys/fs/ext2fs/ext2_lookup.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_lookup.c Tue Sep 1 21:18:40 2020 (r365070) @@ -944,7 +944,6 @@ ext2_direnter(struct inode *ip, struct vnode *dvp, str int DIRBLKSIZ = ip->i_e2fs->e2fs_bsize; int error; - #ifdef INVARIANTS if ((cnp->cn_flags & SAVENAME) == 0) panic("ext2_direnter: missing name"); Modified: head/sys/fs/ext2fs/ext2_vfsops.c ============================================================================== --- head/sys/fs/ext2fs/ext2_vfsops.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_vfsops.c Tue Sep 1 21:18:40 2020 (r365070) @@ -78,7 +78,6 @@ SDT_PROBE_DEFINE2(ext2fs, , vfsops, trace, "int", "cha SDT_PROBE_DEFINE2(ext2fs, , vfsops, ext2_cg_validate_error, "char*", "int"); SDT_PROBE_DEFINE1(ext2fs, , vfsops, ext2_compute_sb_data_error, "char*"); - static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td); static int ext2_mountfs(struct vnode *, struct mount *); static int ext2_reload(struct mount *mp, struct thread *td); @@ -398,7 +397,6 @@ ext2_cg_validate(struct m_ext2fs *fs) SDT_PROBE2(ext2fs, , vfsops, ext2_cg_validate_error, "block bitmap is zero", i); return (EINVAL); - } if (b_bitmap <= last_cg_block) { SDT_PROBE2(ext2fs, , vfsops, ext2_cg_validate_error, Modified: head/sys/fs/ext2fs/ext2_vnops.c ============================================================================== --- head/sys/fs/ext2fs/ext2_vnops.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/ext2fs/ext2_vnops.c Tue Sep 1 21:18:40 2020 (r365070) @@ -1572,7 +1572,6 @@ ext2_strategy(struct vop_strategy_args *ap) if (vp->v_type == VBLK || vp->v_type == VCHR) panic("ext2_strategy: spec"); if (bp->b_blkno == bp->b_lblkno) { - if (VTOI(ap->a_vp)->i_flag & IN_E4EXTENTS) error = ext4_bmapext(vp, bp->b_lblkno, &blkno, NULL, NULL); else Modified: head/sys/fs/fdescfs/fdesc_vnops.c ============================================================================== --- head/sys/fs/fdescfs/fdesc_vnops.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/fdescfs/fdesc_vnops.c Tue Sep 1 21:18:40 2020 (r365070) @@ -272,7 +272,6 @@ fdesc_get_ino_alloc(struct mount *mp, void *arg, int l return (error); } - /* * vp is the current namei directory * ndp is the name to locate in that directory... Modified: head/sys/fs/fifofs/fifo_vnops.c ============================================================================== --- head/sys/fs/fifofs/fifo_vnops.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/fifofs/fifo_vnops.c Tue Sep 1 21:18:40 2020 (r365070) @@ -366,4 +366,3 @@ fifo_advlock(ap) return (ap->a_flags & F_FLOCK ? EOPNOTSUPP : EINVAL); } - Modified: head/sys/fs/fuse/fuse_internal.c ============================================================================== --- head/sys/fs/fuse/fuse_internal.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/fuse/fuse_internal.c Tue Sep 1 21:18:40 2020 (r365070) @@ -312,7 +312,6 @@ fuse_internal_cache_attrs(struct vnode *vp, struct fus memcpy(vap, vp_cache_at, sizeof(*vap)); } - /* fsync */ int Modified: head/sys/fs/fuse/fuse_internal.h ============================================================================== --- head/sys/fs/fuse/fuse_internal.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/fuse/fuse_internal.h Tue Sep 1 21:18:40 2020 (r365070) @@ -199,7 +199,6 @@ fuse_validity_2_timespec(const struct fuse_entry_out * } } - /* VFS ops */ int fuse_internal_get_cached_vnode(struct mount*, ino_t, int, struct vnode**); Modified: head/sys/fs/fuse/fuse_io.c ============================================================================== --- head/sys/fs/fuse/fuse_io.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/fuse/fuse_io.c Tue Sep 1 21:18:40 2020 (r365070) @@ -1037,7 +1037,6 @@ fuse_io_strategy(struct vnode *vp, struct buf *bp) "Short read of a dirty file"); uiop->uio_resid = 0; } - } if (error) { bp->b_ioflags |= BIO_ERROR; Modified: head/sys/fs/fuse/fuse_ipc.c ============================================================================== --- head/sys/fs/fuse/fuse_ipc.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/fuse/fuse_ipc.c Tue Sep 1 21:18:40 2020 (r365070) @@ -285,7 +285,6 @@ fiov_adjust(struct fuse_iov *fiov, size_t size) (fuse_iov_permanent_bufsize >= 0 && fiov->allocated_size - size > fuse_iov_permanent_bufsize && --fiov->credit < 0)) { - fiov->base = realloc(fiov->base, FU_AT_LEAST(size), M_FUSEMSG, M_WAITOK | M_ZERO); if (!fiov->base) { Modified: head/sys/fs/fuse/fuse_kernel.h ============================================================================== --- head/sys/fs/fuse/fuse_kernel.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/fuse/fuse_kernel.h Tue Sep 1 21:18:40 2020 (r365070) @@ -106,7 +106,7 @@ #ifndef _FUSE_FUSE_KERNEL_H #define _FUSE_FUSE_KERNEL_H - + #ifdef __linux__ #include #else Modified: head/sys/fs/fuse/fuse_node.c ============================================================================== --- head/sys/fs/fuse/fuse_node.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/fuse/fuse_node.c Tue Sep 1 21:18:40 2020 (r365070) @@ -440,7 +440,7 @@ out: vnode_pager_setsize(vp, newsize); return err; } - + /* Get the current, possibly dirty, size of the file */ int fuse_vnode_size(struct vnode *vp, off_t *filesize, struct ucred *cred, @@ -485,7 +485,7 @@ fuse_vnode_update(struct vnode *vp, int flags) fvdat->cached_attrs.va_mtime = ts; if (flags & FN_CTIMECHANGE) fvdat->cached_attrs.va_ctime = ts; - + fvdat->flag |= flags; } Modified: head/sys/fs/fuse/fuse_vnops.c ============================================================================== --- head/sys/fs/fuse/fuse_vnops.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/fuse/fuse_vnops.c Tue Sep 1 21:18:40 2020 (r365070) @@ -1232,7 +1232,6 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) (nameiop == RENAME && wantparent))) { cnp->cn_flags |= SAVENAME; } - } } out: @@ -1877,7 +1876,6 @@ fuse_vnop_strategy(struct vop_strategy_args *ap) return 0; } - /* struct vnop_symlink_args { struct vnode *a_dvp; @@ -2120,7 +2118,7 @@ fuse_vnop_setextattr(struct vop_setextattr_args *ap) size_t len; char *attr_str; int err; - + if (fuse_isdeadfs(vp)) return (ENXIO); @@ -2466,7 +2464,7 @@ fuse_vnop_print(struct vop_print_args *ap) return 0; } - + /* * Get an NFS filehandle for a FUSE file. * @@ -2509,5 +2507,3 @@ fuse_vnop_vptofh(struct vop_vptofh_args *ap) return EOVERFLOW; return (0); } - - Modified: head/sys/fs/msdosfs/msdosfs_conv.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_conv.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/msdosfs/msdosfs_conv.c Tue Sep 1 21:18:40 2020 (r365070) @@ -338,7 +338,6 @@ unix2dosfn(const u_char *un, u_char dn[12], size_t unl if (i < 0) return 0; - /* * Filenames with some characters are not allowed! */ Modified: head/sys/fs/msdosfs/msdosfs_fat.c ============================================================================== --- head/sys/fs/msdosfs/msdosfs_fat.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/msdosfs/msdosfs_fat.c Tue Sep 1 21:18:40 2020 (r365070) @@ -816,7 +816,6 @@ clusteralloc1(struct msdosfsmount *pmp, u_long start, return (chainalloc(pmp, foundcn, foundl, fillwith, retcluster, got)); } - /* * Free a chain of clusters. * Modified: head/sys/fs/msdosfs/msdosfsmount.h ============================================================================== --- head/sys/fs/msdosfs/msdosfsmount.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/msdosfs/msdosfsmount.h Tue Sep 1 21:18:40 2020 (r365070) @@ -130,7 +130,6 @@ struct msdosfs_fileno { /* Byte offset in FAT on filesystem pmp, cluster cn */ #define FATOFS(pmp, cn) ((cn) * (pmp)->pm_fatmult / (pmp)->pm_fatdiv) - #define VFSTOMSDOSFS(mp) ((struct msdosfsmount *)mp->mnt_data) /* Number of bits in one pm_inusemap item: */ Modified: head/sys/fs/nfs/nfs.h ============================================================================== --- head/sys/fs/nfs/nfs.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfs/nfs.h Tue Sep 1 21:18:40 2020 (r365070) @@ -579,7 +579,6 @@ struct uio; struct buf; struct vattr; struct nameidata ((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \ ((s) & PR_CONNREQUIRED) == 0) - /* * This structure holds socket information for a connection. Used by the * client and the server for callbacks. Modified: head/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- head/sys/fs/nfs/nfs_commonkrpc.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfs/nfs_commonkrpc.c Tue Sep 1 21:18:40 2020 (r365070) @@ -489,7 +489,6 @@ nfs_getauth(struct nfssockreq *nrp, int secflavour, ch case AUTH_SYS: default: return (authunix_create(cred)); - } } @@ -734,7 +733,7 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmo if (dtrace_nfscl_nfs234_start_probe != NULL) { uint32_t probe_id; int probe_procnum; - + if (nd->nd_flag & ND_NFSV4) { probe_id = nfscl_nfs4_start_probes[nd->nd_procnum]; @@ -1257,13 +1256,13 @@ static int nfs_sig_pending(sigset_t set) { int i; - + for (i = 0 ; i < nitems(newnfs_sig_set); i++) if (SIGISMEMBER(set, newnfs_sig_set[i])) return (1); return (0); } - + /* * The set/restore sigmask functions are used to (temporarily) overwrite * the thread td_sigmask during an RPC call (for example). These are also @@ -1275,7 +1274,7 @@ newnfs_set_sigmask(struct thread *td, sigset_t *oldset sigset_t newset; int i; struct proc *p; - + SIGFILLSET(newset); if (td == NULL) td = curthread; /* XXX */ @@ -1337,7 +1336,7 @@ newnfs_sigintr(struct nfsmount *nmp, struct thread *td { struct proc *p; sigset_t tmpset; - + /* Terminate all requests while attempting a forced unmount. */ if (NFSCL_FORCEDISM(nmp->nm_mountp)) return (EIO); @@ -1420,7 +1419,7 @@ nfs_up(struct nfsmount *nmp, struct thread *td, const VQ_NOTRESP, 1); } else mtx_unlock(&nmp->nm_mtx); - + mtx_lock(&nmp->nm_mtx); if ((flags & NFSSTA_LOCKTIMEO) && (nmp->nm_state & NFSSTA_LOCKTIMEO)) { nmp->nm_state &= ~NFSSTA_LOCKTIMEO; @@ -1430,4 +1429,3 @@ nfs_up(struct nfsmount *nmp, struct thread *td, const } else mtx_unlock(&nmp->nm_mtx); } - Modified: head/sys/fs/nfs/nfs_commonport.c ============================================================================== --- head/sys/fs/nfs/nfs_commonport.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfs/nfs_commonport.c Tue Sep 1 21:18:40 2020 (r365070) @@ -420,7 +420,6 @@ newnfs_timer(void *arg) callout_reset(&newnfsd_callout, nfscl_ticks, newnfs_timer, NULL); } - /* * Sleep for a short period of time unless errval == NFSERR_GRACE, where * the sleep should be for 5 seconds. @@ -952,4 +951,3 @@ DECLARE_MODULE(nfscommon, nfscommon_mod, SI_SUB_VFS, S MODULE_VERSION(nfscommon, 1); MODULE_DEPEND(nfscommon, nfssvc, 1, 1, 1); MODULE_DEPEND(nfscommon, krpc, 1, 1, 1); - Modified: head/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- head/sys/fs/nfs/nfs_commonsubs.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfs/nfs_commonsubs.c Tue Sep 1 21:18:40 2020 (r365070) @@ -364,7 +364,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, mb->m_len = 0; nd->nd_mreq = nd->nd_mb = mb; nd->nd_bpos = mtod(mb, char *); - + /* * And fill the first file handle into the request. */ @@ -2559,7 +2559,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount xattrsupp = true; } } - + /* * Put out the attribute bitmap for the ones being filled in * and get the field for the number of attributes returned. @@ -3272,7 +3272,7 @@ tryagain: len -= (nfsrv_dnsnamelen + 1); *(cp - 1) = '\0'; } - + /* * Check for the special case of "nobody". */ @@ -3281,7 +3281,7 @@ tryagain: error = 0; goto out; } - + hp = NFSUSERNAMEHASH(str, len); mtx_lock(&hp->mtx); TAILQ_FOREACH(usrp, &hp->lughead, lug_namehash) { @@ -3484,7 +3484,7 @@ tryagain: len -= (nfsrv_dnsnamelen + 1); *(cp - 1) = '\0'; } - + /* * Check for the special case of "nogroup". */ @@ -3493,7 +3493,7 @@ tryagain: error = 0; goto out; } - + hp = NFSGROUPNAMEHASH(str, len); mtx_lock(&hp->mtx); TAILQ_FOREACH(usrp, &hp->lughead, lug_namehash) { Modified: head/sys/fs/nfs/nfs_var.h ============================================================================== --- head/sys/fs/nfs/nfs_var.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfs/nfs_var.h Tue Sep 1 21:18:40 2020 (r365070) @@ -776,4 +776,3 @@ void nfsrvd_init(int); /* nfs_clkrpc.c */ int nfscbd_addsock(struct file *); int nfscbd_nfsd(NFSPROC_T *, struct nfsd_nfscbd_args *); - Modified: head/sys/fs/nfs/nfsdport.h ============================================================================== --- head/sys/fs/nfs/nfsdport.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfs/nfsdport.h Tue Sep 1 21:18:40 2020 (r365070) @@ -118,4 +118,3 @@ struct nfsexstuff { if (nfsd_debuglevel >= (level)) \ printf(__VA_ARGS__); \ } while (0) - Modified: head/sys/fs/nfs/nfsm_subs.h ============================================================================== --- head/sys/fs/nfs/nfsm_subs.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfs/nfsm_subs.h Tue Sep 1 21:18:40 2020 (r365070) @@ -37,7 +37,6 @@ #ifndef _NFS_NFSM_SUBS_H_ #define _NFS_NFSM_SUBS_H_ - /* * These macros do strange and peculiar things to mbuf chains for * the assistance of the nfs code. To attempt to use them for any Modified: head/sys/fs/nfs/nfsproto.h ============================================================================== --- head/sys/fs/nfs/nfsproto.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfs/nfsproto.h Tue Sep 1 21:18:40 2020 (r365070) @@ -1137,7 +1137,6 @@ struct nfsv3_sattr { NFSATTRBM_QUOTAUSED | \ NFSATTRBM_FSLAYOUTTYPE) - #ifdef QUOTA /* * If QUOTA OR in NFSATTRBIT_QUOTAHARD, NFSATTRBIT_QUOTASOFT and Modified: head/sys/fs/nfs/rpcv2.h ============================================================================== --- head/sys/fs/nfs/rpcv2.h Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfs/rpcv2.h Tue Sep 1 21:18:40 2020 (r365070) @@ -199,7 +199,7 @@ #define RPCMNT_NAMELEN 255 #define RPCMNT_PATHLEN 1024 #define RPCPROG_NFS 100003 - + /* Structs for common parts of the rpc's */ struct rpcv2_time { u_int32_t rpc_sec; Modified: head/sys/fs/nfsclient/nfs_clbio.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clbio.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clbio.c Tue Sep 1 21:18:40 2020 (r365070) @@ -1890,4 +1890,3 @@ ncl_meta_setsize(struct vnode *vp, struct thread *td, } return(error); } - Modified: head/sys/fs/nfsclient/nfs_clcomsubs.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clcomsubs.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clcomsubs.c Tue Sep 1 21:18:40 2020 (r365070) @@ -485,4 +485,3 @@ nfscl_lockderef(struct nfsv4lock *lckp) } NFSUNLOCKCLSTATE(); } - Modified: head/sys/fs/nfsclient/nfs_clkdtrace.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clkdtrace.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clkdtrace.c Tue Sep 1 21:18:40 2020 (r365070) @@ -540,7 +540,6 @@ dtnfsclient_load(void *dummy) (dtrace_nfsclient_nfs23_done_probe_func_t)dtrace_probe; } - static int dtnfsclient_unload() { Modified: head/sys/fs/nfsclient/nfs_clkrpc.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clkrpc.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clkrpc.c Tue Sep 1 21:18:40 2020 (r365070) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include - NFSDLOCKMUTEX; extern SVCPOOL *nfscbd_pool; @@ -308,4 +307,3 @@ nfsrvd_cbinit(int terminating) NFSD_LOCK(); } } - Modified: head/sys/fs/nfsclient/nfs_clnode.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clnode.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clnode.c Tue Sep 1 21:18:40 2020 (r365070) @@ -164,7 +164,7 @@ ncl_nget(struct mount *mntp, u_int8_t *fhp, int fhsize } vp->v_vflag |= VV_VMSIZEVNLOCK; - + np->n_fhp = malloc(sizeof (struct nfsfh) + fhsize, M_NFSFH, M_WAITOK); bcopy(fhp, np->n_fhp->nfh_fh, fhsize); Modified: head/sys/fs/nfsclient/nfs_clport.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clport.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clport.c Tue Sep 1 21:18:40 2020 (r365070) @@ -249,7 +249,7 @@ nfscl_nget(struct mount *mntp, struct vnode *dvp, stru } vp->v_vflag |= VV_VMSIZEVNLOCK; - + np->n_fhp = nfhp; /* * For NFSv4, we have to attach the directory file handle and @@ -1046,7 +1046,6 @@ newnfs_copyincred(struct ucred *cr, struct nfscred *nf nfscr->nfsc_groups[i] = cr->cr_groups[i]; } - /* * Do any client specific initialization. */ @@ -1419,4 +1418,3 @@ MODULE_VERSION(nfscl, 1); MODULE_DEPEND(nfscl, nfscommon, 1, 1, 1); MODULE_DEPEND(nfscl, krpc, 1, 1, 1); MODULE_DEPEND(nfscl, nfssvc, 1, 1, 1); - Modified: head/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clrpcops.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clrpcops.c Tue Sep 1 21:18:40 2020 (r365070) @@ -231,7 +231,7 @@ nfsrpc_null(vnode_t vp, struct ucred *cred, NFSPROC_T { int error; struct nfsrv_descript nfsd, *nd = &nfsd; - + NFSCL_REQSTART(nd, NFSPROC_NULL, vp); error = nfscl_request(nd, vp, p, cred, NULL); if (nd->nd_repstat && !error) @@ -1191,7 +1191,7 @@ nfsrpc_getattr(vnode_t vp, struct ucred *cred, NFSPROC struct nfsrv_descript nfsd, *nd = &nfsd; int error; nfsattrbit_t attrbits; - + NFSCL_REQSTART(nd, NFSPROC_GETATTR, vp); if (nd->nd_flag & ND_NFSV4) { NFSGETATTR_ATTRBIT(&attrbits); @@ -1219,7 +1219,7 @@ nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp struct nfsrv_descript nfsd, *nd = &nfsd; int error, vers = NFS_VER2; nfsattrbit_t attrbits; - + nfscl_reqstart(nd, NFSPROC_GETATTR, nmp, fhp, fhlen, NULL, NULL, 0, 0); if (nd->nd_flag & ND_NFSV4) { vers = NFS_VER4; @@ -1837,7 +1837,6 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iom x = txdr_unsigned(len); *tl++ = x; /* total to this offset */ *tl = x; /* size of this write */ - } nfsm_uiombuf(nd, uiop, len); /* @@ -2497,7 +2496,7 @@ nfsrpc_rename(vnode_t fdvp, vnode_t fvp, char *fnamept nfsattrbit_t attrbits; nfsv4stateid_t fdstateid, tdstateid; int error = 0, ret = 0, gottd = 0, gotfd = 0, i; - + *fattrflagp = 0; *tattrflagp = 0; nmp = VFSTONFS(fdvp->v_mount); @@ -3086,7 +3085,6 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 reqsize = 5 * NFSX_UNSIGNED; } - /* * Loop around doing readdir rpc's of size readsize. * The stopping criteria is EOF or buffer full. @@ -3146,7 +3144,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 more_dirs = fxdr_unsigned(int, *tl); if (!more_dirs) tryformoredirs = 0; - + /* loop through the dir entries, doctoring them to 4bsd form */ while (more_dirs && bigenough) { if (nd->nd_flag & ND_NFSV4) { @@ -3579,7 +3577,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsui more_dirs = fxdr_unsigned(int, *tl); if (!more_dirs) tryformoredirs = 0; - + /* loop through the dir entries, doctoring them to 4bsd form */ while (more_dirs && bigenough) { NFSM_DISSECT(tl, u_int32_t *, 3 * NFSX_UNSIGNED); @@ -3869,7 +3867,7 @@ nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, st nfsattrbit_t attrbits; int error; struct nfsmount *nmp = VFSTONFS(vp->v_mount); - + *attrflagp = 0; NFSCL_REQSTART(nd, NFSPROC_COMMIT, vp); NFSM_BUILD(tl, u_int32_t *, 3 * NFSX_UNSIGNED); @@ -4674,7 +4672,7 @@ nfsrpc_getacl(vnode_t vp, struct ucred *cred, NFSPROC_ int error; nfsattrbit_t attrbits; struct nfsmount *nmp = VFSTONFS(vp->v_mount); - + if (nfsrv_useacl == 0 || !NFSHASNFSV4(nmp)) return (EOPNOTSUPP); NFSCL_REQSTART(nd, NFSPROC_GETACL, vp); @@ -4702,7 +4700,7 @@ nfsrpc_setacl(vnode_t vp, struct ucred *cred, NFSPROC_ { int error; struct nfsmount *nmp = VFSTONFS(vp->v_mount); - + if (nfsrv_useacl == 0 || !NFSHASNFSV4(nmp)) return (EOPNOTSUPP); error = nfsrpc_setattr(vp, NULL, aclp, cred, p, NULL, NULL, stuff); @@ -4720,7 +4718,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPR int error; nfsattrbit_t attrbits; struct nfsmount *nmp = VFSTONFS(vp->v_mount); - + if (!NFSHASNFSV4(nmp)) return (EOPNOTSUPP); NFSCL_REQSTART(nd, NFSPROC_SETACL, vp); @@ -5121,7 +5119,7 @@ nfsrpc_getdeviceinfo(struct nfsmount *nmp, uint8_t *de error = NFSERR_BADXDR; goto nfsmout; } - + /* * Now we know how many stripe indices and addresses, so * we can allocate the structure the correct size. @@ -6711,7 +6709,6 @@ nfscl_getsameserver(struct nfsmount *nmp, struct nfscl *retdspp = dsp; return (NFSDSP_USETHISSESSION); } - } } if (fndseq != 0) @@ -6733,7 +6730,7 @@ nfsrpc_commitds(vnode_t vp, uint64_t offset, int cnt, struct nfssockreq *nrp; struct nfsvattr na; int attrflag, error; - + nd->nd_mrep = NULL; if (vers == 0 || vers == NFS_VER4) { nfscl_reqstart(nd, NFSPROC_COMMITDS, nmp, fhp->nfh_fh, @@ -6842,7 +6839,7 @@ nfsrpc_advise(vnode_t vp, off_t offset, uint64_t cnt, struct nfsrv_descript nfsd, *nd = &nfsd; nfsattrbit_t hints; int error; - + NFSZERO_ATTRBIT(&hints); if (advise == POSIX_FADV_WILLNEED) NFSSETBIT_ATTRBIT(&hints, NFSV4IOHINT_WILLNEED); @@ -6881,7 +6878,7 @@ nfsrpc_adviseds(vnode_t vp, uint64_t offset, int cnt, struct nfssockreq *nrp; nfsattrbit_t hints; int error; - + /* For NFS DSs prior to NFSv4.2, just return OK. */ if (vers == NFS_VER3 || minorversion < NFSV42_MINORVERSION) return (0); @@ -7922,7 +7919,7 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namel goto nfsmout; op->nfso_stateid = stateid; newnfs_copyincred(cred, &op->nfso_cred); - + nfscl_openrelease(nmp, op, error, newone); *unlockedp = 1; Modified: head/sys/fs/nfsclient/nfs_clstate.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clstate.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clstate.c Tue Sep 1 21:18:40 2020 (r365070) @@ -1917,7 +1917,7 @@ nfscl_umount(struct nfsmount *nmp, NFSPROC_T *p) if (clp != NULL) { if ((clp->nfsc_flags & NFSCLFLAGS_INITED) == 0) panic("nfscl umount"); - + /* * First, handshake with the nfscl renew thread, to terminate * it. @@ -1926,7 +1926,7 @@ nfscl_umount(struct nfsmount *nmp, NFSPROC_T *p) while (clp->nfsc_flags & NFSCLFLAGS_HASTHREAD) (void)mtx_sleep(clp, NFSCLSTATEMUTEXPTR, PWAIT, "nfsclumnt", hz); - + /* * Now, get the exclusive lock on the client state, so * that no uses of the state are still in progress. @@ -1936,7 +1936,7 @@ nfscl_umount(struct nfsmount *nmp, NFSPROC_T *p) NFSCLSTATEMUTEXPTR, NULL); } while (!igotlock); NFSUNLOCKCLSTATE(); - + /* * Free up all the state. It will expire on the server, but * maybe we should do a SetClientId/SetClientIdConfirm so @@ -5479,4 +5479,3 @@ tryagain: NFSUNLOCKCLSTATE(); return (0); } - Modified: head/sys/fs/nfsclient/nfs_clsubs.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clsubs.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clsubs.c Tue Sep 1 21:18:40 2020 (r365070) @@ -187,7 +187,7 @@ ncl_getattrcache(struct vnode *vp, struct vattr *vaper int timeo, mustflush; u_quad_t nsize; bool setnsize; - + np = VTONFS(vp); vap = &np->n_vattr.na_vattr; nmp = VFSTONFS(vp->v_mount); @@ -273,7 +273,7 @@ ncl_getcookie(struct nfsnode *np, off_t off, int add) struct nfsdmap *dp, *dp2; int pos; nfsuint64 *retval = NULL; - + pos = (uoff_t)off / NFS_DIRBLKSIZ; if (pos == 0 || off < 0) { KASSERT(!add, ("nfs getcookie add at <= 0")); @@ -388,4 +388,3 @@ ncl_init(struct vfsconf *vfsp) return (0); } - Modified: head/sys/fs/nfsclient/nfs_clvfsops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clvfsops.c Tue Sep 1 21:18:06 2020 (r365069) +++ head/sys/fs/nfsclient/nfs_clvfsops.c Tue Sep 1 21:18:40 2020 (r365070) @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD$"); - #include "opt_bootp.h" #include "opt_nfsroot.h" #include "opt_kern_tls.h" @@ -180,7 +179,6 @@ SYSCTL_OPAQUE(_vfs_nfs, OID_AUTO, diskless_rootaddr, C &nfsv3_diskless.root_saddr, sizeof(nfsv3_diskless.root_saddr), "%Ssockaddr_in", "Diskless root nfs address"); - void newnfsargs_ntoh(struct nfs_args *); static int nfs_mountdiskless(char *, struct sockaddr_in *, struct nfs_args *, @@ -368,7 +366,7 @@ ncl_fsinfo(struct nfsmount *nmp, struct vnode *vp, str struct nfsfsinfo fs; struct nfsvattr nfsva; int error, attrflag; - + error = nfsrpc_fsinfo(vp, &fs, cred, td, &nfsva, &attrflag, NULL); if (!error) { if (attrflag) @@ -1358,7 +1356,6 @@ out: return (error); } - /* * VFS Operations. * @@ -1551,7 +1548,6 @@ mountnfs(struct nfs_args *argp, struct mount *mp, stru else nmp->nm_sockreq.nr_vers = NFS_VER2; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:19:23 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 95F963790F0; Tue, 1 Sep 2020 21:19:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Lz3lNrz4Hjy; Tue, 1 Sep 2020 21:19:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6346E1FC75; Tue, 1 Sep 2020 21:19:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LJNx1018148; Tue, 1 Sep 2020 21:19:23 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LJERb018106; Tue, 1 Sep 2020 21:19:14 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012119.081LJERb018106@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:19:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph/bluetooth/drivers/bt3c n... X-SVN-Commit-Revision: 365071 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:19:23 -0000 Author: mjg Date: Tue Sep 1 21:19:14 2020 New Revision: 365071 URL: https://svnweb.freebsd.org/changeset/base/365071 Log: net: clean up empty lines in .c and .h files Modified: head/sys/net/altq/altq.h head/sys/net/altq/altq_cbq.c head/sys/net/altq/altq_cbq.h head/sys/net/altq/altq_codel.c head/sys/net/altq/altq_fairq.c head/sys/net/altq/altq_hfsc.c head/sys/net/altq/altq_hfsc.h head/sys/net/altq/altq_priq.c head/sys/net/altq/altq_priq.h head/sys/net/altq/altq_red.c head/sys/net/altq/altq_red.h head/sys/net/altq/altq_rio.c head/sys/net/altq/altq_rio.h head/sys/net/altq/altq_rmclass.c head/sys/net/altq/altq_subr.c head/sys/net/altq/if_altq.h head/sys/net/bpf.c head/sys/net/bridgestp.c head/sys/net/bridgestp.h head/sys/net/debugnet_inet.c head/sys/net/ieee8023ad_lacp.c head/sys/net/if.c head/sys/net/if.h head/sys/net/if_bridge.c head/sys/net/if_clone.c head/sys/net/if_dl.h head/sys/net/if_epair.c head/sys/net/if_ethersubr.c head/sys/net/if_gif.c head/sys/net/if_ipsec.c head/sys/net/if_lagg.c head/sys/net/if_llatbl.c head/sys/net/if_loop.c head/sys/net/if_media.c head/sys/net/if_media.h head/sys/net/if_mib.c head/sys/net/if_pfsync.h head/sys/net/if_spppsubr.c head/sys/net/if_tuntap.c head/sys/net/if_vlan.c head/sys/net/iflib.c head/sys/net/iflib.h head/sys/net/iflib_clone.c head/sys/net/ifq.h head/sys/net/mp_ring.c head/sys/net/netisr.c head/sys/net/netmap.h head/sys/net/netmap_legacy.h head/sys/net/netmap_user.h head/sys/net/pfvar.h head/sys/net/radix.c head/sys/net/radix_mpath.c head/sys/net/route.c head/sys/net/route/nhop.c head/sys/net/route/nhop.h head/sys/net/route/nhop_ctl.c head/sys/net/route/nhop_utils.c head/sys/net/route/nhop_utils.h head/sys/net/route/nhop_var.h head/sys/net/route/route_ctl.c head/sys/net/route/route_ctl.h head/sys/net/route/route_helpers.c head/sys/net/route/route_tables.c head/sys/net/route/route_temporal.c head/sys/net/route/route_var.h head/sys/net/rss_config.c head/sys/net/rtsock.c head/sys/net/sff8436.h head/sys/net/sff8472.h head/sys/net/slcompress.c head/sys/net/slcompress.h head/sys/net/vnet.h head/sys/net80211/ieee80211.h head/sys/net80211/ieee80211_action.c head/sys/net80211/ieee80211_ageq.c head/sys/net80211/ieee80211_crypto.c head/sys/net80211/ieee80211_crypto_tkip.c head/sys/net80211/ieee80211_freebsd.c head/sys/net80211/ieee80211_freebsd.h head/sys/net80211/ieee80211_hostap.c head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_hwmp.c head/sys/net80211/ieee80211_input.c head/sys/net80211/ieee80211_ioctl.c head/sys/net80211/ieee80211_ioctl.h head/sys/net80211/ieee80211_mesh.c head/sys/net80211/ieee80211_mesh.h head/sys/net80211/ieee80211_node.c head/sys/net80211/ieee80211_output.c head/sys/net80211/ieee80211_phy.c head/sys/net80211/ieee80211_power.c head/sys/net80211/ieee80211_proto.c head/sys/net80211/ieee80211_radiotap.c head/sys/net80211/ieee80211_radiotap.h head/sys/net80211/ieee80211_scan.c head/sys/net80211/ieee80211_scan_sta.c head/sys/net80211/ieee80211_scan_sw.c head/sys/net80211/ieee80211_sta.c head/sys/net80211/ieee80211_superg.c head/sys/net80211/ieee80211_tdma.h head/sys/net80211/ieee80211_vht.c head/sys/netgraph/atm/ccatm/ng_ccatm.c head/sys/netgraph/atm/ng_sscop.h head/sys/netgraph/atm/ngatmbase.c head/sys/netgraph/atm/sscfu/ng_sscfu.c head/sys/netgraph/atm/sscfu/ng_sscfu_cust.h head/sys/netgraph/atm/sscop/ng_sscop.c head/sys/netgraph/atm/sscop/ng_sscop_cust.h head/sys/netgraph/atm/uni/ng_uni.c head/sys/netgraph/bluetooth/common/ng_bluetooth.c head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h head/sys/netgraph/bluetooth/drivers/h4/ng_h4.c head/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h head/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c head/sys/netgraph/bluetooth/hci/ng_hci_cmds.c head/sys/netgraph/bluetooth/hci/ng_hci_cmds.h head/sys/netgraph/bluetooth/hci/ng_hci_evnt.c head/sys/netgraph/bluetooth/hci/ng_hci_evnt.h head/sys/netgraph/bluetooth/hci/ng_hci_main.c head/sys/netgraph/bluetooth/hci/ng_hci_misc.c head/sys/netgraph/bluetooth/hci/ng_hci_misc.h head/sys/netgraph/bluetooth/hci/ng_hci_prse.h head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h head/sys/netgraph/bluetooth/hci/ng_hci_var.h head/sys/netgraph/bluetooth/include/ng_bluetooth.h head/sys/netgraph/bluetooth/include/ng_bt3c.h head/sys/netgraph/bluetooth/include/ng_btsocket.h head/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h head/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h head/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h head/sys/netgraph/bluetooth/include/ng_btsocket_sco.h head/sys/netgraph/bluetooth/include/ng_h4.h head/sys/netgraph/bluetooth/include/ng_hci.h head/sys/netgraph/bluetooth/include/ng_l2cap.h head/sys/netgraph/bluetooth/include/ng_ubt.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h head/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c head/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c head/sys/netgraph/netflow/netflow.c head/sys/netgraph/netflow/netflow.h head/sys/netgraph/netflow/netflow_v9.c head/sys/netgraph/netflow/ng_netflow.c head/sys/netgraph/netflow/ng_netflow.h head/sys/netgraph/netgraph.h head/sys/netgraph/ng_UI.c head/sys/netgraph/ng_UI.h head/sys/netgraph/ng_async.c head/sys/netgraph/ng_base.c head/sys/netgraph/ng_bpf.c head/sys/netgraph/ng_bridge.c head/sys/netgraph/ng_bridge.h head/sys/netgraph/ng_car.c head/sys/netgraph/ng_checksum.c head/sys/netgraph/ng_cisco.c head/sys/netgraph/ng_cisco.h head/sys/netgraph/ng_deflate.c head/sys/netgraph/ng_deflate.h head/sys/netgraph/ng_device.c head/sys/netgraph/ng_echo.c head/sys/netgraph/ng_eiface.c head/sys/netgraph/ng_etf.c head/sys/netgraph/ng_ether.c head/sys/netgraph/ng_ether_echo.c head/sys/netgraph/ng_frame_relay.c head/sys/netgraph/ng_gif.c head/sys/netgraph/ng_hub.c head/sys/netgraph/ng_iface.c head/sys/netgraph/ng_ipfw.c head/sys/netgraph/ng_ksocket.c head/sys/netgraph/ng_l2tp.c head/sys/netgraph/ng_lmi.c head/sys/netgraph/ng_message.h head/sys/netgraph/ng_mppc.c head/sys/netgraph/ng_mppc.h head/sys/netgraph/ng_nat.c head/sys/netgraph/ng_one2many.h head/sys/netgraph/ng_parse.c head/sys/netgraph/ng_parse.h head/sys/netgraph/ng_patch.c head/sys/netgraph/ng_pipe.c head/sys/netgraph/ng_ppp.c head/sys/netgraph/ng_pppoe.c head/sys/netgraph/ng_pppoe.h head/sys/netgraph/ng_pptpgre.c head/sys/netgraph/ng_pred1.c head/sys/netgraph/ng_pred1.h head/sys/netgraph/ng_rfc1490.c head/sys/netgraph/ng_sample.c head/sys/netgraph/ng_socket.c head/sys/netgraph/ng_socket.h head/sys/netgraph/ng_split.c head/sys/netgraph/ng_split.h head/sys/netgraph/ng_sppp.c head/sys/netgraph/ng_tag.c head/sys/netgraph/ng_tcpmss.c head/sys/netgraph/ng_tcpmss.h head/sys/netgraph/ng_tty.c head/sys/netgraph/ng_vjc.c head/sys/netgraph/ng_vlan.c head/sys/netgraph/ng_vlan.h head/sys/netinet/accf_http.c head/sys/netinet/cc/cc_cubic.c head/sys/netinet/cc/cc_htcp.c head/sys/netinet/icmp_var.h head/sys/netinet/if_ether.c head/sys/netinet/igmp.c head/sys/netinet/in.c head/sys/netinet/in_fib.c head/sys/netinet/in_fib.h head/sys/netinet/in_gif.c head/sys/netinet/in_mcast.c head/sys/netinet/in_pcb.c head/sys/netinet/in_rmx.c head/sys/netinet/ip_carp.c head/sys/netinet/ip_dummynet.h head/sys/netinet/ip_fw.h head/sys/netinet/ip_icmp.c head/sys/netinet/ip_input.c head/sys/netinet/ip_mroute.c head/sys/netinet/ip_mroute.h head/sys/netinet/ip_options.c head/sys/netinet/ip_output.c head/sys/netinet/libalias/alias.c head/sys/netinet/libalias/alias.h head/sys/netinet/libalias/alias_db.c head/sys/netinet/libalias/alias_dummy.c head/sys/netinet/libalias/alias_ftp.c head/sys/netinet/libalias/alias_irc.c head/sys/netinet/libalias/alias_local.h head/sys/netinet/libalias/alias_nbt.c head/sys/netinet/libalias/alias_pptp.c head/sys/netinet/libalias/alias_proxy.c head/sys/netinet/libalias/alias_sctp.c head/sys/netinet/libalias/alias_sctp.h head/sys/netinet/libalias/alias_skinny.c head/sys/netinet/libalias/alias_smedia.c head/sys/netinet/libalias/alias_util.c head/sys/netinet/sctp.h head/sys/netinet/sctp_asconf.c head/sys/netinet/sctp_asconf.h head/sys/netinet/sctp_auth.c head/sys/netinet/sctp_auth.h head/sys/netinet/sctp_bsd_addr.c head/sys/netinet/sctp_bsd_addr.h head/sys/netinet/sctp_cc_functions.c head/sys/netinet/sctp_constants.h head/sys/netinet/sctp_header.h head/sys/netinet/sctp_indata.c head/sys/netinet/sctp_indata.h head/sys/netinet/sctp_input.c head/sys/netinet/sctp_input.h head/sys/netinet/sctp_lock_bsd.h head/sys/netinet/sctp_os.h head/sys/netinet/sctp_os_bsd.h head/sys/netinet/sctp_output.c head/sys/netinet/sctp_output.h head/sys/netinet/sctp_pcb.c head/sys/netinet/sctp_pcb.h head/sys/netinet/sctp_ss_functions.c head/sys/netinet/sctp_structs.h head/sys/netinet/sctp_sysctl.c head/sys/netinet/sctp_sysctl.h head/sys/netinet/sctp_timer.c head/sys/netinet/sctp_timer.h head/sys/netinet/sctp_uio.h head/sys/netinet/sctp_usrreq.c head/sys/netinet/sctp_var.h head/sys/netinet/sctputil.c head/sys/netinet/sctputil.h head/sys/netinet/siftr.c head/sys/netinet/tcp.h head/sys/netinet/tcp_fastopen.c head/sys/netinet/tcp_hpts.c head/sys/netinet/tcp_hpts.h head/sys/netinet/tcp_input.c head/sys/netinet/tcp_log_buf.c head/sys/netinet/tcp_log_buf.h head/sys/netinet/tcp_lro.c head/sys/netinet/tcp_output.c head/sys/netinet/tcp_ratelimit.c head/sys/netinet/tcp_reass.c head/sys/netinet/tcp_sack.c head/sys/netinet/tcp_stacks/bbr.c head/sys/netinet/tcp_stacks/rack.c head/sys/netinet/tcp_stacks/rack_bbr_common.c head/sys/netinet/tcp_stacks/tcp_bbr.h head/sys/netinet/tcp_stacks/tcp_rack.h head/sys/netinet/tcp_subr.c head/sys/netinet/tcp_syncache.c head/sys/netinet/tcp_usrreq.c head/sys/netinet/toecore.c head/sys/netinet/udp_usrreq.c head/sys/netinet6/frag6.c head/sys/netinet6/in6.c head/sys/netinet6/in6_cksum.c head/sys/netinet6/in6_fib.c head/sys/netinet6/in6_fib.h head/sys/netinet6/in6_mcast.c head/sys/netinet6/in6_rmx.c head/sys/netinet6/in6_src.c head/sys/netinet6/ip6_fastfwd.c head/sys/netinet6/ip6_input.c head/sys/netinet6/ip6_mroute.c head/sys/netinet6/ip6_output.c head/sys/netinet6/ip_fw_nptv6.h head/sys/netinet6/mld6.c head/sys/netinet6/nd6.c head/sys/netinet6/nd6_nbr.c head/sys/netinet6/nd6_rtr.c head/sys/netinet6/scope6.c head/sys/netinet6/sctp6_usrreq.c head/sys/netinet6/udp6_usrreq.c head/sys/netipsec/esp.h head/sys/netipsec/ipsec.c head/sys/netipsec/ipsec_input.c head/sys/netipsec/ipsec_output.c head/sys/netipsec/ipsec_pcb.c head/sys/netipsec/key.c head/sys/netipsec/key_debug.c head/sys/netipsec/udpencap.c head/sys/netpfil/ipfw/dn_aqm.h head/sys/netpfil/ipfw/dn_aqm_codel.c head/sys/netpfil/ipfw/dn_aqm_codel.h head/sys/netpfil/ipfw/dn_aqm_pie.c head/sys/netpfil/ipfw/dn_aqm_pie.h head/sys/netpfil/ipfw/dn_sched_fq_codel.c head/sys/netpfil/ipfw/dn_sched_fq_codel.h head/sys/netpfil/ipfw/dn_sched_fq_codel_helper.h head/sys/netpfil/ipfw/dn_sched_fq_pie.c head/sys/netpfil/ipfw/dn_sched_prio.c head/sys/netpfil/ipfw/dn_sched_qfq.c head/sys/netpfil/ipfw/dn_sched_rr.c head/sys/netpfil/ipfw/dn_sched_wf2q.c head/sys/netpfil/ipfw/ip_dn_glue.c head/sys/netpfil/ipfw/ip_dn_io.c head/sys/netpfil/ipfw/ip_dn_private.h head/sys/netpfil/ipfw/ip_dummynet.c head/sys/netpfil/ipfw/ip_fw2.c head/sys/netpfil/ipfw/ip_fw_bpf.c head/sys/netpfil/ipfw/ip_fw_dynamic.c head/sys/netpfil/ipfw/ip_fw_iface.c head/sys/netpfil/ipfw/ip_fw_nat.c head/sys/netpfil/ipfw/ip_fw_private.h head/sys/netpfil/ipfw/ip_fw_sockopt.c head/sys/netpfil/ipfw/ip_fw_table.c head/sys/netpfil/ipfw/ip_fw_table.h head/sys/netpfil/ipfw/ip_fw_table_algo.c head/sys/netpfil/ipfw/ip_fw_table_value.c head/sys/netpfil/ipfw/nat64/nat64_translate.c head/sys/netpfil/ipfw/nat64/nat64_translate.h head/sys/netpfil/ipfw/nat64/nat64clat_control.c head/sys/netpfil/ipfw/nat64/nat64lsn.c head/sys/netpfil/ipfw/nat64/nat64lsn_control.c head/sys/netpfil/ipfw/nat64/nat64stl.c head/sys/netpfil/ipfw/nat64/nat64stl.h head/sys/netpfil/ipfw/nat64/nat64stl_control.c head/sys/netpfil/ipfw/nptv6/nptv6.c head/sys/netpfil/ipfw/nptv6/nptv6.h head/sys/netpfil/ipfw/pmod/pmod.h head/sys/netpfil/ipfw/pmod/tcpmod.c head/sys/netpfil/ipfw/test/dn_test.h head/sys/netpfil/ipfw/test/main.c head/sys/netpfil/ipfw/test/mylist.h head/sys/netpfil/pf/if_pfsync.c head/sys/netpfil/pf/pf.c head/sys/netpfil/pf/pf_ioctl.c head/sys/netpfil/pf/pf_norm.c head/sys/netpfil/pf/pf_osfp.c head/sys/netpfil/pf/pf_ruleset.c head/sys/netpfil/pf/pf_table.c head/sys/netsmb/smb.h head/sys/netsmb/smb_conn.c head/sys/netsmb/smb_conn.h head/sys/netsmb/smb_crypt.c head/sys/netsmb/smb_dev.c head/sys/netsmb/smb_dev.h head/sys/netsmb/smb_iod.c head/sys/netsmb/smb_rq.c head/sys/netsmb/smb_rq.h head/sys/netsmb/smb_smb.c head/sys/netsmb/smb_subr.h head/sys/netsmb/smb_trantcp.c head/sys/netsmb/smb_trantcp.h Modified: head/sys/net/altq/altq.h ============================================================================== --- head/sys/net/altq/altq.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq.h Tue Sep 1 21:19:14 2020 (r365071) @@ -38,7 +38,6 @@ #define ALTQ3_CLFIER_COMPAT /* for compatibility with altq-3 classifier */ #endif - /* altq discipline type */ #define ALTQT_NONE 0 /* reserved */ #define ALTQT_CBQ 1 /* cbq */ @@ -57,14 +56,12 @@ #define ALTQT_CODEL 14 /* CoDel */ #define ALTQT_MAX 15 /* should be max discipline type + 1 */ - /* simple token backet meter profile */ struct tb_profile { u_int64_t rate; /* rate in bit-per-sec */ u_int32_t depth; /* depth in bytes */ }; - /* * generic packet counter */ @@ -76,7 +73,6 @@ struct pktcntr { #define PKTCNTR_ADD(cntr, len) \ do { (cntr)->packets++; (cntr)->bytes += len; } while (/*CONSTCOND*/ 0) - #ifdef _KERNEL #include #endif @@ -105,5 +101,5 @@ static inline int altq_stats_version(int scheduler) default: return (0); } } - + #endif /* _ALTQ_ALTQ_H_ */ Modified: head/sys/net/altq/altq_cbq.c ============================================================================== --- head/sys/net/altq/altq_cbq.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_cbq.c Tue Sep 1 21:19:14 2020 (r365071) @@ -55,7 +55,6 @@ #include #include - /* * Forward Declarations. */ Modified: head/sys/net/altq/altq_cbq.h ============================================================================== --- head/sys/net/altq/altq_cbq.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_cbq.h Tue Sep 1 21:19:14 2020 (r365071) @@ -111,7 +111,6 @@ typedef struct _cbq_class_stats_ { * header. */ - #ifdef _KERNEL /* * Define macros only good for kernel drivers and modules. @@ -121,7 +120,6 @@ typedef struct _cbq_class_stats_ { #define CBQ_LS_TIMEOUT (20 * hz / 1000) #define CBQ_MAX_CLASSES 256 - /* * Define State structures. Modified: head/sys/net/altq/altq_codel.c ============================================================================== --- head/sys/net/altq/altq_codel.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_codel.c Tue Sep 1 21:19:14 2020 (r365071) @@ -246,7 +246,6 @@ codel_dequeue(struct ifaltq *ifq, int op) if (op == ALTDQ_POLL) return (qhead(cif->cl_q)); - m = codel_getq(&cif->codel, cif->cl_q); if (m != NULL) { IFQ_DEC_LEN(ifq); Modified: head/sys/net/altq/altq_fairq.c ============================================================================== --- head/sys/net/altq/altq_fairq.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_fairq.c Tue Sep 1 21:19:14 2020 (r365071) @@ -157,7 +157,6 @@ fairq_add_altq(struct ifnet *ifp, struct pf_altq *a) if (!ALTQ_IS_READY(&ifp->if_snd)) return (ENODEV); - pif = malloc(sizeof(struct fairq_if), M_DEVBUF, M_WAITOK | M_ZERO); pif->pif_bandwidth = a->ifbandwidth; Modified: head/sys/net/altq/altq_hfsc.c ============================================================================== --- head/sys/net/altq/altq_hfsc.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_hfsc.c Tue Sep 1 21:19:14 2020 (r365071) @@ -133,8 +133,6 @@ static void get_class_stats_v1(struct hfsc_classsta struct hfsc_class *); static struct hfsc_class *clh_to_clp(struct hfsc_if *, u_int32_t); - - /* * macros */ @@ -142,7 +140,6 @@ static struct hfsc_class *clh_to_clp(struct hfsc_if *, #define HT_INFINITY 0xffffffffffffffffULL /* infinite time value */ - int hfsc_pfattach(struct pf_altq *a) { @@ -307,7 +304,6 @@ hfsc_clear_interface(struct hfsc_if *hif) { struct hfsc_class *cl; - /* clear out the classes */ while (hif->hif_rootclass != NULL && (cl = hif->hif_rootclass->cl_children) != NULL) { @@ -569,7 +565,6 @@ hfsc_class_destroy(struct hfsc_class *cl) s = splnet(); IFQ_LOCK(cl->cl_hif->hif_ifq); - if (!qempty(cl->cl_q)) hfsc_purgeq(cl); @@ -729,7 +724,6 @@ hfsc_dequeue(struct ifaltq *ifq, int op) cur_time = read_machclk(); if (op == ALTDQ_REMOVE && hif->hif_pollcache != NULL) { - cl = hif->hif_pollcache; hif->hif_pollcache = NULL; /* check if the class was scheduled by real-time criteria */ @@ -754,7 +748,6 @@ hfsc_dequeue(struct ifaltq *ifq, int op) */ cl = hif->hif_rootclass; while (is_a_parent_class(cl)) { - cl = actlist_firstfit(cl, cur_time); if (cl == NULL) { #ifdef ALTQ_DEBUG @@ -962,7 +955,6 @@ init_vf(struct hfsc_class *cl, int len) cur_time = 0; go_active = 1; for ( ; cl->cl_parent != NULL; cl = cl->cl_parent) { - if (go_active && cl->cl_nactive++ == 0) go_active = 1; else @@ -1052,7 +1044,6 @@ update_vf(struct hfsc_class *cl, int len, u_int64_t cu go_passive = qempty(cl->cl_q); for (; cl->cl_parent != NULL; cl = cl->cl_parent) { - cl->cl_total += len; if (cl->cl_fsc == NULL || cl->cl_nactive == 0) @@ -1596,7 +1587,7 @@ get_class_stats_v0(struct hfsc_classstats_v0 *sp, stru } #undef SATU32 - + sp->total = cl->cl_total; sp->cumul = cl->cl_cumul; @@ -1741,6 +1732,5 @@ clh_to_clp(struct hfsc_if *hif, u_int32_t chandle) return (cl); return (NULL); } - #endif /* ALTQ_HFSC */ Modified: head/sys/net/altq/altq_hfsc.h ============================================================================== --- head/sys/net/altq/altq_hfsc.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_hfsc.h Tue Sep 1 21:19:14 2020 (r365071) @@ -57,7 +57,7 @@ struct service_curve_v1 { /* Latest version of struct service_curve_vX */ #define HFSC_SERVICE_CURVE_VERSION 1 - + /* special class handles */ #define HFSC_NULLCLASS_HANDLE 0 #define HFSC_MAX_CLASSES 64 @@ -167,7 +167,6 @@ struct hfsc_classstats_v1 { * from mixing of public-API and internal bits in each scheduler-specific * header. */ - #ifdef _KERNEL /* Modified: head/sys/net/altq/altq_priq.c ============================================================================== --- head/sys/net/altq/altq_priq.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_priq.c Tue Sep 1 21:19:14 2020 (r365071) @@ -74,11 +74,9 @@ static struct mbuf *priq_getq(struct priq_class *); static struct mbuf *priq_pollq(struct priq_class *); static void priq_purgeq(struct priq_class *); - static void get_class_stats(struct priq_classstats *, struct priq_class *); static struct priq_class *clh_to_clp(struct priq_if *, u_int32_t); - int priq_pfattach(struct pf_altq *a) { @@ -639,6 +637,5 @@ clh_to_clp(struct priq_if *pif, u_int32_t chandle) return (NULL); } - #endif /* ALTQ_PRIQ */ Modified: head/sys/net/altq/altq_priq.h ============================================================================== --- head/sys/net/altq/altq_priq.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_priq.h Tue Sep 1 21:19:14 2020 (r365071) @@ -42,7 +42,6 @@ extern "C" { #define PRIQ_MAXPRI 16 /* upper limit of the number of priorities */ - /* priq class flags */ #define PRCF_RED 0x0001 /* use RED */ #define PRCF_ECN 0x0002 /* use RED/ECN */ @@ -54,7 +53,6 @@ extern "C" { /* special class handles */ #define PRIQ_NULLCLASS_HANDLE 0 - struct priq_classstats { u_int32_t class_handle; @@ -75,7 +73,6 @@ struct priq_classstats { * from mixing of public-API and internal bits in each scheduler-specific * header. */ - #ifdef _KERNEL Modified: head/sys/net/altq/altq_red.c ============================================================================== --- head/sys/net/altq/altq_red.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_red.c Tue Sep 1 21:19:14 2020 (r365071) @@ -162,13 +162,11 @@ * to switch to the random-drop policy, define "RED_RANDOM_DROP". */ - /* default red parameter values */ static int default_th_min = TH_MIN; static int default_th_max = TH_MAX; static int default_inv_pmax = INV_P_MAX; - /* * red support routines */ @@ -628,6 +626,5 @@ pow_w(struct wtab *w, int n) } return (val); } - #endif /* ALTQ_RED */ Modified: head/sys/net/altq/altq_red.h ============================================================================== --- head/sys/net/altq/altq_red.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_red.h Tue Sep 1 21:19:14 2020 (r365071) @@ -32,7 +32,6 @@ #include - /* red flags */ #define REDF_ECN4 0x01 /* use packet marking for IPv4 packets */ #define REDF_ECN6 0x02 /* use packet marking for IPv6 packets */ @@ -58,10 +57,8 @@ struct redstats { u_int marked_packets; }; - #ifdef _KERNEL - /* weight table structure for idle time calibration */ struct wtab { struct wtab *w_next; @@ -96,7 +93,6 @@ typedef struct red { struct wtab *red_wtab; /* weight table */ struct timeval red_last; /* time when the queue becomes idle */ - struct { struct pktcntr xmit_cnt; struct pktcntr drop_cnt; @@ -105,7 +101,6 @@ typedef struct red { u_int marked_packets; } red_stats; } red_t; - /* red drop types */ #define DTYPE_NODROP 0 /* no drop */ Modified: head/sys/net/altq/altq_rio.c ============================================================================== --- head/sys/net/altq/altq_rio.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_rio.c Tue Sep 1 21:19:14 2020 (r365071) @@ -447,5 +447,4 @@ rio_getq(rio_t *rp, class_queue_t *q) return (m); } - #endif /* ALTQ_RIO */ Modified: head/sys/net/altq/altq_rio.h ============================================================================== --- head/sys/net/altq/altq_rio.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_rio.h Tue Sep 1 21:19:14 2020 (r365071) @@ -38,14 +38,12 @@ */ #define RIO_NDROPPREC 3 /* number of drop precedence values */ - /* rio flags */ #define RIOF_ECN4 0x01 /* use packet marking for IPv4 packets */ #define RIOF_ECN6 0x02 /* use packet marking for IPv6 packets */ #define RIOF_ECN (RIOF_ECN4 | RIOF_ECN6) #define RIOF_CLEARDSCP 0x200 /* clear diffserv codepoint */ - #ifdef _KERNEL typedef struct rio { @@ -83,7 +81,6 @@ typedef struct rio { struct redstats q_stats[RIO_NDROPPREC]; /* statistics */ } rio_t; - extern rio_t *rio_alloc(int, struct redparams *, int, int); extern void rio_destroy(rio_t *); Modified: head/sys/net/altq/altq_rmclass.c ============================================================================== --- head/sys/net/altq/altq_rmclass.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_rmclass.c Tue Sep 1 21:19:14 2020 (r365071) @@ -64,7 +64,6 @@ /* * Local Macros */ - #define reset_cutoff(ifd) { ifd->cutoff_ = RM_MAXDEPTH; } /* @@ -651,7 +650,6 @@ rmc_delete_class(struct rm_ifdat *ifd, struct rm_class free(cl->q_, M_DEVBUF); free(cl, M_DEVBUF); } - /* * void Modified: head/sys/net/altq/altq_subr.c ============================================================================== --- head/sys/net/altq/altq_subr.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_subr.c Tue Sep 1 21:19:14 2020 (r365071) @@ -243,7 +243,7 @@ altq_disable(ifq) ASSERT(ifq->ifq_len == 0); ifq->altq_flags &= ~(ALTQF_ENABLED|ALTQF_CLASSIFY); splx(s); - + IFQ_UNLOCK(ifq); return 0; } @@ -330,7 +330,7 @@ tbr_set(ifq, profile) struct tb_profile *profile; { struct tb_regulator *tbr, *otbr; - + if (tbr_dequeue_ptr == NULL) tbr_dequeue_ptr = tbr_dequeue; @@ -841,7 +841,6 @@ write_dsfield(struct mbuf *m, struct altq_pktattr *pkt return; } - /* * high resolution clock support taking advantage of a machine dependent * high resolution time counter (e.g., timestamp counter of intel pentium). @@ -1811,7 +1810,6 @@ filt2fibmask(filt) return (mask); } - /* * helper functions to handle IPv4 fragments. * currently only in-sequence fragments are handled. @@ -1831,7 +1829,6 @@ static TAILQ_HEAD(ip4f_list, ip4_frag) ip4f_list; /* I #define IP4F_TABSIZE 16 /* IPv4 fragment cache size */ - static void ip4f_cache(ip, fin) struct ip *ip; @@ -1871,7 +1868,6 @@ ip4f_lookup(ip, fin) ip->ip_src.s_addr == fp->ip4f_info.fi_src.s_addr && ip->ip_dst.s_addr == fp->ip4f_info.fi_dst.s_addr && ip->ip_p == fp->ip4f_info.fi_proto) { - /* found the matching entry */ fin->fi_sport = fp->ip4f_info.fi_sport; fin->fi_dport = fp->ip4f_info.fi_dport; Modified: head/sys/net/altq/if_altq.h ============================================================================== --- head/sys/net/altq/if_altq.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/if_altq.h Tue Sep 1 21:19:14 2020 (r365071) @@ -74,7 +74,6 @@ struct ifaltq { struct top_cdnr *altq_cdnr; }; - #ifdef _KERNEL /* Modified: head/sys/net/bpf.c ============================================================================== --- head/sys/net/bpf.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/bpf.c Tue Sep 1 21:19:14 2020 (r365071) @@ -577,7 +577,6 @@ bpf_movein(struct uio *uio, int linktype, struct ifnet * for the link level header. */ switch (linktype) { - case DLT_SLIP: sockp->sa_family = AF_INET; hlen = 0; @@ -1428,7 +1427,6 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, i CURVNET_SET(TD_TO_VNET(td)); switch (cmd) { - default: error = EINVAL; break; Modified: head/sys/net/bridgestp.c ============================================================================== --- head/sys/net/bridgestp.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/bridgestp.c Tue Sep 1 21:19:14 2020 (r365071) @@ -832,7 +832,6 @@ bstp_assign_roles(struct bstp_state *bs) bp->bp_desg_fdelay = bs->bs_root_fdelay; bp->bp_desg_htime = bs->bs_bridge_htime; - switch (bp->bp_infois) { case BSTP_INFO_DISABLED: bstp_set_port_role(bp, BSTP_ROLE_DISABLED); Modified: head/sys/net/bridgestp.h ============================================================================== --- head/sys/net/bridgestp.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/bridgestp.h Tue Sep 1 21:19:14 2020 (r365071) @@ -178,7 +178,6 @@ #define BSTP_INFO_AGED 3 #define BSTP_INFO_DISABLED 4 - #define BSTP_MESSAGE_AGE_INCR (1 * 256) /* in 256ths of a second */ #define BSTP_TICK_VAL (1 * 256) /* in 256ths of a second */ #define BSTP_LINK_TIMER (BSTP_TICK_VAL * 15) Modified: head/sys/net/debugnet_inet.c ============================================================================== --- head/sys/net/debugnet_inet.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/debugnet_inet.c Tue Sep 1 21:19:14 2020 (r365071) @@ -161,7 +161,6 @@ debugnet_handle_ip(struct debugnet_pcb *pcb, struct mb return; } if (m->m_pkthdr.len > ip->ip_len) { - /* Truncate the packet to the IP length. */ if (m->m_len == m->m_pkthdr.len) { m->m_len = ip->ip_len; Modified: head/sys/net/ieee8023ad_lacp.c ============================================================================== --- head/sys/net/ieee8023ad_lacp.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/ieee8023ad_lacp.c Tue Sep 1 21:19:14 2020 (r365071) @@ -206,7 +206,6 @@ VNET_DEFINE_STATIC(int, lacp_default_strict_mode) = 1; SYSCTL_INT(_net_link_lagg_lacp, OID_AUTO, default_strict_mode, CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(lacp_default_strict_mode), 0, "LACP strict protocol compliance default"); - #define LACP_DPRINTF(a) if (V_lacp_debug & 0x01) { lacp_dprintf a ; } #define LACP_TRACE(a) if (V_lacp_debug & 0x02) { lacp_dprintf(a,"%s\n",__func__); } #define LACP_TPRINTF(a) if (V_lacp_debug & 0x04) { lacp_dprintf a ; } @@ -607,7 +606,7 @@ lacp_req(struct lagg_softc *sc, void *data) struct lacp_aggregator *la; bzero(req, sizeof(struct lacp_opreq)); - + /* * If the LACP softc is NULL, return with the opreq structure full of * zeros. It is normal for the softc to be NULL while the lagg is @@ -1102,7 +1101,6 @@ lacp_compose_key(struct lacp_port *lp) uint16_t key; if ((lp->lp_state & LACP_STATE_AGGREGATION) == 0) { - /* * non-aggregatable links should have unique keys. * @@ -1677,7 +1675,6 @@ lacp_sm_ptx_tx_schedule(struct lacp_port *lp) if (!(lp->lp_state & LACP_STATE_ACTIVITY) && !(lp->lp_partner.lip_state & LACP_STATE_ACTIVITY)) { - /* * NO_PERIODIC */ Modified: head/sys/net/if.c ============================================================================== --- head/sys/net/if.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if.c Tue Sep 1 21:19:14 2020 (r365071) @@ -488,7 +488,6 @@ VNET_SYSUNINIT(vnet_if_return, SI_SUB_VNET_DONE, SI_OR vnet_if_return, NULL); #endif - static void * if_grow(void) { @@ -688,7 +687,7 @@ if_rele(struct ifnet *ifp) void ifq_init(struct ifaltq *ifq, struct ifnet *ifp) { - + mtx_init(&ifq->ifq_mtx, ifp->if_xname, "if send queue", MTX_DEF); if (ifq->ifq_maxlen == 0) @@ -1838,7 +1837,6 @@ ifa_free(struct ifaddr *ifa) NET_EPOCH_CALL(ifa_destroy, &ifa->ifa_epoch_ctx); } - static int ifa_maintain_loopback_route(int cmd, const char *otype, struct ifaddr *ifa, struct sockaddr *ia) @@ -2358,7 +2356,7 @@ if_qflush(struct ifnet *ifp) { struct mbuf *m, *n; struct ifaltq *ifq; - + ifq = &ifp->if_snd; IFQ_LOCK(ifq); #ifdef ALTQ @@ -3142,7 +3140,7 @@ if_setflag(struct ifnet *ifp, int flag, int pflag, int /* Save ifnet parameters for if_ioctl() may fail */ oldcount = *refcount; oldflags = ifp->if_flags; - + /* * See if we aren't the only and touching refcount is enough. * Actually toggle interface flag if we are the first or last. @@ -3430,7 +3428,6 @@ if_freemulti(struct ifmultiaddr *ifma) NET_EPOCH_CALL(if_destroymulti, &ifma->ifma_epoch_ctx); } - /* * Register an additional multicast address with a network interface. * @@ -4029,7 +4026,7 @@ void if_register_com_alloc(u_char type, if_com_alloc_t *a, if_com_free_t *f) { - + KASSERT(if_com_alloc[type] == NULL, ("if_register_com_alloc: %d already registered", type)); KASSERT(if_com_free[type] == NULL, @@ -4042,7 +4039,7 @@ if_register_com_alloc(u_char type, void if_deregister_com_alloc(u_char type) { - + KASSERT(if_com_alloc[type] != NULL, ("if_deregister_com_alloc: %d not registered", type)); KASSERT(if_com_free[type] != NULL, @@ -4154,7 +4151,7 @@ if_getdrvflags(if_t ifp) { return ((struct ifnet *)ifp)->if_drv_flags; } - + int if_setdrvflags(if_t ifp, int flags) { @@ -4162,7 +4159,6 @@ if_setdrvflags(if_t ifp, int flags) return (0); } - int if_setflags(if_t ifp, int flags) { @@ -4376,7 +4372,6 @@ if_getamcount(if_t ifp) return ((struct ifnet *)ifp)->if_amcount; } - int if_setsendqready(if_t ifp) { @@ -4537,7 +4532,7 @@ if_settransmitfn(if_t ifp, if_transmit_fn_t start_fn) void if_setqflushfn(if_t ifp, if_qflush_fn_t flush_fn) { ((struct ifnet *)ifp)->if_qflush = flush_fn; - + } void Modified: head/sys/net/if.h ============================================================================== --- head/sys/net/if.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if.h Tue Sep 1 21:19:14 2020 (r365071) @@ -164,7 +164,6 @@ struct if_data { #define IFF_RENAMING 0x400000 /* (n) interface is being renamed */ #define IFF_NOGROUP 0x800000 /* (n) interface is not part of any groups */ - /* * Old names for driver flags so that user space tools can continue to use * the old (portable) names. Modified: head/sys/net/if_bridge.c ============================================================================== --- head/sys/net/if_bridge.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_bridge.c Tue Sep 1 21:19:14 2020 (r365071) @@ -364,7 +364,6 @@ static int bridge_fragment(struct ifnet *, struct mbuf static void bridge_linkstate(struct ifnet *ifp); static void bridge_linkcheck(struct bridge_softc *sc); - /* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */ #define VLANTAGOF(_m) \ (_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : 1 @@ -784,7 +783,6 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t da NET_EPOCH_ENTER(et); switch (cmd) { - case SIOCADDMULTI: case SIOCDELMULTI: break; Modified: head/sys/net/if_clone.c ============================================================================== --- head/sys/net/if_clone.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_clone.c Tue Sep 1 21:19:14 2020 (r365071) @@ -239,7 +239,7 @@ if_clone_createif(struct if_clone *ifc, char *name, si err = ifc_simple_create(ifc, name, len, params); else err = (*ifc->ifc_create)(ifc, name, len, params); - + if (!err) { ifp = ifunit(name); if (ifp == NULL) @@ -669,7 +669,7 @@ ifc_simple_match(struct if_clone *ifc, const char *nam { const char *cp; int i; - + /* Match the name */ for (cp = name, i = 0; i < strlen(ifc->ifc_name); i++, cp++) { if (ifc->ifc_name[i] != *cp) @@ -721,7 +721,6 @@ ifc_simple_create(struct if_clone *ifc, char *name, si */ panic("if_clone_create(): interface name too long"); } - } return (0); Modified: head/sys/net/if_dl.h ============================================================================== --- head/sys/net/if_dl.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_dl.h Tue Sep 1 21:19:14 2020 (r365071) @@ -72,7 +72,6 @@ struct sockaddr_dl { #define CLLADDR(s) ((c_caddr_t)((s)->sdl_data + (s)->sdl_nlen)) #define LLINDEX(s) ((s)->sdl_index) - struct ifnet; struct sockaddr_dl *link_alloc_sdl(size_t, int); void link_free_sdl(struct sockaddr *sa); Modified: head/sys/net/if_epair.c ============================================================================== --- head/sys/net/if_epair.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_epair.c Tue Sep 1 21:19:14 2020 (r365071) @@ -489,7 +489,7 @@ epair_transmit_locked(struct ifnet *ifp, struct mbuf * if (m == NULL) return (0); - + /* * We are not going to use the interface en/dequeue mechanism * on the TX side. We are called from ether_output_frame() @@ -609,7 +609,7 @@ static void epair_qflush(struct ifnet *ifp) { struct epair_softc *sc; - + sc = ifp->if_softc; KASSERT(sc != NULL, ("%s: ifp=%p, epair_softc gone? sc=%p\n", __func__, ifp, sc)); @@ -681,7 +681,6 @@ epair_init(void *dummy __unused) { } - /* * Interface cloning functions. * We use our private ones so that we can create/destroy our secondary @@ -800,7 +799,7 @@ epair_clone_create(struct if_clone *ifc, char *name, s ifc_free_unit(ifc, unit); return (ENOSPC); } - + /* * Cross-reference the interfaces so we will be able to free both. */ @@ -825,7 +824,7 @@ epair_clone_create(struct if_clone *ifc, char *name, s ifmedia_init(&scb->media, 0, epair_media_change, epair_media_status); ifmedia_add(&scb->media, IFM_ETHER | IFM_10G_T, 0, NULL); ifmedia_set(&scb->media, IFM_ETHER | IFM_10G_T); - + /* Finish initialization of interface a. */ ifp = sca->ifp; ifp->if_softc = sca; @@ -932,7 +931,7 @@ epair_clone_destroy(struct if_clone *ifc, struct ifnet */ if (ifp->if_softc == NULL) return (0); - + unit = ifp->if_dunit; sca = ifp->if_softc; oifp = sca->oifp; Modified: head/sys/net/if_ethersubr.c ============================================================================== --- head/sys/net/if_ethersubr.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_ethersubr.c Tue Sep 1 21:19:14 2020 (r365071) @@ -122,7 +122,6 @@ static void ether_reassign(struct ifnet *, struct vnet #endif static int ether_requestencap(struct ifnet *, struct if_encap_req *); - #define senderr(e) do { error = (e); goto bad;} while (0) static void @@ -200,7 +199,6 @@ ether_requestencap(struct ifnet *ifp, struct if_encap_ return (0); } - static int ether_resolve_addr(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro, u_char *phdr, @@ -545,7 +543,6 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m /* draft-ietf-6man-ipv6only-flag */ /* Catch ETHERTYPE_IP, and ETHERTYPE_[REV]ARP if we are v6-only. */ if ((ND_IFINFO(ifp)->flags & ND6_IFF_IPV6_ONLY_MASK) != 0) { - switch (etype) { case ETHERTYPE_IP: case ETHERTYPE_ARP: @@ -774,7 +771,7 @@ vnet_ether_init(__unused void *arg) } VNET_SYSINIT(vnet_ether_init, SI_SUB_PROTO_IF, SI_ORDER_ANY, vnet_ether_init, NULL); - + #ifdef VIMAGE static void vnet_ether_pfil_destroy(__unused void *arg) @@ -794,8 +791,6 @@ vnet_ether_destroy(__unused void *arg) VNET_SYSUNINIT(vnet_ether_uninit, SI_SUB_PROTO_IF, SI_ORDER_ANY, vnet_ether_destroy, NULL); #endif - - static void ether_input(struct ifnet *ifp, struct mbuf *m) Modified: head/sys/net/if_gif.c ============================================================================== --- head/sys/net/if_gif.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_gif.c Tue Sep 1 21:19:14 2020 (r365071) @@ -400,7 +400,6 @@ gif_qflush(struct ifnet *ifp __unused) } - int gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro) @@ -721,4 +720,3 @@ gif_delete_tunnel(struct gif_softc *sc) GIF2IFP(sc)->if_drv_flags &= ~IFF_DRV_RUNNING; if_link_state_change(GIF2IFP(sc), LINK_STATE_DOWN); } - Modified: head/sys/net/if_ipsec.c ============================================================================== --- head/sys/net/if_ipsec.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_ipsec.c Tue Sep 1 21:19:14 2020 (r365071) @@ -1003,7 +1003,6 @@ ipsec_set_addresses(struct ifnet *ifp, struct sockaddr key_sockaddrcmp(&saidx->src.sa, src, 0) == 0 && key_sockaddrcmp(&saidx->dst.sa, dst, 0) == 0) return (0); /* Nothing has been changed. */ - } /* If reqid is not set, generate new one. */ if (ipsec_init_reqid(sc) != 0) Modified: head/sys/net/if_lagg.c ============================================================================== --- head/sys/net/if_lagg.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_lagg.c Tue Sep 1 21:19:14 2020 (r365071) @@ -803,7 +803,6 @@ lagg_port_create(struct lagg_softc *sc, struct ifnet * lagg_setmulti(lp); - if ((error = lagg_proto_addport(sc, lp)) != 0) { /* Remove the port, without calling pr_delport. */ lagg_port_destroy(lp, 0); @@ -1046,7 +1045,6 @@ lagg_get_counter(struct ifnet *ifp, ift_counter cnt) */ vsum += sc->detached_counters.val[cnt]; - return (vsum); } @@ -2425,4 +2423,3 @@ lagg_lacp_input(struct lagg_softc *sc, struct lagg_por m->m_pkthdr.rcvif = ifp; return (m); } - Modified: head/sys/net/if_llatbl.c ============================================================================== --- head/sys/net/if_llatbl.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_llatbl.c Tue Sep 1 21:19:14 2020 (r365071) @@ -874,7 +874,6 @@ llatbl_llt_show(struct lltable *llt) for (i = 0; i < llt->llt_hsize; i++) { CK_LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { - llatbl_lle_show((struct llentry_sa *)lle); if (db_pager_quit) return; Modified: head/sys/net/if_loop.c ============================================================================== --- head/sys/net/if_loop.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_loop.c Tue Sep 1 21:19:14 2020 (r365071) @@ -393,7 +393,6 @@ loioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } switch (ifr->ifr_addr.sa_family) { - #ifdef INET case AF_INET: break; Modified: head/sys/net/if_media.c ============================================================================== --- head/sys/net/if_media.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_media.c Tue Sep 1 21:19:14 2020 (r365071) @@ -233,7 +233,6 @@ ifmedia_ioctl(ifp, ifr, ifm, cmd) return(EINVAL); switch (cmd) { - /* * Set the current media. */ @@ -390,7 +389,7 @@ ifmedia_baudrate(int mword) /* Not known. */ return (0); } - + #ifdef IFMEDIA_DEBUG static const struct ifmedia_description ifm_type_descriptions[] = IFM_TYPE_DESCRIPTIONS; Modified: head/sys/net/if_media.h ============================================================================== --- head/sys/net/if_media.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_media.h Tue Sep 1 21:19:14 2020 (r365071) @@ -108,7 +108,6 @@ void ifmedia_set(struct ifmedia *ifm, int mword); int ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm, u_long cmd); - /* Compute baudrate for a given media. */ uint64_t ifmedia_baudrate(int); Modified: head/sys/net/if_mib.c ============================================================================== --- head/sys/net/if_mib.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_mib.c Tue Sep 1 21:19:14 2020 (r365071) @@ -150,4 +150,3 @@ out: static SYSCTL_NODE(_net_link_generic, IFMIB_IFDATA, ifdata, CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ifdata, "Interface table"); - Modified: head/sys/net/if_pfsync.h ============================================================================== --- head/sys/net/if_pfsync.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_pfsync.h Tue Sep 1 21:19:14 2020 (r365071) @@ -47,7 +47,6 @@ * $FreeBSD$ */ - #ifndef _NET_IF_PFSYNC_H_ #define _NET_IF_PFSYNC_H_ Modified: head/sys/net/if_spppsubr.c ============================================================================== --- head/sys/net/if_spppsubr.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_spppsubr.c Tue Sep 1 21:19:14 2020 (r365071) @@ -742,7 +742,7 @@ static void sppp_ifstart_sched(void *dummy) { struct sppp *sp = dummy; - + sp->if_start(SP2IFP(sp)); } @@ -1005,7 +1005,7 @@ sppp_attach(struct ifnet *ifp) /* Initialize mtx lock */ mtx_init(&sp->mtx, "sppp", MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); - + /* Initialize keepalive handler. */ callout_init(&sp->keepalive_callout, 1); callout_reset(&sp->keepalive_callout, hz * 10, sppp_keepalive, @@ -1863,7 +1863,6 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, st } } - /* * The generic part of all Up/Down/Open/Close/TO event handlers. * Basically, the state transition handling in the automaton. @@ -1930,7 +1929,6 @@ sppp_down_event(const struct cp *cp, struct sppp *sp) } } - static void sppp_open_event(const struct cp *cp, struct sppp *sp) { @@ -1980,7 +1978,6 @@ sppp_open_event(const struct cp *cp, struct sppp *sp) } } - static void sppp_close_event(const struct cp *cp, struct sppp *sp) { @@ -2680,7 +2677,7 @@ sppp_lcp_tlu(struct sppp *sp) /* notify low-level driver of state change */ if (sp->pp_chg) sp->pp_chg(sp, (int)sp->pp_phase); - + if (sp->pp_phase == PHASE_NETWORK) /* if no NCP is starting, close down */ sppp_lcp_check_and_close(sp); @@ -3070,7 +3067,6 @@ sppp_ipcp_RCR(struct sppp *sp, struct lcp_header *h, i else log(-1, "%s [not agreed] ", sppp_dotted_quad(desiredaddr)); - } p[2] = hisaddr >> 24; p[3] = hisaddr >> 16; @@ -3836,7 +3832,6 @@ static void sppp_ipv6cp_down(struct sppp *sp) { } - static void sppp_ipv6cp_open(struct sppp *sp) { } @@ -4188,7 +4183,6 @@ sppp_chap_input(struct sppp *sp, struct mbuf *m) log(-1, ">\n"); } break; - } } @@ -4506,7 +4500,6 @@ sppp_pap_input(struct sppp *sp, struct mbuf *m) log(-1, ">\n"); } break; - } } @@ -5227,7 +5220,6 @@ sppp_phase_network(struct sppp *sp) /* if no NCP is starting, all this was in vain, close down */ sppp_lcp_check_and_close(sp); } - static const char * sppp_cp_type_name(u_char type) Modified: head/sys/net/if_tuntap.c ============================================================================== --- head/sys/net/if_tuntap.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_tuntap.c Tue Sep 1 21:19:14 2020 (r365071) @@ -168,7 +168,6 @@ struct tuntap_softc { #define TAP_ALL_OFFLOAD (CSUM_TSO | CSUM_TCP | CSUM_UDP |\ CSUM_TCP_IPV6 | CSUM_UDP_IPV6) - /* * All mutable global variables in if_tun are locked using tunmtx, with * the exception of tundebug, which is used unlocked, and the drivers' *clones, @@ -387,7 +386,6 @@ tun_busy(struct tuntap_softc *tp) return (ret); } - static void tun_unbusy(struct tuntap_softc *tp) { @@ -475,8 +473,6 @@ tuntap_driver_from_flags(int tun_flags) return (NULL); } - - static int tun_clone_match(struct if_clone *ifc, const char *name) Modified: head/sys/net/if_vlan.c ============================================================================== --- head/sys/net/if_vlan.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_vlan.c Tue Sep 1 21:19:14 2020 (r365071) @@ -342,7 +342,7 @@ static void *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:19:47 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6DB03379175; Tue, 1 Sep 2020 21:19:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0MR2grQz4HvT; Tue, 1 Sep 2020 21:19:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 265751F7EC; Tue, 1 Sep 2020 21:19:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LJlth018233; Tue, 1 Sep 2020 21:19:47 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LJd9T018197; Tue, 1 Sep 2020 21:19:39 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012119.081LJd9T018197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:19:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365072 - in head/sys/i386: acpica bios i386 include include/xen linux pci X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/i386: acpica bios i386 include include/xen linux pci X-SVN-Commit-Revision: 365072 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:19:47 -0000 Author: mjg Date: Tue Sep 1 21:19:39 2020 New Revision: 365072 URL: https://svnweb.freebsd.org/changeset/base/365072 Log: i386: clean up empty lines in .c and .h files Modified: head/sys/i386/acpica/acpi_machdep.c head/sys/i386/bios/apm.c head/sys/i386/i386/bios.c head/sys/i386/i386/db_disasm.c head/sys/i386/i386/db_trace.c head/sys/i386/i386/elan-mmcr.c head/sys/i386/i386/elf_machdep.c head/sys/i386/i386/geode.c head/sys/i386/i386/initcpu.c head/sys/i386/i386/machdep.c head/sys/i386/i386/mem.c head/sys/i386/i386/minidump_machdep.c head/sys/i386/i386/mp_clock.c head/sys/i386/i386/mp_machdep.c head/sys/i386/i386/npx.c head/sys/i386/i386/pmap.c head/sys/i386/i386/pmap_base.c head/sys/i386/i386/sys_machdep.c head/sys/i386/i386/vm86.c head/sys/i386/include/asmacros.h head/sys/i386/include/if_wl_wavelan.h head/sys/i386/include/param.h head/sys/i386/include/perfmon.h head/sys/i386/include/pmap.h head/sys/i386/include/smapi.h head/sys/i386/include/vmparam.h head/sys/i386/include/xen/hypercall.h head/sys/i386/include/xen/synch_bitops.h head/sys/i386/linux/linux.h head/sys/i386/linux/linux_machdep.c head/sys/i386/linux/linux_proto.h head/sys/i386/linux/linux_sysvec.c head/sys/i386/pci/pci_cfgreg.c head/sys/i386/pci/pci_pir.c Modified: head/sys/i386/acpica/acpi_machdep.c ============================================================================== --- head/sys/i386/acpica/acpi_machdep.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/acpica/acpi_machdep.c Tue Sep 1 21:19:39 2020 (r365072) @@ -300,7 +300,6 @@ static device_method_t nexus_acpi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, nexus_acpi_probe), DEVMETHOD(device_attach, nexus_acpi_attach), - { 0, 0 } }; Modified: head/sys/i386/bios/apm.c ============================================================================== --- head/sys/i386/bios/apm.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/bios/apm.c Tue Sep 1 21:19:39 2020 (r365072) @@ -397,7 +397,6 @@ deleteit: *list = p->ah_next; } - /* APM driver calls some functions automatically */ static void apm_execute_hook(struct apmhook *list) @@ -411,7 +410,6 @@ apm_execute_hook(struct apmhook *list) } } - /* establish an apm hook */ struct apmhook * apm_hook_establish(int apmh, struct apmhook *ah) @@ -583,7 +581,6 @@ apm_resume(void) EVENTHANDLER_INVOKE(power_resume); } - /* get power status per battery */ static int apm_get_pwstatus(apm_pwstatus_t app) @@ -619,7 +616,6 @@ apm_get_pwstatus(apm_pwstatus_t app) return 0; } - /* get APM information */ static int apm_get_info(apm_info_t aip) @@ -658,7 +654,6 @@ apm_get_info(apm_info_t aip) return 0; } - /* inform APM BIOS that CPU is idle */ void apm_cpu_idle(void) @@ -666,7 +661,6 @@ apm_cpu_idle(void) struct apm_softc *sc = &apm_softc; if (sc->active) { - sc->bios.r.eax = (APM_BIOS <<8) | APM_CPUIDLE; sc->bios.r.edx = sc->bios.r.ecx = sc->bios.r.ebx = 0; (void) apm_bioscall(); @@ -697,14 +691,12 @@ apm_cpu_busy(void) * necessary. */ if (sc->slow_idle_cpu && sc->active) { - sc->bios.r.eax = (APM_BIOS <<8) | APM_CPUBUSY; sc->bios.r.edx = sc->bios.r.ecx = sc->bios.r.ebx = 0; apm_bioscall(); } } - /* * APM thread loop. * @@ -935,7 +927,6 @@ apm_probe(device_t dev) return(0); } - /* * return 0 if the user will notice and handle the event, * return 1 if the kernel driver should do so. @@ -1171,7 +1162,6 @@ apm_attach(device_t dev) ((apm_version & 0x00f0) >> 4) * 10 + ((apm_version & 0x000f) >> 0), sc->majorversion, sc->minorversion); - APM_DPRINT("apm: Slow Idling CPU %s\n", is_enabled(sc->slow_idle_cpu)); /* enable power management */ if (sc->disabled) { @@ -1472,7 +1462,6 @@ static device_method_t apm_methods[] = { DEVMETHOD(device_identify, apm_identify), DEVMETHOD(device_probe, apm_probe), DEVMETHOD(device_attach, apm_attach), - { 0, 0 } }; Modified: head/sys/i386/i386/bios.c ============================================================================== --- head/sys/i386/i386/bios.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/bios.c Tue Sep 1 21:19:39 2020 (r365072) @@ -91,7 +91,6 @@ bios32_init(void *junk) /* look for the signature */ if ((sigaddr = bios_sigsearch(0, "_32_", 4, 16, 0)) != 0) { - /* get a virtual pointer to the structure */ sdh = (struct bios32_SDheader *)(uintptr_t)BIOS_PADDRTOVADDR(sigaddr); for (cv = (u_int8_t *)sdh, ck = 0, i = 0; i < (sdh->len * 16); i++) { @@ -109,7 +108,6 @@ bios32_init(void *junk) /* Allow user override of PCI BIOS search */ if (((p = kern_getenv("machdep.bios.pci")) == NULL) || strcmp(p, "disable")) { - /* See if there's a PCI BIOS entrypoint here */ PCIbios.ident.id = 0x49435024; /* PCI systems should have this */ if (!bios32_SDlookup(&PCIbios) && bootverbose) @@ -129,7 +127,6 @@ bios32_init(void *junk) */ if ((((p = kern_getenv("machdep.bios.pnp")) == NULL) || strcmp(p, "disable")) && ((sigaddr = bios_sigsearch(0, "$PnP", 4, 16, 0)) != 0)) { - /* get a virtual pointer to the structure */ pt = (struct PnPBIOS_table *)(uintptr_t)BIOS_PADDRTOVADDR(sigaddr); for (cv = (u_int8_t *)pt, ck = 0, i = 0; i < pt->len; i++) { @@ -188,7 +185,6 @@ bios32_SDlookup(struct bios32_SDentry *ent) return (1); /* failed */ } - /* * bios_sigsearch * @@ -227,7 +223,6 @@ bios_sigsearch(u_int32_t start, u_char *sig, int sigle /* loop searching */ while ((sp + sigofs + siglen) < end) { - /* compare here */ if (!bcmp(sp + sigofs, sig, siglen)) { /* convert back to physical address */ @@ -272,7 +267,7 @@ set_bios_selectors(struct bios_segments *seg, int flag #else p_gdt = gdt; #endif - + ssd.ssd_base = seg->code32.base; ssd.ssd_limit = seg->code32.limit; ssdtosd(&ssd, &p_gdt[GBIOSCODE32_SEL].sd); @@ -619,7 +614,6 @@ pnpbios_identify(driver_t *driver, device_t parent) pd = &pda->node; for (currdev = 0, left = ndevs; (currdev != 0xff) && (left > 0); left--) { - bzero(pd, bigdev); pda->next = currdev; /* get current configuration */ @@ -648,7 +642,7 @@ pnpbios_identify(driver_t *driver, device_t parent) continue; if (!strcmp(pnp_eisaformat(pd->devid), "PNP0003")) /* APIC */ continue; - + /* Add the device and parse its resources */ dev = BUS_ADD_CHILD(parent, ISA_ORDER_PNPBIOS, NULL, -1); isa_set_vendorid(dev, pd->devid); @@ -718,7 +712,6 @@ pnpbios_identify(driver_t *driver, device_t parent) static device_method_t pnpbios_methods[] = { /* Device interface */ DEVMETHOD(device_identify, pnpbios_identify), - { 0, 0 } }; Modified: head/sys/i386/i386/db_disasm.c ============================================================================== --- head/sys/i386/i386/db_disasm.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/db_disasm.c Tue Sep 1 21:19:39 2020 (r365072) @@ -1346,7 +1346,6 @@ db_disasm(db_addr_t loc, bool altfmt) db_printf(","); switch (i_mode & 0xFF) { - case E: db_print_address(seg, size, &address); break; Modified: head/sys/i386/i386/db_trace.c ============================================================================== --- head/sys/i386/i386/db_trace.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/db_trace.c Tue Sep 1 21:19:39 2020 (r365072) @@ -678,7 +678,6 @@ i386_set_watch(watchnum, watchaddr, size, access, d) return (watchnum); } - int i386_clr_watch(watchnum, d) int watchnum; @@ -694,7 +693,6 @@ i386_clr_watch(watchnum, d) return (0); } - int db_md_set_watchpoint(addr, size) db_expr_t addr; @@ -732,7 +730,6 @@ db_md_set_watchpoint(addr, size) return(0); } - int db_md_clr_watchpoint(addr, size) db_expr_t addr; @@ -748,7 +745,6 @@ db_md_clr_watchpoint(addr, size) if ((DBREG_DRX((&d), i) >= addr) && (DBREG_DRX((&d), i) < addr+size)) i386_clr_watch(i, &d); - } } @@ -757,7 +753,6 @@ db_md_clr_watchpoint(addr, size) return(0); } - static const char * watchtype_str(type) int type; @@ -769,7 +764,6 @@ watchtype_str(type) default : return "invalid"; break; } } - void db_md_list_watchpoints(void) Modified: head/sys/i386/i386/elan-mmcr.c ============================================================================== --- head/sys/i386/i386/elan-mmcr.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/elan-mmcr.c Tue Sep 1 21:19:39 2020 (r365072) @@ -347,7 +347,7 @@ init_AMD_Elan_sc520(void) * f = 32768 * 45 * 25 / 31 = 1189161.29... * We use the sysctl to get the i8254 (timecounter etc) into whack. */ - + new = 1189161; i = kernel_sysctlbyname(&thread0, "machdep.i8254_freq", NULL, 0, &new, sizeof new, NULL, 0); @@ -497,7 +497,7 @@ elan_drvinit(void) /* Create the error LED on GPIO9 */ led_cookie[9] = 0x02000c34; led_dev[9] = led_create(gpio_led, &led_cookie[9], "error"); - + /* Disable the unavailable GPIO pins */ strcpy(gpio_config, "-----....--..--------..---------"); #else /* !CPU_SOEKRIS */ @@ -509,4 +509,3 @@ elan_drvinit(void) } SYSINIT(elan, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, elan_drvinit, NULL); - Modified: head/sys/i386/i386/elf_machdep.c ============================================================================== --- head/sys/i386/i386/elf_machdep.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/elf_machdep.c Tue Sep 1 21:19:39 2020 (r365072) @@ -209,7 +209,6 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas } switch (rtype) { - case R_386_NONE: /* none */ break; Modified: head/sys/i386/i386/geode.c ============================================================================== --- head/sys/i386/i386/geode.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/geode.c Tue Sep 1 21:19:39 2020 (r365072) @@ -140,7 +140,6 @@ cs5536_led_func(void *ptr, int onoff) outl(a, 1 << (bit + 16)); } - static unsigned geode_get_timecount(struct timecounter *tc) { @@ -374,7 +373,7 @@ static device_method_t geode_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), {0, 0} }; - + static driver_t geode_driver = { "geode", geode_methods, Modified: head/sys/i386/i386/initcpu.c ============================================================================== --- head/sys/i386/i386/initcpu.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/initcpu.c Tue Sep 1 21:19:39 2020 (r365072) @@ -159,7 +159,6 @@ init_486dlc(void) intr_restore(saveintr); } - /* * Cyrix 486S/DX series */ @@ -181,7 +180,6 @@ init_cy486dx(void) intr_restore(saveintr); } - /* * Cyrix 5x86 */ @@ -959,7 +957,6 @@ DB_SHOW_COMMAND(cyrixreg, cyrixreg) cr0 = rcr0(); if (cpu_vendor_id == CPU_VENDOR_CYRIX) { saveintr = intr_disable(); - if ((cpu != CPU_M1SC) && (cpu != CPU_CY486DX)) { ccr0 = read_cyrix_reg(CCR0); Modified: head/sys/i386/i386/machdep.c ============================================================================== --- head/sys/i386/i386/machdep.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/machdep.c Tue Sep 1 21:19:39 2020 (r365072) @@ -1667,7 +1667,7 @@ add_physmap_entry(uint64_t base, uint64_t length, vm_p int i, insert_idx, physmap_idx; physmap_idx = *physmap_idxp; - + if (length == 0) return (1); @@ -2151,7 +2151,7 @@ do_next: } } pmap_cmap3(0, 0); - + /* * XXX * The last chunk must contain at least one page plus the message Modified: head/sys/i386/i386/mem.c ============================================================================== --- head/sys/i386/i386/mem.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/mem.c Tue Sep 1 21:19:39 2020 (r365072) @@ -128,7 +128,6 @@ memrw(struct cdev *dev, struct uio *uio, int flags) pa = pmap_extract(kernel_pmap, addr); if (pa == 0) return EFAULT; - } /* @@ -185,7 +184,7 @@ memioctl(struct cdev *dev __unused, u_long cmd, caddr_ int nd, error = 0; struct mem_range_op *mo = (struct mem_range_op *)data; struct mem_range_desc *md; - + /* is this for us? */ if ((cmd != MEMRANGE_GET) && (cmd != MEMRANGE_SET)) Modified: head/sys/i386/i386/minidump_machdep.c ============================================================================== --- head/sys/i386/i386/minidump_machdep.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/minidump_machdep.c Tue Sep 1 21:19:39 2020 (r365072) @@ -82,4 +82,3 @@ minidumpsys(struct dumperinfo *di) return (pae_mode ? minidumpsys_pae(di) : minidumpsys_nopae(di)); } - Modified: head/sys/i386/i386/mp_clock.c ============================================================================== --- head/sys/i386/i386/mp_clock.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/mp_clock.c Tue Sep 1 21:19:39 2020 (r365072) @@ -63,7 +63,6 @@ static struct timecounter piix_timecounter = { "PIIX" /* name */ }; - static int sysctl_machdep_piix_freq(SYSCTL_HANDLER_ARGS) { Modified: head/sys/i386/i386/mp_machdep.c ============================================================================== --- head/sys/i386/i386/mp_machdep.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/mp_machdep.c Tue Sep 1 21:19:39 2020 (r365072) @@ -289,7 +289,7 @@ init_secondary(void) cr0 &= ~(CR0_CD | CR0_NW | CR0_EM); load_cr0(cr0); CHECK_WRITE(0x38, 5); - + /* signal our startup to the BSP. */ mp_naps++; CHECK_WRITE(0x39, 6); Modified: head/sys/i386/i386/npx.c ============================================================================== --- head/sys/i386/i386/npx.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/npx.c Tue Sep 1 21:19:39 2020 (r365072) @@ -440,7 +440,7 @@ npxinit(bool bsp) */ if (bsp) npxinit_bsp2(); - + /* * fninit has the same h/w bugs as fnsave. Use the detoxified * fnsave to throw away any junk in the fpu. fpusave() initializes @@ -1324,7 +1324,6 @@ static device_method_t npxisa_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), - { 0, 0 } }; Modified: head/sys/i386/i386/pmap.c ============================================================================== --- head/sys/i386/i386/pmap.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/pmap.c Tue Sep 1 21:19:39 2020 (r365072) @@ -675,7 +675,6 @@ __CONCAT(PMTYPE, bootstrap)(vm_paddr_t firstaddr) va = virtual_avail; pte = vtopte(va); - /* * Initialize temporary map objects on the current CPU for use * during early boot. @@ -788,7 +787,7 @@ pmap_init_reserved_pages(void) pc->pc_qmap_addr = pages + ptoa(2); } } - + SYSINIT(rpages_init, SI_SUB_CPU, SI_ORDER_ANY, pmap_init_reserved_pages, NULL); /* @@ -962,7 +961,6 @@ pmap_ptelist_init(vm_offset_t *head, void *base, int n } } - /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap @@ -1854,7 +1852,6 @@ __CONCAT(PMTYPE, map)(vm_offset_t *virt, vm_paddr_t st return (sva); } - /* * Add a list of wired pages to the kva * this routine is only used for temporary @@ -2211,7 +2208,6 @@ retry: return (m); } - /*************************************************** * Pmap allocation/deallocation routines. ***************************************************/ @@ -2295,7 +2291,6 @@ __CONCAT(PMTYPE, growkernel)(vm_offset_t addr) } } - /*************************************************** * page management routines. ***************************************************/ @@ -2891,7 +2886,7 @@ pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offse */ if ((*firstpte & PG_PTE_PROMOTE) != (newpte & PG_PTE_PROMOTE)) pmap_fill_ptp(firstpte, newpte); - + /* * Demote the mapping. This pmap is locked. The old PDE has * PG_A set. If the old PDE has PG_RW set, it also has PG_M @@ -4380,7 +4375,6 @@ resume: } PMAP_UNLOCK(pmap); } - /* * Copy the range specified by src_addr/len Modified: head/sys/i386/i386/pmap_base.c ============================================================================== --- head/sys/i386/i386/pmap_base.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/pmap_base.c Tue Sep 1 21:19:39 2020 (r365072) @@ -269,7 +269,6 @@ SYSCTL_OID(_vm_pmap, OID_AUTO, kernel_maps, NULL, 0, sysctl_kmaps, "A", "Dump kernel address layout"); - /* * Initialize a vm_page's machine-dependent fields. */ Modified: head/sys/i386/i386/sys_machdep.c ============================================================================== --- head/sys/i386/i386/sys_machdep.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/sys_machdep.c Tue Sep 1 21:19:39 2020 (r365072) @@ -473,7 +473,7 @@ user_ldt_alloc(struct mdproc *mdp, int len) len * sizeof(union descriptor)); } else bcopy(ldt, new_ldt->ldt_base, sizeof(union descriptor) * NLDT); - + return (new_ldt); } Modified: head/sys/i386/i386/vm86.c ============================================================================== --- head/sys/i386/i386/vm86.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/i386/vm86.c Tue Sep 1 21:19:39 2020 (r365072) @@ -283,7 +283,6 @@ vm86_emulate(struct vm86frame *vmf) vmf->vmf_eflags &= ~PSL_VIF; } return (retcode); - } return (SIGBUS); } @@ -808,7 +807,7 @@ vm86_getptr(struct vm86context *vmc, vm_offset_t kva, } return (0); } - + int vm86_sysarch(struct thread *td, char *args) { @@ -843,7 +842,7 @@ vm86_sysarch(struct thread *td, char *args) #if 0 case VM86_SET_VME: { struct vm86_vme_args sa; - + if ((cpu_feature & CPUID_VME) == 0) return (ENODEV); Modified: head/sys/i386/include/asmacros.h ============================================================================== --- head/sys/i386/include/asmacros.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/include/asmacros.h Tue Sep 1 21:19:39 2020 (r365072) @@ -165,7 +165,7 @@ pushl $0 /* dummy trap type */ PUSH_FRAME2 .endm - + /* * Access per-CPU data. */ Modified: head/sys/i386/include/if_wl_wavelan.h ============================================================================== --- head/sys/i386/include/if_wl_wavelan.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/include/if_wl_wavelan.h Tue Sep 1 21:19:39 2020 (r365072) @@ -166,4 +166,3 @@ struct w_sigcache { }; #endif /* _CHIPS_WAVELAN_H */ - Modified: head/sys/i386/include/param.h ============================================================================== --- head/sys/i386/include/param.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/include/param.h Tue Sep 1 21:19:39 2020 (r365072) @@ -35,7 +35,6 @@ * $FreeBSD$ */ - #ifndef _I386_INCLUDE_PARAM_H_ #define _I386_INCLUDE_PARAM_H_ @@ -44,7 +43,6 @@ /* * Machine dependent constants for Intel 386. */ - #define __HAVE_ACPI #define __HAVE_PIR Modified: head/sys/i386/include/perfmon.h ============================================================================== --- head/sys/i386/include/perfmon.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/include/perfmon.h Tue Sep 1 21:19:39 2020 (r365072) @@ -36,7 +36,7 @@ #ifndef _MACHINE_PERFMON_H_ #define _MACHINE_PERFMON_H_ - + #ifndef _KERNEL #include #endif Modified: head/sys/i386/include/pmap.h ============================================================================== --- head/sys/i386/include/pmap.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/include/pmap.h Tue Sep 1 21:19:39 2020 (r365072) @@ -67,7 +67,6 @@ #define PG_PDE_PAT 0x1000 /* PAT PAT index */ #define PG_NX (1ull<<63) /* No-execute */ - /* Our various interpretations of the above */ #define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 Modified: head/sys/i386/include/smapi.h ============================================================================== --- head/sys/i386/include/smapi.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/include/smapi.h Tue Sep 1 21:19:39 2020 (r365072) @@ -58,7 +58,7 @@ struct smapi_bios_header { u_int32_t prot32_offset; u_int32_t prot32_segment; - + } __packed; struct smapi_bios_parameter { Modified: head/sys/i386/include/vmparam.h ============================================================================== --- head/sys/i386/include/vmparam.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/include/vmparam.h Tue Sep 1 21:19:39 2020 (r365072) @@ -37,7 +37,6 @@ * $FreeBSD$ */ - #ifndef _MACHINE_VMPARAM_H_ #define _MACHINE_VMPARAM_H_ 1 Modified: head/sys/i386/include/xen/hypercall.h ============================================================================== --- head/sys/i386/include/xen/hypercall.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/include/xen/hypercall.h Tue Sep 1 21:19:39 2020 (r365072) @@ -261,7 +261,7 @@ HYPERVISOR_update_va_mapping( lo = (uint32_t)(new_val & 0xffffffff); hi = (uint32_t)(new_val >> 32); - + return _hypercall4(int, update_va_mapping, va, lo, hi, flags); } @@ -327,10 +327,10 @@ HYPERVISOR_update_va_mapping_otherdomain( unsigned long va, uint64_t new_val, unsigned long flags, domid_t domid) { uint32_t hi, lo; - + lo = (uint32_t)(new_val & 0xffffffff); hi = (uint32_t)(new_val >> 32); - + return _hypercall5(int, update_va_mapping_otherdomain, va, lo, hi, flags, domid); } Modified: head/sys/i386/include/xen/synch_bitops.h ============================================================================== --- head/sys/i386/include/xen/synch_bitops.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/include/xen/synch_bitops.h Tue Sep 1 21:19:39 2020 (r365072) @@ -7,7 +7,6 @@ * when communicating with Xen or other guest OSes running on other CPUs. */ - #define ADDR (*(volatile long *) addr) static __inline__ void synch_set_bit(int nr, volatile void * addr) Modified: head/sys/i386/linux/linux.h ============================================================================== --- head/sys/i386/linux/linux.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/linux/linux.h Tue Sep 1 21:19:39 2020 (r365072) @@ -508,7 +508,6 @@ struct l_desc_struct { unsigned long a, b; }; - #define LINUX_LOWERWORD 0x0000ffff /* Modified: head/sys/i386/linux/linux_machdep.c ============================================================================== --- head/sys/i386/linux/linux_machdep.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/linux/linux_machdep.c Tue Sep 1 21:19:39 2020 (r365072) @@ -96,7 +96,6 @@ struct l_old_select_argv { struct l_timeval *timeout; }; - int linux_execve(struct thread *td, struct linux_execve_args *args) { Modified: head/sys/i386/linux/linux_proto.h ============================================================================== --- head/sys/i386/linux/linux_proto.h Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/linux/linux_proto.h Tue Sep 1 21:19:39 2020 (r365072) @@ -1937,41 +1937,35 @@ int linux_io_uring_register(struct thread *, struct li #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 #define nosys linux_nosys #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 #define nosys linux_nosys #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 #define nosys linux_nosys #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 #define nosys linux_nosys #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 #define nosys linux_nosys #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 Modified: head/sys/i386/linux/linux_sysvec.c ============================================================================== --- head/sys/i386/linux/linux_sysvec.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/linux/linux_sysvec.c Tue Sep 1 21:19:39 2020 (r365072) @@ -493,7 +493,6 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigse mtx_lock(&psp->ps_mtx); } - /* * Send an interrupt to process. * Modified: head/sys/i386/pci/pci_cfgreg.c ============================================================================== --- head/sys/i386/pci/pci_cfgreg.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/pci/pci_cfgreg.c Tue Sep 1 21:19:39 2020 (r365072) @@ -405,7 +405,6 @@ pcireg_cfgopen(void) } if ((oldval2 & 0xf0) == 0) { - cfgmech = CFGMECH_2; devmax = 16; @@ -466,7 +465,6 @@ pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) #endif { - pcie_array = malloc(sizeof(struct pcie_cfg_elem) * PCIE_CACHE, M_DEVBUF, M_NOWAIT); if (pcie_array == NULL) Modified: head/sys/i386/pci/pci_pir.c ============================================================================== --- head/sys/i386/pci/pci_pir.c Tue Sep 1 21:19:14 2020 (r365071) +++ head/sys/i386/pci/pci_pir.c Tue Sep 1 21:19:39 2020 (r365072) @@ -481,7 +481,6 @@ pci_pir_biosroute(int bus, int device, int func, int p return (bios32(&args, PCIbios.ventry, GSEL(GCODE_SEL, SEL_KPL))); } - /* * Route a PCI interrupt using a link device from the $PIR. */ @@ -732,7 +731,6 @@ static device_method_t pir_methods[] = { DEVMETHOD(device_probe, pir_probe), DEVMETHOD(device_attach, pir_attach), DEVMETHOD(device_resume, pir_resume), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:20:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61892379423; Tue, 1 Sep 2020 21:20:17 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0N12G1Gz4HlS; Tue, 1 Sep 2020 21:20:17 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 307351FC94; Tue, 1 Sep 2020 21:20:17 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LKHRo018378; Tue, 1 Sep 2020 21:20:17 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LK98r018336; Tue, 1 Sep 2020 21:20:09 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012120.081LK98r018336@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:20:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365073 - in head/sys/powerpc: aim amigaone booke cpufreq fpu include mambo mikrotik mpc85xx ofw powermac powernv powerpc ps3 pseries psim X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/powerpc: aim amigaone booke cpufreq fpu include mambo mikrotik mpc85xx ofw powermac powernv powerpc ps3 pseries psim X-SVN-Commit-Revision: 365073 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:20:17 -0000 Author: mjg Date: Tue Sep 1 21:20:08 2020 New Revision: 365073 URL: https://svnweb.freebsd.org/changeset/base/365073 Log: powerpc: clean up empty lines in .c and .h files Modified: head/sys/powerpc/aim/aim_machdep.c head/sys/powerpc/aim/mmu_oea.c head/sys/powerpc/aim/mmu_oea64.c head/sys/powerpc/aim/mmu_oea64.h head/sys/powerpc/aim/mmu_radix.c head/sys/powerpc/aim/moea64_native.c head/sys/powerpc/aim/mp_cpudep.c head/sys/powerpc/aim/slb.c head/sys/powerpc/amigaone/cpld_a1222.c head/sys/powerpc/amigaone/cpld_x5000.c head/sys/powerpc/booke/booke_machdep.c head/sys/powerpc/booke/platform_bare.c head/sys/powerpc/booke/pmap.c head/sys/powerpc/booke/pmap_32.c head/sys/powerpc/booke/pmap_64.c head/sys/powerpc/booke/spe.c head/sys/powerpc/cpufreq/dfs.c head/sys/powerpc/cpufreq/mpc85xx_jog.c head/sys/powerpc/cpufreq/pcr.c head/sys/powerpc/cpufreq/pmcr.c head/sys/powerpc/cpufreq/pmufreq.c head/sys/powerpc/fpu/fpu_arith.h head/sys/powerpc/fpu/fpu_emu.c head/sys/powerpc/fpu/fpu_explode.c head/sys/powerpc/fpu/fpu_extern.h head/sys/powerpc/fpu/fpu_implode.c head/sys/powerpc/fpu/fpu_instr.h head/sys/powerpc/include/altivec.h head/sys/powerpc/include/atomic.h head/sys/powerpc/include/bat.h head/sys/powerpc/include/cpufunc.h head/sys/powerpc/include/mmuvar.h head/sys/powerpc/include/openpicreg.h head/sys/powerpc/include/openpicvar.h head/sys/powerpc/include/pcb.h head/sys/powerpc/include/pio.h head/sys/powerpc/include/pmap.h head/sys/powerpc/include/rtas.h head/sys/powerpc/include/spr.h head/sys/powerpc/include/trap.h head/sys/powerpc/mambo/mambo.c head/sys/powerpc/mikrotik/rb_led.c head/sys/powerpc/mpc85xx/atpic.c head/sys/powerpc/mpc85xx/ds1553_bus_fdt.c head/sys/powerpc/mpc85xx/ds1553_reg.h head/sys/powerpc/mpc85xx/fsl_diu.c head/sys/powerpc/mpc85xx/fsl_sata.c head/sys/powerpc/mpc85xx/fsl_sata.h head/sys/powerpc/mpc85xx/i2c.c head/sys/powerpc/mpc85xx/lbc.c head/sys/powerpc/mpc85xx/mpc85xx.c head/sys/powerpc/mpc85xx/mpc85xx_gpio.c head/sys/powerpc/mpc85xx/pci_mpc85xx.c head/sys/powerpc/mpc85xx/platform_mpc85xx.c head/sys/powerpc/mpc85xx/qoriq_gpio.c head/sys/powerpc/ofw/ofw_initrd.c head/sys/powerpc/ofw/ofw_machdep.c head/sys/powerpc/ofw/ofw_pcib_pci.c head/sys/powerpc/ofw/ofw_pcibus.c head/sys/powerpc/ofw/ofw_pcibus.h head/sys/powerpc/ofw/ofw_real.c head/sys/powerpc/ofw/ofw_syscons.c head/sys/powerpc/ofw/openpic_ofw.c head/sys/powerpc/ofw/rtas.c head/sys/powerpc/powermac/ata_dbdma.c head/sys/powerpc/powermac/ata_dbdma.h head/sys/powerpc/powermac/ata_macio.c head/sys/powerpc/powermac/cpcht.c head/sys/powerpc/powermac/cuda.c head/sys/powerpc/powermac/dbdma.c head/sys/powerpc/powermac/dbdmavar.h head/sys/powerpc/powermac/grackle.c head/sys/powerpc/powermac/kiic.c head/sys/powerpc/powermac/macgpio.c head/sys/powerpc/powermac/macio.c head/sys/powerpc/powermac/nvbl.c head/sys/powerpc/powermac/platform_powermac.c head/sys/powerpc/powermac/pmu.c head/sys/powerpc/powermac/pmuvar.h head/sys/powerpc/powermac/powermac_thermal.c head/sys/powerpc/powermac/powermac_thermal.h head/sys/powerpc/powermac/pswitch.c head/sys/powerpc/powermac/smu.c head/sys/powerpc/powermac/smusat.c head/sys/powerpc/powermac/uninorth.c head/sys/powerpc/powermac/uninorthpci.c head/sys/powerpc/powermac/uninorthvar.h head/sys/powerpc/powermac/vcoregpio.c head/sys/powerpc/powernv/opal.c head/sys/powerpc/powernv/opal_console.c head/sys/powerpc/powernv/opal_dev.c head/sys/powerpc/powernv/opal_flash.c head/sys/powerpc/powernv/opal_i2cm.c head/sys/powerpc/powernv/opal_nvram.c head/sys/powerpc/powernv/opal_pci.c head/sys/powerpc/powernv/opal_sensor.c head/sys/powerpc/powernv/platform_powernv.c head/sys/powerpc/powernv/powernv_centaur.c head/sys/powerpc/powernv/powernv_xscom.c head/sys/powerpc/powernv/xive.c head/sys/powerpc/powerpc/bus_machdep.c head/sys/powerpc/powerpc/busdma_machdep.c head/sys/powerpc/powerpc/clock.c head/sys/powerpc/powerpc/copyinout.c head/sys/powerpc/powerpc/cpu.c head/sys/powerpc/powerpc/db_disasm.c head/sys/powerpc/powerpc/db_interface.c head/sys/powerpc/powerpc/db_trace.c head/sys/powerpc/powerpc/elf32_machdep.c head/sys/powerpc/powerpc/elf64_machdep.c head/sys/powerpc/powerpc/exec_machdep.c head/sys/powerpc/powerpc/genassym.c head/sys/powerpc/powerpc/intr_machdep.c head/sys/powerpc/powerpc/mem.c head/sys/powerpc/powerpc/minidump_machdep.c head/sys/powerpc/powerpc/mp_machdep.c head/sys/powerpc/powerpc/nexus.c head/sys/powerpc/powerpc/platform.c head/sys/powerpc/powerpc/syncicache.c head/sys/powerpc/powerpc/sys_machdep.c head/sys/powerpc/powerpc/trap.c head/sys/powerpc/powerpc/uma_machdep.c head/sys/powerpc/ps3/if_glc.c head/sys/powerpc/ps3/if_glcreg.h head/sys/powerpc/ps3/mmu_ps3.c head/sys/powerpc/ps3/ohci_ps3.c head/sys/powerpc/ps3/platform_ps3.c head/sys/powerpc/ps3/ps3_syscons.c head/sys/powerpc/ps3/ps3bus.c head/sys/powerpc/ps3/ps3cdrom.c head/sys/powerpc/ps3/ps3disk.c head/sys/powerpc/pseries/phyp-hvcall.h head/sys/powerpc/pseries/phyp_console.c head/sys/powerpc/pseries/phyp_dbg.c head/sys/powerpc/pseries/phyp_llan.c head/sys/powerpc/pseries/phyp_vscsi.c head/sys/powerpc/pseries/platform_chrp.c head/sys/powerpc/pseries/plpar_iommu.c head/sys/powerpc/pseries/plpar_iommu.h head/sys/powerpc/pseries/plpar_pcibus.c head/sys/powerpc/pseries/rtas_dev.c head/sys/powerpc/pseries/rtas_pci.c head/sys/powerpc/pseries/vdevice.c head/sys/powerpc/pseries/xics.c head/sys/powerpc/psim/ata_iobus.c head/sys/powerpc/psim/iobus.c head/sys/powerpc/psim/openpic_iobus.c head/sys/powerpc/psim/uart_iobus.c Modified: head/sys/powerpc/aim/aim_machdep.c ============================================================================== --- head/sys/powerpc/aim/aim_machdep.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/aim/aim_machdep.c Tue Sep 1 21:20:08 2020 (r365073) @@ -391,7 +391,6 @@ aim_cpu_init(vm_offset_t toc) bcopy(&restorebridge, (void *)EXC_TRC, trap_offset); bcopy(&restorebridge, (void *)EXC_BPT, trap_offset); } else { - /* * Use an IBAT and a DBAT to map the bottom 256M segment. * @@ -572,7 +571,6 @@ cpu_machine_check(struct thread *td, struct trapframe return (SIGBUS); } - #ifndef __powerpc64__ uint64_t va_to_vsid(pmap_t pm, vm_offset_t va) @@ -779,4 +777,3 @@ cpu_sleep() enable_vec(curthread); powerpc_sync(); } - Modified: head/sys/powerpc/aim/mmu_oea.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/aim/mmu_oea.c Tue Sep 1 21:20:08 2020 (r365073) @@ -326,7 +326,6 @@ static int moea_map_user_ptr(pmap_t pm, static int moea_decode_kernel_ptr(vm_offset_t addr, int *is_user, vm_offset_t *decoded_addr); - static struct pmap_funcs moea_methods = { .clear_modify = moea_clear_modify, .copy_page = moea_copy_page, @@ -1573,14 +1572,14 @@ moea_map_user_ptr(pmap_t pm, volatile const void *uadd return (EFAULT); vsid = va_to_vsid(pm, (vm_offset_t)uaddr); - + /* Mark segment no-execute */ vsid |= SR_N; - + /* If we have already set this VSID, we can just return */ if (curthread->td_pcb->pcb_cpu.aim.usr_vsid == vsid) return (0); - + __asm __volatile("isync"); curthread->td_pcb->pcb_cpu.aim.usr_segm = (uintptr_t)uaddr >> ADDR_SR_SHFT; @@ -1717,7 +1716,6 @@ moea_pinit(pmap_t pmap) pmap->pmap_phys = pmap; } - mtx_lock(&moea_vsid_mutex); /* * Allocate some segment registers for this pmap. @@ -2481,7 +2479,6 @@ moea_query_bit(vm_page_t m, int ptebit) return (TRUE); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - /* * See if we saved the bit off. If so, cache it and return * success. @@ -2499,7 +2496,6 @@ moea_query_bit(vm_page_t m, int ptebit) */ powerpc_sync(); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - /* * See if this pvo has a valid PTE. if so, fetch the * REF/CHG bits from the valid PTE. If the appropriate Modified: head/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea64.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/aim/mmu_oea64.c Tue Sep 1 21:20:08 2020 (r365073) @@ -316,7 +316,6 @@ static void *moea64_dump_pmap_init(unsigned blkpgs); static void moea64_page_array_startup(long); #endif - static struct pmap_funcs moea64_methods = { .clear_modify = moea64_clear_modify, .copy_page = moea64_copy_page, @@ -408,7 +407,6 @@ alloc_pvo_entry(int bootstrap) return (pvo); } - static void init_pvo_entry(struct pvo_entry *pvo, pmap_t pmap, vm_offset_t va) { @@ -445,7 +443,7 @@ moea64_pte_from_pvo(const struct pvo_entry *pvo, struc lpte->pte_hi = moea64_pte_vpn_from_pvo_vpn(pvo); lpte->pte_hi |= LPTE_VALID; - + if (pvo->pvo_vaddr & PVO_LARGE) lpte->pte_hi |= LPTE_BIG; if (pvo->pvo_vaddr & PVO_WIRED) @@ -1688,7 +1686,7 @@ moea64_uma_page_alloc(uma_zone_t zone, vm_size_t bytes if (needed_lock) PMAP_UNLOCK(kernel_pmap); - + if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) bzero((void *)va, PAGE_SIZE); @@ -2373,7 +2371,6 @@ moea64_release_vsid(uint64_t vsid) moea64_vsid_bitmap[idx] &= ~mask; mtx_unlock(&moea64_slb_mutex); } - void moea64_release(pmap_t pmap) Modified: head/sys/powerpc/aim/mmu_oea64.h ============================================================================== --- head/sys/powerpc/aim/mmu_oea64.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/aim/mmu_oea64.h Tue Sep 1 21:20:08 2020 (r365073) @@ -83,7 +83,6 @@ int64_t moea64_pte_unset(struct pvo_entry *); int64_t moea64_pte_clear(struct pvo_entry *, uint64_t); int64_t moea64_pte_synch(struct pvo_entry *); - typedef int64_t (*moea64_pte_replace_t)(struct pvo_entry *, int); typedef int64_t (*moea64_pte_insert_t)(struct pvo_entry *); typedef int64_t (*moea64_pte_unset_t)(struct pvo_entry *); @@ -131,4 +130,3 @@ extern u_long moea64_pteg_mask; extern int n_slbs; #endif /* _POWERPC_AIM_MMU_OEA64_H */ - Modified: head/sys/powerpc/aim/mmu_radix.c ============================================================================== --- head/sys/powerpc/aim/mmu_radix.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/aim/mmu_radix.c Tue Sep 1 21:20:08 2020 (r365073) @@ -25,11 +25,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD$"); - #include #include #include @@ -597,8 +595,6 @@ static int pmap_change_attr_locked(vm_offset_t va, vm_ #define UNIMPLEMENTED() panic("%s not implemented", __func__) #define UNTESTED() panic("%s not yet tested", __func__) - - /* Number of supported PID bits */ static unsigned int isa3_pid_bits; @@ -608,7 +604,6 @@ static unsigned int isa3_base_pid; #define PROCTAB_SIZE_SHIFT (isa3_pid_bits + 4) #define PROCTAB_ENTRIES (1ul << isa3_pid_bits) - /* * Map of physical memory regions. */ @@ -712,7 +707,6 @@ static struct md_page pv_dummy; */ #define RTS_SIZE ((0x2UL << 61) | (0x5UL << 5)) - static int powernv_enabled = 1; static __always_inline void @@ -846,7 +840,6 @@ pa_cmp(const void *a, const void *b) #define PG_PTE_PROMOTE (PG_X | PG_MANAGED | PG_W | PG_PTE_CACHE | \ PG_M | PG_A | RPTE_EAA_MASK | PG_V) - static __inline void pmap_resident_count_inc(pmap_t pmap, int count) { @@ -3069,7 +3062,6 @@ out: return (rv); } - /* * Tries to create a read- and/or execute-only 2MB page mapping. Returns true * if successful. Returns false if (1) a page table page cannot be allocated @@ -4914,7 +4906,6 @@ pmap_demote_l3e_locked(pmap_t pmap, pml3_entry_t *l3e, if ((oldpde & PG_MANAGED) != 0) pmap_pv_demote_l3e(pmap, va, oldpde & PG_PS_FRAME, lockp); - atomic_add_long(&pmap_l3e_demotions, 1); CTR2(KTR_PMAP, "pmap_demote_l3e: success for va %#lx" " in pmap %p", va, pmap); @@ -5000,7 +4991,6 @@ pmap_remove_l3e(pmap_t pmap, pml3_entry_t *pdq, vm_off return (pmap_unuse_pt(pmap, sva, *pmap_pml2e(pmap, sva), free)); } - /* * pmap_remove_pte: do the things to unmap a page in a process */ @@ -5103,7 +5093,6 @@ pmap_remove_ptes(pmap_t pmap, vm_offset_t sva, vm_offs return (anyvalid); } - void mmu_radix_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { @@ -5147,7 +5136,6 @@ mmu_radix_remove(pmap_t pmap, vm_offset_t sva, vm_offs lock = NULL; for (; sva < eva; sva = va_next) { - if (pmap->pm_stats.resident_count == 0) break; l1e = pmap_pml1e(pmap, sva); @@ -5683,9 +5671,6 @@ mmu_radix_zero_page_area(vm_page_t m, int off, int siz memset(addr + off, 0, size); } - - - static int mmu_radix_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t *locked_pa) { @@ -6272,7 +6257,6 @@ pmap_change_attr_locked(vm_offset_t va, vm_size_t size if (flush) pmap_invalidate_cache_range(base, tmpva); - } return (error); } @@ -6404,4 +6388,3 @@ DB_SHOW_COMMAND(pte, pmap_print_pte) } #endif - Modified: head/sys/powerpc/aim/moea64_native.c ============================================================================== --- head/sys/powerpc/aim/moea64_native.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/aim/moea64_native.c Tue Sep 1 21:20:08 2020 (r365073) @@ -282,7 +282,7 @@ moea64_pte_synch_native(struct pvo_entry *pvo) ptelo = be64toh(pt->pte_lo); rw_runlock(&moea64_eviction_lock); - + return (ptelo & (LPTE_REF | LPTE_CHG)); } Modified: head/sys/powerpc/aim/mp_cpudep.c ============================================================================== --- head/sys/powerpc/aim/mp_cpudep.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/aim/mp_cpudep.c Tue Sep 1 21:20:08 2020 (r365073) @@ -425,4 +425,3 @@ cpudep_ap_setup() break; } } - Modified: head/sys/powerpc/aim/slb.c ============================================================================== --- head/sys/powerpc/aim/slb.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/aim/slb.c Tue Sep 1 21:20:08 2020 (r365073) @@ -100,7 +100,6 @@ esid2idx(uint64_t esid, int level) #define uad_baseok(ua) \ (esid2base(ua->ua_base, ua->ua_level) == ua->ua_base) - static inline uint64_t esid2base(uint64_t esid, int level) { @@ -561,7 +560,7 @@ handle_kernel_slb_spill(int type, register_t dar, regi slbcache = PCPU_GET(aim.slb); esid = (uintptr_t)addr >> ADDR_SR_SHFT; slbe = (esid << SLBE_ESID_SHIFT) | SLBE_VALID; - + /* See if the hardware flushed this somehow (can happen in LPARs) */ for (i = 0; i < n_slbs; i++) if (slbcache[i].slbe == (slbe | (uint64_t)i)) Modified: head/sys/powerpc/amigaone/cpld_a1222.c ============================================================================== --- head/sys/powerpc/amigaone/cpld_a1222.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/amigaone/cpld_a1222.c Tue Sep 1 21:20:08 2020 (r365073) @@ -165,10 +165,10 @@ cpld_read_pair(struct cpld_softc *sc, int addr) KASSERT(addr <= 0xff, ("Invalid register-pair base address %x.", addr)); bus_write_1(sc->sc_mem, CPLD_MEM_ADDR_H, addr); tmp = bus_read_1(sc->sc_mem, CPLD_MEM_DATA) << 8; - + bus_write_1(sc->sc_mem, CPLD_MEM_ADDR_H, addr + 1); tmp |= bus_read_1(sc->sc_mem, CPLD_MEM_DATA); - + return (tmp); } @@ -317,7 +317,7 @@ cpld_send(device_t dev, struct cpld_cmd_data *d) if (d->cmd > USHRT_MAX) return (EINVAL); - + sc = device_get_softc(dev); mtx_lock(&sc->sc_mutex); Modified: head/sys/powerpc/amigaone/cpld_x5000.c ============================================================================== --- head/sys/powerpc/amigaone/cpld_x5000.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/amigaone/cpld_x5000.c Tue Sep 1 21:20:08 2020 (r365073) @@ -255,7 +255,7 @@ cpld_send(device_t dev, struct cpld_cmd_data *d) if (d->cmd > USHRT_MAX) return (EINVAL); - + sc = device_get_softc(dev); mtx_lock(&sc->sc_mutex); Modified: head/sys/powerpc/booke/booke_machdep.c ============================================================================== --- head/sys/powerpc/booke/booke_machdep.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/booke/booke_machdep.c Tue Sep 1 21:20:08 2020 (r365073) @@ -360,7 +360,7 @@ booke_init(u_long arg1, u_long arg2) * string 0x45504150 ('EPAP') in r6 (which has been lost by now). * r4 (arg2) is supposed to be set to zero, but is not always. */ - + if (arg1 == 0) /* Juniper loader */ mdp = (void *)arg2; else if (booke_check_for_fdt(arg1, &dtbp) == 0) { /* ePAPR */ @@ -471,4 +471,3 @@ kdb_cpu_set_singlestep(void) mtspr(SPR_DBCR0, r | DBCR0_IC | DBCR0_IDM); kdb_frame->srr1 |= PSL_DE; } - Modified: head/sys/powerpc/booke/platform_bare.c ============================================================================== --- head/sys/powerpc/booke/platform_bare.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/booke/platform_bare.c Tue Sep 1 21:20:08 2020 (r365073) @@ -159,4 +159,3 @@ bare_reset(platform_t plat) while (1) ; } - Modified: head/sys/powerpc/booke/pmap.c ============================================================================== --- head/sys/powerpc/booke/pmap.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/booke/pmap.c Tue Sep 1 21:20:08 2020 (r365073) @@ -354,7 +354,6 @@ static int mmu_booke_decode_kernel_ptr(vm_offset_t ad static void mmu_booke_page_array_startup(long); static boolean_t mmu_booke_page_is_mapped(vm_page_t m); - static struct pmap_funcs mmu_booke_methods = { /* pmap dispatcher interface */ .clear_modify = mmu_booke_clear_modify, @@ -475,7 +474,6 @@ tlb_miss_lock(void) STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) { if (pc != pcpup) { - CTR3(KTR_PMAP, "%s: tlb miss LOCK of CPU=%d, " "tlb_lock=%p", __func__, pc->pc_cpuid, pc->pc_booke.tlb_lock); @@ -561,7 +559,6 @@ pv_free(pv_entry_t pve) uma_zfree(pvzone, pve); } - /* Allocate and initialize pv_entry structure. */ static void pv_insert(pmap_t pmap, vm_offset_t va, vm_page_t m) @@ -842,7 +839,6 @@ mmu_booke_bootstrap(vm_offset_t start, vm_offset_t ker debugf("fill in phys_avail:\n"); for (i = 0, j = 0; i < availmem_regions_sz; i++, j += 2) { - debugf(" region: 0x%jx - 0x%jx (0x%jx)\n", (uintmax_t)availmem_regions[i].mr_start, (uintmax_t)availmem_regions[i].mr_start + @@ -930,7 +926,7 @@ mmu_booke_bootstrap(vm_offset_t start, vm_offset_t ker (uintmax_t)kstack0_phys, (uintmax_t)kstack0_phys + kstack0_sz); debugf("kstack0 at 0x%"PRI0ptrX" - 0x%"PRI0ptrX"\n", kstack0, kstack0 + kstack0_sz); - + virtual_avail += KSTACK_GUARD_PAGES * PAGE_SIZE + kstack0_sz; for (i = 0; i < kstack_pages; i++) { mmu_booke_kenter(kstack0, kstack0_phys); @@ -939,7 +935,7 @@ mmu_booke_bootstrap(vm_offset_t start, vm_offset_t ker } pmap_bootstrapped = 1; - + debugf("virtual_avail = %"PRI0ptrX"\n", virtual_avail); debugf("virtual_end = %"PRI0ptrX"\n", virtual_end); @@ -1034,7 +1030,7 @@ mmu_booke_kextract(vm_offset_t va) if (va >= VM_MIN_KERNEL_ADDRESS && va <= VM_MAX_KERNEL_ADDRESS) p = pte_vatopa(kernel_pmap, va); - + if (p == 0) { /* Check TLB1 mappings */ for (i = 0; i < TLB1_ENTRIES; i++) { @@ -1148,9 +1144,8 @@ mmu_booke_kenter_attr(vm_offset_t va, vm_paddr_t pa, v mtx_lock_spin(&tlbivax_mutex); tlb_miss_lock(); - + if (PTE_ISVALID(pte)) { - CTR1(KTR_PMAP, "%s: replacing entry!", __func__); /* Flush entry from TLB0 */ @@ -1188,7 +1183,6 @@ mmu_booke_kremove(vm_offset_t va) pte = pte_find(kernel_pmap, va); if (!PTE_ISVALID(pte)) { - CTR1(KTR_PMAP, "%s: invalid pte", __func__); return; @@ -1599,7 +1593,7 @@ mmu_booke_activate(struct thread *td) cpuid = PCPU_GET(cpuid); CPU_SET_ATOMIC(cpuid, &pmap->pm_active); PCPU_SET(curpmap, pmap); - + if (pmap->pm_tid[cpuid] == TID_NONE) tid_alloc(pmap); @@ -1624,7 +1618,7 @@ mmu_booke_deactivate(struct thread *td) pmap_t pmap; pmap = &td->td_proc->p_vmspace->vm_pmap; - + CTR5(KTR_PMAP, "%s: td=%p, proc = '%s', id = %d, pmap = 0x%"PRI0ptrX, __func__, td, td->td_proc->p_comm, td->td_proc->p_pid, pmap); @@ -2464,7 +2458,6 @@ tid_alloc(pmap_t pmap) /* If we are stealing TID then clear the relevant pmap's field */ if (tidbusy[thiscpu][tid] != NULL) { - CTR2(KTR_PMAP, "%s: warning: stealing tid %d", __func__, tid); tidbusy[thiscpu][tid]->pm_tid[thiscpu] = TID_NONE; @@ -2516,7 +2509,6 @@ tlb0_flush_entry(vm_offset_t va) CTR1(KTR_PMAP, "%s: e", __func__); } - /**************************************************************************/ /* TLB1 handling */ /**************************************************************************/ @@ -2890,7 +2882,7 @@ pmap_early_io_map(vm_paddr_t pa, vm_size_t size) tlb_entry_t e; KASSERT(!pmap_bootstrapped, ("Do not use after PMAP is up!")); - + for (i = 0; i < TLB1_ENTRIES; i++) { tlb1_read_entry(&e, i); if (!(e.mas1 & MAS1_VALID)) @@ -2943,7 +2935,6 @@ out: rw_wunlock(&pvh_global_lock); } - /* * Setup MAS4 defaults. * These values are loaded to MAS0-2 on a TLB miss. @@ -2963,7 +2954,6 @@ set_mas4_defaults(void) __asm __volatile("isync"); } - /* * Return 0 if the physical IO range is encompassed by one of the * the TLB1 entries, otherwise return related error code. @@ -3068,7 +3058,6 @@ DB_SHOW_COMMAND(tlb0, tlb0_print_tlbentries) printf("TLB0 entries:\n"); for (way = 0; way < TLB0_WAYS; way ++) for (entryidx = 0; entryidx < TLB0_ENTRIES_PER_WAY; entryidx++) { - mas0 = MAS0_TLBSEL(0) | MAS0_ESEL(way); mtspr(SPR_MAS0, mas0); @@ -3102,7 +3091,6 @@ DB_SHOW_COMMAND(tlb1, tlb1_print_tlbentries) printf("TLB1 entries:\n"); for (i = 0; i < TLB1_ENTRIES; i++) { - mas0 = MAS0_TLBSEL(1) | MAS0_ESEL(i); mtspr(SPR_MAS0, mas0); Modified: head/sys/powerpc/booke/pmap_32.c ============================================================================== --- head/sys/powerpc/booke/pmap_32.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/booke/pmap_32.c Tue Sep 1 21:20:08 2020 (r365073) @@ -162,7 +162,6 @@ static struct ptbl_buf *ptbl_bufs; /* Page table related */ /**************************************************************************/ - /* Initialize pool of kva ptbl buffers. */ static void ptbl_init(void) @@ -323,7 +322,7 @@ ptbl_free(pmap_t pmap, unsigned int pdir_idx) */ mtx_lock_spin(&tlbivax_mutex); tlb_miss_lock(); - + pmap->pm_pdir[pdir_idx] = NULL; tlb_miss_unlock(); @@ -458,7 +457,6 @@ pte_remove(pmap_t pmap, vm_offset_t va, uint8_t flags) /* Handle managed entry. */ if (PTE_ISMANAGED(pte)) { - if (PTE_ISMODIFIED(pte)) vm_page_dirty(m); @@ -553,7 +551,7 @@ pte_enter(pmap_t pmap, vm_page_t m, vm_offset_t va, ui } pmap->pm_stats.resident_count++; - + pte_tmp = PTE_RPN_FROM_PA(VM_PAGE_TO_PHYS(m)); pte_tmp |= (PTE_VALID | flags | PTE_PS_4KB); /* 4KB pages only */ @@ -735,7 +733,7 @@ mmu_booke_sync_icache(pmap_t pm, vm_offset_t va, vm_si vm_page_t m; vm_offset_t addr; int active; - + rw_wlock(&pvh_global_lock); pmap = PCPU_GET(curpmap); active = (pm == kernel_pmap || pm == pmap) ? 1 : 0; @@ -950,7 +948,6 @@ tid_flush(tlbtid_t tid) uint32_t mas0, mas1, mas2; int entry, way; - /* Don't evict kernel translations */ if (tid == TID_KERNEL) return; @@ -975,7 +972,6 @@ tid_flush(tlbtid_t tid) for (way = 0; way < TLB0_WAYS; way++) for (entry = 0; entry < TLB0_ENTRIES_PER_WAY; entry++) { - mas0 = MAS0_TLBSEL(0) | MAS0_ESEL(way); mtspr(SPR_MAS0, mas0); Modified: head/sys/powerpc/booke/pmap_64.c ============================================================================== --- head/sys/powerpc/booke/pmap_64.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/booke/pmap_64.c Tue Sep 1 21:20:08 2020 (r365073) @@ -408,7 +408,6 @@ pte_remove(pmap_t pmap, vm_offset_t va, u_int8_t flags /* Handle managed entry. */ if (PTE_ISMANAGED(pte)) { - /* Handle modified pages. */ if (PTE_ISMODIFIED(pte)) vm_page_dirty(m); @@ -519,7 +518,6 @@ pte_vatopa(pmap_t pmap, vm_offset_t va) return (pa); } - /* allocate pte entries to manage (addr & mask) to (addr & mask) + size */ static void kernel_pte_alloc(vm_offset_t data_end, vm_offset_t addr) @@ -590,7 +588,6 @@ mmu_booke_alloc_kernel_pgtables(vm_offset_t data_end) return (data_end); } - /* * Initialize a preallocated and zeroed pmap structure, * such as one in a vmspace structure. @@ -645,7 +642,7 @@ mmu_booke_sync_icache(pmap_t pm, vm_offset_t va, vm_si pte_t *pte; vm_paddr_t pa = 0; int sync_sz, valid; - + while (sz > 0) { PMAP_LOCK(pm); pte = pte_find(pm, va); Modified: head/sys/powerpc/booke/spe.c ============================================================================== --- head/sys/powerpc/booke/spe.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/booke/spe.c Tue Sep 1 21:20:08 2020 (r365073) @@ -197,7 +197,6 @@ save_vec_nodrop(struct thread *td) } } - #define SPE_INST_MASK 0x31f #define EADD 0x200 #define ESUB 0x201 @@ -485,7 +484,7 @@ spe_handle_fpdata(struct trapframe *frame) uint32_t msr; err = fueword32((void *)frame->srr0, &instr); - + if (err != 0) return; /* Fault. */; Modified: head/sys/powerpc/cpufreq/dfs.c ============================================================================== --- head/sys/powerpc/cpufreq/dfs.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/cpufreq/dfs.c Tue Sep 1 21:20:08 2020 (r365073) @@ -62,7 +62,6 @@ static device_method_t dfs_methods[] = { DEVMETHOD(cpufreq_drv_get, dfs_get), DEVMETHOD(cpufreq_drv_type, dfs_type), DEVMETHOD(cpufreq_drv_settings, dfs_settings), - {0, 0} }; @@ -170,7 +169,7 @@ static int dfs_set(device_t dev, const struct cf_setting *set) { register_t hid1; - + if (set == NULL) return (EINVAL); @@ -181,7 +180,7 @@ dfs_set(device_t dev, const struct cf_setting *set) hid1 |= HID1_DFS2; else if (set->freq == 2500) hid1 |= HID1_DFS4; - + /* * Now set the HID1 register with new values. Calling sequence * taken from page 2-26 of the MPC7450 family CPU manual. @@ -229,4 +228,3 @@ dfs_type(device_t dev, int *type) *type = CPUFREQ_TYPE_RELATIVE; return (0); } - Modified: head/sys/powerpc/cpufreq/mpc85xx_jog.c ============================================================================== --- head/sys/powerpc/cpufreq/mpc85xx_jog.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/cpufreq/mpc85xx_jog.c Tue Sep 1 21:20:08 2020 (r365073) @@ -88,7 +88,6 @@ static device_method_t mpc85xx_jog_methods[] = { DEVMETHOD(cpufreq_drv_get, mpc85xx_jog_get), DEVMETHOD(cpufreq_drv_type, mpc85xx_jog_type), DEVMETHOD(cpufreq_drv_settings, mpc85xx_jog_settings), - {0, 0} }; @@ -154,7 +153,7 @@ mpc85xx_jog_identify(driver_t *driver, device_t parent compat = mpc85xx_jog_devcompat(); if (compat == NULL) return; - + /* * We attach a child for every CPU since settings need to * be performed on every CPU in the SMP case. @@ -200,7 +199,7 @@ mpc85xx_jog_attach(device_t dev) OF_getencprop(cpu, "reg", &sc->cpu, sizeof(sc->cpu)); reg = ccsr_read4(GUTS_PORPLLSR); - + /* * Assume power-on PLL is the highest PLL config supported on the * board. @@ -290,7 +289,7 @@ mpc85xx_jog_set(device_t dev, const struct cf_setting { struct mpc85xx_jog_softc *sc; struct jog_rv_args args; - + if (set == NULL) return (EINVAL); @@ -323,7 +322,7 @@ mpc85xx_jog_get(device_t dev, struct cf_setting *set) freq = PMJCR_GET_CORE_MULT(pmjcr, sc->cpu); freq *= mpc85xx_get_system_clock(); freq /= MHZ; - + set->freq = freq; set->dev = dev; @@ -340,4 +339,3 @@ mpc85xx_jog_type(device_t dev, int *type) *type = CPUFREQ_TYPE_ABSOLUTE; return (0); } - Modified: head/sys/powerpc/cpufreq/pcr.c ============================================================================== --- head/sys/powerpc/cpufreq/pcr.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/cpufreq/pcr.c Tue Sep 1 21:20:08 2020 (r365073) @@ -65,7 +65,6 @@ static device_method_t pcr_methods[] = { DEVMETHOD(cpufreq_drv_get, pcr_get), DEVMETHOD(cpufreq_drv_type, pcr_type), DEVMETHOD(cpufreq_drv_settings, pcr_settings), - {0, 0} }; @@ -266,7 +265,7 @@ pcr_set(device_t dev, const struct cf_setting *set) struct pcr_softc *sc; register_t pcr, msr; uint64_t psr; - + if (set == NULL) return (EINVAL); sc = device_get_softc(dev); @@ -342,4 +341,3 @@ pcr_type(device_t dev, int *type) *type = CPUFREQ_TYPE_RELATIVE; return (0); } - Modified: head/sys/powerpc/cpufreq/pmcr.c ============================================================================== --- head/sys/powerpc/cpufreq/pmcr.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/cpufreq/pmcr.c Tue Sep 1 21:20:08 2020 (r365073) @@ -102,7 +102,6 @@ static device_method_t pmcr_methods[] = { DEVMETHOD(cpufreq_drv_get, pmcr_get), DEVMETHOD(cpufreq_drv_type, pmcr_type), DEVMETHOD(cpufreq_drv_settings, pmcr_settings), - {0, 0} }; @@ -186,7 +185,7 @@ static int pmcr_set(device_t dev, const struct cf_setting *set) { register_t pmcr; - + if (set == NULL) return (EINVAL); @@ -245,4 +244,3 @@ pmcr_type(device_t dev, int *type) *type = CPUFREQ_TYPE_ABSOLUTE; return (0); } - Modified: head/sys/powerpc/cpufreq/pmufreq.c ============================================================================== --- head/sys/powerpc/cpufreq/pmufreq.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/cpufreq/pmufreq.c Tue Sep 1 21:20:08 2020 (r365073) @@ -70,7 +70,6 @@ static device_method_t pmufreq_methods[] = { DEVMETHOD(cpufreq_drv_get, pmufreq_get), DEVMETHOD(cpufreq_drv_type, pmufreq_type), DEVMETHOD(cpufreq_drv_settings, pmufreq_settings), - {0, 0} }; @@ -220,4 +219,3 @@ pmufreq_type(device_t dev, int *type) *type = CPUFREQ_TYPE_ABSOLUTE; return (0); } - Modified: head/sys/powerpc/fpu/fpu_arith.h ============================================================================== --- head/sys/powerpc/fpu/fpu_arith.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/fpu/fpu_arith.h Tue Sep 1 21:20:08 2020 (r365073) @@ -57,7 +57,6 @@ * for example. */ - #ifndef FPE_USE_ASM /* set up for extended-precision arithemtic */ Modified: head/sys/powerpc/fpu/fpu_emu.c ============================================================================== --- head/sys/powerpc/fpu/fpu_emu.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/fpu/fpu_emu.c Tue Sep 1 21:20:08 2020 (r365073) @@ -179,7 +179,6 @@ fpu_dumpfpn(struct fpn *fp) #define NOTFPU 2 /* not an FPU instruction */ #define FAULT 3 - /* * Emulate a floating-point instruction. * Return zero for success, else signal number. @@ -208,7 +207,6 @@ fpu_emulate(struct trapframe *frame, struct fpu *fpf) DPRINTF(FPE_EX, ("fpu_emulate: emulating insn %x at %p\n", insn.i_int, (void *)frame->srr0)); - if ((insn.i_any.i_opcd == OPC_TWI) || ((insn.i_any.i_opcd == OPC_integer_31) && (insn.i_x.i_xo == OPC31_TW))) { @@ -314,7 +312,6 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, un cond = 0; /* ld/st never set condition codes */ - if (instr.i_any.i_opcd == OPC_integer_31) { if (instr.i_x.i_xo == OPC31_STFIWX) { FPU_EMU_EVCNT_INCR(stfiwx); @@ -427,15 +424,12 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, un #endif } else if (instr.i_any.i_opcd == OPC_sp_fp_59 || instr.i_any.i_opcd == OPC_dp_fp_63) { - - if (instr.i_any.i_opcd == OPC_dp_fp_63 && !(instr.i_a.i_xo & OPC63M_MASK)) { /* Format X */ rt = instr.i_x.i_rt; ra = instr.i_x.i_ra; rb = instr.i_x.i_rb; - /* One of the special opcodes.... */ switch (instr.i_x.i_xo) { Modified: head/sys/powerpc/fpu/fpu_explode.c ============================================================================== --- head/sys/powerpc/fpu/fpu_explode.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/fpu/fpu_explode.c Tue Sep 1 21:20:08 2020 (r365073) @@ -220,7 +220,6 @@ fpu_explode(struct fpemu *fe, struct fpn *fp, int type fp->fp_sign = s >> 31; fp->fp_sticky = 0; switch (type) { - case FTYPE_LNG: s = fpu_xtof(fp, l); break; Modified: head/sys/powerpc/fpu/fpu_extern.h ============================================================================== --- head/sys/powerpc/fpu/fpu_extern.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/fpu/fpu_extern.h Tue Sep 1 21:20:08 2020 (r365073) @@ -54,4 +54,3 @@ u_int fpu_ftoi(struct fpemu *, struct fpn *); u_int fpu_ftox(struct fpemu *, struct fpn *, u_int *); u_int fpu_ftos(struct fpemu *, struct fpn *); u_int fpu_ftod(struct fpemu *, struct fpn *, u_int *); - Modified: head/sys/powerpc/fpu/fpu_implode.c ============================================================================== --- head/sys/powerpc/fpu/fpu_implode.c Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/fpu/fpu_implode.c Tue Sep 1 21:20:08 2020 (r365073) @@ -105,7 +105,6 @@ round(struct fpemu *fe, struct fpn *fp) /* Go to rounddown to round down; break to round up. */ switch ((fe->fe_fpscr) & FPSCR_RN) { - case FP_RN: default: /* @@ -169,7 +168,6 @@ toinf(struct fpemu *fe, int sign) /* look at rounding direction */ switch ((fe->fe_fpscr) & FPSCR_RN) { - default: case FP_RN: /* the nearest value is always Inf */ inf = 1; @@ -206,7 +204,6 @@ fpu_ftoi(struct fpemu *fe, struct fpn *fp) sign = fp->fp_sign; switch (fp->fp_class) { - case FPC_ZERO: return (0); @@ -253,7 +250,6 @@ fpu_ftox(struct fpemu *fe, struct fpn *fp, u_int *res) sign = fp->fp_sign; switch (fp->fp_class) { - case FPC_ZERO: res[1] = 0; return (0); @@ -432,7 +428,6 @@ fpu_implode(struct fpemu *fe, struct fpn *fp, int type { switch (type) { - case FTYPE_LNG: space[0] = fpu_ftox(fe, fp, space); DPRINTF(FPE_REG, ("fpu_implode: long %x %x\n", Modified: head/sys/powerpc/fpu/fpu_instr.h ============================================================================== --- head/sys/powerpc/fpu/fpu_instr.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/fpu/fpu_instr.h Tue Sep 1 21:20:08 2020 (r365073) @@ -48,7 +48,7 @@ */ union instr { int i_int; /* as a whole */ - + /* * Any instruction type. */ @@ -156,7 +156,6 @@ union instr { u_int i_rc:1; } i_mds; - /* * Format S */ @@ -385,4 +384,3 @@ union instr { #define FTYPE_INT 0 /* data = 32-bit signed integer */ #define FTYPE_SNG 1 /* data = 32-bit float */ #define FTYPE_DBL 2 /* data = 64-bit double */ - Modified: head/sys/powerpc/include/altivec.h ============================================================================== --- head/sys/powerpc/include/altivec.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/altivec.h Tue Sep 1 21:20:08 2020 (r365073) @@ -39,4 +39,3 @@ void save_vec(struct thread *); void save_vec_nodrop(struct thread *); #endif /* _MACHINE_ALTIVEC_H_ */ - Modified: head/sys/powerpc/include/atomic.h ============================================================================== --- head/sys/powerpc/include/atomic.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/atomic.h Tue Sep 1 21:20:08 2020 (r365073) @@ -228,7 +228,6 @@ _ATOMIC_ADD(long) } \ /* _ATOMIC_CLEAR */ - _ATOMIC_CLEAR(int) _ATOMIC_CLEAR(long) @@ -725,7 +724,6 @@ atomic_cmpset_long(volatile u_long* p, u_long cmpval, ATOMIC_CMPSET_ACQ_REL(int); ATOMIC_CMPSET_ACQ_REL(long); - #ifdef ISA_206_ATOMICS #define atomic_cmpset_8 atomic_cmpset_char Modified: head/sys/powerpc/include/bat.h ============================================================================== --- head/sys/powerpc/include/bat.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/bat.h Tue Sep 1 21:20:08 2020 (r365073) @@ -113,7 +113,6 @@ struct bat { #define BATL(pa, wimg, pp) \ (((pa) & BAT_PBS) | (wimg) | (pp)) - /* Lower BAT bits (PowerPC 601): */ #define BAT601_PBN 0xfffe0000 /* physical block number */ #define BAT601_V 0x00000040 /* valid */ Modified: head/sys/powerpc/include/cpufunc.h ============================================================================== --- head/sys/powerpc/include/cpufunc.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/cpufunc.h Tue Sep 1 21:20:08 2020 (r365073) @@ -108,7 +108,6 @@ mfctrl(void) return (value); } - static __inline void mtdec(register_t value) { Modified: head/sys/powerpc/include/mmuvar.h ============================================================================== --- head/sys/powerpc/include/mmuvar.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/mmuvar.h Tue Sep 1 21:20:08 2020 (r365073) @@ -200,7 +200,6 @@ extern mmu_t mmu_obj; } while (mmu != NULL); \ f;}) - #define MMU_DEF(name, ident, methods) \ \ const struct mmu_kobj name = { \ Modified: head/sys/powerpc/include/openpicreg.h ============================================================================== --- head/sys/powerpc/include/openpicreg.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/openpicreg.h Tue Sep 1 21:20:08 2020 (r365073) @@ -140,4 +140,3 @@ #define OPENPIC_PCPU_EOI(cpu) \ (OPENPIC_PCPU_BASE(cpu) + OPENPIC_EOI) - Modified: head/sys/powerpc/include/openpicvar.h ============================================================================== --- head/sys/powerpc/include/openpicvar.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/openpicvar.h Tue Sep 1 21:20:08 2020 (r365073) @@ -66,7 +66,7 @@ struct openpic_softc { uint32_t sc_saved_prios[4]; struct openpic_timer sc_saved_timers[OPENPIC_TIMERS]; uint32_t sc_saved_vectors[OPENPIC_SRC_VECTOR_COUNT]; - + }; extern devclass_t openpic_devclass; Modified: head/sys/powerpc/include/pcb.h ============================================================================== --- head/sys/powerpc/include/pcb.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/pcb.h Tue Sep 1 21:20:08 2020 (r365073) @@ -82,7 +82,7 @@ struct pcb { uint64_t texasr; uint64_t tfiar; } pcb_htm; - + struct ebb { uint64_t ebbhr; uint64_t ebbrr; Modified: head/sys/powerpc/include/pio.h ============================================================================== --- head/sys/powerpc/include/pio.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/pio.h Tue Sep 1 21:20:08 2020 (r365073) @@ -178,7 +178,6 @@ __inlrb(volatile u_int32_t *a) #define inlrb(a) (__inlrb((volatile u_int32_t *)(a))) #define in32rb(a) inlrb(a) - static __inline void __outsb(volatile u_int8_t *a, const u_int8_t *s, size_t c) { Modified: head/sys/powerpc/include/pmap.h ============================================================================== --- head/sys/powerpc/include/pmap.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/pmap.h Tue Sep 1 21:20:08 2020 (r365073) @@ -80,7 +80,6 @@ #include #endif - /* * The radix page table structure is described by levels 1-4. * See Fig 33. on p. 1002 of Power ISA v3.0B Modified: head/sys/powerpc/include/rtas.h ============================================================================== --- head/sys/powerpc/include/rtas.h Tue Sep 1 21:19:39 2020 (r365072) +++ head/sys/powerpc/include/rtas.h Tue Sep 1 21:20:08 2020 (r365073) @@ -60,4 +60,3 @@ cell_t rtas_token_lookup(const char *method); #define RTAS_VENDOR_ERROR_BEGIN -9004 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:20:50 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B3243792EC; Tue, 1 Sep 2020 21:20:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Nf1C8sz4J9B; Tue, 1 Sep 2020 21:20:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0D6931F866; Tue, 1 Sep 2020 21:20:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LKn8D019204; Tue, 1 Sep 2020 21:20:49 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LKk9R019184; Tue, 1 Sep 2020 21:20:46 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012120.081LKk9R019184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:20:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365074 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 365074 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:20:50 -0000 Author: mjg Date: Tue Sep 1 21:20:45 2020 New Revision: 365074 URL: https://svnweb.freebsd.org/changeset/base/365074 Log: vm: clean up empty lines in .c and .h files Modified: head/sys/vm/default_pager.c head/sys/vm/memguard.c head/sys/vm/redzone.c head/sys/vm/sg_pager.c head/sys/vm/swap_pager.c head/sys/vm/uma.h head/sys/vm/uma_core.c head/sys/vm/uma_int.h head/sys/vm/vm.h head/sys/vm/vm_fault.c head/sys/vm/vm_map.c head/sys/vm/vm_meter.c head/sys/vm/vm_mmap.c head/sys/vm/vm_object.c head/sys/vm/vm_pager.h head/sys/vm/vm_phys.h head/sys/vm/vm_radix.c head/sys/vm/vnode_pager.c Modified: head/sys/vm/default_pager.c ============================================================================== --- head/sys/vm/default_pager.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/default_pager.c Tue Sep 1 21:20:45 2020 (r365074) @@ -154,4 +154,3 @@ default_pager_haspage(vm_object_t object, vm_pindex_t /* An OBJT_DEFAULT object has no backing store. */ return (FALSE); } - Modified: head/sys/vm/memguard.c ============================================================================== --- head/sys/vm/memguard.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/memguard.c Tue Sep 1 21:20:45 2020 (r365074) @@ -158,7 +158,6 @@ SYSCTL_UINT(_vm_memguard, OID_AUTO, frequency, CTLFLAG SYSCTL_ULONG(_vm_memguard, OID_AUTO, frequency_hits, CTLFLAG_RD, &memguard_frequency_hits, 0, "# times MemGuard randomly chose"); - /* * Return a fudged value to be used for vm_kmem_size for allocating * the kernel_arena. Modified: head/sys/vm/redzone.c ============================================================================== --- head/sys/vm/redzone.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/redzone.c Tue Sep 1 21:20:45 2020 (r365074) @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include - static SYSCTL_NODE(_vm, OID_AUTO, redzone, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, "RedZone data"); static u_long redzone_extra_mem = 0; Modified: head/sys/vm/sg_pager.c ============================================================================== --- head/sys/vm/sg_pager.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/sg_pager.c Tue Sep 1 21:20:45 2020 (r365074) @@ -134,7 +134,7 @@ sg_pager_dealloc(vm_object_t object) TAILQ_REMOVE(&object->un_pager.sgp.sgp_pglist, m, plinks.q); vm_page_putfake(m); } - + sg = object->handle; sglist_free(sg); object->handle = NULL; Modified: head/sys/vm/swap_pager.c ============================================================================== --- head/sys/vm/swap_pager.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/swap_pager.c Tue Sep 1 21:20:45 2020 (r365074) @@ -865,7 +865,6 @@ swp_pager_strategy(struct buf *bp) panic("Swapdev not found"); } - /* * SWP_PAGER_FREESWAPSPACE() - free raw swap space * @@ -2744,7 +2743,6 @@ static struct g_class g_swap_class = { DECLARE_GEOM_CLASS(g_swap_class, g_class); - static void swapgeom_close_ev(void *arg, int flags) { @@ -3007,7 +3005,6 @@ swapdev_close(struct thread *td, struct swdevt *sp) VOP_CLOSE(sp->sw_vp, FREAD | FWRITE, td->td_ucred, td); vrele(sp->sw_vp); } - static int swaponvp(struct thread *td, struct vnode *vp, u_long nblks) Modified: head/sys/vm/uma.h ============================================================================== --- head/sys/vm/uma.h Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/uma.h Tue Sep 1 21:20:45 2020 (r365074) @@ -154,7 +154,6 @@ typedef void (*uma_release)(void *arg, void **store, i * */ - /* Function proto types */ /* Modified: head/sys/vm/uma_core.c ============================================================================== --- head/sys/vm/uma_core.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/uma_core.c Tue Sep 1 21:20:45 2020 (r365074) @@ -1892,7 +1892,6 @@ pcpu_page_free(void *mem, vm_size_t size, uint8_t flag kva_free(sva, size); } - /* * Zero fill initializer * @@ -4975,7 +4974,6 @@ uma_vm_zone_stats(struct uma_type_header *uth, uma_zon uma_zone_domain_t zdom; uma_cache_t cache; int i; - for (i = 0; i < vm_ndomains; i++) { zdom = ZDOM_GET(z, i); Modified: head/sys/vm/uma_int.h ============================================================================== --- head/sys/vm/uma_int.h Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/uma_int.h Tue Sep 1 21:20:45 2020 (r365074) @@ -307,14 +307,14 @@ cache_uz_flags(uma_cache_t cache) return (cache->uc_freebucket.ucb_spare); } - + static inline uint32_t cache_uz_size(uma_cache_t cache) { return (cache->uc_allocbucket.ucb_spare); } - + /* * Per-domain slab lists. Embedded in the kegs. */ Modified: head/sys/vm/vm.h ============================================================================== --- head/sys/vm/vm.h Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vm.h Tue Sep 1 21:20:45 2020 (r365074) @@ -163,4 +163,3 @@ void swapper(void); #endif #endif /* VM_H */ - Modified: head/sys/vm/vm_fault.c ============================================================================== --- head/sys/vm/vm_fault.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vm_fault.c Tue Sep 1 21:20:45 2020 (r365074) @@ -872,7 +872,6 @@ vm_fault_cow(struct faultstate *fs) (is_first_object_locked = VM_OBJECT_TRYWLOCK(fs->first_object)) && fs->object == fs->first_object->backing_object && VM_OBJECT_TRYWLOCK(fs->object)) { - /* * Remove but keep xbusy for replace. fs->m is moved into * fs->first_object and left busy while fs->first_m is @@ -1010,7 +1009,6 @@ vm_fault_allocate(struct faultstate *fs) struct domainset *dset; int alloc_req; int rv; - if ((fs->object->flags & OBJ_SIZEVNLOCK) != 0) { rv = vm_fault_lock_vnode(fs, true); Modified: head/sys/vm/vm_map.c ============================================================================== --- head/sys/vm/vm_map.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vm_map.c Tue Sep 1 21:20:45 2020 (r365074) @@ -2940,7 +2940,6 @@ vm_map_madvise( return (0); } - /* * vm_map_inherit: * @@ -3235,7 +3234,6 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset return (rv); } - /* * vm_map_wire_locked: * @@ -3823,7 +3821,6 @@ vm_map_check_protection(vm_map_t map, vm_offset_t star } return (TRUE); } - /* * Modified: head/sys/vm/vm_meter.c ============================================================================== --- head/sys/vm/vm_meter.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vm_meter.c Tue Sep 1 21:20:45 2020 (r365074) @@ -124,7 +124,7 @@ SYSCTL_UINT(_vm, OID_AUTO, v_free_severe, static int sysctl_vm_loadavg(SYSCTL_HANDLER_ARGS) { - + #ifdef SCTL_MASK32 u_int32_t la[4]; Modified: head/sys/vm/vm_mmap.c ============================================================================== --- head/sys/vm/vm_mmap.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vm_mmap.c Tue Sep 1 21:20:45 2020 (r365074) @@ -148,7 +148,6 @@ ogetpagesize(struct thread *td, struct ogetpagesize_ar } #endif /* COMPAT_43 */ - /* * Memory Map (mmap) system call. Note that the file offset * and address are allowed to be NOT page aligned, though if @@ -257,7 +256,7 @@ kern_mmap_req(struct thread *td, const struct mmap_req * Ignore old flags that used to be defined but did not do anything. */ flags &= ~(MAP_RESERVED0020 | MAP_RESERVED0040); - + /* * Enforce the constraints. * Mapping of length 0 is only allowed for old binaries. @@ -498,7 +497,6 @@ ommap(struct thread *td, struct ommap_args *uap) } #endif /* COMPAT_43 */ - #ifndef _SYS_SYSPROTO_H_ struct msync_args { void *addr; @@ -846,7 +844,6 @@ RestartScan: */ lastvecindex = -1; while (entry->start < end) { - /* * check for contiguity */ Modified: head/sys/vm/vm_object.c ============================================================================== --- head/sys/vm/vm_object.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vm_object.c Tue Sep 1 21:20:45 2020 (r365074) @@ -278,7 +278,7 @@ vm_object_init(void) { TAILQ_INIT(&vm_object_list); mtx_init(&vm_object_list_mtx, "vm object_list", NULL, MTX_DEF); - + rw_init(&kernel_object->lock, "kernel vm object"); _vm_object_allocate(OBJT_PHYS, atop(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS), OBJ_UNMANAGED, kernel_object, NULL); @@ -556,7 +556,6 @@ vm_object_deallocate_vnode(vm_object_t object) vrele(vp); } - /* * We dropped a reference on an object and discovered that it had a * single remaining shadow. This is a sibling of the reference we @@ -2269,7 +2268,6 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset * Account for the charge. */ if (prev_object->cred != NULL) { - /* * If prev_object was charged, then this mapping, * although not charged now, may become writable @@ -2434,7 +2432,6 @@ vm_object_vnode(vm_object_t object) } return (vp); } - /* * Busy the vm object. This prevents new pages belonging to the object from Modified: head/sys/vm/vm_pager.h ============================================================================== --- head/sys/vm/vm_pager.h Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vm_pager.h Tue Sep 1 21:20:45 2020 (r365074) @@ -130,7 +130,6 @@ vm_pager_put_pages( int flags, int *rtvals ) { - VM_OBJECT_ASSERT_WLOCKED(object); (*pagertab[object->type]->pgo_putpages) (object, m, count, flags, rtvals); @@ -172,7 +171,6 @@ vm_pager_populate(vm_object_t object, vm_pindex_t pidx return ((*pagertab[object->type]->pgo_populate)(object, pidx, fault_type, max_prot, first, last)); } - /* * vm_pager_page_unswapped Modified: head/sys/vm/vm_phys.h ============================================================================== --- head/sys/vm/vm_phys.h Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vm_phys.h Tue Sep 1 21:20:45 2020 (r365074) @@ -109,7 +109,6 @@ void vm_phys_early_startup(void); int vm_phys_avail_largest(void); vm_paddr_t vm_phys_avail_size(int i); - /* * * vm_phys_domain: Modified: head/sys/vm/vm_radix.c ============================================================================== --- head/sys/vm/vm_radix.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vm_radix.c Tue Sep 1 21:20:45 2020 (r365074) @@ -217,7 +217,6 @@ vm_radix_node_store(smrnode_t *p, struct vm_radix_node enum vm_radix_access access) { - switch (access) { case UNSERIALIZED: smr_unserialized_store(p, v, true); Modified: head/sys/vm/vnode_pager.c ============================================================================== --- head/sys/vm/vnode_pager.c Tue Sep 1 21:20:08 2020 (r365073) +++ head/sys/vm/vnode_pager.c Tue Sep 1 21:20:45 2020 (r365074) @@ -228,7 +228,6 @@ vnode_destroy_vobject(struct vnode *vp) KASSERT(vp->v_object == NULL, ("vp %p obj %p", vp, vp->v_object)); } - /* * Allocate (or lookup) pager for a vnode. * Handle is a vnode pointer. From owner-svn-src-all@freebsd.org Tue Sep 1 21:21:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 48C6D37950F; Tue, 1 Sep 2020 21:21:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Nx1HVfz4JDP; Tue, 1 Sep 2020 21:21:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0F88B1F752; Tue, 1 Sep 2020 21:21:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LL40d020007; Tue, 1 Sep 2020 21:21:04 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LL3Oh019998; Tue, 1 Sep 2020 21:21:03 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012121.081LL3Oh019998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:21:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365075 - in head/sys/riscv: include riscv X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/riscv: include riscv X-SVN-Commit-Revision: 365075 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:21:05 -0000 Author: mjg Date: Tue Sep 1 21:21:03 2020 New Revision: 365075 URL: https://svnweb.freebsd.org/changeset/base/365075 Log: riscv: clean up empty lines in .c and .h files Modified: head/sys/riscv/include/atomic.h head/sys/riscv/include/bus.h head/sys/riscv/riscv/busdma_bounce.c head/sys/riscv/riscv/identcpu.c head/sys/riscv/riscv/mem.c head/sys/riscv/riscv/nexus.c head/sys/riscv/riscv/pmap.c head/sys/riscv/riscv/sbi.c Modified: head/sys/riscv/include/atomic.h ============================================================================== --- head/sys/riscv/include/atomic.h Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/include/atomic.h Tue Sep 1 21:21:03 2020 (r365075) @@ -117,7 +117,6 @@ ATOMIC_FCMPSET_ACQ_REL(16); #define atomic_fcmpset_acq_char atomic_fcmpset_acq_8 #define atomic_fcmpset_rel_char atomic_fcmpset_rel_8 - #define atomic_cmpset_short atomic_cmpset_16 #define atomic_cmpset_acq_short atomic_cmpset_acq_16 #define atomic_cmpset_rel_short atomic_cmpset_rel_16 Modified: head/sys/riscv/include/bus.h ============================================================================== --- head/sys/riscv/include/bus.h Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/include/bus.h Tue Sep 1 21:21:03 2020 (r365075) @@ -89,7 +89,6 @@ #define BUS_SPACE_BARRIER_READ 0x01 #define BUS_SPACE_BARRIER_WRITE 0x02 - struct bus_space { /* cookie */ void *bs_cookie; @@ -256,7 +255,6 @@ struct bus_space { bus_size_t, const u_int64_t *, bus_size_t); }; - /* * Utility macros; INTERNAL USE ONLY. */ @@ -282,7 +280,6 @@ struct bus_space { #define __bs_nonsingle_s(type, sz, t, h, o, a, c) \ (*(t)->__bs_opname_s(type,sz))((t)->bs_cookie, h, o, a, c) - /* * Mapping and unmapping operations. */ @@ -293,7 +290,6 @@ struct bus_space { #define bus_space_subregion(t, h, o, s, hp) \ (*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp)) - /* * Allocation and deallocation operations. */ @@ -309,8 +305,6 @@ struct bus_space { #define bus_space_barrier(t, h, o, l, f) \ (*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f)) - - /* * Bus read (single) operations. */ @@ -345,7 +339,6 @@ struct bus_space { #define bus_space_read_multi_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(rm,8,(t),(h),(o),(a),(c)) - /* * Bus read region operations. */ @@ -367,7 +360,6 @@ struct bus_space { #define bus_space_read_region_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(rr,8,(t),(h),(o),(a),(c)) - /* * Bus write (single) operations. */ @@ -381,7 +373,6 @@ struct bus_space { #define bus_space_write_stream_4(t, h, o, v) __bs_ws_s(4,(t),(h),(o),(v)) #define bus_space_write_stream_8(t, h, o, v) __bs_ws_s(8,(t),(h),(o),(v)) - /* * Bus write multiple operations. */ @@ -403,7 +394,6 @@ struct bus_space { #define bus_space_write_multi_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(wm,8,(t),(h),(o),(a),(c)) - /* * Bus write region operations. */ @@ -425,7 +415,6 @@ struct bus_space { #define bus_space_write_region_stream_8(t, h, o, a, c) \ __bs_nonsingle_s(wr,8,(t),(h),(o),(a),(c)) - /* * Set multiple operations. */ @@ -438,7 +427,6 @@ struct bus_space { #define bus_space_set_multi_8(t, h, o, v, c) \ __bs_set(sm,8,(t),(h),(o),(v),(c)) - /* * Set region operations. */ @@ -450,7 +438,6 @@ struct bus_space { __bs_set(sr,4,(t),(h),(o),(v),(c)) #define bus_space_set_region_8(t, h, o, v, c) \ __bs_set(sr,8,(t),(h),(o),(v),(c)) - /* * Copy operations. Modified: head/sys/riscv/riscv/busdma_bounce.c ============================================================================== --- head/sys/riscv/riscv/busdma_bounce.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/busdma_bounce.c Tue Sep 1 21:21:03 2020 (r365075) @@ -400,7 +400,6 @@ bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmam return (0); } - /* * Allocate a piece of memory that can be efficiently mapped into * bus device space based on the constraints lited in the dma tag. @@ -813,7 +812,6 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_ if (map->sync_count == 0 || (kvaddr != 0 && kvaddr != sl_vend) || (curaddr != sl_pend)) { - if (++map->sync_count > dmat->common.nsegments) goto cleanup; sl++; Modified: head/sys/riscv/riscv/identcpu.c ============================================================================== --- head/sys/riscv/riscv/identcpu.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/identcpu.c Tue Sep 1 21:21:03 2020 (r365075) @@ -173,7 +173,6 @@ fill_elf_hwcap(void *dummy __unused) elf_hwcap &= hwcap; else elf_hwcap = hwcap; - } } Modified: head/sys/riscv/riscv/mem.c ============================================================================== --- head/sys/riscv/riscv/mem.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/mem.c Tue Sep 1 21:21:03 2020 (r365075) @@ -121,4 +121,3 @@ memrw(struct cdev *dev, struct uio *uio, int flags) return (error); } - Modified: head/sys/riscv/riscv/nexus.c ============================================================================== --- head/sys/riscv/riscv/nexus.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/nexus.c Tue Sep 1 21:21:03 2020 (r365075) @@ -117,7 +117,6 @@ static device_method_t nexus_methods[] = { DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_setup_intr, nexus_setup_intr), DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), - { 0, 0 } }; @@ -193,7 +192,6 @@ nexus_add_child(device_t bus, u_int order, const char return (child); } - /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. @@ -348,7 +346,6 @@ nexus_set_resource(device_t dev, device_t child, int t return(0); } - static int nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, Modified: head/sys/riscv/riscv/pmap.c ============================================================================== --- head/sys/riscv/riscv/pmap.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/pmap.c Tue Sep 1 21:21:03 2020 (r365075) @@ -543,7 +543,6 @@ pmap_bootstrap_l3(vm_offset_t l1pt, vm_offset_t va, vm l3pt += PAGE_SIZE; } - /* Clean the L2 page table */ memset((void *)l3_start, 0, l3pt - l3_start); @@ -641,7 +640,7 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, virtual_avail = roundup2(freemempos, L2_SIZE); virtual_end = VM_MAX_KERNEL_ADDRESS - L2_SIZE; kernel_vm_end = virtual_avail; - + pa = pmap_early_vtophys(l1pt, freemempos); physmem_exclude_region(kernstart, pa - kernstart, EXFLAG_NOALLOC); @@ -986,7 +985,6 @@ pmap_map(vm_offset_t *virt, vm_paddr_t start, vm_paddr return PHYS_TO_DMAP(start); } - /* * Add a list of wired pages to the kva * this routine is only used for temporary @@ -1100,7 +1098,7 @@ pmap_remove_pt_page(pmap_t pmap, vm_offset_t va) PMAP_LOCK_ASSERT(pmap, MA_OWNED); return (vm_radix_remove(&pmap->pm_root, pmap_l2_pindex(va))); } - + /* * Decrements a page table page's reference count, which is used to record the * number of valid page table entries within the page. If the reference count @@ -1381,7 +1379,6 @@ retry: return (m); } - /*************************************************** * Pmap allocation/deallocation routines. ***************************************************/ @@ -1506,7 +1503,6 @@ pmap_growkernel(vm_offset_t addr) } } } - /*************************************************** * page management routines. Modified: head/sys/riscv/riscv/sbi.c ============================================================================== --- head/sys/riscv/riscv/sbi.c Tue Sep 1 21:20:45 2020 (r365074) +++ head/sys/riscv/riscv/sbi.c Tue Sep 1 21:21:03 2020 (r365075) @@ -70,7 +70,6 @@ sbi_get_mvendorid(void) return (SBI_CALL0(SBI_EXT_ID_BASE, SBI_BASE_GET_MVENDORID)); } - static struct sbi_ret sbi_get_marchid(void) { From owner-svn-src-all@freebsd.org Tue Sep 1 21:21:29 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E2C6D37965A; Tue, 1 Sep 2020 21:21:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0PP50Ndz4JFF; Tue, 1 Sep 2020 21:21:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8FDD41FC9F; Tue, 1 Sep 2020 21:21:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LLTq0020118; Tue, 1 Sep 2020 21:21:29 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LLJDT020062; Tue, 1 Sep 2020 21:21:19 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012121.081LLJDT020062@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:21:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365076 - in head/sys/mips: atheros atheros/ar531x beri broadcom cavium cavium/cryptocteon cavium/octe cavium/usb include ingenic malta mediatek mips nlm nlm/dev/net nlm/dev/net/ucore n... X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/mips: atheros atheros/ar531x beri broadcom cavium cavium/cryptocteon cavium/octe cavium/usb include ingenic malta mediatek mips nlm nlm/dev/net nlm/dev/net/ucore nlm/dev/sec nlm/hal X-SVN-Commit-Revision: 365076 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:21:30 -0000 Author: mjg Date: Tue Sep 1 21:21:19 2020 New Revision: 365076 URL: https://svnweb.freebsd.org/changeset/base/365076 Log: mips: clean up empty lines in .c and .h files Modified: head/sys/mips/atheros/apb.c head/sys/mips/atheros/ar531x/apb.c head/sys/mips/atheros/ar531x/ar5312_chip.c head/sys/mips/atheros/ar531x/ar5315_chip.c head/sys/mips/atheros/ar531x/ar5315_cpudef.h head/sys/mips/atheros/ar531x/ar5315_gpio.c head/sys/mips/atheros/ar531x/ar5315_machdep.c head/sys/mips/atheros/ar531x/ar5315_setup.c head/sys/mips/atheros/ar531x/ar5315_wdog.c head/sys/mips/atheros/ar531x/ar5315reg.h head/sys/mips/atheros/ar531x/if_are.c head/sys/mips/atheros/ar531x/if_arereg.h head/sys/mips/atheros/ar71xx_cpudef.h head/sys/mips/atheros/ar71xx_gpio.c head/sys/mips/atheros/ar71xx_ohci.c head/sys/mips/atheros/ar71xx_pci.c head/sys/mips/atheros/ar71xx_pci_bus_space.c head/sys/mips/atheros/ar71xx_setup.c head/sys/mips/atheros/ar71xx_spi.c head/sys/mips/atheros/ar71xx_wdog.c head/sys/mips/atheros/ar724x_pci.c head/sys/mips/atheros/ar933x_chip.c head/sys/mips/atheros/ar934x_chip.c head/sys/mips/atheros/if_arge.c head/sys/mips/atheros/if_argevar.h head/sys/mips/atheros/pcf2123reg.h head/sys/mips/atheros/qca955xreg.h head/sys/mips/atheros/uart_dev_ar933x.c head/sys/mips/beri/beri_iommu.c head/sys/mips/beri/beri_machdep.c head/sys/mips/beri/beri_mp.c head/sys/mips/broadcom/bcm_bmips.c head/sys/mips/broadcom/bcm_bmips_exts.h head/sys/mips/broadcom/bcm_mips.c head/sys/mips/broadcom/bcm_mips74k.c head/sys/mips/broadcom/bcm_mips74kreg.h head/sys/mips/broadcom/bcm_mipsvar.h head/sys/mips/broadcom/bcm_nvram_cfe.c head/sys/mips/broadcom/bcm_pmu.c head/sys/mips/broadcom/bhnd_nexus.c head/sys/mips/broadcom/uart_bus_chipc.c head/sys/mips/cavium/ciu.c head/sys/mips/cavium/cryptocteon/cavium_crypto.c head/sys/mips/cavium/cryptocteon/cryptocteon.c head/sys/mips/cavium/if_octm.c head/sys/mips/cavium/obio.c head/sys/mips/cavium/obiovar.h head/sys/mips/cavium/octe/cavium-ethernet.h head/sys/mips/cavium/octe/ethernet-common.c head/sys/mips/cavium/octe/ethernet-common.h head/sys/mips/cavium/octe/ethernet-defines.h head/sys/mips/cavium/octe/ethernet-headers.h head/sys/mips/cavium/octe/ethernet-mdio.c head/sys/mips/cavium/octe/ethernet-mdio.h head/sys/mips/cavium/octe/ethernet-mem.c head/sys/mips/cavium/octe/ethernet-mem.h head/sys/mips/cavium/octe/ethernet-rgmii.c head/sys/mips/cavium/octe/ethernet-rx.c head/sys/mips/cavium/octe/ethernet-rx.h head/sys/mips/cavium/octe/ethernet-sgmii.c head/sys/mips/cavium/octe/ethernet-spi.c head/sys/mips/cavium/octe/ethernet-tx.c head/sys/mips/cavium/octe/ethernet-tx.h head/sys/mips/cavium/octe/ethernet-util.h head/sys/mips/cavium/octe/ethernet-xaui.c head/sys/mips/cavium/octe/ethernet.c head/sys/mips/cavium/octe/mv88e61xxphy.c head/sys/mips/cavium/octe/octe.c head/sys/mips/cavium/octe/octebus.c head/sys/mips/cavium/octe/wrapper-cvmx-includes.h head/sys/mips/cavium/octeon_ds1337.c head/sys/mips/cavium/octeon_ebt3000_cf.c head/sys/mips/cavium/octeon_gpio.c head/sys/mips/cavium/octeon_machdep.c head/sys/mips/cavium/octeon_rnd.c head/sys/mips/cavium/octeon_rtc.c head/sys/mips/cavium/octopci.c head/sys/mips/cavium/octopci_bus_space.c head/sys/mips/cavium/octopcireg.h head/sys/mips/cavium/uart_dev_oct16550.c head/sys/mips/cavium/usb/octusb.c head/sys/mips/cavium/usb/octusb.h head/sys/mips/cavium/usb/octusb_octeon.c head/sys/mips/include/bus.h head/sys/mips/include/cpufunc.h head/sys/mips/include/cpuregs.h head/sys/mips/include/db_machdep.h head/sys/mips/include/mips_opcode.h head/sys/mips/include/regnum.h head/sys/mips/ingenic/jz4780_clk_gen.c head/sys/mips/ingenic/jz4780_clock.c head/sys/mips/ingenic/jz4780_machdep.c head/sys/mips/ingenic/jz4780_pdma.c head/sys/mips/ingenic/jz4780_pinctrl.c head/sys/mips/ingenic/jz4780_pinctrl.h head/sys/mips/ingenic/jz4780_timer.c head/sys/mips/malta/gt.c head/sys/mips/malta/gt_pci.c head/sys/mips/malta/gtreg.h head/sys/mips/malta/malta_machdep.c head/sys/mips/malta/maltareg.h head/sys/mips/malta/obio.c head/sys/mips/malta/obiovar.h head/sys/mips/mediatek/fdt_reset.c head/sys/mips/mediatek/fdt_reset.h head/sys/mips/mediatek/mtk_gpio_v1.c head/sys/mips/mediatek/mtk_machdep.c head/sys/mips/mediatek/mtk_pcie.c head/sys/mips/mediatek/mtk_pinctrl.h head/sys/mips/mediatek/mtk_spi_v1.c head/sys/mips/mediatek/mtk_spi_v2.c head/sys/mips/mediatek/uart_dev_mtk.c head/sys/mips/mips/busdma_machdep.c head/sys/mips/mips/cache_mipsNN.c head/sys/mips/mips/cpu.c head/sys/mips/mips/db_interface.c head/sys/mips/mips/db_trace.c head/sys/mips/mips/elf_trampoline.c head/sys/mips/mips/gdb_machdep.c head/sys/mips/mips/mips_pic.c head/sys/mips/mips/nexus.c head/sys/mips/mips/pm_machdep.c head/sys/mips/mips/pmap.c head/sys/mips/mips/tick.c head/sys/mips/mips/trap.c head/sys/mips/mips/vm_machdep.c head/sys/mips/nlm/board.c head/sys/mips/nlm/bus_space_rmi.c head/sys/mips/nlm/bus_space_rmi_pci.c head/sys/mips/nlm/cms.c head/sys/mips/nlm/dev/net/ucore/ucore.h head/sys/mips/nlm/dev/net/ucore/ucore_app.c head/sys/mips/nlm/dev/net/xaui.c head/sys/mips/nlm/dev/net/xlpge.c head/sys/mips/nlm/dev/sec/nlmseclib.h head/sys/mips/nlm/hal/cpucontrol.h head/sys/mips/nlm/hal/mmu.h head/sys/mips/nlm/hal/usb.h head/sys/mips/nlm/tick.c head/sys/mips/nlm/usb_init.c Modified: head/sys/mips/atheros/apb.c ============================================================================== --- head/sys/mips/atheros/apb.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/apb.c Tue Sep 1 21:21:19 2020 (r365076) @@ -356,7 +356,6 @@ apb_filter(void *arg) reg = ATH_READ_REG(AR71XX_MISC_INTR_STATUS); for (irq = 0; irq < APB_NIRQS; irq++) { if (reg & (1 << irq)) { - switch (ar71xx_soc) { case AR71XX_SOC_AR7240: case AR71XX_SOC_AR7241: @@ -508,7 +507,6 @@ apb_print_child(device_t bus, device_t child) return (retval); } - static device_method_t apb_methods[] = { DEVMETHOD(bus_activate_resource, apb_activate_resource), Modified: head/sys/mips/atheros/ar531x/apb.c ============================================================================== --- head/sys/mips/atheros/ar531x/apb.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/apb.c Tue Sep 1 21:21:19 2020 (r365076) @@ -386,7 +386,6 @@ apb_release_resource(device_t dev, device_t child, int return (0); } - static int apb_setup_intr(device_t bus, device_t child, struct resource *ires, int flags, driver_filter_t *filt, driver_intr_t *handler, @@ -402,7 +401,7 @@ apb_setup_intr(device_t bus, device_t child, struct re #ifdef INTRNG struct intr_irqsrc *isrc; const char *name; - + if ((rman_get_flags(ires) & RF_SHAREABLE) == 0) flags |= INTR_EXCL; @@ -479,7 +478,6 @@ apb_teardown_intr(device_t dev, device_t child, struct #endif } - static int apb_filter(void *arg) { @@ -496,7 +494,6 @@ apb_filter(void *arg) for (irq = 0; irq < APB_NIRQS; irq++) { if (reg & (1 << irq)) { - if(ar531x_soc >= AR531X_SOC_AR5315) { ATH_WRITE_REG(AR5315_SYSREG_BASE + AR5315_SYSREG_MISC_INTSTAT, Modified: head/sys/mips/atheros/ar531x/ar5312_chip.c ============================================================================== --- head/sys/mips/atheros/ar531x/ar5312_chip.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/ar5312_chip.c Tue Sep 1 21:21:19 2020 (r365076) @@ -87,7 +87,6 @@ ar5312_chip_detect_sys_frequency(void) uint32_t predivisor; uint32_t multiplier; - const uint32_t clockctl = ATH_READ_REG(AR5312_SYSREG_BASE + AR5312_SYSREG_CLOCKCTL); if(ar531x_soc == AR531X_SOC_AR5313) { predivisor = __SHIFTOUT(clockctl, AR2313_CLOCKCTL_PREDIVIDE); Modified: head/sys/mips/atheros/ar531x/ar5315_chip.c ============================================================================== --- head/sys/mips/atheros/ar531x/ar5315_chip.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/ar5315_chip.c Tue Sep 1 21:21:19 2020 (r365076) @@ -181,7 +181,7 @@ ar5315_chip_device_start(void) ATH_WRITE_REG(AR5315_SYSREG_BASE+AR5315_SYSREG_AHB_ARB_CTL, ATH_READ_REG(AR5315_SYSREG_BASE+AR5315_SYSREG_AHB_ARB_CTL) | AR5315_ARB_ENET); - + // set Ethernet controller byteswap control /* ATH_WRITE_REG(AR5315_SYSREG_BASE+AR5315_SYSREG_ENDIAN, Modified: head/sys/mips/atheros/ar531x/ar5315_cpudef.h ============================================================================== --- head/sys/mips/atheros/ar531x/ar5315_cpudef.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/ar5315_cpudef.h Tue Sep 1 21:21:19 2020 (r365076) @@ -122,18 +122,14 @@ extern uint32_t u_ar531x_gpio_pins; extern uint32_t u_ar531x_wdog_ctl; extern uint32_t u_ar531x_wdog_timer; - static inline uint32_t ar531x_cpu_freq(void) { return u_ar531x_cpu_freq; } static inline uint32_t ar531x_ahb_freq(void) { return u_ar531x_ahb_freq; } static inline uint32_t ar531x_ddr_freq(void) { return u_ar531x_ddr_freq; } - static inline uint32_t ar531x_uart_addr(void) { return u_ar531x_uart_addr; } - static inline uint32_t ar531x_gpio_di(void) { return u_ar531x_gpio_di; } static inline uint32_t ar531x_gpio_cr(void) { return u_ar531x_gpio_cr; } static inline uint32_t ar531x_gpio_do(void) { return u_ar531x_gpio_do; } static inline uint32_t ar531x_gpio_pins(void) { return u_ar531x_gpio_pins; } - static inline uint32_t ar531x_wdog_ctl(void) { return u_ar531x_wdog_ctl; } static inline uint32_t ar531x_wdog_timer(void) { return u_ar531x_wdog_timer; } #endif Modified: head/sys/mips/atheros/ar531x/ar5315_gpio.c ============================================================================== --- head/sys/mips/atheros/ar531x/ar5315_gpio.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/ar5315_gpio.c Tue Sep 1 21:21:19 2020 (r365076) @@ -308,8 +308,6 @@ ar5315_gpio_filter(void *arg) return (FILTER_STRAY); } - - static void ar5315_gpio_intr(void *arg) { Modified: head/sys/mips/atheros/ar531x/ar5315_machdep.c ============================================================================== --- head/sys/mips/atheros/ar531x/ar5315_machdep.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/ar5315_machdep.c Tue Sep 1 21:21:19 2020 (r365076) @@ -241,7 +241,6 @@ platform_start(__register_t a0 __unused, __register_t /* Detect the system type - this is needed for subsequent chipset-specific calls */ - ar531x_device_soc_init(); ar531x_detect_sys_frequency(); Modified: head/sys/mips/atheros/ar531x/ar5315_setup.c ============================================================================== --- head/sys/mips/atheros/ar531x/ar5315_setup.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/ar5315_setup.c Tue Sep 1 21:21:19 2020 (r365076) @@ -39,12 +39,12 @@ __FBSDID("$FreeBSD$"); #include #include #include - + #include #include - + #include - + #include #include #include @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - + #include #include #include @@ -158,4 +158,3 @@ ar5315_get_system_type(void) { return ar5315_sys_type; } - Modified: head/sys/mips/atheros/ar531x/ar5315_wdog.c ============================================================================== --- head/sys/mips/atheros/ar531x/ar5315_wdog.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/ar5315_wdog.c Tue Sep 1 21:21:19 2020 (r365076) @@ -116,12 +116,11 @@ ar5315_wdog_sysctl(device_t dev) "whether the system rebooted from the watchdog"); } - static int ar5315_wdog_attach(device_t dev) { struct ar5315_wdog_softc *sc = device_get_softc(dev); - + /* Initialise */ sc->reboot_from_watchdog = 0; sc->armed = 0; Modified: head/sys/mips/atheros/ar531x/ar5315reg.h ============================================================================== --- head/sys/mips/atheros/ar531x/ar5315reg.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/ar5315reg.h Tue Sep 1 21:21:19 2020 (r365076) @@ -223,7 +223,7 @@ #define ATH_READ_REG(reg) \ *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1((reg))) - + #define ATH_WRITE_REG(reg, val) \ *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1((reg))) = (val) Modified: head/sys/mips/atheros/ar531x/if_are.c ============================================================================== --- head/sys/mips/atheros/ar531x/if_are.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/if_are.c Tue Sep 1 21:21:19 2020 (r365076) @@ -195,7 +195,6 @@ DRIVER_MODULE(aremdio, nexus, aremdio_driver, aremdio_ DRIVER_MODULE(mdio, aremdio, mdio_driver, mdio_devclass, 0, 0); #endif - static int are_probe(device_t dev) { @@ -1472,7 +1471,6 @@ are_fixup_rx(struct mbuf *m) m->m_data -= ETHER_ALIGN; } - static void are_tx(struct are_softc *sc) { @@ -1538,7 +1536,6 @@ are_tx(struct are_softc *sc) sc->are_cdata.are_tx_ring_map, BUS_DMASYNC_PREWRITE); } - static void are_rx(struct are_softc *sc) { @@ -1611,7 +1608,6 @@ are_rx(struct are_softc *sc) bus_dmamap_sync(sc->are_cdata.are_rx_ring_tag, sc->are_cdata.are_rx_ring_map, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - } if (prog > 0) { Modified: head/sys/mips/atheros/ar531x/if_arereg.h ============================================================================== --- head/sys/mips/atheros/ar531x/if_arereg.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar531x/if_arereg.h Tue Sep 1 21:21:19 2020 (r365076) @@ -141,7 +141,6 @@ struct are_softc { #define CSR_READ_4(sc, reg) \ bus_space_read_4(sc->are_btag, sc->are_bhandle, reg) - /* $NetBSD: aereg.h,v 1.2 2008/04/28 20:23:28 martin Exp $ */ /*- @@ -254,7 +253,7 @@ struct are_softc { #define CSR_MIIDATA 0x0018 /* mii data */ #define CSR_FLOWC 0x001C /* flow control */ #define CSR_VL1 0x0020 /* vlan 1 tag */ - + /* these are more or less normal Tulip registers */ #define CSR_BUSMODE 0x1000 /* bus mode */ #define CSR_TXPOLL 0x1004 /* tx poll demand */ @@ -331,7 +330,6 @@ struct are_softc { /* CSR_TXPOLL - Transmit Poll Demand */ #define TXPOLL_TPD 0x00000001 /* transmit poll demand */ - /* CSR_RXPOLL - Receive Poll Demand */ #define RXPOLL_RPD 0x00000001 /* receive poll demand */ @@ -392,7 +390,6 @@ struct are_softc { /* CSR_INTEN - Interrupt Enable */ /* See bits for CSR_STATUS -- Status */ - /* CSR_MISSED - Missed Frames */ #define MISSED_MFC 0xffff0000 /* missed packet count */ Modified: head/sys/mips/atheros/ar71xx_cpudef.h ============================================================================== --- head/sys/mips/atheros/ar71xx_cpudef.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar71xx_cpudef.h Tue Sep 1 21:21:19 2020 (r365076) @@ -171,7 +171,6 @@ extern uint32_t u_ar71xx_ddr_freq; extern uint32_t u_ar71xx_uart_freq; extern uint32_t u_ar71xx_wdt_freq; extern uint32_t u_ar71xx_mdio_freq; - static inline uint64_t ar71xx_refclk(void) { return u_ar71xx_refclk; } static inline uint64_t ar71xx_cpu_freq(void) { return u_ar71xx_cpu_freq; } static inline uint64_t ar71xx_ahb_freq(void) { return u_ar71xx_ahb_freq; } Modified: head/sys/mips/atheros/ar71xx_gpio.c ============================================================================== --- head/sys/mips/atheros/ar71xx_gpio.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar71xx_gpio.c Tue Sep 1 21:21:19 2020 (r365076) @@ -411,8 +411,6 @@ ar71xx_gpio_filter(void *arg) return (FILTER_STRAY); } - - static void ar71xx_gpio_intr(void *arg) { Modified: head/sys/mips/atheros/ar71xx_ohci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_ohci.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar71xx_ohci.c Tue Sep 1 21:21:19 2020 (r365076) @@ -79,7 +79,6 @@ ar71xx_ohci_intr(void *arg) ohci_interrupt(arg); } - static int ar71xx_ohci_attach(device_t dev) { Modified: head/sys/mips/atheros/ar71xx_pci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_pci.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar71xx_pci.c Tue Sep 1 21:21:19 2020 (r365076) @@ -358,7 +358,6 @@ ar71xx_pci_slot_fixup(device_t dev, u_int bus, u_int s return; } - device_printf(dev, "found EEPROM at 0x%lx on %d.%d.%d\n", flash_addr, bus, slot, func); ar71xx_pci_fixup(dev, bus, slot, func, flash_addr, size); @@ -660,7 +659,7 @@ static int ar71xx_pci_route_interrupt(device_t pcib, device_t device, int pin) { struct ar71xx_pci_softc *sc = device_get_softc(pcib); - + if (pci_get_slot(device) < sc->sc_baseslot) panic("%s: PCI slot %d is less then AR71XX_PCI_BASE_SLOT", __func__, pci_get_slot(device)); Modified: head/sys/mips/atheros/ar71xx_pci_bus_space.c ============================================================================== --- head/sys/mips/atheros/ar71xx_pci_bus_space.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar71xx_pci_bus_space.c Tue Sep 1 21:21:19 2020 (r365076) @@ -188,7 +188,7 @@ pcimem_bs_w_2_s(void *t, bus_space_handle_t h, bus_siz static uint32_t pcimem_bs_r_4_s(void *t, bus_space_handle_t h, bus_size_t o) { - + return le32toh(readl(h + o)); } Modified: head/sys/mips/atheros/ar71xx_setup.c ============================================================================== --- head/sys/mips/atheros/ar71xx_setup.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar71xx_setup.c Tue Sep 1 21:21:19 2020 (r365076) @@ -39,12 +39,12 @@ __FBSDID("$FreeBSD$"); #include #include #include - + #include #include - + #include - + #include #include #include @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - + #include #include #include @@ -234,4 +234,3 @@ ar71xx_get_system_type(void) { return ar71xx_sys_type; } - Modified: head/sys/mips/atheros/ar71xx_spi.c ============================================================================== --- head/sys/mips/atheros/ar71xx_spi.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar71xx_spi.c Tue Sep 1 21:21:19 2020 (r365076) @@ -282,7 +282,6 @@ static device_method_t ar71xx_spi_methods[] = { DEVMETHOD(device_detach, ar71xx_spi_detach), DEVMETHOD(spibus_transfer, ar71xx_spi_transfer), - {0, 0} }; Modified: head/sys/mips/atheros/ar71xx_wdog.c ============================================================================== --- head/sys/mips/atheros/ar71xx_wdog.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar71xx_wdog.c Tue Sep 1 21:21:19 2020 (r365076) @@ -143,12 +143,11 @@ ar71xx_wdog_sysctl(device_t dev) "whether the system rebooted from the watchdog"); } - static int ar71xx_wdog_attach(device_t dev) { struct ar71xx_wdog_softc *sc = device_get_softc(dev); - + /* Initialise */ sc->reboot_from_watchdog = 0; sc->armed = 0; Modified: head/sys/mips/atheros/ar724x_pci.c ============================================================================== --- head/sys/mips/atheros/ar724x_pci.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar724x_pci.c Tue Sep 1 21:21:19 2020 (r365076) @@ -594,7 +594,6 @@ ar724x_pci_intr(void *arg) struct intr_event *event; uint32_t reg, irq, mask; - reg = ATH_READ_REG(AR724X_PCI_INTR_STATUS); mask = ATH_READ_REG(AR724X_PCI_INTR_MASK); /* @@ -602,7 +601,6 @@ ar724x_pci_intr(void *arg) */ reg &= mask; if (reg & AR724X_PCI_INTR_DEV0) { - irq = AR71XX_PCI_IRQ_START; event = sc->sc_eventstab[irq]; if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) { Modified: head/sys/mips/atheros/ar933x_chip.c ============================================================================== --- head/sys/mips/atheros/ar933x_chip.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar933x_chip.c Tue Sep 1 21:21:19 2020 (r365076) @@ -215,7 +215,6 @@ ar933x_chip_ddr_flush(ar71xx_flush_ddr_id_t id) } } - static uint32_t ar933x_chip_get_eth_pll(unsigned int mac, int speed) { Modified: head/sys/mips/atheros/ar934x_chip.c ============================================================================== --- head/sys/mips/atheros/ar934x_chip.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/ar934x_chip.c Tue Sep 1 21:21:19 2020 (r365076) @@ -286,7 +286,6 @@ ar934x_chip_ddr_flush(ar71xx_flush_ddr_id_t id) } } - static uint32_t ar934x_chip_get_eth_pll(unsigned int mac, int speed) { Modified: head/sys/mips/atheros/if_arge.c ============================================================================== --- head/sys/mips/atheros/if_arge.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/if_arge.c Tue Sep 1 21:21:19 2020 (r365076) @@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$"); #include "mdio_if.h" #endif - MODULE_DEPEND(arge, ether, 1, 1, 1); MODULE_DEPEND(arge, miibus, 1, 1, 1); MODULE_VERSION(arge, 1); @@ -230,7 +229,7 @@ static device_method_t argemdio_methods[] = { /* bus interface */ DEVMETHOD(bus_add_child, device_add_child_ordered), - + /* MDIO access */ DEVMETHOD(mdio_readreg, arge_miibus_readreg), DEVMETHOD(mdio_writereg, arge_miibus_writereg), @@ -1242,7 +1241,6 @@ arge_update_link_locked(struct arge_softc *sc) } if (mii->mii_media_status & IFM_ACTIVE) { - media = IFM_SUBTYPE(mii->mii_media_active); if (media != IFM_NONE) { sc->arge_link_status = 1; @@ -1373,7 +1371,6 @@ arge_set_pll(struct arge_softc *sc, int media, int dup #endif } - static void arge_reset_dma(struct arge_softc *sc) { @@ -1738,7 +1735,6 @@ arge_start_locked(struct ifnet *ifp) if (m_head == NULL) break; - /* * Pack the data into the transmit ring. */ @@ -1784,7 +1780,6 @@ arge_stop(struct arge_softc *sc) arge_tx_ring_free(sc); } - static int arge_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { @@ -2419,7 +2414,6 @@ arge_poll(struct ifnet *ifp, enum poll_cmd cmd, int co } #endif /* DEVICE_POLLING */ - static void arge_tx_locked(struct arge_softc *sc) { @@ -2484,7 +2478,6 @@ arge_tx_locked(struct arge_softc *sc) sc->arge_cdata.arge_tx_ring_map, BUS_DMASYNC_PREWRITE); } - static int arge_rx_locked(struct arge_softc *sc) { @@ -2541,7 +2534,6 @@ arge_rx_locked(struct arge_softc *sc) } if (prog > 0) { - i = sc->arge_cdata.arge_rx_cons; for (; prog > 0 ; prog--) { if (arge_newbuf(sc, i) != 0) { @@ -2698,7 +2690,6 @@ arge_intr(void *arg) */ ARGE_WRITE(sc, AR71XX_DMA_INTR, DMA_INTR_ALL); } - static void arge_tick(void *xsc) Modified: head/sys/mips/atheros/if_argevar.h ============================================================================== --- head/sys/mips/atheros/if_argevar.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/if_argevar.h Tue Sep 1 21:21:19 2020 (r365076) @@ -50,7 +50,6 @@ ((sc)->arge_rdata.arge_rx_ring_paddr + sizeof(struct arge_desc) * (i)) #define ARGE_INC(x,y) (x) = (((x) + 1) % y) - #define ARGE_MII_TIMEOUT 1000 #define ARGE_LOCK(_sc) mtx_lock(&(_sc)->arge_mtx) Modified: head/sys/mips/atheros/pcf2123reg.h ============================================================================== --- head/sys/mips/atheros/pcf2123reg.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/pcf2123reg.h Tue Sep 1 21:21:19 2020 (r365076) @@ -66,4 +66,3 @@ #define PCF2123_WRITE(reg) (PCF2123_CMD_WRITE | (1 << 4) | (reg)) #endif /* __PCF2123REG_H__ */ - Modified: head/sys/mips/atheros/qca955xreg.h ============================================================================== --- head/sys/mips/atheros/qca955xreg.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/qca955xreg.h Tue Sep 1 21:21:19 2020 (r365076) @@ -193,7 +193,6 @@ #define QCA955X_NFC_BASE 0x1b800200 #define QCA955X_NFC_SIZE 0xb8 - /* GMAC Interface */ #define QCA955X_GMAC_REG_ETH_CFG (QCA955X_GMAC_BASE + 0x00) Modified: head/sys/mips/atheros/uart_dev_ar933x.c ============================================================================== --- head/sys/mips/atheros/uart_dev_ar933x.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/atheros/uart_dev_ar933x.c Tue Sep 1 21:21:19 2020 (r365076) @@ -54,8 +54,6 @@ __FBSDID("$FreeBSD$"); #define ar933x_setreg(bas, reg, value) \ bus_space_write_4((bas)->bst, (bas)->bsh, reg, value) - - static int ar933x_drain(struct uart_bas *bas, int what) { @@ -78,7 +76,6 @@ ar933x_drain(struct uart_bas *bas, int what) if (what & UART_DRAIN_RECEIVER) { limit=10*4096; while (--limit) { - /* XXX duplicated from ar933x_getc() */ /* XXX TODO: refactor! */ @@ -192,7 +189,6 @@ ar933x_param(struct uart_bas *bas, int baudrate, int d uart_barrier(bas); return (0); } - /* * Low-level UART interface. Modified: head/sys/mips/beri/beri_iommu.c ============================================================================== --- head/sys/mips/beri/beri_iommu.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/beri/beri_iommu.c Tue Sep 1 21:21:19 2020 (r365076) @@ -210,7 +210,6 @@ beri_iommu_detach(device_t dev) } static device_method_t beri_iommu_methods[] = { - /* xDMA IOMMU interface */ DEVMETHOD(xdma_iommu_init, beri_iommu_init), DEVMETHOD(xdma_iommu_release, beri_iommu_release), @@ -221,7 +220,6 @@ static device_method_t beri_iommu_methods[] = { DEVMETHOD(device_probe, beri_iommu_probe), DEVMETHOD(device_attach, beri_iommu_attach), DEVMETHOD(device_detach, beri_iommu_detach), - { 0, 0 } }; Modified: head/sys/mips/beri/beri_machdep.c ============================================================================== --- head/sys/mips/beri/beri_machdep.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/beri/beri_machdep.c Tue Sep 1 21:21:19 2020 (r365076) @@ -115,7 +115,6 @@ mips_init(void) #ifdef FDT if (fdt_get_mem_regions(mr, &mr_cnt, &val) == 0) { - physmem = btoc(val); KASSERT((phys_avail[0] >= mr[0].mr_start) && \ Modified: head/sys/mips/beri/beri_mp.c ============================================================================== --- head/sys/mips/beri/beri_mp.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/beri/beri_mp.c Tue Sep 1 21:21:19 2020 (r365076) @@ -171,7 +171,6 @@ platform_init_secondary(int cpuid) } } - void platform_ipi_send(int cpuid) { Modified: head/sys/mips/broadcom/bcm_bmips.c ============================================================================== --- head/sys/mips/broadcom/bcm_bmips.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/bcm_bmips.c Tue Sep 1 21:21:19 2020 (r365076) @@ -103,7 +103,6 @@ bcm_bmips_probe(device_t dev) return (BUS_PROBE_DEFAULT); } - static int bcm_bmips_attach(device_t dev) { Modified: head/sys/mips/broadcom/bcm_bmips_exts.h ============================================================================== --- head/sys/mips/broadcom/bcm_bmips_exts.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/bcm_bmips_exts.h Tue Sep 1 21:21:19 2020 (r365076) @@ -39,7 +39,6 @@ * $FreeBSD$ */ - /* ********************************************************************* * Broadcom Common Firmware Environment (CFE) * Modified: head/sys/mips/broadcom/bcm_mips.c ============================================================================== --- head/sys/mips/broadcom/bcm_mips.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/bcm_mips.c Tue Sep 1 21:21:19 2020 (r365076) @@ -477,7 +477,6 @@ bcm_mips_pic_teardown_intr(device_t dev, struct intr_i return (error); } - /** return our PIC's xref */ static uintptr_t bcm_mips_pic_xref(struct bcm_mips_softc *sc) Modified: head/sys/mips/broadcom/bcm_mips74k.c ============================================================================== --- head/sys/mips/broadcom/bcm_mips74k.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/bcm_mips74k.c Tue Sep 1 21:21:19 2020 (r365076) @@ -200,7 +200,6 @@ bcm_mips74k_detach(device_t dev) return (0); } - /* PIC_DISABLE_INTR() */ static void bcm_mips74k_pic_disable_intr(device_t dev, struct intr_irqsrc *irqsrc) Modified: head/sys/mips/broadcom/bcm_mips74kreg.h ============================================================================== --- head/sys/mips/broadcom/bcm_mips74kreg.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/bcm_mips74kreg.h Tue Sep 1 21:21:19 2020 (r365076) @@ -64,5 +64,4 @@ #define BCM_MIPS74K_GET_TIMER_IRQ() \ ((mips_rd_intctl() & MIPS_INTCTL_IPTI_MASK) >> MIPS_INTCTL_IPTI_SHIFT) - #endif /* _MIPS_BROADCOM_MIPS74KREG_H_ */ Modified: head/sys/mips/broadcom/bcm_mipsvar.h ============================================================================== --- head/sys/mips/broadcom/bcm_mipsvar.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/bcm_mipsvar.h Tue Sep 1 21:21:19 2020 (r365076) @@ -51,7 +51,6 @@ struct bcm_mips_softc; #define BCM_MIPS_IRQ_SHARED 0 /**< MIPS CPU IRQ reserved for shared interrupt handling */ #define INTR_MAP_DATA_BCM_MIPS INTR_MAP_DATA_PLAT_2 /**< Broadcom MIPS PIC interrupt map data type */ - int bcm_mips_attach(device_t dev, u_int num_cpuirqs, u_int timer_irq, driver_filter_t filter); int bcm_mips_detach(device_t dev); @@ -99,7 +98,6 @@ struct bcm_mips_softc { struct bcm_mips_irqsrc isrcs[BCM_MIPS_NINTR]; struct mtx mtx; }; - #define BCM_MIPS_IVEC_MASK(_isrc) (1 << ((_isrc)->ivec)) Modified: head/sys/mips/broadcom/bcm_nvram_cfe.c ============================================================================== --- head/sys/mips/broadcom/bcm_nvram_cfe.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/bcm_nvram_cfe.c Tue Sep 1 21:21:19 2020 (r365076) @@ -104,7 +104,6 @@ bhnd_nvram_cfe_probe(device_t dev) return (BUS_PROBE_NOWILDCARD); } - static int bhnd_nvram_cfe_attach(device_t dev) { @@ -240,7 +239,6 @@ bcm_nvram_find_cfedev(struct bcm_nvram_iocfe *iocfe, return (ENODEV); } - /** * Initialize a new CFE device-backed I/O context. * @@ -343,7 +341,6 @@ bcm_nvram_iocfe_init(struct bcm_nvram_iocfe *iocfe, ch req_blk_erase = !(fi.flash_flags & FLASH_FLAG_NOERASE); } - /* Verify that the full NVRAM layout can be represented via size_t */ if (nv_size > SIZE_MAX || SIZE_MAX - nv_size < nv_offset) { IOCFE_LOG(iocfe, "invalid NVRAM layout (%#x/%#jx)\n", @@ -449,7 +446,7 @@ bhnd_nvram_iocfe_read(struct bhnd_nvram_io *io, size_t cfe_noff = cfe_offset + nread; p = ((uint8_t *)buffer + nread); nreq = ummin(INT_MAX, remain); - + nr = cfe_readblk(iocfe->fd, cfe_noff, p, nreq); if (nr < 0) { IOCFE_LOG(iocfe, "cfe_readblk() failed: %d\n", nr); Modified: head/sys/mips/broadcom/bcm_pmu.c ============================================================================== --- head/sys/mips/broadcom/bcm_pmu.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/bcm_pmu.c Tue Sep 1 21:21:19 2020 (r365076) @@ -121,7 +121,7 @@ bcm_get_uart_clkcfg(struct bcm_platform *bp) /* PLL M2 clock source? */ if (!bcm_has_pmu(bp) && BCM_PMU_PLL_TYPE(bp) == CHIPC_PLL_TYPE1) { uint32_t n, m; - + n = BCM_CHIPC_READ_4(bp, CHIPC_CLKC_N); m = BCM_CHIPC_READ_4(bp, CHIPC_CLKC_M2); @@ -130,7 +130,7 @@ bcm_get_uart_clkcfg(struct bcm_platform *bp) BCM_UART_RCLK_PLL_T1_DIV, bhnd_pwrctl_clock_rate(BCM_PMU_PLL_TYPE(bp), n, m) }; - + return (cfg); } @@ -247,7 +247,7 @@ bcm_get_cpufreq(struct bcm_platform *bp) m = BCM_CHIPC_READ_4(bp, mreg); return (bhnd_pwrctl_cpu_clock_rate(&bp->cid, pll_type, n, m)); - + } /** Backplane clock frequency (in Hz) */ @@ -276,7 +276,6 @@ bcm_get_sifreq(struct bcm_platform *bp) return (bhnd_pwrctl_si_clock_rate(&bp->cid, pll_type, n, m)); } - static uint32_t bcm_pmu_read4(bus_size_t reg, void *ctx) { Modified: head/sys/mips/broadcom/bhnd_nexus.c ============================================================================== --- head/sys/mips/broadcom/bhnd_nexus.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/bhnd_nexus.c Tue Sep 1 21:21:19 2020 (r365076) @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$"); #include "bhnd_nexusvar.h" - /** * Default bhnd_nexus implementation of BHND_BUS_GET_SERVICE_REGISTRY(). */ Modified: head/sys/mips/broadcom/uart_bus_chipc.c ============================================================================== --- head/sys/mips/broadcom/uart_bus_chipc.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/broadcom/uart_bus_chipc.c Tue Sep 1 21:21:19 2020 (r365076) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include "bcm_machdep.h" - static int uart_chipc_probe(device_t dev) { Modified: head/sys/mips/cavium/ciu.c ============================================================================== --- head/sys/mips/cavium/ciu.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/ciu.c Tue Sep 1 21:21:19 2020 (r365076) @@ -143,7 +143,7 @@ ciu_attach(device_t dev) sc->irq_rman.rm_type = RMAN_ARRAY; sc->irq_rman.rm_descr = "CIU IRQ"; - + error = rman_init(&sc->irq_rman); if (error != 0) return (error); @@ -178,7 +178,7 @@ ciu_alloc_resource(device_t bus, device_t child, int t { struct resource *res; struct ciu_softc *sc; - + sc = device_get_softc(bus); switch (type) { @@ -276,7 +276,7 @@ ciu_bind_intr(device_t bus, device_t child, struct res { struct intr_event *event; int irq; - + irq = rman_get_start(res); if (irq <= CIU_IRQ_EN0_END) event = ciu_en0_intr_events[irq - CIU_IRQ_EN0_BEGIN]; @@ -295,7 +295,7 @@ ciu_describe_intr(device_t bus, device_t child, struct mips_intrcnt_t intrcnt; int error; int irq; - + irq = rman_get_start(res); if (irq <= CIU_IRQ_EN0_END) { event = ciu_en0_intr_events[irq - CIU_IRQ_EN0_BEGIN]; @@ -476,7 +476,6 @@ static device_method_t ciu_methods[] = { DEVMETHOD(bus_add_child, bus_generic_add_child), DEVMETHOD(bus_hinted_child, ciu_hinted_child), - { 0, 0 } }; Modified: head/sys/mips/cavium/cryptocteon/cavium_crypto.c ============================================================================== --- head/sys/mips/cavium/cryptocteon/cavium_crypto.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/cryptocteon/cavium_crypto.c Tue Sep 1 21:21:19 2020 (r365076) @@ -388,7 +388,6 @@ octo_aes_cbc_encrypt( return 0; } - int octo_aes_cbc_decrypt( struct octo_sess *od, @@ -645,7 +644,6 @@ octo_aes_cbc_sha1_encrypt( mydata[1].data32[0] = *data32; IOV_CONSUME(iov, data32, data_i, data_l); mydata[1].data32[1] = *data32; - if (crypt_off <= 0) { if (crypt_len > 0) { Modified: head/sys/mips/cavium/cryptocteon/cryptocteon.c ============================================================================== --- head/sys/mips/cavium/cryptocteon/cryptocteon.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/cryptocteon/cryptocteon.c Tue Sep 1 21:21:19 2020 (r365076) @@ -372,7 +372,6 @@ cryptocteon_process(device_t dev, struct cryptop *crp, panic("can't happen"); } - /* * setup a new explicit key */ @@ -381,7 +380,6 @@ cryptocteon_process(device_t dev, struct cryptop *crp, if (crp->crp_auth_key != NULL) cryptocteon_calc_hash(csp, crp->crp_auth_key, od); - if (CRYPTO_OP_IS_ENCRYPT(crp->crp_op)) (*od->octo_encrypt)(od, od->octo_iov, iovcnt, iovlen, auth_off, auth_len, crypt_off, crypt_len, icv, ivp); @@ -414,7 +412,6 @@ static device_method_t cryptocteon_methods[] = { DEVMETHOD(cryptodev_probesession, cryptocteon_probesession), DEVMETHOD(cryptodev_newsession, cryptocteon_newsession), DEVMETHOD(cryptodev_process, cryptocteon_process), - { 0, 0 } }; Modified: head/sys/mips/cavium/if_octm.c ============================================================================== --- head/sys/mips/cavium/if_octm.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/if_octm.c Tue Sep 1 21:21:19 2020 (r365076) @@ -99,7 +99,6 @@ static device_method_t octm_methods[] = { DEVMETHOD(device_attach, octm_attach), DEVMETHOD(device_detach, octm_detach), DEVMETHOD(device_shutdown, octm_shutdown), - { 0, 0 } }; @@ -464,7 +463,7 @@ octm_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data } sc->sc_flags = ifp->if_flags; return (0); - + case SIOCSIFCAP: /* * Just change the capabilities in software, currently none @@ -484,7 +483,7 @@ octm_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data if (error != 0) return (error); return (0); - + default: error = ether_ioctl(ifp, cmd, data); if (error != 0) @@ -512,7 +511,6 @@ octm_rx_intr(void *arg) device_printf(sc->sc_dev, "no memory for receive mbuf.\n"); return; } - len = cvmx_mgmt_port_receive(sc->sc_port, MCLBYTES, m->m_data); if (len > 0) { Modified: head/sys/mips/cavium/obio.c ============================================================================== --- head/sys/mips/cavium/obio.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/obio.c Tue Sep 1 21:21:19 2020 (r365076) @@ -165,7 +165,7 @@ obio_alloc_resource(device_t bus, device_t child, int rman_set_rid(rv, *rid); rman_set_bustag(rv, bt); rman_set_bushandle(rv, bh); - + if (0) { if (bus_activate_resource(child, type, *rid, rv)) { rman_release_resource(rv); Modified: head/sys/mips/cavium/obiovar.h ============================================================================== --- head/sys/mips/cavium/obiovar.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/obiovar.h Tue Sep 1 21:21:19 2020 (r365076) @@ -51,7 +51,7 @@ struct obio_softc { bus_size_t oba_size; /* size of device */ struct rman oba_rman; struct rman oba_irq_rman; - + }; #endif /* _OCTEON_OBIOVAR_H_ */ Modified: head/sys/mips/cavium/octe/cavium-ethernet.h ============================================================================== --- head/sys/mips/cavium/octe/cavium-ethernet.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/octe/cavium-ethernet.h Tue Sep 1 21:21:19 2020 (r365076) @@ -4,7 +4,6 @@ SPDX-License-Identifier: BSD-3-Clause Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -89,7 +88,6 @@ typedef struct { struct mtx tx_mtx; } cvm_oct_private_t; - /** * Free a work queue entry received in a intercept callback. Modified: head/sys/mips/cavium/octe/ethernet-common.c ============================================================================== --- head/sys/mips/cavium/octe/ethernet-common.c Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/octe/ethernet-common.c Tue Sep 1 21:21:19 2020 (r365076) @@ -4,7 +4,6 @@ SPDX-License-Identifier: BSD-3-Clause Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -91,7 +90,6 @@ void cvm_oct_common_set_multicast_list(struct ifnet *i } } - /** * Assign a MAC addres from the pool of available MAC addresses * Can return as either a 64-bit value and/or 6 octets. @@ -116,7 +114,7 @@ int cvm_assign_mac_address(uint64_t *macp, uint8_t *oc if (cvm_oct_mac_addr_offset >= cvmx_sysinfo_get()->mac_addr_count) return ENXIO; /* Out of addresses to assign */ - + if (macp) *macp = cvm_oct_mac_addr; if (octets) @@ -165,7 +163,6 @@ void cvm_oct_common_set_mac_address(struct ifnet *ifp, } } - /** * Change the link MTU. Unimplemented * @@ -210,7 +207,6 @@ int cvm_oct_common_change_mtu(struct ifnet *ifp, int n return 0; } - /** * Enable port. */ @@ -240,7 +236,6 @@ int cvm_oct_common_open(struct ifnet *ifp) return 0; } - /** * Disable port. */ @@ -298,7 +293,6 @@ void cvm_oct_common_poll(struct ifnet *ifp) priv->need_link_update = 1; } - /** * Per network device initialization * @@ -344,4 +338,3 @@ void cvm_oct_common_uninit(struct ifnet *ifp) { /* Currently nothing to do */ } - Modified: head/sys/mips/cavium/octe/ethernet-common.h ============================================================================== --- head/sys/mips/cavium/octe/ethernet-common.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/octe/ethernet-common.h Tue Sep 1 21:21:19 2020 (r365076) @@ -4,7 +4,6 @@ SPDX-License-Identifier: BSD-3-Clause Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -54,4 +53,3 @@ int cvm_oct_sgmii_init(struct ifnet *ifp); int cvm_oct_spi_init(struct ifnet *ifp); void cvm_oct_spi_uninit(struct ifnet *ifp); int cvm_oct_xaui_init(struct ifnet *ifp); - Modified: head/sys/mips/cavium/octe/ethernet-defines.h ============================================================================== --- head/sys/mips/cavium/octe/ethernet-defines.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/octe/ethernet-defines.h Tue Sep 1 21:21:19 2020 (r365076) @@ -4,7 +4,6 @@ SPDX-License-Identifier: BSD-3-Clause Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -50,4 +49,3 @@ AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROM #define FAU_NUM_PACKET_BUFFERS_TO_FREE (CVMX_FAU_REG_END - sizeof(uint32_t)) #define TOTAL_NUMBER_OF_PORTS (CVMX_PIP_NUM_INPUT_PORTS+1) - Modified: head/sys/mips/cavium/octe/ethernet-headers.h ============================================================================== --- head/sys/mips/cavium/octe/ethernet-headers.h Tue Sep 1 21:21:03 2020 (r365075) +++ head/sys/mips/cavium/octe/ethernet-headers.h Tue Sep 1 21:21:19 2020 (r365076) @@ -4,7 +4,6 @@ SPDX-License-Identifier: BSD-3-Clause Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights reserved. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:22:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CFC4E37954F; Tue, 1 Sep 2020 21:22:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Q15XSnz4Jbv; Tue, 1 Sep 2020 21:22:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88A331FAD5; Tue, 1 Sep 2020 21:22:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LM1Jt020235; Tue, 1 Sep 2020 21:22:01 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LLuXm020180; Tue, 1 Sep 2020 21:21:56 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012121.081LLuXm020180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:21:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365077 - in head/sys/xen: . interface interface/arch-x86 interface/arch-x86/hvm interface/hvm interface/io xenbus xenstore X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/xen: . interface interface/arch-x86 interface/arch-x86/hvm interface/hvm interface/io xenbus xenstore X-SVN-Commit-Revision: 365077 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:22:01 -0000 Author: mjg Date: Tue Sep 1 21:21:55 2020 New Revision: 365077 URL: https://svnweb.freebsd.org/changeset/base/365077 Log: xen: clean up empty lines in .c and .h files Modified: head/sys/xen/hypervisor.h head/sys/xen/interface/arch-x86/hvm/save.h head/sys/xen/interface/arch-x86/pmu.h head/sys/xen/interface/arch-x86/xen-mca.h head/sys/xen/interface/arch-x86/xen.h head/sys/xen/interface/domctl.h head/sys/xen/interface/elfnote.h head/sys/xen/interface/errno.h head/sys/xen/interface/gcov.h head/sys/xen/interface/grant_table.h head/sys/xen/interface/hvm/ioreq.h head/sys/xen/interface/hvm/save.h head/sys/xen/interface/io/fsif.h head/sys/xen/interface/io/libxenvchan.h head/sys/xen/interface/io/tpmif.h head/sys/xen/interface/io/vscsiif.h head/sys/xen/interface/kexec.h head/sys/xen/interface/memory.h head/sys/xen/interface/physdev.h head/sys/xen/xenbus/xenbusb.c head/sys/xen/xenbus/xenbusb.h head/sys/xen/xenbus/xenbusb_back.c head/sys/xen/xenbus/xenbusb_front.c head/sys/xen/xenstore/xenstorevar.h Modified: head/sys/xen/hypervisor.h ============================================================================== --- head/sys/xen/hypervisor.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/hypervisor.h Tue Sep 1 21:21:55 2020 (r365077) @@ -55,7 +55,6 @@ HYPERVISOR_block( return (rc); } - static inline void HYPERVISOR_shutdown(unsigned int reason) { Modified: head/sys/xen/interface/arch-x86/hvm/save.h ============================================================================== --- head/sys/xen/interface/arch-x86/hvm/save.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/arch-x86/hvm/save.h Tue Sep 1 21:21:55 2020 (r365077) @@ -43,7 +43,6 @@ struct hvm_save_header { DECLARE_HVM_SAVE_TYPE(HEADER, 1, struct hvm_save_header); - /* * Processor * @@ -269,7 +268,6 @@ struct hvm_hw_cpu_compat { }; static inline int _hvm_hw_fix_cpu(void *h) { - union hvm_hw_cpu_union { struct hvm_hw_cpu nat; struct hvm_hw_cpu_compat cmp; @@ -342,7 +340,6 @@ struct hvm_hw_vpic { DECLARE_HVM_SAVE_TYPE(PIC, 3, struct hvm_hw_vpic); - /* * IO-APIC */ @@ -374,7 +371,6 @@ struct hvm_hw_vioapic { DECLARE_HVM_SAVE_TYPE(IOAPIC, 4, struct hvm_hw_vioapic); - /* * LAPIC */ @@ -394,7 +390,6 @@ struct hvm_hw_lapic_regs { DECLARE_HVM_SAVE_TYPE(LAPIC_REGS, 6, struct hvm_hw_lapic_regs); - /* * IRQs */ @@ -463,7 +458,6 @@ struct hvm_hw_pit { DECLARE_HVM_SAVE_TYPE(PIT, 10, struct hvm_hw_pit); - /* * RTC */ @@ -479,7 +473,6 @@ struct hvm_hw_rtc { DECLARE_HVM_SAVE_TYPE(RTC, 11, struct hvm_hw_rtc); - /* * HPET */ @@ -509,7 +502,6 @@ struct hvm_hw_hpet { DECLARE_HVM_SAVE_TYPE(HPET, 12, struct hvm_hw_hpet); - /* * PM timer */ @@ -593,7 +585,6 @@ struct hvm_tsc_adjust { }; DECLARE_HVM_SAVE_TYPE(TSC_ADJUST, 19, struct hvm_tsc_adjust); - struct hvm_msr { uint32_t count; Modified: head/sys/xen/interface/arch-x86/pmu.h ============================================================================== --- head/sys/xen/interface/arch-x86/pmu.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/arch-x86/pmu.h Tue Sep 1 21:21:55 2020 (r365077) @@ -164,4 +164,3 @@ DEFINE_XEN_GUEST_HANDLE(xen_pmu_arch_t); * indent-tabs-mode: nil * End: */ - Modified: head/sys/xen/interface/arch-x86/xen-mca.h ============================================================================== --- head/sys/xen/interface/arch-x86/xen-mca.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/arch-x86/xen-mca.h Tue Sep 1 21:21:55 2020 (r365077) @@ -88,7 +88,6 @@ #define XEN_MC_NOTDELIVERED 0x10 /* Note, XEN_MC_CANNOTHANDLE and XEN_MC_NOTDELIVERED are mutually exclusive. */ - #ifndef __ASSEMBLY__ #define VIRQ_MCA VIRQ_ARCH_0 /* G. (DOM0) Machine Check Architecture */ @@ -111,7 +110,6 @@ struct mcinfo_common { uint16_t size; /* size of this struct in bytes */ }; - #define MC_FLAG_CORRECTABLE (1 << 0) #define MC_FLAG_UNCORRECTABLE (1 << 1) #define MC_FLAG_RECOVERABLE (1 << 2) @@ -149,7 +147,6 @@ struct mcinfo_bank { uint64_t mc_tsc; }; - struct mcinfo_msr { uint64_t reg; /* MSR */ uint64_t value; /* MSR value */ @@ -229,7 +226,6 @@ struct mcinfo_recovery } action_info; }; - #define MCINFO_HYPERCALLSIZE 1024 #define MCINFO_MAXSIZE 768 @@ -280,7 +276,6 @@ struct mcinfo_logical_cpu { typedef struct mcinfo_logical_cpu xen_mc_logical_cpu_t; DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t); - /* * OS's should use these instead of writing their own lookup function * each with its own bugs and drawbacks. @@ -325,7 +320,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t); (_ret) = found ? _mic : NULL; \ } while (0) - /* Usecase 1 * Register machine check trap callback handler * (already done via "set_trap_table" hypercall) @@ -355,7 +349,6 @@ struct xen_mc_fetch { }; typedef struct xen_mc_fetch xen_mc_fetch_t; DEFINE_XEN_GUEST_HANDLE(xen_mc_fetch_t); - /* Usecase 4 * This tells the hypervisor to notify a DomU about the machine check error Modified: head/sys/xen/interface/arch-x86/xen.h ============================================================================== --- head/sys/xen/interface/arch-x86/xen.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/arch-x86/xen.h Tue Sep 1 21:21:55 2020 (r365077) @@ -94,7 +94,6 @@ typedef unsigned long xen_pfn_t; #define FIRST_RESERVED_GDT_BYTE (FIRST_RESERVED_GDT_PAGE * 4096) #define FIRST_RESERVED_GDT_ENTRY (FIRST_RESERVED_GDT_BYTE / 8) - /* * ` enum neg_errnoval * ` HYPERVISOR_update_descriptor(u64 pa, u64 desc); Modified: head/sys/xen/interface/domctl.h ============================================================================== --- head/sys/xen/interface/domctl.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/domctl.h Tue Sep 1 21:21:55 2020 (r365077) @@ -118,7 +118,6 @@ struct xen_domctl_getdomaininfo { typedef struct xen_domctl_getdomaininfo xen_domctl_getdomaininfo_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_getdomaininfo_t); - /* XEN_DOMCTL_getmemlist */ struct xen_domctl_getmemlist { /* IN variables. */ @@ -133,7 +132,6 @@ struct xen_domctl_getmemlist { typedef struct xen_domctl_getmemlist xen_domctl_getmemlist_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_getmemlist_t); - /* XEN_DOMCTL_getpageframeinfo */ #define XEN_DOMCTL_PFINFO_LTAB_SHIFT 28 @@ -157,7 +155,6 @@ struct xen_domctl_getpageframeinfo3 { XEN_GUEST_HANDLE_64(xen_pfn_t) array; }; - /* * Control shadow pagetables operation */ @@ -233,7 +230,6 @@ struct xen_domctl_shadow_op { typedef struct xen_domctl_shadow_op xen_domctl_shadow_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_shadow_op_t); - /* XEN_DOMCTL_max_mem */ struct xen_domctl_max_mem { /* IN variables. */ @@ -242,7 +238,6 @@ struct xen_domctl_max_mem { typedef struct xen_domctl_max_mem xen_domctl_max_mem_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_max_mem_t); - /* XEN_DOMCTL_setvcpucontext */ /* XEN_DOMCTL_getvcpucontext */ struct xen_domctl_vcpucontext { @@ -252,7 +247,6 @@ struct xen_domctl_vcpucontext { typedef struct xen_domctl_vcpucontext xen_domctl_vcpucontext_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpucontext_t); - /* XEN_DOMCTL_getvcpuinfo */ struct xen_domctl_getvcpuinfo { /* IN variables. */ @@ -267,7 +261,6 @@ struct xen_domctl_getvcpuinfo { typedef struct xen_domctl_getvcpuinfo xen_domctl_getvcpuinfo_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_getvcpuinfo_t); - /* Get/set the NUMA node(s) with which the guest has affinity with. */ /* XEN_DOMCTL_setnodeaffinity */ /* XEN_DOMCTL_getnodeaffinity */ @@ -277,7 +270,6 @@ struct xen_domctl_nodeaffinity { typedef struct xen_domctl_nodeaffinity xen_domctl_nodeaffinity_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_nodeaffinity_t); - /* Get/set which physical cpus a vcpu can execute on. */ /* XEN_DOMCTL_setvcpuaffinity */ /* XEN_DOMCTL_getvcpuaffinity */ @@ -313,7 +305,6 @@ struct xen_domctl_vcpuaffinity { typedef struct xen_domctl_vcpuaffinity xen_domctl_vcpuaffinity_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpuaffinity_t); - /* XEN_DOMCTL_max_vcpus */ struct xen_domctl_max_vcpus { uint32_t max; /* maximum number of vcpus */ @@ -321,7 +312,6 @@ struct xen_domctl_max_vcpus { typedef struct xen_domctl_max_vcpus xen_domctl_max_vcpus_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_max_vcpus_t); - /* XEN_DOMCTL_scheduler_op */ /* Scheduler types. */ /* #define XEN_SCHEDULER_SEDF 4 (Removed) */ @@ -353,7 +343,6 @@ struct xen_domctl_scheduler_op { typedef struct xen_domctl_scheduler_op xen_domctl_scheduler_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_scheduler_op_t); - /* XEN_DOMCTL_setdomainhandle */ struct xen_domctl_setdomainhandle { xen_domain_handle_t handle; @@ -361,7 +350,6 @@ struct xen_domctl_setdomainhandle { typedef struct xen_domctl_setdomainhandle xen_domctl_setdomainhandle_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_setdomainhandle_t); - /* XEN_DOMCTL_setdebugging */ struct xen_domctl_setdebugging { uint8_t enable; @@ -369,7 +357,6 @@ struct xen_domctl_setdebugging { typedef struct xen_domctl_setdebugging xen_domctl_setdebugging_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_setdebugging_t); - /* XEN_DOMCTL_irq_permission */ struct xen_domctl_irq_permission { uint8_t pirq; @@ -378,7 +365,6 @@ struct xen_domctl_irq_permission { typedef struct xen_domctl_irq_permission xen_domctl_irq_permission_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_irq_permission_t); - /* XEN_DOMCTL_iomem_permission */ struct xen_domctl_iomem_permission { uint64_aligned_t first_mfn;/* first page (physical page number) in range */ @@ -388,7 +374,6 @@ struct xen_domctl_iomem_permission { typedef struct xen_domctl_iomem_permission xen_domctl_iomem_permission_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_iomem_permission_t); - /* XEN_DOMCTL_ioport_permission */ struct xen_domctl_ioport_permission { uint32_t first_port; /* first port int range */ @@ -398,7 +383,6 @@ struct xen_domctl_ioport_permission { typedef struct xen_domctl_ioport_permission xen_domctl_ioport_permission_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_ioport_permission_t); - /* XEN_DOMCTL_hypercall_init */ struct xen_domctl_hypercall_init { uint64_aligned_t gmfn; /* GMFN to be initialised */ @@ -406,7 +390,6 @@ struct xen_domctl_hypercall_init { typedef struct xen_domctl_hypercall_init xen_domctl_hypercall_init_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_hypercall_init_t); - /* XEN_DOMCTL_settimeoffset */ struct xen_domctl_settimeoffset { int64_aligned_t time_offset_seconds; /* applied to domain wallclock time */ @@ -424,7 +407,6 @@ typedef struct xen_domctl_hvmcontext { } xen_domctl_hvmcontext_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_hvmcontext_t); - /* XEN_DOMCTL_set_address_size */ /* XEN_DOMCTL_get_address_size */ typedef struct xen_domctl_address_size { @@ -432,7 +414,6 @@ typedef struct xen_domctl_address_size { } xen_domctl_address_size_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_address_size_t); - /* XEN_DOMCTL_sendtrigger */ #define XEN_DOMCTL_SENDTRIGGER_NMI 0 #define XEN_DOMCTL_SENDTRIGGER_RESET 1 @@ -446,7 +427,6 @@ struct xen_domctl_sendtrigger { typedef struct xen_domctl_sendtrigger xen_domctl_sendtrigger_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_sendtrigger_t); - /* Assign a device to a guest. Sets up IOMMU structures. */ /* XEN_DOMCTL_assign_device */ /* XEN_DOMCTL_test_assign_device */ @@ -526,7 +506,6 @@ struct xen_domctl_bind_pt_irq { typedef struct xen_domctl_bind_pt_irq xen_domctl_bind_pt_irq_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_bind_pt_irq_t); - /* Bind machine I/O address range -> HVM address range. */ /* If this returns -E2BIG lower nr_mfns value. */ /* XEN_DOMCTL_memory_mapping */ @@ -542,7 +521,6 @@ struct xen_domctl_memory_mapping { typedef struct xen_domctl_memory_mapping xen_domctl_memory_mapping_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_memory_mapping_t); - /* Bind machine I/O port range -> HVM I/O port range. */ /* XEN_DOMCTL_ioport_mapping */ struct xen_domctl_ioport_mapping { @@ -554,7 +532,6 @@ struct xen_domctl_ioport_mapping { typedef struct xen_domctl_ioport_mapping xen_domctl_ioport_mapping_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_ioport_mapping_t); - /* * Pin caching type of RAM space for x86 HVM domU. */ @@ -574,7 +551,6 @@ struct xen_domctl_pin_mem_cacheattr { typedef struct xen_domctl_pin_mem_cacheattr xen_domctl_pin_mem_cacheattr_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_pin_mem_cacheattr_t); - /* XEN_DOMCTL_set_ext_vcpucontext */ /* XEN_DOMCTL_get_ext_vcpucontext */ struct xen_domctl_ext_vcpucontext { @@ -691,7 +667,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_hvmcontext_partial_ typedef struct xen_domctl_disable_migrate { uint32_t disable; /* IN: 1: disable migration and restore */ } xen_domctl_disable_migrate_t; - /* XEN_DOMCTL_gettscinfo */ /* XEN_DOMCTL_settscinfo */ Modified: head/sys/xen/interface/elfnote.h ============================================================================== --- head/sys/xen/interface/elfnote.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/elfnote.h Tue Sep 1 21:21:55 2020 (r365077) @@ -233,7 +233,6 @@ */ #define XEN_ELFNOTE_CRASH_REGS 0x1000002 - /* * xen dump-core none note. * xm dump-core code will create one XEN_ELFNOTE_DUMPCORE_NONE Modified: head/sys/xen/interface/errno.h ============================================================================== --- head/sys/xen/interface/errno.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/errno.h Tue Sep 1 21:21:55 2020 (r365077) @@ -4,7 +4,6 @@ #define XEN_ERRNO(name, value) XEN_##name = value, enum xen_errno { - #else /* !__ASSEMBLY__ */ #define XEN_ERRNO(name, value) .equ XEN_##name, value Modified: head/sys/xen/interface/gcov.h ============================================================================== --- head/sys/xen/interface/gcov.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/gcov.h Tue Sep 1 21:21:55 2020 (r365077) @@ -68,7 +68,6 @@ struct xencov_file char filename[1]; }; - /** * Counters information * Prefixed with XENCOV_TAG_COUNTER(n) where n is 0..(XENCOV_COUNTERS-1) @@ -112,4 +111,3 @@ struct xencov_end }; #endif /* __XEN_PUBLIC_GCOV_H__ */ - Modified: head/sys/xen/interface/grant_table.h ============================================================================== --- head/sys/xen/interface/grant_table.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/grant_table.h Tue Sep 1 21:21:55 2020 (r365077) @@ -429,7 +429,6 @@ struct gnttab_transfer { typedef struct gnttab_transfer gnttab_transfer_t; DEFINE_XEN_GUEST_HANDLE(gnttab_transfer_t); - /* * GNTTABOP_copy: Hypervisor based copy * source and destinations can be eithers MFNs or, for foreign domains, @@ -525,7 +524,6 @@ struct gnttab_set_version { }; typedef struct gnttab_set_version gnttab_set_version_t; DEFINE_XEN_GUEST_HANDLE(gnttab_set_version_t); - /* * GNTTABOP_get_status_frames: Get the list of frames used to store grant Modified: head/sys/xen/interface/hvm/ioreq.h ============================================================================== --- head/sys/xen/interface/hvm/ioreq.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/hvm/ioreq.h Tue Sep 1 21:21:55 2020 (r365077) @@ -124,7 +124,6 @@ typedef struct buffered_iopage buffered_iopage_t; #define ACPI_GPE0_BLK_ADDRESS ACPI_GPE0_BLK_ADDRESS_V0 #define ACPI_GPE0_BLK_LEN ACPI_GPE0_BLK_LEN_V0 - #endif /* _IOREQ_H_ */ /* Modified: head/sys/xen/interface/hvm/save.h ============================================================================== --- head/sys/xen/interface/hvm/save.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/hvm/save.h Tue Sep 1 21:21:55 2020 (r365077) @@ -52,7 +52,6 @@ struct hvm_save_descriptor { uint32_t length; /* In bytes, *not* including this descriptor */ }; - /* * Each entry has a datatype associated with it: for example, the CPU state * is saved as a HVM_SAVE_TYPE(CPU), which has HVM_SAVE_LENGTH(CPU), Modified: head/sys/xen/interface/io/fsif.h ============================================================================== --- head/sys/xen/interface/io/fsif.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/io/fsif.h Tue Sep 1 21:21:55 2020 (r365077) @@ -136,7 +136,6 @@ struct fsif_sync_request { uint32_t fd; }; - /* FS operation request */ struct fsif_request { uint8_t type; /* Type of the request */ @@ -187,6 +186,5 @@ DEFINE_RING_TYPES(fsif, struct fsif_request, struct fs #define STATE_READY "ready" #define STATE_CLOSING "closing" #define STATE_CLOSED "closed" - #endif Modified: head/sys/xen/interface/io/libxenvchan.h ============================================================================== --- head/sys/xen/interface/io/libxenvchan.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/io/libxenvchan.h Tue Sep 1 21:21:55 2020 (r365077) @@ -98,4 +98,3 @@ struct vchan_interface { */ uint32_t grants[0]; }; - Modified: head/sys/xen/interface/io/tpmif.h ============================================================================== --- head/sys/xen/interface/io/tpmif.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/io/tpmif.h Tue Sep 1 21:21:55 2020 (r365077) @@ -102,7 +102,6 @@ enum tpmif_state { * to use atomic operations. */ - /* The shared page for vTPM request/response packets looks like: * * Offset Contents Modified: head/sys/xen/interface/io/vscsiif.h ============================================================================== --- head/sys/xen/interface/io/vscsiif.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/io/vscsiif.h Tue Sep 1 21:21:55 2020 (r365077) @@ -247,7 +247,6 @@ typedef struct vscsiif_response vscsiif_response_t; DEFINE_RING_TYPES(vscsiif, struct vscsiif_request, struct vscsiif_response); - #endif /*__XEN__PUBLIC_IO_SCSI_H__*/ /* * Local variables: Modified: head/sys/xen/interface/kexec.h ============================================================================== --- head/sys/xen/interface/kexec.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/kexec.h Tue Sep 1 21:21:55 2020 (r365077) @@ -27,7 +27,6 @@ #ifndef _XEN_PUBLIC_KEXEC_H #define _XEN_PUBLIC_KEXEC_H - /* This file describes the Kexec / Kdump hypercall interface for Xen. * * Kexec under vanilla Linux allows a user to reboot the physical machine @@ -83,7 +82,6 @@ #define KEXEC_TYPE_DEFAULT 0 #define KEXEC_TYPE_CRASH 1 - /* The kexec implementation for Xen allows the user to load two * types of kernels, KEXEC_TYPE_DEFAULT and KEXEC_TYPE_CRASH. * All data needed for a kexec reboot is kept in one xen_kexec_image_t @@ -92,7 +90,7 @@ * is passed to the "code page" which is one page of code that performs * the final relocations before jumping to the new kernel. */ - + typedef struct xen_kexec_image { #if defined(__i386__) || defined(__x86_64__) unsigned long page_list[KEXEC_XEN_NO_PAGES]; Modified: head/sys/xen/interface/memory.h ============================================================================== --- head/sys/xen/interface/memory.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/memory.h Tue Sep 1 21:21:55 2020 (r365077) @@ -61,7 +61,6 @@ #endif struct xen_memory_reservation { - /* * XENMEM_increase_reservation: * OUT: MFN (*not* GMFN) bases of extents that were allocated Modified: head/sys/xen/interface/physdev.h ============================================================================== --- head/sys/xen/interface/physdev.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/interface/physdev.h Tue Sep 1 21:21:55 2020 (r365077) @@ -148,7 +148,7 @@ struct physdev_irq { }; typedef struct physdev_irq physdev_irq_t; DEFINE_XEN_GUEST_HANDLE(physdev_irq_t); - + #define MAP_PIRQ_TYPE_MSI 0x0 #define MAP_PIRQ_TYPE_GSI 0x1 #define MAP_PIRQ_TYPE_UNKNOWN 0x2 Modified: head/sys/xen/xenbus/xenbusb.c ============================================================================== --- head/sys/xen/xenbus/xenbusb.c Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenbus/xenbusb.c Tue Sep 1 21:21:55 2020 (r365077) @@ -242,7 +242,7 @@ xenbusb_delete_child(device_t dev, device_t child) xs_unregister_watch(&ivars->xd_otherend_watch); if (ivars->xd_local_watch.node != NULL) xs_unregister_watch(&ivars->xd_local_watch); - + device_delete_child(dev, child); xenbusb_free_child_ivars(ivars); } @@ -255,7 +255,6 @@ static void xenbusb_verify_device(device_t dev, device_t child) { if (xs_exists(XST_NIL, xenbus_get_node(child), "") == 0) { - /* * Device tree has been removed from Xenbus. * Tear down the device. Modified: head/sys/xen/xenbus/xenbusb.h ============================================================================== --- head/sys/xen/xenbus/xenbusb.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenbus/xenbusb.h Tue Sep 1 21:21:55 2020 (r365077) @@ -114,7 +114,6 @@ struct xenbusb_softc { * the xenbusb_softc structure. */ typedef enum { - /** * This device is contributing to the xbs_connecting_children * count of its parent bus. Modified: head/sys/xen/xenbus/xenbusb_back.c ============================================================================== --- head/sys/xen/xenbus/xenbusb_back.c Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenbus/xenbusb_back.c Tue Sep 1 21:21:55 2020 (r365077) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include - /*------------------ Private Device Attachment Functions --------------------*/ /** * \brief Probe for the existance of the XenBus back bus. @@ -293,7 +292,7 @@ static device_method_t xenbusb_back_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, xenbusb_resume), - + /* Bus Interface */ DEVMETHOD(bus_print_child, xenbusb_print_child), DEVMETHOD(bus_read_ivar, xenbusb_read_ivar), @@ -302,7 +301,7 @@ static device_method_t xenbusb_back_methods[] = { DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - + /* XenBus Bus Interface */ DEVMETHOD(xenbusb_enumerate_type, xenbusb_back_enumerate_type), DEVMETHOD(xenbusb_get_otherend_node, xenbusb_back_get_otherend_node), @@ -314,6 +313,6 @@ static device_method_t xenbusb_back_methods[] = { DEFINE_CLASS_0(xenbusb_back, xenbusb_back_driver, xenbusb_back_methods, sizeof(struct xenbusb_softc)); devclass_t xenbusb_back_devclass; - + DRIVER_MODULE(xenbusb_back, xenstore, xenbusb_back_driver, xenbusb_back_devclass, 0, 0); Modified: head/sys/xen/xenbus/xenbusb_front.c ============================================================================== --- head/sys/xen/xenbus/xenbusb_front.c Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenbus/xenbusb_front.c Tue Sep 1 21:21:55 2020 (r365077) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include - /*------------------ Private Device Attachment Functions --------------------*/ /** * \brief Probe for the existance of the XenBus front bus. @@ -172,7 +171,7 @@ static device_method_t xenbusb_front_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, xenbusb_resume), - + /* Bus Interface */ DEVMETHOD(bus_print_child, xenbusb_print_child), DEVMETHOD(bus_read_ivar, xenbusb_read_ivar), @@ -181,7 +180,7 @@ static device_method_t xenbusb_front_methods[] = { DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - + /* XenBus Bus Interface */ DEVMETHOD(xenbusb_enumerate_type, xenbusb_front_enumerate_type), DEVMETHOD(xenbusb_get_otherend_node, xenbusb_front_get_otherend_node), @@ -191,6 +190,6 @@ static device_method_t xenbusb_front_methods[] = { DEFINE_CLASS_0(xenbusb_front, xenbusb_front_driver, xenbusb_front_methods, sizeof(struct xenbusb_softc)); devclass_t xenbusb_front_devclass; - + DRIVER_MODULE(xenbusb_front, xenstore, xenbusb_front_driver, xenbusb_front_devclass, 0, 0); Modified: head/sys/xen/xenstore/xenstorevar.h ============================================================================== --- head/sys/xen/xenstore/xenstorevar.h Tue Sep 1 21:21:19 2020 (r365076) +++ head/sys/xen/xenstore/xenstorevar.h Tue Sep 1 21:21:55 2020 (r365077) @@ -332,7 +332,7 @@ int xs_gather(struct xs_transaction t, const char *dir * xenbus_watch objects, to watch the same path in the XenStore. */ int xs_register_watch(struct xs_watch *watch); - + /** * Unregister a XenStore watch. * @@ -368,4 +368,3 @@ void xs_lock(void); void xs_unlock(void); #endif /* _XEN_XENSTORE_XENSTOREVAR_H */ - From owner-svn-src-all@freebsd.org Tue Sep 1 21:23:04 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 671EF3797B4; Tue, 1 Sep 2020 21:23:04 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0RD2Wh1z4Jp5; Tue, 1 Sep 2020 21:23:04 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 39A8B1FD92; Tue, 1 Sep 2020 21:23:04 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LN4Gb024360; Tue, 1 Sep 2020 21:23:04 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LN0no024341; Tue, 1 Sep 2020 21:23:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012123.081LN0no024341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:23:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365078 - in head/sys/ufs: ffs ufs X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/ufs: ffs ufs X-SVN-Commit-Revision: 365078 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:23:04 -0000 Author: mjg Date: Tue Sep 1 21:23:00 2020 New Revision: 365078 URL: https://svnweb.freebsd.org/changeset/base/365078 Log: ufs: clean up empty lines in .c and .h files Modified: head/sys/ufs/ffs/ffs_alloc.c head/sys/ufs/ffs/ffs_balloc.c head/sys/ufs/ffs/ffs_extern.h head/sys/ufs/ffs/ffs_inode.c head/sys/ufs/ffs/ffs_rawread.c head/sys/ufs/ffs/ffs_softdep.c head/sys/ufs/ffs/ffs_subr.c head/sys/ufs/ffs/ffs_vfsops.c head/sys/ufs/ffs/ffs_vnops.c head/sys/ufs/ufs/dirhash.h head/sys/ufs/ufs/inode.h head/sys/ufs/ufs/ufs_acl.c head/sys/ufs/ufs/ufs_bmap.c head/sys/ufs/ufs/ufs_dirhash.c head/sys/ufs/ufs/ufs_extattr.c head/sys/ufs/ufs/ufs_vfsops.c head/sys/ufs/ufs/ufs_vnops.c Modified: head/sys/ufs/ffs/ffs_alloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_alloc.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ffs/ffs_alloc.c Tue Sep 1 21:23:00 2020 (r365078) @@ -550,7 +550,7 @@ ffs_reallocblks(ap) return (ffs_reallocblks_ufs1(ap)); return (ffs_reallocblks_ufs2(ap)); } - + static int ffs_reallocblks_ufs1(ap) struct vop_reallocblks_args /* { @@ -3243,7 +3243,6 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) filetype = IFREG; switch (oidp->oid_number) { - case FFS_SET_FLAGS: #ifdef DIAGNOSTIC if (fsckcmds) @@ -3511,7 +3510,6 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) #endif /* DIAGNOSTIC */ error = EINVAL; break; - } fdrop(fp, td); vn_finished_write(mp); Modified: head/sys/ufs/ffs/ffs_balloc.c ============================================================================== --- head/sys/ufs/ffs/ffs_balloc.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ffs/ffs_balloc.c Tue Sep 1 21:23:00 2020 (r365078) @@ -615,7 +615,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i if (DOINGSOFTDEP(vp)) softdep_prealloc(vp, MNT_WAIT); - + /* * Check for allocating external data. */ Modified: head/sys/ufs/ffs/ffs_extern.h ============================================================================== --- head/sys/ufs/ffs/ffs_extern.h Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ffs/ffs_extern.h Tue Sep 1 21:23:00 2020 (r365078) @@ -202,7 +202,6 @@ void softdep_buf_append(struct buf *, struct workhead void softdep_inode_append(struct inode *, struct ucred *, struct workhead *); void softdep_freework(struct workhead *); - /* * Things to request flushing in softdep_request_cleanup() */ Modified: head/sys/ufs/ffs/ffs_inode.c ============================================================================== --- head/sys/ufs/ffs/ffs_inode.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ffs/ffs_inode.c Tue Sep 1 21:23:00 2020 (r365078) @@ -517,7 +517,7 @@ ffs_truncate(vp, length, flags, cred) } UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); allerror = ffs_update(vp, waitforupdate); - + /* * Having written the new inode to disk, save its new configuration * and put back the old block pointers long enough to process them. @@ -795,4 +795,3 @@ ffs_rdonly(struct inode *ip) return (ITOFS(ip)->fs_ronly != 0); } - Modified: head/sys/ufs/ffs/ffs_rawread.c ============================================================================== --- head/sys/ufs/ffs/ffs_rawread.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ffs/ffs_rawread.c Tue Sep 1 21:23:00 2020 (r365078) @@ -183,7 +183,6 @@ ffs_rawread_sync(struct vnode *vp) return 0; } - static int ffs_rawread_readahead(struct vnode *vp, caddr_t udata, @@ -201,9 +200,9 @@ ffs_rawread_readahead(struct vnode *vp, int bforwards; struct inode *ip; ufs2_daddr_t blkno; - + bsize = vp->v_mount->mnt_stat.f_iosize; - + ip = VTOI(vp); dp = ITODEVVP(ip); @@ -223,14 +222,13 @@ ffs_rawread_readahead(struct vnode *vp, if ((daddr_t) blockno != blockno) { return EINVAL; /* blockno overflow */ } - + bp->b_lblkno = bp->b_blkno = blockno; - + error = ufs_bmaparray(vp, bp->b_lblkno, &blkno, NULL, &bforwards, NULL); if (error != 0) return error; if (blkno == -1) { - /* Fill holes with NULs to preserve semantics */ if (bp->b_bcount + blockoff * DEV_BSIZE > bsize) @@ -251,19 +249,18 @@ ffs_rawread_readahead(struct vnode *vp, } bp->b_blkno = blkno + blockoff; bp->b_offset = bp->b_iooffset = (blkno + blockoff) * DEV_BSIZE; - + if (bp->b_bcount + blockoff * DEV_BSIZE > bsize * (1 + bforwards)) bp->b_bcount = bsize * (1 + bforwards) - blockoff * DEV_BSIZE; bp->b_bufsize = bp->b_bcount; - + if (vmapbuf(bp, 1) < 0) return EFAULT; - + BO_STRATEGY(&dp->v_bufobj, bp); return 0; } - static int ffs_rawread_main(struct vnode *vp, struct uio *uio) @@ -275,7 +272,7 @@ ffs_rawread_main(struct vnode *vp, long resid; off_t offset; struct thread *td; - + td = uio->uio_td ? uio->uio_td : curthread; udata = uio->uio_iov->iov_base; resid = uio->uio_resid; @@ -285,13 +282,13 @@ ffs_rawread_main(struct vnode *vp, * keep the process from being swapped */ PHOLD(td->td_proc); - + error = 0; nerror = 0; - + bp = NULL; nbp = NULL; - + while (resid > 0) { if (bp == NULL) { /* Setup first read */ @@ -391,7 +388,7 @@ ffs_rawread_main(struct vnode *vp, break; } } - + if (bp != NULL) { pbrelvp(bp); uma_zfree(ffsraw_pbuf_zone, bp); @@ -402,7 +399,7 @@ ffs_rawread_main(struct vnode *vp, pbrelvp(nbp); uma_zfree(ffsraw_pbuf_zone, nbp); } - + if (error == 0) error = nerror; PRELE(td->td_proc); @@ -411,7 +408,6 @@ ffs_rawread_main(struct vnode *vp, uio->uio_offset = offset; return error; } - int ffs_rawread(struct vnode *vp, Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ffs/ffs_softdep.c Tue Sep 1 21:23:00 2020 (r365078) @@ -181,7 +181,7 @@ softdep_setup_allocdirect(ip, lbn, newblkno, oldblkno, long oldsize; struct buf *bp; { - + panic("softdep_setup_allocdirect called"); } @@ -195,7 +195,7 @@ softdep_setup_allocext(ip, lbn, newblkno, oldblkno, ne long oldsize; struct buf *bp; { - + panic("softdep_setup_allocext called"); } @@ -232,7 +232,7 @@ softdep_journal_freeblocks(ip, cred, length, flags) off_t length; int flags; { - + panic("softdep_journal_freeblocks called"); } @@ -250,7 +250,7 @@ softdep_setup_freeblocks(ip, length, flags) off_t length; int flags; { - + panic("softdep_setup_freeblocks called"); } @@ -297,7 +297,7 @@ softdep_setup_remove(bp, dp, ip, isrmdir) struct inode *ip; int isrmdir; { - + panic("softdep_setup_remove called"); } @@ -540,7 +540,7 @@ softdep_check_suspend(struct mount *mp, { struct bufobj *bo; int error; - + (void) softdep_depcnt, (void) softdep_accdepcnt; @@ -2425,7 +2425,7 @@ indirblk_insert(freework) jseg = TAILQ_LAST(&jblocks->jb_segs, jseglst); if (jseg == NULL) return; - + LIST_INSERT_HEAD(&jseg->js_indirs, freework, fw_segs); TAILQ_INSERT_HEAD(INDIR_HASH(ump, freework->fw_blkno), freework, fw_next); @@ -5163,7 +5163,7 @@ softdep_setup_blkmapdep(bp, mp, newblkno, frags, oldfr uint8_t *blksfree; long bno; int i; - + cgp = (struct cg *)bp->b_data; blksfree = cg_blksfree(cgp); bno = dtogd(fs, jnewblk->jn_blkno); @@ -6325,7 +6325,6 @@ setup_trunc_indir(freeblks, ip, lbn, lastlbn, blkno) int error; int off; - freework = NULL; if (blkno == 0) return (0); @@ -7463,7 +7462,6 @@ cancel_allocdirect(adphead, adp, freeblks) WORKLIST_INSERT(&freeblks->fb_freeworkhd, &newblk->nb_list); } - /* * Cancel a new block allocation. May be an indirect or direct block. We * remove it from various lists and return any journal record that needs to @@ -9211,7 +9209,6 @@ dirrem_journal(dirrem, jremref, dotremref, dotdotremre { struct inodedep *inodedep; - if (inodedep_lookup(jremref->jr_list.wk_mp, jremref->jr_ref.if_ino, 0, &inodedep) == 0) panic("dirrem_journal: Lost inodedep"); @@ -10058,7 +10055,6 @@ handle_workitem_freefile(freefile) FREE_LOCK(ump); } - /* * Helper function which unlinks marker element from work list and returns * the next element on the list. @@ -10067,7 +10063,7 @@ static __inline struct worklist * markernext(struct worklist *marker) { struct worklist *next; - + next = LIST_NEXT(marker, wk_list); LIST_REMOVE(marker, wk_list); return next; @@ -10132,7 +10128,6 @@ softdep_disk_io_initiation(bp) wk = markernext(&marker)) { LIST_INSERT_AFTER(wk, &marker, wk_list); switch (wk->wk_type) { - case D_PAGEDEP: initiate_write_filepage(WK_PAGEDEP(wk), bp); continue; @@ -11172,7 +11167,6 @@ softdep_disk_write_complete(bp) if ((bp->b_ioflags & BIO_ERROR) != 0 && (bp->b_flags & B_INVAL) == 0) { LIST_FOREACH(wk, &bp->b_dep, wk_list) { switch (wk->wk_type) { - case D_PAGEDEP: handle_written_filepage(WK_PAGEDEP(wk), bp, 0); continue; @@ -11214,7 +11208,6 @@ softdep_disk_write_complete(bp) panic("duplicate worklist: %p\n", wk); owk = wk; switch (wk->wk_type) { - case D_PAGEDEP: if (handle_written_filepage(WK_PAGEDEP(wk), bp, WRITESUCCEEDED)) @@ -12890,7 +12883,6 @@ softdep_sync_buf(struct vnode *vp, struct buf *bp, int top: LIST_FOREACH(wk, &bp->b_dep, wk_list) { switch (wk->wk_type) { - case D_ALLOCDIRECT: case D_ALLOCINDIR: newblk = WK_NEWBLK(wk); @@ -13786,7 +13778,6 @@ request_cleanup(mp, resource) * the cleanup for us. */ switch (resource) { - case FLUSH_INODES: case FLUSH_INODES_WAIT: ACQUIRE_GBLLOCK(&lk); @@ -14192,7 +14183,6 @@ softdep_count_dependencies(bp, wantcount) ACQUIRE_LOCK(ump); LIST_FOREACH(wk, &bp->b_dep, wk_list) { switch (wk->wk_type) { - case D_INODEDEP: inodedep = WK_INODEDEP(wk); if ((inodedep->id_state & DEPCOMPLETE) == 0) { @@ -14250,7 +14240,6 @@ softdep_count_dependencies(bp, wantcount) } } for (i = 0; i < DAHASHSZ; i++) { - LIST_FOREACH(dap, &pagedep->pd_diraddhd[i], da_pdlist) { /* directory entry dependency */ retval += 1; @@ -14388,7 +14377,6 @@ getdirtybuf(bp, lock, waitfor) return (bp); } - /* * Check if it is safe to suspend the file system now. On entry, * the vnode interlock for devvp should be held. Return 0 with @@ -14501,7 +14489,6 @@ softdep_check_suspend(struct mount *mp, BO_UNLOCK(bo); return (error); } - /* * Get the number of dependency structures for the file system, both Modified: head/sys/ufs/ffs/ffs_subr.c ============================================================================== --- head/sys/ufs/ffs/ffs_subr.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ffs/ffs_subr.c Tue Sep 1 21:23:00 2020 (r365078) @@ -471,7 +471,7 @@ ffs_isblock(struct fs *fs, unsigned char *cp, ufs1_dad int ffs_isfreeblock(struct fs *fs, u_char *cp, ufs1_daddr_t h) { - + switch ((int)fs->fs_frag) { case 8: return (cp[h] == 0); @@ -526,7 +526,6 @@ ffs_setblock(struct fs *fs, unsigned char *cp, ufs1_da { switch ((int)fs->fs_frag) { - case 8: cp[h] = 0xff; return; Modified: head/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vfsops.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ffs/ffs_vfsops.c Tue Sep 1 21:23:00 2020 (r365078) @@ -873,7 +873,7 @@ ffs_reload(struct mount *mp, struct thread *td, int fl return (EINVAL); } MNT_IUNLOCK(mp); - + /* * Step 1: invalidate all cached meta-data. */ @@ -2419,7 +2419,6 @@ ffs_backgroundwritedone(struct buf *bp) BO_UNLOCK(bufobj); } - /* * Write, release buffer on completion. (Done by iodone * if async). Do not bother writing anything if the buffer @@ -2533,7 +2532,6 @@ ffs_bufwrite(struct buf *bp) /* Mark the buffer clean */ bundirty(bp); - /* Let the normal bufwrite do the rest for us */ normal_write: /* @@ -2545,7 +2543,6 @@ normal_write: } return (bufwrite(bp)); } - static void ffs_geom_strategy(struct bufobj *bo, struct buf *bp) Modified: head/sys/ufs/ffs/ffs_vnops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vnops.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ffs/ffs_vnops.c Tue Sep 1 21:23:00 2020 (r365078) @@ -1182,7 +1182,6 @@ ffs_extwrite(struct vnode *vp, struct uio *uio, int io return (error); } - /* * Vnode operating to retrieve a named extended attribute. * @@ -1411,7 +1410,6 @@ struct vop_openextattr_args { return (ffs_open_ea(ap->a_vp, ap->a_cred, ap->a_td)); } - /* * Vnode extattr transaction commit/abort */ @@ -1473,7 +1471,6 @@ vop_deleteextattr { error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, ap->a_cred, ap->a_td, VWRITE); if (error) { - /* * ffs_lock_ea is not needed there, because the vnode * must be exclusively locked. @@ -1675,7 +1672,6 @@ vop_setextattr { error = extattr_check_cred(ap->a_vp, ap->a_attrnamespace, ap->a_cred, ap->a_td, VWRITE); if (error) { - /* * ffs_lock_ea is not needed there, because the vnode * must be exclusively locked. @@ -1836,4 +1832,3 @@ ffs_getpages_async(struct vop_getpages_async_args *ap) return (error); } - Modified: head/sys/ufs/ufs/dirhash.h ============================================================================== --- head/sys/ufs/ufs/dirhash.h Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ufs/dirhash.h Tue Sep 1 21:23:00 2020 (r365078) @@ -112,7 +112,6 @@ struct dirhash { TAILQ_ENTRY(dirhash) dh_list; /* chain of all dirhashes */ }; - /* * Dirhash functions. */ Modified: head/sys/ufs/ufs/inode.h ============================================================================== --- head/sys/ufs/ufs/inode.h Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ufs/inode.h Tue Sep 1 21:23:00 2020 (r365078) @@ -87,7 +87,6 @@ struct inode { u_int32_t i_flag; /* flags, see below */ int i_effnlink; /* i_nlink when I/O completes */ - /* * Side effects; used during directory lookup. */ Modified: head/sys/ufs/ufs/ufs_acl.c ============================================================================== --- head/sys/ufs/ufs/ufs_acl.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ufs/ufs_acl.c Tue Sep 1 21:23:00 2020 (r365078) @@ -87,7 +87,7 @@ ufs_sync_acl_from_inode(struct inode *ip, struct acl * ACL_USER_OBJ, ip->i_mode); acl->acl_entry[i].ae_id = ACL_UNDEFINED_ID; break; - + case ACL_GROUP_OBJ: acl_group_obj = &acl->acl_entry[i]; acl->acl_entry[i].ae_id = ACL_UNDEFINED_ID; @@ -107,7 +107,7 @@ ufs_sync_acl_from_inode(struct inode *ip, struct acl * case ACL_USER: case ACL_GROUP: break; - + default: panic("ufs_sync_acl_from_inode(): bad ae_tag"); } Modified: head/sys/ufs/ufs/ufs_bmap.c ============================================================================== --- head/sys/ufs/ufs/ufs_bmap.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ufs/ufs_bmap.c Tue Sep 1 21:23:00 2020 (r365078) @@ -185,7 +185,6 @@ ufs_bmaparray(vp, bn, bnp, nbp, runp, runb) *runb = 0; } - ap = a; nump = # error = ufs_getlbns(vp, bn, ap, nump); @@ -242,7 +241,6 @@ ufs_bmaparray(vp, bn, bnp, nbp, runp, runb) } return (0); } - /* Get disk address out of indirect block array */ daddr = DIP(ip, i_ib[ap->in_off]); Modified: head/sys/ufs/ufs/ufs_dirhash.c ============================================================================== --- head/sys/ufs/ufs/ufs_dirhash.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ufs/ufs_dirhash.c Tue Sep 1 21:23:00 2020 (r365078) @@ -94,7 +94,6 @@ SYSCTL_PROC(_vfs_ufs, OID_AUTO, dirhash_reclaimpercent 0, 0, ufsdirhash_set_reclaimpercent, "I", "set percentage of dirhash cache to be removed in low VM events"); - static int ufsdirhash_hash(struct dirhash *dh, char *name, int namelen); static void ufsdirhash_adjfree(struct dirhash *dh, doff_t offset, int diff); static void ufsdirhash_delslot(struct dirhash *dh, int slot); @@ -813,7 +812,7 @@ ufsdirhash_add(struct inode *ip, struct direct *dirp, if ((dh = ufsdirhash_acquire(ip)) == NULL) return; - + KASSERT(offset < dh->dh_dirblks * DIRBLKSIZ, ("ufsdirhash_add: bad offset")); /* @@ -1187,7 +1186,7 @@ ufsdirhash_destroy(struct dirhash *dh) int i, mem, narrays; KASSERT(dh->dh_hash != NULL, ("dirhash: NULL hash on list")); - + /* Remove it from the list and detach its memory. */ TAILQ_REMOVE(&ufsdirhash_list, dh, dh_list); dh->dh_onlist = 0; Modified: head/sys/ufs/ufs/ufs_extattr.c ============================================================================== --- head/sys/ufs/ufs/ufs_extattr.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ufs/ufs_extattr.c Tue Sep 1 21:23:00 2020 (r365078) @@ -441,7 +441,7 @@ ufs_extattr_iterate_directory(struct ufsmount *ump, st } } free(dirbuf, M_TEMP); - + return (0); } @@ -623,7 +623,7 @@ ufs_extattr_enable(struct ufsmount *ump, int attrnames attribute->uele_attrnamespace = attrnamespace; bzero(&attribute->uele_fileheader, sizeof(struct ufs_extattr_fileheader)); - + attribute->uele_backing_vnode = backing_vnode; auio.uio_iov = &aiov; @@ -901,7 +901,7 @@ ufs_extattr_get(struct vnode *vp, int attrnamespace, c local_aio.uio_td = td; local_aio.uio_offset = base_offset; local_aio.uio_resid = sizeof(struct ufs_extattr_header); - + /* * Acquire locks. * @@ -1002,7 +1002,6 @@ vop_deleteextattr { error = ufs_extattr_rm(ap->a_vp, ap->a_attrnamespace, ap->a_name, ap->a_cred, ap->a_td); - ufs_extattr_uepm_unlock(ump); Modified: head/sys/ufs/ufs/ufs_vfsops.c ============================================================================== --- head/sys/ufs/ufs/ufs_vfsops.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ufs/ufs_vfsops.c Tue Sep 1 21:23:00 2020 (r365078) @@ -108,7 +108,6 @@ ufs_quotactl(mp, cmds, id, arg) type = cmds & SUBCMDMASK; if (id == -1) { switch (type) { - case USRQUOTA: id = td->td_ucred->cr_ruid; break; Modified: head/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- head/sys/ufs/ufs/ufs_vnops.c Tue Sep 1 21:21:55 2020 (r365077) +++ head/sys/ufs/ufs/ufs_vnops.c Tue Sep 1 21:23:00 2020 (r365078) @@ -1741,7 +1741,7 @@ ufs_do_posix1e_acl_inheritance_dir(struct vnode *dvp, DIP_SET(ip, i_mode, dmode); error = 0; goto out; - + default: goto out; } @@ -2108,7 +2108,7 @@ ufs_mkdir(ap) goto bad; ufs_makedirentry(ip, cnp, &newdir); error = ufs_direnter(dvp, tvp, &newdir, cnp, bp, 0); - + bad: if (error == 0) { *ap->a_vpp = tvp; From owner-svn-src-all@freebsd.org Tue Sep 1 21:24:08 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2B5713797DA; Tue, 1 Sep 2020 21:24:08 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0SS0lmbz4Jpr; Tue, 1 Sep 2020 21:24:08 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F23C81FD74; Tue, 1 Sep 2020 21:24:07 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LO7f8024485; Tue, 1 Sep 2020 21:24:07 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LNxIX024438; Tue, 1 Sep 2020 21:23:59 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012123.081LNxIX024438@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:23:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365079 - in head/sys/x86: acpica cpufreq include iommu isa pci x86 xen X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/x86: acpica cpufreq include iommu isa pci x86 xen X-SVN-Commit-Revision: 365079 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:24:08 -0000 Author: mjg Date: Tue Sep 1 21:23:59 2020 New Revision: 365079 URL: https://svnweb.freebsd.org/changeset/base/365079 Log: x86: clean up empty lines in .c and .h files Modified: head/sys/x86/acpica/madt.c head/sys/x86/cpufreq/est.c head/sys/x86/cpufreq/hwpstate_amd.c head/sys/x86/cpufreq/p4tcc.c head/sys/x86/cpufreq/powernow.c head/sys/x86/cpufreq/smist.c head/sys/x86/include/acpica_machdep.h head/sys/x86/include/apicreg.h head/sys/x86/include/apicvar.h head/sys/x86/include/apm_bios.h head/sys/x86/include/bus.h head/sys/x86/include/bus_dma.h head/sys/x86/include/elf.h head/sys/x86/iommu/intel_drv.c head/sys/x86/iommu/intel_idpgtbl.c head/sys/x86/isa/atpic.c head/sys/x86/isa/atrtc.c head/sys/x86/isa/clock.c head/sys/x86/isa/isa.c head/sys/x86/isa/isa_dma.c head/sys/x86/isa/nmi.c head/sys/x86/isa/orm.c head/sys/x86/pci/pci_bus.c head/sys/x86/pci/qpi.c head/sys/x86/x86/busdma_bounce.c head/sys/x86/x86/identcpu.c head/sys/x86/x86/io_apic.c head/sys/x86/x86/legacy.c head/sys/x86/x86/local_apic.c head/sys/x86/x86/mca.c head/sys/x86/x86/mp_x86.c head/sys/x86/x86/mptable.c head/sys/x86/x86/mptable_pci.c head/sys/x86/x86/nexus.c head/sys/x86/x86/x86_mem.c head/sys/x86/xen/hvm.c head/sys/x86/xen/pv.c head/sys/x86/xen/xen_apic.c head/sys/x86/xen/xen_intr.c head/sys/x86/xen/xen_nexus.c Modified: head/sys/x86/acpica/madt.c ============================================================================== --- head/sys/x86/acpica/madt.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/acpica/madt.c Tue Sep 1 21:23:59 2020 (r365079) @@ -405,7 +405,6 @@ madt_setup_cpus_handler(ACPI_SUBTABLE_HEADER *entry, v } } - /* * Add an I/O APIC from an entry in the table. */ Modified: head/sys/x86/cpufreq/est.c ============================================================================== --- head/sys/x86/cpufreq/est.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/cpufreq/est.c Tue Sep 1 21:23:59 2020 (r365079) @@ -888,7 +888,6 @@ static device_method_t est_methods[] = { /* ACPI interface */ DEVMETHOD(acpi_get_features, est_features), - {0, 0} }; Modified: head/sys/x86/cpufreq/hwpstate_amd.c ============================================================================== --- head/sys/x86/cpufreq/hwpstate_amd.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/cpufreq/hwpstate_amd.c Tue Sep 1 21:23:59 2020 (r365079) @@ -153,7 +153,6 @@ static device_method_t hwpstate_methods[] = { /* ACPI interface */ DEVMETHOD(acpi_get_features, hwpstate_features), - {0, 0} }; Modified: head/sys/x86/cpufreq/p4tcc.c ============================================================================== --- head/sys/x86/cpufreq/p4tcc.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/cpufreq/p4tcc.c Tue Sep 1 21:23:59 2020 (r365079) @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include "acpi_if.h" - + struct p4tcc_softc { device_t dev; int set_count; @@ -97,7 +97,6 @@ static device_method_t p4tcc_methods[] = { /* ACPI interface */ DEVMETHOD(acpi_get_features, p4tcc_features), - {0, 0} }; Modified: head/sys/x86/cpufreq/powernow.c ============================================================================== --- head/sys/x86/cpufreq/powernow.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/cpufreq/powernow.c Tue Sep 1 21:23:59 2020 (r365079) @@ -146,7 +146,6 @@ struct pst_header { #define ACPI_PN8_CTRL_TO_RVO(x) (((x) >> 28) & 0x03) #define ACPI_PN8_CTRL_TO_IRT(x) (((x) >> 30) & 0x03) - #define WRITE_FIDVID(fid, vid, ctrl) \ wrmsr(MSR_AMDK7_FIDVID_CTL, \ (((ctrl) << 32) | (1ULL << 16) | ((vid) << 8) | (fid))) @@ -169,7 +168,6 @@ static int pn7_fid_to_mult[32] = { 150, 225, 160, 165, 170, 180, 0, 0, }; - static int pn8_fid_to_mult[64] = { 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100, 105, 110, 115, @@ -262,7 +260,6 @@ static device_method_t pn_methods[] = { DEVMETHOD(cpufreq_drv_get, pn_get), DEVMETHOD(cpufreq_drv_settings, pn_settings), DEVMETHOD(cpufreq_drv_type, pn_type), - {0, 0} }; Modified: head/sys/x86/cpufreq/smist.c ============================================================================== --- head/sys/x86/cpufreq/smist.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/cpufreq/smist.c Tue Sep 1 21:23:59 2020 (r365079) @@ -100,7 +100,6 @@ static device_method_t smist_methods[] = { DEVMETHOD(cpufreq_drv_get, smist_get), DEVMETHOD(cpufreq_drv_type, smist_type), DEVMETHOD(cpufreq_drv_settings, smist_settings), - {0, 0} }; Modified: head/sys/x86/include/acpica_machdep.h ============================================================================== --- head/sys/x86/include/acpica_machdep.h Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/include/acpica_machdep.h Tue Sep 1 21:23:59 2020 (r365079) @@ -70,7 +70,7 @@ int acpi_release_global_lock(volatile uint32_t *); #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) do { \ (Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock)); \ } while (0) - + enum intr_trigger; enum intr_polarity; Modified: head/sys/x86/include/apicreg.h ============================================================================== --- head/sys/x86/include/apicreg.h Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/include/apicreg.h Tue Sep 1 21:23:59 2020 (r365079) @@ -110,12 +110,10 @@ * 3F0 Reserved */ - /****************************************************************************** * global defines, etc. */ - /****************************************************************************** * LOCAL APIC structure */ @@ -286,7 +284,6 @@ typedef struct IOAPIC ioapic_t; #endif /* !LOCORE */ - /****************************************************************************** * various code 'logical' values */ @@ -411,7 +408,6 @@ typedef struct IOAPIC ioapic_t; #define APIC_LVT_RIRR 0x00004000 #define APIC_LVT_TM 0x00008000 #define APIC_LVT_M 0x00010000 - /* fields in LVT Timer */ #define APIC_LVTT_VECTOR 0x000000ff Modified: head/sys/x86/include/apicvar.h ============================================================================== --- head/sys/x86/include/apicvar.h Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/include/apicvar.h Tue Sep 1 21:23:59 2020 (r365079) @@ -229,7 +229,6 @@ struct apic_ops { void (*disable_vector)(u_int, u_int); void (*free_vector)(u_int, u_int, u_int); - /* PMC */ int (*enable_pmc)(void); void (*disable_pmc)(void); Modified: head/sys/x86/include/apm_bios.h ============================================================================== --- head/sys/x86/include/apm_bios.h Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/include/apm_bios.h Tue Sep 1 21:23:59 2020 (r365079) @@ -76,7 +76,6 @@ #define APME_NOPMEVENT 0x80 #define APME_NOAPMPRESENT 0x86 - /* device code */ #define PMDV_APMBIOS 0x0000 #define PMDV_ALLDEV 0x0001 Modified: head/sys/x86/include/bus.h ============================================================================== --- head/sys/x86/include/bus.h Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/include/bus.h Tue Sep 1 21:23:59 2020 (r365079) @@ -194,7 +194,6 @@ bus_space_free(bus_space_tag_t t __unused, bus_space_h { } - /* * Read a 1, 2, 4, or 8 byte quantity from bus space * described by tag/handle/offset. @@ -361,7 +360,6 @@ static __inline void bus_space_read_region_4(bus_space bus_space_handle_t bsh, bus_size_t offset, u_int32_t *addr, size_t count); - static __inline void bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, Modified: head/sys/x86/include/bus_dma.h ============================================================================== --- head/sys/x86/include/bus_dma.h Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/include/bus_dma.h Tue Sep 1 21:23:59 2020 (r365079) @@ -192,4 +192,3 @@ _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t } #endif /* !_X86_BUS_DMA_H_ */ - Modified: head/sys/x86/include/elf.h ============================================================================== --- head/sys/x86/include/elf.h Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/include/elf.h Tue Sep 1 21:23:59 2020 (r365079) @@ -122,7 +122,6 @@ typedef struct { /* Auxiliary vector entry on initial } a_un; } Elf32_Auxinfo; - typedef struct { /* Auxiliary vector entry on initial stack */ long a_type; /* Entry type. */ union { Modified: head/sys/x86/iommu/intel_drv.c ============================================================================== --- head/sys/x86/iommu/intel_drv.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/iommu/intel_drv.c Tue Sep 1 21:23:59 2020 (r365079) @@ -866,7 +866,6 @@ dmar_find_nonpci(u_int id, u_int entry_type, uint16_t return (NULL); } - struct dmar_unit * dmar_find_hpet(device_t dev, uint16_t *rid) { Modified: head/sys/x86/iommu/intel_idpgtbl.c ============================================================================== --- head/sys/x86/iommu/intel_idpgtbl.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/iommu/intel_idpgtbl.c Tue Sep 1 21:23:59 2020 (r365079) @@ -267,7 +267,7 @@ end: dmar_flush_write_bufs(unit); DMAR_UNLOCK(unit); } - + return (res); } Modified: head/sys/x86/isa/atpic.c ============================================================================== --- head/sys/x86/isa/atpic.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/isa/atpic.c Tue Sep 1 21:23:59 2020 (r365079) @@ -310,7 +310,6 @@ atpic_disable_intr(struct intsrc *isrc) { } - static int atpic_vector(struct intsrc *isrc) { @@ -562,7 +561,7 @@ static int atpic_probe(device_t dev) { int result; - + result = ISA_PNP_PROBE(device_get_parent(dev), dev, atpic_ids); if (result <= 0) device_quiet(dev); Modified: head/sys/x86/isa/atrtc.c ============================================================================== --- head/sys/x86/isa/atrtc.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/isa/atrtc.c Tue Sep 1 21:23:59 2020 (r365079) @@ -617,7 +617,6 @@ static device_method_t atrtc_isa_methods[] = { /* clock interface */ DEVMETHOD(clock_gettime, atrtc_gettime), DEVMETHOD(clock_settime, atrtc_settime), - { 0, 0 } }; @@ -639,7 +638,6 @@ static device_method_t atrtc_acpi_methods[] = { /* clock interface */ DEVMETHOD(clock_gettime, atrtc_gettime), DEVMETHOD(clock_settime, atrtc_settime), - { 0, 0 } }; Modified: head/sys/x86/isa/clock.c ============================================================================== --- head/sys/x86/isa/clock.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/isa/clock.c Tue Sep 1 21:23:59 2020 (r365079) @@ -543,7 +543,7 @@ attimer_stop(struct eventtimer *et) { device_t dev = (device_t)et->et_priv; struct attimer_softc *sc = device_get_softc(dev); - + sc->mode = MODE_STOP; sc->period = 0; set_i8254_freq(sc->mode, sc->period); @@ -563,7 +563,7 @@ static int attimer_probe(device_t dev) { int result; - + result = ISA_PNP_PROBE(device_get_parent(dev), dev, attimer_ids); /* ENOENT means no PnP-ID, device is hinted. */ if (result == ENOENT) { Modified: head/sys/x86/isa/isa.c ============================================================================== --- head/sys/x86/isa/isa.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/isa/isa.c Tue Sep 1 21:23:59 2020 (r365079) @@ -97,7 +97,7 @@ isa_alloc_resource(device_t bus, device_t child, int t struct isa_device* idev = DEVTOISA(child); struct resource_list *rl = &idev->id_resources; struct resource_list_entry *rle; - + if (!passthrough && !isdefault) { rle = resource_list_find(rl, type, *rid); if (!rle) { Modified: head/sys/x86/isa/isa_dma.c ============================================================================== --- head/sys/x86/isa/isa_dma.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/isa/isa_dma.c Tue Sep 1 21:23:59 2020 (r365079) @@ -95,7 +95,6 @@ isa_dma_init(int chan, u_int bouncebufsize, int flag) panic("isa_dma_init: channel out of range"); #endif - /* Try malloc() first. It works better if it works. */ buf = malloc(bouncebufsize, M_DEVBUF, flag); if (buf != NULL) { @@ -576,7 +575,7 @@ static int atdma_probe(device_t dev) { int result; - + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, atdma_ids)) <= 0) device_quiet(dev); return(result); Modified: head/sys/x86/isa/nmi.c ============================================================================== --- head/sys/x86/isa/nmi.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/isa/nmi.c Tue Sep 1 21:23:59 2020 (r365079) @@ -61,7 +61,7 @@ isa_nmi(int cd) int eisa_port = inb(0x461); log(LOG_CRIT, "NMI ISA %x, EISA %x\n", isa_port, eisa_port); - + if (isa_port & NMI_PARITY) { log(LOG_CRIT, "RAM parity error, likely hardware failure."); retval = 1; Modified: head/sys/x86/isa/orm.c ============================================================================== --- head/sys/x86/isa/orm.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/isa/orm.c Tue Sep 1 21:23:59 2020 (r365079) @@ -163,7 +163,7 @@ orm_detach(device_t dev) { int i; struct orm_softc *sc = device_get_softc(dev); - + for (i = 0; i < sc->rnum; i++) bus_release_resource(dev, SYS_RES_MEMORY, sc->rid[i], sc->res[i]); Modified: head/sys/x86/pci/pci_bus.c ============================================================================== --- head/sys/x86/pci/pci_bus.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/pci/pci_bus.c Tue Sep 1 21:23:59 2020 (r365079) @@ -397,7 +397,6 @@ legacy_pcib_identify(driver_t *driver, device_t parent devclass_get_device(pci_devclass, 0)) return; - bus = 0; retry: for (slot = 0; slot <= PCI_SLOTMAX; slot++) { @@ -675,7 +674,6 @@ static devclass_t hostb_devclass; DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1); DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0); - /* * Install placeholder to claim the resources owned by the * PCI bus interface. This could be used to extract the @@ -737,7 +735,6 @@ static device_method_t pcibios_pcib_pci_methods[] = { /* pcib interface */ DEVMETHOD(pcib_route_interrupt, legacy_pcib_route_interrupt), - {0, 0} }; Modified: head/sys/x86/pci/qpi.c ============================================================================== --- head/sys/x86/pci/qpi.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/pci/qpi.c Tue Sep 1 21:23:59 2020 (r365079) @@ -211,7 +211,6 @@ static device_method_t qpi_methods[] = { DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } }; Modified: head/sys/x86/x86/busdma_bounce.c ============================================================================== --- head/sys/x86/x86/busdma_bounce.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/busdma_bounce.c Tue Sep 1 21:23:59 2020 (r365079) @@ -215,7 +215,7 @@ bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_si error = bounce_bus_dma_zone_setup(newtag); else error = 0; - + if (error != 0) free(newtag, M_DEVBUF); else @@ -393,7 +393,6 @@ bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmam CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat); return (0); } - /* * Allocate a piece of memory that can be efficiently mapped into Modified: head/sys/x86/x86/identcpu.c ============================================================================== --- head/sys/x86/x86/identcpu.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/identcpu.c Tue Sep 1 21:23:59 2020 (r365079) @@ -779,7 +779,6 @@ printcpuinfo(void) * http://www.intel.com/assets/pdf/appnote/241618.pdf */ if (cpu_high > 0) { - /* * Here we should probably set up flags indicating * whether or not various features are available. @@ -1276,7 +1275,6 @@ identblue(void) return IDENTBLUE_CYRIXM2; return IDENTBLUE_IBMCPU; } - /* * identifycyrix() set lower 16 bits of cyrix_did as follows: Modified: head/sys/x86/x86/io_apic.c ============================================================================== --- head/sys/x86/x86/io_apic.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/io_apic.c Tue Sep 1 21:23:59 2020 (r365079) @@ -510,7 +510,6 @@ ioapic_enable_intr(struct intsrc *isrc) apic_enable_vector(intpin->io_cpu, intpin->io_vector); } - static void ioapic_disable_intr(struct intsrc *isrc) { @@ -1054,7 +1053,6 @@ static device_method_t ioapic_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, ioapic_pci_probe), DEVMETHOD(device_attach, ioapic_pci_attach), - { 0, 0 } }; @@ -1146,7 +1144,6 @@ static device_method_t apic_methods[] = { DEVMETHOD(device_identify, apic_identify), DEVMETHOD(device_probe, apic_probe), DEVMETHOD(device_attach, apic_attach), - { 0, 0 } }; Modified: head/sys/x86/x86/legacy.c ============================================================================== --- head/sys/x86/x86/legacy.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/legacy.c Tue Sep 1 21:23:59 2020 (r365079) @@ -91,7 +91,6 @@ static device_method_t legacy_methods[] = { DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } }; @@ -242,7 +241,6 @@ legacy_read_ivar(device_t dev, device_t child, int whi } return 0; } - static int legacy_write_ivar(device_t dev, device_t child, int which, uintptr_t value) Modified: head/sys/x86/x86/local_apic.c ============================================================================== --- head/sys/x86/x86/local_apic.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/local_apic.c Tue Sep 1 21:23:59 2020 (r365079) @@ -666,7 +666,6 @@ native_lapic_create(u_int apic_id, int boot_cpu) lapics[apic_id].la_ioint_irqs[IDT_EVTCHN - APIC_IO_INTS] = IRQ_EVTCHN; #endif - #ifdef SMP cpu_add(apic_id, boot_cpu); #endif @@ -1564,7 +1563,6 @@ native_apic_alloc_vectors(u_int apic_id, u_int *irqs, first = 0; mtx_lock_spin(&icu_lock); for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { - /* Vector is in use, end run. */ if (lapics[apic_id].la_ioint_irqs[vector] != IRQ_FREE) { run = 0; Modified: head/sys/x86/x86/mca.c ============================================================================== --- head/sys/x86/x86/mca.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/mca.c Tue Sep 1 21:23:59 2020 (r365079) @@ -789,7 +789,7 @@ mca_scan(enum scan_mode mode, int *recoverablep) } mca_record_entry(mode, &rec); } - + #ifdef DEV_APIC /* * If this is a bank this CPU monitors via CMCI, Modified: head/sys/x86/x86/mp_x86.c ============================================================================== --- head/sys/x86/x86/mp_x86.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/mp_x86.c Tue Sep 1 21:23:59 2020 (r365079) @@ -1146,7 +1146,6 @@ set_interrupt_apic_ids(void) } } - #ifdef COUNT_XINVLTLB_HITS u_int xhits_gbl[MAXCPU]; u_int xhits_pg[MAXCPU]; Modified: head/sys/x86/x86/mptable.c ============================================================================== --- head/sys/x86/x86/mptable.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/mptable.c Tue Sep 1 21:23:59 2020 (r365079) @@ -496,7 +496,6 @@ mptable_probe_cpus_handler(u_char *entry, void *arg) } } - static void mptable_setup_cpus_handler(u_char *entry, void *arg) { @@ -580,7 +579,6 @@ mptable_parse_apics_and_busses_handler(u_char *entry, bus_entry_ptr bus; enum busTypes bus_type; int i; - switch (*entry) { case MPCT_ENTRY_BUS: Modified: head/sys/x86/x86/mptable_pci.c ============================================================================== --- head/sys/x86/x86/mptable_pci.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/mptable_pci.c Tue Sep 1 21:23:59 2020 (r365079) @@ -230,7 +230,6 @@ static device_method_t mptable_pcib_pci_methods[] = { /* pcib interface */ DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt), - {0, 0} }; Modified: head/sys/x86/x86/nexus.c ============================================================================== --- head/sys/x86/x86/nexus.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/nexus.c Tue Sep 1 21:23:59 2020 (r365079) @@ -187,7 +187,6 @@ static device_method_t nexus_methods[] = { DEVMETHOD(pcib_release_msix, nexus_release_msix), DEVMETHOD(pcib_map_msi, nexus_map_msi), #endif - { 0, 0 } }; @@ -537,7 +536,7 @@ static int nexus_unmap_resource(device_t bus, device_t child, int type, struct resource *r, struct resource_map *map) { - + /* * If this is a memory resource, unmap it. */ Modified: head/sys/x86/x86/x86_mem.c ============================================================================== --- head/sys/x86/x86/x86_mem.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/x86/x86_mem.c Tue Sep 1 21:23:59 2020 (r365079) @@ -507,7 +507,6 @@ x86_mrsetvariable(struct mem_range_softc *sc, struct m /* Exact match? */ if (curr_md->mr_base == mrd->mr_base && curr_md->mr_len == mrd->mr_len) { - /* Whoops, owned by someone. */ if (curr_md->mr_flags & MDF_BUSY) return (EBUSY); Modified: head/sys/x86/xen/hvm.c ============================================================================== --- head/sys/x86/xen/hvm.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/xen/hvm.c Tue Sep 1 21:23:59 2020 (r365079) @@ -416,7 +416,7 @@ xen_hvm_resume(bool suspend_cancelled) /* Register vcpu_info area for CPU#0. */ xen_hvm_cpu_init(); } - + static void xen_hvm_sysinit(void *arg __unused) { Modified: head/sys/x86/xen/pv.c ============================================================================== --- head/sys/x86/xen/pv.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/xen/pv.c Tue Sep 1 21:23:59 2020 (r365079) @@ -406,7 +406,6 @@ xen_pv_start_all_aps(void) mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); for (cpu = 1; cpu < mp_ncpus; cpu++) { - /* attempt to start the Application Processor */ if (!start_xen_ap(cpu)) panic("AP #%d failed to start!", cpu); Modified: head/sys/x86/xen/xen_apic.c ============================================================================== --- head/sys/x86/xen/xen_apic.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/xen/xen_apic.c Tue Sep 1 21:23:59 2020 (r365079) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #define XEN_APIC_UNSUPPORTED \ panic("%s: not available in Xen PV port.", __func__) - /*--------------------------- Forward Declarations ---------------------------*/ #ifdef SMP static driver_filter_t xen_smp_rendezvous_action; @@ -549,7 +548,6 @@ xen_cpu_ipi_init(int cpu) ipi_handle = DPCPU_ID_GET(cpu, ipi_handle); for (ipi = xen_ipis, idx = 0; idx < nitems(xen_ipis); ipi++, idx++) { - if (ipi->filter == NULL) { ipi_handle[idx] = NULL; continue; Modified: head/sys/x86/xen/xen_intr.c ============================================================================== --- head/sys/x86/xen/xen_intr.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/xen/xen_intr.c Tue Sep 1 21:23:59 2020 (r365079) @@ -560,7 +560,6 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) (*pc->evtchn_intrcnt)++; while (l1 != 0) { - l1i = (l1i + 1) % LONG_BIT; masked_l1 = l1 & ((~0UL) << l1i); @@ -1573,7 +1572,7 @@ xen_intr_port(xen_intr_handle_t handle) isrc = xen_intr_isrc(handle); if (isrc == NULL) return (0); - + return (isrc->xi_port); } Modified: head/sys/x86/xen/xen_nexus.c ============================================================================== --- head/sys/x86/xen/xen_nexus.c Tue Sep 1 21:23:00 2020 (r365078) +++ head/sys/x86/xen/xen_nexus.c Tue Sep 1 21:23:59 2020 (r365079) @@ -157,7 +157,6 @@ static device_method_t nexus_xen_methods[] = { DEVMETHOD(pcib_alloc_msix, nexus_xen_alloc_msix), DEVMETHOD(pcib_release_msix, nexus_xen_release_msix), DEVMETHOD(pcib_map_msi, nexus_xen_map_msi), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:24:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4DE30379B0A; Tue, 1 Sep 2020 21:24:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0TB1g6mz4K8T; Tue, 1 Sep 2020 21:24:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1CBE01FCBF; Tue, 1 Sep 2020 21:24:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LOj6R024607; Tue, 1 Sep 2020 21:24:45 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LOYpR024546; Tue, 1 Sep 2020 21:24:34 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012124.081LOYpR024546@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:24:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365080 - in head/sys/compat: cloudabi32 cloudabi64 freebsd32 ia32 lindebugfs linprocfs linux linuxkpi/common/include/asm linuxkpi/common/include/linux linuxkpi/common/include/net linux... X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/compat: cloudabi32 cloudabi64 freebsd32 ia32 lindebugfs linprocfs linux linuxkpi/common/include/asm linuxkpi/common/include/linux linuxkpi/common/include/net linuxkpi/common/src ndis X-SVN-Commit-Revision: 365080 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:24:46 -0000 Author: mjg Date: Tue Sep 1 21:24:33 2020 New Revision: 365080 URL: https://svnweb.freebsd.org/changeset/base/365080 Log: compat: clean up empty lines in .c and .h files Modified: head/sys/compat/cloudabi32/cloudabi32_proto.h head/sys/compat/cloudabi64/cloudabi64_proto.h head/sys/compat/freebsd32/freebsd32_ipc.h head/sys/compat/freebsd32/freebsd32_misc.c head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/ia32/ia32_signal.h head/sys/compat/lindebugfs/lindebugfs.c head/sys/compat/linprocfs/linprocfs.c head/sys/compat/linux/linux_common.c head/sys/compat/linux/linux_event.c head/sys/compat/linux/linux_file.c head/sys/compat/linux/linux_fork.c head/sys/compat/linux/linux_futex.c head/sys/compat/linux/linux_ioctl.c head/sys/compat/linux/linux_ipc.c head/sys/compat/linux/linux_misc.c head/sys/compat/linux/linux_misc.h head/sys/compat/linux/linux_mmap.c head/sys/compat/linux/linux_signal.c head/sys/compat/linux/linux_socket.c head/sys/compat/linux/linux_stats.c head/sys/compat/linux/linux_time.c head/sys/compat/linux/linux_timer.c head/sys/compat/linux/linux_vdso.c head/sys/compat/linuxkpi/common/include/asm/atomic-long.h head/sys/compat/linuxkpi/common/include/asm/atomic.h head/sys/compat/linuxkpi/common/include/asm/atomic64.h head/sys/compat/linuxkpi/common/include/linux/compat.h head/sys/compat/linuxkpi/common/include/linux/dma-attrs.h head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h head/sys/compat/linuxkpi/common/include/linux/dmapool.h head/sys/compat/linuxkpi/common/include/linux/fs.h head/sys/compat/linuxkpi/common/include/linux/io.h head/sys/compat/linuxkpi/common/include/linux/jhash.h head/sys/compat/linuxkpi/common/include/linux/kmod.h head/sys/compat/linuxkpi/common/include/linux/kref.h head/sys/compat/linuxkpi/common/include/linux/list.h head/sys/compat/linuxkpi/common/include/linux/pci.h head/sys/compat/linuxkpi/common/include/linux/scatterlist.h head/sys/compat/linuxkpi/common/include/linux/sysfs.h head/sys/compat/linuxkpi/common/include/net/ipv6.h head/sys/compat/linuxkpi/common/src/linux_compat.c head/sys/compat/linuxkpi/common/src/linux_hrtimer.c head/sys/compat/linuxkpi/common/src/linux_idr.c head/sys/compat/linuxkpi/common/src/linux_kmod.c head/sys/compat/linuxkpi/common/src/linux_pci.c head/sys/compat/linuxkpi/common/src/linux_radix.c head/sys/compat/linuxkpi/common/src/linux_rcu.c head/sys/compat/linuxkpi/common/src/linux_seq_file.c head/sys/compat/linuxkpi/common/src/linux_usb.c head/sys/compat/ndis/kern_ndis.c head/sys/compat/ndis/kern_windrv.c head/sys/compat/ndis/ndis_var.h head/sys/compat/ndis/ntoskrnl_var.h head/sys/compat/ndis/pe_var.h head/sys/compat/ndis/subr_hal.c head/sys/compat/ndis/subr_ndis.c head/sys/compat/ndis/subr_ntoskrnl.c head/sys/compat/ndis/subr_usbd.c Modified: head/sys/compat/cloudabi32/cloudabi32_proto.h ============================================================================== --- head/sys/compat/cloudabi32/cloudabi32_proto.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/cloudabi32/cloudabi32_proto.h Tue Sep 1 21:24:33 2020 (r365080) @@ -324,42 +324,29 @@ int cloudabi_sys_thread_yield(struct thread *, struct #ifdef COMPAT_43 - #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 - #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 - #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 - #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 - #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 - #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 - #endif /* COMPAT_FREEBSD12 */ Modified: head/sys/compat/cloudabi64/cloudabi64_proto.h ============================================================================== --- head/sys/compat/cloudabi64/cloudabi64_proto.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/cloudabi64/cloudabi64_proto.h Tue Sep 1 21:24:33 2020 (r365080) @@ -324,42 +324,29 @@ int cloudabi_sys_thread_yield(struct thread *, struct #ifdef COMPAT_43 - #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 - #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 - #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 - #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 - #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 - #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 - #endif /* COMPAT_FREEBSD12 */ Modified: head/sys/compat/freebsd32/freebsd32_ipc.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_ipc.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/freebsd32/freebsd32_ipc.h Tue Sep 1 21:24:33 2020 (r365080) @@ -60,7 +60,6 @@ struct semid_kernel32 { }; #endif /* _KERNEL */ - union semun32 { int val; uint32_t buf; Modified: head/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_misc.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/freebsd32/freebsd32_misc.c Tue Sep 1 21:24:33 2020 (r365080) @@ -323,7 +323,6 @@ freebsd4_freebsd32_getfsstat(struct thread *td, int freebsd10_freebsd32_pipe(struct thread *td, struct freebsd10_freebsd32_pipe_args *uap) { - return (freebsd10_pipe(td, (struct freebsd10_pipe_args*)uap)); } #endif @@ -465,7 +464,6 @@ freebsd32_fexecve(struct thread *td, struct freebsd32_ post_execve(td, error, oldvmspace); return (error); } - int freebsd32_mknodat(struct thread *td, struct freebsd32_mknodat_args *uap) Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/freebsd32/freebsd32_proto.h Tue Sep 1 21:24:33 2020 (r365080) @@ -976,7 +976,6 @@ int ofreebsd32_getdirentries(struct thread *, struct o #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1042,7 +1041,6 @@ int freebsd4_freebsd32_sigreturn(struct thread *, stru #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1132,7 +1130,6 @@ int freebsd6_freebsd32_lio_listio(struct thread *, str #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1175,7 +1172,6 @@ int freebsd7_freebsd32_shmctl(struct thread *, struct #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1200,7 +1196,6 @@ int freebsd10_freebsd32_pipe(struct thread *, struct f #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1272,7 +1267,6 @@ int freebsd11_freebsd32_kevent(struct thread *, struct int freebsd11_freebsd32_fstatat(struct thread *, struct freebsd11_freebsd32_fstatat_args *); #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 Modified: head/sys/compat/ia32/ia32_signal.h ============================================================================== --- head/sys/compat/ia32/ia32_signal.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ia32/ia32_signal.h Tue Sep 1 21:24:33 2020 (r365080) @@ -88,7 +88,6 @@ struct ia32_ucontext { u_int32_t __spare__[4]; }; - #if defined(COMPAT_FREEBSD4) struct ia32_mcontext4 { u_int32_t mc_onstack; /* XXX - sigcontext compat. */ Modified: head/sys/compat/lindebugfs/lindebugfs.c ============================================================================== --- head/sys/compat/lindebugfs/lindebugfs.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/lindebugfs/lindebugfs.c Tue Sep 1 21:24:33 2020 (r365080) @@ -294,7 +294,6 @@ debugfs_remove_recursive(struct dentry *dnode) pfs_destroy(dnode->d_pfs_node); } - static int debugfs_init(PFS_INIT_ARGS) { Modified: head/sys/compat/linprocfs/linprocfs.c ============================================================================== --- head/sys/compat/linprocfs/linprocfs.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linprocfs/linprocfs.c Tue Sep 1 21:24:33 2020 (r365080) @@ -1041,7 +1041,6 @@ linprocfs_doprocstatus(PFS_FILL_ARGS) return (0); } - /* * Filler function for proc/pid/cwd */ Modified: head/sys/compat/linux/linux_common.c ============================================================================== --- head/sys/compat/linux/linux_common.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_common.c Tue Sep 1 21:24:33 2020 (r365080) @@ -60,7 +60,6 @@ static eventhandler_tag linux_exec_tag; static eventhandler_tag linux_thread_dtor_tag; static eventhandler_tag linux_exit_tag; - static int linux_common_modevent(module_t mod, int type, void *data) { Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_event.c Tue Sep 1 21:24:33 2020 (r365080) @@ -221,7 +221,6 @@ static int eventfd_create(struct thread *td, uint32_t static void linux_timerfd_expire(void *); static void linux_timerfd_curval(struct timerfd *, struct itimerspec *); - static void epoll_fd_install(struct thread *td, int fd, epoll_udata_t udata) { @@ -574,7 +573,6 @@ linux_epoll_wait_common(struct thread *td, int epfd, s td->td_flags |= TDF_ASTPENDING; thread_unlock(td); } - coargs.leventlist = events; coargs.p = td->td_proc; Modified: head/sys/compat/linux/linux_file.c ============================================================================== --- head/sys/compat/linux/linux_file.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_file.c Tue Sep 1 21:24:33 2020 (r365080) @@ -539,7 +539,6 @@ out: } #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ - /* * These exist mainly for hooks for doing /compat/linux translation. */ Modified: head/sys/compat/linux/linux_fork.c ============================================================================== --- head/sys/compat/linux/linux_fork.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_fork.c Tue Sep 1 21:24:33 2020 (r365080) @@ -423,7 +423,6 @@ linux_thread_detach(struct thread *td) child_clear_tid = em->child_clear_tid; if (child_clear_tid != NULL) { - LINUX_CTR2(thread_detach, "thread(%d) %p", em->em_tid, child_clear_tid); Modified: head/sys/compat/linux/linux_futex.c ============================================================================== --- head/sys/compat/linux/linux_futex.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_futex.c Tue Sep 1 21:24:33 2020 (r365080) @@ -999,7 +999,6 @@ retry2: else op_ret += futex_wake(f, nrwake, args->val3); ret += op_ret; - } if (f2 != NULL) futex_put(f2, NULL); Modified: head/sys/compat/linux/linux_ioctl.c ============================================================================== --- head/sys/compat/linux/linux_ioctl.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_ioctl.c Tue Sep 1 21:24:33 2020 (r365080) @@ -713,7 +713,6 @@ linux_ioctl_termio(struct thread *td, struct linux_ioc return (error); switch (args->cmd & 0xffff) { - case LINUX_TCGETS: error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td->td_ucred, td); @@ -1455,7 +1454,6 @@ linux_ioctl_cdrom(struct thread *td, struct linux_ioct if (error != 0) return (error); switch (args->cmd & 0xffff) { - case LINUX_CDROMPAUSE: args->cmd = CDIOCPAUSE; error = (sys_ioctl(td, (struct ioctl_args *)args)); @@ -1723,7 +1721,6 @@ linux_ioctl_sound(struct thread *td, struct linux_ioct { switch (args->cmd & 0xffff) { - case LINUX_SOUND_MIXER_WRITE_VOLUME: args->cmd = SETDIR(SOUND_MIXER_WRITE_VOLUME); return (sys_ioctl(td, (struct ioctl_args *)args)); @@ -1981,7 +1978,6 @@ linux_ioctl_sound(struct thread *td, struct linux_ioct case LINUX_SNDCTL_SYNTH_MEMAVL: args->cmd = SNDCTL_SYNTH_MEMAVL; return (sys_ioctl(td, (struct ioctl_args *)args)); - } return (ENOIOCTL); @@ -2001,7 +1997,6 @@ linux_ioctl_console(struct thread *td, struct linux_io if (error != 0) return (error); switch (args->cmd & 0xffff) { - case LINUX_KIOCSOUND: args->cmd = KIOCSOUND; error = (sys_ioctl(td, (struct ioctl_args *)args)); @@ -2295,7 +2290,6 @@ linux_gifhwaddr(struct ifnet *ifp, struct l_ifreq *ifr return (copyout(&lsa, &ifr->ifr_hwaddr, sizeof(lsa))); } - /* * If we fault in bsd_to_linux_ifreq() then we will fault when we call * the native ioctl(). Thus, we don't really need to check the return @@ -2351,7 +2345,6 @@ linux_ioctl_socket(struct thread *td, struct linux_ioc } switch (args->cmd & 0xffff) { - case LINUX_FIOGETOWN: case LINUX_FIOSETOWN: case LINUX_SIOCADDMULTI: @@ -2404,7 +2397,6 @@ linux_ioctl_socket(struct thread *td, struct linux_ioc } switch (args->cmd & 0xffff) { - case LINUX_FIOSETOWN: args->cmd = FIOSETOWN; error = sys_ioctl(td, (struct ioctl_args *)args); Modified: head/sys/compat/linux/linux_ipc.c ============================================================================== --- head/sys/compat/linux/linux_ipc.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_ipc.c Tue Sep 1 21:24:33 2020 (r365080) @@ -832,7 +832,6 @@ linux_shmctl(struct thread *td, struct linux_shmctl_ar memset(&linux_shminfo64, 0, sizeof(linux_shminfo64)); switch (args->cmd & ~LINUX_IPC_64) { - case LINUX_IPC_INFO: { struct shminfo bsd_shminfo; Modified: head/sys/compat/linux/linux_misc.c ============================================================================== --- head/sys/compat/linux/linux_misc.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_misc.c Tue Sep 1 21:24:33 2020 (r365080) @@ -145,7 +145,6 @@ struct l_pselect6arg { static int linux_utimensat_nsec_valid(l_long); - int linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args) { @@ -641,7 +640,6 @@ struct l_times_argv { l_clock_t tms_cstime; }; - /* * Glibc versions prior to 2.2.1 always use hard-coded CLK_TCK value. * Since 2.2.1 Glibc uses value exported from kernel via AT_CLKTCK @@ -1666,7 +1664,6 @@ linux_reboot(struct thread *td, struct linux_reboot_ar return (sys_reboot(td, &bsd_args)); } - int linux_getpid(struct thread *td, struct linux_getpid_args *args) { @@ -1688,7 +1685,6 @@ linux_gettid(struct thread *td, struct linux_gettid_ar return (0); } - int linux_getppid(struct thread *td, struct linux_getppid_args *args) Modified: head/sys/compat/linux/linux_misc.h ============================================================================== --- head/sys/compat/linux/linux_misc.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_misc.h Tue Sep 1 21:24:33 2020 (r365080) @@ -128,7 +128,6 @@ extern int stclohz; #define LINUX_WCONTINUED 0x00000008 #define LINUX_WNOWAIT 0x01000000 - #define __WNOTHREAD 0x20000000 #define __WALL 0x40000000 #define __WCLONE 0x80000000 Modified: head/sys/compat/linux/linux_mmap.c ============================================================================== --- head/sys/compat/linux/linux_mmap.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_mmap.c Tue Sep 1 21:24:33 2020 (r365080) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - #define STACK_SIZE (2 * 1024 * 1024) #define GUARD_SIZE (4 * PAGE_SIZE) Modified: head/sys/compat/linux/linux_signal.c ============================================================================== --- head/sys/compat/linux/linux_signal.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_signal.c Tue Sep 1 21:24:33 2020 (r365080) @@ -59,7 +59,6 @@ static int linux_do_tkill(struct thread *td, struct th ksiginfo_t *ksi); static void sicode_to_lsicode(int si_code, int *lsi_code); - static void linux_to_bsd_sigaction(l_sigaction_t *lsa, struct sigaction *bsa) { Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_socket.c Tue Sep 1 21:24:33 2020 (r365080) @@ -88,7 +88,6 @@ static int linux_recvmsg_common(struct thread *, l_int l_uint, struct msghdr *); static int linux_set_socket_flags(int, int *); - static int linux_to_bsd_sockopt_level(int level) { @@ -778,7 +777,6 @@ linux_socketpair(struct thread *td, struct linux_socke if (error != 0) return (error); if (args->protocol != 0 && args->protocol != PF_UNIX) { - /* * Use of PF_UNIX as protocol argument is not right, * but Linux does it. @@ -1020,7 +1018,6 @@ linux_sendmsg_common(struct thread *td, l_int s, struc } if (linux_msghdr.msg_controllen >= sizeof(struct l_cmsghdr)) { - error = ENOBUFS; control = m_get(M_WAITOK, MT_CONTROL); MCLGET(control, M_WAITOK); Modified: head/sys/compat/linux/linux_stats.c ============================================================================== --- head/sys/compat/linux/linux_stats.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_stats.c Tue Sep 1 21:24:33 2020 (r365080) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void translate_vnhook_major_minor(struct vnode *vp, struct stat *sb) { Modified: head/sys/compat/linux/linux_time.c ============================================================================== --- head/sys/compat/linux/linux_time.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_time.c Tue Sep 1 21:24:33 2020 (r365080) @@ -122,7 +122,6 @@ LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, uns LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, unsupported_clockid, "int"); LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, return, "int"); - int native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp) { Modified: head/sys/compat/linux/linux_timer.c ============================================================================== --- head/sys/compat/linux/linux_timer.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_timer.c Tue Sep 1 21:24:33 2020 (r365080) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #endif #include - static int linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig) { Modified: head/sys/compat/linux/linux_vdso.c ============================================================================== --- head/sys/compat/linux/linux_vdso.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_vdso.c Tue Sep 1 21:24:33 2020 (r365080) @@ -65,7 +65,6 @@ static int __elfN(symstrindex); static void __elfN(linux_vdso_lookup)(Elf_Ehdr *, struct linux_vdso_sym *); - void __elfN(linux_vdso_sym_init)(struct linux_vdso_sym *s) { Modified: head/sys/compat/linuxkpi/common/include/asm/atomic-long.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/atomic-long.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/asm/atomic-long.h Tue Sep 1 21:24:33 2020 (r365080) @@ -34,7 +34,6 @@ #include #include #include - #define ATOMIC_LONG_INIT(x) { .counter = (x) } typedef struct { Modified: head/sys/compat/linuxkpi/common/include/asm/atomic.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/atomic.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/asm/atomic.h Tue Sep 1 21:24:33 2020 (r365080) @@ -35,7 +35,6 @@ #include #include #include - #define ATOMIC_INIT(x) { .counter = (x) } typedef struct { Modified: head/sys/compat/linuxkpi/common/include/asm/atomic64.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/atomic64.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/asm/atomic64.h Tue Sep 1 21:24:33 2020 (r365080) @@ -35,7 +35,6 @@ typedef struct { volatile int64_t counter; } atomic64_t; - #define ATOMIC64_INIT(x) { .counter = (x) } /*------------------------------------------------------------------------* Modified: head/sys/compat/linuxkpi/common/include/linux/compat.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/compat.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/compat.h Tue Sep 1 21:24:33 2020 (r365080) @@ -41,7 +41,6 @@ struct task_struct; extern int linux_alloc_current(struct thread *, int flags); extern void linux_free_current(struct task_struct *); - static inline void linux_set_current(struct thread *td) { Modified: head/sys/compat/linuxkpi/common/include/linux/dma-attrs.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/dma-attrs.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/dma-attrs.h Tue Sep 1 21:24:33 2020 (r365080) @@ -45,7 +45,6 @@ struct dma_attrs { unsigned long flags; }; - #define DEFINE_DMA_ATTRS(x) struct dma_attrs x = { } static inline void Modified: head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h Tue Sep 1 21:24:33 2020 (r365080) @@ -276,7 +276,6 @@ static inline unsigned int dma_set_max_seg_size(struct return (0); } - #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL) #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL) #define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL) Modified: head/sys/compat/linuxkpi/common/include/linux/dmapool.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/dmapool.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/dmapool.h Tue Sep 1 21:24:33 2020 (r365080) @@ -82,5 +82,4 @@ dma_pool_free(struct dma_pool *pool, void *vaddr, dma_ linux_dma_pool_free(pool, vaddr, dma_addr); } - #endif /* _LINUX_DMAPOOL_H_ */ Modified: head/sys/compat/linuxkpi/common/include/linux/fs.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/fs.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/fs.h Tue Sep 1 21:24:33 2020 (r365080) @@ -64,7 +64,6 @@ struct linux_cdev; #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) - typedef struct files_struct *fl_owner_t; struct file_operations; Modified: head/sys/compat/linuxkpi/common/include/linux/io.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/io.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/io.h Tue Sep 1 21:24:33 2020 (r365080) @@ -43,7 +43,6 @@ * XXX This is all x86 specific. It should be bus space access. */ - /* rmb and wmb are declared in machine/atomic.h, so should be included first. */ #ifndef __io_br #define __io_br() __compiler_membar() Modified: head/sys/compat/linuxkpi/common/include/linux/jhash.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/jhash.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/jhash.h Tue Sep 1 21:24:33 2020 (r365080) @@ -116,7 +116,6 @@ static inline u32 jhash2(const u32 *k, u32 length, u32 return c; } - /* A special ultra-optimized versions that knows they are hashing exactly * 3, 2 or 1 word(s). * Modified: head/sys/compat/linuxkpi/common/include/linux/kmod.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kmod.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/kmod.h Tue Sep 1 21:24:33 2020 (r365080) @@ -48,5 +48,4 @@ #define request_module_nowait request_module - #endif /* _LINUX_KMOD_H_ */ Modified: head/sys/compat/linuxkpi/common/include/linux/kref.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kref.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/kref.h Tue Sep 1 21:24:33 2020 (r365080) @@ -91,7 +91,6 @@ kref_put_lock(struct kref *kref, void (*rel)(struct kr return (0); } - static inline int kref_sub(struct kref *kref, unsigned int count, void (*rel)(struct kref *kref)) Modified: head/sys/compat/linuxkpi/common/include/linux/list.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/list.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/list.h Tue Sep 1 21:24:33 2020 (r365080) @@ -73,7 +73,6 @@ #ifndef prefetch #define prefetch(x) #endif - #define LINUX_LIST_HEAD_INIT(name) { &(name), &(name) } #define LINUX_LIST_HEAD(name) \ @@ -324,7 +323,6 @@ list_splice_tail_init(struct list_head *list, struct l #undef LIST_HEAD #define LIST_HEAD(name) struct list_head name = { &(name), &(name) } - struct hlist_head { struct hlist_node *first; }; @@ -332,7 +330,6 @@ struct hlist_head { struct hlist_node { struct hlist_node *next, **pprev; }; - #define HLIST_HEAD_INIT { } #define HLIST_HEAD(name) struct hlist_head name = HLIST_HEAD_INIT #define INIT_HLIST_HEAD(head) (head)->first = NULL Modified: head/sys/compat/linuxkpi/common/include/linux/pci.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/pci.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/pci.h Tue Sep 1 21:24:33 2020 (r365080) @@ -496,7 +496,6 @@ static inline int pci_pcie_cap(struct pci_dev *dev) return pci_find_capability(dev, PCI_CAP_ID_EXP); } - static inline int pci_read_config_byte(struct pci_dev *pdev, int where, u8 *val) { @@ -706,7 +705,6 @@ pci_iounmap(struct pci_dev *dev, void *res) #define DEFINE_PCI_DEVICE_TABLE(_table) \ const struct pci_device_id _table[] __devinitdata - /* XXX This should not be necessary. */ #define pcix_set_mmrbc(d, v) 0 #define pcix_get_max_mmrbc(d) 0 @@ -773,7 +771,6 @@ enum pci_ers_result { PCI_ERS_RESULT_RECOVERED = 5, }; - /* PCI bus error event callbacks */ struct pci_error_handlers { pci_ers_result_t (*error_detected)(struct pci_dev *dev, @@ -808,7 +805,6 @@ static inline u16 pcie_flags_reg(struct pci_dev *dev) return reg16; } - static inline int pci_pcie_type(struct pci_dev *dev) { Modified: head/sys/compat/linuxkpi/common/include/linux/scatterlist.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/scatterlist.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/scatterlist.h Tue Sep 1 21:24:33 2020 (r365080) @@ -479,5 +479,4 @@ sg_page_iter_page(struct sg_page_iter *piter) return (nth_page(sg_page(piter->sg), piter->sg_pgoffset)); } - #endif /* _LINUX_SCATTERLIST_H_ */ Modified: head/sys/compat/linuxkpi/common/include/linux/sysfs.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/sysfs.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/sysfs.h Tue Sep 1 21:24:33 2020 (r365080) @@ -57,7 +57,6 @@ struct attribute_group { #define __ATTR_RO(_name) __ATTR(_name, 0444, _name##_show, NULL) #define __ATTR_WO(_name) __ATTR(_name, 0200, NULL, _name##_store) #define __ATTR_RW(_name) __ATTR(_name, 0644, _name##_show, _name##_store) - #define __ATTR_NULL { .attr = { .name = NULL } } #define ATTRIBUTE_GROUPS(_name) \ Modified: head/sys/compat/linuxkpi/common/include/net/ipv6.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/net/ipv6.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/net/ipv6.h Tue Sep 1 21:24:33 2020 (r365080) @@ -110,5 +110,4 @@ static inline int ipv6_addr_cmp(const struct in6_addr return memcmp(a1, a2, sizeof(struct in6_addr)); } - #endif /* _LINUX_NET_IPV6_H_ */ Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_compat.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_compat.c Tue Sep 1 21:24:33 2020 (r365080) @@ -206,7 +206,6 @@ kobject_add_complete(struct kobject *kobj, struct kobj } if (error) sysfs_remove_dir(kobj); - } return (error); } @@ -1012,7 +1011,6 @@ linux_poll_wakeup_state(atomic_t *v, const uint8_t *ps return (c); } - static int linux_poll_wakeup_callback(wait_queue_t *wq, unsigned int wq_state, int flags, void *key) { @@ -1835,7 +1833,6 @@ iounmap(void *addr) kfree(vmmap); } - void * vmap(struct page **pages, unsigned int count, unsigned long flags, int prot) { @@ -2002,7 +1999,7 @@ linux_timer_init(void *arg) linux_timer_hz_mask--; /* compute some internal constants */ - + lkpi_nsec2hz_rem = hz; lkpi_usec2hz_rem = hz; lkpi_msec2hz_rem = hz; Modified: head/sys/compat/linuxkpi/common/src/linux_hrtimer.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_hrtimer.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_hrtimer.c Tue Sep 1 21:24:33 2020 (r365080) @@ -120,4 +120,3 @@ linux_hrtimer_forward_now(struct hrtimer *hrtimer, kti nstosbt(hrtimer->precision), hrtimer_call_handler, hrtimer, 0); mtx_unlock(&hrtimer->mtx); } - Modified: head/sys/compat/linuxkpi/common/src/linux_idr.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_idr.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_idr.c Tue Sep 1 21:24:33 2020 (r365080) @@ -269,7 +269,6 @@ idr_remove(struct idr *idr, int id) return (res); } - static inline struct idr_layer * idr_find_layer_locked(struct idr *idr, int id) { Modified: head/sys/compat/linuxkpi/common/src/linux_kmod.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_kmod.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_kmod.c Tue Sep 1 21:24:33 2020 (r365080) @@ -32,4 +32,3 @@ __FBSDID("$FreeBSD$"); MODULE_VERSION(linuxkpi, 1); MODULE_DEPEND(linuxkpi, pci, 1, 1, 1); - Modified: head/sys/compat/linuxkpi/common/src/linux_pci.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_pci.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_pci.c Tue Sep 1 21:24:33 2020 (r365080) @@ -588,7 +588,6 @@ linux_dma_trie_free(struct pctrie *ptree, void *node) uma_zfree(linux_dma_trie_zone, node); } - PCTRIE_DEFINE(LINUX_DMA, linux_dma_obj, dma_addr, linux_dma_trie_alloc, linux_dma_trie_free); Modified: head/sys/compat/linuxkpi/common/src/linux_radix.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_radix.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_radix.c Tue Sep 1 21:24:33 2020 (r365080) @@ -206,7 +206,6 @@ radix_tree_insert(struct radix_tree_root *root, unsign /* expand radix tree as needed */ while (radix_max(root) < index) { - /* check if the radix tree is getting too big */ if (root->height == RADIX_TREE_MAX_HEIGHT) { radix_tree_clean_root_node(root); @@ -311,7 +310,6 @@ radix_tree_store(struct radix_tree_root *root, unsigne /* expand radix tree as needed */ while (radix_max(root) < index) { - /* check if the radix tree is getting too big */ if (root->height == RADIX_TREE_MAX_HEIGHT) { radix_tree_clean_root_node(root); Modified: head/sys/compat/linuxkpi/common/src/linux_rcu.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_rcu.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_rcu.c Tue Sep 1 21:24:33 2020 (r365080) @@ -167,7 +167,6 @@ linux_rcu_cleaner_func(void *context, int pending __un /* dispatch all callbacks, if any */ while ((rcu = STAILQ_FIRST(&tmp_head)) != NULL) { - STAILQ_REMOVE_HEAD(&tmp_head, entry); offset = (uintptr_t)rcu->func; Modified: head/sys/compat/linuxkpi/common/src/linux_seq_file.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_seq_file.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_seq_file.c Tue Sep 1 21:24:33 2020 (r365080) @@ -130,7 +130,6 @@ single_open(struct linux_file *f, int (*show)(struct s free(op, M_LSEQ); else ((struct seq_file *)f->private_data)->private = d; - } return (rc); } Modified: head/sys/compat/linuxkpi/common/src/linux_usb.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_usb.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_usb.c Tue Sep 1 21:24:33 2020 (r365080) @@ -147,7 +147,6 @@ usb_linux_lookup_id(const struct usb_device_id *id, st * array: */ for (; id->match_flags; id++) { - if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) && (id->idVendor != uaa->info.idVendor)) { continue; @@ -513,7 +512,6 @@ usb_unlink_urb_sub(struct urb *urb, uint8_t drain) uhe = urb->endpoint; if (urb->bsd_urb_list.tqe_prev) { - /* not started yet, just remove it from the queue */ TAILQ_REMOVE(&uhe->bsd_urb_list, urb, bsd_urb_list); urb->bsd_urb_list.tqe_prev = NULL; @@ -528,7 +526,6 @@ usb_unlink_urb_sub(struct urb *urb, uint8_t drain) (urb->complete) (urb); } } else { - /* * If the URB is not on the URB list, then check if one of * the FreeBSD USB transfer are processing the current URB. @@ -794,7 +791,6 @@ usb_setup_endpoint(struct usb_device *dev, memset(cfg, 0, sizeof(cfg)); if (type == UE_ISOCHRONOUS) { - /* * Isochronous transfers are special in that they don't fit * into the BULK/INTR/CONTROL transfer model. @@ -881,7 +877,6 @@ usb_linux_create_usb_device(struct usb_device *udev, d * and one pass to initialize all the allocated memory structures. */ for (pass = 0; pass < 2; pass++) { - iface_no_curr = 0xFFFF; niface_total = 0; iface_index = 0; @@ -893,7 +888,6 @@ usb_linux_create_usb_device(struct usb_device *udev, d * descriptor pointer provided by the FreeBSD USB stack. */ while ((desc = usb_desc_foreach(cd, desc))) { - /* * Build up a tree according to the descriptors we * find: @@ -957,7 +951,6 @@ usb_linux_create_usb_device(struct usb_device *udev, d } if (pass == 0) { - size = (sizeof(*p_uhe) * nedesc) + (sizeof(*p_ui) * iface_index) + (sizeof(*p_uhi) * niface_total); @@ -1357,7 +1350,6 @@ usb_linux_isoc_callback(struct usb_xfer *xfer, usb_err case USB_ST_TRANSFERRED: if (urb->bsd_isread) { - /* copy in data with regard to the URB */ offset = 0; @@ -1413,7 +1405,6 @@ usb_linux_isoc_callback(struct usb_xfer *xfer, usb_err tr_setup: if (xfer->priv_fifo == NULL) { - /* get next transfer */ urb = TAILQ_FIRST(&uhe->bsd_urb_list); if (urb == NULL) { @@ -1442,7 +1433,6 @@ tr_setup: usbd_xfer_set_frame_data(xfer, 0, urb->transfer_buffer, 0); } if (!(urb->bsd_isread)) { - /* copy out data with regard to the URB */ offset = 0; @@ -1458,7 +1448,6 @@ tr_setup: offset += uipd->length; } } else { - /* * compute the transfer length into the "offset" * variable @@ -1504,7 +1493,6 @@ tr_setup: return; } goto tr_setup; - } } @@ -1535,7 +1523,6 @@ usb_linux_non_isoc_callback(struct usb_xfer *xfer, usb case USB_ST_TRANSFERRED: if (xfer->flags_int.control_xfr) { - /* don't transfer the setup packet again: */ usbd_xfer_set_frame_len(xfer, 0, 0); @@ -1587,7 +1574,6 @@ tr_setup: xfer->timeout = urb->timeout; if (xfer->flags_int.control_xfr) { - /* * USB control transfers need special handling. * First copy in the header, then copy in data! @@ -1609,7 +1595,6 @@ tr_setup: urb->bsd_length_rem = ptr[6] | (ptr[7] << 8); } else { - /* setup data transfer direction */ urb->bsd_length_rem = urb->transfer_buffer_length; Modified: head/sys/compat/ndis/kern_ndis.c ============================================================================== --- head/sys/compat/ndis/kern_ndis.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/kern_ndis.c Tue Sep 1 21:24:33 2020 (r365080) @@ -102,7 +102,6 @@ static image_patch_table kernndis_functbl[] = { IMPORT_SFUNC(ndis_sendrsrcavail_func, 1), IMPORT_SFUNC(ndis_intrsetup, 4), IMPORT_SFUNC(ndis_return, 1), - { NULL, NULL, NULL } }; @@ -590,7 +589,6 @@ ndis_convert_res(arg) brl = BUS_GET_RESOURCE_LIST(dev, dev); if (brl != NULL) { - STAILQ_FOREACH(brle, brl, link) { switch (brle->type) { case SYS_RES_IOPORT: Modified: head/sys/compat/ndis/kern_windrv.c ============================================================================== --- head/sys/compat/ndis/kern_windrv.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/kern_windrv.c Tue Sep 1 21:24:33 2020 (r365080) @@ -798,7 +798,6 @@ _x86_64_call6(void *fn, uint64_t a, uint64_t b, uint64 } #endif /* __amd64__ */ - #ifdef __i386__ struct x86desc { Modified: head/sys/compat/ndis/ndis_var.h ============================================================================== --- head/sys/compat/ndis/ndis_var.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/ndis_var.h Tue Sep 1 21:24:33 2020 (r365080) @@ -294,7 +294,6 @@ typedef uint8_t ndis_kirql; #define NDIS_PNP_EVENT_STOPPED 4 #define NDIS_PNP_EVENT_PROFILECHANGED 5 - /* PnP/PM Statistics (Optional). */ #define OID_PNP_WAKE_UP_OK 0xFD020200 #define OID_PNP_WAKE_UP_ERROR 0xFD020201 @@ -674,7 +673,6 @@ typedef struct ndis_80211_enc_indication ndis_80211_en #define OID_TCP_TASK_IPSEC_DELETE_SA 0xFC010203 #define OID_TCP_SAN_SUPPORT 0xFC010204 - #define NDIS_TASK_OFFLOAD_VERSION 1 #define NDIS_TASK_TCPIP_CSUM 0x00000000 @@ -812,7 +810,6 @@ typedef enum ndis_media_state ndis_media_state; #define NDIS_PACKET_TYPE_FUNCTIONAL 0x00004000 #define NDIS_PACKET_TYPE_MAC_FRAME 0x00008000 - /* Ndis MAC option bits (OID_GEN_MAC_OPTIONS). */ #define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA 0x00000001 @@ -1425,7 +1422,6 @@ struct ndis_map_arg { */ struct ndis_miniport_characteristics { - /* NDIS 3.0 */ uint8_t nmc_version_major; Modified: head/sys/compat/ndis/ntoskrnl_var.h ============================================================================== --- head/sys/compat/ndis/ntoskrnl_var.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/ntoskrnl_var.h Tue Sep 1 21:24:33 2020 (r365080) @@ -906,7 +906,6 @@ typedef struct devobj_extension devobj_extension; #define IOCTL_CODE(dev, func, iomethod, acc) \ ((dev) << 16) | (acc << 14) | (func << 2) | (iomethod)) - struct io_status_block { union { uint32_t isb_status; Modified: head/sys/compat/ndis/pe_var.h ============================================================================== --- head/sys/compat/ndis/pe_var.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/pe_var.h Tue Sep 1 21:24:33 2020 (r365080) @@ -164,7 +164,6 @@ typedef struct image_data_directory image_data_directo */ struct image_optional_header { - /* Standard fields */ uint16_t ioh_magic; @@ -502,7 +501,6 @@ extern uint32_t x86_stdcall_call(void *, int, ...); x86_stdcall_call(fn, 6, (a), (b), (c), (d), (e), (f)) #endif /* __i386__ */ - #define FUNC void(*)(void) Modified: head/sys/compat/ndis/subr_hal.c ============================================================================== --- head/sys/compat/ndis/subr_hal.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/subr_hal.c Tue Sep 1 21:24:33 2020 (r365080) @@ -478,6 +478,5 @@ image_patch_table hal_functbl[] = { { NULL, (FUNC)dummy, NULL, 0, WINDRV_WRAP_STDCALL }, /* End of list. */ - { NULL, NULL, NULL } }; Modified: head/sys/compat/ndis/subr_ndis.c ============================================================================== --- head/sys/compat/ndis/subr_ndis.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/subr_ndis.c Tue Sep 1 21:24:33 2020 (r365080) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); * expects. */ - #include *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:25:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6514A379B24; Tue, 1 Sep 2020 21:25:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Tx24vXz4KDF; Tue, 1 Sep 2020 21:25:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B15E1FD75; Tue, 1 Sep 2020 21:25:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LPP5Z024701; Tue, 1 Sep 2020 21:25:25 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LPNSs024690; Tue, 1 Sep 2020 21:25:23 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012125.081LPNSs024690@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:25:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365081 - head/sys/libkern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/libkern X-SVN-Commit-Revision: 365081 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:25:25 -0000 Author: mjg Date: Tue Sep 1 21:25:23 2020 New Revision: 365081 URL: https://svnweb.freebsd.org/changeset/base/365081 Log: libkern: clean up empty lines in .c and .h files Modified: head/sys/libkern/bcopy.c head/sys/libkern/gsb_crc32.c head/sys/libkern/iconv_ucs.c head/sys/libkern/iconv_xlat16.c head/sys/libkern/inet_aton.c head/sys/libkern/inet_ntoa.c head/sys/libkern/mcount.c head/sys/libkern/murmur3_32.c head/sys/libkern/ucmpdi2.c Modified: head/sys/libkern/bcopy.c ============================================================================== --- head/sys/libkern/bcopy.c Tue Sep 1 21:24:33 2020 (r365080) +++ head/sys/libkern/bcopy.c Tue Sep 1 21:25:23 2020 (r365081) @@ -154,4 +154,3 @@ void memcpy(dst0, src0, length); } - Modified: head/sys/libkern/gsb_crc32.c ============================================================================== --- head/sys/libkern/gsb_crc32.c Tue Sep 1 21:24:33 2020 (r365080) +++ head/sys/libkern/gsb_crc32.c Tue Sep 1 21:25:23 2020 (r365081) @@ -220,7 +220,6 @@ singletable_crc32c(uint32_t crc, const void *buf, size { const uint8_t *p = buf; - while (size--) crc = crc32Table[(crc ^ *p++) & 0xff] ^ (crc >> 8); @@ -295,8 +294,6 @@ static const uint32_t sctp_crc_tableil8_o32[256] = * end of the CRC lookup table crc_tableil8_o32 */ - - /* * The following CRC lookup table was generated automagically using the * following model parameters: @@ -351,8 +348,6 @@ static const uint32_t sctp_crc_tableil8_o40[256] = * end of the CRC lookup table crc_tableil8_o40 */ - - /* * The following CRC lookup table was generated automagically using the * following model parameters: @@ -407,8 +402,6 @@ static const uint32_t sctp_crc_tableil8_o48[256] = * end of the CRC lookup table crc_tableil8_o48 */ - - /* * The following CRC lookup table was generated automagically using the * following model parameters: @@ -463,8 +456,6 @@ static const uint32_t sctp_crc_tableil8_o56[256] = * end of the CRC lookup table crc_tableil8_o56 */ - - /* * The following CRC lookup table was generated automagically using the * following model parameters: @@ -519,8 +510,6 @@ static const uint32_t sctp_crc_tableil8_o64[256] = * end of the CRC lookup table crc_tableil8_o64 */ - - /* * The following CRC lookup table was generated automagically using the * following model parameters: @@ -575,8 +564,6 @@ static const uint32_t sctp_crc_tableil8_o72[256] = * end of the CRC lookup table crc_tableil8_o72 */ - - /* * The following CRC lookup table was generated automagically using the * following model parameters: @@ -631,8 +618,6 @@ static const uint32_t sctp_crc_tableil8_o80[256] = * end of the CRC lookup table crc_tableil8_o80 */ - - /* * The following CRC lookup table was generated automagically using the * following model parameters: @@ -686,7 +671,6 @@ static const uint32_t sctp_crc_tableil8_o88[256] = /* * end of the CRC lookup table crc_tableil8_o88 */ - static uint32_t crc32c_sb8_64_bit(uint32_t crc, Modified: head/sys/libkern/iconv_ucs.c ============================================================================== --- head/sys/libkern/iconv_ucs.c Tue Sep 1 21:24:33 2020 (r365080) +++ head/sys/libkern/iconv_ucs.c Tue Sep 1 21:25:23 2020 (r365081) @@ -186,7 +186,6 @@ iconv_ucs_conv(void *d2p, const char **inbuf, dst = *outbuf; while (ir > 0 && or > 0) { - /* * The first half of conversion. * (convert any code into ENCODING_UNICODE) @@ -537,4 +536,3 @@ decode_surrogate(const u_char *ucs) return ((((ucs[0] & 0x3) << 18) | (ucs[1] << 10) | ((ucs[2] & 0x3) << 8) | ucs[3]) + 0x10000); } - Modified: head/sys/libkern/iconv_xlat16.c ============================================================================== --- head/sys/libkern/iconv_xlat16.c Tue Sep 1 21:24:33 2020 (r365080) +++ head/sys/libkern/iconv_xlat16.c Tue Sep 1 21:25:23 2020 (r365081) @@ -131,7 +131,6 @@ iconv_xlat16_conv(void *d2p, const char **inbuf, dst = *outbuf; while(ir > 0 && or > 0) { - inlen = 0; code = 0; Modified: head/sys/libkern/inet_aton.c ============================================================================== --- head/sys/libkern/inet_aton.c Tue Sep 1 21:24:33 2020 (r365080) +++ head/sys/libkern/inet_aton.c Tue Sep 1 21:25:23 2020 (r365081) @@ -94,12 +94,10 @@ inet_aton(const char *cp, struct in_addr *addr) gotend = 1; break; } else { - /* Invalid character, then fail. */ return (0); } } - } /* Concoct the address according to the number of parts specified. */ @@ -135,4 +133,3 @@ inet_aton(const char *cp, struct in_addr *addr) addr->s_addr = htonl(val); return (1); } - Modified: head/sys/libkern/inet_ntoa.c ============================================================================== --- head/sys/libkern/inet_ntoa.c Tue Sep 1 21:24:33 2020 (r365080) +++ head/sys/libkern/inet_ntoa.c Tue Sep 1 21:25:23 2020 (r365081) @@ -47,5 +47,3 @@ inet_ntoa_r(struct in_addr ina, char *buf) ucp[3] & 0xff); return buf; } - - Modified: head/sys/libkern/mcount.c ============================================================================== --- head/sys/libkern/mcount.c Tue Sep 1 21:24:33 2020 (r365080) +++ head/sys/libkern/mcount.c Tue Sep 1 21:25:23 2020 (r365081) @@ -237,7 +237,6 @@ _MCOUNT_DECL(uintfptr_t frompc, uintfptr_t selfpc) *frompcindex = toindex; goto done; } - } done: #ifdef _KERNEL Modified: head/sys/libkern/murmur3_32.c ============================================================================== --- head/sys/libkern/murmur3_32.c Tue Sep 1 21:24:33 2020 (r365080) +++ head/sys/libkern/murmur3_32.c Tue Sep 1 21:25:23 2020 (r365081) @@ -129,4 +129,3 @@ murmur3_32_hash32(const uint32_t *data, size_t count, hash ^= hash >> 16; return (hash); } - Modified: head/sys/libkern/ucmpdi2.c ============================================================================== --- head/sys/libkern/ucmpdi2.c Tue Sep 1 21:24:33 2020 (r365080) +++ head/sys/libkern/ucmpdi2.c Tue Sep 1 21:25:23 2020 (r365081) @@ -63,4 +63,3 @@ __aeabi_ulcmp(unsigned long long a, unsigned long long return __ucmpdi2(a, b) - 1; } #endif - From owner-svn-src-all@freebsd.org Tue Sep 1 21:25:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D0299379C89; Tue, 1 Sep 2020 21:25:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0VF58WPz4KDr; Tue, 1 Sep 2020 21:25:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B5DC1FD76; Tue, 1 Sep 2020 21:25:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LPfaw024763; Tue, 1 Sep 2020 21:25:41 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LPd7J024754; Tue, 1 Sep 2020 21:25:39 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012125.081LPd7J024754@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:25:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365082 - in head/sys: nfs nfsclient nfsserver X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: nfs nfsclient nfsserver X-SVN-Commit-Revision: 365082 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:25:41 -0000 Author: mjg Date: Tue Sep 1 21:25:39 2020 New Revision: 365082 URL: https://svnweb.freebsd.org/changeset/base/365082 Log: nfs: clean up empty lines in .c and .h files Modified: head/sys/nfs/bootp_subr.c head/sys/nfs/nfs_diskless.c head/sys/nfs/nfs_kdtrace.h head/sys/nfs/nfs_nfssvc.c head/sys/nfs/nfsproto.h head/sys/nfs/xdr_subs.h head/sys/nfsclient/nfs.h head/sys/nfsclient/nfsnode.h head/sys/nfsserver/nfsm_subs.h Modified: head/sys/nfs/bootp_subr.c ============================================================================== --- head/sys/nfs/bootp_subr.c Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/bootp_subr.c Tue Sep 1 21:25:39 2020 (r365082) @@ -459,7 +459,6 @@ bootpc_received(struct bootpc_globalcontext *gctx, ifctx->dhcpquerytype == DHCP_REQUEST) ifctx->state = IF_DHCP_RESOLVED; - if (ifctx->dhcpquerytype == DHCP_DISCOVER && ifctx->state != IF_BOOTP_RESOLVED) { p = bootpc_tag(&gctx->tmptag, &ifctx->reply, @@ -567,7 +566,6 @@ bootpc_call(struct bootpc_globalcontext *gctx, struct timo = 0; rtimo = 0; for (;;) { - outstanding = 0; gotrootpath = 0; Modified: head/sys/nfs/nfs_diskless.c ============================================================================== --- head/sys/nfs/nfs_diskless.c Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/nfs_diskless.c Tue Sep 1 21:25:39 2020 (r365082) @@ -253,7 +253,7 @@ match_done: if (is_nfsv3 != 0) { strlcpy(nd3->myif.ifra_name, ifp->if_xname, sizeof(nd3->myif.ifra_name)); - + /* set up gateway */ inaddr_to_sockaddr("boot.netif.gateway", &nd3->mygateway); @@ -287,12 +287,12 @@ match_done: nfs_parse_options(cp, &nd3->root_args); freeenv(cp); } - + nfs_diskless_valid = 3; } else { strlcpy(nd->myif.ifra_name, ifp->if_xname, sizeof(nd->myif.ifra_name)); - + /* set up gateway */ inaddr_to_sockaddr("boot.netif.gateway", &nd->mygateway); @@ -319,7 +319,7 @@ match_done: } if ((cp = kern_getenv("boot.nfsroot.options")) != NULL) { struct nfs_args args; - + /* * XXX yech, convert between old and current * arg format @@ -335,7 +335,7 @@ match_done: nd->root_args.wsize = args.wsize; freeenv(cp); } - + nfs_diskless_valid = 1; } } @@ -436,4 +436,3 @@ nfs_rootconf(void) SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, nfs_rootconf, NULL); #endif - Modified: head/sys/nfs/nfs_kdtrace.h ============================================================================== --- head/sys/nfs/nfs_kdtrace.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/nfs_kdtrace.h Tue Sep 1 21:25:39 2020 (r365082) @@ -57,7 +57,7 @@ extern uint32_t nfsclient_accesscache_load_done_id; nfsclient_accesscache_get_hit_id, (vp), (uid), \ (mode)); \ } while (0) - + #define KDTRACE_NFS_ACCESSCACHE_GET_MISS(vp, uid, mode) do { \ if (dtrace_nfsclient_accesscache_get_miss_probe != NULL) \ (dtrace_nfsclient_accesscache_get_miss_probe)( \ Modified: head/sys/nfs/nfs_nfssvc.c ============================================================================== --- head/sys/nfs/nfs_nfssvc.c Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/nfs_nfssvc.c Tue Sep 1 21:25:39 2020 (r365082) @@ -151,4 +151,3 @@ DECLARE_MODULE(nfssvc, nfssvc_mod, SI_SUB_VFS, SI_ORDE /* So that loader and kldload(2) can find us, wherever we are.. */ MODULE_VERSION(nfssvc, 1); - Modified: head/sys/nfs/nfsproto.h ============================================================================== --- head/sys/nfs/nfsproto.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/nfsproto.h Tue Sep 1 21:25:39 2020 (r365082) @@ -137,8 +137,6 @@ #define NFSERR_FILE_OPEN 10046 #define NFSERR_STALEWRITEVERF 30001 /* Fake return for nfs_commit() */ - - #define NFSERR_RETVOID 0x20000000 /* Return void, not error */ #define NFSERR_AUTHERR 0x40000000 /* Mark an authentication error */ #define NFSERR_RETERR 0x80000000 /* Mark an error return for V3 */ Modified: head/sys/nfs/xdr_subs.h ============================================================================== --- head/sys/nfs/xdr_subs.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfs/xdr_subs.h Tue Sep 1 21:25:39 2020 (r365082) @@ -35,7 +35,6 @@ * $FreeBSD$ */ - #ifndef _NFS_XDR_SUBS_H_ #define _NFS_XDR_SUBS_H_ Modified: head/sys/nfsclient/nfs.h ============================================================================== --- head/sys/nfsclient/nfs.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfsclient/nfs.h Tue Sep 1 21:25:39 2020 (r365082) @@ -100,7 +100,6 @@ #define NFSSTA_TIMEO 0x10000000 /* Experiencing a timeout */ #define NFSSTA_LOCKTIMEO 0x20000000 /* Experiencing a lockd timeout */ - /* * XXX to allow amd to include nfs.h without nfsproto.h */ Modified: head/sys/nfsclient/nfsnode.h ============================================================================== --- head/sys/nfsclient/nfsnode.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfsclient/nfsnode.h Tue Sep 1 21:25:39 2020 (r365082) @@ -83,7 +83,7 @@ struct nfs_accesscache { uid_t uid; /* credentials having mode */ time_t stamp; /* mode cache timestamp */ }; - + /* * The nfsnode is the nfs equivalent to ufs's inode. Any similarity * is purely coincidental. Modified: head/sys/nfsserver/nfsm_subs.h ============================================================================== --- head/sys/nfsserver/nfsm_subs.h Tue Sep 1 21:25:23 2020 (r365081) +++ head/sys/nfsserver/nfsm_subs.h Tue Sep 1 21:25:39 2020 (r365082) @@ -61,8 +61,6 @@ * unions. */ - - /* ************************************* */ /* Dissection phase macros */ From owner-svn-src-all@freebsd.org Tue Sep 1 21:26:03 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9EFBB3799EA; Tue, 1 Sep 2020 21:26:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Vg3lS9z4KbH; Tue, 1 Sep 2020 21:26:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63FCE1F75D; Tue, 1 Sep 2020 21:26:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LQ3WM024838; Tue, 1 Sep 2020 21:26:03 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LQ0Uh024825; Tue, 1 Sep 2020 21:26:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012126.081LQ0Uh024825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:26:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365083 - in head/sys/security: audit mac mac_biba mac_lomac mac_mls mac_stub mac_veriexec mac_veriexec_parser X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/security: audit mac mac_biba mac_lomac mac_mls mac_stub mac_veriexec mac_veriexec_parser X-SVN-Commit-Revision: 365083 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:26:03 -0000 Author: mjg Date: Tue Sep 1 21:26:00 2020 New Revision: 365083 URL: https://svnweb.freebsd.org/changeset/base/365083 Log: security: clean up empty lines in .c and .h files Modified: head/sys/security/audit/audit_bsm.c head/sys/security/audit/audit_dtrace.c head/sys/security/audit/audit_syscalls.c head/sys/security/audit/bsm_token.c head/sys/security/mac/mac_internal.h head/sys/security/mac/mac_label.c head/sys/security/mac/mac_socket.c head/sys/security/mac_biba/mac_biba.c head/sys/security/mac_lomac/mac_lomac.c head/sys/security/mac_mls/mac_mls.c head/sys/security/mac_stub/mac_stub.c head/sys/security/mac_veriexec/veriexec_metadata.c head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c Modified: head/sys/security/audit/audit_bsm.c ============================================================================== --- head/sys/security/audit/audit_bsm.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/audit/audit_bsm.c Tue Sep 1 21:26:00 2020 (r365083) @@ -318,7 +318,6 @@ kau_free(struct au_record *rec) } \ } while (0) - /* * Implement auditing for the auditon() system call. The audit tokens that * are generated depend on the command that was sent into the auditon() Modified: head/sys/security/audit/audit_dtrace.c ============================================================================== --- head/sys/security/audit/audit_dtrace.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/audit/audit_dtrace.c Tue Sep 1 21:26:00 2020 (r365083) @@ -383,7 +383,6 @@ dtaudit_au_evnamemap_callback(struct evname_elem *ene) if ((ene->ene_commit_probe_id == 0) && (dtrace_probe_lookup(dtaudit_id, dtaudit_module_str, ene_name_lower, dtaudit_name_commit_str) == 0)) { - /* * Create the commit probe. * @@ -413,7 +412,6 @@ dtaudit_au_evnamemap_callback(struct evname_elem *ene) if ((ene->ene_bsm_probe_id == 0) && (dtrace_probe_lookup(dtaudit_id, dtaudit_module_str, ene_name_lower, dtaudit_name_bsm_str) == 0)) { - /* * Create the bsm probe. * Modified: head/sys/security/audit/audit_syscalls.c ============================================================================== --- head/sys/security/audit/audit_syscalls.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/audit/audit_syscalls.c Tue Sep 1 21:26:00 2020 (r365083) @@ -90,7 +90,6 @@ sys_audit(struct thread *td, struct audit_args *uap) * commit the user audit record. */ if (ar == NULL) { - /* * This is not very efficient; we're required to allocate a * complete kernel audit record just so the user record can Modified: head/sys/security/audit/bsm_token.c ============================================================================== --- head/sys/security/audit/bsm_token.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/audit/bsm_token.c Tue Sep 1 21:26:00 2020 (r365083) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include #include @@ -341,7 +340,6 @@ au_to_data(char unit_print, char unit_type, char unit_ return (t); } - /* * token ID 1 byte Modified: head/sys/security/mac/mac_internal.h ============================================================================== --- head/sys/security/mac/mac_internal.h Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac/mac_internal.h Tue Sep 1 21:26:00 2020 (r365083) @@ -160,7 +160,6 @@ struct label { intptr_t l_perpolicy[MAC_MAX_SLOTS]; }; - /* * Flags for mac_labeled, a bitmask of object types need across the union of * all policies currently registered with the MAC Framework, used to key Modified: head/sys/security/mac/mac_label.c ============================================================================== --- head/sys/security/mac/mac_label.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac/mac_label.c Tue Sep 1 21:26:00 2020 (r365083) @@ -93,7 +93,6 @@ mac_destroy_label(struct label *label) #endif } - static int mac_labelzone_ctor(void *mem, int size, void *arg, int flags) { Modified: head/sys/security/mac/mac_socket.c ============================================================================== --- head/sys/security/mac/mac_socket.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac/mac_socket.c Tue Sep 1 21:26:00 2020 (r365083) @@ -275,7 +275,7 @@ mac_socketpeer_set_from_mbuf(struct mbuf *m, struct so void mac_socketpeer_set_from_socket(struct socket *oldso, struct socket *newso) { - + if (mac_policy_count == 0) return; Modified: head/sys/security/mac_biba/mac_biba.c ============================================================================== --- head/sys/security/mac_biba/mac_biba.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_biba/mac_biba.c Tue Sep 1 21:26:00 2020 (r365083) @@ -2745,7 +2745,7 @@ biba_sysvshm_check_shmat(struct ucred *cred, struct sh if (!biba_dominate_effective(subj, obj)) return (EACCES); } - + return (0); } Modified: head/sys/security/mac_lomac/mac_lomac.c ============================================================================== --- head/sys/security/mac_lomac/mac_lomac.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_lomac/mac_lomac.c Tue Sep 1 21:26:00 2020 (r365083) @@ -731,7 +731,7 @@ lomac_parse_element(struct mac_lomac_element *element, p0 = string; d = strtol(p0, &p1, 10); - + if (d < 0 || d > 65535) return (EINVAL); element->mle_type = MAC_LOMAC_TYPE_GRADE; Modified: head/sys/security/mac_mls/mac_mls.c ============================================================================== --- head/sys/security/mac_mls/mac_mls.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_mls/mac_mls.c Tue Sep 1 21:26:00 2020 (r365083) @@ -2378,7 +2378,7 @@ mls_sysvshm_check_shmat(struct ucred *cred, struct shm if (!mls_dominate_effective(obj, subj)) return (EACCES); } - + return (0); } @@ -3371,7 +3371,6 @@ static struct mac_policy_ops mls_ops = .mpo_sysvshm_create = mls_sysvshm_create, .mpo_sysvshm_destroy_label = mls_destroy_label, .mpo_sysvshm_init_label = mls_init_label, - .mpo_system_check_acct = mls_system_check_acct, .mpo_system_check_auditctl = mls_system_check_auditctl, Modified: head/sys/security/mac_stub/mac_stub.c ============================================================================== --- head/sys/security/mac_stub/mac_stub.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_stub/mac_stub.c Tue Sep 1 21:26:00 2020 (r365083) @@ -1181,7 +1181,6 @@ stub_sysvmsq_check_msgrcv(struct ucred *cred, struct m return (0); } - static int stub_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr, struct label *msglabel) @@ -1190,7 +1189,6 @@ stub_sysvmsq_check_msgrmid(struct ucred *cred, struct return (0); } - static int stub_sysvmsq_check_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) @@ -1199,7 +1197,6 @@ stub_sysvmsq_check_msqget(struct ucred *cred, struct m return (0); } - static int stub_sysvmsq_check_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) @@ -1216,7 +1213,6 @@ stub_sysvmsq_check_msqrcv(struct ucred *cred, struct m return (0); } - static int stub_sysvmsq_check_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel, int cmd) @@ -1225,7 +1221,6 @@ stub_sysvmsq_check_msqctl(struct ucred *cred, struct m return (0); } - static void stub_sysvmsq_cleanup(struct label *msqlabel) { @@ -1255,7 +1250,6 @@ stub_sysvsem_check_semget(struct ucred *cred, struct s return (0); } - static int stub_sysvsem_check_semop(struct ucred *cred, struct semid_kernel *semakptr, struct label *semaklabel, size_t accesstype) @@ -1300,7 +1294,6 @@ stub_sysvshm_check_shmdt(struct ucred *cred, struct sh return (0); } - static int stub_sysvshm_check_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, Modified: head/sys/security/mac_veriexec/veriexec_metadata.c ============================================================================== --- head/sys/security/mac_veriexec/veriexec_metadata.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_veriexec/veriexec_metadata.c Tue Sep 1 21:26:00 2020 (r365083) @@ -773,7 +773,6 @@ mac_veriexec_metadata_get_file_info(dev_t fsid, long f return (ip); } - /** * @brief Intialize the meta-data store */ Modified: head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c ============================================================================== --- head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c Tue Sep 1 21:25:39 2020 (r365082) +++ head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c Tue Sep 1 21:26:00 2020 (r365083) @@ -233,7 +233,6 @@ verify_digest(const char *data, size_t len, const unsi return (memcmp(expected_hash, hash, SHA256_DIGEST_LENGTH)); } - static int open_file(const char *path, struct nameidata *nid) { From owner-svn-src-all@freebsd.org Tue Sep 1 21:26:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE5D9379D89; Tue, 1 Sep 2020 21:26:45 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0WT5TZRz4Kh8; Tue, 1 Sep 2020 21:26:45 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 867C51FCC0; Tue, 1 Sep 2020 21:26:45 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LQjoA024930; Tue, 1 Sep 2020 21:26:45 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LQi46024924; Tue, 1 Sep 2020 21:26:44 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012126.081LQi46024924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:26:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365084 - in head/sys/dev/usb: . controller gadget input misc net quirk serial storage template video wlan X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/usb: . controller gadget input misc net quirk serial storage template video wlan X-SVN-Commit-Revision: 365084 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:26:45 -0000 Author: mjg Date: Tue Sep 1 21:26:44 2020 New Revision: 365084 URL: https://svnweb.freebsd.org/changeset/base/365084 Log: usb: clean up empty lines in .c and .h files Modified: head/sys/dev/usb/controller/atmegadci.c head/sys/dev/usb/controller/avr32dci.c head/sys/dev/usb/controller/dwc_otg.c head/sys/dev/usb/controller/dwc_otg_fdt.c head/sys/dev/usb/controller/ehci.c head/sys/dev/usb/controller/ehci.h head/sys/dev/usb/controller/ehci_fsl.c head/sys/dev/usb/controller/ehci_msm.c head/sys/dev/usb/controller/generic_ehci_fdt.c head/sys/dev/usb/controller/generic_xhci_fdt.c head/sys/dev/usb/controller/musb_otg.c head/sys/dev/usb/controller/ohci.c head/sys/dev/usb/controller/saf1761_otg.c head/sys/dev/usb/controller/uhci.c head/sys/dev/usb/controller/usb_controller.c head/sys/dev/usb/controller/uss820dci.c head/sys/dev/usb/controller/xhci.c head/sys/dev/usb/gadget/g_audio.c head/sys/dev/usb/gadget/g_keyboard.c head/sys/dev/usb/gadget/g_modem.c head/sys/dev/usb/gadget/g_mouse.c head/sys/dev/usb/input/atp.c head/sys/dev/usb/input/uep.c head/sys/dev/usb/input/uhid.c head/sys/dev/usb/input/uhid_snes.c head/sys/dev/usb/input/ukbd.c head/sys/dev/usb/input/ums.c head/sys/dev/usb/input/wmt.c head/sys/dev/usb/input/wsp.c head/sys/dev/usb/misc/cp2112.c head/sys/dev/usb/misc/udbp.c head/sys/dev/usb/misc/udbp.h head/sys/dev/usb/misc/ugold.c head/sys/dev/usb/net/if_aue.c head/sys/dev/usb/net/if_axe.c head/sys/dev/usb/net/if_axge.c head/sys/dev/usb/net/if_cdce.c head/sys/dev/usb/net/if_cdceem.c head/sys/dev/usb/net/if_cue.c head/sys/dev/usb/net/if_ipheth.c head/sys/dev/usb/net/if_kue.c head/sys/dev/usb/net/if_mos.c head/sys/dev/usb/net/if_muge.c head/sys/dev/usb/net/if_rue.c head/sys/dev/usb/net/if_smsc.c head/sys/dev/usb/net/if_udav.c head/sys/dev/usb/net/if_urndisreg.h head/sys/dev/usb/net/if_usie.c head/sys/dev/usb/net/uhso.c head/sys/dev/usb/net/usb_ethernet.c head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/serial/uark.c head/sys/dev/usb/serial/ubsa.c head/sys/dev/usb/serial/ubser.c head/sys/dev/usb/serial/uchcom.c head/sys/dev/usb/serial/ucycom.c head/sys/dev/usb/serial/ufoma.c head/sys/dev/usb/serial/uftdi.c head/sys/dev/usb/serial/ugensa.c head/sys/dev/usb/serial/uipaq.c head/sys/dev/usb/serial/ulpt.c head/sys/dev/usb/serial/umcs.c head/sys/dev/usb/serial/umct.c head/sys/dev/usb/serial/umodem.c head/sys/dev/usb/serial/umoscom.c head/sys/dev/usb/serial/uplcom.c head/sys/dev/usb/serial/usb_serial.c head/sys/dev/usb/serial/uslcom.c head/sys/dev/usb/serial/uvisor.c head/sys/dev/usb/serial/uvscom.c head/sys/dev/usb/storage/cfumass.c head/sys/dev/usb/storage/umass.c head/sys/dev/usb/storage/urio.c head/sys/dev/usb/storage/ustorage_fs.c head/sys/dev/usb/template/usb_template.c head/sys/dev/usb/template/usb_template_kbd.c head/sys/dev/usb/template/usb_template_mouse.c head/sys/dev/usb/template/usb_template_phone.c head/sys/dev/usb/usb_busdma.c head/sys/dev/usb/usb_busdma.h head/sys/dev/usb/usb_controller.h head/sys/dev/usb/usb_core.h head/sys/dev/usb/usb_dev.c head/sys/dev/usb/usb_device.c head/sys/dev/usb/usb_generic.c head/sys/dev/usb/usb_handle_request.c head/sys/dev/usb/usb_hid.c head/sys/dev/usb/usb_hub.c head/sys/dev/usb/usb_hub_acpi.c head/sys/dev/usb/usb_hub_private.h head/sys/dev/usb/usb_lookup.c head/sys/dev/usb/usb_mbuf.c head/sys/dev/usb/usb_msctest.c head/sys/dev/usb/usb_pf.c head/sys/dev/usb/usb_process.c head/sys/dev/usb/usb_request.c head/sys/dev/usb/usb_transfer.c head/sys/dev/usb/usbdi.h head/sys/dev/usb/video/udl.c head/sys/dev/usb/wlan/if_rsu.c head/sys/dev/usb/wlan/if_rumreg.h head/sys/dev/usb/wlan/if_run.c head/sys/dev/usb/wlan/if_runreg.h head/sys/dev/usb/wlan/if_upgt.c head/sys/dev/usb/wlan/if_ural.c head/sys/dev/usb/wlan/if_uralreg.h head/sys/dev/usb/wlan/if_uralvar.h head/sys/dev/usb/wlan/if_urtw.c head/sys/dev/usb/wlan/if_zyd.c head/sys/dev/usb/wlan/if_zydreg.h Modified: head/sys/dev/usb/controller/atmegadci.c ============================================================================== --- head/sys/dev/usb/controller/atmegadci.c Tue Sep 1 21:26:00 2020 (r365083) +++ head/sys/dev/usb/controller/atmegadci.c Tue Sep 1 21:26:44 2020 (r365084) @@ -116,7 +116,6 @@ static void atmegadci_root_intr(struct atmegadci_softc */ static const struct usb_hw_ep_profile atmegadci_ep_profile[2] = { - [0] = { .max_in_frame_size = 64, .max_out_frame_size = 64, @@ -152,7 +151,6 @@ atmegadci_clocks_on(struct atmegadci_softc *sc) { if (sc->sc_flags.clocks_off && sc->sc_flags.port_powered) { - DPRINTFN(5, "\n"); /* turn on clocks */ @@ -173,7 +171,6 @@ static void atmegadci_clocks_off(struct atmegadci_softc *sc) { if (!sc->sc_flags.clocks_off) { - DPRINTFN(5, "\n"); /* disable Transceiver ? */ @@ -488,7 +485,6 @@ repeat: count = td->remainder; } while (count > 0) { - usbd_get_page(td->pc, td->offset, &buf_res); /* get correct length */ @@ -674,7 +670,6 @@ atmegadci_interrupt(struct atmegadci_softc *sc) /* check for any bus state change interrupts */ if (status & ATMEGA_UDINT_EORSTI) { - DPRINTFN(5, "end of reset\n"); /* set correct state */ @@ -697,7 +692,6 @@ atmegadci_interrupt(struct atmegadci_softc *sc) * milliseconds of inactivity on the USB BUS. */ if (status & ATMEGA_UDINT_WAKEUPI) { - DPRINTFN(5, "resume interrupt\n"); if (sc->sc_flags.status_suspend) { @@ -714,7 +708,6 @@ atmegadci_interrupt(struct atmegadci_softc *sc) atmegadci_root_intr(sc); } } else if (status & ATMEGA_UDINT_SUSPI) { - DPRINTFN(5, "suspend interrupt\n"); if (!sc->sc_flags.status_suspend) { @@ -749,7 +742,6 @@ atmegadci_interrupt(struct atmegadci_softc *sc) status = ATMEGA_READ_1(sc, ATMEGA_UEINT); /* the hardware will clear the UEINT bits automatically */ if (status) { - DPRINTFN(5, "real endpoint interrupt UEINT=0x%02x\n", status); atmegadci_interrupt_poll(sc); @@ -817,7 +809,6 @@ atmegadci_setup_standard_chain(struct usb_xfer *xfer) if (xfer->flags_int.control_xfr) { if (xfer->flags_int.control_hdr) { - temp.func = &atmegadci_setup_rx; temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; @@ -851,7 +842,6 @@ atmegadci_setup_standard_chain(struct usb_xfer *xfer) need_sync = 0; } while (x != xfer->nframes) { - /* DATA0 / DATA1 message */ temp.len = xfer->frlengths[x]; @@ -868,13 +858,11 @@ atmegadci_setup_standard_chain(struct usb_xfer *xfer) } } if (temp.len == 0) { - /* make sure that we send an USB packet */ temp.short_pkt = 0; } else { - /* regular data transfer */ temp.short_pkt = (xfer->flags.force_short_xfer) ? 0 : 1; @@ -891,7 +879,6 @@ atmegadci_setup_standard_chain(struct usb_xfer *xfer) } if (xfer->flags_int.control_xfr) { - /* always setup a valid "pc" pointer for status and sync */ temp.pc = xfer->frbuffers + 0; temp.len = 0; @@ -907,7 +894,6 @@ atmegadci_setup_standard_chain(struct usb_xfer *xfer) /* check if we should append a status stage */ if (!xfer->flags_int.control_act) { - /* * Send a DATA1 message and invert the current * endpoint direction. @@ -953,7 +939,6 @@ atmegadci_start_standard_chain(struct usb_xfer *xfer) /* poll one time - will turn on interrupts */ if (atmegadci_xfer_do_fifo(xfer)) { - /* put transfer on interrupt queue */ usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); @@ -1057,9 +1042,7 @@ atmegadci_standard_done(struct usb_xfer *xfer) xfer->td_transfer_cache = xfer->td_transfer_first; if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { - err = atmegadci_standard_done_sub(xfer); } xfer->aframes = 1; @@ -1069,7 +1052,6 @@ atmegadci_standard_done(struct usb_xfer *xfer) } } while (xfer->aframes != xfer->nframes) { - err = atmegadci_standard_done_sub(xfer); xfer->aframes++; @@ -1080,7 +1062,6 @@ atmegadci_standard_done(struct usb_xfer *xfer) if (xfer->flags_int.control_xfr && !xfer->flags_int.control_act) { - err = atmegadci_standard_done_sub(xfer); } done: @@ -1298,7 +1279,6 @@ atmegadci_init(struct atmegadci_softc *sc) /* disable all endpoints */ for (n = 0; n != ATMEGA_EP_MAX; n++) { - /* select endpoint */ ATMEGA_WRITE_1(sc, ATMEGA_UENUM, n); @@ -1556,7 +1536,6 @@ static const struct atmegadci_config_desc atmegadci_co .bInterval = 255, }, }; - #define HSETW(ptr, val) ptr = { (uint8_t)(val), (uint8_t)((val) >> 8) } static const struct usb_hub_descriptor_min atmegadci_hubd = { @@ -2036,11 +2015,9 @@ atmegadci_xfer_setup(struct usb_setup_params *parm) * compute maximum number of TDs */ if ((xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL) { - ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC 1 */ + 1 /* SYNC 2 */ ; } else { - ntd = xfer->nframes + 1 /* SYNC */ ; } @@ -2071,11 +2048,9 @@ atmegadci_xfer_setup(struct usb_setup_params *parm) parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); for (n = 0; n != ntd; n++) { - struct atmegadci_td *td; if (parm->buf) { - td = USB_ADD_BYTES(parm->buf, parm->size[0]); /* init TD */ @@ -2112,7 +2087,6 @@ atmegadci_ep_init(struct usb_device *udev, struct usb_ sc->sc_rt_addr, udev->device_index); if (udev->device_index != sc->sc_rt_addr) { - if (udev->speed != USB_SPEED_FULL) { /* not supported */ return; Modified: head/sys/dev/usb/controller/avr32dci.c ============================================================================== --- head/sys/dev/usb/controller/avr32dci.c Tue Sep 1 21:26:00 2020 (r365083) +++ head/sys/dev/usb/controller/avr32dci.c Tue Sep 1 21:26:44 2020 (r365084) @@ -116,7 +116,6 @@ static void avr32dci_root_intr(struct avr32dci_softc * */ static const struct usb_hw_ep_profile avr32dci_ep_profile[4] = { - [0] = { .max_in_frame_size = 64, .max_out_frame_size = 64, @@ -200,7 +199,6 @@ avr32dci_clocks_on(struct avr32dci_softc *sc) { if (sc->sc_flags.clocks_off && sc->sc_flags.port_powered) { - DPRINTFN(5, "\n"); /* turn on clocks */ @@ -216,7 +214,6 @@ static void avr32dci_clocks_off(struct avr32dci_softc *sc) { if (!sc->sc_flags.clocks_off) { - DPRINTFN(5, "\n"); avr32dci_mod_ctrl(sc, 0, AVR32_CTRL_DEV_EN_USBA); @@ -488,7 +485,6 @@ repeat: count = td->remainder; } while (count > 0) { - usbd_get_page(td->pc, td->offset, &buf_res); /* get correct length */ @@ -662,7 +658,6 @@ avr32dci_interrupt(struct avr32dci_softc *sc) /* check for any bus state change interrupts */ if (status & AVR32_INT_ENDRESET) { - DPRINTFN(5, "end of reset\n"); /* set correct state */ @@ -684,7 +679,6 @@ avr32dci_interrupt(struct avr32dci_softc *sc) * milliseconds of inactivity on the USB BUS. */ if (status & AVR32_INT_WAKE_UP) { - DPRINTFN(5, "resume interrupt\n"); if (sc->sc_flags.status_suspend) { @@ -700,7 +694,6 @@ avr32dci_interrupt(struct avr32dci_softc *sc) avr32dci_root_intr(sc); } } else if (status & AVR32_INT_DET_SUSPD) { - DPRINTFN(5, "suspend interrupt\n"); if (!sc->sc_flags.status_suspend) { @@ -718,7 +711,6 @@ avr32dci_interrupt(struct avr32dci_softc *sc) } /* check for any endpoint interrupts */ if (status & -AVR32_INT_EPT_INT(0)) { - DPRINTFN(5, "real endpoint interrupt\n"); avr32dci_interrupt_poll(sc); @@ -786,7 +778,6 @@ avr32dci_setup_standard_chain(struct usb_xfer *xfer) if (xfer->flags_int.control_xfr) { if (xfer->flags_int.control_hdr) { - temp.func = &avr32dci_setup_rx; temp.len = xfer->frlengths[0]; temp.pc = xfer->frbuffers + 0; @@ -819,7 +810,6 @@ avr32dci_setup_standard_chain(struct usb_xfer *xfer) need_sync = 0; } while (x != xfer->nframes) { - /* DATA0 / DATA1 message */ temp.len = xfer->frlengths[x]; @@ -836,13 +826,11 @@ avr32dci_setup_standard_chain(struct usb_xfer *xfer) } } if (temp.len == 0) { - /* make sure that we send an USB packet */ temp.short_pkt = 0; } else { - /* regular data transfer */ temp.short_pkt = (xfer->flags.force_short_xfer) ? 0 : 1; @@ -859,7 +847,6 @@ avr32dci_setup_standard_chain(struct usb_xfer *xfer) } if (xfer->flags_int.control_xfr) { - /* always setup a valid "pc" pointer for status and sync */ temp.pc = xfer->frbuffers + 0; temp.len = 0; @@ -874,7 +861,6 @@ avr32dci_setup_standard_chain(struct usb_xfer *xfer) } /* check if we should append a status stage */ if (!xfer->flags_int.control_act) { - /* * Send a DATA1 message and invert the current * endpoint direction. @@ -1028,9 +1014,7 @@ avr32dci_standard_done(struct usb_xfer *xfer) xfer->td_transfer_cache = xfer->td_transfer_first; if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { - err = avr32dci_standard_done_sub(xfer); } xfer->aframes = 1; @@ -1040,7 +1024,6 @@ avr32dci_standard_done(struct usb_xfer *xfer) } } while (xfer->aframes != xfer->nframes) { - err = avr32dci_standard_done_sub(xfer); xfer->aframes++; @@ -1051,7 +1034,6 @@ avr32dci_standard_done(struct usb_xfer *xfer) if (xfer->flags_int.control_xfr && !xfer->flags_int.control_act) { - err = avr32dci_standard_done_sub(xfer); } done: @@ -1498,7 +1480,6 @@ static const struct avr32dci_config_desc avr32dci_conf .bInterval = 255, }, }; - #define HSETW(ptr, val) ptr = { (uint8_t)(val), (uint8_t)((val) >> 8) } static const struct usb_hub_descriptor_min avr32dci_hubd = { @@ -1977,11 +1958,9 @@ avr32dci_xfer_setup(struct usb_setup_params *parm) * compute maximum number of TDs */ if ((xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL) { - ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC 1 */ + 1 /* SYNC 2 */ ; } else { - ntd = xfer->nframes + 1 /* SYNC */ ; } @@ -2011,7 +1990,6 @@ avr32dci_xfer_setup(struct usb_setup_params *parm) parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); for (n = 0; n != ntd; n++) { - struct avr32dci_td *td; if (parm->buf) { @@ -2057,7 +2035,6 @@ avr32dci_ep_init(struct usb_device *udev, struct usb_e sc->sc_rt_addr, udev->device_index); if (udev->device_index != sc->sc_rt_addr) { - if ((udev->speed != USB_SPEED_FULL) && (udev->speed != USB_SPEED_HIGH)) { /* not supported */ Modified: head/sys/dev/usb/controller/dwc_otg.c ============================================================================== --- head/sys/dev/usb/controller/dwc_otg.c Tue Sep 1 21:26:00 2020 (r365083) +++ head/sys/dev/usb/controller/dwc_otg.c Tue Sep 1 21:26:44 2020 (r365084) @@ -146,7 +146,6 @@ static void dwc_otg_interrupt_poll_locked(struct dwc_o * Here is a configuration that the chip supports. */ static const struct usb_hw_ep_profile dwc_otg_ep_profile[1] = { - [0] = { .max_in_frame_size = 64,/* fixed */ .max_out_frame_size = 64, /* fixed */ @@ -331,7 +330,6 @@ dwc_otg_init_fifo(struct dwc_otg_softc *sc, uint8_t mo } if (mode == DWC_MODE_HOST) { - /* reset active endpoints */ sc->sc_active_rx_ep = 0; @@ -373,7 +371,6 @@ dwc_otg_init_fifo(struct dwc_otg_softc *sc, uint8_t mo } if (mode == DWC_MODE_DEVICE) { - DWC_OTG_WRITE_4(sc, DOTG_GNPTXFSIZ, (0x10 << 16) | (tx_start / 4)); fifo_size -= 0x40; @@ -386,7 +383,6 @@ dwc_otg_init_fifo(struct dwc_otg_softc *sc, uint8_t mo sc->sc_active_rx_ep = 1; for (x = 1; x != sc->sc_dev_ep_max; x++) { - pf = sc->sc_hw_ep_profile + x; pf->usb.max_out_frame_size = 1024 * 3; @@ -509,7 +505,6 @@ dwc_otg_clocks_on(struct dwc_otg_softc *sc) { if (sc->sc_flags.clocks_off && sc->sc_flags.port_powered) { - DPRINTFN(5, "\n"); /* TODO - platform specific */ @@ -522,7 +517,6 @@ static void dwc_otg_clocks_off(struct dwc_otg_softc *sc) { if (!sc->sc_flags.clocks_off) { - DPRINTFN(5, "\n"); /* TODO - platform specific */ @@ -1835,7 +1829,6 @@ dwc_otg_host_data_tx(struct dwc_otg_softc *sc, struct if (hcint & (HCINT_ERRORS | HCINT_RETRY | HCINT_ACK | HCINT_NYET)) { - if (!(hcint & HCINT_ERRORS)) td->errcnt = 0; } @@ -1989,7 +1982,7 @@ send_pkt: } td->tx_bytes = 0; - + for (x = 0; x != td->max_packet_count; x++) { uint32_t rem_bytes; @@ -2153,12 +2146,10 @@ repeat: if ((td->ep_no == 0) && (temp != 0) && (GRXSTSRD_CHNUM_GET(temp) == 0)) { - if ((temp & GRXSTSRD_PKTSTS_MASK) != GRXSTSRD_STP_DATA && (temp & GRXSTSRD_PKTSTS_MASK) != GRXSTSRD_STP_COMPLETE) { - /* dump data - wrong direction */ dwc_otg_common_rx_ack(sc); } else { @@ -2173,7 +2164,6 @@ repeat: /* fill in more TX data, if possible */ if (td->tx_bytes != 0) { - uint16_t cpkt; /* check if packets have been transferred */ @@ -2229,7 +2219,6 @@ repeat: temp = DWC_OTG_READ_4(sc, DOTG_DIEPTSIZ(td->ep_no)); if (DXEPTSIZ_GET_NPKT(temp) != 0) { - DPRINTFN(5, "busy ep=%d npkt=%d DIEPTSIZ=0x%08x " "DIEPCTL=0x%08x\n", td->ep_no, DXEPTSIZ_GET_NPKT(temp), @@ -2242,7 +2231,6 @@ repeat: /* try to optimise by sending more data */ if ((max_buffer != 0) && ((td->max_packet_size & 3) == 0)) { - /* send multiple packets at the same time */ mpkt = max_buffer / td->max_packet_size; @@ -2351,7 +2339,6 @@ not_complete: if ((td->ep_no == 0) && (temp != 0) && (GRXSTSRD_CHNUM_GET(temp) == 0)) { - if ((temp & GRXSTSRD_PKTSTS_MASK) == GRXSTSRD_STP_DATA || (temp & GRXSTSRD_PKTSTS_MASK) == @@ -2519,7 +2506,6 @@ dwc_otg_update_host_transfer_schedule_locked(struct dw TAILQ_INIT(&head); if ((temp & 7) == 0) { - /* reset the schedule */ memset(sc->sc_tt_info, 0, sizeof(sc->sc_tt_info)); @@ -2667,7 +2653,6 @@ dwc_otg_update_host_transfer_schedule_locked(struct dw TAILQ_CONCAT(&sc->sc_bus.intr_q.head, &head, wait_entry); if ((temp & 7) == 0) { - DPRINTFN(12, "SOF interrupt #%d, needsof=%d\n", (int)temp, (int)sc->sc_needsof); @@ -2729,7 +2714,6 @@ repeat: } if (sc->sc_last_rx_status == 0) { - temp = DWC_OTG_READ_4(sc, DOTG_GINTSTS); if (temp & GINTSTS_RXFLVL) { /* pop current status */ @@ -2738,7 +2722,6 @@ repeat: } if (sc->sc_last_rx_status != 0) { - uint8_t ep_no; temp = sc->sc_last_rx_status & @@ -2842,7 +2825,6 @@ dwc_otg_vbus_interrupt(struct dwc_otg_softc *sc, uint8 * present else rely on the input to this function: */ if ((is_on != 0) || (sc->sc_mode == DWC_MODE_HOST)) { - if (!sc->sc_flags.status_vbus) { sc->sc_flags.status_vbus = 1; @@ -2938,7 +2920,6 @@ dwc_otg_interrupt(void *arg) DWC_OTG_READ_4(sc, DOTG_HFNUM)); if (status & GINTSTS_USBRST) { - /* set correct state */ sc->sc_flags.status_device_mode = 1; sc->sc_flags.status_bus_reset = 0; @@ -2956,7 +2937,6 @@ dwc_otg_interrupt(void *arg) /* check for any bus state change interrupts */ if (status & GINTSTS_ENUMDONE) { - uint32_t temp; DPRINTFN(5, "end of reset\n"); @@ -3070,13 +3050,11 @@ dwc_otg_interrupt(void *arg) * milliseconds of inactivity on the USB BUS. */ if (status & GINTSTS_WKUPINT) { - DPRINTFN(5, "resume interrupt\n"); dwc_otg_resume_irq(sc); } else if (status & GINTSTS_USBSUSP) { - DPRINTFN(5, "suspend interrupt\n"); dwc_otg_suspend_irq(sc); @@ -3177,7 +3155,6 @@ dwc_otg_setup_standard_chain(struct usb_xfer *xfer) if (xfer->flags_int.control_xfr) { if (xfer->flags_int.control_hdr) { - if (is_host) temp.func = &dwc_otg_host_setup_tx; else @@ -3226,7 +3203,6 @@ dwc_otg_setup_standard_chain(struct usb_xfer *xfer) need_sync = 0; } while (x != xfer->nframes) { - /* DATA0 / DATA1 message */ temp.len = xfer->frlengths[x]; @@ -3243,13 +3219,11 @@ dwc_otg_setup_standard_chain(struct usb_xfer *xfer) } } if (temp.len == 0) { - /* make sure that we send an USB packet */ temp.short_pkt = 0; } else { - /* regular data transfer */ temp.short_pkt = (xfer->flags.force_short_xfer ? 0 : 1); @@ -3266,7 +3240,6 @@ dwc_otg_setup_standard_chain(struct usb_xfer *xfer) } if (xfer->flags_int.control_xfr) { - /* always setup a valid "pc" pointer for status and sync */ temp.pc = xfer->frbuffers + 0; temp.len = 0; @@ -3282,7 +3255,6 @@ dwc_otg_setup_standard_chain(struct usb_xfer *xfer) /* check if we should append a status stage */ if (!xfer->flags_int.control_act) { - /* * Send a DATA1 message and invert the current * endpoint direction. @@ -3320,7 +3292,6 @@ dwc_otg_setup_standard_chain(struct usb_xfer *xfer) } else { /* check if we need to sync */ if (need_sync) { - temp.pc = xfer->frbuffers + 0; temp.len = 0; temp.short_pkt = 0; @@ -3337,7 +3308,6 @@ dwc_otg_setup_standard_chain(struct usb_xfer *xfer) xfer->td_transfer_last = td; if (is_host) { - struct dwc_otg_softc *sc; uint32_t hcchar; uint32_t hcsplt; @@ -3614,9 +3584,7 @@ dwc_otg_standard_done(struct usb_xfer *xfer) xfer->td_transfer_cache = xfer->td_transfer_first; if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { - err = dwc_otg_standard_done_sub(xfer); } xfer->aframes = 1; @@ -3626,7 +3594,6 @@ dwc_otg_standard_done(struct usb_xfer *xfer) } } while (xfer->aframes != xfer->nframes) { - err = dwc_otg_standard_done_sub(xfer); xfer->aframes++; @@ -3637,7 +3604,6 @@ dwc_otg_standard_done(struct usb_xfer *xfer) if (xfer->flags_int.control_xfr && !xfer->flags_int.control_act) { - err = dwc_otg_standard_done_sub(xfer); } done: @@ -3721,7 +3687,6 @@ dwc_otg_set_stall(struct usb_device *udev, /* clear active OUT ep */ if (!(ep_no & UE_DIR_IN)) { - sc->sc_active_rx_ep &= ~(1U << (ep_no & UE_ADDR)); if (sc->sc_last_rx_status != 0 && @@ -3851,11 +3816,9 @@ dwc_otg_device_state_change(struct usb_device *udev) /* deactivate all other endpoint but the control endpoint */ if (udev->state == USB_STATE_CONFIGURED || udev->state == USB_STATE_ADDRESSED) { - USB_BUS_LOCK(&sc->sc_bus); for (x = 1; x != sc->sc_dev_ep_max; x++) { - if (x < sc->sc_dev_in_ep_max) { DWC_OTG_WRITE_4(sc, DOTG_DIEPCTL(x), DIEPCTL_EPDIS); @@ -4057,7 +4020,6 @@ dwc_otg_init(struct dwc_otg_softc *sc) DWC_OTG_WRITE_4(sc, DOTG_GINTMSK, sc->sc_irq_mask); if (sc->sc_mode == DWC_MODE_OTG || sc->sc_mode == DWC_MODE_DEVICE) { - /* enable all endpoint interrupts */ temp = DWC_OTG_READ_4(sc, DOTG_GHWCFG2); if (temp & GHWCFG2_MPI) { @@ -4358,7 +4320,6 @@ static const struct dwc_otg_config_desc dwc_otg_confd .bInterval = 255, }, }; - #define HSETW(ptr, val) ptr = { (uint8_t)(val), (uint8_t)((val) >> 8) } static const struct usb_hub_descriptor_min dwc_otg_hubd = { @@ -4728,7 +4689,6 @@ tr_handle_set_port_feature: case UHF_PORT_RESET: if (sc->sc_flags.status_device_mode == 0) { - DPRINTF("PORT RESET\n"); /* enable PORT reset */ @@ -4880,11 +4840,9 @@ dwc_otg_xfer_setup(struct usb_setup_params *parm) ep_type = (xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE); if (ep_type == UE_CONTROL) { - ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC 1 */ + 1 /* SYNC 2 */ + 1 /* SYNC 3 */; } else { - ntd = xfer->nframes + 1 /* SYNC */ ; } @@ -4920,11 +4878,9 @@ dwc_otg_xfer_setup(struct usb_setup_params *parm) parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); for (n = 0; n != ntd; n++) { - struct dwc_otg_td *td; if (parm->buf) { - td = USB_ADD_BYTES(parm->buf, parm->size[0]); /* compute shared bandwidth resource index for TT */ @@ -4973,7 +4929,6 @@ dwc_otg_ep_init(struct usb_device *udev, struct usb_en sc->sc_rt_addr, udev->device_index); if (udev->device_index != sc->sc_rt_addr) { - if (udev->flags.usb_mode == USB_MODE_DEVICE) { if (udev->speed != USB_SPEED_FULL && udev->speed != USB_SPEED_HIGH) { Modified: head/sys/dev/usb/controller/dwc_otg_fdt.c ============================================================================== --- head/sys/dev/usb/controller/dwc_otg_fdt.c Tue Sep 1 21:26:00 2020 (r365083) +++ head/sys/dev/usb/controller/dwc_otg_fdt.c Tue Sep 1 21:26:44 2020 (r365084) @@ -107,7 +107,6 @@ dwc_otg_attach(device_t dev) /* get USB mode, if any */ if (OF_getprop(ofw_bus_get_node(dev), "dr_mode", &usb_mode, sizeof(usb_mode)) > 0) { - /* ensure proper zero termination */ usb_mode[sizeof(usb_mode) - 1] = 0; Modified: head/sys/dev/usb/controller/ehci.c ============================================================================== --- head/sys/dev/usb/controller/ehci.c Tue Sep 1 21:26:00 2020 (r365083) +++ head/sys/dev/usb/controller/ehci.c Tue Sep 1 21:26:44 2020 (r365084) @@ -455,7 +455,6 @@ ehci_init(ehci_softc_t *sc) sitd->sitd_next = sc->sc_intr_p_last[i | (EHCI_VIRTUAL_FRAMELIST_COUNT / 2)]->qh_self; - usbd_get_page(sc->sc_hw.isoc_hs_start_pc + i, 0, &buf_res); itd = buf_res.buffer; @@ -498,7 +497,6 @@ ehci_init(ehci_softc_t *sc) usbd_get_page(&sc->sc_hw.async_start_pc, 0, &buf_res); if (1) { - ehci_qh_t *qh; qh = buf_res.buffer; @@ -1053,7 +1051,6 @@ _ehci_remove_qh(ehci_qh_t *sqh, ehci_qh_t *last) /* only remove if not removed from a queue */ if (sqh->prev) { - sqh->prev->next = sqh->next; sqh->prev->qh_link = sqh->qh_link; @@ -1110,7 +1107,6 @@ ehci_non_isoc_done_sub(struct usb_xfer *xfer) usbd_xfer_set_frame_len(xfer, xfer->aframes, 0); } while (1) { - usb_pc_cpu_invalidate(td->page_cache); status = hc32toh(sc, td->qtd_status); @@ -1220,9 +1216,7 @@ ehci_non_isoc_done(struct usb_xfer *xfer) xfer->td_transfer_cache = xfer->td_transfer_first; if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { - err = ehci_non_isoc_done_sub(xfer); } xfer->aframes = 1; @@ -1232,7 +1226,6 @@ ehci_non_isoc_done(struct usb_xfer *xfer) } } while (xfer->aframes != xfer->nframes) { - err = ehci_non_isoc_done_sub(xfer); xfer->aframes++; @@ -1243,7 +1236,6 @@ ehci_non_isoc_done(struct usb_xfer *xfer) if (xfer->flags_int.control_xfr && !xfer->flags_int.control_act) { - err = ehci_non_isoc_done_sub(xfer); } done: @@ -1580,9 +1572,7 @@ restart: td_next = temp->td_next; while (1) { - if (temp->len == 0) { - if (temp->shortpkt) { break; } @@ -1592,7 +1582,6 @@ restart: average = 0; } else { - average = temp->average; if (temp->len < average) { @@ -1614,7 +1603,6 @@ restart: /* check if we are pre-computing */ if (precompute) { - /* update remaining length */ temp->len -= average; @@ -1629,9 +1617,7 @@ restart: EHCI_QTD_SET_BYTES(average)); if (average == 0) { - if (temp->auto_data_toggle == 0) { - /* update data toggle, ZLP case */ temp->qtd_status ^= @@ -1651,11 +1637,9 @@ restart: td->qtd_buffer_hi[3] = 0; td->qtd_buffer_hi[4] = 0; } else { - uint8_t x; if (temp->auto_data_toggle == 0) { - /* update data toggle */ if (howmany(average, temp->max_frame_size) & 1) { @@ -1802,7 +1786,6 @@ ehci_setup_standard_chain(struct usb_xfer *xfer, ehci_ if (xfer->flags_int.control_xfr) { if (xfer->flags_int.control_hdr) { - xfer->endpoint->toggle_next = 0; temp.qtd_status &= @@ -1831,7 +1814,6 @@ ehci_setup_standard_chain(struct usb_xfer *xfer, ehci_ } while (x != xfer->nframes) { - /* DATA0 / DATA1 message */ temp.len = xfer->frlengths[x]; @@ -1858,13 +1840,11 @@ ehci_setup_standard_chain(struct usb_xfer *xfer, ehci_ EHCI_QTD_SET_TOGGLE(1)); if (temp.len == 0) { - /* make sure that we send an USB packet */ temp.shortpkt = 0; } else { - /* regular data transfer */ temp.shortpkt = (xfer->flags.force_short_xfer) ? 0 : 1; @@ -1886,7 +1866,6 @@ ehci_setup_standard_chain(struct usb_xfer *xfer, ehci_ if (xfer->flags_int.control_xfr && !xfer->flags_int.control_act) { - /* * Send a DATA1 message and invert the current endpoint * direction. @@ -1948,7 +1927,6 @@ ehci_setup_standard_chain(struct usb_xfer *xfer, ehci_ if (methods != &ehci_device_intr_methods) qh_endp |= EHCI_QH_SET_NRL(8); } else { - if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) { qh_endp |= EHCI_QH_SET_EPS(EHCI_QH_SPEED_FULL); } else { @@ -2132,7 +2110,6 @@ ehci_isoc_hs_done(ehci_softc_t *sc, struct usb_xfer *x DPRINTFN(2, "status=0x%08x, len=%u\n", status, len); if (xfer->endpoint->usb_smask & (1 << td_no)) { - if (*plen >= len) { /* * The length is valid. NOTE: The @@ -2430,9 +2407,7 @@ ehci_device_isoc_fs_open(struct usb_xfer *xfer) /* initialize all TD's */ for (ds = 0; ds != 2; ds++) { - for (td = xfer->td_start[ds]; td; td = td->obj_next) { - td->sitd_portaddr = sitd_portaddr; /* @@ -2713,9 +2688,7 @@ ehci_device_isoc_hs_open(struct usb_xfer *xfer) /* initialize all TD's */ for (ds = 0; ds != 2; ds++) { - for (td = xfer->td_start[ds]; td; td = td->obj_next) { - /* set TD inactive */ td->itd_status[0] = 0; td->itd_status[1] = 0; @@ -2883,7 +2856,6 @@ ehci_device_isoc_hs_enter(struct usb_xfer *xfer) td_no++; if ((td_no == 8) || (nframes == 0)) { - /* the rest of the transfers are not active, if any */ for (x = td_no; x != 8; x++) { td->itd_status[x] = 0; /* not active */ @@ -3254,7 +3226,6 @@ ehci_roothub_exec(struct usb_device *udev, break; case UHF_PORT_SUSPEND: if ((v & EHCI_PS_SUSP) && (!(v & EHCI_PS_FPR))) { - /* * waking up a High Speed device is rather * complicated if @@ -3514,7 +3485,6 @@ ehci_xfer_setup(struct usb_setup_params *parm) * compute maximum number of some structures */ if (parm->methods == &ehci_device_ctrl_methods) { - /* * The proof for the "nqtd" formula is illustrated like * this: @@ -3556,7 +3526,6 @@ ehci_xfer_setup(struct usb_setup_params *parm) + (xfer->max_data_length / xfer->max_hc_frame_size)); } else if (parm->methods == &ehci_device_bulk_methods) { - parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = EHCI_QTD_PAYLOAD_MAX; @@ -3569,7 +3538,6 @@ ehci_xfer_setup(struct usb_setup_params *parm) + (xfer->max_data_length / xfer->max_hc_frame_size)); } else if (parm->methods == &ehci_device_intr_methods) { - if (parm->speed == USB_SPEED_HIGH) { parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 3; @@ -3591,7 +3559,6 @@ ehci_xfer_setup(struct usb_setup_params *parm) + (xfer->max_data_length / xfer->max_hc_frame_size)); } else if (parm->methods == &ehci_device_isoc_fs_methods) { - parm->hc_max_packet_size = 0x3FF; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = 0x3FF; @@ -3602,7 +3569,6 @@ ehci_xfer_setup(struct usb_setup_params *parm) nsitd = xfer->nframes; } else if (parm->methods == &ehci_device_isoc_hs_methods) { - parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 3; parm->hc_max_frame_size = 0xC00; @@ -3614,7 +3580,6 @@ ehci_xfer_setup(struct usb_setup_params *parm) usbd_xfer_get_fps_shift(xfer); } else { - parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = 0x400; @@ -3758,7 +3723,6 @@ ehci_ep_init(struct usb_device *udev, struct usb_endpo sc->sc_addr); if (udev->device_index != sc->sc_addr) { - if ((udev->speed != USB_SPEED_HIGH) && ((udev->hs_hub_addr == 0) || (udev->hs_port_no == 0) || @@ -3815,9 +3779,7 @@ ehci_device_resume(struct usb_device *udev) USB_BUS_LOCK(udev->bus); TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { - if (xfer->xroot->udev == udev) { - methods = xfer->endpoint->methods; if ((methods == &ehci_device_bulk_methods) || @@ -3849,9 +3811,7 @@ ehci_device_suspend(struct usb_device *udev) USB_BUS_LOCK(udev->bus); TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { - if (xfer->xroot->udev == udev) { - methods = xfer->endpoint->methods; if ((methods == &ehci_device_bulk_methods) || Modified: head/sys/dev/usb/controller/ehci.h ============================================================================== --- head/sys/dev/usb/controller/ehci.h Tue Sep 1 21:26:00 2020 (r365083) +++ head/sys/dev/usb/controller/ehci.h Tue Sep 1 21:26:44 2020 (r365084) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:27:42 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC3B1379C44; Tue, 1 Sep 2020 21:27:42 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0XZ6Kdgz4Khv; Tue, 1 Sep 2020 21:27:42 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A22A41FCC1; Tue, 1 Sep 2020 21:27:42 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LRgft025075; Tue, 1 Sep 2020 21:27:42 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LRZwg025034; Tue, 1 Sep 2020 21:27:35 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012127.081LRZwg025034@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:27:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365085 - in head/sys/dev/sound: . isa macio midi pci pci/hda pcm usb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/sound: . isa macio midi pci pci/hda pcm usb X-SVN-Commit-Revision: 365085 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:27:43 -0000 Author: mjg Date: Tue Sep 1 21:27:34 2020 New Revision: 365085 URL: https://svnweb.freebsd.org/changeset/base/365085 Log: sound: clean up empty lines in .c and .h files Modified: head/sys/dev/sound/clone.h head/sys/dev/sound/isa/ad1816.c head/sys/dev/sound/isa/ad1816.h head/sys/dev/sound/isa/ess.c head/sys/dev/sound/isa/gusc.c head/sys/dev/sound/isa/mss.c head/sys/dev/sound/isa/mss.h head/sys/dev/sound/isa/sb.h head/sys/dev/sound/isa/sb16.c head/sys/dev/sound/isa/sb8.c head/sys/dev/sound/macio/aoa.c head/sys/dev/sound/macio/aoa.h head/sys/dev/sound/macio/davbus.c head/sys/dev/sound/macio/davbusreg.h head/sys/dev/sound/macio/i2s.c head/sys/dev/sound/macio/snapper.c head/sys/dev/sound/macio/tumbler.c head/sys/dev/sound/midi/midi.c head/sys/dev/sound/midi/mpu401.c head/sys/dev/sound/midi/sequencer.c head/sys/dev/sound/midi/sequencer.h head/sys/dev/sound/pci/allegro_reg.h head/sys/dev/sound/pci/als4000.c head/sys/dev/sound/pci/atiixp.c head/sys/dev/sound/pci/atiixp.h head/sys/dev/sound/pci/aureal.c head/sys/dev/sound/pci/aureal.h head/sys/dev/sound/pci/cmi.c head/sys/dev/sound/pci/csa.c head/sys/dev/sound/pci/csareg.h head/sys/dev/sound/pci/ds1-fw.h head/sys/dev/sound/pci/ds1.c head/sys/dev/sound/pci/ds1.h head/sys/dev/sound/pci/emu10k1.c head/sys/dev/sound/pci/emu10kx-midi.c head/sys/dev/sound/pci/emu10kx-pcm.c head/sys/dev/sound/pci/emu10kx.c head/sys/dev/sound/pci/emu10kx.h head/sys/dev/sound/pci/emuxkireg.h head/sys/dev/sound/pci/envy24.c head/sys/dev/sound/pci/envy24.h head/sys/dev/sound/pci/envy24ht.c head/sys/dev/sound/pci/envy24ht.h head/sys/dev/sound/pci/es137x.c head/sys/dev/sound/pci/fm801.c head/sys/dev/sound/pci/hda/hda_reg.h head/sys/dev/sound/pci/hda/hdaa.c head/sys/dev/sound/pci/hda/hdac.c head/sys/dev/sound/pci/hdspe-pcm.c head/sys/dev/sound/pci/ich.c head/sys/dev/sound/pci/ich.h head/sys/dev/sound/pci/maestro.c head/sys/dev/sound/pci/maestro3.c head/sys/dev/sound/pci/maestro_reg.h head/sys/dev/sound/pci/neomagic-coeff.h head/sys/dev/sound/pci/neomagic.h head/sys/dev/sound/pci/solo.c head/sys/dev/sound/pci/t4dwave.c head/sys/dev/sound/pci/t4dwave.h head/sys/dev/sound/pci/via8233.c head/sys/dev/sound/pci/via82c686.c head/sys/dev/sound/pcm/channel.h head/sys/dev/sound/pcm/dsp.c head/sys/dev/sound/pcm/feeder.c head/sys/dev/sound/pcm/feeder_eq.c head/sys/dev/sound/pcm/feeder_matrix.c head/sys/dev/sound/pcm/feeder_rate.c head/sys/dev/sound/pcm/g711.h head/sys/dev/sound/pcm/intpcm.h head/sys/dev/sound/pcm/mixer.c head/sys/dev/sound/pcm/sndstat.c head/sys/dev/sound/pcm/sndstat.h head/sys/dev/sound/pcm/sound.c head/sys/dev/sound/pcm/sound.h head/sys/dev/sound/pcm/vchan.c head/sys/dev/sound/usb/uaudio.c head/sys/dev/sound/usb/uaudio_pcm.c head/sys/dev/sound/usb/uaudioreg.h Modified: head/sys/dev/sound/clone.h ============================================================================== --- head/sys/dev/sound/clone.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/clone.h Tue Sep 1 21:27:34 2020 (r365085) @@ -99,7 +99,6 @@ struct snd_clone; #define SND_CLONE_DEVMASK SND_CLONE_ALLOC - void snd_timestamp(struct timespec *); struct snd_clone *snd_clone_create(int, int, int, uint32_t); Modified: head/sys/dev/sound/isa/ad1816.c ============================================================================== --- head/sys/dev/sound/isa/ad1816.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/isa/ad1816.c Tue Sep 1 21:27:34 2020 (r365085) @@ -671,7 +671,6 @@ static device_method_t ad1816_methods[] = { DEVMETHOD(device_probe, ad1816_probe), DEVMETHOD(device_attach, ad1816_attach), DEVMETHOD(device_detach, ad1816_detach), - { 0, 0 } }; @@ -685,5 +684,3 @@ DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, pcm_devc DRIVER_MODULE(snd_ad1816, acpi, ad1816_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_ad1816, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_ad1816, 1); - - Modified: head/sys/dev/sound/isa/ad1816.h ============================================================================== --- head/sys/dev/sound/isa/ad1816.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/isa/ad1816.h Tue Sep 1 21:27:34 2020 (r365085) @@ -94,4 +94,3 @@ #define AD1816_MIXER_DEVICES \ (SOUND_MASK_VOLUME | SOUND_MASK_PCM | SOUND_MASK_SYNTH | \ SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD | SOUND_MASK_IGAIN) - Modified: head/sys/dev/sound/isa/ess.c ============================================================================== --- head/sys/dev/sound/isa/ess.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/isa/ess.c Tue Sep 1 21:27:34 2020 (r365085) @@ -143,13 +143,11 @@ static int ess_stop(struct ess_chinfo *ch); static void ess_lock(struct ess_info *sc) { - sbc_lock(device_get_softc(sc->parent_dev)); } static void ess_unlock(struct ess_info *sc) { - sbc_unlock(device_get_softc(sc->parent_dev)); } @@ -468,7 +466,6 @@ ess_setupch(struct ess_info *sc, int ch, int dir, int int unsign = (fmt == AFMT_U8 || fmt == AFMT_U16_LE)? 1 : 0; u_int8_t spdval, fmtval; - spdval = (sc->newspeed)? ess_calcspeed9(&spd) : ess_calcspeed8(&spd); len = -len; @@ -932,7 +929,6 @@ static device_method_t ess_methods[] = { DEVMETHOD(device_attach, ess_attach), DEVMETHOD(device_detach, ess_detach), DEVMETHOD(device_resume, ess_resume), - { 0, 0 } }; @@ -1004,7 +1000,6 @@ static device_method_t esscontrol_methods[] = { DEVMETHOD(device_probe, esscontrol_probe), DEVMETHOD(device_attach, esscontrol_attach), DEVMETHOD(device_detach, esscontrol_detach), - { 0, 0 } }; Modified: head/sys/dev/sound/isa/gusc.c ============================================================================== --- head/sys/dev/sound/isa/gusc.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/isa/gusc.c Tue Sep 1 21:27:34 2020 (r365085) @@ -290,7 +290,6 @@ gusisa_probe(device_t dev) device_set_desc(dev, "Gravis UltraSound MAX"); return 0; } else { - /* * TODO: Support even older GUS cards. MIDI should work on * all models. Modified: head/sys/dev/sound/isa/mss.c ============================================================================== --- head/sys/dev/sound/isa/mss.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/isa/mss.c Tue Sep 1 21:27:34 2020 (r365085) @@ -767,7 +767,6 @@ mss_init(struct mss_info *mss, device_t dev) return 0; } - /* * main irq handler for the CS423x. The OPTi931 code is * a separate one. @@ -1073,7 +1072,6 @@ mss_trigger(struct mss_chinfo *ch, int go) return 0; } - /* * the opti931 seems to miss interrupts when working in full * duplex, so we try some heuristics to catch them. @@ -1527,7 +1525,6 @@ mss_detect(device_t dev, struct mss_info *mss) * b2-b0 = chip id; */ switch (id) { - case 0xa0: name = "CS4231A"; mss->bd_id = MD_CS42XX; @@ -1882,7 +1879,6 @@ static device_method_t mss_methods[] = { DEVMETHOD(device_detach, mss_detach), DEVMETHOD(device_suspend, mss_suspend), DEVMETHOD(device_resume, mss_resume), - { 0, 0 } }; @@ -2099,7 +2095,6 @@ opti_init(device_t dev, struct mss_info *mss) return ENXIO; } - switch (mss->bd_id) { case MD_OPTI924: opti_write(mss, 1, 0x80 | basebits); /* MSS mode */ @@ -2194,7 +2189,6 @@ static device_method_t pnpmss_methods[] = { DEVMETHOD(device_detach, mss_detach), DEVMETHOD(device_suspend, mss_suspend), DEVMETHOD(device_resume, mss_resume), - { 0, 0 } }; @@ -2280,7 +2274,6 @@ static device_method_t guspcm_methods[] = { DEVMETHOD(device_probe, guspcm_probe), DEVMETHOD(device_attach, guspcm_attach), DEVMETHOD(device_detach, mss_detach), - { 0, 0 } }; Modified: head/sys/dev/sound/isa/mss.h ============================================================================== --- head/sys/dev/sound/isa/mss.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/isa/mss.h Tue Sep 1 21:27:34 2020 (r365085) @@ -193,7 +193,6 @@ typedef struct mixer_def mixer_tab[32][2]; #define MSS_REC_DEVICES \ (SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD|SOUND_MASK_IMIX) - /* * Table of mixer registers. There is a default table for the * AD1848/CS423x clones, one for the OPTI931 and one for the @@ -242,7 +241,6 @@ MIX_NONE(SOUND_MIXER_LINE3), (SOUND_MASK_SYNTH | SOUND_MASK_PCM | SOUND_MASK_MIC | \ SOUND_MASK_CD | SOUND_MASK_IMIX | SOUND_MASK_IGAIN ) - mixer_ent opti930_devices[32][2] = { MIX_ENT(SOUND_MIXER_VOLUME, 22, 1, 0, 4, 23, 1, 0, 4), MIX_NONE(SOUND_MIXER_BASS), @@ -411,5 +409,3 @@ MIX_NONE(SOUND_MIXER_LINE3), #define OPL3SAx_HWVOL 0x17 /* HW Volume IRQ Configuration (R/W) */ #define OPL3SAx_HWVOL_IRQA 0x10 /* HW Volume IRQ on IRQ-A */ #define OPL3SAx_HWVOL_IRQB 0x20 /* HW Volume IRQ on IRQ-B */ - - Modified: head/sys/dev/sound/isa/sb.h ============================================================================== --- head/sys/dev/sound/isa/sb.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/isa/sb.h Tue Sep 1 21:27:34 2020 (r365085) @@ -86,7 +86,6 @@ void sbc_unlock(struct sbc_softc *); #define DSP_CMD_DAC2S_AUTO 0x1f /* auto 2-bit adpcm dma out (start) */ - /* SB16 commands */ #define DSP_CMD_O16 0xb0 #define DSP_CMD_I16 0xb8 @@ -112,7 +111,6 @@ void sbc_unlock(struct sbc_softc *); #define DSP_CMD_GETVER 0xE1 #define DSP_CMD_GETID 0xE7 /* return id bytes */ - #define DSP_CMD_OUT16 0x41 /* send parms for dma out on sb16 */ #define DSP_CMD_IN16 0x42 /* send parms for dma in on sb16 */ Modified: head/sys/dev/sound/isa/sb16.c ============================================================================== --- head/sys/dev/sound/isa/sb16.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/isa/sb16.c Tue Sep 1 21:27:34 2020 (r365085) @@ -125,19 +125,16 @@ static void sb_intr(void *arg); static void sb_lock(struct sb_info *sb) { - sbc_lock(device_get_softc(sb->parent_dev)); } static void sb_lockassert(struct sb_info *sb) { - sbc_lockassert(device_get_softc(sb->parent_dev)); } static void sb_unlock(struct sb_info *sb) { - sbc_unlock(device_get_softc(sb->parent_dev)); } @@ -336,7 +333,7 @@ static int rel2abs_volume(int x, int max) { int temp; - + temp = ((x * max) + 50) / 100; if (temp > max) temp = max; @@ -899,7 +896,6 @@ static device_method_t sb16_methods[] = { DEVMETHOD(device_probe, sb16_probe), DEVMETHOD(device_attach, sb16_attach), DEVMETHOD(device_detach, sb16_detach), - { 0, 0 } }; Modified: head/sys/dev/sound/isa/sb8.c ============================================================================== --- head/sys/dev/sound/isa/sb8.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/isa/sb8.c Tue Sep 1 21:27:34 2020 (r365085) @@ -116,13 +116,11 @@ static int sb_stop(struct sb_chinfo *ch); static void sb_lock(struct sb_info *sb) { - sbc_lock(device_get_softc(sb->parent_dev)); } static void sb_unlock(struct sb_info *sb) { - sbc_unlock(device_get_softc(sb->parent_dev)); } @@ -789,7 +787,6 @@ static device_method_t sb_methods[] = { DEVMETHOD(device_probe, sb_probe), DEVMETHOD(device_attach, sb_attach), DEVMETHOD(device_detach, sb_detach), - { 0, 0 } }; @@ -803,7 +800,3 @@ DRIVER_MODULE(snd_sb8, sbc, sb_driver, pcm_devclass, 0 MODULE_DEPEND(snd_sb8, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_DEPEND(snd_sb8, snd_sbc, 1, 1, 1); MODULE_VERSION(snd_sb8, 1); - - - - Modified: head/sys/dev/sound/macio/aoa.c ============================================================================== --- head/sys/dev/sound/macio/aoa.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/macio/aoa.c Tue Sep 1 21:27:34 2020 (r365085) @@ -130,7 +130,7 @@ aoa_dma_create(struct aoa_softc *sc) dma->tag = tag; dma->bufsz = AOA_BUFFER_SIZE; dma->blksz = PAGE_SIZE; /* initial blocksize */ - + mtx_init(&dma->mutex, "AOA", NULL, MTX_DEF); sc->sc_intrp = dma; @@ -215,7 +215,7 @@ aoa_chan_getptr(kobj_t obj, void *data) if (!dma->running) return (0); - + return (dma->slot * dma->blksz); } @@ -327,7 +327,6 @@ aoa_interrupt(void *xsc) mtx_lock(&dma->mutex); while (dbdma_get_cmd_status(dma->channel, dma->slot)) { - dbdma_clear_cmd_status(dma->channel, dma->slot); dma->slot = (dma->slot + 1) % dma->slots; @@ -389,4 +388,3 @@ aoa_attach(void *xsc) return (0); } - Modified: head/sys/dev/sound/macio/aoa.h ============================================================================== --- head/sys/dev/sound/macio/aoa.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/macio/aoa.h Tue Sep 1 21:27:34 2020 (r365085) @@ -46,4 +46,3 @@ void aoa_interrupt(void *); int aoa_attach(void *xsc); #endif /* SOUND_AOA_H */ - Modified: head/sys/dev/sound/macio/davbus.c ============================================================================== --- head/sys/dev/sound/macio/davbus.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/macio/davbus.c Tue Sep 1 21:27:34 2020 (r365085) @@ -78,7 +78,6 @@ static device_method_t pcm_davbus_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, davbus_probe), DEVMETHOD(device_attach, davbus_attach), - { 0, 0 } }; @@ -105,7 +104,7 @@ davbus_probe(device_t self) if (strcmp(name, "davbus") != 0) return (ENXIO); - + device_set_desc(self, "Apple DAVBus Audio Controller"); return (0); @@ -159,7 +158,7 @@ burgundy_init(struct snd_mixer *m) mtx_lock(&d->mutex); burgundy_write_locked(d, 0x16700, 0x40); - + burgundy_write_locked(d, BURGUNDY_MIX0_REG, 0); burgundy_write_locked(d, BURGUNDY_MIX1_REG, 0); burgundy_write_locked(d, BURGUNDY_MIX2_REG, BURGUNDY_MIX_ISA); @@ -374,7 +373,6 @@ screamer_reinit(struct snd_mixer *m) return (0); } - static void screamer_write_locked(struct davbus_softc *d, u_int reg, u_int val) { @@ -529,7 +527,7 @@ davbus_attach(device_t self) return (ENXIO); oirq = rman_get_start(dbdma_irq); - + DPRINTF(("interrupting at irq %d\n", oirq)); err = powerpc_config_intr(oirq, INTR_TRIGGER_EDGE, INTR_POLARITY_LOW); @@ -556,7 +554,7 @@ davbus_attach(device_t self) if (cintr != NULL) bus_setup_intr(self, cintr, INTR_TYPE_MISC | INTR_MPSAFE, NULL, davbus_cint, sc, &cookie); - + /* Initialize controller registers. */ bus_write_4(sc->reg, DAVBUS_SOUND_CTRL, DAVBUS_INPUT_SUBFRAME0 | DAVBUS_OUTPUT_SUBFRAME0 | DAVBUS_RATE_44100 | DAVBUS_INTR_PORTCHG); @@ -589,7 +587,6 @@ davbus_cint(void *ptr) status = bus_read_4(d->reg, DAVBUS_CODEC_STATUS); if (d->read_status && d->set_outputs) { - mask = (*d->read_status)(d, status); (*d->set_outputs)(d, mask); } @@ -600,4 +597,3 @@ davbus_cint(void *ptr) mtx_unlock(&d->mutex); } - Modified: head/sys/dev/sound/macio/davbusreg.h ============================================================================== --- head/sys/dev/sound/macio/davbusreg.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/macio/davbusreg.h Tue Sep 1 21:27:34 2020 (r365085) @@ -78,7 +78,6 @@ /* DAVBUS_CODEC_CTRL bit definitions. */ #define DAVBUS_CODEC_BUSY 0x01000000 - /* * Burgundy Codec Control Bits */ @@ -235,7 +234,6 @@ #define SCREAMER_CODEC_EMSEL2 0x00800000 #define SCREAMER_CODEC_EMSEL4 0x00c00000 - /* cc0 */ /* * Bits 7-4 specify the left ADC input gain; @@ -284,4 +282,3 @@ #define SCREAMER_STATUS_REVSHFT 12 #endif /* _SOUND_DAVBUS_H */ - Modified: head/sys/dev/sound/macio/i2s.c ============================================================================== --- head/sys/dev/sound/macio/i2s.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/macio/i2s.c Tue Sep 1 21:27:34 2020 (r365085) @@ -111,7 +111,6 @@ static device_method_t pcm_i2s_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, i2s_probe), DEVMETHOD(device_attach, i2s_attach), - { 0, 0 } }; @@ -131,7 +130,6 @@ static device_method_t aoagpio_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, aoagpio_probe), DEVMETHOD(device_attach, aoagpio_attach), - { 0, 0 } }; @@ -152,7 +150,6 @@ static devclass_t aoagpio_devclass; DRIVER_MODULE(aoagpio, macgpio, aoagpio_driver, aoagpio_devclass, 0, 0); - /***************************************************************************** Probe and attachment routines. *****************************************************************************/ @@ -179,7 +176,7 @@ i2s_probe(device_t self) if (subchild != 0 && OF_getprop(subchild, "name", subchildname, sizeof(subchildname)) > 0 && strcmp(subchildname, "lightshow") == 0) return (ENXIO); - + device_set_desc(self, "Apple I2S Audio Controller"); return (0); @@ -195,7 +192,7 @@ i2s_attach(device_t self) void *dbdma_ih; int rid, oirq, err; phandle_t port; - + sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO); sc->aoa.sc_dev = self; @@ -207,7 +204,7 @@ i2s_attach(device_t self) sc->soundnode = of_find_firstchild_byname(port, "sound"); if (sc->soundnode == -1) return (ENXIO); - + mtx_init(&sc->port_mtx, "port_mtx", NULL, MTX_DEF); /* Map the controller register space. */ @@ -305,7 +302,7 @@ aoagpio_int(void *cookie) struct aoagpio_softc *sc; sc = device_get_softc(self); - + if (macgpio_read(self) & GPIO_LEVEL_RO) sc->level = sc->detect_active; else @@ -460,7 +457,7 @@ i2s_setup(struct i2s_softc *sc, u_int rate, u_int word if (sclk_fs != 32 && sclk_fs != 64) return (EINVAL); - + /* * Find a clock source to derive the master clock (MCLK) * and the I2S bit block (SCLK) and set the divisors as @@ -478,7 +475,7 @@ i2s_setup(struct i2s_softc *sc, u_int rate, u_int word } if (reg == 0) return (EINVAL); - + switch (mdiv) { /* exception cases */ case 1: @@ -514,7 +511,7 @@ i2s_setup(struct i2s_softc *sc, u_int rate, u_int word * revisited if we want to add recording from SPDIF some day. */ reg |= SCLK_MASTER; - + switch (sclk_fs) { case 64: reg |= SERIAL_64x; @@ -582,7 +579,6 @@ i2s_setup(struct i2s_softc *sc, u_int rate, u_int word return (0); } - /* XXX this does not belong here. */ static phandle_t of_find_firstchild_byname(phandle_t node, const char *req_name) @@ -601,7 +597,6 @@ of_find_firstchild_byname(phandle_t node, const char * return (-1); } - static u_int gpio_read(enum gpio_ctrl ctrl) { @@ -669,7 +664,7 @@ i2s_audio_hw_reset(struct i2s_softc *sc) gpio_write(AUDIO_HW_RESET, !reset_active); /* Negate RESET */ DELAY(RESET_RELEASE_TIME); - + } else { DPRINTF(("no audio_hw_reset\n")); } @@ -762,4 +757,3 @@ i2s_postattach(void *xsc) config_intrhook_disestablish(i2s_delayed_attach); free(i2s_delayed_attach, M_TEMP); } - Modified: head/sys/dev/sound/macio/snapper.c ============================================================================== --- head/sys/dev/sound/macio/snapper.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/macio/snapper.c Tue Sep 1 21:27:34 2020 (r365085) @@ -108,7 +108,6 @@ static device_method_t snapper_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, snapper_probe), DEVMETHOD(device_attach, snapper_attach), - { 0, 0 } }; @@ -190,7 +189,6 @@ MIXER_DECLARE(snapper_mixer); #define SNAPPER_ACR_INP_B 0x02 /* B */ #define SNAPPER_ACR_APD 0x01 /* Analog power down */ - struct snapper_reg { u_char MCR1[1]; u_char DRC[6]; @@ -491,4 +489,3 @@ snapper_setrecsrc(struct snd_mixer *m, u_int32_t src) { return (0); } - Modified: head/sys/dev/sound/macio/tumbler.c ============================================================================== --- head/sys/dev/sound/macio/tumbler.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/macio/tumbler.c Tue Sep 1 21:27:34 2020 (r365085) @@ -108,7 +108,6 @@ static device_method_t tumbler_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, tumbler_probe), DEVMETHOD(device_attach, tumbler_attach), - { 0, 0 } }; @@ -437,4 +436,3 @@ tumbler_setrecsrc(struct snd_mixer *m, u_int32_t src) { return (0); } - Modified: head/sys/dev/sound/midi/midi.c ============================================================================== --- head/sys/dev/sound/midi/midi.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/midi/midi.c Tue Sep 1 21:27:34 2020 (r365085) @@ -142,7 +142,6 @@ static synth_alloc_t midisynth_alloc; static synth_controller_t midisynth_controller; static synth_bender_t midisynth_bender; - static kobj_method_t midisynth_methods[] = { KOBJMETHOD(synth_open, midisynth_open), KOBJMETHOD(synth_close, midisynth_close), @@ -175,7 +174,6 @@ DEFINE_CLASS(midisynth, midisynth_methods, 0); * */ - /* * midi_devs tailq, holder of all rmidi instances protected by midistat_lock */ @@ -207,7 +205,6 @@ static struct cdevsw midistat_cdevsw = { .d_name = "midistat", }; - /* * /dev/rmidi dev_t declarations, struct variable access is protected by * locks contained within the structure. @@ -452,7 +449,6 @@ static int midi_lengths[] = {2, 2, 2, 2, 1, 1, 2, 0}; #define MIDI_SYSEX_START 0xF0 #define MIDI_SYSEX_END 0xF7 - int midi_in(struct snd_midi *m, MIDI_TYPE *buf, int size) { @@ -481,7 +477,6 @@ midi_in(struct snd_midi *m, MIDI_TYPE *buf, int size) return size; for (i = sig = 0; i < size; i++) { - data = buf[i]; enq = 0; if (data == MIDI_ACK) @@ -621,7 +616,6 @@ midi_out(struct snd_midi *m, MIDI_TYPE *buf, int size) return used; } - /* * /dev/rmidi#.# device access functions */ @@ -816,7 +810,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int io int used; char buf[MIDI_WSIZE]; - MIDI_DEBUG(4, printf("midi_write\n")); retval = 0; if (m == NULL) @@ -865,7 +858,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int io uio->uio_resid, (intmax_t)MIDIQ_LEN(m->outq), (intmax_t)MIDIQ_AVAIL(m->outq))); - MIDI_DEBUG(5, printf("midi_write: uiomove cc=%d\n", used)); retval = uiomove(buf, used, uio); if (retval) @@ -1074,7 +1066,6 @@ midi_cmdname(int cmd) * midisynth */ - int midisynth_open(void *n, void *arg, int flags) { @@ -1132,7 +1123,6 @@ midisynth_open(void *n, void *arg, int flags) MPU_CALLBACK(m, m->cookie, m->flags); - err: mtx_unlock(&m->qlock); mtx_unlock(&m->lock); MIDI_DEBUG(2, printf("midisynth_open: return %d.\n", retval)); @@ -1279,7 +1269,6 @@ midisynth_killnote(void *n, uint8_t chn, uint8_t note, { u_char c[3]; - if (note > 127 || chn > 15) return (EINVAL); @@ -1354,7 +1343,6 @@ static int midisynth_bender(void *n, uint8_t chn, uint16_t val) { u_char c[3]; - if (val > 16383 || chn > 15) return EINVAL; Modified: head/sys/dev/sound/midi/mpu401.c ============================================================================== --- head/sys/dev/sound/midi/mpu401.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/midi/mpu401.c Tue Sep 1 21:27:34 2020 (r365085) @@ -241,7 +241,6 @@ mpu401_minit(struct snd_midi *sm, void *arg) return 1; } - int mpu401_muninit(struct snd_midi *sm, void *arg) { Modified: head/sys/dev/sound/midi/sequencer.c ============================================================================== --- head/sys/dev/sound/midi/sequencer.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/midi/sequencer.c Tue Sep 1 21:27:34 2020 (r365085) @@ -310,7 +310,6 @@ static void timer_setvals(struct seq_softc *t, int tem static void timer_wait(struct seq_softc *t, int ticks, int wait_abs); static int timer_now(struct seq_softc *t); - static void timer_start(struct seq_softc *t) { @@ -1011,7 +1010,6 @@ mseq_write(struct cdev *i_dev, struct uio *uio, int io /* Have a look at the event code. */ if (ev_code == SEQ_FULLSIZE) { - /* * TODO: restore code for SEQ_FULLSIZE */ @@ -1044,7 +1042,6 @@ mseq_write(struct cdev *i_dev, struct uio *uio, int io mtx_lock(&scp->seq_lock); if (retval) goto err0; - } retval = 0; goto err0; @@ -1111,7 +1108,6 @@ mseq_write(struct cdev *i_dev, struct uio *uio, int io goto err0; #endif } - } scp->playing = 1; @@ -1837,7 +1833,6 @@ seq_chncommon(struct seq_softc *scp, kobj_t md, u_char printf("seq_chncommon event type %d not handled.\n", event[1])); break; - } mtx_lock(&scp->seq_lock); return ret; @@ -2028,7 +2023,6 @@ seq_sync(struct seq_softc *scp) * the queue is moving along. If it isn't just abort. */ while (!MIDIQ_EMPTY(scp->out_q)) { - if (!scp->playing) { scp->playing = 1; cv_broadcast(&scp->state_cv); Modified: head/sys/dev/sound/midi/sequencer.h ============================================================================== --- head/sys/dev/sound/midi/sequencer.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/midi/sequencer.h Tue Sep 1 21:27:34 2020 (r365085) @@ -36,7 +36,6 @@ #ifndef _SEQUENCER_H_ #define _SEQUENCER_H_ - #define NSEQ_MAX 16 /* Modified: head/sys/dev/sound/pci/allegro_reg.h ============================================================================== --- head/sys/dev/sound/pci/allegro_reg.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/allegro_reg.h Tue Sep 1 21:27:34 2020 (r365085) @@ -148,7 +148,6 @@ #define PCI_DDMA_CTRL 0x60 #define DDMA_ENABLE 0x00000001 - /* Allegro registers */ #define HOST_INT_CTRL 0x18 #define SB_INT_ENABLE 0x0001 @@ -446,7 +445,6 @@ #error Data memory map length too short. #endif - /* * Kernel code memory definition */ @@ -455,7 +453,6 @@ #define KCODE_VECTORS_END 0x002F #define KCODE_VECTORS_UNIT_LENGTH 0x0002 #define KCODE_VECTORS_LENGTH (KCODE_VECTORS_END - KCODE_VECTORS_BEGIN + 1) - /* * Kernel data memory definition Modified: head/sys/dev/sound/pci/als4000.c ============================================================================== --- head/sys/dev/sound/pci/als4000.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/als4000.c Tue Sep 1 21:27:34 2020 (r365085) @@ -312,7 +312,6 @@ als_set_speed(struct sc_chinfo *ch) /* ------------------------------------------------------------------------- */ /* Playback channel implementation */ - #define ALS_8BIT_CMD(x, y) { (x), (y), DSP_DMA8, DSP_CMD_DMAPAUSE_8 } #define ALS_16BIT_CMD(x, y) { (x), (y), DSP_DMA16, DSP_CMD_DMAPAUSE_16 } @@ -895,7 +894,6 @@ static int als_pci_resume(device_t dev) { struct sc_info *sc = pcm_getdevinfo(dev); - snd_mtxlock(sc->lock); if (als_init(sc) != 0) { Modified: head/sys/dev/sound/pci/atiixp.c ============================================================================== --- head/sys/dev/sound/pci/atiixp.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/atiixp.c Tue Sep 1 21:27:34 2020 (r365085) @@ -1291,7 +1291,6 @@ atiixp_pci_attach(device_t dev) sizeof(struct atiixp_dma_op), atiixp_dma_cb, sc, 0)) goto bad; - atiixp_chip_pre_init(sc); sc->delayed_attach.ich_func = atiixp_chip_post_init; Modified: head/sys/dev/sound/pci/atiixp.h ============================================================================== --- head/sys/dev/sound/pci/atiixp.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/atiixp.h Tue Sep 1 21:27:34 2020 (r365085) @@ -34,7 +34,7 @@ /* * Constants, pretty much FreeBSD specific. */ - + /* Number of playback / recording channel */ #define ATI_IXP_NPCHAN 1 #define ATI_IXP_NRCHAN 1 Modified: head/sys/dev/sound/pci/aureal.c ============================================================================== --- head/sys/dev/sound/pci/aureal.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/aureal.c Tue Sep 1 21:27:34 2020 (r365085) @@ -434,7 +434,6 @@ au_intr (void *p) au_rd(au, 0, AU_REG_IRQSRC, 4); } - /* -------------------------------------------------------------------- */ /* Probe and attach the card */ @@ -673,7 +672,6 @@ static device_method_t au_methods[] = { /* Device interface */ DEVMETHOD(device_probe, au_pci_probe), DEVMETHOD(device_attach, au_pci_attach), - { 0, 0 } }; Modified: head/sys/dev/sound/pci/aureal.h ============================================================================== --- head/sys/dev/sound/pci/aureal.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/aureal.h Tue Sep 1 21:27:34 2020 (r365085) @@ -97,5 +97,4 @@ #define AC97_REG_ID1 0x7c #define AC97_REG_ID2 0x7e - #endif Modified: head/sys/dev/sound/pci/cmi.c ============================================================================== --- head/sys/dev/sound/pci/cmi.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/cmi.c Tue Sep 1 21:27:34 2020 (r365085) @@ -269,7 +269,6 @@ cmi_dma_prog(struct sc_info *sc, struct sc_chinfo *ch, cmi_wr(sc, base + 6, i, 2); } - static void cmi_ch0_start(struct sc_info *sc, struct sc_chinfo *ch) { @@ -544,7 +543,6 @@ cmi_intr(void *data) snd_mtxlock(sc->lock); intrstat = cmi_rd(sc, CMPCI_REG_INTR_STATUS, 4); if ((intrstat & CMPCI_REG_ANY_INTR) != 0) { - toclear = 0; if (intrstat & CMPCI_REG_CH0_INTR) { toclear |= CMPCI_REG_CH0_INTR_ENABLE; @@ -571,7 +569,6 @@ cmi_intr(void *data) snd_mtxlock(sc->lock); cmi_set4(sc, CMPCI_REG_INTR_CTRL, toclear); - } } if(sc->mpu_intr) { @@ -843,8 +840,6 @@ cmi_midiattach(struct sc_info *sc) { cmi_set4(sc, CMPCI_REG_FUNC_1, CMPCI_REG_UART_ENABLE); sc->mpu = mpu401_init(&cmi_mpu_class, sc, cmi_intr, &sc->mpu_intr); } - - /* ------------------------------------------------------------------------- */ /* Power and reset */ Modified: head/sys/dev/sound/pci/csa.c ============================================================================== --- head/sys/dev/sound/pci/csa.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/csa.c Tue Sep 1 21:27:34 2020 (r365085) @@ -876,7 +876,7 @@ static int csa_transferimage(csa_res *resp, u_int32_t *src, u_long dest, u_long len) { u_long ul; - + /* * We do not allow DMAs from host memory to host memory (although the DMA * can do it) and we do not allow DMAs which are not a multiple of 4 bytes Modified: head/sys/dev/sound/pci/csareg.h ============================================================================== --- head/sys/dev/sound/pci/csareg.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/csareg.h Tue Sep 1 21:27:34 2020 (r365085) @@ -1971,5 +1971,4 @@ struct cs461x_firmware_struct u_int32_t BA1Array[INKY_BA1_DWORD_SIZE]; }; - #endif /* _CSA_REG_H */ Modified: head/sys/dev/sound/pci/ds1-fw.h ============================================================================== --- head/sys/dev/sound/pci/ds1-fw.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/ds1-fw.h Tue Sep 1 21:27:34 2020 (r365085) @@ -1601,4 +1601,3 @@ static u_int32_t CntrlInst1E[] = { }; #endif - Modified: head/sys/dev/sound/pci/ds1.c ============================================================================== --- head/sys/dev/sound/pci/ds1.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/ds1.c Tue Sep 1 21:27:34 2020 (r365085) @@ -765,7 +765,6 @@ ds_intr(void *p) i = ds_rd(sc, YDSXGR_MODE, 4); if (x) ds_wr(sc, YDSXGR_MODE, i | 0x00000002, 4); - } snd_mtxunlock(sc->lock); } Modified: head/sys/dev/sound/pci/ds1.h ============================================================================== --- head/sys/dev/sound/pci/ds1.h Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/ds1.h Tue Sep 1 21:27:34 2020 (r365085) @@ -8,7 +8,6 @@ * $FreeBSD$ */ - /* ----- YAMAHA DS-XG Devices -------------------------------------------- */ #define YAMAHA 0x1073 #define YMF724 0x0004 @@ -23,34 +22,28 @@ #define YMF738_TEG 0x0006 #define DEVICE4CH(x) ((x == YMF738) || (x == YMF744) || (x == YMF754)) - #define PCIR_DSXGCTRL 0x48 /* ----- interrupt flag -------------------------------------------------- */ #define YDSXG_DEFINT 0x01 #define YDSXG_TIMERINT 0x02 - /* ----- AC97 ------------------------------------------------------------ */ #define YDSXG_AC97TIMEOUT 1000 #define YDSXG_AC97READCMD 0x8000 #define YDSXG_AC97WRITECMD 0x0000 #define YDSXG_AC97READFALSE 0xFFFF - /* ----- AC97 register map _---------------------------------------------- */ #define AC97R_GPIOSTATUS 0x54 - /* ----- work buffer ----------------------------------------------------- */ #define DEF_WORKBUFFLENGTH 0x0400 - /* ----- register size --------------------------------------------------- */ #define YDSXG_MAPLENGTH 0x8000 #define YDSXG_DSPLENGTH 0x0080 #define YDSXG_CTRLLENGTH 0x3000 - /* ----- register map ---------------------------------------------------- */ #define YDSXGR_INTFLAG 0x0004 #define YDSXGR_ACTIVITY 0x0006 @@ -150,7 +143,5 @@ #define YDSXGR_DSPINSTRAM 0x1000 #define YDSXGR_CTRLINSTRAM 0x4000 - /* ----- time out -------------------------------------------------------- */ #define YDSXG_WORKBITTIMEOUT 250000 - Modified: head/sys/dev/sound/pci/emu10k1.c ============================================================================== --- head/sys/dev/sound/pci/emu10k1.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/emu10k1.c Tue Sep 1 21:27:34 2020 (r365085) @@ -1284,7 +1284,6 @@ emu_intr(void *data) emu_enatimer(sc, 0); } - if (ack & (EMU_IPR_ADCBUFFULL | EMU_IPR_ADCBUFHALFFULL)) { if (sc->rch[0].channel) chn_intr(sc->rch[0].channel); Modified: head/sys/dev/sound/pci/emu10kx-midi.c ============================================================================== --- head/sys/dev/sound/pci/emu10kx-midi.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/emu10kx-midi.c Tue Sep 1 21:27:34 2020 (r365085) @@ -223,7 +223,6 @@ emu_midi_attach(device_t dev) return (0); } - static int emu_midi_detach(device_t dev) { Modified: head/sys/dev/sound/pci/emu10kx-pcm.c ============================================================================== --- head/sys/dev/sound/pci/emu10kx-pcm.c Tue Sep 1 21:26:44 2020 (r365084) +++ head/sys/dev/sound/pci/emu10kx-pcm.c Tue Sep 1 21:27:34 2020 (r365085) @@ -116,7 +116,6 @@ struct emu_pcm_info { unsigned int emu10k1_volcache[2][2]; }; - static uint32_t emu_rfmt_adc[] = { SND_FORMAT(AFMT_S16_LE, 1, 0), SND_FORMAT(AFMT_S16_LE, 2, 0), @@ -404,7 +403,7 @@ emu_dspmixer_setrecsrc(struct snd_mixer *m, u_int32_t recmask = 0; for (i=0; i < 8; i++) input[i]=0; - + if (sc->sm != NULL) if ((src & sc->ac97_recdevs) !=0) if (mix_setrecsrc(sc->sm, src & sc->ac97_recdevs) == 0) { @@ -456,7 +455,7 @@ emu_dspmixer_setrecsrc(struct snd_mixer *m, u_int32_t emumix_set_volume(sc->card, M_IN6_REC_L, input[6] == 1 ? 100 : 0); emumix_set_volume(sc->card, M_IN6_REC_R, input[6] == 1 ? 100 : 0); - + /* XXX check for K1/k2 differences? */ if ((src & (1 << SOUND_MIXER_PCM)) == (1 << SOUND_MIXER_PCM)) { emumix_set_volume(sc->card, M_FX0_REC_L, emumix_get_volume(sc->card, M_FX0_FRONT_L)); @@ -684,7 +683,6 @@ static kobj_method_t emu_ac97_methods[] = { }; AC97_DECLARE(emu_ac97); - static int emu_k1_recval(int speed) { @@ -717,7 +715,6 @@ emupchan_init(kobj_t obj __unused, void *devinfo, stru KASSERT(dir == PCMDIR_PLAY, ("emupchan_init: bad direction")); KASSERT(sc->card != NULL, ("empchan_init: no soundcard")); - if (sc->pnum >= MAX_CHANNELS) return (NULL); ch = &(sc->pch[sc->pnum++]); @@ -1229,7 +1226,6 @@ static kobj_method_t emufxrchan_methods[] = { }; CHANNEL_DECLARE(emufxrchan); - static uint32_t emu_pcm_intr(void *pcm, uint32_t stat) { @@ -1240,7 +1236,7 @@ emu_pcm_intr(void *pcm, uint32_t stat) ack = 0; snd_mtxlock(sc->lock); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:29:06 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 47A7C379F23; Tue, 1 Sep 2020 21:29:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0ZB1Qzdz4L3h; Tue, 1 Sep 2020 21:29:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED6431FB3D; Tue, 1 Sep 2020 21:29:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LT5Jo025350; Tue, 1 Sep 2020 21:29:05 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LT1Nn025327; Tue, 1 Sep 2020 21:29:01 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012129.081LT1Nn025327@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:29:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365086 - in head/sys/dev/sfxge: . common X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/sfxge: . common X-SVN-Commit-Revision: 365086 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:29:06 -0000 Author: mjg Date: Tue Sep 1 21:29:01 2020 New Revision: 365086 URL: https://svnweb.freebsd.org/changeset/base/365086 Log: sfxge: clean up empty lines in .c and .h files Modified: head/sys/dev/sfxge/common/ef10_ev.c head/sys/dev/sfxge/common/ef10_filter.c head/sys/dev/sfxge/common/ef10_image.c head/sys/dev/sfxge/common/ef10_impl.h head/sys/dev/sfxge/common/ef10_intr.c head/sys/dev/sfxge/common/ef10_mac.c head/sys/dev/sfxge/common/ef10_mcdi.c head/sys/dev/sfxge/common/ef10_nic.c head/sys/dev/sfxge/common/ef10_nvram.c head/sys/dev/sfxge/common/ef10_phy.c head/sys/dev/sfxge/common/ef10_rx.c head/sys/dev/sfxge/common/ef10_tlv_layout.h head/sys/dev/sfxge/common/ef10_tx.c head/sys/dev/sfxge/common/ef10_vpd.c head/sys/dev/sfxge/common/efsys.h head/sys/dev/sfxge/common/efx.h head/sys/dev/sfxge/common/efx_bootcfg.c head/sys/dev/sfxge/common/efx_ev.c head/sys/dev/sfxge/common/efx_filter.c head/sys/dev/sfxge/common/efx_hash.c head/sys/dev/sfxge/common/efx_impl.h head/sys/dev/sfxge/common/efx_intr.c head/sys/dev/sfxge/common/efx_lic.c head/sys/dev/sfxge/common/efx_mac.c head/sys/dev/sfxge/common/efx_mcdi.c head/sys/dev/sfxge/common/efx_mcdi.h head/sys/dev/sfxge/common/efx_mon.c head/sys/dev/sfxge/common/efx_nic.c head/sys/dev/sfxge/common/efx_nvram.c head/sys/dev/sfxge/common/efx_phy.c head/sys/dev/sfxge/common/efx_phy_ids.h head/sys/dev/sfxge/common/efx_regs.h head/sys/dev/sfxge/common/efx_regs_ef10.h head/sys/dev/sfxge/common/efx_regs_mcdi.h head/sys/dev/sfxge/common/efx_regs_mcdi_aoe.h head/sys/dev/sfxge/common/efx_regs_pci.h head/sys/dev/sfxge/common/efx_rx.c head/sys/dev/sfxge/common/efx_sram.c head/sys/dev/sfxge/common/efx_tunnel.c head/sys/dev/sfxge/common/efx_tx.c head/sys/dev/sfxge/common/efx_types.h head/sys/dev/sfxge/common/hunt_impl.h head/sys/dev/sfxge/common/hunt_nic.c head/sys/dev/sfxge/common/mcdi_mon.c head/sys/dev/sfxge/common/mcdi_mon.h head/sys/dev/sfxge/common/medford2_impl.h head/sys/dev/sfxge/common/medford2_nic.c head/sys/dev/sfxge/common/medford_impl.h head/sys/dev/sfxge/common/medford_nic.c head/sys/dev/sfxge/common/siena_flash.h head/sys/dev/sfxge/common/siena_impl.h head/sys/dev/sfxge/common/siena_mcdi.c head/sys/dev/sfxge/common/siena_nic.c head/sys/dev/sfxge/common/siena_nvram.c head/sys/dev/sfxge/sfxge.c head/sys/dev/sfxge/sfxge.h head/sys/dev/sfxge/sfxge_ev.c head/sys/dev/sfxge/sfxge_intr.c head/sys/dev/sfxge/sfxge_mcdi.c head/sys/dev/sfxge/sfxge_nvram.c head/sys/dev/sfxge/sfxge_rx.c head/sys/dev/sfxge/sfxge_tx.c head/sys/dev/sfxge/sfxge_tx.h Modified: head/sys/dev/sfxge/common/ef10_ev.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_ev.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_ev.c Tue Sep 1 21:29:01 2020 (r365086) @@ -91,7 +91,6 @@ ef10_ev_mcdi( __in const efx_ev_callbacks_t *eecp, __in_opt void *arg); - static __checkReturn efx_rc_t efx_mcdi_set_evq_tmr( __in efx_nic_t *enp, @@ -273,7 +272,6 @@ fail1: return (rc); } - static __checkReturn efx_rc_t efx_mcdi_init_evq_v2( __in efx_nic_t *enp, @@ -440,8 +438,6 @@ fail1: return (rc); } - - __checkReturn efx_rc_t ef10_ev_init( __in efx_nic_t *enp) @@ -753,7 +749,6 @@ fail1: return (rc); } - #if EFSYS_OPT_QSTATS void Modified: head/sys/dev/sfxge/common/ef10_filter.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_filter.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_filter.c Tue Sep 1 21:29:01 2020 (r365086) @@ -577,7 +577,6 @@ ef10_filter_restore( enp->en_family == EFX_FAMILY_MEDFORD2); for (tbl_id = 0; tbl_id < EFX_EF10_FILTER_TBL_ROWS; tbl_id++) { - EFSYS_LOCK(enp->en_eslp, state); spec = ef10_filter_entry_spec(eftp, tbl_id); @@ -729,7 +728,6 @@ found: /* This is a filter we are refreshing */ ef10_filter_set_entry_not_auto_old(eftp, ins_index); goto out_unlock; - } replacing = B_TRUE; } else { @@ -835,7 +833,6 @@ fail1: return (rc); } - static __checkReturn efx_rc_t ef10_filter_delete_internal( __in efx_nic_t *enp, @@ -1288,7 +1285,6 @@ ef10_filter_insert_multicast_list( /* Only stop upon failure if told to rollback */ goto rollback; } - } if (brdcst == B_TRUE) { @@ -1493,7 +1489,6 @@ ef10_filter_remove_old( } } - static __checkReturn efx_rc_t ef10_filter_get_workarounds( __in efx_nic_t *enp) @@ -1529,7 +1524,6 @@ fail1: } - /* * Reconfigure all filters. * If all_unicst and/or all mulcst filters cannot be applied then @@ -1767,7 +1761,6 @@ ef10_filter_get_default_rxq( *using_rss = table->eft_using_rss; } - void ef10_filter_default_rxq_set( __in efx_nic_t *enp, @@ -1796,7 +1789,6 @@ ef10_filter_default_rxq_clear( table->eft_default_rxq = NULL; table->eft_using_rss = B_FALSE; } - #endif /* EFSYS_OPT_FILTER */ Modified: head/sys/dev/sfxge/common/ef10_image.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_image.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_image.c Tue Sep 1 21:29:01 2020 (r365086) @@ -67,7 +67,6 @@ typedef struct efx_asn1_cursor_s { uint32_t val_size; } efx_asn1_cursor_t; - /* Parse header of DER encoded ASN.1 TLV and match tag */ static __checkReturn efx_rc_t efx_asn1_parse_header_match_tag( @@ -305,7 +304,6 @@ fail1: return (rc); } - /* * Utility routines for parsing CMS headers (see RFC2315, PKCS#7) */ @@ -538,7 +536,6 @@ efx_check_reflash_image( void *imagep; efx_rc_t rc; - EFSYS_ASSERT(infop != NULL); if (infop == NULL) { rc = EINVAL; @@ -907,8 +904,6 @@ fail1: return (rc); } - - #endif /* EFSYS_OPT_IMAGE_LAYOUT */ Modified: head/sys/dev/sfxge/common/ef10_impl.h ============================================================================== --- head/sys/dev/sfxge/common/ef10_impl.h Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_impl.h Tue Sep 1 21:29:01 2020 (r365086) @@ -37,7 +37,6 @@ extern "C" { #endif - /* Number of hardware PIO buffers (for compile-time resource dimensions) */ #define EF10_MAX_PIOBUF_NBUFS (16) @@ -57,8 +56,6 @@ extern "C" { # endif #endif /* EFSYS_OPT_MEDFORD2 */ - - /* * FIXME: This is just a power of 2 which fits in an MCDI v1 message, and could * possibly be increased, or the write size reported by newer firmware used @@ -81,7 +78,6 @@ extern "C" { /* Invalid RSS context handle */ #define EF10_RSS_CONTEXT_INVALID (0xffffffff) - /* EV */ __checkReturn efx_rc_t @@ -240,7 +236,6 @@ extern void ef10_nic_unprobe( __in efx_nic_t *enp); - /* MAC */ extern __checkReturn efx_rc_t @@ -311,7 +306,6 @@ ef10_mac_stats_update( #endif /* EFSYS_OPT_MAC_STATS */ - /* MCDI */ #if EFSYS_OPT_MCDI @@ -615,7 +609,6 @@ ef10_nvram_buffer_finish( #endif /* EFSYS_OPT_NVRAM */ - /* PHY */ typedef struct ef10_link_state_s { @@ -876,7 +869,6 @@ ef10_nic_pio_unlink( __inout efx_nic_t *enp, __in uint32_t vi_index); - /* VPD */ #if EFSYS_OPT_VPD @@ -942,7 +934,6 @@ ef10_vpd_fini( #endif /* EFSYS_OPT_VPD */ - /* RX */ extern __checkReturn efx_rc_t @@ -956,7 +947,6 @@ ef10_rx_scatter_enable( __in unsigned int buf_size); #endif /* EFSYS_OPT_RX_SCATTER */ - #if EFSYS_OPT_RX_SCALE extern __checkReturn efx_rc_t @@ -1166,7 +1156,6 @@ extern void ef10_filter_default_rxq_clear( __in efx_nic_t *enp); - #endif /* EFSYS_OPT_FILTER */ extern __checkReturn efx_rc_t @@ -1215,7 +1204,6 @@ efx_mcdi_get_clock( __out uint32_t *sys_freqp, __out uint32_t *dpcpu_freqp); - extern __checkReturn efx_rc_t efx_mcdi_get_rxdp_config( __in efx_nic_t *enp, @@ -1248,7 +1236,6 @@ efx_mcdi_set_nic_global( __in uint32_t value); #endif /* EFSYS_OPT_FW_SUBVARIANT_AWARE */ - #if EFSYS_OPT_RX_PACKED_STREAM Modified: head/sys/dev/sfxge/common/ef10_intr.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_intr.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_intr.c Tue Sep 1 21:29:01 2020 (r365086) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "efx.h" #include "efx_impl.h" - #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 __checkReturn efx_rc_t @@ -47,7 +46,6 @@ ef10_intr_init( return (0); } - void ef10_intr_enable( __in efx_nic_t *enp) @@ -55,7 +53,6 @@ ef10_intr_enable( _NOTE(ARGUNUSED(enp)) } - void ef10_intr_disable( __in efx_nic_t *enp) @@ -63,14 +60,12 @@ ef10_intr_disable( _NOTE(ARGUNUSED(enp)) } - void ef10_intr_disable_unlocked( __in efx_nic_t *enp) { _NOTE(ARGUNUSED(enp)) } - static __checkReturn efx_rc_t efx_mcdi_trigger_interrupt( Modified: head/sys/dev/sfxge/common/ef10_mac.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_mac.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_mac.c Tue Sep 1 21:29:01 2020 (r365086) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "efx.h" #include "efx_impl.h" - #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 __checkReturn efx_rc_t @@ -442,7 +441,6 @@ ef10_mac_filter_default_rxq_clear( epp->ep_mulcst_addr_count); } - #if EFSYS_OPT_LOOPBACK __checkReturn efx_rc_t @@ -603,7 +601,6 @@ fail1: #define EF10_MAC_STAT_READ(_esmp, _field, _eqp) \ EFSYS_MEM_READQ((_esmp), (_field) * sizeof (efx_qword_t), _eqp) - __checkReturn efx_rc_t ef10_mac_stats_update( __in efx_nic_t *enp, @@ -856,7 +853,6 @@ ef10_mac_stats_update( EF10_MAC_STAT_READ(esmp, MC_CMD_MAC_RXDP_HLB_WAIT_CONDITIONS, &value); EFSYS_STAT_SET_QWORD(&(stat[EFX_MAC_RXDP_HLB_WAIT]), &value); - /* VADAPTER RX */ EF10_MAC_STAT_READ(esmp, MC_CMD_MAC_VADAPTER_RX_UNICAST_PACKETS, &value); @@ -938,7 +934,6 @@ ef10_mac_stats_update( EF10_MAC_STAT_READ(esmp, MC_CMD_MAC_VADAPTER_TX_OVERFLOW, &value); EFSYS_STAT_SET_QWORD(&(stat[EFX_MAC_VADAPTER_TX_OVERFLOW]), &value); - if (encp->enc_mac_stats_nstats < MC_CMD_MAC_NSTATS_V2) goto done; Modified: head/sys/dev/sfxge/common/ef10_mcdi.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_mcdi.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_mcdi.c Tue Sep 1 21:29:01 2020 (r365086) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "efx.h" #include "efx_impl.h" - #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 #if EFSYS_OPT_MCDI @@ -42,7 +41,6 @@ __FBSDID("$FreeBSD$"); #ifndef WITH_MCDI_V2 #error "WITH_MCDI_V2 required for EF10 MCDIv2 commands." #endif - __checkReturn efx_rc_t ef10_mcdi_init( Modified: head/sys/dev/sfxge/common/ef10_nic.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_nic.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_nic.c Tue Sep 1 21:29:01 2020 (r365086) @@ -669,7 +669,6 @@ fail1: return (rc); } - static __checkReturn efx_rc_t efx_mcdi_free_vis( __in efx_nic_t *enp) @@ -702,7 +701,6 @@ fail1: return (rc); } - static __checkReturn efx_rc_t efx_mcdi_alloc_piobuf( __in efx_nic_t *enp, @@ -886,7 +884,6 @@ fail1: enp->en_arch.ef10.ena_piobuf_count = 0; } - static void ef10_nic_free_piobufs( __in efx_nic_t *enp) @@ -1075,7 +1072,6 @@ ef10_get_datapath_caps( if ((rc = ef10_mcdi_get_pf_count(enp, &encp->enc_hw_pf_count)) != 0) goto fail1; - req.emr_cmd = MC_CMD_GET_CAPABILITIES; req.emr_in_buf = payload; req.emr_in_length = MC_CMD_GET_CAPABILITIES_IN_LEN; @@ -1416,7 +1412,6 @@ fail1: return (rc); } - #define EF10_LEGACY_PF_PRIVILEGE_MASK \ (MC_CMD_PRIVILEGE_MASK_IN_GRP_ADMIN | \ MC_CMD_PRIVILEGE_MASK_IN_GRP_LINK | \ @@ -1432,7 +1427,6 @@ fail1: #define EF10_LEGACY_VF_PRIVILEGE_MASK 0 - __checkReturn efx_rc_t ef10_get_privilege_mask( __in efx_nic_t *enp, @@ -1467,7 +1461,6 @@ fail1: return (rc); } - #define EFX_EXT_PORT_MAX 4 #define EFX_EXT_PORT_NA 0xFF @@ -2137,7 +2130,6 @@ fail1: return (rc); } - __checkReturn efx_rc_t ef10_nic_reset( __in efx_nic_t *enp) @@ -2445,7 +2437,6 @@ ef10_nic_set_hw_unavailable( EFSYS_PROBE(hw_unavail); enp->en_reset_flags |= EFX_RESET_HW_UNAVAIL; } - void ef10_nic_fini( Modified: head/sys/dev/sfxge/common/ef10_nvram.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_nvram.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_nvram.c Tue Sep 1 21:29:01 2020 (r365086) @@ -63,12 +63,10 @@ typedef struct nvram_partition_s { tlv_cursor_t tlv_cursor; } nvram_partition_t; - static __checkReturn efx_rc_t tlv_validate_state( __inout tlv_cursor_t *cursor); - static void tlv_init_block( __out uint32_t *block) @@ -130,7 +128,6 @@ tlv_item( #define TLV_DWORD_COUNT(length) \ (1 + 1 + (((length) + sizeof (uint32_t) - 1) / sizeof (uint32_t))) - static uint32_t * tlv_next_item_ptr( __in tlv_cursor_t *cursor) @@ -375,7 +372,6 @@ tlv_last_segment_end( return (last_segment_end); } - static uint32_t * tlv_write( __in tlv_cursor_t *cursor, @@ -1168,7 +1164,6 @@ fail1: return (rc); } - __checkReturn efx_rc_t ef10_nvram_buffer_delete_item( __in_bcount(buffer_size) @@ -1233,8 +1228,6 @@ fail1: return (rc); } - - /* * Read and validate a segment from a partition. A segment is a complete Modified: head/sys/dev/sfxge/common/ef10_phy.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_phy.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_phy.c Tue Sep 1 21:29:01 2020 (r365086) @@ -188,7 +188,6 @@ mcdi_phy_decode_link_mode( } } - void ef10_phy_link_ev( __in efx_nic_t *enp, @@ -335,7 +334,6 @@ ef10_phy_get_link( &elsp->epls.epls_ld_cap_mask); } - #if EFSYS_OPT_LOOPBACK /* * MC_CMD_LOOPBACK and EFX_LOOPBACK names are equivalent, so use the @@ -598,7 +596,6 @@ fail1: return (rc); } - #if EFSYS_OPT_PHY_STATS Modified: head/sys/dev/sfxge/common/ef10_rx.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_rx.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_rx.c Tue Sep 1 21:29:01 2020 (r365086) @@ -34,10 +34,8 @@ __FBSDID("$FreeBSD$"); #include "efx.h" #include "efx_impl.h" - #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 - static __checkReturn efx_rc_t efx_mcdi_init_rxq( __in efx_nic_t *enp, @@ -539,7 +537,6 @@ fail1: } #endif /* EFSYS_OPT_RX_SCALE */ - __checkReturn efx_rc_t ef10_rx_init( __in efx_nic_t *enp) @@ -712,7 +709,6 @@ ef10_rx_scale_tbl_set( { efx_rc_t rc; - if (rss_context == EFX_RSS_CONTEXT_DEFAULT) { if (enp->en_rss_context_type == EFX_RX_SCALE_UNAVAILABLE) { rc = ENOTSUP; @@ -736,7 +732,6 @@ fail1: } #endif /* EFSYS_OPT_RX_SCALE */ - /* * EF10 RX pseudo-header * --------------------- @@ -972,7 +967,6 @@ ef10_rx_qps_packet_info( return (pkt_start); } - #endif Modified: head/sys/dev/sfxge/common/ef10_tlv_layout.h ============================================================================== --- head/sys/dev/sfxge/common/ef10_tlv_layout.h Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_tlv_layout.h Tue Sep 1 21:29:01 2020 (r365086) @@ -85,17 +85,14 @@ * well enough.) */ - #ifndef CI_MGMT_TLV_LAYOUT_H #define CI_MGMT_TLV_LAYOUT_H - /* ---------------------------------------------------------------------------- * General structure (defined by SF-108797-SW) * ---------------------------------------------------------------------------- */ - /* The "end" tag. * * (Note that this is *not* followed by length or value fields: anything after @@ -104,14 +101,12 @@ #define TLV_TAG_END (0xEEEEEEEE) - /* Other special reserved tag values. */ #define TLV_TAG_SKIP (0x00000000) #define TLV_TAG_INVALID (0xFFFFFFFF) - /* TLV partition header. * * In a TLV partition, this must be the first item in the sequence, at offset @@ -133,7 +128,6 @@ struct tlv_partition_header { uint32_t total_length; }; - /* TLV partition trailer. * * In a TLV partition, this must be the last item in the sequence, immediately @@ -149,7 +143,6 @@ struct tlv_partition_trailer { uint32_t checksum; }; - /* Appendable TLV partition header. * * In an appendable TLV partition, this must be the first item in the sequence, @@ -166,13 +159,11 @@ struct tlv_appendable_partition_header { uint16_t reserved; }; - /* ---------------------------------------------------------------------------- * Configuration items * ---------------------------------------------------------------------------- */ - /* NIC global capabilities. */ @@ -184,7 +175,6 @@ struct tlv_global_capabilities { uint32_t flags; }; - /* Siena-style per-port MAC address allocation. * * There are addresses, starting at and incrementing @@ -205,7 +195,6 @@ struct tlv_port_mac { uint16_t stride; }; - /* Static VPD. * * This is the portion of VPD which is set at manufacturing time and not @@ -230,7 +219,6 @@ struct tlv_global_static_vpd { uint8_t bytes[]; }; - /* Dynamic VPD. * * This is the portion of VPD which may be changed (e.g. by firmware updates). @@ -255,7 +243,6 @@ struct tlv_global_dynamic_vpd { uint8_t bytes[]; }; - /* "DBI" PCI config space changes. * * This is a set of edits made to the default PCI config space values before @@ -276,7 +263,6 @@ struct tlv_pf_dbi { } items[]; }; - #define TLV_TAG_GLOBAL_DBI (0x00210000) struct tlv_global_dbi { @@ -289,7 +275,6 @@ struct tlv_global_dbi { } items[]; }; - /* Partition subtype codes. * * A subtype may optionally be stored for each type of partition present in @@ -310,7 +295,6 @@ struct tlv_partition_subtype { uint8_t description[]; }; - /* Partition version codes. * * A version may optionally be stored for each type of partition present in @@ -366,7 +350,6 @@ struct tlv_per_pf_pcie_config { uint16_t msix_vec_base; }; - /* Development ONLY. This is a single TLV tag for all the gubbins * that can be set through the MC command-line other than the PCIe * settings. This is a temporary measure. */ @@ -411,7 +394,6 @@ struct tlv_global_port_config { uint32_t max_port_speed; }; - /* Firmware options. * * This is intended for user-configurable selection of optional firmware @@ -468,7 +450,6 @@ struct tlv_0v9_settings { uint16_t panic_high; /* In millivolts */ }; - /* Clock configuration */ #define TLV_TAG_CLOCK_CONFIG (0x000d0000) /* legacy symbol - do not use */ @@ -496,7 +477,6 @@ struct tlv_clock_config_medford { uint16_t clk_pcs; /* MHz */ }; - /* EF10-style global pool of MAC addresses. * * There are addresses, starting at , which are @@ -536,7 +516,6 @@ struct tlv_pcie_tx_amp_config { uint8_t quad_tx_imp50[4]; uint8_t lane_amp[16]; }; - /* Global PCIe configuration, second revision. This represents the visible PFs * by a bitmap rather than having the number of the highest visible one. As such Modified: head/sys/dev/sfxge/common/ef10_tx.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_tx.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_tx.c Tue Sep 1 21:29:01 2020 (r365086) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "efx.h" #include "efx_impl.h" - #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 #if EFSYS_OPT_QSTATS @@ -393,7 +392,6 @@ ef10_tx_qpio_post( unsigned int added = *addedp; efx_rc_t rc; - if (added - completed + 1 > EFX_TXQ_LIMIT(etp->et_mask + 1)) { rc = ENOSPC; goto fail1; @@ -716,7 +714,6 @@ ef10_tx_qdesc_checksum_create( ESF_DZ_TX_OPTION_INNER_IP_CSUM, (flags & EFX_TXQ_CKSUM_INNER_IPV4) ? 1 : 0); } - __checkReturn efx_rc_t ef10_tx_qpace( Modified: head/sys/dev/sfxge/common/ef10_vpd.c ============================================================================== --- head/sys/dev/sfxge/common/ef10_vpd.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/ef10_vpd.c Tue Sep 1 21:29:01 2020 (r365086) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "efx.h" #include "efx_impl.h" - #if EFSYS_OPT_VPD #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 Modified: head/sys/dev/sfxge/common/efsys.h ============================================================================== --- head/sys/dev/sfxge/common/efsys.h Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/efsys.h Tue Sep 1 21:29:01 2020 (r365086) @@ -159,7 +159,6 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, bus_dmamap_t ma /* Code inclusion options */ - #define EFSYS_OPT_NAMES 1 #define EFSYS_OPT_SIENA 1 @@ -332,7 +331,6 @@ typedef struct efsys_mem_s { #define EFSYS_MEM_IS_NULL(_esmp) \ ((_esmp)->esm_base == NULL) - #define EFSYS_MEM_ZERO(_esmp, _size) \ do { \ Modified: head/sys/dev/sfxge/common/efx.h ============================================================================== --- head/sys/dev/sfxge/common/efx.h Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/efx.h Tue Sep 1 21:29:01 2020 (r365086) @@ -72,7 +72,6 @@ extern "C" { typedef __success(return == 0) int efx_rc_t; - /* Chip families */ typedef enum efx_family_e { @@ -92,7 +91,6 @@ efx_family( __out efx_family_t *efp, __out unsigned int *membarp); - #define EFX_PCI_VENID_SFC 0x1924 #define EFX_PCI_DEVID_FALCON 0x0710 /* SFC4000 */ @@ -116,7 +114,6 @@ efx_family( #define EFX_PCI_DEVID_MEDFORD2 0x0B03 /* SFC9250 PF */ #define EFX_PCI_DEVID_MEDFORD2_VF 0x1B03 /* SFC9250 VF */ - #define EFX_MEM_BAR_SIENA 2 #define EFX_MEM_BAR_HUNTINGTON_PF 2 @@ -127,7 +124,6 @@ efx_family( #define EFX_MEM_BAR_MEDFORD2 0 - /* Error codes */ enum { @@ -153,7 +149,6 @@ efx_crc32_calculate( __in_ecount(length) uint8_t const *input, __in int length); - /* Type prototypes */ typedef struct efx_rxq_s efx_rxq_t; @@ -609,7 +604,6 @@ efx_mac_fcntl_get( __out unsigned int *fcntl_wantedp, __out unsigned int *fcntl_linkp); - #if EFSYS_OPT_MAC_STATS #if EFSYS_OPT_NAMES @@ -645,7 +639,6 @@ efx_mac_stats_get_mask( ((_mask)[(_stat) / EFX_MAC_STATS_MASK_BITS_PER_PAGE] & \ (1ULL << ((_stat) & (EFX_MAC_STATS_MASK_BITS_PER_PAGE - 1)))) - extern __checkReturn efx_rc_t efx_mac_stats_clear( __in efx_nic_t *enp); @@ -1022,7 +1015,6 @@ typedef enum efx_phy_cap_type_e { EFX_PHY_CAP_NTYPES } efx_phy_cap_type_t; - #define EFX_PHY_CAP_CURRENT 0x00000000 #define EFX_PHY_CAP_DEFAULT 0x00000001 #define EFX_PHY_CAP_PERM 0x00000002 @@ -1097,7 +1089,6 @@ efx_phy_media_type_get( */ #define EFX_PHY_MEDIA_INFO_MAX_OFFSET 0x100 - extern __checkReturn efx_rc_t efx_phy_module_get_info( __in efx_nic_t *enp, @@ -1180,7 +1171,6 @@ efx_phy_stats_update( #endif /* EFSYS_OPT_PHY_STATS */ - #if EFSYS_OPT_BIST typedef enum efx_bist_type_e { @@ -1512,7 +1502,6 @@ efx_nic_get_vi_pool( __out uint32_t *rxq_countp, __out uint32_t *txq_countp); - #if EFSYS_OPT_VPD typedef enum efx_vpd_tag_e { @@ -1531,7 +1520,6 @@ typedef struct efx_vpd_value_s { uint8_t evv_value[0x100]; } efx_vpd_value_t; - #define EFX_VPD_KEYWORD(x, y) ((x) | ((y) << 8)) extern __checkReturn efx_rc_t @@ -1742,7 +1730,6 @@ efx_bootcfg_write( __in_bcount(size) uint8_t *data, __in size_t size); - /* * Processing routines for buffers arranged in the DHCP/BOOTP option format * (see https://tools.ietf.org/html/rfc1533) @@ -1798,7 +1785,6 @@ efx_dhcp_find_end( __in size_t buffer_length, __deref_out uint8_t **endpp); - extern __checkReturn efx_rc_t efx_dhcp_delete_tag( __inout_bcount(buffer_length) uint8_t *bufferp, @@ -1822,7 +1808,6 @@ efx_dhcp_update_tag( __in_bcount_opt(value_length) uint8_t *valuep, __in size_t value_length); - #endif /* EFSYS_OPT_BOOTCFG */ #if EFSYS_OPT_IMAGE_LAYOUT @@ -1875,7 +1860,6 @@ typedef struct efx_image_header_s { #define EFX_IMAGE_HEADER_VERSION (4) #define EFX_IMAGE_HEADER_MAGIC (0x106F1A5) - typedef struct efx_image_trailer_s { uint32_t eit_crc; } efx_image_trailer_t; @@ -2076,7 +2060,6 @@ typedef __checkReturn boolean_t #define EFX_PKT_PACKED_STREAM_NEW_BUFFER EFX_PKT_START #define EFX_PKT_PACKED_STREAM_PARSE_INCOMPLETE EFX_PKT_CONT - #define EFX_EV_RX_NLABELS 32 #define EFX_EV_TX_NLABELS 32 @@ -2448,7 +2431,6 @@ efx_rx_hash_default_support_get( __in efx_nic_t *enp, __out efx_rx_hash_support_t *supportp); - extern __checkReturn efx_rc_t efx_rx_scale_default_support_get( __in efx_nic_t *enp, @@ -2818,7 +2800,6 @@ extern void efx_tx_qdestroy( __in efx_txq_t *etp); - /* FILTER */ #if EFSYS_OPT_FILTER @@ -2937,7 +2918,6 @@ typedef struct efx_filter_spec_s { uint8_t efs_ifrm_loc_mac[EFX_MAC_ADDR_LEN]; } efx_filter_spec_t; - /* Default values for use in filter specifications */ #define EFX_FILTER_SPEC_RX_DMAQ_ID_DROP 0xfff #define EFX_FILTER_SPEC_VID_UNSPEC 0xffff @@ -3124,7 +3104,6 @@ efx_lic_get_id( __out size_t *lengthp, __out_opt uint8_t *bufferp); - extern __checkReturn efx_rc_t efx_lic_find_start( __in efx_nic_t *enp, @@ -3313,7 +3292,6 @@ extern __checkReturn efx_rc_t efx_phy_link_state_get( __in efx_nic_t *enp, __out efx_phy_link_state_t *eplsp); - #ifdef __cplusplus } Modified: head/sys/dev/sfxge/common/efx_bootcfg.c ============================================================================== --- head/sys/dev/sfxge/common/efx_bootcfg.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/efx_bootcfg.c Tue Sep 1 21:29:01 2020 (r365086) @@ -76,7 +76,6 @@ typedef struct efx_dhcp_tag_hdr_s { #define DHCP_CALC_TAG_LENGTH(payload_len) \ ((payload_len) + sizeof (efx_dhcp_tag_hdr_t)) - /* Report the layout of bootcfg sectors in NVRAM partition. */ __checkReturn efx_rc_t efx_bootcfg_sector_info( @@ -163,7 +162,6 @@ fail1: return (rc); } - __checkReturn uint8_t efx_dhcp_csum( __in_bcount(size) uint8_t const *data, @@ -399,7 +397,6 @@ fail1: return (rc); } - /* * Delete the given tag from anywhere in the buffer. Copes with * encapsulated tags, and updates or deletes the encapsulating opt as @@ -750,7 +747,6 @@ fail1: return (rc); } - /* * Copy bootcfg sector data to a target buffer which may differ in size. Modified: head/sys/dev/sfxge/common/efx_ev.c ============================================================================== --- head/sys/dev/sfxge/common/efx_ev.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/efx_ev.c Tue Sep 1 21:29:01 2020 (r365086) @@ -53,8 +53,6 @@ __FBSDID("$FreeBSD$"); (EFX_QWORD_FIELD((_qword), EFX_DWORD_0) != 0xffffffff && \ EFX_QWORD_FIELD((_qword), EFX_DWORD_1) != 0xffffffff) - - #if EFSYS_OPT_SIENA static __checkReturn efx_rc_t @@ -135,7 +133,6 @@ static const efx_ev_ops_t __efx_ev_ef10_ops = { }; #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */ - __checkReturn efx_rc_t efx_ev_init( __in efx_nic_t *enp) @@ -221,7 +218,6 @@ efx_ev_fini( enp->en_mod_flags &= ~EFX_MOD_EV; } - __checkReturn efx_rc_t efx_ev_qcreate( __in efx_nic_t *enp, @@ -903,7 +899,6 @@ siena_ev_tx( EFX_QWORD_FIELD(*eqp, FSF_AZ_TX_EV_PKT_ERR) == 0 && EFX_QWORD_FIELD(*eqp, FSF_AZ_TX_EV_PKT_TOO_BIG) == 0 && EFX_QWORD_FIELD(*eqp, FSF_AZ_TX_EV_WQ_FF_FULL) == 0) { - id = EFX_QWORD_FIELD(*eqp, FSF_AZ_TX_EV_DESC_PTR); label = EFX_QWORD_FIELD(*eqp, FSF_AZ_TX_EV_Q_LABEL); Modified: head/sys/dev/sfxge/common/efx_filter.c ============================================================================== --- head/sys/dev/sfxge/common/efx_filter.c Tue Sep 1 21:27:34 2020 (r365085) +++ head/sys/dev/sfxge/common/efx_filter.c Tue Sep 1 21:29:01 2020 (r365086) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "efx.h" #include "efx_impl.h" - #if EFSYS_OPT_FILTER *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:29:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 17DA037A108; Tue, 1 Sep 2020 21:29:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0ZX73pYz4L4f; Tue, 1 Sep 2020 21:29:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D59E01F761; Tue, 1 Sep 2020 21:29:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LTOFJ025414; Tue, 1 Sep 2020 21:29:24 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LTNdq025405; Tue, 1 Sep 2020 21:29:23 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012129.081LTNdq025405@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:29:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365087 - head/sys/dev/twa X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/twa X-SVN-Commit-Revision: 365087 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:29:25 -0000 Author: mjg Date: Tue Sep 1 21:29:23 2020 New Revision: 365087 URL: https://svnweb.freebsd.org/changeset/base/365087 Log: twa: clean up empty lines in .c and .h files Modified: head/sys/dev/twa/tw_cl.h head/sys/dev/twa/tw_cl_externs.h head/sys/dev/twa/tw_cl_fwif.h head/sys/dev/twa/tw_cl_init.c head/sys/dev/twa/tw_cl_intr.c head/sys/dev/twa/tw_cl_io.c head/sys/dev/twa/tw_cl_ioctl.h head/sys/dev/twa/tw_cl_misc.c head/sys/dev/twa/tw_cl_share.h head/sys/dev/twa/tw_osl.h head/sys/dev/twa/tw_osl_cam.c head/sys/dev/twa/tw_osl_externs.h head/sys/dev/twa/tw_osl_freebsd.c head/sys/dev/twa/tw_osl_includes.h head/sys/dev/twa/tw_osl_inline.h head/sys/dev/twa/tw_osl_ioctl.h head/sys/dev/twa/tw_osl_share.h head/sys/dev/twa/tw_osl_types.h Modified: head/sys/dev/twa/tw_cl.h ============================================================================== --- head/sys/dev/twa/tw_cl.h Tue Sep 1 21:29:01 2020 (r365086) +++ head/sys/dev/twa/tw_cl.h Tue Sep 1 21:29:23 2020 (r365087) @@ -36,18 +36,14 @@ * Modifications by: Adam Radford */ - - #ifndef TW_CL_H #define TW_CL_H - /* * Common Layer internal macros, structures and functions. */ - #define TW_CLI_SECTOR_SIZE 0x200 #define TW_CLI_REQUEST_TIMEOUT_PERIOD 60 /* seconds */ #define TW_CLI_RESET_TIMEOUT_PERIOD 60 /* seconds */ @@ -76,7 +72,6 @@ #define TW_CLI_PCI_CONFIG_STATUS_OFFSET 0x6 /* status register offset */ #endif /* TW_OSL_PCI_CONFIG_ACCESSIBLE */ - #ifdef TW_OSL_DEBUG struct tw_cli_q_stats { TW_UINT32 cur_len;/* current # of entries in q */ @@ -84,7 +79,6 @@ struct tw_cli_q_stats { }; #endif /* TW_OSL_DEBUG */ - /* Queues of CL internal request context packets. */ #define TW_CLI_FREE_Q 0 /* free q */ #define TW_CLI_BUSY_Q 1 /* q of reqs submitted to fw */ @@ -93,7 +87,6 @@ struct tw_cli_q_stats { #define TW_CLI_RESET_Q 4 /* q of reqs reset by timeout */ #define TW_CLI_Q_COUNT 5 /* total number of queues */ - /* CL's internal request context. */ struct tw_cli_req_context { struct tw_cl_req_handle *req_handle;/* handle to track requests between @@ -119,7 +112,6 @@ struct tw_cli_req_context { struct tw_cl_link link; /* to link this request in a list */ }; - /* CL's internal controller context. */ struct tw_cli_ctlr_context { struct tw_cl_ctlr_handle *ctlr_handle; /* handle to track ctlr between @@ -209,8 +201,6 @@ struct tw_cli_ctlr_context { #endif /* TW_OSL_DEBUG */ }; - - /* * Queue primitives */ @@ -222,7 +212,6 @@ struct tw_cli_ctlr_context { (ctlr)->q_stats[q_type].max_len = 0; \ } while (0) - #define TW_CLI_Q_INSERT(ctlr, q_type) do { \ struct tw_cli_q_stats *q_stats = &((ctlr)->q_stats[q_type]); \ \ @@ -230,7 +219,6 @@ struct tw_cli_ctlr_context { q_stats->max_len = q_stats->cur_len; \ } while (0) - #define TW_CLI_Q_REMOVE(ctlr, q_type) \ (ctlr)->q_stats[q_type].cur_len-- @@ -242,7 +230,6 @@ struct tw_cli_ctlr_context { #endif /* TW_OSL_DEBUG */ - /* Initialize a queue of requests. */ static __inline TW_VOID tw_cli_req_q_init(struct tw_cli_ctlr_context *ctlr, TW_UINT8 q_type) @@ -251,8 +238,6 @@ tw_cli_req_q_init(struct tw_cli_ctlr_context *ctlr, TW TW_CLI_Q_INIT(ctlr, q_type); } - - /* Insert the given request at the head of the given queue (q_type). */ static __inline TW_VOID tw_cli_req_q_insert_head(struct tw_cli_req_context *req, TW_UINT8 q_type) @@ -265,8 +250,6 @@ tw_cli_req_q_insert_head(struct tw_cli_req_context *re tw_osl_free_lock(ctlr->ctlr_handle, ctlr->gen_lock); } - - /* Insert the given request at the tail of the given queue (q_type). */ static __inline TW_VOID tw_cli_req_q_insert_tail(struct tw_cli_req_context *req, TW_UINT8 q_type) @@ -279,8 +262,6 @@ tw_cli_req_q_insert_tail(struct tw_cli_req_context *re tw_osl_free_lock(ctlr->ctlr_handle, ctlr->gen_lock); } - - /* Remove and return the request at the head of the given queue (q_type). */ static __inline struct tw_cli_req_context * tw_cli_req_q_remove_head(struct tw_cli_ctlr_context *ctlr, TW_UINT8 q_type) @@ -300,8 +281,6 @@ tw_cli_req_q_remove_head(struct tw_cli_ctlr_context *c return(req); } - - /* Remove the given request from the given queue (q_type). */ static __inline TW_VOID tw_cli_req_q_remove_item(struct tw_cli_req_context *req, TW_UINT8 q_type) @@ -314,8 +293,6 @@ tw_cli_req_q_remove_item(struct tw_cli_req_context *re tw_osl_free_lock(ctlr->ctlr_handle, ctlr->gen_lock); } - - /* Create an event packet for an event/error posted by the controller. */ #define tw_cli_create_ctlr_event(ctlr, event_src, cmd_hdr) do { \ TW_UINT8 severity = \ @@ -343,7 +320,5 @@ tw_cli_req_q_remove_item(struct tw_cli_req_context *re (cmd_hdr)->sense_data[14], (cmd_hdr)->sense_data[15], \ (cmd_hdr)->sense_data[16], (cmd_hdr)->sense_data[17]); \ } while (0) - - #endif /* TW_CL_H */ Modified: head/sys/dev/twa/tw_cl_externs.h ============================================================================== --- head/sys/dev/twa/tw_cl_externs.h Tue Sep 1 21:29:01 2020 (r365086) +++ head/sys/dev/twa/tw_cl_externs.h Tue Sep 1 21:29:23 2020 (r365087) @@ -36,23 +36,18 @@ * Modifications by: Adam Radford */ - - #ifndef TW_CL_EXTERNS_H #define TW_CL_EXTERNS_H - /* * Data structures and functions global to the Common Layer. */ - extern TW_INT8 tw_cli_fw_img[]; extern TW_INT32 tw_cli_fw_img_size; extern TW_INT8 *tw_cli_severity_string_table[]; - /* Do controller initialization. */ extern TW_INT32 tw_cli_start_ctlr(struct tw_cli_ctlr_context *ctlr); @@ -65,8 +60,6 @@ extern TW_INT32 tw_cli_init_connection(struct tw_cli_c TW_UINT16 *fw_on_ctlr_branch, TW_UINT16 *fw_on_ctlr_build, TW_UINT32 *init_connect_result); - - /* Functions in tw_cl_io.c */ /* Submit a command packet to the firmware on the controller. */ @@ -102,8 +95,6 @@ extern TW_INT32 tw_cli_get_aen(struct tw_cli_ctlr_cont extern TW_VOID tw_cli_fill_sg_list(struct tw_cli_ctlr_context *ctlr, TW_VOID *sgl_src, TW_VOID *sgl_dest, TW_INT32 num_sgl_entries); - - /* Functions in tw_cl_intr.c */ /* Process a host interrupt. */ @@ -148,8 +139,6 @@ extern TW_VOID extern TW_VOID tw_cli_disable_interrupts(struct tw_cli_ctlr_context *ctlr_handle); - - /* Functions in tw_cl_misc.c */ /* Print if dbg_level is appropriate (by calling OS Layer). */ @@ -198,7 +187,5 @@ extern TW_VOID tw_cli_notify_ctlr_info(struct tw_cli_c /* Make sure that the firmware status register reports a proper status. */ extern TW_INT32 tw_cli_check_ctlr_state(struct tw_cli_ctlr_context *ctlr, TW_UINT32 status_reg); - - #endif /* TW_CL_EXTERNS_H */ Modified: head/sys/dev/twa/tw_cl_fwif.h ============================================================================== --- head/sys/dev/twa/tw_cl_fwif.h Tue Sep 1 21:29:01 2020 (r365086) +++ head/sys/dev/twa/tw_cl_fwif.h Tue Sep 1 21:29:23 2020 (r365087) @@ -36,18 +36,14 @@ * Modifications by: Adam Radford */ - - #ifndef TW_CL_FWIF_H #define TW_CL_FWIF_H - /* * Macros and data structures for interfacing with the firmware. */ - /* Register offsets from base address. */ #define TWA_CONTROL_REGISTER_OFFSET 0x0 #define TWA_STATUS_REGISTER_OFFSET 0x4 @@ -57,7 +53,6 @@ #define TWA_COMMAND_QUEUE_OFFSET_HIGH 0x24 #define TWA_LARGE_RESPONSE_QUEUE_OFFSET 0x30 - /* Control register bit definitions. */ #define TWA_CONTROL_ISSUE_HOST_INTERRUPT 0x00000020 #define TWA_CONTROL_DISABLE_INTERRUPTS 0x00000040 @@ -73,7 +68,6 @@ #define TWA_CONTROL_CLEAR_QUEUE_ERROR 0x00400000 #define TWA_CONTROL_CLEAR_PARITY_ERROR 0x00800000 - /* Status register bit definitions. */ #define TWA_STATUS_ROM_BIOS_IN_SBUF 0x00000002 #define TWA_STATUS_COMMAND_QUEUE_EMPTY 0x00001000 @@ -93,7 +87,6 @@ #define TWA_STATUS_UNEXPECTED_BITS 0x00D00000 - /* PCI related defines. */ #define TWA_IO_CONFIG_REG 0x10 @@ -103,7 +96,6 @@ #define TWA_RESET_PHASE1_NOTIFICATION_RESPONSE 0xFFFF #define TWA_RESET_PHASE1_WAIT_TIME_MS 500 - /* Command packet opcodes. */ #define TWA_FW_CMD_NOP 0x00 #define TWA_FW_CMD_INIT_CONNECTION 0x01 @@ -134,7 +126,6 @@ #define TWA_FW_CMD_DIAGNOSTICS 0x1F - /* Misc defines. */ #define TWA_SHUTDOWN_MESSAGE_CREDITS 0x001 #define TWA_64BIT_SG_ADDRESSES 0x00000001 @@ -155,7 +146,6 @@ #define TWA_CTLR_FW_COMPATIBLE 0x00000002 #define TWA_SENSE_DATA_LENGTH 18 - #define TWA_ARCH_ID(device_id) \ (((device_id) == TW_CL_DEVICE_ID_9K) ? TWA_ARCH_ID_9K : \ TWA_ARCH_ID_9K_X) @@ -175,7 +165,6 @@ #define TWA_SG_ELEMENT_SIZE_FACTOR(device_id) \ (((device_id) == TW_CL_DEVICE_ID_9K) ? 512 : 4) - /* * Some errors of interest (in cmd_hdr->status_block.error) when a command * is completed by the firmware with a bad status. @@ -184,13 +173,11 @@ #define TWA_ERROR_UNIT_OFFLINE 0x0128 #define TWA_ERROR_MORE_DATA 0x0231 - /* AEN codes of interest. */ #define TWA_AEN_QUEUE_EMPTY 0x00 #define TWA_AEN_SOFT_RESET 0x01 #define TWA_AEN_SYNC_TIME_WITH_HOST 0x31 - /* Table #'s and id's of parameters of interest in firmware's param table. */ #define TWA_PARAM_VERSION_TABLE 0x0402 #define TWA_PARAM_VERSION_FW 3 /* firmware version [16] */ @@ -205,7 +192,6 @@ #define TWA_9K_PARAM_DESCRIPTOR 0x8000 - #pragma pack(1) /* 7000 structures. */ struct tw_cl_command_init_connect { @@ -224,7 +210,6 @@ struct tw_cl_command_init_connect { TW_UINT32 result; }; - /* Structure for downloading firmware onto the controller. */ struct tw_cl_command_download_firmware { TW_UINT8 sgl_off__opcode;/* 3:5 */ @@ -237,7 +222,6 @@ struct tw_cl_command_download_firmware { TW_UINT8 sgl[1]; }; - /* Structure for hard resetting the controller. */ struct tw_cl_command_reset_firmware { TW_UINT8 res1__opcode; /* 3:5 */ @@ -250,7 +234,6 @@ struct tw_cl_command_reset_firmware { TW_UINT8 param; }; - /* Structure for sending get/set param commands. */ struct tw_cl_command_param { TW_UINT8 sgl_off__opcode;/* 3:5 */ @@ -263,7 +246,6 @@ struct tw_cl_command_param { TW_UINT8 sgl[1]; }; - /* Generic command packet. */ struct tw_cl_command_generic { TW_UINT8 sgl_off__opcode;/* 3:5 */ @@ -275,7 +257,6 @@ struct tw_cl_command_generic { TW_UINT16 count; /* block cnt, parameter cnt, message credits */ }; - /* Command packet header. */ struct tw_cl_command_header { TW_UINT8 sense_data[TWA_SENSE_DATA_LENGTH]; @@ -293,7 +274,6 @@ struct tw_cl_command_header { } header_desc; }; - /* 7000 Command packet. */ union tw_cl_command_7k { struct tw_cl_command_init_connect init_connect; @@ -304,7 +284,6 @@ union tw_cl_command_7k { TW_UINT8 padding[1024 - sizeof(struct tw_cl_command_header)]; }; - /* 9000 Command Packet. */ struct tw_cl_command_9k { TW_UINT8 res__opcode; /* 3:5 */ @@ -319,7 +298,6 @@ struct tw_cl_command_9k { 1024-sizeof(cmd_hdr) */ }; - /* Full command packet. */ struct tw_cl_command_packet { struct tw_cl_command_header cmd_hdr; @@ -329,7 +307,6 @@ struct tw_cl_command_packet { } command; }; - /* Structure describing payload for get/set param commands. */ struct tw_cl_param_9k { TW_UINT16 table_id; @@ -341,16 +318,13 @@ struct tw_cl_param_9k { }; #pragma pack() - /* Functions to read from, and write to registers */ #define TW_CLI_WRITE_CONTROL_REGISTER(ctlr_handle, value) \ tw_osl_write_reg(ctlr_handle, TWA_CONTROL_REGISTER_OFFSET, value, 4) - #define TW_CLI_READ_STATUS_REGISTER(ctlr_handle) \ tw_osl_read_reg(ctlr_handle, TWA_STATUS_REGISTER_OFFSET, 4) - #define TW_CLI_WRITE_COMMAND_QUEUE(ctlr_handle, value) do { \ if (ctlr->flags & TW_CL_64BIT_ADDRESSES) { \ /* First write the low 4 bytes, then the high 4. */ \ @@ -363,15 +337,12 @@ struct tw_cl_param_9k { (TW_UINT32)(value), 4); \ } while (0) - #define TW_CLI_READ_RESPONSE_QUEUE(ctlr_handle) \ tw_osl_read_reg(ctlr_handle, TWA_RESPONSE_QUEUE_OFFSET, 4) - #define TW_CLI_READ_LARGE_RESPONSE_QUEUE(ctlr_handle) \ tw_osl_read_reg(ctlr_handle, TWA_LARGE_RESPONSE_QUEUE_OFFSET, 4) - #define TW_CLI_SOFT_RESET(ctlr) \ TW_CLI_WRITE_CONTROL_REGISTER(ctlr, \ TWA_CONTROL_ISSUE_SOFT_RESET | \ @@ -386,7 +357,6 @@ struct tw_cl_param_9k { ((x & TWA_STATUS_UNEXPECTED_BITS) && \ (x & TWA_STATUS_MICROCONTROLLER_READY)) - /* * Functions for making transparent, the bit fields in firmware * interface structures. @@ -409,7 +379,6 @@ struct tw_cl_param_9k { #define BUILD_LUN_H4__SGL_ENTRIES(lun, sgl_entries) \ (((lun << 8) & 0xF000) | (sgl_entries & 0xFFF)) /* 4:12 */ - #define GET_OPCODE(sgl_off__opcode) \ (sgl_off__opcode & 0x1F) /* 3:5 */ @@ -445,7 +414,5 @@ struct tw_cl_param_9k { #define GET_LUN_H4(lun_h4__sgl_entries) \ ((lun_h4__sgl_entries >> 12) & 0xF) /* 4:12 */ - - #endif /* TW_CL_FWIF_H */ Modified: head/sys/dev/twa/tw_cl_init.c ============================================================================== --- head/sys/dev/twa/tw_cl_init.c Tue Sep 1 21:29:01 2020 (r365086) +++ head/sys/dev/twa/tw_cl_init.c Tue Sep 1 21:29:23 2020 (r365087) @@ -37,12 +37,10 @@ * Modifications by: Manjunath Ranganathaiah */ - /* * Common Layer initialization functions. */ - #include "tw_osl_share.h" #include "tw_cl_share.h" #include "tw_cl_fwif.h" @@ -51,7 +49,6 @@ #include "tw_cl_externs.h" #include "tw_osl_ioctl.h" - /* * Function name: tw_cl_ctlr_supported * Description: Determines if a controller is supported. @@ -74,8 +71,6 @@ tw_cl_ctlr_supported(TW_INT32 vendor_id, TW_INT32 devi return(TW_CL_FALSE); } - - /* * Function name: tw_cl_get_pci_bar_info * Description: Returns PCI BAR info. @@ -150,8 +145,6 @@ tw_cl_get_pci_bar_info(TW_INT32 device_id, TW_INT32 ba return(error); } - - /* * Function name: tw_cl_get_mem_requirements * Description: Provides info about Common Layer requirements for a @@ -213,7 +206,6 @@ tw_cl_get_mem_requirements(struct tw_cl_ctlr_handle *c (sizeof(struct tw_cli_req_context) * max_simult_reqs) + (sizeof(struct tw_cl_event_packet) * max_aens); - /* * Total DMA'able memory needed is the sum total of memory needed for * all command packets (including the 1 needed for CL internal @@ -227,8 +219,6 @@ tw_cl_get_mem_requirements(struct tw_cl_ctlr_handle *c return(0); } - - /* * Function name: tw_cl_init_ctlr * Description: Initializes driver data structures for the controller. @@ -357,7 +347,6 @@ tw_cl_init_ctlr(struct tw_cl_ctlr_handle *ctlr_handle, /* Initialize the AEN queue. */ ctlr->aen_queue = (struct tw_cl_event_packet *)free_non_dma_mem; - start_ctlr: /* * Disable interrupts. Interrupts will be enabled in tw_cli_start_ctlr @@ -545,7 +534,6 @@ tw_cli_start_ctlr(struct tw_cli_ctlr_context *ctlr) return(TW_OSL_ESUCCESS); } - /* * Function name: tw_cl_shutdown_ctlr * Description: Closes logical connection with the controller. @@ -593,8 +581,6 @@ ret: return(error); } - - /* * Function name: tw_cli_init_connection * Description: Sends init_connection cmd to firmware @@ -708,5 +694,3 @@ out: tw_cli_req_q_insert_tail(req, TW_CLI_FREE_Q); return(error); } - - Modified: head/sys/dev/twa/tw_cl_intr.c ============================================================================== --- head/sys/dev/twa/tw_cl_intr.c Tue Sep 1 21:29:01 2020 (r365086) +++ head/sys/dev/twa/tw_cl_intr.c Tue Sep 1 21:29:23 2020 (r365087) @@ -37,12 +37,10 @@ * Modifications by: Manjunath Ranganathaiah */ - /* * Common Layer interrupt handling functions. */ - #include "tw_osl_share.h" #include "tw_cl_share.h" #include "tw_cl_fwif.h" @@ -51,8 +49,6 @@ #include "tw_cl_externs.h" #include "tw_osl_ioctl.h" - - /* * Function name: twa_interrupt * Description: Interrupt handler. Determines the kind of interrupt, @@ -122,8 +118,6 @@ out: return(rc); } - - /* * Function name: tw_cli_process_host_intr * Description: This function gets called if we triggered an interrupt. @@ -139,8 +133,6 @@ tw_cli_process_host_intr(struct tw_cli_ctlr_context *c tw_cli_dbg_printf(6, ctlr->ctlr_handle, tw_osl_cur_func(), "entered"); } - - /* * Function name: tw_cli_process_attn_intr * Description: This function gets called if the fw posted an AEN @@ -175,8 +167,6 @@ tw_cli_process_attn_intr(struct tw_cli_ctlr_context *c } } - - /* * Function name: tw_cli_process_cmd_intr * Description: This function gets called if we hit a queue full @@ -202,8 +192,6 @@ tw_cli_process_cmd_intr(struct tw_cli_ctlr_context *ct */ } - - /* * Function name: tw_cli_process_resp_intr * Description: Looks for cmd completions from fw; queues cmds completed @@ -260,17 +248,14 @@ tw_cli_process_resp_intr(struct tw_cli_ctlr_context *c tw_cli_req_q_remove_item(req, TW_CLI_BUSY_Q); req->state = TW_CLI_REQ_STATE_COMPLETE; tw_cli_req_q_insert_tail(req, TW_CLI_COMPLETE_Q); - } /* Complete this, and other requests in the complete queue. */ tw_cli_process_complete_queue(ctlr); - + return(error); } - - /* * Function name: tw_cli_submit_pending_queue * Description: Kick starts any requests in the pending queue. @@ -287,7 +272,7 @@ tw_cli_submit_pending_queue(struct tw_cli_ctlr_context TW_INT32 error = TW_OSL_ESUCCESS; tw_cli_dbg_printf(3, ctlr->ctlr_handle, tw_osl_cur_func(), "entered"); - + /* * Pull requests off the pending queue, and submit them. */ @@ -339,8 +324,6 @@ tw_cli_submit_pending_queue(struct tw_cli_ctlr_context return(error); } - - /* * Function name: tw_cli_process_complete_queue * Description: Calls the CL internal callback routine, if any, for @@ -368,8 +351,6 @@ tw_cli_process_complete_queue(struct tw_cli_ctlr_conte } } - - /* * Function name: tw_cli_complete_io * Description: CL internal callback for SCSI/fw passthru requests. @@ -418,8 +399,6 @@ out: tw_cli_req_q_insert_tail(req, TW_CLI_FREE_Q); } - - /* * Function name: tw_cli_scsi_complete * Description: Completion routine for SCSI requests. @@ -505,8 +484,6 @@ tw_cli_scsi_complete(struct tw_cli_req_context *req) req_pkt->status |= TW_CL_ERR_REQ_SCSI_ERROR; } - - /* * Function name: tw_cli_param_callback * Description: Callback for get/set_param requests. @@ -559,8 +536,6 @@ tw_cli_param_callback(struct tw_cli_req_context *req) } } - - /* * Function name: tw_cli_aen_callback * Description: Callback for requests to fetch AEN's. @@ -632,8 +607,6 @@ tw_cli_aen_callback(struct tw_cli_req_context *req) } } - - /* * Function name: tw_cli_manage_aen * Description: Handles AEN's. @@ -694,13 +667,11 @@ tw_cli_manage_aen(struct tw_cli_ctlr_context *ctlr, break; - case TWA_AEN_QUEUE_EMPTY: tw_cli_dbg_printf(4, ctlr->ctlr_handle, tw_osl_cur_func(), "AEN queue empty"); break; - default: /* Queue the event. */ @@ -714,8 +685,6 @@ tw_cli_manage_aen(struct tw_cli_ctlr_context *ctlr, return(aen_code); } - - /* * Function name: tw_cli_enable_interrupts * Description: Enables interrupts on the controller @@ -736,8 +705,6 @@ tw_cli_enable_interrupts(struct tw_cli_ctlr_context *c TWA_CONTROL_ENABLE_INTERRUPTS); } - - /* * Function name: twa_setup * Description: Disables interrupts on the controller @@ -755,4 +722,3 @@ tw_cli_disable_interrupts(struct tw_cli_ctlr_context * TWA_CONTROL_DISABLE_INTERRUPTS); ctlr->interrupts_enabled = TW_CL_FALSE; } - Modified: head/sys/dev/twa/tw_cl_io.c ============================================================================== --- head/sys/dev/twa/tw_cl_io.c Tue Sep 1 21:29:01 2020 (r365086) +++ head/sys/dev/twa/tw_cl_io.c Tue Sep 1 21:29:23 2020 (r365087) @@ -37,12 +37,10 @@ * Modifications by: Manjunath Ranganathaiah */ - /* * Common Layer I/O functions. */ - #include "tw_osl_share.h" #include "tw_cl_share.h" #include "tw_cl_fwif.h" @@ -55,8 +53,6 @@ #include #include - - /* * Function name: tw_cl_start_io * Description: Interface to OS Layer for accepting SCSI requests. @@ -155,8 +151,6 @@ tw_cl_start_io(struct tw_cl_ctlr_handle *ctlr_handle, return(error); } - - /* * Function name: tw_cli_submit_cmd * Description: Submits a cmd to firmware. @@ -247,8 +241,6 @@ tw_cli_submit_cmd(struct tw_cli_req_context *req) return(error); } - - /* * Function name: tw_cl_fw_passthru * Description: Interface to OS Layer for accepting firmware @@ -353,8 +345,6 @@ tw_cl_fw_passthru(struct tw_cl_ctlr_handle *ctlr_handl return(error); } - - /* * Function name: tw_cl_ioctl * Description: Handler of CL supported ioctl cmds. @@ -421,7 +411,6 @@ tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, u_l break; - case TW_CL_IOCTL_GET_LAST_EVENT: tw_cli_dbg_printf(3, ctlr_handle, tw_osl_cur_func(), "Get Last Event"); @@ -457,7 +446,6 @@ tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, u_l break; - case TW_CL_IOCTL_GET_NEXT_EVENT: tw_cli_dbg_printf(3, ctlr_handle, tw_osl_cur_func(), "Get Next Event"); @@ -535,7 +523,6 @@ tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, u_l break; - case TW_CL_IOCTL_GET_PREVIOUS_EVENT: tw_cli_dbg_printf(3, ctlr_handle, tw_osl_cur_func(), "Get Previous Event"); @@ -598,7 +585,6 @@ tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, u_l break; - case TW_CL_IOCTL_GET_LOCK: { struct tw_cl_lock_packet lock_pkt; @@ -634,7 +620,6 @@ tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, u_l break; } - case TW_CL_IOCTL_RELEASE_LOCK: tw_cli_dbg_printf(3, ctlr_handle, tw_osl_cur_func(), "Release ioctl lock"); @@ -652,7 +637,6 @@ tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, u_l } break; - case TW_CL_IOCTL_GET_COMPATIBILITY_INFO: { struct tw_cl_compatibility_packet comp_pkt; @@ -699,8 +683,6 @@ tw_cl_ioctl(struct tw_cl_ctlr_handle *ctlr_handle, u_l return(error); } - - /* * Function name: tw_cli_get_param * Description: Get a firmware parameter. @@ -816,8 +798,6 @@ out: return(1); } - - /* * Function name: tw_cli_set_param * Description: Set a firmware parameter. @@ -933,8 +913,6 @@ out: return(error); } - - /* * Function name: tw_cli_submit_and_poll_request * Description: Sends down a firmware cmd, and waits for the completion @@ -1034,8 +1012,6 @@ tw_cli_submit_and_poll_request(struct tw_cli_req_conte return(TW_OSL_ETIMEDOUT); } - - /* * Function name: tw_cl_reset_ctlr * Description: Soft resets and then initializes the controller; @@ -1062,7 +1038,6 @@ tw_cl_reset_ctlr(struct tw_cl_ctlr_handle *ctlr_handle ctlr->reset_in_progress = TW_CL_TRUE; twa_teardown_intr(sc); - /* * Error back all requests in the complete, busy, and pending queues. * If any request is already on its way to getting submitted, it's in @@ -1159,8 +1134,6 @@ tw_cl_is_active(struct tw_cl_ctlr_handle *ctlr_handle) return(ctlr->active); } - - /* * Function name: tw_cli_soft_reset * Description: Does the actual soft reset. @@ -1253,7 +1226,7 @@ tw_cli_soft_reset(struct tw_cli_ctlr_context *ctlr) tw_osl_free_lock(ctlr_handle, ctlr->io_lock); return(error); } - + tw_osl_free_lock(ctlr_handle, ctlr->io_lock); if ((error = tw_cli_drain_aen_queue(ctlr))) { @@ -1264,7 +1237,7 @@ tw_cli_soft_reset(struct tw_cli_ctlr_context *ctlr) "error = %d", error); return(error); } - + if ((error = tw_cli_find_aen(ctlr, TWA_AEN_SOFT_RESET))) { tw_cl_create_event(ctlr_handle, TW_CL_FALSE, TW_CL_MESSAGE_SOURCE_COMMON_LAYER_EVENT, @@ -1277,8 +1250,6 @@ tw_cli_soft_reset(struct tw_cli_ctlr_context *ctlr) return(TW_OSL_ESUCCESS); } - - /* * Function name: tw_cli_send_scsi_cmd * Description: Sends down a scsi cmd to fw. @@ -1350,8 +1321,6 @@ tw_cli_send_scsi_cmd(struct tw_cli_req_context *req, T return(TW_OSL_ESUCCESS); } - - /* * Function name: tw_cli_get_aen * Description: Sends down a Request Sense cmd to fw to fetch an AEN. @@ -1387,8 +1356,6 @@ tw_cli_get_aen(struct tw_cli_ctlr_context *ctlr) return(error); } - - /* * Function name: tw_cli_fill_sg_list * Description: Fills in the scatter/gather list. @@ -1438,4 +1405,3 @@ tw_cli_fill_sg_list(struct tw_cli_ctlr_context *ctlr, } } } - Modified: head/sys/dev/twa/tw_cl_ioctl.h ============================================================================== --- head/sys/dev/twa/tw_cl_ioctl.h Tue Sep 1 21:29:01 2020 (r365086) +++ head/sys/dev/twa/tw_cl_ioctl.h Tue Sep 1 21:29:23 2020 (r365087) @@ -36,18 +36,14 @@ * Modifications by: Adam Radford */ - - #ifndef TW_CL_IOCTL_H #define TW_CL_IOCTL_H - /* * Macros and structures for Common Layer handled ioctls. */ - #define TW_CL_AEN_NOT_RETRIEVED 0x1 #define TW_CL_AEN_RETRIEVED 0x2 @@ -57,7 +53,6 @@ #define TW_CL_ERROR_IOCTL_LOCK_NOT_HELD 0x1001 /* Not locked */ #define TW_CL_ERROR_IOCTL_LOCK_ALREADY_HELD 0x1002 /* Already locked */ - #pragma pack(1) /* Structure used to handle GET/RELEASE LOCK ioctls. */ @@ -67,7 +62,6 @@ struct tw_cl_lock_packet { TW_UINT32 force_flag; }; - /* Structure used to handle GET COMPATIBILITY INFO ioctl. */ struct tw_cl_compatibility_packet { TW_UINT8 driver_version[32];/* driver version */ @@ -87,7 +81,6 @@ struct tw_cl_compatibility_packet { TW_UINT16 fw_on_ctlr_build;/* build # of running firmware */ }; - /* Driver understandable part of the ioctl packet built by the API. */ struct tw_cl_driver_packet { TW_UINT32 control_code; @@ -98,7 +91,6 @@ struct tw_cl_driver_packet { TW_UINT32 buffer_length; }; - /* ioctl packet built by the API. */ struct tw_cl_ioctl_packet { struct tw_cl_driver_packet driver_pkt; @@ -108,7 +100,5 @@ struct tw_cl_ioctl_packet { }; #pragma pack() - - #endif /* TW_CL_IOCTL_H */ Modified: head/sys/dev/twa/tw_cl_misc.c ============================================================================== --- head/sys/dev/twa/tw_cl_misc.c Tue Sep 1 21:29:01 2020 (r365086) +++ head/sys/dev/twa/tw_cl_misc.c Tue Sep 1 21:29:23 2020 (r365087) @@ -37,12 +37,10 @@ * Modifications by: Manjunath Ranganathaiah */ - /* * Common Layer miscellaneous functions. */ - #include "tw_osl_share.h" #include "tw_cl_share.h" #include "tw_cl_fwif.h" @@ -51,8 +49,6 @@ #include "tw_cl_externs.h" #include "tw_osl_ioctl.h" - - /* AEN severity table. */ TW_INT8 *tw_cli_severity_string_table[] = { "None", @@ -63,8 +59,6 @@ TW_INT8 *tw_cli_severity_string_table[] = { "" }; - - /* * Function name: tw_cli_drain_complete_queue * Description: This function gets called during a controller reset. @@ -117,8 +111,6 @@ tw_cli_drain_complete_queue(struct tw_cli_ctlr_context } /* End of while loop */ } - - /* * Function name: tw_cli_drain_busy_queue *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:29:47 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 62F1A379FB5; Tue, 1 Sep 2020 21:29:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Zz20Rwz4L8h; Tue, 1 Sep 2020 21:29:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27C9E1FB3E; Tue, 1 Sep 2020 21:29:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LTlIK025490; Tue, 1 Sep 2020 21:29:47 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LTiNB025477; Tue, 1 Sep 2020 21:29:44 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012129.081LTiNB025477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:29:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365088 - in head/sys/dev/syscons: . daemon logo rain warp X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/syscons: . daemon logo rain warp X-SVN-Commit-Revision: 365088 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:29:47 -0000 Author: mjg Date: Tue Sep 1 21:29:44 2020 New Revision: 365088 URL: https://svnweb.freebsd.org/changeset/base/365088 Log: syscons: clean up empty lines in .c and .h files Modified: head/sys/dev/syscons/daemon/daemon_saver.c head/sys/dev/syscons/logo/logo_saver.c head/sys/dev/syscons/rain/rain_saver.c head/sys/dev/syscons/scgfbrndr.c head/sys/dev/syscons/schistory.c head/sys/dev/syscons/scmouse.c head/sys/dev/syscons/scterm-sc.c head/sys/dev/syscons/scvesactl.c head/sys/dev/syscons/scvgarndr.c head/sys/dev/syscons/scvidctl.c head/sys/dev/syscons/syscons.c head/sys/dev/syscons/sysmouse.c head/sys/dev/syscons/warp/warp_saver.c Modified: head/sys/dev/syscons/daemon/daemon_saver.c ============================================================================== --- head/sys/dev/syscons/daemon/daemon_saver.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/daemon/daemon_saver.c Tue Sep 1 21:29:44 2020 (r365088) @@ -359,7 +359,7 @@ daemon_init(video_adapter_t *adp) for (;;) { hostlen = strlen(prison0.pr_hostname); mtx_unlock(&prison0.pr_mtx); - + messagelen = hostlen + 3 + strlen(ostype) + 1 + strlen(osrelease); message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK); Modified: head/sys/dev/syscons/logo/logo_saver.c ============================================================================== --- head/sys/dev/syscons/logo/logo_saver.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/logo/logo_saver.c Tue Sep 1 21:29:44 2020 (r365088) @@ -65,11 +65,11 @@ logo_blit(video_adapter_t *adp, int x, int y) { int d, l, o, p; int last_origin = -1; - + for (o = 0, p = y * bpsl + x; p > banksize; p -= banksize) o += banksize; SET_ORIGIN(adp, o); - + for (d = 0; d < logo_img_size; d += logo_w) { if (p + logo_w < banksize) { bcopy(logo_img + d, vid + p, logo_w); @@ -94,7 +94,7 @@ logo_update(video_adapter_t *adp) { static int xpos = 0, ypos = 0; static int xinc = 1, yinc = 1; - + /* Turn when you hit the edge */ if ((xpos + logo_w + xinc > scrw) || (xpos + xinc < 0)) xinc = -xinc; @@ -102,7 +102,7 @@ logo_update(video_adapter_t *adp) yinc = -yinc; xpos += xinc; ypos += yinc; - + /* XXX Relies on margin around logo to erase trail */ logo_blit(adp, xpos, ypos); } @@ -111,7 +111,7 @@ static int logo_saver(video_adapter_t *adp, int blank) { int pl; - + if (blank) { /* switch to graphics mode */ if (blanked <= 0) { @@ -137,7 +137,7 @@ static int logo_init(video_adapter_t *adp) { video_info_t info; - + if (!vidd_get_info(adp, M_VESA_CG800x600, &info)) { scrmode = M_VESA_CG800x600; } else if (!vidd_get_info(adp, M_VGA_CG320, &info)) { @@ -148,10 +148,10 @@ logo_init(video_adapter_t *adp) SAVER_NAME); return (ENODEV); } - + scrw = info.vi_width; scrh = info.vi_height; - + return (0); } Modified: head/sys/dev/syscons/rain/rain_saver.c ============================================================================== --- head/sys/dev/syscons/rain/rain_saver.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/rain/rain_saver.c Tue Sep 1 21:29:44 2020 (r365088) @@ -142,7 +142,7 @@ rain_init(video_adapter_t *adp) { video_info_t info; int i; - + if (!vidd_get_info(adp, M_VGA_CG320, &info)) { scrmode = M_VGA_CG320; } else { @@ -151,14 +151,14 @@ rain_init(video_adapter_t *adp) SAVER_NAME); return (ENODEV); } - + scrw = info.vi_width; scrh = info.vi_height; /* intialize the palette */ for (i = 1; i < MAX; i++) rain_pal[BLUE(i)] = rain_pal[BLUE(i - 1)] + INCREMENT; - + return (0); } Modified: head/sys/dev/syscons/scgfbrndr.c ============================================================================== --- head/sys/dev/syscons/scgfbrndr.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/scgfbrndr.c Tue Sep 1 21:29:44 2020 (r365088) @@ -147,7 +147,6 @@ gfb_draw(scr_stat *scp, int from, int count, int flip) and the number of characters to be displayed... */ if (from + count > scp->xsize*scp->ysize) { - /* Calculate the number of characters past the end of the visible screen... @@ -177,7 +176,6 @@ gfb_draw(scr_stat *scp, int from, int count, int flip) all-at-once... */ else { - /* Determine the method by which we are to display characters (are we going to print forwards or backwards? Modified: head/sys/dev/syscons/schistory.c ============================================================================== --- head/sys/dev/syscons/schistory.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/schistory.c Tue Sep 1 21:29:44 2020 (r365088) @@ -299,7 +299,6 @@ sc_hist_ioctl(struct tty *tp, u_long cmd, caddr_t data int error; switch (cmd) { - case CONS_HISTORY: /* set history size */ scp = SC_STAT(tp); if (*(int *)data <= 0) Modified: head/sys/dev/syscons/scmouse.c ============================================================================== --- head/sys/dev/syscons/scmouse.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/scmouse.c Tue Sep 1 21:29:44 2020 (r365088) @@ -663,7 +663,6 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t dat scp = SC_STAT(tp); switch (cmd) { - case CONS_MOUSECTL: /* control mouse arrow */ case OLD_CONS_MOUSECTL: Modified: head/sys/dev/syscons/scterm-sc.c ============================================================================== --- head/sys/dev/syscons/scterm-sc.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/scterm-sc.c Tue Sep 1 21:29:44 2020 (r365088) @@ -206,7 +206,6 @@ scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char sc = scp->sc; if (tcp->esc == 1) { /* seen ESC */ switch (c) { - case '7': /* Save cursor position */ tcp->saved_xpos = scp->xpos; tcp->saved_ypos = scp->ypos; @@ -265,7 +264,6 @@ scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char } tcp->num_param = tcp->last_param + 1; switch (c) { - case ';': if (tcp->num_param < MAX_ESC_PAR) return; @@ -552,7 +550,6 @@ scterm_scan_esc(scr_stat *scp, term_stat *tcp, u_char } tcp->num_param = tcp->last_param + 1; switch (c) { - case ';': if (tcp->num_param < MAX_ESC_PAR) return; Modified: head/sys/dev/syscons/scvesactl.c ============================================================================== --- head/sys/dev/syscons/scvesactl.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/scvesactl.c Tue Sep 1 21:29:44 2020 (r365088) @@ -61,7 +61,6 @@ vesa_ioctl(struct tty *tp, u_long cmd, caddr_t data, s scp = SC_STAT(tp); switch (cmd) { - /* generic text modes */ case SW_TEXT_132x25: case SW_TEXT_132x30: case SW_TEXT_132x43: case SW_TEXT_132x50: Modified: head/sys/dev/syscons/scvgarndr.c ============================================================================== --- head/sys/dev/syscons/scvgarndr.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/scvgarndr.c Tue Sep 1 21:29:44 2020 (r365088) @@ -323,7 +323,7 @@ static const struct mousedata * const mousesmall[] = { writeb((pos), (uint8_t)(color)); \ } \ } while (0) - + static uint32_t vga_palette32[16] = { 0x000000, 0x0000ad, 0x00ad00, 0x00adad, 0xad0000, 0xad00ad, 0xad5200, 0xadadad, Modified: head/sys/dev/syscons/scvidctl.c ============================================================================== --- head/sys/dev/syscons/scvidctl.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/scvidctl.c Tue Sep 1 21:29:44 2020 (r365088) @@ -491,7 +491,6 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, return ENODEV; switch (cmd) { - case CONS_CURRENTADP: /* get current adapter index */ case FBIO_ADAPTER: return fb_ioctl(adp, FBIO_ADAPTER, data); Modified: head/sys/dev/syscons/syscons.c ============================================================================== --- head/sys/dev/syscons/syscons.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/syscons.c Tue Sep 1 21:29:44 2020 (r365088) @@ -845,7 +845,6 @@ sckbdevent(keyboard_t *thiskbd, int event, void *arg) * the Xaccel-2.1 keyboard hang, but it can't hurt. XXX */ while ((c = scgetc(sc, SCGETC_NONBLOCK, NULL)) != NOKEY) { - cur_tty = SC_DEV(sc, sc->cur_scp->index); if (!tty_opened_ns(cur_tty)) continue; @@ -3275,7 +3274,6 @@ scinit(int unit, int flags) } if (!(sc->flags & SC_INIT_DONE) || (adp != sc->adp)) { - sc->initial_mode = sc->adp->va_initial_mode; #ifndef SC_NO_FONT_LOADING @@ -3800,7 +3798,6 @@ next_code: /* if scroll-lock pressed allow history browsing */ if (!ISGRAPHSC(scp) && scp->history && scp->status & SLKED) { - scp->status &= ~CURSOR_ENABLED; sc_remove_cursor_image(scp); Modified: head/sys/dev/syscons/sysmouse.c ============================================================================== --- head/sys/dev/syscons/sysmouse.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/sysmouse.c Tue Sep 1 21:29:44 2020 (r365088) @@ -137,7 +137,6 @@ smdev_ioctl(struct tty *tp, u_long cmd, caddr_t data, mousemode_t *mode; switch (cmd) { - case MOUSE_GETHWINFO: /* get device information */ hw = (mousehw_t *)data; hw->buttons = 10; /* XXX unknown */ Modified: head/sys/dev/syscons/warp/warp_saver.c ============================================================================== --- head/sys/dev/syscons/warp/warp_saver.c Tue Sep 1 21:29:23 2020 (r365087) +++ head/sys/dev/syscons/warp/warp_saver.c Tue Sep 1 21:29:44 2020 (r365088) @@ -100,7 +100,7 @@ static int warp_saver(video_adapter_t *adp, int blank) { int pl; - + if (blank) { /* switch to graphics mode */ if (blanked <= 0) { @@ -128,7 +128,7 @@ warp_init(video_adapter_t *adp) { video_info_t info; int i; - + if (!vidd_get_info(adp, M_VGA_CG320, &info)) { scrmode = M_VGA_CG320; } else { @@ -137,14 +137,14 @@ warp_init(video_adapter_t *adp) SAVER_NAME); return (ENODEV); } - + scrw = info.vi_width; scrh = info.vi_height; /* randomize the star field */ for (i = 0; i < STARS; i++) star[i] = random() % (scrw * scrh); - + return (0); } From owner-svn-src-all@freebsd.org Tue Sep 1 21:30:04 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6279E379D1D; Tue, 1 Sep 2020 21:30:04 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0bJ20fcz4LTS; Tue, 1 Sep 2020 21:30:04 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 295D71FD99; Tue, 1 Sep 2020 21:30:04 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LU47x025593; Tue, 1 Sep 2020 21:30:04 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LU2tP025584; Tue, 1 Sep 2020 21:30:02 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012130.081LU2tP025584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:30:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365089 - in head/sys/dev/vmware: pvscsi vmci vmxnet3 X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/vmware: pvscsi vmci vmxnet3 X-SVN-Commit-Revision: 365089 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:30:04 -0000 Author: mjg Date: Tue Sep 1 21:30:01 2020 New Revision: 365089 URL: https://svnweb.freebsd.org/changeset/base/365089 Log: vmware: clean up empty lines in .c and .h files Modified: head/sys/dev/vmware/pvscsi/pvscsi.c head/sys/dev/vmware/vmci/vmci_defs.h head/sys/dev/vmware/vmci/vmci_doorbell.c head/sys/dev/vmware/vmci/vmci_driver.c head/sys/dev/vmware/vmci/vmci_event.c head/sys/dev/vmware/vmci/vmci_hashtable.c head/sys/dev/vmware/vmci/vmci_kernel_if.c head/sys/dev/vmware/vmci/vmci_queue_pair.c head/sys/dev/vmware/vmxnet3/if_vmx.c Modified: head/sys/dev/vmware/pvscsi/pvscsi.c ============================================================================== --- head/sys/dev/vmware/pvscsi/pvscsi.c Tue Sep 1 21:29:44 2020 (r365088) +++ head/sys/dev/vmware/pvscsi/pvscsi.c Tue Sep 1 21:30:01 2020 (r365089) @@ -127,7 +127,6 @@ static int pvscsi_probe(device_t dev); static int pvscsi_shutdown(device_t dev); static int pvscsi_get_tunable(struct pvscsi_softc *sc, char *name, int value); - #ifdef PVSCSI_DEBUG_LOGGING static int pvscsi_log_level = 0; static SYSCTL_NODE(_hw, OID_AUTO, pvscsi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, @@ -154,11 +153,9 @@ TUNABLE_INT("hw.pvscsi.use_req_call_threshold", &pvscs static int pvscsi_max_queue_depth = 0; TUNABLE_INT("hw.pvscsi.max_queue_depth", &pvscsi_max_queue_depth); - struct pvscsi_sg_list { struct pvscsi_sg_element sge[PVSCSI_MAX_SG_ENTRIES_PER_SEGMENT]; }; - #define PVSCSI_ABORT_TIMEOUT 2 #define PVSCSI_RESET_TIMEOUT 10 Modified: head/sys/dev/vmware/vmci/vmci_defs.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_defs.h Tue Sep 1 21:29:44 2020 (r365088) +++ head/sys/dev/vmware/vmci/vmci_defs.h Tue Sep 1 21:30:01 2020 (r365089) @@ -386,7 +386,6 @@ struct vmci_queue_header { volatile uint64_t consumer_head; /* Offset in peer queue. */ }; - /* * If one client of a QueuePair is a 32bit entity, we restrict the QueuePair * size to be less than 4GB, and use 32bit atomic operations on the head and Modified: head/sys/dev/vmware/vmci/vmci_doorbell.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_doorbell.c Tue Sep 1 21:29:44 2020 (r365088) +++ head/sys/dev/vmware/vmci/vmci_doorbell.c Tue Sep 1 21:30:01 2020 (r365089) @@ -621,7 +621,6 @@ vmci_doorbell_destroy(struct vmci_handle handle) result = vmci_doorbell_unlink(handle, entry->is_doorbell); if (VMCI_SUCCESS != result) { - /* * The only reason this should fail would be an inconsistency * between guest and hypervisor state, where the guest believes Modified: head/sys/dev/vmware/vmci/vmci_driver.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_driver.c Tue Sep 1 21:29:44 2020 (r365088) +++ head/sys/dev/vmware/vmci/vmci_driver.c Tue Sep 1 21:30:01 2020 (r365089) @@ -281,10 +281,8 @@ vmci_read_datagrams_from_port(vmci_io_handle io_handle */ if (dg_in_size > remaining_bytes) { - if (remaining_bytes != current_dg_in_buffer_size) { - /* * We move the partial datagram to the * front and read the reminder of the Modified: head/sys/dev/vmware/vmci/vmci_event.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_event.c Tue Sep 1 21:29:44 2020 (r365088) +++ head/sys/dev/vmware/vmci/vmci_event.c Tue Sep 1 21:30:01 2020 (r365089) @@ -104,7 +104,6 @@ vmci_event_exit(void) for (e = 0; e < VMCI_EVENT_MAX; e++) { vmci_list_scan_safe(iter, &subscriber_array[e], subscriber_list_item, iter_2) { - /* * We should never get here because all events should * have been unregistered before we try to unload the Modified: head/sys/dev/vmware/vmci/vmci_hashtable.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_hashtable.c Tue Sep 1 21:29:44 2020 (r365088) +++ head/sys/dev/vmware/vmci/vmci_hashtable.c Tue Sep 1 21:30:01 2020 (r365089) @@ -368,7 +368,6 @@ vmci_hashtable_release_entry_locked(struct vmci_hashta entry->ref_count--; /* Check if this is last reference and report if so. */ if (entry->ref_count == 0) { - /* * Remove entry from hash table if not already removed. This * could have happened already because VMCIHashTable_RemoveEntry Modified: head/sys/dev/vmware/vmci/vmci_kernel_if.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_kernel_if.c Tue Sep 1 21:29:44 2020 (r365088) +++ head/sys/dev/vmware/vmci/vmci_kernel_if.c Tue Sep 1 21:30:01 2020 (r365089) @@ -615,7 +615,6 @@ vmci_alloc_ppn_set(void *prod_q, uint64_t num_produce_ if (sizeof(pfn) > sizeof(*consume_ppns) && pfn != consume_ppns[i]) goto ppn_error; - } ppn_set->num_produce_pages = num_produce_pages; Modified: head/sys/dev/vmware/vmci/vmci_queue_pair.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_queue_pair.c Tue Sep 1 21:29:44 2020 (r365088) +++ head/sys/dev/vmware/vmci/vmci_queue_pair.c Tue Sep 1 21:30:01 2020 (r365089) @@ -838,7 +838,6 @@ vmci_queue_pair_detach_guest_work(struct vmci_handle h result = vmci_queue_pair_detach_hypercall(handle); if (entry->hibernate_failure) { if (result == VMCI_ERROR_NOT_FOUND) { - /* * If a queue pair detach failed when entering * hibernation, the guest driver and the device @@ -856,7 +855,6 @@ vmci_queue_pair_detach_guest_work(struct vmci_handle h } } if (result < VMCI_SUCCESS) { - /* * We failed to notify a non-local queuepair. That other * queuepair might still be accessing the shared Modified: head/sys/dev/vmware/vmxnet3/if_vmx.c ============================================================================== --- head/sys/dev/vmware/vmxnet3/if_vmx.c Tue Sep 1 21:29:44 2020 (r365088) +++ head/sys/dev/vmware/vmxnet3/if_vmx.c Tue Sep 1 21:30:01 2020 (r365089) @@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" - #define VMXNET3_VMWARE_VENDOR_ID 0x15AD #define VMXNET3_VMWARE_DEVICE_ID 0x07B0 @@ -192,7 +191,6 @@ typedef enum { static void vmxnet3_barrier(struct vmxnet3_softc *, vmxnet3_barrier_t); - static device_method_t vmxnet3_methods[] = { /* Device interface */ DEVMETHOD(device_register, vmxnet3_register), @@ -476,7 +474,7 @@ vmxnet3_msix_intr_assign(if_ctx_t ctx, int msix) sc = iflib_get_softc(ctx); scctx = sc->vmx_scctx; - + for (i = 0; i < scctx->isc_nrxqsets; i++) { snprintf(irq_name, sizeof(irq_name), "rxq%d", i); @@ -737,7 +735,7 @@ vmxnet3_queues_shared_alloc(struct vmxnet3_softc *sc) if_softc_ctx_t scctx; int size; int error; - + scctx = sc->vmx_scctx; /* @@ -763,7 +761,7 @@ vmxnet3_init_txq(struct vmxnet3_softc *sc, int q) struct vmxnet3_comp_ring *txc; struct vmxnet3_txring *txr; if_softc_ctx_t scctx; - + txq = &sc->vmx_txq[q]; txc = &txq->vxtxq_comp_ring; txr = &txq->vxtxq_cmd_ring; @@ -786,7 +784,7 @@ vmxnet3_tx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, int q; int error; caddr_t kva; - + sc = iflib_get_softc(ctx); /* Allocate the array of transmit queues */ @@ -881,7 +879,7 @@ vmxnet3_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, int i; int error; caddr_t kva; - + sc = iflib_get_softc(ctx); scctx = sc->vmx_scctx; @@ -1208,11 +1206,11 @@ vmxnet3_reinit_shared_data(struct vmxnet3_softc *sc) struct ifnet *ifp; struct vmxnet3_driver_shared *ds; if_softc_ctx_t scctx; - + ifp = sc->vmx_ifp; ds = sc->vmx_ds; scctx = sc->vmx_scctx; - + ds->mtu = ifp->if_mtu; ds->ntxqueue = scctx->isc_ntxqsets; ds->nrxqueue = scctx->isc_nrxqsets; @@ -1416,7 +1414,7 @@ vmxnet3_isc_txd_credits_update(void *vsc, uint16_t txq struct vmxnet3_txcompdesc *txcd; struct vmxnet3_txring *txr; int processed; - + sc = vsc; txq = &sc->vmx_txq[txqid]; txc = &txq->vxtxq_comp_ring; @@ -1493,7 +1491,7 @@ vmxnet3_isc_rxd_available(void *vsc, uint16_t rxqid, q completed_gen ^= 1; } } - + return (avail); } @@ -1734,7 +1732,7 @@ vmxnet3_isc_rxd_flush(void *vsc, uint16_t rxqid, uint8 struct vmxnet3_rxqueue *rxq; struct vmxnet3_rxring *rxr; bus_size_t r; - + sc = vsc; rxq = &sc->vmx_rxq[rxqid]; rxr = &rxq->vxrxq_cmd_ring[flid]; @@ -1753,7 +1751,7 @@ vmxnet3_legacy_intr(void *xsc) struct vmxnet3_softc *sc; if_softc_ctx_t scctx; if_ctx_t ctx; - + sc = xsc; scctx = sc->vmx_scctx; ctx = sc->vmx_ctx; @@ -1834,7 +1832,7 @@ vmxnet3_txinit(struct vmxnet3_softc *sc, struct vmxnet struct vmxnet3_comp_ring *txc; txq->vxtxq_last_flush = -1; - + txr = &txq->vxtxq_cmd_ring; txr->vxtxr_next = 0; txr->vxtxr_gen = VMXNET3_INIT_GEN; @@ -1953,7 +1951,7 @@ static void vmxnet3_init(if_ctx_t ctx) { struct vmxnet3_softc *sc; - + sc = iflib_get_softc(ctx); /* Use the current MAC address. */ @@ -2182,7 +2180,7 @@ vmxnet3_link_status(struct vmxnet3_softc *sc) ctx = sc->vmx_ctx; link = vmxnet3_link_is_up(sc); speed = IF_Gbps(10); - + if (link != 0 && sc->vmx_link_active == 0) { sc->vmx_link_active = 1; iflib_link_state_change(ctx, LINK_STATE_UP, speed); @@ -2320,7 +2318,7 @@ vmxnet3_setup_debug_sysctl(struct vmxnet3_softc *sc, int i; scctx = sc->vmx_scctx; - + for (i = 0; i < scctx->isc_ntxqsets; i++) { struct vmxnet3_txqueue *txq = &sc->vmx_txq[i]; @@ -2380,7 +2378,7 @@ vmxnet3_setup_queue_sysctl(struct vmxnet3_softc *sc, int i; scctx = sc->vmx_scctx; - + for (i = 0; i < scctx->isc_ntxqsets; i++) vmxnet3_setup_txq_sysctl(&sc->vmx_txq[i], ctx, child); for (i = 0; i < scctx->isc_nrxqsets; i++) From owner-svn-src-all@freebsd.org Tue Sep 1 21:30:24 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A594D379FD1; Tue, 1 Sep 2020 21:30:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0bh3xq7z4LWw; Tue, 1 Sep 2020 21:30:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AF9C1FB3F; Tue, 1 Sep 2020 21:30:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LUOpw025657; Tue, 1 Sep 2020 21:30:24 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LUNc0025651; Tue, 1 Sep 2020 21:30:23 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012130.081LUNc0025651@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:30:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365090 - in head/sys/dev: iscsi iscsi_initiator X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev: iscsi iscsi_initiator X-SVN-Commit-Revision: 365090 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:30:24 -0000 Author: mjg Date: Tue Sep 1 21:30:22 2020 New Revision: 365090 URL: https://svnweb.freebsd.org/changeset/base/365090 Log: iscsi: clean up empty lines in .c and .h files Modified: head/sys/dev/iscsi/icl_soft.c head/sys/dev/iscsi/icl_soft_proxy.c head/sys/dev/iscsi/iscsi.c head/sys/dev/iscsi_initiator/isc_cam.c head/sys/dev/iscsi_initiator/iscsi.c head/sys/dev/iscsi_initiator/iscsi_subr.c Modified: head/sys/dev/iscsi/icl_soft.c ============================================================================== --- head/sys/dev/iscsi/icl_soft.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi/icl_soft.c Tue Sep 1 21:30:22 2020 (r365090) @@ -954,7 +954,6 @@ icl_conn_send_pdus(struct icl_conn *ic, struct icl_pdu request = STAILQ_FIRST(queue); size = icl_pdu_size(request); if (available < size) { - /* * Set the low watermark, to be checked by * sowriteable() in icl_soupcall_send() Modified: head/sys/dev/iscsi/icl_soft_proxy.c ============================================================================== --- head/sys/dev/iscsi/icl_soft_proxy.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi/icl_soft_proxy.c Tue Sep 1 21:30:22 2020 (r365090) @@ -192,7 +192,7 @@ icl_listen_free(struct icl_listen *il) pause("icl_unlisten", 1 * hz); sx_xlock(&il->il_lock); } - + TAILQ_REMOVE(&il->il_sockets, ils, ils_next); soclose(ils->ils_socket); free(ils, M_ICL_PROXY); @@ -325,7 +325,6 @@ icl_listen_add(struct icl_listen *il, bool rdma, int d ICL_DEBUG("RDMA not supported"); return (EOPNOTSUPP); } - return (icl_listen_add_tcp(il, domain, socktype, protocol, sa, portal_id)); Modified: head/sys/dev/iscsi/iscsi.c ============================================================================== --- head/sys/dev/iscsi/iscsi.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi/iscsi.c Tue Sep 1 21:30:22 2020 (r365090) @@ -398,14 +398,14 @@ iscsi_maintenance_thread_reconnect(struct iscsi_sessio } cv_signal(&is->is_login_cv); #endif - + if (fail_on_disconnection) { ISCSI_SESSION_DEBUG(is, "connection failed, destroying devices"); iscsi_session_cleanup(is, true); } else { iscsi_session_cleanup(is, false); } - + KASSERT(TAILQ_EMPTY(&is->is_outstanding), ("destroying session with active tasks")); KASSERT(STAILQ_EMPTY(&is->is_postponed), @@ -1037,7 +1037,7 @@ iscsi_pdu_handle_data_in(struct icl_pdu *response) union ccb *ccb; struct ccb_scsiio *csio; size_t data_segment_len, received, oreceived; - + is = PDU_SESSION(response); bhsdi = (struct iscsi_bhs_data_in *)response->ip_bhs; io = iscsi_outstanding_find(is, bhsdi->bhsdi_initiator_task_tag); Modified: head/sys/dev/iscsi_initiator/isc_cam.c ============================================================================== --- head/sys/dev/iscsi_initiator/isc_cam.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi_initiator/isc_cam.c Tue Sep 1 21:30:22 2020 (r365090) @@ -211,7 +211,7 @@ ic_action(struct cam_sim *sim, union ccb *ccb) return; break; } - + case XPT_CALC_GEOMETRY: { struct ccb_calc_geometry *ccg; @@ -330,7 +330,6 @@ ic_init(isc_session_t *sp) if(xpt_bus_register(sim, NULL, 0/*bus_number*/) != CAM_SUCCESS) { - cam_sim_free(sim, /*free_devq*/TRUE); mtx_destroy(&sp->cam_mtx); return ENXIO; Modified: head/sys/dev/iscsi_initiator/iscsi.c ============================================================================== --- head/sys/dev/iscsi_initiator/iscsi.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi_initiator/iscsi.c Tue Sep 1 21:30:22 2020 (r365090) @@ -370,7 +370,6 @@ iscsi_read(struct cdev *dev, struct uio *uio, int iofl sprintf(buf, "/---- socket -----/\nso_count=%d so_state=%x\n", so->so_count, so->so_state); uiomove(buf, strlen(buf), uio); - } #endif return 0; @@ -749,7 +748,7 @@ iscsi_start(void) iscsi_driver_version, 0, "iscsi driver version"); - + SYSCTL_ADD_STRING(&isc->clist, SYSCTL_CHILDREN(isc->oid), OID_AUTO, Modified: head/sys/dev/iscsi_initiator/iscsi_subr.c ============================================================================== --- head/sys/dev/iscsi_initiator/iscsi_subr.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi_initiator/iscsi_subr.c Tue Sep 1 21:30:22 2020 (r365090) @@ -409,7 +409,7 @@ iscsi_reject(isc_session_t *sp, pduq_t *opq, pduq_t *p //XXX: check RFC 10.17.1 (page 176) ccb->ccb_h.status = CAM_REQ_ABORTED; xpt_done(ccb); - + pdu_free(sp->isc, opq); } From owner-svn-src-all@freebsd.org Tue Sep 1 21:30:53 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9044D37A284; Tue, 1 Sep 2020 21:30:53 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0cF1ndCz4LkF; Tue, 1 Sep 2020 21:30:52 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-il1-x142.google.com with SMTP id h11so2971102ilj.11; Tue, 01 Sep 2020 14:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:message-id:in-reply-to:references:subject :mime-version:content-transfer-encoding; bh=n+FNW19uFYdsOaPTEUuqlzyxmv5suKlD0r3zziDciJw=; b=AphmAyXtkpBFjEzCff1gUogfbYD9bEnYrS2zN2VVpVsLicIUxC6pn5ZoUG2Jt2M6Sg 9ip9rl1gWAp1a/i2XyObIwpx15uZWBQI9wVKK+v2/iHkyRGvtOIOjW0InJrsCyr4Qi5o y7Qn3nadDjZsVgeEqMlt5BJ7Y0WEpbjrkHfL3qdiyEYbjB/Tt9/TG+IZ0+qadhjAbB09 uS7smwEQik05Z98H6Su9D/hRInSRTtCF2L8M1GYfjoFCneRvMqL4iYw5Fm6CDlJtV7ev QoZRvwxmoVNNI8FVuyGRFgLMgZ6KCRoYMNfWV6AtffdhvhR3ThtzbsvFYI6Zx4NhtKxY 1Piw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version:content-transfer-encoding; bh=n+FNW19uFYdsOaPTEUuqlzyxmv5suKlD0r3zziDciJw=; b=GGhbW5lTCzyIWSD72xvswsevRCjVdoqElOsL7a9REPORWkNKviKAsSlzI522DHKADE PtEElKAV2wiinNKt0YjOCwbjBImHy8jul5ZmdHslzrdyg+80vgGxJSNEMcZPxVN22vnh bdyiv8tGAeG/aOOS1vq1tp05NFxLE/wsRyAWPQHV3EuqPZnAdLDa3uyBSh4tEUG/sqpp CrnR7We4OKrKT8KMS/rzawxWnKOAW1XH2a2eyC6TNVUjzLIoLhuIWz3sT+JLu0OFSHdg 3MqpNplK3Gc8Q+UlBKRBKQA/W8bIN3/687IVpCmg8juJ4tJ97vIrGWJ9pzF45u6vAsax 1hCw== X-Gm-Message-State: AOAM531VJqJy4bAMF6G6yBIQs4fTGZOueSiAam6CnRMbfUWhGf3vFfMy 1ZIKnCbFpcFAhnC35nmqG+SwYwGrfOI= X-Google-Smtp-Source: ABdhPJy4W7FaGyqUegB7Jl5JibasV0D7orhqnnqDSjdoaVn6CaE9poPJtL3KGmSkVG42cujadSKNfQ== X-Received: by 2002:a92:d902:: with SMTP id s2mr894645iln.21.1598995851613; Tue, 01 Sep 2020 14:30:51 -0700 (PDT) Received: from [127.0.0.1] (173-19-125-130.client.mchsi.com. [173.19.125.130]) by smtp.gmail.com with ESMTPSA id e22sm1083599ioc.43.2020.09.01.14.30.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Sep 2020 14:30:51 -0700 (PDT) Date: Tue, 1 Sep 2020 21:30:48 +0000 (UTC) From: Justin Hibbits To: Marcin Wojtas Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: In-Reply-To: <202009011617.081GHL8e031671@repo.freebsd.org> References: <202009011617.081GHL8e031671@repo.freebsd.org> Subject: Re: svn commit: r365054 - in head/sys: conf dev/sdhci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Correlation-ID: X-Rspamd-Queue-Id: 4Bh0cF1ndCz4LkF X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:30:53 -0000 Sep 1, 2020 11:17:35 Marcin Wojtas : > Author: mw > Date: Tue Sep=C2=A0 1 16:17:21 2020 > New Revision: 365054 > URL: https://svnweb.freebsd.org/changeset/base/365054 > > Log: > Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs > > Implement support for an eSDHC controller found in NXP QorIQ Layerscape S= oCs. > > This driver has been tested with NXP LS1046A and LX2160A (Honeycomb board= ), > which is incompatible with the existing sdhci_fsl driver (aiming at older > chips from this family). As such, it is not intended as replacement for > the old driver, but rather serves as an improved alternative for SoCs tha= t > support it. > It comes with support for both PIO and Single DMA modes and samples the > clock from the extres clk API. How is it incompatible? > > Submitted by: Artur Rojek > Reviewed by: manu, mmel, kibab > Obtained from: Semihalf > Sponsored by: Alstom Group > Differential Revision: https://reviews.freebsd.org/D26153 > > Added: > head/sys/dev/sdhci/sdhci_fsl_fdt.c=C2=A0=C2=A0 (contents, props changed) The name choice here is odd, given there is already fsl_sdhci.c > Modified: > head/sys/conf/files > > Modified: head/sys/conf/files > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/conf/files Tue Sep=C2=A0 1 16:13:09 2020=C2=A0 (r365053) > +++ head/sys/conf/files Tue Sep=C2=A0 1 16:17:21 2020=C2=A0 (r365054) > @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c=C2=A0=C2=A0 optional scc > dev/sdhci/sdhci.c=C2=A0=C2=A0=C2=A0 optional sdhci > dev/sdhci/sdhci_fdt.c=C2=A0=C2=A0=C2=A0 optional sdhci fdt > dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio > +dev/sdhci/sdhci_fsl_fdt.c=C2=A0 optional sdhci fdt gpio > dev/sdhci/sdhci_if.m=C2=A0=C2=A0 optional sdhci > dev/sdhci/sdhci_acpi.c=C2=A0=C2=A0 optional sdhci acpi > dev/sdhci/sdhci_pci.c=C2=A0=C2=A0=C2=A0 optional sdhci pci > > Added: head/sys/dev/sdhci/sdhci_fsl_fdt.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/sys/dev/sdhci/sdhci_fsl_fdt.c=C2=A0 Tue Sep=C2=A0 1 16:17:21 202= 0=C2=A0 (r365054) > @@ -0,0 +1,680 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2020 Alstom Group. > + * Copyright (c) 2020 Semihalf. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + *=C2=A0=C2=A0=C2=A0 notice, this list of conditions and the following d= isclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + *=C2=A0=C2=A0=C2=A0 notice, this list of conditions and the following d= isclaimer in the > + *=C2=A0=C2=A0=C2=A0 documentation and/or other materials provided with = the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AN= D > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PU= RPOSE > + * ARE DISCLAIMED.=C2=A0 IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE= LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUE= NTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOO= DS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, S= TRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY= WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O= F > + * SUCH DAMAGE. > + */ > + > +/* eSDHC controller driver for NXP QorIQ Layerscape SoCs. */ > + > +#include > +__FBSDID("$FreeBSD$"); > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "mmcbr_if.h" > +#include "sdhci_if.h" > + > +#define=C2=A0 RD4 (sc->read) > +#define=C2=A0 WR4 (sc->write) > + > +#define=C2=A0 SDHCI_FSL_PRES_STATE=C2=A0=C2=A0=C2=A0 0x24 > +#define=C2=A0 SDHCI_FSL_PRES_SDSTB=C2=A0=C2=A0=C2=A0 (1 << 3) > +#define=C2=A0 SDHCI_FSL_PRES_COMPAT_MASK=C2=A0 0x000f0f07 > + > +#define=C2=A0 SDHCI_FSL_PROT_CTRL=C2=A0=C2=A0 0x28 > +#define=C2=A0 SDHCI_FSL_PROT_CTRL_WIDTH_1BIT=C2=A0 (0 << 1) > +#define=C2=A0 SDHCI_FSL_PROT_CTRL_WIDTH_4BIT=C2=A0 (1 << 1) > +#define=C2=A0 SDHCI_FSL_PROT_CTRL_WIDTH_8BIT=C2=A0 (2 << 1) > +#define=C2=A0 SDHCI_FSL_PROT_CTRL_WIDTH_MASK=C2=A0 (3 << 1) > +#define=C2=A0 SDHCI_FSL_PROT_CTRL_BYTE_SWAP (0 << 4) > +#define=C2=A0 SDHCI_FSL_PROT_CTRL_BYTE_NATIVE (2 << 4) > +#define=C2=A0 SDHCI_FSL_PROT_CTRL_BYTE_MASK (3 << 4) > +#define=C2=A0 SDHCI_FSL_PROT_CTRL_DMA_MASK=C2=A0 (3 << 8) > + > +#define=C2=A0 SDHCI_FSL_SYS_CTRL=C2=A0=C2=A0=C2=A0 0x2c > +#define=C2=A0 SDHCI_FSL_CLK_IPGEN=C2=A0=C2=A0 (1 << 0) > +#define=C2=A0 SDHCI_FSL_CLK_SDCLKEN=C2=A0=C2=A0 (1 << 3) > +#define=C2=A0 SDHCI_FSL_CLK_DIVIDER_MASK=C2=A0 0x000000f0 > +#define=C2=A0 SDHCI_FSL_CLK_DIVIDER_SHIFT 4 > +#define=C2=A0 SDHCI_FSL_CLK_PRESCALE_MASK 0x0000ff00 > +#define=C2=A0 SDHCI_FSL_CLK_PRESCALE_SHIFT=C2=A0 8 > + > +#define=C2=A0 SDHCI_FSL_WTMK_LVL=C2=A0=C2=A0=C2=A0 0x44 > +#define=C2=A0 SDHCI_FSL_WTMK_RD_512B=C2=A0=C2=A0=C2=A0 (0 << 0) > +#define=C2=A0 SDHCI_FSL_WTMK_WR_512B=C2=A0=C2=A0=C2=A0 (0 << 15) > + > +#define=C2=A0 SDHCI_FSL_HOST_VERSION=C2=A0=C2=A0=C2=A0 0xfc > +#define=C2=A0 SDHCI_FSL_CAPABILITIES2=C2=A0=C2=A0 0x114 > + > +#define=C2=A0 SDHCI_FSL_ESDHC_CTRL=C2=A0=C2=A0=C2=A0 0x40c > +#define=C2=A0 SDHCI_FSL_ESDHC_CTRL_SNOOP=C2=A0 (1 << 6) > +#define=C2=A0 SDHCI_FSL_ESDHC_CTRL_CLK_DIV2 (1 << 19) > + > +struct sdhci_fsl_fdt_softc { > + device_t=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 dev; > + const struct sdhci_fsl_fdt_soc_data *soc_data; > + struct resource=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *mem_res; > + struct resource=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *irq_res; > + void=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *irq_cookie; > + uint32_t=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 baseclk_hz; > + struct sdhci_fdt_gpio=C2=A0=C2=A0=C2=A0=C2=A0 *gpio; > + struct sdhci_slot=C2=A0=C2=A0=C2=A0=C2=A0 slot; > + bool=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 slot_init_do= ne; > + uint32_t=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cmd_and_mode; > + uint16_t=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sdclk_bits; > + > + uint32_t (* read)(struct sdhci_fsl_fdt_softc *, bus_size_t); > + void (* write)(struct sdhci_fsl_fdt_softc *, bus_size_t, uint32_t); > +}; > + > +struct sdhci_fsl_fdt_soc_data { > + int quirks; > +}; > + > +static const struct sdhci_fsl_fdt_soc_data sdhci_fsl_fdt_ls1046a_soc_dat= a =3D { > + .quirks =3D SDHCI_QUIRK_DONT_SET_HISPD_BIT | SDHCI_QUIRK_BROKEN_AUTO_ST= OP > +}; > + > +static const struct sdhci_fsl_fdt_soc_data sdhci_fsl_fdt_gen_data =3D { > + .quirks =3D 0, > +}; > + > +static const struct ofw_compat_data sdhci_fsl_fdt_compat_data[] =3D { > + {"fsl,ls1046a-esdhc", (uintptr_t)&sdhci_fsl_fdt_ls1046a_soc_data}, > + {"fsl,esdhc",=C2=A0=C2=A0 (uintptr_t)&sdhci_fsl_fdt_gen_data}, > + {NULL,=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0} > +}; The existing driver is compatible with fsl,esdhc.=C2=A0 How are you prevent= ing collisions? Why couldn't you make these changes to the existing driver?=C2=A0 I see som= e improvements in this one that would be nice to have in the other driver. - Justin From owner-svn-src-all@freebsd.org Tue Sep 1 21:31:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 82A0437A21E; Tue, 1 Sep 2020 21:31:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0cw2x9Fz4LqT; Tue, 1 Sep 2020 21:31:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2EB791FFD2; Tue, 1 Sep 2020 21:31:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LVSOs029783; Tue, 1 Sep 2020 21:31:28 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LVQPC029777; Tue, 1 Sep 2020 21:31:26 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012131.081LVQPC029777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:31:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365091 - in head/sys/dev/virtio: . balloon block console network scsi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/virtio: . balloon block console network scsi X-SVN-Commit-Revision: 365091 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:31:28 -0000 Author: mjg Date: Tue Sep 1 21:31:26 2020 New Revision: 365091 URL: https://svnweb.freebsd.org/changeset/base/365091 Log: virtio: clean up empty lines in .c and .h files Modified: head/sys/dev/virtio/balloon/virtio_balloon.c head/sys/dev/virtio/block/virtio_blk.c head/sys/dev/virtio/console/virtio_console.c head/sys/dev/virtio/network/if_vtnet.c head/sys/dev/virtio/scsi/virtio_scsi.c head/sys/dev/virtio/virtio.c Modified: head/sys/dev/virtio/balloon/virtio_balloon.c ============================================================================== --- head/sys/dev/virtio/balloon/virtio_balloon.c Tue Sep 1 21:30:22 2020 (r365090) +++ head/sys/dev/virtio/balloon/virtio_balloon.c Tue Sep 1 21:31:26 2020 (r365091) @@ -80,7 +80,6 @@ struct vtballoon_softc { static struct virtio_feature_desc vtballoon_feature_desc[] = { { VIRTIO_BALLOON_F_MUST_TELL_HOST, "MustTellHost" }, { VIRTIO_BALLOON_F_STATS_VQ, "StatsVq" }, - { 0, NULL } }; Modified: head/sys/dev/virtio/block/virtio_blk.c ============================================================================== --- head/sys/dev/virtio/block/virtio_blk.c Tue Sep 1 21:30:22 2020 (r365090) +++ head/sys/dev/virtio/block/virtio_blk.c Tue Sep 1 21:31:26 2020 (r365091) @@ -114,7 +114,6 @@ static struct virtio_feature_desc vtblk_feature_desc[] { VIRTIO_BLK_F_TOPOLOGY, "Topology" }, { VIRTIO_BLK_F_CONFIG_WCE, "ConfigWCE" }, { VIRTIO_BLK_F_DISCARD, "Discard" }, - { 0, NULL } }; Modified: head/sys/dev/virtio/console/virtio_console.c ============================================================================== --- head/sys/dev/virtio/console/virtio_console.c Tue Sep 1 21:30:22 2020 (r365090) +++ head/sys/dev/virtio/console/virtio_console.c Tue Sep 1 21:31:26 2020 (r365091) @@ -146,7 +146,6 @@ static struct virtio_feature_desc vtcon_feature_desc[] { VIRTIO_CONSOLE_F_SIZE, "ConsoleSize" }, { VIRTIO_CONSOLE_F_MULTIPORT, "MultiplePorts" }, { VIRTIO_CONSOLE_F_EMERG_WRITE, "EmergencyWrite" }, - { 0, NULL } }; @@ -511,7 +510,6 @@ vtcon_alloc_virtqueues(struct vtcon_softc *sc) return (ENOMEM); for (i = 0, idx = 0, portidx = 0; i < nvqs / 2; i++, idx += 2) { - if (i == 1) { /* The control virtqueues are after the first port. */ VQ_ALLOC_INFO_INIT(&info[idx], 0, Modified: head/sys/dev/virtio/network/if_vtnet.c ============================================================================== --- head/sys/dev/virtio/network/if_vtnet.c Tue Sep 1 21:30:22 2020 (r365090) +++ head/sys/dev/virtio/network/if_vtnet.c Tue Sep 1 21:31:26 2020 (r365091) @@ -287,7 +287,6 @@ static struct virtio_feature_desc vtnet_feature_desc[] { VIRTIO_NET_F_GUEST_ANNOUNCE, "GuestAnnounce" }, { VIRTIO_NET_F_MQ, "Multiqueue" }, { VIRTIO_NET_F_CTRL_MAC_ADDR, "SetMacAddress" }, - { 0, NULL } }; Modified: head/sys/dev/virtio/scsi/virtio_scsi.c ============================================================================== --- head/sys/dev/virtio/scsi/virtio_scsi.c Tue Sep 1 21:30:22 2020 (r365090) +++ head/sys/dev/virtio/scsi/virtio_scsi.c Tue Sep 1 21:31:26 2020 (r365091) @@ -206,7 +206,6 @@ TUNABLE_INT("hw.vtscsi.bus_reset_disable", &vtscsi_bus static struct virtio_feature_desc vtscsi_feature_desc[] = { { VIRTIO_SCSI_F_INOUT, "InOut" }, { VIRTIO_SCSI_F_HOTPLUG, "Hotplug" }, - { 0, NULL } }; Modified: head/sys/dev/virtio/virtio.c ============================================================================== --- head/sys/dev/virtio/virtio.c Tue Sep 1 21:30:22 2020 (r365090) +++ head/sys/dev/virtio/virtio.c Tue Sep 1 21:31:26 2020 (r365091) @@ -69,7 +69,6 @@ static struct virtio_ident { { VIRTIO_ID_INPUT, "Input" }, { VIRTIO_ID_VSOCK, "VSOCK Transport" }, { VIRTIO_ID_CRYPTO, "Crypto" }, - { 0, NULL } }; @@ -80,7 +79,6 @@ static struct virtio_feature_desc virtio_common_featur { VIRTIO_RING_F_EVENT_IDX, "EventIdx" }, { VIRTIO_F_BAD_FEATURE, "BadFeature" }, { VIRTIO_F_VERSION_1, "Version1" }, - { 0, NULL } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:31:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B536B379F9A; Tue, 1 Sep 2020 21:31:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0d84nPKz4LtR; Tue, 1 Sep 2020 21:31:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F8451FDF6; Tue, 1 Sep 2020 21:31:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LVeKO029849; Tue, 1 Sep 2020 21:31:40 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LVcm2029838; Tue, 1 Sep 2020 21:31:38 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012131.081LVcm2029838@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:31:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365092 - head/sys/dev/tws X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/tws X-SVN-Commit-Revision: 365092 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:31:40 -0000 Author: mjg Date: Tue Sep 1 21:31:38 2020 New Revision: 365092 URL: https://svnweb.freebsd.org/changeset/base/365092 Log: tws: clean up empty lines in .c and .h files Modified: head/sys/dev/tws/tws.c head/sys/dev/tws/tws.h head/sys/dev/tws/tws_cam.c head/sys/dev/tws/tws_hdm.c head/sys/dev/tws/tws_hdm.h head/sys/dev/tws/tws_services.c head/sys/dev/tws/tws_services.h head/sys/dev/tws/tws_user.c head/sys/dev/tws/tws_user.h Modified: head/sys/dev/tws/tws.c ============================================================================== --- head/sys/dev/tws/tws.c Tue Sep 1 21:31:26 2020 (r365091) +++ head/sys/dev/tws/tws.c Tue Sep 1 21:31:38 2020 (r365092) @@ -49,8 +49,6 @@ int tws_queue_depth = TWS_MAX_REQS; int tws_enable_msi = 0; int tws_enable_msix = 0; - - /* externs */ extern int tws_cam_attach(struct tws_softc *sc); extern void tws_cam_detach(struct tws_softc *sc); @@ -68,15 +66,12 @@ extern boolean tws_ctlr_reset(struct tws_softc *sc); extern void tws_intr(void *arg); extern int tws_use_32bit_sgls; - struct tws_request *tws_get_request(struct tws_softc *sc, u_int16_t type); int tws_init_connect(struct tws_softc *sc, u_int16_t mc); void tws_send_event(struct tws_softc *sc, u_int8_t event); uint8_t tws_get_state(struct tws_softc *sc); void tws_release_request(struct tws_request *req); - - /* Function prototypes */ static d_open_t tws_open; static d_close_t tws_close; @@ -95,7 +90,6 @@ static int tws_setup_irq(struct tws_softc *sc); int tws_setup_intr(struct tws_softc *sc, int irqs); int tws_teardown_intr(struct tws_softc *sc); - /* Character device entry points */ static struct cdevsw tws_cdevsw = { @@ -209,7 +203,6 @@ tws_attach(device_t dev) tws_send_event(sc, TWS_INIT_START); mtx_unlock(&sc->gen_lock); - #if _BYTE_ORDER == _BIG_ENDIAN TWS_TRACE(sc, "BIG endian", 0, 0); #endif @@ -233,7 +226,7 @@ tws_attach(device_t dev) bar = pci_read_config(dev, TWS_PCI_BAR1, 4); bar = bar & ~TWS_BIT2; TWS_TRACE_DEBUG(sc, "bar1 ", bar, 0); - + /* MFA base address is BAR2 register used for * push mode. Firmware will evatualy move to * pull mode during witch this needs to change @@ -455,7 +448,6 @@ tws_setup_intr(struct tws_softc *sc, int irqs) } - int tws_teardown_intr(struct tws_softc *sc) { @@ -471,7 +463,6 @@ tws_teardown_intr(struct tws_softc *sc) return(SUCCESS); } - static int tws_setup_irq(struct tws_softc *sc) { @@ -506,7 +497,6 @@ tws_setup_irq(struct tws_softc *sc) return(FAILURE); device_printf(sc->tws_dev, "Using MSI\n"); break; - } return(SUCCESS); @@ -727,7 +717,6 @@ tws_send_event(struct tws_softc *sc, u_int8_t event) mtx_assert(&sc->gen_lock, MA_OWNED); TWS_TRACE_DEBUG(sc, "received event ", 0, event); switch (event) { - case TWS_INIT_START: sc->tws_state = TWS_INIT; break; @@ -826,7 +815,6 @@ tws_resume(device_t dev) return (0); } - struct tws_request * tws_get_request(struct tws_softc *sc, u_int16_t type) { @@ -892,7 +880,6 @@ static driver_t tws_driver = { tws_methods, sizeof(struct tws_softc) }; - static devclass_t tws_devclass; Modified: head/sys/dev/tws/tws.h ============================================================================== --- head/sys/dev/tws/tws.h Tue Sep 1 21:31:26 2020 (r365091) +++ head/sys/dev/tws/tws.h Tue Sep 1 21:31:38 2020 (r365092) @@ -60,14 +60,12 @@ #include #include - #define TWS_PULL_MODE_ENABLE 1 MALLOC_DECLARE(M_TWS); /* externs */ extern int tws_queue_depth; - #define TWS_DRIVER_VERSION_STRING "10.80.00.005" #define TWS_MAX_NUM_UNITS 65 #define TWS_MAX_NUM_LUNS 32 @@ -142,7 +140,7 @@ enum tws_req_flags { TWS_DIR_NONE = 0x8, TWS_DATA_CCB = 0x10, }; - + enum tws_intrs { TWS_INTx, TWS_MSI, @@ -160,7 +158,6 @@ struct tws_ioctl_lock { u_int32_t lock; time_t timeout; }; - #define TWS_TRACE_FNAME_LEN 10 #define TWS_TRACE_FUNC_LEN 15 @@ -182,9 +179,7 @@ struct tws_circular_q { u_int8_t overflow; void * q; }; - - struct tws_stats { u_int64_t reqs_in; u_int64_t reqs_out; @@ -205,7 +200,6 @@ struct tws_init_connect_info { u_int16_t fw_on_ctlr_build; }; - /* ------------ boolean types ------------------- */ Modified: head/sys/dev/tws/tws_cam.c ============================================================================== --- head/sys/dev/tws/tws_cam.c Tue Sep 1 21:31:26 2020 (r365091) +++ head/sys/dev/tws/tws_cam.c Tue Sep 1 21:31:38 2020 (r365092) @@ -50,8 +50,6 @@ static void tws_action(struct cam_sim *sim, union ccb static void tws_poll(struct cam_sim *sim); static void tws_scsi_complete(struct tws_request *req); - - void tws_unmap_request(struct tws_softc *sc, struct tws_request *req); int32_t tws_map_request(struct tws_softc *sc, struct tws_request *req); int tws_bus_scan(struct tws_softc *sc); @@ -73,7 +71,6 @@ static void tws_scsi_err_complete(struct tws_request * static void tws_passthru_err_complete(struct tws_request *req, struct tws_command_header *hdr); - void tws_timeout(void *arg); static void tws_intr_attn_aen(struct tws_softc *sc); static void tws_intr_attn_error(struct tws_softc *sc); @@ -88,7 +85,6 @@ int tws_set_param(struct tws_softc *sc, u_int32_t tabl int tws_get_param(struct tws_softc *sc, u_int32_t table_id, u_int32_t param_id, u_int32_t param_size, void *data); - extern struct tws_request *tws_get_request(struct tws_softc *sc, u_int16_t type); extern void *tws_release_request(struct tws_request *req); @@ -126,8 +122,6 @@ extern u_int16_t tws_poll4_response(struct tws_softc * extern int tws_setup_intr(struct tws_softc *sc, int irqs); extern int tws_teardown_intr(struct tws_softc *sc); - - int tws_cam_attach(struct tws_softc *sc) { @@ -233,7 +227,6 @@ tws_action(struct cam_sim *sim, union ccb *ccb) { struct tws_softc *sc = (struct tws_softc *)cam_sim_softc(sim); - switch( ccb->ccb_h.func_code ) { case XPT_SCSI_IO: { @@ -335,7 +328,6 @@ tws_scsi_complete(struct tws_request *req) callout_stop(&req->timeout); tws_unmap_request(req->sc, req); - req->ccb_ptr->ccb_h.status = CAM_REQ_CMP; mtx_lock(&sc->sim_lock); xpt_done(req->ccb_ptr); @@ -426,7 +418,6 @@ tws_aen_complete(struct tws_request *req) sc->seq_id++; mtx_unlock(&sc->gen_lock); break; - } free(req->data, M_TWS); @@ -516,7 +507,6 @@ tws_scsi_err_complete(struct tws_request *req, struct req->cmd_pkt->cmd.pkt_a.status); if ( hdr->status_block.error == TWS_ERROR_LOGICAL_UNIT_NOT_SUPPORTED || hdr->status_block.error == TWS_ERROR_UNIT_OFFLINE ) { - if ( ccb->ccb_h.target_lun ) { TWS_TRACE_DEBUG(sc, "invalid lun error",0,0); ccb->ccb_h.status |= CAM_DEV_NOT_THERE; @@ -546,7 +536,7 @@ tws_scsi_err_complete(struct tws_request *req, struct ccb->ccb_h.status |= CAM_AUTOSNS_VALID; } ccb->csio.scsi_status = req->cmd_pkt->cmd.pkt_a.status; - + ccb->ccb_h.status &= ~CAM_SIM_QUEUED; mtx_lock(&sc->sim_lock); xpt_done(ccb); @@ -604,7 +594,6 @@ tws_drain_busy_queue(struct tws_softc *sc) } } - static void tws_drain_reserved_reqs(struct tws_softc *sc) { @@ -645,7 +634,6 @@ tws_drain_response_queue(struct tws_softc *sc) while ( tws_get_response(sc, &req_id, &mfa) ); } - static int32_t tws_execute_scsi(struct tws_softc *sc, union ccb *ccb) { @@ -744,7 +732,6 @@ tws_execute_scsi(struct tws_softc *sc, union ccb *ccb) return(error); } - int tws_send_scsi_cmd(struct tws_softc *sc, int cmd) { @@ -842,7 +829,6 @@ tws_get_param(struct tws_softc *sc, u_int32_t table_id u_int64_t mfa; int error = SUCCESS; - req = tws_get_request(sc, TWS_REQ_TYPE_GETSET_PARAM); if ( req == NULL ) { TWS_TRACE_DEBUG(sc, "null req", 0, 0); @@ -912,7 +898,6 @@ tws_map_request(struct tws_softc *sc, struct tws_reque { int32_t error = 0; - /* If the command involves data, map that too. */ if (req->data != NULL) { int my_flags = ((req->type == TWS_REQ_TYPE_SCSI_IO) ? BUS_DMA_WAITOK : BUS_DMA_NOWAIT); @@ -944,7 +929,6 @@ tws_map_request(struct tws_softc *sc, struct tws_reque return(error); } - static void tws_dmamap_data_load_cbfn(void *arg, bus_dma_segment_t *segs, int nseg, int error) @@ -955,7 +939,6 @@ tws_dmamap_data_load_cbfn(void *arg, bus_dma_segment_t void *sgl_ptr; struct tws_cmd_generic *gcmd; - if ( error ) { TWS_TRACE(sc, "SOMETHING BAD HAPPENED! error = %d\n", error, 0); } @@ -991,12 +974,10 @@ tws_dmamap_data_load_cbfn(void *arg, bus_dma_segment_t } } - req->error_code = tws_submit_command(req->sc, req); } - static void tws_fill_sg_list(struct tws_softc *sc, void *sgl_src, void *sgl_dest, u_int16_t num_sgl_entries) @@ -1037,7 +1018,6 @@ tws_fill_sg_list(struct tws_softc *sc, void *sgl_src, if ( num_sgl_entries > TWS_MAX_32BIT_SG_ELEMENTS ) TWS_TRACE(sc, "32bit sg overflow", num_sgl_entries, 0); - for (i = 0; i < num_sgl_entries; i++) { sgl_d[i].address = sgl_s[i].address; sgl_d[i].length = sgl_s[i].length; @@ -1045,7 +1025,6 @@ tws_fill_sg_list(struct tws_softc *sc, void *sgl_src, } } } - void tws_intr(void *arg) @@ -1129,7 +1108,6 @@ tws_intr_resp(struct tws_softc *sc) } - static void tws_poll(struct cam_sim *sim) { @@ -1144,7 +1122,6 @@ tws_timeout(void *arg) struct tws_request *req = (struct tws_request *)arg; struct tws_softc *sc = req->sc; - if ( req->error_code == TWS_REQ_RET_RESET ) { return; } @@ -1253,7 +1230,6 @@ tws_reinit(void *arg) int try=2; int done=0; - // device_printf(sc->tws_dev, "Waiting for Controller Ready\n"); while ( !done && try ) { if ( tws_ctlr_ready(sc) ) { @@ -1288,7 +1264,6 @@ tws_reinit(void *arg) wakeup_one(sc); } - static void tws_freeze_simq(struct tws_softc *sc, struct tws_request *req) { @@ -1301,6 +1276,5 @@ tws_freeze_simq(struct tws_softc *sc, struct tws_reque ccb->ccb_h.status |= CAM_REQUEUE_REQ; } } - TUNABLE_INT("hw.tws.cam_depth", &tws_cam_depth); Modified: head/sys/dev/tws/tws_hdm.c ============================================================================== --- head/sys/dev/tws/tws_hdm.c Tue Sep 1 21:31:26 2020 (r365091) +++ head/sys/dev/tws/tws_hdm.c Tue Sep 1 21:31:38 2020 (r365092) @@ -36,12 +36,10 @@ * $FreeBSD$ */ - #include #include #include - int tws_use_32bit_sgls=0; extern u_int64_t mfa_base; extern struct tws_request *tws_get_request(struct tws_softc *sc, @@ -96,7 +94,6 @@ tws_init_ctlr(struct tws_softc *sc) } - while( 1 ) { regh = tws_read_reg(sc, TWS_I2O0_IOPOBQPH, 4); regl = tws_read_reg(sc, TWS_I2O0_IOPOBQPL, 4); @@ -274,7 +271,6 @@ tws_send_generic_cmd(struct tws_softc *sc, u_int8_t op } - int tws_submit_command(struct tws_softc *sc, struct tws_request *req) { @@ -319,16 +315,13 @@ tws_submit_command(struct tws_softc *sc, struct tws_re * retry later */ return(TWS_REQ_RET_PEND_NOMFA); - } #ifndef TWS_PULL_MODE_ENABLE for (int i=mfa; i<(sizeof(struct tws_command_packet)+ mfa - sizeof( struct tws_command_header)); i++) { - bus_space_write_1(sc->bus_mfa_tag, sc->bus_mfa_handle,i, ((u_int8_t *)&req->cmd_pkt->cmd)[i-mfa]); - } #endif @@ -371,7 +364,6 @@ tws_get_response(struct tws_softc *sc, u_int16_t *req_ if ( out_mfa == TWS_FIFO_EMPTY32 ) { return(false); - } out_mfa = out_mfa << 32; val = tws_read_reg(sc, TWS_I2O0_HOBQPL, 4); @@ -389,9 +381,6 @@ tws_get_response(struct tws_softc *sc, u_int16_t *req_ return(true); } - - - u_int16_t tws_poll4_response(struct tws_softc *sc, u_int64_t *mfa) { @@ -401,7 +390,6 @@ tws_poll4_response(struct tws_softc *sc, u_int64_t *mf endt = TWS_LOCAL_TIME + TWS_POLL_TIMEOUT; do { if(tws_get_response(sc, &req_id, mfa)) { - if ( req_id == TWS_INVALID_REQID ) { TWS_TRACE_DEBUG(sc, "invalid req_id", 0, req_id); return(TWS_INVALID_REQID); Modified: head/sys/dev/tws/tws_hdm.h ============================================================================== --- head/sys/dev/tws/tws_hdm.h Tue Sep 1 21:31:26 2020 (r365091) +++ head/sys/dev/tws/tws_hdm.h Tue Sep 1 21:31:38 2020 (r365092) @@ -36,7 +36,6 @@ * $FreeBSD$ */ - /* bit's defination */ #define TWS_BIT0 0x00000001 @@ -84,7 +83,6 @@ #define TWS_SRC_FREEBSD_DRIVER 5 #define TWS_SRC_FREEBSD_OS 8 - enum tws_sense_severity { error = 1, warning , @@ -101,13 +99,11 @@ enum tws_sense_severity { #define TWS_ERROR_UNIT_OFFLINE 0x0128 #define TWS_ERROR_MORE_DATA 0x0231 - /* AEN codes of interest. */ #define TWS_AEN_QUEUE_EMPTY 0x00 #define TWS_AEN_SOFT_RESET 0x01 #define TWS_AEN_SYNC_TIME_WITH_HOST 0x31 - /* AEN severity */ #define TWS_SEVERITY_ERROR 0x1 #define TWS_SEVERITY_WARNING 0x2 @@ -126,11 +122,9 @@ enum tws_sense_severity { #define TWS_CURRENT_FW_BUILD 4 #define TWS_CURRENT_ARCH_ID 0x000A - #define TWS_FIFO_EMPTY 0xFFFFFFFFFFFFFFFFull #define TWS_FIFO_EMPTY32 0xFFFFFFFFull - /* Register offsets from base address. */ #define TWS_CONTROL_REGISTER_OFFSET 0x0 #define TWS_STATUS_REGISTER_OFFSET 0x4 @@ -180,7 +174,6 @@ enum tws_sense_severity { #define TWS_FW_CMD_GET_PARAM 0x12 #define TWS_FW_CMD_SET_PARAM 0x13 - #define BUILD_SGL_OFF__OPCODE(sgl_off, opcode) \ ((sgl_off << 5) & 0xE0) | (opcode & 0x1F) /* 3:5 */ @@ -190,11 +183,8 @@ enum tws_sense_severity { #define GET_OPCODE(sgl_off__opcode) \ (sgl_off__opcode & 0x1F) /* 3:5 */ - - /* end revisit */ - /* Table #'s and id's of parameters of interest in firmware's param table. */ #define TWS_PARAM_VERSION_TABLE 0x0402 #define TWS_PARAM_VERSION_FW 3 /* firmware version [16] */ @@ -212,10 +202,8 @@ enum tws_sense_severity { #define TWS_9K_PARAM_DESCRIPTOR 0x8000 - /* ----------- request ------------- */ - #pragma pack(1) struct tws_cmd_init_connect { @@ -258,7 +246,6 @@ struct tws_cmd_reset_firmware { u_int8_t param; }; - /* Structure for sending get/set param commands. */ struct tws_cmd_param { u_int8_t sgl_off__opcode;/* 3:5 */ @@ -282,9 +269,6 @@ struct tws_cmd_generic { u_int16_t count; /* block cnt, parameter cnt, message credits */ }; - - - /* Command packet header. */ struct tws_command_header { u_int8_t sense_data[TWS_SENSE_DATA_LENGTH]; @@ -354,7 +338,6 @@ struct tws_outbound_response { u_int32_t request_id:16; /* request id */ }; - /* Scatter/Gather list entry with 32 bit addresses. */ struct tws_sg_desc32 { u_int32_t address; @@ -387,8 +370,6 @@ struct tws_event_packet { u_int8_t severity_str[20]; }; - - #pragma pack() struct tws_sense { @@ -418,5 +399,3 @@ struct tws_request { struct tws_request *next; /* pointer to next request */ struct tws_request *prev; /* pointer to prev request */ }; - - Modified: head/sys/dev/tws/tws_services.c ============================================================================== --- head/sys/dev/tws/tws_services.c Tue Sep 1 21:31:26 2020 (r365091) +++ head/sys/dev/tws/tws_services.c Tue Sep 1 21:31:38 2020 (r365092) @@ -53,8 +53,6 @@ void tws_print_stats(void *arg); struct tws_sense *tws_find_sense_from_mfa(struct tws_softc *sc, u_int64_t mfa); - - static struct error_desc array[] = { { "Cannot add sysctl tree node", 0x2000, ERROR, "%s: (0x%02X: 0x%04X): %s:\n", "ERROR" }, @@ -89,7 +87,6 @@ tws_trace(const char *file, const char *fun, int linen struct tws_softc *sc, char *desc, u_int64_t val1, u_int64_t val2) { - struct tws_trace_rec *rec = (struct tws_trace_rec *)sc->trace_q.q; volatile u_int16_t head, tail; char fmt[256]; @@ -142,7 +139,6 @@ tws_log(struct tws_softc *sc, int index) /* ----------- swap functions ----------- */ - u_int16_t tws_swap16(u_int16_t val) { @@ -156,7 +152,6 @@ tws_swap32(u_int32_t val) ((val >> 8) & (0xFF00)) | (val >> 24))); } - u_int64_t tws_swap64(u_int64_t val) { @@ -164,10 +159,8 @@ tws_swap64(u_int64_t val) ((u_int32_t)(tws_swap32(((u_int32_t *)(&(val)))[0])))); } - /* ----------- reg access ----------- */ - void tws_write_reg(struct tws_softc *sc, int offset, u_int32_t value, int size) @@ -331,7 +324,6 @@ tws_q_remove_request(struct tws_softc *sc, struct tws_ if ( req == sc->q_tail[q_type] ) return(tws_q_remove_tail(sc, q_type)); - /* The given node is not at head or tail. * It's in the middle and there are more than * 2 elements on the q. @@ -384,7 +376,6 @@ tws_find_sense_from_mfa(struct tws_softc *sc, u_int64_ /* --------------------- Q service end --------------------- */ /* --------------------- misc service start --------------------- */ - void tws_print_stats(void *arg) Modified: head/sys/dev/tws/tws_services.h ============================================================================== --- head/sys/dev/tws/tws_services.h Tue Sep 1 21:31:26 2020 (r365091) +++ head/sys/dev/tws/tws_services.h Tue Sep 1 21:31:38 2020 (r365092) @@ -36,7 +36,6 @@ * $FreeBSD$ */ - /* #define TWS_DEBUG on */ void tws_trace(const char *file, const char *fun, int linenum, @@ -53,8 +52,6 @@ u_int64_t tws_swap64(u_int64_t val); void tws_init_qs(struct tws_softc *sc); - - /* ----------------- trace ----------------- */ #define TWS_TRACE_ON on /* Alawys on - use wisely to trace errors */ @@ -81,7 +78,6 @@ void tws_init_qs(struct tws_softc *sc); /* ---------------- logging ---------------- */ - /* ---------------- logging ---------------- */ enum error_index { SYSCTL_TREE_NODE_ADD, @@ -128,7 +124,6 @@ struct error_desc { #define TWS_REQ_RET_PEND_NOMFA 1 #define TWS_REQ_RET_RESET 2 #define TWS_REQ_RET_INVALID 0xdead - /* ------------------------ */ #include Modified: head/sys/dev/tws/tws_user.c ============================================================================== --- head/sys/dev/tws/tws_user.c Tue Sep 1 21:31:26 2020 (r365091) +++ head/sys/dev/tws/tws_user.c Tue Sep 1 21:31:38 2020 (r365092) @@ -41,14 +41,12 @@ #include #include - int tws_ioctl(struct cdev *dev, long unsigned int cmd, caddr_t buf, int flags, struct thread *td); void tws_passthru_complete(struct tws_request *req); extern void tws_circular_aenq_insert(struct tws_softc *sc, struct tws_circular_q *cq, struct tws_event_packet *aen); - static int tws_passthru(struct tws_softc *sc, void *buf); static int tws_ioctl_aen(struct tws_softc *sc, u_long cmd, void *buf); @@ -81,7 +79,6 @@ tws_ioctl(struct cdev *dev, u_long cmd, caddr_t buf, i TWS_TRACE_DEBUG(sc, "ioctl-aen", cmd, buf); error = tws_ioctl_aen(sc, cmd, (void *)buf); break; - } return(error); } @@ -327,7 +324,6 @@ tws_ioctl_aen(struct tws_softc *sc, u_long cmd, void * lpkt.time_remaining_msec = (u_int32_t) ((sc->ioctl_lock.timeout - ctime) * 1000); ubuf->driver_pkt.status = TWS_IOCTL_LOCK_ALREADY_HELD; - } break; case TWS_IOCTL_RELEASE_LOCK : @@ -366,7 +362,6 @@ tws_ioctl_aen(struct tws_softc *sc, u_long cmd, void * TWS_TRACE_DEBUG(sc, "not valid cmd", cmd, TWS_IOCTL_GET_COMPATIBILITY_INFO); break; - } mtx_unlock(&sc->gen_lock); return(SUCCESS); Modified: head/sys/dev/tws/tws_user.h ============================================================================== --- head/sys/dev/tws/tws_user.h Tue Sep 1 21:31:26 2020 (r365091) +++ head/sys/dev/tws/tws_user.h Tue Sep 1 21:31:38 2020 (r365092) @@ -76,7 +76,6 @@ struct tws_compatibility_packet { u_int16_t fw_on_ctlr_build;/* build # of running firmware */ }; - /* Driver understandable part of the ioctl packet built by the API. */ struct tws_driver_packet { u_int32_t control_code; @@ -97,7 +96,6 @@ struct tws_ioctl_packet { #pragma pack() - #pragma pack(1) /* * We need the structure below to ensure that the first byte of @@ -116,7 +114,6 @@ struct tws_ioctl_no_data_buf { #pragma pack() - #include #pragma pack(1) @@ -155,4 +152,3 @@ struct tws_ioctl_with_payload { _IOWR('T', 208, struct tws_ioctl_with_payload) #define TWS_IOCTL_GET_COMPATIBILITY_INFO \ _IOWR('T', 209, struct tws_ioctl_with_payload) - From owner-svn-src-all@freebsd.org Tue Sep 1 21:31:53 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5157837A4AF; Tue, 1 Sep 2020 21:31:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0dN5nfLz4MJq; Tue, 1 Sep 2020 21:31:52 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 630401FEA9; Tue, 1 Sep 2020 21:31:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LVp6l029906; Tue, 1 Sep 2020 21:31:51 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LVodt029898; Tue, 1 Sep 2020 21:31:50 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012131.081LVodt029898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:31:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365093 - head/sys/dev/twe X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/twe X-SVN-Commit-Revision: 365093 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:31:53 -0000 Author: mjg Date: Tue Sep 1 21:31:50 2020 New Revision: 365093 URL: https://svnweb.freebsd.org/changeset/base/365093 Log: twe: clean up empty lines in .c and .h files Modified: head/sys/dev/twe/twe.c head/sys/dev/twe/twe_freebsd.c head/sys/dev/twe/tweio.h head/sys/dev/twe/twereg.h head/sys/dev/twe/twevar.h Modified: head/sys/dev/twe/twe.c ============================================================================== --- head/sys/dev/twe/twe.c Tue Sep 1 21:31:38 2020 (r365092) +++ head/sys/dev/twe/twe.c Tue Sep 1 21:31:50 2020 (r365093) @@ -184,10 +184,9 @@ twe_setup(struct twe_softc *sc) * check for errors, drain the response queue. */ for (i = 0; i < TWE_MAX_RESET_TRIES; i++) { - if (i > 0) twe_printf(sc, "reset %d failed, trying again\n", i); - + if (!twe_soft_reset(sc)) break; /* reset process complete */ } @@ -413,7 +412,6 @@ twe_startio(struct twe_softc *sc) /* spin until something prevents us from doing any work */ for (;;) { - /* try to get a command that's already ready to go */ tr = twe_dequeue_ready(sc); @@ -447,18 +445,18 @@ twe_startio(struct twe_softc *sc) biofinish(bp, NULL, EOPNOTSUPP); break; } - + /* build a suitable I/O command (assumes 512-byte rounded transfers) */ cmd->io.size = 3; cmd->io.unit = *(int *)(bp->bio_driver1); cmd->io.block_count = (tr->tr_length + TWE_BLOCK_SIZE - 1) / TWE_BLOCK_SIZE; cmd->io.lba = bp->bio_pblkno; } - + /* did we find something to do? */ if (tr == NULL) break; - + /* try to map and submit the command to controller */ error = twe_map_request(tr); @@ -578,7 +576,7 @@ twe_ioctl(struct twe_softc *sc, u_long ioctlcmd, void /* copy the command out again */ bcopy(cmd, &tu->tu_command, sizeof(TWE_Command)); - + /* if there was a data buffer, copy it out */ if (tr->tr_length > 0) error = copyout(tr->tr_data, tu->tu_data, tu->tu_size); @@ -1024,7 +1022,6 @@ twe_completeio(struct twe_request *tr) debug_called(4); if (tr->tr_status == TWE_CMD_COMPLETE) { - if (cmd->generic.status) if (twe_report_request(tr)) { bp->bio_error = EIO; @@ -1065,10 +1062,9 @@ twe_reset(struct twe_softc *sc) * Try to soft-reset the controller. */ for (i = 0; i < TWE_MAX_RESET_TRIES; i++) { - if (i > 0) twe_printf(sc, "reset %d failed, trying again\n", i); - + if (!twe_soft_reset(sc)) break; /* reset process complete */ } @@ -1132,7 +1128,6 @@ twe_start(struct twe_request *tr) * and let the command be rescheduled. */ for (i = 100000; (i > 0); i--) { - /* check to see if we can post a command */ status_reg = TWE_STATUS(sc); twe_check_bits(sc, status_reg); @@ -1541,7 +1536,6 @@ twe_find_aen(struct twe_softc *sc, u_int16_t aen) return(missing); } - #if 0 /* currently unused */ /******************************************************************************** * Sleep waiting for at least (timeout) seconds until we see (aen) as @@ -1809,7 +1803,6 @@ twe_format_aen(struct twe_softc *sc, u_int16_t aen) TWE_AEN_UNIT(aen), msg); return(sc->twe_aen_buf); - case 'x': default: break; Modified: head/sys/dev/twe/twe_freebsd.c ============================================================================== --- head/sys/dev/twe/twe_freebsd.c Tue Sep 1 21:31:38 2020 (r365092) +++ head/sys/dev/twe/twe_freebsd.c Tue Sep 1 21:31:50 2020 (r365093) @@ -709,7 +709,7 @@ twed_open(struct disk *dp) struct twed_softc *sc = (struct twed_softc *)dp->d_drv1; debug_called(4); - + if (sc == NULL) return (ENXIO); @@ -1065,7 +1065,6 @@ twe_map_request(struct twe_request *tr) * If the command involves data, map that too. */ if (tr->tr_data != NULL && ((tr->tr_flags & TWE_CMD_MAPPED) == 0)) { - /* * Data must be 64-byte aligned; allocate a fixup buffer if it's not. */ @@ -1079,7 +1078,7 @@ twe_map_request(struct twe_request *tr) return(ENOMEM); } } - + /* * Map the data buffer into bus space and build the s/g list. */ Modified: head/sys/dev/twe/tweio.h ============================================================================== --- head/sys/dev/twe/tweio.h Tue Sep 1 21:31:38 2020 (r365092) +++ head/sys/dev/twe/tweio.h Tue Sep 1 21:31:50 2020 (r365093) @@ -31,7 +31,6 @@ * $FreeBSD$ */ - /* * User-space command * Modified: head/sys/dev/twe/twereg.h ============================================================================== --- head/sys/dev/twe/twereg.h Tue Sep 1 21:31:38 2020 (r365092) +++ head/sys/dev/twe/twereg.h Tue Sep 1 21:31:50 2020 (r365093) @@ -494,4 +494,3 @@ typedef struct u_int8_t parameter_size_bytes; u_int8_t data[0]; } __packed TWE_Param; - Modified: head/sys/dev/twe/twevar.h ============================================================================== --- head/sys/dev/twe/twevar.h Tue Sep 1 21:31:38 2020 (r365092) +++ head/sys/dev/twe/twevar.h Tue Sep 1 21:31:50 2020 (r365093) @@ -108,7 +108,7 @@ struct twe_request ((tr)->tr_tag * sizeof(TWE_Command))) #define TWE_FIND_COMMANDPHYS(tr) ((tr)->tr_sc->twe_cmdphys + \ ((tr)->tr_tag * sizeof(TWE_Command))) - + /* * Per-controller state. */ @@ -201,7 +201,6 @@ extern void twe_unmap_request(struct twe_request *tr); sc->twe_qstat[qname].q_max = 0; \ sc->twe_qstat[qname].q_min = 0xFFFFFFFF; \ } while(0) - #define TWEQ_REQUEST_QUEUE(name, index) \ static __inline void \ From owner-svn-src-all@freebsd.org Tue Sep 1 21:32:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3570A37A55C; Tue, 1 Sep 2020 21:32:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0dj0jySz4MNZ; Tue, 1 Sep 2020 21:32:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F120920081; Tue, 1 Sep 2020 21:32:08 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LW8xW031493; Tue, 1 Sep 2020 21:32:08 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LW7ax031488; Tue, 1 Sep 2020 21:32:07 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012132.081LW7ax031488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:32:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365094 - head/sys/dev/aac X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/aac X-SVN-Commit-Revision: 365094 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:32:09 -0000 Author: mjg Date: Tue Sep 1 21:32:07 2020 New Revision: 365094 URL: https://svnweb.freebsd.org/changeset/base/365094 Log: aac: clean up empty lines in .c and .h files Modified: head/sys/dev/aac/aac.c head/sys/dev/aac/aac_cam.c head/sys/dev/aac/aac_debug.c head/sys/dev/aac/aac_disk.c head/sys/dev/aac/aacreg.h Modified: head/sys/dev/aac/aac.c ============================================================================== --- head/sys/dev/aac/aac.c Tue Sep 1 21:31:50 2020 (r365093) +++ head/sys/dev/aac/aac.c Tue Sep 1 21:32:07 2020 (r365094) @@ -1029,7 +1029,6 @@ aac_command_thread(struct aac_softc *sc) sc->aifflags = AAC_AIFFLAGS_RUNNING; while ((sc->aifflags & AAC_AIFFLAGS_EXIT) == 0) { - retval = 0; if ((sc->aifflags & AAC_AIFFLAGS_PENDING) == 0) retval = msleep(sc->aifthread, &sc->aac_io_lock, PRIBIO, @@ -1533,7 +1532,6 @@ aac_free_commands(struct aac_softc *sc) fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); while ((fm = TAILQ_FIRST(&sc->aac_fibmap_tqh)) != NULL) { - TAILQ_REMOVE(&sc->aac_fibmap_tqh, fm, fm_link); /* * We check against total_fibs to handle partially Modified: head/sys/dev/aac/aac_cam.c ============================================================================== --- head/sys/dev/aac/aac_cam.c Tue Sep 1 21:31:50 2020 (r365093) +++ head/sys/dev/aac/aac_cam.c Tue Sep 1 21:32:07 2020 (r365094) @@ -144,7 +144,6 @@ aac_cam_rescan(struct aac_softc *sc, uint32_t channel, } } - static void aac_cam_event(struct aac_softc *sc, struct aac_event *event, void *arg) { Modified: head/sys/dev/aac/aac_debug.c ============================================================================== --- head/sys/dev/aac/aac_debug.c Tue Sep 1 21:31:50 2020 (r365093) +++ head/sys/dev/aac/aac_debug.c Tue Sep 1 21:32:07 2020 (r365094) @@ -392,7 +392,7 @@ aac_print_aif(struct aac_softc *sc, struct aac_aif_com default: status = "unknown status"; break; } - + device_printf(sc->aac_dev, "JobProgress (%d) - %s (%d, %d)\n", aif->seqNumber, status, aif->data.PR[0].currentTick, Modified: head/sys/dev/aac/aac_disk.c ============================================================================== --- head/sys/dev/aac/aac_disk.c Tue Sep 1 21:31:50 2020 (r365093) +++ head/sys/dev/aac/aac_disk.c Tue Sep 1 21:32:07 2020 (r365094) @@ -100,7 +100,7 @@ aac_disk_open(struct disk *dp) fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); sc = (struct aac_disk *)dp->d_drv1; - + if (sc == NULL) { printf("aac_disk_open: No Softc\n"); return (ENXIO); @@ -129,7 +129,7 @@ aac_disk_close(struct disk *dp) fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); sc = (struct aac_disk *)dp->d_drv1; - + if (sc == NULL) return (ENXIO); @@ -366,7 +366,7 @@ static int aac_disk_attach(device_t dev) { struct aac_disk *sc; - + sc = (struct aac_disk *)device_get_softc(dev); fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); Modified: head/sys/dev/aac/aacreg.h ============================================================================== --- head/sys/dev/aac/aacreg.h Tue Sep 1 21:31:50 2020 (r365093) +++ head/sys/dev/aac/aacreg.h Tue Sep 1 21:32:07 2020 (r365094) @@ -1563,4 +1563,3 @@ enum { AAC_DB_RESPONSE_READY | \ AAC_DB_PRINTF) #define AAC_DB_INT_NEW_COMM 0x08 - From owner-svn-src-all@freebsd.org Tue Sep 1 21:32:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 21EAE37A268; Tue, 1 Sep 2020 21:32:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0f30913z4MRg; Tue, 1 Sep 2020 21:32:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DBB4A1FF58; Tue, 1 Sep 2020 21:32:26 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LWQ4d031553; Tue, 1 Sep 2020 21:32:26 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LWQMY031549; Tue, 1 Sep 2020 21:32:26 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012132.081LWQMY031549@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:32:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365095 - head/sys/dev/aacraid X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/aacraid X-SVN-Commit-Revision: 365095 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:32:27 -0000 Author: mjg Date: Tue Sep 1 21:32:25 2020 New Revision: 365095 URL: https://svnweb.freebsd.org/changeset/base/365095 Log: aacraid: clean up empty lines in .c and .h files Modified: head/sys/dev/aacraid/aacraid.c head/sys/dev/aacraid/aacraid_debug.c head/sys/dev/aacraid/aacraid_endian.h head/sys/dev/aacraid/aacraid_reg.h head/sys/dev/aacraid/aacraid_var.h Modified: head/sys/dev/aacraid/aacraid.c ============================================================================== --- head/sys/dev/aacraid/aacraid.c Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid.c Tue Sep 1 21:32:25 2020 (r365095) @@ -1023,7 +1023,6 @@ aac_command_thread(struct aac_softc *sc) sc->aifflags = AAC_AIFFLAGS_RUNNING; while ((sc->aifflags & AAC_AIFFLAGS_EXIT) == 0) { - retval = 0; if ((sc->aifflags & AAC_AIFFLAGS_PENDING) == 0) retval = msleep(sc->aifthread, &sc->aac_io_lock, PRIBIO, @@ -1267,7 +1266,6 @@ aac_free_commands(struct aac_softc *sc) fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); while ((fm = TAILQ_FIRST(&sc->aac_fibmap_tqh)) != NULL) { - TAILQ_REMOVE(&sc->aac_fibmap_tqh, fm, fm_link); /* * We check against total_fibs to handle partially @@ -1451,7 +1449,6 @@ aacraid_map_command_sg(void *arg, bus_dma_segment_t *s } } - static int aac_convert_sgraw2(struct aac_softc *sc, struct aac_raw_io2 *raw, int pages, int nseg, int nseg_new) @@ -1488,7 +1485,6 @@ aac_convert_sgraw2(struct aac_softc *sc, struct aac_ra return nseg_new; } - /* * Unmap a command from controller-visible space. */ @@ -1851,7 +1847,7 @@ aac_define_int_mode(struct aac_softc *sc) device_t dev; int cap, msi_count, error = 0; uint32_t val; - + dev = sc->aac_dev; if (sc->flags & AAC_FLAGS_SYNC_MODE) { @@ -2377,7 +2373,7 @@ aac_src_access_devreg(struct aac_softc *sc, int mode) AAC_MEM0_SETREG4(sc, AAC_SRC_OIMR, val & (~(PMC_GLOBAL_INT_BIT2))); break; - + default: break; } @@ -2398,7 +2394,7 @@ aac_src_send_command(struct aac_softc *sc, struct aac_ if (sc->msi_enabled && cm->cm_fib->Header.Command != AifRequest && sc->aac_max_msix > 1) { u_int16_t vector_no, first_choice = 0xffff; - + vector_no = sc->aac_fibs_pushed_no % sc->aac_max_msix; do { vector_no += 1; @@ -3102,7 +3098,6 @@ aac_request_aif(struct aac_softc *sc) aacraid_map_command_sg(cm, NULL, 0, 0); } - /* * cdevpriv interface private destructor. Modified: head/sys/dev/aacraid/aacraid_debug.c ============================================================================== --- head/sys/dev/aacraid/aacraid_debug.c Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid_debug.c Tue Sep 1 21:32:25 2020 (r365095) @@ -305,7 +305,7 @@ aacraid_print_aif(struct aac_softc *sc, struct aac_aif default: status = "unknown status"; break; } - + device_printf(sc->aac_dev, "JobProgress (%d) - %s (%d, %d)\n", aif->seqNumber, status, aif->data.PR[0].currentTick, @@ -704,7 +704,6 @@ void aacraid_fw_print_mem(struct aac_softc *sc, unsign * Bump the offset by 16 for the next line */ Offset += 16; - } /* @@ -713,4 +712,3 @@ void aacraid_fw_print_mem(struct aac_softc *sc, unsign if (sc != NULL) sc->FwDebugFlags = DebugFlags; } - Modified: head/sys/dev/aacraid/aacraid_endian.h ============================================================================== --- head/sys/dev/aacraid/aacraid_endian.h Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid_endian.h Tue Sep 1 21:32:25 2020 (r365095) @@ -71,7 +71,6 @@ #define aac_blockread64_tole(ptr) #define aac_blockwrite64_tole(ptr) - #else /* _BYTE_ORDER != _LITTLE_ENDIAN */ /* Convert from Little-Endian to host order (TOH) */ Modified: head/sys/dev/aacraid/aacraid_reg.h ============================================================================== --- head/sys/dev/aacraid/aacraid_reg.h Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid_reg.h Tue Sep 1 21:32:25 2020 (r365095) @@ -1342,7 +1342,6 @@ typedef enum { CMUNSTABLE } AAC_CommitLevel; - #define CT_FIB_PARAMS 6 #define MAX_FIB_PARAMS 10 #define CT_PACKET_SIZE \ @@ -1589,7 +1588,6 @@ enum { /* Sunrise Lake dual core reset */ #define AAC_IRCSR 0x38 /* inbound dual cores reset */ #define AAC_IRCSR_CORES_RST 3 - /* * Common bit definitions for the doorbell registers. Modified: head/sys/dev/aacraid/aacraid_var.h ============================================================================== --- head/sys/dev/aacraid/aacraid_var.h Tue Sep 1 21:32:07 2020 (r365094) +++ head/sys/dev/aacraid/aacraid_var.h Tue Sep 1 21:32:25 2020 (r365095) @@ -235,7 +235,7 @@ struct aac_common { /* buffer for text messages from the controller */ char ac_printf[AAC_PRINTF_BUFSIZE]; - + /* fib for synchronous commands */ struct aac_fib ac_sync_fib; @@ -555,7 +555,6 @@ struct aac_code_lookup { sc->aac_qstat[qname].q_length = 0; \ sc->aac_qstat[qname].q_max = 0; \ } while (0) - #define AACQ_COMMAND_QUEUE(name, index) \ static __inline void \ From owner-svn-src-all@freebsd.org Tue Sep 1 21:32:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A061C37A6A1; Tue, 1 Sep 2020 21:32:45 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0fP3khRz4Mnq; Tue, 1 Sep 2020 21:32:45 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EEB4B1FF59; Tue, 1 Sep 2020 21:32:44 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LWifK031640; Tue, 1 Sep 2020 21:32:44 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LWglh031628; Tue, 1 Sep 2020 21:32:42 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012132.081LWglh031628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:32:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365096 - in head/sys/dev/acpica: . Osd X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/acpica: . Osd X-SVN-Commit-Revision: 365096 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:32:45 -0000 Author: mjg Date: Tue Sep 1 21:32:41 2020 New Revision: 365096 URL: https://svnweb.freebsd.org/changeset/base/365096 Log: acpica: clean up empty lines in .c and .h files Modified: head/sys/dev/acpica/Osd/OsdHardware.c head/sys/dev/acpica/acpi.c head/sys/dev/acpica/acpi_acad.c head/sys/dev/acpica/acpi_cpu.c head/sys/dev/acpica/acpi_isab.c head/sys/dev/acpica/acpi_pci.c head/sys/dev/acpica/acpi_pci_link.c head/sys/dev/acpica/acpi_powerres.c head/sys/dev/acpica/acpi_smbus.h head/sys/dev/acpica/acpi_thermal.c head/sys/dev/acpica/acpi_timer.c head/sys/dev/acpica/acpivar.h Modified: head/sys/dev/acpica/Osd/OsdHardware.c ============================================================================== --- head/sys/dev/acpica/Osd/OsdHardware.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/Osd/OsdHardware.c Tue Sep 1 21:32:41 2020 (r365096) @@ -119,7 +119,6 @@ AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 #endif } - ACPI_STATUS AcpiOsWritePciConfiguration (ACPI_PCI_ID *PciId, UINT32 Register, UINT64 Value, UINT32 Width) Modified: head/sys/dev/acpica/acpi.c ============================================================================== --- head/sys/dev/acpica/acpi.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi.c Tue Sep 1 21:32:41 2020 (r365096) @@ -1709,7 +1709,7 @@ acpi_device_id_probe(device_t bus, device_t dev, char rv = acpi_MatchHid(h, ids[i]); if (rv == ACPI_MATCHHID_NOMATCH) continue; - + if (match != NULL) { *match = ids[i]; } Modified: head/sys/dev/acpica/acpi_acad.c ============================================================================== --- head/sys/dev/acpica/acpi_acad.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_acad.c Tue Sep 1 21:32:41 2020 (r365096) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - + /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_AC_ADAPTER ACPI_MODULE_NAME("AC_ADAPTER") Modified: head/sys/dev/acpica/acpi_cpu.c ============================================================================== --- head/sys/dev/acpica/acpi_cpu.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_cpu.c Tue Sep 1 21:32:41 2020 (r365096) @@ -873,7 +873,6 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *sc) acpi_PkgInt32(pkg, 1, &cx_ptr->type) != 0 || acpi_PkgInt32(pkg, 2, &cx_ptr->trans_lat) != 0 || acpi_PkgInt32(pkg, 3, &cx_ptr->power) != 0) { - device_printf(sc->cpu_dev, "skipping invalid Cx state package\n"); continue; } Modified: head/sys/dev/acpica/acpi_isab.c ============================================================================== --- head/sys/dev/acpica/acpi_isab.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_isab.c Tue Sep 1 21:32:41 2020 (r365096) @@ -92,7 +92,7 @@ acpi_isab_probe(device_t dev) { static char *isa_ids[] = { "PNP0A05", "PNP0A06", NULL }; int rv; - + if (acpi_disabled("isab") || devclass_get_device(isab_devclass, 0) != dev) return (ENXIO); Modified: head/sys/dev/acpica/acpi_pci.c ============================================================================== --- head/sys/dev/acpica/acpi_pci.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_pci.c Tue Sep 1 21:32:41 2020 (r365096) @@ -424,7 +424,7 @@ acpi_pci_attach(device_t dev) acpi_pci_bus_notify_handler, dev); AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1, acpi_pci_install_device_notify_handler, NULL, dev, NULL); - + return (0); } @@ -479,4 +479,3 @@ acpi_pci_get_dma_tag(device_t bus, device_t child) return (pci_get_dma_tag(bus, child)); } #endif - Modified: head/sys/dev/acpica/acpi_pci_link.c ============================================================================== --- head/sys/dev/acpica/acpi_pci_link.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_pci_link.c Tue Sep 1 21:32:41 2020 (r365096) @@ -157,7 +157,7 @@ acpi_pci_link_probe(device_t dev) rv = ACPI_ID_PROBE(device_get_parent(dev), dev, pci_link_ids, NULL); if (rv > 0) return (rv); - + if (ACPI_SUCCESS(acpi_short_name(acpi_get_handle(dev), name, sizeof(name)))) { snprintf(descr, sizeof(descr), "ACPI PCI Link %s", name); @@ -811,11 +811,9 @@ acpi_pci_link_srs_from_links(struct acpi_pci_link_soft srsbuf->Pointer = NULL; link = sc->pl_links; for (i = 0; i < sc->pl_num_links; i++) { - /* Add a new IRQ resource from each link. */ link = &sc->pl_links[i]; if (link->l_prs_template.Type == ACPI_RESOURCE_TYPE_IRQ) { - /* Build an IRQ resource. */ bcopy(&link->l_prs_template, &newres, ACPI_RS_SIZE(newres.Data.Irq)); @@ -828,7 +826,6 @@ acpi_pci_link_srs_from_links(struct acpi_pci_link_soft } else newres.Data.Irq.Interrupts[0] = 0; } else { - /* Build an ExtIRQ resuorce. */ bcopy(&link->l_prs_template, &newres, ACPI_RS_SIZE(newres.Data.ExtendedIrq)); Modified: head/sys/dev/acpica/acpi_powerres.c ============================================================================== --- head/sys/dev/acpica/acpi_powerres.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_powerres.c Tue Sep 1 21:32:41 2020 (r365096) @@ -659,7 +659,6 @@ acpi_pwr_switch_power(void) /* Sweep the list backwards turning things off. */ TAILQ_FOREACH_REVERSE(rp, &acpi_powerresources, acpi_powerresource_list, ap_link) { - if (TAILQ_FIRST(&rp->ap_references) != NULL) { ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "%s has references, not turning off\n", Modified: head/sys/dev/acpica/acpi_smbus.h ============================================================================== --- head/sys/dev/acpica/acpi_smbus.h Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_smbus.h Tue Sep 1 21:32:41 2020 (r365096) @@ -49,7 +49,6 @@ /* Base address */ #define SMBATT_ADDRESS 0x16 - /* access: READ WRITE WORD */ #define SMBATT_CMD_MANUFACTURER_ACCESS 0 Modified: head/sys/dev/acpica/acpi_thermal.c ============================================================================== --- head/sys/dev/acpica/acpi_thermal.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_thermal.c Tue Sep 1 21:32:41 2020 (r365096) @@ -530,7 +530,6 @@ acpi_tz_monitor(void *Context) if (acpi_tz_min_runtime > 0 && sc->tz_active != TZ_ACTIVE_NONE && sc->tz_active != TZ_ACTIVE_UNKNOWN && (newactive == TZ_ACTIVE_NONE || newactive > sc->tz_active)) { - getnanotime(&curtime); timespecsub(&curtime, &sc->tz_cooling_started, &curtime); if (curtime.tv_sec < acpi_tz_min_runtime) @@ -926,7 +925,6 @@ acpi_tz_power_profile(void *arg) /* check that we haven't decided there's no _SCP method */ if ((sc->tz_flags & TZ_FLAG_NO_SCP) == 0) { - /* Call _SCP to set the new profile */ status = acpi_SetInteger(sc->tz_handle, "_SCP", (state == POWER_PROFILE_PERFORMANCE) ? 0 : 1); Modified: head/sys/dev/acpica/acpi_timer.c ============================================================================== --- head/sys/dev/acpica/acpi_timer.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_timer.c Tue Sep 1 21:32:41 2020 (r365096) @@ -354,7 +354,7 @@ acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS) { int error; u_int freq; - + if (acpi_timer_timecounter.tc_frequency == 0) return (EOPNOTSUPP); freq = acpi_timer_frequency; @@ -366,7 +366,7 @@ acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS) return (error); } - + SYSCTL_PROC(_machdep, OID_AUTO, acpi_timer_freq, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, 0, sizeof(u_int), acpi_timer_sysctl_freq, "I", Modified: head/sys/dev/acpica/acpivar.h ============================================================================== --- head/sys/dev/acpica/acpivar.h Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpivar.h Tue Sep 1 21:32:41 2020 (r365096) @@ -377,7 +377,6 @@ int acpi_MatchHid(ACPI_HANDLE h, const char *hid); #define ACPI_MATCHHID_HID 1 #define ACPI_MATCHHID_CID 2 - struct acpi_parse_resource_set { void (*set_init)(device_t dev, void *arg, void **context); void (*set_done)(device_t dev, void *context); From owner-svn-src-all@freebsd.org Tue Sep 1 21:33:47 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CF13437A70D; Tue, 1 Sep 2020 21:33:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0gb5RxRz4MgN; Tue, 1 Sep 2020 21:33:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DCDC20086; Tue, 1 Sep 2020 21:33:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LXl01031866; Tue, 1 Sep 2020 21:33:47 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LXVFV031771; Tue, 1 Sep 2020 21:33:31 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012133.081LXVFV031771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:33:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365097 - in head/sys/dev/rtwn: . pci rtl8188e rtl8188e/pci rtl8188e/usb rtl8192c rtl8192c/pci rtl8192c/usb rtl8192e rtl8192e/usb rtl8812a rtl8812a/usb rtl8821a rtl8821a/usb usb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/rtwn: . pci rtl8188e rtl8188e/pci rtl8188e/usb rtl8192c rtl8192c/pci rtl8192c/usb rtl8192e rtl8192e/usb rtl8812a rtl8812a/usb rtl8821a rtl8821a/usb usb X-SVN-Commit-Revision: 365097 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:33:47 -0000 Author: mjg Date: Tue Sep 1 21:33:31 2020 New Revision: 365097 URL: https://svnweb.freebsd.org/changeset/base/365097 Log: rtwn: clean up empty lines in .c and .h files Modified: head/sys/dev/rtwn/if_rtwn.c head/sys/dev/rtwn/if_rtwn_beacon.c head/sys/dev/rtwn/if_rtwn_calib.c head/sys/dev/rtwn/if_rtwn_cam.c head/sys/dev/rtwn/if_rtwn_efuse.c head/sys/dev/rtwn/if_rtwn_fw.c head/sys/dev/rtwn/if_rtwn_fw.h head/sys/dev/rtwn/if_rtwn_ridx.h head/sys/dev/rtwn/if_rtwn_rx.c head/sys/dev/rtwn/if_rtwn_rx.h head/sys/dev/rtwn/if_rtwn_task.c head/sys/dev/rtwn/if_rtwn_tx.c head/sys/dev/rtwn/if_rtwnreg.h head/sys/dev/rtwn/if_rtwnvar.h head/sys/dev/rtwn/pci/rtwn_pci_attach.c head/sys/dev/rtwn/pci/rtwn_pci_reg.c head/sys/dev/rtwn/pci/rtwn_pci_rx.c head/sys/dev/rtwn/pci/rtwn_pci_tx.c head/sys/dev/rtwn/pci/rtwn_pci_var.h head/sys/dev/rtwn/rtl8188e/pci/r88ee.h head/sys/dev/rtwn/rtl8188e/pci/r88ee_reg.h head/sys/dev/rtwn/rtl8188e/r88e.h head/sys/dev/rtwn/rtl8188e/r88e_beacon.c head/sys/dev/rtwn/rtl8188e/r88e_calib.c head/sys/dev/rtwn/rtl8188e/r88e_chan.c head/sys/dev/rtwn/rtl8188e/r88e_fw.c head/sys/dev/rtwn/rtl8188e/r88e_init.c head/sys/dev/rtwn/rtl8188e/r88e_led.c head/sys/dev/rtwn/rtl8188e/r88e_priv.h head/sys/dev/rtwn/rtl8188e/r88e_reg.h head/sys/dev/rtwn/rtl8188e/r88e_rf.c head/sys/dev/rtwn/rtl8188e/r88e_rom.c head/sys/dev/rtwn/rtl8188e/r88e_rx.c head/sys/dev/rtwn/rtl8188e/r88e_tx.c head/sys/dev/rtwn/rtl8188e/usb/r88eu.h head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c head/sys/dev/rtwn/rtl8192c/pci/r92ce.h head/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h head/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h head/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c head/sys/dev/rtwn/rtl8192c/r92c.h head/sys/dev/rtwn/rtl8192c/r92c_attach.c head/sys/dev/rtwn/rtl8192c/r92c_beacon.c head/sys/dev/rtwn/rtl8192c/r92c_calib.c head/sys/dev/rtwn/rtl8192c/r92c_chan.c head/sys/dev/rtwn/rtl8192c/r92c_fw.c head/sys/dev/rtwn/rtl8192c/r92c_init.c head/sys/dev/rtwn/rtl8192c/r92c_priv.h head/sys/dev/rtwn/rtl8192c/r92c_reg.h head/sys/dev/rtwn/rtl8192c/r92c_rf.c head/sys/dev/rtwn/rtl8192c/r92c_rom.c head/sys/dev/rtwn/rtl8192c/r92c_rx.c head/sys/dev/rtwn/rtl8192c/r92c_tx.c head/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h head/sys/dev/rtwn/rtl8192c/usb/r92cu.h head/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h head/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h head/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h head/sys/dev/rtwn/rtl8192e/r92e.h head/sys/dev/rtwn/rtl8192e/r92e_chan.c head/sys/dev/rtwn/rtl8192e/r92e_priv.h head/sys/dev/rtwn/rtl8192e/usb/r92eu.h head/sys/dev/rtwn/rtl8812a/r12a.h head/sys/dev/rtwn/rtl8812a/r12a_beacon.c head/sys/dev/rtwn/rtl8812a/r12a_calib.c head/sys/dev/rtwn/rtl8812a/r12a_caps.c head/sys/dev/rtwn/rtl8812a/r12a_chan.c head/sys/dev/rtwn/rtl8812a/r12a_fw.c head/sys/dev/rtwn/rtl8812a/r12a_fw_cmd.h head/sys/dev/rtwn/rtl8812a/r12a_init.c head/sys/dev/rtwn/rtl8812a/r12a_led.c head/sys/dev/rtwn/rtl8812a/r12a_priv.h head/sys/dev/rtwn/rtl8812a/r12a_reg.h head/sys/dev/rtwn/rtl8812a/r12a_rf.c head/sys/dev/rtwn/rtl8812a/r12a_rom.c head/sys/dev/rtwn/rtl8812a/r12a_rx.c head/sys/dev/rtwn/rtl8812a/r12a_tx.c head/sys/dev/rtwn/rtl8812a/r12a_tx_desc.h head/sys/dev/rtwn/rtl8812a/usb/r12au.h head/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c head/sys/dev/rtwn/rtl8812a/usb/r12au_init.c head/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c head/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c head/sys/dev/rtwn/rtl8821a/r21a.h head/sys/dev/rtwn/rtl8821a/r21a_beacon.c head/sys/dev/rtwn/rtl8821a/r21a_calib.c head/sys/dev/rtwn/rtl8821a/r21a_chan.c head/sys/dev/rtwn/rtl8821a/r21a_fw.c head/sys/dev/rtwn/rtl8821a/r21a_init.c head/sys/dev/rtwn/rtl8821a/r21a_led.c head/sys/dev/rtwn/rtl8821a/r21a_priv.h head/sys/dev/rtwn/rtl8821a/r21a_reg.h head/sys/dev/rtwn/rtl8821a/r21a_rom.c head/sys/dev/rtwn/rtl8821a/r21a_rx.c head/sys/dev/rtwn/rtl8821a/usb/r21au.h head/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c head/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c head/sys/dev/rtwn/rtl8821a/usb/r21au_init.c head/sys/dev/rtwn/usb/rtwn_usb_attach.c head/sys/dev/rtwn/usb/rtwn_usb_ep.c head/sys/dev/rtwn/usb/rtwn_usb_reg.c head/sys/dev/rtwn/usb/rtwn_usb_tx.c Modified: head/sys/dev/rtwn/if_rtwn.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn.c Tue Sep 1 21:33:31 2020 (r365097) @@ -79,7 +79,6 @@ __FBSDID("$FreeBSD$"); #include - static void rtwn_radiotap_attach(struct rtwn_softc *); static void rtwn_vap_decrement_counters(struct rtwn_softc *, enum ieee80211_opmode, int); @@ -1541,7 +1540,6 @@ rtwn_getradiocaps(struct ieee80211com *ic, setbit(bands, IEEE80211_MODE_11A); setbit(bands, IEEE80211_MODE_11NA); for (i = 0; i < nitems(sc->chan_num_5ghz); i++) { - if (sc->chan_num_5ghz[i] == 0) continue; Modified: head/sys/dev/rtwn/if_rtwn_beacon.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_beacon.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_beacon.c Tue Sep 1 21:33:31 2020 (r365097) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include - static void rtwn_reset_beacon_valid(struct rtwn_softc *sc, int id) { Modified: head/sys/dev/rtwn/if_rtwn_calib.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void rtwn_temp_calib(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/if_rtwn_cam.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_cam.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_cam.c Tue Sep 1 21:33:31 2020 (r365097) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include - void rtwn_init_cam(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/if_rtwn_efuse.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_efuse.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_efuse.c Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include - static int rtwn_efuse_switch_power(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/if_rtwn_fw.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include - #ifndef RTWN_WITHOUT_UCODE static int rtwn_fw_loadpage(struct rtwn_softc *sc, int page, const uint8_t *buf, Modified: head/sys/dev/rtwn/if_rtwn_fw.h ============================================================================== --- head/sys/dev/rtwn/if_rtwn_fw.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_fw.h Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ struct r92c_fw_hdr { uint32_t reserved5; } __packed; - int rtwn_load_firmware(struct rtwn_softc *); #endif /* IF_RTWN_FW_H */ Modified: head/sys/dev/rtwn/if_rtwn_ridx.h ============================================================================== --- head/sys/dev/rtwn/if_rtwn_ridx.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_ridx.h Tue Sep 1 21:33:31 2020 (r365097) @@ -47,7 +47,6 @@ #define RTWN_RATE_IS_OFDM(rate) \ ((rate) >= RTWN_RIDX_OFDM6 && (rate) != RTWN_RIDX_UNKNOWN) - static const uint8_t ridx2rate[] = { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 }; Modified: head/sys/dev/rtwn/if_rtwn_rx.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include - void rtwn_get_rates(struct rtwn_softc *sc, const struct ieee80211_rateset *rs, const struct ieee80211_htrateset *rs_ht, uint32_t *rates_p, @@ -398,7 +397,6 @@ rtwn_set_multi(struct rtwn_softc *sc) if_foreach_llmaddr(vap->iv_ifp, rtwm_hash_maddr, mfilt); } else mfilt[0] = mfilt[1] = ~0; - rtwn_write_4(sc, R92C_MAR + 0, mfilt[0]); rtwn_write_4(sc, R92C_MAR + 4, mfilt[1]); Modified: head/sys/dev/rtwn/if_rtwn_rx.h ============================================================================== --- head/sys/dev/rtwn/if_rtwn_rx.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_rx.h Tue Sep 1 21:33:31 2020 (r365097) @@ -21,7 +21,6 @@ #define RTWN_NOISE_FLOOR -95 - void rtwn_get_rates(struct rtwn_softc *, const struct ieee80211_rateset *, const struct ieee80211_htrateset *, uint32_t *, int *, int); void rtwn_set_basicrates(struct rtwn_softc *, uint32_t); Modified: head/sys/dev/rtwn/if_rtwn_task.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_task.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_task.c Tue Sep 1 21:33:31 2020 (r365097) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include - static void rtwn_cmdq_cb(void *arg, int pending) { Modified: head/sys/dev/rtwn/if_rtwn_tx.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - void rtwn_drain_mbufq(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/if_rtwnreg.h ============================================================================== --- head/sys/dev/rtwn/if_rtwnreg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwnreg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -26,7 +26,6 @@ #define R92C_H2C_NBOX 4 - /* Common part of Tx descriptor (named only!). */ struct rtwn_tx_desc_common { uint16_t pktlen; @@ -115,7 +114,6 @@ struct rtwn_rx_stat_pci { #define RW(var, field, val) \ (((var) & ~field##_M) | SM(field, val)) - #define RTWN_MAX_CONDITIONS 3 /* @@ -154,7 +152,6 @@ struct rtwn_rf_prog { const uint8_t cond[RTWN_MAX_CONDITIONS]; const struct rtwn_rf_prog *next; }; - /* XXX move to net80211. */ static __inline int Modified: head/sys/dev/rtwn/if_rtwnvar.h ============================================================================== --- head/sys/dev/rtwn/if_rtwnvar.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwnvar.h Tue Sep 1 21:33:31 2020 (r365097) @@ -80,7 +80,6 @@ struct rtwn_tx_phystat { uint32_t phydw[RTWN_PHY_STATUS_SIZE / sizeof(uint32_t)]; }; - struct rtwn_softc; union sec_param { @@ -423,7 +422,6 @@ MALLOC_DECLARE(M_RTWN_PRIV); #define RTWN_NT_LOCK_INITIALIZED(sc) mtx_initialized(&(sc)->nt_mtx) #define RTWN_NT_LOCK_DESTROY(sc) mtx_destroy(&(sc)->nt_mtx) - void rtwn_sysctlattach(struct rtwn_softc *); int rtwn_attach(struct rtwn_softc *); @@ -431,7 +429,6 @@ void rtwn_detach(struct rtwn_softc *); void rtwn_resume(struct rtwn_softc *); void rtwn_suspend(struct rtwn_softc *); - /* Interface-specific. */ #define rtwn_write_1(_sc, _addr, _val) \ (((_sc)->sc_write_1)((_sc), (_addr), (_val))) @@ -590,7 +587,6 @@ void rtwn_suspend(struct rtwn_softc *); (((_sc)->sc_post_init)((_sc))) #define rtwn_init_bcnq1_boundary(_sc) \ (((_sc)->sc_init_bcnq1_boundary)((_sc))) - /* * Methods to access subfields in registers. Modified: head/sys/dev/rtwn/pci/rtwn_pci_attach.c ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$"); #include - static device_probe_t rtwn_pci_probe; static device_attach_t rtwn_pci_attach; static device_detach_t rtwn_pci_detach; @@ -91,7 +90,6 @@ static void rtwn_pci_beacon_update_begin(struct rtwn_s static void rtwn_pci_beacon_update_end(struct rtwn_softc *, struct ieee80211vap *); static void rtwn_pci_attach_methods(struct rtwn_softc *); - static const struct rtwn_pci_ident * rtwn_pci_probe_sub(device_t dev) Modified: head/sys/dev/rtwn/pci/rtwn_pci_reg.c ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_reg.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_reg.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - int rtwn_pci_write_1(struct rtwn_softc *sc, uint16_t addr, uint8_t val) { Modified: head/sys/dev/rtwn/pci/rtwn_pci_rx.c ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - void rtwn_pci_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) Modified: head/sys/dev/rtwn/pci/rtwn_pci_tx.c ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include - static struct mbuf * rtwn_mbuf_defrag(struct mbuf *m0, int how) { Modified: head/sys/dev/rtwn/pci/rtwn_pci_var.h ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_var.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_var.h Tue Sep 1 21:33:31 2020 (r365097) @@ -101,7 +101,6 @@ enum { (RTWN_PCI_INTR_RX_ERROR | RTWN_PCI_INTR_RX_OVERFLOW | \ RTWN_PCI_INTR_RX_DESC_UNAVAIL | RTWN_PCI_INTR_RX_DONE) - struct rtwn_pci_softc { struct rtwn_softc pc_sc; /* must be the first */ Modified: head/sys/dev/rtwn/rtl8188e/pci/r88ee.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/pci/r88ee.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/pci/r88ee.h Tue Sep 1 21:33:31 2020 (r365097) @@ -21,7 +21,6 @@ #include - /* * Global definitions. */ @@ -33,7 +32,6 @@ (R88EE_PUBQ_NPAGES + R88EE_HPQ_NPAGES + \ R88EE_NPQ_NPAGES + R88EE_LPQ_NPAGES) - /* * Function declarations. */ @@ -50,4 +48,3 @@ void r88ee_start_xfers(struct rtwn_softc *); void r88ee_post_init(struct rtwn_softc *); #endif /* RTL8188EE_H */ - Modified: head/sys/dev/rtwn/rtl8188e/pci/r88ee_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/pci/r88ee_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/pci/r88ee_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,4 +23,3 @@ #include #endif /* R88EE_REG_H */ - Modified: head/sys/dev/rtwn/rtl8188e/r88e.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e.h Tue Sep 1 21:33:31 2020 (r365097) @@ -33,7 +33,6 @@ #define R88E_CALIB_THRESHOLD 4 - /* * Function declarations. */ Modified: head/sys/dev/rtwn/rtl8188e/r88e_beacon.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_beacon.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_beacon.c Tue Sep 1 21:33:31 2020 (r365097) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_beacon_enable(struct rtwn_softc *sc, int id, int enable) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_calib.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* Registers to save and restore during IQ calibration. */ struct r88e_iq_cal_reg_vals { uint32_t adda[16]; Modified: head/sys/dev/rtwn/rtl8188e/r88e_chan.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_chan.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_chan.c Tue Sep 1 21:33:31 2020 (r365097) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r88e_get_power_group(struct rtwn_softc *sc, struct ieee80211_channel *c) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_fw.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE int r88e_fw_cmd(struct rtwn_softc *sc, uint8_t id, const void *buf, int len) Modified: head/sys/dev/rtwn/rtl8188e/r88e_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r88e_crystalcap_write(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_led.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_led.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_led.c Tue Sep 1 21:33:31 2020 (r365097) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_set_led(struct rtwn_softc *sc, int led, int on) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -33,7 +33,6 @@ struct rtwn_r88e_txpwr { int8_t bw20_tx_pwr_diff; }; - /* * MAC initialization values. */ Modified: head/sys/dev/rtwn/rtl8188e/r88e_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -44,7 +44,6 @@ #define R88E_TX_RPT_TIME 0x4f0 #define R88E_SCH_TXCMD 0x5f8 - /* Bits for R88E_HIMR. */ #define R88E_HIMR_ROK 0x00000001 /* receive DMA OK */ #define R88E_HIMR_RDU 0x00000002 /* Rx descriptor unavailable */ @@ -100,14 +99,12 @@ /* Bits for R92C_SECCFG. */ #define R88E_SECCFG_CHK_KEYID 0x0100 - /* * Baseband registers. */ /* Bits for R92C_LSSI_PARAM(i). */ #define R88E_LSSI_PARAM_ADDR_M 0x0ff00000 #define R88E_LSSI_PARAM_ADDR_S 20 - /* * RF (6052) registers. Modified: head/sys/dev/rtwn/rtl8188e/r88e_rf.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_rf.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_rf.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_rf_write(struct rtwn_softc *sc, int chain, uint8_t addr, uint32_t val) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_rom.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_rom.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_rom.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_parse_rom(struct rtwn_softc *sc, uint8_t *buf) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_rx.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r88e_classify_intr(struct rtwn_softc *sc, void *buf, int len) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_tx.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_tx_enable_ampdu(void *buf, int enable) { Modified: head/sys/dev/rtwn/rtl8188e/usb/r88eu.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/usb/r88eu.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/usb/r88eu.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,13 +23,11 @@ #include - /* * Global definitions. */ #define R88EU_PUBQ_NPAGES 142 #define R88EU_TX_PAGE_COUNT 169 - /* * Function declarations. Modified: head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include - static struct rtwn_r88e_txpwr r88e_txpwr; void r88eu_attach(struct rtwn_usb_softc *); Modified: head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88eu_init_bb(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce.h Tue Sep 1 21:33:31 2020 (r365097) @@ -25,7 +25,6 @@ #include - /* * Global definitions. */ @@ -34,7 +33,6 @@ #define R92CE_LPQ_NPAGES 28 #define R92CE_TX_PAGE_COUNT \ (R92CE_PUBQ_NPAGES + R92CE_HPQ_NPAGES + R92CE_LPQ_NPAGES) - /* * Function declarations. Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include - static struct rtwn_r92c_txpwr r92c_txpwr; void r92ce_attach(struct rtwn_pci_softc *); Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* Registers to save and restore during IQ calibration. */ struct r92ce_iq_cal_reg_vals { uint32_t adda[16]; Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include - #ifndef RTWN_WITHOUT_UCODE void r92ce_fw_reset(struct rtwn_softc *sc, int reason) Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92ce_init_intr(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -25,7 +25,6 @@ #include - /* * MAC initialization values. */ @@ -52,7 +51,6 @@ static const struct rtwn_mac_prog rtl8192ce_mac[] = { { 0x703, 0x87 }, { 0x708, 0x21 }, { 0x709, 0x43 }, { 0x70a, 0x65 }, { 0x70b, 0x87 } }; - /* * Baseband initialization values. Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ #define R92C_UART_TX_DES 0x370 #define R92C_UART_RX_DES 0x378 - /* Bits for R92C_GPIO_MUXCFG. */ #define R92C_GPIO_MUXCFG_RFKILL 0x0008 Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r92ce_get_intr_status(struct rtwn_pci_softc *pc, int *rings) { Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92ce_setup_tx_desc(struct rtwn_pci_softc *pc, void *desc, uint32_t next_desc_addr) Modified: head/sys/dev/rtwn/rtl8192c/r92c.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c.h Tue Sep 1 21:33:31 2020 (r365097) @@ -35,7 +35,6 @@ #define R92C_CALIB_THRESHOLD 2 - /* * Function declarations. */ Modified: head/sys/dev/rtwn/rtl8192c/r92c_attach.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92c_detach_private(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_beacon.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_beacon.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_beacon.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92c_beacon_init(struct rtwn_softc *sc, void *buf, int id) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_calib.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* Registers to save and restore during IQ calibration. */ struct r92c_iq_cal_reg_vals { uint32_t adda[16]; Modified: head/sys/dev/rtwn/rtl8192c/r92c_chan.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_chan.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_chan.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r92c_get_power_group(struct rtwn_softc *sc, struct ieee80211_channel *c) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_fw.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE static int r92c_fw_cmd(struct rtwn_softc *sc, uint8_t id, const void *buf, int len) Modified: head/sys/dev/rtwn/rtl8192c/r92c_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r92c_check_condition(struct rtwn_softc *sc, const uint8_t cond[]) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -36,7 +36,6 @@ struct rtwn_r92c_txpwr { int8_t ht20_max_pwr[R92C_MAX_CHAINS][R92C_GROUP_2G]; }; - /* * Baseband initialization values (shared parts). */ @@ -132,7 +131,6 @@ static const struct rtwn_agc_prog rtl8192ce_agc[] = { } }; - /* * RF initialization values. */ @@ -330,7 +328,6 @@ static const struct rtwn_rf_prog rtl8192c_rf[] = { }, { 0, NULL, NULL, { 0 }, NULL } }; - struct rtwn_r92c_txagc { uint8_t pwr[R92C_GROUP_2G][28]; /* RTWN_RIDX_HT_MCS(15) + 1 */ Modified: head/sys/dev/rtwn/rtl8192c/r92c_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -224,7 +224,6 @@ #define R92C_MACID1 0x700 #define R92C_BSSID1 0x708 - #define R92C_MACID(id) ((id) == 0 ? R92C_MACID0 : R92C_MACID1) #define R92C_BSSID(id) ((id) == 0 ? R92C_BSSID0 : R92C_BSSID1) @@ -628,7 +627,6 @@ #define R92C_CAMCMD_CLR 0x40000000 #define R92C_CAMCMD_POLLING 0x80000000 - /* * CAM entries. */ @@ -666,7 +664,6 @@ #define R92C_RXFLTMAP_SUBTYPE(subtype) \ (1 << ((subtype) >> IEEE80211_FC0_SUBTYPE_SHIFT)) - /* * Baseband registers. */ @@ -849,7 +846,6 @@ /* Bits for R92C_[RT]X_POWER_IQK*. */ #define R92C_POWER_IQK_RESULT_S 16 #define R92C_POWER_IQK_RESULT_M 0x03ff0000 - /* * RF (6052) registers. Modified: head/sys/dev/rtwn/rtl8192c/r92c_rf.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_rf.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_rf.c Tue Sep 1 21:33:31 2020 (r365097) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include - uint32_t r92c_rf_read(struct rtwn_softc *sc, int chain, uint8_t addr) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_rom.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_rom.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_rom.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r92c_set_chains(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_rx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r92c_classify_intr(struct rtwn_softc *sc, void *buf, int len) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_tx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r92c_tx_get_sco(struct rtwn_softc *sc, struct ieee80211_channel *c) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h Tue Sep 1 21:33:31 2020 (r365097) @@ -109,7 +109,6 @@ struct r92c_tx_desc { #define R92C_TXDW6_MAX_AGG_S 11 } __packed __attribute__((aligned(4))); - /* Rate adaptation modes. */ #define R92C_RAID_11BGN 0 #define R92C_RAID_11GN 1 Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,13 +23,11 @@ #include - /* * Global definitions. */ #define R92CU_PUBQ_NPAGES 231 #define R92CU_TX_PAGE_COUNT 248 - /* * Function declarations. Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - static struct rtwn_r92c_txpwr r92c_txpwr; void r92cu_attach(struct rtwn_usb_softc *); Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92cu_init_bb(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include - void r92cu_set_led(struct rtwn_softc *sc, int led, int on) { Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,7 +23,6 @@ #include - /* * MAC initialization values. */ @@ -52,7 +51,6 @@ static const struct rtwn_mac_prog rtl8192cu_mac[] = { { 0x70a, 0x65 }, { 0x70b, 0x87 } }; - /* * Baseband initialization values. */ @@ -273,7 +271,6 @@ static const struct rtwn_bb_prog rtl8192cu_bb[] = { } } }; - static const uint32_t rtl8188ru_agc_vals[] = { 0x7b000001, 0x7b010001, 0x7b020001, 0x7b030001, 0x7b040001, Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,13 +23,11 @@ #include - /* * MAC registers. */ /* System Configuration. */ #define R92C_USB_SIE_INTF 0x0e0 - /* * USB registers. Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include - int r92cu_align_rx(int totlen, int len) { Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92cu_dump_tx_desc(struct rtwn_softc *sc, const void *desc) { Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h Tue Sep 1 21:33:31 2020 (r365097) @@ -42,4 +42,4 @@ struct r92cu_tx_desc { uint16_t pad; } __packed __attribute__((aligned(4))); -#endif /* R92CU_TX_DESC_H */ \ No newline at end of file +#endif /* R92CU_TX_DESC_H */ Modified: head/sys/dev/rtwn/rtl8192e/r92e.h ============================================================================== --- head/sys/dev/rtwn/rtl8192e/r92e.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192e/r92e.h Tue Sep 1 21:33:31 2020 (r365097) @@ -40,7 +40,6 @@ #define R92E_MAX_FW_SIZE 0x8000 - /* * Function declarations. */ Modified: head/sys/dev/rtwn/rtl8192e/r92e_chan.c ============================================================================== --- head/sys/dev/rtwn/rtl8192e/r92e_chan.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192e/r92e_chan.c Tue Sep 1 21:33:31 2020 (r365097) @@ -127,7 +127,6 @@ r92e_get_txpower(struct rtwn_softc *sc, int chain, str min_mcs = RTWN_RIDX_HT_MCS(i * 8); for (ridx = min_mcs; ridx <= max_mcs; ridx++) power[ridx] += pwr_diff; - } /* Apply max limit. */ Modified: head/sys/dev/rtwn/rtl8192e/r92e_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8192e/r92e_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192e/r92e_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -61,7 +61,6 @@ static const struct rtwn_mac_prog rtl8192eu_mac[] = { { 0x70b, 0x87 } }; - /* * Baseband initialization values. */ @@ -146,7 +145,6 @@ static const struct rtwn_bb_prog rtl8192eu_bb[] = { NULL } }; - static const uint32_t rtl8192eu_agc_vals[] = { 0xfb000001, 0xfb010001, 0xfb020001, 0xfb030001, 0xfb040001, Modified: head/sys/dev/rtwn/rtl8192e/usb/r92eu.h ============================================================================== --- head/sys/dev/rtwn/rtl8192e/usb/r92eu.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192e/usb/r92eu.h Tue Sep 1 21:33:31 2020 (r365097) @@ -26,7 +26,6 @@ * $FreeBSD$ */ - #ifndef RTL8192EU_H #define RTL8192EU_H Modified: head/sys/dev/rtwn/rtl8812a/r12a.h ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a.h Tue Sep 1 21:33:31 2020 (r365097) @@ -52,7 +52,6 @@ static const uint8_t r12a_chan_5ghz_1[] = static const uint8_t r12a_chan_5ghz_2[] = { 149, 153, 157, 161, 165, 169, 173, 177 }; - /* * Function declarations. */ Modified: head/sys/dev/rtwn/rtl8812a/r12a_beacon.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_beacon.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_beacon.c Tue Sep 1 21:33:31 2020 (r365097) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12a_beacon_init(struct rtwn_softc *sc, void *buf, int id) { Modified: head/sys/dev/rtwn/rtl8812a/r12a_calib.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12a_lc_calib(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8812a/r12a_caps.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_caps.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_caps.c Tue Sep 1 21:33:31 2020 (r365097) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r12a_ioctl_net(struct ieee80211com *ic, u_long cmd, void *data) { Modified: head/sys/dev/rtwn/rtl8812a/r12a_chan.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_chan.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_chan.c Tue Sep 1 21:33:31 2020 (r365097) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r12a_write_txpower(struct rtwn_softc *sc, int chain, struct ieee80211_channel *c, uint8_t power[RTWN_RIDX_COUNT]) Modified: head/sys/dev/rtwn/rtl8812a/r12a_fw.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE void r12a_fw_reset(struct rtwn_softc *sc, int reason) Modified: head/sys/dev/rtwn/rtl8812a/r12a_fw_cmd.h ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_fw_cmd.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_fw_cmd.h Tue Sep 1 21:33:31 2020 (r365097) @@ -77,7 +77,6 @@ struct r12a_fw_cmd_iq_calib { #define RTWN_CMD_IQ_EXT_LNA_5G(lna) ((lna) << 1) } __packed; - /* * C2H event types. */ Modified: head/sys/dev/rtwn/rtl8812a/r12a_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r12a_check_condition(struct rtwn_softc *sc, const uint8_t cond[]) { Modified: head/sys/dev/rtwn/rtl8812a/r12a_led.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_led.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_led.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:34:06 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B086437A655; Tue, 1 Sep 2020 21:34:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0gy45qQz4Mkd; Tue, 1 Sep 2020 21:34:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6FC721FF5A; Tue, 1 Sep 2020 21:34:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LY6Em031932; Tue, 1 Sep 2020 21:34:06 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LY4kK031925; Tue, 1 Sep 2020 21:34:04 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012134.081LY4kK031925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:34:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365098 - head/sys/dev/acpi_support X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/acpi_support X-SVN-Commit-Revision: 365098 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:34:06 -0000 Author: mjg Date: Tue Sep 1 21:34:04 2020 New Revision: 365098 URL: https://svnweb.freebsd.org/changeset/base/365098 Log: acpi_support: clean up empty lines in .c and .h files Modified: head/sys/dev/acpi_support/acpi_asus.c head/sys/dev/acpi_support/acpi_asus_wmi.c head/sys/dev/acpi_support/acpi_fujitsu.c head/sys/dev/acpi_support/acpi_hp.c head/sys/dev/acpi_support/acpi_panasonic.c head/sys/dev/acpi_support/acpi_rapidstart.c head/sys/dev/acpi_support/acpi_wmi.c Modified: head/sys/dev/acpi_support/acpi_asus.c ============================================================================== --- head/sys/dev/acpi_support/acpi_asus.c Tue Sep 1 21:33:31 2020 (r365097) +++ head/sys/dev/acpi_support/acpi_asus.c Tue Sep 1 21:34:04 2020 (r365098) @@ -417,7 +417,6 @@ static struct acpi_asus_model acpi_asus_models[] = { .disp_get = "\\_SB.PCI0.P0P2.VGA.GETD", .disp_set = "SDSP" }, - { .name = NULL } }; @@ -434,7 +433,6 @@ static struct acpi_asus_model acpi_samsung_models[] = .lcd_get = "\\BKLT", .lcd_set = "\\_SB.PCI0.LPCB.EC0._Q0E" }, - { .name = NULL } }; @@ -457,7 +455,6 @@ static struct acpi_asus_model acpi_eeepc_models[] = { .wlan_set = "\\_SB.ATKD.WLDS", .n_func = acpi_asus_eeepc_notify }, - { .name = NULL } }; @@ -499,7 +496,6 @@ static struct { .method = ACPI_ASUS_METHOD_WLAN, .description = "wireless lan state", }, - { .name = NULL } }; @@ -524,7 +520,6 @@ static device_method_t acpi_asus_methods[] = { DEVMETHOD(device_probe, acpi_asus_probe), DEVMETHOD(device_attach, acpi_asus_attach), DEVMETHOD(device_detach, acpi_asus_detach), - { 0, 0 } }; @@ -617,7 +612,6 @@ acpi_asus_probe(device_t dev) */ for (model = acpi_asus_models; model->name != NULL; model++) { if (strncmp(Obj->String.Pointer, model->name, 3) == 0) { - good: sbuf_printf(sb, "Asus %s Laptop Extras", Obj->String.Pointer); @@ -867,7 +861,7 @@ acpi_asus_detach(device_t dev) /* Remove notify handler */ AcpiRemoveNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, acpi_asus_notify); - + if (sc->lcdd_handle) { KASSERT(sc->model->lcdd_n_func != NULL, ("model->lcdd_n_func is NULL, but lcdd_handle is non-zero")); @@ -887,7 +881,7 @@ acpi_asus_led_task(struct acpi_asus_led *led, int pend struct acpi_asus_softc *sc; char *method; int state; - + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = led->sc; @@ -926,7 +920,7 @@ acpi_asus_led_task(struct acpi_asus_led *led, int pend acpi_SetInteger(sc->handle, method, state); led->busy = 0; } - + static void acpi_asus_led(struct acpi_asus_led *led, int state) { @@ -950,7 +944,7 @@ acpi_asus_sysctl(SYSCTL_HANDLER_ARGS) int error = 0; int function; int method; - + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_asus_softc *)oidp->oid_arg1; Modified: head/sys/dev/acpi_support/acpi_asus_wmi.c ============================================================================== --- head/sys/dev/acpi_support/acpi_asus_wmi.c Tue Sep 1 21:33:31 2020 (r365097) +++ head/sys/dev/acpi_support/acpi_asus_wmi.c Tue Sep 1 21:34:04 2020 (r365098) @@ -104,7 +104,6 @@ ACPI_MODULE_NAME("ASUS-WMI") #define ASUS_WMI_DSTS_BRIGHTNESS_MASK 0x000000FF #define ASUS_WMI_DSTS_MAX_BRIGTH_MASK 0x0000FF00 - struct acpi_asus_wmi_softc { device_t dev; device_t wmi_dev; @@ -450,7 +449,7 @@ static int acpi_asus_wmi_detach(device_t dev) { struct acpi_asus_wmi_softc *sc = device_get_softc(dev); - + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); if (sc->notify_guid) @@ -468,7 +467,7 @@ acpi_asus_wmi_sysctl(SYSCTL_HANDLER_ARGS) int error = 0; int function; int dev_id; - + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_asus_wmi_softc *)oidp->oid_arg1; @@ -601,7 +600,7 @@ acpi_asus_wmi_evaluate_method(device_t wmi_dev, int me ACPI_OBJECT *obj; ACPI_BUFFER in = { sizeof(params), ¶ms }; ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL }; - + if (ACPI_FAILURE(ACPI_WMI_EVALUATE_CALL(wmi_dev, ACPI_ASUS_WMI_MGMT_GUID, 1, method, &in, &out))) { acpi_asus_wmi_free_buffer(&out); Modified: head/sys/dev/acpi_support/acpi_fujitsu.c ============================================================================== --- head/sys/dev/acpi_support/acpi_fujitsu.c Tue Sep 1 21:33:31 2020 (r365097) +++ head/sys/dev/acpi_support/acpi_fujitsu.c Tue Sep 1 21:34:04 2020 (r365098) @@ -213,7 +213,6 @@ static struct { .method = METHOD_RBLL, .description = "Number of brightness level steps" }, - { NULL, 0, NULL } }; @@ -317,7 +316,6 @@ acpi_fujitsu_notify_status_changed(void *arg) ACPI_SERIAL_END(fujitsu); } - static void acpi_fujitsu_notify_handler(ACPI_HANDLE h, uint32_t notify, void *context) { @@ -423,7 +421,6 @@ acpi_fujitsu_init(struct acpi_fujitsu_softc *sc) sysctl_table[i].description); } - /* Set the hotkeys to their initial states */ if (!acpi_fujitsu_update(sc)) { device_printf(sc->dev, "Couldn't init hotkey states\n"); @@ -675,21 +672,21 @@ acpi_fujitsu_update(struct acpi_fujitsu_softc *sc) device_printf(sc->dev, "Couldn't query volume level\n"); return (FALSE); } - + if (changed & VOLUME_CHANGED) { sc->bIsMuted = (uint8_t)((sc->gvol.value & VOLUME_MUTE_BIT) != 0); - + /* Clear the modification bit */ sc->gvol.value &= VOLUME_SETTING_BITS; - + if (sc->bIsMuted) { acpi_UserNotify("FUJITSU", sc->handle, FN_MUTE); ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now mute\n"); } else ACPI_VPRINT(sc->dev, acpi_sc, "Volume is now %d\n", sc->gvol.value); - + acpi_UserNotify("FUJITSU", sc->handle, FN_VOLUME); } } @@ -701,10 +698,10 @@ acpi_fujitsu_update(struct acpi_fujitsu_softc *sc) device_printf(sc->dev, "Couldn't query pointer state\n"); return (FALSE); } - + if (changed & MOUSE_CHANGED) { sc->bIntPtrEnabled = (uint8_t)(sc->gmou.value & 0x1); - + /* Clear the modification bit */ sc->gmou.value &= MOUSE_SETTING_BITS; @@ -712,7 +709,7 @@ acpi_fujitsu_update(struct acpi_fujitsu_softc *sc) acpi_fujitsu_method_set(sc, METHOD_GMOU, sc->gmou.value); acpi_UserNotify("FUJITSU", sc->handle, FN_POINTER_ENABLE); - + ACPI_VPRINT(sc->dev, acpi_sc, "Internal pointer is now %s\n", (sc->bIntPtrEnabled) ? "enabled" : "disabled"); } @@ -748,15 +745,15 @@ acpi_fujitsu_update(struct acpi_fujitsu_softc *sc) device_printf(sc->dev, "Couldn't query brightness level\n"); return (FALSE); } - + if (changed & BRIGHT_CHANGED) { /* No state to record here. */ - + /* Clear the modification bit */ sc->gbll.value &= BRIGHTNESS_SETTING_BITS; - + acpi_UserNotify("FUJITSU", sc->handle, FN_LCD_BRIGHTNESS); - + ACPI_VPRINT(sc->dev, acpi_sc, "Brightness level is now %d\n", sc->gbll.value); } Modified: head/sys/dev/acpi_support/acpi_hp.c ============================================================================== --- head/sys/dev/acpi_support/acpi_hp.c Tue Sep 1 21:33:31 2020 (r365097) +++ head/sys/dev/acpi_support/acpi_hp.c Tue Sep 1 21:34:04 2020 (r365098) @@ -298,7 +298,6 @@ static struct { .method = ACPI_HP_METHOD_VERBOSE, .description = "Verbosity level", }, - { NULL, 0, NULL, 0 } }; @@ -615,7 +614,7 @@ static int acpi_hp_detach(device_t dev) { struct acpi_hp_softc *sc; - + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); sc = device_get_softc(dev); if (sc->has_cmi && sc->hpcmi_open_pid != 0) @@ -647,7 +646,7 @@ acpi_hp_sysctl(SYSCTL_HANDLER_ARGS) int error = 0; int function; int method; - + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_hp_softc *)oidp->oid_arg1; @@ -898,7 +897,7 @@ acpi_hp_exec_wmi_command(device_t wmi_dev, int command ACPI_BUFFER in = { sizeof(params), ¶ms }; ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL }; int res; - + if (ACPI_FAILURE(ACPI_WMI_EVALUATE_CALL(wmi_dev, ACPI_HP_WMI_BIOS_GUID, 0, 0x3, &in, &out))) { acpi_hp_free_buffer(&out); @@ -935,7 +934,6 @@ acpi_hp_get_string_from_object(ACPI_OBJECT* obj, char* return (dst); } - /* * Read BIOS Setting block in instance "instance". * The block returned is ACPI_TYPE_PACKAGE which should contain the following @@ -1073,8 +1071,6 @@ acpi_hp_get_cmi_block(device_t wmi_dev, const char* gu return (0); } - - /* * Convert given two digit hex string (hexin) to an UINT8 referenced * by byteout. @@ -1108,7 +1104,6 @@ static __inline int acpi_hp_hex_to_int(const UINT8 *he return (0); } - static void acpi_hp_hex_decode(char* buffer) { @@ -1140,7 +1135,6 @@ acpi_hp_hex_decode(char* buffer) buffer[(length+1)/3] = 0; } - /* * open hpcmi device */ @@ -1219,7 +1213,7 @@ acpi_hp_hpcmi_read(struct cdev *dev, struct uio *buf, if (dev == NULL || dev->si_drv1 == NULL) return (EBADF); sc = dev->si_drv1; - + ACPI_SERIAL_BEGIN(hp); if (sc->hpcmi_open_pid != buf->uio_td->td_proc->p_pid || sc->hpcmi_bufptr == -1) { Modified: head/sys/dev/acpi_support/acpi_panasonic.c ============================================================================== --- head/sys/dev/acpi_support/acpi_panasonic.c Tue Sep 1 21:33:31 2020 (r365097) +++ head/sys/dev/acpi_support/acpi_panasonic.c Tue Sep 1 21:34:04 2020 (r365098) @@ -139,7 +139,7 @@ acpi_panasonic_probe(device_t dev) { static char *mat_ids[] = { "MAT0019", NULL }; int rv; - + if (acpi_disabled("panasonic") || device_get_unit(dev) != 0) return (ENXIO); Modified: head/sys/dev/acpi_support/acpi_rapidstart.c ============================================================================== --- head/sys/dev/acpi_support/acpi_rapidstart.c Tue Sep 1 21:33:31 2020 (r365097) +++ head/sys/dev/acpi_support/acpi_rapidstart.c Tue Sep 1 21:34:04 2020 (r365098) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include static int sysctl_acpi_rapidstart_gen_handler(SYSCTL_HANDLER_ARGS); - static struct acpi_rapidstart_name_list { char *nodename; @@ -72,7 +71,7 @@ acpi_rapidstart_probe(device_t dev) device_set_desc(dev, "Intel Rapid Start ACPI device"); return (rv); - + } static int @@ -82,7 +81,7 @@ acpi_rapidstart_attach(device_t dev) int i; sc = device_get_softc(dev); - + sc->sysctl_ctx = device_get_sysctl_ctx(dev); sc->sysctl_tree = device_get_sysctl_tree(dev); for (i = 0 ; acpi_rapidstart_oids[i].nodename != NULL; i++){ @@ -141,4 +140,3 @@ static devclass_t acpi_rapidstart_devclass; DRIVER_MODULE(acpi_rapidstart, acpi, acpi_rapidstart_driver, acpi_rapidstart_devclass, 0, 0); MODULE_DEPEND(acpi_rapidstart, acpi, 1, 1, 1); - Modified: head/sys/dev/acpi_support/acpi_wmi.c ============================================================================== --- head/sys/dev/acpi_support/acpi_wmi.c Tue Sep 1 21:33:31 2020 (r365097) +++ head/sys/dev/acpi_support/acpi_wmi.c Tue Sep 1 21:34:04 2020 (r365098) @@ -76,7 +76,7 @@ struct acpi_wmi_softc { pid_t wmistat_open_pid; /* pid operating on /dev/wmistat */ int wmistat_bufptr; /* /dev/wmistat ptr to buffer position */ char *mofbuf; - + TAILQ_HEAD(wmi_info_list_head, wmi_info) wmi_info_list; }; @@ -97,7 +97,6 @@ enum event_generation_state { EVENT_GENERATION_OFF = 0 }; - /* * Information about one entry in _WDG. * List of those is used to lookup information by GUID. @@ -109,7 +108,6 @@ struct wmi_info { void *event_handler_user_data; /* ev handler cookie */ }; - ACPI_SERIAL_DECL(acpi_wmi, "ACPI-WMI Mapping"); /* public interface - declaration */ @@ -168,7 +166,6 @@ static struct cdevsw wmistat_cdevsw = { .d_name = "wmistat", }; - static device_method_t acpi_wmi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, acpi_wmi_probe), @@ -354,7 +351,6 @@ acpi_wmi_detach(device_t dev) return (ret); } - /* * Check if the given GUID string (human readable format * AABBCCDD-EEFF-GGHH-IIJJ-KKLLMMNNOOPP) @@ -801,7 +797,7 @@ acpi_wmi_toggle_we_event_generation(device_t dev, stru params[0].Integer.Value = state==EVENT_GENERATION_ON?1:0; input.Pointer = params; input.Count = 1; - + UINT8 hi = ((UINT8) winfo->ginfo.oid[0]) >> 4; UINT8 lo = ((UINT8) winfo->ginfo.oid[0]) & 0xf; method[2] = (hi > 9 ? hi + 55: hi + 48); @@ -978,7 +974,7 @@ acpi_wmi_wmistat_read(struct cdev *dev, struct uio *bu if (dev == NULL || dev->si_drv1 == NULL) return (EBADF); sc = dev->si_drv1; - + ACPI_SERIAL_BEGIN(acpi_wmi); if (sc->wmistat_open_pid != buf->uio_td->td_proc->p_pid || sc->wmistat_bufptr == -1) { From owner-svn-src-all@freebsd.org Tue Sep 1 21:34:26 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 48FCB37A5E5; Tue, 1 Sep 2020 21:34:26 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0hL1BBwz4N3s; Tue, 1 Sep 2020 21:34:26 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0BFE720009; Tue, 1 Sep 2020 21:34:26 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LYPeM031997; Tue, 1 Sep 2020 21:34:25 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LYO12031989; Tue, 1 Sep 2020 21:34:24 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012134.081LYO12031989@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:34:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365099 - head/sys/dev/adb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/adb X-SVN-Commit-Revision: 365099 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:34:26 -0000 Author: mjg Date: Tue Sep 1 21:34:24 2020 New Revision: 365099 URL: https://svnweb.freebsd.org/changeset/base/365099 Log: adb: clean up empty lines in .c and .h files Modified: head/sys/dev/adb/adb.h head/sys/dev/adb/adb_bus.c head/sys/dev/adb/adb_buttons.c head/sys/dev/adb/adb_kbd.c head/sys/dev/adb/adb_mouse.c head/sys/dev/adb/adbvar.h Modified: head/sys/dev/adb/adb.h ============================================================================== --- head/sys/dev/adb/adb.h Tue Sep 1 21:34:04 2020 (r365098) +++ head/sys/dev/adb/adb.h Tue Sep 1 21:34:24 2020 (r365099) @@ -45,7 +45,7 @@ enum { ADB_DEVICE_MOUSE = 0x03, ADB_DEVICE_TABLET = 0x04, ADB_DEVICE_MODEM = 0x05, - + ADB_DEVICE_MISC = 0x07 }; @@ -78,4 +78,3 @@ extern devclass_t adb_devclass; extern driver_t adb_driver; #endif - Modified: head/sys/dev/adb/adb_bus.c ============================================================================== --- head/sys/dev/adb/adb_bus.c Tue Sep 1 21:34:04 2020 (r365098) +++ head/sys/dev/adb/adb_bus.c Tue Sep 1 21:34:24 2020 (r365099) @@ -99,13 +99,13 @@ adb_bus_attach(device_t dev) * the bus. Enumerating the ADB involves receiving packets, * which works best with interrupts enabled. */ - + if (config_intrhook_establish(&sc->enum_hook) != 0) return (ENOMEM); return (0); } - + static void adb_bus_enumerate(void *xdev) { @@ -127,7 +127,7 @@ adb_bus_enumerate(void *xdev) sc->devinfo[i].address = i; sc->devinfo[i].default_address = 0; } - + /* Reset ADB bus */ adb_send_raw_packet_sync(dev,0,ADB_COMMAND_BUS_RESET,0,0,NULL,NULL); DELAY(1500); @@ -142,7 +142,7 @@ adb_bus_enumerate(void *xdev) do { reply = adb_send_raw_packet_sync(dev,i, ADB_COMMAND_TALK,3,0,NULL,NULL); - + if (reply) { /* If we got a response, relocate to next_free */ r3 = sc->devinfo[i].register3; @@ -197,7 +197,6 @@ static int adb_bus_detach(device_t dev) { return (bus_generic_detach(dev)); } - static void adb_probe_nomatch(device_t dev, device_t child) @@ -234,7 +233,7 @@ adb_receive_raw_packet(device_t dev, u_char status, u_ ADB_RECEIVE_PACKET(sc->children[addr],status, (command & 0x0f) >> 2,command & 0x03,len,data); } - + return (0); } @@ -243,9 +242,9 @@ adb_print_child(device_t dev, device_t child) { struct adb_devinfo *dinfo; int retval = 0; - + dinfo = device_get_ivars(child); - + retval += bus_print_child_header(dev,child); printf(" at device %d",dinfo->address); retval += bus_print_child_footer(dev, child); @@ -262,7 +261,7 @@ adb_send_packet(device_t dev, u_char command, u_char r sc = device_get_softc(device_get_parent(dev)); dinfo = device_get_ivars(dev); - + command_byte |= dinfo->address << 4; command_byte |= command << 2; command_byte |= reg; @@ -281,7 +280,7 @@ adb_set_autopoll(device_t dev, u_char enable) sc = device_get_softc(device_get_parent(dev)); dinfo = device_get_ivars(dev); - + mod = enable << dinfo->address; if (enable) { sc->autopoll_mask |= mod; @@ -323,7 +322,7 @@ adb_send_raw_packet_sync(device_t dev, uint8_t to, uin int i = 1; sc = device_get_softc(dev); - + command_byte |= to << 4; command_byte |= command << 2; command_byte |= reg; @@ -410,13 +409,13 @@ adb_write_register(device_t dev, u_char reg, size_t le struct adb_softc *sc; struct adb_devinfo *dinfo; size_t result; - + dinfo = device_get_ivars(dev); sc = device_get_softc(device_get_parent(dev)); - + result = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, ADB_COMMAND_LISTEN, reg, len, (u_char *)data, NULL); - + result = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, ADB_COMMAND_TALK, reg, 0, NULL, NULL); Modified: head/sys/dev/adb/adb_buttons.c ============================================================================== --- head/sys/dev/adb/adb_buttons.c Tue Sep 1 21:34:04 2020 (r365098) +++ head/sys/dev/adb/adb_buttons.c Tue Sep 1 21:34:24 2020 (r365099) @@ -69,7 +69,6 @@ static device_method_t abtn_methods[] = { /* ADB interface */ DEVMETHOD(adb_receive_packet, abtn_receive_packet), - { 0, 0 } }; @@ -159,4 +158,3 @@ abtn_receive_packet(device_t dev, u_char status, } return 0; } - Modified: head/sys/dev/adb/adb_kbd.c ============================================================================== --- head/sys/dev/adb/adb_kbd.c Tue Sep 1 21:34:04 2020 (r365098) +++ head/sys/dev/adb/adb_kbd.c Tue Sep 1 21:34:24 2020 (r365099) @@ -102,7 +102,6 @@ static device_method_t adb_kbd_methods[] = { /* ADB interface */ DEVMETHOD(adb_receive_packet, adb_kbd_receive_packet), - { 0, 0 } }; @@ -282,7 +281,7 @@ ms_to_ticks(int ms) return ms/(1000/hz); } - + static int adb_kbd_attach(device_t dev) { @@ -502,7 +501,7 @@ akbd_repeat(void *xsc) { callout_reset(&sc->sc_repeater, ms_to_ticks(sc->sc_kbd.kb_delay2), akbd_repeat, sc); } - + static int akbd_configure(int flags) { @@ -666,7 +665,7 @@ akbd_read_char(keyboard_t *kbd, int wait) key & ~SCAN_PREFIX; sc->at_buffered_char[1] = 0; } - + key = (key & SCAN_PREFIX_E0) ? 0xe0 : 0xe1; } } @@ -756,7 +755,7 @@ static int akbd_ioctl(keyboard_t *kbd, u_long cmd, cad case KDSETLED: KBD_LED_VAL(kbd) = *(int *)data; - + if (!sc->have_led_control) break; @@ -890,4 +889,3 @@ adb_fn_keys(SYSCTL_HANDLER_ARGS) } DEV_MODULE(akbd, akbd_modevent, NULL); - Modified: head/sys/dev/adb/adb_mouse.c ============================================================================== --- head/sys/dev/adb/adb_mouse.c Tue Sep 1 21:34:04 2020 (r365098) +++ head/sys/dev/adb/adb_mouse.c Tue Sep 1 21:34:24 2020 (r365099) @@ -107,7 +107,6 @@ static device_method_t adb_mouse_methods[] = { /* ADB interface */ DEVMETHOD(adb_receive_packet, adb_mouse_receive_packet), - { 0, 0 } }; @@ -145,7 +144,7 @@ adb_mouse_probe(device_t dev) device_set_desc(dev,"ADB Mouse"); return (0); } - + static int adb_mouse_attach(device_t dev) { @@ -509,13 +508,11 @@ ams_read(struct cdev *dev, struct uio *uio, int flag) if (!sc->packet_read_len) { if (sc->xdelta == 0 && sc->ydelta == 0 && sc->buttons == sc->last_buttons) { - if (flag & O_NONBLOCK) { mtx_unlock(&sc->sc_mtx); return EWOULDBLOCK; } - /* Otherwise, block on new data */ error = cv_wait_sig(&sc->sc_cv, &sc->sc_mtx); if (error) { @@ -557,7 +554,6 @@ ams_read(struct cdev *dev, struct uio *uio, int flag) sc->packet[7] = ~((uint8_t)(sc->buttons >> 3)) & 0x7f; - sc->last_buttons = sc->buttons; sc->xdelta = 0; sc->ydelta = 0; @@ -579,7 +575,6 @@ ams_read(struct cdev *dev, struct uio *uio, int flag) return (error); } - static int ams_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *p) @@ -616,12 +611,12 @@ ams_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, sc->mode.packetsize = 5; break; } - + return EINVAL; case MOUSE_GETLEVEL: *(int *)addr = sc->mode.level; break; - + case MOUSE_GETSTATUS: { mousestatus_t *status = (mousestatus_t *) addr; @@ -646,7 +641,6 @@ ams_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, sc->last_buttons = sc->buttons; mtx_unlock(&sc->sc_mtx); - break; } default: return ENOTTY; Modified: head/sys/dev/adb/adbvar.h ============================================================================== --- head/sys/dev/adb/adbvar.h Tue Sep 1 21:34:04 2020 (r365098) +++ head/sys/dev/adb/adbvar.h Tue Sep 1 21:34:24 2020 (r365099) @@ -36,13 +36,12 @@ enum { ADB_COMMAND_BUS_RESET = 0 }; - struct adb_softc { device_t sc_dev; device_t parent; struct intr_config_hook enum_hook; - + volatile int sync_packet; volatile int packet_reply; From owner-svn-src-all@freebsd.org Tue Sep 1 21:34:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A4AE637A5FF; Tue, 1 Sep 2020 21:34:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0hd3zLlz4NCn; Tue, 1 Sep 2020 21:34:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6CA061FEB7; Tue, 1 Sep 2020 21:34:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LYfti032050; Tue, 1 Sep 2020 21:34:41 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LYfag032049; Tue, 1 Sep 2020 21:34:41 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012134.081LYfag032049@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:34:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365100 - head/sys/dev/adlink X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/adlink X-SVN-Commit-Revision: 365100 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:34:41 -0000 Author: mjg Date: Tue Sep 1 21:34:41 2020 New Revision: 365100 URL: https://svnweb.freebsd.org/changeset/base/365100 Log: adlink: clean up empty lines in .c and .h files Modified: head/sys/dev/adlink/adlink.c Modified: head/sys/dev/adlink/adlink.c ============================================================================== --- head/sys/dev/adlink/adlink.c Tue Sep 1 21:34:24 2020 (r365099) +++ head/sys/dev/adlink/adlink.c Tue Sep 1 21:34:41 2020 (r365100) @@ -199,7 +199,7 @@ adlink_ioctl(struct cdev *dev, u_long cmd, caddr_t dat u_int u; struct pgstat *pg; uint64_t *sample; - + sc = dev->si_drv1; u = *(u_int*)data; error = 0; @@ -430,7 +430,7 @@ static device_method_t adlink_methods[] = { DEVMETHOD_END }; - + static driver_t adlink_driver = { "adlink", adlink_methods, From owner-svn-src-all@freebsd.org Tue Sep 1 21:34:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 64A5E37A4DC; Tue, 1 Sep 2020 21:34:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0hz1qTxz4NDf; Tue, 1 Sep 2020 21:34:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21CFF1FE74; Tue, 1 Sep 2020 21:34:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LYxSV032110; Tue, 1 Sep 2020 21:34:59 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LYwd6032109; Tue, 1 Sep 2020 21:34:58 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012134.081LYwd6032109@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:34:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365101 - head/sys/dev/ae X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ae X-SVN-Commit-Revision: 365101 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:34:59 -0000 Author: mjg Date: Tue Sep 1 21:34:58 2020 New Revision: 365101 URL: https://svnweb.freebsd.org/changeset/base/365101 Log: if_ae: clean up empty lines in .c and .h files Modified: head/sys/dev/ae/if_ae.c head/sys/dev/ae/if_aevar.h Modified: head/sys/dev/ae/if_ae.c ============================================================================== --- head/sys/dev/ae/if_ae.c Tue Sep 1 21:34:41 2020 (r365100) +++ head/sys/dev/ae/if_ae.c Tue Sep 1 21:34:58 2020 (r365101) @@ -166,7 +166,6 @@ static device_method_t ae_methods[] = { DEVMETHOD(miibus_readreg, ae_miibus_readreg), DEVMETHOD(miibus_writereg, ae_miibus_writereg), DEVMETHOD(miibus_statchg, ae_miibus_statchg), - { NULL, NULL } }; static driver_t ae_driver = { @@ -314,7 +313,7 @@ ae_attach(device_t dev) goto fail; } } - + ae_init_tunables(sc); ae_phy_reset(sc); /* Reset PHY. */ @@ -399,7 +398,7 @@ ae_attach(device_t dev) fail: if (error != 0) ae_detach(dev); - + return (error); } @@ -503,7 +502,7 @@ ae_reset(ae_softc_t *sc) AE_WRITE_4(sc, AE_MASTER_REG, AE_MASTER_SOFT_RESET); bus_barrier(sc->mem[0], AE_MASTER_REG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - + /* * Wait for reset to complete. */ @@ -1022,7 +1021,7 @@ ae_get_vpd_eaddr(ae_softc_t *sc, uint32_t *eaddr) if (found < 2) return (ENOENT); - + eaddr[1] &= 0xffff; /* Only last 2 bytes are used. */ if (AE_CHECK_EADDR_VALID(eaddr) != 0) { if (bootverbose) @@ -1288,7 +1287,7 @@ static void ae_powersave_disable(ae_softc_t *sc) { uint32_t val; - + AE_LOCK_ASSERT(sc); AE_PHY_WRITE(sc, AE_PHY_DBG_ADDR, 0); @@ -1304,7 +1303,7 @@ static void ae_powersave_enable(ae_softc_t *sc) { uint32_t val; - + AE_LOCK_ASSERT(sc); /* @@ -1430,7 +1429,7 @@ static unsigned int ae_tx_avail_size(ae_softc_t *sc) { unsigned int avail; - + if (sc->txd_cur >= sc->txd_ack) avail = AE_TXD_BUFSIZE_DEFAULT - (sc->txd_cur - sc->txd_ack); else @@ -1451,7 +1450,7 @@ ae_encap(ae_softc_t *sc, struct mbuf **m_head) m0 = *m_head; len = m0->m_pkthdr.len; - + if ((sc->flags & AE_FLAG_TXAVAIL) == 0 || len + sizeof(ae_txd_t) + 3 > ae_tx_avail_size(sc)) { #ifdef AE_DEBUG @@ -1599,7 +1598,7 @@ ae_link_task(void *arg, int pending) AE_UNLOCK(sc); /* XXX: could happen? */ return; } - + sc->flags &= ~AE_FLAG_LINK; if ((mii->mii_media_status & (IFM_AVALID | IFM_ACTIVE)) == (IFM_AVALID | IFM_ACTIVE)) { Modified: head/sys/dev/ae/if_aevar.h ============================================================================== --- head/sys/dev/ae/if_aevar.h Tue Sep 1 21:34:41 2020 (r365100) +++ head/sys/dev/ae/if_aevar.h Tue Sep 1 21:34:58 2020 (r365101) @@ -123,7 +123,7 @@ typedef struct ae_softc { struct task int_task; struct task link_task; struct taskqueue *tq; - + /* DMA tags. */ bus_dma_tag_t dma_parent_tag; bus_dma_tag_t dma_rxd_tag; @@ -136,7 +136,7 @@ typedef struct ae_softc { bus_addr_t dma_rxd_busaddr; bus_addr_t dma_txd_busaddr; bus_addr_t dma_txs_busaddr; - + char *rxd_base_dma; /* Start of allocated area. */ ae_rxd_t *rxd_base; /* Start of RxD ring. */ char *txd_base; /* Start of TxD ring. */ From owner-svn-src-all@freebsd.org Tue Sep 1 21:35:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 39BFC37AA83; Tue, 1 Sep 2020 21:35:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0jH0rp6z4Nb8; Tue, 1 Sep 2020 21:35:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 01D771FFD6; Tue, 1 Sep 2020 21:35:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LZEYR032181; Tue, 1 Sep 2020 21:35:14 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LZEiL032180; Tue, 1 Sep 2020 21:35:14 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012135.081LZEiL032180@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:35:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365102 - head/sys/dev/age X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/age X-SVN-Commit-Revision: 365102 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:35:15 -0000 Author: mjg Date: Tue Sep 1 21:35:14 2020 New Revision: 365102 URL: https://svnweb.freebsd.org/changeset/base/365102 Log: if_age: clean up empty lines in .c and .h files Modified: head/sys/dev/age/if_age.c head/sys/dev/age/if_agevar.h Modified: head/sys/dev/age/if_age.c ============================================================================== --- head/sys/dev/age/if_age.c Tue Sep 1 21:34:58 2020 (r365101) +++ head/sys/dev/age/if_age.c Tue Sep 1 21:35:14 2020 (r365102) @@ -156,7 +156,6 @@ static int sysctl_int_range(SYSCTL_HANDLER_ARGS, int, static int sysctl_hw_age_proc_limit(SYSCTL_HANDLER_ARGS); static int sysctl_hw_age_int_mod(SYSCTL_HANDLER_ARGS); - static device_method_t age_methods[] = { /* Device interface. */ DEVMETHOD(device_probe, age_probe), @@ -170,7 +169,6 @@ static device_method_t age_methods[] = { DEVMETHOD(miibus_readreg, age_miibus_readreg), DEVMETHOD(miibus_writereg, age_miibus_writereg), DEVMETHOD(miibus_statchg, age_miibus_statchg), - { NULL, NULL } }; @@ -565,7 +563,6 @@ age_attach(device_t dev) device_printf(dev, "cannot allocate IRQ resources.\n"); goto fail; } - /* Get DMA parameters from PCIe device control register. */ if (pci_find_cap(dev, PCIY_EXPRESS, &i) == 0) { Modified: head/sys/dev/age/if_agevar.h ============================================================================== --- head/sys/dev/age/if_agevar.h Tue Sep 1 21:34:58 2020 (r365101) +++ head/sys/dev/age/if_agevar.h Tue Sep 1 21:35:14 2020 (r365102) @@ -249,7 +249,6 @@ struct age_softc { #define AGE_UNLOCK(_sc) mtx_unlock(&(_sc)->age_mtx) #define AGE_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->age_mtx, MA_OWNED) - #define AGE_COMMIT_MBOX(_sc) \ do { \ CSR_WRITE_4(_sc, AGE_MBOX, \ From owner-svn-src-all@freebsd.org Tue Sep 1 21:35:42 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 038D837A6BE; Tue, 1 Sep 2020 21:35:42 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0jn6Kjlz4Ngt; Tue, 1 Sep 2020 21:35:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDD252000B; Tue, 1 Sep 2020 21:35:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LZfuN032253; Tue, 1 Sep 2020 21:35:41 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LZdwp032242; Tue, 1 Sep 2020 21:35:39 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012135.081LZdwp032242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:35:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365103 - head/sys/dev/agp X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/agp X-SVN-Commit-Revision: 365103 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:35:42 -0000 Author: mjg Date: Tue Sep 1 21:35:39 2020 New Revision: 365103 URL: https://svnweb.freebsd.org/changeset/base/365103 Log: agp: clean up empty lines in .c and .h files Modified: head/sys/dev/agp/agp.c head/sys/dev/agp/agp_ali.c head/sys/dev/agp/agp_amd.c head/sys/dev/agp/agp_amd64.c head/sys/dev/agp/agp_apple.c head/sys/dev/agp/agp_ati.c head/sys/dev/agp/agp_i810.c head/sys/dev/agp/agp_intel.c head/sys/dev/agp/agp_nvidia.c head/sys/dev/agp/agp_sis.c head/sys/dev/agp/agp_via.c Modified: head/sys/dev/agp/agp.c ============================================================================== --- head/sys/dev/agp/agp.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp.c Tue Sep 1 21:35:39 2020 (r365103) @@ -93,7 +93,6 @@ agp_find_caps(device_t dev) { int capreg; - if (pci_find_cap(dev, PCIY_AGP, &capreg) != 0) capreg = 0; return (capreg); @@ -357,7 +356,7 @@ agp_v3_enable(device_t dev, device_t mdev, u_int32_t m fw = (AGP_MODE_GET_FW(tstatus) & AGP_MODE_GET_FW(mstatus) & AGP_MODE_GET_FW(mode)); - + /* Figure out the max rate */ rate = (AGP_MODE_GET_RATE(tstatus) & AGP_MODE_GET_RATE(mstatus) @@ -563,7 +562,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memor i = 0; goto bad; } - + /* * Bind the individual pages and flush the chipset's * TLB. @@ -637,7 +636,6 @@ agp_generic_unbind_memory(device_t dev, struct agp_mem mtx_unlock(&sc->as_lock); return EINVAL; } - /* * Unbind the individual pages and flush the chipset's Modified: head/sys/dev/agp/agp_ali.c ============================================================================== --- head/sys/dev/agp/agp_ali.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_ali.c Tue Sep 1 21:35:39 2020 (r365103) @@ -130,7 +130,7 @@ agp_ali_attach(device_t dev) attbase = pci_read_config(dev, AGP_ALI_ATTBASE, 4); pci_write_config(dev, AGP_ALI_ATTBASE, gatt->ag_physical | (attbase & 0xfff), 4); - + /* Enable the TLB. */ pci_write_config(dev, AGP_ALI_TLBCTRL, 0x10, 1); @@ -256,7 +256,6 @@ static device_method_t agp_ali_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } }; Modified: head/sys/dev/agp/agp_amd.c ============================================================================== --- head/sys/dev/agp/agp_amd.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_amd.c Tue Sep 1 21:35:39 2020 (r365103) @@ -252,7 +252,7 @@ agp_amd_attach(device_t dev) /* Install the gatt. */ WRITE4(AGP_AMD751_ATTBASE, gatt->ag_pdir); - + /* Enable synchronisation between host and agp. */ pci_write_config(dev, AGP_AMD751_MODECTRL, @@ -281,10 +281,10 @@ agp_amd_detach(device_t dev) /* Disable the TLB.. */ WRITE2(AGP_AMD751_STATUS, READ2(AGP_AMD751_STATUS) & ~AGP_AMD751_STATUS_GCE); - + /* Disable host-agp sync */ pci_write_config(dev, AGP_AMD751_MODECTRL, 0x00, 1); - + /* Clear the GATT base */ WRITE4(AGP_AMD751_ATTBASE, 0); @@ -327,7 +327,7 @@ agp_amd_set_aperture(device_t dev, u_int32_t aperture) return EINVAL; vas = ffs(aperture / 32*1024*1024) - 1; - + /* * While the size register is bits 1-3 of APCTRL, bit 0 must be * set for the size value to be 'valid' @@ -395,7 +395,6 @@ static device_method_t agp_amd_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } }; Modified: head/sys/dev/agp/agp_amd64.c ============================================================================== --- head/sys/dev/agp/agp_amd64.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_amd64.c Tue Sep 1 21:35:39 2020 (r365103) @@ -499,7 +499,6 @@ static device_method_t agp_amd64_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } }; Modified: head/sys/dev/agp/agp_apple.c ============================================================================== --- head/sys/dev/agp/agp_apple.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_apple.c Tue Sep 1 21:35:39 2020 (r365103) @@ -155,7 +155,7 @@ agp_apple_attach(device_t dev) AGP_SET_APERTURE(dev, sc->aperture); /* XXX: U3 scratch page? */ - + /* Enable the aperture and TLB. */ AGP_FLUSH_TLB(dev); @@ -213,7 +213,7 @@ agp_apple_set_aperture(device_t dev, uint32_t aperture pci_write_config(dev, UNIN_AGP_GART_BASE, (sc->gatt->ag_physical & 0xfffff000) | aperture, 4); - + return (0); } @@ -281,7 +281,6 @@ static device_method_t agp_apple_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } }; Modified: head/sys/dev/agp/agp_ati.c ============================================================================== --- head/sys/dev/agp/agp_ati.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_ati.c Tue Sep 1 21:35:39 2020 (r365103) @@ -75,7 +75,6 @@ struct agp_ati_softc { vm_offset_t ag_pdir; /* physical address of page dir */ }; - static const char* agp_ati_match(device_t dev) { @@ -167,7 +166,6 @@ agp_ati_alloc_gatt(device_t dev) return 0; } - static int agp_ati_attach(device_t dev) { @@ -369,7 +367,6 @@ static device_method_t agp_ati_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } }; Modified: head/sys/dev/agp/agp_i810.c ============================================================================== --- head/sys/dev/agp/agp_i810.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_i810.c Tue Sep 1 21:35:39 2020 (r365103) @@ -1216,7 +1216,7 @@ agp_i830_install_gatt_init(struct agp_i810_softc *sc) pgtblctl = bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL); pgtblctl |= 1; bus_write_4(sc->sc_res[0], AGP_I810_PGTBL_CTL, pgtblctl); - + sc->gatt->ag_physical = pgtblctl & ~1; } @@ -1412,7 +1412,7 @@ agp_i810_set_aperture(device_t dev, u_int32_t aperture miscc |= AGP_I810_MISCC_WINSIZE_32; else miscc |= AGP_I810_MISCC_WINSIZE_64; - + pci_write_config(sc->bdev, AGP_I810_MISCC, miscc, 2); return (0); } @@ -1915,7 +1915,6 @@ static device_method_t agp_i810_methods[] = { DEVMETHOD(agp_bind_memory, agp_i810_bind_memory), DEVMETHOD(agp_unbind_memory, agp_i810_unbind_memory), DEVMETHOD(agp_chipset_flush, agp_intel_gtt_chipset_flush), - { 0, 0 } }; Modified: head/sys/dev/agp/agp_intel.c ============================================================================== --- head/sys/dev/agp/agp_intel.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_intel.c Tue Sep 1 21:35:39 2020 (r365103) @@ -312,7 +312,7 @@ agp_intel_resume(device_t dev) { struct agp_intel_softc *sc; sc = device_get_softc(dev); - + AGP_SET_APERTURE(dev, sc->current_aperture); agp_intel_commit_gatt(dev); return (bus_generic_resume(dev)); @@ -422,7 +422,6 @@ static device_method_t agp_intel_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } }; Modified: head/sys/dev/agp/agp_nvidia.c ============================================================================== --- head/sys/dev/agp/agp_nvidia.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_nvidia.c Tue Sep 1 21:35:39 2020 (r365103) @@ -437,7 +437,6 @@ static device_method_t agp_nvidia_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } }; Modified: head/sys/dev/agp/agp_sis.c ============================================================================== --- head/sys/dev/agp/agp_sis.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_sis.c Tue Sep 1 21:35:39 2020 (r365103) @@ -155,7 +155,7 @@ agp_sis_attach(device_t dev) /* Install the gatt. */ pci_write_config(dev, AGP_SIS_ATTBASE, gatt->ag_physical, 4); - + /* Enable the aperture. */ pci_write_config(dev, AGP_SIS_WINCTRL, pci_read_config(dev, AGP_SIS_WINCTRL, 1) | 3, 1); @@ -218,7 +218,7 @@ agp_sis_set_aperture(device_t dev, u_int32_t aperture) return EINVAL; gws = ffs(aperture / 4*1024*1024) - 1; - + pci_write_config(dev, AGP_SIS_WINCTRL, ((pci_read_config(dev, AGP_SIS_WINCTRL, 1) & ~0x70) | gws << 4), 1); @@ -276,7 +276,6 @@ static device_method_t agp_sis_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } }; Modified: head/sys/dev/agp/agp_via.c ============================================================================== --- head/sys/dev/agp/agp_via.c Tue Sep 1 21:35:14 2020 (r365102) +++ head/sys/dev/agp/agp_via.c Tue Sep 1 21:35:39 2020 (r365103) @@ -176,7 +176,7 @@ agp_via_attach(device_t dev) if ((agpsel & (1 << 1)) == 0) sc->regs = via_v3_regs; } - + error = agp_generic_attach(dev); if (error) return error; @@ -388,7 +388,7 @@ agp_via_flush_tlb(device_t dev) ~(1 << 7), 4); pci_write_config(dev, sc->regs[REG_GARTCTRL], gartctrl, 4); } - + } static device_method_t agp_via_methods[] = { @@ -411,7 +411,6 @@ static device_method_t agp_via_methods[] = { DEVMETHOD(agp_free_memory, agp_generic_free_memory), DEVMETHOD(agp_bind_memory, agp_generic_bind_memory), DEVMETHOD(agp_unbind_memory, agp_generic_unbind_memory), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:36:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3103E37AAC6; Tue, 1 Sep 2020 21:36:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0kx0YDmz4NTG; Tue, 1 Sep 2020 21:36:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EB0D31FB5D; Tue, 1 Sep 2020 21:36:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LaeKV032359; Tue, 1 Sep 2020 21:36:40 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LaeQS032357; Tue, 1 Sep 2020 21:36:40 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012136.081LaeQS032357@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:36:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365104 - head/sys/dev/ahci X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ahci X-SVN-Commit-Revision: 365104 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:36:41 -0000 Author: mjg Date: Tue Sep 1 21:36:40 2020 New Revision: 365104 URL: https://svnweb.freebsd.org/changeset/base/365104 Log: ahci: clean up empty lines in .c and .h files Modified: head/sys/dev/ahci/ahci.c head/sys/dev/ahci/ahci.h head/sys/dev/ahci/ahci_pci.c Modified: head/sys/dev/ahci/ahci.c ============================================================================== --- head/sys/dev/ahci/ahci.c Tue Sep 1 21:35:39 2020 (r365103) +++ head/sys/dev/ahci/ahci.c Tue Sep 1 21:36:40 2020 (r365104) @@ -148,7 +148,6 @@ ahci_ctlr_reset(device_t dev) if ((ATA_INL(ctlr->r_mem, AHCI_VS) >= 0x00010200) && (ATA_INL(ctlr->r_mem, AHCI_CAP2) & AHCI_CAP2_BOH) && ((v = ATA_INL(ctlr->r_mem, AHCI_BOHC)) & AHCI_BOHC_OOS) == 0) { - /* Request OS ownership. */ ATA_OUTL(ctlr->r_mem, AHCI_BOHC, v | AHCI_BOHC_OOS); @@ -192,7 +191,6 @@ ahci_ctlr_reset(device_t dev) return (0); } - int ahci_attach(device_t dev) Modified: head/sys/dev/ahci/ahci.h ============================================================================== --- head/sys/dev/ahci/ahci.h Tue Sep 1 21:35:39 2020 (r365103) +++ head/sys/dev/ahci/ahci.h Tue Sep 1 21:36:40 2020 (r365104) @@ -679,4 +679,3 @@ struct ahci_channel * ahci_getch(device_t dev, int n); void ahci_putch(struct ahci_channel *ch); extern devclass_t ahci_devclass; - Modified: head/sys/dev/ahci/ahci_pci.c ============================================================================== --- head/sys/dev/ahci/ahci_pci.c Tue Sep 1 21:35:39 2020 (r365103) +++ head/sys/dev/ahci/ahci_pci.c Tue Sep 1 21:36:40 2020 (r365104) @@ -545,7 +545,6 @@ ahci_pci_attach(device_t dev) } } - if (ctlr->quirks & AHCI_Q_NOMSIX) msix_count = 0; From owner-svn-src-all@freebsd.org Tue Sep 1 21:37:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5340E37A6E7; Tue, 1 Sep 2020 21:37:18 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0ld6Yf4z4Np6; Tue, 1 Sep 2020 21:37:17 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0F0A1FCEE; Tue, 1 Sep 2020 21:37:17 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LbHsM032443; Tue, 1 Sep 2020 21:37:17 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LbF3B032431; Tue, 1 Sep 2020 21:37:15 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012137.081LbF3B032431@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:37:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365105 - in head/sys/dev/aic7xxx: . aicasm X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/aic7xxx: . aicasm X-SVN-Commit-Revision: 365105 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:37:18 -0000 Author: mjg Date: Tue Sep 1 21:37:14 2020 New Revision: 365105 URL: https://svnweb.freebsd.org/changeset/base/365105 Log: aic7xxx: clean up empty lines in .c and .h files Modified: head/sys/dev/aic7xxx/ahc_isa.c head/sys/dev/aic7xxx/ahc_pci.c head/sys/dev/aic7xxx/ahd_pci.c head/sys/dev/aic7xxx/aic7770.c head/sys/dev/aic7xxx/aic79xx.c head/sys/dev/aic7xxx/aic79xx_inline.h head/sys/dev/aic7xxx/aic79xx_osm.c head/sys/dev/aic7xxx/aic79xx_osm.h head/sys/dev/aic7xxx/aic79xx_pci.c head/sys/dev/aic7xxx/aic79xx_reg.h head/sys/dev/aic7xxx/aic79xx_reg_print.c head/sys/dev/aic7xxx/aic7xxx.c head/sys/dev/aic7xxx/aic7xxx_inline.h head/sys/dev/aic7xxx/aic7xxx_osm.c head/sys/dev/aic7xxx/aic7xxx_pci.c head/sys/dev/aic7xxx/aic7xxx_reg.h head/sys/dev/aic7xxx/aic7xxx_reg_print.c head/sys/dev/aic7xxx/aic_osm_lib.c head/sys/dev/aic7xxx/aic_osm_lib.h head/sys/dev/aic7xxx/aicasm/aicasm.c head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c Modified: head/sys/dev/aic7xxx/ahc_isa.c ============================================================================== --- head/sys/dev/aic7xxx/ahc_isa.c Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/ahc_isa.c Tue Sep 1 21:37:14 2020 (r365105) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include /* For CHAR_BIT*/ #include /* For ISA attach glue */ - static struct aic7770_identity *ahc_isa_find_device(bus_space_tag_t tag, bus_space_handle_t bsh); static void ahc_isa_identify(driver_t *driver, Modified: head/sys/dev/aic7xxx/ahc_pci.c ============================================================================== --- head/sys/dev/aic7xxx/ahc_pci.c Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/ahc_pci.c Tue Sep 1 21:37:14 2020 (r365105) @@ -165,7 +165,6 @@ ahc_pci_map_registers(struct ahc_softc *ahc) } if (allow_memio != 0) { - regs_type = SYS_RES_MEMORY; regs_id = AHC_PCI_MEMADDR; regs = bus_alloc_resource_any(ahc->dev_softc, regs_type, Modified: head/sys/dev/aic7xxx/ahd_pci.c ============================================================================== --- head/sys/dev/aic7xxx/ahd_pci.c Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/ahd_pci.c Tue Sep 1 21:37:14 2020 (r365105) @@ -165,7 +165,6 @@ ahd_pci_map_registers(struct ahd_softc *ahd) if ((ahd->bugs & AHD_PCIX_MMAPIO_BUG) == 0 && allow_memio != 0) { - regs_type = SYS_RES_MEMORY; regs_id = AHD_PCI_MEMADDR; regs = bus_alloc_resource_any(ahd->dev_softc, regs_type, Modified: head/sys/dev/aic7xxx/aic7770.c ============================================================================== --- head/sys/dev/aic7xxx/aic7770.c Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/aic7770.c Tue Sep 1 21:37:14 2020 (r365105) @@ -323,7 +323,6 @@ aha2840_load_seeprom(struct ahc_softc *ahc) /*start_addr*/0, sizeof(*sc)/2); if (have_seeprom) { - if (ahc_verify_cksum(sc) == 0) { if(bootverbose) printf ("checksum error\n"); Modified: head/sys/dev/aic7xxx/aic79xx.c ============================================================================== --- head/sys/dev/aic7xxx/aic79xx.c Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/aic79xx.c Tue Sep 1 21:37:14 2020 (r365105) @@ -487,7 +487,6 @@ rescan_fifos: * if this if for an SCB in the qinfifo. */ while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) { - if ((ccscbctl & (CCSCBDIR|CCARREN)) == (CCSCBDIR|CCARREN)) { if ((ccscbctl & ARRDONE) != 0) break; @@ -542,7 +541,6 @@ rescan_fifos: scbid = ahd_inw(ahd, COMPLETE_ON_QFREEZE_HEAD); while (!SCBID_IS_NULL(scbid)) { - ahd_set_scbptr(ahd, scbid); next_scbid = ahd_inw_scbram(ahd, SCB_NEXT_COMPLETE); scb = ahd_lookup_scb(ahd, scbid); @@ -560,7 +558,6 @@ rescan_fifos: scbid = ahd_inw(ahd, COMPLETE_SCB_HEAD); while (!SCBID_IS_NULL(scbid)) { - ahd_set_scbptr(ahd, scbid); next_scbid = ahd_inw_scbram(ahd, SCB_NEXT_COMPLETE); scb = ahd_lookup_scb(ahd, scbid); @@ -762,7 +759,6 @@ ahd_run_data_fifo(struct ahd_softc *ahd, struct scb *s */ if ((ahd_inb(ahd, DFSTATUS) & PRELOAD_AVAIL) != 0 && (ahd_inb(ahd, DFCNTRL) & HDMAENACK) != 0) { - /* * Determine the offset of the next S/G * element to load. @@ -819,7 +815,6 @@ ahd_run_data_fifo(struct ahd_softc *ahd, struct scb *s ahd_outb(ahd, DFCNTRL, dfcntrl); } } else if ((ahd_inb(ahd, SG_CACHE_SHADOW) & LAST_SEG_DONE) != 0) { - /* * Transfer completed to the end of SG list * and has flushed to the host. @@ -1582,24 +1577,20 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intsta ahd_setup_iocell_workaround(ahd); ahd_unpause(ahd); } else if ((status0 & OVERRUN) != 0) { - printf("%s: SCSI offset overrun detected. Resetting bus.\n", ahd_name(ahd)); AHD_CORRECTABLE_ERROR(ahd); ahd_reset_channel(ahd, 'A', /*Initiate Reset*/TRUE); } else if ((status & SCSIRSTI) != 0) { - printf("%s: Someone reset channel A\n", ahd_name(ahd)); ahd_reset_channel(ahd, 'A', /*Initiate Reset*/FALSE); AHD_UNCORRECTABLE_ERROR(ahd); } else if ((status & SCSIPERR) != 0) { - /* Make sure the sequencer is in a safe location. */ ahd_clear_critical_section(ahd); ahd_handle_transmission_error(ahd); } else if (lqostat0 != 0) { - printf("%s: lqostat0 == 0x%x!\n", ahd_name(ahd), lqostat0); ahd_outb(ahd, CLRLQOINT0, lqostat0); if ((ahd->bugs & AHD_CLRLQO_AUTOCLR_BUG) != 0) @@ -1666,7 +1657,6 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intsta ahd_iocell_first_selection(ahd); ahd_unpause(ahd); } else if ((status0 & (SELDI|SELDO)) != 0) { - ahd_iocell_first_selection(ahd); ahd_unpause(ahd); } else if (status3 != 0) { @@ -1675,7 +1665,6 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intsta AHD_CORRECTABLE_ERROR(ahd); ahd_outb(ahd, CLRSINT3, status3); } else if ((lqistat1 & (LQIPHASE_LQ|LQIPHASE_NLQ)) != 0) { - /* Make sure the sequencer is in a safe location. */ ahd_clear_critical_section(ahd); @@ -1852,7 +1841,7 @@ ahd_handle_transmission_error(struct ahd_softc *ahd) perrdiag = ahd_inb(ahd, PERRDIAG); msg_out = MSG_INITIATOR_DET_ERR; ahd_outb(ahd, CLRSINT1, CLRSCSIPERR); - + /* * Try to find the SCB associated with this error. */ @@ -1980,7 +1969,7 @@ ahd_handle_transmission_error(struct ahd_softc *ahd) ahd_lookup_phase_entry(curphase)->phasemsg); ahd_inb(ahd, SCSIDAT); } - + if (curphase == P_MESGIN) msg_out = MSG_PARITY_ERROR; } @@ -2106,7 +2095,6 @@ ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int bu waiting_h = ahd_inw(ahd, WAITING_TID_HEAD); saved_scbptr = ahd_get_scbptr(ahd); if (waiting_h != scbid) { - ahd_outw(ahd, WAITING_TID_HEAD, scbid); waiting_t = ahd_inw(ahd, WAITING_TID_TAIL); if (waiting_t == waiting_h) { @@ -2378,7 +2366,6 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) } else if ((ahd->msg_flags & MSG_FLAG_EXPECT_IDE_BUSFREE) != 0 && ahd_sent_msg(ahd, AHDMSG_1B, MSG_INITIATOR_DET_ERR, TRUE)) { - #ifdef AHD_DEBUG if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) printf("Expected IDE Busfree\n"); @@ -2387,7 +2374,6 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) } else if ((ahd->msg_flags & MSG_FLAG_EXPECT_QASREJ_BUSFREE) && ahd_sent_msg(ahd, AHDMSG_1B, MSG_MESSAGE_REJECT, TRUE)) { - #ifdef AHD_DEBUG if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) printf("Expected QAS Reject Busfree\n"); @@ -2404,7 +2390,6 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) if (printerror != 0 && (lastphase == P_MESGIN || lastphase == P_MESGOUT) && ((ahd->msg_flags & MSG_FLAG_EXPECT_PPR_BUSFREE) != 0)) { - ahd_freeze_devq(ahd, scb); aic_set_transaction_status(scb, CAM_REQUEUE_REQ); aic_freeze_scb(scb); @@ -2477,7 +2462,6 @@ ahd_handle_proto_violation(struct ahd_softc *ahd) curphase = ahd_inb(ahd, SCSISIGI) & PHASE_MASK; lastphase = ahd_inb(ahd, LASTPHASE); if ((seq_flags & NOT_IDENTIFIED) != 0) { - /* * The reconnecting target either did not send an * identify message, or did, but we didn't find an SCB @@ -2650,7 +2634,6 @@ ahd_clear_critical_section(struct ahd_softc *ahd) seqaddr); #endif if (stepping == FALSE) { - first_instr = seqaddr; ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG); simode0 = ahd_inb(ahd, SIMODE0); @@ -3116,7 +3099,6 @@ ahd_set_syncrate(struct ahd_softc *ahd, struct ahd_dev && (old_period != period || old_offset != offset || old_ppr != ppr_options)) { - update_needed++; tinfo->curr.period = period; @@ -3241,7 +3223,6 @@ ahd_set_width(struct ahd_softc *ahd, struct ahd_devinf oldwidth = tinfo->curr.width; if ((type & AHD_TRANS_CUR) != 0 && oldwidth != width) { - update_needed++; tinfo->curr.width = width; @@ -3307,7 +3288,6 @@ ahd_update_neg_table(struct ahd_softc *ahd, struct ahd if (period == 0) period = AHD_SYNCRATE_ASYNC; if (period == AHD_SYNCRATE_160) { - if ((ahd->bugs & AHD_PACED_NEGTABLE_BUG) != 0) { /* * When the SPI4 spec was finalized, PACE transfers @@ -3564,7 +3544,6 @@ ahd_scb_devinfo(struct ahd_softc *ahd, struct ahd_devi SCB_GET_LUN(scb), SCB_GET_CHANNEL(ahd, scb), role); } - /************************ Message Phase Processing ****************************/ /* * When an initiator transaction with the MK_MESSAGE flag either reconnects @@ -3641,7 +3620,6 @@ ahd_setup_initiator_msgout(struct ahd_softc *ahd, stru */ ahd_outb(ahd, SCSISEQ0, 0); } else if ((scb->flags & SCB_ABORT) != 0) { - if ((scb->hscb->control & TAG_ENB) != 0) { ahd->msgout_buf[ahd->msgout_index++] = MSG_ABORT_TAG; } else { @@ -3772,7 +3750,6 @@ ahd_build_transfer_msg(struct ahd_softc *ahd, struct a * messages that WDTR comes first. */ if (doppr || (dosync && !dowide)) { - offset = tinfo->goal.offset; ahd_validate_offset(ahd, tinfo, period, &offset, doppr ? tinfo->goal.width @@ -4110,7 +4087,6 @@ reswitch: msgout_request = FALSE; if (msgout_request) { - /* * Change gears and see if * this messages is of interest to @@ -4254,7 +4230,6 @@ ahd_sent_msg(struct ahd_softc *ahd, ahd_msgtype type, end_index = index + 1 + ahd->msgout_buf[index + 1]; if (ahd->msgout_buf[index+2] == msgval && type == AHDMSG_EXT) { - if (full) { if (ahd->msgout_index > end_index) found = TRUE; @@ -4264,7 +4239,6 @@ ahd_sent_msg(struct ahd_softc *ahd, ahd_msgtype type, index = end_index; } else if (ahd->msgout_buf[index] >= MSG_SIMPLE_TASK && ahd->msgout_buf[index] <= MSG_IGN_WIDE_RESIDUE) { - /* Skip tag type and tag id or residue param*/ index += 2; } else { @@ -4495,7 +4469,6 @@ ahd_parse_msg(struct ahd_softc *ahd, struct ahd_devinf AHD_TRANS_ACTIVE|AHD_TRANS_GOAL, /*paused*/TRUE); if (sending_reply == FALSE && reject == FALSE) { - /* * We will always have an SDTR to send. */ @@ -4768,7 +4741,6 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ah ahd->msgout_index = 0; response = 1; } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, /*full*/FALSE)) { - /* note 8bit xfers */ printf("(%s:%c:%d:%d): refuses WIDE negotiation. Using " "8bit transfers\n", ahd_name(ahd), @@ -4784,7 +4756,6 @@ ahd_handle_msg_reject(struct ahd_softc *ahd, struct ah * sync rate before sending our WDTR. */ if (tinfo->goal.offset != tinfo->curr.offset) { - /* Start the sync negotiation */ ahd->msgout_index = 0; ahd->msgout_len = 0; @@ -4947,7 +4918,6 @@ ahd_handle_ign_wide_residue(struct ahd_softc *ahd, str sglen = aic_le32toh(sg->len) & AHD_SG_LEN_MASK; if (sg != scb->sg_list && sglen < (data_cnt & AHD_SG_LEN_MASK)) { - sg--; sglen = aic_le32toh(sg->len); /* @@ -4980,7 +4950,6 @@ ahd_handle_ign_wide_residue(struct ahd_softc *ahd, str sglen = aic_le32toh(sg->len) & AHD_SG_LEN_MASK; if (sg != scb->sg_list && sglen < (data_cnt & AHD_SG_LEN_MASK)) { - sg--; sglen = aic_le32toh(sg->len); /* @@ -5021,7 +4990,6 @@ ahd_handle_ign_wide_residue(struct ahd_softc *ahd, str } } - /* * Reinitialize the data pointers for the active transfer * based on its current residual. @@ -5161,7 +5129,7 @@ ahd_handle_devreset(struct ahd_softc *ahd, struct ahd_ ahd_set_syncrate(ahd, devinfo, /*period*/0, /*offset*/0, /*ppr_options*/0, AHD_TRANS_CUR, /*paused*/TRUE); - + if (status != CAM_SEL_TIMEOUT) ahd_send_async(ahd, devinfo->channel, devinfo->target, lun, AC_SENT_BDR, NULL); @@ -5503,7 +5471,7 @@ ahd_reset(struct ahd_softc *ahd, int reinit) u_int sxfrctl1; int wait; uint32_t cmd; - + /* * Preserve the value of the SXFRCTL1 register for all channels. * It contains settings that affect termination and we don't want @@ -5978,7 +5946,6 @@ look_again: } } if ((scb = LIST_FIRST(&ahd->scb_data.any_dev_free_scb_list)) == NULL) { - if (tries++ != 0) return (NULL); if (ahd_alloc_scbs(ahd) == 0) @@ -6010,14 +5977,12 @@ ahd_free_scb(struct ahd_softc *ahd, struct scb *scb) ahd->scb_data.scbindex[SCB_GET_TAG(scb)] = NULL; if (scb->col_scb == NULL) { - /* * No collision possible. Just free normally. */ LIST_INSERT_HEAD(&ahd->scb_data.any_dev_free_scb_list, scb, links.le); } else if ((scb->col_scb->flags & SCB_ON_COL_LIST) != 0) { - /* * The SCB we might have collided with is on * a free collision list. Put both SCBs on @@ -6031,7 +5996,6 @@ ahd_free_scb(struct ahd_softc *ahd, struct scb *scb) } else if ((scb->col_scb->flags & (SCB_PACKETIZED|SCB_ACTIVE)) == SCB_ACTIVE && (scb->col_scb->hscb->control & TAG_ENB) != 0) { - /* * The SCB we might collide with on the next allocation * is still active in a non-packetized, tagged, context. @@ -7156,7 +7120,6 @@ ahd_pause_and_flushwork(struct ahd_softc *ahd) ahd_outw(ahd, KERNEL_QFREEZE_COUNT, ahd->qfreeze_cnt); ahd_outb(ahd, SEQ_FLAGS2, ahd_inb(ahd, SEQ_FLAGS2) | SELECTOUT_QFROZEN); do { - ahd_unpause(ahd); /* * Give the sequencer some time to service @@ -7317,7 +7280,7 @@ ahd_freeze_devq(struct ahd_softc *ahd, struct scb *scb target = SCB_GET_TARGET(ahd, scb); lun = SCB_GET_LUN(scb); channel = SCB_GET_CHANNEL(ahd, scb); - + ahd_search_qinfifo(ahd, target, channel, lun, /*tag*/SCB_LIST_NULL, ROLE_UNKNOWN, CAM_REQUEUE_REQ, SEARCH_COMPLETE); @@ -7586,7 +7549,6 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, if (mk_msg_scb != NULL && ahd_match_scb(ahd, mk_msg_scb, target, channel, lun, tag, role)) { - /* * We found an scb that needs to be acted on. */ @@ -7630,7 +7592,6 @@ ahd_search_qinfifo(struct ahd_softc *ahd, int target, && SCBID_IS_NULL(tid_head) && ahd_match_scb(ahd, scb, target, channel, CAM_LUN_WILDCARD, SCB_LIST_NULL, ROLE_UNKNOWN)) { - /* * When removing the last SCB for a target * queue with a pending MK_MESSAGE scb, we @@ -7730,7 +7691,6 @@ ahd_stitch_tid_list(struct ahd_softc *ahd, u_int tid_p AHD_ASSERT_MODES(ahd, AHD_MODE_SCSI_MSK, AHD_MODE_SCSI_MSK); if (SCBID_IS_NULL(tid_cur)) { - /* Bypass current TID list */ if (SCBID_IS_NULL(tid_prev)) { ahd_outw(ahd, WAITING_TID_HEAD, tid_next); @@ -7741,7 +7701,6 @@ ahd_stitch_tid_list(struct ahd_softc *ahd, u_int tid_p if (SCBID_IS_NULL(tid_next)) ahd_outw(ahd, WAITING_TID_TAIL, tid_prev); } else { - /* Stitch through tid_cur */ if (SCBID_IS_NULL(tid_prev)) { ahd_outw(ahd, WAITING_TID_HEAD, tid_cur); @@ -8029,7 +7988,6 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, */ max_scsiid = (ahd->features & AHD_WIDE) ? 15 : 7; for (target = 0; target <= max_scsiid; target++) { - if (ahd->enabled_targets[target] == NULL) continue; for (initiator = 0; initiator <= max_scsiid; initiator++) { @@ -8091,14 +8049,13 @@ ahd_reset_channel(struct ahd_softc *ahd, char channel, return (found); } - #define AHD_RESET_POLL_MS 1 static void ahd_reset_poll(void *arg) { struct ahd_softc *ahd = (struct ahd_softc *)arg; u_int scsiseq1; - + ahd_lock(ahd); ahd_pause(ahd); ahd_update_modes(ahd); @@ -8128,7 +8085,7 @@ ahd_stat_timer(void *arg) { struct ahd_softc *ahd = (struct ahd_softc *)arg; int enint_coal; - + ahd_lock(ahd); enint_coal = ahd->hs_mailbox & ENINT_COALESCE; if (ahd->cmdcmplt_total > ahd->int_coalescing_threshold) @@ -8238,7 +8195,6 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct s if (scsi_4btoul(siu->pkt_failures_length) < 4) { printf("Unable to parse pkt_failures\n"); } else { - switch (SIU_PKTFAIL_CODE(siu)) { case SIU_PFC_NONE: printf("No packet failure found\n"); @@ -8750,7 +8706,6 @@ ahd_loadseq(struct ahd_softc *ahd) ahd->num_critical_sections = cs_count; if (cs_count != 0) { - cs_count *= sizeof(struct cs); ahd->critical_sections = malloc(cs_count, M_DEVBUF, M_NOWAIT); if (ahd->critical_sections == NULL) @@ -8779,9 +8734,7 @@ ahd_check_patch(struct ahd_softc *ahd, struct patch ** cur_patch = *start_patch; while (cur_patch < last_patch && start_instr == cur_patch->begin) { - if (cur_patch->patch_func(ahd) == 0) { - /* Start rejecting code */ *skip_addr = start_instr + cur_patch->skip_instr; cur_patch += cur_patch->skip_patch; @@ -8815,7 +8768,6 @@ ahd_resolve_seqaddr(struct ahd_softc *ahd, u_int addre skip_addr = 0; for (i = 0; i < address;) { - ahd_check_patch(ahd, &cur_patch, i, &skip_addr); if (skip_addr > i) { @@ -9138,7 +9090,6 @@ ahd_dump_card_state(struct ahd_softc *ahd) } printf("\n"); - printf("Sequencer DMA-Up and Complete list: "); scb_index = ahd_inw(ahd, COMPLETE_DMA_SCB_HEAD); i = 0; @@ -9289,7 +9240,6 @@ ahd_dump_scbs(struct ahd_softc *ahd) ahd_restore_modes(ahd, saved_modes); } - /*************************** Timeout Handling *********************************/ void ahd_timeout(struct scb *scb) @@ -9403,9 +9353,7 @@ bus_reset: scb->flags &= ~SCB_TIMEDOUT; if (active_scb != NULL) { - if (active_scb != scb) { - /* * If the active SCB is not us, assume that * the active SCB has a longer timeout than @@ -9448,7 +9396,6 @@ bus_reset: SCB_GET_TAG(scb), ROLE_INITIATOR, /*status*/0, SEARCH_COUNT) > 0) { - /* * We haven't even gone out on the bus * yet, so the timeout must be due to @@ -9527,14 +9474,13 @@ bus_reset: break; } } - + /* * Any remaining SCBs were not the "culprit", so remove * them from the timeout list. The timer for these commands * will be reset once the recovery SCB completes. */ while ((scb = LIST_FIRST(&ahd->timedout_scbs)) != NULL) { - LIST_REMOVE(scb, timedout_links); scb->flags &= ~SCB_TIMEDOUT; } @@ -9617,7 +9563,6 @@ ahd_read_seeprom(struct ahd_softc *ahd, uint16_t *buf, AHD_ASSERT_MODES(ahd, AHD_MODE_SCSI_MSK, AHD_MODE_SCSI_MSK); end_addr = start_addr + count; for (cur_addr = start_addr; cur_addr < end_addr; cur_addr++) { - ahd_outb(ahd, SEEADR, cur_addr); ahd_outb(ahd, SEECTL, SEEOP_READ | SEESTART); @@ -10160,7 +10105,6 @@ ahd_handle_en_lun(struct ahd_softc *ahd, struct cam_si } } } else { - ahd->black_hole = NULL; /* @@ -10245,7 +10189,6 @@ ahd_run_tqinfifo(struct ahd_softc *ahd, int paused) ahd_sync_tqinfifo(ahd, BUS_DMASYNC_POSTREAD); while ((cmd = &ahd->targetcmds[ahd->tqinfifonext])->cmd_valid != 0) { - /* * Only advance through the queue if we * have the resources to process the command. @@ -10364,7 +10307,7 @@ ahd_handle_target_cmd(struct ahd_softc *ahd, struct ta printf("Reserved or VU command code type encountered\n"); break; } - + memcpy(atio->cdb_io.cdb_bytes, byte, atio->cdb_len); atio->ccb_h.status |= CAM_CDB_RECVD; Modified: head/sys/dev/aic7xxx/aic79xx_inline.h ============================================================================== --- head/sys/dev/aic7xxx/aic79xx_inline.h Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/aic79xx_inline.h Tue Sep 1 21:37:14 2020 (r365105) @@ -969,7 +969,6 @@ ahd_intr(struct ahd_softc *ahd) } else if ((intstat & (PCIINT|SPLTINT)) != 0) { ahd->bus_intr(ahd); } else { - if ((intstat & SEQINT) != 0) ahd_handle_seqint(ahd, intstat); Modified: head/sys/dev/aic7xxx/aic79xx_osm.c ============================================================================== --- head/sys/dev/aic7xxx/aic79xx_osm.c Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/aic79xx_osm.c Tue Sep 1 21:37:14 2020 (r365105) @@ -257,7 +257,7 @@ ahd_attach(struct ahd_softc *ahd) sim = NULL; goto fail; } - + if (xpt_create_path(&path, /*periph*/NULL, cam_sim_path(sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { @@ -287,7 +287,6 @@ fail: ahd_intr_enable(ahd, TRUE); } - return (count); } @@ -349,7 +348,6 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) ccb_path = ccb->ccb_h.path; if (ahd->pending_device != NULL && xpt_path_comp(ahd->pending_device->path, ccb_path) == 0) { - if ((ccb->ccb_h.flags & CAM_SEND_STATUS) != 0) { ahd->pending_device = NULL; } else { @@ -385,7 +383,6 @@ ahd_done(struct ahd_softc *ahd, struct scb *scb) */ LIST_FOREACH(list_scb, &ahd->pending_scbs, pending_links) { - aic_scb_timer_reset(list_scb, aic_get_timeout(scb)); } @@ -461,12 +458,12 @@ ahd_action(struct cam_sim *sim, union ccb *ccb) u_int our_id; CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("ahd_action\n")); - + ahd = (struct ahd_softc *)cam_sim_softc(sim); target_id = ccb->ccb_h.target_id; our_id = SIM_SCSI_ID(ahd, sim); - + switch (ccb->ccb_h.func_code) { /* Common cases first */ #ifdef AHD_TARGET_MODE @@ -491,7 +488,6 @@ ahd_action(struct cam_sim *sim, union ccb *ccb) } } if (ccb->ccb_h.func_code == XPT_ACCEPT_TARGET_IO) { - SLIST_INSERT_HEAD(&lstate->accept_tios, &ccb->ccb_h, sim_links.sle); ccb->ccb_h.status = CAM_REQ_INPROG; @@ -541,7 +537,6 @@ ahd_action(struct cam_sim *sim, union ccb *ccb) ccb->ccb_h.target_lun); } if ((scb = ahd_get_scb(ahd, col_idx)) == NULL) { - xpt_freeze_simq(sim, /*count*/1); ahd->flags |= AHD_RESOURCE_SHORTAGE; ccb->ccb_h.status = CAM_REQUEUE_REQ; @@ -721,7 +716,6 @@ ahd_action(struct cam_sim *sim, union ccb *ccb) } } - static void ahd_set_tran_settings(struct ahd_softc *ahd, int our_id, char channel, struct ccb_trans_settings *cts) @@ -764,14 +758,14 @@ ahd_set_tran_settings(struct ahd_softc *ahd, int our_i cts->ccb_h.status = CAM_REQ_INVALID; return; } - + if ((spi->valid & CTS_SPI_VALID_DISC) != 0) { if ((spi->flags & CTS_SPI_FLAGS_DISC_ENB) != 0) *discenable |= devinfo.target_mask; else *discenable &= ~devinfo.target_mask; } - + if ((scsi->valid & CTS_SCSI_VALID_TQ) != 0) { if ((scsi->flags & CTS_SCSI_FLAGS_TAG_ENB) != 0) *tagenable |= devinfo.target_mask; @@ -858,12 +852,12 @@ ahd_get_tran_settings(struct ahd_softc *ahd, int our_i targ_info = ahd_fetch_transinfo(ahd, devinfo.channel, devinfo.our_scsiid, devinfo.target, &tstate); - + if (cts->type == CTS_TYPE_CURRENT_SETTINGS) tinfo = &targ_info->curr; else tinfo = &targ_info->user; - + scsi->flags &= ~CTS_SCSI_FLAGS_TAG_ENB; spi->flags &= ~CTS_SPI_FLAGS_DISC_ENB; if (cts->type == CTS_TYPE_USER_SETTINGS) { @@ -886,7 +880,7 @@ ahd_get_tran_settings(struct ahd_softc *ahd, int our_i spi->sync_offset = tinfo->offset; spi->bus_width = tinfo->width; spi->ppr_options = tinfo->ppr_options; - + cts->protocol = PROTO_SCSI; cts->transport = XPORT_SPI; spi->valid = CTS_SPI_VALID_SYNC_RATE @@ -973,7 +967,6 @@ ahd_execute_scb(void *arg, bus_dma_segment_t *dm_segs, /* Copy the segments into our SG list */ for (i = nsegments, sg = scb->sg_list; i > 0; i--) { - sg = ahd_sg_setup(ahd, scb, sg, dm_segs->ds_addr, dm_segs->ds_len, /*last*/i == 1); @@ -1072,19 +1065,17 @@ ahd_setup_data(struct ahd_softc *ahd, struct cam_sim * struct hardware_scb *hscb; struct ccb_hdr *ccb_h; int error; - + hscb = scb->hscb; ccb_h = &csio->ccb_h; - + csio->resid = 0; csio->sense_resid = 0; if (ccb_h->func_code == XPT_SCSI_IO) { hscb->cdb_len = csio->cdb_len; if ((ccb_h->flags & CAM_CDB_POINTER) != 0) { - if (hscb->cdb_len > MAX_CDB_LEN && (ccb_h->flags & CAM_CDB_PHYS) == 0) { - /* * Should CAM start to support CDB sizes * greater than 16 bytes, we could use @@ -1109,7 +1100,6 @@ ahd_setup_data(struct ahd_softc *ahd, struct cam_sim * } } else { if (hscb->cdb_len > MAX_CDB_LEN) { - aic_set_transaction_status(scb, CAM_REQ_INVALID); ahd_free_scb(ahd, scb); @@ -1240,7 +1230,7 @@ ahd_send_async(struct ahd_softc *ahd, char channel, u_ case AC_TRANSFER_NEG: { struct ccb_trans_settings_scsi *scsi; - + cts.type = CTS_TYPE_CURRENT_SETTINGS; scsi = &cts.proto_specific.scsi; cts.ccb_h.path = path; @@ -1440,7 +1430,7 @@ DB_COMMAND(ahd_in, ahd_ddb_in) { int c; int size; - + if (ahd_ddb_softc == NULL) { db_error("Must set unit with ahd_sunit first!\n"); return; @@ -1487,7 +1477,7 @@ DB_FUNC(ahd_out, ahd_ddb_out, db_cmd_table, CS_MORE, N db_expr_t old_value; db_expr_t new_value; int size; - + if (ahd_ddb_softc == NULL) { db_error("Must set unit with ahd_sunit first!\n"); return; @@ -1508,7 +1498,7 @@ DB_FUNC(ahd_out, ahd_ddb_out, db_cmd_table, CS_MORE, N db_error("Unknown size\n"); return; } - + while (db_expression(&new_value)) { switch (size) { default: @@ -1543,7 +1533,6 @@ DB_COMMAND(ahd_dump, ahd_ddb_dump) } #endif - DECLARE_MODULE(ahd, ahd_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); MODULE_DEPEND(ahd, cam, 1, 1, 1); Modified: head/sys/dev/aic7xxx/aic79xx_osm.h ============================================================================== --- head/sys/dev/aic7xxx/aic79xx_osm.h Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/aic79xx_osm.h Tue Sep 1 21:37:14 2020 (r365105) @@ -257,7 +257,6 @@ void ahd_sysctl(struct ahd_softc *ahd); int ahd_detach(device_t); #define ahd_platform_init(arg) - /****************************** Interrupts ************************************/ void ahd_platform_intr(void *); static __inline void ahd_platform_flushwork(struct ahd_softc *ahd); Modified: head/sys/dev/aic7xxx/aic79xx_pci.c ============================================================================== --- head/sys/dev/aic7xxx/aic79xx_pci.c Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/aic79xx_pci.c Tue Sep 1 21:37:14 2020 (r365105) @@ -404,7 +404,7 @@ ahd_pci_config(struct ahd_softc *ahd, struct ahd_pci_i aic_pci_write_config(ahd->dev_softc, DEVCONFIG, devconfig, /*bytes*/4); } - + /* Ensure busmastering is enabled */ command = aic_pci_read_config(ahd->dev_softc, PCIR_COMMAND, /*bytes*/2); command |= PCIM_CMD_BUSMASTEREN; @@ -529,7 +529,6 @@ ahd_pci_test_register_access(struct ahd_softc *ahd) fail: if ((ahd_inb(ahd, INTSTAT) & PCIINT) != 0) { - ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG); targpcistat = ahd_inb(ahd, TARGPCISTAT); @@ -699,7 +698,7 @@ ahd_configure_termination(struct ahd_softc *ahd, u_int printf("%s: STPWLEVEL is %s\n", ahd_name(ahd), (devconfig & STPWLEVEL) ? "on" : "off"); aic_pci_write_config(ahd->dev_softc, DEVCONFIG, devconfig, /*bytes*/4); - + /* Make sure current sensing is off. */ if ((ahd->flags & AHD_CURRENT_SENSING) != 0) { (void)ahd_write_flexport(ahd, FLXADDR_ROMSTAT_CURSENSECTL, 0); @@ -836,7 +835,7 @@ ahd_pci_intr(struct ahd_softc *ahd) u_int intstat; u_int i; u_int reg; - + intstat = ahd_inb(ahd, INTSTAT); if ((intstat & SPLTINT) != 0) @@ -850,7 +849,6 @@ ahd_pci_intr(struct ahd_softc *ahd) ahd_dump_card_state(ahd); ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG); for (i = 0, reg = DF0PCISTAT; i < 8; i++, reg++) { - if (i == 5) continue; pci_status[i] = ahd_inb(ahd, reg); @@ -860,12 +858,11 @@ ahd_pci_intr(struct ahd_softc *ahd) for (i = 0; i < 8; i++) { u_int bit; - + if (i == 5) continue; for (bit = 0; bit < 8; bit++) { - if ((pci_status[i] & (0x1 << bit)) != 0) { static const char *s; @@ -926,7 +923,6 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intsta u_int bit; for (bit = 0; bit < 8; bit++) { - if ((split_status[i] & (0x1 << bit)) != 0) { static const char *s; Modified: head/sys/dev/aic7xxx/aic79xx_reg.h ============================================================================== --- head/sys/dev/aic7xxx/aic79xx_reg.h Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/aic79xx_reg.h Tue Sep 1 21:37:14 2020 (r365105) @@ -2380,7 +2380,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print; ahd_print_register(NULL, 0, "SCB_DISCONNECTED_LISTS", 0x1b8, regvalue, cur_col, wrap) #endif - #define MODE_PTR 0x00 #define DST_MODE 0x70 #define SRC_MODE 0x07 @@ -3749,7 +3748,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print; #define SCB_DISCONNECTED_LISTS 0x1b8 - #define STATUS_QUEUE_FULL 0x28 #define WRTBIASCTL_HP_DEFAULT 0x00 #define NUMDSPS 0x14 @@ -3808,7 +3806,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print; #define AHD_SLEWRATE_SHIFT 0x03 #define B_CURRFIFO_0 0x02 - /* Downloaded Constant Definitions */ #define SG_SIZEOF 0x04 #define CACHELINE_MASK 0x07 @@ -3819,7 +3816,6 @@ ahd_reg_print_t ahd_scb_disconnected_lists_print; #define SG_PREFETCH_CNT_LIMIT 0x01 #define PKT_OVERRUN_BUFOFFSET 0x05 #define DOWNLOAD_CONST_COUNT 0x08 - /* Exported Labels */ #define LABEL_seq_isr 0x28f Modified: head/sys/dev/aic7xxx/aic79xx_reg_print.c ============================================================================== --- head/sys/dev/aic7xxx/aic79xx_reg_print.c Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/aic79xx_reg_print.c Tue Sep 1 21:37:14 2020 (r365105) @@ -3671,4 +3671,3 @@ ahd_scb_disconnected_lists_print(u_int regvalue, u_int return (ahd_print_register(NULL, 0, "SCB_DISCONNECTED_LISTS", 0x1b8, regvalue, cur_col, wrap)); } - Modified: head/sys/dev/aic7xxx/aic7xxx.c ============================================================================== --- head/sys/dev/aic7xxx/aic7xxx.c Tue Sep 1 21:36:40 2020 (r365104) +++ head/sys/dev/aic7xxx/aic7xxx.c Tue Sep 1 21:37:14 2020 (r365105) @@ -319,7 +319,6 @@ ahc_run_qoutfifo(struct ahc_softc *ahc) ahc_sync_qoutfifo(ahc, BUS_DMASYNC_POSTREAD); while (ahc->qoutfifo[ahc->qoutfifonext] != SCB_LIST_NULL) { - scb_index = ahc->qoutfifo[ahc->qoutfifonext]; if ((ahc->qoutfifonext & 0x03) == 0x03) { u_int modnext; @@ -421,7 +420,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat { struct scb *scb; struct ahc_devinfo devinfo; - + ahc_fetch_devinfo(ahc, &devinfo); /* @@ -760,7 +759,6 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat */ if ((intstat & SCSIINT) == 0 && (ahc_inb(ahc, SSTAT1) & SCSIPERR) != 0) { - if ((ahc->features & AHC_DT) == 0) { u_int curphase; @@ -845,7 +843,6 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat aic_get_transfer_length(scb), scb->sg_count); if (scb->sg_count > 0) { for (i = 0; i < scb->sg_count; i++) { - printf("sg[%d] - Addr 0x%x%x : Length %d\n", i, (aic_le32toh(scb->sg_list[i].len) >> 24 @@ -1471,7 +1468,6 @@ ahc_clear_critical_section(struct ahc_softc *ahc) steps++; if (stepping == FALSE) { - /* * Disable all interrupt sources so that the * sequencer will not be stuck by a pausing @@ -1717,11 +1713,10 @@ ahc_find_syncrate(struct ahc_softc *ahc, u_int *period if ((*ppr_options & MSG_EXT_PPR_DT_REQ) == 0 && maxsync < AHC_SYNCRATE_ULTRA2) maxsync = AHC_SYNCRATE_ULTRA2; - + for (syncrate = &ahc_syncrates[maxsync]; syncrate->rate != NULL; syncrate++) { - /* * The Ultra2 table doesn't go as low * as for the Fast/Ultra cards. @@ -1783,7 +1778,6 @@ ahc_find_period(struct ahc_softc *ahc, u_int scsirate, syncrate = &ahc_syncrates[maxsync]; while (syncrate->rate != NULL) { - if ((ahc->features & AHC_ULTRA2) != 0) { if (syncrate->sxfr_u2 == 0) break; @@ -1955,7 +1949,6 @@ ahc_set_syncrate(struct ahc_softc *ahc, struct ahc_dev update_needed++; scsirate = tinfo->scsirate; if ((ahc->features & AHC_ULTRA2) != 0) { - scsirate &= ~(SXFR_ULTRA2|SINGLE_EDGE|ENABLE_CRC); if (syncrate != NULL) { scsirate |= syncrate->sxfr_u2; @@ -1965,7 +1958,6 @@ ahc_set_syncrate(struct ahc_softc *ahc, struct ahc_dev scsirate |= SINGLE_EDGE; } } else { - scsirate &= ~(SXFR|SOFS); /* * Ensure Ultra mode is set properly for @@ -2268,7 +2260,6 @@ ahc_scb_devinfo(struct ahc_softc *ahc, struct ahc_devi SCB_GET_LUN(scb), SCB_GET_CHANNEL(ahc, scb), role); } - /************************ Message Phase Processing ****************************/ static void ahc_assert_atn(struct ahc_softc *ahc) @@ -2450,7 +2441,6 @@ ahc_build_transfer_msg(struct ahc_softc *ahc, struct a * messages that WDTR comes first. */ if (doppr || (dosync && !dowide)) { - offset = tinfo->goal.offset; ahc_validate_offset(ahc, tinfo, rate, &offset, doppr ? tinfo->goal.width @@ -2577,7 +2567,6 @@ ahc_handle_proto_violation(struct ahc_softc *ahc) curphase = ahc_inb(ahc, SCSISIGI) & PHASE_MASK; lastphase = ahc_inb(ahc, LASTPHASE); if ((seq_flags & NOT_IDENTIFIED) != 0) { - /* * The reconnecting target either did not send an * identify message, or did, but we didn't find an SCB @@ -2848,7 +2837,6 @@ reswitch: */ if ((ahc_inb(ahc, SCSISIGI) & ATNI) != 0 && ahc->msgout_index > 0) { - /* * Change gears and see if this messages is * of interest to us or should be passed back @@ -3047,7 +3035,6 @@ ahc_sent_msg(struct ahc_softc *ahc, ahc_msgtype type, end_index = index + 1 + ahc->msgout_buf[index + 1]; if (ahc->msgout_buf[index+2] == msgval && type == AHCMSG_EXT) { - if (full) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:37:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3FC8937AC20; Tue, 1 Sep 2020 21:37:36 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0m00zgsz4P0k; Tue, 1 Sep 2020 21:37:36 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0692A1FCEF; Tue, 1 Sep 2020 21:37:36 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LbZXB032505; Tue, 1 Sep 2020 21:37:35 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LbZVt032502; Tue, 1 Sep 2020 21:37:35 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012137.081LbZVt032502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:37:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365106 - head/sys/dev/al_eth X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/al_eth X-SVN-Commit-Revision: 365106 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:37:36 -0000 Author: mjg Date: Tue Sep 1 21:37:35 2020 New Revision: 365106 URL: https://svnweb.freebsd.org/changeset/base/365106 Log: al_eth: clean up empty lines in .c and .h files Modified: head/sys/dev/al_eth/al_eth.c head/sys/dev/al_eth/al_init_eth_kr.c head/sys/dev/al_eth/al_init_eth_lm.c head/sys/dev/al_eth/al_init_eth_lm.h Modified: head/sys/dev/al_eth/al_eth.c ============================================================================== --- head/sys/dev/al_eth/al_eth.c Tue Sep 1 21:37:14 2020 (r365105) +++ head/sys/dev/al_eth/al_eth.c Tue Sep 1 21:37:35 2020 (r365106) @@ -2168,7 +2168,6 @@ __al_eth_free_irq(struct al_eth_adapter *adapter) if (rc != 0) device_printf(adapter->dev, "failed to tear " "down irq: %d\n", irq->vector); - } irq->requested = 0; } Modified: head/sys/dev/al_eth/al_init_eth_kr.c ============================================================================== --- head/sys/dev/al_eth/al_init_eth_kr.c Tue Sep 1 21:37:14 2020 (r365105) +++ head/sys/dev/al_eth/al_init_eth_kr.c Tue Sep 1 21:37:35 2020 (r365106) @@ -707,7 +707,6 @@ al_eth_kr_run_lt(struct al_eth_kr_data *kr_data) if (al_eth_kr_lt_frame_lock_wait(kr_data->adapter, AL_ETH_AN__LT_LANE_0, AL_ETH_KR_FRAME_LOCK_TIMEOUT) == TRUE) { - /* * when locked, for the first time initialize the receiver and * transmitter tasks to prepare it for detecting coefficient @@ -755,7 +754,6 @@ al_eth_kr_run_lt(struct al_eth_kr_data *kr_data) } } else { - al_info("[%s] FAILED: did not achieve initial frame lock...\n", kr_data->adapter->name); Modified: head/sys/dev/al_eth/al_init_eth_lm.c ============================================================================== --- head/sys/dev/al_eth/al_init_eth_lm.c Tue Sep 1 21:37:14 2020 (r365105) +++ head/sys/dev/al_eth/al_init_eth_lm.c Tue Sep 1 21:37:35 2020 (r365106) @@ -551,7 +551,6 @@ al_eth_serdes_static_rx_params_set(struct al_eth_lm_co lm_context->lane, &lm_context->rx_params_override); - } else if (lm_context->static_values != 0) { lm_context->rx_param_dirty = 0; @@ -989,7 +988,6 @@ static int al_eth_lm_retimer_ds25_full_config(struct a config_rx_size = AL_ARR_SIZE(retimer_ds25_10g_mode); } - rc = al_eth_lm_retimer_ds25_channel_config(lm_context, lm_context->retimer_channel, config_rx, @@ -1357,7 +1355,6 @@ al_eth_lm_link_establish(struct al_eth_lm_context *lm_ DELAY(AL_ETH_LM_GEARBOX_RESET_DELAY); } - if (lm_context->retimer_exist) { DELAY(AL_ETH_LM_RETIMER_LINK_STATUS_DELAY); @@ -1393,7 +1390,6 @@ al_eth_lm_link_establish(struct al_eth_lm_context *lm_ lm_debug("%s: link is up with LT\n", __func__); return (0); } - } lm_context->link_training_failures++; Modified: head/sys/dev/al_eth/al_init_eth_lm.h ============================================================================== --- head/sys/dev/al_eth/al_init_eth_lm.h Tue Sep 1 21:37:14 2020 (r365105) +++ head/sys/dev/al_eth/al_init_eth_lm.h Tue Sep 1 21:37:35 2020 (r365106) @@ -133,7 +133,6 @@ struct al_eth_lm_led_config_data { enum al_eth_lm_led_config_speed speed; }; - struct al_eth_lm_context { struct al_hal_eth_adapter *adapter; struct al_serdes_grp_obj *serdes_obj; From owner-svn-src-all@freebsd.org Tue Sep 1 21:37:54 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 66D9F37ABAC; Tue, 1 Sep 2020 21:37:54 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0mL27VBz4Nxw; Tue, 1 Sep 2020 21:37:54 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2C93B1FEB8; Tue, 1 Sep 2020 21:37:54 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lbrb8032564; Tue, 1 Sep 2020 21:37:53 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LbrWC032563; Tue, 1 Sep 2020 21:37:53 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012137.081LbrWC032563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:37:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365107 - head/sys/dev/ale X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ale X-SVN-Commit-Revision: 365107 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:37:54 -0000 Author: mjg Date: Tue Sep 1 21:37:53 2020 New Revision: 365107 URL: https://svnweb.freebsd.org/changeset/base/365107 Log: ale: clean up empty lines in .c and .h files Modified: head/sys/dev/ale/if_ale.c Modified: head/sys/dev/ale/if_ale.c ============================================================================== --- head/sys/dev/ale/if_ale.c Tue Sep 1 21:37:35 2020 (r365106) +++ head/sys/dev/ale/if_ale.c Tue Sep 1 21:37:53 2020 (r365107) @@ -2394,7 +2394,6 @@ ale_rx_update_page(struct ale_softc *sc, struct ale_rx } } - /* * It seems that AR81xx controller can compute partial checksum. * The partial checksum value can be used to accelerate checksum From owner-svn-src-all@freebsd.org Tue Sep 1 21:38:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1EC1A37A9E6; Tue, 1 Sep 2020 21:38:07 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0mZ6DHlz4P8x; Tue, 1 Sep 2020 21:38:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA9871FE75; Tue, 1 Sep 2020 21:38:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lc6LM032621; Tue, 1 Sep 2020 21:38:06 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lc660032620; Tue, 1 Sep 2020 21:38:06 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012138.081Lc660032620@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:38:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365108 - head/sys/dev/alpm X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/alpm X-SVN-Commit-Revision: 365108 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:38:07 -0000 Author: mjg Date: Tue Sep 1 21:38:06 2020 New Revision: 365108 URL: https://svnweb.freebsd.org/changeset/base/365108 Log: alpm: clean up empty lines in .c and .h files Modified: head/sys/dev/alpm/alpm.c Modified: head/sys/dev/alpm/alpm.c ============================================================================== --- head/sys/dev/alpm/alpm.c Tue Sep 1 21:37:53 2020 (r365107) +++ head/sys/dev/alpm/alpm.c Tue Sep 1 21:38:06 2020 (r365108) @@ -557,7 +557,7 @@ alpm_bwrite(device_t dev, u_char slave, char cmd, u_ch } ALPM_SMBOUTB(sc, SMBHADDR, slave & ~LSB); - + /* set the cmd and reset the * 32-byte long internal buffer */ ALPM_SMBOUTB(sc, SMBCMD, SMBWRBLOCK | SMB_BLK_CLR); @@ -598,7 +598,7 @@ alpm_bread(device_t dev, u_char slave, char cmd, u_cha } ALPM_SMBOUTB(sc, SMBHADDR, slave | LSB); - + /* set the cmd and reset the * 32-byte long internal buffer */ ALPM_SMBOUTB(sc, SMBCMD, SMBWRBLOCK | SMB_BLK_CLR); @@ -634,7 +634,7 @@ static device_method_t alpm_methods[] = { DEVMETHOD(device_probe, alpm_probe), DEVMETHOD(device_attach, alpm_attach), DEVMETHOD(device_detach, alpm_detach), - + /* smbus interface */ DEVMETHOD(smbus_callback, alpm_callback), DEVMETHOD(smbus_quick, alpm_quick), @@ -646,7 +646,6 @@ static device_method_t alpm_methods[] = { DEVMETHOD(smbus_readw, alpm_readw), DEVMETHOD(smbus_bwrite, alpm_bwrite), DEVMETHOD(smbus_bread, alpm_bread), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:38:20 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0E3E837ADA6; Tue, 1 Sep 2020 21:38:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0mq6gY6z4PG5; Tue, 1 Sep 2020 21:38:19 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C9D871FFD8; Tue, 1 Sep 2020 21:38:19 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LcJdd032678; Tue, 1 Sep 2020 21:38:19 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LcIZH032673; Tue, 1 Sep 2020 21:38:18 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012138.081LcIZH032673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:38:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365109 - in head/sys/dev/altera: atse msgdma pio softdma X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/altera: atse msgdma pio softdma X-SVN-Commit-Revision: 365109 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:38:20 -0000 Author: mjg Date: Tue Sep 1 21:38:18 2020 New Revision: 365109 URL: https://svnweb.freebsd.org/changeset/base/365109 Log: altera: clean up empty lines in .c and .h files Modified: head/sys/dev/altera/atse/if_atse.c head/sys/dev/altera/atse/if_atsereg.h head/sys/dev/altera/msgdma/msgdma.c head/sys/dev/altera/pio/pio.h head/sys/dev/altera/softdma/softdma.c Modified: head/sys/dev/altera/atse/if_atse.c ============================================================================== --- head/sys/dev/altera/atse/if_atse.c Tue Sep 1 21:38:06 2020 (r365108) +++ head/sys/dev/altera/atse/if_atse.c Tue Sep 1 21:38:18 2020 (r365109) @@ -588,7 +588,6 @@ atse_get_eth_address(struct atse_softc *sc) if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 && sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff && sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) { - device_printf(sc->atse_dev, "Factory programmed Ethernet " "hardware address blacklisted. Falling back to random " "address to avoid collisions.\n"); @@ -1177,7 +1176,6 @@ static struct atse_rx_err_stats_regs { const char *name; const char *descr; } atse_rx_err_stats_regs[] = { - #define ATSE_RX_ERR_FIFO_THRES_EOP 0 /* FIFO threshold reached, on EOP. */ #define ATSE_RX_ERR_ELEN 1 /* Frame/payload length not valid. */ #define ATSE_RX_ERR_CRC32 2 /* CRC-32 error. */ @@ -1559,7 +1557,6 @@ atse_miibus_statchg(device_t dev) if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) == (IFM_ACTIVE | IFM_AVALID)) { - switch (IFM_SUBTYPE(mii->mii_media_active)) { case IFM_10_T: val4 |= BASE_CFG_COMMAND_CONFIG_ENA_10; Modified: head/sys/dev/altera/atse/if_atsereg.h ============================================================================== --- head/sys/dev/altera/atse/if_atsereg.h Tue Sep 1 21:38:06 2020 (r365108) +++ head/sys/dev/altera/atse/if_atsereg.h Tue Sep 1 21:38:18 2020 (r365109) @@ -118,7 +118,6 @@ static char *fifo_memory_block[] = { #define PCS_TXRX_ENABLE_DYNAMIC_RECONF 0 /* Dynamic trans. reconfig. */ #define PCS_TXRX_STARTING_CHANNEL 0 /* 0..284. */ - /* -------------------------------------------------------------------------- */ /* XXX more values based on the bitmaps provided. Cleanup. */ @@ -397,7 +396,6 @@ static char *fifo_memory_block[] = { /* 0xC8 - 0xCF, Reserved; set to zero, ignore on read. */ /* 0xD7 - 0xFF, Reserved; set to zero, ignore on read. */ - /* -------------------------------------------------------------------------- */ /* DE4 Intel Strata Flash Ethernet Option Bits area. */ @@ -456,7 +454,6 @@ struct atse_softc { struct buf_ring *br; struct mtx br_mtx; }; - int atse_attach(device_t); int atse_detach_dev(device_t); Modified: head/sys/dev/altera/msgdma/msgdma.c ============================================================================== --- head/sys/dev/altera/msgdma/msgdma.c Tue Sep 1 21:38:06 2020 (r365108) +++ head/sys/dev/altera/msgdma/msgdma.c Tue Sep 1 21:38:18 2020 (r365109) @@ -399,7 +399,6 @@ msgdma_desc_alloc(struct msgdma_softc *sc, struct msgd return (0); } - static int msgdma_channel_alloc(device_t dev, struct xdma_channel *xchan) { Modified: head/sys/dev/altera/pio/pio.h ============================================================================== --- head/sys/dev/altera/pio/pio.h Tue Sep 1 21:38:06 2020 (r365108) +++ head/sys/dev/altera/pio/pio.h Tue Sep 1 21:38:18 2020 (r365109) @@ -40,4 +40,3 @@ #define PIO_EDGECAPT 0x0c #define PIO_OUTSET 0x10 #define PIO_OUTCLR 0x14 - Modified: head/sys/dev/altera/softdma/softdma.c ============================================================================== --- head/sys/dev/altera/softdma/softdma.c Tue Sep 1 21:38:06 2020 (r365108) +++ head/sys/dev/altera/softdma/softdma.c Tue Sep 1 21:38:18 2020 (r365109) @@ -501,7 +501,6 @@ softdma_process_descriptors(struct softdma_channel *ch desc = &chan->descs[chan->idx_tail]; while (desc != NULL) { - if ((desc->control & CONTROL_OWN) == 0) { break; } From owner-svn-src-all@freebsd.org Tue Sep 1 21:39:21 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2A58137AF89; Tue, 1 Sep 2020 21:39:21 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0p10QJlz4PTn; Tue, 1 Sep 2020 21:39:21 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E57EE1FE76; Tue, 1 Sep 2020 21:39:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LdKSZ032768; Tue, 1 Sep 2020 21:39:20 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LdJrn032761; Tue, 1 Sep 2020 21:39:19 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012139.081LdJrn032761@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:39:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365110 - in head/sys/dev: amd_ecc_inject amdgpio amdpm amdsbwd amdsmb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev: amd_ecc_inject amdgpio amdpm amdsbwd amdsmb X-SVN-Commit-Revision: 365110 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:39:21 -0000 Author: mjg Date: Tue Sep 1 21:39:19 2020 New Revision: 365110 URL: https://svnweb.freebsd.org/changeset/base/365110 Log: amd*: clean up empty lines in .c and .h files Modified: head/sys/dev/amd_ecc_inject/ecc_inject.c head/sys/dev/amdgpio/amdgpio.c head/sys/dev/amdpm/amdpm.c head/sys/dev/amdsbwd/amd_chipset.h head/sys/dev/amdsbwd/amdsbwd.c head/sys/dev/amdsmb/amdsmb.c Modified: head/sys/dev/amd_ecc_inject/ecc_inject.c ============================================================================== --- head/sys/dev/amd_ecc_inject/ecc_inject.c Tue Sep 1 21:38:18 2020 (r365109) +++ head/sys/dev/amd_ecc_inject/ecc_inject.c Tue Sep 1 21:39:19 2020 (r365110) @@ -45,7 +45,6 @@ #include #include - /* * See BKDG for AMD Family 15h Models 00h-0Fh Processors * (publication 42301 Rev 3.08 - March 12, 2012): Modified: head/sys/dev/amdgpio/amdgpio.c ============================================================================== --- head/sys/dev/amdgpio/amdgpio.c Tue Sep 1 21:38:18 2020 (r365109) +++ head/sys/dev/amdgpio/amdgpio.c Tue Sep 1 21:39:19 2020 (r365110) @@ -179,7 +179,6 @@ amdgpio_pin_getflags(device_t dev, uint32_t pin, uint3 sc = device_get_softc(dev); - dprintf("pin %d\n", pin); if (!amdgpio_valid_pin(sc, pin)) return (EINVAL); @@ -427,7 +426,6 @@ err_rsrc: return (ENXIO); } - static int amdgpio_detach(device_t dev) Modified: head/sys/dev/amdpm/amdpm.c ============================================================================== --- head/sys/dev/amdpm/amdpm.c Tue Sep 1 21:38:18 2020 (r365109) +++ head/sys/dev/amdpm/amdpm.c Tue Sep 1 21:39:19 2020 (r365110) @@ -195,7 +195,7 @@ amdpm_attach(device_t dev) { struct amdpm_softc *amdpm_sc = device_get_softc(dev); u_char val_b; - + /* Enable I/O block access */ val_b = pci_read_config(dev, AMDPCI_GEN_CONFIG_PM, 1); pci_write_config(dev, AMDPCI_GEN_CONFIG_PM, val_b | AMDPCI_PMIOEN, 1); @@ -208,7 +208,7 @@ amdpm_attach(device_t dev) amdpm_sc->rid = NFPCI_PMBASE; amdpm_sc->res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &amdpm_sc->rid, RF_ACTIVE); - + if (amdpm_sc->res == NULL) { device_printf(dev, "could not map i/o space\n"); return (ENXIO); @@ -278,7 +278,7 @@ static int amdpm_abort(struct amdpm_softc *sc) { u_short l; - + l = AMDPM_SMBINW(sc, AMDSMB_GLOBAL_ENABLE); AMDPM_SMBOUTW(sc, AMDSMB_GLOBAL_ENABLE, l | AMDSMB_GE_ABORT); @@ -562,7 +562,7 @@ amdpm_bwrite(device_t dev, u_char slave, char cmd, u_c } AMDPM_SMBOUTW(sc, AMDSMB_HSTADDR, slave & ~LSB); - + /* * Do we have to reset the internal 32-byte buffer? * Can't see how to do this from the data sheet. @@ -606,7 +606,7 @@ amdpm_bread(device_t dev, u_char slave, char cmd, u_ch } AMDPM_SMBOUTW(sc, AMDSMB_HSTADDR, slave | LSB); - + AMDPM_SMBOUTB(sc, AMDSMB_HSTCMD, cmd); l = AMDPM_SMBINW(sc, AMDSMB_GLOBAL_ENABLE); @@ -641,7 +641,7 @@ static device_method_t amdpm_methods[] = { DEVMETHOD(device_probe, amdpm_probe), DEVMETHOD(device_attach, amdpm_attach), DEVMETHOD(device_detach, amdpm_detach), - + /* SMBus interface */ DEVMETHOD(smbus_callback, amdpm_callback), DEVMETHOD(smbus_quick, amdpm_quick), @@ -653,7 +653,6 @@ static device_method_t amdpm_methods[] = { DEVMETHOD(smbus_readw, amdpm_readw), DEVMETHOD(smbus_bwrite, amdpm_bwrite), DEVMETHOD(smbus_bread, amdpm_bread), - { 0, 0 } }; Modified: head/sys/dev/amdsbwd/amd_chipset.h ============================================================================== --- head/sys/dev/amdsbwd/amd_chipset.h Tue Sep 1 21:38:18 2020 (r365109) +++ head/sys/dev/amdsbwd/amd_chipset.h Tue Sep 1 21:39:19 2020 (r365110) @@ -147,4 +147,3 @@ #define AMDCZ49_SMBUS_REVID 0x49 #define HYGONCZ_SMBUS_DEVID 0x790b1d94 - Modified: head/sys/dev/amdsbwd/amdsbwd.c ============================================================================== --- head/sys/dev/amdsbwd/amdsbwd.c Tue Sep 1 21:38:18 2020 (r365109) +++ head/sys/dev/amdsbwd/amdsbwd.c Tue Sep 1 21:39:19 2020 (r365110) @@ -132,7 +132,6 @@ static driver_t amdsbwd_driver = { DRIVER_MODULE(amdsbwd, isa, amdsbwd_driver, amdsbwd_devclass, NULL, NULL); - static uint8_t pmio_read(struct resource *res, uint8_t reg) { @@ -279,7 +278,6 @@ amdsbwd_identify(driver_t *driver, device_t parent) if (child == NULL) device_printf(parent, "add amdsbwd child failed\n"); } - static void amdsbwd_probe_sb7xx(device_t dev, struct resource *pmres, uint32_t *addr) Modified: head/sys/dev/amdsmb/amdsmb.c ============================================================================== --- head/sys/dev/amdsmb/amdsmb.c Tue Sep 1 21:38:18 2020 (r365109) +++ head/sys/dev/amdsmb/amdsmb.c Tue Sep 1 21:39:19 2020 (r365110) @@ -150,7 +150,7 @@ amdsmb_attach(device_t dev) /* Allocate I/O space */ amdsmb_sc->rid = PCIR_BAR(0); - + amdsmb_sc->res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &amdsmb_sc->rid, RF_ACTIVE); @@ -563,7 +563,6 @@ static device_method_t amdsmb_methods[] = { DEVMETHOD(smbus_readw, amdsmb_readw), DEVMETHOD(smbus_bwrite, amdsmb_bwrite), DEVMETHOD(smbus_bread, amdsmb_bread), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:39:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB4BE37ADEB; Tue, 1 Sep 2020 21:39:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0pL5rTxz4PgZ; Tue, 1 Sep 2020 21:39:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC39520088; Tue, 1 Sep 2020 21:39:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LdcwL032830; Tue, 1 Sep 2020 21:39:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Ldbrs032826; Tue, 1 Sep 2020 21:39:37 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012139.081Ldbrs032826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:39:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365111 - head/sys/dev/amr X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/amr X-SVN-Commit-Revision: 365111 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:39:39 -0000 Author: mjg Date: Tue Sep 1 21:39:37 2020 New Revision: 365111 URL: https://svnweb.freebsd.org/changeset/base/365111 Log: amr: clean up empty lines in .c and .h files Modified: head/sys/dev/amr/amr.c head/sys/dev/amr/amr_cam.c head/sys/dev/amr/amr_disk.c head/sys/dev/amr/amr_pci.c head/sys/dev/amr/amrreg.h Modified: head/sys/dev/amr/amr.c ============================================================================== --- head/sys/dev/amr/amr.c Tue Sep 1 21:39:19 2020 (r365110) +++ head/sys/dev/amr/amr.c Tue Sep 1 21:39:37 2020 (r365111) @@ -371,7 +371,6 @@ amr_init_sysctl(struct amr_softc *sc) ""); } - /******************************************************************************* * Free resources associated with a controller instance */ @@ -777,7 +776,6 @@ amr_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, ap = NULL; switch(cmd) { - case AMR_IO_VERSION: debug(1, "AMR_IO_VERSION"); *arg.result = AMR_IO_VERSION_NUMBER; @@ -977,7 +975,6 @@ amr_query_controller(struct amr_softc *sc) */ if ((aex = amr_enquiry(sc, 2048, AMR_CMD_CONFIG, AMR_CONFIG_ENQ3, AMR_CONFIG_ENQ3_SOLICITED_FULL, &status)) != NULL) { - /* * Fetch current state of logical drives. */ @@ -1011,7 +1008,6 @@ amr_query_controller(struct amr_softc *sc) device_printf(sc->amr_dev, "delete logical drives supported by controller\n"); } } else { - /* failed, try the 8LD ENQUIRY commands */ if ((ae = (struct amr_enquiry *)amr_enquiry(sc, 2048, AMR_CMD_EXT_ENQUIRY2, 0, 0, &status)) == NULL) { if ((ae = (struct amr_enquiry *)amr_enquiry(sc, 2048, AMR_CMD_ENQUIRY, 0, 0, &status)) == NULL) { @@ -1173,7 +1169,6 @@ amr_support_ext_cdb(struct amr_softc *sc) mbox[0] = 0xA4; mbox[2] = 0x16; - /* we have to poll, as the system may be going down or otherwise damaged */ if (sc->amr_poll_command(ac)) goto out; @@ -1203,7 +1198,6 @@ amr_startio(struct amr_softc *sc) /* spin until something prevents us from doing any work */ for (;;) { - /* Don't bother to queue commands no bounce buffers are available. */ if (sc->amr_state & AMR_STATE_QUEUE_FRZN) break; @@ -1342,7 +1336,6 @@ amr_bio_command(struct amr_softc *sc, struct amr_comma /* we fill in the s/g related data when the command is mapped */ - *acp = ac; return(error); } @@ -1643,7 +1636,7 @@ amr_setup_data(void *arg, bus_dma_segment_t *segs, int amr_requeue_ready(ac); } } - + static void amr_setup_ccb(void *arg, bus_dma_segment_t *segs, int nsegs, int err) { @@ -1730,9 +1723,7 @@ amr_unmapcmd(struct amr_command *ac) /* if the command involved data at all and was mapped */ if (ac->ac_flags & AMR_CMD_MAPPED) { - if (ac->ac_data != NULL) { - flag = 0; if (ac->ac_flags & AMR_CMD_DATAIN) flag |= BUS_DMASYNC_POSTREAD; @@ -1834,7 +1825,6 @@ amr_done(struct amr_softc *sc) /* really a busy command? */ if (ac != NULL) { - /* pull the command from the busy index */ amr_freeslot(ac); @@ -2144,7 +2134,6 @@ amr_quartz_get_work(struct amr_softc *sc, struct amr_m /* work waiting for us? */ if ((outd = AMR_QGET_ODB(sc)) == AMR_QODB_READY) { - /* acknowledge interrupt */ AMR_QPUT_ODB(sc, AMR_QODB_READY); @@ -2275,7 +2264,7 @@ amr_std_init(struct amr_softc *sc) device_printf(sc->amr_dev, "initial init status %x\n", AMR_SGET_INITSTATUS(sc)); AMR_SRESET(sc); - + ostatus = 0xff; while ((status = AMR_SGET_INITSTATUS(sc)) != AMR_SINIT_DONE) { if (status != ostatus) { @@ -2331,7 +2320,6 @@ amr_describe_controller(struct amr_softc *sc) prod = amr_describe_code(amr_table_adaptertype, ae->ae_signature); } else if ((ae = (struct amr_enquiry *)amr_enquiry(sc, 2048, AMR_CMD_ENQUIRY, 0, 0, &status)) != NULL) { - /* * Try to work it out based on the PCI signatures. */ @@ -2366,7 +2354,6 @@ amr_describe_controller(struct amr_softc *sc) ae->ae_adapter.aa_bios[2] <= 'Z' && ae->ae_adapter.aa_bios[1] < ' ' && ae->ae_adapter.aa_bios[0] < ' ') { - /* this looks like we have an HP NetRaid version of the MegaRaid */ if(ae->ae_signature == AMR_SIG_438) { @@ -2428,8 +2415,6 @@ amr_dump_blocks(struct amr_softc *sc, int unit, u_int3 sc->amr_state &= ~AMR_STATE_INTEN; return (error); } - - #ifdef AMR_DEBUG /******************************************************************************** Modified: head/sys/dev/amr/amr_cam.c ============================================================================== --- head/sys/dev/amr/amr_cam.c Tue Sep 1 21:39:19 2020 (r365110) +++ head/sys/dev/amr/amr_cam.c Tue Sep 1 21:39:37 2020 (r365111) @@ -175,7 +175,6 @@ amr_cam_attach(device_t dev) * Iterate over our channels, registering them with CAM */ for (chn = 0; chn < sc->amr_maxchan; chn++) { - /* allocate a sim */ if ((sc->amr_cam_sim[chn] = cam_sim_alloc(amr_cam_action, amr_cam_poll, "amr", sc, device_get_unit(sc->amr_dev), @@ -247,7 +246,6 @@ amr_cam_action(struct cam_sim *sim, union ccb *ccb) struct amr_softc *sc = cam_sim_softc(sim); switch(ccb->ccb_h.func_code) { - /* * Perform SCSI I/O to a physical device. */ @@ -266,7 +264,7 @@ amr_cam_action(struct cam_sim *sim, union ccb *ccb) if ((csio->cdb_len > AMR_MAX_CDB_LEN) && (sc->support_ext_cdb == 0)) ccbh->status = CAM_REQ_INVALID; - + /* check that the CDB pointer is not to a physical address */ if ((ccbh->flags & CAM_CDB_POINTER) && (ccbh->flags & CAM_CDB_PHYS)) @@ -280,7 +278,7 @@ amr_cam_action(struct cam_sim *sim, union ccb *ccb) /* we can't map it */ ccbh->status = CAM_REQ_INVALID; } - + /* * If the command is to a LUN other than 0, fail it. * This is probably incorrect, but during testing the @@ -292,7 +290,6 @@ amr_cam_action(struct cam_sim *sim, union ccb *ccb) /* if we're happy with the request, queue it for attention */ if (ccbh->status == CAM_REQ_INPROG) { - /* save the channel number in the ccb */ csio->ccb_h.sim_priv.entries[0].field= cam_sim_bus(sim); @@ -396,7 +393,6 @@ amr_cam_action(struct cam_sim *sim, union ccb *ccb) debug(3, "XPT_SET_TRAN_SETTINGS"); ccb->ccb_h.status = CAM_FUNC_NOTAVAIL; break; - /* * Reject anything else as unsupported. Modified: head/sys/dev/amr/amr_disk.c ============================================================================== --- head/sys/dev/amr/amr_disk.c Tue Sep 1 21:39:19 2020 (r365110) +++ head/sys/dev/amr/amr_disk.c Tue Sep 1 21:39:37 2020 (r365111) @@ -148,7 +148,6 @@ amrd_dump(void *arg, void *virtual, vm_offset_t physic int driveno = amrd_sc->amrd_drive - amr_sc->amr_drive; if ((error = amr_dump_blocks(amr_sc,driveno,offset / AMR_BLKSIZE ,(void *)virtual,(int) length / AMR_BLKSIZE )) != 0) return(error); - } return(0); } @@ -266,4 +265,3 @@ amrd_detach(device_t dev) #endif return(0); } - Modified: head/sys/dev/amr/amr_pci.c ============================================================================== --- head/sys/dev/amr/amr_pci.c Tue Sep 1 21:39:19 2020 (r365110) +++ head/sys/dev/amr/amr_pci.c Tue Sep 1 21:39:37 2020 (r365111) @@ -155,7 +155,6 @@ amr_find_ident(device_t dev) for (id = amr_device_ids; id->vendor != 0; id++) { if ((pci_get_vendor(dev) == id->vendor) && (pci_get_device(dev) == id->device)) { - /* do we need to test for a signature? */ if (id->flags & AMR_ID_PROBE_SIG) { sig = pci_read_config(dev, AMR_CFG_SIG, 2); @@ -167,7 +166,7 @@ amr_find_ident(device_t dev) } return (NULL); } - + static int amr_pci_probe(device_t dev) { @@ -332,7 +331,6 @@ amr_pci_attach(device_t dev) goto out; debug(2, "ccb mapped"); - /* * Do bus-independant initialisation, bring controller online. */ @@ -389,7 +387,6 @@ amr_pci_shutdown(device_t dev) /* mark ourselves as in-shutdown */ sc->amr_state |= AMR_STATE_SHUTDOWN; - /* flush controller */ device_printf(sc->amr_dev, "flushing cache..."); printf("%s\n", amr_flush(sc) ? "failed" : "done"); @@ -706,4 +703,3 @@ amr_ccb_map(struct amr_softc *sc) return (0); } - Modified: head/sys/dev/amr/amrreg.h ============================================================================== --- head/sys/dev/amr/amrreg.h Tue Sep 1 21:39:19 2020 (r365110) +++ head/sys/dev/amr/amrreg.h Tue Sep 1 21:39:37 2020 (r365111) @@ -191,7 +191,6 @@ #define AMR_BATT_CHARGE_FAIL 0x20 #define AMR_BATT_CYCLES_EXCEEDED 0x40 - /******************************************************************************** ******************************************************************************** 8LD Firmware Interface @@ -278,7 +277,6 @@ struct amr_enquiry u_int8_t res2[844]; /* X */ } __packed; - /******************************************************************************** ******************************************************************************** 40LD Firmware Interface @@ -408,7 +406,6 @@ struct amr_enquiry3 u_int8_t res1[263]; /* pad to 1024 bytes */ } __packed; - /******************************************************************************** ******************************************************************************** From owner-svn-src-all@freebsd.org Tue Sep 1 21:39:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A5CE837AFAD; Tue, 1 Sep 2020 21:39:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0pj3zwKz4Pdw; Tue, 1 Sep 2020 21:39:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6C24C1FE77; Tue, 1 Sep 2020 21:39:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Ldvvr032890; Tue, 1 Sep 2020 21:39:57 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lduuw032885; Tue, 1 Sep 2020 21:39:56 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012139.081Lduuw032885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:39:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365112 - head/sys/dev/an X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/an X-SVN-Commit-Revision: 365112 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:39:57 -0000 Author: mjg Date: Tue Sep 1 21:39:56 2020 New Revision: 365112 URL: https://svnweb.freebsd.org/changeset/base/365112 Log: an: clean up empty lines in .c and .h files Modified: head/sys/dev/an/if_aironet_ieee.h head/sys/dev/an/if_an.c head/sys/dev/an/if_an_pccard.c head/sys/dev/an/if_an_pci.c head/sys/dev/an/if_anreg.h Modified: head/sys/dev/an/if_aironet_ieee.h ============================================================================== --- head/sys/dev/an/if_aironet_ieee.h Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_aironet_ieee.h Tue Sep 1 21:39:56 2020 (r365112) @@ -152,7 +152,6 @@ struct an_rssi_entry { u_int8_t an_rss_dbm; }; - struct an_ltv_key { u_int16_t an_len; u_int16_t an_type; @@ -641,7 +640,6 @@ struct an_rxframe { u_int8_t an_addr4[6]; /* 0x2C */ u_int8_t an_gaplen; /* 0x32 */ } __packed; - /* Do not modify this unless you are modifying LEAP itself */ #define LEAP_USERNAME_MAX 32 Modified: head/sys/dev/an/if_an.c ============================================================================== --- head/sys/dev/an/if_an.c Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_an.c Tue Sep 1 21:39:56 2020 (r365112) @@ -1259,7 +1259,6 @@ an_intr(void *xsc) return; } - static int an_cmd_struct(struct an_softc *sc, struct an_command *cmd, struct an_reply *reply) @@ -1572,7 +1571,6 @@ an_write_record(struct an_softc *sc, struct an_ltv_gen return(EIO); } - if (reply.an_status & AN_CMD_QUAL_MASK) { if_printf(sc->an_ifp, "failed to write RID 2 %x %x %x %x %x, %d\n", @@ -1842,7 +1840,6 @@ an_setdef(struct an_softc *sc, struct an_req *areq) return; } - /* Reinitialize the card. */ if (ifp->if_flags) an_init_locked(sc); @@ -2867,7 +2864,6 @@ an_start_locked(struct ifnet *ifp) bcopy((caddr_t)&sc->an_txbuf, &buf[0x44], tx_frame_802_3.an_tx_802_3_payload_len); - bzero(&an_tx_desc, sizeof(an_tx_desc)); an_tx_desc.an_offset = 0; an_tx_desc.an_eoc = 1; @@ -3044,7 +3040,6 @@ int an_sigitems; /* number of cached entries */ struct an_sigcache an_sigcache[MAXANCACHE]; /* array of cache entries */ int an_nextitem; /* index/# of entries */ - #endif /* control variables for cache filtering. Basic idea is @@ -3142,7 +3137,6 @@ an_cache_store(struct an_softc *sc, struct ether_heade * if table full, then we need to replace LRU entry */ else { - /* check for space in cache table * note: an_nextitem also holds number of entries * added in the cache table @@ -3183,7 +3177,6 @@ an_cache_store(struct an_softc *sc, struct ether_heade } bcopy( eh->ether_shost, sc->an_sigcache[cache_slot].macsrc, 6); - switch (an_cache_mode) { case DBM: if (sc->an_have_rssimap) { @@ -3553,7 +3546,6 @@ cmdreset(struct ifnet *ifp) FLASH_DELAY(sc, 1000); /* WAS 600 12/7/00 */ - if (!(status = WaitBusy(ifp, 100))) { if_printf(ifp, "Waitbusy hang AFTER RESET =%d\n", status); AN_UNLOCK(sc); @@ -3603,7 +3595,6 @@ flashgchar(struct ifnet *ifp, int matchbyte, int dwell int success = -1; struct an_softc *sc = ifp->if_softc; - do { rchar = CSR_READ_2(sc, AN_SW1(sc->mpi350)); @@ -3675,7 +3666,6 @@ flashpchar(struct ifnet *ifp, int byte, int dwelltime) dwelltime -= 50; echo = CSR_READ_2(sc, AN_SW1(sc->mpi350)); } while (dwelltime >= 0 && echo != byte); - CSR_WRITE_2(sc, AN_SW1(sc->mpi350), 0); Modified: head/sys/dev/an/if_an_pccard.c ============================================================================== --- head/sys/dev/an/if_an_pccard.c Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_an_pccard.c Tue Sep 1 21:39:56 2020 (r365112) @@ -88,7 +88,6 @@ static device_method_t an_pccard_methods[] = { DEVMETHOD(device_attach, an_pccard_attach), DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), - { 0, 0 } }; @@ -147,7 +146,7 @@ an_pccard_attach(device_t dev) error = an_attach(sc, flags); if (error) goto fail; - + /* * Must setup the interrupt after the an_attach to prevent racing. */ Modified: head/sys/dev/an/if_an_pci.c ============================================================================== --- head/sys/dev/an/if_an_pci.c Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_an_pci.c Tue Sep 1 21:39:56 2020 (r365112) @@ -242,7 +242,7 @@ static int an_suspend_pci(device_t dev) { an_shutdown(dev); - + return (0); } Modified: head/sys/dev/an/if_anreg.h ============================================================================== --- head/sys/dev/an/if_anreg.h Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_anreg.h Tue Sep 1 21:39:56 2020 (r365112) @@ -354,7 +354,6 @@ struct an_rxframe_802_3 { }; #define AN_RXGAP_MAX 8 - struct an_txframe_802_3 { /* * Transmit 802.3 header structure. From owner-svn-src-all@freebsd.org Tue Sep 1 21:40:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 413D437B09C; Tue, 1 Sep 2020 21:40:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0q210GFz4PfP; Tue, 1 Sep 2020 21:40:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 058311FCF1; Tue, 1 Sep 2020 21:40:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LeD4b032986; Tue, 1 Sep 2020 21:40:13 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LeDIC032984; Tue, 1 Sep 2020 21:40:13 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012140.081LeDIC032984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:40:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365113 - head/sys/dev/arcmsr X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/arcmsr X-SVN-Commit-Revision: 365113 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:40:14 -0000 Author: mjg Date: Tue Sep 1 21:40:13 2020 New Revision: 365113 URL: https://svnweb.freebsd.org/changeset/base/365113 Log: arcmsr: clean up empty lines in .c and .h files Modified: head/sys/dev/arcmsr/arcmsr.c head/sys/dev/arcmsr/arcmsr.h Modified: head/sys/dev/arcmsr/arcmsr.c ============================================================================== --- head/sys/dev/arcmsr/arcmsr.c Tue Sep 1 21:39:56 2020 (r365112) +++ head/sys/dev/arcmsr/arcmsr.c Tue Sep 1 21:40:13 2020 (r365113) @@ -263,7 +263,7 @@ static int arcmsr_ioctl(struct cdev *dev, u_long ioctl { int unit = dev2unit(dev); struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass, unit); - + if (acb == NULL) { return ENXIO; } @@ -451,7 +451,7 @@ static u_int8_t arcmsr_hbe_wait_msgint_ready(struct Ad { u_int32_t Index, read_doorbell; u_int8_t Retries = 0x00; - + do { for(Index=0; Index < 100; Index++) { read_doorbell = CHIP_REG_READ32(HBE_MessageUnit, 0, iobound_doorbell); @@ -542,7 +542,7 @@ static void arcmsr_flush_hbd_cache(struct AdapterContr static void arcmsr_flush_hbe_cache(struct AdapterControlBlock *acb) { int retry_count = 30;/* enlarge wait flush adapter cache time: 10 minute */ - + CHIP_REG_WRITE32(HBE_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_FLUSH_CACHE); acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBE_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); @@ -934,7 +934,6 @@ static void arcmsr_done4abort_postqueue(struct Adapter } break; case ACB_ADAPTER_TYPE_C: { - while((CHIP_REG_READ32(HBC_MessageUnit, 0, host_int_status) & ARCMSR_HBCMU_OUTBOUND_POSTQUEUE_ISR) && (i++ < ARCMSR_MAX_OUTSTANDING_CMD)) { flag_srb = CHIP_REG_READ32(HBC_MessageUnit, 0, outbound_queueport_low); error = (flag_srb & ARCMSR_SRBREPLY_FLAG_ERROR_MODE1) ? TRUE : FALSE; @@ -1207,7 +1206,7 @@ static struct QBUFFER *arcmsr_get_iop_rqbuffer( struct break; case ACB_ADAPTER_TYPE_E: { struct HBE_MessageUnit *phbcmu = (struct HBE_MessageUnit *)acb->pmu; - + qbuffer = (struct QBUFFER *)&phbcmu->message_rbuffer; } break; @@ -1249,7 +1248,7 @@ static struct QBUFFER *arcmsr_get_iop_wqbuffer( struct break; case ACB_ADAPTER_TYPE_E: { struct HBE_MessageUnit *phbcmu = (struct HBE_MessageUnit *)acb->pmu; - + qbuffer = (struct QBUFFER *)&phbcmu->message_wbuffer; } break; @@ -1462,7 +1461,6 @@ static void arcmsr_poll(struct cam_sim *psim) */ static u_int32_t arcmsr_Read_iop_rqbuffer_data_D(struct AdapterControlBlock *acb, struct QBUFFER *prbuffer) { - u_int8_t *pQbuffer; u_int8_t *buf1 = NULL; u_int32_t *iop_data, *buf2 = NULL; @@ -1507,7 +1505,6 @@ static u_int32_t arcmsr_Read_iop_rqbuffer_data_D(struc */ static u_int32_t arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb, struct QBUFFER *prbuffer) { - u_int8_t *pQbuffer; u_int8_t *iop_data; u_int32_t iop_len; @@ -1689,7 +1686,6 @@ static void arcmsr_rescan_lun(struct AdapterControlBlo xpt_action(ccb); } - static void arcmsr_abort_dr_ccbs(struct AdapterControlBlock *acb, int target, int lun) { struct CommandControlBlock *srb; @@ -1965,7 +1961,7 @@ static void arcmsr_hbd_doorbell_isr(struct AdapterCont static void arcmsr_hbe_doorbell_isr(struct AdapterControlBlock *acb) { u_int32_t doorbell_status, in_doorbell; - + /* ******************************************************************* ** Maybe here we need to check wrqbuffer_lock is lock or not @@ -2136,7 +2132,7 @@ static void arcmsr_hbe_postqueue_isr(struct AdapterCon u_int16_t error; uint32_t doneq_index; uint16_t cmdSMID; - + /* ***************************************************************************** ** areca cdb command done @@ -2988,7 +2984,7 @@ static void arcmsr_handle_virtual_command(struct Adapt case INQUIRY: { unsigned char inqdata[36]; char *buffer = pccb->csio.data_ptr; - + inqdata[0] = T_PROCESSOR; /* Periph Qualifier & Periph Dev Type */ inqdata[1] = 0; /* rem media bit & Dev Type Modifier */ inqdata[2] = 0; /* ISO, ECMA, & ANSI versions */ @@ -3110,7 +3106,7 @@ static void arcmsr_action(struct cam_sim *psim, union } case XPT_ABORT: { union ccb *pabort_ccb; - + pabort_ccb = pccb->cab.abort_ccb; switch (pabort_ccb->ccb_h.func_code) { case XPT_ACCEPT_TARGET_IO: @@ -3548,7 +3544,7 @@ static void arcmsr_polling_hbe_srbdone(struct AdapterC struct CommandControlBlock *srb; u_int32_t poll_srb_done=0, poll_count=0, doneq_index; u_int16_t error, cmdSMID; - + polling_ccb_retry: poll_count++; bus_dmamap_sync(acb->srb_dmat, acb->srb_dmamap, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); @@ -3835,14 +3831,14 @@ static void arcmsr_get_hbe_config(struct AdapterContro size_t iop_firm_version = offsetof(struct HBE_MessageUnit,msgcode_rwbuffer[ARCMSR_FW_VERS_OFFSET]); /*firm_version,17,68-83*/ size_t iop_device_map = offsetof(struct HBE_MessageUnit,msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); int i; - + CHIP_REG_WRITE32(HBE_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_GET_CONFIG); acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBE_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); if(!arcmsr_hbe_wait_msgint_ready(acb)) { printf("arcmsr%d: wait 'get adapter firmware miscellaneous data' timeout \n", acb->pci_unit); } - + i = 0; while(i < 8) { *acb_firm_model = bus_space_read_1(acb->btag[0], acb->bhandle[0], iop_firm_model+i); Modified: head/sys/dev/arcmsr/arcmsr.h ============================================================================== --- head/sys/dev/arcmsr/arcmsr.h Tue Sep 1 21:39:56 2020 (r365112) +++ head/sys/dev/arcmsr/arcmsr.h Tue Sep 1 21:40:13 2020 (r365113) @@ -1128,15 +1128,15 @@ struct ARCMSR_CDB { u_int8_t TargetID; /* 01h should be 0--15 */ u_int8_t LUN; /* 02h should be 0--7 */ u_int8_t Function; /* 03h should be 1 */ - + u_int8_t CdbLength; /* 04h not used now */ u_int8_t sgcount; /* 05h */ u_int8_t Flags; /* 06h */ u_int8_t msgPages; /* 07h */ - + u_int32_t Context; /* 08h Address of this request */ u_int32_t DataLength; /* 0ch not used now */ - + u_int8_t Cdb[16]; /* 10h SCSI CDB */ /* ******************************************************** @@ -1145,9 +1145,9 @@ struct ARCMSR_CDB { ******************************************************** */ u_int8_t DeviceStatus; /* 20h if error */ - + u_int8_t SenseData[15]; /* 21h output */ - + union { struct SG32ENTRY sg32entry[ARCMSR_MAX_SG_ENTRIES]; /* 30h Scatter gather address */ struct SG64ENTRY sg64entry[ARCMSR_MAX_SG_ENTRIES]; /* 30h */ @@ -1235,7 +1235,7 @@ struct CommandControlBlock { struct AdapterControlBlock { u_int32_t adapter_type; /* adapter A,B..... */ - + bus_space_tag_t btag[2]; bus_space_handle_t bhandle[2]; bus_dma_tag_t parent_dmat; @@ -1245,12 +1245,12 @@ struct AdapterControlBlock { device_t pci_dev; struct cdev *ioctl_dev; int pci_unit; - + struct resource *sys_res_arcmsr[2]; struct resource *irqres[ARCMSR_NUM_MSIX_VECTORS]; void *ih[ARCMSR_NUM_MSIX_VECTORS]; /* interrupt handle */ int irq_id[ARCMSR_NUM_MSIX_VECTORS]; - + /* Hooks into the CAM XPT */ struct cam_sim *psim; struct cam_path *ppath; @@ -1266,32 +1266,32 @@ struct AdapterControlBlock { // unsigned long srb_phyaddr; /* Offset is used in making arc cdb physical to virtual calculations */ u_int32_t outbound_int_enable; - + struct MessageUnit_UNION *pmu; /* message unit ATU inbound base address0 */ - + u_int8_t adapter_index; u_int8_t irq; u_int16_t acb_flags; - + struct CommandControlBlock *psrb_pool[ARCMSR_MAX_FREESRB_NUM]; /* serial srb pointer array */ struct CommandControlBlock *srbworkingQ[ARCMSR_MAX_FREESRB_NUM]; /* working srb pointer array */ int32_t workingsrb_doneindex; /* done srb array index */ int32_t workingsrb_startindex; /* start srb array index */ int32_t srboutstandingcount; - + u_int8_t rqbuffer[ARCMSR_MAX_QBUFFER]; /* data collection buffer for read from 80331 */ u_int32_t rqbuf_firstindex; /* first of read buffer */ u_int32_t rqbuf_lastindex; /* last of read buffer */ - + u_int8_t wqbuffer[ARCMSR_MAX_QBUFFER]; /* data collection buffer for write to 80331 */ u_int32_t wqbuf_firstindex; /* first of write buffer */ u_int32_t wqbuf_lastindex; /* last of write buffer */ - + arcmsr_lock_t isr_lock; arcmsr_lock_t srb_lock; arcmsr_lock_t postDone_lock; arcmsr_lock_t qbuffer_lock; - + u_int8_t devstate[ARCMSR_MAX_TARGETID][ARCMSR_MAX_TARGETLUN]; /* id0 ..... id15,lun0...lun7 */ u_int32_t num_resets; u_int32_t num_aborts; @@ -2500,9 +2500,6 @@ struct SENSE_DATA { ************************************************************************** */ - - - /* ************************************************************************************************************************************* ** 80331 Address Translation Unit Register Definitions @@ -3028,8 +3025,6 @@ struct SENSE_DATA { *************************************************************************************** */ - - /* *********************************************************************************** ** ATU Interrupt Line Register - ATUILR @@ -3157,8 +3152,6 @@ struct SENSE_DATA { *********************************************************************************** */ - - /* *********************************************************************************** ** Inbound ATU Limit Register 0 - IALR0 @@ -4387,8 +4380,6 @@ struct SENSE_DATA { ***************************************************************** */ - - /* ************************************************************************** ** Inbound Read Completions Data Parity Errors @@ -4447,7 +4438,6 @@ struct SENSE_DATA { *************************************************************************** */ - /* *************************************************************************** ** Inbound Configuration Write Request @@ -4552,7 +4542,6 @@ struct SENSE_DATA { ** the internal bus of the 80331. ***************************************************************************** */ - /* ****************************************************************************************************** From owner-svn-src-all@freebsd.org Tue Sep 1 21:40:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1EB6737AD7D; Tue, 1 Sep 2020 21:40:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0qM05Zpz4Pnl; Tue, 1 Sep 2020 21:40:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB07B1FB60; Tue, 1 Sep 2020 21:40:30 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LeUeG033043; Tue, 1 Sep 2020 21:40:30 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LeUY7033042; Tue, 1 Sep 2020 21:40:30 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012140.081LeUY7033042@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:40:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365114 - head/sys/dev/asmc X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/asmc X-SVN-Commit-Revision: 365114 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:40:31 -0000 Author: mjg Date: Tue Sep 1 21:40:30 2020 New Revision: 365114 URL: https://svnweb.freebsd.org/changeset/base/365114 Log: asmc: clean up empty lines in .c and .h files Modified: head/sys/dev/asmc/asmc.c head/sys/dev/asmc/asmcvar.h Modified: head/sys/dev/asmc/asmc.c ============================================================================== --- head/sys/dev/asmc/asmc.c Tue Sep 1 21:40:13 2020 (r365113) +++ head/sys/dev/asmc/asmc.c Tue Sep 1 21:40:30 2020 (r365114) @@ -371,7 +371,6 @@ struct asmc_model asmc_models[] = { ASMC_LIGHT_FUNCS, ASMC_MBA7_TEMPS, ASMC_MBA7_TEMPNAMES, ASMC_MBA7_TEMPDESCS }, - { NULL, NULL } }; @@ -389,7 +388,6 @@ static device_method_t asmc_methods[] = { DEVMETHOD(device_attach, asmc_attach), DEVMETHOD(device_detach, asmc_detach), DEVMETHOD(device_resume, asmc_resume), - { 0, 0 } }; @@ -712,7 +710,6 @@ asmc_resume(device_t dev) return (0); } - #ifdef DEBUG void asmc_dumpall(device_t dev) { @@ -871,7 +868,6 @@ asmc_wait(device_t dev, uint8_t val) */ static int asmc_command(device_t dev, uint8_t command) { - int i; struct asmc_softc *sc = device_get_softc(dev); @@ -1171,7 +1167,6 @@ asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS) return (error); } - static int asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS) { @@ -1315,8 +1310,6 @@ asmc_sms_intrfast(void *arg) taskqueue_enqueue(sc->sc_sms_tq, &sc->sc_sms_task); return (FILTER_HANDLED); } - - static void asmc_sms_printintr(device_t dev, uint8_t type) Modified: head/sys/dev/asmc/asmcvar.h ============================================================================== --- head/sys/dev/asmc/asmcvar.h Tue Sep 1 21:40:13 2020 (r365113) +++ head/sys/dev/asmc/asmcvar.h Tue Sep 1 21:40:30 2020 (r365114) @@ -76,7 +76,6 @@ struct asmc_softc { */ #define ASMC_INTPORT_READ(sc) bus_read_1(sc->sc_ioport, 0x1f) - /* Number of keys */ #define ASMC_NKEYS "#KEY" /* RO; 4 bytes */ @@ -292,7 +291,6 @@ struct asmc_softc { "GPU Die", "Memory Bank A1", "Memory Module A1", \ "PCH Die" } - #define ASMC_MBP112_TEMPS { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \ "TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \ "TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \ @@ -349,8 +347,6 @@ struct asmc_softc { "TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \ "TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \ "Ts1S" } - - #define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL } #define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" } #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ @@ -433,7 +429,7 @@ struct asmc_softc { "memory_proximity", "pch_controller_proximity", \ "pch_controller_die", "pwr_supply", \ "wireless_proximity", } - + #define ASMC_MM52_TEMPDESCS { "Ambient Air Proximity Temperature", \ "Combo Ambient CPU PCH Wireless DIMM Temperature", \ "CPU Die Temperature", "CPU Proximity Temperature", \ @@ -585,7 +581,6 @@ struct asmc_softc { "Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \ "Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \ "TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", } - #define ASMC_MBA_TEMPS { "TB0T", NULL } #define ASMC_MBA_TEMPNAMES { "enclosure" } #define ASMC_MBA_TEMPDESCS { "Enclosure Bottom" } From owner-svn-src-all@freebsd.org Tue Sep 1 21:40:51 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3E58437AF40; Tue, 1 Sep 2020 21:40:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0ql0qrzz4QDT; Tue, 1 Sep 2020 21:40:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0185D20095; Tue, 1 Sep 2020 21:40:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LeoAK035429; Tue, 1 Sep 2020 21:40:50 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LelOA035411; Tue, 1 Sep 2020 21:40:47 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012140.081LelOA035411@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:40:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365115 - in head/sys/dev/ata: . chipsets X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/ata: . chipsets X-SVN-Commit-Revision: 365115 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:40:51 -0000 Author: mjg Date: Tue Sep 1 21:40:47 2020 New Revision: 365115 URL: https://svnweb.freebsd.org/changeset/base/365115 Log: ata: clean up empty lines in .c and .h files Modified: head/sys/dev/ata/ata-all.h head/sys/dev/ata/ata-isa.c head/sys/dev/ata/ata-lowlevel.c head/sys/dev/ata/ata-pci.c head/sys/dev/ata/chipsets/ata-cypress.c head/sys/dev/ata/chipsets/ata-cyrix.c head/sys/dev/ata/chipsets/ata-fsl.c head/sys/dev/ata/chipsets/ata-highpoint.c head/sys/dev/ata/chipsets/ata-ite.c head/sys/dev/ata/chipsets/ata-jmicron.c head/sys/dev/ata/chipsets/ata-marvell.c head/sys/dev/ata/chipsets/ata-national.c head/sys/dev/ata/chipsets/ata-netcell.c head/sys/dev/ata/chipsets/ata-promise.c head/sys/dev/ata/chipsets/ata-serverworks.c Modified: head/sys/dev/ata/ata-all.h ============================================================================== --- head/sys/dev/ata/ata-all.h Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/ata-all.h Tue Sep 1 21:40:47 2020 (r365115) @@ -296,7 +296,6 @@ struct ata_request { #define ATA_DEBUG_RQ(request, string) #endif - /* structure describing an ATA/ATAPI device */ struct ata_device { device_t dev; /* device handle */ Modified: head/sys/dev/ata/ata-isa.c ============================================================================== --- head/sys/dev/ata/ata-isa.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/ata-isa.c Tue Sep 1 21:40:47 2020 (r365115) @@ -138,7 +138,7 @@ ata_isa_attach(device_t dev) ch->r_io[ATA_CONTROL].offset = 0; ch->r_io[ATA_IDX_ADDR].res = io; ata_default_registers(dev); - + /* initialize softc for this channel */ ch->unit = 0; ch->flags |= ATA_USE_16BIT; @@ -186,7 +186,6 @@ ata_isa_resume(device_t dev) return ata_resume(dev); } - static device_method_t ata_isa_methods[] = { /* device interface */ Modified: head/sys/dev/ata/ata-lowlevel.c ============================================================================== --- head/sys/dev/ata/ata-lowlevel.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/ata-lowlevel.c Tue Sep 1 21:40:47 2020 (r365115) @@ -99,7 +99,6 @@ ata_begin_transaction(struct ata_request *request) request->flags &= ~ATA_R_DMA; switch (request->flags & (ATA_R_ATAPI | ATA_R_DMA)) { - /* ATA PIO data transfer and control commands */ default: { @@ -116,7 +115,6 @@ ata_begin_transaction(struct ata_request *request) /* device reset doesn't interrupt */ if (request->u.ata.command == ATA_DEVICE_RESET) { - int timeout = 1000000; do { DELAY(10); @@ -254,7 +252,6 @@ ata_end_transaction(struct ata_request *request) request->status = ATA_IDX_INB(ch, ATA_STATUS); switch (request->flags & (ATA_R_ATAPI | ATA_R_DMA | ATA_R_CONTROL)) { - /* ATA PIO data transfer and control commands */ default: @@ -273,10 +270,9 @@ ata_end_transaction(struct ata_request *request) request->error = ATA_IDX_INB(ch, ATA_ERROR); goto end_finished; } - + /* are we moving data ? */ if (request->flags & (ATA_R_READ | ATA_R_WRITE)) { - /* if read data get it */ if (request->flags & ATA_R_READ) { int flags = ATA_S_DRQ; @@ -297,7 +293,6 @@ ata_end_transaction(struct ata_request *request) /* do we need a scoop more ? */ if (request->bytecount > request->donecount) { - /* set this transfer size according to HW capabilities */ request->transfersize = min((request->bytecount - request->donecount), @@ -305,7 +300,6 @@ ata_end_transaction(struct ata_request *request) /* if data write command, output the data */ if (request->flags & ATA_R_WRITE) { - /* if we get an error here we are done with the HW */ if (ata_wait(ch, request->unit, (ATA_S_READY | ATA_S_DRQ)) < 0) { device_printf(request->parent, @@ -364,7 +358,6 @@ ata_end_transaction(struct ata_request *request) switch ((ATA_IDX_INB(ch, ATA_IREASON) & (ATA_I_CMD | ATA_I_IN)) | (request->status & ATA_S_DRQ)) { - case ATAPI_P_CMDOUT: /* this seems to be needed for some (slow) devices */ DELAY(10); @@ -457,7 +450,7 @@ ata_end_transaction(struct ata_request *request) request->status |= ATA_S_ERROR; else if (!(request->flags & ATA_R_TIMEOUT)) request->donecount = request->bytecount; - + /* release SG list etc */ ch->dma.unload(request); Modified: head/sys/dev/ata/ata-pci.c ============================================================================== --- head/sys/dev/ata/ata-pci.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/ata-pci.c Tue Sep 1 21:40:47 2020 (r365115) @@ -161,7 +161,7 @@ ata_pci_suspend(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); int error = 0; - + bus_generic_suspend(dev); if (ctlr->suspend) error = ctlr->suspend(dev); @@ -173,7 +173,7 @@ ata_pci_resume(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); int error = 0; - + if (ctlr->resume) error = ctlr->resume(dev); bus_generic_resume(dev); Modified: head/sys/dev/ata/chipsets/ata-cypress.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-cypress.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-cypress.c Tue Sep 1 21:40:47 2020 (r365115) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); static int ata_cypress_chipinit(device_t dev); static int ata_cypress_setmode(device_t dev, int target, int mode); - /* * Cypress chipset support functions */ Modified: head/sys/dev/ata/chipsets/ata-cyrix.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-cyrix.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-cyrix.c Tue Sep 1 21:40:47 2020 (r365115) @@ -89,7 +89,7 @@ static int ata_cyrix_ch_attach(device_t dev) { struct ata_channel *ch = device_get_softc(dev); - + ch->dma.alignment = 16; ch->dma.max_iosize = 64 * DEV_BSIZE; return (ata_pci_ch_attach(dev)); Modified: head/sys/dev/ata/chipsets/ata-fsl.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-fsl.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-fsl.c Tue Sep 1 21:40:47 2020 (r365115) @@ -154,7 +154,6 @@ imx_ata_ch_attach(device_t dev) bus_write_2(ctrl->r_res1, 0x24, 0xc0); DELAY(100); - /* Write TIME_OFF/ON/1/2W */ bus_write_1(ctrl->r_res1, 0x00, 3); bus_write_1(ctrl->r_res1, 0x01, 3); Modified: head/sys/dev/ata/chipsets/ata-highpoint.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-highpoint.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-highpoint.c Tue Sep 1 21:40:47 2020 (r365115) @@ -65,7 +65,6 @@ static int ata_highpoint_check_80pin(device_t dev, int #define HPT_374 3 #define HPT_OLD 1 - /* * HighPoint chipset support functions */ Modified: head/sys/dev/ata/chipsets/ata-ite.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-ite.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-ite.c Tue Sep 1 21:40:47 2020 (r365115) @@ -117,7 +117,7 @@ ata_ite_ch_attach(device_t dev) { struct ata_channel *ch = device_get_softc(dev); int error; - + error = ata_pci_ch_attach(dev); ch->flags |= ATA_CHECKS_CABLE; ch->flags |= ATA_NO_ATAPI_DMA; Modified: head/sys/dev/ata/chipsets/ata-jmicron.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-jmicron.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-jmicron.c Tue Sep 1 21:40:47 2020 (r365115) @@ -135,7 +135,7 @@ ata_jmicron_ch_attach(device_t dev) { struct ata_channel *ch = device_get_softc(dev); int error; - + error = ata_pci_ch_attach(dev); ch->flags |= ATA_CHECKS_CABLE; return (error); Modified: head/sys/dev/ata/chipsets/ata-marvell.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-marvell.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-marvell.c Tue Sep 1 21:40:47 2020 (r365115) @@ -147,7 +147,7 @@ ata_marvell_ch_attach(device_t dev) { struct ata_channel *ch = device_get_softc(dev); int error; - + error = ata_pci_ch_attach(dev); /* dont use 32 bit PIO transfers */ ch->flags |= ATA_USE_16BIT; Modified: head/sys/dev/ata/chipsets/ata-national.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-national.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-national.c Tue Sep 1 21:40:47 2020 (r365115) @@ -91,7 +91,7 @@ static int ata_national_ch_attach(device_t dev) { struct ata_channel *ch = device_get_softc(dev); - + ch->dma.alignment = 16; ch->dma.max_iosize = 64 * DEV_BSIZE; return (ata_pci_ch_attach(dev)); Modified: head/sys/dev/ata/chipsets/ata-netcell.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-netcell.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-netcell.c Tue Sep 1 21:40:47 2020 (r365115) @@ -90,11 +90,11 @@ static int ata_netcell_ch_attach(device_t dev) { struct ata_channel *ch = device_get_softc(dev); - + /* setup the usual register normal pci style */ if (ata_pci_ch_attach(dev)) return ENXIO; - + /* the NetCell only supports 16 bit PIO transfers */ ch->flags |= ATA_USE_16BIT; /* It is a hardware RAID without cable. */ Modified: head/sys/dev/ata/chipsets/ata-promise.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-promise.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-promise.c Tue Sep 1 21:40:47 2020 (r365115) @@ -731,7 +731,6 @@ ata_promise_mio_reset(device_t dev) case PR_SATA: if ((ctlr->chip->cfg2 == PR_SATA) || ((ctlr->chip->cfg2 == PR_CMBO) && (ch->unit < 2))) { - /* mask plug/unplug intr */ ATA_OUTL(ctlr->r_res2, 0x06c, (0x00110000 << ch->unit)); } @@ -745,7 +744,6 @@ ata_promise_mio_reset(device_t dev) if ((ctlr->chip->cfg2 == PR_SATA) || ((ctlr->chip->cfg2 == PR_CMBO) && (ch->unit < 2))) { - if (ata_sata_phy_reset(dev, -1, 1)) ata_generic_reset(dev); else @@ -778,7 +776,6 @@ ata_promise_mio_reset(device_t dev) if ((ctlr->chip->cfg2 == PR_SATA2) || ((ctlr->chip->cfg2 == PR_CMBO2) && (ch->unit < 2))) { - /* set PHY mode to "improved" */ ATA_OUTL(ctlr->r_res2, 0x414 + (ch->unit << 8), (ATA_INL(ctlr->r_res2, 0x414 + (ch->unit << 8)) & @@ -823,7 +820,6 @@ ata_promise_mio_reset(device_t dev) else ata_generic_reset(dev); break; - } } Modified: head/sys/dev/ata/chipsets/ata-serverworks.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-serverworks.c Tue Sep 1 21:40:30 2020 (r365114) +++ head/sys/dev/ata/chipsets/ata-serverworks.c Tue Sep 1 21:40:47 2020 (r365115) @@ -68,7 +68,6 @@ static int ata_serverworks_status(device_t dev); #define SWKS_100 2 #define SWKS_MIO 3 - /* * ServerWorks chipset support functions */ @@ -235,7 +234,7 @@ ata_serverworks_ch_attach(device_t dev) * The status register must be read as a long to fill the other * registers. */ - + ch->hw.status = ata_serverworks_status; ch->flags |= ATA_STATUS_IS_LONG; } From owner-svn-src-all@freebsd.org Tue Sep 1 21:41:20 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 66CD037B0DA; Tue, 1 Sep 2020 21:41:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0rJ2Nf3z4QQ5; Tue, 1 Sep 2020 21:41:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C5AC20217; Tue, 1 Sep 2020 21:41:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LfKfR035554; Tue, 1 Sep 2020 21:41:20 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lf7n3035488; Tue, 1 Sep 2020 21:41:07 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012141.081Lf7n3035488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:41:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365116 - in head/sys/dev/ath: . ath_dfs/null ath_hal ath_hal/ah_regdomain ath_hal/ar5210 ath_hal/ar5211 ath_hal/ar5212 ath_hal/ar5312 ath_hal/ar5416 ath_hal/ar9001 ath_hal/ar9002 ath_r... X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/ath: . ath_dfs/null ath_hal ath_hal/ah_regdomain ath_hal/ar5210 ath_hal/ar5211 ath_hal/ar5212 ath_hal/ar5312 ath_hal/ar5416 ath_hal/ar9001 ath_hal/ar9002 ath_rate/amrr ath_rate/onoe at... X-SVN-Commit-Revision: 365116 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:41:20 -0000 Author: mjg Date: Tue Sep 1 21:41:07 2020 New Revision: 365116 URL: https://svnweb.freebsd.org/changeset/base/365116 Log: ath: clean up empty lines in .c and .h files Modified: head/sys/dev/ath/ah_osdep.c head/sys/dev/ath/ah_osdep_ar5210.c head/sys/dev/ath/ah_osdep_ar5211.c head/sys/dev/ath/ah_osdep_ar5212.c head/sys/dev/ath/ah_osdep_ar5416.c head/sys/dev/ath/ah_osdep_ar9300.c head/sys/dev/ath/ath_dfs/null/dfs_null.c head/sys/dev/ath/ath_hal/ah.c head/sys/dev/ath/ath_hal/ah.h head/sys/dev/ath/ath_hal/ah_eeprom_9287.c head/sys/dev/ath/ath_hal/ah_eeprom_9287.h head/sys/dev/ath/ath_hal/ah_eeprom_v14.c head/sys/dev/ath/ath_hal/ah_eeprom_v3.c head/sys/dev/ath/ath_hal/ah_eeprom_v3.h head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c head/sys/dev/ath/ath_hal/ah_internal.h head/sys/dev/ath/ath_hal/ah_regdomain.c head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h head/sys/dev/ath/ath_hal/ah_soc.h head/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c head/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c head/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c head/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c head/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c head/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c head/sys/dev/ath/ath_hal/ar5211/ar5211phy.h head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h head/sys/dev/ath/ath_hal/ar5212/ar2316.c head/sys/dev/ath/ath_hal/ar5212/ar2317.c head/sys/dev/ath/ath_hal/ar5212/ar2413.c head/sys/dev/ath/ath_hal/ar5212/ar2425.c head/sys/dev/ath/ath_hal/ar5212/ar5111.c head/sys/dev/ath/ath_hal/ar5212/ar5112.c head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c head/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c head/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c head/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c head/sys/dev/ath/ath_hal/ar5212/ar5212phy.h head/sys/dev/ath/ath_hal/ar5212/ar5413.c head/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c head/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c head/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c head/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c head/sys/dev/ath/ath_hal/ar5312/ar5312reg.h head/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c head/sys/dev/ath/ath_hal/ar5416/ar2133.c head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c head/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h head/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c head/sys/dev/ath/ath_hal/ar5416/ar5416_power.c head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c head/sys/dev/ath/ath_hal/ar5416/ar5416desc.h head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c head/sys/dev/ath/ath_hal/ar9002/ar9285.c head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c head/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c head/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c head/sys/dev/ath/ath_rate/amrr/amrr.c head/sys/dev/ath/ath_rate/onoe/onoe.c head/sys/dev/ath/ath_rate/sample/sample.c head/sys/dev/ath/ath_rate/sample/sample.h head/sys/dev/ath/if_ath.c head/sys/dev/ath/if_ath_ahb.c head/sys/dev/ath/if_ath_beacon.c head/sys/dev/ath/if_ath_beacon.h head/sys/dev/ath/if_ath_btcoex.c head/sys/dev/ath/if_ath_dfs.c head/sys/dev/ath/if_ath_drv.c head/sys/dev/ath/if_ath_ioctl.c head/sys/dev/ath/if_ath_led.c head/sys/dev/ath/if_ath_lna_div.c head/sys/dev/ath/if_ath_pci.c head/sys/dev/ath/if_ath_pci_devlist.h head/sys/dev/ath/if_ath_rate.c head/sys/dev/ath/if_ath_spectral.c head/sys/dev/ath/if_ath_sysctl.c head/sys/dev/ath/if_ath_tx.c head/sys/dev/ath/if_ath_tx.h head/sys/dev/ath/if_ath_tx_edma.c head/sys/dev/ath/if_ath_tx_ht.c head/sys/dev/ath/if_athioctl.h head/sys/dev/ath/if_athvar.h Modified: head/sys/dev/ath/ah_osdep.c ============================================================================== --- head/sys/dev/ath/ah_osdep.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ah_osdep.c Tue Sep 1 21:41:07 2020 (r365116) @@ -447,7 +447,6 @@ ath_hal_modevent(module_t mod __unused, int type, void default: error = EOPNOTSUPP; break; - } return (error); } Modified: head/sys/dev/ath/ah_osdep_ar5210.c ============================================================================== --- head/sys/dev/ath/ah_osdep_ar5210.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ah_osdep_ar5210.c Tue Sep 1 21:41:07 2020 (r365116) @@ -64,7 +64,6 @@ ath_hal_ar5210_modevent(module_t mod __unused, int typ default: error = EOPNOTSUPP; break; - } return (error); } Modified: head/sys/dev/ath/ah_osdep_ar5211.c ============================================================================== --- head/sys/dev/ath/ah_osdep_ar5211.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ah_osdep_ar5211.c Tue Sep 1 21:41:07 2020 (r365116) @@ -64,7 +64,6 @@ ath_hal_ar5211_modevent(module_t mod __unused, int typ default: error = EOPNOTSUPP; break; - } return (error); } Modified: head/sys/dev/ath/ah_osdep_ar5212.c ============================================================================== --- head/sys/dev/ath/ah_osdep_ar5212.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ah_osdep_ar5212.c Tue Sep 1 21:41:07 2020 (r365116) @@ -85,7 +85,6 @@ ath_hal_ar5212_modevent(module_t mod __unused, int typ default: error = EOPNOTSUPP; break; - } return (error); } Modified: head/sys/dev/ath/ah_osdep_ar5416.c ============================================================================== --- head/sys/dev/ath/ah_osdep_ar5416.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ah_osdep_ar5416.c Tue Sep 1 21:41:07 2020 (r365116) @@ -92,7 +92,6 @@ ath_hal_ar5416_modevent(module_t mod __unused, int typ default: error = EOPNOTSUPP; break; - } return (error); } Modified: head/sys/dev/ath/ah_osdep_ar9300.c ============================================================================== --- head/sys/dev/ath/ah_osdep_ar9300.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ah_osdep_ar9300.c Tue Sep 1 21:41:07 2020 (r365116) @@ -64,7 +64,6 @@ ath_hal_ar9300_modevent(module_t mod __unused, int typ default: error = EOPNOTSUPP; break; - } return (error); } Modified: head/sys/dev/ath/ath_dfs/null/dfs_null.c ============================================================================== --- head/sys/dev/ath/ath_dfs/null/dfs_null.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_dfs/null/dfs_null.c Tue Sep 1 21:41:07 2020 (r365116) @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include - + #include #include #include Modified: head/sys/dev/ath/ath_hal/ah.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah.c Tue Sep 1 21:41:07 2020 (r365116) @@ -556,7 +556,6 @@ ath_hal_get_curmode(struct ath_hal *ah, const struct i return HAL_MODE_11NG_HT20; } - typedef enum { WIRELESS_MODE_11a = 0, WIRELESS_MODE_TURBO = 1, @@ -971,7 +970,7 @@ ath_hal_getregdump(struct ath_hal *ah, const HAL_REGRA } return (char *) dp - (char *) dstbuf; } - + static void ath_hal_setregs(struct ath_hal *ah, const HAL_REGWRITE *regs, int space) { Modified: head/sys/dev/ath/ath_hal/ah.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah.h Tue Sep 1 21:41:07 2020 (r365116) @@ -739,7 +739,6 @@ typedef enum { HAL_HT_EXTPROTSPACING_25 = 1, /* 25 MHz spacing */ } HAL_HT_EXTPROTSPACING; - typedef enum { HAL_RX_CLEAR_CTL_LOW = 0x1, /* force control channel to appear busy */ HAL_RX_CLEAR_EXT_LOW = 0x2, /* force extension channel to appear busy */ @@ -1052,7 +1051,6 @@ typedef enum { HAL_DFS_ETSI_DOMAIN = 2, /* ETSI dfs domain */ HAL_DFS_MKK4_DOMAIN = 3, /* Japan dfs domain */ } HAL_DFS_DOMAIN; - /* * MFP decryption options for initializing the MAC. Modified: head/sys/dev/ath/ath_hal/ah_eeprom_9287.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_9287.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_eeprom_9287.c Tue Sep 1 21:41:07 2020 (r365116) @@ -207,11 +207,11 @@ static uint16_t v9287EepromGetSpurChan(struct ath_hal *ah, int ix, HAL_BOOL is2GHz) { HAL_EEPROM_9287 *ee = AH_PRIVATE(ah)->ah_eeprom; - + HALASSERT(is2GHz == AH_TRUE); if (is2GHz != AH_TRUE) return 0; /* XXX ? */ - + HALASSERT(0 <= ix && ix < AR5416_EEPROM_MODAL_SPURS); return ee->ee_base.modalHeader.spurChans[ix].spurChan; } @@ -234,7 +234,6 @@ fbin2freq(uint8_t fbin, HAL_BOOL is2GHz) return (uint16_t)((is2GHz) ? (2300 + fbin) : (4800 + 5 * fbin)); } - /* * Copy EEPROM Conformance Testing Limits contents * into the allocated space @@ -247,7 +246,7 @@ v9287EepromReadCTLInfo(struct ath_hal *ah, HAL_EEPROM_ { RD_EDGES_POWER *rep = ee->ee_rdEdgesPower; int i, j; - + HALASSERT(AR9287_NUM_CTLS <= sizeof(ee->ee_rdEdgesPower)/NUM_EDGES); for (i = 0; ee->ee_base.ctlIndex[i] != 0 && i < AR9287_NUM_CTLS; i++) { @@ -359,7 +358,7 @@ ath_hal_9287EepromAttach(struct ath_hal *ah) len = ee->ee_base.baseEepHeader.length; } len = AH_MIN(len, sizeof(HAL_EEPROM_9287)) / sizeof(uint16_t); - + /* Apply the checksum, done in native eeprom format */ /* XXX - Need to check to make sure checksum calculation is done * in the correct endian format. Right now, it seems it would Modified: head/sys/dev/ath/ath_hal/ah_eeprom_9287.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_9287.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_eeprom_9287.h Tue Sep 1 21:41:07 2020 (r365116) @@ -166,5 +166,4 @@ typedef struct { typedef struct modal_eep_ar9287_header MODAL_EEP_9287_HEADER; typedef struct base_eep_ar9287_header BASE_EEP_9287_HEADER; - #endif /* __AH_EEPROM_9287_H__ */ Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v14.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v14.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v14.c Tue Sep 1 21:41:07 2020 (r365116) @@ -249,7 +249,7 @@ static uint16_t v14EepromGetSpurChan(struct ath_hal *ah, int ix, HAL_BOOL is2GHz) { HAL_EEPROM_v14 *ee = AH_PRIVATE(ah)->ah_eeprom; - + HALASSERT(0 <= ix && ix < AR5416_EEPROM_MODAL_SPURS); return ee->ee_base.modalHeader[is2GHz].spurChans[ix].spurChan; } @@ -284,7 +284,7 @@ v14EepromReadCTLInfo(struct ath_hal *ah, HAL_EEPROM_v1 { RD_EDGES_POWER *rep = ee->ee_rdEdgesPower; int i, j; - + HALASSERT(AR5416_NUM_CTLS <= sizeof(ee->ee_rdEdgesPower)/NUM_EDGES); for (i = 0; ee->ee_base.ctlIndex[i] != 0 && i < AR5416_NUM_CTLS; i++) { @@ -342,7 +342,7 @@ ath_hal_v14EepromAttach(struct ath_hal *ah) uint32_t sum; HALASSERT(ee == AH_NULL); - + /* * Don't check magic if we're supplied with an EEPROM block, * typically this is from Howl but it may also be from later @@ -398,7 +398,7 @@ ath_hal_v14EepromAttach(struct ath_hal *ah) len = ee->ee_base.baseEepHeader.length; } len = AH_MIN(len, sizeof(struct ar5416eeprom)) / sizeof(uint16_t); - + /* Apply the checksum, done in native eeprom format */ /* XXX - Need to check to make sure checksum calculation is done * in the correct endian format. Right now, it seems it would Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v3.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v3.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v3.c Tue Sep 1 21:41:07 2020 (r365116) @@ -739,14 +739,14 @@ readEepromRawPowerCalInfo2413(struct ath_hal *ah, HAL_ int numEEPROMWordsPerChannel; uint32_t off; HAL_BOOL ret = AH_FALSE; - + HALASSERT(ee->ee_version >= AR_EEPROM_VER5_0); HALASSERT(ee->ee_eepMap == 2); - + pCal = ath_hal_malloc(sizeof(EEPROM_DATA_STRUCT_2413)); if (pCal == AH_NULL) goto exit; - + off = ee->ee_eepMap2PowerCalStart; if (ee->ee_Amode) { OS_MEMZERO(pCal, sizeof(EEPROM_DATA_STRUCT_2413)); Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v3.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v3.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v3.h Tue Sep 1 21:41:07 2020 (r365116) @@ -231,7 +231,6 @@ typedef struct cornerCalInfo { #define NUM_TARGET_POWER_LOCATIONS_11B 4 #define NUM_TARGET_POWER_LOCATIONS_11G 6 - typedef struct { uint16_t xpd_gain; uint16_t numPcdacs; Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c Tue Sep 1 21:41:07 2020 (r365116) @@ -200,7 +200,7 @@ static uint16_t v4kEepromGetSpurChan(struct ath_hal *ah, int ix, HAL_BOOL is2GHz) { HAL_EEPROM_v4k *ee = AH_PRIVATE(ah)->ah_eeprom; - + HALASSERT(0 <= ix && ix < AR5416_EEPROM_MODAL_SPURS); HALASSERT(is2GHz); return ee->ee_base.modalHeader.spurChans[ix].spurChan; @@ -236,7 +236,7 @@ v4kEepromReadCTLInfo(struct ath_hal *ah, HAL_EEPROM_v4 { RD_EDGES_POWER *rep = ee->ee_rdEdgesPower; int i, j; - + HALASSERT(AR5416_4K_NUM_CTLS <= sizeof(ee->ee_rdEdgesPower)/NUM_EDGES); for (i = 0; ee->ee_base.ctlIndex[i] != 0 && i < AR5416_4K_NUM_CTLS; i++) { @@ -347,7 +347,7 @@ ath_hal_v4kEepromAttach(struct ath_hal *ah) len = ee->ee_base.baseEepHeader.length; } len = AH_MIN(len, sizeof(struct ar5416eeprom_4k)) / sizeof(uint16_t); - + /* Apply the checksum, done in native eeprom format */ /* XXX - Need to check to make sure checksum calculation is done * in the correct endian format. Right now, it seems it would Modified: head/sys/dev/ath/ath_hal/ah_internal.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_internal.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_internal.h Tue Sep 1 21:41:07 2020 (r365116) @@ -849,7 +849,6 @@ typedef struct { uint16_t ee_data; /* write data */ } HAL_DIAG_EEVAL; - typedef struct { u_int offset; /* reg offset */ uint32_t val; /* reg value */ Modified: head/sys/dev/ath/ath_hal/ah_regdomain.c ============================================================================== --- head/sys/dev/ath/ath_hal/ah_regdomain.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_regdomain.c Tue Sep 1 21:41:07 2020 (r365116) @@ -953,7 +953,6 @@ ath_hal_getctl(struct ath_hal *ah, const struct ieee80 return ctl; } - /* * Update the current dfsDomain setting based on the given * country code. @@ -978,7 +977,6 @@ ath_hal_update_dfsdomain(struct ath_hal *ah) HALDEBUG(ah, HAL_DEBUG_REGDOMAIN, "%s ah_dfsDomain: %d\n", __func__, AH_PRIVATE(ah)->ah_dfsDomain); } - /* * Return the max allowed antenna gain and apply any regulatory Modified: head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h Tue Sep 1 21:41:07 2020 (r365116) @@ -64,7 +64,6 @@ W1(_fg) | W1(_fh) | W1(_fi) } static REG_DOMAIN regDomains[] = { - {.regDmnEnum = DEBUG_REG_DMN, .conformanceTestLimit = FCC, .dfsMask = DFS_FCC3, Modified: head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h Tue Sep 1 21:41:07 2020 (r365116) @@ -198,7 +198,6 @@ static REG_DMN_FREQ_BAND regDmn5GhzFreq[] = { #define W2_5825_5825 AFTER(W2_5180_5240) }; - /* * 5GHz Turbo (dynamic & static) tags */ @@ -373,7 +372,7 @@ static REG_DMN_FREQ_BAND regDmn2Ghz11gFreq[] = { #define G3_2412_2462 AFTER(G2_2412_2462) { 2412, 2462, 27, 6, 5, 5, NO_DFS, NO_PSCAN }, #define G4_2412_2462 AFTER(G3_2412_2462) - + { 2432, 2442, 20, 0, 20, 5, NO_DFS, NO_PSCAN }, #define G1_2432_2442 AFTER(G4_2412_2462) Modified: head/sys/dev/ath/ath_hal/ah_soc.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_soc.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ah_soc.h Tue Sep 1 21:41:07 2020 (r365116) @@ -62,18 +62,18 @@ struct ar531x_boarddata { #define BD_WLAN1_5G_EN 0x00040000 /* FLAG for radio0_2G */ uint16_t resetConfigGpio; /* Reset factory GPIO pin */ uint16_t sysLedGpio; /* System LED GPIO pin */ - + uint32_t cpuFreq; /* CPU core frequency in Hz */ uint32_t sysFreq; /* System frequency in Hz */ uint32_t cntFreq; /* Calculated C0_COUNT frequency */ - + uint8_t wlan0Mac[6]; uint8_t enet0Mac[6]; uint8_t enet1Mac[6]; - + uint16_t pciId; /* Pseudo PCIID for common code */ uint16_t memCap; /* cap bank1 in MB */ - + /* version 3 */ uint8_t wlan1Mac[6]; /* (ar5212) */ }; Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c Tue Sep 1 21:41:07 2020 (r365116) @@ -50,7 +50,6 @@ ar5210SetRxDP(struct ath_hal *ah, uint32_t rxdp, HAL_R OS_REG_WRITE(ah, AR_RXDP, rxdp); } - /* * Set Receive Enable bits. */ Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Tue Sep 1 21:41:07 2020 (r365116) @@ -611,7 +611,6 @@ ar5210SetResetReg(struct ath_hal *ah, uint32_t resetMa return rt; } - /* * Returns: the pcdac value */ Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c Tue Sep 1 21:41:07 2020 (r365116) @@ -163,7 +163,6 @@ ar5211SetKeyCacheEntry(struct ath_hal *ah, uint16_t en if (k->kv_len <= 104 / NBBY) key4 &= 0xff; - /* * Note: WEP key cache hardware requires that each double-word * pair be written in even/odd order (since the destination is Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c Tue Sep 1 21:41:07 2020 (r365116) @@ -708,7 +708,6 @@ ar5211Get11nExtBusy(struct ath_hal *ah) return (0); } - /* * There's no channel survey support for the AR5211. */ Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c Tue Sep 1 21:41:07 2020 (r365116) @@ -81,7 +81,6 @@ HAL_RATE_TABLE ar5211_11b_table = { #undef CCK #undef TURBO - const HAL_RATE_TABLE * ar5211GetRateTable(struct ath_hal *ah, u_int mode) { Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c Tue Sep 1 21:41:07 2020 (r365116) @@ -51,7 +51,6 @@ ar5211SetRxDP(struct ath_hal *ah, uint32_t rxdp, HAL_R HALASSERT(OS_REG_READ(ah, AR_RXDP) == rxdp); } - /* * Set Receive Enable bits. */ Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c Tue Sep 1 21:41:07 2020 (r365116) @@ -193,7 +193,6 @@ setTxQInterrupts(struct ath_hal *ah, HAL_TX_QUEUE_INFO AR_IMR_S2_QCU_TXURN, ahp->ah_txUrnInterruptMask); } - /* * Free a tx DCU/QCU combination. */ @@ -676,7 +675,6 @@ ar5211GetTxCompletionRates(struct ath_hal *ah, const s { return AH_FALSE; } - void ar5211SetTxDescLink(struct ath_hal *ah, void *ds, uint32_t link) Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211phy.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211phy.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211phy.h Tue Sep 1 21:41:07 2020 (r365116) @@ -48,7 +48,6 @@ #define AR_PHY_PLL_CTL_40 0x18 /* 40 MHz */ #define AR_PHY_PLL_CTL_20 0x13 /* 20 MHz half rate 11a for emulation */ - #define AR_PHY_RX_DELAY 0x9914 /* PHY analog_power_on_time, in 100ns increments */ #define AR_PHY_RX_DELAY_M 0x00003FFF /* Mask for delay from active assertion (wake up) */ /* to enable_receiver */ Modified: head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h Tue Sep 1 21:41:07 2020 (r365116) @@ -808,7 +808,6 @@ #define AR5211_USEC_RX_LAT_M 0x1F800000 /* Rx latency */ #define AR5211_USEC_RX_LAT_S 23 - #define AR_BEACON_PERIOD 0x0000FFFF /* Beacon period in TU/msec */ #define AR_BEACON_PERIOD_S 0 /* Byte offset of PERIOD start*/ #define AR_BEACON_TIM 0x007F0000 /* Byte offset of TIM start */ Modified: head/sys/dev/ath/ath_hal/ar5212/ar2316.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar2316.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar2316.c Tue Sep 1 21:41:07 2020 (r365116) @@ -629,7 +629,7 @@ ar2316GetMaxPower(struct ath_hal *ah, const RAW_DATA_P { uint32_t ii; uint16_t Pmax=0,numVpd; - + for (ii=0; ii< MAX_NUM_PDGAINS_PER_CHANNEL; ii++) { /* work forwards cuase lowest pdGain for highest power */ numVpd = data->pDataPerPDGain[ii].numVpd; @@ -664,7 +664,7 @@ ar2316GetChannelMaxMinPower(struct ath_hal *ah, numChannels = pRawDataset->numChannels; data = pRawDataset->pDataPerChannel; - + /* Make sure the channel is in the range of the TP values * (freq piers) */ Modified: head/sys/dev/ath/ath_hal/ar5212/ar2317.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar2317.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar2317.c Tue Sep 1 21:41:07 2020 (r365116) @@ -608,7 +608,7 @@ ar2317GetMaxPower(struct ath_hal *ah, const RAW_DATA_P uint32_t ii; uint16_t Pmax=0,numVpd; uint16_t vpdmax; - + for (ii=0; ii< MAX_NUM_PDGAINS_PER_CHANNEL; ii++) { /* work forwards cuase lowest pdGain for highest power */ numVpd = data->pDataPerPDGain[ii].numVpd; @@ -644,7 +644,7 @@ ar2317GetChannelMaxMinPower(struct ath_hal *ah, numChannels = pRawDataset->numChannels; data = pRawDataset->pDataPerChannel; - + /* Make sure the channel is in the range of the TP values * (freq piers) */ Modified: head/sys/dev/ath/ath_hal/ar5212/ar2413.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar2413.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar2413.c Tue Sep 1 21:41:07 2020 (r365116) @@ -624,7 +624,7 @@ ar2413GetMaxPower(struct ath_hal *ah, const RAW_DATA_P { uint32_t ii; uint16_t Pmax=0,numVpd; - + for (ii=0; ii< MAX_NUM_PDGAINS_PER_CHANNEL; ii++) { /* work forwards cuase lowest pdGain for highest power */ numVpd = data->pDataPerPDGain[ii].numVpd; @@ -659,7 +659,7 @@ ar2413GetChannelMaxMinPower(struct ath_hal *ah, numChannels = pRawDataset->numChannels; data = pRawDataset->pDataPerChannel; - + /* Make sure the channel is in the range of the TP values * (freq piers) */ Modified: head/sys/dev/ath/ath_hal/ar5212/ar2425.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar2425.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar2425.c Tue Sep 1 21:41:07 2020 (r365116) @@ -492,7 +492,6 @@ ar2425getGainBoundariesAndPdadcsForPowers(struct ath_h HALDEBUG(ah, HAL_DEBUG_RFPARAM, "<==%s\n", __func__); } - /* Same as 2413 set power table */ static HAL_BOOL ar2425SetPowerTable(struct ath_hal *ah, @@ -586,7 +585,7 @@ ar2425GetMaxPower(struct ath_hal *ah, const RAW_DATA_P { uint32_t ii; uint16_t Pmax=0,numVpd; - + for (ii=0; ii< MAX_NUM_PDGAINS_PER_CHANNEL; ii++) { /* work forwards cuase lowest pdGain for highest power */ numVpd = data->pDataPerPDGain[ii].numVpd; @@ -622,7 +621,7 @@ ar2425GetChannelMaxMinPower(struct ath_hal *ah, numChannels = pRawDataset->numChannels; data = pRawDataset->pDataPerChannel; - + /* Make sure the channel is in the range of the TP values * (freq piers) */ Modified: head/sys/dev/ath/ath_hal/ar5212/ar5111.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5111.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5111.c Tue Sep 1 21:41:07 2020 (r365116) @@ -336,7 +336,6 @@ ar5111SetRfRegs(struct ath_hal *ah, const struct ieee8 ar5212ModifyRfBuffer(rfReg, rfWaitS, 5, 19, 0); ar5212ModifyRfBuffer(rfReg, rfWaitI, 5, 24, 0); ar5212ModifyRfBuffer(rfReg, rfMaxTime, 2, 49, 0); - } HAL_INI_WRITE_BANK(ah, ar5212Bank7_5111, rfReg, regWrites); Modified: head/sys/dev/ath/ath_hal/ar5212/ar5112.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5112.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5112.c Tue Sep 1 21:41:07 2020 (r365116) @@ -281,7 +281,7 @@ ar5112SetRfRegs(struct ath_hal *ah, ar5212ModifyRfBuffer(priv->Bank6Data, ob5GHz, 3, 279, 0); ar5212ModifyRfBuffer(priv->Bank6Data, db5GHz, 3, 282, 0); } - + /* Lower synth voltage for X112 Rev 2.0 only */ if (IS_RADX112_REV2(ah)) { /* Non-Reversed analyg registers - so values are pre-reversed */ @@ -763,7 +763,7 @@ ar5112GetMinPower(struct ath_hal *ah, const EXPN_DATA_ retVal = minPwr - (minPcdac*2); return(retVal); } - + static HAL_BOOL ar5112GetChannelMaxMinPower(struct ath_hal *ah, const struct ieee80211_channel *chan, Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c Tue Sep 1 21:41:07 2020 (r365116) @@ -225,7 +225,7 @@ ar5212AniControl(struct ath_hal *ah, HAL_ANI_CMD cmd, struct ath_hal_5212 *ahp = AH5212(ah); struct ar5212AniState *aniState = ahp->ah_curani; const struct ar5212AniParams *params = AH_NULL; - + /* * This function may be called before there's a current * channel (eg to disable ANI.) @@ -784,7 +784,7 @@ ar5212AniLowerImmunity(struct ath_hal *ah) struct ath_hal_5212 *ahp = AH5212(ah); struct ar5212AniState *aniState; const struct ar5212AniParams *params; - + HALASSERT(ANI_ENA(ah)); aniState = ahp->ah_curani; Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c Tue Sep 1 21:41:07 2020 (r365116) @@ -27,7 +27,6 @@ #include "ar5212/ar5212reg.h" #include "ar5212/ar5212phy.h" - /* * Checks to see if an interrupt is pending on our NIC * Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c Tue Sep 1 21:41:07 2020 (r365116) @@ -245,7 +245,6 @@ ar5212SetKeyCacheEntry(struct ath_hal *ah, uint16_t en OS_REG_WRITE(ah, AR_KEYTABLE_TYPE(entry), keyType); (void) ar5212SetKeyCacheEntryMac(ah, entry, mac); - /* * Write MIC entry according to new or old key layout. * The MISC_MODE register is assumed already set so Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c Tue Sep 1 21:41:07 2020 (r365116) @@ -623,7 +623,7 @@ ar5212SetCoverageClass(struct ath_hal *ah, uint8_t cov * timeouts. This value is in core clocks. */ timeout = ACK_CTS_TIMEOUT_11A + (coverageclass * 3 * clkRate); - + /* * Write the values: slot, eifs, ack/cts timeouts. */ @@ -1194,7 +1194,6 @@ ar5212EnableDfs(struct ath_hal *ah, HAL_PHYERR_PARAM * val &= ~ AR_PHY_RADAR_0_ENA; if (IS_5413(ah)) { - if (pe->pe_blockradar == 1) OS_REG_SET_BIT(ah, AR_PHY_RADAR_2, AR_PHY_RADAR_2_BLOCKOFDMWEAK); Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c Tue Sep 1 21:41:07 2020 (r365116) @@ -129,7 +129,6 @@ HAL_RATE_TABLE ar5212_11b_table = { }, }; - /* Venice TODO: roundUpRate() is broken when the rate table does not represent rates * in increasing order e.g. 5.5, 11, 6, 9. * An average rate of 6 Mbps will currently map to 11 Mbps. Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c Tue Sep 1 21:41:07 2020 (r365116) @@ -692,7 +692,7 @@ done: HALDEBUG(ah, HAL_DEBUG_RESET, "%s: done\n", __func__); RESTORE_CCK(ah, chan, isBmode); - + OS_MARK(ah, AH_MARK_RESET_DONE, 0); return AH_TRUE; @@ -1192,7 +1192,6 @@ ar5212MacStop(struct ath_hal *ah) return status; } - /* * Write the given reset bit mask into the reset register */ @@ -1922,7 +1921,6 @@ ar5212SetSpurMitigation(struct ath_hal *ah, } #undef CHAN_TO_SPUR } - /* * Delta slope coefficient computation. Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c Tue Sep 1 21:41:07 2020 (r365116) @@ -107,7 +107,6 @@ ar5212GetTxQueueProps(struct ath_hal *ah, int q, HAL_T struct ath_hal_5212 *ahp = AH5212(ah); HAL_CAPABILITIES *pCap = &AH_PRIVATE(ah)->ah_caps; - if (q >= pCap->halTotalQueues) { HALDEBUG(ah, HAL_DEBUG_ANY, "%s: invalid queue num %u\n", __func__, q); @@ -346,7 +345,7 @@ ar5212ResetTxQueue(struct ath_hal *ah, u_int q) SM(qi->tqi_readyTime, AR_Q_RDYTIMECFG_INT) | AR_Q_RDYTIMECFG_ENA); } - + OS_REG_WRITE(ah, AR_DCHNTIME(q), SM(qi->tqi_burstTime, AR_D_CHNTIME_DUR) | (qi->tqi_burstTime ? AR_D_CHNTIME_EN : 0)); @@ -473,7 +472,7 @@ ar5212ResetTxQueue(struct ath_hal *ah, u_int q) OS_REG_READ(ah, AR_Q0_MISC + 4*q) | AR_Q_MISC_QCU_COMP_EN); } - + /* * Always update the secondary interrupt mask registers - this * could be a new queue getting enabled in a running system or Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212phy.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5212phy.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5212phy.h Tue Sep 1 21:41:07 2020 (r365116) @@ -78,7 +78,6 @@ #define AR_PHY_TSTDAC_CONST_Q_S 9 #define AR_PHY_TSTDAC_CONST_I 0x000001FF - #define AR_PHY_SETTLING 0x9844 #define AR_PHY_SETTLING_AGC 0x0000007F #define AR_PHY_SETTLING_AGC_S 0 Modified: head/sys/dev/ath/ath_hal/ar5212/ar5413.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5212/ar5413.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5212/ar5413.c Tue Sep 1 21:41:07 2020 (r365116) @@ -241,7 +241,6 @@ ar5413SetRfRegs(struct ath_hal *ah, } else { ar5212ModifyRfBuffer(priv->Bank6Data, ob5GHz, 3, 247, 0); ar5212ModifyRfBuffer(priv->Bank6Data, db5GHz, 3, 244, 0); - } /* Bank 7 Setup */ @@ -668,7 +667,7 @@ ar5413GetMaxPower(struct ath_hal *ah, const RAW_DATA_P { uint32_t ii; uint16_t Pmax=0,numVpd; - + for (ii=0; ii< MAX_NUM_PDGAINS_PER_CHANNEL; ii++) { /* work forwards cuase lowest pdGain for highest power */ numVpd = data->pDataPerPDGain[ii].numVpd; @@ -705,7 +704,7 @@ ar5413GetChannelMaxMinPower(struct ath_hal *ah, numChannels = pRawDataset->numChannels; data = pRawDataset->pDataPerChannel; - + /* Make sure the channel is in the range of the TP values * (freq piers) */ Modified: head/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c Tue Sep 1 21:41:07 2020 (r365116) @@ -20,7 +20,6 @@ */ #include "opt_ah.h" - #ifdef AH_SUPPORT_AR5312 #include "ah.h" @@ -39,7 +38,7 @@ ar5312EepromRead(struct ath_hal *ah, u_int off, uint16 int i,offset; const char *eepromAddr = AR5312_RADIOCONFIG(ah); uint8_t *data; - + data = (uint8_t *) dataIn; for (i=0,offset=2*off; i<2; i++,offset++) { data[i] = eepromAddr[offset]; Modified: head/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c Tue Sep 1 21:41:07 2020 (r365116) @@ -129,5 +129,4 @@ ar5312GpioSetIntr(struct ath_hal *ah, u_int gpio, uint (void) ar5212SetInterrupts(ah, AH5212(ah)->ah_maskReg | HAL_INT_GPIO); } - #endif /* AH_SUPPORT_AR5312 */ Modified: head/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c Tue Sep 1 21:41:07 2020 (r365116) @@ -29,7 +29,6 @@ #include "ar5312/ar5312reg.h" #include "ar5312/ar5312phy.h" - /* * Checks to see if an interrupt is pending on our NIC * Modified: head/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c Tue Sep 1 21:41:07 2020 (r365116) @@ -271,7 +271,7 @@ ar5312Reset(struct ath_hal *ah, HAL_OPMODE opmode, /* Set the mute mask to the correct default */ OS_REG_WRITE(ah, AR_SEQ_MASK, 0x0000000F); } - + if (AH_PRIVATE(ah)->ah_phyRev >= AR_PHY_CHIP_ID_REV_3) { /* Clear reg to alllow RX_CLEAR line debug */ OS_REG_WRITE(ah, AR_PHY_BLUETOOTH, 0); @@ -827,12 +827,10 @@ ar5312MacReset(struct ath_hal *ah, unsigned int RCMask OS_REG_READ(ah, (AR5315_RSTIMER_BASE- ((uint32_t) ah->ah_sh) +AR5315_RESET)); - } else #endif { - switch(wlanNum) { case 0: resetBB = AR5312_RC_BB0_CRES | AR5312_RC_WBB0_RES; Modified: head/sys/dev/ath/ath_hal/ar5312/ar5312reg.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5312/ar5312reg.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5312/ar5312reg.h Tue Sep 1 21:41:07 2020 (r365116) @@ -29,7 +29,6 @@ /* Register base addresses for modules which are not wmac modules */ /* 531X has a fixed memory map */ - #define REG_WRITE(_reg,_val) *((volatile uint32_t *)(_reg)) = (_val); #define REG_READ(_reg) *((volatile uint32_t *)(_reg)) /* @@ -128,7 +127,6 @@ #define AR5312_RC_WBB0_RES 0x00004000 /* Warm reset to WBB0 */ #define AR5312_RC_WMAC1_RES 0x00020000 /* Warm reset to WMAC1 */ #define AR5312_RC_WBB1_RES 0x00040000 /* Warm reset to WBB */ - #define AR_RAD2112_SREV_MAJOR 0x40 /* 2112 Major Rev */ Modified: head/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c Tue Sep 1 21:41:07 2020 (r365116) @@ -128,5 +128,4 @@ ar5315GpioSetIntr(struct ath_hal *ah, u_int gpio, uint (void) ar5212SetInterrupts(ah, AH5212(ah)->ah_maskReg | HAL_INT_GPIO); } - #endif /* AH_SUPPORT_2316 || AH_SUPPORT_2317 */ Modified: head/sys/dev/ath/ath_hal/ar5416/ar2133.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar2133.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5416/ar2133.c Tue Sep 1 21:41:07 2020 (r365116) @@ -278,7 +278,7 @@ ar2133SetRfRegs(struct ath_hal *ah, const struct ieee8 /* Setup Bank 6 Write */ ath_hal_ini_bank_setup(priv->Bank6Data, &AH5416(ah)->ah_ini_bank6, modesIndex); - + /* Only the 5 or 2 GHz OB/DB need to be set for a mode */ if (IEEE80211_IS_CHAN_2GHZ(chan)) { HALDEBUG(ah, HAL_DEBUG_EEPROM, "%s: 2ghz: OB_2:%d, DB_2:%d\n", @@ -473,7 +473,6 @@ ar2133GetNoiseFloor(struct ath_hal *ah, int16_t nfarra "NF calibrated [ctl] [chain 1] is %d\n", nf); nfarray[1] = nf; - nf = MS(OS_REG_READ(ah, AR_PHY_CH1_EXT_CCA), AR_PHY_CH1_EXT_MINCCA_PWR); if (nf & 0x100) nf = 0 - ((nf ^ 0x1ff) + 1); @@ -522,7 +521,7 @@ ar2133RfDetach(struct ath_hal *ah) ath_hal_free(ahp->ah_rfHal); ahp->ah_rfHal = AH_NULL; } - + /* * Allocate memory for analog bank scratch buffers * Scratch Buffer will be reinitialized every reset so no need to zero now Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c Tue Sep 1 21:41:07 2020 (r365116) @@ -223,7 +223,6 @@ ar5416AniControl(struct ath_hal *ah, HAL_ANI_CMD cmd, return AH_FALSE; } - switch (cmd) { case HAL_ANI_NOISE_IMMUNITY_LEVEL: { u_int level = param; @@ -727,7 +726,7 @@ ar5416AniLowerImmunity(struct ath_hal *ah) struct ath_hal_5212 *ahp = AH5212(ah); struct ar5212AniState *aniState; const struct ar5212AniParams *params; - + HALASSERT(ANI_ENA(ah)); aniState = ahp->ah_curani; Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Tue Sep 1 21:41:07 2020 (r365116) @@ -721,7 +721,6 @@ ar5416SpurMitigate(struct ath_hal *ah, const struct ie SM(spur_delta_phase, AR_PHY_TIMING11_SPUR_DELTA_PHASE)); OS_REG_WRITE(ah, AR_PHY_TIMING11, new); - /* * ============================================ * pilot mask 1 [31:0] = +6..-26, no 0 bin @@ -893,7 +892,7 @@ ar5416FillCapabilityInfo(struct ath_hal *ah) struct ath_hal_private *ahpriv = AH_PRIVATE(ah); HAL_CAPABILITIES *pCap = &ahpriv->ah_caps; uint16_t val; - + /* Construct wireless mode from EEPROM */ pCap->halWirelessModes = 0; if (ath_hal_eepromGetFlag(ah, AR_EEP_AMODE)) { Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c Tue Sep 1 21:41:07 2020 (r365116) @@ -155,7 +155,7 @@ ar5416SetStaBeaconTimers(struct ath_hal *ah, const HAL uint32_t nextTbtt, nextdtim,beaconintval, dtimperiod; HALASSERT(bs->bs_intval != 0); - + /* NB: no cfp setting since h/w automatically takes care */ OS_REG_WRITE(ah, AR_NEXT_TBTT, TU_TO_USEC(bs->bs_nexttbtt)); Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Tue Sep 1 21:41:07 2020 (r365116) @@ -196,7 +196,6 @@ ar5416RunInitCals(struct ath_hal *ah, int init_cal_cou } #endif - /* * AGC calibration for the AR5416, AR9130, AR9160, AR9280. */ @@ -623,7 +622,6 @@ ar5416LoadNF(struct ath_hal *ah, const struct ieee8021 h = AH5416(ah)->ah_cal.nfCalHist; HALDEBUG(ah, HAL_DEBUG_NFCAL, "CCA: "); for (i = 0; i < AR5416_NUM_NF_READINGS; i ++) { - /* Don't write to EXT radio CCA registers unless in HT/40 mode */ /* XXX this check should really be cleaner! */ if (i > 2 && !IEEE80211_IS_CHAN_HT40(chan)) @@ -674,7 +672,6 @@ ar5416LoadNF(struct ath_hal *ah, const struct ieee8021 * of next noise floor calibration the baseband does. */ for (i = 0; i < AR5416_NUM_NF_READINGS; i ++) { - /* Don't write to EXT radio CCA registers unless in HT/40 mode */ /* XXX this check should really be cleaner! */ if (i > 2 && !IEEE80211_IS_CHAN_HT40(chan)) @@ -780,7 +777,6 @@ ar5416SanitizeNF(struct ath_hal *ah, int16_t *nf) } } } - /* * Read the NF and check it against the noise floor threshold Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h Tue Sep 1 21:41:07 2020 (r365116) @@ -20,7 +20,7 @@ */ #ifndef _ATH_AR5416_CAL_H_ #define _ATH_AR5416_CAL_H_ - + typedef enum { ADC_DC_INIT_CAL = 0x1, ADC_GAIN_CAL = 0x2, Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c Tue Sep 1 21:41:07 2020 (r365116) @@ -131,7 +131,7 @@ ar5416GpioCfgOutput(struct ath_hal *ah, uint32_t gpio, return AH_TRUE; #undef N } - + /* * Configure GPIO Input lines */ Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_power.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_power.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_power.c Tue Sep 1 21:41:07 2020 (r365116) @@ -114,7 +114,7 @@ static void ar5416SetPowerModeNetworkSleep(struct ath_hal *ah, int setChip) { OS_REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV); - + if (setChip) OS_REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN); } Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c ============================================================================== --- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Tue Sep 1 21:40:47 2020 (r365115) +++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Tue Sep 1 21:41:07 2020 (r365116) @@ -386,7 +386,6 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMODE opmode, AR_PCU_MISC_MODE2_ENABLE_AGGWEP); } - /* * disable seq number generation in hw */ @@ -606,7 +605,7 @@ ar5416InitDMA(struct ath_hal *ah) * Setup receive FIFO threshold to hold off TX activities */ OS_REG_WRITE(ah, AR_RXFIFO_CFG, 0x200); - + /* * reduce the number of usable entries in PCU TXBUF to avoid * wrap around. @@ -645,7 +644,7 @@ ar5416InitBB(struct ath_hal *ah, const struct ieee8021 /* Activate the PHY (includes baseband activate and synthesizer on) */ OS_REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN); - + /* * If the AP starts the calibration before the base band timeout * completes we could get rx_clear false triggering. Add an @@ -1049,7 +1048,6 @@ ar5416WriteTxPowerRateRegisters(struct ath_hal *ah, #undef POW_SM } - /************************************************************** * ar5416SetTransmitPower * @@ -1096,7 +1094,7 @@ ar5416SetTransmitPower(struct ath_hal *ah, if (IS_EEP_MINOR_V2(ah)) { AH5416(ah)->ah_ht40PowerIncForPdadc = pModal->ht40PowerIncForPdadc; } - + if (!ar5416SetPowerPerRateTable(ah, pEepData, chan, &AH5416(ah)->ah_ratesArray[0], cfgCtl, @@ -1525,7 +1523,7 @@ ar5416InitPLL(struct ath_hal *ah, const struct ieee802 pll |= SM(0xb, AR_RTC_PLL_DIV); } else pll |= SM(0xb, AR_RTC_PLL_DIV); - + OS_REG_WRITE(ah, AR_RTC_PLL_CONTROL, pll); /* TODO: *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:41:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2C97E37B1BB; Tue, 1 Sep 2020 21:41:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0rh06kpz4QQs; Tue, 1 Sep 2020 21:41:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB77620143; Tue, 1 Sep 2020 21:41:39 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lfdc0035613; Tue, 1 Sep 2020 21:41:39 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lfd9B035609; Tue, 1 Sep 2020 21:41:39 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012141.081Lfd9B035609@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:41:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365117 - head/sys/dev/atkbdc X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/atkbdc X-SVN-Commit-Revision: 365117 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:41:40 -0000 Author: mjg Date: Tue Sep 1 21:41:38 2020 New Revision: 365117 URL: https://svnweb.freebsd.org/changeset/base/365117 Log: atkbdc: clean up empty lines in .c and .h files Modified: head/sys/dev/atkbdc/atkbd.c head/sys/dev/atkbdc/atkbdc.c head/sys/dev/atkbdc/atkbdc_isa.c head/sys/dev/atkbdc/psm.c Modified: head/sys/dev/atkbdc/atkbd.c ============================================================================== --- head/sys/dev/atkbdc/atkbd.c Tue Sep 1 21:41:07 2020 (r365116) +++ head/sys/dev/atkbdc/atkbd.c Tue Sep 1 21:41:38 2020 (r365117) @@ -314,7 +314,7 @@ atkbd_configure(int flags) } return 0; } - + /* XXX: a kludge to obtain the device configuration flags */ if (resource_int_value("atkbd", ATKBD_DEFAULT, "flags", &i) == 0) flags |= i; @@ -427,7 +427,7 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int imin(fkeymap_size * sizeof(fkeymap[0]), sizeof(fkey_tab))); kbd_set_maps(kbd, keymap, accmap, fkeymap, fkeymap_size); kbd->kb_data = (void *)state; - + if (probe_keyboard(state->kbdc, flags)) { /* shouldn't happen */ if (flags & KB_CONF_FAIL_IF_NO_KBD) { error = ENXIO; @@ -928,7 +928,6 @@ atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg) s = spltty(); switch (cmd) { - case KDGKBMODE: /* get keyboard mode */ *(int *)arg = state->ks_mode; break; @@ -1386,7 +1385,7 @@ init_keyboard(KBDC kbdc, int *type, int flags) if (bootverbose) printf("atkbd: scancode set %d\n", codeset); #endif /* KBD_DETECT_XT_KEYBOARD */ - + *type = KB_OTHER; id = get_kbd_id(kbdc); switch(id) { Modified: head/sys/dev/atkbdc/atkbdc.c ============================================================================== --- head/sys/dev/atkbdc/atkbdc.c Tue Sep 1 21:41:07 2020 (r365116) +++ head/sys/dev/atkbdc/atkbdc.c Tue Sep 1 21:41:38 2020 (r365117) @@ -116,7 +116,6 @@ static struct atkbdc_quirks quirks[] = { {"coreboot", NULL, NULL, KBDC_QUIRK_KEEP_ACTIVATED | KBDC_QUIRK_IGNORE_PROBE_RESULT | KBDC_QUIRK_RESET_AFTER_PROBE | KBDC_QUIRK_SETLEDS_ON_INIT}, - {NULL, NULL, NULL, 0} }; Modified: head/sys/dev/atkbdc/atkbdc_isa.c ============================================================================== --- head/sys/dev/atkbdc/atkbdc_isa.c Tue Sep 1 21:41:07 2020 (r365116) +++ head/sys/dev/atkbdc/atkbdc_isa.c Tue Sep 1 21:41:38 2020 (r365117) @@ -77,7 +77,6 @@ static device_method_t atkbdc_isa_methods[] = { DEVMETHOD(bus_delete_resource, bus_generic_rl_delete_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } }; @@ -300,7 +299,7 @@ atkbdc_isa_alloc_resource(device_t dev, device_t child rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { atkbdc_softc_t *sc; - + sc = *(atkbdc_softc_t **)device_get_softc(dev); if (type == SYS_RES_IRQ && *rid == KBDC_RID_KBD && sc->irq != NULL) return (sc->irq); @@ -313,7 +312,7 @@ atkbdc_isa_release_resource(device_t dev, device_t chi struct resource *r) { atkbdc_softc_t *sc; - + sc = *(atkbdc_softc_t **)device_get_softc(dev); if (type == SYS_RES_IRQ && rid == KBDC_RID_KBD && r == sc->irq) return (0); Modified: head/sys/dev/atkbdc/psm.c ============================================================================== --- head/sys/dev/atkbdc/psm.c Tue Sep 1 21:41:07 2020 (r365116) +++ head/sys/dev/atkbdc/psm.c Tue Sep 1 21:41:38 2020 (r365117) @@ -727,7 +727,6 @@ static device_method_t psm_methods[] = { DEVMETHOD(device_attach, psmattach), DEVMETHOD(device_detach, psmdetach), DEVMETHOD(device_resume, psmresume), - { 0, 0 } }; @@ -1691,7 +1690,6 @@ psmprobe(device_t dev) #define PS2_MOUSE_ELANTECH_NAME "ETPS/2 Elantech Touchpad" #define PS2_MOUSE_ELANTECH_ST_NAME "ETPS/2 Elantech TrackPoint" #define PS2_MOUSE_ELANTECH_PRODUCT 0x000E - #define ABSINFO_END { ABS_CNT, 0, 0, 0 } static void @@ -2629,7 +2627,6 @@ psmioctl(struct cdev *dev, u_long cmd, caddr_t addr, i /* Perform IOCTL command */ switch (cmd) { - case OLD_MOUSE_GETHWINFO: s = spltty(); ((old_mousehw_t *)addr)->buttons = sc->hw.buttons; @@ -4716,7 +4713,6 @@ proc_elantech(struct psm_softc *sc, packetbuf_t *pb, m !(pb->ipacket[0] & 0x10) != !(pb->ipacket[3] & 0x10) && !(pb->ipacket[0] & 0x20) != !(pb->ipacket[2] & 0x80) && !(pb->ipacket[0] & 0x20) != !(pb->ipacket[3] & 0x20)) { - *x = (pb->ipacket[0] & MOUSE_PS2_XNEG) ? pb->ipacket[4] - 256 : pb->ipacket[4]; *y = (pb->ipacket[0] & MOUSE_PS2_YNEG) ? @@ -4982,7 +4978,6 @@ psmsoftintr(void *arg) sc->idlepacket.inputbytes = 0; switch (sc->hw.model) { - case MOUSE_MODEL_EXPLORER: /* * b7 b6 b5 b4 b3 b2 b1 b0 @@ -7489,7 +7484,6 @@ static device_attach_t psmcpnp_attach; static device_method_t psmcpnp_methods[] = { DEVMETHOD(device_probe, psmcpnp_probe), DEVMETHOD(device_attach, psmcpnp_attach), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:41:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6ED6837B2A6; Tue, 1 Sep 2020 21:41:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0s02PM8z4QXK; Tue, 1 Sep 2020 21:41:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3705820147; Tue, 1 Sep 2020 21:41:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LfuIJ036345; Tue, 1 Sep 2020 21:41:56 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LfuJN036344; Tue, 1 Sep 2020 21:41:56 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012141.081LfuJN036344@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:41:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365118 - head/sys/dev/axgbe X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/axgbe X-SVN-Commit-Revision: 365118 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:41:56 -0000 Author: mjg Date: Tue Sep 1 21:41:55 2020 New Revision: 365118 URL: https://svnweb.freebsd.org/changeset/base/365118 Log: axgbe: clean up empty lines in .c and .h files Modified: head/sys/dev/axgbe/if_axgbe.c Modified: head/sys/dev/axgbe/if_axgbe.c ============================================================================== --- head/sys/dev/axgbe/if_axgbe.c Tue Sep 1 21:41:38 2020 (r365117) +++ head/sys/dev/axgbe/if_axgbe.c Tue Sep 1 21:41:55 2020 (r365118) @@ -391,7 +391,6 @@ axgbe_attach(device_t dev) sc->prv.phy.advertising = ADVERTISED_10000baseKR_Full | ADVERTISED_1000baseKX_Full; - /* * Read the needed properties from the phy node. */ @@ -563,7 +562,6 @@ static device_method_t axgbe_methods[] = { /* Device interface */ DEVMETHOD(device_probe, axgbe_probe), DEVMETHOD(device_attach, axgbe_attach), - { 0, 0 } }; @@ -573,7 +571,6 @@ DEFINE_CLASS_0(axgbe, axgbe_driver, axgbe_methods, sizeof(struct axgbe_softc)); DRIVER_MODULE(axgbe, simplebus, axgbe_driver, axgbe_devclass, 0, 0); - static struct ofw_compat_data phy_compat_data[] = { { "amd,xgbe-phy-seattle-v1a", true }, { NULL, false } @@ -608,7 +605,6 @@ static device_method_t axgbephy_methods[] = { /* Device interface */ DEVMETHOD(device_probe, axgbephy_probe), DEVMETHOD(device_attach, axgbephy_attach), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:42:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 682D937B15A; Tue, 1 Sep 2020 21:42:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0sF1jH6z4QY3; Tue, 1 Sep 2020 21:42:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0331D1FB7B; Tue, 1 Sep 2020 21:42:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lg8JI036406; Tue, 1 Sep 2020 21:42:08 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lg8PD036404; Tue, 1 Sep 2020 21:42:08 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012142.081Lg8PD036404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:42:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365119 - head/sys/dev/bce X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/bce X-SVN-Commit-Revision: 365119 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:42:09 -0000 Author: mjg Date: Tue Sep 1 21:42:08 2020 New Revision: 365119 URL: https://svnweb.freebsd.org/changeset/base/365119 Log: bce: clean up empty lines in .c and .h files Modified: head/sys/dev/bce/if_bce.c head/sys/dev/bce/if_bcefw.h head/sys/dev/bce/if_bcereg.h Modified: head/sys/dev/bce/if_bce.c ============================================================================== --- head/sys/dev/bce/if_bce.c Tue Sep 1 21:41:55 2020 (r365118) +++ head/sys/dev/bce/if_bce.c Tue Sep 1 21:42:08 2020 (r365119) @@ -199,11 +199,9 @@ static const struct bce_type bce_devs[] = { /* BCM5716 controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5716, PCI_ANY_ID, PCI_ANY_ID, "QLogic NetXtreme II BCM5716 1000Base-T" }, - { 0, 0, 0, 0, NULL } }; - /****************************************************************************/ /* Supported Flash NVRAM device data. */ /****************************************************************************/ @@ -313,7 +311,6 @@ static const struct flash_spec flash_5709 = { .name = "5709/5716 buffered flash (256kB)", }; - /****************************************************************************/ /* FreeBSD device entry points. */ /****************************************************************************/ @@ -322,7 +319,6 @@ static int bce_attach (device_t); static int bce_detach (device_t); static int bce_shutdown (device_t); - /****************************************************************************/ /* BCE Debug Data Structure Dump Routines */ /****************************************************************************/ @@ -365,7 +361,6 @@ static void bce_dump_rv2p_state (struct bce_softc *); static void bce_breakpoint (struct bce_softc *); #endif /*BCE_DEBUG */ - /****************************************************************************/ /* BCE Register/Memory Access Routines */ /****************************************************************************/ @@ -488,7 +483,6 @@ static void bce_tick (void *); static void bce_pulse (void *); static void bce_add_sysctls (struct bce_softc *); - /****************************************************************************/ /* FreeBSD device dispatch table. */ /****************************************************************************/ @@ -667,7 +661,6 @@ static int bce_rx_ticks = DEFAULT_RX_TICKS; SYSCTL_UINT(_hw_bce, OID_AUTO, rx_ticks, CTLFLAG_RDTUN, &bce_rx_ticks, 0, "Receive ticks count"); - /****************************************************************************/ /* Device probe function. */ /* */ @@ -703,11 +696,9 @@ bce_probe(device_t dev) /* Look through the list of known devices for a match. */ while(t->bce_name != NULL) { - if ((vid == t->bce_vid) && (did == t->bce_did) && ((svid == t->bce_svid) || (t->bce_svid == PCI_ANY_ID)) && ((sdid == t->bce_sdid) || (t->bce_sdid == PCI_ANY_ID))) { - descbuf = malloc(BCE_DEVDESC_MAX, M_TEMP, M_NOWAIT); if (descbuf == NULL) @@ -729,7 +720,6 @@ bce_probe(device_t dev) return(ENXIO); } - /****************************************************************************/ /* PCI Capabilities Probe Function. */ /* */ @@ -751,7 +741,6 @@ bce_print_adapter_info(struct bce_softc *sc) printf("Rev (%c%d); ", ((BCE_CHIP_ID(sc) & 0xf000) >> 12) + 'A', ((BCE_CHIP_ID(sc) & 0x0ff0) >> 4)); - /* Bus info. */ if (sc->bce_flags & BCE_PCIE_FLAG) { printf("Bus (PCIe x%d, ", sc->link_width); @@ -815,13 +804,11 @@ bce_print_adapter_info(struct bce_softc *sc) sc->bce_tx_quick_cons_trip, sc->bce_tx_ticks_int, sc->bce_tx_ticks); - } DBEXIT(BCE_VERBOSE_LOAD); } - /****************************************************************************/ /* PCI Capabilities Probe Function. */ /* */ @@ -872,7 +859,6 @@ bce_probe_pci_caps(device_t dev, struct bce_softc *sc) DBEXIT(BCE_VERBOSE_LOAD); } - /****************************************************************************/ /* Load and validate user tunable settings. */ /* */ @@ -1054,7 +1040,6 @@ bce_set_tunables(struct bce_softc *sc) } } - /****************************************************************************/ /* Device attach function. */ /* */ @@ -1115,7 +1100,6 @@ bce_attach(device_t dev) (bce_msi_enable >= 2) && ((sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE)) != NULL)) { - msi_needed = count = 1; if (((error = pci_alloc_msix(dev, &count)) != 0) || @@ -1540,7 +1524,6 @@ bce_attach_exit: return(rc); } - /****************************************************************************/ /* Device detach function. */ /* */ @@ -1593,7 +1576,6 @@ bce_detach(device_t dev) return(0); } - /****************************************************************************/ /* Device shutdown function. */ /* */ @@ -1624,7 +1606,6 @@ bce_shutdown(device_t dev) return (0); } - #ifdef BCE_DEBUG /****************************************************************************/ /* Register read. */ @@ -1641,7 +1622,6 @@ bce_reg_rd(struct bce_softc *sc, u32 offset) return val; } - /****************************************************************************/ /* Register write (16 bit). */ /* */ @@ -1656,7 +1636,6 @@ bce_reg_wr16(struct bce_softc *sc, u32 offset, u16 val REG_WR16(sc, offset, val); } - /****************************************************************************/ /* Register write. */ /* */ @@ -1702,7 +1681,6 @@ bce_reg_rd_ind(struct bce_softc *sc, u32 offset) #endif } - /****************************************************************************/ /* Indirect register write. */ /* */ @@ -1726,7 +1704,6 @@ bce_reg_wr_ind(struct bce_softc *sc, u32 offset, u32 v pci_write_config(dev, BCE_PCICFG_REG_WINDOW, val, 4); } - /****************************************************************************/ /* Shared memory write. */ /* */ @@ -1744,7 +1721,6 @@ bce_shmem_wr(struct bce_softc *sc, u32 offset, u32 val bce_reg_wr_ind(sc, sc->bce_shmem_base + offset, val); } - /****************************************************************************/ /* Shared memory read. */ /* */ @@ -1764,7 +1740,6 @@ bce_shmem_rd(struct bce_softc *sc, u32 offset) return val; } - #ifdef BCE_DEBUG /****************************************************************************/ /* Context memory read. */ @@ -1787,7 +1762,6 @@ bce_ctx_rd(struct bce_softc *sc, u32 cid_addr, u32 ctx offset = ctx_offset + cid_addr; if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { - REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | BCE_CTX_CTX_CTRL_READ_REQ)); for (idx = 0; idx < retry_cnt; idx++) { @@ -1815,7 +1789,6 @@ bce_ctx_rd(struct bce_softc *sc, u32 cid_addr, u32 ctx } #endif - /****************************************************************************/ /* Context memory write. */ /* */ @@ -1839,7 +1812,6 @@ bce_ctx_wr(struct bce_softc *sc, u32 cid_addr, u32 ctx __FUNCTION__, cid_addr)); if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { - REG_WR(sc, BCE_CTX_CTX_DATA, ctx_val); REG_WR(sc, BCE_CTX_CTX_CTRL, (offset | BCE_CTX_CTX_CTRL_WRITE_REQ)); @@ -1861,7 +1833,6 @@ bce_ctx_wr(struct bce_softc *sc, u32 cid_addr, u32 ctx } } - /****************************************************************************/ /* PHY register read. */ /* */ @@ -1899,7 +1870,6 @@ bce_miibus_read_reg(device_t dev, int phy, int reg) DELAY(40); } - val = BCE_MIPHY(phy) | BCE_MIREG(reg) | BCE_EMAC_MDIO_COMM_COMMAND_READ | BCE_EMAC_MDIO_COMM_DISEXT | BCE_EMAC_MDIO_COMM_START_BUSY; @@ -1927,7 +1897,6 @@ bce_miibus_read_reg(device_t dev, int phy, int reg) val = REG_RD(sc, BCE_EMAC_MDIO_COMM); } - if (sc->bce_phy_flags & BCE_PHY_INT_MODE_AUTO_POLLING_FLAG) { val = REG_RD(sc, BCE_EMAC_MDIO_MODE); val |= BCE_EMAC_MDIO_MODE_AUTO_POLL; @@ -1942,7 +1911,6 @@ bce_miibus_read_reg(device_t dev, int phy, int reg) return (val & 0xffff); } - /****************************************************************************/ /* PHY register write. */ /* */ @@ -2014,7 +1982,6 @@ bce_miibus_write_reg(device_t dev, int phy, int reg, i return 0; } - /****************************************************************************/ /* MII bus status change. */ /* */ @@ -2127,7 +2094,6 @@ bce_miibus_statchg_exit: DBEXIT(BCE_VERBOSE_PHY); } - /****************************************************************************/ /* Acquire NVRAM lock. */ /* */ @@ -2165,7 +2131,6 @@ bce_acquire_nvram_lock(struct bce_softc *sc) return (rc); } - /****************************************************************************/ /* Release NVRAM lock. */ /* */ @@ -2206,7 +2171,6 @@ bce_release_nvram_lock(struct bce_softc *sc) return (rc); } - #ifdef BCE_NVRAM_WRITE_SUPPORT /****************************************************************************/ /* Enable NVRAM write access. */ @@ -2251,7 +2215,6 @@ bce_enable_nvram_write(struct bce_softc *sc) return (rc); } - /****************************************************************************/ /* Disable NVRAM write access. */ /* */ @@ -2276,7 +2239,6 @@ bce_disable_nvram_write(struct bce_softc *sc) } #endif - /****************************************************************************/ /* Enable NVRAM access. */ /* */ @@ -2301,7 +2263,6 @@ bce_enable_nvram_access(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_NVRAM); } - /****************************************************************************/ /* Disable NVRAM access. */ /* */ @@ -2326,7 +2287,6 @@ bce_disable_nvram_access(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_NVRAM); } - #ifdef BCE_NVRAM_WRITE_SUPPORT /****************************************************************************/ /* Erase NVRAM page before writing. */ @@ -2383,7 +2343,6 @@ bce_nvram_erase_page_exit: } #endif /* BCE_NVRAM_WRITE_SUPPORT */ - /****************************************************************************/ /* Read a dword (32 bits) from NVRAM. */ /* */ @@ -2447,7 +2406,6 @@ bce_nvram_read_dword(struct bce_softc *sc, return(rc); } - #ifdef BCE_NVRAM_WRITE_SUPPORT /****************************************************************************/ /* Write a dword (32 bits) to NVRAM. */ @@ -2507,7 +2465,6 @@ bce_nvram_write_dword(struct bce_softc *sc, u32 offset } #endif /* BCE_NVRAM_WRITE_SUPPORT */ - /****************************************************************************/ /* Initialize NVRAM access. */ /* */ @@ -2571,7 +2528,6 @@ bce_init_nvram(struct bce_softc *sc) /* Look for the matching NVRAM device configuration data. */ for (j = 0, flash = &flash_table[0]; j < entry_count; j++, flash++) { - /* Check if the device matches any of the known devices. */ if ((val & mask) == (flash->strapping & mask)) { /* Found a device match. */ @@ -2621,7 +2577,6 @@ bce_init_nvram_get_flash_size: return rc; } - /****************************************************************************/ /* Read an arbitrary range of data from NVRAM. */ /* */ @@ -2745,7 +2700,6 @@ bce_nvram_read_exit: return rc; } - #ifdef BCE_NVRAM_WRITE_SUPPORT /****************************************************************************/ /* Write an arbitrary range of data from NVRAM. */ @@ -2872,7 +2826,6 @@ bce_nvram_write(struct bce_softc *sc, u32 offset, u8 * if (!(sc->bce_flash_info->flags & BCE_NV_BUFFERED)) { for (addr = page_start; addr < data_start; addr += 4, i += 4) { - rc = bce_nvram_write_dword(sc, addr, &flash_buffer[i], cmd_flags); @@ -2888,7 +2841,6 @@ bce_nvram_write(struct bce_softc *sc, u32 offset, u8 * if ((addr == page_end - 4) || ((sc->bce_flash_info->flags & BCE_NV_BUFFERED) && (addr == data_end - 4))) { - cmd_flags |= BCE_NVM_COMMAND_LAST; } rc = bce_nvram_write_dword(sc, addr, buf, @@ -2906,7 +2858,6 @@ bce_nvram_write(struct bce_softc *sc, u32 offset, u8 * if (!(sc->bce_flash_info->flags & BCE_NV_BUFFERED)) { for (addr = data_end; addr < page_end; addr += 4, i += 4) { - if (addr == page_end-4) { cmd_flags = BCE_NVM_COMMAND_LAST; } @@ -2947,7 +2898,6 @@ bce_nvram_write_exit: } #endif /* BCE_NVRAM_WRITE_SUPPORT */ - /****************************************************************************/ /* Verifies that NVRAM is accessible and contains valid data. */ /* */ @@ -3023,7 +2973,6 @@ bce_nvram_test_exit: return rc; } - /****************************************************************************/ /* Calculates the size of the buffers to allocate based on the MTU. */ /* */ @@ -3152,7 +3101,6 @@ bce_get_media(struct bce_softc *sc) sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG; if (sc->bce_phy_flags & BCE_PHY_SERDES_FLAG) { - sc->bce_flags |= BCE_NO_WOL_FLAG; if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) @@ -3181,7 +3129,6 @@ bce_get_media_exit: DBEXIT(BCE_VERBOSE_PHY); } - /****************************************************************************/ /* Performs PHY initialization required before MII drivers access the */ /* device. */ @@ -3213,7 +3160,6 @@ bce_init_media(struct bce_softc *sc) } } - /****************************************************************************/ /* Free any DMA memory owned by the driver. */ /* */ @@ -3251,7 +3197,6 @@ bce_dma_free(struct bce_softc *sc) sc->status_tag = NULL; } - /* Free, unmap, and destroy the statistics block. */ if (sc->stats_block_paddr != 0) { bus_dmamap_unload( @@ -3273,7 +3218,6 @@ bce_dma_free(struct bce_softc *sc) sc->stats_tag = NULL; } - /* Free, unmap and destroy all context memory pages. */ if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { for (i = 0; i < sc->ctx_pages; i++ ) { @@ -3300,7 +3244,6 @@ bce_dma_free(struct bce_softc *sc) } } - /* Free, unmap and destroy all TX buffer descriptor chain pages. */ for (i = 0; i < sc->tx_pages; i++ ) { if (sc->tx_bd_chain_paddr[i] != 0) { @@ -3325,7 +3268,6 @@ bce_dma_free(struct bce_softc *sc) sc->tx_bd_chain_tag = NULL; } - /* Free, unmap and destroy all RX buffer descriptor chain pages. */ for (i = 0; i < sc->rx_pages; i++ ) { if (sc->rx_bd_chain_paddr[i] != 0) { @@ -3350,7 +3292,6 @@ bce_dma_free(struct bce_softc *sc) sc->rx_bd_chain_tag = NULL; } - /* Free, unmap and destroy all page buffer descriptor chain pages. */ if (bce_hdr_split == TRUE) { for (i = 0; i < sc->pg_pages; i++ ) { @@ -3377,7 +3318,6 @@ bce_dma_free(struct bce_softc *sc) } } - /* Unload and destroy the TX mbuf maps. */ for (i = 0; i < MAX_TX_BD_AVAIL; i++) { if (sc->tx_mbuf_map[i] != NULL) { @@ -3440,7 +3380,6 @@ bce_dma_free(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET | BCE_VERBOSE_UNLOAD | BCE_VERBOSE_CTX); } - /****************************************************************************/ /* Get DMA memory from the OS. */ /* */ @@ -3474,7 +3413,6 @@ bce_dma_map_addr(void *arg, bus_dma_segment_t *segs, i } } - /****************************************************************************/ /* Allocate any DMA memory needed by the driver. */ /* */ @@ -3626,7 +3564,6 @@ bce_dma_alloc(device_t dev) } for (i = 0; i < sc->ctx_pages; i++) { - if(bus_dmamem_alloc(sc->ctx_tag, (void **)&sc->ctx_block[i], BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, @@ -3670,7 +3607,6 @@ bce_dma_alloc(device_t dev) } for (i = 0; i < sc->tx_pages; i++) { - if(bus_dmamem_alloc(sc->tx_bd_chain_tag, (void **)&sc->tx_bd_chain[i], BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, @@ -3747,7 +3683,6 @@ bce_dma_alloc(device_t dev) } for (i = 0; i < sc->rx_pages; i++) { - if (bus_dmamem_alloc(sc->rx_bd_chain_tag, (void **)&sc->rx_bd_chain[i], BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, @@ -3881,7 +3816,6 @@ bce_dma_alloc_exit: return(rc); } - /****************************************************************************/ /* Release all resources used by the driver. */ /* */ @@ -3935,7 +3869,6 @@ bce_release_resources(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Firmware synchronization. */ /* */ @@ -3981,7 +3914,6 @@ bce_fw_sync(struct bce_softc *sc, u32 msg_data) /* If we've timed out, tell bootcode that we've stopped waiting. */ if (((val & BCE_FW_MSG_ACK) != (msg_data & BCE_DRV_MSG_SEQ)) && ((msg_data & BCE_DRV_MSG_DATA) != BCE_DRV_MSG_DATA_WAIT0)) { - BCE_PRINTF("%s(%d): Firmware synchronization timeout! " "msg_data = 0x%08X\n", __FILE__, __LINE__, msg_data); @@ -3999,7 +3931,6 @@ bce_fw_sync_exit: return (rc); } - /****************************************************************************/ /* Load Receive Virtual 2 Physical (RV2P) processor firmware. */ /* */ @@ -4047,7 +3978,6 @@ bce_load_rv2p_fw(struct bce_softc *sc, const u32 *rv2p DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Load RISC processor firmware. */ /* */ @@ -4125,7 +4055,6 @@ bce_load_cpu_fw(struct bce_softc *sc, struct cpu_reg * DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Starts the RISC processor. */ /* */ @@ -4150,7 +4079,6 @@ bce_start_cpu(struct bce_softc *sc, struct cpu_reg *cp DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Halts the RISC processor. */ /* */ @@ -4173,7 +4101,6 @@ bce_halt_cpu(struct bce_softc *sc, struct cpu_reg *cpu DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Initialize the RX CPU. */ /* */ @@ -4206,7 +4133,6 @@ bce_start_rxp_cpu(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Initialize the RX CPU. */ /* */ @@ -4304,7 +4230,6 @@ bce_init_rxp_cpu(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Initialize the TX CPU. */ /* */ @@ -4401,7 +4326,6 @@ bce_init_txp_cpu(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Initialize the TPAT CPU. */ /* */ @@ -4498,7 +4422,6 @@ bce_init_tpat_cpu(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Initialize the CP CPU. */ /* */ @@ -4595,7 +4518,6 @@ bce_init_cp_cpu(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Initialize the COM CPU. */ /* */ @@ -4692,7 +4614,6 @@ bce_init_com_cpu(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Initialize the RV2P, RX, TX, TPAT, COM, and CP CPUs. */ /* */ @@ -4707,7 +4628,6 @@ bce_init_cpus(struct bce_softc *sc) DBENTER(BCE_VERBOSE_RESET); if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) { - if ((BCE_CHIP_REV(sc) == BCE_CHIP_REV_Ax)) { bce_load_rv2p_fw(sc, bce_xi90_rv2p_proc1, sizeof(bce_xi90_rv2p_proc1), RV2P_PROC1); @@ -4736,7 +4656,6 @@ bce_init_cpus(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Initialize context memory. */ /* */ @@ -4809,7 +4728,6 @@ bce_init_ctx(struct bce_softc *sc) } } } else { - DBPRINT(sc, BCE_INFO, "Initializing 5706/5708 context.\n"); /* @@ -4820,7 +4738,6 @@ bce_init_ctx(struct bce_softc *sc) vcid_addr = GET_CID_ADDR(96); while (vcid_addr) { - vcid_addr -= PHY_CTX_SIZE; REG_WR(sc, BCE_CTX_VIRT_ADDR, 0); @@ -4833,14 +4750,12 @@ bce_init_ctx(struct bce_softc *sc) REG_WR(sc, BCE_CTX_VIRT_ADDR, vcid_addr); REG_WR(sc, BCE_CTX_PAGE_TBL, vcid_addr); } - } init_ctx_fail: DBEXIT(BCE_VERBOSE_RESET | BCE_VERBOSE_CTX); return (rc); } - /****************************************************************************/ /* Fetch the permanent MAC address of the controller. */ /* */ @@ -4883,7 +4798,6 @@ bce_get_mac_addr(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Program the MAC address. */ /* */ @@ -4914,7 +4828,6 @@ bce_set_mac_addr(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Stop the controller. */ /* */ @@ -4959,7 +4872,6 @@ bce_stop(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET); } - static int bce_reset(struct bce_softc *sc, u32 reset_code) { @@ -5082,7 +4994,6 @@ bce_reset_exit: return (rc); } - static int bce_chipinit(struct bce_softc *sc) { @@ -5183,7 +5094,6 @@ bce_chipinit_exit: return(rc); } - /****************************************************************************/ /* Initialize the controller in preparation to send/receive traffic. */ /* */ @@ -5353,7 +5263,6 @@ bce_blockinit_exit: return (rc); } - /****************************************************************************/ /* Encapsulate an mbuf into the rx_bd chain. */ /* */ @@ -5468,7 +5377,6 @@ bce_get_rx_buf_exit: return(rc); } - /****************************************************************************/ /* Encapsulate an mbuf cluster into the page chain. */ /* */ @@ -5572,7 +5480,6 @@ bce_get_pg_buf_exit: return(rc); } - /****************************************************************************/ /* Initialize the TX context memory. */ /* */ @@ -5622,7 +5529,6 @@ bce_init_tx_context(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET | BCE_VERBOSE_SEND | BCE_VERBOSE_CTX); } - /****************************************************************************/ /* Allocate memory and initialize the TX data structures. */ /* */ @@ -5682,7 +5588,6 @@ bce_init_tx_chain(struct bce_softc *sc) return(rc); } - /****************************************************************************/ /* Free memory and clear the TX data structures. */ /* */ @@ -5724,7 +5629,6 @@ bce_free_tx_chain(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET | BCE_VERBOSE_SEND | BCE_VERBOSE_UNLOAD); } - /****************************************************************************/ /* Initialize the RX context memory. */ /* */ @@ -5798,7 +5702,6 @@ bce_init_rx_context(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET | BCE_VERBOSE_RECV | BCE_VERBOSE_CTX); } - /****************************************************************************/ /* Allocate memory and initialize the RX data structures. */ /* */ @@ -5862,7 +5765,6 @@ bce_init_rx_chain(struct bce_softc *sc) return(rc); } - /****************************************************************************/ /* Add mbufs to the RX chain until its full or an mbuf allocation error */ /* occurs. */ @@ -5910,7 +5812,6 @@ bce_fill_rx_chain(struct bce_softc *sc) BCE_VERBOSE_CTX); } - /****************************************************************************/ /* Free memory and clear the RX data structures. */ /* */ @@ -5953,7 +5854,6 @@ bce_free_rx_chain(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET | BCE_VERBOSE_RECV | BCE_VERBOSE_UNLOAD); } - /****************************************************************************/ /* Allocate memory and initialize the page data structures. */ /* Assumes that bce_init_rx_chain() has not already been called. */ @@ -6033,7 +5933,6 @@ bce_init_pg_chain(struct bce_softc *sc) return(rc); } - /****************************************************************************/ /* Add mbufs to the page chain until its full or an mbuf allocation error */ /* occurs. */ @@ -6080,7 +5979,6 @@ bce_fill_pg_chain(struct bce_softc *sc) BCE_VERBOSE_CTX); } - /****************************************************************************/ /* Free memory and clear the RX data structures. */ /* */ @@ -6121,7 +6019,6 @@ bce_free_pg_chain(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_RESET | BCE_VERBOSE_RECV | BCE_VERBOSE_UNLOAD); } - static u32 bce_get_rphy_link(struct bce_softc *sc) { @@ -6170,7 +6067,6 @@ bce_get_rphy_link(struct bce_softc *sc) return (advertise); } - /****************************************************************************/ /* Set media options. */ /* */ @@ -6193,7 +6089,6 @@ bce_ifmedia_upd(struct ifnet *ifp) return (error); } - /****************************************************************************/ /* Set media options. */ /* */ @@ -6316,7 +6211,6 @@ bce_ifmedia_upd_locked(struct ifnet *ifp) return (error); } - static void bce_ifmedia_sts_rphy(struct bce_softc *sc, struct ifmediareq *ifmr) { @@ -6395,7 +6289,6 @@ bce_ifmedia_sts_rphy(struct bce_softc *sc, struct ifme ifmr->ifm_active |= IFM_ETH_TXPAUSE; } - /****************************************************************************/ /* Reports current media status. */ /* */ @@ -6431,7 +6324,6 @@ bce_ifmedia_sts(struct ifnet *ifp, struct ifmediareq * DBEXIT(BCE_VERBOSE_PHY); } - /****************************************************************************/ /* Handles PHY generated interrupt events. */ /* */ @@ -6454,7 +6346,6 @@ bce_phy_intr(struct bce_softc *sc) /* Handle any changes if the link state has changed. */ if (new_link_state != old_link_state) { - /* Update the status_attn_bits_ack field. */ if (new_link_state) { REG_WR(sc, BCE_PCICFG_STATUS_BIT_SET_CMD, @@ -6497,7 +6388,6 @@ bce_phy_intr(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_PHY | BCE_VERBOSE_INTR); } - /****************************************************************************/ /* Reads the receive consumer value from the status block (skipping over */ /* chain page pointer if necessary). */ @@ -6740,7 +6630,6 @@ bce_rx_intr(struct bce_softc *sc) if (status & (L2_FHDR_ERRORS_BAD_CRC | L2_FHDR_ERRORS_PHY_DECODE | L2_FHDR_ERRORS_ALIGNMENT | L2_FHDR_ERRORS_TOO_SHORT | L2_FHDR_ERRORS_GIANT_FRAME)) { - /* Log the error and release the mbuf. */ sc->l2fhdr_error_count++; m_freem(m0); @@ -6770,7 +6659,6 @@ bce_rx_intr(struct bce_softc *sc) /* Check for a valid TCP/UDP frame. */ if (status & (L2_FHDR_STATUS_TCP_SEGMENT | L2_FHDR_STATUS_UDP_DATAGRAM)) { - /* Check for a good TCP/UDP checksum. */ if ((status & (L2_FHDR_ERRORS_TCP_XSUM | L2_FHDR_ERRORS_UDP_XSUM)) == 0) { @@ -6870,7 +6758,6 @@ bce_rx_intr_next_rx: DBEXIT(BCE_VERBOSE_RECV | BCE_VERBOSE_INTR); } - /****************************************************************************/ /* Reads the transmit consumer value from the status block (skipping over */ /* chain page pointer if necessary). */ @@ -6891,7 +6778,6 @@ bce_get_hw_tx_cons(struct bce_softc *sc) return hw_cons; } - /****************************************************************************/ /* Handles transmit completion interrupt events. */ /* */ @@ -6955,7 +6841,6 @@ bce_tx_intr(struct bce_softc *sc) * has an mbuf pointer and DMA map. */ if (sc->tx_mbuf_ptr[sw_tx_chain_cons] != NULL) { - /* Validate that this is the last tx_bd. */ DBRUNIF((!(txbd->tx_bd_flags & TX_BD_FLAGS_END)), BCE_PRINTF("%s(%d): tx_bd END flag not set but " @@ -7010,7 +6895,6 @@ bce_tx_intr(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_SEND | BCE_VERBOSE_INTR); } - /****************************************************************************/ /* Disables interrupt generation. */ /* */ @@ -7028,7 +6912,6 @@ bce_disable_intr(struct bce_softc *sc) DBEXIT(BCE_VERBOSE_INTR); } - /****************************************************************************/ /* Enables interrupt generation. */ /* */ @@ -7054,7 +6937,6 @@ bce_enable_intr(struct bce_softc *sc, int coal_now) DBEXIT(BCE_VERBOSE_INTR); } - /****************************************************************************/ /* Handles controller initialization. */ /* */ @@ -7167,7 +7049,6 @@ bce_init_locked_exit: DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Initialize the controller just enough so that any management firmware */ /* running on the device will continue to operate correctly. */ @@ -7204,7 +7085,6 @@ bce_mgmt_init_locked_exit: DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Handles controller initialization when called from an unlocked routine. */ /* */ @@ -7225,7 +7105,6 @@ bce_init(void *xsc) DBEXIT(BCE_VERBOSE_RESET); } - /****************************************************************************/ /* Modifies an mbuf for TSO on the hardware. */ /* */ @@ -7342,7 +7221,6 @@ bce_tso_setup(struct bce_softc *sc, struct mbuf **m_he return (*m_head); } - /****************************************************************************/ /* Encapsultes an mbuf cluster into the tx_bd chain structure and makes the */ /* memory visible to the controller. */ @@ -7482,7 +7360,6 @@ bce_tx_encap(struct bce_softc *sc, struct mbuf **m_hea * the mbuf. */ for (i = 0; i < nsegs ; i++) { - chain_prod = TX_CHAIN_IDX(prod); txbd= &sc->tx_bd_chain[TX_PAGE(chain_prod)] [TX_IDX(chain_prod)]; @@ -7542,7 +7419,6 @@ bce_tx_encap_exit: return(rc); } - /****************************************************************************/ /* Main transmit routine when called from another routine with a lock. */ /* */ @@ -7587,7 +7463,6 @@ bce_start_locked(struct ifnet *ifp) * Keep adding entries while there is space in the ring. */ while (sc->used_tx_bd < sc->max_tx_bd) { - /* Check for any frames to send. */ IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); @@ -7637,7 +7512,6 @@ bce_start_locked_exit: DBEXIT(BCE_VERBOSE_SEND | BCE_VERBOSE_CTX); } - /****************************************************************************/ /* Main transmit routine when called from another routine without a lock. */ /* */ @@ -7658,7 +7532,6 @@ bce_start(struct ifnet *ifp) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:42:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F14AF37B608; Tue, 1 Sep 2020 21:42:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0sV6Cr0z4R1L; Tue, 1 Sep 2020 21:42:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA2131FB7E; Tue, 1 Sep 2020 21:42:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LgM3Q039261; Tue, 1 Sep 2020 21:42:22 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LgM69039258; Tue, 1 Sep 2020 21:42:22 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012142.081LgM69039258@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:42:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365120 - in head/sys/dev/beri/virtio: . network X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/beri/virtio: . network X-SVN-Commit-Revision: 365120 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:42:23 -0000 Author: mjg Date: Tue Sep 1 21:42:21 2020 New Revision: 365120 URL: https://svnweb.freebsd.org/changeset/base/365120 Log: beri: clean up empty lines in .c and .h files Modified: head/sys/dev/beri/virtio/network/if_vtbe.c head/sys/dev/beri/virtio/virtio.c head/sys/dev/beri/virtio/virtio_block.c Modified: head/sys/dev/beri/virtio/network/if_vtbe.c ============================================================================== --- head/sys/dev/beri/virtio/network/if_vtbe.c Tue Sep 1 21:42:08 2020 (r365119) +++ head/sys/dev/beri/virtio/network/if_vtbe.c Tue Sep 1 21:42:21 2020 (r365120) @@ -635,7 +635,6 @@ vtbe_attach(device_t dev) static device_method_t vtbe_methods[] = { DEVMETHOD(device_probe, vtbe_probe), DEVMETHOD(device_attach, vtbe_attach), - { 0, 0 } }; Modified: head/sys/dev/beri/virtio/virtio.c ============================================================================== --- head/sys/dev/beri/virtio/virtio.c Tue Sep 1 21:42:08 2020 (r365119) +++ head/sys/dev/beri/virtio/virtio.c Tue Sep 1 21:42:21 2020 (r365120) @@ -109,7 +109,6 @@ paddr_unmap(void *phys, uint32_t size) static inline void _vq_record(uint32_t offs, int i, volatile struct vring_desc *vd, struct iovec *iov, int n_iov, uint16_t *flags) { - if (i >= n_iov) return; Modified: head/sys/dev/beri/virtio/virtio_block.c ============================================================================== --- head/sys/dev/beri/virtio/virtio_block.c Tue Sep 1 21:42:08 2020 (r365119) +++ head/sys/dev/beri/virtio/virtio_block.c Tue Sep 1 21:42:21 2020 (r365120) @@ -347,7 +347,6 @@ vq_init(struct beri_vtblk_softc *sc) return (0); } - static void vtblk_thread(void *arg) { From owner-svn-src-all@freebsd.org Tue Sep 1 21:42:39 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 47AB237B4DB; Tue, 1 Sep 2020 21:42:39 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0sq0Vgmz4R0P; Tue, 1 Sep 2020 21:42:39 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E8ADD20153; Tue, 1 Sep 2020 21:42:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LgchE039324; Tue, 1 Sep 2020 21:42:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LgcDq039322; Tue, 1 Sep 2020 21:42:38 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012142.081LgcDq039322@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:42:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365121 - head/sys/dev/bfe X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/bfe X-SVN-Commit-Revision: 365121 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:42:39 -0000 Author: mjg Date: Tue Sep 1 21:42:38 2020 New Revision: 365121 URL: https://svnweb.freebsd.org/changeset/base/365121 Log: bfe: clean up empty lines in .c and .h files Modified: head/sys/dev/bfe/if_bfe.c head/sys/dev/bfe/if_bfereg.h Modified: head/sys/dev/bfe/if_bfe.c ============================================================================== --- head/sys/dev/bfe/if_bfe.c Tue Sep 1 21:42:21 2020 (r365120) +++ head/sys/dev/bfe/if_bfe.c Tue Sep 1 21:42:38 2020 (r365121) @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD$"); @@ -823,7 +822,7 @@ bfe_list_newbuf(struct bfe_softc *sc, int c) rx_header->len = 0; rx_header->flags = 0; bus_dmamap_sync(sc->bfe_rxmbuf_tag, r->bfe_map, BUS_DMASYNC_PREREAD); - + ctrl = segs[0].ds_len & BFE_DESC_LEN; KASSERT(ctrl > ETHER_MAX_LEN + 32, ("%s: buffer size too small(%d)!", __func__, ctrl)); @@ -1110,7 +1109,6 @@ bfe_set_rx_mode(struct bfe_softc *sc) else val |= BFE_RXCONF_DBCAST; - CSR_WRITE_4(sc, BFE_CAM_CTRL, 0); bfe_cam_write(sc, IF_LLADDR(sc->bfe_ifp), 0); @@ -1481,7 +1479,6 @@ bfe_intr(void *xsc) bfe_txeof(sc); if (istat & BFE_ISTAT_ERRORS) { - if (istat & BFE_ISTAT_DSCE) { device_printf(sc->bfe_dev, "Descriptor Error\n"); bfe_stop(sc); Modified: head/sys/dev/bfe/if_bfereg.h ============================================================================== --- head/sys/dev/bfe/if_bfereg.h Tue Sep 1 21:42:21 2020 (r365120) +++ head/sys/dev/bfe/if_bfereg.h Tue Sep 1 21:42:38 2020 (r365121) @@ -248,7 +248,6 @@ #define BFE_IBE 0x00020000 /* In Band Error */ #define BFE_TO 0x00040000 /* Timeout */ - /* Seems the bcm440x has a fairly generic core, we only need be concerned with * a couple of these */ From owner-svn-src-all@freebsd.org Tue Sep 1 21:42:50 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BC81A37B5D5; Tue, 1 Sep 2020 21:42:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0t21Qysz4R31; Tue, 1 Sep 2020 21:42:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF75920223; Tue, 1 Sep 2020 21:42:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LgnPY039378; Tue, 1 Sep 2020 21:42:49 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LgnnN039377; Tue, 1 Sep 2020 21:42:49 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012142.081LgnnN039377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:42:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365122 - head/sys/dev/bge X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/bge X-SVN-Commit-Revision: 365122 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:42:50 -0000 Author: mjg Date: Tue Sep 1 21:42:49 2020 New Revision: 365122 URL: https://svnweb.freebsd.org/changeset/base/365122 Log: bge: clean up empty lines in .c and .h files Modified: head/sys/dev/bge/if_bge.c head/sys/dev/bge/if_bgereg.h Modified: head/sys/dev/bge/if_bge.c ============================================================================== --- head/sys/dev/bge/if_bge.c Tue Sep 1 21:42:38 2020 (r365121) +++ head/sys/dev/bge/if_bge.c Tue Sep 1 21:42:49 2020 (r365122) @@ -240,7 +240,6 @@ static const struct bge_type { { FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE4 }, { FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE5 }, { FJTSU_VENDORID, FJTSU_DEVICEID_PP250450 }, - { 0, 0 } }; @@ -255,7 +254,6 @@ static const struct bge_vendor { { SK_VENDORID, "SysKonnect" }, { TC_VENDORID, "3Com" }, { FJTSU_VENDORID, "Fujitsu" }, - { 0, NULL } }; @@ -330,7 +328,6 @@ static const struct bge_revision { { BGE_CHIPID_BCM57765_B0, "BCM57765 B0" }, { BGE_CHIPID_BCM57780_A0, "BCM57780 A0" }, { BGE_CHIPID_BCM57780_A1, "BCM57780 A1" }, - { 0, NULL } }; @@ -363,7 +360,6 @@ static const struct bge_revision bge_majorrevs[] = { { BGE_ASICREV_BCM5719, "unknown BCM5719" }, { BGE_ASICREV_BCM5720, "unknown BCM5720" }, { BGE_ASICREV_BCM5762, "unknown BCM5762" }, - { 0, NULL } }; Modified: head/sys/dev/bge/if_bgereg.h ============================================================================== --- head/sys/dev/bge/if_bgereg.h Tue Sep 1 21:42:38 2020 (r365121) +++ head/sys/dev/bge/if_bgereg.h Tue Sep 1 21:42:49 2020 (r365122) @@ -145,7 +145,6 @@ #define BGE_EXT_SSRAM 0x00020000 #define BGE_EXT_SSRAM_END 0x000FFFFF - /* * BCM570x register offsets. These are memory mapped registers * which can be accessed with the CSR_READ_4()/CSR_WRITE_4() macros. @@ -462,7 +461,6 @@ #define BGE_PCICLOCKCTL_SYSPLL_DISABLE 0x00008000 #define BGE_PCICLOCKCTL_BIST_ENABLE 0x00010000 - #ifndef PCIM_CMD_MWIEN #define PCIM_CMD_MWIEN 0x0010 #endif @@ -902,7 +900,6 @@ #define BGE_SGDIGSTS_PAUSE_CAP 0x00080000 #define BGE_SGDIGSTS_ASYM_PAUSE 0x00100000 - /* MI communication register */ #define BGE_MICOMM_DATA 0x0000FFFF #define BGE_MICOMM_REG 0x001F0000 @@ -927,7 +924,6 @@ #define BGE_MIMODE_500KHZ_CONST 0x00008000 #define BGE_MIMODE_BASE 0x000C0000 - /* * Send data initiator control registers. */ @@ -1157,7 +1153,6 @@ #define BGE_RXLP_LOCSTAT_IFIN_ERRORS 0x2254 #define BGE_RXLP_LOCSTAT_RXTHRESH_HIT 0x2258 - /* Receive List Placement mode register */ #define BGE_RXLPMODE_RESET 0x00000001 #define BGE_RXLPMODE_ENABLE 0x00000002 @@ -1208,7 +1203,6 @@ #define BGE_RDBDI_RETURN_PROD15 0x24BC #define BGE_RDBDI_HWDIAG 0x24C0 - /* Receive Data and Receive BD Initiator Mode register */ #define BGE_RDBDIMODE_RESET 0x00000001 #define BGE_RDBDIMODE_ENABLE 0x00000002 @@ -1221,7 +1215,6 @@ #define BGE_RDBDISTAT_GIANT_ATTN 0x00000008 #define BGE_RDBDISTAT_BADRINGSZ_ATTN 0x00000010 - /* * Receive Data Completion Control registers */ @@ -1410,7 +1403,6 @@ #define BGE_HCC_TX_BD_CONS14 0x3CF8 #define BGE_HCC_TX_BD_CONS15 0x3CFC - /* Host coalescing mode register */ #define BGE_HCCMODE_RESET 0x00000001 #define BGE_HCCMODE_ENABLE 0x00000002 @@ -1544,7 +1536,6 @@ #define BGE_BMANSTAT_ERRO 0x00000004 #define BGE_BMANSTAT_LOWMBUF_ERROR 0x00000010 - /* * Read DMA Control registers */ @@ -1652,7 +1643,6 @@ #define BGE_WDMASTAT_PCI_FIFOOREAD_ATTN 0x00000100 #define BGE_WDMASTAT_LOCREAD_TOOBIG 0x00000200 - /* * RX CPU registers */ @@ -1748,7 +1738,6 @@ #define BGE_TXCPUSTAT_MA_REQ_FIFOOFLOW 0x40000000 #define BGE_TXCPUSTAT_BLOCKING_READ 0x80000000 - /* * Low priority mailbox registers */ @@ -1924,7 +1913,6 @@ #define BGE_MSISTAT_MSI_FIFOUFLOW_ATTN 0x00000020 #define BGE_MSISTAT_MSI_FIFOOFLOW_ATTN 0x00000040 - /* * DMA Completion registers */ @@ -1934,7 +1922,6 @@ #define BGE_DMACMODE_RESET 0x00000001 #define BGE_DMACMODE_ENABLE 0x00000002 - /* * General control registers. */ @@ -2427,7 +2414,6 @@ struct bge_status_block { #define BGE_STATFLAG_LINKSTATE_CHANGED 0x00000002 #define BGE_STATFLAG_ERROR 0x00000004 - /* * Broadcom Vendor ID * (Note: the BCM570x still defaults to the Alteon PCI vendor ID @@ -2665,7 +2651,6 @@ struct bge_rx_mac_stats { bge_hostaddr etherStatsPkts4096Octetsto8191Octets; bge_hostaddr etherStatsPkts8192Octetsto9022Octets; }; - /* Statistics maintained MAC Transmit block. */ struct bge_tx_mac_stats { From owner-svn-src-all@freebsd.org Tue Sep 1 21:43:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC11437B5EC; Tue, 1 Sep 2020 21:43:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0tP6DN3z4RGN; Tue, 1 Sep 2020 21:43:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B9F6B1FFF1; Tue, 1 Sep 2020 21:43:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lh9AD039461; Tue, 1 Sep 2020 21:43:09 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lh5v0039437; Tue, 1 Sep 2020 21:43:05 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012143.081Lh5v0039437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:43:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365123 - in head/sys/dev/bhnd: . bcma bhndb cores/chipc cores/chipc/pwrctl cores/pci cores/pcie2 cores/pmu cores/usb nvram siba X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/bhnd: . bcma bhndb cores/chipc cores/chipc/pwrctl cores/pci cores/pcie2 cores/pmu cores/usb nvram siba X-SVN-Commit-Revision: 365123 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:43:10 -0000 Author: mjg Date: Tue Sep 1 21:43:05 2020 New Revision: 365123 URL: https://svnweb.freebsd.org/changeset/base/365123 Log: bhnd: clean up empty lines in .c and .h files Modified: head/sys/dev/bhnd/bcma/bcma.c head/sys/dev/bhnd/bcma/bcma_bhndb.c head/sys/dev/bhnd/bcma/bcma_dmp.h head/sys/dev/bhnd/bcma/bcma_erom.c head/sys/dev/bhnd/bcma/bcma_eromreg.h head/sys/dev/bhnd/bcma/bcma_subr.c head/sys/dev/bhnd/bcma/bcmavar.h head/sys/dev/bhnd/bhnd.c head/sys/dev/bhnd/bhnd.h head/sys/dev/bhnd/bhnd_debug.h head/sys/dev/bhnd/bhnd_erom.c head/sys/dev/bhnd/bhnd_erom.h head/sys/dev/bhnd/bhnd_eromvar.h head/sys/dev/bhnd/bhnd_ids.h head/sys/dev/bhnd/bhnd_match.h head/sys/dev/bhnd/bhnd_private.h head/sys/dev/bhnd/bhnd_subr.c head/sys/dev/bhnd/bhnd_types.h head/sys/dev/bhnd/bhndb/bhnd_bhndb.c head/sys/dev/bhnd/bhndb/bhndb.c head/sys/dev/bhnd/bhndb/bhndb.h head/sys/dev/bhnd/bhndb/bhndb_hwdata.h head/sys/dev/bhnd/bhndb/bhndb_pci.c head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.h head/sys/dev/bhnd/bhndb/bhndb_pci_sprom.c head/sys/dev/bhnd/bhndb/bhndb_pcireg.h head/sys/dev/bhnd/bhndb/bhndb_private.h head/sys/dev/bhnd/bhndb/bhndb_subr.c head/sys/dev/bhnd/cores/chipc/chipc.c head/sys/dev/bhnd/cores/chipc/chipc_cfi.c head/sys/dev/bhnd/cores/chipc/chipc_gpio.c head/sys/dev/bhnd/cores/chipc/chipc_subr.c head/sys/dev/bhnd/cores/chipc/chipcreg.h head/sys/dev/bhnd/cores/chipc/chipcvar.h head/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c head/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_subr.c head/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctlvar.h head/sys/dev/bhnd/cores/pci/bhnd_pci.c head/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c head/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h head/sys/dev/bhnd/cores/pci/bhnd_pcireg.h head/sys/dev/bhnd/cores/pci/bhnd_pcivar.h head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_reg.h head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h head/sys/dev/bhnd/cores/pmu/bhnd_pmu.c head/sys/dev/bhnd/cores/pmu/bhnd_pmu.h head/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c head/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h head/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c head/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h head/sys/dev/bhnd/cores/usb/bhnd_ehci.c head/sys/dev/bhnd/cores/usb/bhnd_usb.c head/sys/dev/bhnd/nvram/bhnd_nvram.h head/sys/dev/bhnd/nvram/bhnd_nvram_data.c head/sys/dev/bhnd/nvram/bhnd_nvram_data_bcm.c head/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmvar.h head/sys/dev/bhnd/nvram/bhnd_nvram_data_btxt.c head/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c head/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom_subr.c head/sys/dev/bhnd/nvram/bhnd_nvram_data_spromvar.h head/sys/dev/bhnd/nvram/bhnd_nvram_data_tlv.c head/sys/dev/bhnd/nvram/bhnd_nvram_io.c head/sys/dev/bhnd/nvram/bhnd_nvram_iobuf.c head/sys/dev/bhnd/nvram/bhnd_nvram_ioptr.c head/sys/dev/bhnd/nvram/bhnd_nvram_iores.c head/sys/dev/bhnd/nvram/bhnd_nvram_store.c head/sys/dev/bhnd/nvram/bhnd_nvram_subr.c head/sys/dev/bhnd/nvram/bhnd_nvram_value.c head/sys/dev/bhnd/nvram/bhnd_nvram_value.h head/sys/dev/bhnd/nvram/bhnd_nvram_value_fmts.c head/sys/dev/bhnd/nvram/bhnd_nvram_value_prf.c head/sys/dev/bhnd/nvram/bhnd_nvram_value_subr.c head/sys/dev/bhnd/nvram/bhnd_sprom.c head/sys/dev/bhnd/siba/siba.c head/sys/dev/bhnd/siba/siba_bhndb.c head/sys/dev/bhnd/siba/siba_erom.c head/sys/dev/bhnd/siba/siba_subr.c head/sys/dev/bhnd/siba/sibareg.h head/sys/dev/bhnd/siba/sibavar.h Modified: head/sys/dev/bhnd/bcma/bcma.c ============================================================================== --- head/sys/dev/bhnd/bcma/bcma.c Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bcma/bcma.c Tue Sep 1 21:43:05 2020 (r365123) @@ -140,10 +140,10 @@ bcma_read_ivar(device_t dev, device_t child, int index { const struct bcma_devinfo *dinfo; const struct bhnd_core_info *ci; - + dinfo = device_get_ivars(child); ci = &dinfo->corecfg->core_info; - + switch (index) { case BHND_IVAR_VENDOR: *result = ci->vendor; @@ -500,7 +500,7 @@ bcma_get_region_count(device_t dev, device_t child, bh dinfo = device_get_ivars(child); ports = bcma_corecfg_get_port_list(dinfo->corecfg, type); - + STAILQ_FOREACH(port, ports, sp_link) { if (port->sp_num == port_num) return (port->sp_num_maps); @@ -518,7 +518,7 @@ bcma_get_port_rid(device_t dev, device_t child, bhnd_p struct bcma_map *map; struct bcma_sport_list *ports; struct bcma_sport *port; - + dinfo = device_get_ivars(child); ports = bcma_corecfg_get_port_list(dinfo->corecfg, port_type); @@ -584,7 +584,7 @@ bcma_get_region_addr(device_t dev, device_t child, bhn struct bcma_map *map; struct bcma_sport_list *ports; struct bcma_sport *port; - + dinfo = device_get_ivars(child); ports = bcma_corecfg_get_port_list(dinfo->corecfg, port_type); @@ -710,7 +710,7 @@ bcma_add_children(device_t bus) /* EOF while parsing cores is expected */ if (error == ENOENT) error = 0; - + cleanup: bhnd_erom_free(erom); @@ -723,13 +723,12 @@ cleanup: return (error); } - static device_method_t bcma_methods[] = { /* Device interface */ DEVMETHOD(device_probe, bcma_probe), DEVMETHOD(device_attach, bcma_attach), DEVMETHOD(device_detach, bcma_detach), - + /* Bus interface */ DEVMETHOD(bus_add_child, bcma_add_child), DEVMETHOD(bus_child_deleted, bcma_child_deleted), Modified: head/sys/dev/bhnd/bcma/bcma_bhndb.c ============================================================================== --- head/sys/dev/bhnd/bcma/bcma_bhndb.c Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bcma/bcma_bhndb.c Tue Sep 1 21:43:05 2020 (r365123) @@ -99,7 +99,7 @@ bcma_bhndb_suspend_child(device_t dev, device_t child) if (device_get_parent(child) != dev) BUS_SUSPEND_CHILD(device_get_parent(dev), child); - + if (device_is_suspended(child)) return (EBUSY); @@ -113,7 +113,7 @@ bcma_bhndb_suspend_child(device_t dev, device_t child) if (dinfo->res_agent != NULL) BHNDB_SUSPEND_RESOURCE(device_get_parent(dev), dev, SYS_RES_MEMORY, dinfo->res_agent->res); - + return (0); } @@ -169,7 +169,7 @@ DEFINE_CLASS_2(bhnd, bcma_bhndb_driver, bcma_bhndb_met sizeof(struct bcma_softc), bhnd_bhndb_driver, bcma_driver); DRIVER_MODULE(bcma_bhndb, bhndb, bcma_bhndb_driver, bhnd_devclass, NULL, NULL); - + MODULE_VERSION(bcma_bhndb, 1); MODULE_DEPEND(bcma_bhndb, bcma, 1, 1, 1); MODULE_DEPEND(bcma_bhndb, bhnd, 1, 1, 1); Modified: head/sys/dev/bhnd/bcma/bcma_dmp.h ============================================================================== --- head/sys/dev/bhnd/bcma/bcma_dmp.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bcma/bcma_dmp.h Tue Sep 1 21:43:05 2020 (r365123) @@ -219,7 +219,6 @@ #define BCMA_DMP_COMPONENTID2 0xff8 #define BCMA_DMP_COMPONENTID3 0xffc - /* OOBSEL(IN|OUT) */ #define BCMA_DMP_OOBSEL_MASK 0xFF /**< OOB selector mask */ #define BCMA_DMP_OOBSEL_EN (1<<7) /**< OOB selector enable bit */ Modified: head/sys/dev/bhnd/bcma/bcma_erom.c ============================================================================== --- head/sys/dev/bhnd/bcma/bcma_erom.c Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bcma/bcma_erom.c Tue Sep 1 21:43:05 2020 (r365123) @@ -79,7 +79,6 @@ static int bcma_erom_seek_next(struct bcma_erom *ero static int bcma_erom_region_to_port_type(struct bcma_erom *erom, uint8_t region_type, bhnd_port_type *port_type); - static int bcma_erom_peek32(struct bcma_erom *erom, uint32_t *entry); @@ -302,7 +301,7 @@ bcma_erom_lookup_core_addr(bhnd_erom_t *erom, const st /* Otherwise, seek to next block of region records */ while (1) { uint8_t next_type, next_port; - + if ((error = bcma_erom_skip_sport_region(sc))) return (error); @@ -676,7 +675,7 @@ bcma_erom_seek_matching_core(struct bcma_erom *sc, /* Save the core offset */ core_offset = bcma_erom_tell(sc); - + /* Parse the core */ if ((error = bcma_erom_parse_core(sc, &ec))) return (error); @@ -744,11 +743,11 @@ bcma_erom_parse_core(struct bcma_erom *erom, struct bc /* Parse CoreDescA */ if ((error = bcma_erom_read32(erom, &entry))) return (error); - + /* Handle EOF */ if (entry == BCMA_EROM_TABLE_EOF) return (ENOENT); - + if (!BCMA_EROM_ENTRY_IS(entry, CORE)) { EROM_LOG(erom, "Unexpected EROM entry 0x%x (type=%s)\n", entry, bcma_erom_entry_type_name(entry)); @@ -758,7 +757,7 @@ bcma_erom_parse_core(struct bcma_erom *erom, struct bc core->vendor = BCMA_EROM_GET_ATTR(entry, COREA_DESIGNER); core->device = BCMA_EROM_GET_ATTR(entry, COREA_ID); - + /* Parse CoreDescB */ if ((error = bcma_erom_read32(erom, &entry))) return (error); @@ -794,7 +793,7 @@ bcma_erom_parse_mport(struct bcma_erom *erom, struct b /* Parse the master port descriptor */ if ((error = bcma_erom_read32(erom, &entry))) return (error); - + if (!BCMA_EROM_ENTRY_IS(entry, MPORT)) return (EINVAL); @@ -957,7 +956,7 @@ bcma_erom_corecfg_fill_port_regions(struct bcma_erom * /* Fetch the list to be populated */ sports = bcma_corecfg_get_port_list(corecfg, port_type); - + /* Allocate a new port descriptor */ sport = bcma_alloc_sport(port_num, port_type); if (sport == NULL) @@ -1109,7 +1108,7 @@ bcma_erom_next_corecfg(struct bcma_erom *erom, struct core.device, core.rev); if (cfg == NULL) return (ENOMEM); - + /* These are 5-bit values in the EROM table, and should never be able * to overflow BCMA_PID_MAX. */ KASSERT(core.num_mport <= BCMA_PID_MAX, ("unsupported mport count")); @@ -1135,7 +1134,7 @@ bcma_erom_next_corecfg(struct bcma_erom *erom, struct for (uint8_t i = 0; i < core.num_mport; i++) { struct bcma_mport *mport; struct bcma_erom_mport mpd; - + /* Parse the master port descriptor */ error = bcma_erom_parse_mport(erom, &mpd); if (error) @@ -1154,7 +1153,6 @@ bcma_erom_next_corecfg(struct bcma_erom *erom, struct /* Update dinfo */ STAILQ_INSERT_TAIL(&cfg->master_ports, mport, mp_link); } - /* * Determine whether this is a bridge device; if so, we can @@ -1184,7 +1182,7 @@ bcma_erom_next_corecfg(struct bcma_erom *erom, struct cfg->num_bridge_ports = 0; } } - + /* Device/bridge port descriptors */ for (uint8_t sp_num = 0; sp_num < core.num_dport; sp_num++) { error = bcma_erom_corecfg_fill_port_regions(erom, cfg, sp_num, @@ -1203,7 +1201,6 @@ bcma_erom_next_corecfg(struct bcma_erom *erom, struct goto failed; } - /* Wrapper (aka device management) descriptors (for slave ports). */ for (uint8_t i = 0; i < core.num_swrap; i++) { /* Slave wrapper ports are not numbered distinctly from master @@ -1250,7 +1247,7 @@ bcma_erom_next_corecfg(struct bcma_erom *erom, struct *result = cfg; return (0); - + failed: if (cfg != NULL) bcma_free_corecfg(cfg); Modified: head/sys/dev/bhnd/bcma/bcma_eromreg.h ============================================================================== --- head/sys/dev/bhnd/bcma/bcma_eromreg.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bcma/bcma_eromreg.h Tue Sep 1 21:43:05 2020 (r365123) @@ -105,7 +105,6 @@ #define BCMA_EROM_MPORT_ID_MASK 0x000000F0 /* AXI master ID (unique per master). */ #define BCMA_EROM_MPORT_ID_SHIFT 4 - /* EROM Slave Port MMIO Region Descriptor */ #define BCMA_EROM_REGION_BASE_MASK 0xFFFFF000 /* region base address */ #define BCMA_EROM_REGION_BASE_SHIFT 0 Modified: head/sys/dev/bhnd/bcma/bcma_subr.c ============================================================================== --- head/sys/dev/bhnd/bcma/bcma_subr.c Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bcma/bcma_subr.c Tue Sep 1 21:43:05 2020 (r365123) @@ -81,7 +81,7 @@ bcma_alloc_corecfg(u_int core_index, int core_unit, ui .core_idx = core_index, .unit = core_unit }; - + STAILQ_INIT(&cfg->master_ports); cfg->num_master_ports = 0; @@ -111,7 +111,7 @@ bcma_free_corecfg(struct bcma_corecfg *corecfg) STAILQ_FOREACH_SAFE(mport, &corecfg->master_ports, mp_link, mnext) { free(mport, M_BHND); } - + STAILQ_FOREACH_SAFE(sport, &corecfg->dev_ports, sp_link, snext) { bcma_free_sport(sport); } @@ -119,7 +119,7 @@ bcma_free_corecfg(struct bcma_corecfg *corecfg) STAILQ_FOREACH_SAFE(sport, &corecfg->bridge_ports, sp_link, snext) { bcma_free_sport(sport); } - + STAILQ_FOREACH_SAFE(sport, &corecfg->wrapper_ports, sp_link, snext) { bcma_free_sport(sport); } @@ -198,8 +198,6 @@ bcma_dinfo_init_port_resource_info(device_t bus, struc } } - - /** * Allocate the per-core agent register block for a device info structure. * @@ -297,7 +295,7 @@ bcma_dinfo_init_intrs(device_t bus, device_t child, if (dinfo->num_intrs == UINT_MAX) return (ENOMEM); - + selout = bhnd_bus_read_4(dinfo->res_agent, BCMA_DMP_OOBSELOUT( BCMA_OOB_BANK_INTR, sel)); @@ -330,7 +328,7 @@ struct bcma_devinfo * bcma_alloc_dinfo(device_t bus) { struct bcma_devinfo *dinfo; - + dinfo = malloc(sizeof(struct bcma_devinfo), M_BHND, M_NOWAIT|M_ZERO); if (dinfo == NULL) return (NULL); @@ -406,7 +404,7 @@ bcma_init_dinfo(device_t bus, device_t child, struct b } intr->i_mapped = true; - + /* Add to resource list */ intr->i_rid = resource_list_add_next(&dinfo->resources, SYS_RES_IRQ, intr->i_irq, intr->i_irq, 1); @@ -459,7 +457,6 @@ bcma_free_dinfo(device_t bus, device_t child, struct b free(dinfo, M_BHND); } - /** * Allocate and initialize a new interrupt descriptor. * @@ -517,11 +514,11 @@ struct bcma_sport * bcma_alloc_sport(bcma_pid_t port_num, bhnd_port_type port_type) { struct bcma_sport *sport; - + sport = malloc(sizeof(struct bcma_sport), M_BHND, M_NOWAIT); if (sport == NULL) return NULL; - + sport->sp_num = port_num; sport->sp_type = port_type; sport->sp_num_maps = 0; @@ -545,7 +542,6 @@ bcma_free_sport(struct bcma_sport *sport) { free(sport, M_BHND); } - /** * Given a bcma(4) child's device info, spin waiting for the device's DMP Modified: head/sys/dev/bhnd/bcma/bcmavar.h ============================================================================== --- head/sys/dev/bhnd/bcma/bcmavar.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bcma/bcmavar.h Tue Sep 1 21:43:05 2020 (r365123) @@ -62,7 +62,6 @@ #define BCMA_DINFO_COREIDX(_dinfo) \ ((_dinfo)->corecfg->core_info.core_idx) - /** BCMA port identifier. */ typedef u_int bcma_pid_t; #define BCMA_PID_MAX UINT_MAX /**< Maximum bcma_pid_t value */ @@ -165,10 +164,10 @@ struct bcma_corecfg { u_long num_dev_ports; /**< number of device slave port descriptors. */ struct bcma_sport_list dev_ports; /**< device port descriptors */ - + u_long num_bridge_ports; /**< number of bridge slave port descriptors. */ struct bcma_sport_list bridge_ports; /**< bridge port descriptors */ - + u_long num_wrapper_ports; /**< number of wrapper slave port descriptors. */ struct bcma_sport_list wrapper_ports; /**< wrapper port descriptors */ }; @@ -189,7 +188,6 @@ struct bcma_devinfo { void *pmu_info; /**< Bus-managed PMU state, or NULL */ }; - /** BMCA per-instance state */ struct bcma_softc { Modified: head/sys/dev/bhnd/bhnd.c ============================================================================== --- head/sys/dev/bhnd/bhnd.c Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd.c Tue Sep 1 21:43:05 2020 (r365123) @@ -90,7 +90,6 @@ static const struct bhnd_nomatch { { BHND_MFGID_ARM, BHND_COREID_PL301, true }, { BHND_MFGID_ARM, BHND_COREID_APB_BRIDGE, true }, { BHND_MFGID_ARM, BHND_COREID_AXI_UNMAPPED, false }, - { BHND_MFGID_INVALID, BHND_COREID_INVALID, false } }; @@ -491,7 +490,7 @@ bhnd_generic_release_pmu(device_t dev, device_t child) device_t pmu_dev; GIANT_REQUIRED; /* for newbus */ - + sc = device_get_softc(dev); if (device_get_parent(child) != dev) @@ -756,7 +755,6 @@ bhnd_generic_release_ext_rsrc(device_t dev, device_t c if ((clkctl = bhnd_get_pmu_info(child)) == NULL) panic("no active PMU allocation"); - BHND_ASSERT_CLKCTL_AVAIL(clkctl); sc = device_get_softc(dev); @@ -844,8 +842,7 @@ bhnd_generic_print_child(device_t dev, device_t child) retval += bus_print_child_header(dev, child); rl = BUS_GET_RESOURCE_LIST(dev, child); - - + if (rl != NULL) { retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx"); @@ -889,7 +886,7 @@ bhnd_generic_probe_nomatch(device_t dev, device_t chil report = true; break; } - + if (!report) return; @@ -935,13 +932,12 @@ bhnd_child_location_str(device_t dev, device_t child, { bhnd_addr_t addr; bhnd_size_t size; - + if (device_get_parent(child) != dev) { return (BUS_CHILD_LOCATION_STR(device_get_parent(dev), child, buf, buflen)); } - if (bhnd_get_region_addr(child, BHND_PORT_DEVICE, 0, 0, &addr, &size)) { /* No device default port/region */ if (buflen > 0) @@ -1010,7 +1006,6 @@ bhnd_generic_resume_child(device_t dev, device_t child return bus_generic_resume_child(dev, child); } - /** * Default bhnd(4) bus driver implementation of BUS_SETUP_INTR(). * @@ -1176,7 +1171,7 @@ static device_method_t bhnd_methods[] = { DEVMETHOD(bhnd_bus_write_multi_1, bhnd_write_multi_1), DEVMETHOD(bhnd_bus_write_multi_2, bhnd_write_multi_2), DEVMETHOD(bhnd_bus_write_multi_4, bhnd_write_multi_4), - + DEVMETHOD(bhnd_bus_read_multi_stream_1, bhnd_read_multi_stream_1), DEVMETHOD(bhnd_bus_read_multi_stream_2, bhnd_read_multi_stream_2), DEVMETHOD(bhnd_bus_read_multi_stream_4, bhnd_read_multi_stream_4), Modified: head/sys/dev/bhnd/bhnd.h ============================================================================== --- head/sys/dev/bhnd/bhnd.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd.h Tue Sep 1 21:43:05 2020 (r365123) @@ -108,7 +108,6 @@ enum { }; - /** * Per-core IOCTL flags common to all bhnd(4) cores. */ @@ -207,7 +206,6 @@ struct bhnd_board_info { uint32_t board_flags3; /**< Board flags 3 (see BHND_BFL3_*) */ }; - /** * Chip Identification * @@ -307,7 +305,6 @@ struct bhnd_dma_translation { */ uint32_t flags; }; - #define BHND_DMA_TRANSLATION_TABLE_END { 0, 0, 0, 0 } #define BHND_DMA_IS_TRANSLATION_TABLE_END(_dt) \ @@ -377,7 +374,6 @@ struct bhnd_device_quirk { #define BHND_BOARD_QUIRK(_board, _flags) \ {{ BHND_MATCH_BOARD_TYPE(_board) }, \ (_flags) } - #define BHND_DEVICE_QUIRK_END { { BHND_MATCH_ANY }, 0 } #define BHND_DEVICE_QUIRK_IS_END(_q) \ (((_q)->desc.m.match_flags == 0) && (_q)->quirks == 0) @@ -409,7 +405,6 @@ struct bhnd_device { #define BHND_DEVICE(_vendor, _device, _desc, _quirks, ...) \ _BHND_DEVICE(_vendor, _device, _desc, _quirks, \ ## __VA_ARGS__, 0) - #define BHND_DEVICE_END { { BHND_MATCH_ANY }, NULL, NULL, 0 } #define BHND_DEVICE_IS_END(_d) \ (BHND_MATCH_IS_ANY(&(_d)->core) && (_d)->desc == NULL) @@ -764,7 +759,6 @@ bhnd_get_chipid(device_t dev) { return (BHND_BUS_GET_CHIPID(device_get_parent(dev), dev)); }; - /** * Read the current value of a bhnd(4) device's per-core I/O control register. * @@ -1309,7 +1303,6 @@ bhnd_alloc_resource(device_t dev, int type, int *rid, return BHND_BUS_ALLOC_RESOURCE(device_get_parent(dev), dev, type, rid, start, end, count, flags); } - /** * Allocate a resource from a device's parent bhnd(4) bus, using the Modified: head/sys/dev/bhnd/bhnd_debug.h ============================================================================== --- head/sys/dev/bhnd/bhnd_debug.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd_debug.h Tue Sep 1 21:43:05 2020 (r365123) @@ -108,7 +108,6 @@ } while(0); #endif /* BHND_LOGGING > BHND_INFO_LEVEL */ - #define _BHND_RAWPRINTFN printf( #define _BHND_DEVPRINTFN(dev) device_printf(dev, Modified: head/sys/dev/bhnd/bhnd_erom.c ============================================================================== --- head/sys/dev/bhnd/bhnd_erom.c Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd_erom.c Tue Sep 1 21:43:05 2020 (r365123) @@ -312,7 +312,6 @@ bhnd_erom_read_chipid(struct bhnd_erom_io *eio, struct return (0); } - /** * Attempt to map @p size bytes at @p addr, replacing any existing * @p eio mapping. Modified: head/sys/dev/bhnd/bhnd_erom.h ============================================================================== --- head/sys/dev/bhnd/bhnd_erom.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd_erom.h Tue Sep 1 21:43:05 2020 (r365123) @@ -90,7 +90,6 @@ struct bhnd_erom { KOBJ_FIELDS; }; - /** Number of additional bytes to reserve for statically allocated * bhnd_erom instances. */ #define BHND_EROM_STATIC_BYTES 64 Modified: head/sys/dev/bhnd/bhnd_eromvar.h ============================================================================== --- head/sys/dev/bhnd/bhnd_eromvar.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd_eromvar.h Tue Sep 1 21:43:05 2020 (r365123) @@ -59,10 +59,8 @@ typedef uint32_t (bhnd_erom_io_read_t)(struct bhnd_ero /** @see bhnd_erom_io_fini() */ typedef void (bhnd_erom_io_fini_t)(struct bhnd_erom_io *eio); - int bhnd_erom_read_chipid(struct bhnd_erom_io *eio, struct bhnd_chipid *cid); - /** * Abstract EROM bus I/O support. Modified: head/sys/dev/bhnd/bhnd_ids.h ============================================================================== --- head/sys/dev/bhnd/bhnd_ids.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd_ids.h Tue Sep 1 21:43:05 2020 (r365123) @@ -67,7 +67,6 @@ */ #define OCP_VENDOR_BCM 0x4243 /**< Broadcom OCP vendor id */ - /* PCI vendor IDs */ #define PCI_VENDOR_ASUSTEK 0x1043 #define PCI_VENDOR_EPIGRAM 0xfeda @@ -88,15 +87,12 @@ #define PCI_VENDOR_RICOH 0x1180 /* Ricoh */ #define PCI_VENDOR_JMICRON 0x197b - /* PCMCIA vendor IDs */ #define PCMCIA_VENDOR_BROADCOM 0x02d0 - /* SDIO vendor IDs */ #define SDIO_VENDOR_BROADCOM 0x00BF - /* USB dongle VID/PIDs */ #define USB_VID_BROADCOM 0x0a5c #define USB_PID_BCM4328 0xbd12 @@ -119,11 +115,9 @@ #define USB_PID_BCM_DNGL_BDC 0x0bdc /* BDC USB device controller IP? */ #define USB_PID_BCM_DNGL_JTAG 0x4a44 - /* HW USB BLOCK [CPULESS USB] PIDs */ #define USB_PID_CCM_HWUSB_43239 43239 - /* PCI Device IDs */ #define PCI_DEVID_BCM4210 0x1072 /* never used */ #define PCI_DEVID_BCM4230 0x1086 /* never used */ @@ -228,14 +222,12 @@ #define PCI_DEVID_PCIXX21_FLASHMEDIA0 0x8033 /* TI PCI xx21 Standard Host Controller */ #define PCI_DEVID_PCIXX21_SDIOH0 0x8034 /* TI PCI xx21 Standard Host Controller */ - /* PCI Subsystem Vendor IDs */ #define PCI_SUBVENDOR_BCM943228HMB 0x0607 #define PCI_SUBVENDOR_BCM94313HMGBL 0x0608 #define PCI_SUBVENDOR_BCM94313HMG 0x0609 #define PCI_SUBVENDOR_BCM943142HM 0x0611 - /* PCI Subsystem Device IDs */ #define PCI_SUBDEVID_BCM43143_D11N2G 0x4366 /* 43143 802.11n 2.4G device */ @@ -296,7 +288,6 @@ #define PCI_SUBDEVID_BCM_R5C822_SDIOH 0x0822 /* Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host */ #define PCI_SUBDEVID_BCM_JMICRON_SDIOH 0x2381 /* JMicron Standard SDIO Host Controller */ - /* Broadcom ChipCommon Chip IDs */ #define BHND_CHIPID_BCM4306 0x4306 /* 4306 chipcommon chipid */ #define BHND_CHIPID_BCM4311 0x4311 /* 4311 PCIe 802.11a/b/g */ @@ -381,7 +372,6 @@ #define BHND_CHIPID_BCM5357 0x5357 /* 5357 chipcommon chipid */ #define BHND_CHIPID_BCM53572 53572 /* 53572 chipcommon chipid */ - /* Broadcom ChipCommon Package IDs */ #define BHND_PKGID_BCM4303 2 /* 4303 package id */ #define BHND_PKGID_BCM4309 1 /* 4309 package id */ @@ -522,8 +512,6 @@ #define BHND_COREID_4706_GMAC 0x52d /* Gigabit MAC core */ #define BHND_COREID_AMEMC 0x52e /* DDR1/2 cadence/denali memory controller core */ - - /* ARM PrimeCell Peripherial IDs. These were derived from inspection of the * PrimeCell-compatible BCM4331 cores, but due to lack of documentation, the * surmised core name/description may be incorrect. */ @@ -593,7 +581,6 @@ */ #define BHND_BFL_EXTLNA_TX 0x20000000 /* Temp boardflag to indicate to */ - /* Boardflags2 */ #define BHND_BFL2_RXBB_INT_REG_DIS 0x00000001 /* Board has an external rxbb regulator */ #define BHND_BFL2_APLL_WAR 0x00000002 /* Flag to implement alternative A-band PLL settings */ @@ -642,7 +629,6 @@ #define BHND_BFL2_LNA1BYPFORTR2G 0x40000000 /* acphy, enable lna1 bypass for clip gain, 2g */ #define BHND_BFL2_LNA1BYPFORTR5G 0x80000000 /* acphy, enable lna1 bypass for clip gain, 5g */ - /* SROM 11 - 11ac boardflag definitions */ #define BHND_BFL_SROM11_BTCOEX 0x00000001 /* Board supports BTCOEX */ #define BHND_BFL_SROM11_WLAN_BT_SH_XTL 0x00000002 /* bluetooth and wlan share same crystal */ @@ -653,7 +639,6 @@ #define BHND_BFL2_SROM11_ANAPACTRL_2G 0x00100000 /* 2G ext PAs are ctrl-ed by analog PA ctrl lines */ #define BHND_BFL2_SROM11_ANAPACTRL_5G 0x00200000 /* 5G ext PAs are ctrl-ed by analog PA ctrl lines */ - /* Boardflags3 */ #define BHND_BFL3_FEMCTRL_SUB 0x00000007 /* acphy, subrevs of femctrl on top of srom_femctrl */ #define BHND_BFL3_RCAL_WAR 0x00000008 /* acphy, rcal war active on this board (4335a0) */ @@ -680,7 +665,6 @@ #define BHND_BFL3_EN_NONBRCM_TXBF 0x10000000 /* acphy, enable non-brcm TXBF */ #define BHND_BFL3_EN_P2PLINK_TXBF 0x20000000 /* acphy, enable TXBF in p2p links */ - /* board specific GPIO assignment, gpio 0-3 are also customer-configurable led */ #define BHND_GPIO_BOARD_BTC3W_IN 0x850 /* bit 4 is RF_ACTIVE, bit 6 is STATUS, bit 11 is PRI */ #define BHND_GPIO_BOARD_BTC3W_OUT 0x020 /* bit 5 is TX_CONF */ @@ -730,7 +714,6 @@ #define BHND_BOARD_BU2050 0x041f - #define BHND_BOARD_BCM94309G 0x0421 #define BHND_BOARD_BU4704 0x0423 @@ -738,7 +721,6 @@ #define BHND_BOARD_BCM94306PC 0x0425 /* pcmcia 3.3v 4306 card */ - #define BHND_BOARD_BCM94702MN 0x0428 /* BCM4702 1U CompactPCI Board */ @@ -761,8 +743,6 @@ /* 11a-only minipci */ #define BHND_BOARD_BCM94308MP 0x0430 - - #define BHND_BOARD_BU4712 0x0444 #define BHND_BOARD_BU4712SD 0x045d Modified: head/sys/dev/bhnd/bhnd_match.h ============================================================================== --- head/sys/dev/bhnd/bhnd_match.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd_match.h Tue Sep 1 21:43:05 2020 (r365123) @@ -50,7 +50,7 @@ struct bhnd_hwrev_match { #define _BHND_COPY_MATCH_FIELD(_src, _name) \ .m.match._name = (_src)->m.match._name, \ ._name = (_src)->_name - + /* Set match field @p _name with @p _value */ #define _BHND_SET_MATCH_FIELD(_name, _value) \ .m.match._name = 1, ._name = _value @@ -112,7 +112,7 @@ struct bhnd_core_match { flags_unused:2; } match; } m; - + uint16_t core_vendor; /**< required JEP106 device vendor */ uint16_t core_id; /**< required core ID */ struct bhnd_hwrev_match core_rev; /**< matching core revisions. */ @@ -261,7 +261,6 @@ struct bhnd_board_match { #define BHND_MATCH_BOARD(_vend, _type) \ BHND_MATCH_BOARD_VENDOR(_vend), BHND_MATCH_BOARD_TYPE(_type) - /** * A bhnd(4) device match descriptor. * @@ -292,7 +291,7 @@ struct bhnd_device_match { flags_unused:15; } match; } m; - + uint16_t core_vendor; /**< required JEP106 device vendor */ uint16_t core_id; /**< required core ID */ struct bhnd_hwrev_match core_rev; /**< matching core revisions. */ Modified: head/sys/dev/bhnd/bhnd_private.h ============================================================================== --- head/sys/dev/bhnd/bhnd_private.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd_private.h Tue Sep 1 21:43:05 2020 (r365123) @@ -96,7 +96,7 @@ struct bhnd_core_clkctl { #define BHND_CLKCTL_WRITE_4(_clkctl, _val) \ bhnd_bus_write_4((_clkctl)->cc_res, (_clkctl)->cc_res_offset, (_val)) - + #define BHND_CLKCTL_SET_4(_clkctl, _val, _mask) \ BHND_CLKCTL_WRITE_4((_clkctl), \ ((_val) & (_mask)) | (BHND_CLKCTL_READ_4(_clkctl) & ~(_mask))) Modified: head/sys/dev/bhnd/bhnd_subr.c ============================================================================== --- head/sys/dev/bhnd/bhnd_subr.c Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd_subr.c Tue Sep 1 21:43:05 2020 (r365123) @@ -169,7 +169,6 @@ static const struct bhnd_core_desc { "PL368 Device Management Interface" }, { BHND_MFGID_ARM, BHND_PRIMEID_MWRAP, BHND_DEVCLASS_OTHER, "PL369 Device Management Interface" }, - { 0, 0, 0, NULL } }; @@ -276,7 +275,7 @@ bhnd_find_core_desc(uint16_t vendor, uint16_t device) return (&bhnd_core_descs[i]); } - + return (NULL); } @@ -290,7 +289,7 @@ const char * bhnd_find_core_name(uint16_t vendor, uint16_t device) { const struct bhnd_core_desc *desc; - + if ((desc = bhnd_find_core_desc(vendor, device)) == NULL) return ("unknown"); @@ -307,7 +306,7 @@ bhnd_devclass_t bhnd_find_core_class(uint16_t vendor, uint16_t device) { const struct bhnd_core_desc *desc; - + if ((desc = bhnd_find_core_desc(vendor, device)) == NULL) return (BHND_DEVCLASS_OTHER); @@ -654,7 +653,6 @@ bhnd_match_core(const struct bhnd_core_info *cores, u_ return (NULL); } - /** * Find the first core in @p cores with the given @p class. * @@ -676,7 +674,6 @@ bhnd_find_core(const struct bhnd_core_info *cores, u_i return bhnd_match_core(cores, num_cores, &md); } - /** * Create an equality match descriptor for @p core. * @@ -697,7 +694,6 @@ bhnd_core_get_match_desc(const struct bhnd_core_info * }); } - /** * Return true if the @p lhs is equal to @p rhs. * @@ -942,7 +938,7 @@ bhnd_device_lookup(device_t dev, const struct bhnd_dev /* hostb implies BHND_ATTACH_ADAPTER requirement */ if (dflags & BHND_DF_HOSTB) dflags |= BHND_DF_ADAPTER; - + if (dflags & BHND_DF_ADAPTER) if (attach_type != BHND_ATTACH_ADAPTER) continue; @@ -999,7 +995,6 @@ bhnd_device_quirks(device_t dev, const struct bhnd_dev return (quirks); } - /** * Allocate bhnd(4) resources defined in @p rs from a parent bus. * @@ -1444,7 +1439,6 @@ bhnd_nvram_getvar_int32(device_t dev, const char *name return (bhnd_nvram_getvar_int(dev, name, value, sizeof(*value))); } - /** * Read an NVRAM variable's array value. * @@ -1799,7 +1793,6 @@ bhnd_set_default_core_desc(device_t dev) bhnd_set_custom_core_desc(dev, bhnd_get_device_name(dev)); } - /** * Using the bhnd @p chip_id, populate the bhnd(4) bus @p dev's device * description. @@ -1843,7 +1836,7 @@ bhnd_set_default_bus_desc(device_t dev, const struct b } else { device_set_desc(dev, bus_name); } - + } /** @@ -2236,7 +2229,7 @@ bhnd_bus_generic_alloc_resource(device_t dev, device_t br = malloc(sizeof(struct bhnd_resource), M_BHND, M_NOWAIT); if (br == NULL) goto failed; - + br->direct = false; br->res = res; @@ -2248,7 +2241,7 @@ bhnd_bus_generic_alloc_resource(device_t dev, device_t } return (br); - + failed: if (res != NULL) BUS_RELEASE_RESOURCE(dev, child, type, *rid, res); @@ -2275,7 +2268,6 @@ bhnd_bus_generic_release_resource(device_t dev, device free(r, M_BHND); return (0); } - /** * Helper function for implementing BHND_BUS_ACTIVATE_RESOURCE(). Modified: head/sys/dev/bhnd/bhnd_types.h ============================================================================== --- head/sys/dev/bhnd/bhnd_types.h Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhnd_types.h Tue Sep 1 21:43:05 2020 (r365123) @@ -122,14 +122,14 @@ typedef enum { * acceptable. */ BHND_CLOCK_ILP = (1 << 1), - + /** * Active Low-Power (ALP). * * Low-latency register access and low-rate DMA. */ BHND_CLOCK_ALP = (1 << 2), - + /** * High Throughput (HT). * @@ -183,6 +183,5 @@ typedef uint64_t bhnd_addr_t; /** BHND bus size. */ typedef uint64_t bhnd_size_t; #define BHND_SIZE_MAX UINT64_MAX /**< Maximum bhnd_size_t value */ - #endif /* _BHND_BHND_TYPES_H_ */ Modified: head/sys/dev/bhnd/bhndb/bhnd_bhndb.c ============================================================================== --- head/sys/dev/bhnd/bhndb/bhnd_bhndb.c Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhndb/bhnd_bhndb.c Tue Sep 1 21:43:05 2020 (r365123) @@ -72,7 +72,6 @@ bhnd_bhndb_get_attach_type(device_t dev, device_t chil return (BHND_ATTACH_ADAPTER); } - static bool bhnd_bhndb_is_hw_disabled(device_t dev, device_t child) { @@ -81,7 +80,6 @@ bhnd_bhndb_is_hw_disabled(device_t dev, device_t child /* Delegate to parent bridge */ return (BHNDB_IS_CORE_DISABLED(device_get_parent(dev), dev, &core)); } - static device_t bhnd_bhndb_find_hostb_device(device_t dev) Modified: head/sys/dev/bhnd/bhndb/bhndb.c ============================================================================== --- head/sys/dev/bhnd/bhndb/bhndb.c Tue Sep 1 21:42:49 2020 (r365122) +++ head/sys/dev/bhnd/bhndb/bhndb.c Tue Sep 1 21:43:05 2020 (r365123) @@ -451,7 +451,7 @@ bhndb_init_region_cfg(struct bhndb_softc *sc, bhnd_ero direct_msg = prio >= prio_min ? "direct" : "indirect"; type_msg = region->static_regwin ? "static" : "dynamic"; - + device_printf(sc->dev, "region 0x%llx+0x%llx priority " "%u %s/%s", (unsigned long long) region->addr, @@ -649,7 +649,7 @@ bhndb_generic_detach(device_t dev) /* Clean up our driver state. */ bhndb_free_resources(sc->bus_res); - + BHNDB_LOCK_DESTROY(sc); return (0); @@ -690,7 +690,7 @@ bhndb_generic_resume(device_t dev) error = 0; for (size_t i = 0; i < bus_res->dwa_count; i++) { dwa = &bus_res->dw_alloc[i]; - + /* Skip regions that were not previously used */ if (bhndb_dw_is_free(bus_res, dwa) && dwa->target == 0x0) continue; @@ -858,7 +858,7 @@ bhndb_add_child(device_t dev, u_int order, const char { struct bhndb_devinfo *dinfo; device_t child; - + child = device_add_child_ordered(dev, order, name, unit); if (child == NULL) return (NULL); @@ -1016,7 +1016,7 @@ bhndb_alloc_resource(device_t dev, device_t child, int child); if (rv == NULL) return (NULL); - + rman_set_rid(rv, *rid); /* Activate */ @@ -1099,7 +1099,7 @@ bhndb_adjust_resource(device_t dev, device_t child, in struct rman *rm; rman_res_t mstart, mend; int error; - + sc = device_get_softc(dev); error = 0; @@ -1219,7 +1219,7 @@ bhndb_activate_static_region(struct bhndb_softc *sc, bridge_res = bhndb_host_resource_for_regwin(sc->bus_res->res, win); if (bridge_res == NULL) return (ENXIO); - + /* Calculate subregion offset within the parent resource */ parent_offset = r_start - region->addr; parent_offset += win->win_offset; @@ -1340,7 +1340,7 @@ bhndb_try_activate_resource(struct bhndb_softc *sc, de /* Only MMIO resources can be mapped via register windows */ KASSERT(type == SYS_RES_MEMORY, ("invalid type: %d", type)); - + r_start = rman_get_start(r); r_size = rman_get_size(r); @@ -1537,7 +1537,7 @@ bhndb_activate_bhnd_resource(device_t dev, device_t ch KASSERT(!r->direct, ("direct flag set on inactive resource")); - + KASSERT(!(rman_get_flags(r->res) & RF_ACTIVE), ("RF_ACTIVE set on inactive resource")); @@ -1769,7 +1769,7 @@ bhndb_io_resource(struct bhndb_softc *sc, bus_addr_t a (unsigned long long) addr, (unsigned long long) addr+size-1); } - + error = bhndb_dw_set_addr(sc->dev, sc->bus_res, dwa, addr, size); if (error) { @@ -2161,7 +2161,7 @@ bhndb_get_dma_translation(device_t dev, device_t child masked = (dwin->addr_mask | dwin->addrext_mask) & addr_mask; if (masked == 0) continue; - + /* Is this a better match? */ if (match == NULL || masked > match_addr_mask) { match = dwin; @@ -2264,7 +2264,7 @@ static device_method_t bhndb_methods[] = { DEVMETHOD(bhnd_bus_deregister_provider, bhnd_bus_generic_sr_deregister_provider), *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:43:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 651EB37B45E; Tue, 1 Sep 2020 21:43:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0tj21g2z4RSB; Tue, 1 Sep 2020 21:43:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1749A200B8; Tue, 1 Sep 2020 21:43:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LhOSc039521; Tue, 1 Sep 2020 21:43:24 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LhOxi039518; Tue, 1 Sep 2020 21:43:24 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012143.081LhOxi039518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:43:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365124 - head/sys/dev/bnxt X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/bnxt X-SVN-Commit-Revision: 365124 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:43:25 -0000 Author: mjg Date: Tue Sep 1 21:43:23 2020 New Revision: 365124 URL: https://svnweb.freebsd.org/changeset/base/365124 Log: bnxt: clean up empty lines in .c and .h files Modified: head/sys/dev/bnxt/bnxt.h head/sys/dev/bnxt/bnxt_hwrm.c head/sys/dev/bnxt/bnxt_sysctl.c head/sys/dev/bnxt/if_bnxt.c Modified: head/sys/dev/bnxt/bnxt.h ============================================================================== --- head/sys/dev/bnxt/bnxt.h Tue Sep 1 21:43:05 2020 (r365123) +++ head/sys/dev/bnxt/bnxt.h Tue Sep 1 21:43:23 2020 (r365124) @@ -413,7 +413,6 @@ struct bnxt_vf_info { bus_addr_t hwrm_cmd_req_dma_addr; }; - #define BNXT_PF(softc) (!((softc)->flags & BNXT_FLAG_VF)) #define BNXT_VF(softc) ((softc)->flags & BNXT_FLAG_VF) Modified: head/sys/dev/bnxt/bnxt_hwrm.c ============================================================================== --- head/sys/dev/bnxt/bnxt_hwrm.c Tue Sep 1 21:43:05 2020 (r365123) +++ head/sys/dev/bnxt/bnxt_hwrm.c Tue Sep 1 21:43:23 2020 (r365124) @@ -263,7 +263,6 @@ qportcfg_exit: return (rc); } - int bnxt_hwrm_ver_get(struct bnxt_softc *softc) { @@ -377,7 +376,6 @@ bnxt_hwrm_func_drv_rgtr(struct bnxt_softc *softc) return hwrm_send_message(softc, &req, sizeof(req)); } - int bnxt_hwrm_func_drv_unrgtr(struct bnxt_softc *softc, bool shutdown) { @@ -390,7 +388,6 @@ bnxt_hwrm_func_drv_unrgtr(struct bnxt_softc *softc, bo return hwrm_send_message(softc, &req, sizeof(req)); } - static inline int _is_valid_ether_addr(uint8_t *addr) { @@ -529,7 +526,6 @@ bnxt_hwrm_set_link_common(struct bnxt_softc *softc, req->flags |= htole32(HWRM_PORT_PHY_CFG_INPUT_FLAGS_RESET_PHY); } - static void bnxt_hwrm_set_pause_common(struct bnxt_softc *softc, struct hwrm_port_phy_cfg_input *req) @@ -559,7 +555,6 @@ bnxt_hwrm_set_pause_common(struct bnxt_softc *softc, } } - /* JFV this needs interface connection */ static void bnxt_hwrm_set_eee(struct bnxt_softc *softc, struct hwrm_port_phy_cfg_input *req) @@ -586,7 +581,6 @@ bnxt_hwrm_set_eee(struct bnxt_softc *softc, struct hwr } } - int bnxt_hwrm_set_link_setting(struct bnxt_softc *softc, bool set_pause, bool set_eee, bool set_link) @@ -598,7 +592,7 @@ bnxt_hwrm_set_link_setting(struct bnxt_softc *softc, b return ENOTSUP; bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_PORT_PHY_CFG); - + if (set_pause) { bnxt_hwrm_set_pause_common(softc, &req); @@ -608,10 +602,10 @@ bnxt_hwrm_set_link_setting(struct bnxt_softc *softc, b if (set_link) bnxt_hwrm_set_link_common(softc, &req); - + if (set_eee) bnxt_hwrm_set_eee(softc, &req); - + BNXT_HWRM_LOCK(softc); rc = _hwrm_send_message(softc, &req, sizeof(req)); @@ -905,7 +899,6 @@ bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt_softc *softc, return hwrm_send_message(softc, &req, sizeof(req)); } - int bnxt_hwrm_set_filter(struct bnxt_softc *softc, struct bnxt_vnic_info *vnic) { @@ -966,7 +959,7 @@ int bnxt_cfg_async_cr(struct bnxt_softc *softc) { int rc = 0; - + if (BNXT_PF(softc)) { struct hwrm_func_cfg_input req = {0}; @@ -1569,7 +1562,7 @@ bnxt_hwrm_port_phy_qcfg(struct bnxt_softc *softc) * 3. When the auto_mode is set to none and this flag is set to 1, * auto_pause bits should be ignored and should be set to 0. */ - + link_info->flow_ctrl.autoneg = false; link_info->flow_ctrl.tx = false; link_info->flow_ctrl.rx = false; @@ -1697,7 +1690,6 @@ static void bnxt_hwrm_set_coal_params(struct bnxt_soft req->num_cmpl_aggr_int = htole16((uint16_t)max_frames * 4); } - int bnxt_hwrm_set_coal(struct bnxt_softc *softc) { int i, rc = 0; @@ -1749,7 +1741,6 @@ int bnxt_hwrm_set_coal(struct bnxt_softc *softc) buf_tmr_irq << 16 | buf_tmr, flags, &req_tx); for (i = 0; i < softc->nrxqsets; i++) { - req = &req_rx; /* @@ -1767,8 +1758,6 @@ int bnxt_hwrm_set_coal(struct bnxt_softc *softc) } return rc; } - - int bnxt_hwrm_func_rgtr_async_events(struct bnxt_softc *softc, unsigned long *bmap, int bmap_size) Modified: head/sys/dev/bnxt/bnxt_sysctl.c ============================================================================== --- head/sys/dev/bnxt/bnxt_sysctl.c Tue Sep 1 21:43:05 2020 (r365123) +++ head/sys/dev/bnxt/bnxt_sysctl.c Tue Sep 1 21:43:23 2020 (r365124) @@ -173,7 +173,6 @@ bnxt_create_tx_sysctls(struct bnxt_softc *softc, int t if (!oid) return ENOMEM; - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "ucast_pkts", CTLFLAG_RD, &tx_stats[txr].tx_ucast_pkts, "unicast packets sent"); @@ -651,7 +650,6 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *soft return 0; } - int bnxt_create_rx_sysctls(struct bnxt_softc *softc, int rxr) { @@ -1362,7 +1360,7 @@ bnxt_create_hw_lro_sysctls(struct bnxt_softc *softc) softc, 0, bnxt_hw_lro_set_max_agg_segs, "A", "Set Max Agg Seg Value (unit is Log2): " "0 (= 1 seg) / 1 (= 2 segs) / ... / 31 (= 2^31 segs)"); - + SYSCTL_ADD_PROC(&softc->hw_lro_ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "max_aggs", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NEEDGIANT, softc, 0, bnxt_hw_lro_set_max_aggs, "A", Modified: head/sys/dev/bnxt/if_bnxt.c ============================================================================== --- head/sys/dev/bnxt/if_bnxt.c Tue Sep 1 21:43:05 2020 (r365123) +++ head/sys/dev/bnxt/if_bnxt.c Tue Sep 1 21:43:23 2020 (r365124) @@ -713,7 +713,6 @@ bnxt_attach_pre(if_ctx_t ctx) if (rc) goto dma_fail; - /* Get firmware version and compare with driver */ softc->ver_info = malloc(sizeof(struct bnxt_ver_info), M_DEVBUF, M_NOWAIT | M_ZERO); @@ -1094,7 +1093,6 @@ bnxt_init(if_ctx_t ctx) rc = bnxt_hwrm_ring_grp_alloc(softc, &softc->grp_info[i]); if (rc) goto fail; - } /* Allocate the VNIC RSS context */ @@ -1250,7 +1248,6 @@ bnxt_media_status(if_ctx_t ctx, struct ifmediareq * if uint64_t target_baudrate = bnxt_get_baudrate(link_info); int active_media = IFM_UNKNOWN; - bnxt_update_link(softc, true); ifmr->ifm_status = IFM_AVALID; @@ -1655,7 +1652,6 @@ bnxt_priv_ioctl(if_ctx_t ctx, u_long command, caddr_t int rc = ENOTSUP; struct bnxt_ioctl_data iod_storage, *iod = &iod_storage; - switch (command) { case SIOCGPRIVATE_0: if ((rc = priv_check(curthread, PRIV_DRIVER)) != 0) @@ -2086,7 +2082,7 @@ bnxt_add_media_types(struct bnxt_softc *softc) BNXT_IFMEDIA_ADD(supported, SPEEDS_100MB, IFM_100_T); BNXT_IFMEDIA_ADD(supported, SPEEDS_10MB, IFM_10_T); break; - + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX: BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_KR); BNXT_IFMEDIA_ADD(supported, SPEEDS_2_5GB, IFM_2500_KX); From owner-svn-src-all@freebsd.org Tue Sep 1 21:43:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7DD2C37B7DA; Tue, 1 Sep 2020 21:43:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0ty2r1xz4RNf; Tue, 1 Sep 2020 21:43:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31BA620224; Tue, 1 Sep 2020 21:43:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LhcUE039582; Tue, 1 Sep 2020 21:43:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LhaSL039576; Tue, 1 Sep 2020 21:43:36 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012143.081LhaSL039576@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:43:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365125 - head/sys/dev/bwi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/bwi X-SVN-Commit-Revision: 365125 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:43:38 -0000 Author: mjg Date: Tue Sep 1 21:43:36 2020 New Revision: 365125 URL: https://svnweb.freebsd.org/changeset/base/365125 Log: bwi: clean up empty lines in .c and .h files Modified: head/sys/dev/bwi/bwimac.c head/sys/dev/bwi/bwiphy.c head/sys/dev/bwi/bwirf.c head/sys/dev/bwi/if_bwi.c head/sys/dev/bwi/if_bwi_pci.c head/sys/dev/bwi/if_bwireg.h Modified: head/sys/dev/bwi/bwimac.c ============================================================================== --- head/sys/dev/bwi/bwimac.c Tue Sep 1 21:43:23 2020 (r365124) +++ head/sys/dev/bwi/bwimac.c Tue Sep 1 21:43:36 2020 (r365125) @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include - + #include #include #include Modified: head/sys/dev/bwi/bwiphy.c ============================================================================== --- head/sys/dev/bwi/bwiphy.c Tue Sep 1 21:43:23 2020 (r365124) +++ head/sys/dev/bwi/bwiphy.c Tue Sep 1 21:43:36 2020 (r365125) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - + #include #include #include @@ -88,7 +88,6 @@ static void bwi_phy_config_agc(struct bwi_mac *); static void bwi_tbl_write_2(struct bwi_mac *mac, uint16_t, uint16_t); static void bwi_tbl_write_4(struct bwi_mac *mac, uint16_t, uint32_t); - #define SUP_BPHY(num) { .rev = num, .init = bwi_phy_init_11b_rev##num } static const struct { Modified: head/sys/dev/bwi/bwirf.c ============================================================================== --- head/sys/dev/bwi/bwirf.c Tue Sep 1 21:43:23 2020 (r365124) +++ head/sys/dev/bwi/bwirf.c Tue Sep 1 21:43:36 2020 (r365125) @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - + #include #include #include Modified: head/sys/dev/bwi/if_bwi.c ============================================================================== --- head/sys/dev/bwi/if_bwi.c Tue Sep 1 21:43:23 2020 (r365124) +++ head/sys/dev/bwi/if_bwi.c Tue Sep 1 21:43:36 2020 (r365125) @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - + #include #include #include Modified: head/sys/dev/bwi/if_bwi_pci.c ============================================================================== --- head/sys/dev/bwi/if_bwi_pci.c Tue Sep 1 21:43:23 2020 (r365124) +++ head/sys/dev/bwi/if_bwi_pci.c Tue Sep 1 21:43:36 2020 (r365125) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include - + #include #include #include @@ -246,7 +246,6 @@ static device_method_t bwi_pci_methods[] = { DEVMETHOD(device_shutdown, bwi_pci_shutdown), DEVMETHOD(device_suspend, bwi_pci_suspend), DEVMETHOD(device_resume, bwi_pci_resume), - { 0,0 } }; static driver_t bwi_driver = { Modified: head/sys/dev/bwi/if_bwireg.h ============================================================================== --- head/sys/dev/bwi/if_bwireg.h Tue Sep 1 21:43:23 2020 (r365124) +++ head/sys/dev/bwi/if_bwireg.h Tue Sep 1 21:43:36 2020 (r365125) @@ -77,7 +77,6 @@ #define BWI_CONF_LO_REQTO_MASK __BITS(6, 4) /* request timeout */ #define BWI_CONF_LO_REQTO 3 - #define BWI_ID_LO 0xff8 #define BWI_ID_LO_BUSREV_MASK __BITS(31, 28) /* Bus revision */ From owner-svn-src-all@freebsd.org Tue Sep 1 21:43:50 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C779D37B47A; Tue, 1 Sep 2020 21:43:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0vB4NZtz4RcH; Tue, 1 Sep 2020 21:43:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 531E0200B9; Tue, 1 Sep 2020 21:43:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LhopX039639; Tue, 1 Sep 2020 21:43:50 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lhn7s039634; Tue, 1 Sep 2020 21:43:49 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012143.081Lhn7s039634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:43:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365126 - head/sys/dev/bwn X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/bwn X-SVN-Commit-Revision: 365126 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:43:50 -0000 Author: mjg Date: Tue Sep 1 21:43:48 2020 New Revision: 365126 URL: https://svnweb.freebsd.org/changeset/base/365126 Log: bwn: clean up empty lines in .c and .h files Modified: head/sys/dev/bwn/if_bwn.c head/sys/dev/bwn/if_bwn_pci.c head/sys/dev/bwn/if_bwn_pcivar.h head/sys/dev/bwn/if_bwn_phy_g.c head/sys/dev/bwn/if_bwnvar.h Modified: head/sys/dev/bwn/if_bwn.c ============================================================================== --- head/sys/dev/bwn/if_bwn.c Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwn.c Tue Sep 1 21:43:48 2020 (r365126) @@ -580,7 +580,7 @@ bwn_attach(device_t dev) device_printf(sc->sc_dev, "couldn't allocate registers\n"); return (error); } - + if ((error = bhnd_alloc_pmu(sc->sc_dev))) { bus_release_resource(sc->sc_dev, SYS_RES_MEMORY, sc->sc_mem_rid, sc->sc_mem_res); @@ -685,7 +685,7 @@ fail: free(mac, M_DEVBUF); bhnd_release_pmu(dev); bwn_release_bus_providers(sc); - + if (sc->sc_mem_res != NULL) { bus_release_resource(sc->sc_dev, SYS_RES_MEMORY, sc->sc_mem_rid, sc->sc_mem_res); @@ -1307,7 +1307,6 @@ bwn_attach_core(struct bwn_mac *mac) have_bg = 1; have_a = 1; } - #if 0 device_printf(sc->sc_dev, "%s: iost=0x%04hx, have_a=%d, have_bg=%d," @@ -3041,7 +3040,7 @@ bwn_dma_32_setdesc(struct bwn_dma_ring *dr, struct bhnd_dma_translation *dt; uint32_t addr, addrext, ctl; int slot; - + descbase = dr->dr_ring_descbase; dma = &dr->dr_mac->mac_method.dma; dt = &dma->translation; @@ -3137,8 +3136,7 @@ bwn_dma_64_setdesc(struct bwn_dma_ring *dr, uint32_t addrext; uint32_t ctl0, ctl1; int slot; - - + descbase = dr->dr_ring_descbase; dma = &dr->dr_mac->mac_method.dma; dt = &dma->translation; @@ -3686,7 +3684,6 @@ bwn_gpio_control(struct bwn_mac *mac, uint32_t pins) return (0); } - static int bwn_gpio_init(struct bwn_mac *mac) { @@ -4527,7 +4524,6 @@ bwn_fwinitvals_write(struct bwn_mac *mac, const struct BWN_WRITE_4(mac, offset, be32toh(iv->data.d32)); iv = GET_NEXTIV32(iv); } else { - if (array_size < sizeof(iv->data.d16)) goto fail; array_size -= sizeof(iv->data.d16); @@ -6008,7 +6004,6 @@ bwn_rxeof(struct bwn_mac *mac, struct mbuf *m, const v break; } - phytype = chanstat & BWN_RX_CHAN_PHYTYPE; if (macstat & BWN_RX_MAC_FCSERR) @@ -7171,7 +7166,6 @@ bwn_dma_attach(struct bwn_mac *mac) mac->mac_dmatype); return (ENXIO); } - /* Fetch our device->host DMA translation and tag */ error = bhnd_get_dma_translation(sc->sc_dev, addr_width, 0, &dmat, Modified: head/sys/dev/bwn/if_bwn_pci.c ============================================================================== --- head/sys/dev/bwn/if_bwn_pci.c Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwn_pci.c Tue Sep 1 21:43:48 2020 (r365126) @@ -90,7 +90,6 @@ static const struct bwn_pci_device siba_devices[] = { BWN_QUIRK_UNTESTED), BWN_BCM_DEV(BCM4328_D11G, "BCM4328/4312 802.11g", 0), - { 0, 0, NULL, 0 } }; @@ -102,7 +101,6 @@ static const struct bwn_pci_device bcma_devices[] = { BWN_BCM_DEV(BCM43224_D11N, "BCM43224 802.11n Dual-Band", 0), BWN_BCM_DEV(BCM43224_D11N_ID_VEN1, "BCM43224 802.11n Dual-Band",0), BWN_BCM_DEV(BCM43225_D11N2G, "BCM43225 802.11n 2GHz", 0), - { 0, 0, NULL, 0} }; Modified: head/sys/dev/bwn/if_bwn_pcivar.h ============================================================================== --- head/sys/dev/bwn/if_bwn_pcivar.h Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwn_pcivar.h Tue Sep 1 21:43:48 2020 (r365126) @@ -91,7 +91,6 @@ struct bwn_pci_device { uint32_t quirks; }; - #define BWN_BCM_DEV(_devid, _desc, _quirks) \ { PCI_VENDOR_BROADCOM, PCI_DEVID_ ## _devid, \ "Broadcom " _desc " Wireless", _quirks } Modified: head/sys/dev/bwn/if_bwn_phy_g.c ============================================================================== --- head/sys/dev/bwn/if_bwn_phy_g.c Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwn_phy_g.c Tue Sep 1 21:43:48 2020 (r365126) @@ -1689,7 +1689,6 @@ bwn_wa_grev1(struct bwn_mac *mac) bwn_ofdmtab_write_2(mac, BWN_OFDMTAB_AGC2, i, bwn_tab_noise_g2[i]); - for (i = 0; i < N(bwn_tab_rotor); i++) bwn_ofdmtab_write_4(mac, BWN_OFDMTAB_ROTOR, i, bwn_tab_rotor[i]); Modified: head/sys/dev/bwn/if_bwnvar.h ============================================================================== --- head/sys/dev/bwn/if_bwnvar.h Tue Sep 1 21:43:36 2020 (r365125) +++ head/sys/dev/bwn/if_bwnvar.h Tue Sep 1 21:43:48 2020 (r365126) @@ -161,7 +161,6 @@ struct bwn_mac; #define BWN_DMA_WRITE(dr, offset, value) \ (BWN_WRITE_4(dr->dr_mac, dr->dr_base + offset, value)) - typedef enum { BWN_PHY_BAND_2G = 0, BWN_PHY_BAND_5G_LO = 1, From owner-svn-src-all@freebsd.org Tue Sep 1 21:44:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DC7F337B851; Tue, 1 Sep 2020 21:44:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0wC5YNgz4Rx1; Tue, 1 Sep 2020 21:44:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1CC5200BA; Tue, 1 Sep 2020 21:44:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LihSd039764; Tue, 1 Sep 2020 21:44:43 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LihwL039762; Tue, 1 Sep 2020 21:44:43 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012144.081LihwL039762@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:44:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365127 - head/sys/dev/xilinx X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/xilinx X-SVN-Commit-Revision: 365127 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:44:43 -0000 Author: mjg Date: Tue Sep 1 21:44:42 2020 New Revision: 365127 URL: https://svnweb.freebsd.org/changeset/base/365127 Log: xilinx: clean up empty lines in .c and .h files Modified: head/sys/dev/xilinx/if_xae.c head/sys/dev/xilinx/xlnx_pcib.c Modified: head/sys/dev/xilinx/if_xae.c ============================================================================== --- head/sys/dev/xilinx/if_xae.c Tue Sep 1 21:43:48 2020 (r365126) +++ head/sys/dev/xilinx/if_xae.c Tue Sep 1 21:44:42 2020 (r365127) @@ -1143,7 +1143,6 @@ static device_method_t xae_methods[] = { DEVMETHOD(miibus_readreg, xae_miibus_read_reg), DEVMETHOD(miibus_writereg, xae_miibus_write_reg), DEVMETHOD(miibus_statchg, xae_miibus_statchg), - { 0, 0 } }; Modified: head/sys/dev/xilinx/xlnx_pcib.c ============================================================================== --- head/sys/dev/xilinx/xlnx_pcib.c Tue Sep 1 21:43:48 2020 (r365126) +++ head/sys/dev/xilinx/xlnx_pcib.c Tue Sep 1 21:44:42 2020 (r365127) @@ -596,7 +596,6 @@ xlnx_pcib_msi_alloc_msi(device_t dev, device_t child, found = false; for (irq = 0; (irq + count - 1) < XLNX_PCIB_MAX_MSI; irq++) { - /* Assume the range is valid. */ found = true; From owner-svn-src-all@freebsd.org Tue Sep 1 21:45:11 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C456A37B921; Tue, 1 Sep 2020 21:45:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0wl59GVz4Rxw; Tue, 1 Sep 2020 21:45:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9496020225; Tue, 1 Sep 2020 21:45:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LjBj2039853; Tue, 1 Sep 2020 21:45:11 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lj8mv039837; Tue, 1 Sep 2020 21:45:08 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012145.081Lj8mv039837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:45:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365128 - in head/sys/dev/xen: balloon blkback blkfront control gntdev grant_table netback netfront pcifront xenpci xenstore X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/xen: balloon blkback blkfront control gntdev grant_table netback netfront pcifront xenpci xenstore X-SVN-Commit-Revision: 365128 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:45:11 -0000 Author: mjg Date: Tue Sep 1 21:45:08 2020 New Revision: 365128 URL: https://svnweb.freebsd.org/changeset/base/365128 Log: dev/xen: clean up empty lines in .c and .h files Modified: head/sys/dev/xen/balloon/balloon.c head/sys/dev/xen/blkback/blkback.c head/sys/dev/xen/blkfront/blkfront.c head/sys/dev/xen/control/control.c head/sys/dev/xen/gntdev/gntdev.c head/sys/dev/xen/grant_table/grant_table.c head/sys/dev/xen/netback/netback.c head/sys/dev/xen/netback/netback_unit_tests.c head/sys/dev/xen/netfront/netfront.c head/sys/dev/xen/pcifront/pcifront.c head/sys/dev/xen/xenpci/xenpci.c head/sys/dev/xen/xenstore/xenstore.c head/sys/dev/xen/xenstore/xenstore_dev.c head/sys/dev/xen/xenstore/xenstored_dev.c Modified: head/sys/dev/xen/balloon/balloon.c ============================================================================== --- head/sys/dev/xen/balloon/balloon.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/balloon/balloon.c Tue Sep 1 21:45:08 2020 (r365128) @@ -274,7 +274,7 @@ balloon_process(void *unused) { int need_sleep = 0; long credit; - + mtx_lock(&balloon_mutex); for (;;) { int sleep_time; Modified: head/sys/dev/xen/blkback/blkback.c ============================================================================== --- head/sys/dev/xen/blkback/blkback.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/blkback/blkback.c Tue Sep 1 21:45:08 2020 (r365128) @@ -256,7 +256,6 @@ struct xbb_xen_reqlist { */ uint64_t gnt_base; - #ifdef XBB_USE_BOUNCE_BUFFERS /** * Pre-allocated domain local memory used to proxy remote @@ -545,7 +544,6 @@ typedef int (*xbb_dispatch_t)(struct xbb_softc *xbb, * Per-instance configuration data. */ struct xbb_softc { - /** * Task-queue used to process I/O requests. */ @@ -1029,7 +1027,6 @@ xbb_get_kva(struct xbb_softc *xbb, int nr_pages) * to satisfy the request. */ if (++num_clear == nr_pages) { - bit_nset(xbb->kva_free, first_clear, first_clear + nr_pages - 1); @@ -1093,7 +1090,6 @@ xbb_unmap_reqlist(struct xbb_xen_reqlist *reqlist) invcount = 0; for (i = 0; i < reqlist->nr_segments; i++) { - if (reqlist->gnt_handles[i] == GRANT_REF_INVALID) continue; @@ -1127,7 +1123,6 @@ xbb_get_reqlist(struct xbb_softc *xbb) mtx_assert(&xbb->lock, MA_OWNED); if ((reqlist = STAILQ_FIRST(&xbb->reqlist_free_stailq)) != NULL) { - STAILQ_REMOVE_HEAD(&xbb->reqlist_free_stailq, links); reqlist->flags = XBB_REQLIST_NONE; reqlist->kva = NULL; @@ -1366,7 +1361,6 @@ xbb_push_responses(struct xbb_softc *xbb, int *run_tas RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&xbb->rings.common, *notify); if (xbb->rings.common.rsp_prod_pvt == xbb->rings.common.req_cons) { - /* * Tail check for pending requests. Allows frontend to avoid * notifications if requests are already in flight (lower @@ -1374,7 +1368,6 @@ xbb_push_responses(struct xbb_softc *xbb, int *run_tas */ RING_FINAL_CHECK_FOR_REQUESTS(&xbb->rings.common, more_to_do); } else if (RING_HAS_UNCONSUMED_REQUESTS(&xbb->rings.common)) { - more_to_do = 1; } @@ -1505,7 +1498,6 @@ xbb_bio_done(struct bio *bio) if (bio->bio_error == ENXIO && xenbus_get_state(xbb->dev) == XenbusStateConnected) { - /* * Backend device has disappeared. Signal the * front-end that we (the device proxy) want to @@ -1744,7 +1736,6 @@ xbb_dispatch_io(struct xbb_softc *xbb, struct xbb_xen_ for (seg_idx = 0, map = xbb->maps; seg_idx < reqlist->nr_segments; seg_idx++, map++){ - if (__predict_false(map->status != 0)) { DPRINTF("invalid buffer -- could not remap " "it (%d)\n", map->status); @@ -1760,7 +1751,6 @@ xbb_dispatch_io(struct xbb_softc *xbb, struct xbb_xen_ } if (reqlist->starting_sector_number + total_sects > xbb->media_num_sectors) { - DPRINTF("%s of [%" PRIu64 ",%" PRIu64 "] " "extends past end of device %s\n", operation == BIO_READ ? "read" : "write", @@ -1831,7 +1821,6 @@ xbb_run_queue(void *context, int pending) int cur_operation; struct xbb_xen_reqlist *reqlist; - xbb = (struct xbb_softc *)context; rings = &xbb->rings; @@ -2121,7 +2110,6 @@ xbb_dispatch_dev(struct xbb_softc *xbb, struct xbb_xen nseg = reqlist->nr_segments; for (seg_idx = 0; seg_idx < nseg; seg_idx++, xbb_sg++) { - /* * KVA will not be contiguous, so any additional * I/O will need to be represented in a new bio. @@ -2173,7 +2161,6 @@ xbb_dispatch_dev(struct xbb_softc *xbb, struct xbb_xen bio_offset += xbb_sg->nsect << 9; if (xbb_sg->last_sect != (PAGE_SIZE - 512) >> 9) { - if ((bio->bio_length & (xbb->sector_size - 1)) != 0) { printf("%s: Discontiguous I/O request " "from domain %d ends on " @@ -2224,7 +2211,7 @@ xbb_dispatch_dev(struct xbb_softc *xbb, struct xbb_xen fail_free_bios: for (bio_idx = 0; bio_idx < (nbio-1); bio_idx++) g_destroy_bio(bios[bio_idx]); - + return (error); } @@ -2302,7 +2289,6 @@ xbb_dispatch_file(struct xbb_softc *xbb, struct xbb_xe nseg = reqlist->nr_segments; for (xiovec = NULL, seg_idx = 0; seg_idx < nseg; seg_idx++, xbb_sg++) { - /* * If the first sector is not 0, the KVA will * not be contiguous and we'll need to go on @@ -2354,7 +2340,6 @@ xbb_dispatch_file(struct xbb_softc *xbb, struct xbb_xe for (seg_idx = 0, p_vaddr = file_data->xiovecs_vaddr, xiovec = xuio.uio_iov; seg_idx < xuio.uio_iovcnt; seg_idx++, xiovec++, p_vaddr++) { - memcpy(xiovec->iov_base, *p_vaddr, xiovec->iov_len); } } else { @@ -2448,12 +2433,10 @@ xbb_dispatch_file(struct xbb_softc *xbb, struct xbb_xe #ifdef XBB_USE_BOUNCE_BUFFERS /* We only need to copy here for read operations */ if (operation == BIO_READ) { - for (seg_idx = 0, p_vaddr = file_data->xiovecs_vaddr, xiovec = file_data->saved_xiovecs; seg_idx < saved_uio_iovcnt; seg_idx++, xiovec++, p_vaddr++) { - /* * Note that we have to use the copy of the * io vector we made above. uiomove() modifies @@ -2563,7 +2546,6 @@ xbb_open_dev(struct xbb_softc *xbb) return (error); } - dev = xbb->vn->v_rdev; devsw = dev->si_devsw; if (!devsw->d_ioctl) { @@ -2814,11 +2796,10 @@ xbb_disconnect(struct xbb_softc *xbb) */ if (xbb->active_request_count != 0) return (EAGAIN); - + for (ring_idx = 0, op = ops; ring_idx < xbb->ring_config.ring_pages; ring_idx++, op++) { - op->host_addr = xbb->ring_config.gnt_addr + (ring_idx * PAGE_SIZE); op->dev_bus_addr = xbb->ring_config.bus_addr[ring_idx]; @@ -2895,7 +2876,6 @@ xbb_connect_ring(struct xbb_softc *xbb) for (ring_idx = 0, gnt = gnts; ring_idx < xbb->ring_config.ring_pages; ring_idx++, gnt++) { - gnt->host_addr = xbb->ring_config.gnt_addr + (ring_idx * PAGE_SIZE); gnt->flags = GNTMAP_host_map; @@ -3138,13 +3118,10 @@ xbb_collect_frontend_info(struct xbb_softc *xbb) */ xbb->abi = BLKIF_PROTOCOL_NATIVE; } else if (!strcmp(protocol_abi, XEN_IO_PROTO_ABI_X86_32)) { - xbb->abi = BLKIF_PROTOCOL_X86_32; } else if (!strcmp(protocol_abi, XEN_IO_PROTO_ABI_X86_64)) { - xbb->abi = BLKIF_PROTOCOL_X86_64; } else { - xenbus_dev_fatal(xbb->dev, EINVAL, "Unknown protocol ABI (%s) published by " "frontend. Unable to connect.", protocol_abi); @@ -3361,7 +3338,7 @@ xbb_connect(struct xbb_softc *xbb) /* Specific errors are reported by xbb_connect_ring(). */ return; } - + if (xbb_publish_backend_info(xbb) != 0) { /* * If we can't publish our data, we cannot participate @@ -3496,7 +3473,7 @@ xbb_attach_failed(struct xbb_softc *xbb, int err, cons static int xbb_probe(device_t dev) { - + if (!strcmp(xenbus_get_type(dev), "vbd")) { device_set_desc(dev, "Backend Virtual Block Device"); device_quiet(dev); @@ -3517,7 +3494,7 @@ xbb_setup_sysctl(struct xbb_softc *xbb) { struct sysctl_ctx_list *sysctl_ctx = NULL; struct sysctl_oid *sysctl_tree = NULL; - + sysctl_ctx = device_get_sysctl_ctx(xbb->dev); if (sysctl_ctx == NULL) return; @@ -3930,7 +3907,6 @@ static device_method_t xbb_methods[] = { /* Xenbus interface */ DEVMETHOD(xenbus_otherend_changed, xbb_frontend_changed), - { 0, 0 } }; Modified: head/sys/dev/xen/blkfront/blkfront.c ============================================================================== --- head/sys/dev/xen/blkfront/blkfront.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/blkfront/blkfront.c Tue Sep 1 21:45:08 2020 (r365128) @@ -427,7 +427,6 @@ xbd_startio(struct xbd_softc *sc) return; while (!RING_FULL(&sc->xbd_ring)) { - if (sc->xbd_qfrozen_cnt != 0) break; @@ -768,7 +767,6 @@ xbd_alloc_ring(struct xbd_softc *sc) for (i = 0, sring_page_addr = (uintptr_t)sring; i < sc->xbd_ring_pages; i++, sring_page_addr += PAGE_SIZE) { - error = xenbus_grant_ring(sc->xbd_dev, (vtophys(sring_page_addr) >> PAGE_SHIFT), &sc->xbd_ring_ref[i]); @@ -899,7 +897,7 @@ xbd_setup_sysctl(struct xbd_softc *xbd) struct sysctl_ctx_list *sysctl_ctx = NULL; struct sysctl_oid *sysctl_tree = NULL; struct sysctl_oid_list *children; - + sysctl_ctx = device_get_sysctl_ctx(xbd->xbd_dev); if (sysctl_ctx == NULL) return; @@ -1050,7 +1048,7 @@ static void xbd_free(struct xbd_softc *sc) { int i; - + /* Prevent new requests being issued until we fix things up. */ mtx_lock(&sc->xbd_io_lock); sc->xbd_state = XBD_STATE_DISCONNECTED; @@ -1059,7 +1057,6 @@ xbd_free(struct xbd_softc *sc) /* Free resources associated with old device channel. */ xbd_free_ring(sc); if (sc->xbd_shadow) { - for (i = 0; i < sc->xbd_max_requests; i++) { struct xbd_command *cm; @@ -1638,7 +1635,7 @@ static device_method_t xbd_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, xbd_suspend), DEVMETHOD(device_resume, xbd_resume), - + /* Xenbus interface */ DEVMETHOD(xenbus_otherend_changed, xbd_backend_changed), @@ -1651,5 +1648,5 @@ static driver_t xbd_driver = { sizeof(struct xbd_softc), }; devclass_t xbd_devclass; - + DRIVER_MODULE(xbd, xenbusb_front, xbd_driver, xbd_devclass, 0, 0); Modified: head/sys/dev/xen/control/control.c ============================================================================== --- head/sys/dev/xen/control/control.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/control/control.c Tue Sep 1 21:45:08 2020 (r365128) @@ -356,7 +356,7 @@ xctrl_on_watch_event(struct xs_watch *watch, const cha char *result; int error; int result_len; - + error = xs_read(XST_NIL, "control", "shutdown", &result_len, (void **)&result); if (error != 0 || result_len == 0) @@ -370,7 +370,6 @@ xctrl_on_watch_event(struct xs_watch *watch, const cha reason = xctrl_shutdown_reasons; last_reason = reason + nitems(xctrl_shutdown_reasons); while (reason < last_reason) { - if (!strcmp(result, reason->name)) { reason->handler(); break; @@ -469,11 +468,11 @@ static device_method_t xctrl_methods[] = { DEVMETHOD(device_probe, xctrl_probe), DEVMETHOD(device_attach, xctrl_attach), DEVMETHOD(device_detach, xctrl_detach), - + DEVMETHOD_END }; DEFINE_CLASS_0(xctrl, xctrl_driver, xctrl_methods, sizeof(struct xctrl_softc)); devclass_t xctrl_devclass; - + DRIVER_MODULE(xctrl, xenstore, xctrl_driver, xctrl_devclass, NULL, NULL); Modified: head/sys/dev/xen/gntdev/gntdev.c ============================================================================== --- head/sys/dev/xen/gntdev/gntdev.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/gntdev/gntdev.c Tue Sep 1 21:45:08 2020 (r365128) @@ -462,7 +462,7 @@ gntdev_dealloc_gref(struct ioctl_gntdev_dealloc_gref * } mtx_unlock(&cleanup_data.to_kill_grefs_mtx); mtx_unlock(&priv_user->user_data_lock); - + taskqueue_enqueue(taskqueue_thread, &cleanup_task); put_file_offset(priv_user, arg->count, arg->index); @@ -573,10 +573,10 @@ notify_unmap_cleanup(struct gntdev_gmap *gmap) int error, count; vm_page_t m; struct gnttab_unmap_grant_ref *unmap_ops; - + unmap_ops = malloc(sizeof(struct gnttab_unmap_grant_ref) * gmap->count, M_GNTDEV, M_WAITOK); - + /* Enumerate freeable maps. */ count = 0; for (i = 0; i < gmap->count; i++) { @@ -588,7 +588,7 @@ notify_unmap_cleanup(struct gntdev_gmap *gmap) count++; } } - + /* Perform notification. */ if (count > 0 && gmap->notify) { vm_page_t page; @@ -598,7 +598,7 @@ notify_unmap_cleanup(struct gntdev_gmap *gmap) page = PHYS_TO_VM_PAGE(gmap->map->phys_base_addr + page_offset); notify(gmap->notify, page); } - + /* Free the pages. */ VM_OBJECT_WLOCK(gmap->map->mem); retry: @@ -611,16 +611,16 @@ retry: cdev_pager_free_page(gmap->map->mem, m); } VM_OBJECT_WUNLOCK(gmap->map->mem); - + /* Perform unmap hypercall. */ error = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap_ops, count); - + for (i = 0; i < gmap->count; i++) { gmap->grant_map_ops[i].handle = -1; gmap->grant_map_ops[i].host_addr = 0; } - + if (gmap->map) { error = xenmem_free(gntdev_dev, gmap->map->pseudo_phys_res_id, gmap->map->pseudo_phys_res); @@ -630,9 +630,9 @@ retry: free(gmap->map, M_GNTDEV); gmap->map = NULL; } - + free(unmap_ops, M_GNTDEV); - + return (error); } @@ -721,13 +721,13 @@ gntdev_unmap_grant_ref(struct ioctl_gntdev_unmap_grant STAILQ_INSERT_TAIL(&cleanup_data.to_kill_gmaps, gmap, gmap_next.list); mtx_unlock(&cleanup_data.to_kill_gmaps_mtx); mtx_unlock(&priv_user->user_data_lock); - + if (gmap->map) vm_object_deallocate(gmap->map->mem); taskqueue_enqueue(taskqueue_thread, &cleanup_task); put_file_offset(priv_user, arg->count, arg->index); - + return (0); } Modified: head/sys/dev/xen/grant_table/grant_table.c ============================================================================== --- head/sys/dev/xen/grant_table/grant_table.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/grant_table/grant_table.c Tue Sep 1 21:45:08 2020 (r365128) @@ -224,7 +224,6 @@ gnttab_end_foreign_access_references(u_int count, gran tail = *refs; last_ref = refs + count; while (refs != last_ref) { - if (gnttab_end_foreign_access_ref(*refs)) { gnttab_entry(*refs) = head; head = *refs; @@ -416,7 +415,6 @@ gnttab_cancel_free_callback(struct gnttab_free_callbac } mtx_unlock(&gnttab_list_lock); } - static int grow_gnttab_list(unsigned int more_frames) Modified: head/sys/dev/xen/netback/netback.c ============================================================================== --- head/sys/dev/xen/netback/netback.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/netback/netback.c Tue Sep 1 21:45:08 2020 (r365128) @@ -194,7 +194,6 @@ static void xnb_add_mbuf_cksum(struct mbuf *mbufc); #endif /*------------------------------ Data Structures -----------------------------*/ - /** * Representation of a xennet packet. Simplified version of a packet as * stored in the Xen tx ring. Applicable to both RX and TX packets @@ -306,7 +305,6 @@ xnb_dump_txreq(RING_IDX idx, const struct netif_tx_req } } - /** * \brief Configuration data for a shared memory request ring * used to communicate with the front-end client of this @@ -1414,7 +1412,6 @@ xnb_frontend_changed(device_t dev, XenbusState fronten } } - /*---------------------------- Request Processing ----------------------------*/ /** * Interrupt handler bound to the shared ring's event channel. @@ -1467,7 +1464,6 @@ xnb_intr(void *arg) xnb_start(ifp); } - /** * Build a struct xnb_pkt based on netif_tx_request's from a netif tx ring. * Will read exactly 0 or 1 packets from the ring; never a partial packet. @@ -1591,7 +1587,6 @@ xnb_ring2pkt(struct xnb_pkt *pkt, const netif_tx_back_ return idx - start; } - /** * Respond to all the requests that constituted pkt. Builds the responses and * writes them to the ring, but doesn't push them to the shared ring. @@ -2448,7 +2443,6 @@ xnb_ifinit_locked(struct xnb_softc *xnb) if_link_state_change(ifp, LINK_STATE_UP); } - static void xnb_ifinit(void *xsc) { @@ -2480,7 +2474,6 @@ xnb_ifmedia_sts(struct ifnet *ifp, struct ifmediareq * ifmr->ifm_active = IFM_ETHER|IFM_MANUAL; } - /*---------------------------- NewBus Registration ---------------------------*/ static device_method_t xnb_methods[] = { /* Device interface */ @@ -2493,7 +2486,6 @@ static device_method_t xnb_methods[] = { /* Xenbus interface */ DEVMETHOD(xenbus_otherend_changed, xnb_frontend_changed), - { 0, 0 } }; @@ -2505,7 +2497,6 @@ static driver_t xnb_driver = { devclass_t xnb_devclass; DRIVER_MODULE(xnb, xenbusb_back, xnb_driver, xnb_devclass, 0, 0); - /*-------------------------- Unit Tests -------------------------------------*/ #ifdef XNB_DEBUG Modified: head/sys/dev/xen/netback/netback_unit_tests.c ============================================================================== --- head/sys/dev/xen/netback/netback_unit_tests.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/netback/netback_unit_tests.c Tue Sep 1 21:45:08 2020 (r365128) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); * standalone; they must be #include'd from the driver's .c file. */ - /** Helper macro used to snprintf to a buffer and update the buffer pointer */ #define SNCATF(buffer, buflen, ...) do { \ size_t new_chars = snprintf(buffer, buflen, __VA_ARGS__); \ @@ -75,7 +74,6 @@ __FBSDID("$FreeBSD$"); } \ }) - /** * The signature used by all testcases. If the test writes anything * to buffer, then it will be considered a failure @@ -644,7 +642,6 @@ xnb_ring2pkt_wraps(char *buffer, size_t buflen) XNB_ASSERT(RING_GET_REQUEST(&xnb_unit_pvt.txb, pkt.cdr + 1) == req); } - /** * xnb_txpkt2rsp should do nothing for an empty packet */ @@ -959,7 +956,6 @@ xnb_txpkt2rsp_wraps(char *buffer, size_t buflen) XNB_ASSERT(rsp->status == NETIF_RSP_OKAY); } - /** * Helper function used to setup pkt2mbufc tests * \param size size in bytes of the single request to push to the ring @@ -1280,7 +1276,6 @@ xnb_txpkt2gnttab_2cluster(char *buffer, size_t buflen) m_freem(pMbuf); } - /** * xnb_update_mbufc on a short packet that only has one gnttab entry */ @@ -2032,7 +2027,7 @@ xnb_rxpkt2rsp_copyerror(char *buffer, size_t buflen) struct netif_rx_request *req; struct netif_rx_response *rsp; struct mbuf *mbuf; - + mbuf = m_getm(NULL, size, M_WAITOK, MT_DATA); mbuf->m_flags |= M_PKTHDR; mbuf->m_pkthdr.len = size; Modified: head/sys/dev/xen/netfront/netfront.c ============================================================================== --- head/sys/dev/xen/netfront/netfront.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/netfront/netfront.c Tue Sep 1 21:45:08 2020 (r365128) @@ -1432,7 +1432,6 @@ xn_get_responses(struct netfront_rxq *rxq, #endif if (__predict_false(rx->status < 0 || rx->offset + rx->status > PAGE_SIZE)) { - xn_move_rx_slot(rxq, m, ref); if (m0 == m) m0 = NULL; Modified: head/sys/dev/xen/pcifront/pcifront.c ============================================================================== --- head/sys/dev/xen/pcifront/pcifront.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/pcifront/pcifront.c Tue Sep 1 21:45:08 2020 (r365128) @@ -185,7 +185,6 @@ put_pdev(struct pcifront_device *pdev) free(pdev, M_DEVBUF); } - /* Write to the xenbus info needed by backend */ static int pcifront_publish_info(struct pcifront_device *pdev) @@ -434,7 +433,6 @@ pcifront_init(void *unused) SYSINIT(pciif, SI_SUB_PSEUDO, SI_ORDER_ANY, pcifront_init, NULL) - /* Newbus xpcife device driver probe */ static int xpcife_probe(device_t dev) @@ -536,7 +534,6 @@ static driver_t xpcife_driver = { DRIVER_MODULE(xpcife, nexus, xpcife_driver, xpcife_devclass, 0, 0); - /* Newbus xen pcib device driver probe */ static int xpcib_probe(device_t dev) @@ -549,7 +546,7 @@ xpcib_probe(device_t dev) sc->domain = pdev->xdev->otherend_id; sc->bus = device_get_unit(dev); sc->pdev = pdev; - + return 0; } @@ -603,7 +600,7 @@ xpcib_read_config(device_t dev, int bus, int slot, int int err; err = do_pci_op(sc->pdev, &op); - + DPRINTF("read config (b=%d, s=%d, f=%d, reg=%d, len=%d, val=%x, err=%d)\n", bus, slot, func, reg, bytes, op.value, err); Modified: head/sys/dev/xen/xenpci/xenpci.c ============================================================================== --- head/sys/dev/xen/xenpci/xenpci.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/xenpci/xenpci.c Tue Sep 1 21:45:08 2020 (r365128) @@ -227,7 +227,6 @@ static device_method_t xenpci_methods[] = { DEVMETHOD(device_attach, xenpci_attach), DEVMETHOD(device_detach, xenpci_detach), DEVMETHOD(device_resume, xenpci_resume), - { 0, 0 } }; Modified: head/sys/dev/xen/xenstore/xenstore.c ============================================================================== --- head/sys/dev/xen/xenstore/xenstore.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/xenstore/xenstore.c Tue Sep 1 21:45:08 2020 (r365128) @@ -28,7 +28,6 @@ * IN THE SOFTWARE. */ - #include __FBSDID("$FreeBSD$"); @@ -971,7 +970,6 @@ xenwatch_thread(void *unused) struct xs_stored_msg *msg; for (;;) { - mtx_lock(&xs.watch_events_lock); while (TAILQ_EMPTY(&xs.watch_events)) mtx_sleep(&xs.watch_events, @@ -1223,7 +1221,7 @@ static device_method_t xenstore_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, xs_suspend), DEVMETHOD(device_resume, xs_resume), - + /* Bus interface */ DEVMETHOD(bus_add_child, bus_generic_add_child), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), @@ -1236,7 +1234,7 @@ static device_method_t xenstore_methods[] = { DEFINE_CLASS_0(xenstore, xenstore_driver, xenstore_methods, 0); static devclass_t xenstore_devclass; - + DRIVER_MODULE(xenstore, xenpv, xenstore_driver, xenstore_devclass, 0, 0); /*------------------------------- Sysctl Data --------------------------------*/ @@ -1656,4 +1654,3 @@ xs_unlock(void) sx_xunlock(&xs.request_mutex); return; } - Modified: head/sys/dev/xen/xenstore/xenstore_dev.c ============================================================================== --- head/sys/dev/xen/xenstore/xenstore_dev.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/xenstore/xenstore_dev.c Tue Sep 1 21:45:08 2020 (r365128) @@ -29,7 +29,6 @@ * IN THE SOFTWARE. */ - #include __FBSDID("$FreeBSD$"); @@ -128,7 +127,6 @@ xs_dev_return_error(struct xs_dev_data *u, int error, msg.req_id = req_id; msg.tx_id = tx_id; payload = NULL; - payload = xs_dev_error_to_string(error); if (payload == NULL) Modified: head/sys/dev/xen/xenstore/xenstored_dev.c ============================================================================== --- head/sys/dev/xen/xenstore/xenstored_dev.c Tue Sep 1 21:44:42 2020 (r365127) +++ head/sys/dev/xen/xenstore/xenstored_dev.c Tue Sep 1 21:45:08 2020 (r365128) @@ -53,7 +53,6 @@ static int xsd_dev_read(struct cdev *dev, struct uio * static int xsd_dev_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr); - static struct cdevsw xsd_dev_cdevsw = { .d_version = D_VERSION, .d_read = xsd_dev_read, From owner-svn-src-all@freebsd.org Tue Sep 1 21:45:37 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4E9E337BB28; Tue, 1 Sep 2020 21:45:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0xF1QQDz4S49; Tue, 1 Sep 2020 21:45:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13FE61FEE0; Tue, 1 Sep 2020 21:45:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LjaHl039924; Tue, 1 Sep 2020 21:45:36 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LjZ9A039913; Tue, 1 Sep 2020 21:45:35 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012145.081LjZ9A039913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:45:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365129 - in head/sys/dev/wtap: . plugins wtap_hal X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/wtap: . plugins wtap_hal X-SVN-Commit-Revision: 365129 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:45:37 -0000 Author: mjg Date: Tue Sep 1 21:45:35 2020 New Revision: 365129 URL: https://svnweb.freebsd.org/changeset/base/365129 Log: wtap: clean up empty lines in .c and .h files Modified: head/sys/dev/wtap/if_wtap_module.c head/sys/dev/wtap/plugins/visibility.c head/sys/dev/wtap/plugins/visibility.h head/sys/dev/wtap/plugins/visibility_ioctl.h head/sys/dev/wtap/plugins/wtap_plugin.h head/sys/dev/wtap/wtap_hal/hal.c head/sys/dev/wtap/wtap_hal/hal.h head/sys/dev/wtap/wtap_hal/handler.h Modified: head/sys/dev/wtap/if_wtap_module.c ============================================================================== --- head/sys/dev/wtap/if_wtap_module.c Tue Sep 1 21:45:08 2020 (r365128) +++ head/sys/dev/wtap/if_wtap_module.c Tue Sep 1 21:45:35 2020 (r365129) @@ -70,12 +70,10 @@ #include - #include #include /* cdevsw struct */ #include /* uio struct */ - #include #include @@ -131,7 +129,6 @@ wtap_ioctl(struct cdev *dev, u_long cmd, caddr_t data, CURVNET_RESTORE(); return error; } - /* The function called at load/unload. */ static int Modified: head/sys/dev/wtap/plugins/visibility.c ============================================================================== --- head/sys/dev/wtap/plugins/visibility.c Tue Sep 1 21:45:08 2020 (r365128) +++ head/sys/dev/wtap/plugins/visibility.c Tue Sep 1 21:45:35 2020 (r365129) @@ -70,7 +70,6 @@ #include - #include #include /* cdevsw struct */ #include /* uio struct */ @@ -200,7 +199,6 @@ del_link(struct visibility_plugin *vis_plugin, struct #endif } - int vis_ioctl(struct cdev *sdev, u_long cmd, caddr_t data, int fflag, struct thread *td) @@ -239,4 +237,3 @@ vis_ioctl(struct cdev *sdev, u_long cmd, caddr_t data, CURVNET_RESTORE(); return error; } - Modified: head/sys/dev/wtap/plugins/visibility.h ============================================================================== --- head/sys/dev/wtap/plugins/visibility.h Tue Sep 1 21:45:08 2020 (r365128) +++ head/sys/dev/wtap/plugins/visibility.h Tue Sep 1 21:45:35 2020 (r365129) @@ -55,4 +55,3 @@ void visibility_deinit(struct wtap_plugin *); void visibility_work(struct wtap_plugin *, struct packet *); #endif - Modified: head/sys/dev/wtap/plugins/visibility_ioctl.h ============================================================================== --- head/sys/dev/wtap/plugins/visibility_ioctl.h Tue Sep 1 21:45:08 2020 (r365128) +++ head/sys/dev/wtap/plugins/visibility_ioctl.h Tue Sep 1 21:45:35 2020 (r365129) @@ -50,4 +50,3 @@ struct link { #define VISIOCTLLINK _IOW('W', 4, struct link) // #endif - Modified: head/sys/dev/wtap/plugins/wtap_plugin.h ============================================================================== --- head/sys/dev/wtap/plugins/wtap_plugin.h Tue Sep 1 21:45:08 2020 (r365128) +++ head/sys/dev/wtap/plugins/wtap_plugin.h Tue Sep 1 21:45:35 2020 (r365129) @@ -37,7 +37,6 @@ #include "../if_medium.h" #include "../wtap_hal/hal.h" - struct wtap_plugin { struct cdev *wp_sdev; struct wtap_hal *wp_hal; @@ -47,4 +46,3 @@ struct wtap_plugin { }; #endif - Modified: head/sys/dev/wtap/wtap_hal/hal.c ============================================================================== --- head/sys/dev/wtap/wtap_hal/hal.c Tue Sep 1 21:45:08 2020 (r365128) +++ head/sys/dev/wtap/wtap_hal/hal.c Tue Sep 1 21:45:35 2020 (r365129) @@ -214,4 +214,3 @@ free_wtap(struct wtap_hal *hal, int32_t id) hal->hal_devs[id] = NULL; return 0; } - Modified: head/sys/dev/wtap/wtap_hal/hal.h ============================================================================== --- head/sys/dev/wtap/wtap_hal/hal.h Tue Sep 1 21:45:08 2020 (r365128) +++ head/sys/dev/wtap/wtap_hal/hal.h Tue Sep 1 21:45:35 2020 (r365129) @@ -52,6 +52,4 @@ void deregister_plugin(struct wtap_hal *); int32_t new_wtap(struct wtap_hal *, int32_t id); int32_t free_wtap(struct wtap_hal *, int32_t id); - #endif - Modified: head/sys/dev/wtap/wtap_hal/handler.h ============================================================================== --- head/sys/dev/wtap/wtap_hal/handler.h Tue Sep 1 21:45:08 2020 (r365128) +++ head/sys/dev/wtap/wtap_hal/handler.h Tue Sep 1 21:45:35 2020 (r365129) @@ -49,4 +49,3 @@ struct eventhandler { }; #endif - From owner-svn-src-all@freebsd.org Tue Sep 1 21:46:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D3D6337BABB; Tue, 1 Sep 2020 21:46:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0yC5Jh1z4SNB; Tue, 1 Sep 2020 21:46:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 998552001E; Tue, 1 Sep 2020 21:46:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LkRON040004; Tue, 1 Sep 2020 21:46:27 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LkRL1040003; Tue, 1 Sep 2020 21:46:27 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012146.081LkRL1040003@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:46:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365130 - head/sys/dev/wpi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/wpi X-SVN-Commit-Revision: 365130 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:46:27 -0000 Author: mjg Date: Tue Sep 1 21:46:27 2020 New Revision: 365130 URL: https://svnweb.freebsd.org/changeset/base/365130 Log: wpi: clean up empty lines in .c and .h files Modified: head/sys/dev/wpi/if_wpireg.h Modified: head/sys/dev/wpi/if_wpireg.h ============================================================================== --- head/sys/dev/wpi/if_wpireg.h Tue Sep 1 21:45:35 2020 (r365129) +++ head/sys/dev/wpi/if_wpireg.h Tue Sep 1 21:46:27 2020 (r365130) @@ -92,7 +92,6 @@ #define WPI_FH_MSG_CONFIG 0xe88 #define WPI_FH_TX_STATUS 0xe90 - /* * NIC internal memory offsets. */ @@ -119,7 +118,6 @@ #define WPI_BSM_DRAM_DATA_SIZE 0x349c #define WPI_BSM_SRAM_BASE 0x3800 - /* Possible flags for register WPI_HW_IF_CONFIG. */ #define WPI_HW_IF_CONFIG_ALM_MB (1 << 8) #define WPI_HW_IF_CONFIG_ALM_MM (1 << 9) @@ -558,7 +556,6 @@ struct wpi_beacon_missed { uint32_t received; } __packed; - /* Structure for command WPI_CMD_MRR_SETUP. */ #define WPI_RIDX_MAX 11 struct wpi_mrr_setup { @@ -806,7 +803,6 @@ struct wpi_stats { /* Possible flags for command WPI_CMD_GET_STATISTICS. */ #define WPI_STATISTICS_BEACON_DISABLE (1 << 1) - /* Firmware error dump entry. */ struct wpi_fw_dump { uint32_t desc; @@ -818,7 +814,6 @@ struct wpi_fw_dump { /* Firmware image file header. */ struct wpi_firmware_hdr { - #define WPI_FW_MINVERSION 2144 #define WPI_FW_NAME "wpifw" From owner-svn-src-all@freebsd.org Tue Sep 1 21:46:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C663637BB53; Tue, 1 Sep 2020 21:46:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0yW4vzvz4SG6; Tue, 1 Sep 2020 21:46:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8BC8D20227; Tue, 1 Sep 2020 21:46:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LkhxP040064; Tue, 1 Sep 2020 21:46:43 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LkgdW040060; Tue, 1 Sep 2020 21:46:42 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012146.081LkgdW040060@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:46:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365131 - head/sys/dev/wi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/wi X-SVN-Commit-Revision: 365131 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:46:43 -0000 Author: mjg Date: Tue Sep 1 21:46:42 2020 New Revision: 365131 URL: https://svnweb.freebsd.org/changeset/base/365131 Log: wi: clean up empty lines in .c and .h files Modified: head/sys/dev/wi/if_wavelan_ieee.h head/sys/dev/wi/if_wi.c head/sys/dev/wi/if_wi_macio.c head/sys/dev/wi/if_wi_pccard.c head/sys/dev/wi/if_wi_pci.c Modified: head/sys/dev/wi/if_wavelan_ieee.h ============================================================================== --- head/sys/dev/wi/if_wavelan_ieee.h Tue Sep 1 21:46:27 2020 (r365130) +++ head/sys/dev/wi/if_wavelan_ieee.h Tue Sep 1 21:46:42 2020 (r365131) @@ -478,7 +478,6 @@ struct wi_rx_frame { #define WI_MGMT_HDRLEN 0x3C #define WI_CTL_HDRLEN 0x3C - /* * all data packets have a snap (sub-network access protocol) header that * isn't entirely definied, but added for ethernet compatibility. @@ -488,7 +487,6 @@ struct wi_snap_frame { u_int16_t wi_type; }; - /* * management frame headers * note: all management frames consist of a static header and variable length @@ -592,7 +590,6 @@ struct wi_mgmt_deauth_hdr { u_int16_t wi_reason; }; - /* * rid configuration register definitions */ @@ -602,7 +599,6 @@ struct wi_mgmt_deauth_hdr { #define WI_RID_PROCFRAME 0x3137 /* Return full frame information */ #define WI_RID_PRISM2 0x3138 /* tell if we're a prism2 card or not */ - /* * 802.11 definitions */ @@ -650,7 +646,6 @@ struct wi_mgmt_deauth_hdr { #define WI_FCS_LEN 0x4 /* checksum length */ - /* * management definitions */ @@ -693,7 +688,6 @@ struct wi_mgmt_deauth_hdr { #define WI_VAR_SRATES_MASK 0x7F - /* * control definitions */ @@ -704,7 +698,6 @@ struct wi_mgmt_deauth_hdr { #define WI_STYPE_CTL_CFEND 0x00E0 #define WI_STYPE_CTL_CFENDCFACK 0x00F0 - /* * ap scanning structures */ @@ -728,7 +721,6 @@ struct wi_scan_p2_hdr { u_int16_t wi_reason; }; #define WI_PRISM2_RES_SIZE 62 - /* * prism2 debug mode definitions Modified: head/sys/dev/wi/if_wi.c ============================================================================== --- head/sys/dev/wi/if_wi.c Tue Sep 1 21:46:27 2020 (r365130) +++ head/sys/dev/wi/if_wi.c Tue Sep 1 21:46:42 2020 (r365131) @@ -162,7 +162,7 @@ static void wi_scan_end(struct ieee80211com *); static void wi_getradiocaps(struct ieee80211com *, int, int *, struct ieee80211_channel[]); static void wi_set_channel(struct ieee80211com *); - + static __inline int wi_write_val(struct wi_softc *sc, int rid, u_int16_t val) { Modified: head/sys/dev/wi/if_wi_macio.c ============================================================================== --- head/sys/dev/wi/if_wi_macio.c Tue Sep 1 21:46:27 2020 (r365130) +++ head/sys/dev/wi/if_wi_macio.c Tue Sep 1 21:46:42 2020 (r365131) @@ -87,7 +87,6 @@ static device_method_t wi_macio_methods[] = { DEVMETHOD(device_attach, wi_macio_attach), DEVMETHOD(device_detach, wi_detach), DEVMETHOD(device_shutdown, wi_shutdown), - { 0, 0 } }; Modified: head/sys/dev/wi/if_wi_pccard.c ============================================================================== --- head/sys/dev/wi/if_wi_pccard.c Tue Sep 1 21:46:27 2020 (r365130) +++ head/sys/dev/wi/if_wi_pccard.c Tue Sep 1 21:46:42 2020 (r365131) @@ -85,7 +85,6 @@ static device_method_t wi_pccard_methods[] = { DEVMETHOD(device_attach, wi_pccard_attach), DEVMETHOD(device_detach, wi_detach), DEVMETHOD(device_shutdown, wi_shutdown), - { 0, 0 } }; Modified: head/sys/dev/wi/if_wi_pci.c ============================================================================== --- head/sys/dev/wi/if_wi_pci.c Tue Sep 1 21:46:27 2020 (r365130) +++ head/sys/dev/wi/if_wi_pci.c Tue Sep 1 21:46:42 2020 (r365131) @@ -84,7 +84,6 @@ static device_method_t wi_pci_methods[] = { DEVMETHOD(device_shutdown, wi_shutdown), DEVMETHOD(device_suspend, wi_pci_suspend), DEVMETHOD(device_resume, wi_pci_resume), - { 0, 0 } }; @@ -246,7 +245,7 @@ wi_pci_suspend(device_t dev) WI_LOCK(sc); wi_stop(sc, 1); WI_UNLOCK(sc); - + return (0); } From owner-svn-src-all@freebsd.org Tue Sep 1 21:46:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B18E537BC19; Tue, 1 Sep 2020 21:46:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0yq4KmPz4SZ8; Tue, 1 Sep 2020 21:46:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 763AD20287; Tue, 1 Sep 2020 21:46:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LkxqE040120; Tue, 1 Sep 2020 21:46:59 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LkxMJ040119; Tue, 1 Sep 2020 21:46:59 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012146.081LkxMJ040119@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:46:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365132 - head/sys/dev/wbwd X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/wbwd X-SVN-Commit-Revision: 365132 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:46:59 -0000 Author: mjg Date: Tue Sep 1 21:46:58 2020 New Revision: 365132 URL: https://svnweb.freebsd.org/changeset/base/365132 Log: wbwd: clean up empty lines in .c and .h files Modified: head/sys/dev/wbwd/wbwd.c Modified: head/sys/dev/wbwd/wbwd.c ============================================================================== --- head/sys/dev/wbwd/wbwd.c Tue Sep 1 21:46:42 2020 (r365131) +++ head/sys/dev/wbwd/wbwd.c Tue Sep 1 21:46:58 2020 (r365132) @@ -236,7 +236,6 @@ struct winbond_vendor_device_id { }, }; - /* * Return the watchdog related registers as we last read them. This will * usually not give the current timeout or state on whether the watchdog From owner-svn-src-all@freebsd.org Tue Sep 1 21:47:21 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 07BA637BAEF; Tue, 1 Sep 2020 21:47:21 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0zD6VTxz4SZw; Tue, 1 Sep 2020 21:47:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C25CA1FFF2; Tue, 1 Sep 2020 21:47:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LlK6d040183; Tue, 1 Sep 2020 21:47:20 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LlK8T040182; Tue, 1 Sep 2020 21:47:20 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012147.081LlK8T040182@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:47:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365133 - head/sys/dev/watchdog X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/watchdog X-SVN-Commit-Revision: 365133 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:47:21 -0000 Author: mjg Date: Tue Sep 1 21:47:20 2020 New Revision: 365133 URL: https://svnweb.freebsd.org/changeset/base/365133 Log: watchdog: clean up empty lines in .c and .h files Modified: head/sys/dev/watchdog/watchdog.c Modified: head/sys/dev/watchdog/watchdog.c ============================================================================== --- head/sys/dev/watchdog/watchdog.c Tue Sep 1 21:46:58 2020 (r365132) +++ head/sys/dev/watchdog/watchdog.c Tue Sep 1 21:47:20 2020 (r365133) @@ -120,7 +120,6 @@ seconds_to_pow2ns(int seconds) return (power); } - int wdog_kern_pat(u_int utim) { From owner-svn-src-all@freebsd.org Tue Sep 1 21:47:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 127D837BE82; Tue, 1 Sep 2020 21:47:34 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0zT6phyz4SqK; Tue, 1 Sep 2020 21:47:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CBA9C20229; Tue, 1 Sep 2020 21:47:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LlX5m040242; Tue, 1 Sep 2020 21:47:33 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LlXpf040239; Tue, 1 Sep 2020 21:47:33 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012147.081LlXpf040239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:47:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365134 - in head/sys/dev/vt: . hw/ofwfb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/vt: . hw/ofwfb X-SVN-Commit-Revision: 365134 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:47:34 -0000 Author: mjg Date: Tue Sep 1 21:47:32 2020 New Revision: 365134 URL: https://svnweb.freebsd.org/changeset/base/365134 Log: vt: clean up empty lines in .c and .h files Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c head/sys/dev/vt/vt.h head/sys/dev/vt/vt_buf.c head/sys/dev/vt/vt_core.c Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c ============================================================================== --- head/sys/dev/vt/hw/ofwfb/ofwfb.c Tue Sep 1 21:47:20 2020 (r365133) +++ head/sys/dev/vt/hw/ofwfb/ofwfb.c Tue Sep 1 21:47:32 2020 (r365134) @@ -504,7 +504,6 @@ ofwfb_init(struct vt_device *vd) #endif } - #if defined(__powerpc__) /* * If we are running on PowerPC in real mode (supported only on AIM @@ -521,4 +520,3 @@ ofwfb_init(struct vt_device *vd) return (CN_INTERNAL); } - Modified: head/sys/dev/vt/vt.h ============================================================================== --- head/sys/dev/vt/vt.h Tue Sep 1 21:47:20 2020 (r365133) +++ head/sys/dev/vt/vt.h Tue Sep 1 21:47:32 2020 (r365134) @@ -450,4 +450,3 @@ extern const unsigned int vt_logo_sprite_width; void vtterm_draw_cpu_logos(struct vt_device *); #endif /* !_DEV_VT_VT_H_ */ - Modified: head/sys/dev/vt/vt_buf.c ============================================================================== --- head/sys/dev/vt/vt_buf.c Tue Sep 1 21:47:20 2020 (r365133) +++ head/sys/dev/vt/vt_buf.c Tue Sep 1 21:47:32 2020 (r365134) @@ -706,7 +706,6 @@ vtbuf_flush_mark(struct vt_buf *vb) /* Notify renderer to update marked region. */ if ((vb->vb_mark_start.tp_col != vb->vb_mark_end.tp_col) || (vb->vb_mark_start.tp_row != vb->vb_mark_end.tp_row)) { - s = vtbuf_htw(vb, vb->vb_mark_start.tp_row); e = vtbuf_htw(vb, vb->vb_mark_end.tp_row); Modified: head/sys/dev/vt/vt_core.c ============================================================================== --- head/sys/dev/vt/vt_core.c Tue Sep 1 21:47:20 2020 (r365133) +++ head/sys/dev/vt/vt_core.c Tue Sep 1 21:47:32 2020 (r365134) @@ -1422,7 +1422,6 @@ vtterm_splash(struct vt_device *vd) /* Display a nice boot splash. */ if (!(vd->vd_flags & VDF_TEXTMODE) && (boothowto & RB_MUTE)) { - top = (vd->vd_height - vt_logo_height) / 2; left = (vd->vd_width - vt_logo_width) / 2; switch (vt_logo_depth) { @@ -1437,7 +1436,6 @@ vtterm_splash(struct vt_device *vd) } #endif - static void vtterm_cnprobe(struct terminal *tm, struct consdev *cp) { @@ -2729,7 +2727,6 @@ vt_upgrade(struct vt_device *vd) vt_window_switch, vw, SHUTDOWN_PRI_DEFAULT); } } - } VT_LOCK(vd); if (vd->vd_curwindow == NULL) From owner-svn-src-all@freebsd.org Tue Sep 1 21:48:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7F98537BF06; Tue, 1 Sep 2020 21:48:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1092tqLz4Sfy; Tue, 1 Sep 2020 21:48:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 467C51FFF3; Tue, 1 Sep 2020 21:48:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lm9WT040324; Tue, 1 Sep 2020 21:48:09 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lm8lv040322; Tue, 1 Sep 2020 21:48:08 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012148.081Lm8lv040322@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:48:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365135 - head/sys/dev/vr X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/vr X-SVN-Commit-Revision: 365135 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:48:09 -0000 Author: mjg Date: Tue Sep 1 21:48:08 2020 New Revision: 365135 URL: https://svnweb.freebsd.org/changeset/base/365135 Log: vr: clean up empty lines in .c and .h files Modified: head/sys/dev/vr/if_vr.c head/sys/dev/vr/if_vrreg.h Modified: head/sys/dev/vr/if_vr.c ============================================================================== --- head/sys/dev/vr/if_vr.c Tue Sep 1 21:47:32 2020 (r365134) +++ head/sys/dev/vr/if_vr.c Tue Sep 1 21:48:08 2020 (r365135) @@ -380,7 +380,6 @@ vr_miibus_statchg(device_t dev) } } - static void vr_cam_mask(struct vr_softc *sc, uint32_t mask, int type) { Modified: head/sys/dev/vr/if_vrreg.h ============================================================================== --- head/sys/dev/vr/if_vrreg.h Tue Sep 1 21:47:32 2020 (r365134) +++ head/sys/dev/vr/if_vrreg.h Tue Sep 1 21:48:08 2020 (r365135) @@ -491,7 +491,6 @@ struct vr_desc { #define VR_RXCTL_RXLERR 0x00800000 /* 6105M */ #define VR_RXCTL_RX_INTR 0x00800000 - #define VR_RXCTL (VR_RXCTL_CHAIN|VR_RXCTL_RX_INTR) #define VR_TXSTAT_DEFER 0x00000001 @@ -525,7 +524,6 @@ struct vr_desc { #define VR_FLAG_FORCEDELAY 1 #define VR_FLAG_SCHEDDELAY 2 #define VR_FLAG_DELAYTIMEO 3 - #define VR_TIMEOUT 1000 #define VR_MII_TIMEOUT 10000 From owner-svn-src-all@freebsd.org Tue Sep 1 21:48:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE4FC37BCC7; Tue, 1 Sep 2020 21:48:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh10Q598Lz4SpD; Tue, 1 Sep 2020 21:48:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 916E720158; Tue, 1 Sep 2020 21:48:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LmMdo040385; Tue, 1 Sep 2020 21:48:22 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LmMx8040383; Tue, 1 Sep 2020 21:48:22 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012148.081LmMx8040383@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:48:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365136 - head/sys/dev/vnic X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/vnic X-SVN-Commit-Revision: 365136 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:48:22 -0000 Author: mjg Date: Tue Sep 1 21:48:21 2020 New Revision: 365136 URL: https://svnweb.freebsd.org/changeset/base/365136 Log: vnic: clean up empty lines in .c and .h files Modified: head/sys/dev/vnic/nicvf_main.c head/sys/dev/vnic/nicvf_queues.c head/sys/dev/vnic/thunder_mdio.c Modified: head/sys/dev/vnic/nicvf_main.c ============================================================================== --- head/sys/dev/vnic/nicvf_main.c Tue Sep 1 21:48:08 2020 (r365135) +++ head/sys/dev/vnic/nicvf_main.c Tue Sep 1 21:48:21 2020 (r365136) @@ -656,7 +656,6 @@ nicvf_if_transmit(struct ifnet *ifp, struct mbuf *mbuf int qidx; int err = 0; - if (__predict_false(qs == NULL)) { panic("%s: missing queue set for %s", __func__, device_get_nameunit(nic->dev)); Modified: head/sys/dev/vnic/nicvf_queues.c ============================================================================== --- head/sys/dev/vnic/nicvf_queues.c Tue Sep 1 21:48:08 2020 (r365135) +++ head/sys/dev/vnic/nicvf_queues.c Tue Sep 1 21:48:21 2020 (r365136) @@ -891,7 +891,6 @@ nicvf_cmp_task(void *arg, int pending) * process the entire CQ due to Tx or Rx CQ parse error. */ taskqueue_enqueue(cq->cmp_taskq, &cq->cmp_task); - } nicvf_clear_intr(nic, NICVF_INTR_CQ, cq->idx); @@ -1533,7 +1532,6 @@ nicvf_free_resources(struct nicvf *nic) while (taskqueue_cancel(qs->qs_err_taskq, &qs->qs_err_task, NULL) != 0) { taskqueue_drain(qs->qs_err_taskq, &qs->qs_err_task); - } taskqueue_free(qs->qs_err_taskq); qs->qs_err_taskq = NULL; Modified: head/sys/dev/vnic/thunder_mdio.c ============================================================================== --- head/sys/dev/vnic/thunder_mdio.c Tue Sep 1 21:48:08 2020 (r365135) +++ head/sys/dev/vnic/thunder_mdio.c Tue Sep 1 21:48:21 2020 (r365136) @@ -142,7 +142,6 @@ MALLOC_DEFINE(M_THUNDER_MDIO, "ThunderX MDIO", #define MDIO_LOCK_ASSERT(sc) \ mtx_assert(&(sc)->mtx, MA_OWNED) - #define mdio_reg_read(sc, reg) \ bus_read_8((sc)->reg_base, (reg)) From owner-svn-src-all@freebsd.org Tue Sep 1 21:48:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4212E37BE31; Tue, 1 Sep 2020 21:48:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh10k15WWz4TD1; Tue, 1 Sep 2020 21:48:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A21520289; Tue, 1 Sep 2020 21:48:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lmbgu040442; Tue, 1 Sep 2020 21:48:37 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lmbd0040440; Tue, 1 Sep 2020 21:48:37 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012148.081Lmbd0040440@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:48:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365137 - head/sys/dev/vmd X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/vmd X-SVN-Commit-Revision: 365137 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:48:38 -0000 Author: mjg Date: Tue Sep 1 21:48:37 2020 New Revision: 365137 URL: https://svnweb.freebsd.org/changeset/base/365137 Log: vmd: clean up empty lines in .c and .h files Modified: head/sys/dev/vmd/vmd.c head/sys/dev/vmd/vmd_bus.c Modified: head/sys/dev/vmd/vmd.c ============================================================================== --- head/sys/dev/vmd/vmd.c Tue Sep 1 21:48:21 2020 (r365136) +++ head/sys/dev/vmd/vmd.c Tue Sep 1 21:48:37 2020 (r365137) @@ -316,7 +316,6 @@ vmd_attach(device_t dev) goto fail; } - sc->vmd_btag = rman_get_bustag(sc->vmd_regs_resource[0]); sc->vmd_bhandle = rman_get_bushandle(sc->vmd_regs_resource[0]); @@ -366,7 +365,6 @@ vmd_attach(device_t dev) min_count - 1); } - /* * Add the initial resource to the rman. */ @@ -424,7 +422,6 @@ vmd_attach(device_t dev) goto fail; } - return (0); fail: @@ -517,7 +514,6 @@ vmd_pcib_route_interrupt(device_t pcib, device_t dev, { return (pcib_route_interrupt(pcib, dev, pin)); } - static int vmd_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, Modified: head/sys/dev/vmd/vmd_bus.c ============================================================================== --- head/sys/dev/vmd/vmd_bus.c Tue Sep 1 21:48:21 2020 (r365136) +++ head/sys/dev/vmd/vmd_bus.c Tue Sep 1 21:48:37 2020 (r365137) @@ -95,7 +95,7 @@ vmd_bus_attach(device_t dev) end = rman_get_end(sc->vmd_io_resource); resource_list_add_next(&dinfo->resources, SYS_RES_IOPORT, start, end, end - start + 1); - + bus_generic_attach(dev); return (0); From owner-svn-src-all@freebsd.org Tue Sep 1 21:48:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 33D1C37BD58; Tue, 1 Sep 2020 21:48:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1140bsWz4T6S; Tue, 1 Sep 2020 21:48:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ECF7C2001F; Tue, 1 Sep 2020 21:48:55 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lmtrp040499; Tue, 1 Sep 2020 21:48:55 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LmtTv040498; Tue, 1 Sep 2020 21:48:55 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012148.081LmtTv040498@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:48:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365138 - head/sys/dev/vkbd X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/vkbd X-SVN-Commit-Revision: 365138 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:48:56 -0000 Author: mjg Date: Tue Sep 1 21:48:55 2020 New Revision: 365138 URL: https://svnweb.freebsd.org/changeset/base/365138 Log: vkbd: clean up empty lines in .c and .h files Modified: head/sys/dev/vkbd/vkbd.c head/sys/dev/vkbd/vkbd_var.h Modified: head/sys/dev/vkbd/vkbd.c ============================================================================== --- head/sys/dev/vkbd/vkbd.c Tue Sep 1 21:48:37 2020 (r365137) +++ head/sys/dev/vkbd/vkbd.c Tue Sep 1 21:48:55 2020 (r365138) @@ -344,7 +344,7 @@ done: state->ks_flags &= ~READ; VKBD_UNLOCK(state); - + return (error); } @@ -649,7 +649,7 @@ vkbd_init(int unit, keyboard_t **kbdp, void *arg, int imin(fkeymap_size*sizeof(fkeymap[0]), sizeof(fkey_tab))); kbd_set_maps(kbd, keymap, accmap, fkeymap, fkeymap_size); kbd->kb_data = (void *)state; - + KBD_FOUND_DEVICE(kbd); KBD_PROBE_DONE(kbd); @@ -1071,7 +1071,7 @@ vkbd_check_char(keyboard_t *kbd) return (FALSE); state = (vkbd_state_t *) kbd->kb_data; - + VKBD_LOCK(state); if (!(state->ks_flags & COMPOSE) && (state->ks_composed_char > 0)) ready = TRUE; @@ -1377,4 +1377,3 @@ vkbd_modevent(module_t mod, int type, void *data) } DEV_MODULE(vkbd, vkbd_modevent, NULL); - Modified: head/sys/dev/vkbd/vkbd_var.h ============================================================================== --- head/sys/dev/vkbd/vkbd_var.h Tue Sep 1 21:48:37 2020 (r365137) +++ head/sys/dev/vkbd/vkbd_var.h Tue Sep 1 21:48:55 2020 (r365138) @@ -50,4 +50,3 @@ typedef struct vkbd_status vkbd_status_t; typedef struct vkbd_status * vkbd_status_p; #endif /* ndef _VKBD_VAR_H_ */ - From owner-svn-src-all@freebsd.org Tue Sep 1 21:49:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 850FA37C003; Tue, 1 Sep 2020 21:49:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh11R32nJz4TSX; Tue, 1 Sep 2020 21:49:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BAB71FFF4; Tue, 1 Sep 2020 21:49:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LnFJT040562; Tue, 1 Sep 2020 21:49:15 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LnE1M040558; Tue, 1 Sep 2020 21:49:14 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012149.081LnE1M040558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:49:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365139 - head/sys/dev/videomode X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/videomode X-SVN-Commit-Revision: 365139 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:49:15 -0000 Author: mjg Date: Tue Sep 1 21:49:14 2020 New Revision: 365139 URL: https://svnweb.freebsd.org/changeset/base/365139 Log: videomode: clean up empty lines in .c and .h files Modified: head/sys/dev/videomode/edid.c head/sys/dev/videomode/edidreg.h head/sys/dev/videomode/pickmode.c head/sys/dev/videomode/vesagtf.c Modified: head/sys/dev/videomode/edid.c ============================================================================== --- head/sys/dev/videomode/edid.c Tue Sep 1 21:48:55 2020 (r365138) +++ head/sys/dev/videomode/edid.c Tue Sep 1 21:49:14 2020 (r365139) @@ -133,10 +133,10 @@ edid_is_valid(uint8_t *d) { int sum = 0, i; uint8_t sig[8] = EDID_SIGNATURE; - + if (memcmp(d, sig, 8) != 0) return EINVAL; - + for (i = 0; i < 128; i++) sum += d[i]; if ((sum & 0xff) != 0) @@ -391,7 +391,7 @@ edid_det_timing(uint8_t *data, struct videomode *vmp) vblank = EDID_DET_TIMING_VBLANK(data); vsyncwid = EDID_DET_TIMING_VSYNC_WIDTH(data); vsyncoff = EDID_DET_TIMING_VSYNC_OFFSET(data); - + /* Borders are contained within the blank areas. */ vmp->hdisplay = hactive; @@ -644,4 +644,3 @@ edid_parse(uint8_t *data, struct edid_info *edid) return 0; } - Modified: head/sys/dev/videomode/edidreg.h ============================================================================== --- head/sys/dev/videomode/edidreg.h Tue Sep 1 21:48:55 2020 (r365138) +++ head/sys/dev/videomode/edidreg.h Tue Sep 1 21:49:14 2020 (r365139) @@ -54,7 +54,6 @@ #define EDID_OFFSET_MFG_TIMING 0x25 #define EDID_OFFSET_STD_TIMING 0x26 #define EDID_OFFSET_DESC_BLOCK 0x36 - #define EDID_SIGNATURE { 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0 } /* assume x is 16-bit value */ @@ -209,7 +208,6 @@ #define EDID_DET_TIMING_FLAG_VSYNC_POSITIVE 0x04 #define EDID_DET_TIMING_FLAG_HSYNC_POSITIVE 0x02 #define EDID_DET_TIMING_FLAG_STEREO_MODE 0x01 /* stereo mode */ - /* N.B.: these tests assume that we already checked for detailed timing! */ #define EDID_BLOCK_TYPE(ptr) ((ptr)[3]) Modified: head/sys/dev/videomode/pickmode.c ============================================================================== --- head/sys/dev/videomode/pickmode.c Tue Sep 1 21:48:55 2020 (r365138) +++ head/sys/dev/videomode/pickmode.c Tue Sep 1 21:49:14 2020 (r365139) @@ -77,7 +77,6 @@ pick_mode_by_ref(int width, int height, int refresh) DPRINTF("%s: looking for %d x %d at up to %d Hz\n", __func__, width, height, refresh); for (i = 0; i < videomode_count; i++) { - this = &videomode_list[i]; mref = this->dot_clock * 1000 / (this->htotal * this->vtotal); diff = abs(mref - refresh); Modified: head/sys/dev/videomode/vesagtf.c ============================================================================== --- head/sys/dev/videomode/vesagtf.c Tue Sep 1 21:48:55 2020 (r365138) +++ head/sys/dev/videomode/vesagtf.c Tue Sep 1 21:49:14 2020 (r365139) @@ -150,7 +150,6 @@ * */ - #ifdef _KERNEL #include @@ -203,7 +202,6 @@ print_value(int n, const char *name, unsigned val) #define print_value(n, name, val) #endif - /* * vert_refresh() - as defined by the GTF Timing Standard, compute the * Stage 1 Parameters using the vertical refresh frequency. In other @@ -565,7 +563,6 @@ vesagtf_mode_params(unsigned h_pixels, unsigned v_line print_value(22, "[H FREQ]", h_freq); #endif - /* Stage 1 computations are now complete; I should really pass the results to another function and do the Stage 2 From owner-svn-src-all@freebsd.org Tue Sep 1 21:49:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E6E9437C18A; Tue, 1 Sep 2020 21:49:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh11l5slRz4TM8; Tue, 1 Sep 2020 21:49:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE359200BC; Tue, 1 Sep 2020 21:49:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LnVvO040618; Tue, 1 Sep 2020 21:49:31 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LnVwA040617; Tue, 1 Sep 2020 21:49:31 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012149.081LnVwA040617@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:49:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365140 - head/sys/dev/viapm X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/viapm X-SVN-Commit-Revision: 365140 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:49:32 -0000 Author: mjg Date: Tue Sep 1 21:49:31 2020 New Revision: 365140 URL: https://svnweb.freebsd.org/changeset/base/365140 Log: viapm: clean up empty lines in .c and .h files Modified: head/sys/dev/viapm/viapm.c Modified: head/sys/dev/viapm/viapm.c ============================================================================== --- head/sys/dev/viapm/viapm.c Tue Sep 1 21:49:14 2020 (r365139) +++ head/sys/dev/viapm/viapm.c Tue Sep 1 21:49:31 2020 (r365140) @@ -178,7 +178,6 @@ static devclass_t viapropm_devclass; #define SMBSCTRL_ENABLE 0x01 /* enable slave */ - /* * VIA8233 definitions */ @@ -243,7 +242,6 @@ viapm_586b_probe(device_t dev) return ENXIO; } - static int viapm_pro_probe(device_t dev) { @@ -528,7 +526,7 @@ viabb_setsda(device_t dev, int data) return; } - + static int viabb_reset(device_t dev, u_char speed, u_char addr, u_char *oldaddr) { @@ -987,7 +985,7 @@ static device_method_t viapropm_methods[] = { DEVMETHOD(smbus_readw, viasmb_readw), DEVMETHOD(smbus_bwrite, viasmb_bwrite), DEVMETHOD(smbus_bread, viasmb_bread), - + /* Bus interface */ DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), From owner-svn-src-all@freebsd.org Tue Sep 1 21:49:50 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E74337BF5D; Tue, 1 Sep 2020 21:49:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1263L5Mz4Tlb; Tue, 1 Sep 2020 21:49:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 56AA82015A; Tue, 1 Sep 2020 21:49:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lnoc4040685; Tue, 1 Sep 2020 21:49:50 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LnnJb040682; Tue, 1 Sep 2020 21:49:49 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012149.081LnnJb040682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:49:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365141 - head/sys/dev/vge X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/vge X-SVN-Commit-Revision: 365141 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:49:50 -0000 Author: mjg Date: Tue Sep 1 21:49:49 2020 New Revision: 365141 URL: https://svnweb.freebsd.org/changeset/base/365141 Log: vge: clean up empty lines in .c and .h files Modified: head/sys/dev/vge/if_vge.c head/sys/dev/vge/if_vgereg.h head/sys/dev/vge/if_vgevar.h Modified: head/sys/dev/vge/if_vge.c ============================================================================== --- head/sys/dev/vge/if_vge.c Tue Sep 1 21:49:31 2020 (r365140) +++ head/sys/dev/vge/if_vge.c Tue Sep 1 21:49:49 2020 (r365141) @@ -556,7 +556,6 @@ vge_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_i return (1); } - /* * Program the multicast filter. We use the 64-entry CAM filter * for perfect filtering. If there's more than 64 multicast addresses, @@ -1953,7 +1952,6 @@ vge_start(struct ifnet *ifp) vge_start_locked(ifp); VGE_UNLOCK(sc); } - static void vge_start_locked(struct ifnet *ifp) Modified: head/sys/dev/vge/if_vgereg.h ============================================================================== --- head/sys/dev/vge/if_vgereg.h Tue Sep 1 21:49:31 2020 (r365140) +++ head/sys/dev/vge/if_vgereg.h Tue Sep 1 21:49:49 2020 (r365141) @@ -396,7 +396,6 @@ * 0xC0 (controls which pattern is set) */ - #define VGE_CAMCTL_WRITE 0x04 /* CAM write command */ #define VGE_CAMCTL_READ 0x08 /* CAM read command */ #define VGE_CAMCTL_INTPKT_SIZ 0x10 /* select interesting pkt CAM size */ Modified: head/sys/dev/vge/if_vgevar.h ============================================================================== --- head/sys/dev/vge/if_vgevar.h Tue Sep 1 21:49:31 2020 (r365140) +++ head/sys/dev/vge/if_vgevar.h Tue Sep 1 21:49:49 2020 (r365141) @@ -246,4 +246,3 @@ struct vge_softc { #define VGE_RXCHUNK 4 #define VGE_TIMEOUT 10000 - From owner-svn-src-all@freebsd.org Tue Sep 1 21:50:03 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E9B837C1B5; Tue, 1 Sep 2020 21:50:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh12M0nvTz4Tph; Tue, 1 Sep 2020 21:50:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EABD82015E; Tue, 1 Sep 2020 21:50:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lo23E040786; Tue, 1 Sep 2020 21:50:02 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lo093040776; Tue, 1 Sep 2020 21:50:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012150.081Lo093040776@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:50:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365142 - head/sys/dev/uart X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/uart X-SVN-Commit-Revision: 365142 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:50:03 -0000 Author: mjg Date: Tue Sep 1 21:50:00 2020 New Revision: 365142 URL: https://svnweb.freebsd.org/changeset/base/365142 Log: uart: clean up empty lines in .c and .h files Modified: head/sys/dev/uart/uart_bus_acpi.c head/sys/dev/uart/uart_bus_pccard.c head/sys/dev/uart/uart_cpu_powerpc.c head/sys/dev/uart/uart_dev_imx.h head/sys/dev/uart/uart_dev_mu.c head/sys/dev/uart/uart_dev_mvebu.c head/sys/dev/uart/uart_dev_ns8250.c head/sys/dev/uart/uart_dev_ns8250.h head/sys/dev/uart/uart_dev_pl011.c head/sys/dev/uart/uart_dev_quicc.c Modified: head/sys/dev/uart/uart_bus_acpi.c ============================================================================== --- head/sys/dev/uart/uart_bus_acpi.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_bus_acpi.c Tue Sep 1 21:50:00 2020 (r365142) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int uart_acpi_probe(device_t dev); static device_method_t uart_acpi_methods[] = { Modified: head/sys/dev/uart/uart_bus_pccard.c ============================================================================== --- head/sys/dev/uart/uart_bus_pccard.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_bus_pccard.c Tue Sep 1 21:50:00 2020 (r365142) @@ -53,7 +53,6 @@ static device_method_t uart_pccard_methods[] = { DEVMETHOD(device_probe, uart_pccard_probe), DEVMETHOD(device_attach, uart_pccard_attach), DEVMETHOD(device_detach, uart_bus_detach), - { 0, 0 } }; Modified: head/sys/dev/uart/uart_cpu_powerpc.c ============================================================================== --- head/sys/dev/uart/uart_cpu_powerpc.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_cpu_powerpc.c Tue Sep 1 21:50:00 2020 (r365142) @@ -99,7 +99,7 @@ ofw_get_console_phandle_path(phandle_t node, phandle_t output = OF_finddevice(field.buf); if (output == -1 && size == 4) output = OF_instance_to_package(field.ref); - + if (output != -1) { *result = output; return (0); @@ -202,4 +202,3 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) di->parity = UART_PARITY_NONE; return (0); } - Modified: head/sys/dev/uart/uart_dev_imx.h ============================================================================== --- head/sys/dev/uart/uart_dev_imx.h Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_imx.h Tue Sep 1 21:50:00 2020 (r365142) @@ -217,5 +217,4 @@ #define DIS(_bas, _r, _b) CLR((_bas), REG(_r), FLD(_r, _b)) #define IS(_bas, _r, _b) IS_SET((_bas), REG(_r), FLD(_r, _b)) - #endif /* _UART_DEV_IMX5XX_H */ Modified: head/sys/dev/uart/uart_dev_mu.c ============================================================================== --- head/sys/dev/uart/uart_dev_mu.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_mu.c Tue Sep 1 21:50:00 2020 (r365142) @@ -101,7 +101,7 @@ __FBSDID("$FreeBSD$"); #define AUX_MU_MCR_REG 0x04 #define AUX_MCR_RTS (1<<1) - + #define AUX_MU_LSR_REG 0x05 #define LSR_RXREADY (1) #define LSR_OVRRUN (1<<1) @@ -153,7 +153,7 @@ static struct uart_ops uart_mu_ops = { static int uart_mu_probe(struct uart_bas *bas) { - + return (0); } @@ -169,7 +169,7 @@ uart_mu_param(struct uart_bas *bas, int baudrate, int { uint32_t line; uint32_t baud; - + /* * Zero all settings to make sure * UART is disabled and not configured @@ -199,7 +199,7 @@ uart_mu_param(struct uart_bas *bas, int baudrate, int */ __uart_setreg(bas, AUX_MU_BAUD_REG, ((uint32_t)(baud & 0xFFFF))); } - + /* re-enable UART */ __uart_setreg(bas, AUX_MU_CNTL_REG, CNTL_RXENAB|CNTL_TXENAB); } @@ -283,7 +283,6 @@ static kobj_method_t uart_mu_methods[] = { KOBJMETHOD(uart_transmit, uart_mu_bus_transmit), KOBJMETHOD(uart_grab, uart_mu_bus_grab), KOBJMETHOD(uart_ungrab, uart_mu_bus_ungrab), - { 0, 0 } }; @@ -319,7 +318,7 @@ uart_mu_bus_attach(struct uart_softc *sc) psc->aux_ier = (IER_RXENABLE|IER_TXENABLE|IER_REQUIRED); __uart_setreg(bas, AUX_MU_IER_REG, psc->aux_ier); sc->sc_txbusy = 0; - + return (0); } @@ -375,7 +374,7 @@ uart_mu_bus_ipend(struct uart_softc *sc) struct uart_bas *bas; uint32_t ints; int ipend; - + psc = (struct uart_mu_softc *)sc; bas = &sc->sc_bas; @@ -436,11 +435,11 @@ uart_mu_bus_receive(struct uart_softc *sc) struct uart_bas *bas; uint32_t lsr, xc; int rx; - + bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); psc = (struct uart_mu_softc *)sc; - + lsr = __uart_getreg(bas, AUX_MU_LSR_REG); while (lsr & LSR_RXREADY) { xc = __uart_getreg(bas, AUX_MU_IO_REG); @@ -470,7 +469,7 @@ uart_mu_bus_transmit(struct uart_softc *sc) struct uart_mu_softc *psc; struct uart_bas *bas; int i; - + psc = (struct uart_mu_softc *)sc; bas = &sc->sc_bas; uart_lock(sc->sc_hwmtx); Modified: head/sys/dev/uart/uart_dev_mvebu.c ============================================================================== --- head/sys/dev/uart/uart_dev_mvebu.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_mvebu.c Tue Sep 1 21:50:00 2020 (r365142) @@ -614,4 +614,3 @@ uart_mvebu_bus_ungrab(struct uart_softc *sc) uart_barrier(bas); uart_unlock(sc->sc_hwmtx); } - Modified: head/sys/dev/uart/uart_dev_ns8250.c ============================================================================== --- head/sys/dev/uart/uart_dev_ns8250.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_ns8250.c Tue Sep 1 21:50:00 2020 (r365142) @@ -514,19 +514,19 @@ ns8250_bus_attach(struct uart_softc *sc) ns8250->fcr |= FCR_RX_MEDH; } else ns8250->fcr |= FCR_RX_MEDH; - + /* Get IER mask */ ivar = 0xf0; resource_int_value("uart", device_get_unit(sc->sc_dev), "ier_mask", &ivar); ns8250->ier_mask = (uint8_t)(ivar & 0xff); - + /* Get IER RX interrupt bits */ ivar = IER_EMSC | IER_ERLS | IER_ERXRDY; resource_int_value("uart", device_get_unit(sc->sc_dev), "ier_rxbits", &ivar); ns8250->ier_rxbits = (uint8_t)(ivar & 0xff); - + uart_setreg(bas, REG_FCR, ns8250->fcr); uart_barrier(bas); ns8250_bus_flush(sc, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER); Modified: head/sys/dev/uart/uart_dev_ns8250.h ============================================================================== --- head/sys/dev/uart/uart_dev_ns8250.h Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_ns8250.h Tue Sep 1 21:50:00 2020 (r365142) @@ -39,7 +39,7 @@ struct ns8250_softc { uint8_t fcr; uint8_t ier; uint8_t mcr; - + uint8_t ier_mask; uint8_t ier_rxbits; uint8_t busy_detect; Modified: head/sys/dev/uart/uart_dev_pl011.c ============================================================================== --- head/sys/dev/uart/uart_dev_pl011.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_pl011.c Tue Sep 1 21:50:00 2020 (r365142) @@ -317,7 +317,6 @@ static kobj_method_t uart_pl011_methods[] = { KOBJMETHOD(uart_transmit, uart_pl011_bus_transmit), KOBJMETHOD(uart_grab, uart_pl011_bus_grab), KOBJMETHOD(uart_ungrab, uart_pl011_bus_ungrab), - { 0, 0 } }; @@ -330,7 +329,6 @@ static struct uart_class uart_pl011_class = { .uc_rclk = 0, .uc_rshift = 2 }; - #ifdef FDT static struct ofw_compat_data fdt_compat_data[] = { Modified: head/sys/dev/uart/uart_dev_quicc.c ============================================================================== --- head/sys/dev/uart/uart_dev_quicc.c Tue Sep 1 21:49:49 2020 (r365141) +++ head/sys/dev/uart/uart_dev_quicc.c Tue Sep 1 21:50:00 2020 (r365142) @@ -522,4 +522,3 @@ quicc_bus_ungrab(struct uart_softc *sc) quicc_write2(bas, rb, st | 0x9000); uart_unlock(sc->sc_hwmtx); } - From owner-svn-src-all@freebsd.org Tue Sep 1 21:50:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D711D37C177; Tue, 1 Sep 2020 21:50:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh12k5PcZz4Tqr; Tue, 1 Sep 2020 21:50:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D6FC2022B; Tue, 1 Sep 2020 21:50:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LoMlr040848; Tue, 1 Sep 2020 21:50:22 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LoMqj040847; Tue, 1 Sep 2020 21:50:22 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012150.081LoMqj040847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:50:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365143 - head/sys/dev/tsec X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/tsec X-SVN-Commit-Revision: 365143 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:50:22 -0000 Author: mjg Date: Tue Sep 1 21:50:21 2020 New Revision: 365143 URL: https://svnweb.freebsd.org/changeset/base/365143 Log: tsec: clean up empty lines in .c and .h files Modified: head/sys/dev/tsec/if_tsec.c head/sys/dev/tsec/if_tsec.h Modified: head/sys/dev/tsec/if_tsec.c ============================================================================== --- head/sys/dev/tsec/if_tsec.c Tue Sep 1 21:50:00 2020 (r365142) +++ head/sys/dev/tsec/if_tsec.c Tue Sep 1 21:50:21 2020 (r365143) @@ -269,7 +269,7 @@ tsec_attach(struct tsec_softc *sc) /* Advertise that polling is supported */ ifp->if_capabilities |= IFCAP_POLLING; #endif - + /* Attach PHY(s) */ error = mii_attach(sc->dev, &sc->tsec_miibus, ifp, tsec_ifmedia_upd, tsec_ifmedia_sts, BMSR_DEFCAPMASK, sc->phyaddr, MII_OFFSET_ANY, @@ -373,7 +373,6 @@ tsec_mii_wait(struct tsec_softc *sc, uint32_t flags) return (timeout == 0); } - static void tsec_init_locked(struct tsec_softc *sc) { @@ -556,7 +555,7 @@ tsec_init_locked(struct tsec_softc *sc) /* Step 26: Setup multicast filters */ tsec_setup_multicast(sc); - + /* Step 27: Activate network interface */ ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; @@ -742,7 +741,6 @@ tsec_start_locked(struct ifnet *ifp) BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); for (;;) { - if (TSEC_FREE_TX_DESC(sc) < TSEC_TX_MAX_DMA_SEGS) { /* No free descriptors */ ifp->if_drv_flags |= IFF_DRV_OACTIVE; @@ -806,7 +804,7 @@ tsec_encap(struct ifnet *ifp, struct tsec_softc *sc, s tx_idx = sc->tx_idx_head; tx_bufmap = &sc->tx_bufmap[tx_idx]; - + /* Create mapping in DMA memory */ error = bus_dmamap_load_mbuf_sg(sc->tsec_tx_mtag, tx_bufmap->map, m0, segs, &nsegs, BUS_DMA_NOWAIT); @@ -831,7 +829,7 @@ tsec_encap(struct ifnet *ifp, struct tsec_softc *sc, s bus_dmamap_sync(sc->tsec_tx_mtag, tx_bufmap->map, BUS_DMASYNC_PREWRITE); tx_bufmap->mbuf = m0; - + /* * Fill in the TX descriptors back to front so that READY bit in first * descriptor is set last. @@ -1328,7 +1326,6 @@ tsec_receive_intr_locked(struct tsec_softc *sc, int co if (flags & (TSEC_RXBD_LG | TSEC_RXBD_SH | TSEC_RXBD_NO | TSEC_RXBD_CR | TSEC_RXBD_OV | TSEC_RXBD_TR)) { - rx_desc->length = 0; rx_desc->flags = (rx_desc->flags & ~TSEC_RXBD_ZEROONINIT) | TSEC_RXBD_E | TSEC_RXBD_I; @@ -1847,7 +1844,6 @@ tsec_offload_setup(struct tsec_softc *sc) TSEC_WRITE(sc, TSEC_REG_RCTRL, reg); } - static void tsec_offload_process_frame(struct tsec_softc *sc, struct mbuf *m) { @@ -1871,7 +1867,6 @@ tsec_offload_process_frame(struct tsec_softc *sc, stru if ((protocol == IPPROTO_TCP || protocol == IPPROTO_UDP) && TSEC_RX_FCB_TCP_UDP_CSUM_CHECKED(flags) && (flags & TSEC_RX_FCB_TCP_UDP_CSUM_ERROR) == 0) { - csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR; m->m_pkthdr.csum_data = 0xFFFF; } Modified: head/sys/dev/tsec/if_tsec.h ============================================================================== --- head/sys/dev/tsec/if_tsec.h Tue Sep 1 21:50:00 2020 (r365142) +++ head/sys/dev/tsec/if_tsec.h Tue Sep 1 21:50:21 2020 (r365143) @@ -56,7 +56,7 @@ struct tsec_bufmap { struct tsec_softc { /* XXX MII bus requires that struct ifnet is first!!! */ struct ifnet *tsec_ifp; - + struct mtx transmit_lock; /* transmitter lock */ struct mtx receive_lock; /* receiver lock */ From owner-svn-src-all@freebsd.org Tue Sep 1 21:50:35 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DDC6B37C0EE; Tue, 1 Sep 2020 21:50:35 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh12z1Lrqz4Tyh; Tue, 1 Sep 2020 21:50:35 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D80D2028C; Tue, 1 Sep 2020 21:50:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LoXIK040908; Tue, 1 Sep 2020 21:50:33 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LoWND040900; Tue, 1 Sep 2020 21:50:32 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012150.081LoWND040900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:50:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365144 - head/sys/dev/tpm X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/tpm X-SVN-Commit-Revision: 365144 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:50:36 -0000 Author: mjg Date: Tue Sep 1 21:50:31 2020 New Revision: 365144 URL: https://svnweb.freebsd.org/changeset/base/365144 Log: tpm: clean up empty lines in .c and .h files Modified: head/sys/dev/tpm/tpm.c head/sys/dev/tpm/tpm20.c head/sys/dev/tpm/tpm20.h head/sys/dev/tpm/tpm_acpi.c head/sys/dev/tpm/tpm_crb.c head/sys/dev/tpm/tpm_tis.c Modified: head/sys/dev/tpm/tpm.c ============================================================================== --- head/sys/dev/tpm/tpm.c Tue Sep 1 21:50:21 2020 (r365143) +++ head/sys/dev/tpm/tpm.c Tue Sep 1 21:50:31 2020 (r365144) @@ -146,7 +146,6 @@ __FBSDID("$FreeBSD$"); /* Set when enabling legacy interface in host bridge. */ int tpm_enabled; - #ifdef __FreeBSD__ #define TPMSOFTC(dev) \ ((struct tpm_softc *)dev->si_drv1) @@ -244,7 +243,6 @@ tpm_identify(driver_t *driver, device_t parent) } #endif - int tpm_attach(device_t dev) { @@ -270,7 +268,7 @@ tpm_attach(device_t dev) /* In case PnP probe this may contain some initialization. */ tpm_tis12_probe(sc->sc_bt, sc->sc_bh); - + if (tpm_legacy_probe(sc->sc_bt, sc->sc_bh)) { sc->sc_init = tpm_legacy_init; sc->sc_start = tpm_legacy_start; @@ -330,7 +328,6 @@ tpm_detach(device_t dev) return 0; } - #else /* Modified: head/sys/dev/tpm/tpm20.c ============================================================================== --- head/sys/dev/tpm/tpm20.c Tue Sep 1 21:50:21 2020 (r365143) +++ head/sys/dev/tpm/tpm20.c Tue Sep 1 21:50:31 2020 (r365144) @@ -177,7 +177,6 @@ tpm20_close(struct cdev *dev, int flag, int mode, stru return (0); } - int tpm20_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) @@ -234,7 +233,6 @@ tpm20_release(struct tpm_sc *sc) destroy_dev(sc->sc_cdev); } - int tpm20_suspend(device_t dev) { @@ -266,7 +264,6 @@ tpm20_harvest(void *arg) 0x00, 0x00, 0x01, 0x7b, /* cmd TPM_CC_GetRandom */ 0x00, TPM_HARVEST_SIZE /* number of bytes requested */ }; - sc = arg; sx_xlock(&sc->dev_lock); Modified: head/sys/dev/tpm/tpm20.h ============================================================================== --- head/sys/dev/tpm/tpm20.h Tue Sep 1 21:50:21 2020 (r365143) +++ head/sys/dev/tpm/tpm20.h Tue Sep 1 21:50:31 2020 (r365144) @@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$"); #define TPM_CDEV_NAME "tpm0" #define TPM_CDEV_PERM_FLAG 0600 - #define TPM2_START_METHOD_ACPI 2 #define TPM2_START_METHOD_TIS 6 #define TPM2_START_METHOD_CRB 7 Modified: head/sys/dev/tpm/tpm_acpi.c ============================================================================== --- head/sys/dev/tpm/tpm_acpi.c Tue Sep 1 21:50:21 2020 (r365143) +++ head/sys/dev/tpm/tpm_acpi.c Tue Sep 1 21:50:31 2020 (r365144) @@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$"); #include #include - - char *tpm_ids[] = {"ATM1200", "BCM0102", "INTC0102", "SNO3504", "WEC1000", "PNP0C31", NULL}; @@ -53,7 +51,7 @@ static int tpm_acpi_probe(device_t dev) { int rv; - + rv = ACPI_ID_PROBE(device_get_parent(dev), dev, tpm_ids, NULL); if (rv <= 0) device_set_desc(dev, "Trusted Platform Module"); Modified: head/sys/dev/tpm/tpm_crb.c ============================================================================== --- head/sys/dev/tpm/tpm_crb.c Tue Sep 1 21:50:21 2020 (r365143) +++ head/sys/dev/tpm/tpm_crb.c Tue Sep 1 21:50:31 2020 (r365144) @@ -85,7 +85,6 @@ struct tpmcrb_sc { size_t rsp_buf_size; }; - int tpmcrb_transmit(struct tpm_sc *sc, size_t size); static int tpmcrb_acpi_probe(device_t dev); Modified: head/sys/dev/tpm/tpm_tis.c ============================================================================== --- head/sys/dev/tpm/tpm_tis.c Tue Sep 1 21:50:21 2020 (r365143) +++ head/sys/dev/tpm/tpm_tis.c Tue Sep 1 21:50:31 2020 (r365144) @@ -331,7 +331,6 @@ tpmtis_write_bytes(struct tpm_sc *sc, size_t count, ui return (true); } - static bool tpmtis_request_locality(struct tpm_sc *sc, int locality) { From owner-svn-src-all@freebsd.org Tue Sep 1 21:50:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 47AC737C066; Tue, 1 Sep 2020 21:50:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh13D604kz4VD9; Tue, 1 Sep 2020 21:50:48 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 84EB2200CC; Tue, 1 Sep 2020 21:50:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lolb2040961; Tue, 1 Sep 2020 21:50:47 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lolvj040960; Tue, 1 Sep 2020 21:50:47 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012150.081Lolvj040960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:50:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365145 - head/sys/dev/ti X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ti X-SVN-Commit-Revision: 365145 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:50:49 -0000 Author: mjg Date: Tue Sep 1 21:50:47 2020 New Revision: 365145 URL: https://svnweb.freebsd.org/changeset/base/365145 Log: ti: clean up empty lines in .c and .h files Modified: head/sys/dev/ti/if_ti.c Modified: head/sys/dev/ti/if_ti.c ============================================================================== --- head/sys/dev/ti/if_ti.c Tue Sep 1 21:50:31 2020 (r365144) +++ head/sys/dev/ti/if_ti.c Tue Sep 1 21:50:47 2020 (r365145) @@ -166,7 +166,6 @@ static const struct ti_type ti_devs[] = { { 0, 0, NULL } }; - static d_open_t ti_open; static d_close_t ti_close; static d_ioctl_t ti_ioctl2; @@ -446,7 +445,6 @@ ti_mem_read(struct ti_softc *sc, uint32_t addr, uint32 } } - /* * NIC memory write function. * Can be used to copy data into NIC local memory. @@ -587,7 +585,6 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr, TI_LOCK(sc); } else { if (first_pass) { - ti_bcopy_swap(sc->ti_membuf, sc->ti_membuf2, segsize, TI_SWAP_NTOH); @@ -2665,7 +2662,6 @@ ti_hdr_split(struct mbuf *top, int hdr_len, int pkt_le if (m) { m_freem(m); mp->m_next = NULL; - } if (mp->m_next != NULL) panic("ti_hdr_split: last mbuf in chain should be null"); From owner-svn-src-all@freebsd.org Tue Sep 1 21:51:11 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6B14137C07E; Tue, 1 Sep 2020 21:51:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh13g24m6z4VM3; Tue, 1 Sep 2020 21:51:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2BF0620309; Tue, 1 Sep 2020 21:51:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LpAwD041874; Tue, 1 Sep 2020 21:51:10 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LpAwI041873; Tue, 1 Sep 2020 21:51:10 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012151.081LpAwI041873@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:51:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365146 - head/sys/dev/tdfx X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/tdfx X-SVN-Commit-Revision: 365146 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:51:11 -0000 Author: mjg Date: Tue Sep 1 21:51:10 2020 New Revision: 365146 URL: https://svnweb.freebsd.org/changeset/base/365146 Log: tdfx: clean up empty lines in .c and .h files Modified: head/sys/dev/tdfx/tdfx_linux.h head/sys/dev/tdfx/tdfx_pci.c Modified: head/sys/dev/tdfx/tdfx_linux.h ============================================================================== --- head/sys/dev/tdfx/tdfx_linux.h Tue Sep 1 21:50:47 2020 (r365145) +++ head/sys/dev/tdfx/tdfx_linux.h Tue Sep 1 21:51:10 2020 (r365146) @@ -33,7 +33,6 @@ * $FreeBSD$ */ - #include #include #include Modified: head/sys/dev/tdfx/tdfx_pci.c ============================================================================== --- head/sys/dev/tdfx/tdfx_pci.c Tue Sep 1 21:50:47 2020 (r365145) +++ head/sys/dev/tdfx/tdfx_pci.c Tue Sep 1 21:51:10 2020 (r365146) @@ -75,13 +75,10 @@ __FBSDID("$FreeBSD$"); #include #include - static devclass_t tdfx_devclass; - static int tdfx_count = 0; - /* Set up the boot probe/attach routines */ static device_method_t tdfx_methods[] = { DEVMETHOD(device_probe, tdfx_probe), @@ -250,7 +247,7 @@ tdfx_attach(device_t dev) { tdfx_info->devt = make_dev(&tdfx_cdev, device_get_unit(dev), UID_ROOT, GID_WHEEL, 0600, "3dfx%x", device_get_unit(dev)); tdfx_info->devt->si_drv1 = tdfx_info; - + return 0; } @@ -259,7 +256,7 @@ tdfx_detach(device_t dev) { struct tdfx_softc* tdfx_info; int retval; tdfx_info = device_get_softc(dev); - + /* Delete allocated resource, of course */ bus_release_resource(dev, SYS_RES_MEMORY, tdfx_info->memrid, tdfx_info->memrange); @@ -303,12 +300,12 @@ tdfx_clrmtrr(device_t dev) { */ int retval, act; struct tdfx_softc *tdfx_info = device_get_softc(dev); - + act = MEMRANGE_SET_REMOVE; retval = mem_range_attr_set(&tdfx_info->mrdesc, &act); return retval; } - + static int tdfx_setmtrr(device_t dev) { /* @@ -426,13 +423,13 @@ tdfx_mmap(struct cdev *dev, vm_ooffset_t offset, vm_pa /**** OLD GET CONFIG ****/ /* struct tdfx_softc* tdfx_info; */ - + /* Get the configuration for our card XXX*/ /*tdfx_info = dev->si_drv1; */ /************************/ struct tdfx_softc* tdfx_info[2]; - + tdfx_info[0] = (struct tdfx_softc*)devclass_get_softc(tdfx_devclass, 0); /* If, for some reason, its not configured, we bail out */ @@ -449,7 +446,7 @@ tdfx_mmap(struct cdev *dev, vm_ooffset_t offset, vm_pa *paddr = rman_get_start(tdfx_info[0]->memrange) + offset; return 0; } - + if(tdfx_count > 1) { tdfx_info[1] = (struct tdfx_softc*)devclass_get_softc(tdfx_devclass, 1); if((offset & 0xff000000) == tdfx_info[1]->addr0) { @@ -552,7 +549,6 @@ tdfx_query_fetch(u_int cmd, struct tdfx_pio_data *piod return -EINVAL; } - /* Read the value and return */ switch(piod->size) { case 1: @@ -675,7 +671,7 @@ tdfx_do_pio_rd(struct tdfx_pio_data *piod) (piod->port != SC_DATA) || (piod->port != VGA_MISC_OUTPUT_READ)) && (piod->port < tdfx_info->pio0) && (piod->port > tdfx_info->pio0max)) return -EPERM; - + /* All VGA STATUS REGS are byte registers, size should never be > 1 */ if(piod->size != 1) { return -EINVAL; @@ -702,7 +698,7 @@ tdfx_do_pio_wt(struct tdfx_pio_data *piod) (piod->port != VGA_MISC_OUTPUT_READ)) /* Can't write VGA_ST_1C */ && (piod->port < tdfx_info->pio0) && (piod->port > tdfx_info->pio0max)) return -EPERM; - + /* All VGA STATUS REGS are byte registers, size should never be > 1 */ if(piod->size != 1) { return -EINVAL; From owner-svn-src-all@freebsd.org Tue Sep 1 21:51:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F1BE737C140; Tue, 1 Sep 2020 21:51:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh14B68rnz4VYh; Tue, 1 Sep 2020 21:51:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B2BB92029F; Tue, 1 Sep 2020 21:51:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LpcF2044995; Tue, 1 Sep 2020 21:51:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lpc8G044994; Tue, 1 Sep 2020 21:51:38 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012151.081Lpc8G044994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:51:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365147 - head/sys/dev/tcp_log X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/tcp_log X-SVN-Commit-Revision: 365147 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:51:39 -0000 Author: mjg Date: Tue Sep 1 21:51:38 2020 New Revision: 365147 URL: https://svnweb.freebsd.org/changeset/base/365147 Log: tcp_log: clean up empty lines in .c and .h files Modified: head/sys/dev/tcp_log/tcp_log_dev.c Modified: head/sys/dev/tcp_log/tcp_log_dev.c ============================================================================== --- head/sys/dev/tcp_log/tcp_log_dev.c Tue Sep 1 21:51:10 2020 (r365146) +++ head/sys/dev/tcp_log/tcp_log_dev.c Tue Sep 1 21:51:38 2020 (r365147) @@ -89,7 +89,6 @@ static int tcp_log_dev_ioctl(struct cdev *dev __unused static int tcp_log_dev_poll(struct cdev *dev __unused, int events, struct thread *td); - enum tcp_log_dev_queue_lock_state { QUEUE_UNLOCKED = 0, QUEUE_LOCKED, From owner-svn-src-all@freebsd.org Tue Sep 1 21:51:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6162B37C2EF; Tue, 1 Sep 2020 21:51:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh14X1yssz4Vl0; Tue, 1 Sep 2020 21:51:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 281C22038D; Tue, 1 Sep 2020 21:51:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LpuGX045071; Tue, 1 Sep 2020 21:51:56 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lpt7G045068; Tue, 1 Sep 2020 21:51:55 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012151.081Lpt7G045068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:51:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365148 - head/sys/dev/sym X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/sym X-SVN-Commit-Revision: 365148 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:51:56 -0000 Author: mjg Date: Tue Sep 1 21:51:55 2020 New Revision: 365148 URL: https://svnweb.freebsd.org/changeset/base/365148 Log: sym: clean up empty lines in .c and .h files Modified: head/sys/dev/sym/sym_defs.h head/sys/dev/sym/sym_hipd.c Modified: head/sys/dev/sym/sym_defs.h ============================================================================== --- head/sys/dev/sym/sym_defs.h Tue Sep 1 21:51:38 2020 (r365147) +++ head/sys/dev/sym/sym_defs.h Tue Sep 1 21:51:55 2020 (r365148) @@ -674,7 +674,6 @@ struct sym_tblsel { #define SCR_ACK 0x00000040 #define SCR_ATN 0x00000008 - /*----------------------------------------------------------- * * Memory to memory move @@ -736,7 +735,6 @@ struct sym_tblsel { #define SCR_REG_REG(reg,op,data) \ (0x78000000 | (SCR_REG_OFS(REG(reg))) | (op) | (((data)&0xff)<<8ul)) - #define SCR_LOAD 0x00000000 #define SCR_SHL 0x01000000 #define SCR_OR 0x02000000 @@ -814,7 +812,6 @@ struct sym_tblsel { #define SCR_STORE_REL(reg, n) SCR_STORE_R(reg, SCR_NO_FLUSH2|SCR_DSA_REL2,n) #define SCR_STORE_ABS_F(reg, n) SCR_STORE_R(reg, 0, n) #define SCR_STORE_REL_F(reg, n) SCR_STORE_R(reg, SCR_DSA_REL2, n) - /*----------------------------------------------------------- * Modified: head/sys/dev/sym/sym_hipd.c ============================================================================== --- head/sys/dev/sym/sym_hipd.c Tue Sep 1 21:51:38 2020 (r365147) +++ head/sys/dev/sym/sym_hipd.c Tue Sep 1 21:51:55 2020 (r365148) @@ -2007,7 +2007,6 @@ static void sym_fw_bind_script (hcb_p np, u32 *start, end = start + len/4; while (cur < end) { - opcode = *cur; /* @@ -9214,7 +9213,6 @@ static void S24C16_set_bit(hcb_p np, u_char write_bit, case CLR_CLK: *gpreg &= 0xfd; break; - } OUTB (nc_gpreg, *gpreg); UDELAY (5); @@ -9526,7 +9524,6 @@ static int T93C46_Read_Data(hcb_p np, u_short *data,in int x; for (x = 0; x < len; x++) { - /* output read command and address */ T93C46_Send_Command(np, 0x180 | x, &read_bit, gpreg); if (read_bit & 0x01) From owner-svn-src-all@freebsd.org Tue Sep 1 21:52:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AB98937C5DF; Tue, 1 Sep 2020 21:52:07 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh14l3G0bz4Vtq; Tue, 1 Sep 2020 21:52:07 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A0F820045; Tue, 1 Sep 2020 21:52:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lq64w045863; Tue, 1 Sep 2020 21:52:06 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lq6Ne045862; Tue, 1 Sep 2020 21:52:06 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012152.081Lq6Ne045862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:52:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365149 - head/sys/dev/superio X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/superio X-SVN-Commit-Revision: 365149 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:52:07 -0000 Author: mjg Date: Tue Sep 1 21:52:05 2020 New Revision: 365149 URL: https://svnweb.freebsd.org/changeset/base/365149 Log: superio: clean up empty lines in .c and .h files Modified: head/sys/dev/superio/superio.c Modified: head/sys/dev/superio/superio.c ============================================================================== --- head/sys/dev/superio/superio.c Tue Sep 1 21:51:55 2020 (r365148) +++ head/sys/dev/superio/superio.c Tue Sep 1 21:52:05 2020 (r365149) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include "isa_if.h" - typedef void (*sio_conf_enter_f)(struct resource*, uint16_t); typedef void (*sio_conf_exit_f)(struct resource*, uint16_t); From owner-svn-src-all@freebsd.org Tue Sep 1 21:52:21 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4831E37C64F; Tue, 1 Sep 2020 21:52:21 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1506twKz4WB8; Tue, 1 Sep 2020 21:52:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B82A82031A; Tue, 1 Sep 2020 21:52:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LqKIS045919; Tue, 1 Sep 2020 21:52:20 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LqKfL045918; Tue, 1 Sep 2020 21:52:20 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012152.081LqKfL045918@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:52:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365150 - head/sys/dev/stge X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/stge X-SVN-Commit-Revision: 365150 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:52:21 -0000 Author: mjg Date: Tue Sep 1 21:52:20 2020 New Revision: 365150 URL: https://svnweb.freebsd.org/changeset/base/365150 Log: stge: clean up empty lines in .c and .h files Modified: head/sys/dev/stge/if_stge.c Modified: head/sys/dev/stge/if_stge.c ============================================================================== --- head/sys/dev/stge/if_stge.c Tue Sep 1 21:52:05 2020 (r365149) +++ head/sys/dev/stge/if_stge.c Tue Sep 1 21:52:20 2020 (r365150) @@ -407,7 +407,6 @@ stge_read_eeprom(struct stge_softc *sc, int offset, ui *data = CSR_READ_2(sc, STGE_EepromData); } - static int stge_probe(device_t dev) { @@ -1815,7 +1814,6 @@ stge_poll(struct ifnet *ifp, enum poll_cmd cmd, int co } } } - } if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) From owner-svn-src-all@freebsd.org Tue Sep 1 21:52:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C27D137C66D; Tue, 1 Sep 2020 21:52:36 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh15J4s0nz4W6f; Tue, 1 Sep 2020 21:52:36 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A04E20247; Tue, 1 Sep 2020 21:52:36 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lqajd046729; Tue, 1 Sep 2020 21:52:36 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LqaDS046727; Tue, 1 Sep 2020 21:52:36 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012152.081LqaDS046727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:52:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365151 - head/sys/dev/spibus X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/spibus X-SVN-Commit-Revision: 365151 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:52:36 -0000 Author: mjg Date: Tue Sep 1 21:52:35 2020 New Revision: 365151 URL: https://svnweb.freebsd.org/changeset/base/365151 Log: spibus: clean up empty lines in .c and .h files Modified: head/sys/dev/spibus/spi.h head/sys/dev/spibus/spigen.c Modified: head/sys/dev/spibus/spi.h ============================================================================== --- head/sys/dev/spibus/spi.h Tue Sep 1 21:52:20 2020 (r365150) +++ head/sys/dev/spibus/spi.h Tue Sep 1 21:52:35 2020 (r365151) @@ -35,7 +35,6 @@ struct spi_command { void *rx_data; uint32_t rx_data_sz; }; - #define SPI_COMMAND_INITIALIZER { 0 } #define SPI_CHIP_SELECT_HIGH 0x1 /* Chip select high (else low) */ Modified: head/sys/dev/spibus/spigen.c ============================================================================== --- head/sys/dev/spibus/spigen.c Tue Sep 1 21:52:20 2020 (r365150) +++ head/sys/dev/spibus/spigen.c Tue Sep 1 21:52:35 2020 (r365151) @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include - + #include #include #include @@ -370,7 +370,7 @@ spigen_detach(device_t dev) if (sc->sc_cdev) destroy_dev(sc->sc_cdev); - + mtx_destroy(&sc->sc_mtx); return (0); @@ -383,7 +383,6 @@ static device_method_t spigen_methods[] = { DEVMETHOD(device_probe, spigen_probe), DEVMETHOD(device_attach, spigen_attach), DEVMETHOD(device_detach, spigen_detach), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:52:50 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3B71937C6E3; Tue, 1 Sep 2020 21:52:50 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh15Y6BzXz4WWk; Tue, 1 Sep 2020 21:52:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA21020500; Tue, 1 Sep 2020 21:52:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LqkGO046783; Tue, 1 Sep 2020 21:52:46 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lqka1046782; Tue, 1 Sep 2020 21:52:46 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012152.081Lqka1046782@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:52:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365152 - head/sys/dev/smc X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/smc X-SVN-Commit-Revision: 365152 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:52:50 -0000 Author: mjg Date: Tue Sep 1 21:52:46 2020 New Revision: 365152 URL: https://svnweb.freebsd.org/changeset/base/365152 Log: smc: clean up empty lines in .c and .h files Modified: head/sys/dev/smc/if_smc.c head/sys/dev/smc/if_smcvar.h Modified: head/sys/dev/smc/if_smc.c ============================================================================== --- head/sys/dev/smc/if_smc.c Tue Sep 1 21:52:35 2020 (r365151) +++ head/sys/dev/smc/if_smc.c Tue Sep 1 21:52:46 2020 (r365152) @@ -434,10 +434,10 @@ smc_detach(device_t dev) if (sc->smc_ifp != NULL) { ether_ifdetach(sc->smc_ifp); } - + callout_drain(&sc->smc_watchdog); callout_drain(&sc->smc_mii_tick_ch); - + #ifdef DEVICE_POLLING if (sc->smc_ifp->if_capenable & IFCAP_POLLING) ether_poll_deregister(sc->smc_ifp); @@ -491,7 +491,6 @@ static device_method_t smc_methods[] = { DEVMETHOD(miibus_readreg, smc_miibus_readreg), DEVMETHOD(miibus_writereg, smc_miibus_writereg), DEVMETHOD(miibus_statchg, smc_miibus_statchg), - { 0, 0 } }; @@ -603,7 +602,7 @@ smc_task_tx(void *context, int pending) sc = ifp->if_softc; SMC_LOCK(sc); - + if (sc->smc_pending == NULL) { SMC_UNLOCK(sc); goto next_packet; @@ -722,7 +721,7 @@ smc_task_rx(void *context, int pending) m_freem(m); break; } - + /* * Point to the start of the packet. */ @@ -749,14 +748,14 @@ smc_task_rx(void *context, int pending) m_freem(m); break; } - + /* * Set the mbuf up the way we want it. */ m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = len + 2; /* XXX: Is this right? */ m_adj(m, ETHER_ALIGN); - + /* * Pull the packet out of the device. Make sure we're in the * right bank first as things may have changed while we were @@ -865,7 +864,7 @@ smc_task_intr(void *context, int pending) sc = ifp->if_softc; SMC_LOCK(sc); - + smc_select_bank(sc, 2); /* @@ -1255,7 +1254,7 @@ static void smc_watchdog(void *arg) { struct smc_softc *sc; - + sc = (struct smc_softc *)arg; device_printf(sc->smc_dev, "watchdog timeout\n"); taskqueue_enqueue(sc->smc_tq, &sc->smc_intr); Modified: head/sys/dev/smc/if_smcvar.h ============================================================================== --- head/sys/dev/smc/if_smcvar.h Tue Sep 1 21:52:35 2020 (r365151) +++ head/sys/dev/smc/if_smcvar.h Tue Sep 1 21:52:46 2020 (r365152) @@ -53,7 +53,7 @@ struct smc_softc { struct task smc_tx; struct mbuf *smc_pending; struct callout smc_watchdog; - + /* MII support */ device_t smc_miibus; struct callout smc_mii_tick_ch; From owner-svn-src-all@freebsd.org Tue Sep 1 21:53:03 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3F8C937C925; Tue, 1 Sep 2020 21:53:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh15q0RDVz4WKJ; Tue, 1 Sep 2020 21:53:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B1C62004A; Tue, 1 Sep 2020 21:53:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lr1EX046854; Tue, 1 Sep 2020 21:53:01 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lr0Mx046852; Tue, 1 Sep 2020 21:53:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012153.081Lr0Mx046852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:53:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365153 - head/sys/dev/smbus X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/smbus X-SVN-Commit-Revision: 365153 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:53:03 -0000 Author: mjg Date: Tue Sep 1 21:53:00 2020 New Revision: 365153 URL: https://svnweb.freebsd.org/changeset/base/365153 Log: smbus: clean up empty lines in .c and .h files Modified: head/sys/dev/smbus/smb.c head/sys/dev/smbus/smbconf.c head/sys/dev/smbus/smbus.c Modified: head/sys/dev/smbus/smb.c ============================================================================== --- head/sys/dev/smbus/smb.c Tue Sep 1 21:52:46 2020 (r365152) +++ head/sys/dev/smbus/smb.c Tue Sep 1 21:53:00 2020 (r365153) @@ -68,7 +68,6 @@ static device_method_t smb_methods[] = { /* smbus interface */ DEVMETHOD(smbus_intr, smbus_generic_intr), - { 0, 0 } }; @@ -104,7 +103,7 @@ smb_probe(device_t dev) device_set_desc(dev, "SMBus generic I/O"); return (BUS_PROBE_NOWILDCARD); } - + static int smb_attach(device_t dev) { Modified: head/sys/dev/smbus/smbconf.c ============================================================================== --- head/sys/dev/smbus/smbconf.c Tue Sep 1 21:52:46 2020 (r365152) +++ head/sys/dev/smbus/smbconf.c Tue Sep 1 21:53:00 2020 (r365153) @@ -68,7 +68,7 @@ smbus_error(int smb_error) if (smb_error == SMB_ENOERR) return (0); - + if (smb_error & (SMB_ENOTSUPP)) error = ENODEV; else if (smb_error & (SMB_ENOACK)) Modified: head/sys/dev/smbus/smbus.c ============================================================================== --- head/sys/dev/smbus/smbus.c Tue Sep 1 21:52:46 2020 (r365152) +++ head/sys/dev/smbus/smbus.c Tue Sep 1 21:53:00 2020 (r365153) @@ -134,7 +134,6 @@ smbus_hinted_child(device_t bus, const char *dname, in devi->addr = addr; } - static int smbus_child_location_str(device_t parent, device_t child, char *buf, size_t buflen) From owner-svn-src-all@freebsd.org Tue Sep 1 21:53:23 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4EF1737C995; Tue, 1 Sep 2020 21:53:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh16C1dQ3z4WQK; Tue, 1 Sep 2020 21:53:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B33A20248; Tue, 1 Sep 2020 21:53:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LrNEH046924; Tue, 1 Sep 2020 21:53:23 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LrLCi046915; Tue, 1 Sep 2020 21:53:21 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012153.081LrLCi046915@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:53:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365154 - head/sys/dev/smartpqi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/smartpqi X-SVN-Commit-Revision: 365154 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:53:23 -0000 Author: mjg Date: Tue Sep 1 21:53:21 2020 New Revision: 365154 URL: https://svnweb.freebsd.org/changeset/base/365154 Log: smartpqi: clean up empty lines in .c and .h files Modified: head/sys/dev/smartpqi/smartpqi_cam.c head/sys/dev/smartpqi/smartpqi_cmd.c head/sys/dev/smartpqi/smartpqi_defines.h head/sys/dev/smartpqi/smartpqi_discovery.c head/sys/dev/smartpqi/smartpqi_event.c head/sys/dev/smartpqi/smartpqi_helper.c head/sys/dev/smartpqi/smartpqi_includes.h head/sys/dev/smartpqi/smartpqi_init.c head/sys/dev/smartpqi/smartpqi_intr.c head/sys/dev/smartpqi/smartpqi_ioctl.c head/sys/dev/smartpqi/smartpqi_ioctl.h head/sys/dev/smartpqi/smartpqi_main.c head/sys/dev/smartpqi/smartpqi_mem.c head/sys/dev/smartpqi/smartpqi_misc.c head/sys/dev/smartpqi/smartpqi_prototypes.h head/sys/dev/smartpqi/smartpqi_queue.c head/sys/dev/smartpqi/smartpqi_request.c head/sys/dev/smartpqi/smartpqi_response.c head/sys/dev/smartpqi/smartpqi_sis.c head/sys/dev/smartpqi/smartpqi_structures.h head/sys/dev/smartpqi/smartpqi_tag.c Modified: head/sys/dev/smartpqi/smartpqi_cam.c ============================================================================== --- head/sys/dev/smartpqi/smartpqi_cam.c Tue Sep 1 21:53:00 2020 (r365153) +++ head/sys/dev/smartpqi/smartpqi_cam.c Tue Sep 1 21:53:21 2020 (r365154) @@ -76,7 +76,7 @@ static void get_transport_settings(struct pqisrc_softs struct ccb_trans_settings_spi *spi = &cts->xport_specific.spi; DBG_FUNC("IN\n"); - + cts->protocol = PROTO_SCSI; cts->protocol_version = SCSI_REV_SPC4; cts->transport = XPORT_SPI; @@ -126,7 +126,7 @@ void os_remove_device(pqisrc_softstate_t *softs, struct cam_path *tmppath; DBG_FUNC("IN\n"); - + if(softs->os_specific.sim_registered) { if (xpt_create_path(&tmppath, NULL, cam_sim_path(softs->os_specific.sim), @@ -224,7 +224,6 @@ smartpqi_fix_ld_inquiry(pqisrc_softstate_t *softs, str (cdb[1] & SI_EVPD) == 0 && (csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN && csio->dxfer_len >= SHORT_INQUIRY_LENGTH) { - inq = (struct scsi_inquiry_data *)csio->data_ptr; device = softs->device_list[csio->ccb_h.target_id][csio->ccb_h.target_lun]; @@ -263,7 +262,7 @@ os_io_response_success(rcb_t *rcb) panic("rcb is null"); csio = (struct ccb_scsiio *)&rcb->cm_ccb->csio; - + if (csio == NULL) panic("csio is null"); @@ -332,7 +331,6 @@ void os_raid_response_error(rcb_t *rcb, raid_path_erro csio->ccb_h.status = CAM_SCSI_STATUS_ERROR | CAM_AUTOSNS_VALID | CAM_REQ_CMP_ERR; - } break; @@ -364,7 +362,6 @@ void os_raid_response_error(rcb_t *rcb, raid_path_erro DBG_IO("OUT\n"); } - /* * Error response handling for aio. */ @@ -564,7 +561,6 @@ static int pqi_map_request( rcb_t *rcb ) rcb->status = REQUEST_PENDING; error = pqisrc_build_send_io(softs, rcb); - } DBG_FUNC("OUT error = %d\n", error); @@ -605,7 +601,6 @@ static void smartpqi_lunrescan_cb(struct cam_periph *p xpt_free_ccb(ccb); } - /* * Function to rescan the lun */ @@ -717,7 +712,7 @@ static int pqisrc_io_start(struct cam_sim *sim, union pqi_scsi_dev_t *dvp; DBG_FUNC("IN\n"); - + if( softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun] == NULL ) { ccb->ccb_h.status = CAM_DEV_NOT_THERE; DBG_INFO("Device = %d not there\n", ccb->ccb_h.target_id); @@ -1172,13 +1167,12 @@ int register_sim(struct pqisrc_softstate *softs, int c void deregister_sim(struct pqisrc_softstate *softs) { struct ccb_setasync csa; - + DBG_FUNC("IN\n"); if (softs->os_specific.mtx_init) { mtx_lock(&softs->os_specific.cam_lock); } - xpt_setup_ccb(&csa.ccb_h, softs->os_specific.path, 5); csa.ccb_h.func_code = XPT_SASYNC_CB; Modified: head/sys/dev/smartpqi/smartpqi_cmd.c ============================================================================== --- head/sys/dev/smartpqi/smartpqi_cmd.c Tue Sep 1 21:53:00 2020 (r365153) +++ head/sys/dev/smartpqi/smartpqi_cmd.c Tue Sep 1 21:53:21 2020 (r365154) @@ -43,7 +43,7 @@ int pqisrc_submit_cmnd(pqisrc_softstate_t *softs, DBG_FUNC("IN\n"); PQI_LOCK(&ib_q->lock); - + /* Check queue full */ if ((ib_q->pi_local + 1) % ib_q->num_elem == *(ib_q->ci_virt_addr)) { DBG_WARN("OUT Q full\n"); Modified: head/sys/dev/smartpqi/smartpqi_defines.h ============================================================================== --- head/sys/dev/smartpqi/smartpqi_defines.h Tue Sep 1 21:53:00 2020 (r365153) +++ head/sys/dev/smartpqi/smartpqi_defines.h Tue Sep 1 21:53:21 2020 (r365154) @@ -77,7 +77,7 @@ } \ } \ } - + #define FILL_QUEUE_ARRAY_ADDR(q,virt,dma) { \ q->array_virt_addr = virt; \ q->array_dma_addr = dma; \ @@ -105,7 +105,6 @@ enum INTR_TYPE { #define DMA_PHYS_LOW(mem) (((mem)->dma_addr) & 0x00000000ffffffff) #define DMA_PHYS_HIGH(mem) ((((mem)->dma_addr) & 0xffffffff00000000) >> 32) - typedef enum REQUEST_STATUS { REQUEST_SUCCESS = 0, REQUEST_PENDING = -1, @@ -135,7 +134,6 @@ typedef enum controller_state { PQI_BUS_RESET, }controller_state_t; - #define PQISRC_MAX_MSIX_SUPPORTED 64 /* SIS Specific */ @@ -187,8 +185,6 @@ typedef enum controller_state { #define PQISRC_MAX_ADMIN_IB_QUEUE_ELEM_NUM 16 #define PQISRC_MAX_ADMIN_OB_QUEUE_ELEM_NUM 16 - - #define PQI_MIN_OP_IB_QUEUE_ID 1 #define PQI_OP_EVENT_QUEUE_ID 1 #define PQI_MIN_OP_OB_QUEUE_ID 2 @@ -348,7 +344,6 @@ enum pqisrc_ctrl_mode{ #define PQI_MANAGEMENT_CMD_RESP_TIMEOUT 3000 #define PQISRC_EVENT_ACK_RESP_TIMEOUT 1000 - /* Supported Event types by controller */ #define PQI_NUM_SUPPORTED_EVENTS 7 @@ -371,7 +366,6 @@ enum pqisrc_ctrl_mode{ #define PQI_MAX_HEARTBEAT_REQUESTS 5 - /* Device flags */ #define PQISRC_DFLAG_VALID (1 << 0) #define PQISRC_DFLAG_CONFIGURING (1 << 1) @@ -409,7 +403,6 @@ enum pqisrc_ctrl_mode{ #define SOP_TASK_MANAGEMENT_FUNCTION_ABORT_TASK_SET 0x02 #define SOP_TASK_MANAGEMENT_LUN_RESET 0x8 - /* Additional CDB bytes */ #define PQI_ADDITIONAL_CDB_BYTES_0 0 /* 16 byte CDB */ #define PQI_ADDITIONAL_CDB_BYTES_4 1 /* 20 byte CDB */ @@ -471,7 +464,6 @@ enum pqisrc_ctrl_mode{ #define VPD_PAGE (1 << 8) - /* logical volume states */ #define SA_LV_OK 0x0 #define SA_LV_NOT_AVAILABLE 0xb @@ -495,8 +487,6 @@ enum pqisrc_ctrl_mode{ /* 0 = no limit */ #define PQI_LOGICAL_DISK_DEFAULT_MAX_QUEUE_DEPTH 0 - - #define RAID_CTLR_LUNID "\0\0\0\0\0\0\0\0" #define SA_CACHE_FLUSH 0x1 @@ -521,13 +511,11 @@ enum pqisrc_ctrl_mode{ #define ASCQ_LUN_NOT_READY_FORMAT_IN_PROGRESS 0x4 #define ASCQ_LUN_NOT_READY_INITIALIZING_CMD_REQ 0x2 - #define OBDR_SIG_OFFSET 43 #define OBDR_TAPE_SIG "$DR-10" #define OBDR_SIG_LEN (sizeof(OBDR_TAPE_SIG) - 1) #define OBDR_TAPE_INQ_SIZE (OBDR_SIG_OFFSET + OBDR_SIG_LEN) - #define IOACCEL_STATUS_BYTE 4 #define OFFLOAD_CONFIGURED_BIT 0x1 #define OFFLOAD_ENABLED_BIT 0x2 @@ -546,7 +534,6 @@ enum pqisrc_ctrl_mode{ #define TEST_UNIT_READY 0x00 #define SCSI_VPD_HEADER_LENGTH 64 - #define PQI_MAX_MULTILUN 256 #define PQI_MAX_LOGICALS 64 #define PQI_MAX_PHYSICALS 1024 @@ -588,7 +575,6 @@ typedef enum pqisrc_device_status { #define BMIC_FLASH_FIRMWARE 0xf7 #define BMIC_WRITE_HOST_WELLNESS 0xa5 - #define MASKED_DEVICE(lunid) ((lunid)[3] & 0xC0) #define BMIC_GET_LEVEL_2_BUS(lunid) ((lunid)[7] & 0x3F) #define BMIC_GET_LEVEL_TWO_TARGET(lunid) ((lunid)[6]) @@ -659,14 +645,12 @@ static inline void PUT_BE64(uint64_t val, uint8_t *p) PUT_BE32(val, p + 4); } - #define OS_FREEBSD #define SIS_POLL_WAIT #define OS_ATTRIBUTE_PACKED __attribute__((__packed__)) #define OS_ATTRIBUTE_ALIGNED(n) __attribute__((aligned(n))) - /* Management Interface */ #define CCISS_IOC_MAGIC 'C' #define SMARTPQI_IOCTL_BASE 'M' @@ -699,7 +683,6 @@ typedef struct _driver_info typedef uint8_t *passthru_buf_type_t; - #define PQISRC_DRIVER_MAJOR 1 #define PQISRC_DRIVER_MINOR 0 #define PQISRC_DRIVER_RELEASE 3 @@ -711,7 +694,7 @@ typedef uint8_t *passthru_buf_type_t; PQISRC_DRIVER_MINOR, \ PQISRC_DRIVER_RELEASE, \ PQISRC_DRIVER_REVISION) - + /* End Management interface */ #ifdef ASSERT @@ -724,7 +707,6 @@ typedef uint8_t *passthru_buf_type_t; } \ } - #define PQI_MAX_MSIX 64 /* vectors */ #define PQI_MSI_CTX_SIZE sizeof(pqi_intr_ctx)+1 #define IS_POLLING_REQUIRED(softs) if (cold) {\ @@ -764,7 +746,6 @@ typedef struct PCI_ACC_HANDLE { #define LEGACY_SIS_ODR_SHIFT 12 /* outbound doorbell shift */ #define LEGACY_SIS_IDR_SHIFT 9 /* inbound doorbell shift */ - /* * PQI Register definitions for the smartraid adapters */ @@ -792,10 +773,9 @@ typedef struct PCI_ACC_HANDLE { #define OS_BUSYWAIT(x) DELAY(x) #define OS_SLEEP(timeout) \ DELAY(timeout); - + #define OS_HOST_WELLNESS_TIMEOUT (24 * 3600) - #define LE_16(x) htole16(x) #define LE_32(x) htole32(x) #define LE_64(x) htole64(x) @@ -806,7 +786,6 @@ typedef struct PCI_ACC_HANDLE { #define PQI_HWIF_SRCV 0 #define PQI_HWIF_UNKNOWN -1 - #define SMART_STATE_SUSPEND (1<<0) #define SMART_STATE_UNUSED0 (1<<1) #define SMART_STATE_INTERRUPTS_ON (1<<2) @@ -818,7 +797,6 @@ typedef struct PCI_ACC_HANDLE { #define PQI_SIM_REGISTERED (1<<2) #define PQI_MTX_INIT (1<<3) - #define PQI_CMD_MAPPED (1<<2) /* Interrupt context to get oq_id */ @@ -946,7 +924,6 @@ static int logging_level = PQISRC_LOG_LEVEL; #define PQISRC_FLAGS_DISC 0x00000010 #define PQISRC_FLAGS_WARN 0x00000020 #define PQISRC_FLAGS_ERROR 0x00000040 - #define DBG_INIT(fmt,args...) \ do { \ Modified: head/sys/dev/smartpqi/smartpqi_discovery.c ============================================================================== --- head/sys/dev/smartpqi/smartpqi_discovery.c Tue Sep 1 21:53:00 2020 (r365153) +++ head/sys/dev/smartpqi/smartpqi_discovery.c Tue Sep 1 21:53:21 2020 (r365154) @@ -58,7 +58,7 @@ int pqisrc_alloc_tid(pqisrc_softstate_t *softs) DBG_ERR("Target ID exhausted\n"); return INVALID_ELEM; } - + return softs->tid_pool.tid[softs->tid_pool.index--]; } @@ -68,7 +68,7 @@ void pqisrc_free_tid(pqisrc_softstate_t *softs, int ti DBG_ERR("Target ID queue is full\n"); return; } - + softs->tid_pool.index++; softs->tid_pool.tid[softs->tid_pool.index] = tid; } @@ -126,7 +126,7 @@ int pqisrc_build_send_raid_request(pqisrc_softstate_t void *buff, size_t datasize, uint8_t cmd, uint16_t vpd_page, uint8_t *scsi3addr, raid_path_error_info_elem_t *error_info) { - + uint8_t *cdb; int ret = PQI_STATUS_SUCCESS; uint32_t tag = 0; @@ -137,7 +137,7 @@ int pqisrc_build_send_raid_request(pqisrc_softstate_t ob_queue_t *ob_q = &softs->op_ob_q[PQI_DEFAULT_IB_QUEUE]; rcb_t *rcb = NULL; - + DBG_FUNC("IN\n"); memset(&device_mem, 0, sizeof(struct dma_mem)); @@ -149,7 +149,7 @@ int pqisrc_build_send_raid_request(pqisrc_softstate_t device_mem.align = PQISRC_DEFAULT_DMA_ALIGN; ret = os_dma_mem_alloc(softs, &device_mem); - + if (ret) { DBG_ERR("failed to allocate dma memory for device_mem return code %d\n", ret); return ret; @@ -160,7 +160,6 @@ int pqisrc_build_send_raid_request(pqisrc_softstate_t sgd->addr = device_mem.dma_addr; sgd->len = datasize; sgd->flags = SG_FLAG_LAST; - } /* Build raid path request */ @@ -278,7 +277,7 @@ int pqisrc_build_send_raid_request(pqisrc_softstate_t } os_dma_mem_free(softs, &device_mem); } - + ret = rcb->status; if (ret) { if(error_info) { @@ -422,7 +421,6 @@ static int pqisrc_get_phys_log_device_list(pqisrc_soft reportlun_data_ext_t *local_logdev_list; reportlun_data_ext_t *logdev_data; reportlun_header_t report_lun_header; - DBG_FUNC("IN\n"); @@ -438,7 +436,6 @@ static int pqisrc_get_phys_log_device_list(pqisrc_soft return ret; } - logdev_data = *logical_dev_list; if (logdev_data) { @@ -592,7 +589,7 @@ static uint8_t pqisrc_get_volume_offline_status(pqisrc uint8_t *buff = NULL; DBG_FUNC("IN\n"); - + buff = os_mem_alloc(softs, 64); if (!buff) return PQI_STATUS_FAILURE; @@ -621,7 +618,6 @@ out: return status; } - /* Determine offline status of a volume. Returns appropriate SA_LV_* status.*/ static uint8_t pqisrc_get_dev_vol_status(pqisrc_softstate_t *softs, uint8_t *scsi3addr) @@ -642,7 +638,7 @@ static uint8_t pqisrc_get_dev_vol_status(pqisrc_softst memset(&request, 0, sizeof(request)); ret = pqisrc_build_send_raid_request(softs, &request, NULL, 0, TEST_UNIT_READY, 0, scsi3addr, &error_info); - + if (ret) goto error; sense_data = error_info.data; @@ -824,7 +820,7 @@ static void pqisrc_get_dev_ioaccel_status(pqisrc_softs DBG_ERR("error in send scsi inquiry ret=%d\n", ret); goto err_out; } - + ioaccel_status = buff[IOACCEL_STATUS_BYTE]; device->offload_config = !!(ioaccel_status & OFFLOAD_CONFIGURED_BIT); @@ -835,7 +831,7 @@ static void pqisrc_get_dev_ioaccel_status(pqisrc_softs if (pqisrc_get_device_raidmap(softs, device)) device->offload_enabled_pending = false; } - + DBG_DISC("offload_config: 0x%x offload_enabled_pending: 0x%x \n", device->offload_config, device->offload_enabled_pending); @@ -995,7 +991,6 @@ static int pqisrc_identify_physical_disk(pqisrc_softst uint16_t bmic_device_index; pqisrc_raid_req_t request; - DBG_FUNC("IN\n"); memset(&request, 0, sizeof(request)); @@ -1046,7 +1041,6 @@ static void pqisrc_get_physical_device_info(pqisrc_sof DBG_FUNC("OUT\n"); } - /* Function used to find the entry of the device in a list */ static device_status_t pqisrc_scsi_find_entry(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device_to_find, @@ -1077,7 +1071,6 @@ static device_status_t pqisrc_scsi_find_entry(pqisrc_s return DEVICE_NOT_FOUND; } - /* Update the newly added devices as existed device */ static void pqisrc_exist_device_update(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device_exist, @@ -1241,7 +1234,6 @@ void pqisrc_remove_device(pqisrc_softstate_t *softs, DBG_FUNC("OUT\n"); } - /* * When exposing new device to OS fails then adjst list according to the * mid scsi list @@ -1331,7 +1323,7 @@ void pqisrc_device_mem_free(pqisrc_softstate_t *softs, } os_mem_free(softs, (char *)device,sizeof(*device)); DBG_FUNC("OUT\n"); - + } /* OS should call this function to free the scsi device */ @@ -1347,7 +1339,6 @@ void pqisrc_free_device(pqisrc_softstate_t * softs,pqi } - /* Update the newly added devices to the device list */ static void pqisrc_update_device_list(pqisrc_softstate_t *softs, pqi_scsi_dev_t *new_device_list[], int num_new_devices) @@ -1372,9 +1363,9 @@ static void pqisrc_update_device_list(pqisrc_softstate DBG_WARN("Out of memory \n"); goto free_and_out; } - + OS_ACQUIRE_SPINLOCK(&softs->devlist_lock); - + for(i = 0; i < PQI_MAX_DEVICES; i++) { for(j = 0; j < PQI_MAX_MULTILUN; j++) { if(softs->device_list[i][j] == NULL) @@ -1448,7 +1439,7 @@ static void pqisrc_update_device_list(pqisrc_softstate } pqisrc_update_log_dev_qdepth(softs); - + for(i = 0; i < PQI_MAX_DEVICES; i++) { for(j = 0; j < PQI_MAX_MULTILUN; j++) { if(softs->device_list[i][j] == NULL) @@ -1571,7 +1562,7 @@ int pqisrc_write_driver_version_to_host_wellness(pqisr BMIC_WRITE_HOST_WELLNESS, 0, (uint8_t *)RAID_CTLR_LUNID, NULL); os_mem_free(softs, (char *)host_wellness_driver_ver, data_length); - + DBG_FUNC("OUT"); return rval; } @@ -1613,10 +1604,10 @@ int pqisrc_write_current_time_to_host_wellness(pqisrc_ host_wellness_time->dont_write_tag[1] = 'W'; host_wellness_time->end_tag[0] = 'Z'; host_wellness_time->end_tag[1] = 'Z'; - + rval = pqisrc_build_send_raid_request(softs, &request, host_wellness_time,data_length, BMIC_WRITE_HOST_WELLNESS, 0, (uint8_t *)RAID_CTLR_LUNID, NULL); - + os_mem_free(softs, (char *)host_wellness_time, data_length); DBG_FUNC("OUT"); @@ -1645,7 +1636,6 @@ int pqisrc_scan_devices(pqisrc_softstate_t *softs) bmic_ident_physdev_t *bmic_phy_info = NULL; pqi_scsi_dev_t **new_device_list = NULL; pqi_scsi_dev_t *device = NULL; - DBG_FUNC("IN\n"); @@ -1657,7 +1647,7 @@ int pqisrc_scan_devices(pqisrc_softstate_t *softs) physical_cnt = BE_32(physical_dev_list->header.list_length) / sizeof(physical_dev_list->lun_entries[0]); - + logical_cnt = BE_32(logical_dev_list->header.list_length) / sizeof(logical_dev_list->lun_entries[0]); @@ -1695,7 +1685,6 @@ int pqisrc_scan_devices(pqisrc_softstate_t *softs) ndev_allocated = phy_log_dev_cnt; new_dev_cnt = 0; for (i = 0; i < phy_log_dev_cnt; i++) { - if (i < physical_cnt) { is_physical_device = true; lun_ext_entry = &physical_dev_list->lun_entries[i]; @@ -1803,7 +1792,7 @@ int pqisrc_scan_devices(pqisrc_softstate_t *softs) DBG_DISC("new_dev_cnt %d\n", new_dev_cnt); pqisrc_update_device_list(softs, new_device_list, new_dev_cnt); - + err_out: if (new_device_list) { for (i = 0; i < ndev_allocated; i++) { @@ -1824,7 +1813,7 @@ err_out: os_mem_free(softs, (char *)logical_dev_list, log_data_length); if (bmic_phy_info) os_mem_free(softs, (char *)bmic_phy_info, sizeof(*bmic_phy_info)); - + DBG_FUNC("OUT \n"); return ret; @@ -1839,7 +1828,7 @@ void pqisrc_cleanup_devices(pqisrc_softstate_t *softs) int i = 0,j = 0; pqi_scsi_dev_t *dvp = NULL; DBG_FUNC("IN\n"); - + for(i = 0; i < PQI_MAX_DEVICES; i++) { for(j = 0; j < PQI_MAX_MULTILUN; j++) { if (softs->device_list[i][j] == NULL) @@ -1850,4 +1839,3 @@ void pqisrc_cleanup_devices(pqisrc_softstate_t *softs) } DBG_FUNC("OUT\n"); } - Modified: head/sys/dev/smartpqi/smartpqi_event.c ============================================================================== --- head/sys/dev/smartpqi/smartpqi_event.c Tue Sep 1 21:53:00 2020 (r365153) +++ head/sys/dev/smartpqi/smartpqi_event.c Tue Sep 1 21:53:21 2020 (r365154) @@ -35,15 +35,15 @@ int pqisrc_rescan_devices(pqisrc_softstate_t *softs) { int ret; - + DBG_FUNC("IN\n"); - + os_sema_lock(&softs->scan_lock); - + ret = pqisrc_scan_devices(softs); os_sema_unlock(&softs->scan_lock); - + DBG_FUNC("OUT\n"); return ret; @@ -62,7 +62,7 @@ static void pqisrc_acknowledge_event(pqisrc_softstate_t *softs, struct pqi_event *event) { - + pqi_event_acknowledge_request_t request; ib_queue_t *ib_q = &softs->op_raid_ib_q[0]; int tmo = PQISRC_EVENT_ACK_RESP_TIMEOUT; @@ -93,7 +93,7 @@ pqisrc_acknowledge_event(pqisrc_softstate_t *softs, DBG_ERR("wait for event acknowledge timed out\n"); DBG_ERR("tmo : %d\n",tmo); } - + DBG_FUNC(" OUT\n"); } @@ -109,7 +109,6 @@ pqisrc_ack_all_events(void *arg1) DBG_FUNC(" IN\n"); - pending_event = &softs->pending_events[0]; for (i=0; i < PQI_NUM_SUPPORTED_EVENTS; i++) { if (pending_event->pending == true) { @@ -118,13 +117,13 @@ pqisrc_ack_all_events(void *arg1) } pending_event++; } - + /* Rescan devices except for heartbeat event */ if ((pqisrc_rescan_devices(softs)) != PQI_STATUS_SUCCESS) { DBG_ERR(" Failed to Re-Scan devices\n "); } DBG_FUNC(" OUT\n"); - + } /* @@ -173,16 +172,16 @@ pqisrc_process_event_intr_src(pqisrc_softstate_t *soft ob_queue_t *event_q; struct pqi_event *pending_event; boolean_t need_delayed_work = false; - + DBG_FUNC(" IN\n"); - + OS_ATOMIC64_INC(softs, num_intrs); - + event_q = &softs->event_q; obq_ci = event_q->ci_local; obq_pi = *(event_q->pi_virt_addr); DBG_INFO("Initial Event_q ci : %d Event_q pi : %d\n", obq_ci, obq_pi); - + while(1) { int event_index; DBG_INFO("queue_id : %d ci : %d pi : %d\n",obq_id, obq_ci, obq_pi); @@ -223,7 +222,6 @@ pqisrc_process_event_intr_src(pqisrc_softstate_t *soft DBG_FUNC("OUT"); return PQI_STATUS_SUCCESS; - } @@ -236,7 +234,7 @@ int pqisrc_submit_management_req(pqisrc_softstate_t *s int ret = PQI_STATUS_SUCCESS; ib_queue_t *op_ib_q = &softs->op_raid_ib_q[0]; rcb_t *rcb = NULL; - + DBG_FUNC(" IN\n"); /* Get the tag */ @@ -267,7 +265,7 @@ int pqisrc_submit_management_req(pqisrc_softstate_t *s pqisrc_put_tag(&softs->taglist,request->request_id); DBG_FUNC("OUT\n"); return ret; - + err_cmd: os_reset_rcb(rcb); pqisrc_put_tag(&softs->taglist,request->request_id); @@ -285,9 +283,9 @@ pqi_event_configure(pqisrc_softstate_t *softs , dma_mem_t *buff) { int ret = PQI_STATUS_SUCCESS; - + DBG_FUNC(" IN\n"); - + request->header.comp_feature = 0x00; request->header.iu_length = sizeof(pqi_event_config_request_t) - PQI_REQUEST_HEADER_LENGTH; /* excluding IU header length */ @@ -304,7 +302,6 @@ pqi_event_configure(pqisrc_softstate_t *softs , ret = pqisrc_submit_management_req(softs,request); if(ret) goto err_out; - DBG_FUNC(" OUT\n"); return ret; @@ -328,14 +325,14 @@ int pqisrc_report_event_config(pqisrc_softstate_t *sof /*bytes to be allocaed for report event config data-in buffer */ uint32_t alloc_size = sizeof(pqi_event_config_t) ; memset(&request, 0 , sizeof(request)); - + DBG_FUNC(" IN\n"); - + memset(&buf_report_event, 0, sizeof(struct dma_mem)); buf_report_event.tag = "pqi_report_event_buf" ; buf_report_event.size = alloc_size; buf_report_event.align = PQISRC_DEFAULT_DMA_ALIGN; - + /* allocate memory */ ret = os_dma_mem_alloc(softs, &buf_report_event); if (ret) { @@ -346,13 +343,13 @@ int pqisrc_report_event_config(pqisrc_softstate_t *sof DBG_INFO("buf_report_event.virt_addr = %p \n",(void*)buf_report_event.virt_addr); request.header.iu_type = PQI_REQUEST_IU_REPORT_VENDOR_EVENT_CONFIG; - + /* Event configuration */ ret=pqi_event_configure(softs,&request,&buf_report_event); if(ret) goto free_mem; - + event_config_p = (pqi_event_config_t*)buf_report_event.virt_addr; softs->event_config.num_event_descriptors = MIN(event_config_p->num_event_descriptors, PQI_MAX_EVENT_DESCRIPTORS) ; @@ -415,7 +412,6 @@ int pqisrc_set_event_config(pqisrc_softstate_t *softs) event_config_p->num_event_descriptors = softs->event_config.num_event_descriptors; - for (i=0; i < softs->event_config.num_event_descriptors ; i++){ event_config_p->descriptors[i].event_type = softs->event_config.descriptors[i].event_type; @@ -424,7 +420,6 @@ int pqisrc_set_event_config(pqisrc_softstate_t *softs) else event_config_p->descriptors[i].oq_id = 0; /* Not supported this event. */ - } /* Event configuration */ ret = pqi_event_configure(softs,&request,&buf_set_event); @@ -435,7 +430,7 @@ int pqisrc_set_event_config(pqisrc_softstate_t *softs) DBG_FUNC(" OUT\n"); return ret; - + free_mem: os_dma_mem_free(softs, &buf_set_event); err_out: Modified: head/sys/dev/smartpqi/smartpqi_helper.c ============================================================================== --- head/sys/dev/smartpqi/smartpqi_helper.c Tue Sep 1 21:53:00 2020 (r365153) +++ head/sys/dev/smartpqi/smartpqi_helper.c Tue Sep 1 21:53:21 2020 (r365154) @@ -47,18 +47,18 @@ void pqisrc_configure_legacy_intx(pqisrc_softstate_t * { uint32_t intx_mask; uint32_t *reg_addr = NULL; - + DBG_FUNC("IN\n"); - + if (enable_intx) reg_addr = &softs->pqi_reg->legacy_intr_mask_clr; else reg_addr = &softs->pqi_reg->legacy_intr_mask_set; - + intx_mask = PCI_MEM_GET32(softs, reg_addr, PQI_LEGACY_INTR_MASK_CLR); intx_mask |= PQISRC_LEGACY_INTX_MASK; PCI_MEM_PUT32(softs, reg_addr, PQI_LEGACY_INTR_MASK_CLR ,intx_mask); - + DBG_FUNC("OUT\n"); } @@ -150,12 +150,11 @@ take_ctrl_offline: * Conditional variable management routine for internal commands. */ int pqisrc_wait_on_condition(pqisrc_softstate_t *softs, rcb_t *rcb){ - DBG_FUNC("IN\n"); int ret = PQI_STATUS_SUCCESS; uint32_t loop_cnt = 0; - + while (rcb->req_pending == true) { OS_SLEEP(500); /* Micro sec */ @@ -170,13 +169,12 @@ int pqisrc_wait_on_condition(pqisrc_softstate_t *softs ret = PQI_STATUS_TIMEOUT; break; } - + if (pqisrc_ctrl_offline(softs)) { DBG_ERR("Controller is Offline"); ret = PQI_STATUS_FAILURE; break; } - } rcb->req_pending = true; Modified: head/sys/dev/smartpqi/smartpqi_includes.h ============================================================================== --- head/sys/dev/smartpqi/smartpqi_includes.h Tue Sep 1 21:53:00 2020 (r365153) +++ head/sys/dev/smartpqi/smartpqi_includes.h Tue Sep 1 21:53:21 2020 (r365154) @@ -78,12 +78,9 @@ #include #include - - #include "smartpqi_defines.h" #include "smartpqi_structures.h" #include "smartpqi_prototypes.h" #include "smartpqi_ioctl.h" - #endif // _PQI_INCLUDES_H Modified: head/sys/dev/smartpqi/smartpqi_init.c ============================================================================== --- head/sys/dev/smartpqi/smartpqi_init.c Tue Sep 1 21:53:00 2020 (r365153) +++ head/sys/dev/smartpqi/smartpqi_init.c Tue Sep 1 21:53:21 2020 (r365154) @@ -34,7 +34,7 @@ static int pqisrc_report_pqi_capability(pqisrc_softstate_t *softs) { int ret = PQI_STATUS_SUCCESS; - + DBG_FUNC("IN\n"); gen_adm_req_iu_t admin_req; @@ -64,7 +64,7 @@ static int pqisrc_report_pqi_capability(pqisrc_softsta DBG_ERR("Failed to allocate capability DMA buffer : %d\n", ret); goto err_dma_alloc; } - + admin_req.fn_code = PQI_FUNCTION_REPORT_DEV_CAP; admin_req.req_type.general_func.buf_size = pqi_cap_dma_buf.size; admin_req.req_type.general_func.sg_desc.length = pqi_cap_dma_buf.size; @@ -107,7 +107,6 @@ static int pqisrc_report_pqi_capability(pqisrc_softsta DBG_INIT("softs->max_ib_iu_length_per_fw: %d\n", softs->max_ib_iu_length_per_fw); DBG_INIT("softs->ib_spanning_supported: %d\n", softs->ib_spanning_supported); DBG_INIT("softs->ob_spanning_supported: %d\n", softs->ob_spanning_supported); - os_mem_free(softs, (void *)capability, REPORT_PQI_DEV_CAP_DATA_BUF_SIZE); @@ -132,7 +131,7 @@ err_out: */ void pqisrc_free_rcb(pqisrc_softstate_t *softs, int req_count) { - + uint32_t num_req; size_t size; int i; @@ -147,7 +146,6 @@ void pqisrc_free_rcb(pqisrc_softstate_t *softs, int re DBG_FUNC("OUT\n"); } - /* * Allocate memory for rcb and SG descriptors. */ @@ -181,7 +179,7 @@ static int pqisrc_allocate_rcb(pqisrc_softstate_t *sof goto err_out; } softs->rcb = rcb; - + /* Allocate sg dma memory for sg chain */ sg_buf_size = softs->pqi_cap.max_sg_elem * sizeof(sgt_t); @@ -227,7 +225,7 @@ void pqisrc_decide_opq_config(pqisrc_softstate_t *soft DBG_INIT("softs->intr_count : %d softs->num_cpus_online : %d", softs->intr_count, softs->num_cpus_online); - + if (softs->intr_count == 1 || softs->num_cpus_online == 1) { /* Share the event and Operational queue. */ softs->num_op_obq = 1; @@ -247,7 +245,7 @@ void pqisrc_decide_opq_config(pqisrc_softstate_t *soft */ if (softs->intr_count > 1) softs->share_opq_and_eventq = false; - + DBG_INIT("softs->num_op_obq : %d\n",softs->num_op_obq); softs->num_op_raid_ibq = softs->num_op_obq; @@ -270,11 +268,11 @@ void pqisrc_decide_opq_config(pqisrc_softstate_t *soft Max.Outstanding IO and Max.Spanning element */ total_iq_elements = (softs->max_outstanding_io * (softs->max_ib_iu_length / softs->ibq_elem_size)); - + softs->num_elem_per_op_ibq = total_iq_elements / softs->num_op_raid_ibq; softs->num_elem_per_op_ibq = MIN(softs->num_elem_per_op_ibq, softs->pqi_dev_cap.max_iq_elements); - + softs->num_elem_per_op_obq = softs->max_outstanding_io / softs->num_op_obq; softs->num_elem_per_op_obq = MIN(softs->num_elem_per_op_obq, softs->pqi_dev_cap.max_oq_elements); @@ -298,7 +296,7 @@ void pqisrc_decide_opq_config(pqisrc_softstate_t *soft int pqisrc_configure_op_queues(pqisrc_softstate_t *softs) { int ret = PQI_STATUS_SUCCESS; - + /* Get the PQI capability, REPORT PQI DEVICE CAPABILITY request */ ret = pqisrc_report_pqi_capability(softs); @@ -313,7 +311,7 @@ int pqisrc_configure_op_queues(pqisrc_softstate_t *sof /* Decide the Op queue configuration */ pqisrc_decide_opq_config(softs); - + DBG_FUNC("OUT\n"); return ret; @@ -364,7 +362,6 @@ int pqisrc_check_pqimode(pqisrc_softstate_t *softs) goto err_out; } - tmo = PQISRC_PQIMODE_READY_TIMEOUT; /* Check the PQI device status register */ COND_WAIT(LE_32(PCI_MEM_GET32(softs, &softs->pqi_reg->pqi_dev_status, PQI_DEV_STATUS)) & @@ -417,7 +414,6 @@ int pqisrc_process_config_table(pqisrc_softstate_t *so softs->pqi_cap.conf_tab_off, (uint8_t*)conf_table, config_table_size); - if (memcmp(conf_table->sign, PQI_CONF_TABLE_SIGNATURE, sizeof(conf_table->sign)) != 0) { DBG_ERR("Invalid PQI config signature\n"); @@ -427,7 +423,6 @@ int pqisrc_process_config_table(pqisrc_softstate_t *so section_off = LE_32(conf_table->first_section_off); while (section_off) { - if (section_off+ sizeof(*section_hdr) >= config_table_size) { DBG_ERR("PQI config table section offset (%u) beyond \ end of config table (config table length: %u)\n", @@ -505,7 +500,7 @@ int pqi_reset(pqisrc_softstate_t *softs) DBG_FUNC("IN\n"); if (true == softs->ctrl_in_pqi_mode) { - + if (softs->pqi_reset_quiesce_allowed) { val = PCI_MEM_GET32(softs, &softs->ioa_reg->host_to_ioa_db, LEGACY_SIS_IDBR); @@ -555,7 +550,7 @@ int pqisrc_pqi_init(pqisrc_softstate_t *softs) PQI_SAVE_CTRL_MODE(softs, CTRL_PQI_MODE); softs->ctrl_in_pqi_mode = true; - + /* Get the No. of Online CPUs,NUMA/Processor config from OS */ ret = os_get_processor_config(softs); if (ret) { @@ -563,7 +558,7 @@ int pqisrc_pqi_init(pqisrc_softstate_t *softs) ret); goto err_out; } - + softs->intr_type = INTR_TYPE_NONE; /* Get the interrupt count, type, priority available from OS */ @@ -682,7 +677,7 @@ int pqisrc_wait_for_cmnd_complete(pqisrc_softstate_t * { int ret = PQI_STATUS_SUCCESS; int tmo = PQI_CMND_COMPLETE_TMO; - + COND_WAIT((softs->taglist.num_elem == softs->max_outstanding_io), tmo); if (!tmo) { DBG_ERR("Pending commands %x!!!",softs->taglist.num_elem); @@ -695,7 +690,7 @@ void pqisrc_complete_internal_cmds(pqisrc_softstate_t { int tag = 0; rcb_t *rcb; - + for (tag = 1; tag <= softs->max_outstanding_io; tag++) { rcb = &softs->rcb[tag]; if(rcb->req_pending && is_internal_req(rcb)) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:53:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B8FDB37CA91; Tue, 1 Sep 2020 21:53:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh16V4NfLz4WfX; Tue, 1 Sep 2020 21:53:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 797B2204F9; Tue, 1 Sep 2020 21:53:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lrckc046981; Tue, 1 Sep 2020 21:53:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LrcEV046980; Tue, 1 Sep 2020 21:53:38 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012153.081LrcEV046980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:53:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365155 - head/sys/dev/sk X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/sk X-SVN-Commit-Revision: 365155 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:53:38 -0000 Author: mjg Date: Tue Sep 1 21:53:37 2020 New Revision: 365155 URL: https://svnweb.freebsd.org/changeset/base/365155 Log: sk: clean up empty lines in .c and .h files Modified: head/sys/dev/sk/if_sk.c head/sys/dev/sk/if_skreg.h Modified: head/sys/dev/sk/if_sk.c ============================================================================== --- head/sys/dev/sk/if_sk.c Tue Sep 1 21:53:21 2020 (r365154) +++ head/sys/dev/sk/if_sk.c Tue Sep 1 21:53:37 2020 (r365155) @@ -265,7 +265,7 @@ static int sysctl_hw_sk_int_mod(SYSCTL_HANDLER_ARGS); /* Tunables. */ static int jumbo_disable = 0; TUNABLE_INT("hw.skc.jumbo_disable", &jumbo_disable); - + /* * It seems that SK-NET GENESIS supports very simple checksum offload * capability for Tx and I believe it can generate 0 checksum value for @@ -936,7 +936,6 @@ sk_discard_rxbuf(sc_if, idx) struct sk_rxdesc *rxd; struct mbuf *m; - r = &sc_if->sk_rdata.sk_rx_ring[idx]; rxd = &sc_if->sk_cdata.sk_rxdesc[idx]; m = rxd->rx_m; @@ -2535,7 +2534,6 @@ sk_start_locked(ifp) sc_if->sk_watchdog_timer = 5; } } - static void sk_watchdog(arg) Modified: head/sys/dev/sk/if_skreg.h ============================================================================== --- head/sys/dev/sk/if_skreg.h Tue Sep 1 21:53:21 2020 (r365154) +++ head/sys/dev/sk/if_skreg.h Tue Sep 1 21:53:37 2020 (r365155) @@ -133,7 +133,6 @@ * there are a few 16-bit and 8-bit ones as well. */ - /* Start of remappable register window. */ #define SK_WIN_BASE 0x0080 From owner-svn-src-all@freebsd.org Tue Sep 1 21:53:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B01A37CA93; Tue, 1 Sep 2020 21:53:48 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh16g42qZz4Whq; Tue, 1 Sep 2020 21:53:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 938142031C; Tue, 1 Sep 2020 21:53:45 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lrj66047031; Tue, 1 Sep 2020 21:53:45 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LrjAY047030; Tue, 1 Sep 2020 21:53:45 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012153.081LrjAY047030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:53:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365156 - head/sys/dev/sec X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/sec X-SVN-Commit-Revision: 365156 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:53:48 -0000 Author: mjg Date: Tue Sep 1 21:53:44 2020 New Revision: 365156 URL: https://svnweb.freebsd.org/changeset/base/365156 Log: sec: clean up empty lines in .c and .h files Modified: head/sys/dev/sec/sec.c Modified: head/sys/dev/sec/sec.c ============================================================================== --- head/sys/dev/sec/sec.c Tue Sep 1 21:53:37 2020 (r365155) +++ head/sys/dev/sec/sec.c Tue Sep 1 21:53:44 2020 (r365156) @@ -266,7 +266,6 @@ sec_attach(device_t dev) if (error) goto fail2; - if (sc->sc_version == 3) { sc->sc_sec_irid = 1; error = sec_setup_intr(sc, &sc->sc_sec_ires, &sc->sc_sec_ihand, From owner-svn-src-all@freebsd.org Tue Sep 1 21:54:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A5F137C85F; Tue, 1 Sep 2020 21:54:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh16w2YK3z4Wyw; Tue, 1 Sep 2020 21:54:00 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBD822004B; Tue, 1 Sep 2020 21:53:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lrwgv047088; Tue, 1 Sep 2020 21:53:58 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LrwRl047087; Tue, 1 Sep 2020 21:53:58 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012153.081LrwRl047087@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:53:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365157 - head/sys/dev/sdio X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/sdio X-SVN-Commit-Revision: 365157 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:54:01 -0000 Author: mjg Date: Tue Sep 1 21:53:58 2020 New Revision: 365157 URL: https://svnweb.freebsd.org/changeset/base/365157 Log: sdio: clean up empty lines in .c and .h files Modified: head/sys/dev/sdio/sdiob.c Modified: head/sys/dev/sdio/sdiob.c ============================================================================== --- head/sys/dev/sdio/sdiob.c Tue Sep 1 21:53:44 2020 (r365156) +++ head/sys/dev/sdio/sdiob.c Tue Sep 1 21:53:58 2020 (r365157) @@ -388,7 +388,6 @@ sdiob_rw_extended_sc(struct sdiob_softc *sc, uint8_t f */ while (sc->cardinfo.support_multiblk && size > 4 && size >= sc->cardinfo.f[fn].cur_blksize) { - b_count = size / sc->cardinfo.f[fn].cur_blksize; KASSERT(b_count >= 1, ("%s: block count too small %u size %u " "cur_blksize %u\n", __func__, b_count, size, @@ -531,7 +530,6 @@ sdiob_write_ivar(device_t dev, device_t child, int whi return (0); } - /* -------------------------------------------------------------------------- */ /* * Newbus functions for ourselves to probe/attach/detach and become a proper @@ -565,7 +563,6 @@ sdiob_attach(device_t dev) * Do this before any child gets a chance to attach. */ for (i = 0; i < sc->cardinfo.num_funcs; i++) { - sc->child[i] = device_add_child(dev, NULL, -1); if (sc->child[i] == NULL) { device_printf(dev, "%s: failed to add child\n", __func__); @@ -612,7 +609,6 @@ sdiob_detach(device_t dev) return (EOPNOTSUPP); } - /* -------------------------------------------------------------------------- */ /* * driver(9) and device(9) "control plane". @@ -622,7 +618,6 @@ sdiob_detach(device_t dev) */ static device_method_t sdiob_methods[] = { - /* Device interface. */ DEVMETHOD(device_probe, sdiob_probe), DEVMETHOD(device_attach, sdiob_attach), @@ -650,7 +645,6 @@ static driver_t sdiob_driver = { 0 }; - /* -------------------------------------------------------------------------- */ /* * CIS related. @@ -859,7 +853,6 @@ sdiob_get_card_info(struct sdiob_softc *sc) mmcp = &sc->ccb->ccb_h.path->device->mmc_ident_data; fn_max = MIN(mmcp->sdio_func_count + 1, nitems(sc->cardinfo.f)); for (fn = 1; fn < fn_max; fn++) { - fbr_addr = SD_IO_FBR_START * fn + SD_IO_FBR_CIS_OFFSET; error = sdio_read_direct_sc(sc, 0, fbr_addr++, &val); @@ -910,7 +903,6 @@ sdiob_get_card_info(struct sdiob_softc *sc) } return (error); } - /* -------------------------------------------------------------------------- */ /* From owner-svn-src-all@freebsd.org Tue Sep 1 21:54:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9C01937C9E8; Tue, 1 Sep 2020 21:54:17 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh17F3hBHz4X19; Tue, 1 Sep 2020 21:54:17 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6344F204FA; Tue, 1 Sep 2020 21:54:17 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LsHHX047161; Tue, 1 Sep 2020 21:54:17 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LsHHd047160; Tue, 1 Sep 2020 21:54:17 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012154.081LsHHd047160@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:54:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365158 - head/sys/dev/sdhci X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/sdhci X-SVN-Commit-Revision: 365158 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:54:17 -0000 Author: mjg Date: Tue Sep 1 21:54:16 2020 New Revision: 365158 URL: https://svnweb.freebsd.org/changeset/base/365158 Log: sdhci: clean up empty lines in .c and .h files Modified: head/sys/dev/sdhci/fsl_sdhci.c head/sys/dev/sdhci/sdhci_fdt.c Modified: head/sys/dev/sdhci/fsl_sdhci.c ============================================================================== --- head/sys/dev/sdhci/fsl_sdhci.c Tue Sep 1 21:53:58 2020 (r365157) +++ head/sys/dev/sdhci/fsl_sdhci.c Tue Sep 1 21:54:16 2020 (r365158) @@ -253,7 +253,6 @@ fsl_sdhci_read_1(device_t dev, struct sdhci_slot *slot return (SDHCI_POWER_ON | SDHCI_POWER_300); } - return ((RD4(sc, off & ~3) >> (off & 3) * 8) & 0xff); } @@ -279,7 +278,6 @@ fsl_sdhci_read_2(device_t dev, struct sdhci_slot *slot return (RD4(sc, USDHC_MIX_CONTROL) & 0x37); } else if (sc->hwtype == HWTYPE_ESDHC) { - /* * The ESDHC hardware has the typical 32-bit combined "command * and mode" register that we have to cache so that command @@ -340,7 +338,7 @@ fsl_sdhci_read_4(device_t dev, struct sdhci_slot *slot val32 |= SDHCI_CAN_DO_8BITBUS; return (val32); } - + /* * The hardware moves bits around in the present state register to make * room for all 8 data line state bits. To translate, mask out all the @@ -596,7 +594,6 @@ fsl_sdhc_set_clock(struct fsl_sdhci_softc *sc, uint16_ WR4(sc, SDHCI_CLOCK_CONTROL, val32 & ~SDHC_CLK_SDCLKEN); #endif return; - } divisor = (val >> SDHCI_DIVIDER_SHIFT) & SDHCI_DIVIDER_MASK; freq = sc->baseclk_hz >> ffs(divisor); @@ -782,7 +779,6 @@ fsl_sdhci_get_platform_clock(device_t dev) /* Get sdhci node properties */ if((OF_getprop(node, "clock-frequency", (void *)&clock, sizeof(clock)) <= 0) || (clock == 0)) { - clock = mpc85xx_get_system_clock(); if (clock == 0) { @@ -799,7 +795,6 @@ fsl_sdhci_get_platform_clock(device_t dev) return (clock); } #endif - static int fsl_sdhci_detach(device_t dev) Modified: head/sys/dev/sdhci/sdhci_fdt.c ============================================================================== --- head/sys/dev/sdhci/sdhci_fdt.c Tue Sep 1 21:53:58 2020 (r365157) +++ head/sys/dev/sdhci/sdhci_fdt.c Tue Sep 1 21:54:16 2020 (r365158) @@ -317,7 +317,7 @@ sdhci_init_rk3399(device_t dev) val = SHIFTIN((freq + (1000000 / 2)) / 1000000, RK3399_CORECFG_BASECLKFREQ); SYSCON_WRITE_4(grf, RK3399_GRF_EMMCCORE_CON0, (mask << 16) | val); - + return (0); } #endif From owner-svn-src-all@freebsd.org Tue Sep 1 21:54:37 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 734E137CAC7; Tue, 1 Sep 2020 21:54:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh17d2VJVz4XHc; Tue, 1 Sep 2020 21:54:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3906A2031D; Tue, 1 Sep 2020 21:54:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lsb9k047224; Tue, 1 Sep 2020 21:54:37 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LsaQj047219; Tue, 1 Sep 2020 21:54:36 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012154.081LsaQj047219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:54:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365159 - head/sys/dev/sbni X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/sbni X-SVN-Commit-Revision: 365159 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:54:37 -0000 Author: mjg Date: Tue Sep 1 21:54:35 2020 New Revision: 365159 URL: https://svnweb.freebsd.org/changeset/base/365159 Log: sbni: clean up empty lines in .c and .h files Modified: head/sys/dev/sbni/if_sbni.c head/sys/dev/sbni/if_sbni_isa.c head/sys/dev/sbni/if_sbni_pci.c head/sys/dev/sbni/if_sbnireg.h head/sys/dev/sbni/if_sbnivar.h Modified: head/sys/dev/sbni/if_sbni.c ============================================================================== --- head/sys/dev/sbni/if_sbni.c Tue Sep 1 21:54:16 2020 (r365158) +++ head/sys/dev/sbni/if_sbni.c Tue Sep 1 21:54:35 2020 (r365159) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); * * Written with reference to NE2000 driver developed by David Greenman. */ - #include #include @@ -169,7 +168,6 @@ sbni_outsb(struct sbni_softc *sc, u_char *from, u_int sc->io_off + DAT, from, len); } - /* Valid combinations in CSR0 (for probing): @@ -195,7 +193,6 @@ sbni_outsb(struct sbni_softc *sc, u_char *from, u_int #define VALID_DECODER (2 + 8 + 0x10 + 0x20 + 0x80 + 0x100 + 0x200) - int sbni_probe(struct sbni_softc *sc) { @@ -214,7 +211,6 @@ sbni_probe(struct sbni_softc *sc) return (ENXIO); } - /* * Install interface into kernel networking data structures */ @@ -341,7 +337,6 @@ sbni_start_locked(struct ifnet *ifp) prepare_to_send(sc); } - static void sbni_stop(struct sbni_softc *sc) { @@ -402,7 +397,6 @@ sbni_intr(void *arg) } while (repeat); } - static void handle_channel(struct sbni_softc *sc) { @@ -442,7 +436,6 @@ handle_channel(struct sbni_softc *sc) sbni_outb(sc, CSR0, sbni_inb(sc, CSR0) | EN_INT); } - /* * Routine returns 1 if it need to acknoweledge received frame. * Empty frame received without errors won't be acknoweledged. @@ -482,7 +475,6 @@ recv_frame(struct sbni_softc *sc) return (!frame_ok || framelen > 4); } - static void send_frame(struct sbni_softc *sc) { @@ -491,7 +483,6 @@ send_frame(struct sbni_softc *sc) crc = CRC32_INITIAL; if (sc->state & FL_NEED_RESEND) { - /* if frame was sended but not ACK'ed - resend it */ if (sc->trans_errors) { sc->trans_errors--; @@ -512,7 +503,6 @@ send_frame(struct sbni_softc *sc) * frame sended then in prepare_to_send next frame */ - if (sc->framelen) { download_data(sc, &crc); sc->in_stats.all_tx_number++; @@ -531,7 +521,6 @@ do_send: } } - static void download_data(struct sbni_softc *sc, u_int32_t *crc_p) { @@ -588,7 +577,6 @@ do_copy: } while (pos < sc->framelen); } - static int upload_data(struct sbni_softc *sc, u_int framelen, u_int frameno, u_int is_first, u_int32_t crc) @@ -601,7 +589,6 @@ upload_data(struct sbni_softc *sc, u_int framelen, u_i } if (sc->wait_frameno == frameno) { - if (sc->inppos + framelen <= ETHER_MAX_LEN) { frame_ok = append_frame_to_pkt(sc, framelen, crc); @@ -630,7 +617,6 @@ upload_data(struct sbni_softc *sc, u_int framelen, u_i return (frame_ok); } - static __inline void send_complete(struct sbni_softc *); static __inline void @@ -641,7 +627,6 @@ send_complete(struct sbni_softc *sc) if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1); } - static void interpret_ack(struct sbni_softc *sc, u_int ack) { @@ -664,7 +649,6 @@ interpret_ack(struct sbni_softc *sc, u_int ack) sc->state &= ~FL_WAIT_ACK; } - /* * Glue received frame with previous fragments of packet. * Indicate packet when last frame would be accepted. @@ -695,7 +679,6 @@ append_frame_to_pkt(struct sbni_softc *sc, u_int frame return (1); } - /* * Prepare to start output on adapter. Current priority must be set to splimp * before this routine is called. @@ -746,7 +729,6 @@ prepare_to_send(struct sbni_softc *sc) BPF_MTAP(sc->ifp, sc->tx_buf_p); } - static void drop_xmit_queue(struct sbni_softc *sc) { @@ -773,7 +755,6 @@ drop_xmit_queue(struct sbni_softc *sc) sc->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; } - static void send_frame_header(struct sbni_softc *sc, u_int32_t *crc_p) { @@ -807,7 +788,6 @@ send_frame_header(struct sbni_softc *sc, u_int32_t *cr *crc_p = crc; } - /* * if frame tail not needed (incorrect number or received twice), * it won't store, but CRC will be calculated @@ -822,7 +802,6 @@ skip_tail(struct sbni_softc *sc, u_int tail_len, u_int return (crc == CRC32_REMAINDER); } - static int check_fhdr(struct sbni_softc *sc, u_int *framelen, u_int *frameno, u_int *ack, u_int *is_first, u_int32_t *crc_p) @@ -858,7 +837,6 @@ check_fhdr(struct sbni_softc *sc, u_int *framelen, u_i return (1); } - static int get_rx_buf(struct sbni_softc *sc) { @@ -895,7 +873,6 @@ get_rx_buf(struct sbni_softc *sc) return (1); } - static void indicate_pkt(struct sbni_softc *sc) { @@ -930,7 +907,6 @@ sbni_timeout(void *xsc) csr0 = sbni_inb(sc, CSR0); if (csr0 & RC_CHK) { - if (sc->timer_ticks) { if (csr0 & (RC_RDY | BU_EMP)) /* receiving not active */ @@ -1005,7 +981,6 @@ set_initial_values(struct sbni_softc *sc, struct sbni_ } } - #ifdef SBNI_DUAL_COMPOUND void sbni_add(struct sbni_softc *sc) @@ -1042,7 +1017,6 @@ connect_to_master(struct sbni_softc *sc) #endif /* SBNI_DUAL_COMPOUND */ - /* Receive level auto-selection */ static void @@ -1065,7 +1039,6 @@ change_level(struct sbni_softc *sc) sc->prev_rxl_rcvd = sc->cur_rxl_rcvd; sc->cur_rxl_rcvd = 0; } - static void timeout_change_level(struct sbni_softc *sc) Modified: head/sys/dev/sbni/if_sbni_isa.c ============================================================================== --- head/sys/dev/sbni/if_sbni_isa.c Tue Sep 1 21:54:16 2020 (r365158) +++ head/sys/dev/sbni/if_sbni_isa.c Tue Sep 1 21:54:35 2020 (r365159) @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD$"); - #include #include #include @@ -99,7 +98,6 @@ sbni_probe_isa(device_t dev) device_set_desc(dev, "Granch SBNI12/ISA adapter"); return (0); } - static int sbni_attach_isa(device_t dev) Modified: head/sys/dev/sbni/if_sbni_pci.c ============================================================================== --- head/sys/dev/sbni/if_sbni_pci.c Tue Sep 1 21:54:16 2020 (r365158) +++ head/sys/dev/sbni/if_sbni_pci.c Tue Sep 1 21:54:35 2020 (r365159) @@ -77,7 +77,7 @@ sbni_pci_probe(device_t dev) { struct sbni_softc *sc; u_int32_t ports; - + ports = SBNI_PORTS; if (pci_get_vendor(dev) != SBNI_PCI_VENDOR || pci_get_device(dev) != SBNI_PCI_DEVICE) @@ -183,7 +183,7 @@ sbni_pci_detach(device_t dev) sbni_detach(sc); if (sc->slave_sc) sbni_detach(sc); - + sbni_release_resources(sc); if (sc->slave_sc) free(sc->slave_sc, M_DEVBUF); Modified: head/sys/dev/sbni/if_sbnireg.h ============================================================================== --- head/sys/dev/sbni/if_sbnireg.h Tue Sep 1 21:54:16 2020 (r365158) +++ head/sys/dev/sbni/if_sbnireg.h Tue Sep 1 21:54:35 2020 (r365159) @@ -55,7 +55,6 @@ enum { RC_RDY = 0x80 }; - /* CSR1 mapping */ #define PR_RES 0x80 @@ -65,8 +64,6 @@ struct sbni_csr1 { unsigned : 1; }; - - #define FRAME_ACK_MASK (u_int16_t)0x7000 #define FRAME_LEN_MASK (u_int16_t)0x03FF #define FRAME_FIRST (u_int16_t)0x8000 @@ -75,14 +72,12 @@ struct sbni_csr1 { #define FRAME_SENT_BAD (u_int16_t)0x4000 #define FRAME_SENT_OK (u_int16_t)0x3000 - enum { FL_WAIT_ACK = 1, FL_NEED_RESEND = 2, FL_PREV_OK = 4, FL_SLOW_MODE = 8 }; - enum { DEFAULT_IOBASEADDR = 0x210, Modified: head/sys/dev/sbni/if_sbnivar.h ============================================================================== --- head/sys/dev/sbni/if_sbnivar.h Tue Sep 1 21:54:16 2020 (r365158) +++ head/sys/dev/sbni/if_sbnivar.h Tue Sep 1 21:54:35 2020 (r365159) @@ -63,7 +63,6 @@ struct sbni_flags { u_int fixed_rate : 1; }; - #ifdef _KERNEL /* to avoid compile this decls with sbniconfig */ struct sbni_softc { @@ -81,7 +80,7 @@ struct sbni_softc { struct mbuf *rx_buf_p; /* receive buffer ptr */ struct mbuf *tx_buf_p; /* transmit buffer ptr */ - + u_int pktlen; /* length of transmitting pkt */ u_int framelen; /* current frame length */ u_int maxframe; /* maximum valid frame length */ @@ -147,7 +146,6 @@ struct sbni_softc *connect_to_master(struct sbni_softc #define SIOCSHWFLAGS _IOWR('i', 61, struct ifreq) /* set flags */ #define SIOCGINSTATS _IOWR('i', 60, struct ifreq) /* get internal stats */ #define SIOCRINSTATS _IOWR('i', 63, struct ifreq) /* reset internal stats */ - /* * CRC-32 stuff From owner-svn-src-all@freebsd.org Tue Sep 1 21:54:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 22DEF37CA67; Tue, 1 Sep 2020 21:54:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh18309w3z4XQx; Tue, 1 Sep 2020 21:54:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DDADE20502; Tue, 1 Sep 2020 21:54:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LswrC047288; Tue, 1 Sep 2020 21:54:58 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LswTE047287; Tue, 1 Sep 2020 21:54:58 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012154.081LswTE047287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:54:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365160 - head/sys/dev/safexcel X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/safexcel X-SVN-Commit-Revision: 365160 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:54:59 -0000 Author: mjg Date: Tue Sep 1 21:54:58 2020 New Revision: 365160 URL: https://svnweb.freebsd.org/changeset/base/365160 Log: safexcel: clean up empty lines in .c and .h files Modified: head/sys/dev/safexcel/safexcel_reg.h Modified: head/sys/dev/safexcel/safexcel_reg.h ============================================================================== --- head/sys/dev/safexcel/safexcel_reg.h Tue Sep 1 21:54:35 2020 (r365159) +++ head/sys/dev/safexcel/safexcel_reg.h Tue Sep 1 21:54:58 2020 (r365160) @@ -35,7 +35,6 @@ #define SAFEXCEL_REG_LO16(_reg) ((_reg) & 0xffff) #define SAFEXCEL_REG_HI16(_reg) (((_reg) >> 16) & 0xffff) - /* HIA, Command Descriptor Ring Manager */ #define CDR_BASE_ADDR_LO(x) (0x0 + ((x) << 12)) #define CDR_BASE_ADDR_HI(x) (0x4 + ((x) << 12)) From owner-svn-src-all@freebsd.org Tue Sep 1 21:55:24 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0420F37CD32; Tue, 1 Sep 2020 21:55:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh18W6Jzkz4XcD; Tue, 1 Sep 2020 21:55:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD1CC2004D; Tue, 1 Sep 2020 21:55:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LtNGw047393; Tue, 1 Sep 2020 21:55:23 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LtNpA047392; Tue, 1 Sep 2020 21:55:23 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012155.081LtNpA047392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:55:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365161 - head/sys/dev/safe X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/safe X-SVN-Commit-Revision: 365161 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:55:24 -0000 Author: mjg Date: Tue Sep 1 21:55:23 2020 New Revision: 365161 URL: https://svnweb.freebsd.org/changeset/base/365161 Log: safe: clean up empty lines in .c and .h files Modified: head/sys/dev/safe/safe.c Modified: head/sys/dev/safe/safe.c ============================================================================== --- head/sys/dev/safe/safe.c Tue Sep 1 21:54:58 2020 (r365160) +++ head/sys/dev/safe/safe.c Tue Sep 1 21:55:23 2020 (r365161) @@ -1736,9 +1736,9 @@ safe_free_entry(struct safe_softc *sc, struct safe_rin m_freem(re->re_dst_m); crp = (struct cryptop *)re->re_crp; - + re->re_desc.d_csr = 0; - + crp->crp_etype = EFAULT; crypto_done(crp); return(0); From owner-svn-src-all@freebsd.org Tue Sep 1 21:55:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BFFBF37CB7D; Tue, 1 Sep 2020 21:55:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh18p4gLJz4XV7; Tue, 1 Sep 2020 21:55:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83EA7200F5; Tue, 1 Sep 2020 21:55:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Ltc20047451; Tue, 1 Sep 2020 21:55:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Ltc8u047450; Tue, 1 Sep 2020 21:55:38 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012155.081Ltc8u047450@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:55:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365162 - head/sys/dev/rt X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/rt X-SVN-Commit-Revision: 365162 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:55:38 -0000 Author: mjg Date: Tue Sep 1 21:55:37 2020 New Revision: 365162 URL: https://svnweb.freebsd.org/changeset/base/365162 Log: rt: clean up empty lines in .c and .h files Modified: head/sys/dev/rt/if_rt.c Modified: head/sys/dev/rt/if_rt.c ============================================================================== --- head/sys/dev/rt/if_rt.c Tue Sep 1 21:55:23 2020 (r365161) +++ head/sys/dev/rt/if_rt.c Tue Sep 1 21:55:37 2020 (r365162) @@ -295,7 +295,6 @@ ether_request_mac(device_t dev, uint8_t *mac) #if defined(RT305X_UBOOT) || defined(__REDBOOT__) || defined(__ROUTERBOOT__) if ((var = kern_getenv("ethaddr")) != NULL || (var = kern_getenv("kmac")) != NULL ) { - if(!macaddr_atoi(var, mac)) { printf("%s: use %s macaddr from KENV\n", device_get_nameunit(dev), var); @@ -312,7 +311,6 @@ ether_request_mac(device_t dev, uint8_t *mac) */ if (!resource_string_value(device_get_name(dev), device_get_unit(dev), "macaddr", (const char **)&var)) { - if(!macaddr_atoi(var, mac)) { printf("%s: use %s macaddr from hints\n", device_get_nameunit(dev), var); @@ -404,7 +402,6 @@ rt_attach(device_t dev) /* Reset hardware */ reset_freng(sc); - if (sc->rt_chipid == RT_CHIPID_MT7620) { sc->csum_fail_ip = MT7620_RXD_SRC_IP_CSUM_FAIL; sc->csum_fail_l4 = MT7620_RXD_SRC_L4_CSUM_FAIL; @@ -1000,7 +997,7 @@ rt_stop_locked(void *priv) /* disable interrupts */ RT_WRITE(sc, sc->fe_int_enable, 0); - + if(sc->rt_chipid != RT_CHIPID_RT5350 && sc->rt_chipid != RT_CHIPID_MT7620 && sc->rt_chipid != RT_CHIPID_MT7621) { @@ -1110,7 +1107,6 @@ rt_tx_data(struct rt_softc *sc, struct mbuf *m, int qi /* set up Tx descs */ for (i = 0; i < ndmasegs; i += 2) { - /* TODO: this needs to be refined as MT7620 for example has * a different word3 layout than RT305x and RT5350 (the last * one doesn't use word3 at all). And so does MT7621... @@ -1545,25 +1541,25 @@ rt_rt5350_intr(void *arg) struct rt_softc *sc; struct ifnet *ifp; uint32_t status; - + sc = arg; ifp = sc->ifp; - + /* acknowledge interrupts */ status = RT_READ(sc, sc->fe_int_status); RT_WRITE(sc, sc->fe_int_status, status); - + RT_DPRINTF(sc, RT_DEBUG_INTR, "interrupt: status=0x%08x\n", status); - + if (status == 0xffffffff || /* device likely went away */ status == 0) /* not for us */ return; - + sc->interrupts++; - + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) return; - + if (status & RT5350_INT_TX_COHERENT) rt_tx_coherent_intr(sc); if (status & RT5350_INT_RX_COHERENT) From owner-svn-src-all@freebsd.org Tue Sep 1 21:55:53 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 66ADA37CE90; Tue, 1 Sep 2020 21:55:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh195272Dz4Xtx; Tue, 1 Sep 2020 21:55:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CA2F202A7; Tue, 1 Sep 2020 21:55:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Ltrxp047513; Tue, 1 Sep 2020 21:55:53 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Ltrk9047512; Tue, 1 Sep 2020 21:55:53 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012155.081Ltrk9047512@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:55:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365163 - head/sys/dev/rndtest X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/rndtest X-SVN-Commit-Revision: 365163 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:55:53 -0000 Author: mjg Date: Tue Sep 1 21:55:52 2020 New Revision: 365163 URL: https://svnweb.freebsd.org/changeset/base/365163 Log: rndtest: clean up empty lines in .c and .h files Modified: head/sys/dev/rndtest/rndtest.h Modified: head/sys/dev/rndtest/rndtest.h ============================================================================== --- head/sys/dev/rndtest/rndtest.h Tue Sep 1 21:55:37 2020 (r365162) +++ head/sys/dev/rndtest/rndtest.h Tue Sep 1 21:55:52 2020 (r365163) @@ -34,7 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ - /* Some of the tests depend on these values */ #define RNDTEST_NBYTES 2500 #define RNDTEST_NBITS (8 * RNDTEST_NBYTES) From owner-svn-src-all@freebsd.org Tue Sep 1 21:56:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2C01437CF0A; Tue, 1 Sep 2020 21:56:07 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh19K6RfGz4XyK; Tue, 1 Sep 2020 21:56:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 72B6620503; Tue, 1 Sep 2020 21:56:04 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lu4Ml047570; Tue, 1 Sep 2020 21:56:04 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lu4OK047569; Tue, 1 Sep 2020 21:56:04 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012156.081Lu4OK047569@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:56:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365164 - head/sys/dev/rl X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/rl X-SVN-Commit-Revision: 365164 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:56:07 -0000 Author: mjg Date: Tue Sep 1 21:56:03 2020 New Revision: 365164 URL: https://svnweb.freebsd.org/changeset/base/365164 Log: rl: clean up empty lines in .c and .h files Modified: head/sys/dev/rl/if_rl.c Modified: head/sys/dev/rl/if_rl.c ============================================================================== --- head/sys/dev/rl/if_rl.c Tue Sep 1 21:55:52 2020 (r365163) +++ head/sys/dev/rl/if_rl.c Tue Sep 1 21:56:03 2020 (r365164) @@ -590,7 +590,7 @@ rl_probe(device_t dev) const struct rl_type *t; uint16_t devid, revid, vendor; int i; - + vendor = pci_get_vendor(dev); devid = pci_get_device(dev); revid = pci_get_revid(dev); @@ -667,7 +667,6 @@ rl_attach(device_t dev) pci_enable_busmaster(dev); - /* * Map control/status registers. * Default to using PIO access for this driver. On SMP systems, @@ -1393,7 +1392,7 @@ rl_twister_update(struct rl_softc *sc) case DONE: break; } - + } static void @@ -1636,7 +1635,6 @@ rl_start_locked(struct ifnet *ifp) return; while (RL_CUR_TXMBUF(sc) == NULL) { - IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) From owner-svn-src-all@freebsd.org Tue Sep 1 21:56:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 26BCF37CF14; Tue, 1 Sep 2020 21:56:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh19T4HDkz4Y3S; Tue, 1 Sep 2020 21:56:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF72F2024B; Tue, 1 Sep 2020 21:56:12 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LuCYT047633; Tue, 1 Sep 2020 21:56:12 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LuAmY047625; Tue, 1 Sep 2020 21:56:10 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012156.081LuAmY047625@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:56:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365165 - head/sys/dev/ral X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ral X-SVN-Commit-Revision: 365165 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:56:14 -0000 Author: mjg Date: Tue Sep 1 21:56:10 2020 New Revision: 365165 URL: https://svnweb.freebsd.org/changeset/base/365165 Log: ral: clean up empty lines in .c and .h files Modified: head/sys/dev/ral/if_ral_pci.c head/sys/dev/ral/rt2560.c head/sys/dev/ral/rt2560reg.h head/sys/dev/ral/rt2661.c head/sys/dev/ral/rt2661reg.h head/sys/dev/ral/rt2661var.h head/sys/dev/ral/rt2860.c head/sys/dev/ral/rt2860reg.h Modified: head/sys/dev/ral/if_ral_pci.c ============================================================================== --- head/sys/dev/ral/if_ral_pci.c Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/if_ral_pci.c Tue Sep 1 21:56:10 2020 (r365165) @@ -231,7 +231,7 @@ ral_pci_attach(device_t dev) sc->sc_st = rman_get_bustag(psc->mem); sc->sc_sh = rman_get_bushandle(psc->mem); sc->sc_invalid = 1; - + rid = 0; if (ral_msi_disable == 0) { count = 1; @@ -265,7 +265,7 @@ ral_pci_attach(device_t dev) return error; } sc->sc_invalid = 0; - + return 0; } @@ -274,7 +274,7 @@ ral_pci_detach(device_t dev) { struct ral_pci_softc *psc = device_get_softc(dev); struct rt2560_softc *sc = &psc->u.sc_rt2560; - + /* check if device was removed */ sc->sc_invalid = !bus_child_present(dev); Modified: head/sys/dev/ral/rt2560.c ============================================================================== --- head/sys/dev/ral/rt2560.c Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2560.c Tue Sep 1 21:56:10 2020 (r365165) @@ -342,7 +342,7 @@ rt2560_detach(void *xsc) { struct rt2560_softc *sc = xsc; struct ieee80211com *ic = &sc->sc_ic; - + rt2560_stop(sc); ieee80211_ifdetach(ic); @@ -2453,7 +2453,6 @@ rt2560_read_config(struct rt2560_softc *sc) DPRINTF(sc, "rssi correction %d, calibrate 0x%02x\n", sc->rssi_corr, val); } - static void rt2560_scan_start(struct ieee80211com *ic) Modified: head/sys/dev/ral/rt2560reg.h ============================================================================== --- head/sys/dev/ral/rt2560reg.h Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2560reg.h Tue Sep 1 21:56:10 2020 (r365165) @@ -115,7 +115,6 @@ #define RT2560_SECCSR1 0x0158 /* WEP control */ #define RT2560_BBPCSR1 0x015c /* BBP TX Configuration */ - /* possible flags for register RXCSR0 */ #define RT2560_DISABLE_RX (1 << 0) #define RT2560_DROP_CRC_ERROR (1 << 1) Modified: head/sys/dev/ral/rt2661.c ============================================================================== --- head/sys/dev/ral/rt2661.c Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2661.c Tue Sep 1 21:56:10 2020 (r365165) @@ -332,7 +332,7 @@ rt2661_detach(void *xsc) { struct rt2661_softc *sc = xsc; struct ieee80211com *ic = &sc->sc_ic; - + RAL_LOCK(sc); rt2661_stop_locked(sc); RAL_UNLOCK(sc); Modified: head/sys/dev/ral/rt2661reg.h ============================================================================== --- head/sys/dev/ral/rt2661reg.h Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2661reg.h Tue Sep 1 21:56:10 2020 (r365165) @@ -119,7 +119,6 @@ #define RT2661_IO_CNTL_CSR 0x3498 #define RT2661_MCU_CODE_BASE 0x4000 - /* possible flags for register HOST_CMD_CSR */ #define RT2661_KICK_CMD (1 << 7) /* Host to MCU (8051) command identifiers */ Modified: head/sys/dev/ral/rt2661var.h ============================================================================== --- head/sys/dev/ral/rt2661var.h Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2661var.h Tue Sep 1 21:56:10 2020 (r365165) @@ -114,7 +114,7 @@ struct rt2661_softc { * The same in both up to here * ------------------------------------------------ */ - + int sc_flags; #define RAL_FW_LOADED 0x1 #define RAL_INPUT_RUNNING 0x2 Modified: head/sys/dev/ral/rt2860.c ============================================================================== --- head/sys/dev/ral/rt2860.c Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2860.c Tue Sep 1 21:56:10 2020 (r365165) @@ -504,7 +504,6 @@ rt2860_dma_map_addr(void *arg, bus_dma_segment_t *segs *(bus_addr_t *)arg = segs[0].ds_addr; } - static int rt2860_alloc_tx_ring(struct rt2860_softc *sc, struct rt2860_tx_ring *ring) { @@ -2591,7 +2590,7 @@ rt5390_set_chan(struct rt2860_softc *sc, u_int chan) rf = MIN(rf, 0x5f); if (tmp != rf) rt2860_mcu_cmd(sc, 0x74, (tmp << 8 ) | rf, 0); - + if (sc->mac_ver == 0x5390) { if (chan <= 4) rf = 0x73; Modified: head/sys/dev/ral/rt2860reg.h ============================================================================== --- head/sys/dev/ral/rt2860reg.h Tue Sep 1 21:56:03 2020 (r365164) +++ head/sys/dev/ral/rt2860reg.h Tue Sep 1 21:56:10 2020 (r365165) @@ -210,7 +210,6 @@ #define RT2860_H2M_BBPAGENT 0x7028 #define RT2860_BCN_BASE(vap) (0x7800 + (vap) * 512) - /* possible flags for RT2860_PCI_CFG */ #define RT2860_PCI_CFG_USB (1 << 17) #define RT2860_PCI_CFG_PCI (1 << 16) @@ -699,13 +698,11 @@ #define RT2860_H2M_BUSY (1 << 24) #define RT2860_TOKEN_NO_INTR 0xff - /* possible flags for MCU command RT2860_MCU_CMD_LEDS */ #define RT2860_LED_RADIO (1 << 13) #define RT2860_LED_LINK_2GHZ (1 << 14) #define RT2860_LED_LINK_5GHZ (1 << 15) - /* possible flags for RT3020 RF register 1 */ #define RT3070_RF_BLOCK (1 << 0) #define RT3070_PLL_PD (1 << 1) @@ -896,7 +893,6 @@ struct rt2860_rxwi { uint8_t snr[2]; uint16_t reserved2; } __packed; - /* first DMA segment contains TXWI + 802.11 header + 32-bit padding */ #define RT2860_TXWI_DMASZ \ From owner-svn-src-all@freebsd.org Tue Sep 1 21:56:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3FD9137D022; Tue, 1 Sep 2020 21:56:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh19s1JpKz4Y4l; Tue, 1 Sep 2020 21:56:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0FF0720504; Tue, 1 Sep 2020 21:56:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LuXPY047710; Tue, 1 Sep 2020 21:56:33 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LuVYG047694; Tue, 1 Sep 2020 21:56:31 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012156.081LuVYG047694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:56:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365166 - head/sys/dev/qlxge X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/qlxge X-SVN-Commit-Revision: 365166 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:56:33 -0000 Author: mjg Date: Tue Sep 1 21:56:30 2020 New Revision: 365166 URL: https://svnweb.freebsd.org/changeset/base/365166 Log: qlxge: clean up empty lines in .c and .h files Modified: head/sys/dev/qlxge/qls_dbg.c head/sys/dev/qlxge/qls_dbg.h head/sys/dev/qlxge/qls_def.h head/sys/dev/qlxge/qls_dump.c head/sys/dev/qlxge/qls_dump.h head/sys/dev/qlxge/qls_hw.c head/sys/dev/qlxge/qls_hw.h head/sys/dev/qlxge/qls_ioctl.c head/sys/dev/qlxge/qls_ioctl.h head/sys/dev/qlxge/qls_isr.c head/sys/dev/qlxge/qls_os.c head/sys/dev/qlxge/qls_os.h Modified: head/sys/dev/qlxge/qls_dbg.c ============================================================================== --- head/sys/dev/qlxge/qls_dbg.c Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_dbg.c Tue Sep 1 21:56:30 2020 (r365166) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include "qls_glbl.h" #include "qls_dbg.h" - uint32_t qls_dbg_level = 0 ; /* * Name: qls_dump_buf32 @@ -162,7 +161,7 @@ qls_dump_buf8(qla_host_t *ha, const char *msg, void *d buf = dbuf; device_printf(dev, "%s: %s 0x%x dump start\n", __func__, msg, len); - + while (len >= 16) { device_printf(dev,"0x%08x:" " %02x %02x %02x %02x %02x %02x %02x %02x" @@ -265,7 +264,7 @@ qls_dump_buf8(qla_host_t *ha, const char *msg, void *d default: break; } - + device_printf(dev, "%s: %s dump end\n", __func__, msg); return; @@ -306,4 +305,3 @@ qls_dump_cq(qla_host_t *ha) return; } - Modified: head/sys/dev/qlxge/qls_dbg.h ============================================================================== --- head/sys/dev/qlxge/qls_dbg.h Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_dbg.h Tue Sep 1 21:56:30 2020 (r365166) @@ -48,7 +48,6 @@ extern void qls_dump_buf32(qla_host_t *ha, const char extern void qls_dump_cq(qla_host_t *ha); - #ifdef QL_DBG #define QL_DPRINT1(x) if (qls_dbg_level & 0x0001) device_printf x @@ -91,6 +90,5 @@ extern void qls_dump_cq(qla_host_t *ha); #define QL_DUMP_CQ(ha) #endif - #endif /* #ifndef _QL_DBG_H_ */ Modified: head/sys/dev/qlxge/qls_def.h ============================================================================== --- head/sys/dev/qlxge/qls_def.h Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_def.h Tue Sep 1 21:56:30 2020 (r365166) @@ -96,7 +96,6 @@ struct qla_tx_buf { typedef struct qla_tx_buf qla_tx_buf_t; struct qla_tx_ring { - volatile struct { uint32_t wq_dma:1, privb_dma:1; @@ -119,7 +118,7 @@ struct qla_tx_ring { uint32_t *txr_cons_vaddr; bus_addr_t txr_cons_paddr; - + volatile uint32_t txr_free; /* # of free entries in tx ring */ volatile uint32_t txr_next; /* # next available tx ring entry */ volatile uint32_t txr_done; @@ -147,7 +146,6 @@ typedef struct qla_tx_ring qla_tx_ring_t; #define QLA_LGBQ_AND_TABLE_SIZE \ ((QLA_LBQ_SIZE + PAGE_SIZE + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1)) - /* Please note that Small Buffer size is determined by max mtu size */ #define QLA_NUM_SMB_ENTRIES NUM_RX_DESCRIPTORS @@ -222,7 +220,6 @@ struct qla_rx_ring { }; typedef struct qla_rx_ring qla_rx_ring_t; - #define QLA_WATCHDOG_CALLOUT_TICKS 1 /* @@ -326,7 +323,7 @@ struct qla_host { uint8_t mac_addr[ETHER_ADDR_LEN]; uint32_t nmcast; qla_mcast_t mcast[Q8_MAX_NUM_MULTICAST_ADDRS]; - + /* Link Related */ uint8_t link_up; uint32_t link_status; @@ -358,7 +355,7 @@ struct qla_host { /* mpi dump related */ qla_dma_t mpi_dma; qla_dma_t rss_dma; - + }; typedef struct qla_host qla_host_t; Modified: head/sys/dev/qlxge/qls_dump.c ============================================================================== --- head/sys/dev/qlxge/qls_dump.c Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_dump.c Tue Sep 1 21:56:30 2020 (r365166) @@ -33,7 +33,6 @@ #include __FBSDID("$FreeBSD$"); - #include "qls_os.h" #include "qls_hw.h" #include "qls_def.h" @@ -380,7 +379,6 @@ qls_wait_reg_rdy(qla_host_t *ha , uint32_t reg, uint32 int count = 10; while (count) { - data = READ_REG32(ha, reg); if (data & err_bit) @@ -439,7 +437,6 @@ exit_qls_wr_mpi_reg: return (ret); } - #define Q81_TEST_LOGIC_FUNC_PORT_CONFIG 0x1002 #define Q81_INVALID_NUM 0xFFFFFFFF @@ -528,7 +525,6 @@ qls_wait_ofunc_reg_rdy(qla_host_t *ha , uint32_t reg, int count = 10; while (count) { - data = qls_rd_ofunc_reg(ha, reg); if (data & err_bit) @@ -685,7 +681,6 @@ qls_rd_serdes_regs(qla_host_t *ha, qls_mpi_coredump_t temp = 0; if ((temp & Q81_XFI1_POWERED_UP) == Q81_XFI1_POWERED_UP) { - if (ha->pci_func & 1) xfi_ind_valid = 1; /* NIC 2, so the indirect (NIC1) xfi is up*/ @@ -694,7 +689,6 @@ qls_rd_serdes_regs(qla_host_t *ha, qls_mpi_coredump_t } if((temp & Q81_XFI2_POWERED_UP) == Q81_XFI2_POWERED_UP) { - if(ha->pci_func & 1) xfi_d_valid = 1; /* NIC 2, so the indirect (NIC1) xfi is up */ @@ -855,7 +849,6 @@ qls_get_intr_states(qla_host_t *ha, uint32_t *buf) int i; for (i = 0; i < MAX_RX_RINGS; i++, buf++) { - WRITE_REG32(ha, Q81_CTL_INTR_ENABLE, (0x037f0300 + i)); *buf = READ_REG32(ha, Q81_CTL_INTR_ENABLE); @@ -892,7 +885,6 @@ qls_rd_xgmac_regs(qla_host_t *ha, uint32_t *buf, uint3 int i; for (i = 0; i < Q81_XGMAC_REGISTER_END; i += 4, buf ++) { - switch (i) { case Q81_PAUSE_SRC_LO : case Q81_PAUSE_SRC_HI : @@ -1158,7 +1150,6 @@ qls_rd_xgmac_regs(qla_host_t *ha, uint32_t *buf, uint3 default: break; - } } return 0; @@ -1170,7 +1161,6 @@ qls_get_mpi_regs(qla_host_t *ha, uint32_t *buf, uint32 int i, ret = 0; for (i = 0; i < count; i++, buf++) { - ret = qls_rd_mpi_reg(ha, (offset + i), buf); if (ret) @@ -1191,7 +1181,6 @@ qls_get_mpi_shadow_regs(qla_host_t *ha, uint32_t *buf) #define Q81_SHADOW_OFFSET 0xb0000000 for (i = 0; i < Q81_MPI_CORE_SH_REGS_CNT; i++, buf++) { - ret = qls_wr_mpi_reg(ha, (Q81_CTL_PROC_ADDR_RISC_INT_REG | Q81_RISC_124), (Q81_SHADOW_OFFSET | i << 20)); @@ -1225,11 +1214,8 @@ qls_get_probe(qla_host_t *ha, uint32_t clock, uint8_t uint32_t module, mux_sel, probe, lo_val, hi_val; for (module = 0; module < Q81_MAX_MODULES; module ++) { - if (valid[module]) { - for (mux_sel = 0; mux_sel < Q81_MAX_MUX; mux_sel++) { - probe = clock | Q81_ADDRESS_REGISTER_ENABLE | mux_sel | (module << 9); WRITE_REG32(ha, Q81_CTL_XG_PROBE_MUX_ADDR,\ @@ -1300,7 +1286,6 @@ qls_get_probe_dump(qla_host_t *ha, uint32_t *buf) 0 // 0x1F }; - uint8_t pci_clock_valid_modules[0x20] = { 1, // 0x00 0, // 0x01 @@ -1336,7 +1321,6 @@ qls_get_probe_dump(qla_host_t *ha, uint32_t *buf) 0 // 0x1F }; - uint8_t xgm_clock_valid_modules[0x20] = { 1, // 0x00 0, // 0x01 @@ -1435,7 +1419,6 @@ qls_get_ridx_registers(qla_host_t *ha, uint32_t *buf) idx_max = 16; for (idx = 0; idx < idx_max; idx ++) { - val = 0x04000000 | (type << 16) | (idx << 8); WRITE_REG32(ha, Q81_CTL_ROUTING_INDEX, val); @@ -1476,7 +1459,6 @@ qls_get_mac_proto_regs(qla_host_t *ha, uint32_t* buf) for (type = 0; type < Q81_NUM_TYPES; type ++) { switch (type) { - case 0: // CAM initial_val = Q81_RS_AND_ADR; max_index = 512; @@ -1540,9 +1522,7 @@ qls_get_mac_proto_regs(qla_host_t *ha, uint32_t* buf) } for (index = 0; index < max_index; index ++) { - for (offset = 0; offset < max_offset; offset ++) { - val = initial_val | (type << 16) | (index << 4) | (offset); @@ -1663,7 +1643,6 @@ qls_mpi_core_dump(qla_host_t *ha) qls_rd_xgmac_regs(ha, &mpi_dump->xgmac2[0], 1); } - qls_mpid_seg_hdr(&mpi_dump->xaui1_an_hdr, Q81_XAUI1_AN_SEG_NUM, (sizeof(qls_mpid_seg_hdr_t) + @@ -1928,7 +1907,6 @@ qls_mpi_core_dump(qla_host_t *ha) "Sem Registers"); for(i = 0; i < Q81_MAX_SEMAPHORE_FUNCTIONS ; i ++) { - reg = Q81_CTL_PROC_ADDR_REG_BLOCK | (i << Q81_FUNCTION_SHIFT) | (Q81_CTL_SEMAPHORE >> 2); @@ -1991,4 +1969,3 @@ qls_mpi_core_dump(qla_host_t *ha) return 0; } - Modified: head/sys/dev/qlxge/qls_dump.h ============================================================================== --- head/sys/dev/qlxge/qls_dump.h Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_dump.h Tue Sep 1 21:56:30 2020 (r365166) @@ -276,4 +276,3 @@ typedef struct qls_mpi_coredump qls_mpi_coredump_t; #define Q81_BAD_DATA 0xDEADBEEF #endif /* #ifndef _QLS_DUMP_H_ */ - Modified: head/sys/dev/qlxge/qls_hw.c ============================================================================== --- head/sys/dev/qlxge/qls_hw.c Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_hw.c Tue Sep 1 21:56:30 2020 (r365166) @@ -35,8 +35,6 @@ #include __FBSDID("$FreeBSD$"); - - #include "qls_os.h" #include "qls_hw.h" #include "qls_def.h" @@ -76,7 +74,6 @@ static int qls_alloc_rss_dma(qla_host_t *ha); static int qls_flash_validate(qla_host_t *ha, const char *signature); - static int qls_wait_for_proc_addr_ready(qla_host_t *ha); static int qls_proc_addr_rd_reg(qla_host_t *ha, uint32_t addr_module, uint32_t reg, uint32_t *data); @@ -112,7 +109,6 @@ qls_syctl_mpi_dump(SYSCTL_HANDLER_ARGS) if (err || !req->newptr) return (err); - if (ret == 1) { ha = (qla_host_t *)arg1; qls_mpi_core_dump(ha); @@ -131,7 +127,6 @@ qls_syctl_link_status(SYSCTL_HANDLER_ARGS) if (err || !req->newptr) return (err); - if (ret == 1) { ha = (qla_host_t *)arg1; qls_mbx_get_link_status(ha); @@ -217,7 +212,6 @@ qls_alloc_dma(qla_host_t *ha) return (0); } - static int qls_wait_for_mac_proto_idx_ready(qla_host_t *ha, uint32_t op) { @@ -262,7 +256,7 @@ qls_config_unicast_mac_addr(qla_host_t *ha, uint32_t a ret = qls_wait_for_mac_proto_idx_ready(ha, Q81_CTL_MAC_PROTO_AI_MW); if (ret) goto qls_config_unicast_mac_addr_exit; - + index = 128 * (ha->pci_func & 0x1); /* index */ value = (index << Q81_CTL_MAC_PROTO_AI_IDX_SHIFT) | @@ -328,7 +322,7 @@ qls_config_mcast_mac_addr(qla_host_t *ha, uint8_t *mac ret = qls_wait_for_mac_proto_idx_ready(ha, Q81_CTL_MAC_PROTO_AI_MW); if (ret) goto qls_config_mcast_mac_addr_exit; - + value = Q81_CTL_MAC_PROTO_AI_E | (index << Q81_CTL_MAC_PROTO_AI_IDX_SHIFT) | Q81_CTL_MAC_PROTO_AI_TYPE_MCAST ; @@ -388,7 +382,6 @@ qls_load_route_idx_reg(qla_host_t *ha, uint32_t index, goto qls_load_route_idx_reg_exit; } - WRITE_REG32(ha, Q81_CTL_ROUTING_INDEX, index); WRITE_REG32(ha, Q81_CTL_ROUTING_DATA, data); @@ -481,7 +474,6 @@ qls_reset_allmulti(qla_host_t *ha) return; } - static int qls_init_fw_routing_table(qla_host_t *ha) { @@ -596,7 +588,6 @@ qls_tx_tso_chksum(qla_host_t *ha, struct mbuf *mp, q81 } tx_mac->vlan_off |= Q81_TX_TSO_VLAN_OFF_IC ; - if (ip->ip_p == IPPROTO_TCP) { tx_mac->flags |= Q81_TX_TSO_FLAGS_TC; } else if (ip->ip_p == IPPROTO_UDP) { @@ -702,10 +693,9 @@ qls_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, i tx_mac = (q81_tx_mac_t *)&ha->tx_ring[txr_idx].wq_vaddr[txr_next]; bzero(tx_mac, sizeof(q81_tx_mac_t)); - + if ((mp->m_pkthdr.csum_flags & (CSUM_TCP | CSUM_UDP | CSUM_IP | CSUM_TSO)) != 0) { - ret = qls_tx_tso_chksum(ha, mp, (q81_tx_tso_t *)tx_mac); if (ret) return (EINVAL); @@ -720,7 +710,6 @@ qls_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, i } if (mp->m_flags & M_VLANTAG) { - tx_mac->vlan_tci = mp->m_pkthdr.ether_vtag; tx_mac->vlan_off |= Q81_TX_MAC_VLAN_OFF_V; @@ -732,7 +721,6 @@ qls_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, i tx_mac->tid_lo = txr_next; if (nsegs <= MAX_TX_MAC_DESC) { - QL_DPRINT2((dev, "%s: 1 [%d, %d]\n", __func__, total_length, tx_mac->tid_lo)); @@ -832,7 +820,6 @@ qls_init_hw_if(qla_host_t *ha) int ret = 0; int i; - QL_DPRINT2((ha->pci_dev, "%s:enter\n", __func__)); dev = ha->pci_dev; @@ -871,7 +858,7 @@ qls_init_hw_if(qla_host_t *ha) /* Interrupt Mask Register */ value = Q81_CTL_INTRM_PI; value = (value << Q81_CTL_INTRM_MASK_SHIFT) | value; - + WRITE_REG32(ha, Q81_CTL_INTR_MASK, value); /* Initialiatize Completion Queue */ @@ -945,7 +932,6 @@ qls_init_hw_if(qla_host_t *ha) ha->tx_ring[0].wq_db_offset)); for (i = 0; i < ha->num_rx_rings; i++) { - Q81_WR_CQ_CONS_IDX(i, 0); Q81_WR_LBQ_PROD_IDX(i, ha->rx_ring[i].lbq_in); Q81_WR_SBQ_PROD_IDX(i, ha->rx_ring[i].sbq_in); @@ -972,7 +958,6 @@ qls_wait_for_config_reg_bits(qla_host_t *ha, uint32_t uint32_t count = 3; while (count--) { - data32 = READ_REG32(ha, Q81_CTL_CONFIG); if ((data32 & bits) == value) @@ -1076,7 +1061,7 @@ qls_init_comp_queue(qla_host_t *ha, int cid) Q81_CQ_ICB_FLAGS_LL | Q81_CQ_ICB_FLAGS_LS | Q81_CQ_ICB_FLAGS_LV; - + cq_icb->length_v = NUM_CQ_ENTRIES; cq_icb->cq_baddr_lo = (rxr->cq_base_paddr & 0xFFFFFFFF); @@ -1221,7 +1206,6 @@ qls_hw_add_all_mcast(qla_host_t *ha) (ha->mcast[i].addr[3] != 0) || (ha->mcast[i].addr[4] != 0) || (ha->mcast[i].addr[5] != 0)) { - if (qls_config_mcast_mac_addr(ha, ha->mcast[i].addr, 1, i)) { device_printf(ha->pci_dev, "%s: failed\n", @@ -1241,20 +1225,17 @@ qls_hw_add_mcast(qla_host_t *ha, uint8_t *mta) int i; for (i = 0; i < Q8_MAX_NUM_MULTICAST_ADDRS; i++) { - if (QL_MAC_CMP(ha->mcast[i].addr, mta) == 0) return 0; /* its been already added */ } for (i = 0; i < Q8_MAX_NUM_MULTICAST_ADDRS; i++) { - if ((ha->mcast[i].addr[0] == 0) && (ha->mcast[i].addr[1] == 0) && (ha->mcast[i].addr[2] == 0) && (ha->mcast[i].addr[3] == 0) && (ha->mcast[i].addr[4] == 0) && (ha->mcast[i].addr[5] == 0)) { - if (qls_config_mcast_mac_addr(ha, mta, 1, i)) return (-1); @@ -1274,7 +1255,6 @@ qls_hw_del_mcast(qla_host_t *ha, uint8_t *mta) for (i = 0; i < Q8_MAX_NUM_MULTICAST_ADDRS; i++) { if (QL_MAC_CMP(ha->mcast[i].addr, mta) == 0) { - if (qls_config_mcast_mac_addr(ha, mta, 0, i)) return (-1); @@ -1338,8 +1318,6 @@ qls_update_link_state(qla_host_t *ha) ha->link_up = ((link_state & Q81_CTL_STATUS_PL1)? 1 : 0); if (prev_link_state != ha->link_up) { - - if (ha->link_up) { if_link_state_change(ha->ifp, LINK_STATE_UP); } else { @@ -1371,11 +1349,9 @@ qls_free_tx_dma(qla_host_t *ha) qla_tx_buf_t *txb; for (i = 0; i < ha->num_tx_rings; i++) { - qls_free_tx_ring_dma(ha, i); for (j = 0; j < NUM_TX_DESCRIPTORS; j++) { - txb = &ha->tx_ring[i].tx_buf[j]; if (txb->map) { @@ -1444,7 +1420,6 @@ qls_alloc_tx_ring_dma(qla_host_t *ha, int ridx) txb = ha->tx_ring[ridx].tx_buf; for (i = 0; i < NUM_TX_DESCRIPTORS; i++) { - txb[i].oal_vaddr = v_addr; txb[i].oal_paddr = p_addr; @@ -1481,7 +1456,6 @@ qls_alloc_tx_dma(qla_host_t *ha) } for (i = 0; i < ha->num_tx_rings; i++) { - ret = qls_alloc_tx_ring_dma(ha, i); if (ret) { @@ -1490,7 +1464,6 @@ qls_alloc_tx_dma(qla_host_t *ha) } for (j = 0; j < NUM_TX_DESCRIPTORS; j++) { - txb = &ha->tx_ring[i].tx_buf[j]; ret = bus_dmamap_create(ha->tx_tag, @@ -1691,7 +1664,7 @@ qls_alloc_rx_ring_dma(qla_host_t *ha, int ridx) /* large buffer queue */ ha->rx_ring[ridx].lbq_vaddr = v_addr + PAGE_SIZE; ha->rx_ring[ridx].lbq_paddr = p_addr + PAGE_SIZE; - + v_addr = ha->rx_ring[ridx].sbq_dma.dma_b; p_addr = ha->rx_ring[ridx].sbq_dma.dma_addr; @@ -1760,7 +1733,6 @@ qls_alloc_rx_dma(qla_host_t *ha) NULL, /* lockfunc */ NULL, /* lockfuncarg */ &ha->rx_tag)) { - device_printf(ha->pci_dev, "%s: rx_tag alloc failed\n", __func__); @@ -1786,7 +1758,6 @@ qls_wait_for_flash_ready(qla_host_t *ha) uint32_t count = 3; while (count--) { - data32 = READ_REG32(ha, Q81_CTL_FLASH_ADDR); if (data32 & Q81_CTL_FLASH_ADDR_ERR) @@ -1878,7 +1849,6 @@ qls_rd_nic_params(qla_host_t *ha) qflash = (uint32_t *)&ha->flash; for (i = 0; i < (sizeof(q81_flash_t) >> 2) ; i++) { - ret = qls_rd_flash32(ha, faddr, qflash); if (ret) @@ -1916,7 +1886,7 @@ qls_sem_lock(qla_host_t *ha, uint32_t mask, uint32_t v while (count--) { WRITE_REG32(ha, Q81_CTL_SEMAPHORE, (mask|value)); - + data = READ_REG32(ha, Q81_CTL_SEMAPHORE); if (data & value) { @@ -1942,7 +1912,6 @@ qls_wait_for_proc_addr_ready(qla_host_t *ha) uint32_t count = 3; while (count--) { - data32 = READ_REG32(ha, Q81_CTL_PROC_ADDR); if (data32 & Q81_CTL_PROC_ADDR_ERR) @@ -1981,7 +1950,7 @@ qls_proc_addr_rd_reg(qla_host_t *ha, uint32_t addr_mod if (ret) goto qls_proc_addr_rd_reg_exit; - + *data = READ_REG32(ha, Q81_CTL_PROC_DATA); qls_proc_addr_rd_reg_exit: @@ -2018,7 +1987,7 @@ qls_hw_nic_reset(qla_host_t *ha) int count; uint32_t data; device_t dev = ha->pci_dev; - + ha->hw_init = 0; data = (Q81_CTL_RESET_FUNC << Q81_CTL_RESET_MASK_SHIFT) | @@ -2039,7 +2008,7 @@ qls_hw_nic_reset(qla_host_t *ha) } return (0); } - + static int qls_hw_reset(qla_host_t *ha) { @@ -2096,7 +2065,7 @@ qls_hw_reset(qla_host_t *ha) ret = qls_hw_nic_reset(ha); if (ret) goto qls_hw_reset_exit; - + ret = qls_mbx_set_mgmt_ctrl(ha, Q81_MBX_SET_MGMT_CTL_RESUME); qls_hw_reset_exit: @@ -2159,7 +2128,6 @@ qls_mbx_wr_reg(qla_host_t *ha, uint32_t reg, uint32_t return (ret); } - static int qls_mbx_cmd(qla_host_t *ha, uint32_t *in_mbx, uint32_t i_count, uint32_t *out_mbx, uint32_t o_count) @@ -2190,7 +2158,6 @@ qls_mbx_cmd(qla_host_t *ha, uint32_t *in_mbx, uint32_t mbx_cmd = *in_mbx; for (i = 0; i < i_count; i++) { - ret = qls_mbx_wr_reg(ha, i, *in_mbx); if (ret) { @@ -2211,7 +2178,6 @@ qls_mbx_cmd(qla_host_t *ha, uint32_t *in_mbx, uint32_t ha->mbx_done = 0; while (count--) { - if (ha->flags.intr_enable == 0) { data32 = READ_REG32(ha, Q81_CTL_STATUS); @@ -2224,7 +2190,6 @@ qls_mbx_cmd(qla_host_t *ha, uint32_t *in_mbx, uint32_t if (ret == 0 ) { if ((data32 & 0xF000) == 0x4000) { - out_mbx[0] = data32; for (i = 1; i < o_count; i++) { @@ -2422,7 +2387,7 @@ qls_mpi_reset(qla_host_t *ha) int count; uint32_t data; device_t dev = ha->pci_dev; - + WRITE_REG32(ha, Q81_CTL_HOST_CMD_STATUS,\ Q81_CTL_HCS_CMD_SET_RISC_RESET); @@ -2442,4 +2407,3 @@ qls_mpi_reset(qla_host_t *ha) } return (0); } - Modified: head/sys/dev/qlxge/qls_hw.h ============================================================================== --- head/sys/dev/qlxge/qls_hw.h Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_hw.h Tue Sep 1 21:56:30 2020 (r365166) @@ -86,7 +86,6 @@ #define BIT_30 (0x1 << 30) #define BIT_31 (0x1 << 31) - /* * Firmware Interface */ @@ -169,7 +168,6 @@ #define Q81_CTL_XG_PROBE_MUX_ADDR 0xF8 /* R/W - Y - */ #define Q81_CTL_XG_PROBE_MUX_DATA 0xFC /* R/W - Y - */ - /* * Process Address Register (0x00) */ @@ -181,7 +179,6 @@ #define Q81_CTL_PROC_ADDR_REG_BLOCK (0x02 << 16) #define Q81_CTL_PROC_ADDR_RISC_INT_REG (0x03 << 16) - /* * System Register (0x08) */ @@ -228,7 +225,6 @@ #define Q81_CTL_FUNC_SPECIFIC_DBRST_768 0x02 #define Q81_CTL_FUNC_SPECIFIC_DBRST_1024 0x03 - /* * Host Command/Status Register (0x14) */ @@ -250,7 +246,6 @@ #define Q81_CTL_HCS_RISC_RESET BIT_8 #define Q81_CTL_HCS_ERR_STATUS_MASK 0x3F - /* * Configuration Register (0x28) */ @@ -265,7 +260,6 @@ #define Q81_CTL_CONFIG_DRQ BIT_1 #define Q81_CTL_CONFIG_LRQ BIT_0 - /* * Status Register (0x30) */ @@ -363,7 +357,6 @@ #define Q81_CTL_SEM_SET_XGMAC1 0x0004 #define Q81_CTL_SEM_SET_XGMAC0 0x0001 - /* * Flash Address Register (0x88) */ @@ -439,7 +432,6 @@ #define Q81_CTL_NIC_RCVC_VLAN_REJECT (0x3 << 1) #define Q81_CTL_NIC_RCVC_PPE BIT_0 - /* * Routing Index Register (0xE4) */ @@ -505,7 +497,6 @@ #define Q81_CTL_RD_RSS_IPV4 BIT_30 #define Q81_CTL_RD_RSS_MATCH BIT_31 - /********************************************************************* * Host Data Structures * *********************************************************************/ @@ -515,7 +506,6 @@ */ typedef struct _q81_wq_icb { - uint16_t length_v; #define Q81_WQ_ICB_VALID BIT_4 @@ -540,7 +530,6 @@ typedef struct _q81_wq_icb { uint32_t ci_addr_hi; } __packed q81_wq_icb_t; - /* * Completion Queue Initialization Control Block */ @@ -606,8 +595,6 @@ typedef struct _q81_rss_icb { uint32_t ipv4_rss_hash_key[4]; } __packed q81_rss_icb_t; - - /* * Transmit Buffer Descriptor */ @@ -622,7 +609,6 @@ typedef struct _q81_txb_desc { } __packed q81_txb_desc_t; - /* * Receive Buffer Descriptor */ @@ -651,7 +637,6 @@ typedef struct _q81_rxb_desc { #define Q81_IOCB_MPI 0x21 #define Q81_IOCB_SYS 0x3F - /* * IOCB Definitions */ @@ -663,7 +648,6 @@ typedef struct _q81_rxb_desc { #define MAX_TX_MAC_DESC 8 typedef struct _q81_tx_mac { - uint8_t opcode; uint16_t flags; @@ -692,8 +676,7 @@ typedef struct _q81_tx_mac { q81_txb_desc_t txd[MAX_TX_MAC_DESC]; } __packed q81_tx_mac_t; - - + /* * MAC Tx Frame with TSO IOCB * Total Size of each IOCB Entry = 4 * 32 = 128 bytes @@ -734,7 +717,7 @@ typedef struct _q81_tx_tso { q81_txb_desc_t txd[MAX_TX_MAC_DESC]; } __packed q81_tx_tso_t; - + typedef struct _q81_tx_cmd { uint8_t bytes[128]; } __packed q81_tx_cmd_t; @@ -766,7 +749,6 @@ typedef struct _q81_tx_mac_comp { uint32_t rsrvd1[13]; } __packed q81_tx_mac_comp_t; - /* * MAC TX Frame with LSO Completion * Total Size of each IOCB Entry = 4 * 16 = 64 bytes @@ -793,7 +775,6 @@ typedef struct _q81_tx_tso_comp { uint32_t rsrvd1[13]; } __packed q81_tx_tso_comp_t; - /* * SYS - Chip Event Notification Completion * Total Size of each IOCB Entry = 4 * 16 = 64 bytes @@ -823,8 +804,6 @@ typedef struct _q81_sys_comp { uint32_t rsrvd1[15]; } __packed q81_sys_comp_t; - - /* * Mac Rx Packet Completion * Total Size of each IOCB Entry = 4 * 16 = 64 bytes @@ -904,7 +883,6 @@ typedef struct _q81_bq_addr_e { uint32_t addr_hi; } __packed q81_bq_addr_e_t; - /* * Macros for reading and writing registers */ @@ -946,7 +924,6 @@ typedef struct _q81_bq_addr_e { #define Q81_RD_WQ_IDX(wq_idx) bus_read_4((ha->pci_reg1),\ (ha->tx_ring[wq_idx].wq_db_offset + Q81_WRKQ_INDEX_REG)) - #define Q81_SET_WQ_VALID(wq_idx) bus_write_4((ha->pci_reg1),\ (ha->tx_ring[wq_idx].wq_db_offset + Q81_WRKQ_VALID_REG),\ Q81_COMPQ_VALID_V) @@ -981,7 +958,6 @@ typedef struct _q81_bq_addr_e { #define Q81_RD_SBQ_IDX(cq_idx) bus_read_4((ha->pci_reg1),\ (ha->rx_ring[cq_idx].cq_db_offset + Q81_SMBQ_INDEX_REG)) - /* * Flash Related */ @@ -991,7 +967,6 @@ typedef struct _q81_bq_addr_e { #define Q81_FLASH_ID "8000" typedef struct _q81_flash { - uint8_t id[4]; /* equal to "8000" */ uint16_t version; @@ -1024,7 +999,6 @@ typedef struct _q81_flash { uint8_t rsrvd2[4]; } __packed q81_flash_t; - /* * MPI Related Modified: head/sys/dev/qlxge/qls_ioctl.c ============================================================================== --- head/sys/dev/qlxge/qls_ioctl.c Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_ioctl.c Tue Sep 1 21:56:30 2020 (r365166) @@ -33,7 +33,6 @@ #include __FBSDID("$FreeBSD$"); - #include "qls_os.h" #include "qls_hw.h" #include "qls_def.h" @@ -95,7 +94,6 @@ qls_eioctl(struct cdev *dev, u_long cmd, caddr_t data, pci_dev= ha->pci_dev; switch(cmd) { - case QLA_MPI_DUMP: mpi_dump = (qls_mpi_dump_t *)data; @@ -119,7 +117,6 @@ qls_eioctl(struct cdev *dev, u_long cmd, caddr_t data, __func__, rval); } } - } break; @@ -129,4 +126,3 @@ qls_eioctl(struct cdev *dev, u_long cmd, caddr_t data, return rval; } - Modified: head/sys/dev/qlxge/qls_ioctl.h ============================================================================== --- head/sys/dev/qlxge/qls_ioctl.h Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_ioctl.h Tue Sep 1 21:56:30 2020 (r365166) @@ -49,5 +49,4 @@ typedef struct qls_mpi_dump qls_mpi_dump_t; */ #define QLA_MPI_DUMP _IOWR('q', 1, qls_mpi_dump_t) - #endif /* #ifndef _QLS_IOCTL_H_ */ Modified: head/sys/dev/qlxge/qls_isr.c ============================================================================== --- head/sys/dev/qlxge/qls_isr.c Tue Sep 1 21:56:10 2020 (r365165) +++ head/sys/dev/qlxge/qls_isr.c Tue Sep 1 21:56:30 2020 (r365166) @@ -36,8 +36,6 @@ #include __FBSDID("$FreeBSD$"); - - #include "qls_os.h" #include "qls_hw.h" #include "qls_def.h" @@ -46,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include "qls_glbl.h" #include "qls_dbg.h" - static void qls_tx_comp(qla_host_t *ha, uint32_t txr_idx, q81_tx_mac_comp_t *tx_comp) { @@ -90,7 +87,6 @@ qls_replenish_rx(qla_host_t *ha, uint32_t r_idx) sbq_e = rxr->sbq_vaddr; while (count--) { - rxb = &rxr->rx_buf[rxr->sbq_next]; if (rxb->m_head == NULL) { @@ -117,7 +113,6 @@ qls_replenish_rx(qla_host_t *ha, uint32_t r_idx) } if (rxr->sbq_free == 16) { - rxr->sbq_in += 16; rxr->sbq_in = rxr->sbq_in & (NUM_RX_DESCRIPTORS - 1); rxr->sbq_free = 0; @@ -149,7 +144,6 @@ qls_rx_comp(qla_host_t *ha, uint32_t rxr_idx, uint32_t return -1; } if (rxb->paddr != cq_e->b_paddr) { - device_printf(dev, "%s: (rxb->paddr != cq_e->b_paddr)[%p, %p] \n", __func__, (void *)rxb->paddr, (void *)cq_e->b_paddr); @@ -164,7 +158,6 @@ qls_rx_comp(qla_host_t *ha, uint32_t rxr_idx, uint32_t rxr->rx_int++; if ((cq_e->flags1 & Q81_RX_FLAGS1_ERR_MASK) == 0) { - mp = rxb->m_head; rxb->m_head = NULL; @@ -245,11 +238,9 @@ qls_cq_isr(qla_host_t *ha, uint32_t cq_idx) i = ha->rx_ring[cq_idx].cq_next; while (i != cq_comp_idx) { - cq_e = &cq_b[i]; switch (cq_e->opcode) { - case Q81_IOCB_TX_MAC: case Q81_IOCB_TX_TSO: qls_tx_comp(ha, cq_idx, (q81_tx_mac_comp_t *)cq_e); @@ -258,7 +249,7 @@ qls_cq_isr(qla_host_t *ha, uint32_t cq_idx) case Q81_IOCB_RX: ret = qls_rx_comp(ha, cq_idx, i, (q81_rx_t *)cq_e); - + break; case Q81_IOCB_MPI: @@ -311,7 +302,6 @@ qls_mbx_isr(qla_host_t *ha) device_t dev = ha->pci_dev; if (qls_mbx_rd_reg(ha, 0, &data) == 0) { - if ((data & 0xF000) == 0x4000) { ha->mbox[0] = data; for (i = 1; i < Q81_NUM_MBX_REGISTERS; i++) { @@ -321,9 +311,8 @@ qls_mbx_isr(qla_host_t *ha) } ha->mbx_done = 1; } else if ((data & 0xF000) == 0x8000) { - /* we have an AEN */ - + ha->aen[0] = data; for (i = 1; i < Q81_NUM_AEN_REGISTERS; i++) { if (qls_mbx_rd_reg(ha, i, &data)) @@ -339,7 +328,6 @@ qls_mbx_isr(qla_host_t *ha) ha->aen[6], ha->aen[7], ha->aen[8]); switch ((ha->aen[0] & 0xFFFF)) { - case 0x8011: ha->link_up = 1; break; @@ -355,7 +343,6 @@ qls_mbx_isr(qla_host_t *ha) case 0x8131: ha->link_hw_info = 0; break; - } } } @@ -397,4 +384,3 @@ qls_isr(void *arg) return; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:56:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3684337D03E; Tue, 1 Sep 2020 21:56:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1BL17W2z4YBR; Tue, 1 Sep 2020 21:56:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09FC120505; Tue, 1 Sep 2020 21:56:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LuwpZ047787; Tue, 1 Sep 2020 21:56:58 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LutkS047776; Tue, 1 Sep 2020 21:56:55 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012156.081LutkS047776@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:56:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365167 - head/sys/dev/qlxgbe X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/qlxgbe X-SVN-Commit-Revision: 365167 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:56:58 -0000 Author: mjg Date: Tue Sep 1 21:56:55 2020 New Revision: 365167 URL: https://svnweb.freebsd.org/changeset/base/365167 Log: qlxgbe: clean up empty lines in .c and .h files Modified: head/sys/dev/qlxgbe/ql_boot.c head/sys/dev/qlxgbe/ql_dbg.c head/sys/dev/qlxgbe/ql_dbg.h head/sys/dev/qlxgbe/ql_def.h head/sys/dev/qlxgbe/ql_fw.c head/sys/dev/qlxgbe/ql_glbl.h head/sys/dev/qlxgbe/ql_hw.c head/sys/dev/qlxgbe/ql_hw.h head/sys/dev/qlxgbe/ql_inline.h head/sys/dev/qlxgbe/ql_ioctl.c head/sys/dev/qlxgbe/ql_ioctl.h head/sys/dev/qlxgbe/ql_isr.c head/sys/dev/qlxgbe/ql_minidump.c head/sys/dev/qlxgbe/ql_minidump.h head/sys/dev/qlxgbe/ql_misc.c head/sys/dev/qlxgbe/ql_os.c head/sys/dev/qlxgbe/ql_os.h head/sys/dev/qlxgbe/ql_reset.c head/sys/dev/qlxgbe/ql_tmplt.h Modified: head/sys/dev/qlxgbe/ql_boot.c ============================================================================== --- head/sys/dev/qlxgbe/ql_boot.c Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_boot.c Tue Sep 1 21:56:55 2020 (r365167) @@ -10962,4 +10962,3 @@ unsigned char ql83xx_bootloader[] = { 0x00, 0x00, 0x00, 0x00, 0x9b, 0x64, 0x92, 0x0e }; unsigned int ql83xx_bootloader_len = 131072; - Modified: head/sys/dev/qlxgbe/ql_dbg.c ============================================================================== --- head/sys/dev/qlxgbe/ql_dbg.c Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_dbg.c Tue Sep 1 21:56:55 2020 (r365167) @@ -153,7 +153,7 @@ void ql_dump_buf8(qla_host_t *ha, const char *msg, voi buf = dbuf; device_printf(dev, "%s: %s 0x%x dump start\n", __func__, msg, len); - + while (len >= 16) { device_printf(dev,"0x%08x:" " %02x %02x %02x %02x %02x %02x %02x %02x" @@ -256,7 +256,6 @@ void ql_dump_buf8(qla_host_t *ha, const char *msg, voi default: break; } - + device_printf(dev, "%s: %s dump end\n", __func__, msg); } - Modified: head/sys/dev/qlxgbe/ql_dbg.h ============================================================================== --- head/sys/dev/qlxgbe/ql_dbg.h Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_dbg.h Tue Sep 1 21:56:55 2020 (r365167) @@ -102,5 +102,4 @@ extern void ql_dump_buf32(qla_host_t *ha, const char * #endif - #endif /* #ifndef _QL_DBG_H_ */ Modified: head/sys/dev/qlxgbe/ql_def.h ============================================================================== --- head/sys/dev/qlxgbe/ql_def.h Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_def.h Tue Sep 1 21:56:55 2020 (r365167) @@ -170,7 +170,7 @@ struct qla_host { int msix_count; qla_ivec_t irq_vec[MAX_SDS_RINGS]; - + /* parent dma tag */ bus_dma_tag_t parent_tag; @@ -228,7 +228,7 @@ struct qla_host { struct task stats_task; struct taskqueue *stats_tq; - + uint32_t fw_ver_major; uint32_t fw_ver_minor; uint32_t fw_ver_sub; Modified: head/sys/dev/qlxgbe/ql_fw.c ============================================================================== --- head/sys/dev/qlxgbe/ql_fw.c Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_fw.c Tue Sep 1 21:56:55 2020 (r365167) @@ -149068,4 +149068,3 @@ unsigned char ql83xx_firmware[] = { 0x36, 0x37, 0x20, 0x0a }; unsigned int ql83xx_firmware_len = 1788328; - Modified: head/sys/dev/qlxgbe/ql_glbl.h ============================================================================== --- head/sys/dev/qlxgbe/ql_glbl.h Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_glbl.h Tue Sep 1 21:56:55 2020 (r365167) @@ -124,5 +124,4 @@ extern void ql_sp_log(qla_host_t *ha, uint16_t fmtstr_ extern void ql_alloc_sp_log_buffer(qla_host_t *ha); extern void ql_free_sp_log_buffer(qla_host_t *ha); - #endif /* #ifndef_QL_GLBL_H_ */ Modified: head/sys/dev/qlxgbe/ql_hw.c ============================================================================== --- head/sys/dev/qlxgbe/ql_hw.c Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_hw.c Tue Sep 1 21:56:55 2020 (r365167) @@ -98,10 +98,9 @@ qla_sysctl_stop_pegs(SYSCTL_HANDLER_ARGS) { int err, ret = 0; qla_host_t *ha; - + err = sysctl_handle_int(oidp, &ret, 0, req); - if (err || !req->newptr) return (err); @@ -147,7 +146,6 @@ qla_sysctl_port_cfg(SYSCTL_HANDLER_ARGS) ha = (qla_host_t *)arg1; if ((qla_validate_set_port_cfg_bit((uint32_t)ret) == 0)) { - err = qla_get_port_config(ha, &cfg_bits); if (err) @@ -215,7 +213,6 @@ qla_sysctl_set_cam_search_mode(SYSCTL_HANDLER_ARGS) if ((ret == Q8_HW_CONFIG_CAM_SEARCH_MODE_INTERNAL) || (ret == Q8_HW_CONFIG_CAM_SEARCH_MODE_AUTO)) { - if (QLA_LOCK(ha, __func__, QLA_LOCK_DEFAULT_MS_TIMEOUT, 0) == 0) { err = qla_set_cam_search_mode(ha, (uint32_t)ret); QLA_UNLOCK(ha, __func__); @@ -604,7 +601,6 @@ qlnx_add_hw_xmt_stats_sysctls(qla_host_t *ha) children = SYSCTL_CHILDREN(ctx_oid); for (i = 0; i < ha->hw.num_tx_rings; i++) { - bzero(name_str, (sizeof(uint8_t) * sizeof(name_str))); snprintf(name_str, sizeof(name_str), "%d", i); @@ -783,7 +779,6 @@ qlnx_add_drvr_sds_stats(qla_host_t *ha) children = SYSCTL_CHILDREN(ctx_oid); for (i = 0; i < ha->hw.num_sds_rings; i++) { - bzero(name_str, (sizeof(uint8_t) * sizeof(name_str))); snprintf(name_str, sizeof(name_str), "%d", i); @@ -822,7 +817,6 @@ qlnx_add_drvr_rds_stats(qla_host_t *ha) children = SYSCTL_CHILDREN(ctx_oid); for (i = 0; i < ha->hw.num_rds_rings; i++) { - bzero(name_str, (sizeof(uint8_t) * sizeof(name_str))); snprintf(name_str, sizeof(name_str), "%d", i); @@ -867,7 +861,6 @@ qlnx_add_drvr_tx_stats(qla_host_t *ha) children = SYSCTL_CHILDREN(ctx_oid); for (i = 0; i < ha->hw.num_tx_rings; i++) { - bzero(name_str, (sizeof(uint8_t) * sizeof(name_str))); snprintf(name_str, sizeof(name_str), "%d", i); @@ -1162,7 +1155,6 @@ ql_hw_link_status(qla_host_t *ha) } switch (ha->hw.module_type) { - case 0x01: device_printf(ha->pci_dev, "Module Type 10GBase-LRM\n"); break; @@ -1282,7 +1274,7 @@ ql_alloc_dma(qla_host_t *ha) hw->dma_buf.tx_ring.alignment = 8; hw->dma_buf.tx_ring.size = size + PAGE_SIZE; - + if (ql_alloc_dmabuf(ha, &hw->dma_buf.tx_ring)) { device_printf(dev, "%s: tx ring alloc failed\n", __func__); goto ql_alloc_dma_exit; @@ -1290,7 +1282,7 @@ ql_alloc_dma(qla_host_t *ha) vaddr = (uint8_t *)hw->dma_buf.tx_ring.dma_b; paddr = hw->dma_buf.tx_ring.dma_addr; - + for (i = 0; i < ha->hw.num_tx_rings; i++) { tx_cntxt = (qla_hw_tx_cntxt_t *)&hw->tx_cntxt[i]; @@ -1321,7 +1313,6 @@ ql_alloc_dma(qla_host_t *ha) */ for (i = 0; i < hw->num_rds_rings; i++) { - hw->dma_buf.rds_ring[i].alignment = 8; hw->dma_buf.rds_ring[i].size = (sizeof(q80_recv_desc_t)) * NUM_RX_DESCRIPTORS; @@ -1415,7 +1406,6 @@ qla_mbx_cmd(qla_host_t *ha, uint32_t *h_mbox, uint32_t i = Q8_MBX_MSEC_DELAY; while (i) { - if (ha->qla_initiate_recovery) { ql_sp_log(ha, 2, 1, ha->qla_initiate_recovery, 0, 0, 0, 0); return (-1); @@ -1449,10 +1439,8 @@ qla_mbx_cmd(qla_host_t *ha, uint32_t *h_mbox, uint32_t WRITE_REG32(ha, Q8_HOST_MBOX_CNTRL, 0x1); - i = Q8_MBX_MSEC_DELAY; while (i) { - if (ha->qla_initiate_recovery) { ql_sp_log(ha, 4, 1, ha->qla_initiate_recovery, 0, 0, 0, 0); return (-1); @@ -1483,7 +1471,6 @@ qla_mbx_cmd(qla_host_t *ha, uint32_t *h_mbox, uint32_t } for (i = 0; i < n_fwmbox; i++) { - if (ha->qla_initiate_recovery) { ql_sp_log(ha, 6, 1, ha->qla_initiate_recovery, 0, 0, 0, 0); return (-1); @@ -1512,7 +1499,6 @@ qla_mbx_cmd(qla_host_t *ha, uint32_t *h_mbox, uint32_t } ql_sp_log(ha, 7, 5, fw_mbox[0], fw_mbox[1], fw_mbox[2], fw_mbox[3], fw_mbox[4]); - exit_qla_mbx_cmd: return (ret); } @@ -1742,7 +1728,7 @@ qla_config_intr_coalesce(qla_host_t *ha, uint16_t cntx q80_config_intr_coalesc_rsp_t *intrc_rsp; uint32_t err, i; device_t dev = ha->pci_dev; - + intrc = (q80_config_intr_coalesc_t *)ha->hw.mbox; bzero(intrc, (sizeof (q80_config_intr_coalesc_t))); @@ -1786,11 +1772,10 @@ qla_config_intr_coalesce(qla_host_t *ha, uint16_t cntx device_printf(dev, "%s: failed1 [0x%08x]\n", __func__, err); return (-1); } - + return 0; } - /* * Name: qla_config_mac_addr * Function: binds a MAC address to the context/interface. @@ -1857,11 +1842,10 @@ qla_config_mac_addr(qla_host_t *ha, uint8_t *mac_addr, } return (-1); } - + return 0; } - /* * Name: qla_set_mac_rcv_mode * Function: Enable/Disable AllMulticast and Promiscous Modes. @@ -1899,7 +1883,7 @@ qla_set_mac_rcv_mode(qla_host_t *ha, uint32_t mode) device_printf(dev, "%s: failed1 [0x%08x]\n", __func__, err); return (-1); } - + return 0; } @@ -2284,7 +2268,6 @@ qla_tx_tso(qla_host_t *ha, struct mbuf *mp, q80_tx_cmd dev = ha->pci_dev; - eh = mtod(mp, struct ether_vlan_header *); if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) { @@ -2523,7 +2506,6 @@ ql_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, in eh = mtod(mp, struct ether_vlan_header *); if (mp->m_pkthdr.csum_flags & CSUM_TSO) { - bzero((void *)&tso_cmd, sizeof(q80_tx_cmd_t)); src = frame_hdr; @@ -2586,7 +2568,6 @@ ql_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, in tx_cmd = &hw->tx_cntxt[txr_idx].tx_ring_base[tx_idx]; if (!(mp->m_pkthdr.csum_flags & CSUM_TSO)) { - if (nsegs > ha->hw.max_tx_segs) ha->hw.max_tx_segs = nsegs; @@ -2611,7 +2592,6 @@ ql_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, in eh->evl_tag |= ha->hw.user_pri_iscsi << 13; } else if (mp->m_flags & M_VLANTAG) { - if (hdr_len) { /* TSO */ tx_cmd->flags_opcode |= (Q8_TX_CMD_FLAGS_VLAN_TAGGED | Q8_TX_CMD_FLAGS_HW_VLAN_ID); @@ -2628,7 +2608,6 @@ ql_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, in } } - tx_cmd->n_bufs = (uint8_t)nsegs; tx_cmd->data_len_lo = (uint8_t)(total_length & 0xFF); tx_cmd->data_len_hi = qla_host_to_le16(((uint16_t)(total_length >> 8))); @@ -2638,7 +2617,6 @@ ql_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, in while (1) { for (i = 0; ((i < Q8_TX_CMD_MAX_SEGMENTS) && nsegs); i++) { - switch (i) { case 0: tx_cmd->buf1_addr = c_seg->ds_addr; @@ -2678,7 +2656,6 @@ ql_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, in } if (mp->m_pkthdr.csum_flags & CSUM_TSO) { - /* TSO : Copy the header in the following tx cmd descriptors */ txr_next = hw->tx_cntxt[txr_idx].txr_next; @@ -2709,7 +2686,6 @@ ql_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, in /* bytes left in TxCmd Entry */ bytes -= ((ETHER_ADDR_LEN * 2) + ETHER_VLAN_ENCAP_LEN); - bcopy(src, dst, bytes); src += bytes; hdr_len -= bytes; @@ -2751,8 +2727,6 @@ ql_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, in return (0); } - - #define Q8_CONFIG_IND_TBL_SIZE 32 /* < Q8_RSS_IND_TBL_SIZE and power of 2 */ static int qla_config_rss_ind_table(qla_host_t *ha) @@ -2760,14 +2734,12 @@ qla_config_rss_ind_table(qla_host_t *ha) uint32_t i, count; uint8_t rss_ind_tbl[Q8_CONFIG_IND_TBL_SIZE]; - for (i = 0; i < Q8_CONFIG_IND_TBL_SIZE; i++) { rss_ind_tbl[i] = i % ha->hw.num_sds_rings; } for (i = 0; i <= Q8_RSS_IND_TBL_MAX_IDX ; i = i + Q8_CONFIG_IND_TBL_SIZE) { - if ((i + Q8_CONFIG_IND_TBL_SIZE) > Q8_RSS_IND_TBL_MAX_IDX) { count = Q8_RSS_IND_TBL_MAX_IDX - i + 1; } else { @@ -2858,7 +2830,6 @@ qla_free_soft_lro(qla_host_t *ha) return; } - /* * Name: ql_del_hw_if * Function: Destroys the hardware specific entities corresponding to an @@ -2879,7 +2850,6 @@ ql_del_hw_if(qla_host_t *ha) if (ha->hw.flags.init_intr_cnxt) { for (i = 0; i < ha->hw.num_sds_rings; ) { - if ((i + Q8_MAX_INTR_VECTORS) < ha->hw.num_sds_rings) num_msix = Q8_MAX_INTR_VECTORS; else @@ -2947,16 +2917,13 @@ ql_init_hw_if(qla_host_t *ha) } for (i = 0; i < ha->hw.num_sds_rings; ) { - if ((i + Q8_MAX_INTR_VECTORS) < ha->hw.num_sds_rings) num_msix = Q8_MAX_INTR_VECTORS; else num_msix = ha->hw.num_sds_rings - i; if (qla_config_intr_cntxt(ha, i, num_msix, 1)) { - if (i > 0) { - num_msix = i; for (i = 0; i < num_msix; ) { @@ -3225,9 +3192,7 @@ qla_init_rcv_cntxt(qla_host_t *ha) ha->hw.flags.init_rx_cnxt = 1; if (hw->num_sds_rings > MAX_RCNTXT_SDS_RINGS) { - for (i = MAX_RCNTXT_SDS_RINGS; i < hw->num_sds_rings;) { - if ((i + MAX_RCNTXT_SDS_RINGS) < hw->num_sds_rings) max_idx = MAX_RCNTXT_SDS_RINGS; else @@ -3242,9 +3207,7 @@ qla_init_rcv_cntxt(qla_host_t *ha) } if (hw->num_rds_rings > 1) { - for (i = 0; i < hw->num_rds_rings; ) { - if ((i + MAX_SDS_TO_RDS_MAP) < hw->num_rds_rings) max_idx = MAX_SDS_TO_RDS_MAP; else @@ -3282,7 +3245,6 @@ qla_add_rcv_rings(qla_host_t *ha, uint32_t sds_idx, ui add_rcv->cntxt_id = hw->rcv_cntxt_id; for (i = 0; i < nsds; i++) { - j = i + sds_idx; add_rcv->sds[i].paddr = @@ -3293,7 +3255,6 @@ qla_add_rcv_rings(qla_host_t *ha, uint32_t sds_idx, ui add_rcv->sds[i].intr_id = qla_host_to_le16(hw->intr_id[j]); add_rcv->sds[i].intr_src_bit = qla_host_to_le16(0); - } for (i = 0; (i < nsds); i++) { @@ -3312,7 +3273,6 @@ qla_add_rcv_rings(qla_host_t *ha, uint32_t sds_idx, ui qla_host_to_le32(NUM_RX_DESCRIPTORS); } - if (qla_mbx_cmd(ha, (uint32_t *)add_rcv, (sizeof (q80_rq_add_rcv_rings_t) >> 2), ha->hw.mbox, (sizeof(q80_rsp_add_rcv_rings_t) >> 2), 0)) { @@ -3360,14 +3320,12 @@ qla_del_rcv_cntxt(qla_host_t *ha) return; if (ha->hw.flags.bcast_mac) { - bcast_mac[0] = 0xFF; bcast_mac[1] = 0xFF; bcast_mac[2] = 0xFF; bcast_mac[3] = 0xFF; bcast_mac[4] = 0xFF; bcast_mac[5] = 0xFF; if (qla_config_mac_addr(ha, bcast_mac, 0, 1)) return; ha->hw.flags.bcast_mac = 0; - } if (ha->hw.flags.unicast_mac) { @@ -3490,7 +3448,6 @@ qla_init_xmt_cntxt_i(qla_host_t *ha, uint32_t txr_idx) return (0); } - /* * Name: qla_del_xmt_cntxt * Function: Destroys the Transmit Context. @@ -3587,7 +3544,6 @@ qla_hw_all_mcast(qla_host_t *ha, uint32_t add_mcast) (ha->hw.mcast[i].addr[3] != 0) || (ha->hw.mcast[i].addr[4] != 0) || (ha->hw.mcast[i].addr[5] != 0)) { - bcopy(ha->hw.mcast[i].addr, mcast, ETHER_ADDR_LEN); mcast = mcast + ETHER_ADDR_LEN; count++; @@ -3671,14 +3627,12 @@ qla_hw_add_mcast(qla_host_t *ha, uint8_t *mta, uint32_ int i; for (i = 0; i < Q8_MAX_NUM_MULTICAST_ADDRS; i++) { - if ((ha->hw.mcast[i].addr[0] == 0) && (ha->hw.mcast[i].addr[1] == 0) && (ha->hw.mcast[i].addr[2] == 0) && (ha->hw.mcast[i].addr[3] == 0) && (ha->hw.mcast[i].addr[4] == 0) && (ha->hw.mcast[i].addr[5] == 0)) { - bcopy(mta, ha->hw.mcast[i].addr, Q8_MAC_ADDR_LEN); ha->hw.nmcast++; @@ -3688,7 +3642,6 @@ qla_hw_add_mcast(qla_host_t *ha, uint8_t *mta, uint32_ if (nmcast == 0) break; } - } return 0; } @@ -3700,7 +3653,6 @@ qla_hw_del_mcast(qla_host_t *ha, uint8_t *mta, uint32_ for (i = 0; i < Q8_MAX_NUM_MULTICAST_ADDRS; i++) { if (QL_MAC_CMP(ha->hw.mcast[i].addr, mta) == 0) { - ha->hw.mcast[i].addr[0] = 0; ha->hw.mcast[i].addr[1] = 0; ha->hw.mcast[i].addr[2] = 0; @@ -3812,7 +3764,6 @@ ql_hw_tx_done_locked(qla_host_t *ha, uint32_t txr_idx) comp_idx = qla_le32_to_host(*(hw_tx_cntxt->tx_cons)); while (comp_idx != hw_tx_cntxt->txr_comp) { - txb = &ha->tx_ring[txr_idx].tx_buf[hw_tx_cntxt->txr_comp]; hw_tx_cntxt->txr_comp++; @@ -3845,7 +3796,7 @@ ql_hw_tx_done_locked(qla_host_t *ha, uint32_t txr_idx) ("%s [%d]: txr_idx = %d txr_free = %d txr_next = %d txr_comp = %d\n",\ __func__, __LINE__, txr_idx, hw_tx_cntxt->txr_free, \ hw_tx_cntxt->txr_next, hw_tx_cntxt->txr_comp)); - + return; } @@ -3917,7 +3868,6 @@ ql_hw_check_health(qla_host_t *ha) ha->hw.hbeat_failure++; - if ((ha->dbg_level & 0x8000) && (ha->hw.hbeat_failure == 1)) device_printf(ha->pci_dev, "%s: Heartbeat Failue 1[0x%08x]\n", __func__, val); @@ -4182,7 +4132,6 @@ qla_set_port_config(qla_host_t *ha, uint32_t cfg_bits) return (0); } - static int qla_get_minidump_tmplt_size(qla_host_t *ha, uint32_t *size) { @@ -4211,7 +4160,6 @@ qla_get_minidump_tmplt_size(qla_host_t *ha, uint32_t * if (qla_mbx_cmd(ha, (uint32_t *) md_size, (sizeof(q80_config_md_templ_size_t) >> 2), ha->hw.mbox, (sizeof(q80_config_md_templ_size_rsp_t) >> 2), 0)) { - device_printf(dev, "%s: failed\n", __func__); return (-1); @@ -4301,7 +4249,6 @@ ql_iscsi_pdu(qla_host_t *ha, struct mbuf *mp) } if (etype == ETHERTYPE_IP) { - offset = (hdrlen + sizeof (struct ip)); if (mp->m_len >= offset) { @@ -4312,10 +4259,9 @@ ql_iscsi_pdu(qla_host_t *ha, struct mbuf *mp) } if (ip->ip_p == IPPROTO_TCP) { - hdrlen += ip->ip_hl << 2; offset = hdrlen + 4; - + if (mp->m_len >= offset) { th = (struct tcphdr *)(mp->m_data + hdrlen); } else { @@ -4325,7 +4271,6 @@ ql_iscsi_pdu(qla_host_t *ha, struct mbuf *mp) } } else if (etype == ETHERTYPE_IPV6) { - offset = (hdrlen + sizeof (struct ip6_hdr)); if (mp->m_len >= offset) { @@ -4336,7 +4281,6 @@ ql_iscsi_pdu(qla_host_t *ha, struct mbuf *mp) } if (ip6->ip6_nxt == IPPROTO_TCP) { - hdrlen += sizeof(struct ip6_hdr); offset = hdrlen + 4; @@ -4397,7 +4341,6 @@ ql_get_minidump_template(qla_host_t *ha) (sizeof(q80_config_md_templ_cmd_t) >> 2), ha->hw.mbox, (sizeof(q80_config_md_templ_cmd_rsp_t) >> 2), 0)) { - device_printf(dev, "%s: failed\n", __func__); return (-1); @@ -4471,7 +4414,6 @@ static uint32_t ql_cntrl(qla_host_t *ha, ql_minidump_template_hdr_t *template_hdr, ql_minidump_entry_cntrl_t *crbEntry); - static uint32_t ql_minidump_size(qla_host_t *ha) { @@ -4562,7 +4504,6 @@ ql_alloc_minidump_buffers(qla_host_t *ha) return (ret); } - static uint32_t ql_validate_minidump_checksum(qla_host_t *ha) { @@ -4611,7 +4552,6 @@ ql_minidump_init(qla_host_t *ha) #ifdef QL_LDFLASH_FW if (ql_alloc_dmabuf(ha, &ha->hw.dma_buf.minidump)) { - device_printf(dev, "%s: minidump dma alloc failed\n", __func__); return (-1); @@ -4628,11 +4568,9 @@ ql_minidump_init(qla_host_t *ha) #endif /* #ifdef QL_LDFLASH_FW */ if (ret == 0) { - ret = ql_validate_minidump_checksum(ha); if (ret == 0) { - ret = ql_alloc_minidump_buffers(ha); if (ret == 0) @@ -4689,7 +4627,7 @@ ql_minidump(qla_host_t *ha) ha->hw.mdump_template_size); ql_parse_template(ha); - + ql_start_sequence(ha, ha->hw.mdump_start_seq_index); ha->hw.mdump_done = 1; @@ -4697,7 +4635,6 @@ ql_minidump(qla_host_t *ha) return; } - /* * helper routines */ @@ -4711,7 +4648,6 @@ ql_entry_err_chk(ql_minidump_entry_t *entry, uint32_t return; } - static int ql_parse_template(qla_host_t *ha) { @@ -4729,7 +4665,7 @@ ql_parse_template(qla_host_t *ha) if (template_hdr->entry_type == TLHDR) sane_start = 1; - + dump_buff = (char *) ha->hw.mdump_buffer; num_of_entries = template_hdr->num_of_entries; @@ -4752,14 +4688,12 @@ ql_parse_template(qla_host_t *ha) __func__, sane_start, num_of_entries, capture_mask, dump_size)); for (buff_level = 0, e_cnt = 0; e_cnt < num_of_entries; e_cnt++) { - /* * If the capture_mask of the entry does not match capture mask * skip the entry after marking the driver_flags indicator. */ if (!(entry->hdr.entry_capture_mask & capture_mask)) { - entry->hdr.driver_flags |= QL_DBG_SKIPPED_FLAG; entry = (ql_minidump_entry_t *) ((char *) entry + entry->hdr.entry_size); @@ -4907,7 +4841,7 @@ ql_parse_template(qla_host_t *ha) "\n%s: Template configuration error. Check Template\n", __func__); } - + QL_DPRINT80(ha, (ha->pci_dev, "%s: Minidump num of entries = %d\n", __func__, template_hdr->num_of_entries)); @@ -4930,7 +4864,6 @@ ql_rdcrb(qla_host_t *ha, ql_minidump_entry_rdcrb_t * c stride = crb_entry->addr_stride; for (loop_cnt = 0; loop_cnt < op_count; loop_cnt++) { - ret = ql_rdwr_indreg32(ha, addr, &value, 1); if (ret) @@ -4978,7 +4911,6 @@ ql_L2Cache(qla_host_t *ha, ql_minidump_entry_cache_t * read_cnt = cacheEntry->read_addr_cnt; for (i = 0; i < loop_cnt; i++) { - ret = ql_rdwr_indreg32(ha, tag_reg_addr, &tag_value, 0); if (ret) return (0); @@ -5002,7 +4934,6 @@ ql_L2Cache(qla_host_t *ha, ql_minidump_entry_cache_t * cntl_value_r = (uint8_t)data; while ((cntl_value_r & cacheEntry->poll_mask) != 0) { - if (timeout) { qla_mdelay(__func__, 1); timeout--; @@ -5030,7 +4961,6 @@ ql_L2Cache(qla_host_t *ha, ql_minidump_entry_cache_t * addr = read_addr; for (k = 0; k < read_cnt; k++) { - ret = ql_rdwr_indreg32(ha, addr, &read_value, 1); if (ret) return (0); @@ -5075,7 +5005,6 @@ ql_L1Cache(qla_host_t *ha, read_cnt = cacheEntry->read_addr_cnt; for (i = 0; i < loop_cnt; i++) { - ret = ql_rdwr_indreg32(ha, tag_reg_addr, &tag_value, 0); if (ret) return (0); @@ -5086,7 +5015,6 @@ ql_L1Cache(qla_host_t *ha, addr = read_addr; for (k = 0; k < read_cnt; k++) { - ret = ql_rdwr_indreg32(ha, addr, &read_value, 1); if (ret) return (0); @@ -5145,7 +5073,6 @@ ql_rdmem(qla_host_t *ha, loop_cnt = mem_entry->read_data_size / (sizeof(uint32_t) * 4); for (i = 0; i < loop_cnt; i++) { - ret = ql_rdwr_offchip_mem(ha, (addr & 0x0ffffffff), &val, 1); if (ret) return (0); @@ -5180,7 +5107,6 @@ ql_rdrom(qla_host_t *ha, loop_cnt /= sizeof(value); for (i = 0; i < loop_cnt; i++) { - ret = ql_rd_flash32(ha, addr, &value); if (ret) return (0); @@ -5211,7 +5137,6 @@ ql_rdmux(qla_host_t *ha, read_addr = muxEntry->read_addr; for (loop_cnt = 0; loop_cnt < muxEntry->op_count; loop_cnt++) { - ret = ql_rdwr_indreg32(ha, select_addr, &sel_value, 0); if (ret) return (0); @@ -5253,7 +5178,6 @@ ql_rdmux2(qla_host_t *ha, for (loop_cnt = 0; loop_cnt < muxEntry->select_value_count; loop_cnt++) { - uint32_t temp_sel_val; ret = ql_rdwr_indreg32(ha, select_addr_1, &select_value_1, 0); @@ -5318,7 +5242,6 @@ ql_rdqueue(qla_host_t *ha, for (loop_cnt = 0, queue_id = 0; loop_cnt < queueEntry->op_count; loop_cnt++) { - ret = ql_rdwr_indreg32(ha, select_addr, &queue_id, 0); if (ret) return (0); @@ -5326,7 +5249,6 @@ ql_rdqueue(qla_host_t *ha, read_addr = queueEntry->read_addr; for (k = 0; k < read_cnt; k++) { - ret = ql_rdwr_indreg32(ha, read_addr, &read_value, 1); if (ret) return (0); @@ -5361,7 +5283,6 @@ ql_cntrl(qla_host_t *ha, opcode = crbEntry->opcode; if (opcode & QL_DBG_OPCODE_WR) { - ret = ql_rdwr_indreg32(ha, entry_addr, &crbEntry->value_1, 0); if (ret) @@ -5371,7 +5292,6 @@ ql_cntrl(qla_host_t *ha, } if (opcode & QL_DBG_OPCODE_RW) { - ret = ql_rdwr_indreg32(ha, entry_addr, &read_value, 1); if (ret) return (0); @@ -5384,7 +5304,6 @@ ql_cntrl(qla_host_t *ha, } if (opcode & QL_DBG_OPCODE_AND) { - ret = ql_rdwr_indreg32(ha, entry_addr, &read_value, 1); if (ret) return (0); @@ -5403,7 +5322,6 @@ ql_cntrl(qla_host_t *ha, } if (opcode & QL_DBG_OPCODE_OR) { - ret = ql_rdwr_indreg32(ha, entry_addr, &read_value, 1); if (ret) return (0); @@ -5418,7 +5336,6 @@ ql_cntrl(qla_host_t *ha, } if (opcode & QL_DBG_OPCODE_POLL) { - opcode &= ~QL_DBG_OPCODE_POLL; timeout = crbEntry->poll_timeout; addr = entry_addr; @@ -5429,7 +5346,6 @@ ql_cntrl(qla_host_t *ha, while ((read_value & crbEntry->value_2) != crbEntry->value_1) { - if (timeout) { qla_mdelay(__func__, 1); timeout--; @@ -5555,7 +5471,6 @@ ql_pollrd(qla_host_t *ha, ql_minidump_entry_pollrd_t * data_size = entry->data_size; for (loop_cnt = 0; loop_cnt < op_count; loop_cnt++) { - ret = ql_rdwr_indreg32(ha, select_addr, &select_value, 0); if (ret) return (0); @@ -5563,7 +5478,6 @@ ql_pollrd(qla_host_t *ha, ql_minidump_entry_pollrd_t * wait_count = 0; while (wait_count < poll) { - uint32_t temp; ret = ql_rdwr_indreg32(ha, select_addr, &temp, 1); @@ -5600,7 +5514,6 @@ ql_pollrd(qla_host_t *ha, ql_minidump_entry_pollrd_t * return (loop_cnt * (2 * sizeof(uint32_t))); } - /* * Handling rd modify write poll entry. */ @@ -5625,14 +5538,12 @@ ql_pollrd_modify_write(qla_host_t *ha, modify_mask = entry->modify_mask; data_size = entry->data_size; - ret = ql_rdwr_indreg32(ha, addr_1, &value_1, 0); if (ret) return (0); wait_count = 0; while (wait_count < poll) { - uint32_t temp; ret = ql_rdwr_indreg32(ha, addr_1, &temp, 1); @@ -5649,7 +5560,6 @@ ql_pollrd_modify_write(qla_host_t *ha, device_printf(ha->pci_dev, "%s Error in processing entry\n", __func__); } else { - ret = ql_rdwr_indreg32(ha, addr_2, &data, 1); if (ret) return (0); @@ -5667,7 +5577,6 @@ ql_pollrd_modify_write(qla_host_t *ha, /* Poll again */ wait_count = 0; while (wait_count < poll) { - uint32_t temp; ret = ql_rdwr_indreg32(ha, addr_1, &temp, 1); @@ -5688,5 +5597,3 @@ ql_pollrd_modify_write(qla_host_t *ha, */ return (2 * sizeof(uint32_t)); } - - Modified: head/sys/dev/qlxgbe/ql_hw.h ============================================================================== --- head/sys/dev/qlxgbe/ql_hw.h Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_hw.h Tue Sep 1 21:56:55 2020 (r365167) @@ -266,8 +266,6 @@ #define Q8_MBX_GET_PORT_CONFIG 0x0067 #define Q8_MBX_GET_LINK_STATUS 0x0068 - - /* * Mailbox Command Response */ @@ -925,7 +923,6 @@ typedef struct _q80_idc_ack_rsp { uint16_t regcnt_status; } __packed q80_idc_ack_rsp_t; - /* * Set Port Configuration command * Used to set Ethernet Standard Pause values @@ -1083,7 +1080,6 @@ typedef struct _q80_get_link_status_rsp { } __packed q80_get_link_status_rsp_t; - /* * Transmit Related Definitions */ @@ -1209,7 +1205,6 @@ typedef struct _q80_tx_cmd { #define Q8_TX_CMD_TSO_ALIGN 2 #define Q8_TX_MAX_NON_TSO_SEGS 62 - /* * Receive Related Definitions */ @@ -1224,7 +1219,6 @@ typedef struct _q80_tx_cmd { #endif /* #ifdef QL_ENABLE_ISCSI_TLV */ #define MAX_RDS_RINGS MAX_SDS_RINGS /* Max# of Rcv Descriptor Rings */ - typedef struct _q80_rq_sds_ring { uint64_t paddr; /* physical addr of status ring in system memory */ uint64_t hdr_split1; @@ -1310,7 +1304,6 @@ typedef struct _q80_rcv_cntxt_destroy_rsp { uint16_t regcnt_status; } __packed q80_rcv_cntxt_destroy_rsp_t; - /* * Add Receive Rings */ @@ -1355,7 +1348,6 @@ typedef struct _q80_rq_map_sds_to_rds { q80_sds_rds_map_e_t sds_rds[MAX_SDS_TO_RDS_MAP]; } __packed q80_rq_map_sds_to_rds_t; - typedef struct _q80_rsp_map_sds_to_rds { uint16_t opcode; uint16_t regcnt_status; @@ -1364,7 +1356,6 @@ typedef struct _q80_rsp_map_sds_to_rds { q80_sds_rds_map_e_t sds_rds[MAX_SDS_TO_RDS_MAP]; } __packed q80_rsp_map_sds_to_rds_t; - /* * Receive Descriptor corresponding to each entry in the receive ring */ @@ -1434,7 +1425,6 @@ typedef struct _q80_stat_desc { #define Q8_SGL_LRO_STAT_TS(data) ((data >> 40) & 0x1) #define Q8_SGL_LRO_STAT_PUSH_BIT(data) ((data >> 41) & 0x1) - /* * definitions specific to opcode 0x05 data[1] */ @@ -1463,7 +1453,6 @@ typedef struct _q80_stat_desc { #define NUM_TX_DESCRIPTORS 1024 #define NUM_STATUS_DESCRIPTORS 1024 - #define NUM_RX_DESCRIPTORS 2048 /* @@ -1608,7 +1597,6 @@ typedef struct _qla_hw { fdt_valid :1; } flags; - volatile uint16_t link_speed; volatile uint16_t cable_length; volatile uint32_t cable_oui; @@ -1630,7 +1618,7 @@ typedef struct _qla_hw { uint32_t num_tx_rings; qla_dmabuf_t dma_buf; - + /* Transmit Side */ qla_hw_tx_cntxt_t tx_cntxt[NUM_TX_RINGS]; @@ -1679,7 +1667,7 @@ typedef struct _qla_hw { uint32_t max_tx_segs; uint32_t min_lro_pkt_size; - + uint32_t enable_hw_lro; uint32_t enable_soft_lro; uint32_t enable_9kb; @@ -1739,7 +1727,6 @@ typedef struct _qla_hw { bus_write_4((ha->pci_reg), (ha->hw.intr_src[i]), 0); #define QL_BUFFER_ALIGN 16 - /* * Flash Configuration Modified: head/sys/dev/qlxgbe/ql_inline.h ============================================================================== --- head/sys/dev/qlxgbe/ql_inline.h Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_inline.h Tue Sep 1 21:56:55 2020 (r365167) @@ -35,9 +35,7 @@ #ifndef _QL_INLINE_H_ #define _QL_INLINE_H_ - #define QL8_SEMLOCK_TIMEOUT 1000/* QLA8020 Semaphore Lock Timeout 10ms */ - /* * Inline functions for hardware semaphores Modified: head/sys/dev/qlxgbe/ql_ioctl.c ============================================================================== --- head/sys/dev/qlxgbe/ql_ioctl.c Tue Sep 1 21:56:30 2020 (r365166) +++ head/sys/dev/qlxgbe/ql_ioctl.c Tue Sep 1 21:56:55 2020 (r365167) @@ -34,7 +34,6 @@ #include __FBSDID("$FreeBSD$"); - #include "ql_os.h" #include "ql_hw.h" #include "ql_def.h" @@ -104,14 +103,12 @@ ql_eioctl(struct cdev *dev, u_long cmd, caddr_t data, qla_offchip_mem_val_t *mem; } u; - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:57:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3110637CE8A; Tue, 1 Sep 2020 21:57:18 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Bk0txxz4YPp; Tue, 1 Sep 2020 21:57:18 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 01ACB204FC; Tue, 1 Sep 2020 21:57:18 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LvHED047861; Tue, 1 Sep 2020 21:57:17 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LvFRH047847; Tue, 1 Sep 2020 21:57:15 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012157.081LvFRH047847@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:57:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365168 - head/sys/dev/qlxgb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/qlxgb X-SVN-Commit-Revision: 365168 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:57:18 -0000 Author: mjg Date: Tue Sep 1 21:57:15 2020 New Revision: 365168 URL: https://svnweb.freebsd.org/changeset/base/365168 Log: qlxgb: clean up empty lines in .c and .h files Modified: head/sys/dev/qlxgb/qla_dbg.c head/sys/dev/qlxgb/qla_dbg.h head/sys/dev/qlxgb/qla_def.h head/sys/dev/qlxgb/qla_hw.c head/sys/dev/qlxgb/qla_hw.h head/sys/dev/qlxgb/qla_inline.h head/sys/dev/qlxgb/qla_ioctl.c head/sys/dev/qlxgb/qla_isr.c head/sys/dev/qlxgb/qla_misc.c head/sys/dev/qlxgb/qla_os.c head/sys/dev/qlxgb/qla_os.h head/sys/dev/qlxgb/qla_reg.h Modified: head/sys/dev/qlxgb/qla_dbg.c ============================================================================== --- head/sys/dev/qlxgb/qla_dbg.c Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_dbg.c Tue Sep 1 21:57:15 2020 (r365168) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include "qla_glbl.h" #include "qla_dbg.h" - uint32_t dbg_level = 0 ; /* * Name: qla_dump_buf32 @@ -157,7 +156,7 @@ void qla_dump_buf8(qla_host_t *ha, char *msg, void *db buf = dbuf; device_printf(dev, "%s: %s 0x%x dump start\n", __func__, msg, len); - + while (len >= 16) { device_printf(dev,"0x%08x:" " %02x %02x %02x %02x %02x %02x %02x %02x" @@ -260,6 +259,6 @@ void qla_dump_buf8(qla_host_t *ha, char *msg, void *db default: break; } - + device_printf(dev, "%s: %s dump end\n", __func__, msg); } Modified: head/sys/dev/qlxgb/qla_dbg.h ============================================================================== --- head/sys/dev/qlxgb/qla_dbg.h Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_dbg.h Tue Sep 1 21:57:15 2020 (r365168) @@ -46,7 +46,6 @@ extern void qla_dump_buf16(qla_host_t *ha, char *str, extern void qla_dump_buf32(qla_host_t *ha, char *str, void *dbuf, uint32_t len32); - #define DBG 1 #if DBG Modified: head/sys/dev/qlxgb/qla_def.h ============================================================================== --- head/sys/dev/qlxgb/qla_def.h Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_def.h Tue Sep 1 21:57:15 2020 (r365168) @@ -141,7 +141,7 @@ struct qla_host { int msix_count; void *intr_handle; qla_ivec_t irq_vec[Q8_MSI_COUNT]; - + /* parent dma tag */ bus_dma_tag_t parent_tag; Modified: head/sys/dev/qlxgb/qla_hw.c ============================================================================== --- head/sys/dev/qlxgb/qla_hw.c Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_hw.c Tue Sep 1 21:57:15 2020 (r365168) @@ -155,7 +155,7 @@ qla_alloc_dma(qla_host_t *ha) ha->hw.dma_buf.tx_ring.alignment = 8; ha->hw.dma_buf.tx_ring.size = (sizeof(q80_tx_cmd_t)) * NUM_TX_DESCRIPTORS; - + if (qla_alloc_dmabuf(ha, &ha->hw.dma_buf.tx_ring)) { device_printf(dev, "%s: tx ring alloc failed\n", __func__); goto qla_alloc_dma_exit; @@ -181,7 +181,7 @@ qla_alloc_dma(qla_host_t *ha) NUM_RX_JUMBO_DESCRIPTORS; } else break; - + if (qla_alloc_dmabuf(ha, &ha->hw.dma_buf.rds_ring[i])) { QL_DPRINT4((dev, "%s: rds ring alloc failed\n", __func__)); @@ -239,10 +239,10 @@ qla_alloc_dma(qla_host_t *ha) size += sizeof (uint32_t); /* for tx consumer index */ size = QL_ALIGN(size, PAGE_SIZE); - + ha->hw.dma_buf.context.alignment = 8; ha->hw.dma_buf.context.size = size; - + if (qla_alloc_dmabuf(ha, &ha->hw.dma_buf.context)) { device_printf(dev, "%s: context alloc failed\n", __func__); goto qla_alloc_dma_exit; @@ -281,12 +281,11 @@ qla_init_cntxt_regions(qla_host_t *ha) hw = &ha->hw; hw->tx_ring_base = hw->dma_buf.tx_ring.dma_b; - + for (i = 0; i < ha->hw.num_sds_rings; i++) hw->sds[i].sds_ring_base = (q80_stat_desc_t *)hw->dma_buf.sds_ring[i].dma_b; - phys_addr = hw->dma_buf.context.dma_addr; memset((void *)hw->dma_buf.context.dma_b, 0, @@ -331,7 +330,7 @@ qla_init_cntxt_regions(qla_host_t *ha) tx_cntxt_req->caps[0] = qla_host_to_le32((CNTXT_CAP0_BASEFW | CNTXT_CAP0_LEGACY_MN | CNTXT_CAP0_LSO)); - + tx_cntxt_req->intr_mode = qla_host_to_le32(CNTXT_INTR_MODE_SHARED); tx_cntxt_req->phys_addr = @@ -423,7 +422,7 @@ qla_issue_cmd(qla_host_t *ha, qla_cdrp_t *cdrp) signature = 0xcafe0000 | 0x0100 | ha->pci_func; ret = qla_sem_lock(ha, Q8_SEM5_LOCK, 0, (uint32_t)ha->pci_func); - + if (ret) { device_printf(dev, "%s: SEM5_LOCK lock failed\n", __func__); return (ret); @@ -556,7 +555,7 @@ qla_config_rss(qla_host_t *ha, uint16_t cntxt_id) rss_config.flags = Q8_FWCD_RSS_FLAGS_ENABLE_RSS; rss_config.ind_tbl_mask = 0x7; - + for (i = 0; i < 5; i++) rss_config.rss_key[i] = rss_key[i]; @@ -580,7 +579,7 @@ qla_config_intr_coalesce(qla_host_t *ha, uint16_t cntx intr_coalesce.hdr.cmd = Q8_FWCD_CNTRL_REQ; intr_coalesce.hdr.opcode = Q8_FWCD_OPCODE_CONFIG_INTR_COALESCING; intr_coalesce.hdr.cntxt_id = cntxt_id; - + intr_coalesce.flags = 0x04; intr_coalesce.max_rcv_pkts = 256; intr_coalesce.max_rcv_usecs = 3; @@ -600,7 +599,6 @@ qla_config_intr_coalesce(qla_host_t *ha, uint16_t cntx return ret; } - /* * Name: qla_config_mac_addr * Function: binds a MAC address to the context/interface. @@ -623,7 +621,7 @@ qla_config_mac_addr(qla_host_t *ha, uint8_t *mac_addr, mac_config.hdr.cmd = Q8_FWCD_CNTRL_REQ; mac_config.hdr.opcode = Q8_FWCD_OPCODE_CONFIG_MAC_ADDR; mac_config.hdr.cntxt_id = cntxt_id; - + if (add_multi) mac_config.cmd = Q8_FWCD_ADD_MAC_ADDR; else @@ -635,7 +633,6 @@ qla_config_mac_addr(qla_host_t *ha, uint8_t *mac_addr, return ret; } - /* * Name: qla_set_mac_rcv_mode * Function: Enable/Disable AllMulticast and Promiscuous Modes. @@ -651,7 +648,7 @@ qla_set_mac_rcv_mode(qla_host_t *ha, uint16_t cntxt_id rcv_mode.hdr.cmd = Q8_FWCD_CNTRL_REQ; rcv_mode.hdr.opcode = Q8_FWCD_OPCODE_CONFIG_MAC_RCV_MODE; rcv_mode.hdr.cntxt_id = cntxt_id; - + rcv_mode.mode = mode; ret = qla_fw_cmd(ha, &rcv_mode, sizeof(qla_set_mac_rcv_mode_t)); @@ -697,7 +694,7 @@ qla_config_ipv4_addr(qla_host_t *ha, uint32_t ipv4_add ip_conf.hdr.cmd = Q8_FWCD_CNTRL_REQ; ip_conf.hdr.opcode = Q8_FWCD_OPCODE_CONFIG_IPADDR; ip_conf.hdr.cntxt_id = (ha->hw.rx_cntxt_rsp)->rx_rsp.cntxt_id; - + ip_conf.cmd = (uint64_t)Q8_CONFIG_CMD_IP_ENABLE; ip_conf.ipv4_addr = (uint64_t)ipv4_addr; @@ -770,7 +767,6 @@ qla_tx_tso(qla_host_t *ha, struct mbuf *mp, q80_tx_cmd tcp_hlen = th->th_off << 2; - hdrlen = ehdrlen + ip_hlen + tcp_hlen; if (mp->m_len < hdrlen) { @@ -786,12 +782,10 @@ qla_tx_tso(qla_host_t *ha, struct mbuf *mp, q80_tx_cmd } if ((mp->m_pkthdr.csum_flags & CSUM_TSO) == 0) { - /* If TCP options are preset only time stamp option is supported */ if ((tcp_hlen - sizeof(struct tcphdr)) != 10) return -1; else { - if (mp->m_len < hdrlen) { tcp_opt = &hdr[tcp_opt_off]; } else { @@ -955,7 +949,6 @@ qla_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, i eh = mtod(mp, struct ether_vlan_header *); if ((mp->m_pkthdr.len > ha->max_frame_size)||(nsegs > Q8_TX_MAX_SEGMENTS)) { - bzero((void *)&tso_cmd, sizeof(q80_tx_cmd_t)); src = ha->hw.frame_hdr; @@ -968,7 +961,7 @@ qla_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, i bytes = sizeof(q80_tx_cmd_t) - Q8_TX_CMD_TSO_ALIGN; bytes = QL_MIN(bytes, hdr_len); - + num_tx_cmds++; hdr_len -= bytes; @@ -1024,7 +1017,6 @@ qla_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, i tx_cmd->vlan_tci = mp->m_pkthdr.ether_vtag; } - tx_cmd->n_bufs = (uint8_t)nsegs; tx_cmd->data_len_lo = (uint8_t)(total_length & 0xFF); tx_cmd->data_len_hi = qla_host_to_le16(((uint16_t)(total_length >> 8))); @@ -1034,7 +1026,6 @@ qla_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, i while (1) { for (i = 0; ((i < Q8_TX_CMD_MAX_SEGMENTS) && nsegs); i++) { - switch (i) { case 0: tx_cmd->buf1_addr = c_seg->ds_addr; @@ -1143,10 +1134,10 @@ qla_del_hw_if(qla_host_t *ha) for (i = 0; i < ha->hw.num_sds_rings; i++) QL_DISABLE_INTERRUPTS(ha, i); - + qla_del_rcv_cntxt(ha); qla_del_xmt_cntxt(ha); - + ha->hw.flags.lro = 0; } @@ -1249,7 +1240,7 @@ qla_init_rcv_cntxt(qla_host_t *ha) cdrp.cmd_arg1 = (uint32_t)(phys_addr >> 32); cdrp.cmd_arg2 = (uint32_t)(phys_addr); cdrp.cmd_arg3 = (uint32_t)(sizeof (q80_rcv_cntxt_req_t)); - + if (qla_issue_cmd(ha, &cdrp)) { device_printf(dev, "%s: Q8_CMD_CREATE_RX_CNTXT failed\n", __func__); @@ -1350,7 +1341,7 @@ qla_init_xmt_cntxt(qla_host_t *ha) cdrp.cmd_arg1 = (uint32_t)(phys_addr >> 32); cdrp.cmd_arg2 = (uint32_t)(phys_addr); cdrp.cmd_arg3 = (uint32_t)(sizeof (q80_tx_cntxt_req_t)); - + if (qla_issue_cmd(ha, &cdrp)) { device_printf(dev, "%s: Q8_CMD_CREATE_TX_CNTXT failed\n", __func__); @@ -1705,7 +1696,6 @@ qla_hw_tx_done_locked(qla_host_t *ha) comp_idx = qla_le32_to_host(*(hw->tx_cons)); while (comp_idx != hw->txr_comp) { - txb = &ha->tx_buf[hw->txr_comp]; hw->txr_comp++; @@ -1839,4 +1829,3 @@ qla_hw_stop_rcv(qla_host_t *ha) qla_mdelay(__func__, 10); } } - Modified: head/sys/dev/qlxgb/qla_hw.h ============================================================================== --- head/sys/dev/qlxgb/qla_hw.h Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_hw.h Tue Sep 1 21:57:15 2020 (r365168) @@ -55,7 +55,7 @@ typedef struct qla_cdrp { uint32_t rsp_arg2; uint32_t rsp_arg3; } qla_cdrp_t; - + #define Q8_CMD_RD_MAX_RDS_PER_CNTXT 0x80000002 #define Q8_CMD_RD_MAX_SDS_PER_CNTXT 0x80000003 #define Q8_CMD_RD_MAX_RULES_PER_CNTXT 0x80000004 @@ -97,7 +97,6 @@ typedef struct qla_cdrp { #define Q8_RSP_CMD_INVALID 0x00000010 #define Q8_RSP_TIMEOUT 0x00000011 - /* * Transmit Related Definitions */ @@ -128,7 +127,6 @@ typedef struct _q80_tx_cntxt_req { uint32_t num_entries; /* number of entries in transmit ring */ uint8_t rsrvd3[128]; } __packed q80_tx_cntxt_req_t; /* 188 bytes total */ - /* * Transmit Context - Response from Firmware to Q8_CMD_CREATE_TX_CNTXT @@ -208,7 +206,6 @@ typedef struct _q80_tx_cmd { #define Q8_TX_CMD_TSO_ALIGN 2 #define Q8_TX_MAX_SEGMENTS 14 - /* * Receive Related Definitions */ @@ -282,7 +279,6 @@ typedef struct _q80_rsp_rcv_cntxt { uint8_t data[0]; } __packed q80_rsp_rcv_cntxt_t; /* 152 bytes header + rds + sds ring rspncs */ - /* * Note: * Transmit Context @@ -583,7 +579,6 @@ typedef struct _qla_link_event_req { uint8_t pad[6]; } __packed qla_link_event_req_t; - /* * Set MAC Receive Mode */ @@ -621,7 +616,6 @@ typedef struct _qla_config_lro { #define Q8_CONFIG_LRO_ENABLE 0x08 } __packed qla_config_lro_t; - /* * Control Messages Received on SDS Ring */ @@ -762,7 +756,7 @@ typedef struct _qla_hw { uint16_t num_sds_rings; qla_dmabuf_t dma_buf; - + /* Transmit Side */ q80_tx_cmd_t *tx_ring_base; @@ -793,7 +787,7 @@ typedef struct _qla_hw { bus_addr_t rx_cntxt_req_paddr; q80_rcv_cntxt_rsp_t *rx_cntxt_rsp; /* Rcv Context Response */ bus_addr_t rx_cntxt_rsp_paddr; - + qla_sds_t sds[MAX_SDS_RINGS]; uint8_t frame_hdr[QL_FRAME_HDR_SIZE]; @@ -830,7 +824,6 @@ typedef struct _qla_hw { rsp_sds = &((ha->hw.rx_cntxt_rsp)->sds_rsp[sds_index]);\ WRITE_REG32(ha, (rsp_sds->intr_mask_reg + 0x1b2000), 0x0);\ } - #define QL_BUFFER_ALIGN 16 Modified: head/sys/dev/qlxgb/qla_inline.h ============================================================================== --- head/sys/dev/qlxgb/qla_inline.h Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_inline.h Tue Sep 1 21:57:15 2020 (r365168) @@ -45,7 +45,6 @@ static __inline void qla_hw_reset(qla_host_t *ha) #define QL8_SEMLOCK_TIMEOUT 1000/* QLA8020 Semaphore Lock Timeout 10ms */ - /* * Inline functions for hardware semaphores */ Modified: head/sys/dev/qlxgb/qla_ioctl.c ============================================================================== --- head/sys/dev/qlxgb/qla_ioctl.c Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_ioctl.c Tue Sep 1 21:57:15 2020 (r365168) @@ -94,7 +94,6 @@ qla_eioctl(struct cdev *dev, u_long cmd, caddr_t data, pci_dev= ha->pci_dev; switch(cmd) { - case QLA_RDWR_REG: rv = (qla_reg_val_t *)data; @@ -125,7 +124,6 @@ qla_eioctl(struct cdev *dev, u_long cmd, caddr_t data, rval = ENXIO; break; - case QLA_ERASE_FLASH: if (qla_erase_flash(ha, ((qla_erase_flash_t *)data)->off, ((qla_erase_flash_t *)data)->size)) @@ -147,4 +145,3 @@ qla_eioctl(struct cdev *dev, u_long cmd, caddr_t data, return rval; } - Modified: head/sys/dev/qlxgb/qla_isr.c ============================================================================== --- head/sys/dev/qlxgb/qla_isr.c Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_isr.c Tue Sep 1 21:57:15 2020 (r365168) @@ -61,9 +61,9 @@ qla_rx_intr(qla_host_t *ha, uint64_t data, uint32_t sd struct ifnet *ifp = ha->ifp; qla_sds_t *sdsp; struct ether_vlan_header *eh; - + sdsp = &ha->hw.sds[sds_idx]; - + ring = (uint32_t)Q8_STAT_DESC_TYPE(data); idx = (uint32_t)Q8_STAT_DESC_HANDLE(data); length = (uint32_t)Q8_STAT_DESC_TOTAL_LENGTH(data); @@ -113,11 +113,11 @@ qla_rx_intr(qla_host_t *ha, uint64_t data, uint32_t sd sdsp->rxjb_free = rxb; sdsp->rxj_free++; } - + mp->m_len = length; mp->m_pkthdr.len = length; mp->m_pkthdr.rcvif = ifp; - + eh = mtod(mp, struct ether_vlan_header *); if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) { @@ -175,7 +175,6 @@ qla_replenish_jumbo_rx(qla_host_t *ha, qla_sds_t *sdsp sdsp->rxjb_free = rxb->next; sdsp->rxj_free--; - if (qla_get_mbuf(ha, rxb, NULL, RDS_RING_INDEX_JUMBO) == 0) { qla_set_hw_rcv_desc(ha, RDS_RING_INDEX_JUMBO, ha->hw.rxj_in, rxb->handle, rxb->paddr, @@ -289,7 +288,6 @@ qla_rcv_isr(qla_host_t *ha, uint32_t sds_idx, uint32_t lro = &hw->sds[sds_idx].lro; while (count--) { - sdesc = (q80_stat_desc_t *) &hw->sds[sds_idx].sds_ring_base[comp_idx]; @@ -303,7 +301,6 @@ qla_rcv_isr(qla_host_t *ha, uint32_t sds_idx, uint32_t desc_count = Q8_STAT_DESC_COUNT((sdesc->data[0])); switch (Q8_STAT_DESC_OPCODE((sdesc->data[0]))) { - case Q8_STAT_DESC_OPCODE_RCV_PKT: case Q8_STAT_DESC_OPCODE_SYN_OFFLOAD: qla_rx_intr(ha, (sdesc->data[0]), sds_idx, lro); @@ -410,4 +407,3 @@ qla_rcv(void *context, int pending) QL_ENABLE_INTERRUPTS(ha, sds_idx); } - Modified: head/sys/dev/qlxgb/qla_misc.c ============================================================================== --- head/sys/dev/qlxgb/qla_misc.c Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_misc.c Tue Sep 1 21:57:15 2020 (r365168) @@ -187,7 +187,7 @@ static crb_to_pci_t crbinit_to_pciaddr[] = { {(0x759 << 20), (0x027 << 20)}, {(0x773 << 20), (0x001 << 20)} }; - + #define Q8_INVALID_ADDRESS (-1) #define Q8_ADDR_MASK (0xFFF << 20) @@ -293,7 +293,7 @@ qla_rdwr_offchip_mem(qla_host_t *ha, uint64_t addr, of } else qla_mdelay(__func__, 1); } - + device_printf(ha->pci_dev, "%s: failed[0x%08x]\n", __func__, data); return (-1); } @@ -501,7 +501,6 @@ qla_load_fw_from_flash(qla_host_t *ha) uint32_t count; offchip_mem_val_t val; - /* only bootloader needs to be loaded into memory */ for (count = 0; count < 0x20000 ; ) { qla_rd_flash32(ha, flash_off, &val.data_lo); @@ -553,7 +552,7 @@ qla_init_from_flash(qla_host_t *ha) qla_mdelay(__func__, 10); qla_load_fw_from_flash(ha); - + WRITE_OFFSET32(ha, Q8_CMDPEG_STATE, 0x00000000); WRITE_OFFSET32(ha, Q8_PEG_0_RESET, 0x00001020); WRITE_OFFSET32(ha, Q8_ASIC_RESET, 0x0080001E); @@ -582,7 +581,7 @@ qla_init_from_flash(qla_host_t *ha) (READ_OFFSET32(ha, Q8_PEG_HALT_STATUS2)), (READ_OFFSET32(ha, Q8_FIRMWARE_HEARTBEAT)), (READ_OFFSET32(ha, Q8_RCVPEG_STATE)), data); - + return (-1); } @@ -630,11 +629,9 @@ qla_init_hw(qla_host_t *ha) ha->fw_ver_sub = READ_OFFSET32(ha, Q8_FW_VER_SUB); if (qla_rd_flash32(ha, 0x100004, &val) == 0) { - if (((val & 0xFF) != ha->fw_ver_major) || (((val >> 8) & 0xFF) != ha->fw_ver_minor) || (((val >> 16) & 0xFF) != ha->fw_ver_sub)) { - ret = qla_init_from_flash(ha); qla_mdelay(__func__, 100); } @@ -700,7 +697,7 @@ qla_flash_unprotect(qla_host_t *ha) val = ROM_OPCODE_WR_STATUS_REG; qla_rdwr_indreg32(ha, Q8_ROM_INSTR_OPCODE, &val, 0); - + rval = qla_wait_for_flash_busy(ha); if (rval) { @@ -716,7 +713,7 @@ qla_flash_unprotect(qla_host_t *ha) val = ROM_OPCODE_WR_STATUS_REG; qla_rdwr_indreg32(ha, Q8_ROM_INSTR_OPCODE, &val, 0); - + rval = qla_wait_for_flash_busy(ha); if (rval) @@ -738,7 +735,7 @@ qla_flash_protect(qla_host_t *ha) val = ROM_OPCODE_WR_STATUS_REG; qla_rdwr_indreg32(ha, Q8_ROM_INSTR_OPCODE, &val, 0); - + rval = qla_wait_for_flash_busy(ha); if (rval) @@ -759,7 +756,7 @@ qla_flash_get_status(qla_host_t *ha) val = ROM_OPCODE_RD_STATUS_REG; qla_rdwr_indreg32(ha, Q8_ROM_INSTR_OPCODE, &val, 0); - + rval = qla_wait_for_flash_busy(ha); if (rval == 0) { @@ -779,7 +776,6 @@ qla_wait_for_flash_unprotect(qla_host_t *ha) uint32_t delay = 1000; while (delay--) { - if (qla_flash_get_status(ha) == 0) return 0; @@ -795,7 +791,6 @@ qla_wait_for_flash_protect(qla_host_t *ha) uint32_t delay = 1000; while (delay--) { - if (qla_flash_get_status(ha) == 0x9C) return 0; @@ -898,7 +893,6 @@ qla_flash_wait_for_write_complete(qla_host_t *ha) int rval = 0; while (count--) { - val = 0; qla_rdwr_indreg32(ha, Q8_ROM_ADDR_BYTE_COUNT, &val, 0); @@ -934,7 +928,6 @@ qla_flash_write(qla_host_t *ha, uint32_t off, uint32_t return 0; } - static int qla_flash_write_pattern(qla_host_t *ha, uint32_t off, uint32_t size, uint32_t pattern) @@ -942,7 +935,6 @@ qla_flash_write_pattern(qla_host_t *ha, uint32_t off, int rval = 0; uint32_t start; - if ((rval = qla_p3p_sem_lock2(ha))) goto qla_wr_pattern_exit; @@ -979,7 +971,6 @@ qla_flash_write_data(qla_host_t *ha, uint32_t off, uin uint32_t start; uint32_t *data32 = data; - if ((rval = qla_p3p_sem_lock2(ha))) goto qla_wr_pattern_exit; @@ -1011,7 +1002,7 @@ qla_wr_pattern_unlock_exit: qla_wr_pattern_exit: return (rval); } - + int qla_wr_flash_buffer(qla_host_t *ha, uint32_t off, uint32_t size, void *buf, uint32_t pattern) @@ -1019,7 +1010,6 @@ qla_wr_flash_buffer(qla_host_t *ha, uint32_t off, uint int rval = 0; void *data; - if (size == 0) return 0; @@ -1049,4 +1039,3 @@ qla_wr_flash_buffer_free_exit: qla_wr_flash_buffer_exit: return (rval); } - Modified: head/sys/dev/qlxgb/qla_os.c ============================================================================== --- head/sys/dev/qlxgb/qla_os.c Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_os.c Tue Sep 1 21:57:15 2020 (r365168) @@ -378,7 +378,7 @@ qla_pci_attach(device_t dev) ha->flags.qla_watchdog_active = 1; ha->flags.qla_watchdog_pause = 1; - + callout_init(&ha->tx_callout, 1); /* create ioctl device interface */ @@ -463,7 +463,6 @@ qla_sysctl_get_stats(SYSCTL_HANDLER_ARGS) return (err); } - /* * Name: qla_release * Function: Releases the resources allocated for the device @@ -639,7 +638,7 @@ qla_alloc_parent_dma_tag(qla_host_t *ha) } ha->flags.parent_tag = 1; - + return (0); } @@ -969,7 +968,7 @@ qla_media_status(struct ifnet *ifp, struct ifmediareq ifmr->ifm_status = IFM_AVALID; ifmr->ifm_active = IFM_ETHER; - + qla_update_link_state(ha); if (ha->hw.flags.link_up) { ifmr->ifm_status |= IFM_ACTIVE; @@ -1061,7 +1060,6 @@ qla_send(qla_host_t *ha, struct mbuf **m_headp) BUS_DMA_NOWAIT); if (ret == EFBIG) { - struct mbuf *m; QL_DPRINT8((ha->pci_dev, "%s: EFBIG [%d]\n", __func__, @@ -1081,7 +1079,6 @@ qla_send(qla_host_t *ha, struct mbuf **m_headp) if ((ret = bus_dmamap_load_mbuf_sg(ha->tx_tag, map, m_head, segs, &nsegs, BUS_DMA_NOWAIT))) { - ha->err_tx_dmamap_load++; device_printf(ha->pci_dev, @@ -1191,7 +1188,6 @@ qla_clear_tx_buf(qla_host_t *ha, qla_tx_buf_t *txb) QL_DPRINT2((ha->pci_dev, "%s: enter\n", __func__)); if (txb->m_head) { - bus_dmamap_unload(ha->tx_tag, txb->map); bus_dmamap_destroy(ha->tx_tag, txb->map); @@ -1219,7 +1215,6 @@ qla_free_xmt_bufs(qla_host_t *ha) return; } - static int qla_alloc_rcv_bufs(qla_host_t *ha) { @@ -1238,7 +1233,6 @@ qla_alloc_rcv_bufs(qla_host_t *ha) NULL, /* lockfunc */ NULL, /* lockfuncarg */ &ha->rx_tag)) { - device_printf(ha->pci_dev, "%s: rx_tag alloc failed\n", __func__); @@ -1258,7 +1252,6 @@ qla_alloc_rcv_bufs(qla_host_t *ha) } for (i = 0; i < NUM_RX_DESCRIPTORS; i++) { - rxb = &ha->rx_buf[i]; ret = bus_dmamap_create(ha->rx_tag, BUS_DMA_NOWAIT, &rxb->map); @@ -1298,9 +1291,7 @@ qla_alloc_rcv_bufs(qla_host_t *ha) } } - for (i = 0; i < NUM_RX_JUMBO_DESCRIPTORS; i++) { - rxb = &ha->rx_jbuf[i]; ret = bus_dmamap_create(ha->rx_tag, BUS_DMA_NOWAIT, &rxb->map); @@ -1407,7 +1398,6 @@ qla_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct ifp = ha->ifp; if (mp == NULL) { - if (!jumbo) { mp = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); @@ -1441,7 +1431,6 @@ qla_get_mbuf(qla_host_t *ha, qla_rx_buf_t *rxb, struct mp->m_next = NULL; } - offset = (uint32_t)((unsigned long long)mp->m_data & 0x7ULL); if (offset) { offset = 8 - offset; @@ -1480,4 +1469,3 @@ qla_tx_done(void *context, int pending) qla_hw_tx_done(ha); qla_start(ha->ifp); } - Modified: head/sys/dev/qlxgb/qla_os.h ============================================================================== --- head/sys/dev/qlxgb/qla_os.h Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_os.h Tue Sep 1 21:57:15 2020 (r365168) @@ -121,7 +121,6 @@ static __inline int qla_sec_to_hz(int sec) return (tvtohz(&t)); } - #define qla_host_to_le16(x) htole16(x) #define qla_host_to_le32(x) htole32(x) #define qla_host_to_le64(x) htole64(x) @@ -145,13 +144,13 @@ MALLOC_DECLARE(M_QLA8XXXBUF); else \ pause(fn, qla_ms_to_hz(msecs)); \ } - + /* * Locks */ #define QLA_LOCK(ha, str) qla_lock(ha, str); #define QLA_UNLOCK(ha, str) qla_unlock(ha, str) - + #define QLA_TX_LOCK(ha) mtx_lock(&ha->tx_lock); #define QLA_TX_UNLOCK(ha) mtx_unlock(&ha->tx_lock); Modified: head/sys/dev/qlxgb/qla_reg.h ============================================================================== --- head/sys/dev/qlxgb/qla_reg.h Tue Sep 1 21:56:55 2020 (r365167) +++ head/sys/dev/qlxgb/qla_reg.h Tue Sep 1 21:57:15 2020 (r365168) @@ -81,7 +81,6 @@ /* Valid bit for a SEM_LOCK registers */ #define SEM_LOCK_BIT 0x00000001 - #define Q8_ROM_LOCKID 0x1B2100 /******************************* @@ -127,7 +126,6 @@ */ #define COLD_BOOT_VALUE 0x12345678 - #define Q8_MIU_TEST_AGT_CTRL 0x180090 #define Q8_MIU_TEST_AGT_ADDR_LO 0x180094 #define Q8_MIU_TEST_AGT_ADDR_HI 0x180098 @@ -194,7 +192,7 @@ * 31:2 Reserved; * 1:0 max address bytes for ROM Interface */ - + #define Q8_ROM_DUMMY_BYTE_COUNT 0x03310014 /* * bit definitions for Q8_ROM_DUMMY_BYTE_COUNT @@ -206,7 +204,6 @@ #define Q8_ROM_WR_DATA 0x0331000C #define Q8_ROM_DIRECT_WINDOW 0x03310030 #define Q8_ROM_DIRECT_DATA_OFFSET 0x03310000 - #define Q8_NX_CDRP_CMD_RSP 0x1B2218 #define Q8_NX_CDRP_ARG1 0x1B221C From owner-svn-src-all@freebsd.org Tue Sep 1 21:57:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 037AA37D1A9; Tue, 1 Sep 2020 21:57:36 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1C36k2nz4Ydm; Tue, 1 Sep 2020 21:57:35 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AFF2920506; Tue, 1 Sep 2020 21:57:35 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LvZUt047926; Tue, 1 Sep 2020 21:57:35 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LvXKQ047916; Tue, 1 Sep 2020 21:57:33 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012157.081LvXKQ047916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:57:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365169 - in head/sys/dev/qlnx: qlnxe qlnxr X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/qlnx: qlnxe qlnxr X-SVN-Commit-Revision: 365169 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:57:36 -0000 Author: mjg Date: Tue Sep 1 21:57:33 2020 New Revision: 365169 URL: https://svnweb.freebsd.org/changeset/base/365169 Log: qlnx: clean up empty lines in .c and .h files Modified: head/sys/dev/qlnx/qlnxe/bcm_osal.h head/sys/dev/qlnx/qlnxe/common_hsi.h head/sys/dev/qlnx/qlnxe/ecore_cxt.c head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.c head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.h head/sys/dev/qlnx/qlnxe/ecore_dbg_values.h head/sys/dev/qlnx/qlnxe/ecore_dev.c head/sys/dev/qlnx/qlnxe/ecore_fcoe.h head/sys/dev/qlnx/qlnxe/ecore_hsi_common.h head/sys/dev/qlnx/qlnxe/ecore_hsi_debug_tools.h head/sys/dev/qlnx/qlnxe/ecore_hsi_eth.h head/sys/dev/qlnx/qlnxe/ecore_hsi_fcoe.h head/sys/dev/qlnx/qlnxe/ecore_hsi_init_func.h head/sys/dev/qlnx/qlnxe/ecore_hsi_init_tool.h head/sys/dev/qlnx/qlnxe/ecore_hsi_iscsi.h head/sys/dev/qlnx/qlnxe/ecore_hsi_iwarp.h head/sys/dev/qlnx/qlnxe/ecore_hsi_rdma.h head/sys/dev/qlnx/qlnxe/ecore_hsi_roce.h head/sys/dev/qlnx/qlnxe/ecore_init_fw_funcs.c head/sys/dev/qlnx/qlnxe/ecore_init_ops.c head/sys/dev/qlnx/qlnxe/ecore_init_ops.h head/sys/dev/qlnx/qlnxe/ecore_int.c head/sys/dev/qlnx/qlnxe/ecore_int.h head/sys/dev/qlnx/qlnxe/ecore_iov_api.h head/sys/dev/qlnx/qlnxe/ecore_iscsi.h head/sys/dev/qlnx/qlnxe/ecore_iscsi_api.h head/sys/dev/qlnx/qlnxe/ecore_iwarp.c head/sys/dev/qlnx/qlnxe/ecore_l2.c head/sys/dev/qlnx/qlnxe/ecore_l2.h head/sys/dev/qlnx/qlnxe/ecore_ll2.c head/sys/dev/qlnx/qlnxe/ecore_mcp.c head/sys/dev/qlnx/qlnxe/ecore_mcp.h head/sys/dev/qlnx/qlnxe/ecore_mng_tlv.c head/sys/dev/qlnx/qlnxe/ecore_ooo.h head/sys/dev/qlnx/qlnxe/ecore_proto_if.h head/sys/dev/qlnx/qlnxe/ecore_rdma.c head/sys/dev/qlnx/qlnxe/ecore_rdma.h head/sys/dev/qlnx/qlnxe/ecore_roce.c head/sys/dev/qlnx/qlnxe/ecore_roce_api.h head/sys/dev/qlnx/qlnxe/ecore_rt_defs.h head/sys/dev/qlnx/qlnxe/ecore_sp_api.h head/sys/dev/qlnx/qlnxe/ecore_sp_commands.c head/sys/dev/qlnx/qlnxe/ecore_sp_commands.h head/sys/dev/qlnx/qlnxe/ecore_spq.c head/sys/dev/qlnx/qlnxe/ecore_sriov.c head/sys/dev/qlnx/qlnxe/ecore_status.h head/sys/dev/qlnx/qlnxe/ecore_tcp_ip.h head/sys/dev/qlnx/qlnxe/ecore_vf.c head/sys/dev/qlnx/qlnxe/ecore_vf.h head/sys/dev/qlnx/qlnxe/ecore_vf_api.h head/sys/dev/qlnx/qlnxe/ecore_vfpf_if.h head/sys/dev/qlnx/qlnxe/eth_common.h head/sys/dev/qlnx/qlnxe/fcoe_common.h head/sys/dev/qlnx/qlnxe/iscsi_common.h head/sys/dev/qlnx/qlnxe/mcp_private.h head/sys/dev/qlnx/qlnxe/mcp_public.h head/sys/dev/qlnx/qlnxe/mfw_hsi.h head/sys/dev/qlnx/qlnxe/nvm_cfg.h head/sys/dev/qlnx/qlnxe/nvm_map.h head/sys/dev/qlnx/qlnxe/pcics_reg_driver.h head/sys/dev/qlnx/qlnxe/qlnx_def.h head/sys/dev/qlnx/qlnxe/qlnx_ioctl.c head/sys/dev/qlnx/qlnxe/qlnx_ioctl.h head/sys/dev/qlnx/qlnxe/qlnx_os.c head/sys/dev/qlnx/qlnxe/qlnx_os.h head/sys/dev/qlnx/qlnxe/qlnx_rdma.c head/sys/dev/qlnx/qlnxe/qlnx_rdma.h head/sys/dev/qlnx/qlnxe/qlnx_ver.h head/sys/dev/qlnx/qlnxe/rdma_common.h head/sys/dev/qlnx/qlnxe/roce_common.h head/sys/dev/qlnx/qlnxe/spad_layout.h head/sys/dev/qlnx/qlnxe/storage_common.h head/sys/dev/qlnx/qlnxe/tcp_common.h head/sys/dev/qlnx/qlnxr/qlnxr_cm.c head/sys/dev/qlnx/qlnxr/qlnxr_cm.h head/sys/dev/qlnx/qlnxr/qlnxr_def.h head/sys/dev/qlnx/qlnxr/qlnxr_os.c head/sys/dev/qlnx/qlnxr/qlnxr_roce.h head/sys/dev/qlnx/qlnxr/qlnxr_user.h head/sys/dev/qlnx/qlnxr/qlnxr_verbs.c head/sys/dev/qlnx/qlnxr/qlnxr_verbs.h Modified: head/sys/dev/qlnx/qlnxe/bcm_osal.h ============================================================================== --- head/sys/dev/qlnx/qlnxe/bcm_osal.h Tue Sep 1 21:57:15 2020 (r365168) +++ head/sys/dev/qlnx/qlnxe/bcm_osal.h Tue Sep 1 21:57:33 2020 (r365169) @@ -92,7 +92,6 @@ extern void qlnx_get_protocol_stats(void *cdev, int pr extern void qlnx_sp_isr(void *arg); - extern void qlnx_osal_vf_fill_acquire_resc_req(void *p_hwfn, void *p_resc_req, void *p_sw_info); extern void qlnx_osal_iov_vf_cleanup(void *p_hwfn, uint8_t relative_vf_id); @@ -126,7 +125,7 @@ is_power_of_2(unsigned long n) { return (n == roundup_pow_of_two(n)); } - + static __inline unsigned long rounddown_pow_of_two(unsigned long x) { @@ -345,7 +344,6 @@ do { \ } \ } while (0) - #define OSAL_LIST_IS_EMPTY(list) \ ((list)->cnt == 0) @@ -364,7 +362,6 @@ do { \ entry = (type *)tmp_entry, \ tmp_entry = (entry) ? OSAL_LIST_NEXT(entry, field, type) : NULL) - #define OSAL_BAR_SIZE(dev, bar_id) qlnx_pci_bus_get_bar_size(dev, bar_id) #define OSAL_PCI_READ_CONFIG_BYTE(dev, reg, value) \ @@ -440,7 +437,6 @@ qlnx_log2(uint32_t x) #define OSAL_UNLIKELY #define OSAL_NULL NULL - #define OSAL_MAX_T(type, __max1, __max2) max_t(type, __max1, __max2) #define OSAL_MIN_T(type, __max1, __max2) min_t(type, __max1, __max2) @@ -512,7 +508,6 @@ bitmap_weight(unsigned long *bitmap, unsigned nbits) } #endif - #define OSAL_TEST_AND_FLIP_BIT qlnx_test_and_change_bit #define OSAL_TEST_AND_CLEAR_BIT test_and_clear_bit Modified: head/sys/dev/qlnx/qlnxe/common_hsi.h ============================================================================== --- head/sys/dev/qlnx/qlnxe/common_hsi.h Tue Sep 1 21:57:15 2020 (r365168) +++ head/sys/dev/qlnx/qlnxe/common_hsi.h Tue Sep 1 21:57:33 2020 (r365169) @@ -72,7 +72,6 @@ #define ETH_MAX_NUM_RX_QUEUES_PER_VF_DOUBLE 48 /*Maximum number of RX queues that can be allocated to VF with doubled VF zone size. Up to 96 VF supported in this mode*/ #define ETH_MAX_NUM_RX_QUEUES_PER_VF_QUAD 112 /*Maximum number of RX queues that can be allocated to VF with 4 VF zone size. Up to 48 VF supported in this mode*/ - /********************************/ /* CORE (LIGHT L2) FW CONSTANTS */ /********************************/ @@ -97,12 +96,10 @@ #define MAX_NUM_LL2_RX_QUEUES 48 #define MAX_NUM_LL2_TX_STATS_COUNTERS 48 - /////////////////////////////////////////////////////////////////////////////////////////////////// // Include firmware verison number only- do not add constants here to avoid redundunt compilations /////////////////////////////////////////////////////////////////////////////////////////////////// - #define FW_MAJOR_VERSION 8 #define FW_MINOR_VERSION 33 #define FW_REVISION_VERSION 7 @@ -196,7 +193,6 @@ #define CDU_CONTEXT_VALIDATION_CFG_USE_CID (4) #define CDU_CONTEXT_VALIDATION_CFG_USE_ACTIVE (5) - /*****************/ /* DQ CONSTANTS */ /*****************/ @@ -412,12 +408,10 @@ #define PIS_PER_SB_E5 8 #define MAX_PIS_PER_SB OSAL_MAX_T(PIS_PER_SB_E4,PIS_PER_SB_E5) - #define CAU_HC_STOPPED_STATE 3 /* fsm is stopped or not valid for this sb */ #define CAU_HC_DISABLE_STATE 4 /* fsm is working without interrupt coalescing for this sb*/ #define CAU_HC_ENABLE_STATE 0 /* fsm is working with interrupt coalescing for this sb*/ - /*****************/ /* IGU CONSTANTS */ /*****************/ @@ -594,12 +588,10 @@ #define PXP_NUM_ILT_RECORDS_E5 13664 - // Host Interface #define PXP_QUEUES_ZONE_MAX_NUM_E4 320 #define PXP_QUEUES_ZONE_MAX_NUM_E5 512 - /*****************/ /* PRM CONSTANTS */ /*****************/ @@ -608,7 +600,6 @@ /* SDMs CONSTANTS */ /*****************/ - #define SDM_OP_GEN_TRIG_NONE 0 #define SDM_OP_GEN_TRIG_WAKE_THREAD 1 #define SDM_OP_GEN_TRIG_AGG_INT 2 @@ -660,14 +651,12 @@ struct coalescing_timeset #define COALESCING_TIMESET_VALID_SHIFT 7 }; - struct common_queue_zone { __le16 ring_drv_data_consumer; __le16 reserved; }; - /* * ETH Rx producers data */ @@ -677,7 +666,6 @@ struct eth_rx_prod_data __le16 cqe_prod /* CQE producer. */; }; - struct tcp_ulp_connect_done_params { __le16 mss; @@ -696,7 +684,6 @@ struct iscsi_connect_done_results struct tcp_ulp_connect_done_params params /* decided tcp params after connect done */; }; - struct iscsi_eqe_data { __le16 icid /* Context ID of the connection */; @@ -712,7 +699,6 @@ struct iscsi_eqe_data #define ISCSI_EQE_DATA_RESERVED0_SHIFT 7 }; - /* * Multi function mode */ @@ -724,7 +710,6 @@ enum mf_mode MAX_MF_MODE }; - /* * Per-protocol connection types */ @@ -743,7 +728,6 @@ enum protocol_type MAX_PROTOCOL_TYPE }; - struct regpair { __le32 lo /* low word for reg-pair */; @@ -768,9 +752,6 @@ union rdma_eqe_data struct rdma_eqe_destroy_qp rdma_destroy_qp_data /* RoCE Destroy Event Data */; }; - - - /* * Ustorm Queue Zone */ @@ -780,14 +761,12 @@ struct ustorm_eth_queue_zone u8 reserved[3]; }; - struct ustorm_queue_zone { struct ustorm_eth_queue_zone eth; struct common_queue_zone common; }; - /* * status block structure */ @@ -804,7 +783,6 @@ struct cau_pi_entry #define CAU_PI_ENTRY_RESERVED_SHIFT 24 }; - /* * status block structure */ @@ -836,7 +814,6 @@ struct cau_sb_entry #define CAU_SB_ENTRY_TPH_SHIFT 31 }; - /* * Igu cleanup bit values to distinguish between clean or producer consumer update. */ @@ -847,7 +824,6 @@ enum command_type_bit MAX_COMMAND_TYPE_BIT }; - /* * core doorbell data */ @@ -868,7 +844,6 @@ struct core_db_data __le16 spq_prod; }; - /* * Enum of doorbell aggregative command selection */ @@ -881,7 +856,6 @@ enum db_agg_cmd_sel MAX_DB_AGG_CMD_SEL }; - /* * Enum of doorbell destination */ @@ -894,7 +868,6 @@ enum db_dest MAX_DB_DEST }; - /* * Enum of doorbell DPM types */ @@ -907,7 +880,6 @@ enum db_dpm_type MAX_DB_DPM_TYPE }; - /* * Structure for doorbell data, in L2 DPM mode, for the first doorbell in a DPM burst */ @@ -932,7 +904,6 @@ struct db_l2_dpm_data #define DB_L2_DPM_DATA_GFS_SRC_EN_SHIFT 31 }; - /* * Structure for SGE in a DPM doorbell of type DPM_L2_BD */ @@ -952,7 +923,6 @@ struct db_l2_dpm_sge __le32 reserved2; }; - /* * Structure for doorbell address, in legacy mode */ @@ -967,7 +937,6 @@ struct db_legacy_addr #define DB_LEGACY_ADDR_ICID_SHIFT 5 }; - /* * Structure for doorbell address, in PWM mode */ @@ -986,7 +955,6 @@ struct db_pwm_addr #define DB_PWM_ADDR_RESERVED1_SHIFT 28 }; - /* * Parameters to RDMA firmware, passed in EDPM doorbell */ @@ -1023,8 +991,6 @@ struct db_rdma_dpm_data struct db_rdma_dpm_params params /* parametes passed to RDMA firmware */; }; - - /* * Igu interrupt command */ @@ -1037,7 +1003,6 @@ enum igu_int_cmd MAX_IGU_INT_CMD }; - /* * IGU producer or consumer update command */ @@ -1061,7 +1026,6 @@ struct igu_prod_cons_update __le32 reserved1; }; - /* * Igu segments access for default status block only */ @@ -1072,7 +1036,6 @@ enum igu_seg_access MAX_IGU_SEG_ACCESS }; - /* * Enumeration for L3 type field of parsing_and_err_flags. L3Type: 0 - unknown (not ip) ,1 - Ipv4, 2 - Ipv6 (this field can be filled according to the last-ethertype) */ @@ -1084,7 +1047,6 @@ enum l3_type MAX_L3_TYPE }; - /* * Enumeration for l4Protocol field of parsing_and_err_flags. L4-protocol 0 - none, 1 - TCP, 2- UDP. if the packet is IPv4 fragment, and its not the first fragment, the protocol-type should be set to none. */ @@ -1096,7 +1058,6 @@ enum l4_protocol MAX_L4_PROTOCOL }; - /* * Parsing and error flags field. */ @@ -1133,7 +1094,6 @@ struct parsing_and_err_flags #define PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMERROR_SHIFT 15 }; - /* * Parsing error flags bitmap. */ @@ -1174,7 +1134,6 @@ struct parsing_err_flags #define PARSING_ERR_FLAGS_TUNNEL_L4_CHKSM_ERROR_SHIFT 15 }; - /* * Pb context */ @@ -1183,7 +1142,6 @@ struct pb_context __le32 crc[4]; }; - /* * Concrete Function ID. */ @@ -1202,7 +1160,6 @@ struct pxp_concrete_fid #define PXP_CONCRETE_FID_VFID_SHIFT 8 }; - /* * Concrete Function ID. */ @@ -1255,9 +1212,6 @@ struct pxp_pretend_cmd #define PXP_PRETEND_CMD_IS_CONCRETE_SHIFT 15 }; - - - /* * PTT Record in PXP Admin Window. */ @@ -1271,7 +1225,6 @@ struct pxp_ptt_entry struct pxp_pretend_cmd pretend; }; - /* * VF Zone A Permission Register. */ @@ -1288,7 +1241,6 @@ struct pxp_vf_zone_a_permission #define PXP_VF_ZONE_A_PERMISSION_RESERVED1_SHIFT 16 }; - /* * Rdif context */ @@ -1359,8 +1311,6 @@ struct rdif_task_context __le32 reserved2; }; - - /* * status block structure */ @@ -1381,7 +1331,6 @@ struct status_block_e4 #define STATUS_BLOCK_E4_ZERO_PAD3_SHIFT 24 }; - /* * status block structure */ @@ -1402,7 +1351,6 @@ struct status_block_e5 #define STATUS_BLOCK_E5_ZERO_PAD3_SHIFT 24 }; - /* * Tdif context */ @@ -1489,7 +1437,6 @@ struct tdif_task_context u8 partial_dif_data_b[8]; }; - /* * Timers context */ @@ -1538,7 +1485,6 @@ struct timers_context #define TIMERS_CONTEXT_RESERVED7_MASK 0x7 #define TIMERS_CONTEXT_RESERVED7_SHIFT 29 }; - /* * Enum for next_protocol field of tunnel_parsing_flags / tunnelTypeDesc Modified: head/sys/dev/qlnx/qlnxe/ecore_cxt.c ============================================================================== --- head/sys/dev/qlnx/qlnxe/ecore_cxt.c Tue Sep 1 21:57:15 2020 (r365168) +++ head/sys/dev/qlnx/qlnxe/ecore_cxt.c Tue Sep 1 21:57:33 2020 (r365169) @@ -1062,7 +1062,6 @@ t2_fail: continue; \ } else \ - /* Total number of ILT lines used by this PF */ static u32 ecore_cxt_ilt_shadow_size(struct ecore_ilt_client_cfg *ilt_clients) { @@ -1590,7 +1589,6 @@ static void ecore_cdu_init_pf(struct ecore_hwfn *p_hwf SET_FIELD(cdu_seg_params, CDU_SEG_REG_OFFSET, offset); STORE_RT_REG(p_hwfn, rt_type_offset_fl_arr[i], cdu_seg_params); - } } Modified: head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.c ============================================================================== --- head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.c Tue Sep 1 21:57:15 2020 (r365168) +++ head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.c Tue Sep 1 21:57:33 2020 (r365169) @@ -194,7 +194,6 @@ static u32 (*cond_arr[])(const u32 *r, const u32 *imm) #endif /* __PREVENT_COND_ARR__ */ - /******************************* Data Types **********************************/ enum platform_ids { @@ -540,7 +539,6 @@ struct phy_defs { #define EMPTY_FW_VERSION_STR "???_???_???_???" #define EMPTY_FW_IMAGE_STR "???????????????" - /***************************** Constant Arrays *******************************/ struct dbg_array { @@ -553,7 +551,6 @@ struct dbg_array { static struct dbg_array s_dbg_arrays[MAX_BIN_DBG_BUFFER_TYPE] = { { OSAL_NULL } }; #else static struct dbg_array s_dbg_arrays[MAX_BIN_DBG_BUFFER_TYPE] = { - /* BIN_BUF_DBG_MODE_TREE */ { (const u32 *)dbg_modes_tree_buf, OSAL_ARRAY_SIZE(dbg_modes_tree_buf)}, @@ -651,7 +648,6 @@ static struct chip_defs s_chip_defs[MAX_CHIP_IDS] = { /* Storm constant definitions array */ static struct storm_defs s_storm_defs[] = { - /* Tstorm */ { 'T', BLOCK_TSEM, { DBG_BUS_CLIENT_RBCT, DBG_BUS_CLIENT_RBCT, DBG_BUS_CLIENT_RBCT }, true, @@ -1405,7 +1401,6 @@ static struct block_defs block_bar0_map_defs = { 0, 0, 0, 0, 0, false, false, MAX_DBG_RESET_REGS, 0 }; - static struct block_defs* s_block_defs[MAX_BLOCK_ID] = { &block_grc_defs, &block_miscs_defs, @@ -1498,10 +1493,8 @@ static struct block_defs* s_block_defs[MAX_BLOCK_ID] = }; - /* Constraint operation types */ static struct dbg_bus_constraint_op_defs s_constraint_op_defs[] = { - /* DBG_BUS_CONSTRAINT_OP_EQ */ { 0, false }, @@ -1534,7 +1527,6 @@ static struct dbg_bus_constraint_op_defs s_constraint_ }; static const char* s_dbg_target_names[] = { - /* DBG_BUS_TARGET_ID_INT_BUF */ "int-buf", @@ -1546,7 +1538,6 @@ static const char* s_dbg_target_names[] = { }; static struct storm_mode_defs s_storm_mode_defs[] = { - /* DBG_BUS_STORM_MODE_PRINTF */ { "printf", true, 0 }, @@ -1576,7 +1567,6 @@ static struct storm_mode_defs s_storm_mode_defs[] = { }; static struct platform_defs s_platform_defs[] = { - /* PLATFORM_ASIC */ { "asic", 1, 256, 32768 }, @@ -1591,7 +1581,6 @@ static struct platform_defs s_platform_defs[] = { }; static struct grc_param_defs s_grc_param_defs[] = { - /* DBG_GRC_PARAM_DUMP_TSTORM */ { { 1, 1, 1 }, 0, 1, false, 1, 1 }, @@ -1755,7 +1744,6 @@ static struct big_ram_defs s_big_ram_defs[] = { }; static struct reset_reg_defs s_reset_regs_defs[] = { - /* DBG_RESET_REG_MISCS_PL_UA */ { MISCS_REG_RESET_PL_UA, { true, true, true }, { 0x0, 0x0, 0x0 } }, @@ -2308,7 +2296,6 @@ static void ecore_bus_enable_storm(struct ecore_hwfn * /* Config SEM */ if (storm_mode->is_fast_dbg) { - /* Enable fast debug */ ecore_wr(p_hwfn, p_ptt, storm->sem_frame_mode_addr, DBG_BUS_SEMI_FRAME_MODE_0SLOW_4FAST); ecore_wr(p_hwfn, p_ptt, base_addr + SEM_FAST_REG_DEBUG_MODE, storm_mode->id_in_hw); @@ -2323,7 +2310,6 @@ static void ecore_bus_enable_storm(struct ecore_hwfn * ecore_wr(p_hwfn, p_ptt, base_addr + SEM_FAST_REG_DBG_MODE6_SRC_DISABLE, SEM_FAST_MODE6_SRC_ENABLE_VAL); } else { - /* Enable slow debug */ ecore_wr(p_hwfn, p_ptt, storm->sem_frame_mode_addr, DBG_BUS_SEMI_FRAME_MODE_4SLOW_0FAST); ecore_wr(p_hwfn, p_ptt, storm->sem_slow_enable_addr, 1); @@ -2521,7 +2507,6 @@ static u32 ecore_bus_dump_int_buf(struct ecore_hwfn *p last_written_line = ecore_rd(p_hwfn, p_ptt, DBG_REG_INTR_BUFFER_WR_PTR); if (ecore_rd(p_hwfn, p_ptt, DBG_REG_WRAP_ON_INT_BUFFER)) { - /* Internal buffer was wrapped: first dump from write pointer * to buffer end, then dump from buffer start to write pointer. */ @@ -2530,7 +2515,6 @@ static u32 ecore_bus_dump_int_buf(struct ecore_hwfn *p offset += ecore_bus_dump_int_buf_range(p_hwfn, p_ptt, dump_buf + offset, dump, 0, last_written_line); } else if (last_written_line) { - /* Internal buffer wasn't wrapped: dump from buffer start until * write pointer. */ @@ -3392,7 +3376,6 @@ static u32 ecore_grc_dump_mem_hdr(struct ecore_hwfn *p offset += ecore_dump_section_hdr(dump_buf + offset, dump, "grc_mem", num_params); if (name) { - /* Dump name */ if (is_storm) { OSAL_STRCPY(buf, "?STORM_"); @@ -3406,7 +3389,6 @@ static u32 ecore_grc_dump_mem_hdr(struct ecore_hwfn *p offset += ecore_dump_str_param(dump_buf + offset, dump, "name", buf); } else { - /* Dump address */ u32 addr_in_bytes = DWORDS_TO_BYTES(addr); @@ -3712,7 +3694,6 @@ static u32 ecore_grc_dump_vfc_cam(struct ecore_hwfn *p SET_VAR_FIELD(cam_addr, VFC_CAM_ADDR, OP, VFC_OPCODE_CAM_RD); for (row = 0; row < VFC_CAM_NUM_ROWS; row++, offset += VFC_CAM_RESP_DWORDS) { - /* Write VFC CAM command */ SET_VAR_FIELD(cam_cmd, VFC_CAM_CMD, ROW, row); ARR_REG_WR(p_hwfn, p_ptt, storm->sem_fast_mem_addr + SEM_FAST_REG_VFC_DATA_WR, cam_cmd, VFC_CAM_CMD_DWORDS); @@ -3750,7 +3731,6 @@ static u32 ecore_grc_dump_vfc_ram(struct ecore_hwfn *p return offset + total_size; for (row = ram_defs->base_row; row < ram_defs->base_row + ram_defs->num_rows; row++, offset += VFC_RAM_RESP_DWORDS) { - /* Write VFC RAM command */ ARR_REG_WR(p_hwfn, p_ptt, storm->sem_fast_mem_addr + SEM_FAST_REG_VFC_DATA_WR, ram_cmd, VFC_RAM_CMD_DWORDS); @@ -4036,7 +4016,6 @@ static u32 ecore_grc_dump_static_debug(struct ecore_hw /* Enable block's client */ ecore_bus_enable_clients(p_hwfn, p_ptt, 1 << block->dbg_client_id[dev_data->chip_id]); for (line_id = 0; line_id < (u32)NUM_DBG_LINES(block_desc); line_id++) { - /* Configure debug line ID */ ecore_config_dbg_line(p_hwfn, p_ptt, (enum block_id)block_id, (u8)line_id, 0xf, 0, 0, 0); @@ -4076,7 +4055,6 @@ static enum dbg_status ecore_grc_dump(struct ecore_hwf *num_dumped_dwords = 0; if (dump) { - /* Find port mode */ switch (ecore_rd(p_hwfn, p_ptt, MISC_REG_PORT_MODE)) { case 0: port_mode = 1; break; @@ -4177,7 +4155,6 @@ static enum dbg_status ecore_grc_dump(struct ecore_hwf offset += ecore_dump_last_section(dump_buf, offset, dump); if (dump) { - /* Unstall storms */ if (ecore_grc_get_param(p_hwfn, DBG_GRC_PARAM_UNSTALL)) ecore_grc_stall_storms(p_hwfn, p_ptt, false); @@ -4745,7 +4722,6 @@ static enum dbg_status ecore_reg_fifo_dump(struct ecor ecore_dump_num_param(dump_buf + size_param_offset, dump, "size", dwords_read); } else { - /* FIFO max size is REG_FIFO_DEPTH_DWORDS. There is no way to * test how much data is available, except for reading it. */ @@ -4799,7 +4775,6 @@ static enum dbg_status ecore_igu_fifo_dump(struct ecor ecore_dump_num_param(dump_buf + size_param_offset, dump, "size", dwords_read); } else { - /* FIFO max size is IGU_FIFO_DEPTH_DWORDS. There is no way to * test how much data is available, except for reading it. */ @@ -5084,7 +5059,6 @@ enum dbg_status ecore_dbg_bus_set_nw_output(struct eco ecore_wr(p_hwfn, p_ptt, DBG_REG_OTHER_ENGINE_MODE_BB_K2, DBG_BUS_OTHER_ENGINE_MODE_CROSS_ENGINE_RX); } else { - /* Configure ethernet header of 14 bytes */ ecore_wr(p_hwfn, p_ptt, DBG_REG_ETHERNET_HDR_WIDTH, 0); ecore_wr(p_hwfn, p_ptt, DBG_REG_ETHERNET_HDR_7, dest_addr_lo32); @@ -5671,7 +5645,6 @@ static enum dbg_status ecore_config_storm_inputs(struc /* Configure calendar */ for (i = 0; i < NUM_CALENDAR_SLOTS; i++, next_storm_id = (next_storm_id + 1) % MAX_DBG_STORMS) { - /* Find next enabled Storm */ for (; !dev_data->bus.storms[next_storm_id].enabled; next_storm_id = (next_storm_id + 1) % MAX_DBG_STORMS); @@ -5718,7 +5691,6 @@ static void ecore_assign_hw_ids(struct ecore_hwfn *p_h } if (hw_id_per_dword) { - /* Assign a different HW ID for each dword */ for (val_id = 0; val_id < VALUES_PER_CYCLE; val_id++) hw_ids[val_id] = val_id; @@ -6047,7 +6019,6 @@ enum dbg_status ecore_dbg_grc_config(struct ecore_hwfn return DBG_STATUS_INVALID_ARGS; if (s_grc_param_defs[grc_param].is_preset) { - /* Preset param */ /* Disabling a preset is not allowed. Call @@ -6071,7 +6042,6 @@ enum dbg_status ecore_dbg_grc_config(struct ecore_hwfn } } else { - /* Regular param - set its value */ ecore_grc_set_param(p_hwfn, grc_param, val); } @@ -6506,4 +6476,3 @@ bool ecore_is_block_in_reset(struct ecore_hwfn *p_hwfn return s_reset_regs_defs[reset_reg].exists[dev_data->chip_id] ? !(ecore_rd(p_hwfn, p_ptt, s_reset_regs_defs[reset_reg].addr) & (1 << block->reset_bit_offset)) : true; } - Modified: head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.h ============================================================================== --- head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.h Tue Sep 1 21:57:15 2020 (r365168) +++ head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.h Tue Sep 1 21:57:33 2020 (r365169) @@ -893,5 +893,4 @@ bool ecore_is_block_in_reset(struct ecore_hwfn *p_hwfn struct ecore_ptt *p_ptt, enum block_id block); - #endif Modified: head/sys/dev/qlnx/qlnxe/ecore_dbg_values.h ============================================================================== --- head/sys/dev/qlnx/qlnxe/ecore_dbg_values.h Tue Sep 1 21:57:15 2020 (r365168) +++ head/sys/dev/qlnx/qlnxe/ecore_dbg_values.h Tue Sep 1 21:57:33 2020 (r365169) @@ -28,7 +28,6 @@ * */ - #ifndef __DBG_VALUES_H__ #define __DBG_VALUES_H__ Modified: head/sys/dev/qlnx/qlnxe/ecore_dev.c ============================================================================== --- head/sys/dev/qlnx/qlnxe/ecore_dev.c Tue Sep 1 21:57:15 2020 (r365168) +++ head/sys/dev/qlnx/qlnxe/ecore_dev.c Tue Sep 1 21:57:33 2020 (r365169) @@ -232,7 +232,6 @@ enum _ecore_status_t ecore_db_recovery_del(struct ecor &p_hwfn->db_recovery_info.list, list_entry, struct ecore_db_recovery_entry) { - /* search according to db_data addr since db_addr is not unique (roce) */ if (db_entry->db_data == db_data) { ecore_db_recovery_dp_entry(p_hwfn, db_entry, "Deleting"); @@ -1837,7 +1836,6 @@ static u32 ecore_get_pq_flags(struct ecore_hwfn *p_hwf return flags; } - /* Getters for resource amounts necessary for qm initialization */ u8 ecore_init_qm_get_num_tcs(struct ecore_hwfn *p_hwfn) Modified: head/sys/dev/qlnx/qlnxe/ecore_fcoe.h ============================================================================== --- head/sys/dev/qlnx/qlnxe/ecore_fcoe.h Tue Sep 1 21:57:15 2020 (r365168) +++ head/sys/dev/qlnx/qlnxe/ecore_fcoe.h Tue Sep 1 21:57:33 2020 (r365169) @@ -53,9 +53,7 @@ static inline enum _ecore_status_t ecore_fcoe_alloc(st { return ECORE_INVAL; } - static inline void ecore_fcoe_setup(struct ecore_hwfn OSAL_UNUSED *p_hwfn) {} - static inline void ecore_fcoe_free(struct ecore_hwfn OSAL_UNUSED *p_hwfn) {} #endif @@ -74,4 +72,3 @@ ecore_sp_fcoe_conn_destroy(struct ecore_hwfn *p_hwfn, #endif #endif /*__ECORE_FCOE_H__*/ - Modified: head/sys/dev/qlnx/qlnxe/ecore_hsi_common.h ============================================================================== --- head/sys/dev/qlnx/qlnxe/ecore_hsi_common.h Tue Sep 1 21:57:15 2020 (r365168) +++ head/sys/dev/qlnx/qlnxe/ecore_hsi_common.h Tue Sep 1 21:57:33 2020 (r365169) @@ -35,7 +35,6 @@ /********************************/ #include "common_hsi.h" - /* * opcodes for the event ring */ @@ -54,7 +53,6 @@ enum common_event_opcode MAX_COMMON_EVENT_OPCODE }; - /* * Common Ramrod Command IDs */ @@ -71,7 +69,6 @@ enum common_ramrod_cmd_id MAX_COMMON_RAMROD_CMD_ID }; - /* * How ll2 should deal with packet upon errors */ @@ -83,7 +80,6 @@ enum core_error_handle MAX_CORE_ERROR_HANDLE }; - /* * opcodes for the event ring */ @@ -98,7 +94,6 @@ enum core_event_opcode MAX_CORE_EVENT_OPCODE }; - /* * The L4 pseudo checksum mode for Core */ @@ -109,7 +104,6 @@ enum core_l4_pseudo_checksum_mode MAX_CORE_L4_PSEUDO_CHECKSUM_MODE }; - /* * Light-L2 RX Producers in Tstorm RAM */ @@ -121,7 +115,6 @@ struct core_ll2_port_stats struct regpair gsi_crcchksm_error; }; - /* * Ethernet TX Per Queue Stats */ @@ -135,7 +128,6 @@ struct core_ll2_pstorm_per_queue_stat struct regpair sent_bcast_pkts /* number of total packets sent without errors */; }; - /* * Light-L2 RX Producers in Tstorm RAM */ @@ -146,14 +138,12 @@ struct core_ll2_rx_prod __le32 reserved; }; - struct core_ll2_tstorm_per_queue_stat { struct regpair packet_too_big_discard /* Number of packets discarded because they are bigger than MTU */; struct regpair no_buff_discard /* Number of packets discarded due to lack of host buffers */; }; - struct core_ll2_ustorm_per_queue_stat { struct regpair rcv_ucast_bytes; @@ -164,7 +154,6 @@ struct core_ll2_ustorm_per_queue_stat struct regpair rcv_bcast_pkts; }; - /* * Core Ramrod Command IDs (light L2) */ @@ -180,7 +169,6 @@ enum core_ramrod_cmd_id MAX_CORE_RAMROD_CMD_ID }; - /* * Core RX CQE Type for Light L2 */ @@ -191,7 +179,6 @@ enum core_roce_flavor_type MAX_CORE_ROCE_FLAVOR_TYPE }; - /* * Specifies how ll2 should deal with packets errors: packet_too_big and no_buff */ @@ -206,7 +193,6 @@ struct core_rx_action_on_error #define CORE_RX_ACTION_ON_ERROR_RESERVED_SHIFT 4 }; - /* * Core RX BD for Light L2 */ @@ -216,7 +202,6 @@ struct core_rx_bd __le16 reserved[4]; }; - /* * Core RX CM offload BD for Light L2 */ @@ -236,8 +221,6 @@ union core_rx_bd_union struct core_rx_bd_with_buff_len rx_bd_with_len /* Core Rx Bd with dynamic buffer length */; }; - - /* * Opaque Data for Light L2 RX CQE . */ @@ -246,7 +229,6 @@ struct core_rx_cqe_opaque_data __le32 data[2] /* Opaque CQE Data */; }; - /* * Core RX CQE Type for Light L2 */ @@ -259,7 +241,6 @@ enum core_rx_cqe_type MAX_CORE_RX_CQE_TYPE }; - /* * Core RX CQE for Light L2 . */ @@ -315,10 +296,6 @@ union core_rx_cqe_union struct core_rx_slow_path_cqe rx_cqe_sp /* Slow path CQE */; }; - - - - /* * Ramrod data for rx queue start ramrod */ @@ -344,7 +321,6 @@ struct core_rx_start_ramrod_data u8 reserved[6]; }; - /* * Ramrod data for rx queue stop ramrod */ @@ -357,7 +333,6 @@ struct core_rx_stop_ramrod_data __le16 reserved2[2]; }; - /* * Flags for Core TX BD */ @@ -408,8 +383,6 @@ struct core_tx_bd #define CORE_TX_BD_TX_DST_SHIFT 14 }; - - /* * Light L2 TX Destination */ @@ -422,7 +395,6 @@ enum core_tx_dest MAX_CORE_TX_DEST }; - /* * Ramrod data for tx queue start ramrod */ @@ -441,7 +413,6 @@ struct core_tx_start_ramrod_data u8 resrved[3]; }; - /* * Ramrod data for tx queue stop ramrod */ @@ -450,7 +421,6 @@ struct core_tx_stop_ramrod_data __le32 reserved0[2]; }; - /* * Ramrod data for tx queue update ramrod */ @@ -462,7 +432,6 @@ struct core_tx_update_ramrod_data __le32 reserved1[1]; }; - /* * Enum flag for what type of DCB data to update */ @@ -475,7 +444,6 @@ enum dcb_dscp_update_mode MAX_DCB_DSCP_UPDATE_MODE }; - /* * The core storm context for the Ystorm */ @@ -978,7 +946,6 @@ struct e4_core_conn_context struct regpair ustorm_st_padding[2] /* padding */; }; - struct e5_xstorm_core_conn_ag_ctx { u8 reserved0 /* cdu_validation */; @@ -1479,7 +1446,6 @@ struct e5_core_conn_context struct regpair ustorm_st_padding[2] /* padding */; }; - struct eth_mstorm_per_pf_stat { struct regpair gre_discard_pkts /* Dropped GRE RX packets */; @@ -1488,7 +1454,6 @@ struct eth_mstorm_per_pf_stat struct regpair lb_discard_pkts /* Dropped Tx switched packets */; }; - struct eth_mstorm_per_queue_stat { struct regpair ttl0_discard /* Number of packets discarded because TTL=0 (in IPv4) or hopLimit=0 (in IPv6) */; @@ -1501,7 +1466,6 @@ struct eth_mstorm_per_queue_stat struct regpair tpa_coalesced_bytes /* total TCP payload length in all TPA aggregations */; }; - /* * Ethernet TX Per PF */ @@ -1524,7 +1488,6 @@ struct eth_pstorm_per_pf_stat *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 21:57:51 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 752F537D1BC; Tue, 1 Sep 2020 21:57:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1CM2bsVz4YTs; Tue, 1 Sep 2020 21:57:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DD9C20507; Tue, 1 Sep 2020 21:57:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LvpYp047985; Tue, 1 Sep 2020 21:57:51 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LvoSZ047984; Tue, 1 Sep 2020 21:57:50 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012157.081LvoSZ047984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:57:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365170 - head/sys/dev/pwm X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/pwm X-SVN-Commit-Revision: 365170 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:57:51 -0000 Author: mjg Date: Tue Sep 1 21:57:50 2020 New Revision: 365170 URL: https://svnweb.freebsd.org/changeset/base/365170 Log: pwm: clean up empty lines in .c and .h files Modified: head/sys/dev/pwm/pwmc.c head/sys/dev/pwm/pwmc.h Modified: head/sys/dev/pwm/pwmc.c ============================================================================== --- head/sys/dev/pwm/pwmc.c Tue Sep 1 21:57:33 2020 (r365169) +++ head/sys/dev/pwm/pwmc.c Tue Sep 1 21:57:50 2020 (r365170) @@ -182,7 +182,7 @@ static int pwmc_detach(device_t dev) { struct pwmc_softc *sc; - + sc = device_get_softc(dev); destroy_dev(sc->cdev); Modified: head/sys/dev/pwm/pwmc.h ============================================================================== --- head/sys/dev/pwm/pwmc.h Tue Sep 1 21:57:33 2020 (r365169) +++ head/sys/dev/pwm/pwmc.h Tue Sep 1 21:57:50 2020 (r365170) @@ -46,5 +46,4 @@ struct pwm_state { #define PWMGETSTATE _IOWR('G', 0, struct pwm_state) #define PWMSETSTATE _IOWR('G', 1, struct pwm_state) - #endif /* _PWM_H_ */ From owner-svn-src-all@freebsd.org Tue Sep 1 21:58:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3DC9537D2B5; Tue, 1 Sep 2020 21:58:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Cd0y6Gz4YZq; Tue, 1 Sep 2020 21:58:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 055A4204FD; Tue, 1 Sep 2020 21:58:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Lw4qH048046; Tue, 1 Sep 2020 21:58:04 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lw4HI048044; Tue, 1 Sep 2020 21:58:04 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012158.081Lw4HI048044@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:58:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365171 - head/sys/dev/puc X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/puc X-SVN-Commit-Revision: 365171 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:58:05 -0000 Author: mjg Date: Tue Sep 1 21:58:04 2020 New Revision: 365171 URL: https://svnweb.freebsd.org/changeset/base/365171 Log: puc: clean up empty lines in .c and .h files Modified: head/sys/dev/puc/puc_pci.c head/sys/dev/puc/pucdata.c Modified: head/sys/dev/puc/puc_pci.c ============================================================================== --- head/sys/dev/puc/puc_pci.c Tue Sep 1 21:57:50 2020 (r365170) +++ head/sys/dev/puc/puc_pci.c Tue Sep 1 21:58:04 2020 (r365171) @@ -160,7 +160,7 @@ puc_pci_detach(device_t dev) int error; sc = device_get_softc(dev); - + error = puc_bfe_detach(dev); if (error != 0) @@ -171,7 +171,6 @@ puc_pci_detach(device_t dev) return (error); } - static device_method_t puc_pci_methods[] = { /* Device interface */ Modified: head/sys/dev/puc/pucdata.c ============================================================================== --- head/sys/dev/puc/pucdata.c Tue Sep 1 21:57:50 2020 (r365170) +++ head/sys/dev/puc/pucdata.c Tue Sep 1 21:58:04 2020 (r365171) @@ -905,7 +905,6 @@ const struct puc_cfg puc_pci_devices[] = { PUC_PORT_8S, 0x10, 0, 8, }, - /* * Oxford Semiconductor PCI Express Expresso family * @@ -1279,7 +1278,6 @@ const struct puc_cfg puc_pci_devices[] = { PUC_PORT_4S, 0x10, 0, 8, .config_function = puc_config_icbook }, - { 0xffff, 0, 0xffff, 0, NULL, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:58:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B806B37D480; Tue, 1 Sep 2020 21:58:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Cp6T8xz4Yv4; Tue, 1 Sep 2020 21:58:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 16ADC2031E; Tue, 1 Sep 2020 21:58:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LwCYA048100; Tue, 1 Sep 2020 21:58:12 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LwCIu048099; Tue, 1 Sep 2020 21:58:12 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012158.081LwCIu048099@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:58:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365172 - head/sys/dev/pst X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/pst X-SVN-Commit-Revision: 365172 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:58:16 -0000 Author: mjg Date: Tue Sep 1 21:58:12 2020 New Revision: 365172 URL: https://svnweb.freebsd.org/changeset/base/365172 Log: pst: clean up empty lines in .c and .h files Modified: head/sys/dev/pst/pst-pci.c head/sys/dev/pst/pst-raid.c Modified: head/sys/dev/pst/pst-pci.c ============================================================================== --- head/sys/dev/pst/pst-pci.c Tue Sep 1 21:58:04 2020 (r365171) +++ head/sys/dev/pst/pst-pci.c Tue Sep 1 21:58:12 2020 (r365172) @@ -116,7 +116,6 @@ iop_pci_detach(device_t dev) return (0); } - static device_method_t pst_pci_methods[] = { DEVMETHOD(device_probe, iop_pci_probe), DEVMETHOD(device_attach, iop_pci_attach), Modified: head/sys/dev/pst/pst-raid.c ============================================================================== --- head/sys/dev/pst/pst-raid.c Tue Sep 1 21:58:04 2020 (r365171) +++ head/sys/dev/pst/pst-raid.c Tue Sep 1 21:58:12 2020 (r365172) @@ -365,7 +365,7 @@ static device_method_t pst_methods[] = { DEVMETHOD(device_attach, pst_attach), { 0, 0 } }; - + static driver_t pst_driver = { "pst", pst_methods, From owner-svn-src-all@freebsd.org Tue Sep 1 21:58:29 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ADCC237D39E; Tue, 1 Sep 2020 21:58:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1D54CwDz4Z19; Tue, 1 Sep 2020 21:58:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7598B20508; Tue, 1 Sep 2020 21:58:29 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LwTMj048158; Tue, 1 Sep 2020 21:58:29 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LwTht048157; Tue, 1 Sep 2020 21:58:29 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012158.081LwTht048157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:58:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365173 - head/sys/dev/psci X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/psci X-SVN-Commit-Revision: 365173 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:58:29 -0000 Author: mjg Date: Tue Sep 1 21:58:29 2020 New Revision: 365173 URL: https://svnweb.freebsd.org/changeset/base/365173 Log: psci: clean up empty lines in .c and .h files Modified: head/sys/dev/psci/psci.c Modified: head/sys/dev/psci/psci.c ============================================================================== --- head/sys/dev/psci/psci.c Tue Sep 1 21:58:12 2020 (r365172) +++ head/sys/dev/psci/psci.c Tue Sep 1 21:58:29 2020 (r365173) @@ -498,7 +498,6 @@ psci_v0_1_init(device_t dev, int default_version __unu phandle_t node; int len; - /* Zero out the function ID table - Is this needed ? */ for (psci_fn = PSCI_FN_VERSION, psci_fnid = PSCI_FNID_VERSION; psci_fn < PSCI_FN_MAX; psci_fn++, psci_fnid++) From owner-svn-src-all@freebsd.org Tue Sep 1 21:58:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 83ABF37D50D; Tue, 1 Sep 2020 21:58:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1DK2MBDz4Z4D; Tue, 1 Sep 2020 21:58:41 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 01554200F7; Tue, 1 Sep 2020 21:58:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LweuU048211; Tue, 1 Sep 2020 21:58:40 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lwejm048210; Tue, 1 Sep 2020 21:58:40 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012158.081Lwejm048210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:58:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365174 - head/sys/dev/proto X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/proto X-SVN-Commit-Revision: 365174 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:58:42 -0000 Author: mjg Date: Tue Sep 1 21:58:40 2020 New Revision: 365174 URL: https://svnweb.freebsd.org/changeset/base/365174 Log: proto: clean up empty lines in .c and .h files Modified: head/sys/dev/proto/proto_busdma.c Modified: head/sys/dev/proto/proto_busdma.c ============================================================================== --- head/sys/dev/proto/proto_busdma.c Tue Sep 1 21:58:29 2020 (r365173) +++ head/sys/dev/proto/proto_busdma.c Tue Sep 1 21:58:40 2020 (r365174) @@ -270,7 +270,7 @@ proto_busdma_md_load_callback(void *arg, bus_dma_segme bus_size_t sz, int error) { struct proto_callback_bundle *pcb = arg; - + pcb->ioc->u.md.bus_nsegs = nseg; pcb->ioc->u.md.bus_addr = segs[0].ds_addr; } From owner-svn-src-all@freebsd.org Tue Sep 1 21:58:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7986337D3BC; Tue, 1 Sep 2020 21:58:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Df2gPzz4ZKw; Tue, 1 Sep 2020 21:58:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FF1D200F8; Tue, 1 Sep 2020 21:58:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LwwBC048271; Tue, 1 Sep 2020 21:58:58 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lwvs5048266; Tue, 1 Sep 2020 21:58:57 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012158.081Lwvs5048266@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:58:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365175 - head/sys/dev/ppc X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ppc X-SVN-Commit-Revision: 365175 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:58:58 -0000 Author: mjg Date: Tue Sep 1 21:58:56 2020 New Revision: 365175 URL: https://svnweb.freebsd.org/changeset/base/365175 Log: ppc: clean up empty lines in .c and .h files Modified: head/sys/dev/ppc/ppc.c head/sys/dev/ppc/ppc_acpi.c head/sys/dev/ppc/ppc_isa.c head/sys/dev/ppc/ppc_pci.c head/sys/dev/ppc/ppc_puc.c Modified: head/sys/dev/ppc/ppc.c ============================================================================== --- head/sys/dev/ppc/ppc.c Tue Sep 1 21:58:40 2020 (r365174) +++ head/sys/dev/ppc/ppc.c Tue Sep 1 21:58:56 2020 (r365175) @@ -426,7 +426,6 @@ ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_m int ptr, pcr, val, i; while ((idport = pc873xx_basetab[index++])) { - /* XXX should check first to see if this location is already claimed */ /* @@ -488,7 +487,6 @@ ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_m val = inb(idport + 1); /* XXX we should create a driver instance for every port found */ if (pc873xx_porttab[val & 0x3] != ppc->ppc_base) { - /* First try to change the port address to that requested... */ switch (ppc->ppc_base) { @@ -710,7 +708,6 @@ ppc_smc37c66xgt_detect(struct ppc_data *ppc, int chips int port_address[] = { -1 /* disabled */ , 0x3bc, 0x378, 0x278 }; - #define cio csr+1 /* config IO port is either 0x3F1 or 0x371 */ /* @@ -1256,7 +1253,6 @@ ppc_generic_detect(struct ppc_data *ppc, int chipset_m */ static int ppc_detect(struct ppc_data *ppc, int chipset_mode) { - #ifdef PPC_PROBE_CHIPSET int i, mode; @@ -1570,7 +1566,6 @@ ppcintr(void *arg) /* check if ppc driver has programmed the * nFault interrupt */ if (ppc->ppc_irqstat & PPC_IRQ_nFAULT) { - w_ecr(ppc, ecr | PPC_nFAULT_INTR); ppc->ppc_irqstat &= ~PPC_IRQ_nFAULT; } else { @@ -1607,7 +1602,6 @@ ppcintr(void *arg) } } } else if (ppc->ppc_irqstat & PPC_IRQ_FIFO) { - /* classic interrupt I/O */ ppc->ppc_irqstat &= ~PPC_IRQ_FIFO; } Modified: head/sys/dev/ppc/ppc_acpi.c ============================================================================== --- head/sys/dev/ppc/ppc_acpi.c Tue Sep 1 21:58:40 2020 (r365174) +++ head/sys/dev/ppc/ppc_acpi.c Tue Sep 1 21:58:56 2020 (r365175) @@ -81,7 +81,6 @@ static device_method_t ppc_acpi_methods[] = { #else DEVMETHOD(ppbus_write, ppc_write), #endif - { 0, 0 } }; Modified: head/sys/dev/ppc/ppc_isa.c ============================================================================== --- head/sys/dev/ppc/ppc_isa.c Tue Sep 1 21:58:40 2020 (r365174) +++ head/sys/dev/ppc/ppc_isa.c Tue Sep 1 21:58:56 2020 (r365175) @@ -76,7 +76,6 @@ static device_method_t ppc_isa_methods[] = { DEVMETHOD(ppbus_ecp_sync, ppc_ecp_sync), DEVMETHOD(ppbus_read, ppc_read), DEVMETHOD(ppbus_write, ppc_isa_write), - { 0, 0 } }; @@ -234,7 +233,6 @@ ppc_isa_write(device_t dev, char *buf, int len, int ho /* wait for an empty fifo */ while (!(r_ecr(ppc) & PPC_FIFO_EMPTY)) { - for (spin=100; spin; spin--) if (r_ecr(ppc) & PPC_FIFO_EMPTY) goto fifo_empty; Modified: head/sys/dev/ppc/ppc_pci.c ============================================================================== --- head/sys/dev/ppc/ppc_pci.c Tue Sep 1 21:58:40 2020 (r365174) +++ head/sys/dev/ppc/ppc_pci.c Tue Sep 1 21:58:56 2020 (r365175) @@ -67,7 +67,6 @@ static device_method_t ppc_pci_methods[] = { DEVMETHOD(ppbus_ecp_sync, ppc_ecp_sync), DEVMETHOD(ppbus_read, ppc_read), DEVMETHOD(ppbus_write, ppc_write), - { 0, 0 } }; Modified: head/sys/dev/ppc/ppc_puc.c ============================================================================== --- head/sys/dev/ppc/ppc_puc.c Tue Sep 1 21:58:40 2020 (r365174) +++ head/sys/dev/ppc/ppc_puc.c Tue Sep 1 21:58:56 2020 (r365175) @@ -69,7 +69,6 @@ static device_method_t ppc_puc_methods[] = { DEVMETHOD(ppbus_ecp_sync, ppc_ecp_sync), DEVMETHOD(ppbus_read, ppc_read), DEVMETHOD(ppbus_write, ppc_write), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:59:13 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C423737D5BA; Tue, 1 Sep 2020 21:59:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Dx4bFFz4ZRm; Tue, 1 Sep 2020 21:59:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 818D1204FF; Tue, 1 Sep 2020 21:59:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LxDKw048343; Tue, 1 Sep 2020 21:59:13 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LxBLg048330; Tue, 1 Sep 2020 21:59:11 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012159.081LxBLg048330@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:59:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365176 - head/sys/dev/ppbus X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ppbus X-SVN-Commit-Revision: 365176 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:59:13 -0000 Author: mjg Date: Tue Sep 1 21:59:11 2020 New Revision: 365176 URL: https://svnweb.freebsd.org/changeset/base/365176 Log: ppbus: clean up empty lines in .c and .h files Modified: head/sys/dev/ppbus/if_plip.c head/sys/dev/ppbus/lpbb.c head/sys/dev/ppbus/lpt.c head/sys/dev/ppbus/pcfclock.c head/sys/dev/ppbus/ppb_1284.c head/sys/dev/ppbus/ppb_msq.c head/sys/dev/ppbus/ppb_msq.h head/sys/dev/ppbus/ppbconf.c head/sys/dev/ppbus/ppbconf.h head/sys/dev/ppbus/ppi.c head/sys/dev/ppbus/pps.c Modified: head/sys/dev/ppbus/if_plip.c ============================================================================== --- head/sys/dev/ppbus/if_plip.c Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/if_plip.c Tue Sep 1 21:59:11 2020 (r365176) @@ -539,7 +539,6 @@ lp_intr(void *arg) ppb_assert_locked(ppbus); if (sc->sc_ifp->if_flags & IFF_LINK0) { - /* Ack. the request */ ppb_wdtr(ppbus, 0x01); @@ -599,7 +598,6 @@ lp_intr(void *arg) len = sc->sc_ifp->if_mtu + LPIPHDRLEN; bp = sc->sc_ifbuf; while (len--) { - cl = ppb_rstr(ppbus); ppb_wdtr(ppbus, 8); @@ -842,7 +840,6 @@ static device_method_t lp_methods[] = { DEVMETHOD(device_probe, lp_probe), DEVMETHOD(device_attach, lp_attach), DEVMETHOD(device_detach, lp_detach), - { 0, 0 } }; Modified: head/sys/dev/ppbus/lpbb.c ============================================================================== --- head/sys/dev/ppbus/lpbb.c Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/lpbb.c Tue Sep 1 21:59:11 2020 (r365176) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include "ppbus_if.h" #include Modified: head/sys/dev/ppbus/lpt.c ============================================================================== --- head/sys/dev/ppbus/lpt.c Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/lpt.c Tue Sep 1 21:59:11 2020 (r365176) @@ -151,7 +151,6 @@ static void lptintr(void *arg); static devclass_t lpt_devclass; - /* bits for state */ #define OPEN (1<<0) /* device is open */ #define ASLP (1<<1) /* awaiting draining of printer */ @@ -176,7 +175,6 @@ static devclass_t lpt_devclass; #define MAX_SLEEP (hz*5) /* Timeout while waiting for device ready */ #define MAX_SPIN 20 /* Max delay for device ready in usecs */ - static d_open_t lptopen; static d_close_t lptclose; static d_write_t lptwrite; @@ -708,7 +706,6 @@ lpt_pushbytes(struct lpt_data *sc) /* strobe */ ppb_wctr(ppbus, sc->sc_control|LPC_STB); ppb_wctr(ppbus, sc->sc_control); - } return(0); } @@ -990,7 +987,6 @@ static device_method_t lpt_methods[] = { DEVMETHOD(device_probe, lpt_probe), DEVMETHOD(device_attach, lpt_attach), DEVMETHOD(device_detach, lpt_detach), - { 0, 0 } }; Modified: head/sys/dev/ppbus/pcfclock.c ============================================================================== --- head/sys/dev/ppbus/pcfclock.c Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/pcfclock.c Tue Sep 1 21:59:11 2020 (r365176) @@ -325,7 +325,6 @@ static device_method_t pcfclock_methods[] = { DEVMETHOD(device_identify, pcfclock_identify), DEVMETHOD(device_probe, pcfclock_probe), DEVMETHOD(device_attach, pcfclock_attach), - { 0, 0 } }; Modified: head/sys/dev/ppbus/ppb_1284.c ============================================================================== --- head/sys/dev/ppbus/ppb_1284.c Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/ppb_1284.c Tue Sep 1 21:59:11 2020 (r365176) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #include @@ -224,7 +223,6 @@ ppb_peripheral_negociate(device_t bus, int mode, int o /* nibble mode is not supported */ if ((r == (char)request_mode) || (r == NIBBLE_1284_NORMAL)) { - /* Event 5 - restore direction bit, no data avail */ ppb_wctr(bus, (STROBE | nINIT) & ~(SELECTIN)); DELAY(1); @@ -489,7 +487,6 @@ nibble_1284_inbyte(device_t bus, char *buffer) int i, error; for (i = 0; i < 2; i++) { - /* Event 7 - ready to take data (nAUTO low) */ ppb_wctr(bus, (nINIT | AUTOFEED) & ~(STROBE | SELECTIN)); @@ -555,7 +552,6 @@ spp_1284_read(device_t bus, int mode, char *buffer, in } while ((len < max) && !(ppb_rstr(bus) & (nFAULT))) { - ppb_1284_set_state(bus, PPB_REVERSE_TRANSFER); #ifdef DEBUG_1284 @@ -744,11 +740,9 @@ ppb_1284_negociate(device_t bus, int mode, int options /* Event 7 - quering result consider nACK not to misunderstand * a remote computer terminate sequence */ if (options & PPB_EXTENSIBILITY_LINK) { - /* XXX not fully supported yet */ ppb_1284_terminate(bus); return (0); - } if (request_mode == NIBBLE_1284_NORMAL) { if (do_1284_wait(bus, nACK | SELECT, nACK)) { Modified: head/sys/dev/ppbus/ppb_msq.c ============================================================================== --- head/sys/dev/ppbus/ppb_msq.c Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/ppb_msq.c Tue Sep 1 21:59:11 2020 (r365176) @@ -343,4 +343,3 @@ ppb_MS_microseq(device_t bus, device_t dev, struct ppb error: return (error); } - Modified: head/sys/dev/ppbus/ppb_msq.h ============================================================================== --- head/sys/dev/ppbus/ppb_msq.h Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/ppb_msq.h Tue Sep 1 21:59:11 2020 (r365176) @@ -111,7 +111,6 @@ #define MS_RSET(reg,assert,clear) { MS_OP_RSET, {{ (reg) }, { (assert) }, { (clear) }}} #define MS_RASSERT(reg,byte) { MS_OP_RASSERT, { { (reg) }, { (byte) }}} #define MS_RCLR(reg,clear) { MS_OP_RSET, {{ (reg) }, { MS_ASSERT_NONE }, { (clear) }}} - #define MS_RFETCH(reg,mask,ptr) { MS_OP_RFETCH, {{ (reg) }, { (mask) }, { (ptr) }}} /* trigger the port with array[char, delay,...] */ @@ -127,7 +126,6 @@ #define MS_DASS(byte) MS_RASSERT(MS_REG_DTR,byte) #define MS_SASS(byte) MS_RASSERT(MS_REG_STR,byte) #define MS_CASS(byte) MS_RASSERT(MS_REG_CTR,byte) - #define MS_SET(accum) { MS_OP_SET, {{ (accum) }}} #define MS_BRSET(mask,offset) { MS_OP_BRSET, {{ (mask) }, { (offset) }}} #define MS_DBRA(offset) { MS_OP_DBRA, {{ (offset) }}} Modified: head/sys/dev/ppbus/ppbconf.c ============================================================================== --- head/sys/dev/ppbus/ppbconf.c Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/ppbconf.c Tue Sep 1 21:59:11 2020 (r365176) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); static MALLOC_DEFINE(M_PPBUSDEV, "ppbusdev", "Parallel Port bus device"); - static int ppbus_intr(void *arg); /* @@ -593,7 +592,6 @@ static device_method_t ppbus_methods[] = { DEVMETHOD(bus_teardown_intr, ppbus_teardown_intr), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), - { 0, 0 } }; Modified: head/sys/dev/ppbus/ppbconf.h ============================================================================== --- head/sys/dev/ppbus/ppbconf.h Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/ppbconf.h Tue Sep 1 21:59:11 2020 (r365176) @@ -185,7 +185,6 @@ struct ppb_context { /* other fields are reserved to the ppbus internals */ struct ppb_device { - const char *name; /* name of the device */ u_int flags; /* flags */ @@ -224,7 +223,6 @@ struct ppb_device { * Parallel Port Bus structure. */ struct ppb_data { - #define PPB_PnP_PRINTER 0 #define PPB_PnP_MODEM 1 #define PPB_PnP_NET 2 Modified: head/sys/dev/ppbus/ppi.c ============================================================================== --- head/sys/dev/ppbus/ppi.c Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/ppi.c Tue Sep 1 21:59:11 2020 (r365176) @@ -241,7 +241,6 @@ ppiintr(void *arg) ppi_disable_intr(ppidev); switch (ppb_1284_get_state(ppbus)) { - /* accept IEEE1284 negotiation then wakeup a waiting process to * continue negotiation at process level */ case PPB_FORWARD_IDLE: @@ -380,7 +379,6 @@ ppiread(struct cdev *dev, struct uio *uio, int ioflag) */ if ((ppb_1284_negociate(ppbus, ppi->ppi_mode = PPB_NIBBLE, 0))) { - /* XXX Wait 2 seconds to let the remote host some * time to terminate its interrupt */ @@ -557,7 +555,6 @@ ppiioctl(struct cdev *dev, u_long cmd, caddr_t data, i ppb_lock(ppbus); switch (cmd) { - case PPIGDATA: /* get data register */ *val = ppb_rdtr(ppbus); break; @@ -615,7 +612,6 @@ static device_method_t ppi_methods[] = { DEVMETHOD(device_probe, ppi_probe), DEVMETHOD(device_attach, ppi_attach), DEVMETHOD(device_detach, ppi_detach), - { 0, 0 } }; Modified: head/sys/dev/ppbus/pps.c ============================================================================== --- head/sys/dev/ppbus/pps.c Tue Sep 1 21:58:56 2020 (r365175) +++ head/sys/dev/ppbus/pps.c Tue Sep 1 21:59:11 2020 (r365176) @@ -333,7 +333,6 @@ static device_method_t pps_methods[] = { DEVMETHOD(device_identify, ppsidentify), DEVMETHOD(device_probe, ppsprobe), DEVMETHOD(device_attach, ppsattach), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 21:59:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CC22537D3DC; Tue, 1 Sep 2020 21:59:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1FH53DHz4ZVN; Tue, 1 Sep 2020 21:59:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 91B4A20580; Tue, 1 Sep 2020 21:59:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LxVgA048401; Tue, 1 Sep 2020 21:59:31 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LxV85048400; Tue, 1 Sep 2020 21:59:31 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012159.081LxV85048400@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:59:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365177 - head/sys/dev/powermac_nvram X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/powermac_nvram X-SVN-Commit-Revision: 365177 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:59:31 -0000 Author: mjg Date: Tue Sep 1 21:59:31 2020 New Revision: 365177 URL: https://svnweb.freebsd.org/changeset/base/365177 Log: powermac_nvram: clean up empty lines in .c and .h files Modified: head/sys/dev/powermac_nvram/powermac_nvram.c Modified: head/sys/dev/powermac_nvram/powermac_nvram.c ============================================================================== --- head/sys/dev/powermac_nvram/powermac_nvram.c Tue Sep 1 21:59:11 2020 (r365176) +++ head/sys/dev/powermac_nvram/powermac_nvram.c Tue Sep 1 21:59:31 2020 (r365177) @@ -76,7 +76,6 @@ static device_method_t powermac_nvram_methods[] = { DEVMETHOD(device_probe, powermac_nvram_probe), DEVMETHOD(device_attach, powermac_nvram_attach), DEVMETHOD(device_detach, powermac_nvram_detach), - { 0, 0 } }; @@ -200,7 +199,7 @@ powermac_nvram_detach(device_t dev) destroy_dev(sc->sc_cdev); sx_destroy(&sc->sc_lock); - + return 0; } From owner-svn-src-all@freebsd.org Tue Sep 1 22:00:11 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 472AA37D3FD; Tue, 1 Sep 2020 22:00:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1G30sDZz4Zmq; Tue, 1 Sep 2020 22:00:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 01C7D200FB; Tue, 1 Sep 2020 22:00:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M0AC6048577; Tue, 1 Sep 2020 22:00:10 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M075A048563; Tue, 1 Sep 2020 22:00:07 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012200.081M075A048563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:00:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365178 - head/sys/dev/pci X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/pci X-SVN-Commit-Revision: 365178 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:00:11 -0000 Author: mjg Date: Tue Sep 1 22:00:07 2020 New Revision: 365178 URL: https://svnweb.freebsd.org/changeset/base/365178 Log: pci: clean up empty lines in .c and .h files Modified: head/sys/dev/pci/hostb_pci.c head/sys/dev/pci/isa_pci.c head/sys/dev/pci/pci.c head/sys/dev/pci/pci_dw.c head/sys/dev/pci/pci_dw.h head/sys/dev/pci/pci_dw_mv.c head/sys/dev/pci/pci_host_generic.c head/sys/dev/pci/pci_host_generic_fdt.c head/sys/dev/pci/pci_iov.c head/sys/dev/pci/pci_iov_private.h head/sys/dev/pci/pci_pci.c head/sys/dev/pci/pci_user.c head/sys/dev/pci/pcib_support.c head/sys/dev/pci/vga_pci.c Modified: head/sys/dev/pci/hostb_pci.c ============================================================================== --- head/sys/dev/pci/hostb_pci.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/hostb_pci.c Tue Sep 1 22:00:07 2020 (r365178) @@ -51,7 +51,6 @@ pci_hostb_probe(device_t dev) id = pci_get_devid(dev); switch (id) { - /* VIA VT82C596 Power Management Function */ case 0x30501106: return (ENXIO); @@ -280,7 +279,6 @@ static device_method_t pci_hostb_methods[] = { DEVMETHOD(pci_find_next_extcap, pci_hostb_find_next_extcap), DEVMETHOD(pci_find_htcap, pci_hostb_find_htcap), DEVMETHOD(pci_find_next_htcap, pci_hostb_find_next_htcap), - { 0, 0 } }; Modified: head/sys/dev/pci/isa_pci.c ============================================================================== --- head/sys/dev/pci/isa_pci.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/isa_pci.c Tue Sep 1 22:00:07 2020 (r365178) @@ -145,7 +145,7 @@ isab_pci_probe(device_t dev) pci_get_subclass(dev)); matched = 1; break; - + default: break; } Modified: head/sys/dev/pci/pci.c ============================================================================== --- head/sys/dev/pci/pci.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci.c Tue Sep 1 22:00:07 2020 (r365178) @@ -317,7 +317,6 @@ static const struct pci_quirk pci_quirks[] = { * expected place. */ { 0x98741002, PCI_QUIRK_REALLOC_BAR, 0, 0 }, - { 0 } }; @@ -768,7 +767,6 @@ pci_ea_fill_info(device_t pcib, pcicfgregs *cfg) ptr += 4; for (a = 0; a < num_ent; a++) { - eae = malloc(sizeof(*eae), M_DEVBUF, M_WAITOK | M_ZERO); eae->eae_cfg_offset = cfg->ea.ea_location + ptr; @@ -2363,7 +2361,6 @@ pci_remap_intr_method(device_t bus, device_t dev, u_in * data registers and apply the results. */ if (cfg->msi.msi_alloc > 0) { - /* If we don't have any active handlers, nothing to do. */ if (cfg->msi.msi_handlers == 0) return (0); @@ -2593,7 +2590,6 @@ pci_alloc_msi_method(device_t dev, device_t child, int device_printf(child, "using IRQs %d", irqs[0]); run = 0; for (i = 1; i < actual; i++) { - /* Still in a run? */ if (irqs[i] == irqs[i - 1] + 1) { run = 1; @@ -3862,7 +3858,6 @@ pci_add_resources_ea(device_t bus, device_t dev, int a return; STAILQ_FOREACH(ea, &dinfo->cfg.ea.ea_entries, eae_link) { - /* * TODO: Ignore EA-BAR if is not enabled. * Currently the EA implementation supports @@ -5261,7 +5256,6 @@ DB_SHOW_COMMAND(pciregs, db_pci_dump) dinfo = STAILQ_FIRST(devlist_head); (dinfo != NULL) && (error == 0) && (i < pci_numdevs) && !db_pager_quit; dinfo = STAILQ_NEXT(dinfo, pci_links), i++) { - /* Populate pd_name and pd_unit */ name = NULL; if (dinfo->cfg.dev) Modified: head/sys/dev/pci/pci_dw.c ============================================================================== --- head/sys/dev/pci/pci_dw.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci_dw.c Tue Sep 1 22:00:07 2020 (r365178) @@ -31,7 +31,6 @@ #include __FBSDID("$FreeBSD$"); - #include #include #include @@ -82,13 +81,10 @@ __FBSDID("$FreeBSD$"); #define PCI_FUNC_MASK 0x07 #define PCI_REG_MASK 0xFFF - #define IATU_CFG_BUS(bus) ((uint64_t)((bus) & 0xff) << 24) #define IATU_CFG_SLOT(slot) ((uint64_t)((slot) & 0x1f) << 19) #define IATU_CFG_FUNC(func) ((uint64_t)((func) & 0x07) << 16) - - static uint32_t pci_dw_dbi_read(device_t dev, u_int reg, int width) { @@ -134,7 +130,6 @@ pci_dw_dbi_write(device_t dev, u_int reg, uint32_t val } } - static void pci_dw_dbi_protect(struct pci_dw_softc *sc, bool protect) { @@ -243,7 +238,6 @@ pci_dw_setup_hw(struct pci_dw_softc *sc) } /* XXX Should we handle also prefetch memory? */ - /* Adjust number of lanes */ reg = DBI_RD4(sc, DW_PORT_LINK_CTRL); reg &= ~PORT_LINK_CAPABLE(~0); @@ -274,7 +268,6 @@ pci_dw_setup_hw(struct pci_dw_softc *sc) } DBI_WR4(sc, DW_PORT_LINK_CTRL, reg); - /* And link width */ reg = DBI_RD4(sc, DW_GEN2_CTRL); reg &= ~GEN2_CTRL_NUM_OF_LANES(~0); @@ -304,7 +297,6 @@ pci_dw_setup_hw(struct pci_dw_softc *sc) reg |= DIRECT_SPEED_CHANGE; DBI_WR4(sc, DW_GEN2_CTRL, reg); - return (0); } @@ -353,8 +345,6 @@ pci_dw_decode_ranges(struct pci_dw_softc *sc, struct o return (0); } - - /*----------------------------------------------------------------------------- * * P C I B I N T E R F A C E @@ -438,7 +428,6 @@ pci_dw_write_config(device_t dev, u_int bus, u_int slo res = sc->cfg_res; } - switch (bytes) { case 1: bus_write_1(res, reg, val); @@ -658,7 +647,6 @@ out: } static device_method_t pci_dw_methods[] = { - /* Bus interface */ DEVMETHOD(bus_get_dma_tag, pci_dw_get_dma_tag), Modified: head/sys/dev/pci/pci_dw.h ============================================================================== --- head/sys/dev/pci/pci_dw.h Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci_dw.h Tue Sep 1 22:00:07 2020 (r365178) @@ -34,7 +34,6 @@ #include "pci_dw_if.h" - /* DesignWare CIe configuration registers */ #define DW_PORT_LINK_CTRL 0x710 #define PORT_LINK_CAPABLE(n) (((n) & 0x3F) << 16) @@ -45,7 +44,6 @@ #define PORT_LINK_CAPABLE_16 0x1F #define PORT_LINK_CAPABLE_32 0x3F - #define DW_GEN2_CTRL 0x80C #define DIRECT_SPEED_CHANGE (1 << 17) #define GEN2_CTRL_NUM_OF_LANES(n) (((n) & 0x3F) << 8) @@ -62,7 +60,6 @@ #define DW_MSI_INTR0_MASK 0x82C #define DW_MSI_INTR0_STATUS 0x830 - #define DW_MISC_CONTROL_1 0x8BC #define DBI_RO_WR_EN (1 << 0) @@ -83,7 +80,6 @@ #define DW_IATU_LWR_TARGET_ADDR 0x918 #define DW_IATU_UPPER_TARGET_ADDR 0x91C - struct pci_dw_softc { struct ofw_pci_softc ofw_pci; /* Must be first */ @@ -115,7 +111,6 @@ struct pci_dw_softc { }; DECLARE_CLASS(pci_dw_driver); - static inline void pci_dw_dbi_wr4(device_t dev, u_int reg, uint32_t val) Modified: head/sys/dev/pci/pci_dw_mv.c ============================================================================== --- head/sys/dev/pci/pci_dw_mv.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci_dw_mv.c Tue Sep 1 22:00:07 2020 (r365178) @@ -31,7 +31,6 @@ #include __FBSDID("$FreeBSD$"); - #include #include #include @@ -145,7 +144,6 @@ pci_mv_init(struct pci_mv_softc *sc) { uint32_t reg; - /* Set device configuration to RC */ reg = pci_dw_dbi_rd4(sc->dev, MV_GLOBAL_CONTROL_REG); reg &= ~0x000000F0; @@ -232,7 +230,7 @@ pci_mv_attach(device_t dev) node = ofw_bus_get_node(dev); sc->dev = dev; sc->node = node; - + rid = 0; sc->dw_sc.dbi_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); @@ -266,7 +264,6 @@ pci_mv_attach(device_t dev) rv = ENXIO; goto out; } - rv = clk_enable(sc->clk_core); if (rv != 0) { Modified: head/sys/dev/pci/pci_host_generic.c ============================================================================== --- head/sys/dev/pci/pci_host_generic.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci_host_generic.c Tue Sep 1 22:00:07 2020 (r365178) @@ -261,7 +261,6 @@ generic_pcie_read_ivar(device_t dev, device_t child, i if (index == PCIB_IVAR_BUS) { *result = sc->bus_start; return (0); - } if (index == PCIB_IVAR_DOMAIN) { Modified: head/sys/dev/pci/pci_host_generic_fdt.c ============================================================================== --- head/sys/dev/pci/pci_host_generic_fdt.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci_host_generic_fdt.c Tue Sep 1 22:00:07 2020 (r365178) @@ -506,7 +506,6 @@ generic_pcie_ofw_bus_attach(device_t dev) get_addr_size_cells(parent, &addr_cells, &size_cells); /* Iterate through all bus subordinates */ for (node = OF_child(parent); node > 0; node = OF_peer(node)) { - /* Allocate and populate devinfo. */ di = malloc(sizeof(*di), M_DEVBUF, M_WAITOK | M_ZERO); if (ofw_bus_gen_setup_devinfo(&di->di_dinfo, node) != 0) { Modified: head/sys/dev/pci/pci_iov.c ============================================================================== --- head/sys/dev/pci/pci_iov.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci_iov.c Tue Sep 1 22:00:07 2020 (r365178) @@ -83,7 +83,6 @@ static u_long pci_iov_max_config = 1024 * 1024; SYSCTL_ULONG(_hw_pci, OID_AUTO, iov_max_config, CTLFLAG_RWTUN, &pci_iov_max_config, 0, "Maximum allowed size of SR-IOV configuration."); - #define IOV_READ(d, r, w) \ pci_read_config((d)->cfg.dev, (d)->cfg.iov->iov_pos + r, w) @@ -128,7 +127,7 @@ pci_iov_attach_method(device_t bus, device_t dev, nvli dinfo = device_get_ivars(dev); pcib = device_get_parent(bus); schema = NULL; - + error = pci_find_extcap(dev, PCIZ_SRIOV, &iov_pos); if (error != 0) @@ -171,7 +170,7 @@ pci_iov_attach_method(device_t bus, device_t dev, nvli error = ENOMEM; goto cleanup; } - + dinfo->cfg.iov = iov; iov->iov_cdev->si_drv1 = dinfo; mtx_unlock(&Giant); @@ -1061,4 +1060,3 @@ pci_vf_release_mem_resource(device_t dev, device_t chi return (rman_release_resource(r)); } - Modified: head/sys/dev/pci/pci_iov_private.h ============================================================================== --- head/sys/dev/pci/pci_iov_private.h Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci_iov_private.h Tue Sep 1 22:00:07 2020 (r365178) @@ -43,7 +43,7 @@ struct pcicfg_iov { struct pci_iov_bar iov_bar[PCIR_MAX_BAR_0 + 1]; struct rman rman; char rman_name[64]; - + int iov_pos; int iov_num_vfs; uint32_t iov_flags; @@ -59,4 +59,3 @@ void pci_iov_cfg_restore(device_t dev, struct pci_devi void pci_iov_cfg_save(device_t dev, struct pci_devinfo *dinfo); #endif - Modified: head/sys/dev/pci/pci_pci.c ============================================================================== --- head/sys/dev/pci/pci_pci.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci_pci.c Tue Sep 1 22:00:07 2020 (r365178) @@ -1445,7 +1445,7 @@ pcib_detach_hotplug(struct pcib_softc *sc) } pcib_pcie_hotplug_update(sc, val, mask, false); - + error = pcib_release_pcie_irq(sc); if (error) return (error); @@ -2532,7 +2532,6 @@ pcib_xlate_ari(device_t pcib, int bus, int *slot, int *func = PCIE_ARI_FUNC(ari_func); } } - static void pcib_enable_ari(struct pcib_softc *sc, uint32_t pcie_pos) Modified: head/sys/dev/pci/pci_user.c ============================================================================== --- head/sys/dev/pci/pci_user.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pci_user.c Tue Sep 1 22:00:07 2020 (r365178) @@ -963,7 +963,6 @@ pci_ioctl(struct cdev *dev, u_long cmd, caddr_t data, } } - /* Giant because newbus is Giant locked revisit with newbus locking */ mtx_lock(&Giant); @@ -1086,7 +1085,6 @@ pci_ioctl(struct cdev *dev, u_long cmd, caddr_t data, dinfo = STAILQ_FIRST(devlist_head); dinfo != NULL; dinfo = STAILQ_NEXT(dinfo, pci_links), i++) { - if (i < cio->offset) continue; Modified: head/sys/dev/pci/pcib_support.c ============================================================================== --- head/sys/dev/pci/pcib_support.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/pcib_support.c Tue Sep 1 22:00:07 2020 (r365178) @@ -79,4 +79,3 @@ pcib_decode_rid(device_t pcib, uint16_t rid, int *bus, *slot = PCI_RID2SLOT(rid); *func = PCI_RID2FUNC(rid); } - Modified: head/sys/dev/pci/vga_pci.c ============================================================================== --- head/sys/dev/pci/vga_pci.c Tue Sep 1 21:59:31 2020 (r365177) +++ head/sys/dev/pci/vga_pci.c Tue Sep 1 22:00:07 2020 (r365178) @@ -160,7 +160,6 @@ vga_pci_reset(device_t dev) pci_set_powerstate(dev, ps); } - void * vga_pci_map_bios(device_t dev, size_t *size) { @@ -779,7 +778,6 @@ static device_method_t vga_pci_methods[] = { DEVMETHOD(pci_release_msi, vga_pci_release_msi), DEVMETHOD(pci_msi_count, vga_pci_msi_count), DEVMETHOD(pci_msix_count, vga_pci_msix_count), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 22:00:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6111A37D5F4; Tue, 1 Sep 2020 22:00:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1GR1yJtz4ZwK; Tue, 1 Sep 2020 22:00:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 11D15200FD; Tue, 1 Sep 2020 22:00:31 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M0UNN048639; Tue, 1 Sep 2020 22:00:30 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M0Ui4048638; Tue, 1 Sep 2020 22:00:30 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012200.081M0Ui4048638@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:00:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365179 - head/sys/dev/pcf X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/pcf X-SVN-Commit-Revision: 365179 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:00:31 -0000 Author: mjg Date: Tue Sep 1 22:00:30 2020 New Revision: 365179 URL: https://svnweb.freebsd.org/changeset/base/365179 Log: pcf: clean up empty lines in .c and .h files Modified: head/sys/dev/pcf/pcf.c Modified: head/sys/dev/pcf/pcf.c ============================================================================== --- head/sys/dev/pcf/pcf.c Tue Sep 1 22:00:07 2020 (r365178) +++ head/sys/dev/pcf/pcf.c Tue Sep 1 22:00:30 2020 (r365179) @@ -66,7 +66,6 @@ pcf_wait_byte(struct pcf_softc *sc) PCF_ASSERT_LOCKED(sc); while (counter--) { - if ((pcf_get_S1(sc) & PIN) == 0) return (0); } @@ -252,7 +251,6 @@ pcf_intr(void *arg) status = pcf_get_S1(sc); switch(sc->pcf_slave_mode) { - case SLAVE_TRANSMITTER: if (status & LRB) { /* ack interrupt line */ @@ -393,7 +391,6 @@ pcf_write(device_t dev, const char *buf, int len, int bytes = 0; PCF_LOCK(sc); while (len) { - pcf_set_S0(sc, *buf++); /* wait for the byte to be send */ @@ -445,7 +442,6 @@ pcf_read(device_t dev, char *buf, int len, int *read, bytes = 0; while (len) { - /* XXX delay needed here */ /* wait for trigged byte */ From owner-svn-src-all@freebsd.org Tue Sep 1 22:00:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8413D37D602; Tue, 1 Sep 2020 22:00:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Gn30Slz4Ztm; Tue, 1 Sep 2020 22:00:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B8B020513; Tue, 1 Sep 2020 22:00:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M0nX0048696; Tue, 1 Sep 2020 22:00:49 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M0mmi048695; Tue, 1 Sep 2020 22:00:48 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012200.081M0mmi048695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:00:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365180 - head/sys/dev/pccbb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/pccbb X-SVN-Commit-Revision: 365180 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:00:49 -0000 Author: mjg Date: Tue Sep 1 22:00:48 2020 New Revision: 365180 URL: https://svnweb.freebsd.org/changeset/base/365180 Log: pccbb: clean up empty lines in .c and .h files Modified: head/sys/dev/pccbb/pccbb.c head/sys/dev/pccbb/pccbbreg.h Modified: head/sys/dev/pccbb/pccbb.c ============================================================================== --- head/sys/dev/pccbb/pccbb.c Tue Sep 1 22:00:30 2020 (r365179) +++ head/sys/dev/pccbb/pccbb.c Tue Sep 1 22:00:48 2020 (r365180) @@ -193,7 +193,7 @@ static struct resource * cbb_find_res(struct cbb_softc *sc, int type, int rid) { struct cbb_reslist *rle; - + SLIST_FOREACH(rle, &sc->rl, link) if (SYS_RES_MEMORY == rle->type && rid == rle->rid) return (rle->res); @@ -405,7 +405,6 @@ cbb_teardown_intr(device_t dev, device_t child, struct return (0); } - void cbb_driver_added(device_t brdev, driver_t *driver) { @@ -884,7 +883,7 @@ cbb_current_voltage(device_t brdev) { struct cbb_softc *sc = device_get_softc(brdev); uint32_t ctrl; - + ctrl = cbb_get(sc, CBB_SOCKET_CONTROL); switch (ctrl & CBB_SOCKET_CTRL_VCCMASK) { case CBB_SOCKET_CTRL_VCC_5V: @@ -1496,7 +1495,6 @@ cbb_pcic_set_memory_offset(device_t brdev, device_t ch /************************************************************************/ /* BUS Methods */ /************************************************************************/ - int cbb_activate_resource(device_t brdev, device_t child, int type, int rid, Modified: head/sys/dev/pccbb/pccbbreg.h ============================================================================== --- head/sys/dev/pccbb/pccbbreg.h Tue Sep 1 22:00:30 2020 (r365179) +++ head/sys/dev/pccbb/pccbbreg.h Tue Sep 1 22:00:48 2020 (r365180) @@ -62,7 +62,6 @@ * Register definitions for PCI to Cardbus Bridge chips */ - /* PCI header registers */ #define CBBR_SOCKBASE 0x10 /* len=4 */ @@ -187,7 +186,6 @@ # define TOPIC97_REG_CTRL_RI_DISABLE 0x00000004 # define TOPIC97_REG_CTRL_CAUDIO_OFF 0x00000002 # define TOPIC_REG_CTRL_CAUDIO_INVERT 0x00000001 - /* Socket definitions */ #define CBB_SOCKET_EVENT_CSTS 0x01 /* Card Status Change */ From owner-svn-src-all@freebsd.org Tue Sep 1 22:01:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4128C37DA8C; Tue, 1 Sep 2020 22:01:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1H5151Qz4b45; Tue, 1 Sep 2020 22:01:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 088E520607; Tue, 1 Sep 2020 22:01:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M14GQ049492; Tue, 1 Sep 2020 22:01:04 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M14bC049491; Tue, 1 Sep 2020 22:01:04 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012201.081M14bC049491@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:01:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365181 - head/sys/dev/pccard X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/pccard X-SVN-Commit-Revision: 365181 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:01:05 -0000 Author: mjg Date: Tue Sep 1 22:01:04 2020 New Revision: 365181 URL: https://svnweb.freebsd.org/changeset/base/365181 Log: pccard: clean up empty lines in .c and .h files Modified: head/sys/dev/pccard/pccard.c head/sys/dev/pccard/pccard_cis_quirks.c Modified: head/sys/dev/pccard/pccard.c ============================================================================== --- head/sys/dev/pccard/pccard.c Tue Sep 1 22:00:48 2020 (r365180) +++ head/sys/dev/pccard/pccard.c Tue Sep 1 22:01:04 2020 (r365181) @@ -136,7 +136,6 @@ pccard_do_product_lookup(device_t bus, device_t dev, const struct pccard_product *tab, size_t ent_size, pccard_product_match_fn matchfn); - static int pccard_ccr_read(struct pccard_function *pf, int ccr) { @@ -455,7 +454,7 @@ pccard_select_cfe(device_t dev, int entry) { struct pccard_ivar *devi = PCCARD_IVAR(dev); struct pccard_function *pf = devi->pf; - + pccard_function_init(pf, entry); return (pf->cfe ? 0 : ENOMEM); } @@ -1259,7 +1258,7 @@ static void pccard_intr(void *arg) { struct pccard_function *pf = (struct pccard_function*) arg; - + pf->intr_handler(pf->intr_handler_arg); } @@ -1432,7 +1431,6 @@ pccard_ccr_write_impl(device_t brdev, device_t child, return 0; } - static device_method_t pccard_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pccard_probe), @@ -1471,7 +1469,6 @@ static device_method_t pccard_methods[] = { DEVMETHOD(card_attr_write, pccard_attr_write_impl), DEVMETHOD(card_ccr_read, pccard_ccr_read_impl), DEVMETHOD(card_ccr_write, pccard_ccr_write_impl), - { 0, 0 } }; Modified: head/sys/dev/pccard/pccard_cis_quirks.c ============================================================================== --- head/sys/dev/pccard/pccard_cis_quirks.c Tue Sep 1 22:00:48 2020 (r365180) +++ head/sys/dev/pccard/pccard_cis_quirks.c Tue Sep 1 22:01:04 2020 (r365181) @@ -258,7 +258,7 @@ static struct pccard_cis_quirk pccard_cis_quirks[] = { { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_NDC_ND5100_E, &pccard_ndc_nd5100_func0, &pccard_ndc_nd5100_func0_cfe0 }, }; - + static int pccard_cis_quirk_match(struct pccard_softc *sc, struct pccard_cis_quirk *q) { From owner-svn-src-all@freebsd.org Tue Sep 1 22:01:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8844537D9CB; Tue, 1 Sep 2020 22:01:18 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1HL0QpKz4bKH; Tue, 1 Sep 2020 22:01:18 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B748620055; Tue, 1 Sep 2020 22:01:17 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M1H92049548; Tue, 1 Sep 2020 22:01:17 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M1H0Q049547; Tue, 1 Sep 2020 22:01:17 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012201.081M1H0Q049547@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:01:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365182 - head/sys/dev/pbio X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/pbio X-SVN-Commit-Revision: 365182 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:01:18 -0000 Author: mjg Date: Tue Sep 1 22:01:17 2020 New Revision: 365182 URL: https://svnweb.freebsd.org/changeset/base/365182 Log: pbio: clean up empty lines in .c and .h files Modified: head/sys/dev/pbio/pbio.c Modified: head/sys/dev/pbio/pbio.c ============================================================================== --- head/sys/dev/pbio/pbio.c Tue Sep 1 22:01:04 2020 (r365181) +++ head/sys/dev/pbio/pbio.c Tue Sep 1 22:01:17 2020 (r365182) @@ -159,7 +159,6 @@ pboutb(struct pbio_softc *scp, int off, uint8_t val) bus_space_write_1(scp->bst, scp->bsh, off, val); } - static int pbioprobe(device_t dev) { @@ -251,7 +250,7 @@ pbioioctl (struct cdev *dev, u_long cmd, caddr_t data, { struct pbio_softc *scp; int port, unit; - + unit = UNIT(dev); port = PORT(dev); scp = pbio_addr(unit); @@ -288,13 +287,13 @@ pbioopen(struct cdev *dev, int oflags, int devtype, st struct pbio_softc *scp; int ocfg, port, unit; int portbit; /* Port configuration bit */ - + unit = UNIT(dev); port = PORT(dev); scp = pbio_addr(unit); if (scp == NULL) return (ENODEV); - + switch (port) { case 0: portbit = 0x10; break; /* Port A */ case 1: portbit = 0x02; break; /* Port B */ @@ -321,12 +320,12 @@ pbioclose(struct cdev *dev, int fflag, int devtype, st { struct pbio_softc *scp; int unit; - + unit = UNIT(dev); scp = pbio_addr(unit); if (scp == NULL) return (ENODEV); - + return (0); } @@ -377,7 +376,7 @@ pbioread(struct cdev *dev, struct uio *uio, int ioflag struct pbio_softc *scp; int err, i, port, ret, toread, unit; char val; - + unit = UNIT(dev); port = PORT(dev); scp = pbio_addr(unit); @@ -406,7 +405,7 @@ pbiowrite(struct cdev *dev, struct uio *uio, int iofla struct pbio_softc *scp; int i, port, ret, towrite, unit; char val, oval; - + unit = UNIT(dev); port = PORT(dev); scp = pbio_addr(unit); @@ -453,12 +452,12 @@ pbiopoll(struct cdev *dev, int which, struct thread *t { struct pbio_softc *scp; int unit; - + unit = UNIT(dev); scp = pbio_addr(unit); if (scp == NULL) return (ENODEV); - + /* * Do processing */ From owner-svn-src-all@freebsd.org Tue Sep 1 22:01:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 801C037DC88; Tue, 1 Sep 2020 22:01:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Hd2S49z4b9H; Tue, 1 Sep 2020 22:01:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 389EB2058E; Tue, 1 Sep 2020 22:01:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M1XZG049606; Tue, 1 Sep 2020 22:01:33 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M1W2q049600; Tue, 1 Sep 2020 22:01:32 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012201.081M1W2q049600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:01:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365183 - head/sys/dev/ow X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ow X-SVN-Commit-Revision: 365183 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:01:33 -0000 Author: mjg Date: Tue Sep 1 22:01:32 2020 New Revision: 365183 URL: https://svnweb.freebsd.org/changeset/base/365183 Log: ow: clean up empty lines in .c and .h files Modified: head/sys/dev/ow/ow.h head/sys/dev/ow/ow_temp.c head/sys/dev/ow/own.h Modified: head/sys/dev/ow/ow.h ============================================================================== --- head/sys/dev/ow/ow.h Tue Sep 1 22:01:17 2020 (r365182) +++ head/sys/dev/ow/ow.h Tue Sep 1 22:01:32 2020 (r365183) @@ -35,7 +35,7 @@ enum ow_device_ivars { #define OW_ACCESSOR(var, ivar, type) \ __BUS_ACCESSOR(ow, var, OW, ivar, type); - + OW_ACCESSOR(family, FAMILY, uint8_t) OW_ACCESSOR(romid, ROMID, uint8_t *) Modified: head/sys/dev/ow/ow_temp.c ============================================================================== --- head/sys/dev/ow/ow_temp.c Tue Sep 1 22:01:17 2020 (r365182) +++ head/sys/dev/ow/ow_temp.c Tue Sep 1 22:01:32 2020 (r365183) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #define RECALL_EE 0xb8 #define READ_SCRATCHPAD 0xbe - #define OW_TEMP_DONE 0x01 #define OW_TEMP_RUNNING 0x02 @@ -95,7 +94,7 @@ static int ow_temp_read_scratchpad(device_t dev, uint8_t *scratch, int len) { struct ow_cmd cmd; - + own_self_command(dev, &cmd, READ_SCRATCHPAD); cmd.xpt_read_len = len; own_command_wait(dev, &cmd); @@ -115,7 +114,6 @@ ow_temp_convert_t(device_t dev) return 0; } - static int ow_temp_read_power_supply(device_t dev, int *parasite) { @@ -262,7 +260,7 @@ ow_temp_detach(device_t dev) msleep(sc->event_thread, &sc->temp_lock, PWAIT, "owtun", 0); } mtx_destroy(&sc->temp_lock); - + return 0; } @@ -273,7 +271,6 @@ static device_method_t ow_temp_methods[] = { DEVMETHOD(device_probe, ow_temp_probe), DEVMETHOD(device_attach, ow_temp_attach), DEVMETHOD(device_detach, ow_temp_detach), - { 0, 0 } }; Modified: head/sys/dev/ow/own.h ============================================================================== --- head/sys/dev/ow/own.h Tue Sep 1 22:01:17 2020 (r365182) +++ head/sys/dev/ow/own.h Tue Sep 1 22:01:32 2020 (r365183) @@ -30,7 +30,6 @@ #include "own_if.h" - #define READ_ROM 0x33 #define MATCH_ROM 0x55 #define SKIP_ROM 0xcc From owner-svn-src-all@freebsd.org Tue Sep 1 22:01:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D8A0137D8DF; Tue, 1 Sep 2020 22:01:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Hs515Wz4bcP; Tue, 1 Sep 2020 22:01:45 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52BCA202B4; Tue, 1 Sep 2020 22:01:42 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M1gUx050403; Tue, 1 Sep 2020 22:01:42 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M1gQh050402; Tue, 1 Sep 2020 22:01:42 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012201.081M1gQh050402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:01:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365184 - head/sys/dev/otus X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/otus X-SVN-Commit-Revision: 365184 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:01:47 -0000 Author: mjg Date: Tue Sep 1 22:01:41 2020 New Revision: 365184 URL: https://svnweb.freebsd.org/changeset/base/365184 Log: otus: clean up empty lines in .c and .h files Modified: head/sys/dev/otus/if_otus.c Modified: head/sys/dev/otus/if_otus.c ============================================================================== --- head/sys/dev/otus/if_otus.c Tue Sep 1 22:01:32 2020 (r365183) +++ head/sys/dev/otus/if_otus.c Tue Sep 1 22:01:41 2020 (r365184) @@ -99,7 +99,6 @@ SYSCTL_INT(_hw_usb_otus, OID_AUTO, debug, CTLFLAG_RWTU if ((dm == OTUS_DEBUG_ANY) || (dm & otus_debug)) \ device_printf(sc->sc_dev, __VA_ARGS__); \ } while (0) - #define OTUS_DEV(v, p) { USB_VPI(v, p, 0) } static const STRUCT_USB_HOST_ID otus_devs[] = { OTUS_DEV(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_WN7512), @@ -1571,7 +1570,6 @@ otus_sub_rxeof(struct otus_softc *sc, uint8_t *buf, in struct mbuf *m; // int s; - if (otus_debug & OTUS_DEBUG_RX_BUFFER) { device_printf(sc->sc_dev, "%s: %*D\n", __func__, len, buf, "-"); @@ -2226,7 +2224,6 @@ otus_hw_rate_is_ofdm(struct otus_softc *sc, uint8_t hw } } - static void otus_tx_update_ratectl(struct otus_softc *sc, struct ieee80211_node *ni) { @@ -2417,7 +2414,6 @@ otus_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_ return (1); } - int otus_set_multi(struct otus_softc *sc) From owner-svn-src-all@freebsd.org Tue Sep 1 22:01:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DA94C37D8E5; Tue, 1 Sep 2020 22:01:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1J4207Fz4bcw; Tue, 1 Sep 2020 22:01:55 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 653E320616; Tue, 1 Sep 2020 22:01:55 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M1tNK050465; Tue, 1 Sep 2020 22:01:55 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M1sgf050459; Tue, 1 Sep 2020 22:01:54 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012201.081M1sgf050459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:01:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365185 - head/sys/dev/ofw X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ofw X-SVN-Commit-Revision: 365185 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:01:58 -0000 Author: mjg Date: Tue Sep 1 22:01:53 2020 New Revision: 365185 URL: https://svnweb.freebsd.org/changeset/base/365185 Log: ofw: clean up empty lines in .c and .h files Modified: head/sys/dev/ofw/ofw_bus_subr.c head/sys/dev/ofw/ofw_cpu.c head/sys/dev/ofw/ofw_graph.h head/sys/dev/ofw/ofw_standard.c head/sys/dev/ofw/ofwpci.c head/sys/dev/ofw/openfirmio.c Modified: head/sys/dev/ofw/ofw_bus_subr.c ============================================================================== --- head/sys/dev/ofw/ofw_bus_subr.c Tue Sep 1 22:01:41 2020 (r365184) +++ head/sys/dev/ofw/ofw_bus_subr.c Tue Sep 1 22:01:53 2020 (r365185) @@ -183,7 +183,7 @@ ofw_bus_status_okay(device_t dev) if (status == NULL || strcmp(status, "okay") == 0 || strcmp(status, "ok") == 0) return (1); - + return (0); } Modified: head/sys/dev/ofw/ofw_cpu.c ============================================================================== --- head/sys/dev/ofw/ofw_cpu.c Tue Sep 1 22:01:41 2020 (r365184) +++ head/sys/dev/ofw/ofw_cpu.c Tue Sep 1 22:01:53 2020 (r365185) @@ -361,7 +361,6 @@ ofw_cpu_early_foreach(ofw_cpu_foreach_cb callback, boo for (child = OF_child(node); child != 0; child = OF_peer(child), id = next_id) { - /* Check if child is a CPU */ memset(device_type, 0, sizeof(device_type)); rv = OF_getprop(child, "device_type", device_type, Modified: head/sys/dev/ofw/ofw_graph.h ============================================================================== --- head/sys/dev/ofw/ofw_graph.h Tue Sep 1 22:01:41 2020 (r365184) +++ head/sys/dev/ofw/ofw_graph.h Tue Sep 1 22:01:53 2020 (r365185) @@ -41,4 +41,3 @@ phandle_t ofw_graph_get_remote_parent(phandle_t remote device_t ofw_graph_get_device_by_port_ep(phandle_t node, uint32_t port_id, uint32_t ep_id); #endif /* _OFW_GRAPH_H_ */ - Modified: head/sys/dev/ofw/ofw_standard.c ============================================================================== --- head/sys/dev/ofw/ofw_standard.c Tue Sep 1 22:01:41 2020 (r365184) +++ head/sys/dev/ofw/ofw_standard.c Tue Sep 1 22:01:53 2020 (r365185) @@ -136,7 +136,6 @@ static ofw_method_t ofw_std_methods[] = { OFWMETHOD(ofw_release, ofw_std_release), OFWMETHOD(ofw_enter, ofw_std_enter), OFWMETHOD(ofw_exit, ofw_std_exit), - { 0, 0 } }; Modified: head/sys/dev/ofw/ofwpci.c ============================================================================== --- head/sys/dev/ofw/ofwpci.c Tue Sep 1 22:01:41 2020 (r365184) +++ head/sys/dev/ofw/ofwpci.c Tue Sep 1 22:01:53 2020 (r365185) @@ -103,7 +103,6 @@ static struct rman *ofw_pci_get_rman(struct ofw_pci_so * Driver methods. */ static device_method_t ofw_pci_methods[] = { - /* Device interface */ DEVMETHOD(device_attach, ofw_pci_attach), @@ -408,7 +407,6 @@ ofw_pci_alloc_resource(device_t bus, device_t child, i struct resource *rv; struct rman *rm; int needactivate; - needactivate = flags & RF_ACTIVE; flags &= ~RF_ACTIVE; Modified: head/sys/dev/ofw/openfirmio.c ============================================================================== --- head/sys/dev/ofw/openfirmio.c Tue Sep 1 22:01:41 2020 (r365184) +++ head/sys/dev/ofw/openfirmio.c Tue Sep 1 22:01:53 2020 (r365185) @@ -151,7 +151,6 @@ openfirm_ioctl(struct cdev *dev, u_long cmd, caddr_t d name = value = NULL; error = 0; switch (cmd) { - case OFIOCGET: case OFIOCGETPROPLEN: if (node == 0) From owner-svn-src-all@freebsd.org Tue Sep 1 22:02:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AFDD437D665; Tue, 1 Sep 2020 22:02:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1JQ4HDcz4c3t; Tue, 1 Sep 2020 22:02:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-274.local (unknown [IPv6:2601:648:8681:1cb0:e5a7:fb2f:c4d3:375f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 0EFE21CA6B; Tue, 1 Sep 2020 22:02:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r365091 - in head/sys/dev/virtio: . balloon block console network scsi To: Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009012131.081LVQPC029777@repo.freebsd.org> From: John Baldwin Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <9ed0fd45-2428-2efb-19cc-f065cae23431@FreeBSD.org> Date: Tue, 1 Sep 2020 15:02:12 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <202009012131.081LVQPC029777@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:02:14 -0000 On 9/1/20 2:31 PM, Mateusz Guzik wrote: > Author: mjg > Date: Tue Sep 1 21:31:26 2020 > New Revision: 365091 > URL: https://svnweb.freebsd.org/changeset/base/365091 > > Log: > virtio: clean up empty lines in .c and .h files > > Modified: > head/sys/dev/virtio/balloon/virtio_balloon.c > head/sys/dev/virtio/block/virtio_blk.c > head/sys/dev/virtio/console/virtio_console.c > head/sys/dev/virtio/network/if_vtnet.c > head/sys/dev/virtio/scsi/virtio_scsi.c > head/sys/dev/virtio/virtio.c > > Modified: head/sys/dev/virtio/balloon/virtio_balloon.c > ============================================================================== > --- head/sys/dev/virtio/balloon/virtio_balloon.c Tue Sep 1 21:30:22 2020 (r365090) > +++ head/sys/dev/virtio/balloon/virtio_balloon.c Tue Sep 1 21:31:26 2020 (r365091) > @@ -80,7 +80,6 @@ struct vtballoon_softc { > static struct virtio_feature_desc vtballoon_feature_desc[] = { > { VIRTIO_BALLOON_F_MUST_TELL_HOST, "MustTellHost" }, > { VIRTIO_BALLOON_F_STATS_VQ, "StatsVq" }, > - > { 0, NULL } > }; While many of the fixes are correct, I feel that this one (along with similar changes to remove a blank line before table terminators in devmethod tables, or in tables in the acpi drivers I saw in acpi_support) are a regression. Also, in general some kind of heads up to ask before generating umpteen billion merge conflicts would be nice. -- John Baldwin From owner-svn-src-all@freebsd.org Tue Sep 1 22:02:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EED5F37D8F7; Tue, 1 Sep 2020 22:02:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1JR6Q7Bz4bnZ; Tue, 1 Sep 2020 22:02:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BF4282027F; Tue, 1 Sep 2020 22:02:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M2FMv053061; Tue, 1 Sep 2020 22:02:15 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M2CFI053046; Tue, 1 Sep 2020 22:02:12 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012202.081M2CFI053046@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:02:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365186 - head/sys/dev/ocs_fc X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ocs_fc X-SVN-Commit-Revision: 365186 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:02:16 -0000 Author: mjg Date: Tue Sep 1 22:02:12 2020 New Revision: 365186 URL: https://svnweb.freebsd.org/changeset/base/365186 Log: ocs_fc: clean up empty lines in .c and .h files Modified: head/sys/dev/ocs_fc/ocs.h head/sys/dev/ocs_fc/ocs_cam.c head/sys/dev/ocs_fc/ocs_cam.h head/sys/dev/ocs_fc/ocs_common.h head/sys/dev/ocs_fc/ocs_ddump.c head/sys/dev/ocs_fc/ocs_device.c head/sys/dev/ocs_fc/ocs_device.h head/sys/dev/ocs_fc/ocs_domain.c head/sys/dev/ocs_fc/ocs_drv_fc.h head/sys/dev/ocs_fc/ocs_els.c head/sys/dev/ocs_fc/ocs_fabric.c head/sys/dev/ocs_fc/ocs_fabric.h head/sys/dev/ocs_fc/ocs_fcp.h head/sys/dev/ocs_fc/ocs_hw.c head/sys/dev/ocs_fc/ocs_hw.h head/sys/dev/ocs_fc/ocs_hw_queues.c head/sys/dev/ocs_fc/ocs_hw_queues.h head/sys/dev/ocs_fc/ocs_io.c head/sys/dev/ocs_fc/ocs_io.h head/sys/dev/ocs_fc/ocs_ioctl.c head/sys/dev/ocs_fc/ocs_ioctl.h head/sys/dev/ocs_fc/ocs_list.h head/sys/dev/ocs_fc/ocs_mgmt.c head/sys/dev/ocs_fc/ocs_mgmt.h head/sys/dev/ocs_fc/ocs_node.c head/sys/dev/ocs_fc/ocs_node.h head/sys/dev/ocs_fc/ocs_os.c head/sys/dev/ocs_fc/ocs_os.h head/sys/dev/ocs_fc/ocs_pci.c head/sys/dev/ocs_fc/ocs_scsi.c head/sys/dev/ocs_fc/ocs_scsi.h head/sys/dev/ocs_fc/ocs_sport.c head/sys/dev/ocs_fc/ocs_sport.h head/sys/dev/ocs_fc/ocs_stats.h head/sys/dev/ocs_fc/ocs_unsol.c head/sys/dev/ocs_fc/ocs_utils.c head/sys/dev/ocs_fc/ocs_utils.h head/sys/dev/ocs_fc/ocs_vpd.h head/sys/dev/ocs_fc/ocs_xport.c head/sys/dev/ocs_fc/ocs_xport.h head/sys/dev/ocs_fc/sli4.c head/sys/dev/ocs_fc/sli4.h Modified: head/sys/dev/ocs_fc/ocs.h ============================================================================== --- head/sys/dev/ocs_fc/ocs.h Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs.h Tue Sep 1 22:02:12 2020 (r365186) @@ -36,7 +36,6 @@ * OCS bsd driver common include file */ - #if !defined(__OCS_H__) #define __OCS_H__ @@ -103,7 +102,6 @@ typedef struct ocs_fcport_s { */ struct ocs_softc { - device_t dev; struct cdev *cdev; @@ -197,7 +195,6 @@ struct ocs_softc { uint32_t config_tgt:1, /**< Configured to support target mode */ config_ini:1; /**< Configured to support initiator mode */ - uint32_t nodedb_mask; /**< Node debugging mask */ char modeldesc[64]; @@ -218,7 +215,7 @@ struct ocs_softc { bool attached; struct mtx dbg_lock; - + struct cam_devq *devq; ocs_fcport *fcports; Modified: head/sys/dev/ocs_fc/ocs_cam.c ============================================================================== --- head/sys/dev/ocs_fc/ocs_cam.c Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_cam.c Tue Sep 1 22:02:12 2020 (r365186) @@ -132,7 +132,7 @@ ocs_attach_port(ocs_t *ocs, int chan) cam_sim_free(sim, FALSE); return 1; } - + fcp->ocs = ocs; fcp->sim = sim; fcp->path = path; @@ -171,7 +171,7 @@ ocs_detach_port(ocs_t *ocs, int32_t chan) fcp->sim = NULL; mtx_unlock(&ocs->sim_lock); } - + return 0; } @@ -199,7 +199,7 @@ ocs_cam_attach(ocs_t *ocs) goto detach_port; } } - + ocs->io_high_watermark = max_io; ocs->io_in_use = 0; return 0; @@ -323,7 +323,6 @@ ocs_scsi_tgt_del_domain(ocs_domain_t *domain) { } - /** * @ingroup scsi_api_target * @brief accept new sli port (sport) notification @@ -493,7 +492,6 @@ ocs_scsi_del_initiator(ocs_node_t *node, ocs_scsi_del_ adc->arrived = 0; xpt_async(AC_CONTRACT, fcp->path, &ac); - if (reason == OCS_SCSI_INITIATOR_MISSING) { return OCS_SCSI_CALL_COMPLETE; } @@ -566,7 +564,6 @@ int32_t ocs_scsi_recv_cmd(ocs_io_t *io, uint64_t lun, } if (atio) { - STAILQ_REMOVE_HEAD(&trsrc->atio, sim_links.stqe); atio->ccb_h.status = CAM_CDB_RECVD; @@ -699,7 +696,6 @@ int32_t ocs_scsi_recv_tmf(ocs_io_t *tmfio, uint64_t lu goto ocs_scsi_recv_tmf_out; } - tmfio->tgt_io.app = abortio; STAILQ_REMOVE_HEAD(&trsrc->inot, sim_links.stqe); @@ -773,7 +769,7 @@ int32_t ocs_scsi_recv_tmf(ocs_io_t *tmfio, uint64_t lu abortio->tgt_io.flags |= OCS_CAM_IO_F_ABORT_DEV; rc = ocs_scsi_tgt_abort_io(abortio, ocs_io_abort_cb, tmfio); } - + ocs_scsi_recv_tmf_out: return rc; } @@ -813,7 +809,6 @@ ocs_scsi_ini_del_device(ocs_t *ocs) return 0; } - /** * @ingroup scsi_api_initiator * @brief accept new domain notification @@ -959,7 +954,7 @@ ocs_tgt_find(ocs_fcport *fcp, ocs_node_t *node) { ocs_fc_target_t *tgt = NULL; uint32_t i; - + for (i = 0; i < OCS_MAX_TARGETS; i++) { tgt = &fcp->tgt[i]; @@ -970,7 +965,7 @@ ocs_tgt_find(ocs_fcport *fcp, ocs_node_t *node) return i; } } - + return -1; } @@ -996,12 +991,12 @@ uint32_t ocs_update_tgt(ocs_node_t *node, ocs_fcport *fcp, uint32_t tgt_id) { ocs_fc_target_t *tgt = NULL; - + tgt = &fcp->tgt[tgt_id]; tgt->node_id = node->instance_index; tgt->state = OCS_TGT_STATE_VALID; - + tgt->port_id = node->rnode.fc_id; tgt->wwpn = ocs_node_get_wwpn(node); tgt->wwnn = ocs_node_get_wwnn(node); @@ -1052,7 +1047,7 @@ ocs_scsi_new_target(ocs_node_t *node) } i = ocs_tgt_find(fcp, node); - + if (i < 0) { ocs_add_new_tgt(node, fcp); return 0; @@ -1071,7 +1066,7 @@ ocs_delete_target(ocs_t *ocs, ocs_fcport *fcp, int tgt device_printf(ocs->dev, "%s: calling with NULL sim\n", __func__); return; } - + if (CAM_REQ_CMP == xpt_create_path(&cpath, NULL, cam_sim_path(fcp->sim), tgt, CAM_LUN_WILDCARD)) { xpt_async(AC_LOST_DEVICE, cpath, NULL); @@ -1189,14 +1184,13 @@ ocs_scsi_del_target(ocs_node_t *node, ocs_scsi_del_tar if(!ocs->attached) { ocs_delete_target(ocs, fcp, tgt_id); } else { - tgt->state = OCS_TGT_STATE_LOST; tgt->gone_timer = 30; if (!callout_active(&fcp->ldt)) { callout_reset(&fcp->ldt, hz, ocs_ldt, fcp); } } - + return 0; } @@ -1742,7 +1736,6 @@ ocs_target_io(struct ocs_softc *ocs, union ccb *ccb) " are 0 \n", __func__); ocs_set_ccb_status(ccb, CAM_REQ_INVALID); rc = 1; - } if (rc) { @@ -1917,7 +1910,7 @@ ocs_fcp_change_role(struct ocs_softc *ocs, ocs_fcport return 0; } - + if ((fcp->role != KNOB_ROLE_NONE)){ fcp->role = new_role; vport->enable_ini = (new_role & KNOB_ROLE_INITIATOR)? 1:0; @@ -1927,7 +1920,7 @@ ocs_fcp_change_role(struct ocs_softc *ocs, ocs_fcport } fcp->role = new_role; - + vport->enable_ini = (new_role & KNOB_ROLE_INITIATOR)? 1:0; vport->enable_tgt = (new_role & KNOB_ROLE_TARGET)? 1:0; @@ -2617,7 +2610,7 @@ ocs_abort_atio(struct ocs_softc *ocs, union ccb *ccb) aio->tgt_io.flags |= OCS_CAM_IO_F_ABORT_CAM; ocs_target_io_free(aio); ocs_set_ccb_status(ccb, CAM_REQ_CMP); - + return; } @@ -2808,7 +2801,7 @@ ocs_get_crn(ocs_node_t *node, uint8_t *crn, uint64_t l if (lcrn->lun != lun) { return (1); } - + if (lcrn->crnseed == 0) lcrn->crnseed = 1; @@ -2821,7 +2814,7 @@ ocs_del_crn(ocs_node_t *node) { uint32_t i; struct ocs_lun_crn *lcrn = NULL; - + for(i = 0; i < OCS_MAX_LUN; i++) { lcrn = node->ini_node.lun_crn[i]; if (lcrn) { Modified: head/sys/dev/ocs_fc/ocs_cam.h ============================================================================== --- head/sys/dev/ocs_fc/ocs_cam.h Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_cam.h Tue Sep 1 22:02:12 2020 (r365186) @@ -42,7 +42,6 @@ #include - #define ccb_ocs_ptr spriv_ptr0 #define ccb_io_ptr spriv_ptr1 @@ -119,4 +118,3 @@ extern int32_t ocs_cam_attach(ocs_t *ocs); extern int32_t ocs_cam_detach(ocs_t *ocs); #endif /* __OCS_CAM_H__ */ - Modified: head/sys/dev/ocs_fc/ocs_common.h ============================================================================== --- head/sys/dev/ocs_fc/ocs_common.h Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_common.h Tue Sep 1 22:02:12 2020 (r365186) @@ -36,7 +36,6 @@ * Contains declarations shared between the alex layer and HW/SLI4 */ - #if !defined(__OCS_COMMON_H__) #define __OCS_COMMON_H__ @@ -154,7 +153,6 @@ typedef enum { * a separate SLI port object. */ struct ocs_sli_port_s { - ocs_t *ocs; /**< pointer to ocs */ uint32_t tgt_id; /**< target id */ uint32_t index; /**< ??? */ @@ -215,7 +213,6 @@ struct ocs_sli_port_s { * to connect to the domain of a FC or FCoE switch */ struct ocs_domain_s { - ocs_t *ocs; /**< pointer back to ocs */ uint32_t instance_index; /**< unique instance index value */ char display_name[OCS_DISPLAY_NAME_LENGTH]; /**< Node display name */ @@ -302,7 +299,6 @@ struct ocs_remote_node_group_s { * Implementation specific fields allowed here */ - uint32_t instance_index; /*<< instance index */ ocs_node_group_dir_t *node_group_dir; /*<< pointer to the node group directory */ ocs_list_link_t link; /*<< linked list link */ @@ -325,7 +321,6 @@ typedef enum { * */ struct ocs_node_s { - ocs_t *ocs; /**< pointer back to ocs structure */ uint32_t instance_index; /**< unique instance index value */ char display_name[OCS_DISPLAY_NAME_LENGTH]; /**< Node display name */ @@ -419,6 +414,5 @@ struct ocs_vport_spec_s { void *ini_data; /**< initiator backend pointer */ ocs_sport_t *sport; /**< Used to match record after attaching for update */ }; - #endif /* __OCS_COMMON_H__*/ Modified: head/sys/dev/ocs_fc/ocs_ddump.c ============================================================================== --- head/sys/dev/ocs_fc/ocs_ddump.c Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_ddump.c Tue Sep 1 22:02:12 2020 (r365186) @@ -118,7 +118,6 @@ ocs_ddump_sli4_queue(ocs_textbuf_t *textbuf, const cha } } - /** * @brief Generate SLI4 ddump * @@ -153,7 +152,6 @@ ocs_ddump_sli_q_fields(ocs_textbuf_t *textbuf, sli4_t ocs_ddump_endsection(textbuf, q_desc, qtype); } - /** * @brief Generate SLI4 ddump * @@ -259,7 +257,6 @@ ocs_ddump_sli(ocs_textbuf_t *textbuf, sli4_t *sli4) ocs_ddump_endsection(textbuf, "sli4", 0); } - /** * @brief Dump HW IO * @@ -334,7 +331,6 @@ ocs_ddump_queue_history(ocs_textbuf_t *textbuf, ocs_hw ocs_q_hist_ftr_t ftr; uint32_t mask; - /* footer's mask indicates what words were captured */ ftr.word = q_hist->q_hist[x]; mask = ftr.s.mask; @@ -878,4 +874,3 @@ ocs_clear_saved_ddump(ocs_t *ocs) return 1; } } - Modified: head/sys/dev/ocs_fc/ocs_device.c ============================================================================== --- head/sys/dev/ocs_fc/ocs_device.c Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_device.c Tue Sep 1 22:02:12 2020 (r365186) @@ -246,7 +246,6 @@ __ocs_d_common(const char *funcname, ocs_sm_ctx_t *ctx ocs_assert(ocs, NULL); switch(evt) { - /* Handle shutdown events */ case OCS_EVT_SHUTDOWN: ocs_log_debug(ocs, "[%s] %-20s %-20s\n", node->display_name, funcname, ocs_sm_event_name(evt)); @@ -315,9 +314,6 @@ __ocs_d_wait_loop(ocs_sm_ctx_t *ctx, ocs_sm_event_t ev return NULL; } - - - /** * @ingroup device_sm * @brief state: wait for node resume event @@ -384,7 +380,6 @@ __ocs_d_wait_del_ini_tgt(ocs_sm_ctx_t *ctx, ocs_sm_eve return NULL; } - /** * @ingroup device_sm * @brief state: Wait for node resume event. @@ -455,8 +450,6 @@ __ocs_d_wait_del_node(ocs_sm_ctx_t *ctx, ocs_sm_event_ return NULL; } - - /** * @brief Save the OX_ID for sending LS_ACC sometime later. * @@ -535,7 +528,6 @@ ocs_process_abts(ocs_io_t *io, fc_header_t *hdr) /* If an IO was found, attempt to take a reference on it */ if (abortio != NULL && (ocs_ref_get_unless_zero(&abortio->ref) != 0)) { - /* Got a reference on the IO. Hold it until backend is notified below */ node_printf(node, "Abort request: ox_id [%04x] rx_id [%04x]\n", ox_id, rx_id); @@ -677,7 +669,6 @@ __ocs_d_wait_logo_rsp(ocs_sm_ctx_t *ctx, ocs_sm_event_ return NULL; } - /** * @ingroup device_sm * @brief Device node state machine: Wait for the PRLO response. @@ -724,7 +715,6 @@ __ocs_d_wait_prlo_rsp(ocs_sm_ctx_t *ctx, ocs_sm_event_ return NULL; } - /** * @brief Initialize device node. * @@ -1654,13 +1644,12 @@ __ocs_d_device_ready(ocs_sm_ctx_t *ctx, ocs_sm_event_t break; } - case OCS_EVT_PDISC_RCVD: { fc_header_t *hdr = cbdata->header->dma.virt; ocs_send_plogi_acc(cbdata->io, ocs_be16toh(hdr->ox_id), NULL, NULL); break; } - + case OCS_EVT_PRLI_RCVD: { /* T, I+T: remote initiator is slow to get started */ fc_header_t *hdr = cbdata->header->dma.virt; @@ -1808,7 +1797,6 @@ __ocs_d_device_gone(ocs_sm_ctx_t *ctx, ocs_sm_event_t default: rc = OCS_SCSI_CALL_COMPLETE; break; - } if ((rc == OCS_SCSI_CALL_COMPLETE) && (rc_2 == OCS_SCSI_CALL_COMPLETE)) { Modified: head/sys/dev/ocs_fc/ocs_device.h ============================================================================== --- head/sys/dev/ocs_fc/ocs_device.h Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_device.h Tue Sep 1 22:02:12 2020 (r365186) @@ -47,7 +47,6 @@ #define OCS_FC_RQ_SIZE_DEFAULT 1024 #endif - /*************************************************************************** * IO Configuration */ @@ -58,7 +57,6 @@ #ifndef OCS_FC_MAX_SGL #define OCS_FC_MAX_SGL 128 #endif - /*************************************************************************** * DIF Configuration Modified: head/sys/dev/ocs_fc/ocs_domain.c ============================================================================== --- head/sys/dev/ocs_fc/ocs_domain.c Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_domain.c Tue Sep 1 22:02:12 2020 (r365186) @@ -77,8 +77,6 @@ static ocs_mgmt_functions_t domain_mgmt_functions = { .exec_handler = ocs_mgmt_domain_exec, }; - - /** * @brief Accept domain callback events from the HW. * @@ -174,7 +172,6 @@ ocs_domain_cb(void *arg, ocs_hw_domain_event_e event, return rc; } - /** * @brief Find the domain, given its FCF_WWN. * @@ -225,7 +222,6 @@ ocs_domain_alloc(ocs_t *ocs, uint64_t fcf_wwn) domain = ocs_malloc(ocs, sizeof(*domain), OCS_M_NOWAIT | OCS_M_ZERO); if (domain) { - domain->ocs = ocs; domain->instance_index = ocs->domain_instance_count++; domain->drvsm.app = domain; @@ -258,7 +254,6 @@ ocs_domain_alloc(ocs_t *ocs, uint64_t fcf_wwn) ocs_log_err(ocs, "domain allocation failed\n"); } - return domain; } @@ -962,7 +957,6 @@ __ocs_domain_ready(ocs_sm_ctx_t *ctx, ocs_sm_event_t e switch(evt) { case OCS_EVT_ENTER: { - /* start any pending vports */ if (ocs_vport_start(domain)) { ocs_log_debug(domain->ocs, "ocs_vport_start() did not start all vports\n"); @@ -1197,8 +1191,6 @@ __ocs_domain_wait_domain_lost(ocs_sm_ctx_t *ctx, ocs_s return NULL; } - - /** * @brief Save the port's service parameters. * @@ -1282,7 +1274,6 @@ ocs_domain_post_event(ocs_domain_t *domain, ocs_sm_eve return rc; } - /** * @brief Return the WWN as a uint64_t. * @@ -1367,7 +1358,6 @@ ocs_ddump_domain(ocs_textbuf_t *textbuf, ocs_domain_t return retval; } - void ocs_mgmt_domain_list(ocs_textbuf_t *textbuf, void *object) { @@ -1390,8 +1380,6 @@ ocs_mgmt_domain_list(ocs_textbuf_t *textbuf, void *obj #endif if (ocs_domain_lock_try(domain) == TRUE) { - - /* If we get here, then we are holding the domain lock */ ocs_list_foreach(&domain->sport_list, sport) { if ((sport->mgmt_functions) && (sport->mgmt_functions->get_list_handler)) { @@ -1468,7 +1456,6 @@ ocs_mgmt_domain_get(ocs_textbuf_t *textbuf, char *pare if (retval == 0) { break; } - } ocs_domain_unlock(domain); } @@ -1507,7 +1494,6 @@ ocs_mgmt_domain_get_all(ocs_textbuf_t *textbuf, void * } ocs_domain_unlock(domain); - ocs_mgmt_end_unnumbered_section(textbuf, "domain"); } @@ -1524,11 +1510,9 @@ ocs_mgmt_domain_set(char *parent, char *name, char *va /* If it doesn't start with my qualifier I don't know what to do with it */ if (ocs_strncmp(name, qualifier, strlen(qualifier)) == 0) { - /* See if it's a value I can supply */ /* if (ocs_strcmp(unqualified_name, "display_name") == 0) { - } else */ { /* If I didn't know the value of this status pass the request to each of my children */ @@ -1541,7 +1525,6 @@ ocs_mgmt_domain_set(char *parent, char *name, char *va if (retval == 0) { break; } - } ocs_domain_unlock(domain); } @@ -1563,7 +1546,6 @@ ocs_mgmt_domain_exec(char *parent, char *action, void /* If it doesn't start with my qualifier I don't know what to do with it */ if (ocs_strncmp(action, qualifier, strlen(qualifier)) == 0) { - { /* If I didn't know how to do this action pass the request to each of my children */ ocs_domain_lock(domain); @@ -1575,7 +1557,6 @@ ocs_mgmt_domain_exec(char *parent, char *action, void if (retval == 0) { break; } - } ocs_domain_unlock(domain); } Modified: head/sys/dev/ocs_fc/ocs_drv_fc.h ============================================================================== --- head/sys/dev/ocs_fc/ocs_drv_fc.h Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_drv_fc.h Tue Sep 1 22:02:12 2020 (r365186) @@ -36,7 +36,6 @@ * OCS linux driver common include file */ - #if !defined(__OCS_DRV_FC_H__) #define __OCS_DRV_FC_H__ @@ -52,7 +51,6 @@ #include "ocs_stats.h" struct ocs_s { - ocs_os_t ocs_os; char display_name[OCS_DISPLAY_NAME_LENGTH]; ocs_rlock_t lock; /*>> Device wide lock */ @@ -207,6 +205,5 @@ extern int32_t ocs_start_event_processing(ocs_os_t *oc #include "ocs_ioctl.h" #include "ocs_elxu.h" - #endif Modified: head/sys/dev/ocs_fc/ocs_els.c ============================================================================== --- head/sys/dev/ocs_fc/ocs_els.c Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_els.c Tue Sep 1 22:02:12 2020 (r365186) @@ -68,7 +68,6 @@ static ocs_io_t *ocs_els_abort_io(ocs_io_t *els, int s static void _ocs_els_io_free(void *arg); static void ocs_els_delay_timer_cb(void *arg); - /** * @ingroup els_api * @brief ELS state machine transition wrapper. @@ -355,7 +354,6 @@ ocs_els_make_active(ocs_io_t *els) ocs_unlock(&node->active_ios_lock); return; } else { - /* remove from pending list */ ocs_list_remove(&node->els_io_pend_list, els); els->els_pend = 0; @@ -506,7 +504,6 @@ ocs_els_req_cb(ocs_hw_io_t *hio, ocs_remote_node_t *rn ocs_els_post_event(els, OCS_EVT_SRRS_ELS_REQ_RJT, &cbdata); break; - case SLI4_FC_WCQE_STATUS_LOCAL_REJECT: switch (ext_status) { case SLI4_FC_LOCAL_REJECT_SEQUENCE_TIMEOUT: @@ -647,7 +644,6 @@ ocs_send_plogi(ocs_node_t *node, uint32_t timeout_sec, els->iparam.els.timeout = timeout_sec; ocs_io_transition(els, __ocs_els_init, NULL); - } return els; } @@ -909,7 +905,6 @@ ocs_send_logo(ocs_node_t *node, uint32_t timeout_sec, fc_logo_payload_t *logo; fc_plogi_payload_t *sparams; - ocs = node->ocs; node_els_trace(); @@ -1305,7 +1300,7 @@ ocs_send_plogi_acc(ocs_io_t *io, uint32_t ox_id, els_c ocs_memcpy(plogi, node->sport->service_params, sizeof(*plogi)); plogi->command_code = FC_ELS_CMD_ACC; plogi->resv1 = 0; - + /* Set Application header support bit if requested */ if (req->common_service_parameters[1] & ocs_htobe32(1U << 24)) { plogi->common_service_parameters[1] |= ocs_htobe32(1U << 24); @@ -1724,7 +1719,6 @@ ocs_ns_send_rftid(ocs_node_t *node, uint32_t timeout_s if (els == NULL) { ocs_log_err(ocs, "IO alloc failed\n"); } else { - els->iparam.fc_ct.r_ctl = FC_RCTL_ELS; els->iparam.fc_ct.type = FC_TYPE_GS; els->iparam.fc_ct.df_ctl = 0; @@ -1777,7 +1771,6 @@ ocs_ns_send_rffid(ocs_node_t *node, uint32_t timeout_s if (els == NULL) { ocs_log_err(ocs, "IO alloc failed\n"); } else { - els->iparam.fc_ct.r_ctl = FC_RCTL_ELS; els->iparam.fc_ct.type = FC_TYPE_GS; els->iparam.fc_ct.df_ctl = 0; @@ -1808,7 +1801,6 @@ ocs_ns_send_rffid(ocs_node_t *node, uint32_t timeout_s return els; } - /** * @ingroup els_api * @brief Send a GIDPT CT request. @@ -1839,7 +1831,6 @@ ocs_ns_send_gidpt(ocs_node_t *node, uint32_t timeout_s if (els == NULL) { ocs_log_err(ocs, "IO alloc failed\n"); } else { - els->iparam.fc_ct.r_ctl = FC_RCTL_ELS; els->iparam.fc_ct.type = FC_TYPE_GS; els->iparam.fc_ct.df_ctl = 0; @@ -2102,7 +2093,6 @@ ocs_els_abort_io(ocs_io_t *els, int send_abts) return abort_io; } - /* * ELS IO State Machine */ @@ -2126,7 +2116,6 @@ ocs_els_abort_io(ocs_io_t *els, int send_abts) __func__, ocs_sm_event_name(evt)); \ } while (0) - /** * @brief Cleanup an ELS IO * @@ -2160,7 +2149,6 @@ ocs_els_io_cleanup(ocs_io_t *els, ocs_sm_event_t node_ els->els_req_free = 1; } - /** * @brief Common event handler for the ELS IO state machine. * @@ -2650,7 +2638,6 @@ ocs_ddump_els(ocs_textbuf_t *textbuf, ocs_io_t *els) ocs_ddump_endsection(textbuf, "els", -1); } - /** * @brief return TRUE if given ELS list is empty (while taking proper locks) * @@ -2743,7 +2730,6 @@ ocs_send_ct_rsp(ocs_io_t *io, uint32_t ox_id, fcct_iu_ } return 0; } - /** * @brief Handle delay retry timeout Modified: head/sys/dev/ocs_fc/ocs_fabric.c ============================================================================== --- head/sys/dev/ocs_fc/ocs_fabric.c Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_fabric.c Tue Sep 1 22:02:12 2020 (r365186) @@ -166,7 +166,6 @@ __ocs_fabric_flogi_wait_rsp(ocs_sm_ctx_t *ctx, ocs_sm_ switch(evt) { case OCS_EVT_SRRS_ELS_REQ_OK: { - if (node_check_els_req(ctx, evt, arg, FC_ELS_CMD_FLOGI, __ocs_fabric_common, __func__)) { return NULL; } @@ -317,7 +316,6 @@ __ocs_fabric_fdisc_wait_rsp(ocs_sm_ctx_t *ctx, ocs_sm_ ocs_sport_attach(node->sport, cbdata->ext_status); ocs_node_transition(node, __ocs_fabric_wait_domain_attach, NULL); break; - } case OCS_EVT_SRRS_ELS_REQ_RJT: @@ -791,7 +789,6 @@ __ocs_ns_gidpt_wait_rsp(ocs_sm_ctx_t *ctx, ocs_sm_even return NULL; } - /** * @ingroup ns_sm * @brief Name services node state machine: Idle state. @@ -1513,7 +1510,6 @@ __ocs_p2p_wait_flogi_acc_cmpl(ocs_sm_ctx_t *ctx, ocs_s return NULL; } - /** * @ingroup p2p_sm Modified: head/sys/dev/ocs_fc/ocs_fabric.h ============================================================================== --- head/sys/dev/ocs_fc/ocs_fabric.h Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_fabric.h Tue Sep 1 22:02:12 2020 (r365186) @@ -36,7 +36,6 @@ * Declarations for the interface exported by ocs_fabric */ - #if !defined(__OCS_FABRIC_H__) #define __OCS_FABRIC_H__ extern void *__ocs_fabric_init(ocs_sm_ctx_t *ctx, ocs_sm_event_t evt, void *arg); Modified: head/sys/dev/ocs_fc/ocs_fcp.h ============================================================================== --- head/sys/dev/ocs_fc/ocs_fcp.h Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_fcp.h Tue Sep 1 22:02:12 2020 (r365186) @@ -95,7 +95,6 @@ #define FC_GS_NAMESERVER_RSNN_NN 0x0239 #define FC_GS_NAMESERVER_RSPN_ID 0x0218 - #define FC_GS_REVISION 0x03 #define FC_GS_IO_PARAMS { .fc_ct.r_ctl = 0x02, \ @@ -115,7 +114,6 @@ typedef struct fc_vft_header_s { hopct:8; } fc_vft_header_t; - #if BYTE_ORDER == LITTLE_ENDIAN static inline uint32_t fc_be24toh(uint32_t x) { return (ocs_be32toh(x) >> 8); } #else @@ -147,7 +145,6 @@ typedef struct fc_header_s { uint32_t parameter; } fc_header_t; - /** * @brief FC header in little-endian order */ @@ -321,7 +318,6 @@ typedef struct fc_acc_payload_s { resv1:24; } fc_acc_payload_t; - typedef struct fc_ls_rjt_payload_s { uint32_t command_code:8, resv1:24; @@ -742,6 +738,5 @@ typedef struct fcp_xfer_rdy_iu_s { } fcp_xfer_rdy_iu_t; #define MAX_ACC_REJECT_PAYLOAD (sizeof(fc_ls_rjt_payload_t) > sizeof(fc_acc_payload_t) ? sizeof(fc_ls_rjt_payload_t) : sizeof(fc_acc_payload_t)) - #endif /* !_OCS_FCP_H */ Modified: head/sys/dev/ocs_fc/ocs_hw.c ============================================================================== --- head/sys/dev/ocs_fc/ocs_hw.c Tue Sep 1 22:01:53 2020 (r365185) +++ head/sys/dev/ocs_fc/ocs_hw.c Tue Sep 1 22:02:12 2020 (r365186) @@ -126,7 +126,6 @@ static ocs_hw_rtn_e ocs_hw_config_sli_port_health_chec static int32_t ocs_hw_domain_add(ocs_hw_t *, ocs_domain_t *); static int32_t ocs_hw_domain_del(ocs_hw_t *, ocs_domain_t *); - /* Port state machine */ static void *__ocs_hw_port_alloc_init(ocs_sm_ctx_t *, ocs_sm_event_t, void *); static void *__ocs_hw_port_alloc_read_sparm64(ocs_sm_ctx_t *, ocs_sm_event_t, void *); @@ -372,7 +371,6 @@ ocs_hw_setup(ocs_hw_t *hw, ocs_os_handle_t os, sli4_po hw->config.auto_xfer_rdy_app_tag_valid = OCS_HW_AUTO_XFER_RDY_APP_TAG_VALID_DEFAULT; hw->config.auto_xfer_rdy_app_tag_value = OCS_HW_AUTO_XFER_RDY_APP_TAG_VALUE_DEFAULT; - if (sli_setup(&hw->sli, hw->os, port_type)) { ocs_log_err(hw->os, "SLI setup failed\n"); return OCS_HW_RTN_ERROR; @@ -482,7 +480,7 @@ ocs_hw_setup(ocs_hw_t *hw, ocs_os_handle_t os, sli4_po OCS_HW_MAX_NUM_EQ); return OCS_HW_RTN_ERROR; } - + if (hw->config.n_cq > OCS_HW_MAX_NUM_CQ) { ocs_log_crit(hw->os, "Max supported CQs = %d\n", OCS_HW_MAX_NUM_CQ); @@ -610,7 +608,7 @@ ocs_hw_init(ocs_hw_t *hw) if (hw->config.n_rq == 1) { hw->sli.config.features.flag.mrqp = FALSE; } - + if (sli_init(&hw->sli)) { ocs_log_err(hw->os, "SLI failed to initialize\n"); return OCS_HW_RTN_ERROR; @@ -693,7 +691,7 @@ ocs_hw_init(ocs_hw_t *hw) hw->config.n_mq, q_count); return OCS_HW_RTN_ERROR; } - + q_count = MIN(sli_get_max_queue(&hw->sli, SLI_QTYPE_RQ), OCS_HW_MAX_NUM_RQ); if (hw->config.n_rq > q_count) { @@ -723,7 +721,6 @@ ocs_hw_init(ocs_hw_t *hw) ocs_log_debug(hw->os, "Max WQs %d, hash size = %d\n", OCS_HW_MAX_NUM_WQ, OCS_HW_Q_HASH_SIZE); - rc = ocs_hw_init_queues(hw, hw->qtop); if (rc != OCS_HW_RTN_SUCCESS) { return rc; @@ -816,7 +813,6 @@ ocs_hw_init(ocs_hw_t *hw) /* Register a FCFI to allow unsolicited frames to be routed to the driver */ if (sli_get_medium(&hw->sli) == SLI_LINK_MEDIUM_FC) { - if (hw->hw_mrq_count) { ocs_log_debug(hw->os, "using REG_FCFI MRQ\n"); @@ -874,7 +870,6 @@ ocs_hw_init(ocs_hw_t *hw) } hw->fcf_indicator = ((sli4_cmd_reg_fcfi_t *)buf)->fcfi; } - } /* @@ -1180,7 +1175,6 @@ ocs_hw_teardown(ocs_hw_t *hw) } if (hw->state != OCS_HW_STATE_QUEUES_ALLOCATED) { - hw->state = OCS_HW_STATE_TEARDOWN_IN_PROGRESS; ocs_hw_flush(hw); @@ -1250,12 +1244,10 @@ ocs_hw_teardown(ocs_hw_t *hw) ocs_lock_free(&hw->io_lock); ocs_lock_free(&hw->io_abort_lock); - for (i = 0; i < hw->wq_count; i++) { sli_queue_free(&hw->sli, &hw->wq[i], destroy_queues, free_memory); } - for (i = 0; i < hw->rq_count; i++) { sli_queue_free(&hw->sli, &hw->rq[i], destroy_queues, free_memory); } @@ -1443,7 +1435,6 @@ ocs_hw_reset(ocs_hw_t *hw, ocs_hw_reset_e reset) /* Teardown the HW queue topology */ hw_queue_teardown(hw); } else { - /* Free rq buffers */ ocs_hw_rx_free(hw); } @@ -1474,7 +1465,6 @@ ocs_hw_get_fw_timed_out(ocs_hw_t *hw) sli_reg_read(&hw->sli, SLI4_REG_SLIPORT_ERROR2) == 0x10); } - ocs_hw_rtn_e ocs_hw_get(ocs_hw_t *hw, ocs_hw_property_e prop, uint32_t *value) { @@ -1803,8 +1793,6 @@ ocs_hw_get_ptr(ocs_hw_t *hw, ocs_hw_property_e prop) return rc; } - - ocs_hw_rtn_e ocs_hw_set(ocs_hw_t *hw, ocs_hw_property_e prop, uint32_t value) { @@ -2027,7 +2015,6 @@ ocs_hw_set(ocs_hw_t *hw, ocs_hw_property_e prop, uint3 return rc; } - ocs_hw_rtn_e ocs_hw_set_ptr(ocs_hw_t *hw, ocs_hw_property_e prop, void *value) { @@ -2218,7 +2205,6 @@ ocs_hw_eq_process(ocs_hw_t *hw, hw_eq_t *eq, uint32_t } } - if (eq->queue->n_posted > (eq->queue->posted_limit)) { sli_queue_arm(&hw->sli, eq->queue, FALSE); } @@ -2320,7 +2306,6 @@ ocs_hw_command(ocs_hw_t *hw, uint8_t *cmd, uint32_t op } if (OCS_CMD_POLL == opts) { - ocs_lock(&hw->cmd_lock); if (hw->mq->length && !sli_queue_is_empty(&hw->sli, hw->mq)) { /* @@ -2682,7 +2667,6 @@ ocs_hw_port_control(ocs_hw_t *hw, ocs_hw_port_e ctrl, return OCS_HW_RTN_NO_MEMORY; } - if (sli_cmd_init_link(&hw->sli, init_link, SLI4_BMBX_SIZE, speed, reset_alpa)) { rc = ocs_hw_command(hw, init_link, OCS_CMD_NOWAIT, ocs_hw_cb_port_control, NULL); @@ -2725,7 +2709,6 @@ ocs_hw_port_control(ocs_hw_t *hw, ocs_hw_port_e ctrl, return rc; } - /** * @ingroup port * @brief Free port resources. @@ -3107,7 +3090,6 @@ ocs_hw_node_free_resources(ocs_hw_t *hw, ocs_remote_no return rc; } - /** * @ingroup node * @brief Free a remote node object. @@ -4174,7 +4156,6 @@ ocs_hw_io_send(ocs_hw_t *hw, ocs_hw_io_type_e type, oc * data phase, it is marked for quarantine. */ if (hw->workaround.use_dif_sec_xri && (iparam->fcp_tgt.dif_oper != OCS_HW_DIF_OPER_DISABLED)) { - /* * If we have allocated a chained SGL for skyhawk, then * we can re-use this for the sec_hio. @@ -5030,7 +5011,6 @@ ocs_hw_io_get_xid(ocs_hw_t *hw, ocs_hw_io_t *io) return io->indicator; } - typedef struct ocs_hw_fw_write_cb_arg { ocs_hw_fw_cb_t cb; void *arg; @@ -5604,7 +5584,6 @@ ocs_hw_get_host_stats(ocs_hw_t *hw, uint8_t cc, ocs_hw return rc; } - /** * @brief Called when the READ_STATUS command completes. * @@ -5649,7 +5628,6 @@ ocs_hw_cb_host_stat(ocs_hw_t *hw, int32_t status, uint counts[OCS_HW_HOST_STAT_DROP_FRM_DUE_TO_NO_XRI_COUNT].counter = mbox_rsp->dropped_frames_due_to_no_xri_count; counts[OCS_HW_HOST_STAT_EMPTY_XRI_POOL_COUNT].counter = mbox_rsp->empty_xri_pool_count; - if (cb_arg) { if (cb_arg->cb) { if ((status == 0) && mbox_rsp->hdr.status) { @@ -6100,7 +6078,6 @@ ocs_hw_get_linkcfg_lancer(ocs_hw_t *hw, uint32_t opts, return rc; } - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 22:02:39 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2E0FC37DF0F; Tue, 1 Sep 2020 22:02:39 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Jt2zPcz4cLt; Tue, 1 Sep 2020 22:02:36 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D0E1220061; Tue, 1 Sep 2020 22:02:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M2Xq9054765; Tue, 1 Sep 2020 22:02:33 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M2X7r054760; Tue, 1 Sep 2020 22:02:33 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012202.081M2X7r054760@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:02:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365187 - head/sys/dev/oce X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/oce X-SVN-Commit-Revision: 365187 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:02:39 -0000 Author: mjg Date: Tue Sep 1 22:02:32 2020 New Revision: 365187 URL: https://svnweb.freebsd.org/changeset/base/365187 Log: oce: clean up empty lines in .c and .h files Modified: head/sys/dev/oce/oce_hw.c head/sys/dev/oce/oce_hw.h head/sys/dev/oce/oce_if.c head/sys/dev/oce/oce_if.h head/sys/dev/oce/oce_mbox.c head/sys/dev/oce/oce_queue.c head/sys/dev/oce/oce_sysctl.c head/sys/dev/oce/oce_user.h head/sys/dev/oce/oce_util.c Modified: head/sys/dev/oce/oce_hw.c ============================================================================== --- head/sys/dev/oce/oce_hw.c Tue Sep 1 22:02:12 2020 (r365186) +++ head/sys/dev/oce/oce_hw.c Tue Sep 1 22:02:32 2020 (r365187) @@ -40,7 +40,6 @@ /* $FreeBSD$ */ - #include "oce_if.h" static int oce_POST(POCE_SOFTC sc); @@ -98,7 +97,7 @@ oce_hw_init(POCE_SOFTC sc) rc = oce_POST(sc); if (rc) return rc; - + /* create the bootstrap mailbox */ rc = oce_dma_alloc(sc, sizeof(struct oce_bmbx), &sc->bsmbx, 0); if (rc) { @@ -115,30 +114,27 @@ oce_hw_init(POCE_SOFTC sc) if (rc) goto error; - rc = oce_get_fw_version(sc); if (rc) goto error; - rc = oce_get_fw_config(sc); if (rc) goto error; - sc->macaddr.size_of_struct = 6; rc = oce_read_mac_addr(sc, 0, 1, MAC_ADDRESS_TYPE_NETWORK, &sc->macaddr); if (rc) goto error; - + if ((IS_BE(sc) && (sc->flags & OCE_FLAGS_BE3)) || IS_SH(sc)) { rc = oce_mbox_check_native_mode(sc); if (rc) goto error; } else sc->be3_native = 0; - + return rc; error: @@ -147,8 +143,6 @@ error: return rc; } - - /** * @brief Releases the obtained pci resources * @param sc software handle to the device @@ -194,9 +188,6 @@ oce_hw_pci_free(POCE_SOFTC sc) } } - - - /** * @brief Function to get the PCI capabilities * @param sc software handle to the device @@ -284,7 +275,7 @@ oce_hw_pci_alloc(POCE_SOFTC sc) if (intf.bits.sli_valid != OCE_INTF_VALID_SIG) goto error; - + if (intf.bits.sli_rev != OCE_INTF_SLI_REV4) { device_printf(sc->dev, "Adapter doesnt support SLI4\n"); goto error; @@ -329,7 +320,6 @@ error: return ENXIO; } - /** * @brief Function for device shutdown * @param sc software handle to the device @@ -363,7 +353,6 @@ oce_hw_shutdown(POCE_SOFTC sc) oce_dma_free(sc, &sc->bsmbx); } - /** * @brief Function for creating nw interface. * @param sc software handle to the device @@ -480,7 +469,7 @@ oce_hw_start(POCE_SOFTC sc) rc = oce_get_link_status(sc, &link); if (rc) return 1; - + if (link.logical_link_status == NTWK_LOGICAL_LINK_UP) { sc->link_status = NTWK_LOGICAL_LINK_UP; if_link_state_change(sc->ifp, LINK_STATE_UP); @@ -493,7 +482,7 @@ oce_hw_start(POCE_SOFTC sc) sc->qos_link_speed = (uint32_t )link.qos_link_speed * 10; rc = oce_start_mq(sc->mq); - + /* we need to get MCC aync events. So enable intrs and arm first EQ, Other EQs will be armed after interface is UP */ @@ -508,7 +497,6 @@ oce_hw_start(POCE_SOFTC sc) return rc; } - /** * @brief Function for hardware enable interupts. * @param sc software handle to the device @@ -524,7 +512,6 @@ oce_hw_intr_enable(POCE_SOFTC sc) } - /** * @brief Function for hardware disable interupts * @param sc software handle to the device @@ -533,13 +520,12 @@ void oce_hw_intr_disable(POCE_SOFTC sc) { uint32_t reg; - + reg = OCE_READ_REG32(sc, devcfg, PCICFG_INTR_CTRL); reg &= ~HOSTINTR_MASK; OCE_WRITE_REG32(sc, devcfg, PCICFG_INTR_CTRL, reg); } - static u_int oce_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) { @@ -554,7 +540,6 @@ oce_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_i return (1); } - /** * @brief Function for hardware update multicast filter * @param sc software handle to the device @@ -589,4 +574,3 @@ oce_hw_update_multicast(POCE_SOFTC sc) oce_dma_free(sc, &dma); return rc; } - Modified: head/sys/dev/oce/oce_hw.h ============================================================================== --- head/sys/dev/oce/oce_hw.h Tue Sep 1 22:02:12 2020 (r365186) +++ head/sys/dev/oce/oce_hw.h Tue Sep 1 22:02:32 2020 (r365187) @@ -61,7 +61,6 @@ #define INTR_EN 0x20000000 #define IMAGE_TRANSFER_SIZE (32 * 1024) /* 32K at a time */ - /********* UE Status and Mask Registers ***/ #define PCICFG_UE_STATUS_LOW 0xA0 #define PCICFG_UE_STATUS_HIGH 0xA4 @@ -271,8 +270,6 @@ typedef union pci_sli_intf_u { } bits; } pci_sli_intf_t; - - /* physical address structure to be used in MBX */ struct phys_addr { /* dw0 */ @@ -281,8 +278,6 @@ struct phys_addr { uint32_t hi; }; - - typedef union pcicfg_intr_ctl_u { uint32_t dw0; struct { @@ -304,9 +299,6 @@ typedef union pcicfg_intr_ctl_u { } bits; } pcicfg_intr_ctl_t; - - - typedef union pcicfg_semaphore_u { uint32_t dw0; struct { @@ -320,9 +312,6 @@ typedef union pcicfg_semaphore_u { } bits; } pcicfg_semaphore_t; - - - typedef union pcicfg_soft_reset_u { uint32_t dw0; struct { @@ -344,9 +333,6 @@ typedef union pcicfg_soft_reset_u { } bits; } pcicfg_soft_reset_t; - - - typedef union pcicfg_online1_u { uint32_t dw0; struct { @@ -400,8 +386,6 @@ typedef union pcicfg_online1_u { } bits; } pcicfg_online1_t; - - typedef union mpu_ep_semaphore_u { uint32_t dw0; struct { @@ -427,9 +411,6 @@ typedef union mpu_ep_semaphore_u { } bits; } mpu_ep_semaphore_t; - - - typedef union mpu_ep_control_u { uint32_t dw0; struct { @@ -453,9 +434,6 @@ typedef union mpu_ep_control_u { } bits; } mpu_ep_control_t; - - - /* RX doorbell */ typedef union pd_rxulp_db_u { uint32_t dw0; @@ -474,7 +452,6 @@ typedef union pd_rxulp_db_u { } bits; } pd_rxulp_db_t; - /* TX doorbell */ typedef union pd_txulp_db_u { uint32_t dw0; @@ -777,7 +754,6 @@ struct oce_async_event_qnq { uint32_t code; } ; - typedef union oce_mq_ext_ctx_u { uint32_t dw[6]; struct { @@ -861,7 +837,6 @@ typedef union oce_mq_ext_ctx_u { } oce_mq_ext_ctx_t; - /* MQ mailbox structure */ struct oce_bmbx { struct oce_mbx mbx; @@ -1554,8 +1529,6 @@ struct mbx_create_common_mq_ex { } params; }; - - /* [53] OPCODE_COMMON_DESTROY_MQ */ struct mbx_destroy_common_mq { struct mbx_hdr hdr; @@ -1710,7 +1683,6 @@ struct mbx_common_query_fw_config { uint32_t port_id; /* used for stats retrieval */ uint32_t function_mode; struct { - uint32_t ulp_mode; uint32_t nic_wqid_base; uint32_t nic_wq_tot; @@ -1806,7 +1778,6 @@ enum CQFW_FUNCTION_MODES_SUPPORTED { FNM_VNIC_DEF_EN = 0x800000 /* Set when VNIC Default enabled */ }; - struct mbx_common_config_vlan { struct mbx_hdr hdr; union { @@ -2098,7 +2069,6 @@ struct mbx_common_get_func_config { } params; }; - /* OPCODE_COMMON_GET_PROFILE_CONFIG */ struct mbx_common_get_profile_config { @@ -2150,7 +2120,6 @@ struct oce_nic_resc_desc { }; - struct flash_file_hdr { uint8_t sign[52]; uint8_t ufi_version[4]; @@ -2198,7 +2167,6 @@ struct flash_sec_info { struct flash_section_entry fsec_entry[32]; }; - enum LOWLEVEL_SUBSYSTEM_OPCODES { /* Opcodes used for lowlevel functions common to many subystems. * Some of these opcodes are used for diagnostic functions only. @@ -2896,8 +2864,6 @@ struct mbx_delete_nic_wq { } params; }; - - struct mbx_create_nic_rq { struct mbx_hdr hdr; union { @@ -2921,8 +2887,6 @@ struct mbx_create_nic_rq { } params; }; - - /* [10] NIC_DELETE_RQ */ struct mbx_delete_nic_rq { /* dw0 - dw3 */ @@ -2947,9 +2911,6 @@ struct mbx_delete_nic_rq { } params; }; - - - struct oce_port_rxf_stats_v0 { uint32_t rx_bytes_lsd; /* dword 0*/ uint32_t rx_bytes_msd; /* dword 1*/ @@ -3019,7 +2980,6 @@ struct oce_port_rxf_stats_v0 { uint32_t rx_input_fifo_overflow_drop; /* dword 65*/ }; - struct oce_rxf_stats_v0 { struct oce_port_rxf_stats_v0 port[2]; uint32_t rx_drops_no_pbuf; /* dword 132*/ @@ -3090,7 +3050,6 @@ struct oce_port_rxf_stats_v2 { uint32_t rsvd7[19]; }; - struct oce_port_rxf_stats_v1 { uint32_t rsvd0[12]; uint32_t rx_crc_errors; @@ -3167,7 +3126,6 @@ struct oce_erx_stats_v1 { uint32_t rsvd[4]; }; - struct oce_erx_stats_v0 { uint32_t rx_drops_no_fragments[44]; uint32_t rsvd[4]; @@ -3186,7 +3144,6 @@ struct oce_hw_stats_v2 { uint32_t rsvd1[18]; }; - struct oce_hw_stats_v1 { struct oce_rxf_stats_v1 rxf; uint32_t rsvd0[OCE_TXP_SW_SZ]; @@ -3445,7 +3402,6 @@ struct mbx_get_queue_stats { } params; }; - /* [01] NIC_CONFIG_RSS */ #define OCE_HASH_TBL_SZ 10 #define OCE_CPU_TBL_SZ 128 @@ -3478,11 +3434,9 @@ struct mbx_config_nic_rss { } rsp; } params; }; - #pragma pack() - typedef uint32_t oce_stat_t; /* statistic counter */ enum OCE_RXF_PORT_STATS { @@ -3885,7 +3839,6 @@ struct mbx_nic_set_iface_lro_config { } params; }; - struct mbx_create_nic_rq_v2 { struct mbx_hdr hdr; union { @@ -4074,7 +4027,7 @@ struct nic_hwlro_singleton_cqe { uint32_t debug:7; uint32_t cqe_type:2; uint32_t valid:1; - + /* dw 3 */ uint32_t rss_hash_value; #endif Modified: head/sys/dev/oce/oce_if.c ============================================================================== --- head/sys/dev/oce/oce_if.c Tue Sep 1 22:02:12 2020 (r365186) +++ head/sys/dev/oce/oce_if.c Tue Sep 1 22:02:32 2020 (r365187) @@ -132,7 +132,6 @@ struct oce_common_cqe_info{ uint16_t vtag; }; - /* Driver entry points prototypes */ static int oce_probe(device_t dev); static int oce_attach(device_t dev); @@ -190,7 +189,6 @@ static void oce_get_config(POCE_SOFTC sc); static struct mbuf *oce_insert_vlan_tag(POCE_SOFTC sc, struct mbuf *m, boolean_t *complete); static void oce_read_env_variables(POCE_SOFTC sc); - /* IP specific */ #if defined(INET6) || defined(INET) static int oce_init_lro(POCE_SOFTC sc); @@ -213,7 +211,6 @@ static driver_t oce_driver = { }; static devclass_t oce_devclass; - /* global vars */ const char component_revision[32] = {"///" COMPONENT_REVISION "///"}; @@ -225,7 +222,6 @@ uint32_t oce_rq_buf_size = 2048; TUNABLE_INT("hw.oce.max_rsp_handled", &oce_max_rsp_handled); TUNABLE_INT("hw.oce.enable_rss", &oce_enable_rss); - /* Supported devices table */ static uint32_t supportedDevices[] = { (PCI_VENDOR_SERVERENGINES << 16) | PCI_PRODUCT_BE2, @@ -236,7 +232,6 @@ static uint32_t supportedDevices[] = { (PCI_VENDOR_EMULEX << 16) | PCI_PRODUCT_SH }; - DRIVER_MODULE(oce, pci, oce_driver, oce_devclass, 0, 0); MODULE_PNP_INFO("W32:vendor/device", pci, oce, supportedDevices, nitems(supportedDevices)); @@ -244,7 +239,6 @@ MODULE_DEPEND(oce, pci, 1, 1, 1); MODULE_DEPEND(oce, ether, 1, 1, 1); MODULE_VERSION(oce, 1); - POCE_SOFTC softc_head = NULL; POCE_SOFTC softc_tail = NULL; @@ -302,7 +296,6 @@ oce_probe(device_t dev) return ENXIO; } - static int oce_attach(device_t dev) { @@ -414,7 +407,6 @@ pci_res_free: } - static int oce_detach(device_t dev) { @@ -441,7 +433,7 @@ oce_detach(device_t dev) UNLOCK(&sc->dev_lock); callout_drain(&sc->timer); - + if (sc->vlan_attach != NULL) EVENTHANDLER_DEREGISTER(vlan_config, sc->vlan_attach); if (sc->vlan_detach != NULL) @@ -458,18 +450,16 @@ oce_detach(device_t dev) return 0; } - static int oce_shutdown(device_t dev) { int rc; - + rc = oce_detach(dev); return rc; } - static int oce_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { @@ -481,7 +471,6 @@ oce_ioctl(struct ifnet *ifp, u_long command, caddr_t d uint32_t u; switch (command) { - case SIOCGIFMEDIA: rc = ifmedia_ioctl(ifp, ifr, &sc->media, command); break; @@ -634,24 +623,22 @@ oce_ioctl(struct ifnet *ifp, u_long command, caddr_t d return rc; } - static void oce_init(void *arg) { POCE_SOFTC sc = arg; - + LOCK(&sc->dev_lock); if (sc->ifp->if_flags & IFF_UP) { oce_if_deactivate(sc); oce_if_activate(sc); } - + UNLOCK(&sc->dev_lock); } - static int oce_multiq_start(struct ifnet *ifp, struct mbuf *m) { @@ -676,7 +663,6 @@ oce_multiq_start(struct ifnet *ifp, struct mbuf *m) } - static void oce_multiq_flush(struct ifnet *ifp) { @@ -691,8 +677,6 @@ oce_multiq_flush(struct ifnet *ifp) if_qflush(ifp); } - - /***************************************************************************** * Driver interrupt routines functions * *****************************************************************************/ @@ -708,7 +692,6 @@ oce_intr(void *arg, int pending) struct oce_cq *cq = NULL; int i, num_eqes = 0; - bus_dmamap_sync(eq->ring->dma.tag, eq->ring->dma.map, BUS_DMASYNC_POSTWRITE); do { @@ -722,7 +705,7 @@ oce_intr(void *arg, int pending) num_eqes++; } while (TRUE); - + if (!num_eqes) goto eq_arm; /* Spurious */ @@ -747,7 +730,6 @@ eq_arm: return; } - static int oce_setup_intr(POCE_SOFTC sc) { @@ -816,7 +798,6 @@ error: return rc; } - static int oce_fast_isr(void *arg) { @@ -835,7 +816,6 @@ oce_fast_isr(void *arg) return FILTER_HANDLED; } - static int oce_alloc_intr(POCE_SOFTC sc, int vector, void (*isr) (void *arg, int pending)) { @@ -885,12 +865,11 @@ oce_alloc_intr(POCE_SOFTC sc, int vector, void (*isr) } - void oce_intr_free(POCE_SOFTC sc) { int i = 0; - + for (i = 0; i < sc->intr_count; i++) { if (sc->intrs[i].tag != NULL) @@ -912,8 +891,6 @@ oce_intr_free(POCE_SOFTC sc) } - - /****************************************************************************** * Media callbacks functions * ******************************************************************************/ @@ -923,15 +900,14 @@ oce_media_status(struct ifnet *ifp, struct ifmediareq { POCE_SOFTC sc = (POCE_SOFTC) ifp->if_softc; - req->ifm_status = IFM_AVALID; req->ifm_active = IFM_ETHER; - + if (sc->link_status == 1) req->ifm_status |= IFM_ACTIVE; else return; - + switch (sc->link_speed) { case 1: /* 10 Mbps */ req->ifm_active |= IFM_10_T | IFM_FDX; @@ -965,18 +941,16 @@ oce_media_status(struct ifnet *ifp, struct ifmediareq sc->speed = 0; break; } - + return; } - int oce_media_change(struct ifnet *ifp) { return 0; } - static void oce_is_pkt_dest_bmc(POCE_SOFTC sc, struct mbuf *m, boolean_t *os2bmc, struct mbuf **m_new) @@ -1050,8 +1024,6 @@ done: } } - - /***************************************************************************** * Transmit routines functions * *****************************************************************************/ @@ -1094,7 +1066,6 @@ oce_tx(POCE_SOFTC sc, struct mbuf **mpp, int wq_index) device_printf(sc->dev, "Insertion unsuccessful\n"); return 0; } - } /* Lancer, SH ASIC has a bug wherein Packets that are 32 bytes or less @@ -1123,7 +1094,6 @@ tx_start: } } - pd = &wq->pckts[wq->pkt_desc_head]; retry: @@ -1252,7 +1222,7 @@ retry: m = m_new; goto tx_start; } - + return 0; free_ret: @@ -1261,7 +1231,6 @@ free_ret: return rc; } - static void oce_process_tx_completion(struct oce_wq *wq) { @@ -1280,7 +1249,6 @@ oce_process_tx_completion(struct oce_wq *wq) m_freem(m); pd->mbuf = NULL; - if (sc->ifp->if_drv_flags & IFF_DRV_OACTIVE) { if (wq->ring->num_used < (wq->ring->num_items / 2)) { sc->ifp->if_drv_flags &= ~(IFF_DRV_OACTIVE); @@ -1289,7 +1257,6 @@ oce_process_tx_completion(struct oce_wq *wq) } } - static void oce_tx_restart(POCE_SOFTC sc, struct oce_wq *wq) { @@ -1302,7 +1269,6 @@ oce_tx_restart(POCE_SOFTC sc, struct oce_wq *wq) } - #if defined(INET6) || defined(INET) static struct mbuf * oce_tso_setup(POCE_SOFTC sc, struct mbuf **mpp) @@ -1318,7 +1284,7 @@ oce_tso_setup(POCE_SOFTC sc, struct mbuf **mpp) struct tcphdr *th; uint16_t etype; int total_len = 0, ehdrlen = 0; - + m = *mpp; if (M_WRITABLE(m) == 0) { @@ -1362,13 +1328,13 @@ oce_tso_setup(POCE_SOFTC sc, struct mbuf **mpp) default: return NULL; } - + m = m_pullup(m, total_len); if (!m) return NULL; *mpp = m; return m; - + } #endif /* INET6 || INET */ @@ -1389,7 +1355,6 @@ oce_tx_task(void *arg, int npending) UNLOCK(&wq->tx_lock); } - void oce_start(struct ifnet *ifp) { @@ -1404,7 +1369,7 @@ oce_start(struct ifnet *ifp) if (!sc->link_status) return; - + while (true) { IF_DEQUEUE(&sc->ifp->if_snd, m); if (m == NULL) @@ -1425,7 +1390,6 @@ oce_start(struct ifnet *ifp) } } - /* Handle the Completion Queue for transmit */ uint16_t oce_wq_handler(void *arg) @@ -1460,12 +1424,11 @@ oce_wq_handler(void *arg) if (num_cqes) oce_arm_cq(sc, cq->cq_id, num_cqes, FALSE); - + UNLOCK(&wq->tx_compl_lock); return num_cqes; } - static int oce_multiq_transmit(struct ifnet *ifp, struct mbuf *m, struct oce_wq *wq) { @@ -1505,9 +1468,6 @@ oce_multiq_transmit(struct ifnet *ifp, struct mbuf *m, return 0; } - - - /***************************************************************************** * Receive routines functions * *****************************************************************************/ @@ -1730,7 +1690,7 @@ oce_rx(struct oce_rq *rq, struct oce_nic_rx_cqe *cqe) vtag = BSWAP_16(cqe->u0.s.vlan_tag); else vtag = cqe->u0.s.vlan_tag; - + cq_info.l4_cksum_pass = cqe->u0.s.l4_cksum_pass; cq_info.ip_cksum_pass = cqe->u0.s.ip_cksum_pass; cq_info.ipv6_frame = cqe->u0.s.ip_ver; @@ -1773,7 +1733,6 @@ oce_rx(struct oce_rq *rq, struct oce_nic_rx_cqe *cqe) (cqe->u0.s.l4_cksum_pass) && (!cqe->u0.s.ip_ver) && (rq->lro.lro_cnt != 0)) { - if (tcp_lro_rx(&rq->lro, m, 0) == 0) { rq->lro_pkts_queued ++; goto post_done; @@ -1781,7 +1740,7 @@ oce_rx(struct oce_rq *rq, struct oce_nic_rx_cqe *cqe) /* If LRO posting fails then try to post to STACK */ } #endif - + (*sc->ifp->if_input) (sc->ifp, m); #if defined(INET6) || defined(INET) post_done: @@ -1799,7 +1758,6 @@ exit: return; } - void oce_discard_rx_comp(struct oce_rq *rq, int num_frags) { @@ -1826,7 +1784,6 @@ oce_discard_rx_comp(struct oce_rq *rq, int num_frags) } } - static int oce_cqe_vtp_valid(POCE_SOFTC sc, struct oce_nic_rx_cqe *cqe) { @@ -1838,12 +1795,11 @@ oce_cqe_vtp_valid(POCE_SOFTC sc, struct oce_nic_rx_cqe vtp = cqe_v1->u0.s.vlan_tag_present; } else vtp = cqe->u0.s.vlan_tag_present; - + return vtp; } - static int oce_cqe_portid_valid(POCE_SOFTC sc, struct oce_nic_rx_cqe *cqe) { @@ -1857,7 +1813,7 @@ oce_cqe_portid_valid(POCE_SOFTC sc, struct oce_nic_rx_ return 0; } else ;/* For BE3 legacy and Lancer this is dummy */ - + return 1; } @@ -1874,11 +1830,10 @@ oce_rx_flush_lro(struct oce_rq *rq) tcp_lro_flush_all(lro); rq->lro_pkts_queued = 0; - + return; } - static int oce_init_lro(POCE_SOFTC sc) { @@ -1898,7 +1853,6 @@ oce_init_lro(POCE_SOFTC sc) return rc; } - void oce_free_lro(POCE_SOFTC sc) { @@ -1991,7 +1945,7 @@ oce_alloc_rx_bufs(struct oce_rq *rq, int count) } } } - + return 0; } @@ -2143,9 +2097,6 @@ oce_rq_handler(void *arg) } - - - /***************************************************************************** * Helper function prototypes in this file * *****************************************************************************/ @@ -2191,7 +2142,7 @@ oce_attach_ifp(POCE_SOFTC sc) sc->ifp->if_capabilities |= IFCAP_LRO; sc->ifp->if_capabilities |= IFCAP_VLAN_HWTSO; #endif - + sc->ifp->if_capenable = sc->ifp->if_capabilities; sc->ifp->if_baudrate = IF_Gbps(10); @@ -2200,11 +2151,10 @@ oce_attach_ifp(POCE_SOFTC sc) sc->ifp->if_hw_tsomaxsegsize = 4096; ether_ifattach(sc->ifp, sc->macaddr.mac_addr); - + return 0; } - static void oce_add_vlan(void *arg, struct ifnet *ifp, uint16_t vtag) { @@ -2221,7 +2171,6 @@ oce_add_vlan(void *arg, struct ifnet *ifp, uint16_t vt oce_vid_config(sc); } - static void oce_del_vlan(void *arg, struct ifnet *ifp, uint16_t vtag) { @@ -2237,7 +2186,6 @@ oce_del_vlan(void *arg, struct ifnet *ifp, uint16_t vt oce_vid_config(sc); } - /* * A max of 64 vlans can be configured in BE. If the user configures * more, place the card in vlan promiscuous mode. @@ -2266,14 +2214,12 @@ oce_vid_config(POCE_SOFTC sc) return status; } - static void oce_mac_addr_set(POCE_SOFTC sc) { uint32_t old_pmac_id = sc->pmac_id; int status = 0; - status = bcmp((IF_LLADDR(sc->ifp)), sc->macaddr.mac_addr, sc->macaddr.size_of_struct); if (!status) @@ -2291,7 +2237,6 @@ oce_mac_addr_set(POCE_SOFTC sc) } - static int oce_handle_passthrough(struct ifnet *ifp, caddr_t data) { @@ -2501,22 +2446,21 @@ static void oce_detect_hw_error(POCE_SOFTC sc) } - static void oce_local_timer(void *arg) { POCE_SOFTC sc = arg; int i = 0; - + oce_detect_hw_error(sc); oce_refresh_nic_stats(sc); oce_refresh_queue_stats(sc); oce_mac_addr_set(sc); - + /* TX Watch Dog*/ for (i = 0; i < sc->nwqs; i++) oce_tx_restart(sc, sc->wq[i]); - + /* calculate and set the eq delay for optimal interrupt rate */ if (IS_BE(sc) || IS_SH(sc)) oce_eqd_set_periodic(sc); @@ -2613,7 +2557,6 @@ oce_if_deactivate(POCE_SOFTC sc) DELAY(10); } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 22:02:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EFF8B37DDA8; Tue, 1 Sep 2020 22:02:55 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1KC66HTz4cBw; Tue, 1 Sep 2020 22:02:55 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B55DB205DD; Tue, 1 Sep 2020 22:02:55 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M2tdS054838; Tue, 1 Sep 2020 22:02:55 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M2tVB054837; Tue, 1 Sep 2020 22:02:55 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012202.081M2tVB054837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:02:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365188 - head/sys/dev/nvram2env X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/nvram2env X-SVN-Commit-Revision: 365188 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:02:56 -0000 Author: mjg Date: Tue Sep 1 22:02:55 2020 New Revision: 365188 URL: https://svnweb.freebsd.org/changeset/base/365188 Log: nvram2env: clean up empty lines in .c and .h files Modified: head/sys/dev/nvram2env/nvram2env.c head/sys/dev/nvram2env/nvram2env.h Modified: head/sys/dev/nvram2env/nvram2env.c ============================================================================== --- head/sys/dev/nvram2env/nvram2env.c Tue Sep 1 22:02:32 2020 (r365187) +++ head/sys/dev/nvram2env/nvram2env.c Tue Sep 1 22:02:55 2020 (r365188) @@ -87,7 +87,6 @@ nvram2env_probe(device_t dev) &sc->flags) != 0 || sc->flags == 0) sc->flags = NVRAM_FLAGS_GENERIC; - for (i = 0; i < 2; i ++) { switch (i) { @@ -160,7 +159,6 @@ static uint32_t read_4(struct nvram2env_softc * sc, in return (bus_space_read_4(sc->bst, sc->bsh, offset)); } - int nvram2env_attach(device_t dev) { @@ -187,10 +185,8 @@ nvram2env_attach(device_t dev) size = (size > sc->maxsize)?sc->maxsize:size; - if (sig == sc->sig || (sc->flags & NVRAM_FLAGS_UBOOT)) { - /* align size to 32bit size*/ size += 3; size &= ~3; @@ -229,7 +225,6 @@ nvram2env_attach(device_t dev) /* iterate over buffer till end. tmp points to end of NVRAM */ for ( ; pair < (char*)tmp; pair += strlen(pair) + strlen(value) + 2 ) { - if (!pair || (strlen(pair) == 0)) break; @@ -266,7 +261,6 @@ nvram2env_attach(device_t dev) bootverbose = strtoul(value, 0, 0); if (strcmp(pair, "boothowto" ) == 0) boothowto = strtoul(value, 0, 0); - } free(nv, M_DEVBUF); } Modified: head/sys/dev/nvram2env/nvram2env.h ============================================================================== --- head/sys/dev/nvram2env/nvram2env.h Tue Sep 1 22:02:32 2020 (r365187) +++ head/sys/dev/nvram2env/nvram2env.h Tue Sep 1 22:02:55 2020 (r365188) @@ -27,7 +27,6 @@ * $FreeBSD$ */ - #ifndef NVRAM2ENV_NVRAM2ENV_H_ #define NVRAM2ENV_NVRAM2ENV_H_ From owner-svn-src-all@freebsd.org Tue Sep 1 22:03:13 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4335137E014; Tue, 1 Sep 2020 22:03:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1KY15Hdz4cHf; Tue, 1 Sep 2020 22:03:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09CDB20703; Tue, 1 Sep 2020 22:03:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M3CWh054909; Tue, 1 Sep 2020 22:03:12 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M3BM6054898; Tue, 1 Sep 2020 22:03:11 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012203.081M3BM6054898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:03:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365189 - head/sys/dev/nvme X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/nvme X-SVN-Commit-Revision: 365189 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:03:13 -0000 Author: mjg Date: Tue Sep 1 22:03:10 2020 New Revision: 365189 URL: https://svnweb.freebsd.org/changeset/base/365189 Log: nvme: clean up empty lines in .c and .h files Modified: head/sys/dev/nvme/nvme.c head/sys/dev/nvme/nvme.h head/sys/dev/nvme/nvme_ctrlr.c head/sys/dev/nvme/nvme_pci.c head/sys/dev/nvme/nvme_private.h head/sys/dev/nvme/nvme_qpair.c head/sys/dev/nvme/nvme_sysctl.c head/sys/dev/nvme/nvme_test.c head/sys/dev/nvme/nvme_util.c Modified: head/sys/dev/nvme/nvme.c ============================================================================== --- head/sys/dev/nvme/nvme.c Tue Sep 1 22:02:55 2020 (r365188) +++ head/sys/dev/nvme/nvme.c Tue Sep 1 22:03:10 2020 (r365189) @@ -52,7 +52,6 @@ struct nvme_consumer nvme_consumer[NVME_MAX_CONSUMERS] uma_zone_t nvme_request_zone; int32_t nvme_retry_count; - MALLOC_DEFINE(M_NVME, "nvme", "nvme(4) memory allocations"); devclass_t nvme_devclass; Modified: head/sys/dev/nvme/nvme.h ============================================================================== --- head/sys/dev/nvme/nvme.h Tue Sep 1 22:02:55 2020 (r365188) +++ head/sys/dev/nvme/nvme.h Tue Sep 1 22:03:10 2020 (r365189) @@ -576,7 +576,6 @@ struct nvme_command _Static_assert(sizeof(struct nvme_command) == 16 * 4, "bad size for nvme_command"); struct nvme_completion { - /* dword 0 */ uint32_t cdw0; /* command-specific */ @@ -871,7 +870,6 @@ _Static_assert(sizeof(struct nvme_power_state) == 32, #define NVME_FIRMWARE_REVISION_LENGTH 8 struct nvme_controller_data { - /* bytes 0-255: controller capabilities and features */ /** pci vendor id */ @@ -1117,7 +1115,6 @@ struct nvme_controller_data { _Static_assert(sizeof(struct nvme_controller_data) == 4096, "bad size for nvme_controller_data"); struct nvme_namespace_data { - /** namespace size */ uint64_t nsze; @@ -1231,7 +1228,6 @@ struct nvme_namespace_data { _Static_assert(sizeof(struct nvme_namespace_data) == 4096, "bad size for nvme_namepsace_data"); enum nvme_log_page { - /* 0x00 - reserved */ NVME_LOG_ERROR = 0x01, NVME_LOG_HEALTH_INFORMATION = 0x02, @@ -1272,7 +1268,6 @@ enum nvme_log_page { }; struct nvme_error_information_entry { - uint64_t error_count; uint16_t sqid; uint16_t cid; @@ -1291,7 +1286,6 @@ struct nvme_error_information_entry { _Static_assert(sizeof(struct nvme_error_information_entry) == 64, "bad size for nvme_error_information_entry"); struct nvme_health_information_page { - uint8_t critical_warning; uint16_t temperature; uint8_t available_spare; @@ -1336,7 +1330,6 @@ struct nvme_health_information_page { _Static_assert(sizeof(struct nvme_health_information_page) == 512, "bad size for nvme_health_information_page"); struct nvme_firmware_page { - uint8_t afi; uint8_t reserved[7]; uint64_t revision[7]; /* revisions for 7 slots */ @@ -1456,7 +1449,6 @@ _Static_assert(sizeof(struct nvme_resv_status_ext) == #define NVME_TEST_MAX_THREADS 128 struct nvme_io_test { - enum nvme_nvm_opcode opc; uint32_t size; uint32_t time; /* in seconds */ @@ -1466,7 +1458,6 @@ struct nvme_io_test { }; enum nvme_io_test_flags { - /* * Specifies whether dev_refthread/dev_relthread should be * called during NVME_BIO_TEST. Ignored for other test @@ -1476,7 +1467,6 @@ enum nvme_io_test_flags { }; struct nvme_pt_command { - /* * cmd is used to specify a passthrough command to a controller or * namespace. @@ -1854,7 +1844,6 @@ void nvme_health_information_page_swapbytes(struct nvm s->ttftmt1 = le32toh(s->ttftmt1); s->ttftmt2 = le32toh(s->ttftmt2); } - static inline void nvme_firmware_page_swapbytes(struct nvme_firmware_page *s) Modified: head/sys/dev/nvme/nvme_ctrlr.c ============================================================================== --- head/sys/dev/nvme/nvme_ctrlr.c Tue Sep 1 22:02:55 2020 (r365188) +++ head/sys/dev/nvme/nvme_ctrlr.c Tue Sep 1 22:03:10 2020 (r365189) @@ -745,7 +745,6 @@ nvme_ctrlr_async_event_log_page_cb(void *arg, const st } } - /* * Pass the cpl data from the original async event completion, * not the log page fetch. Modified: head/sys/dev/nvme/nvme_pci.c ============================================================================== --- head/sys/dev/nvme/nvme_pci.c Tue Sep 1 22:02:55 2020 (r365188) +++ head/sys/dev/nvme/nvme_pci.c Tue Sep 1 22:03:10 2020 (r365189) @@ -93,7 +93,6 @@ static struct _pcsid { 0x00000000, 0, 0, NULL } }; - static int nvme_match(uint32_t devid, uint16_t subdevice, struct _pcsid *ep) { Modified: head/sys/dev/nvme/nvme_private.h ============================================================================== --- head/sys/dev/nvme/nvme_private.h Tue Sep 1 22:02:55 2020 (r365188) +++ head/sys/dev/nvme/nvme_private.h Tue Sep 1 22:03:10 2020 (r365189) @@ -118,7 +118,6 @@ extern int32_t nvme_retry_count; extern bool nvme_verbose_cmd_dump; struct nvme_completion_poll_status { - struct nvme_completion cpl; int done; }; @@ -132,7 +131,6 @@ extern devclass_t nvme_devclass; #define NVME_REQUEST_CCB 5 struct nvme_request { - struct nvme_command cmd; struct nvme_qpair *qpair; union { @@ -149,7 +147,6 @@ struct nvme_request { }; struct nvme_async_event_request { - struct nvme_controller *ctrlr; struct nvme_request *req; struct nvme_completion cpl; @@ -159,7 +156,6 @@ struct nvme_async_event_request { }; struct nvme_tracker { - TAILQ_ENTRY(nvme_tracker) tailq; struct nvme_request *req; struct nvme_qpair *qpair; @@ -172,7 +168,6 @@ struct nvme_tracker { }; struct nvme_qpair { - struct nvme_controller *ctrlr; uint32_t id; int domain; @@ -221,7 +216,6 @@ struct nvme_qpair { } __aligned(CACHE_LINE_SIZE); struct nvme_namespace { - struct nvme_controller *ctrlr; struct nvme_namespace_data data; uint32_t id; @@ -236,7 +230,6 @@ struct nvme_namespace { * One of these per allocated PCI device. */ struct nvme_controller { - device_t dev; struct mtx lock; Modified: head/sys/dev/nvme/nvme_qpair.c ============================================================================== --- head/sys/dev/nvme/nvme_qpair.c Tue Sep 1 22:02:55 2020 (r365188) +++ head/sys/dev/nvme/nvme_qpair.c Tue Sep 1 22:03:10 2020 (r365189) @@ -47,7 +47,6 @@ static void _nvme_qpair_submit_request(struct nvme_qpa static void nvme_qpair_destroy(struct nvme_qpair *qpair); struct nvme_opcode_string { - uint16_t opc; const char * str; }; @@ -128,7 +127,6 @@ get_io_opcode_string(uint16_t opc) return (entry->str); } - static void nvme_admin_qpair_print_command(struct nvme_qpair *qpair, struct nvme_command *cmd) @@ -195,7 +193,6 @@ nvme_qpair_print_command(struct nvme_qpair *qpair, str } struct nvme_status_string { - uint16_t sc; const char * str; }; @@ -662,7 +659,6 @@ nvme_qpair_construct(struct nvme_qpair *qpair, qpair->ctrlr = ctrlr; if (ctrlr->msix_enabled) { - /* * MSI-X vector resource IDs start at 1, so we add one to * the queue's vector to get the corresponding rid to use. @@ -762,7 +758,6 @@ nvme_qpair_construct(struct nvme_qpair *qpair, list_phys = prpmem_phys; prp_list = prpmem; for (i = 0; i < qpair->num_trackers; i++) { - if (list_phys + prpsz > prpmem_phys + prpmemsz) { qpair->num_trackers = i; break; Modified: head/sys/dev/nvme/nvme_sysctl.c ============================================================================== --- head/sys/dev/nvme/nvme_sysctl.c Tue Sep 1 22:02:55 2020 (r365188) +++ head/sys/dev/nvme/nvme_sysctl.c Tue Sep 1 22:03:10 2020 (r365189) @@ -86,7 +86,6 @@ nvme_dump_queue(struct nvme_qpair *qpair) } } - static int nvme_sysctl_dump_debug(SYSCTL_HANDLER_ARGS) { @@ -252,7 +251,6 @@ nvme_sysctl_reset_stats(SYSCTL_HANDLER_ARGS) return (0); } - static void nvme_sysctl_initialize_queue(struct nvme_qpair *qpair, Modified: head/sys/dev/nvme/nvme_test.c ============================================================================== --- head/sys/dev/nvme/nvme_test.c Tue Sep 1 22:02:55 2020 (r365188) +++ head/sys/dev/nvme/nvme_test.c Tue Sep 1 22:03:10 2020 (r365189) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include "nvme_private.h" struct nvme_io_test_thread { - uint32_t idx; struct nvme_namespace *ns; enum nvme_nvm_opcode opc; @@ -59,7 +58,6 @@ struct nvme_io_test_thread { }; struct nvme_io_test_internal { - struct nvme_namespace *ns; enum nvme_nvm_opcode opc; struct timeval start; @@ -103,7 +101,6 @@ nvme_ns_bio_test(void *arg) offset = idx * 2048ULL * nvme_ns_get_sector_size(io_test->ns); while (1) { - bio = g_alloc_bio(); memset(bio, 0, sizeof(*bio)); Modified: head/sys/dev/nvme/nvme_util.c ============================================================================== --- head/sys/dev/nvme/nvme_util.c Tue Sep 1 22:02:55 2020 (r365188) +++ head/sys/dev/nvme/nvme_util.c Tue Sep 1 22:03:10 2020 (r365189) @@ -60,4 +60,3 @@ nvme_strvis(uint8_t *dst, const uint8_t *src, int dstl } *dst = '\0'; } - From owner-svn-src-all@freebsd.org Tue Sep 1 22:03:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A05C537DF44; Tue, 1 Sep 2020 22:03:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Kx3pDpz4cbq; Tue, 1 Sep 2020 22:03:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6490320704; Tue, 1 Sep 2020 22:03:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M3XjL054970; Tue, 1 Sep 2020 22:03:33 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M3Xkj054969; Tue, 1 Sep 2020 22:03:33 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012203.081M3Xkj054969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:03:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365190 - head/sys/dev/nvd X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/nvd X-SVN-Commit-Revision: 365190 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:03:33 -0000 Author: mjg Date: Tue Sep 1 22:03:32 2020 New Revision: 365190 URL: https://svnweb.freebsd.org/changeset/base/365190 Log: nvd: clean up empty lines in .c and .h files Modified: head/sys/dev/nvd/nvd.c Modified: head/sys/dev/nvd/nvd.c ============================================================================== --- head/sys/dev/nvd/nvd.c Tue Sep 1 22:03:10 2020 (r365189) +++ head/sys/dev/nvd/nvd.c Tue Sep 1 22:03:32 2020 (r365190) @@ -518,4 +518,3 @@ nvd_controller_fail(void *ctrlr_arg) mtx_unlock(&nvd_lock); free(ctrlr, M_NVD); } - From owner-svn-src-all@freebsd.org Tue Sep 1 22:03:47 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2083037DEFF; Tue, 1 Sep 2020 22:03:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1LC04zzz4cfn; Tue, 1 Sep 2020 22:03:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB9BB2062C; Tue, 1 Sep 2020 22:03:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M3kgI055040; Tue, 1 Sep 2020 22:03:46 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M3k2X055039; Tue, 1 Sep 2020 22:03:46 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012203.081M3k2X055039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:03:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365191 - head/sys/dev/null X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/null X-SVN-Commit-Revision: 365191 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:03:47 -0000 Author: mjg Date: Tue Sep 1 22:03:46 2020 New Revision: 365191 URL: https://svnweb.freebsd.org/changeset/base/365191 Log: null: clean up empty lines in .c and .h files Modified: head/sys/dev/null/null.c Modified: head/sys/dev/null/null.c ============================================================================== --- head/sys/dev/null/null.c Tue Sep 1 22:03:32 2020 (r365190) +++ head/sys/dev/null/null.c Tue Sep 1 22:03:46 2020 (r365191) @@ -82,8 +82,6 @@ static struct cdevsw zero_cdevsw = { .d_flags = D_MMAP_ANON, }; - - /* ARGSUSED */ static int full_write(struct cdev *dev __unused, struct uio *uio __unused, int flags __unused) @@ -159,7 +157,6 @@ zero_ioctl(struct cdev *dev __unused, u_long cmd, cadd } return (error); } - /* ARGSUSED */ static int From owner-svn-src-all@freebsd.org Tue Sep 1 22:03:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 046B337E20B; Tue, 1 Sep 2020 22:03:59 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1LN4yYpz4cgS; Tue, 1 Sep 2020 22:03:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C77F20063; Tue, 1 Sep 2020 22:03:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M3tKa055093; Tue, 1 Sep 2020 22:03:55 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M3tcm055090; Tue, 1 Sep 2020 22:03:55 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012203.081M3tcm055090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:03:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365192 - in head/sys/dev/ntb: . ntb_hw X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/ntb: . ntb_hw X-SVN-Commit-Revision: 365192 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:03:59 -0000 Author: mjg Date: Tue Sep 1 22:03:55 2020 New Revision: 365192 URL: https://svnweb.freebsd.org/changeset/base/365192 Log: ntb: clean up empty lines in .c and .h files Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_amd.c head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c head/sys/dev/ntb/ntb_transport.c Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_amd.c ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw_amd.c Tue Sep 1 22:03:46 2020 (r365191) +++ head/sys/dev/ntb/ntb_hw/ntb_hw_amd.c Tue Sep 1 22:03:55 2020 (r365192) @@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$"); MALLOC_DEFINE(M_AMD_NTB, "amd_ntb_hw", "amd_ntb_hw driver memory allocations"); static const struct amd_ntb_hw_info amd_ntb_hw_info_list[] = { - { .vendor_id = NTB_HW_AMD_VENDOR_ID, .device_id = NTB_HW_AMD_DEVICE_ID1, .mw_count = 3, @@ -686,7 +685,6 @@ amd_ntb_peer_spad_write(device_t dev, unsigned int idx return (0); } - /* * AMD NTB INIT */ @@ -871,7 +869,6 @@ amd_ntb_setup_isr(struct amd_ntb_softc *ntb, uint16_t flags |= RF_SHAREABLE; for (i = 0; i < num_vectors; i++) { - /* RID should be 0 for intx */ if (intx) ntb->int_info[i].rid = i; @@ -911,7 +908,7 @@ static int amd_ntb_create_msix_vec(struct amd_ntb_softc *ntb, uint32_t max_vectors) { uint8_t i; - + ntb->msix_vec = malloc(max_vectors * sizeof(*ntb->msix_vec), M_AMD_NTB, M_ZERO | M_WAITOK); Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c ============================================================================== --- head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c Tue Sep 1 22:03:46 2020 (r365191) +++ head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c Tue Sep 1 22:03:55 2020 (r365192) @@ -1682,7 +1682,6 @@ configure_atom_secondary_side_bars(struct ntb_softc *n } } - /* * When working around Xeon SDOORBELL errata by remapping remote registers in a * MW, limit the B2B MW to half a MW. By sharing a MW, half the shared MW Modified: head/sys/dev/ntb/ntb_transport.c ============================================================================== --- head/sys/dev/ntb/ntb_transport.c Tue Sep 1 22:03:46 2020 (r365191) +++ head/sys/dev/ntb/ntb_transport.c Tue Sep 1 22:03:55 2020 (r365192) @@ -757,8 +757,6 @@ ntb_transport_link_up(struct ntb_transport_qp *qp) callout_reset(&qp->link_work, 0, ntb_qp_link_work, qp); } - - /* Transport Tx */ /** @@ -1204,7 +1202,6 @@ ntb_transport_link_work(void *arg) mw->rx_size = val64; val64 = roundup(val64, mw->xlat_align_size); if (mw->buff_size != val64) { - rc = ntb_set_mw(nt, i, val64); if (rc != 0) { ntb_printf(0, "link up set mw%d fails, rc %d\n", @@ -1592,7 +1589,6 @@ ntb_send_link_down(struct ntb_transport_qp *qp) ntb_qp_link_down_reset(qp); } - /* List Management */ From owner-svn-src-all@freebsd.org Tue Sep 1 22:04:12 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E91737E073; Tue, 1 Sep 2020 22:04:12 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Lh1CM1z4d5Z; Tue, 1 Sep 2020 22:04:12 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C74742057C; Tue, 1 Sep 2020 22:04:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M4AV5055153; Tue, 1 Sep 2020 22:04:10 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M4AQU055152; Tue, 1 Sep 2020 22:04:10 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012204.081M4AQU055152@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:04:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365193 - head/sys/dev/nge X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/nge X-SVN-Commit-Revision: 365193 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:04:12 -0000 Author: mjg Date: Tue Sep 1 22:04:10 2020 New Revision: 365193 URL: https://svnweb.freebsd.org/changeset/base/365193 Log: nge: clean up empty lines in .c and .h files Modified: head/sys/dev/nge/if_ngereg.h Modified: head/sys/dev/nge/if_ngereg.h ============================================================================== --- head/sys/dev/nge/if_ngereg.h Tue Sep 1 22:03:55 2020 (r365192) +++ head/sys/dev/nge/if_ngereg.h Tue Sep 1 22:04:10 2020 (r365193) @@ -385,7 +385,6 @@ #define NGE_RXFILTCTL_BROAD 0x40000000 #define NGE_RXFILTCTL_ENABLE 0x80000000 - #define NGE_FILTADDR_PAR0 0x00000000 #define NGE_FILTADDR_PAR1 0x00000002 #define NGE_FILTADDR_PAR2 0x00000004 @@ -434,7 +433,6 @@ #define NGE_CLKRUN_PMESTS 0x00008000 #define NGE_CLKRUN_PMEENB 0x00000100 #define NGE_CLNRUN_CLKRUN_ENB 0x00000001 - /* TBI BMCR */ #define NGE_TBIBMCR_RESTART_ANEG 0x00000200 From owner-svn-src-all@freebsd.org Tue Sep 1 22:04:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5065B37E22E; Tue, 1 Sep 2020 22:04:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Lx1HNhz4d8k; Tue, 1 Sep 2020 22:04:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 95E8920639; Tue, 1 Sep 2020 22:04:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M4Oov055209; Tue, 1 Sep 2020 22:04:24 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M4O95055208; Tue, 1 Sep 2020 22:04:24 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012204.081M4O95055208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:04:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365194 - head/sys/dev/nfsmb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/nfsmb X-SVN-Commit-Revision: 365194 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:04:25 -0000 Author: mjg Date: Tue Sep 1 22:04:24 2020 New Revision: 365194 URL: https://svnweb.freebsd.org/changeset/base/365194 Log: nfsmb: clean up empty lines in .c and .h files Modified: head/sys/dev/nfsmb/nfsmb.c Modified: head/sys/dev/nfsmb/nfsmb.c ============================================================================== --- head/sys/dev/nfsmb/nfsmb.c Tue Sep 1 22:04:10 2020 (r365193) +++ head/sys/dev/nfsmb/nfsmb.c Tue Sep 1 22:04:24 2020 (r365194) @@ -609,7 +609,6 @@ static device_method_t nfsmb_methods[] = { DEVMETHOD(smbus_readw, nfsmb_readw), DEVMETHOD(smbus_bwrite, nfsmb_bwrite), DEVMETHOD(smbus_bread, nfsmb_bread), - { 0, 0 } }; @@ -630,7 +629,6 @@ static device_method_t nfsmbsub_methods[] = { DEVMETHOD(smbus_readw, nfsmb_readw), DEVMETHOD(smbus_bwrite, nfsmb_bwrite), DEVMETHOD(smbus_bread, nfsmb_bread), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 22:04:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2AD8837E31A; Tue, 1 Sep 2020 22:04:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1M953hnz4d9J; Tue, 1 Sep 2020 22:04:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 903962057E; Tue, 1 Sep 2020 22:04:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M4bev055262; Tue, 1 Sep 2020 22:04:37 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M4bDk055261; Tue, 1 Sep 2020 22:04:37 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012204.081M4bDk055261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:04:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365195 - head/sys/dev/nfe X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/nfe X-SVN-Commit-Revision: 365195 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:04:38 -0000 Author: mjg Date: Tue Sep 1 22:04:37 2020 New Revision: 365195 URL: https://svnweb.freebsd.org/changeset/base/365195 Log: nfe: clean up empty lines in .c and .h files Modified: head/sys/dev/nfe/if_nfe.c Modified: head/sys/dev/nfe/if_nfe.c ============================================================================== --- head/sys/dev/nfe/if_nfe.c Tue Sep 1 22:04:24 2020 (r365194) +++ head/sys/dev/nfe/if_nfe.c Tue Sep 1 22:04:37 2020 (r365195) @@ -270,7 +270,6 @@ static struct nfe_type nfe_devs[] = { {0, 0, NULL} }; - /* Probe for supported hardware ID's */ static int nfe_probe(device_t dev) @@ -337,7 +336,6 @@ nfe_alloc_msix(struct nfe_softc *sc, int count) } } - static int nfe_detect_msik9(struct nfe_softc *sc) { @@ -361,7 +359,6 @@ nfe_detect_msik9(struct nfe_softc *sc) return (found); } - static int nfe_attach(device_t dev) { @@ -604,7 +601,6 @@ nfe_attach(device_t dev) if_setsendqlen(ifp, NFE_TX_RING_COUNT - 1); if_setsendqready(ifp); - if (sc->nfe_flags & NFE_HW_CSUM) { if_setcapabilitiesbit(ifp, IFCAP_HWCSUM | IFCAP_TSO4, 0); if_sethwassistbits(ifp, NFE_CSUM_FEATURES | CSUM_TSO, 0); @@ -688,7 +684,6 @@ fail: return (error); } - static int nfe_detach(device_t dev) { @@ -786,7 +781,6 @@ nfe_detach(device_t dev) return (0); } - static int nfe_suspend(device_t dev) { @@ -803,7 +797,6 @@ nfe_suspend(device_t dev) return (0); } - static int nfe_resume(device_t dev) { @@ -823,7 +816,6 @@ nfe_resume(device_t dev) return (0); } - static int nfe_can_use_msix(struct nfe_softc *sc) { @@ -865,7 +857,6 @@ nfe_can_use_msix(struct nfe_softc *sc) return (use_msix); } - /* Take PHY/NIC out of powerdown, from Linux */ static void nfe_power(struct nfe_softc *sc) @@ -889,7 +880,6 @@ nfe_power(struct nfe_softc *sc) NFE_WRITE(sc, NFE_PWR2_CTL, pwr); } - static void nfe_miibus_statchg(device_t dev) { @@ -931,7 +921,6 @@ nfe_miibus_statchg(device_t dev) NFE_WRITE(sc, NFE_RX_CTL, rxctl); } - static void nfe_mac_config(struct nfe_softc *sc, struct mii_data *mii) { @@ -1024,7 +1013,6 @@ nfe_mac_config(struct nfe_softc *sc, struct mii_data * } } - static int nfe_miibus_readreg(device_t dev, int phy, int reg) { @@ -1065,7 +1053,6 @@ nfe_miibus_readreg(device_t dev, int phy, int reg) return (val); } - static int nfe_miibus_writereg(device_t dev, int phy, int reg, int val) { @@ -1197,7 +1184,6 @@ fail: return (error); } - static void nfe_alloc_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring) { @@ -1317,7 +1303,6 @@ fail: sc->nfe_jumbo_disable = 1; } - static int nfe_init_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring) { @@ -1345,7 +1330,6 @@ nfe_init_rx_ring(struct nfe_softc *sc, struct nfe_rx_r return (0); } - static int nfe_init_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring) { @@ -1373,7 +1357,6 @@ nfe_init_jrx_ring(struct nfe_softc *sc, struct nfe_jrx return (0); } - static void nfe_free_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring) { @@ -1420,7 +1403,6 @@ nfe_free_rx_ring(struct nfe_softc *sc, struct nfe_rx_r } } - static void nfe_free_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring) { @@ -1474,7 +1456,6 @@ nfe_free_jrx_ring(struct nfe_softc *sc, struct nfe_jrx } } - static int nfe_alloc_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring) { @@ -1559,7 +1540,6 @@ fail: return (error); } - static void nfe_init_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring) { @@ -1582,7 +1562,6 @@ nfe_init_tx_ring(struct nfe_softc *sc, struct nfe_tx_r BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); } - static void nfe_free_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring) { @@ -1635,7 +1614,6 @@ nfe_free_tx_ring(struct nfe_softc *sc, struct nfe_tx_r #ifdef DEVICE_POLLING static poll_handler_t nfe_poll; - static int nfe_poll(if_t ifp, enum poll_cmd cmd, int count) { @@ -1684,7 +1662,6 @@ nfe_set_intr(struct nfe_softc *sc) NFE_WRITE(sc, NFE_IRQ_MASK, NFE_IRQ_WANTED); } - /* In MSIX, a write to mask reegisters behaves as XOR. */ static __inline void nfe_enable_intr(struct nfe_softc *sc) @@ -1698,7 +1675,6 @@ nfe_enable_intr(struct nfe_softc *sc) NFE_WRITE(sc, sc->nfe_irq_mask, sc->nfe_intrs); } - static __inline void nfe_disable_intr(struct nfe_softc *sc) { @@ -1711,7 +1687,6 @@ nfe_disable_intr(struct nfe_softc *sc) NFE_WRITE(sc, sc->nfe_irq_mask, sc->nfe_nointrs); } - static int nfe_ioctl(if_t ifp, u_long cmd, caddr_t data) { @@ -1863,7 +1838,6 @@ nfe_ioctl(if_t ifp, u_long cmd, caddr_t data) return (error); } - static int nfe_intr(void *arg) { @@ -1881,7 +1855,6 @@ nfe_intr(void *arg) return (FILTER_HANDLED); } - static void nfe_int_task(void *arg, int pending) { @@ -1943,7 +1916,6 @@ nfe_int_task(void *arg, int pending) nfe_enable_intr(sc); } - static __inline void nfe_discard_rxbuf(struct nfe_softc *sc, int idx) { @@ -1969,7 +1941,6 @@ nfe_discard_rxbuf(struct nfe_softc *sc, int idx) } } - static __inline void nfe_discard_jrxbuf(struct nfe_softc *sc, int idx) { @@ -1995,7 +1966,6 @@ nfe_discard_jrxbuf(struct nfe_softc *sc, int idx) } } - static int nfe_newbuf(struct nfe_softc *sc, int idx) { @@ -2051,7 +2021,6 @@ nfe_newbuf(struct nfe_softc *sc, int idx) return (0); } - static int nfe_jnewbuf(struct nfe_softc *sc, int idx) { @@ -2106,7 +2075,6 @@ nfe_jnewbuf(struct nfe_softc *sc, int idx) return (0); } - static int nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp) { @@ -2221,7 +2189,6 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npk return (count > 0 ? 0 : EAGAIN); } - static int nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp) { @@ -2337,7 +2304,6 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_np return (count > 0 ? 0 : EAGAIN); } - static void nfe_txeof(struct nfe_softc *sc) { @@ -2626,7 +2592,6 @@ done: NFE_WRITE(sc, NFE_RXFILTER, filter); } - static void nfe_start(if_t ifp) { @@ -2681,7 +2646,6 @@ nfe_start_locked(if_t ifp) } } - static void nfe_watchdog(if_t ifp) { @@ -2718,7 +2682,6 @@ nfe_watchdog(if_t ifp) nfe_init_locked(sc); } - static void nfe_init(void *xsc) { @@ -2729,7 +2692,6 @@ nfe_init(void *xsc) NFE_UNLOCK(sc); } - static void nfe_init_locked(void *xsc) { @@ -2880,7 +2842,6 @@ nfe_init_locked(void *xsc) callout_reset(&sc->nfe_stat_ch, hz, nfe_tick, sc); } - static void nfe_stop(if_t ifp) { @@ -2955,7 +2916,6 @@ nfe_stop(if_t ifp) nfe_stats_update(sc); } - static int nfe_ifmedia_upd(if_t ifp) { @@ -2970,7 +2930,6 @@ nfe_ifmedia_upd(if_t ifp) return (0); } - static void nfe_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) { @@ -2988,7 +2947,6 @@ nfe_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) NFE_UNLOCK(sc); } - void nfe_tick(void *xsc) { @@ -3009,7 +2967,6 @@ nfe_tick(void *xsc) callout_reset(&sc->nfe_stat_ch, hz, nfe_tick, sc); } - static int nfe_shutdown(device_t dev) { @@ -3017,7 +2974,6 @@ nfe_shutdown(device_t dev) return (nfe_suspend(dev)); } - static void nfe_get_macaddr(struct nfe_softc *sc, uint8_t *addr) { @@ -3046,7 +3002,6 @@ nfe_get_macaddr(struct nfe_softc *sc, uint8_t *addr) } } - static void nfe_set_macaddr(struct nfe_softc *sc, uint8_t *addr) { @@ -3056,7 +3011,6 @@ nfe_set_macaddr(struct nfe_softc *sc, uint8_t *addr) addr[1] << 8 | addr[0]); } - /* * Map a single buffer address. */ @@ -3075,7 +3029,6 @@ nfe_dma_map_segs(void *arg, bus_dma_segment_t *segs, i ctx->nfe_busaddr = segs[0].ds_addr; } - static int sysctl_int_range(SYSCTL_HANDLER_ARGS, int low, int high) { @@ -3094,7 +3047,6 @@ sysctl_int_range(SYSCTL_HANDLER_ARGS, int low, int hig return (0); } - static int sysctl_hw_nfe_proc_limit(SYSCTL_HANDLER_ARGS) { @@ -3103,7 +3055,6 @@ sysctl_hw_nfe_proc_limit(SYSCTL_HANDLER_ARGS) NFE_PROC_MAX)); } - #define NFE_SYSCTL_STAT_ADD32(c, h, n, p, d) \ SYSCTL_ADD_UINT(c, h, OID_AUTO, n, CTLFLAG_RD, p, 0, d) #define NFE_SYSCTL_STAT_ADD64(c, h, n, p, d) \ @@ -3299,7 +3250,6 @@ nfe_stats_update(struct nfe_softc *sc) } } - static void nfe_set_linkspeed(struct nfe_softc *sc) { @@ -3368,7 +3318,6 @@ nfe_set_linkspeed(struct nfe_softc *sc) mii->mii_media_active = IFM_ETHER | IFM_100_TX | IFM_FDX; nfe_mac_config(sc, mii); } - static void nfe_set_wol(struct nfe_softc *sc) From owner-svn-src-all@freebsd.org Tue Sep 1 22:05:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3DFC537E177; Tue, 1 Sep 2020 22:05:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Mf1GdCz4dB4; Tue, 1 Sep 2020 22:05:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0EE0C2063A; Tue, 1 Sep 2020 22:05:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M52gV055342; Tue, 1 Sep 2020 22:05:02 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M50hb055334; Tue, 1 Sep 2020 22:05:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012205.081M50hb055334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:05:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365196 - head/sys/dev/mxge X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mxge X-SVN-Commit-Revision: 365196 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:05:02 -0000 Author: mjg Date: Tue Sep 1 22:05:00 2020 New Revision: 365196 URL: https://svnweb.freebsd.org/changeset/base/365196 Log: mxge: clean up empty lines in .c and .h files Modified: head/sys/dev/mxge/if_mxge.c head/sys/dev/mxge/if_mxge_var.h head/sys/dev/mxge/mcp_gen_header.h head/sys/dev/mxge/mxge_eth_z8e.c head/sys/dev/mxge/mxge_ethp_z8e.c head/sys/dev/mxge/mxge_mcp.h head/sys/dev/mxge/mxge_rss_eth_z8e.c head/sys/dev/mxge/mxge_rss_ethp_z8e.c Modified: head/sys/dev/mxge/if_mxge.c ============================================================================== --- head/sys/dev/mxge/if_mxge.c Tue Sep 1 22:04:37 2020 (r365195) +++ head/sys/dev/mxge/if_mxge.c Tue Sep 1 22:05:00 2020 (r365196) @@ -159,7 +159,6 @@ mxge_probe(device_t dev) { int rev; - if ((pci_get_vendor(dev) == MXGE_PCI_VENDOR_MYRICOM) && ((pci_get_device(dev) == MXGE_PCI_DEVICE_Z8E) || (pci_get_device(dev) == MXGE_PCI_DEVICE_Z8E_9))) { @@ -201,7 +200,6 @@ mxge_enable_wc(mxge_softc_t *sc) #endif } - /* callback to get our DMA address */ static void mxge_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs, @@ -272,7 +270,6 @@ abort_with_dmat: return err; } - static void mxge_dma_free(mxge_dma_t *dma) { @@ -351,7 +348,6 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc) uintptr_t bus, slot, func, ivend, idev; uint32_t *ptr32; - if (!mxge_nvidia_ecrc_enable) return; @@ -427,7 +423,6 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc) /* map it into the kernel */ va = pmap_mapdev(trunc_page((vm_paddr_t)off), PAGE_SIZE); - if (va == NULL) { device_printf(sc->dev, "pmap_kenter_temporary didn't\n"); @@ -473,7 +468,6 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc) } #endif - static int mxge_dma_test(mxge_softc_t *sc, int test_type) { @@ -483,7 +477,6 @@ mxge_dma_test(mxge_softc_t *sc, int test_type) uint32_t len; char *test = " "; - /* Run a small DMA test. * The magic multipliers to the length tell the firmware * to do DMA read, write, or read+write tests. The @@ -657,7 +650,6 @@ static int mxge_validate_firmware(mxge_softc_t *sc, const mcp_gen_header_t *hdr) { - if (be32toh(hdr->mcp_type) != MCP_TYPE_ETH) { device_printf(sc->dev, "Bad firmware type: 0x%x\n", be32toh(hdr->mcp_type)); @@ -704,8 +696,6 @@ mxge_load_firmware_helper(mxge_softc_t *sc, uint32_t * return ENOENT; } - - /* setup zlib and decompress f/w */ bzero(&zs, sizeof (zs)); zs.zalloc = zcalloc_nowait; @@ -805,7 +795,6 @@ mxge_dummy_rdma(mxge_softc_t *sc, int enable) buf[4] = htobe32(dma_low); /* dummy addr LSW */ buf[5] = htobe32(enable); /* enable? */ - submit = (volatile char *)(sc->sram + MXGEFW_BOOT_DUMMY_RDMA); mxge_pio_copy(submit, buf, 64); @@ -946,7 +935,6 @@ mxge_adopt_running_firmware(mxge_softc_t *sc) return status; } - static int mxge_load_firmware(mxge_softc_t *sc, int adopt) { @@ -1039,7 +1027,6 @@ mxge_update_mac_address(mxge_softc_t *sc) uint8_t *addr = sc->mac_addr; int status; - cmd.data0 = ((addr[0] << 24) | (addr[1] << 16) | (addr[2] << 8) | addr[3]); @@ -1133,10 +1120,10 @@ mxge_set_multicast_list(mxge_softc_t *sc) " error status: %d\n", err); return; } - + if (sc->adopted_rx_filter_bug) return; - + if (ifp->if_flags & IFF_ALLMULTI) /* request to disable multicast filtering, so quit here */ return; @@ -1211,7 +1198,6 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup) mxge_dummy_rdma(sc, 1); - /* set the intrq size */ cmd.data0 = sc->rx_ring_size; status = mxge_send_cmd(sc, MXGEFW_CMD_SET_INTRQ_SIZE, &cmd); @@ -1226,7 +1212,7 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup) * MXGEFW_CMD_SET_INTRQ_SIZE, since the intrq size is used by * the firmware to compute offsets. */ - + if (sc->num_slices > 1) { /* ask the maximum number of slices it supports */ status = mxge_send_cmd(sc, MXGEFW_CMD_GET_MAX_RSS_QUEUES, @@ -1254,7 +1240,6 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup) } } - if (interrupts_setup) { /* Now exchange information about interrupts */ for (slice = 0; slice < sc->num_slices; slice++) { @@ -1271,14 +1256,12 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup) status |= mxge_send_cmd(sc, MXGEFW_CMD_GET_INTR_COAL_DELAY_OFFSET, &cmd); - sc->intr_coal_delay_ptr = (volatile uint32_t *)(sc->sram + cmd.data0); status |= mxge_send_cmd(sc, MXGEFW_CMD_GET_IRQ_ACK_OFFSET, &cmd); irq_claim = (volatile uint32_t *)(sc->sram + cmd.data0); - status |= mxge_send_cmd(sc, MXGEFW_CMD_GET_IRQ_DEASSERT_OFFSET, &cmd); sc->irq_deassert = (volatile uint32_t *)(sc->sram + cmd.data0); @@ -1286,11 +1269,9 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup) device_printf(sc->dev, "failed set interrupt parameters\n"); return status; } - *sc->intr_coal_delay_ptr = htobe32(sc->intr_coal_delay); - /* run a DMA benchmark */ (void) mxge_dma_test(sc, MXGEFW_DMA_TEST); @@ -1355,7 +1336,7 @@ mxge_change_throttle(SYSCTL_HANDLER_ARGS) if (throttle < MXGE_MIN_THROTTLE || throttle > MXGE_MAX_THROTTLE) return EINVAL; - + mtx_lock(&sc->driver_mtx); cmd.data0 = throttle; err = mxge_send_cmd(sc, MXGEFW_CMD_SET_THROTTLE_FACTOR, &cmd); @@ -1387,7 +1368,7 @@ mxge_change_intr_coal(SYSCTL_HANDLER_ARGS) mtx_lock(&sc->driver_mtx); *sc->intr_coal_delay_ptr = htobe32(intr_coal_delay); sc->intr_coal_delay = intr_coal_delay; - + mtx_unlock(&sc->driver_mtx); return err; } @@ -1504,7 +1485,6 @@ mxge_add_sysctls(mxge_softc_t *sc) CTLFLAG_RD, &sc->watchdog_resets, 0, "Number of times NIC was reset"); - /* performance related tunables */ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "intr_coal_delay", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, @@ -1708,7 +1688,7 @@ mxge_submit_req(mxge_tx_ring_t *tx, mcp_kreq_ether_sen mcp_kreq_ether_send_t *srcp; volatile mcp_kreq_ether_send_t *dstp, *dst; uint8_t last_flags; - + idx = tx->req & tx->mask; last_flags = src->flags; @@ -1882,7 +1862,6 @@ mxge_encap_tso(struct mxge_slice_state *ss, struct mbu } flags = MXGEFW_FLAGS_TSO_HDR | MXGEFW_FLAGS_FIRST; - /* for TSO, pseudo_hdr_offset holds mss. * The firmware figures out where to put * the checksum by parsing the header. */ @@ -2063,7 +2042,6 @@ mxge_encap(struct mxge_slice_state *ss, struct mbuf *m uint16_t pseudo_hdr_offset; uint8_t flags, cksum_offset; - sc = ss->sc; ifp = sc->ifp; tx = &ss->tx; @@ -2477,7 +2455,6 @@ mxge_csum_generic(uint16_t *raw, int len) { uint32_t csum; - csum = 0; while (len > 0) { csum += *raw; @@ -2547,7 +2524,6 @@ mxge_rx_csum(struct mbuf *m, int csum) #endif uint16_t c, etype; - eh = mtod(m, struct ether_header *); etype = ntohs(eh->ether_type); switch (etype) { @@ -2633,7 +2609,6 @@ mxge_vlan_tag_remove(struct mbuf *m, uint32_t *csum) m_adj(m, ETHER_VLAN_ENCAP_LEN); } - static inline void mxge_rx_done_big(struct mxge_slice_state *ss, uint32_t len, uint32_t csum, int lro) @@ -2800,7 +2775,6 @@ mxge_clean_rx_done(struct mxge_slice_state *ss) #endif } - static inline void mxge_tx_done(struct mxge_slice_state *ss, uint32_t mcp_idx) { @@ -2834,7 +2808,7 @@ mxge_tx_done(struct mxge_slice_state *ss, uint32_t mcp tx->pkt_done++; } } - + /* If we have space, clear IFF_OACTIVE to tell the stack that its OK to send packets */ #ifdef IFNET_BUF_RING @@ -2891,7 +2865,6 @@ static void mxge_media_set(mxge_softc_t *sc, int media_type) { - ifmedia_add(&sc->media, IFM_ETHER | IFM_FDX | media_type, 0, NULL); ifmedia_set(&sc->media, IFM_ETHER | IFM_FDX | media_type); @@ -3063,7 +3036,6 @@ mxge_intr(void *arg) uint32_t send_done_count; uint8_t valid; - #ifndef IFNET_BUF_RING /* an interrupt on a non-zero slice is implicitly valid since MSI-X irqs are not shared */ @@ -3147,15 +3119,12 @@ mxge_init(void *arg) mxge_softc_t *sc = arg; struct ifnet *ifp = sc->ifp; - mtx_lock(&sc->driver_mtx); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) (void) mxge_open(sc); mtx_unlock(&sc->driver_mtx); } - - static void mxge_free_slice_mbufs(struct mxge_slice_state *ss) { @@ -3211,7 +3180,6 @@ mxge_free_slice_rings(struct mxge_slice_state *ss) { int i; - if (ss->rx_done.entry != NULL) mxge_dma_free(&ss->rx_done.dma); ss->rx_done.entry = NULL; @@ -3399,7 +3367,6 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, in ss->tx.mask = tx_ring_entries - 1; ss->tx.max_desc = MIN(MXGE_MAX_SEND_DESC, tx_ring_entries / 4); - /* allocate the tx request copy block */ bytes = 8 + sizeof (*ss->tx.req_list) * (ss->tx.max_desc + 4); @@ -3416,7 +3383,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, in /* allocate the tx host info ring */ bytes = tx_ring_entries * sizeof (*ss->tx.info); ss->tx.info = malloc(bytes, M_DEVBUF, M_ZERO|M_WAITOK); - + /* allocate the tx busdma resources */ err = bus_dma_tag_create(sc->parent_dmat, /* parent */ 1, /* alignment */ @@ -3430,7 +3397,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, in BUS_DMA_ALLOCNOW, /* flags */ NULL, NULL, /* lock */ &ss->tx.dmat); /* tag */ - + if (err != 0) { device_printf(sc->dev, "Err %d allocating tx dmat\n", err); @@ -3459,7 +3426,7 @@ mxge_alloc_rings(mxge_softc_t *sc) int tx_ring_size; int tx_ring_entries, rx_ring_entries; int err, slice; - + /* get ring sizes */ err = mxge_send_cmd(sc, MXGEFW_CMD_GET_SEND_RING_SIZE, &cmd); tx_ring_size = cmd.data0; @@ -3489,7 +3456,6 @@ abort: } - static void mxge_choose_params(int mtu, int *big_buf_size, int *cl_size, int *nbufs) { @@ -3533,7 +3499,6 @@ mxge_slice_open(struct mxge_slice_state *ss, int nbufs bus_dmamap_t map; int err, i, slice; - sc = ss->sc; slice = ss - sc->ss; @@ -3541,7 +3506,7 @@ mxge_slice_open(struct mxge_slice_state *ss, int nbufs (void)tcp_lro_init(&ss->lc); #endif ss->lc.ifp = sc->ifp; - + /* get the lanai pointers to the send and receive rings */ err = 0; @@ -3652,7 +3617,6 @@ mxge_open(mxge_softc_t *sc) } } - mxge_choose_params(sc->ifp->if_mtu, &big_bytes, &cl_size, &nbufs); cmd.data0 = nbufs; @@ -3746,7 +3710,6 @@ mxge_open(mxge_softc_t *sc) return 0; - abort: mxge_free_mbufs(sc); @@ -3878,7 +3841,6 @@ mxge_watchdog_reset(mxge_softc_t *sc) reboot); running = sc->ifp->if_drv_flags & IFF_DRV_RUNNING; if (running) { - /* * quiesce NIC so that TX routines will not try to * xmit after restoration of BAR @@ -3945,7 +3907,6 @@ mxge_watchdog_task(void *arg, int pending) { mxge_softc_t *sc = arg; - mtx_lock(&sc->driver_mtx); mxge_watchdog_reset(sc); mtx_unlock(&sc->driver_mtx); @@ -4096,7 +4057,6 @@ mxge_change_mtu(mxge_softc_t *sc, int mtu) int real_mtu, old_mtu; int err = 0; - real_mtu = mtu + ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN; if ((real_mtu > sc->max_mtu) || real_mtu < 60) return EINVAL; @@ -4120,7 +4080,6 @@ static void mxge_media_status(struct ifnet *ifp, struct ifmediareq *ifmr) { mxge_softc_t *sc = ifp->if_softc; - if (sc == NULL) return; @@ -4137,7 +4096,6 @@ mxge_fetch_i2c(mxge_softc_t *sc, struct ifi2creq *i2c) uint32_t i2c_args; int i, ms, err; - if (i2c->dev_addr != 0xA0 && i2c->dev_addr != 0xA2) return (EINVAL); @@ -4386,14 +4344,12 @@ mxge_fetch_tunables(mxge_softc_t *sc) sc->throttle = mxge_throttle; } - static void mxge_free_slices(mxge_softc_t *sc) { struct mxge_slice_state *ss; int i; - if (sc->ss == NULL) return; @@ -4434,7 +4390,7 @@ mxge_alloc_slices(mxge_softc_t *sc) } sc->rx_ring_size = cmd.data0; max_intr_slots = 2 * (sc->rx_ring_size / sizeof (mcp_dma_addr_t)); - + bytes = sizeof (*sc->ss) * sc->num_slices; sc->ss = malloc(bytes, M_DEVBUF, M_NOWAIT | M_ZERO); if (sc->ss == NULL) @@ -4497,7 +4453,7 @@ mxge_slice_probe(mxge_softc_t *sc) * don't enable multiple slices if they are not enabled, * or if this is not an SMP system */ - + if (mxge_max_slices == 0 || mxge_max_slices == 1 || mp_ncpus < 2) return; @@ -4517,7 +4473,7 @@ mxge_slice_probe(mxge_softc_t *sc) device_printf(sc->dev, "Falling back to a single slice\n"); return; } - + /* try to send a reset command to the card to see if it is alive */ memset(&cmd, 0, sizeof (cmd)); @@ -4569,7 +4525,7 @@ mxge_slice_probe(mxge_softc_t *sc) if (mxge_verbose) device_printf(sc->dev, "using %d slices\n", sc->num_slices); - + return; abort_with_fw: @@ -4666,7 +4622,6 @@ abort_with_intr: } free(sc->msix_ih, M_DEVBUF); - abort_with_res: for (i = 0; i < sc->num_slices; i++) { rid = i + 1; @@ -4677,7 +4632,6 @@ abort_with_res: } free(sc->msix_irq_res, M_DEVBUF); - abort_with_msix: pci_release_msi(sc->dev); @@ -4783,7 +4737,7 @@ mxge_add_irq(mxge_softc_t *sc) err = mxge_add_msix_irqs(sc); else err = mxge_add_single_irq(sc); - + if (0 && err == 0 && sc->num_slices > 1) { mxge_rem_msix_irqs(sc); err = mxge_add_msix_irqs(sc); @@ -4791,7 +4745,6 @@ mxge_add_irq(mxge_softc_t *sc) return err; } - static int mxge_attach(device_t dev) { @@ -4849,7 +4802,7 @@ mxge_attach(device_t dev) callout_init_mtx(&sc->co_hdl, &sc->driver_mtx, 0); mxge_setup_cfg_space(sc); - + /* Map the board into the kernel */ rid = PCIR_BARS; sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, Modified: head/sys/dev/mxge/if_mxge_var.h ============================================================================== --- head/sys/dev/mxge/if_mxge_var.h Tue Sep 1 22:04:37 2020 (r365195) +++ head/sys/dev/mxge/if_mxge_var.h Tue Sep 1 22:05:00 2020 (r365196) @@ -78,7 +78,7 @@ $FreeBSD$ #ifndef IFCAP_TSO #define IFCAP_TSO 0 #endif - + #ifndef IFCAP_TSO4 #define IFCAP_TSO4 0 #endif @@ -118,7 +118,6 @@ typedef struct { bus_dmamap_t map; } mxge_dma_t; - typedef struct { mcp_slot_t *entry; mxge_dma_t dma; @@ -324,7 +323,6 @@ struct mxge_pkt_info { struct tcphdr *tcp; }; - static inline void mxge_pio_copy(volatile void *to_v, void *from_v, size_t size) { @@ -346,7 +344,6 @@ void mxge_lro_flush(struct mxge_slice_state *ss, struc int mxge_lro_rx(struct mxge_slice_state *ss, struct mbuf *m_head, uint32_t csum); - /* This file uses Myri10GE driver indentation. Modified: head/sys/dev/mxge/mcp_gen_header.h ============================================================================== --- head/sys/dev/mxge/mcp_gen_header.h Tue Sep 1 22:04:37 2020 (r365195) +++ head/sys/dev/mxge/mcp_gen_header.h Tue Sep 1 22:05:00 2020 (r365196) @@ -57,7 +57,6 @@ $FreeBSD$ }; */ - #define MCP_HEADER_PTR_OFFSET 0x3c #define MCP_TYPE_MX 0x4d582020 /* "MX " */ @@ -65,7 +64,6 @@ $FreeBSD$ #define MCP_TYPE_ETH 0x45544820 /* "ETH " */ #define MCP_TYPE_MCP0 0x4d435030 /* "MCP0" */ - typedef struct mcp_gen_header { /* the first 4 fields are filled at compile time */ unsigned header_length; @@ -99,6 +97,5 @@ typedef struct mcp_gen_header { (unsigned int) STRING_SPECS, \ 256 \ } - #endif /* _mcp_gen_header_h */ Modified: head/sys/dev/mxge/mxge_eth_z8e.c ============================================================================== --- head/sys/dev/mxge/mxge_eth_z8e.c Tue Sep 1 22:04:37 2020 (r365195) +++ head/sys/dev/mxge/mxge_eth_z8e.c Tue Sep 1 22:05:00 2020 (r365196) @@ -44,4 +44,3 @@ static moduledata_t mxge_eth_z8e_fw_mod = { DECLARE_MODULE(mxge_eth_z8e_fw, mxge_eth_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_eth_z8e_fw, 1); MODULE_DEPEND(mxge_eth_z8e_fw, firmware, 1, 1, 1); - Modified: head/sys/dev/mxge/mxge_ethp_z8e.c ============================================================================== --- head/sys/dev/mxge/mxge_ethp_z8e.c Tue Sep 1 22:04:37 2020 (r365195) +++ head/sys/dev/mxge/mxge_ethp_z8e.c Tue Sep 1 22:05:00 2020 (r365196) @@ -44,4 +44,3 @@ static moduledata_t mxge_ethp_z8e_fw_mod = { DECLARE_MODULE(mxge_ethp_z8e_fw, mxge_ethp_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_ethp_z8e_fw, 1); MODULE_DEPEND(mxge_ethp_z8e_fw, firmware, 1, 1, 1); - Modified: head/sys/dev/mxge/mxge_mcp.h ============================================================================== --- head/sys/dev/mxge/mxge_mcp.h Tue Sep 1 22:04:37 2020 (r365195) +++ head/sys/dev/mxge/mxge_mcp.h Tue Sep 1 22:05:00 2020 (r365196) @@ -100,8 +100,6 @@ struct mcp_cmd_response { }; typedef struct mcp_cmd_response mcp_cmd_response_t; - - /* flags used in mcp_kreq_ether_send_t: @@ -117,7 +115,6 @@ typedef struct mcp_cmd_response mcp_cmd_response_t; length of all previous segments was odd. */ - #define MXGEFW_FLAGS_SMALL 0x1 #define MXGEFW_FLAGS_TSO_HDR 0x1 #define MXGEFW_FLAGS_FIRST 0x2 @@ -160,7 +157,6 @@ struct mcp_kreq_ether_recv { }; typedef struct mcp_kreq_ether_recv mcp_kreq_ether_recv_t; - /* Commands */ #define MXGEFW_BOOT_HANDOFF 0xfc0000 @@ -189,7 +185,6 @@ enum myri10ge_mcp_cmd_type { (may be available in the eeprom strings..? */ MXGEFW_GET_MCP_VERSION = 2, - /* Parameters which must be set by the driver before it can issue MXGEFW_CMD_ETHERNET_UP. They persist until the next MXGEFW_CMD_RESET is issued */ @@ -451,7 +446,6 @@ enum myri10ge_mcp_cmd_type { }; typedef enum myri10ge_mcp_cmd_type myri10ge_mcp_cmd_type_t; - enum myri10ge_mcp_cmd_status { MXGEFW_CMD_OK = 0, MXGEFW_CMD_UNKNOWN = 1, @@ -470,7 +464,6 @@ enum myri10ge_mcp_cmd_status { MXGEFW_CMD_ERROR_BAD_PCIE_LINK = 14 }; typedef enum myri10ge_mcp_cmd_status myri10ge_mcp_cmd_status_t; - #define MXGEFW_OLD_IRQ_DATA_LEN 40 Modified: head/sys/dev/mxge/mxge_rss_eth_z8e.c ============================================================================== --- head/sys/dev/mxge/mxge_rss_eth_z8e.c Tue Sep 1 22:04:37 2020 (r365195) +++ head/sys/dev/mxge/mxge_rss_eth_z8e.c Tue Sep 1 22:05:00 2020 (r365196) @@ -44,4 +44,3 @@ static moduledata_t mxge_rss_eth_z8e_fw_mod = { DECLARE_MODULE(mxge_rss_eth_z8e_fw, mxge_rss_eth_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_rss_eth_z8e_fw, 1); MODULE_DEPEND(mxge_rss_eth_z8e_fw, firmware, 1, 1, 1); - Modified: head/sys/dev/mxge/mxge_rss_ethp_z8e.c ============================================================================== --- head/sys/dev/mxge/mxge_rss_ethp_z8e.c Tue Sep 1 22:04:37 2020 (r365195) +++ head/sys/dev/mxge/mxge_rss_ethp_z8e.c Tue Sep 1 22:05:00 2020 (r365196) @@ -44,4 +44,3 @@ static moduledata_t mxge_rss_ethp_z8e_fw_mod = { DECLARE_MODULE(mxge_rss_ethp_z8e_fw, mxge_rss_ethp_z8e_fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(mxge_rss_ethp_z8e_fw, 1); MODULE_DEPEND(mxge_rss_ethp_z8e_fw, firmware, 1, 1, 1); - From owner-svn-src-all@freebsd.org Tue Sep 1 22:05:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9FF0937E33E; Tue, 1 Sep 2020 22:05:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1N23nDnz4dQC; Tue, 1 Sep 2020 22:05:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6652B2057F; Tue, 1 Sep 2020 22:05:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M5MgX055403; Tue, 1 Sep 2020 22:05:22 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M5L7Q055401; Tue, 1 Sep 2020 22:05:21 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012205.081M5L7Q055401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:05:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365197 - head/sys/dev/my X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/my X-SVN-Commit-Revision: 365197 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:05:22 -0000 Author: mjg Date: Tue Sep 1 22:05:21 2020 New Revision: 365197 URL: https://svnweb.freebsd.org/changeset/base/365197 Log: my: clean up empty lines in .c and .h files Modified: head/sys/dev/my/if_my.c head/sys/dev/my/if_myreg.h Modified: head/sys/dev/my/if_my.c ============================================================================== --- head/sys/dev/my/if_my.c Tue Sep 1 22:05:00 2020 (r365196) +++ head/sys/dev/my/if_my.c Tue Sep 1 22:05:21 2020 (r365197) @@ -80,7 +80,6 @@ static int MY_USEIOSPACE = 1; #define MY_RID MY_PCI_LOMEM #endif - #include /* @@ -220,7 +219,6 @@ my_send_cmd_to_phy(struct my_softc * sc, int opcode, i return miir; } - static u_int16_t my_phy_readreg(struct my_softc * sc, int reg) { @@ -264,7 +262,6 @@ my_phy_readreg(struct my_softc * sc, int reg) return (u_int16_t) data; } - static void my_phy_writereg(struct my_softc * sc, int reg, int data) { @@ -1006,7 +1003,6 @@ my_detach(device_t dev) return (0); } - /* * Initialize the transmit descriptors. */ @@ -1179,7 +1175,6 @@ my_rxeof(struct my_softc * sc) return; } - /* * A frame was downloaded to the chip. It's safe for us to clean up the list * buffers. @@ -1311,7 +1306,6 @@ my_intr(void *arg) my_init_locked(sc); } #endif - } /* Re-enable interrupts. */ @@ -1708,7 +1702,6 @@ my_watchdog(void *arg) if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) my_start_locked(ifp); } - /* * Stop the adapter and free any mbufs allocated to the RX and TX lists. Modified: head/sys/dev/my/if_myreg.h ============================================================================== --- head/sys/dev/my/if_myreg.h Tue Sep 1 22:05:00 2020 (r365196) +++ head/sys/dev/my/if_myreg.h Tue Sep 1 22:05:21 2020 (r365197) @@ -585,5 +585,3 @@ struct my_softc { #define PHY_BMSR_LINKSTAT 0x0004 #define PHY_BMSR_JABBER 0x0002 #define PHY_BMSR_EXTENDED 0x0001 - - From owner-svn-src-all@freebsd.org Tue Sep 1 22:05:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7401337E1F9; Tue, 1 Sep 2020 22:05:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1NN2XlFz4dSg; Tue, 1 Sep 2020 22:05:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3BEC0202C2; Tue, 1 Sep 2020 22:05:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M5etA055461; Tue, 1 Sep 2020 22:05:40 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M5dxH055459; Tue, 1 Sep 2020 22:05:39 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012205.081M5dxH055459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:05:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365198 - head/sys/dev/mwl X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mwl X-SVN-Commit-Revision: 365198 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:05:40 -0000 Author: mjg Date: Tue Sep 1 22:05:39 2020 New Revision: 365198 URL: https://svnweb.freebsd.org/changeset/base/365198 Log: mwl: clean up empty lines in .c and .h files Modified: head/sys/dev/mwl/if_mwl.c head/sys/dev/mwl/if_mwl_pci.c head/sys/dev/mwl/mwlreg.h Modified: head/sys/dev/mwl/if_mwl.c ============================================================================== --- head/sys/dev/mwl/if_mwl.c Tue Sep 1 22:05:21 2020 (r365197) +++ head/sys/dev/mwl/if_mwl.c Tue Sep 1 22:05:39 2020 (r365198) @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include - + #include #include #include Modified: head/sys/dev/mwl/if_mwl_pci.c ============================================================================== --- head/sys/dev/mwl/if_mwl_pci.c Tue Sep 1 22:05:21 2020 (r365197) +++ head/sys/dev/mwl/if_mwl_pci.c Tue Sep 1 22:05:39 2020 (r365198) @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include - + #include #include #include @@ -98,7 +98,6 @@ static const struct mwl_pci_ident mwl_pci_ids[] = { { 0x11ab, 0x2a0c, "Marvell 88W8363" }, { 0x11ab, 0x2a21, "Marvell 88W8363" }, { 0x11ab, 0x2a24, "Marvell 88W8363" }, - { 0, 0, NULL } }; @@ -280,7 +279,6 @@ static device_method_t mwl_pci_methods[] = { DEVMETHOD(device_shutdown, mwl_pci_shutdown), DEVMETHOD(device_suspend, mwl_pci_suspend), DEVMETHOD(device_resume, mwl_pci_resume), - { 0,0 } }; static driver_t mwl_pci_driver = { Modified: head/sys/dev/mwl/mwlreg.h ============================================================================== --- head/sys/dev/mwl/mwlreg.h Tue Sep 1 22:05:21 2020 (r365197) +++ head/sys/dev/mwl/mwlreg.h Tue Sep 1 22:05:39 2020 (r365198) @@ -57,7 +57,6 @@ #define MACREG_REG_A2H_INTERRUPT_CLEAR_SEL 0x00000C38 // (From ARM to host) #define MACREG_REG_A2H_INTERRUPT_STATUS_MASK 0x00000C3C // (From ARM to host) - // Map to 0x80000000 on BAR1 #define MACREG_REG_GEN_PTR 0x00000C10 #define MACREG_REG_INT_CODE 0x00000C14 @@ -101,7 +100,6 @@ #define MACREG_A2HRIC_BIT_MASK ISR_SRC_BITS - // Bit definitio for MACREG_REG_H2A_INTERRUPT_CAUSE (H2ARIC) #define MACREG_H2ARIC_BIT_PPA_READY 0x00000001 // bit 0 #define MACREG_H2ARIC_BIT_DOOR_BELL 0x00000002 // bit 1 @@ -341,7 +339,6 @@ struct mwl_rxdesc { #define HostCmd_RESULT_BUSY 0x0004 // System is busy (command ignored) #define HostCmd_RESULT_PARTIAL_DATA 0x0005 // Data buffer is not big enough - /* // Definition of action or option for each command // @@ -377,7 +374,6 @@ struct mwl_rxdesc { #define HostCmd_WEP_KEY_INDEX_MASK 0x3fffffff - // Define action or option for HostCmd_CMD_802_11_RESET #define HostCmd_ACT_HALT 0x0001 #define HostCmd_ACT_RESTART 0x0002 @@ -485,7 +481,6 @@ typedef struct { u_int32_t Enable; /* FALSE: Disable or TRUE: Enable */ } __packed HostCmd_DS_BSS_START; - typedef struct { u_int8_t ElemId; u_int8_t Len; @@ -704,7 +699,7 @@ typedef struct { uint32_t FixedRate; // legacy rate(not index) or an MCS code. uint32_t RetryCount; } __packed FIXED_RATE_ENTRY; - + typedef struct { FWCmdHdr CmdHdr; uint32_t Action; //HostCmd_ACT_GEN_GET 0x0000 @@ -723,7 +718,7 @@ typedef struct { uint32_t EntryCount; FIXED_RATE_ENTRY FixedRateTable[4]; } __packed USE_FIXED_RATE_INFO; - + typedef struct { FWCmdHdr CmdHdr; uint32_t Action; @@ -745,7 +740,6 @@ typedef struct { uint8_t Slot; // Slot=0 if regular, Slot=1 if short. } __packed HostCmd_FW_SET_SLOT; - // Define data structure for HostCmd_CMD_802_11_GET_STAT typedef struct { FWCmdHdr CmdHdr; @@ -778,7 +772,6 @@ typedef struct { uint32_t RxExcludedFrames; } __packed HostCmd_DS_802_11_GET_STAT; - // Define data structure for HostCmd_CMD_MAC_REG_ACCESS typedef struct { FWCmdHdr CmdHdr; @@ -806,7 +799,6 @@ typedef struct { uint8_t Reserverd[3]; } __packed HostCmd_DS_RF_REG_ACCESS; - // Define data structure for HostCmd_CMD_802_11_RADIO_CONTROL typedef struct { FWCmdHdr CmdHdr; @@ -815,7 +807,6 @@ typedef struct { uint16_t RadioOn; } __packed HostCmd_DS_802_11_RADIO_CONTROL; - #define TX_POWER_LEVEL_TOTAL 8 // Define data structure for HostCmd_CMD_802_11_RF_TX_POWER typedef struct { @@ -1141,7 +1132,6 @@ typedef struct { uint8_t ActionData[1]; } __packed HostCmd_FW_UPDATE_ENCRYPTION; - typedef struct { FWCmdHdr CmdHdr; uint32_t ActionType; // ENCR_ACTION_TYPE @@ -1271,8 +1261,6 @@ typedef struct { FWCmdHdr CmdHdr; uint8_t Watchdogbitmap; // for SW/BA } __packed HostCmd_FW_GET_WATCHDOG_BITMAP; - - // Define data structure for HostCmd_CMD_SET_REGION_POWER typedef struct { From owner-svn-src-all@freebsd.org Tue Sep 1 22:05:54 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D9E937E3DF; Tue, 1 Sep 2020 22:05:54 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Nd74Y4z4dw1; Tue, 1 Sep 2020 22:05:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D71D42063C; Tue, 1 Sep 2020 22:05:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M5rDQ055518; Tue, 1 Sep 2020 22:05:53 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M5rbr055516; Tue, 1 Sep 2020 22:05:53 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012205.081M5rbr055516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:05:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365199 - head/sys/dev/mvs X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mvs X-SVN-Commit-Revision: 365199 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:05:54 -0000 Author: mjg Date: Tue Sep 1 22:05:53 2020 New Revision: 365199 URL: https://svnweb.freebsd.org/changeset/base/365199 Log: mvs: clean up empty lines in .c and .h files Modified: head/sys/dev/mvs/mvs.c head/sys/dev/mvs/mvs_pci.c Modified: head/sys/dev/mvs/mvs.c ============================================================================== --- head/sys/dev/mvs/mvs.c Tue Sep 1 22:05:39 2020 (r365198) +++ head/sys/dev/mvs/mvs.c Tue Sep 1 22:05:53 2020 (r365199) @@ -929,7 +929,6 @@ mvs_legacy_intr(device_t dev, int poll) ireason = ATA_INB(ch->r_mem,ATA_IREASON); switch ((ireason & (ATA_I_CMD | ATA_I_IN)) | (status & ATA_S_DRQ)) { - case ATAPI_P_CMDOUT: device_printf(dev, "ATAPI CMDOUT\n"); /* Return wait for interrupt */ @@ -1181,7 +1180,6 @@ mvs_tfd_write(device_t dev, union ccb *ccb) ATA_OUTB(ch->r_mem, ATA_COMMAND, cmd->command); } - /* Must be called with channel locked. */ static void mvs_begin_transaction(device_t dev, union ccb *ccb) @@ -2456,4 +2454,3 @@ mvspoll(struct cam_sim *sim) mvs_reset_to(ch->dev); } } - Modified: head/sys/dev/mvs/mvs_pci.c ============================================================================== --- head/sys/dev/mvs/mvs_pci.c Tue Sep 1 22:05:39 2020 (r365198) +++ head/sys/dev/mvs/mvs_pci.c Tue Sep 1 22:05:53 2020 (r365199) @@ -525,4 +525,3 @@ MODULE_PNP_INFO("W32:vendor/device", pci, mvs, mvs_ids nitems(mvs_ids) - 1); MODULE_VERSION(mvs, 1); MODULE_DEPEND(mvs, cam, 1, 1, 1); - From owner-svn-src-all@freebsd.org Tue Sep 1 22:06:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 07BAA37E3EC; Tue, 1 Sep 2020 22:06:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Nw6R6xz4drH; Tue, 1 Sep 2020 22:06:08 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B9F2F20066; Tue, 1 Sep 2020 22:06:08 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M68HO055578; Tue, 1 Sep 2020 22:06:08 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M68Bv055575; Tue, 1 Sep 2020 22:06:08 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012206.081M68Bv055575@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:06:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365200 - head/sys/dev/mthca X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mthca X-SVN-Commit-Revision: 365200 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:06:09 -0000 Author: mjg Date: Tue Sep 1 22:06:07 2020 New Revision: 365200 URL: https://svnweb.freebsd.org/changeset/base/365200 Log: mthca: clean up empty lines in .c and .h files Modified: head/sys/dev/mthca/mthca_cmd.c head/sys/dev/mthca/mthca_mad.c head/sys/dev/mthca/mthca_mr.c head/sys/dev/mthca/mthca_qp.c Modified: head/sys/dev/mthca/mthca_cmd.c ============================================================================== --- head/sys/dev/mthca/mthca_cmd.c Tue Sep 1 22:05:53 2020 (r365199) +++ head/sys/dev/mthca/mthca_cmd.c Tue Sep 1 22:06:07 2020 (r365200) @@ -301,7 +301,6 @@ static int mthca_cmd_post(struct mthca_dev *dev, return err; } - static int mthca_status_to_errno(u8 status) { static const int trans_table[] = { @@ -331,7 +330,6 @@ static int mthca_status_to_errno(u8 status) return trans_table[status]; } - static int mthca_cmd_poll(struct mthca_dev *dev, u64 in_param, Modified: head/sys/dev/mthca/mthca_mad.c ============================================================================== --- head/sys/dev/mthca/mthca_mad.c Tue Sep 1 22:05:53 2020 (r365199) +++ head/sys/dev/mthca/mthca_mad.c Tue Sep 1 22:06:07 2020 (r365200) @@ -311,7 +311,6 @@ int mthca_create_agents(struct mthca_dev *dev) dev->send_agent[p][q] = agent; } - for (p = 1; p <= dev->limits.num_ports; ++p) { ret = mthca_update_rate(dev, p); if (ret) { Modified: head/sys/dev/mthca/mthca_mr.c ============================================================================== --- head/sys/dev/mthca/mthca_mr.c Tue Sep 1 22:05:53 2020 (r365199) +++ head/sys/dev/mthca/mthca_mr.c Tue Sep 1 22:06:07 2020 (r365200) @@ -713,7 +713,6 @@ static inline int mthca_check_fmr(struct mthca_fmr *fm return 0; } - int mthca_tavor_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list, int list_len, u64 iova) { @@ -869,7 +868,6 @@ int mthca_init_mr_table(struct mthca_dev *dev) if (!mthca_is_memfree(dev) && (dev->mthca_flags & MTHCA_FLAG_FMR)) { - addr = pci_resource_start(dev->pdev, 4) + ((pci_resource_len(dev->pdev, 4) - 1) & dev->mr_table.mpt_base); Modified: head/sys/dev/mthca/mthca_qp.c ============================================================================== --- head/sys/dev/mthca/mthca_qp.c Tue Sep 1 22:05:53 2020 (r365199) +++ head/sys/dev/mthca/mthca_qp.c Tue Sep 1 22:06:07 2020 (r365200) @@ -1086,7 +1086,6 @@ static int mthca_map_memfree(struct mthca_dev *dev, qp->qpn << dev->qp_table.rdb_shift); if (ret) goto err_eqpc; - } return 0; @@ -1218,7 +1217,6 @@ static int mthca_alloc_qp_common(struct mthca_dev *dev next->nda_op = htonl((((i + 1) % qp->rq.max) << qp->rq.wqe_shift) | 1); } - } qp->sq.last = get_send_wqe(qp, qp->sq.max - 1); From owner-svn-src-all@freebsd.org Tue Sep 1 22:06:24 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7785137E4FC; Tue, 1 Sep 2020 22:06:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1PD2fcgz4dxL; Tue, 1 Sep 2020 22:06:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F3942032D; Tue, 1 Sep 2020 22:06:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M6OlS055650; Tue, 1 Sep 2020 22:06:24 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M6Nlo055645; Tue, 1 Sep 2020 22:06:23 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012206.081M6Nlo055645@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:06:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365201 - head/sys/dev/mrsas X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mrsas X-SVN-Commit-Revision: 365201 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:06:24 -0000 Author: mjg Date: Tue Sep 1 22:06:23 2020 New Revision: 365201 URL: https://svnweb.freebsd.org/changeset/base/365201 Log: mrsas: clean up empty lines in .c and .h files Modified: head/sys/dev/mrsas/mrsas.c head/sys/dev/mrsas/mrsas.h head/sys/dev/mrsas/mrsas_cam.c head/sys/dev/mrsas/mrsas_fp.c head/sys/dev/mrsas/mrsas_ioctl.h Modified: head/sys/dev/mrsas/mrsas.c ============================================================================== --- head/sys/dev/mrsas/mrsas.c Tue Sep 1 22:06:07 2020 (r365200) +++ head/sys/dev/mrsas/mrsas.c Tue Sep 1 22:06:23 2020 (r365201) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* * Function prototypes */ @@ -177,7 +176,6 @@ void mrsas_write_64bit_req_desc(struct mrsas_softc *sc, u_int32_t req_desc_lo, u_int32_t req_desc_hi); - SYSCTL_NODE(_hw, OID_AUTO, mrsas, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "MRSAS Driver Parameters"); @@ -314,7 +312,6 @@ mrsas_read_reg(struct mrsas_softc *sc, int offset) return ((u_int32_t)bus_space_read_4(bus_tag, bus_handle, offset)); } - /* * Interrupt Disable/Enable/Clear Functions * @@ -650,7 +647,6 @@ dcmd_timeout: return retcode; } - /* * mrsas_register_aen: Register for asynchronous event notification * @sc: Adapter soft state @@ -685,7 +681,6 @@ mrsas_register_aen(struct mrsas_softc *sc, u_int32_t s curr_aen.word = class_locale_word; if (sc->aen_cmd) { - prev_aen.word = sc->aen_cmd->frame->dcmd.mbox.w[1]; /* @@ -779,7 +774,6 @@ mrsas_start_aen(struct mrsas_softc *sc) struct mrsas_evt_log_info eli; union mrsas_evt_class_locale class_locale; - /* Get the latest sequence number from FW */ memset(&eli, 0, sizeof(eli)); @@ -905,7 +899,6 @@ mrsas_attach(device_t dev) case MRSAS_AERO_10E7: device_printf(dev, "Adapter is in non-secure mode\n"); return SUCCESS; - } mrsas_get_tunables(sc); @@ -1263,7 +1256,6 @@ mrsas_free_mem(struct mrsas_softc *sc) if (sc->verbuf_tag != NULL) bus_dma_tag_destroy(sc->verbuf_tag); - /* * Free sense buffer memory */ @@ -2487,7 +2479,6 @@ mrsas_init_fw(struct mrsas_softc *sc) } megasas_setup_jbod_map(sc); - memset(sc->target_list, 0, MRSAS_MAX_TM_TARGETS * sizeof(struct mrsas_target)); for (i = 0; i < MRSAS_MAX_TM_TARGETS; i++) @@ -3132,7 +3123,6 @@ mrsas_ocr_thread(void *arg) fw_state = fw_status & MFI_STATE_MASK; if (fw_state == MFI_STATE_FAULT || sc->do_timedout_reset || mrsas_atomic_read(&sc->target_reset_outstanding)) { - /* First, freeze further IOs to come to the SIM */ mrsas_xpt_freeze(sc); @@ -3526,7 +3516,6 @@ mrsas_wait_for_outstanding(struct mrsas_softc *sc, u_i int i, outstanding, retval = 0; u_int32_t fw_state, count, MSIxIndex; - for (i = 0; i < MRSAS_RESET_WAIT_TIME; i++) { if (sc->remove_in_progress) { mrsas_dprint(sc, MRSAS_OCR, @@ -3592,7 +3581,6 @@ mrsas_release_mfi_cmd(struct mrsas_mfi_cmd *cmd_mfi) struct mrsas_softc *sc = cmd_mfi->sc; struct mrsas_mpt_cmd *cmd_mpt; - mtx_lock(&sc->mfi_cmd_pool_lock); /* * Release the mpt command (if at all it is allocated @@ -4094,7 +4082,6 @@ mrsas_complete_mptmfi_passthru(struct mrsas_softc *sc, if ((cmd->frame->dcmd.opcode == MR_DCMD_SYSTEM_PD_MAP_GET_INFO) && (cmd->frame->dcmd.mbox.b[0] == 1)) { - mtx_lock(&sc->raidmap_lock); sc->jbod_seq_cmd = NULL; mrsas_release_mfi_cmd(cmd); @@ -5021,7 +5008,6 @@ skip_register_aen: return; } - /* * mrsas_complete_aen: Completes AEN command Modified: head/sys/dev/mrsas/mrsas.h ============================================================================== --- head/sys/dev/mrsas/mrsas.h Tue Sep 1 22:06:07 2020 (r365200) +++ head/sys/dev/mrsas/mrsas.h Tue Sep 1 22:06:23 2020 (r365201) @@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$"); #include /* For pci_get macros! */ #include - #define IOCTL_SEMA_DESCRIPTION "mrsas semaphore for MFI pool" /* @@ -101,7 +100,6 @@ __FBSDID("$FreeBSD$"); #define MRSAS_AERO_10E6 0x10E6 #define MRSAS_AERO_10E7 0x10E7 - /* * Firmware State Defines */ @@ -167,7 +165,6 @@ do { \ device_printf(sc->mrsas_dev, msg, ##args); \ } while (0) - /**************************************************************************** * Raid Context structure which describes MegaRAID specific IO Paramenters * This resides at offset 0x60 where the SGL normally starts in MPT IO Frames @@ -242,7 +239,6 @@ typedef union _RAID_CONTEXT_UNION { RAID_CONTEXT_G35 raid_context_g35; } RAID_CONTEXT_UNION, *PRAID_CONTEXT_UNION; - /************************************************************************* * MPI2 Defines ************************************************************************/ @@ -296,7 +292,6 @@ typedef union _RAID_CONTEXT_UNION { #define MPI2_POINTER * #endif - /*************************************** * MPI2 Structures ***************************************/ @@ -762,7 +757,6 @@ Mpi2IOCInitRequest_t, MPI2_POINTER pMpi2IOCInitRequest #define MRSAS_MAX_LD_IDS (MRSAS_MAX_LD_CHANNELS * \ MRSAS_MAX_DEV_PER_CHANNEL) - #define VD_EXT_DEBUG 0 #define TM_DEBUG 1 @@ -904,7 +898,6 @@ typedef struct _MR_FW_RAID_MAP { MR_LD_SPAN_MAP ldSpanMap[1]; } MR_FW_RAID_MAP; - typedef struct _MR_FW_RAID_MAP_EXT { /* Not used in new map */ u_int32_t reserved; @@ -935,7 +928,6 @@ typedef struct _MR_FW_RAID_MAP_EXT { MR_LD_SPAN_MAP ldSpanMap[MAX_LOGICAL_DRIVES_EXT]; } MR_FW_RAID_MAP_EXT; - typedef struct _MR_DRV_RAID_MAP { /* * Total size of this structure, including this field. This feild @@ -979,7 +971,6 @@ typedef struct _MR_DRV_RAID_MAP { #pragma pack(1) typedef struct _MR_DRV_RAID_MAP_ALL { - MR_DRV_RAID_MAP raidMap; MR_LD_SPAN_MAP ldSpanMap[MAX_LOGICAL_DRIVES_DYN - 1]; } MR_DRV_RAID_MAP_ALL; @@ -1084,14 +1075,12 @@ typedef struct _LD_STREAM_DETECT { STREAM_DETECT streamTrack[MAX_STREAMS_TRACKED]; } LD_STREAM_DETECT, *PTR_LD_STREAM_DETECT; - typedef struct _MR_LD_TARGET_SYNC { u_int8_t targetId; u_int8_t reserved; u_int16_t seqNum; } MR_LD_TARGET_SYNC; - /* * RAID Map descriptor Types. * Each element should uniquely idetify one data structure in the RAID map @@ -1166,7 +1155,6 @@ typedef struct _MR_FW_RAID_MAP_DYNAMIC { } MR_FW_RAID_MAP_DYNAMIC; - #define IEEE_SGE_FLAGS_ADDR_MASK (0x03) #define IEEE_SGE_FLAGS_SYSTEM_ADDR (0x00) #define IEEE_SGE_FLAGS_IOCDDR_ADDR (0x01) @@ -1183,7 +1171,6 @@ typedef struct _MR_FW_RAID_MAP_DYNAMIC { #define IEEE_SGE_FLAGS_FORMAT_NVME (0x02) #define IEEE_SGE_FLAGS_FORMAT_AHCI (0x03) - #define MPI26_IEEE_SGE_FLAGS_NSF_MASK (0x1C) #define MPI26_IEEE_SGE_FLAGS_NSF_MPI_IEEE (0x00) #define MPI26_IEEE_SGE_FLAGS_NSF_PQI (0x04) @@ -1213,7 +1200,6 @@ struct mrsas_tmp_dcmd { #define MR_MAX_RAID_MAP_SIZE_MASK 0x1FF #define MR_MIN_MAP_SIZE 0x10000 - /******************************************************************* * Register set, included legacy controllers 1068 and 1078, * structure extended for 1078 registers @@ -1472,7 +1458,6 @@ enum MFI_STAT { #define MFI_MBOX_SIZE 12 enum MR_EVT_CLASS { - MR_EVT_CLASS_DEBUG = -2, MR_EVT_CLASS_PROGRESS = -1, MR_EVT_CLASS_INFO = 0, @@ -1484,7 +1469,6 @@ enum MR_EVT_CLASS { }; enum MR_EVT_LOCALE { - MR_EVT_LOCALE_LD = 0x0001, MR_EVT_LOCALE_PD = 0x0002, MR_EVT_LOCALE_ENCL = 0x0004, @@ -1498,7 +1482,6 @@ enum MR_EVT_LOCALE { }; enum MR_EVT_ARGS { - MR_EVT_ARGS_NONE, MR_EVT_ARGS_CDB_SENSE, MR_EVT_ARGS_LD, @@ -1617,7 +1600,6 @@ typedef enum _REGION_TYPE { REGION_TYPE_EXCLUSIVE = 3, } REGION_TYPE; - /* * SCSI-CAM Related Defines */ @@ -1736,7 +1718,6 @@ struct mrsas_mfi_cmd { TAILQ_ENTRY(mrsas_mfi_cmd) next; }; - /* * define constants for device list query options */ @@ -1833,7 +1814,6 @@ typedef union _MR_LD_REF { u_int32_t ref; } MR_LD_REF; - /* * defines the logical drive list structure */ @@ -1929,7 +1909,6 @@ struct mrsas_ctrl_prop { #pragma pack() - /* * SAS controller information */ @@ -2213,7 +2192,6 @@ struct mrsas_ctrl_info { u_int32_t headlessMode:1; u_int32_t dedicatedHotSparesLimited:1; - u_int32_t supportUnevenSpans:1; u_int32_t reserved:11; } adapterOperations2; @@ -2225,7 +2203,6 @@ struct mrsas_ctrl_info { u_int8_t reserved4; /* 0x7CB */ u_int16_t maxConfigurablePds; /* 0x7CC */ - u_int8_t reserved5[2]; /* 0x7CD reserved */ struct { @@ -2580,7 +2557,6 @@ struct mrsas_smp_frame { #pragma pack() - #pragma pack(1) struct mrsas_stp_frame { u_int8_t cmd; /* 00h */ @@ -2625,7 +2601,6 @@ union mrsas_frame { #pragma pack(1) union mrsas_evt_class_locale { - struct { u_int16_t locale; u_int8_t reserved; @@ -2638,7 +2613,6 @@ union mrsas_evt_class_locale { #pragma pack() - #pragma pack(1) struct mrsas_evt_log_info { u_int32_t newest_seq_num; @@ -2652,14 +2626,12 @@ struct mrsas_evt_log_info { #pragma pack() struct mrsas_progress { - u_int16_t progress; u_int16_t elapsed_seconds; } __packed; struct mrsas_evtarg_ld { - u_int16_t target_id; u_int8_t ld_index; u_int8_t reserved; @@ -2674,7 +2646,6 @@ struct mrsas_evtarg_pd { } __packed; struct mrsas_evt_detail { - u_int32_t seq_num; u_int32_t time_stamp; u_int32_t code; @@ -2952,7 +2923,6 @@ typedef struct _MRSAS_DRV_PCI_LINK_STATUS_CAPABILITY { #define MRSAS_DRV_PCI_LINK_STATUS_CAPABILITY_SIZE sizeof(MRSAS_DRV_PCI_LINK_STATUS_CAPABILITY) - typedef struct _MRSAS_DRV_PCI_CAPABILITIES { MRSAS_DRV_PCI_LINK_CAPABILITY linkCapability; MRSAS_DRV_PCI_LINK_STATUS_CAPABILITY linkStatusCapability; @@ -3060,7 +3030,6 @@ struct MR_PD_PROGRESS { union MR_PROGRESS reserved[3]; } __packed; - struct mrsas_pd_info { MR_PD_REF ref; Modified: head/sys/dev/mrsas/mrsas_cam.c ============================================================================== --- head/sys/dev/mrsas/mrsas_cam.c Tue Sep 1 22:06:07 2020 (r365200) +++ head/sys/dev/mrsas/mrsas_cam.c Tue Sep 1 22:06:23 2020 (r365201) @@ -784,9 +784,6 @@ mrsas_get_request_desc(struct mrsas_softc *sc, u_int16 return (MRSAS_REQUEST_DESCRIPTOR_UNION *) p; } - - - /* mrsas_prepare_secondRaid1_IO * It prepares the raid 1 second IO */ @@ -836,7 +833,6 @@ mrsas_prepare_secondRaid1_IO(struct mrsas_softc *sc, } - /* * mrsas_build_ldio_rw: Builds an LDIO command * input: Adapter instance soft state @@ -957,7 +953,6 @@ mrsas_stream_detect(struct mrsas_softc *sc, struct mrs return; } - /* * mrsas_setup_io: Set up data including Fast Path I/O * input: Adapter instance soft state @@ -1451,7 +1446,6 @@ static boolean_t mrsas_is_prp_possible(struct mrsas_mp break; } } - } return build_prp; @@ -1623,14 +1617,12 @@ static void mrsas_build_prp_nvme(struct mrsas_mpt_cmd main_chain_element = (pMpi25IeeeSgeChain64_t) ((u_int8_t *)sgl_ptr + sizeof(MPI25_IEEE_SGE_CHAIN64)); - main_chain_element->Address = cmd->chain_frame_phys_addr; main_chain_element->NextChainOffset = 0; main_chain_element->Flags = IEEE_SGE_FLAGS_CHAIN_ELEMENT | IEEE_SGE_FLAGS_SYSTEM_ADDR | MPI26_IEEE_SGE_FLAGS_NSF_NVME_PRP; - /* Build first PRP, SGE need not to be PAGE aligned*/ ptr_first_sgl = sgl_ptr; sge_addr = segs[i].ds_addr; @@ -1655,7 +1647,6 @@ static void mrsas_build_prp_nvme(struct mrsas_mpt_cmd } for (;;) { - offset = (u_int32_t) (sge_addr & page_mask); /* Put PRP pointer due to page boundary*/ @@ -1674,7 +1665,6 @@ static void mrsas_build_prp_nvme(struct mrsas_mpt_cmd ptr_sgl_phys++; num_prp_in_chain++; - sge_addr += mr_nvme_pg_size; sge_len -= mr_nvme_pg_size; data_len -= mr_nvme_pg_size; @@ -1783,7 +1773,7 @@ void mrsas_cmd_done(struct mrsas_softc *sc, struct mrsas_mpt_cmd *cmd) { mrsas_unmap_request(sc, cmd); - + mtx_lock(&sc->sim_lock); if (cmd->callout_owner) { callout_stop(&cmd->cm_callout); @@ -2152,4 +2142,3 @@ return_status: return retCode; } - Modified: head/sys/dev/mrsas/mrsas_fp.c ============================================================================== --- head/sys/dev/mrsas/mrsas_fp.c Tue Sep 1 22:06:07 2020 (r365200) +++ head/sys/dev/mrsas/mrsas_fp.c Tue Sep 1 22:06:23 2020 (r365201) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* * Function prototypes */ @@ -105,7 +104,6 @@ MR_LdSpanInfoGet(u_int32_t ld, MR_LD_RAID *MR_LdRaidGet(u_int32_t ld, MR_DRV_RAID_MAP_ALL * map); static int MR_PopulateDrvRaidMap(struct mrsas_softc *sc); - /* * Spanset related function prototypes Added for PRL11 configuration (Uneven * span support) @@ -126,7 +124,6 @@ static u_int8_t get_arm(struct mrsas_softc *sc, u_int32_t ld, u_int8_t span, u_int64_t stripe, MR_DRV_RAID_MAP_ALL * map); - /* * Spanset related defines Added for PRL11 configuration(Uneven span support) */ @@ -149,7 +146,6 @@ typedef u_int32_t REGION_LEN; #define LB_PENDING_CMDS_DEFAULT 4 - /* * Related Macros */ @@ -163,7 +159,6 @@ typedef u_int32_t REGION_LEN; (((unsigned int)(x) & (unsigned int)0x00ff0000UL) >> 8) | \ (((unsigned int)(x) & (unsigned int)0xff000000UL) >> 24) )) - /* * In-line functions for mod and divide of 64-bit dividend and 32-bit * divisor. Assumes a check for a divisor of zero is not possible. @@ -183,7 +178,6 @@ int quotient; \ quotient = ((u_int64_t) (dividend)) / (u_int32_t) (divisor); \ quotient;}) - /* * Various RAID map access functions. These functions access the various * parts of the RAID map and returns the appropriate parameters. @@ -224,7 +218,6 @@ static u_int8_t MR_PdInterfaceTypeGet(u_int32_t pd, MR return map->raidMap.devHndlInfo[pd].interfaceType; } - static u_int16_t MR_ArPdGet(u_int32_t ar, u_int32_t arm, MR_DRV_RAID_MAP_ALL * map) { @@ -768,7 +761,6 @@ get_row_from_strip(struct mrsas_softc *sc, return -1LLU; } - /* * * This routine calculates the Start Strip for given row using spanset. @@ -880,7 +872,6 @@ get_arm_from_strip(struct mrsas_softc *sc, return -1; } - /* This Function will return Phys arm */ u_int8_t get_arm(struct mrsas_softc *sc, u_int32_t ld, u_int8_t span, u_int64_t stripe, @@ -941,7 +932,6 @@ mr_spanset_get_phy_params(struct mrsas_softc *sc, u_in row = io_info->start_row; span = io_info->start_span; - if (raid->level == 6) { logArm = get_arm_from_strip(sc, ld, stripRow, map); rowMod = mega_mod64(row, SPAN_ROW_SIZE(map, ld, span)); @@ -954,7 +944,6 @@ mr_spanset_get_phy_params(struct mrsas_softc *sc, u_in /* Calculate the arm */ physArm = get_arm(sc, ld, span, stripRow, map); - arRef = MR_LdSpanArrayGet(ld, span, map); pd = MR_ArPdGet(arRef, physArm, map); @@ -1350,7 +1339,6 @@ mrsas_update_load_balance_params(struct mrsas_softc *s lbInfo[ldCount].loadBalanceFlag = 1; } } - /* * mrsas_set_pd_lba: Sets PD LBA Modified: head/sys/dev/mrsas/mrsas_ioctl.h ============================================================================== --- head/sys/dev/mrsas/mrsas_ioctl.h Tue Sep 1 22:06:07 2020 (r365200) +++ head/sys/dev/mrsas/mrsas_ioctl.h Tue Sep 1 22:06:23 2020 (r365201) @@ -88,7 +88,6 @@ __FBSDID("$FreeBSD$"); #define MEGAMFI_RAW_FRAME_SIZE 128 - #pragma pack(1) struct mrsas_iocpacket { u_int16_t host_no; From owner-svn-src-all@freebsd.org Tue Sep 1 22:06:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C0C5C37E813; Tue, 1 Sep 2020 22:06:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Pb3spVz4dvh; Tue, 1 Sep 2020 22:06:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 685AF2032E; Tue, 1 Sep 2020 22:06:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M6hXS055715; Tue, 1 Sep 2020 22:06:43 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M6g8R055709; Tue, 1 Sep 2020 22:06:42 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012206.081M6g8R055709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:06:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365202 - in head/sys/dev/mpt: . mpilib X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/mpt: . mpilib X-SVN-Commit-Revision: 365202 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:06:43 -0000 Author: mjg Date: Tue Sep 1 22:06:41 2020 New Revision: 365202 URL: https://svnweb.freebsd.org/changeset/base/365202 Log: mpt: clean up empty lines in .c and .h files Modified: head/sys/dev/mpt/mpilib/mpi.h head/sys/dev/mpt/mpilib/mpi_cnfg.h head/sys/dev/mpt/mpilib/mpi_fc.h head/sys/dev/mpt/mpilib/mpi_init.h head/sys/dev/mpt/mpilib/mpi_ioc.h head/sys/dev/mpt/mpilib/mpi_lan.h head/sys/dev/mpt/mpilib/mpi_log_fc.h head/sys/dev/mpt/mpilib/mpi_log_sas.h head/sys/dev/mpt/mpilib/mpi_raid.h head/sys/dev/mpt/mpilib/mpi_sas.h head/sys/dev/mpt/mpilib/mpi_targ.h head/sys/dev/mpt/mpilib/mpi_tool.h head/sys/dev/mpt/mpilib/mpi_type.h head/sys/dev/mpt/mpt.c head/sys/dev/mpt/mpt.h head/sys/dev/mpt/mpt_cam.c head/sys/dev/mpt/mpt_debug.c head/sys/dev/mpt/mpt_raid.c head/sys/dev/mpt/mpt_user.c Modified: head/sys/dev/mpt/mpilib/mpi.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi.h Tue Sep 1 22:06:41 2020 (r365202) @@ -118,7 +118,6 @@ #ifndef MPI_H #define MPI_H - /***************************************************************************** * * M P I V e r s i o n D e f i n i t i o n s @@ -175,7 +174,6 @@ #define MPI_FAULT_DATA_RECEIVE_PCI_PARITY_ERROR (0x8117) #define MPI_FAULT_DATA_RECEIVE_PCI_BUS_FAULT (0x8118) - /***************************************************************************** * * P C I S y s t e m I n t e r f a c e R e g i s t e r s @@ -206,7 +204,6 @@ #define MPI_DB_HPBAC_DISABLE_ACCESS (0x02) #define MPI_DB_HPBAC_FREE_BUFFER (0x03) - #define MPI_WRITE_SEQUENCE_OFFSET (0x00000004) #define MPI_WRSEQ_KEY_VALUE_MASK (0x0000000F) #define MPI_WRSEQ_1ST_KEY_VALUE (0x04) @@ -250,8 +247,6 @@ #define MPI_HI_PRI_REQUEST_QUEUE_OFFSET (0x00000048) - - /***************************************************************************** * * M e s s a g e F r a m e D e s c r i p t o r s @@ -273,7 +268,6 @@ #define MPI_CONTEXT_REPLY_TYPE_SHIFT (29) #define MPI_CONTEXT_REPLY_CONTEXT_MASK (0x1FFFFFFF) - /****************************************************************************/ /* Context Reply macros */ /****************************************************************************/ @@ -286,7 +280,6 @@ (((typ) << MPI_CONTEXT_REPLY_TYPE_SHIFT) & \ MPI_CONTEXT_REPLY_TYPE_MASK)) - /***************************************************************************** * * M e s s a g e F u n c t i o n s @@ -354,7 +347,6 @@ #define MPI_FUNCTION_REPLY_FRAME_REMOVAL (0x43) #define MPI_FUNCTION_HOST_PAGEBUF_ACCESS_CONTROL (0x44) - /* standard version format */ typedef struct _MPI_VERSION_STRUCT { @@ -372,7 +364,6 @@ typedef union _MPI_VERSION_FORMAT } MPI_VERSION_FORMAT, MPI_POINTER PTR_MPI_VERSION_FORMAT, MpiVersionFormat_t, MPI_POINTER pMpiVersionFormat_t; - /***************************************************************************** * * S c a t t e r G a t h e r E l e m e n t s @@ -508,7 +499,6 @@ typedef struct _SGE_TRANSACTION_UNION } SGE_TRANSACTION_UNION, MPI_POINTER PTR_SGE_TRANSACTION_UNION, SGETransactionUnion_t, MPI_POINTER pSGETransactionUnion_t; - /****************************************************************************/ /* SGE IO types union for IO SGL's */ /****************************************************************************/ @@ -553,7 +543,6 @@ typedef struct _SGE_MPI_UNION MPI_SGE_UNION_t, MPI_POINTER pMPI_SGE_UNION_t, SGEAllUnion_t, MPI_POINTER pSGEAllUnion_t; - /****************************************************************************/ /* SGE field definition and masks */ /****************************************************************************/ @@ -604,7 +593,6 @@ typedef struct _SGE_MPI_UNION #define MPI_SGE_CHAIN_OFFSET_MASK (0x00FF0000) #define MPI_SGE_CHAIN_OFFSET_SHIFT (16) - /****************************************************************************/ /* SGE operation Macros */ /****************************************************************************/ @@ -626,8 +614,6 @@ typedef struct _SGE_MPI_UNION #define MPI_GET_CHAIN_OFFSET(x) ((x&MPI_SGE_CHAIN_OFFSET_MASK)>>MPI_SGE_CHAIN_OFFSET_SHIFT) - - /***************************************************************************** * * S t a n d a r d M e s s a g e S t r u c t u r e s @@ -649,7 +635,6 @@ typedef struct _MSG_REQUEST_HEADER } MSG_REQUEST_HEADER, MPI_POINTER PTR_MSG_REQUEST_HEADER, MPIHeader_t, MPI_POINTER pMPIHeader_t; - /****************************************************************************/ /* Default Reply */ /****************************************************************************/ @@ -668,12 +653,10 @@ typedef struct _MSG_DEFAULT_REPLY } MSG_DEFAULT_REPLY, MPI_POINTER PTR_MSG_DEFAULT_REPLY, MPIDefaultReply_t, MPI_POINTER pMPIDefaultReply_t; - /* MsgFlags definition for all replies */ #define MPI_MSGFLAGS_CONTINUATION_REPLY (0x80) - /***************************************************************************** * * I O C S t a t u s V a l u e s @@ -732,7 +715,6 @@ typedef struct _MSG_DEFAULT_REPLY #define MPI_IOCSTATUS_EEDP_REF_TAG_ERROR (0x004E) #define MPI_IOCSTATUS_EEDP_APP_TAG_ERROR (0x004F) - /****************************************************************************/ /* SCSI Target values */ /****************************************************************************/ @@ -804,7 +786,6 @@ typedef struct _MSG_DEFAULT_REPLY #define MPI_IOCSTATUS_DIAGNOSTIC_RELEASED (0x00A0) - /****************************************************************************/ /* IOCStatus flag to indicate that log info is available */ /****************************************************************************/ @@ -824,6 +805,5 @@ typedef struct _MSG_DEFAULT_REPLY #define MPI_IOCLOGINFO_TYPE_SAS (0x3) #define MPI_IOCLOGINFO_TYPE_ISCSI (0x4) #define MPI_IOCLOGINFO_LOG_DATA_MASK (0x0FFFFFFF) - #endif Modified: head/sys/dev/mpt/mpilib/mpi_cnfg.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_cnfg.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_cnfg.h Tue Sep 1 22:06:41 2020 (r365202) @@ -365,7 +365,6 @@ #ifndef MPI_CNFG_H #define MPI_CNFG_H - /***************************************************************************** * * C o n f i g M e s s a g e a n d S t r u c t u r e s @@ -402,8 +401,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER } CONFIG_EXTENDED_PAGE_HEADER, MPI_POINTER PTR_CONFIG_EXTENDED_PAGE_HEADER, ConfigExtendedPageHeader_t, MPI_POINTER pConfigExtendedPageHeader_t; - - /**************************************************************************** * PageType field values ****************************************************************************/ @@ -430,7 +427,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER #define MPI_CONFIG_TYPENUM_MASK (0x0FFF) - /**************************************************************************** * ExtPageType field values ****************************************************************************/ @@ -441,7 +437,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER #define MPI_CONFIG_EXTPAGETYPE_LOG (0x14) #define MPI_CONFIG_EXTPAGETYPE_ENCLOSURE (0x15) - /**************************************************************************** * PageAddress field values ****************************************************************************/ @@ -531,8 +526,6 @@ typedef struct _CONFIG_EXTENDED_PAGE_HEADER #define MPI_SAS_ENCLOS_PGAD_H_HANDLE_MASK (0x0000FFFF) #define MPI_SAS_ENCLOS_PGAD_H_HANDLE_SHIFT (0) - - /**************************************************************************** * Config Request Message ****************************************************************************/ @@ -553,7 +546,6 @@ typedef struct _MSG_CONFIG } MSG_CONFIG, MPI_POINTER PTR_MSG_CONFIG, Config_t, MPI_POINTER pConfig_t; - /**************************************************************************** * Action field values ****************************************************************************/ @@ -565,7 +557,6 @@ typedef struct _MSG_CONFIG #define MPI_CONFIG_ACTION_PAGE_READ_DEFAULT (0x05) #define MPI_CONFIG_ACTION_PAGE_READ_NVRAM (0x06) - /* Config Reply Message */ typedef struct _MSG_CONFIG_REPLY { @@ -584,8 +575,6 @@ typedef struct _MSG_CONFIG_REPLY } MSG_CONFIG_REPLY, MPI_POINTER PTR_MSG_CONFIG_REPLY, ConfigReply_t, MPI_POINTER pConfigReply_t; - - /***************************************************************************** * * C o n f i g u r a t i o n P a g e s @@ -622,7 +611,6 @@ typedef struct _MSG_CONFIG_REPLY #define MPI_MANUFACTPAGE_DEVID_SAS1068E (0x0058) #define MPI_MANUFACTPAGE_DEVID_SAS1078 (0x0062) - typedef struct _CONFIG_PAGE_MANUFACTURING_0 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -637,7 +625,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_0 #define MPI_MANUFACTURING0_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_MANUFACTURING_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -647,7 +634,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_1 #define MPI_MANUFACTURING1_PAGEVERSION (0x00) - typedef struct _MPI_CHIP_REVISION_ID { U16 DeviceID; /* 00h */ @@ -656,7 +642,6 @@ typedef struct _MPI_CHIP_REVISION_ID } MPI_CHIP_REVISION_ID, MPI_POINTER PTR_MPI_CHIP_REVISION_ID, MpiChipRevisionId_t, MPI_POINTER pMpiChipRevisionId_t; - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check Header.PageLength at runtime. @@ -675,7 +660,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_2 #define MPI_MANUFACTURING2_PAGEVERSION (0x00) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check Header.PageLength at runtime. @@ -694,7 +678,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_3 #define MPI_MANUFACTURING3_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_MANUFACTURING_4 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -752,7 +735,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_4 #define MPI_MANPAGE4_EXTFLAGS_SATA_CACHE_DISABLE (0x0002) #define MPI_MANPAGE4_EXTFLAGS_LEGACY_MODE (0x0001) - #ifndef MPI_MANPAGE5_NUM_FORCEWWID #define MPI_MANPAGE5_NUM_FORCEWWID (1) #endif @@ -775,7 +757,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_5 /* defines for the Flags field */ #define MPI_MANPAGE5_TWO_WWID_PER_PHY (0x01) - typedef struct _CONFIG_PAGE_MANUFACTURING_6 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -785,7 +766,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_6 #define MPI_MANUFACTURING6_PAGEVERSION (0x00) - typedef struct _MPI_MANPAGE7_CONNECTOR_INFO { U32 Pinout; /* 00h */ @@ -845,7 +825,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_7 /* defines for the Flags field */ #define MPI_MANPAGE7_FLAG_USE_SLOT_INFO (0x00000001) - typedef struct _CONFIG_PAGE_MANUFACTURING_8 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -855,7 +834,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_8 #define MPI_MANUFACTURING8_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_MANUFACTURING_9 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -865,7 +843,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_9 #define MPI_MANUFACTURING9_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_MANUFACTURING_10 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -875,7 +852,6 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_10 #define MPI_MANUFACTURING10_PAGEVERSION (0x00) - /**************************************************************************** * IO Unit Config Pages ****************************************************************************/ @@ -889,7 +865,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_0 #define MPI_IOUNITPAGE0_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_IO_UNIT_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -944,7 +919,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_2 #define MPI_IOUNITPAGE2_FLAGS_ADAPTER_DISPLAY (0x00000020) #define MPI_IOUNITPAGE2_FLAGS_ADAPTER_DEV_DISPLAY (0x00000040) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check Header.PageLength at runtime. @@ -970,7 +944,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_3 #define MPI_IOUNITPAGE3_GPIO_SETTING_OFF (0x00) #define MPI_IOUNITPAGE3_GPIO_SETTING_ON (0x01) - typedef struct _CONFIG_PAGE_IO_UNIT_4 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -981,7 +954,6 @@ typedef struct _CONFIG_PAGE_IO_UNIT_4 #define MPI_IOUNITPAGE4_PAGEVERSION (0x00) - /**************************************************************************** * IOC Config Pages ****************************************************************************/ @@ -1003,7 +975,6 @@ typedef struct _CONFIG_PAGE_IOC_0 #define MPI_IOCPAGE0_PAGEVERSION (0x01) - typedef struct _CONFIG_PAGE_IOC_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1027,7 +998,6 @@ typedef struct _CONFIG_PAGE_IOC_1 #define MPI_IOCPAGE1_PCISLOTNUM_UNKNOWN (0xFF) - typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL { U8 VolumeID; /* 00h */ @@ -1091,7 +1061,6 @@ typedef struct _CONFIG_PAGE_IOC_2 #define MPI_IOCPAGE2_CAP_FLAGS_SAFTE_SUPPORT (0x40000000) #define MPI_IOCPAGE2_CAP_FLAGS_CROSS_CHANNEL_SUPPORT (0x80000000) - typedef struct _IOC_3_PHYS_DISK { U8 PhysDiskID; /* 00h */ @@ -1121,7 +1090,6 @@ typedef struct _CONFIG_PAGE_IOC_3 #define MPI_IOCPAGE3_PAGEVERSION (0x00) - typedef struct _IOC_4_SEP { U8 SEPTargetID; /* 00h */ @@ -1150,7 +1118,6 @@ typedef struct _CONFIG_PAGE_IOC_4 #define MPI_IOCPAGE4_PAGEVERSION (0x00) - typedef struct _IOC_5_HOT_SPARE { U8 PhysDiskNum; /* 00h */ @@ -1230,7 +1197,6 @@ typedef struct _CONFIG_PAGE_IOC_6 #define MPI_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE (0x00000001) - /**************************************************************************** * BIOS Config Pages ****************************************************************************/ @@ -1504,7 +1470,6 @@ typedef struct _CONFIG_PAGE_BIOS_4 #define MPI_BIOSPAGE4_PAGEVERSION (0x00) - /**************************************************************************** * SCSI Port Config Pages ****************************************************************************/ @@ -1557,7 +1522,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_0 #define MPI_SCSIPORTPAGE0_PHY_BUS_FREE_CONNECTED_ID (0xFE) #define MPI_SCSIPORTPAGE0_PHY_UNKNOWN_CONNECTED_ID (0xFF) - typedef struct _CONFIG_PAGE_SCSI_PORT_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1580,7 +1544,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_1 #define MPI_SCSIPORTPAGE1_TARGCONFIG_TARG_ONLY (0x01) #define MPI_SCSIPORTPAGE1_TARGCONFIG_INIT_TARG (0x02) - typedef struct _MPI_DEVICE_INFO { U8 Timeout; /* 00h */ @@ -1611,7 +1574,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_2 #define MPI_SCSIPORTPAGE2_PORT_FLAGS_BASIC_DV_ONLY (0x00000020) #define MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV (0x00000060) - /* PortSettings values */ #define MPI_SCSIPORTPAGE2_PORT_HOST_ID_MASK (0x0000000F) #define MPI_SCSIPORTPAGE2_PORT_MASK_INIT_HBA (0x00000030) @@ -1637,7 +1599,6 @@ typedef struct _CONFIG_PAGE_SCSI_PORT_2 #define MPI_SCSIPORTPAGE2_DEVICE_WIDE_DISABLE (0x0010) #define MPI_SCSIPORTPAGE2_DEVICE_BOOT_CHOICE (0x0020) - /**************************************************************************** * SCSI Target Device Config Pages ****************************************************************************/ @@ -1673,7 +1634,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_0 #define MPI_SCSIDEVPAGE0_INFO_WDTR_REJECTED (0x00000004) #define MPI_SCSIDEVPAGE0_INFO_PPR_REJECTED (0x00000008) - typedef struct _CONFIG_PAGE_SCSI_DEVICE_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1706,7 +1666,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_1 #define MPI_SCSIDEVPAGE1_CONF_EXTENDED_PARAMS_ENABLE (0x00000008) #define MPI_SCSIDEVPAGE1_CONF_FORCE_PPR_MSG (0x00000010) - typedef struct _CONFIG_PAGE_SCSI_DEVICE_2 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1747,7 +1706,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_2 #define MPI_SCSIDEVPAGE2_DPS_BIT_14_PL_SELECT_MASK (0x30000000) #define MPI_SCSIDEVPAGE2_DPS_BIT_15_PL_SELECT_MASK (0xC0000000) - typedef struct _CONFIG_PAGE_SCSI_DEVICE_3 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1763,7 +1721,6 @@ typedef struct _CONFIG_PAGE_SCSI_DEVICE_3 #define MPI_SCSIDEVPAGE3_MAX_COUNTER (0xFFFE) #define MPI_SCSIDEVPAGE3_UNSUPPORTED_COUNTER (0xFFFF) - /**************************************************************************** * FC Port Config Pages ****************************************************************************/ @@ -1856,7 +1813,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_0 #define MPI_FCPORTPAGE0_CURRENT_SPEED_4GBIT MPI_FCPORTPAGE0_SUPPORT_4GBIT_SPEED #define MPI_FCPORTPAGE0_CURRENT_SPEED_NOT_NEGOTIATED (0x00008000) /* (SNIA)HBA_PORTSPEED_NOT_NEGOTIATED (1<<15) Speed not established */ - typedef struct _CONFIG_PAGE_FC_PORT_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1922,7 +1878,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_1 #define MPI_FCPORTPAGE1_INITIATOR_DEV_TIMEOUT_MASK (0x7F) #define MPI_FCPORTPAGE1_INITIATOR_DEV_UNIT_16 (0x80) - typedef struct _CONFIG_PAGE_FC_PORT_2 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -1933,7 +1888,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_2 #define MPI_FCPORTPAGE2_PAGEVERSION (0x01) - typedef struct _WWN_FORMAT { U64 WWNN; /* 00h */ @@ -1981,7 +1935,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_3 #define MPI_FCPORTPAGE3_PAGEVERSION (0x01) - typedef struct _CONFIG_PAGE_FC_PORT_4 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2002,7 +1955,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_4 #define MPI_FCPORTPAGE4_PORT_REMOVABLE_MEDIA (0x000000C0) #define MPI_FCPORTPAGE4_PORT_SPINUP_DELAY_MASK (0x00000F00) - typedef struct _CONFIG_PAGE_FC_PORT_5_ALIAS_INFO { U8 Flags; /* 00h */ @@ -2054,7 +2006,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_6 #define MPI_FCPORTPAGE6_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_FC_PORT_7 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2065,7 +2016,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_7 #define MPI_FCPORTPAGE7_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_FC_PORT_8 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2075,7 +2025,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_8 #define MPI_FCPORTPAGE8_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_FC_PORT_9 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2095,7 +2044,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_9 #define MPI_FCPORTPAGE9_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA { U8 Id; /* 10h */ @@ -2167,7 +2115,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA #define MPI_FCPORT10_BASE_ENCODE_NRZ (0x03) #define MPI_FCPORT10_BASE_ENCODE_MANCHESTER (0x04) - typedef struct _CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA { U8 Options[2]; /* 50h */ @@ -2189,7 +2136,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DA #define MPI_FCPORT10_EXT_OPTION1_LOS_INVERT (0x04) #define MPI_FCPORT10_EXT_OPTION1_LOS (0x02) - typedef struct _CONFIG_PAGE_FC_PORT_10 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2223,7 +2169,6 @@ typedef struct _CONFIG_PAGE_FC_PORT_10 #define MPI_FCPORTPAGE10_FLAGS_CC_BASE_OK (0x00000010) #define MPI_FCPORTPAGE10_FLAGS_CC_EXT_OK (0x00000020) - /**************************************************************************** * FC Device Config Pages ****************************************************************************/ @@ -2377,7 +2322,6 @@ typedef struct _CONFIG_PAGE_RAID_VOL_0 #define MPI_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05) #define MPI_RAIDVOLPAGE0_PREVIOUSLY_DELETED (0x06) - typedef struct _CONFIG_PAGE_RAID_VOL_1 { CONFIG_PAGE_HEADER Header; /* 00h */ @@ -2395,7 +2339,6 @@ typedef struct _CONFIG_PAGE_RAID_VOL_1 #define MPI_RAIDVOLPAGE1_PAGEVERSION (0x01) - /**************************************************************************** * RAID Physical Disk Config Pages ****************************************************************************/ @@ -2477,7 +2420,6 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0 #define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION (0x02) - typedef struct _RAID_PHYS_DISK1_PATH { U8 PhysDiskID; /* 00h */ @@ -2495,7 +2437,6 @@ typedef struct _RAID_PHYS_DISK1_PATH #define MPI_RAID_PHYSDISK1_FLAG_BROKEN (0x0002) #define MPI_RAID_PHYSDISK1_FLAG_INVALID (0x0001) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check Header.PageLength or NumPhysDiskPaths at runtime. @@ -2517,7 +2458,6 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1 #define MPI_RAIDPHYSDISKPAGE1_PAGEVERSION (0x00) - /**************************************************************************** * LAN Config Pages ****************************************************************************/ @@ -2561,7 +2501,6 @@ typedef struct _CONFIG_PAGE_LAN_1 #define MPI_LAN_PAGE1_DEV_STATE_RESET (0x00) #define MPI_LAN_PAGE1_DEV_STATE_OPERATIONAL (0x01) - /**************************************************************************** * Inband Config Pages ****************************************************************************/ @@ -2577,8 +2516,6 @@ typedef struct _CONFIG_PAGE_INBAND_0 #define MPI_INBAND_PAGEVERSION (0x00) - - /**************************************************************************** * SAS IO Unit Config Pages ****************************************************************************/ @@ -2656,7 +2593,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0 #define MPI_SAS_IOUNIT0_DS_MAX_SATA_TARGETS (0x00001000) #define MPI_SAS_IOUNIT0_DS_MULTI_PORT_DOMAIN (0x00002000) - typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA { U8 Port; /* 00h */ @@ -2751,7 +2687,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1 /* see mpi_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */ - typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2787,7 +2722,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2 #define MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT (0x10) #define MPI_SAS_IOUNIT2_FLAGS_DA_STARTING_SLOT (0x20) - typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2805,7 +2739,6 @@ typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3 #define MPI_SASIOUNITPAGE3_PAGEVERSION (0x00) - /**************************************************************************** * SAS Expander Config Pages ****************************************************************************/ @@ -2850,7 +2783,6 @@ typedef struct _CONFIG_PAGE_SAS_EXPANDER_0 #define MPI_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG (0x02) #define MPI_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS (0x01) - typedef struct _CONFIG_PAGE_SAS_EXPANDER_1 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2899,7 +2831,6 @@ typedef struct _CONFIG_PAGE_SAS_EXPANDER_1 #define MPI_SAS_EXPANDER1_NEG_RATE_1_5 (0x08) #define MPI_SAS_EXPANDER1_NEG_RATE_3_0 (0x09) - /**************************************************************************** * SAS Device Config Pages ****************************************************************************/ @@ -2959,7 +2890,6 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_0 /* see mpi_sas.h for values for SAS Device Page 0 DeviceInfo values */ - typedef struct _CONFIG_PAGE_SAS_DEVICE_1 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2975,7 +2905,6 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_1 #define MPI_SASDEVICE1_PAGEVERSION (0x00) - typedef struct _CONFIG_PAGE_SAS_DEVICE_2 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -2994,7 +2923,6 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_2 #define MPI_SASDEVICE2_ENC_MAP_MASK_START_INDEX (0x001FF800) #define MPI_SASDEVICE2_ENC_MAP_SHIFT_START_INDEX (11) - /**************************************************************************** * SAS PHY Config Pages ****************************************************************************/ @@ -3062,7 +2990,6 @@ typedef struct _CONFIG_PAGE_SAS_PHY_0 #define MPI_SAS_PHY0_PHYINFO_RATE_1_5 (0x00000008) #define MPI_SAS_PHY0_PHYINFO_RATE_3_0 (0x00000009) - typedef struct _CONFIG_PAGE_SAS_PHY_1 { CONFIG_EXTENDED_PAGE_HEADER Header; /* 00h */ @@ -3076,7 +3003,6 @@ typedef struct _CONFIG_PAGE_SAS_PHY_1 #define MPI_SASPHY1_PAGEVERSION (0x00) - /**************************************************************************** * SAS Enclosure Config Pages ****************************************************************************/ @@ -3113,7 +3039,6 @@ typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0 #define MPI_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE (0x0004) #define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_GPIO (0x0005) - /**************************************************************************** * Log Config Pages ****************************************************************************/ @@ -3154,6 +3079,4 @@ typedef struct _CONFIG_PAGE_LOG_0 #define MPI_LOG_0_PAGEVERSION (0x01) - #endif - Modified: head/sys/dev/mpt/mpilib/mpi_fc.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_fc.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_fc.h Tue Sep 1 22:06:41 2020 (r365202) @@ -75,7 +75,6 @@ #ifndef MPI_FC_H #define MPI_FC_H - /***************************************************************************** * * F C D i r e c t A c c e s s M e s s a g e s @@ -170,7 +169,6 @@ typedef struct _MSG_LINK_SERVICE_BUFFER_POST_REPLY #define FCP_TARGET_TYPE_MASK (0xFF000000) #define FCP_TARGET_TYPE_SHIFT (24) - /****************************************************************************/ /* Link Service Response messages */ /****************************************************************************/ @@ -201,7 +199,6 @@ typedef struct _MSG_LINK_SERVICE_RSP_REQUEST #define LINK_SERVICE_RSP_FLAGS_IMMEDIATE (0x80) #define LINK_SERVICE_RSP_FLAGS_PORT_MASK (0x01) - /* Link Service Response Reply */ typedef struct _MSG_LINK_SERVICE_RSP_REPLY { @@ -219,7 +216,6 @@ typedef struct _MSG_LINK_SERVICE_RSP_REPLY } MSG_LINK_SERVICE_RSP_REPLY, MPI_POINTER PTR_MSG_LINK_SERVICE_RSP_REPLY, LinkServiceRspReply_t, MPI_POINTER pLinkServiceRspReply_t; - /****************************************************************************/ /* Extended Link Service Send messages */ /****************************************************************************/ @@ -242,7 +238,6 @@ typedef struct _MSG_EXLINK_SERVICE_SEND_REQUEST #define EX_LINK_SERVICE_SEND_MSGFLAGS_MASK (0xFF000000) #define EX_LINK_SERVICE_SEND_MSGFLAGS_SHIFT (24) - /* Extended Link Service Send Reply */ typedef struct _MSG_EXLINK_SERVICE_SEND_REPLY { @@ -302,7 +297,6 @@ typedef struct _MSG_FC_ABORT_REPLY } MSG_FC_ABORT_REPLY, MPI_POINTER PTR_MSG_FC_ABORT_REPLY, FcAbortReply_t, MPI_POINTER pFcAbortReply_t; - /****************************************************************************/ /* FC Common Transport Send messages */ /****************************************************************************/ @@ -328,7 +322,6 @@ typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REQUEST #define MPI_FC_CT_SEND_MSGFLAGS_MASK (0xFF000000) #define MPI_FC_CT_SEND_MSGFLAGS_SHIFT (24) - /* FC Common Transport Send Reply */ typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REPLY { @@ -347,7 +340,6 @@ typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REPLY } MSG_FC_COMMON_TRANSPORT_SEND_REPLY, MPI_POINTER PTR_MSG_FC_COMMON_TRANSPORT_SEND_REPLY, FcCommonTransportSendReply_t, MPI_POINTER pFcCommonTransportSendReply_t; - /****************************************************************************/ /* FC Primitive Send messages */ /****************************************************************************/ @@ -393,4 +385,3 @@ typedef struct _MSG_FC_PRIMITIVE_SEND_REPLY FcPrimitiveSendReply_t, MPI_POINTER pFcPrimitiveSendReply_t; #endif - Modified: head/sys/dev/mpt/mpilib/mpi_init.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_init.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_init.h Tue Sep 1 22:06:41 2020 (r365202) @@ -91,7 +91,6 @@ #ifndef MPI_INIT_H #define MPI_INIT_H - /***************************************************************************** * * S C S I I n i t i a t o r M e s s a g e s @@ -122,7 +121,6 @@ typedef struct _MSG_SCSI_IO_REQUEST } MSG_SCSI_IO_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO_REQUEST, SCSIIORequest_t, MPI_POINTER pSCSIIORequest_t; - /* SCSI IO MsgFlags bits */ #define MPI_SCSIIO_MSGFLGS_SENSE_WIDTH (0x01) @@ -172,7 +170,6 @@ typedef struct _MSG_SCSI_IO_REQUEST #define MPI_SCSIIO_CONTROL_ABORT_TASK_SET (0x00020000) #define MPI_SCSIIO_CONTROL_RESERVED2 (0x00010000) - /* SCSI IO reply structure */ typedef struct _MSG_SCSI_IO_REPLY { @@ -197,7 +194,6 @@ typedef struct _MSG_SCSI_IO_REPLY } MSG_SCSI_IO_REPLY, MPI_POINTER PTR_MSG_SCSI_IO_REPLY, SCSIIOReply_t, MPI_POINTER pSCSIIOReply_t; - /* SCSI IO Reply SCSIStatus values (SAM-2 status codes) */ #define MPI_SCSI_STATUS_SUCCESS (0x00) @@ -215,7 +211,6 @@ typedef struct _MSG_SCSI_IO_REPLY #define MPI_SCSI_STATUS_FCPEXT_NO_LINK (0x81) #define MPI_SCSI_STATUS_FCPEXT_UNASSIGNED (0x82) - /* SCSI IO Reply SCSIState values */ #define MPI_SCSI_STATE_AUTOSENSE_VALID (0x01) @@ -238,7 +233,6 @@ typedef struct _MSG_SCSI_IO_REPLY #define MPI_SCSI_TASKTAG_UNKNOWN (0xFFFF) - /****************************************************************************/ /* SCSI IO 32 messages and associated structures */ /****************************************************************************/ @@ -403,7 +397,6 @@ typedef struct _MSG_SCSI_IO32_REQUEST #define MPI_SCSIIO32_EEDPFLAGS_INC_SEC_REFTAG (0x4000) #define MPI_SCSIIO32_EEDPFLAGS_INC_PRI_REFTAG (0x8000) - /* SCSIIO32 IO reply structure */ typedef struct _MSG_SCSIIO32_IO_REPLY { @@ -429,7 +422,6 @@ typedef struct _MSG_SCSIIO32_IO_REPLY } MSG_SCSIIO32_IO_REPLY, MPI_POINTER PTR_MSG_SCSIIO32_IO_REPLY, SCSIIO32Reply_t, MPI_POINTER pSCSIIO32Reply_t; - /****************************************************************************/ /* SCSI Task Management messages */ /****************************************************************************/ @@ -499,7 +491,6 @@ typedef struct _MSG_SCSI_TASK_MGMT_REPLY #define MPI_SCSITASKMGMT_RSP_TM_INVALID_LUN (0x09) #define MPI_SCSITASKMGMT_RSP_IO_QUEUED_ON_IOC (0x80) - /****************************************************************************/ /* SCSI Enclosure Processor messages */ /****************************************************************************/ @@ -555,7 +546,6 @@ typedef struct _MSG_SEP_REQUEST #define MPI_SEP_REQ_SLOTSTATUS_A_ENABLE_BYPASS (0x08000000) #define MPI_SEP_REQ_SLOTSTATUS_DEV_OFF (0x10000000) #define MPI_SEP_REQ_SLOTSTATUS_SWAP_RESET (0x80000000) - typedef struct _MSG_SEP_REPLY { Modified: head/sys/dev/mpt/mpilib/mpi_ioc.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_ioc.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_ioc.h Tue Sep 1 22:06:41 2020 (r365202) @@ -158,7 +158,6 @@ #ifndef MPI_IOC_H #define MPI_IOC_H - /***************************************************************************** * * I O C M e s s a g e s @@ -216,7 +215,6 @@ typedef struct _MSG_IOC_INIT #define MPI_IOCINIT_HEADERVERSION_DEV_MASK (0x00FF) #define MPI_IOCINIT_HEADERVERSION_DEV_SHIFT (0) - typedef struct _MSG_IOC_INIT_REPLY { U8 WhoInit; /* 00h */ @@ -234,8 +232,6 @@ typedef struct _MSG_IOC_INIT_REPLY } MSG_IOC_INIT_REPLY, MPI_POINTER PTR_MSG_IOC_INIT_REPLY, IOCInitReply_t, MPI_POINTER pIOCInitReply_t; - - /****************************************************************************/ /* IOC Facts message */ /****************************************************************************/ @@ -340,7 +336,6 @@ typedef struct _MSG_IOC_FACTS_REPLY #define MPI_IOCFACTS_CAPABILITY_NO_SCSIIO16 (0x00000400) #define MPI_IOCFACTS_CAPABILITY_TLR (0x00000800) - /***************************************************************************** * * P o r t M e s s a g e s @@ -389,7 +384,6 @@ typedef struct _MSG_PORT_FACTS_REPLY } MSG_PORT_FACTS_REPLY, MPI_POINTER PTR_MSG_PORT_FACTS_REPLY, PortFactsReply_t, MPI_POINTER pPortFactsReply_t; - /* PortTypes values */ #define MPI_PORTFACTS_PORTTYPE_INACTIVE (0x00) @@ -405,7 +399,6 @@ typedef struct _MSG_PORT_FACTS_REPLY #define MPI_PORTFACTS_PROTOCOL_TARGET (0x04) #define MPI_PORTFACTS_PROTOCOL_INITIATOR (0x08) - /****************************************************************************/ /* Port Enable Message */ /****************************************************************************/ @@ -437,7 +430,6 @@ typedef struct _MSG_PORT_ENABLE_REPLY } MSG_PORT_ENABLE_REPLY, MPI_POINTER PTR_MSG_PORT_ENABLE_REPLY, PortEnableReply_t, MPI_POINTER pPortEnableReply_t; - /***************************************************************************** * * E v e n t M e s s a g e s @@ -654,7 +646,6 @@ typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE #define MPI_EVENT_SAS_DEV_STAT_RC_CMPL_INTERNAL_DEV_RESET (0x0E) #define MPI_EVENT_SAS_DEV_STAT_RC_CMPL_TASK_ABORT_INTERNAL (0x0F) - /* SCSI Event data for Queue Full event */ typedef struct _EVENT_DATA_QUEUE_FULL @@ -694,7 +685,6 @@ typedef struct _EVENT_DATA_RAID #define MPI_EVENT_RAID_RC_SMART_DATA (0x0A) #define MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED (0x0B) - /* MPI Integrated RAID Resync Update Event data */ typedef struct _MPI_EVENT_DATA_IR_RESYNC_UPDATE @@ -1010,8 +1000,6 @@ typedef struct _EVENT_DATA_SAS_EXPANDER_STATUS_CHANGE #define MPI_EVENT_SAS_EXP_FLAGS_ROUTE_TABLE_CONFIG (0x02) #define MPI_EVENT_SAS_EXP_FLAGS_CONFIG_IN_PROGRESS (0x01) - - /***************************************************************************** * * F i r m w a r e L o a d M e s s a g e s @@ -1048,7 +1036,6 @@ typedef struct _MSG_FW_DOWNLOAD #define MPI_FW_DOWNLOAD_ITYPE_MEGARAID (0x09) #define MPI_FW_DOWNLOAD_ITYPE_COMMON_BOOT_BLOCK (0x0B) - typedef struct _FWDownloadTCSGE { U8 Reserved; /* 00h */ @@ -1077,7 +1064,6 @@ typedef struct _MSG_FW_DOWNLOAD_REPLY } MSG_FW_DOWNLOAD_REPLY, MPI_POINTER PTR_MSG_FW_DOWNLOAD_REPLY, FWDownloadReply_t, MPI_POINTER pFWDownloadReply_t; - /****************************************************************************/ /* Firmware Upload message and associated structures */ /****************************************************************************/ @@ -1136,7 +1122,6 @@ typedef struct _MSG_FW_UPLOAD_REPLY U32 ActualImageSize; /* 14h */ } MSG_FW_UPLOAD_REPLY, MPI_POINTER PTR_MSG_FW_UPLOAD_REPLY, FWUploadReply_t, MPI_POINTER pFWUploadReply_t; - typedef struct _MPI_FW_HEADER { Modified: head/sys/dev/mpt/mpilib/mpi_lan.h ============================================================================== --- head/sys/dev/mpt/mpilib/mpi_lan.h Tue Sep 1 22:06:23 2020 (r365201) +++ head/sys/dev/mpt/mpilib/mpi_lan.h Tue Sep 1 22:06:41 2020 (r365202) @@ -66,7 +66,6 @@ #ifndef MPI_LAN_H #define MPI_LAN_H - /****************************************************************************** * * L A N M e s s a g e s @@ -88,7 +87,6 @@ typedef struct _MSG_LAN_SEND_REQUEST } MSG_LAN_SEND_REQUEST, MPI_POINTER PTR_MSG_LAN_SEND_REQUEST, LANSendRequest_t, MPI_POINTER pLANSendRequest_t; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 22:07:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7CBA37E90E; Tue, 1 Sep 2020 22:07:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Px6F36z4fT8; Tue, 1 Sep 2020 22:07:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0AA62032F; Tue, 1 Sep 2020 22:07:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M71Q1055791; Tue, 1 Sep 2020 22:07:01 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M70Qa055785; Tue, 1 Sep 2020 22:07:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012207.081M70Qa055785@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:07:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365203 - in head/sys/dev/mps: . mpi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/mps: . mpi X-SVN-Commit-Revision: 365203 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:07:02 -0000 Author: mjg Date: Tue Sep 1 22:07:00 2020 New Revision: 365203 URL: https://svnweb.freebsd.org/changeset/base/365203 Log: mps: clean up empty lines in .c and .h files Modified: head/sys/dev/mps/mpi/mpi2.h head/sys/dev/mps/mpi/mpi2_cnfg.h head/sys/dev/mps/mpi/mpi2_hbd.h head/sys/dev/mps/mpi/mpi2_init.h head/sys/dev/mps/mpi/mpi2_ioc.h head/sys/dev/mps/mpi/mpi2_ra.h head/sys/dev/mps/mpi/mpi2_raid.h head/sys/dev/mps/mpi/mpi2_sas.h head/sys/dev/mps/mpi/mpi2_targ.h head/sys/dev/mps/mpi/mpi2_tool.h head/sys/dev/mps/mpi/mpi2_type.h head/sys/dev/mps/mps.c head/sys/dev/mps/mps_config.c head/sys/dev/mps/mps_ioctl.h head/sys/dev/mps/mps_mapping.c head/sys/dev/mps/mps_mapping.h head/sys/dev/mps/mps_pci.c head/sys/dev/mps/mps_sas.c head/sys/dev/mps/mps_sas_lsi.c head/sys/dev/mps/mps_table.c head/sys/dev/mps/mps_user.c head/sys/dev/mps/mpsvar.h Modified: head/sys/dev/mps/mpi/mpi2.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2.h Tue Sep 1 22:07:00 2020 (r365203) @@ -106,7 +106,6 @@ #ifndef MPI2_H #define MPI2_H - /***************************************************************************** * * MPI Version Definitions @@ -133,7 +132,6 @@ #define MPI2_HEADER_VERSION_DEV_SHIFT (0) #define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) | MPI2_HEADER_VERSION_DEV) - /***************************************************************************** * * IOC State Definitions @@ -152,7 +150,6 @@ #define MPI2_FAULT_PRODUCT_SPECIFIC_MIN (0x0000) #define MPI2_FAULT_PRODUCT_SPECIFIC_MAX (0xEFFF) - /***************************************************************************** * * System Interface Register Definitions @@ -206,7 +203,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_DOORBELL_ADD_DWORDS_MASK (0x00FF0000) #define MPI2_DOORBELL_ADD_DWORDS_SHIFT (16) - /* * Defines for the WriteSequence register */ @@ -302,7 +298,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_REQUEST_DESCRIPTOR_POST_LOW_OFFSET (0x000000C0) #define MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET (0x000000C4) - /***************************************************************************** * * Message Descriptors @@ -333,7 +328,6 @@ typedef struct _MPI2_DEFAULT_REQUEST_DESCRIPTOR #define MPI2_REQ_DESCRIPT_FLAGS_IOC_FIFO_MARKER (0x01) - /* High Priority Request Descriptor */ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR { @@ -347,7 +341,6 @@ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR Mpi2HighPriorityRequestDescriptor_t, MPI2_POINTER pMpi2HighPriorityRequestDescriptor_t; - /* SCSI IO Request Descriptor */ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR { @@ -360,7 +353,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI2_POINTER PTR_MPI2_SCSI_IO_REQUEST_DESCRIPTOR, Mpi2SCSIIORequestDescriptor_t, MPI2_POINTER pMpi2SCSIIORequestDescriptor_t; - /* SCSI Target Request Descriptor */ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR { @@ -374,7 +366,6 @@ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR Mpi2SCSITargetRequestDescriptor_t, MPI2_POINTER pMpi2SCSITargetRequestDescriptor_t; - /* RAID Accelerator Request Descriptor */ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR { @@ -388,7 +379,6 @@ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR Mpi2RAIDAcceleratorRequestDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorRequestDescriptor_t; - /* union of Request Descriptors */ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION { @@ -401,7 +391,6 @@ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION } MPI2_REQUEST_DESCRIPTOR_UNION, MPI2_POINTER PTR_MPI2_REQUEST_DESCRIPTOR_UNION, Mpi2RequestDescriptorUnion_t, MPI2_POINTER pMpi2RequestDescriptorUnion_t; - /* Reply Descriptors */ /* Default Reply Descriptor */ @@ -439,7 +428,6 @@ typedef struct _MPI2_ADDRESS_REPLY_DESCRIPTOR #define MPI2_ADDRESS_REPLY_SMID_INVALID (0x00) - /* SCSI IO Success Reply Descriptor */ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR { @@ -453,7 +441,6 @@ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR Mpi2SCSIIOSuccessReplyDescriptor_t, MPI2_POINTER pMpi2SCSIIOSuccessReplyDescriptor_t; - /* TargetAssist Success Reply Descriptor */ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRIPTOR { @@ -468,7 +455,6 @@ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRI Mpi2TargetAssistSuccessReplyDescriptor_t, MPI2_POINTER pMpi2TargetAssistSuccessReplyDescriptor_t; - /* Target Command Buffer Reply Descriptor */ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCRIPTOR { @@ -486,7 +472,6 @@ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCR /* defines for Flags field */ #define MPI2_RPY_DESCRIPT_TCB_FLAGS_PHYNUM_MASK (0x3F) - /* RAID Accelerator Success Reply Descriptor */ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR { @@ -499,7 +484,6 @@ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DE Mpi2RAIDAcceleratorSuccessReplyDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorSuccessReplyDescriptor_t; - /* union of Reply Descriptors */ typedef union _MPI2_REPLY_DESCRIPTORS_UNION { @@ -513,8 +497,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION } MPI2_REPLY_DESCRIPTORS_UNION, MPI2_POINTER PTR_MPI2_REPLY_DESCRIPTORS_UNION, Mpi2ReplyDescriptorsUnion_t, MPI2_POINTER pMpi2ReplyDescriptorsUnion_t; - - /***************************************************************************** * * Message Functions @@ -552,13 +534,10 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION #define MPI2_FUNCTION_MIN_PRODUCT_SPECIFIC (0xF0) /* beginning of product-specific range */ #define MPI2_FUNCTION_MAX_PRODUCT_SPECIFIC (0xFF) /* end of product-specific range */ - - /* Doorbell functions */ #define MPI2_FUNCTION_IOC_MESSAGE_UNIT_RESET (0x40) #define MPI2_FUNCTION_HANDSHAKE (0x42) - /***************************************************************************** * * IOC Status Values @@ -672,7 +651,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION #define MPI2_IOCLOGINFO_TYPE_ISCSI (0x4) #define MPI2_IOCLOGINFO_LOG_DATA_MASK (0x0FFFFFFF) - /***************************************************************************** * * Standard Message Structures @@ -697,7 +675,6 @@ typedef struct _MPI2_REQUEST_HEADER } MPI2_REQUEST_HEADER, MPI2_POINTER PTR_MPI2_REQUEST_HEADER, MPI2RequestHeader_t, MPI2_POINTER pMPI2RequestHeader_t; - /**************************************************************************** * Default Reply ****************************************************************************/ @@ -719,7 +696,6 @@ typedef struct _MPI2_DEFAULT_REPLY } MPI2_DEFAULT_REPLY, MPI2_POINTER PTR_MPI2_DEFAULT_REPLY, MPI2DefaultReply_t, MPI2_POINTER pMPI2DefaultReply_t; - /* common version structure/union used in messages and configuration pages */ typedef struct _MPI2_VERSION_STRUCT @@ -736,7 +712,6 @@ typedef union _MPI2_VERSION_UNION U32 Word; } MPI2_VERSION_UNION; - /* LUN field defines, common to many structures */ #define MPI2_LUN_FIRST_LEVEL_ADDRESSING (0x0000FFFF) #define MPI2_LUN_SECOND_LEVEL_ADDRESSING (0xFFFF0000) @@ -745,7 +720,6 @@ typedef union _MPI2_VERSION_UNION #define MPI2_LUN_LEVEL_1_WORD (0xFF00) #define MPI2_LUN_LEVEL_1_DWORD (0x0000FF00) - /***************************************************************************** * * Fusion-MPT MPI Scatter Gather Elements @@ -781,7 +755,6 @@ typedef struct _MPI2_SGE_SIMPLE_UNION } MPI2_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_SIMPLE_UNION, Mpi2SGESimpleUnion_t, MPI2_POINTER pMpi2SGESimpleUnion_t; - /**************************************************************************** * MPI Chain Element structures ****************************************************************************/ @@ -817,7 +790,6 @@ typedef struct _MPI2_SGE_CHAIN_UNION } MPI2_SGE_CHAIN_UNION, MPI2_POINTER PTR_MPI2_SGE_CHAIN_UNION, Mpi2SGEChainUnion_t, MPI2_POINTER pMpi2SGEChainUnion_t; - /**************************************************************************** * MPI Transaction Context Element structures ****************************************************************************/ @@ -883,7 +855,6 @@ typedef struct _MPI2_SGE_TRANSACTION_UNION } MPI2_SGE_TRANSACTION_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANSACTION_UNION, Mpi2SGETransactionUnion_t, MPI2_POINTER pMpi2SGETransactionUnion_t; - /**************************************************************************** * MPI SGE union for IO SGL's ****************************************************************************/ @@ -898,7 +869,6 @@ typedef struct _MPI2_MPI_SGE_IO_UNION } MPI2_MPI_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_IO_UNION, Mpi2MpiSGEIOUnion_t, MPI2_POINTER pMpi2MpiSGEIOUnion_t; - /**************************************************************************** * MPI SGE union for SGL's with Simple and Transaction elements ****************************************************************************/ @@ -913,7 +883,6 @@ typedef struct _MPI2_SGE_TRANS_SIMPLE_UNION } MPI2_SGE_TRANS_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANS_SIMPLE_UNION, Mpi2SGETransSimpleUnion_t, MPI2_POINTER pMpi2SGETransSimpleUnion_t; - /**************************************************************************** * All MPI SGE types union ****************************************************************************/ @@ -929,7 +898,6 @@ typedef struct _MPI2_MPI_SGE_UNION } MPI2_MPI_SGE_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_UNION, Mpi2MpiSgeUnion_t, MPI2_POINTER pMpi2MpiSgeUnion_t; - /**************************************************************************** * MPI SGE field definition and masks ****************************************************************************/ @@ -1005,7 +973,6 @@ typedef struct _MPI2_MPI_SGE_UNION #define MPI2_GET_CHAIN_OFFSET(x) ((x & MPI2_SGE_CHAIN_OFFSET_MASK) >> MPI2_SGE_CHAIN_OFFSET_SHIFT) - /***************************************************************************** * * Fusion-MPT IEEE Scatter Gather Elements @@ -1040,7 +1007,6 @@ typedef union _MPI2_IEEE_SGE_SIMPLE_UNION } MPI2_IEEE_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_SIMPLE_UNION, Mpi2IeeeSgeSimpleUnion_t, MPI2_POINTER pMpi2IeeeSgeSimpleUnion_t; - /**************************************************************************** * IEEE Chain Element structures ****************************************************************************/ @@ -1056,7 +1022,6 @@ typedef union _MPI2_IEEE_SGE_CHAIN_UNION } MPI2_IEEE_SGE_CHAIN_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_CHAIN_UNION, Mpi2IeeeSgeChainUnion_t, MPI2_POINTER pMpi2IeeeSgeChainUnion_t; - /**************************************************************************** * All IEEE SGE types union ****************************************************************************/ @@ -1071,7 +1036,6 @@ typedef struct _MPI2_IEEE_SGE_UNION } MPI2_IEEE_SGE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_UNION, Mpi2IeeeSgeUnion_t, MPI2_POINTER pMpi2IeeeSgeUnion_t; - /**************************************************************************** * IEEE SGE field definitions and masks ****************************************************************************/ @@ -1117,9 +1081,6 @@ typedef struct _MPI2_IEEE_SGE_UNION #define MPI2_IEEE32_pSGE_SET_FLAGS(psg,f) (psg)->FlagsLength |= MPI2_IEEE32_SGE_SET_FLAGS(f) #define MPI2_IEEE32_pSGE_SET_LENGTH(psg,l) (psg)->FlagsLength |= MPI2_IEEE32_SGE_LENGTH(l) - - - /***************************************************************************** * * Fusion-MPT MPI/IEEE Scatter Gather Unions @@ -1133,7 +1094,6 @@ typedef union _MPI2_SIMPLE_SGE_UNION } MPI2_SIMPLE_SGE_UNION, MPI2_POINTER PTR_MPI2_SIMPLE_SGE_UNION, Mpi2SimpleSgeUntion_t, MPI2_POINTER pMpi2SimpleSgeUntion_t; - typedef union _MPI2_SGE_IO_UNION { MPI2_SGE_SIMPLE_UNION MpiSimple; @@ -1143,7 +1103,6 @@ typedef union _MPI2_SGE_IO_UNION } MPI2_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_SGE_IO_UNION, Mpi2SGEIOUnion_t, MPI2_POINTER pMpi2SGEIOUnion_t; - /**************************************************************************** * * Values for SGLFlags field, used in many request messages with an SGL @@ -1162,6 +1121,4 @@ typedef union _MPI2_SGE_IO_UNION #define MPI2_SGLFLAGS_SGL_TYPE_IEEE32 (0x01) #define MPI2_SGLFLAGS_SGL_TYPE_IEEE64 (0x02) - #endif - Modified: head/sys/dev/mps/mpi/mpi2_cnfg.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2_cnfg.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2_cnfg.h Tue Sep 1 22:07:00 2020 (r365203) @@ -221,7 +221,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION } MPI2_CONFIG_EXT_PAGE_HEADER_UNION, MPI2_POINTER PTR_MPI2_CONFIG_EXT_PAGE_HEADER_UNION, Mpi2ConfigPageExtendedHeaderUnion, MPI2_POINTER pMpi2ConfigPageExtendedHeaderUnion; - /* PageType field values */ #define MPI2_CONFIG_PAGEATTR_READ_ONLY (0x00) #define MPI2_CONFIG_PAGEATTR_CHANGEABLE (0x10) @@ -239,7 +238,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_CONFIG_TYPENUM_MASK (0x0FFF) - /* ExtPageType field values */ #define MPI2_CONFIG_EXTPAGETYPE_SAS_IO_UNIT (0x10) #define MPI2_CONFIG_EXTPAGETYPE_SAS_EXPANDER (0x11) @@ -253,7 +251,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_CONFIG_EXTPAGETYPE_ETHERNET (0x19) #define MPI2_CONFIG_EXTPAGETYPE_EXT_MANUFACTURING (0x1A) - /***************************************************************************** * PageAddress defines *****************************************************************************/ @@ -265,7 +262,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_RAID_VOLUME_PGAD_HANDLE_MASK (0x0000FFFF) - /* RAID Physical Disk PageAddress format */ #define MPI2_PHYSDISK_PGAD_FORM_MASK (0xF0000000) #define MPI2_PHYSDISK_PGAD_FORM_GET_NEXT_PHYSDISKNUM (0x00000000) @@ -275,7 +271,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_PHYSDISK_PGAD_PHYSDISKNUM_MASK (0x000000FF) #define MPI2_PHYSDISK_PGAD_DEVHANDLE_MASK (0x0000FFFF) - /* SAS Expander PageAddress format */ #define MPI2_SAS_EXPAND_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_EXPAND_PGAD_FORM_GET_NEXT_HNDL (0x00000000) @@ -286,7 +281,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_EXPAND_PGAD_PHYNUM_MASK (0x00FF0000) #define MPI2_SAS_EXPAND_PGAD_PHYNUM_SHIFT (16) - /* SAS Device PageAddress format */ #define MPI2_SAS_DEVICE_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -294,7 +288,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_DEVICE_PGAD_HANDLE_MASK (0x0000FFFF) - /* SAS PHY PageAddress format */ #define MPI2_SAS_PHY_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_PHY_PGAD_FORM_PHY_NUMBER (0x00000000) @@ -303,7 +296,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_PHY_PGAD_PHY_NUMBER_MASK (0x000000FF) #define MPI2_SAS_PHY_PGAD_PHY_TBL_INDEX_MASK (0x0000FFFF) - /* SAS Port PageAddress format */ #define MPI2_SASPORT_PGAD_FORM_MASK (0xF0000000) #define MPI2_SASPORT_PGAD_FORM_GET_NEXT_PORT (0x00000000) @@ -311,7 +303,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SASPORT_PGAD_PORTNUMBER_MASK (0x00000FFF) - /* SAS Enclosure PageAddress format */ #define MPI2_SAS_ENCLOS_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_ENCLOS_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -319,7 +310,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_ENCLOS_PGAD_HANDLE_MASK (0x0000FFFF) - /* RAID Configuration PageAddress format */ #define MPI2_RAID_PGAD_FORM_MASK (0xF0000000) #define MPI2_RAID_PGAD_FORM_GET_NEXT_CONFIGNUM (0x00000000) @@ -328,7 +318,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_RAID_PGAD_CONFIGNUM_MASK (0x000000FF) - /* Driver Persistent Mapping PageAddress format */ #define MPI2_DPM_PGAD_FORM_MASK (0xF0000000) #define MPI2_DPM_PGAD_FORM_ENTRY_RANGE (0x00000000) @@ -337,15 +326,12 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT (16) #define MPI2_DPM_PGAD_START_ENTRY_MASK (0x0000FFFF) - /* Ethernet PageAddress format */ #define MPI2_ETHERNET_PGAD_FORM_MASK (0xF0000000) #define MPI2_ETHERNET_PGAD_FORM_IF_NUM (0x00000000) #define MPI2_ETHERNET_PGAD_IF_NUMBER_MASK (0x000000FF) - - /**************************************************************************** * Configuration messages ****************************************************************************/ @@ -383,7 +369,6 @@ typedef struct _MPI2_CONFIG_REQUEST /* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */ - /* Config Reply Message */ typedef struct _MPI2_CONFIG_REPLY { @@ -404,8 +389,6 @@ typedef struct _MPI2_CONFIG_REPLY } MPI2_CONFIG_REPLY, MPI2_POINTER PTR_MPI2_CONFIG_REPLY, Mpi2ConfigReply_t, MPI2_POINTER pMpi2ConfigReply_t; - - /***************************************************************************** * * C o n f i g u r a t i o n P a g e s @@ -439,9 +422,6 @@ typedef struct _MPI2_CONFIG_REPLY #define MPI2_MFGPAGE_DEVID_SAS2308_2 (0x0087) #define MPI2_MFGPAGE_DEVID_SAS2308_3 (0x006E) - - - /* Manufacturing Page 0 */ typedef struct _MPI2_CONFIG_PAGE_MAN_0 @@ -458,7 +438,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_0 #define MPI2_MANUFACTURING0_PAGEVERSION (0x00) - /* Manufacturing Page 1 */ typedef struct _MPI2_CONFIG_PAGE_MAN_1 @@ -471,7 +450,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_1 #define MPI2_MANUFACTURING1_PAGEVERSION (0x00) - typedef struct _MPI2_CHIP_REVISION_ID { U16 DeviceID; /* 0x00 */ @@ -480,7 +458,6 @@ typedef struct _MPI2_CHIP_REVISION_ID } MPI2_CHIP_REVISION_ID, MPI2_POINTER PTR_MPI2_CHIP_REVISION_ID, Mpi2ChipRevisionId_t, MPI2_POINTER pMpi2ChipRevisionId_t; - /* Manufacturing Page 2 */ /* @@ -502,7 +479,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_2 #define MPI2_MANUFACTURING2_PAGEVERSION (0x00) - /* Manufacturing Page 3 */ /* @@ -524,7 +500,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_3 #define MPI2_MANUFACTURING3_PAGEVERSION (0x00) - /* Manufacturing Page 4 */ typedef struct _MPI2_MANPAGE4_PWR_SAVE_SETTINGS @@ -600,7 +575,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_4 #define MPI2_MANPAGE4_IM_RESYNC_CACHE_ENABLE (0x00000002) #define MPI2_MANPAGE4_IR_NO_MIX_SAS_SATA (0x00000001) - /* Manufacturing Page 5 */ /* @@ -633,7 +607,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_5 #define MPI2_MANUFACTURING5_PAGEVERSION (0x03) - /* Manufacturing Page 6 */ typedef struct _MPI2_CONFIG_PAGE_MAN_6 @@ -646,7 +619,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_6 #define MPI2_MANUFACTURING6_PAGEVERSION (0x00) - /* Manufacturing Page 7 */ typedef struct _MPI2_MANPAGE7_CONNECTOR_INFO @@ -717,7 +689,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_7 /* defines for the Flags field */ #define MPI2_MANPAGE7_FLAG_USE_SLOT_INFO (0x00000001) - /* * Generic structure to use for product-specific manufacturing pages * (currently Manufacturing Page 8 through Manufacturing Page 31). @@ -756,7 +727,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_PS #define MPI2_MANUFACTURING30_PAGEVERSION (0x00) #define MPI2_MANUFACTURING31_PAGEVERSION (0x00) - /**************************************************************************** * IO Unit Config Pages ****************************************************************************/ @@ -774,7 +744,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_0 #define MPI2_IOUNITPAGE0_PAGEVERSION (0x02) - /* IO Unit Page 1 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1 @@ -798,7 +767,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1 #define MPI2_IOUNITPAGE1_DISABLE_TASK_SET_FULL_HANDLING (0x00000020) #define MPI2_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID (0x00000004) - /* IO Unit Page 3 */ /* @@ -827,7 +795,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_3 #define MPI2_IOUNITPAGE3_GPIO_SETTING_OFF (0x0000) #define MPI2_IOUNITPAGE3_GPIO_SETTING_ON (0x0001) - /* IO Unit Page 5 */ /* @@ -866,7 +833,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_5 #define MPI2_IOUNITPAGE5_DMA_CAP_HASHING (0x0002) #define MPI2_IOUNITPAGE5_DMA_CAP_ENCRYPTION (0x0001) - /* IO Unit Page 6 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6 @@ -887,7 +853,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6 /* defines for IO Unit Page 6 Flags field */ #define MPI2_IOUNITPAGE6_FLAGS_ENABLE_RAID_ACCELERATOR (0x0001) - /* IO Unit Page 7 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 @@ -951,8 +916,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 #define MPI2_IOUNITPAGE7_BOARD_TEMP_FAHRENHEIT (0x01) #define MPI2_IOUNITPAGE7_BOARD_TEMP_CELSIUS (0x02) - - /**************************************************************************** * IOC Config Pages ****************************************************************************/ @@ -977,7 +940,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_0 #define MPI2_IOCPAGE0_PAGEVERSION (0x02) - /* IOC Page 1 */ typedef struct _MPI2_CONFIG_PAGE_IOC_1 @@ -1047,7 +1009,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_6 #define MPI2_IOCPAGE6_CAP_FLAGS_RAID0_SUPPORT (0x00000002) #define MPI2_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE (0x00000001) - /* IOC Page 7 */ #define MPI2_IOCPAGE7_EVENTMASK_WORDS (4) @@ -1065,7 +1026,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_7 #define MPI2_IOCPAGE7_PAGEVERSION (0x01) - /* IOC Page 8 */ typedef struct _MPI2_CONFIG_PAGE_IOC_8 @@ -1102,7 +1062,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_8 #define MPI2_IOCPAGE8_IRFLAGS_LOW_VOLUME_MAPPING (0x00000000) #define MPI2_IOCPAGE8_IRFLAGS_HIGH_VOLUME_MAPPING (0x00000001) - /**************************************************************************** * BIOS Config Pages ****************************************************************************/ @@ -1155,7 +1114,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_1 #define MPI2_BIOSPAGE1_DEVSET_DISABLE_NON_RM_LUN (0x00000002) #define MPI2_BIOSPAGE1_DEVSET_DISABLE_OTHER_LUN (0x00000001) - /* BIOS Page 2 */ typedef struct _MPI2_BOOT_DEVICE_ADAPTER_ORDER @@ -1242,7 +1200,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_2 #define MPI2_BIOSPAGE2_FORM_ENCLOSURE_SLOT (0x06) #define MPI2_BIOSPAGE2_FORM_DEVICE_NAME (0x07) - /* BIOS Page 3 */ typedef struct _MPI2_ADAPTER_INFO @@ -1278,7 +1235,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_3 #define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DISPLAY (0x00000020) #define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DEV_DISPLAY (0x00000040) - /* BIOS Page 4 */ /* @@ -1308,7 +1264,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_4 #define MPI2_BIOSPAGE4_PAGEVERSION (0x01) - /**************************************************************************** * RAID Volume Config Pages ****************************************************************************/ @@ -1439,7 +1394,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_0 #define MPI2_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05) #define MPI2_RAIDVOLPAGE0_PREVIOUSLY_DELETED (0x06) - /* RAID Volume Page 1 */ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1 @@ -1457,7 +1411,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1 #define MPI2_RAIDVOLPAGE1_PAGEVERSION (0x03) - /**************************************************************************** * RAID Physical Disk Config Pages ****************************************************************************/ @@ -1559,7 +1512,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_0 #define MPI2_PHYSDISK0_STATUS_FLAG_QUIESCED (0x00000002) #define MPI2_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC (0x00000001) - /* RAID Physical Disk Page 1 */ /* @@ -1601,7 +1553,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_RAIDPHYSDISKPAGE1_PAGEVERSION (0x02) - /**************************************************************************** * values for fields used by several types of SAS Config Pages ****************************************************************************/ @@ -1622,7 +1573,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_NEG_LINK_RATE_3_0 (0x09) #define MPI2_SAS_NEG_LINK_RATE_6_0 (0x0A) - /* values for AttachedPhyInfo fields */ #define MPI2_SAS_APHYINFO_INSIDE_ZPSDS_PERSISTENT (0x00000040) #define MPI2_SAS_APHYINFO_REQUESTED_INSIDE_ZPSDS (0x00000020) @@ -1639,7 +1589,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_APHYINFO_REASON_BREAK_TIMEOUT (0x00000007) #define MPI2_SAS_APHYINFO_REASON_PHY_TEST_STOPPED (0x00000008) - /* values for PhyInfo fields */ #define MPI2_SAS_PHYINFO_PHY_VACANT (0x80000000) @@ -1680,7 +1629,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_PHYINFO_SUBTRACTIVE_ROUTING (0x00000010) #define MPI2_SAS_PHYINFO_TABLE_ROUTING (0x00000020) - /* values for SAS ProgrammedLinkRate fields */ #define MPI2_SAS_PRATE_MAX_RATE_MASK (0xF0) #define MPI2_SAS_PRATE_MAX_RATE_NOT_PROGRAMMABLE (0x00) @@ -1693,7 +1641,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_PRATE_MIN_RATE_3_0 (0x09) #define MPI2_SAS_PRATE_MIN_RATE_6_0 (0x0A) - /* values for SAS HwLinkRate fields */ #define MPI2_SAS_HWRATE_MAX_RATE_MASK (0xF0) #define MPI2_SAS_HWRATE_MAX_RATE_1_5 (0x80) @@ -1704,8 +1651,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_HWRATE_MIN_RATE_3_0 (0x09) #define MPI2_SAS_HWRATE_MIN_RATE_6_0 (0x0A) - - /**************************************************************************** * SAS IO Unit Config Pages ****************************************************************************/ @@ -1782,7 +1727,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_0 #define MPI2_SASIOUNIT0_DS_UNADDRESSABLE_DEVICE (0x00000002) #define MPI2_SASIOUNIT0_DS_LOOP_DETECTED (0x00000001) - /* SAS IO Unit Page 1 */ typedef struct _MPI2_SAS_IO_UNIT1_PHY_DATA @@ -1877,7 +1821,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_1 /* see mpi2_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */ - /* SAS IO Unit Page 4 */ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP @@ -1923,7 +1866,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_4 /* defines for PHY field */ #define MPI2_SASIOUNIT4_PHY_SPINUP_GROUP_MASK (0x03) - /* SAS IO Unit Page 5 */ typedef struct _MPI2_SAS_IO_UNIT5_PHY_PM_SETTINGS @@ -1993,7 +1935,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_5 #define MPI2_SASIOUNITPAGE5_PAGEVERSION (0x01) - /* SAS IO Unit Page 6 */ typedef struct _MPI2_SAS_IO_UNIT6_PORT_WIDTH_MOD_GROUP_STATUS @@ -2048,7 +1989,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_6 #define MPI2_SASIOUNITPAGE6_PAGEVERSION (0x00) - /* SAS IO Unit Page 7 */ typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP_SETTINGS @@ -2068,7 +2008,6 @@ typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP /* defines for Flags field */ #define MPI2_SASIOUNIT7_FLAGS_ENABLE_PORT_WIDTH_MODULATION (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumGroups at runtime. @@ -2096,7 +2035,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_7 #define MPI2_SASIOUNITPAGE7_PAGEVERSION (0x00) - /* SAS IO Unit Page 8 */ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 @@ -2123,9 +2061,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 #define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_SLUMBER_MODE (0x000000002) #define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_PARTIAL_MODE (0x000000001) - - - /**************************************************************************** * SAS Expander Config Pages ****************************************************************************/ @@ -2198,7 +2133,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_0 #define MPI2_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS (0x0002) #define MPI2_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG (0x0001) - /* SAS Expander Page 1 */ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 @@ -2248,7 +2182,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 #define MPI2_SAS_EXPANDER1_DISCINFO_LINK_STATUS_CHANGE (0x02) #define MPI2_SAS_EXPANDER1_DISCINFO_NO_ROUTING_ENTRIES (0x01) - /**************************************************************************** * SAS Device Config Pages ****************************************************************************/ @@ -2320,7 +2253,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_0 #define MPI2_SAS_DEVICE0_FLAGS_PORT_SELECTOR_ATTACH (0x0008) #define MPI2_SAS_DEVICE0_FLAGS_DEVICE_PRESENT (0x0001) - /* SAS Device Page 1 */ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_1 @@ -2337,7 +2269,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_1 #define MPI2_SASDEVICE1_PAGEVERSION (0x01) - /**************************************************************************** * SAS PHY Config Pages ****************************************************************************/ @@ -2379,7 +2310,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0 /* use MPI2_SAS_PHYINFO_ for the PhyInfo field */ - /* SAS PHY Page 1 */ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 @@ -2395,7 +2325,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 #define MPI2_SASPHY1_PAGEVERSION (0x01) - /* SAS PHY Page 2 */ typedef struct _MPI2_SASPHY2_PHY_EVENT @@ -2409,7 +2338,6 @@ typedef struct _MPI2_SASPHY2_PHY_EVENT /* use MPI2_SASPHY3_EVENT_CODE_ for the PhyEventCode field */ - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumPhyEvents at runtime. @@ -2431,7 +2359,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_2 #define MPI2_SASPHY2_PAGEVERSION (0x00) - /* SAS PHY Page 3 */ typedef struct _MPI2_SASPHY3_PHY_EVENT_CONFIG @@ -2524,7 +2451,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_3 #define MPI2_SASPHY3_PAGEVERSION (0x00) - /* SAS PHY Page 4 */ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4 @@ -2543,9 +2469,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4 #define MPI2_SASPHY4_FLAGS_FRAME_VALID (0x02) #define MPI2_SASPHY4_FLAGS_SATA_FRAME (0x01) - - - /**************************************************************************** * SAS Port Config Pages ****************************************************************************/ @@ -2573,7 +2496,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PORT_0 /* see mpi2_sas.h for values for SAS Port Page 0 DeviceInfo values */ - /**************************************************************************** * SAS Enclosure Config Pages ****************************************************************************/ @@ -2608,7 +2530,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_ENCLOSURE_0 #define MPI2_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE (0x0004) #define MPI2_SAS_ENCLS0_FLAGS_MNG_IOC_GPIO (0x0005) - /**************************************************************************** * Log Config Page ****************************************************************************/ @@ -2658,7 +2579,6 @@ typedef struct _MPI2_CONFIG_PAGE_LOG_0 #define MPI2_LOG_0_PAGEVERSION (0x02) - /**************************************************************************** * RAID Config Page ****************************************************************************/ @@ -2691,7 +2611,6 @@ typedef struct _MPI2_RAIDCONFIG0_CONFIG_ELEMENT #define MPI2_RAIDCONFIG0_EFLAGS_HOT_SPARE_ELEMENT (0x0002) #define MPI2_RAIDCONFIG0_EFLAGS_OCE_ELEMENT (0x0003) - typedef struct _MPI2_CONFIG_PAGE_RAID_CONFIGURATION_0 { MPI2_CONFIG_EXTENDED_PAGE_HEADER Header; /* 0x00 */ @@ -2715,7 +2634,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_CONFIGURATION_0 /* values for RAID Configuration Page 0 Flags field */ #define MPI2_RAIDCONFIG0_FLAG_FOREIGN_CONFIG (0x00000001) - /**************************************************************************** * Driver Persistent Mapping Config Pages ****************************************************************************/ @@ -2748,7 +2666,6 @@ typedef struct _MPI2_CONFIG_PAGE_DRIVER_MAPPING_0 #define MPI2_DRVMAP0_MAPINFO_SLOT_SHIFT (4) #define MPI2_DRVMAP0_MAPINFO_MISSING_MASK (0x000F) - /**************************************************************************** * Ethernet Config Pages ****************************************************************************/ @@ -2815,7 +2732,6 @@ typedef struct _MPI2_CONFIG_PAGE_ETHERNET_0 #define MPI2_ETHPG0_MS_100MBIT (0x02) #define MPI2_ETHPG0_MS_1GBIT (0x03) - /* Ethernet Page 1 */ typedef struct _MPI2_CONFIG_PAGE_ETHERNET_1 @@ -2866,7 +2782,6 @@ typedef struct _MPI2_CONFIG_PAGE_ETHERNET_1 #define MPI2_ETHPG1_MS_DATA_RATE_100MBIT (0x02) #define MPI2_ETHPG1_MS_DATA_RATE_1GBIT (0x03) - /**************************************************************************** * Extended Manufacturing Config Pages ****************************************************************************/ @@ -2888,4 +2803,3 @@ typedef struct _MPI2_CONFIG_PAGE_EXT_MAN_PS /* PageVersion should be provided by product-specific code */ #endif - Modified: head/sys/dev/mps/mpi/mpi2_hbd.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2_hbd.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2_hbd.h Tue Sep 1 22:07:00 2020 (r365203) @@ -120,7 +120,6 @@ typedef struct _MPI2_HBD_ACTION_REQUEST #define MPI2_HBD_MAX_RATE_3_0 (0x09) #define MPI2_HBD_MAX_RATE_6_0 (0x0A) - /* Host Based Discovery Action Reply Message */ typedef struct _MPI2_HBD_ACTION_REPLY { @@ -140,7 +139,4 @@ typedef struct _MPI2_HBD_ACTION_REPLY } MPI2_HBD_ACTION_REPLY, MPI2_POINTER PTR_MPI2_HBD_ACTION_REPLY, Mpi2HbdActionReply_t, MPI2_POINTER pMpi2HbdActionReply_t; - #endif - - Modified: head/sys/dev/mps/mpi/mpi2_init.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2_init.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2_init.h Tue Sep 1 22:07:00 2020 (r365203) @@ -240,7 +240,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST #define MPI2_SCSIIO_CONTROL_TLR_ON (0x00000040) #define MPI2_SCSIIO_CONTROL_TLR_OFF (0x00000080) - /* SCSI IO Error Reply Message */ typedef struct _MPI2_SCSI_IO_REPLY { @@ -297,7 +296,6 @@ typedef struct _MPI2_SCSI_IO_REPLY #define MPI2_SCSI_TASKTAG_UNKNOWN (0xFFFF) - /**************************************************************************** * SCSI Task Management messages ****************************************************************************/ @@ -348,8 +346,6 @@ typedef struct _MPI2_SCSI_TASK_MANAGE_REQUEST #define MPI2_SCSITASKMGMT_MSGFLAGS_DO_NOT_SEND_TASK_IU (0x01) - - /* SCSI Task Management Reply Message */ typedef struct _MPI2_SCSI_TASK_MANAGE_REPLY { @@ -394,7 +390,6 @@ typedef struct _MPI2_SCSI_TASK_MANAGE_REPLY #define MPI2_SCSITASKMGMT_RI_MASK_ARI0 (0xFF000000) #define MPI2_SCSITASKMGMT_RI_SHIFT_ARI0 (24) - /**************************************************************************** * SCSI Enclosure Processor messages ****************************************************************************/ @@ -442,7 +437,6 @@ typedef struct _MPI2_SEP_REQUEST #define MPI2_SEP_REQ_SLOTSTATUS_DEV_FAULTY (0x00000002) #define MPI2_SEP_REQ_SLOTSTATUS_NO_ERROR (0x00000001) - /* SCSI Enclosure Processor Reply Message */ typedef struct _MPI2_SEP_REPLY { @@ -479,7 +473,4 @@ typedef struct _MPI2_SEP_REPLY #define MPI2_SEP_REPLY_SLOTSTATUS_DEV_FAULTY (0x00000002) #define MPI2_SEP_REPLY_SLOTSTATUS_NO_ERROR (0x00000001) - #endif - - Modified: head/sys/dev/mps/mpi/mpi2_ioc.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2_ioc.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2_ioc.h Tue Sep 1 22:07:00 2020 (r365203) @@ -209,7 +209,6 @@ typedef struct _MPI2_IOC_INIT_REQUEST /* minimum depth for the Reply Descriptor Post Queue */ #define MPI2_RDPQ_DEPTH_MIN (16) - /* IOCInit Reply message */ typedef struct _MPI2_IOC_INIT_REPLY *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 22:07:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 70C6637E7BB; Tue, 1 Sep 2020 22:07:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1QB24gYz4fQx; Tue, 1 Sep 2020 22:07:14 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 520CC2070C; Tue, 1 Sep 2020 22:07:13 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M7DTo055858; Tue, 1 Sep 2020 22:07:13 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M7Dkl055855; Tue, 1 Sep 2020 22:07:13 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012207.081M7Dkl055855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:07:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365204 - in head/sys/dev/mpr: . mpi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/mpr: . mpi X-SVN-Commit-Revision: 365204 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:07:14 -0000 Author: mjg Date: Tue Sep 1 22:07:12 2020 New Revision: 365204 URL: https://svnweb.freebsd.org/changeset/base/365204 Log: mpr: clean up empty lines in .c and .h files Modified: head/sys/dev/mpr/mpi/mpi2.h head/sys/dev/mpr/mpi/mpi2_cnfg.h head/sys/dev/mpr/mpi/mpi2_hbd.h head/sys/dev/mpr/mpi/mpi2_init.h head/sys/dev/mpr/mpi/mpi2_ioc.h head/sys/dev/mpr/mpi/mpi2_pci.h head/sys/dev/mpr/mpi/mpi2_ra.h head/sys/dev/mpr/mpi/mpi2_raid.h head/sys/dev/mpr/mpi/mpi2_sas.h head/sys/dev/mpr/mpi/mpi2_targ.h head/sys/dev/mpr/mpi/mpi2_tool.h head/sys/dev/mpr/mpi/mpi2_type.h head/sys/dev/mpr/mpr.c head/sys/dev/mpr/mpr_config.c head/sys/dev/mpr/mpr_ioctl.h head/sys/dev/mpr/mpr_mapping.c head/sys/dev/mpr/mpr_pci.c head/sys/dev/mpr/mpr_sas.c head/sys/dev/mpr/mpr_sas_lsi.c head/sys/dev/mpr/mpr_table.c head/sys/dev/mpr/mpr_user.c head/sys/dev/mpr/mprvar.h Modified: head/sys/dev/mpr/mpi/mpi2.h ============================================================================== --- head/sys/dev/mpr/mpi/mpi2.h Tue Sep 1 22:07:00 2020 (r365203) +++ head/sys/dev/mpr/mpi/mpi2.h Tue Sep 1 22:07:12 2020 (r365204) @@ -160,7 +160,6 @@ #ifndef MPI2_H #define MPI2_H - /***************************************************************************** * * MPI Version Definitions @@ -181,21 +180,18 @@ MPI2_VERSION_MINOR) #define MPI2_VERSION_02_00 (0x0200) - /* minor version for MPI v2.5 compatible products */ #define MPI25_VERSION_MINOR (0x05) #define MPI25_VERSION ((MPI2_VERSION_MAJOR << MPI2_VERSION_MAJOR_SHIFT) | \ MPI25_VERSION_MINOR) #define MPI2_VERSION_02_05 (0x0205) - /* minor version for MPI v2.6 compatible products */ #define MPI26_VERSION_MINOR (0x06) #define MPI26_VERSION ((MPI2_VERSION_MAJOR << MPI2_VERSION_MAJOR_SHIFT) | \ MPI26_VERSION_MINOR) #define MPI2_VERSION_02_06 (0x0206) - /* Unit and Dev versioning for this MPI header set */ #define MPI2_HEADER_VERSION_UNIT (0x34) #define MPI2_HEADER_VERSION_DEV (0x00) @@ -205,7 +201,6 @@ #define MPI2_HEADER_VERSION_DEV_SHIFT (0) #define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) | MPI2_HEADER_VERSION_DEV) - /***************************************************************************** * * IOC State Definitions @@ -224,7 +219,6 @@ #define MPI2_FAULT_PRODUCT_SPECIFIC_MIN (0x0000) #define MPI2_FAULT_PRODUCT_SPECIFIC_MAX (0xEFFF) - /***************************************************************************** * * System Interface Register Definitions @@ -280,7 +274,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_DOORBELL_ADD_DWORDS_MASK (0x00FF0000) #define MPI2_DOORBELL_ADD_DWORDS_SHIFT (16) - /* * Defines for the WriteSequence register */ @@ -371,7 +364,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_RPHI_MSIX_INDEX_SHIFT (24) #define MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET (0x0000030C) /* MPI v2.5 only */ - /* * Defines for the HCBSize and address */ @@ -397,7 +389,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET (0x000000C4) #define MPI26_ATOMIC_REQUEST_DESCRIPTOR_POST_OFFSET (0x000000C8) - /* Hard Reset delay timings */ #define MPI2_HARD_RESET_PCIE_FIRST_READ_DELAY_MICRO_SEC (50000) #define MPI2_HARD_RESET_PCIE_RESET_READ_WINDOW_MICRO_SEC (255000) @@ -436,7 +427,6 @@ typedef struct _MPI2_DEFAULT_REQUEST_DESCRIPTOR #define MPI2_REQ_DESCRIPT_FLAGS_IOC_FIFO_MARKER (0x01) - /* High Priority Request Descriptor */ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR { @@ -450,7 +440,6 @@ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR Mpi2HighPriorityRequestDescriptor_t, MPI2_POINTER pMpi2HighPriorityRequestDescriptor_t; - /* SCSI IO Request Descriptor */ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR { @@ -463,7 +452,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI2_POINTER PTR_MPI2_SCSI_IO_REQUEST_DESCRIPTOR, Mpi2SCSIIORequestDescriptor_t, MPI2_POINTER pMpi2SCSIIORequestDescriptor_t; - /* SCSI Target Request Descriptor */ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR { @@ -477,7 +465,6 @@ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR Mpi2SCSITargetRequestDescriptor_t, MPI2_POINTER pMpi2SCSITargetRequestDescriptor_t; - /* RAID Accelerator Request Descriptor */ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR { @@ -491,7 +478,6 @@ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR Mpi2RAIDAcceleratorRequestDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorRequestDescriptor_t; - /* Fast Path SCSI IO Request Descriptor */ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI25_FP_SCSI_IO_REQUEST_DESCRIPTOR, @@ -499,7 +485,6 @@ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR Mpi25FastPathSCSIIORequestDescriptor_t, MPI2_POINTER pMpi25FastPathSCSIIORequestDescriptor_t; - /* PCIe Encapsulated Request Descriptor */ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI26_PCIE_ENCAPSULATED_REQUEST_DESCRIPTOR, @@ -507,7 +492,6 @@ typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR Mpi26PCIeEncapsulatedRequestDescriptor_t, MPI2_POINTER pMpi26PCIeEncapsulatedRequestDescriptor_t; - /* union of Request Descriptors */ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION { @@ -522,7 +506,6 @@ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION } MPI2_REQUEST_DESCRIPTOR_UNION, MPI2_POINTER PTR_MPI2_REQUEST_DESCRIPTOR_UNION, Mpi2RequestDescriptorUnion_t, MPI2_POINTER pMpi2RequestDescriptorUnion_t; - /* Atomic Request Descriptors */ /* @@ -549,7 +532,6 @@ typedef struct _MPI26_ATOMIC_REQUEST_DESCRIPTOR /* for the RequestFlags field, use the same defines as MPI2_DEFAULT_REQUEST_DESCRIPTOR */ - /* Reply Descriptors */ /* Default Reply Descriptor */ @@ -589,7 +571,6 @@ typedef struct _MPI2_ADDRESS_REPLY_DESCRIPTOR #define MPI2_ADDRESS_REPLY_SMID_INVALID (0x00) - /* SCSI IO Success Reply Descriptor */ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR { @@ -603,7 +584,6 @@ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR Mpi2SCSIIOSuccessReplyDescriptor_t, MPI2_POINTER pMpi2SCSIIOSuccessReplyDescriptor_t; - /* TargetAssist Success Reply Descriptor */ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRIPTOR { @@ -618,7 +598,6 @@ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRI Mpi2TargetAssistSuccessReplyDescriptor_t, MPI2_POINTER pMpi2TargetAssistSuccessReplyDescriptor_t; - /* Target Command Buffer Reply Descriptor */ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCRIPTOR { @@ -636,7 +615,6 @@ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCR /* defines for Flags field */ #define MPI2_RPY_DESCRIPT_TCB_FLAGS_PHYNUM_MASK (0x3F) - /* RAID Accelerator Success Reply Descriptor */ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR { @@ -649,7 +627,6 @@ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DE Mpi2RAIDAcceleratorSuccessReplyDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorSuccessReplyDescriptor_t; - /* Fast Path SCSI IO Success Reply Descriptor */ typedef MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR MPI25_FP_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR, @@ -657,7 +634,6 @@ typedef MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR Mpi25FastPathSCSIIOSuccessReplyDescriptor_t, MPI2_POINTER pMpi25FastPathSCSIIOSuccessReplyDescriptor_t; - /* PCIe Encapsulated Success Reply Descriptor */ typedef MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR MPI26_PCIE_ENCAPSULATED_SUCCESS_REPLY_DESCRIPTOR, @@ -665,7 +641,6 @@ typedef MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR Mpi26PCIeEncapsulatedSuccessReplyDescriptor_t, MPI2_POINTER pMpi26PCIeEncapsulatedSuccessReplyDescriptor_t; - /* union of Reply Descriptors */ typedef union _MPI2_REPLY_DESCRIPTORS_UNION { @@ -681,8 +656,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION } MPI2_REPLY_DESCRIPTORS_UNION, MPI2_POINTER PTR_MPI2_REPLY_DESCRIPTORS_UNION, Mpi2ReplyDescriptorsUnion_t, MPI2_POINTER pMpi2ReplyDescriptorsUnion_t; - - /***************************************************************************** * * Message Functions @@ -723,13 +696,10 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION #define MPI2_FUNCTION_MIN_PRODUCT_SPECIFIC (0xF0) /* beginning of product-specific range */ #define MPI2_FUNCTION_MAX_PRODUCT_SPECIFIC (0xFF) /* end of product-specific range */ - - /* Doorbell functions */ #define MPI2_FUNCTION_IOC_MESSAGE_UNIT_RESET (0x40) #define MPI2_FUNCTION_HANDSHAKE (0x42) - /***************************************************************************** * * IOC Status Values @@ -844,7 +814,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION #define MPI2_IOCLOGINFO_TYPE_ISCSI (0x4) #define MPI2_IOCLOGINFO_LOG_DATA_MASK (0x0FFFFFFF) - /***************************************************************************** * * Standard Message Structures @@ -869,7 +838,6 @@ typedef struct _MPI2_REQUEST_HEADER } MPI2_REQUEST_HEADER, MPI2_POINTER PTR_MPI2_REQUEST_HEADER, MPI2RequestHeader_t, MPI2_POINTER pMPI2RequestHeader_t; - /**************************************************************************** * Default Reply ****************************************************************************/ @@ -891,7 +859,6 @@ typedef struct _MPI2_DEFAULT_REPLY } MPI2_DEFAULT_REPLY, MPI2_POINTER PTR_MPI2_DEFAULT_REPLY, MPI2DefaultReply_t, MPI2_POINTER pMPI2DefaultReply_t; - /* common version structure/union used in messages and configuration pages */ typedef struct _MPI2_VERSION_STRUCT @@ -908,7 +875,6 @@ typedef union _MPI2_VERSION_UNION U32 Word; } MPI2_VERSION_UNION; - /* LUN field defines, common to many structures */ #define MPI2_LUN_FIRST_LEVEL_ADDRESSING (0x0000FFFF) #define MPI2_LUN_SECOND_LEVEL_ADDRESSING (0xFFFF0000) @@ -917,7 +883,6 @@ typedef union _MPI2_VERSION_UNION #define MPI2_LUN_LEVEL_1_WORD (0xFF00) #define MPI2_LUN_LEVEL_1_DWORD (0x0000FF00) - /***************************************************************************** * * Fusion-MPT MPI Scatter Gather Elements @@ -953,7 +918,6 @@ typedef struct _MPI2_SGE_SIMPLE_UNION } MPI2_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_SIMPLE_UNION, Mpi2SGESimpleUnion_t, MPI2_POINTER pMpi2SGESimpleUnion_t; - /**************************************************************************** * MPI Chain Element structures - for MPI v2.0 products only ****************************************************************************/ @@ -989,7 +953,6 @@ typedef struct _MPI2_SGE_CHAIN_UNION } MPI2_SGE_CHAIN_UNION, MPI2_POINTER PTR_MPI2_SGE_CHAIN_UNION, Mpi2SGEChainUnion_t, MPI2_POINTER pMpi2SGEChainUnion_t; - /**************************************************************************** * MPI Transaction Context Element structures - for MPI v2.0 products only ****************************************************************************/ @@ -1055,7 +1018,6 @@ typedef struct _MPI2_SGE_TRANSACTION_UNION } MPI2_SGE_TRANSACTION_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANSACTION_UNION, Mpi2SGETransactionUnion_t, MPI2_POINTER pMpi2SGETransactionUnion_t; - /**************************************************************************** * MPI SGE union for IO SGL's - for MPI v2.0 products only ****************************************************************************/ @@ -1070,7 +1032,6 @@ typedef struct _MPI2_MPI_SGE_IO_UNION } MPI2_MPI_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_IO_UNION, Mpi2MpiSGEIOUnion_t, MPI2_POINTER pMpi2MpiSGEIOUnion_t; - /**************************************************************************** * MPI SGE union for SGL's with Simple and Transaction elements - for MPI v2.0 products only ****************************************************************************/ @@ -1085,7 +1046,6 @@ typedef struct _MPI2_SGE_TRANS_SIMPLE_UNION } MPI2_SGE_TRANS_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANS_SIMPLE_UNION, Mpi2SGETransSimpleUnion_t, MPI2_POINTER pMpi2SGETransSimpleUnion_t; - /**************************************************************************** * All MPI SGE types union ****************************************************************************/ @@ -1101,7 +1061,6 @@ typedef struct _MPI2_MPI_SGE_UNION } MPI2_MPI_SGE_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_UNION, Mpi2MpiSgeUnion_t, MPI2_POINTER pMpi2MpiSgeUnion_t; - /**************************************************************************** * MPI SGE field definition and masks ****************************************************************************/ @@ -1177,7 +1136,6 @@ typedef struct _MPI2_MPI_SGE_UNION #define MPI2_GET_CHAIN_OFFSET(x) ((x & MPI2_SGE_CHAIN_OFFSET_MASK) >> MPI2_SGE_CHAIN_OFFSET_SHIFT) - /***************************************************************************** * * Fusion-MPT IEEE Scatter Gather Elements @@ -1213,7 +1171,6 @@ typedef union _MPI2_IEEE_SGE_SIMPLE_UNION } MPI2_IEEE_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_SIMPLE_UNION, Mpi2IeeeSgeSimpleUnion_t, MPI2_POINTER pMpi2IeeeSgeSimpleUnion_t; - /**************************************************************************** * IEEE Chain Element structures ****************************************************************************/ @@ -1242,7 +1199,6 @@ typedef struct _MPI25_IEEE_SGE_CHAIN64 } MPI25_IEEE_SGE_CHAIN64, MPI2_POINTER PTR_MPI25_IEEE_SGE_CHAIN64, Mpi25IeeeSgeChain64_t, MPI2_POINTER pMpi25IeeeSgeChain64_t; - /**************************************************************************** * All IEEE SGE types union ****************************************************************************/ @@ -1258,7 +1214,6 @@ typedef struct _MPI2_IEEE_SGE_UNION } MPI2_IEEE_SGE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_UNION, Mpi2IeeeSgeUnion_t, MPI2_POINTER pMpi2IeeeSgeUnion_t; - /**************************************************************************** * IEEE SGE union for IO SGL's ****************************************************************************/ @@ -1270,7 +1225,6 @@ typedef union _MPI25_SGE_IO_UNION } MPI25_SGE_IO_UNION, MPI2_POINTER PTR_MPI25_SGE_IO_UNION, Mpi25SGEIOUnion_t, MPI2_POINTER pMpi25SGEIOUnion_t; - /**************************************************************************** * IEEE SGE field definitions and masks ****************************************************************************/ @@ -1327,8 +1281,6 @@ typedef union _MPI25_SGE_IO_UNION #define MPI2_IEEE32_pSGE_SET_FLAGS(psg,f) (psg)->FlagsLength |= MPI2_IEEE32_SGE_SET_FLAGS(f) #define MPI2_IEEE32_pSGE_SET_LENGTH(psg,l) (psg)->FlagsLength |= MPI2_IEEE32_SGE_LENGTH(l) - - /***************************************************************************** * * Fusion-MPT MPI/IEEE Scatter Gather Unions @@ -1342,7 +1294,6 @@ typedef union _MPI2_SIMPLE_SGE_UNION } MPI2_SIMPLE_SGE_UNION, MPI2_POINTER PTR_MPI2_SIMPLE_SGE_UNION, Mpi2SimpleSgeUntion_t, MPI2_POINTER pMpi2SimpleSgeUntion_t; - typedef union _MPI2_SGE_IO_UNION { MPI2_SGE_SIMPLE_UNION MpiSimple; @@ -1352,7 +1303,6 @@ typedef union _MPI2_SGE_IO_UNION } MPI2_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_SGE_IO_UNION, Mpi2SGEIOUnion_t, MPI2_POINTER pMpi2SGEIOUnion_t; - /**************************************************************************** * * Values for SGLFlags field, used in many request messages with an SGL @@ -1372,6 +1322,4 @@ typedef union _MPI2_SGE_IO_UNION #define MPI2_SGLFLAGS_SGL_TYPE_IEEE32 (0x01) /* MPI v2.0 products only */ #define MPI2_SGLFLAGS_SGL_TYPE_IEEE64 (0x02) - #endif - Modified: head/sys/dev/mpr/mpi/mpi2_cnfg.h ============================================================================== --- head/sys/dev/mpr/mpi/mpi2_cnfg.h Tue Sep 1 22:07:00 2020 (r365203) +++ head/sys/dev/mpr/mpi/mpi2_cnfg.h Tue Sep 1 22:07:12 2020 (r365204) @@ -329,7 +329,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION } MPI2_CONFIG_EXT_PAGE_HEADER_UNION, MPI2_POINTER PTR_MPI2_CONFIG_EXT_PAGE_HEADER_UNION, Mpi2ConfigPageExtendedHeaderUnion, MPI2_POINTER pMpi2ConfigPageExtendedHeaderUnion; - /* PageType field values */ #define MPI2_CONFIG_PAGEATTR_READ_ONLY (0x00) #define MPI2_CONFIG_PAGEATTR_CHANGEABLE (0x10) @@ -347,7 +346,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_CONFIG_TYPENUM_MASK (0x0FFF) - /* ExtPageType field values */ #define MPI2_CONFIG_EXTPAGETYPE_SAS_IO_UNIT (0x10) #define MPI2_CONFIG_EXTPAGETYPE_SAS_EXPANDER (0x11) @@ -367,7 +365,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION /* Product specific reserved values 0xE0 - 0xEF */ /* Vendor specific reserved values 0xF0 - 0xFF */ - /***************************************************************************** * PageAddress defines *****************************************************************************/ @@ -379,7 +376,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_RAID_VOLUME_PGAD_HANDLE_MASK (0x0000FFFF) - /* RAID Physical Disk PageAddress format */ #define MPI2_PHYSDISK_PGAD_FORM_MASK (0xF0000000) #define MPI2_PHYSDISK_PGAD_FORM_GET_NEXT_PHYSDISKNUM (0x00000000) @@ -389,7 +385,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_PHYSDISK_PGAD_PHYSDISKNUM_MASK (0x000000FF) #define MPI2_PHYSDISK_PGAD_DEVHANDLE_MASK (0x0000FFFF) - /* SAS Expander PageAddress format */ #define MPI2_SAS_EXPAND_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_EXPAND_PGAD_FORM_GET_NEXT_HNDL (0x00000000) @@ -400,7 +395,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_EXPAND_PGAD_PHYNUM_MASK (0x00FF0000) #define MPI2_SAS_EXPAND_PGAD_PHYNUM_SHIFT (16) - /* SAS Device PageAddress format */ #define MPI2_SAS_DEVICE_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -408,7 +402,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_DEVICE_PGAD_HANDLE_MASK (0x0000FFFF) - /* SAS PHY PageAddress format */ #define MPI2_SAS_PHY_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_PHY_PGAD_FORM_PHY_NUMBER (0x00000000) @@ -417,7 +410,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_PHY_PGAD_PHY_NUMBER_MASK (0x000000FF) #define MPI2_SAS_PHY_PGAD_PHY_TBL_INDEX_MASK (0x0000FFFF) - /* SAS Port PageAddress format */ #define MPI2_SASPORT_PGAD_FORM_MASK (0xF0000000) #define MPI2_SASPORT_PGAD_FORM_GET_NEXT_PORT (0x00000000) @@ -425,7 +417,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SASPORT_PGAD_PORTNUMBER_MASK (0x00000FFF) - /* SAS Enclosure PageAddress format */ #define MPI2_SAS_ENCLOS_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_ENCLOS_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -448,7 +439,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_RAID_PGAD_CONFIGNUM_MASK (0x000000FF) - /* Driver Persistent Mapping PageAddress format */ #define MPI2_DPM_PGAD_FORM_MASK (0xF0000000) #define MPI2_DPM_PGAD_FORM_ENTRY_RANGE (0x00000000) @@ -457,14 +447,12 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT (16) #define MPI2_DPM_PGAD_START_ENTRY_MASK (0x0000FFFF) - /* Ethernet PageAddress format */ #define MPI2_ETHERNET_PGAD_FORM_MASK (0xF0000000) #define MPI2_ETHERNET_PGAD_FORM_IF_NUM (0x00000000) #define MPI2_ETHERNET_PGAD_IF_NUMBER_MASK (0x000000FF) - /* PCIe Switch PageAddress format */ #define MPI26_PCIE_SWITCH_PGAD_FORM_MASK (0xF0000000) #define MPI26_PCIE_SWITCH_PGAD_FORM_GET_NEXT_HNDL (0x00000000) @@ -475,7 +463,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI26_PCIE_SWITCH_PGAD_PORTNUM_MASK (0x00FF0000) #define MPI26_PCIE_SWITCH_PGAD_PORTNUM_SHIFT (16) - /* PCIe Device PageAddress format */ #define MPI26_PCIE_DEVICE_PGAD_FORM_MASK (0xF0000000) #define MPI26_PCIE_DEVICE_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -490,8 +477,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI26_PCIE_DEVICE_PGAD_LINKNUM_MASK (0x000000FF) - - /**************************************************************************** * Configuration messages ****************************************************************************/ @@ -531,7 +516,6 @@ typedef struct _MPI2_CONFIG_REQUEST /* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */ - /* Config Reply Message */ typedef struct _MPI2_CONFIG_REPLY { @@ -552,8 +536,6 @@ typedef struct _MPI2_CONFIG_REPLY } MPI2_CONFIG_REPLY, MPI2_POINTER PTR_MPI2_CONFIG_REPLY, Mpi2ConfigReply_t, MPI2_POINTER pMpi2ConfigReply_t; - - /***************************************************************************** * * C o n f i g u r a t i o n P a g e s @@ -630,7 +612,6 @@ typedef struct _MPI2_CONFIG_REPLY #define MPI26_MFGPAGE_DEVID_HARD_SEC_SAS3816 (0x00E6) #define MPI26_MFGPAGE_DEVID_INVALID1_SAS3816 (0x00E7) - /* Manufacturing Page 0 */ typedef struct _MPI2_CONFIG_PAGE_MAN_0 @@ -647,7 +628,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_0 #define MPI2_MANUFACTURING0_PAGEVERSION (0x00) - /* Manufacturing Page 1 */ typedef struct _MPI2_CONFIG_PAGE_MAN_1 @@ -660,7 +640,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_1 #define MPI2_MANUFACTURING1_PAGEVERSION (0x00) - typedef struct _MPI2_CHIP_REVISION_ID { U16 DeviceID; /* 0x00 */ @@ -669,7 +648,6 @@ typedef struct _MPI2_CHIP_REVISION_ID } MPI2_CHIP_REVISION_ID, MPI2_POINTER PTR_MPI2_CHIP_REVISION_ID, Mpi2ChipRevisionId_t, MPI2_POINTER pMpi2ChipRevisionId_t; - /* Manufacturing Page 2 */ /* @@ -691,7 +669,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_2 #define MPI2_MANUFACTURING2_PAGEVERSION (0x00) - /* Manufacturing Page 3 */ /* @@ -713,7 +690,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_3 #define MPI2_MANUFACTURING3_PAGEVERSION (0x00) - /* Manufacturing Page 4 */ typedef struct _MPI2_MANPAGE4_PWR_SAVE_SETTINGS @@ -789,7 +765,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_4 #define MPI2_MANPAGE4_IM_RESYNC_CACHE_ENABLE (0x00000002) #define MPI2_MANPAGE4_IR_NO_MIX_SAS_SATA (0x00000001) - /* Manufacturing Page 5 */ /* @@ -822,7 +797,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_5 #define MPI2_MANUFACTURING5_PAGEVERSION (0x03) - /* Manufacturing Page 6 */ typedef struct _MPI2_CONFIG_PAGE_MAN_6 @@ -835,7 +809,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_6 #define MPI2_MANUFACTURING6_PAGEVERSION (0x00) - /* Manufacturing Page 7 */ typedef struct _MPI2_MANPAGE7_CONNECTOR_INFO @@ -918,7 +891,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_7 #define MPI2_MANPAGE7_FLAG_EVENTREPLAY_SLOT_ORDER (0x00000002) #define MPI2_MANPAGE7_FLAG_USE_SLOT_INFO (0x00000001) - /* * Generic structure to use for product-specific manufacturing pages * (currently Manufacturing Page 8 through Manufacturing Page 31). @@ -957,7 +929,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_PS #define MPI2_MANUFACTURING30_PAGEVERSION (0x00) #define MPI2_MANUFACTURING31_PAGEVERSION (0x00) - /**************************************************************************** * IO Unit Config Pages ****************************************************************************/ @@ -975,7 +946,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_0 #define MPI2_IOUNITPAGE0_PAGEVERSION (0x02) - /* IO Unit Page 1 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1 @@ -1006,7 +976,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1 #define MPI2_IOUNITPAGE1_DISABLE_TASK_SET_FULL_HANDLING (0x00000020) #define MPI2_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID (0x00000004) - /* IO Unit Page 3 */ /* @@ -1035,7 +1004,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_3 #define MPI2_IOUNITPAGE3_GPIO_SETTING_OFF (0x0000) #define MPI2_IOUNITPAGE3_GPIO_SETTING_ON (0x0001) - /* IO Unit Page 5 */ /* @@ -1074,7 +1042,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_5 #define MPI2_IOUNITPAGE5_DMA_CAP_HASHING (0x0002) #define MPI2_IOUNITPAGE5_DMA_CAP_ENCRYPTION (0x0001) - /* IO Unit Page 6 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6 @@ -1095,7 +1062,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6 /* defines for IO Unit Page 6 Flags field */ #define MPI2_IOUNITPAGE6_FLAGS_ENABLE_RAID_ACCELERATOR (0x0001) - /* IO Unit Page 7 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 @@ -1138,7 +1104,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 #define MPI25_IOUNITPAGE7_PM_MODE_REDUCED_POWER (0x05) #define MPI25_IOUNITPAGE7_PM_MODE_STANDBY (0x06) - /* defines for IO Unit Page 7 PCIeWidth field */ #define MPI2_IOUNITPAGE7_PCIE_WIDTH_X1 (0x01) #define MPI2_IOUNITPAGE7_PCIE_WIDTH_X2 (0x02) @@ -1188,7 +1153,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 #define MPI2_IOUNITPAGE7_PMCAP_PCIE_WIDTH_CHANGE (0x00000008) /* obsolete */ #define MPI2_IOUNITPAGE7_PMCAP_PCIE_SPEED_CHANGE (0x00000004) /* obsolete */ - /* defines for IO Unit Page 7 IOCTemperatureUnits field */ #define MPI2_IOUNITPAGE7_IOC_TEMP_NOT_PRESENT (0x00) #define MPI2_IOUNITPAGE7_IOC_TEMP_FAHRENHEIT (0x01) @@ -1208,7 +1172,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 /* defines for IO Unit Page 7 Flags field */ #define MPI2_IOUNITPAGE7_FLAG_CABLE_POWER_EXC (0x01) - /* IO Unit Page 8 */ #define MPI2_IOUNIT8_NUM_THRESHOLDS (4) @@ -1252,7 +1215,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_8 #define MPI2_IOUNITPAGE8_PAGEVERSION (0x00) - /* IO Unit Page 9 */ typedef struct _MPI2_IOUNIT9_SENSOR @@ -1292,7 +1254,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_9 #define MPI2_IOUNITPAGE9_PAGEVERSION (0x00) - /* IO Unit Page 10 */ typedef struct _MPI2_IOUNIT10_FUNCTION @@ -1325,7 +1286,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_10 #define MPI2_IOUNITPAGE10_PAGEVERSION (0x01) - /* IO Unit Page 11 (for MPI v2.6 and later) */ typedef struct _MPI26_IOUNIT11_SPINUP_GROUP @@ -1340,7 +1300,6 @@ typedef struct _MPI26_IOUNIT11_SPINUP_GROUP /* defines for IO Unit Page 11 SpinupFlags */ #define MPI26_IOUNITPAGE11_SPINUP_DISABLE_FLAG (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * four and check the value returned for NumPhys at runtime. @@ -1377,8 +1336,6 @@ typedef struct _MPI26_CONFIG_PAGE_IO_UNIT_11 /* defines for PHY field */ #define MPI26_IOUNITPAGE11_PHY_SPINUP_GROUP_MASK (0x03) - - /**************************************************************************** * IOC Config Pages ****************************************************************************/ @@ -1403,7 +1360,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_0 #define MPI2_IOCPAGE0_PAGEVERSION (0x02) - /* IOC Page 1 */ typedef struct _MPI2_CONFIG_PAGE_IOC_1 @@ -1474,7 +1430,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_6 #define MPI2_IOCPAGE6_CAP_FLAGS_RAID0_SUPPORT (0x00000002) #define MPI2_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE (0x00000001) - /* IOC Page 7 */ #define MPI2_IOCPAGE7_EVENTMASK_WORDS (4) @@ -1492,7 +1447,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_7 #define MPI2_IOCPAGE7_PAGEVERSION (0x02) - /* IOC Page 8 */ typedef struct _MPI2_CONFIG_PAGE_IOC_8 @@ -1529,7 +1483,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_8 #define MPI2_IOCPAGE8_IRFLAGS_LOW_VOLUME_MAPPING (0x00000000) #define MPI2_IOCPAGE8_IRFLAGS_HIGH_VOLUME_MAPPING (0x00000001) - /**************************************************************************** * BIOS Config Pages ****************************************************************************/ @@ -1616,8 +1569,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_1 #define MPI2_BIOSPAGE1_UEFI_VER_MINOR_MASK (0x00FF) #define MPI2_BIOSPAGE1_UEFI_VER_MINOR_SHIFT (0) - - /* BIOS Page 2 */ typedef struct _MPI2_BOOT_DEVICE_ADAPTER_ORDER @@ -1704,7 +1655,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_2 #define MPI2_BIOSPAGE2_FORM_ENCLOSURE_SLOT (0x06) #define MPI2_BIOSPAGE2_FORM_DEVICE_NAME (0x07) - /* BIOS Page 3 */ #define MPI2_BIOSPAGE3_NUM_ADAPTER (4) @@ -1751,7 +1701,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_3 #define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DISPLAY (0x00000020) #define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DEV_DISPLAY (0x00000040) - /* BIOS Page 4 */ /* @@ -1781,7 +1730,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_4 #define MPI2_BIOSPAGE4_PAGEVERSION (0x01) - /**************************************************************************** * RAID Volume Config Pages ****************************************************************************/ @@ -1912,7 +1860,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_0 #define MPI2_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05) #define MPI2_RAIDVOLPAGE0_PREVIOUSLY_DELETED (0x06) - /* RAID Volume Page 1 */ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1 @@ -1930,7 +1877,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1 #define MPI2_RAIDVOLPAGE1_PAGEVERSION (0x03) - /**************************************************************************** * RAID Physical Disk Config Pages ****************************************************************************/ @@ -2032,7 +1978,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_0 #define MPI2_PHYSDISK0_STATUS_FLAG_QUIESCED (0x00000002) #define MPI2_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC (0x00000001) - /* RAID Physical Disk Page 1 */ /* @@ -2074,7 +2019,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_RAIDPHYSDISKPAGE1_PAGEVERSION (0x02) - /**************************************************************************** * values for fields used by several types of SAS Config Pages ****************************************************************************/ @@ -2097,7 +2041,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI25_SAS_NEG_LINK_RATE_12_0 (0x0B) #define MPI26_SAS_NEG_LINK_RATE_22_5 (0x0C) - /* values for AttachedPhyInfo fields */ #define MPI2_SAS_APHYINFO_INSIDE_ZPSDS_PERSISTENT (0x00000040) #define MPI2_SAS_APHYINFO_REQUESTED_INSIDE_ZPSDS (0x00000020) @@ -2114,7 +2057,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_APHYINFO_REASON_BREAK_TIMEOUT (0x00000007) #define MPI2_SAS_APHYINFO_REASON_PHY_TEST_STOPPED (0x00000008) - /* values for PhyInfo fields */ #define MPI2_SAS_PHYINFO_PHY_VACANT (0x80000000) @@ -2155,7 +2097,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_PHYINFO_SUBTRACTIVE_ROUTING (0x00000010) #define MPI2_SAS_PHYINFO_TABLE_ROUTING (0x00000020) - /* values for SAS ProgrammedLinkRate fields */ #define MPI2_SAS_PRATE_MAX_RATE_MASK (0xF0) #define MPI2_SAS_PRATE_MAX_RATE_NOT_PROGRAMMABLE (0x00) @@ -2172,7 +2113,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI25_SAS_PRATE_MIN_RATE_12_0 (0x0B) #define MPI26_SAS_PRATE_MIN_RATE_22_5 (0x0C) - /* values for SAS HwLinkRate fields */ #define MPI2_SAS_HWRATE_MAX_RATE_MASK (0xF0) #define MPI2_SAS_HWRATE_MAX_RATE_1_5 (0x80) @@ -2187,8 +2127,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI25_SAS_HWRATE_MIN_RATE_12_0 (0x0B) #define MPI26_SAS_HWRATE_MIN_RATE_22_5 (0x0C) - - /**************************************************************************** * SAS IO Unit Config Pages ****************************************************************************/ @@ -2267,7 +2205,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_0 #define MPI2_SASIOUNIT0_DS_UNADDRESSABLE_DEVICE (0x00000002) #define MPI2_SASIOUNIT0_DS_LOOP_DETECTED (0x00000001) - /* SAS IO Unit Page 1 */ typedef struct _MPI2_SAS_IO_UNIT1_PHY_DATA @@ -2369,7 +2306,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_1 /* see mpi2_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */ - /* SAS IO Unit Page 4 (for MPI v2.5 and earlier) */ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP @@ -2384,7 +2320,6 @@ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP /* defines for SAS IO Unit Page 4 SpinupFlags */ #define MPI2_SASIOUNIT4_SPINUP_DISABLE_FLAG (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumPhys at runtime. @@ -2420,7 +2355,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_4 /* defines for PHY field */ #define MPI2_SASIOUNIT4_PHY_SPINUP_GROUP_MASK (0x03) - /* SAS IO Unit Page 5 */ typedef struct _MPI2_SAS_IO_UNIT5_PHY_PM_SETTINGS @@ -2490,7 +2424,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_5 #define MPI2_SASIOUNITPAGE5_PAGEVERSION (0x01) - /* SAS IO Unit Page 6 */ typedef struct _MPI2_SAS_IO_UNIT6_PORT_WIDTH_MOD_GROUP_STATUS @@ -2545,7 +2478,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_6 #define MPI2_SASIOUNITPAGE6_PAGEVERSION (0x00) - /* SAS IO Unit Page 7 */ typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP_SETTINGS @@ -2565,7 +2497,6 @@ typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP /* defines for Flags field */ #define MPI2_SASIOUNIT7_FLAGS_ENABLE_PORT_WIDTH_MODULATION (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumGroups at runtime. @@ -2593,7 +2524,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_7 #define MPI2_SASIOUNITPAGE7_PAGEVERSION (0x00) - /* SAS IO Unit Page 8 */ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 @@ -2628,8 +2558,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 #define MPI25_SASIOUNIT8_TXRXSLEEP_ACTIVE (0x02) #define MPI25_SASIOUNIT8_TXRXSLEEP_SHUTDOWN (0x03) - - /* SAS IO Unit Page 16 */ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT16 @@ -2652,7 +2580,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT16 #define MPI2_SASIOUNITPAGE16_PAGEVERSION (0x00) - /**************************************************************************** * SAS Expander Config Pages ****************************************************************************/ @@ -2725,7 +2652,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_0 #define MPI2_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS (0x0002) #define MPI2_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG (0x0001) - /* SAS Expander Page 1 */ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 @@ -2775,7 +2701,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 /* use MPI2_SAS_APHYINFO_ defines for AttachedPhyInfo field */ - /**************************************************************************** * SAS Device Config Pages ****************************************************************************/ @@ -2868,7 +2793,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_1 #define MPI2_SASDEVICE1_PAGEVERSION (0x01) - /**************************************************************************** * SAS PHY Config Pages ****************************************************************************/ @@ -2910,7 +2834,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0 /* use MPI2_SAS_NEG_LINK_RATE_ defines for the NegotiatedLinkRate field */ - /* SAS PHY Page 1 */ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 @@ -2926,7 +2849,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 #define MPI2_SASPHY1_PAGEVERSION (0x01) - /* SAS PHY Page 2 */ typedef struct _MPI2_SASPHY2_PHY_EVENT @@ -2940,7 +2862,6 @@ typedef struct _MPI2_SASPHY2_PHY_EVENT /* use MPI2_SASPHY3_EVENT_CODE_ for the PhyEventCode field */ - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumPhyEvents at runtime. @@ -2962,7 +2883,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_2 #define MPI2_SASPHY2_PAGEVERSION (0x00) - /* SAS PHY Page 3 */ typedef struct _MPI2_SASPHY3_PHY_EVENT_CONFIG @@ -3066,7 +2986,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_3 #define MPI2_SASPHY3_PAGEVERSION (0x00) - /* SAS PHY Page 4 */ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4 @@ -3085,9 +3004,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4 #define MPI2_SASPHY4_FLAGS_FRAME_VALID (0x02) #define MPI2_SASPHY4_FLAGS_SATA_FRAME (0x01) - - - /**************************************************************************** * SAS Port Config Pages ****************************************************************************/ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 22:07:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A056637E7CC; Tue, 1 Sep 2020 22:07:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1QS1Z5Kz4fVy; Tue, 1 Sep 2020 22:07:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EB21D20782; Tue, 1 Sep 2020 22:07:26 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M7QUW055915; Tue, 1 Sep 2020 22:07:26 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M7QGb055913; Tue, 1 Sep 2020 22:07:26 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012207.081M7QGb055913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:07:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365205 - in head/sys/dev/mmc: . host X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/mmc: . host X-SVN-Commit-Revision: 365205 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:07:28 -0000 Author: mjg Date: Tue Sep 1 22:07:26 2020 New Revision: 365205 URL: https://svnweb.freebsd.org/changeset/base/365205 Log: mmc: clean up empty lines in .c and .h files Modified: head/sys/dev/mmc/host/dwmmc.c head/sys/dev/mmc/mmc.c Modified: head/sys/dev/mmc/host/dwmmc.c ============================================================================== --- head/sys/dev/mmc/host/dwmmc.c Tue Sep 1 22:07:12 2020 (r365204) +++ head/sys/dev/mmc/host/dwmmc.c Tue Sep 1 22:07:26 2020 (r365205) @@ -1478,7 +1478,6 @@ dwmmc_cam_action(struct cam_sim *sim, union ccb *ccb) } case XPT_SET_TRAN_SETTINGS: { - dwmmc_cam_settran_settings(sc, ccb); ccb->ccb_h.status = CAM_REQ_CMP; break; Modified: head/sys/dev/mmc/mmc.c ============================================================================== --- head/sys/dev/mmc/mmc.c Tue Sep 1 22:07:12 2020 (r365204) +++ head/sys/dev/mmc/mmc.c Tue Sep 1 22:07:26 2020 (r365205) @@ -130,7 +130,6 @@ static const struct mmc_quirk mmc_quirks[] = { */ { 0x70, MMC_QUIRK_OID_ANY, "V10008", MMC_QUIRK_BROKEN_TRIM }, { 0x70, MMC_QUIRK_OID_ANY, "V10016", MMC_QUIRK_BROKEN_TRIM }, - { 0x0, 0x0, NULL, 0x0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 22:07:39 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F1BFC37E937; Tue, 1 Sep 2020 22:07:39 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Qg5SLgz4fll; Tue, 1 Sep 2020 22:07:39 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4E37C20067; Tue, 1 Sep 2020 22:07:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M7cWq055969; Tue, 1 Sep 2020 22:07:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M7bDx055967; Tue, 1 Sep 2020 22:07:37 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012207.081M7bDx055967@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:07:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365206 - head/sys/dev/mly X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mly X-SVN-Commit-Revision: 365206 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:07:40 -0000 Author: mjg Date: Tue Sep 1 22:07:37 2020 New Revision: 365206 URL: https://svnweb.freebsd.org/changeset/base/365206 Log: mly: clean up empty lines in .c and .h files Modified: head/sys/dev/mly/mly.c head/sys/dev/mly/mlyvar.h Modified: head/sys/dev/mly/mly.c ============================================================================== --- head/sys/dev/mly/mly.c Tue Sep 1 22:07:26 2020 (r365205) +++ head/sys/dev/mly/mly.c Tue Sep 1 22:07:37 2020 (r365206) @@ -123,7 +123,6 @@ static void mly_timeout(void *arg); #endif void mly_print_controller(int controller); - static d_open_t mly_user_open; static d_close_t mly_user_close; static d_ioctl_t mly_user_ioctl; @@ -1411,7 +1410,6 @@ mly_periodic(void *data) for (bus = 0; bus < sc->mly_cam_channels; bus++) { if (MLY_BUS_IS_VALID(sc, bus)) { for (target = 0; target < MLY_MAX_TARGETS; target++) { - /* ignore the controller in this scan */ if (target == sc->mly_controllerparam->initiator_id) continue; @@ -1504,7 +1502,7 @@ mly_start(struct mly_command *mc) return(EBUSY); } mc->mc_flags |= MLY_CMD_BUSY; - + /* * It's ready, send the command. */ @@ -1520,7 +1518,7 @@ mly_start(struct mly_command *mc) return(EBUSY); } mc->mc_flags |= MLY_CMD_BUSY; - + /* copy in new command */ bcopy(mc->mc_packet->mmbox.data, pkt->mmbox.data, sizeof(pkt->mmbox.data)); /* barrier to ensure completion of previous write before we write the flag */ @@ -1641,7 +1639,6 @@ mly_complete(struct mly_softc *sc) * Spin pulling commands off the completed queue and processing them. */ while ((mc = mly_dequeue_complete(sc)) != NULL) { - /* * Free controller resources, mark command complete. * @@ -1746,7 +1743,7 @@ mly_alloc_commands(struct mly_softc *sc) { struct mly_command *mc; int i, ncmd; - + if (sc->mly_controllerinfo == NULL) { ncmd = 4; } else { @@ -1801,7 +1798,6 @@ mly_release_commands(struct mly_softc *sc) } } - /******************************************************************************** * Command-mapping helper function - populate this command's s/g table * with the s/g entries for its data. @@ -1916,7 +1912,6 @@ mly_unmap_command(struct mly_command *mc) mc->mc_flags &= ~MLY_CMD_MAPPED; } - /******************************************************************************** ******************************************************************************** CAM interface @@ -1958,7 +1953,6 @@ mly_cam_attach(struct mly_softc *sc) if (testenv("hw.mly.register_physical_channels")) { chn = 0; for (i = 0; i < sc->mly_controllerinfo->physical_channels_present; i++, chn++) { - if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action, mly_cam_poll, "mly", sc, device_get_unit(sc->mly_dev), &sc->mly_lock, @@ -2067,7 +2061,6 @@ mly_cam_action(struct cam_sim *sim, union ccb *ccb) MLY_ASSERT_LOCKED(sc); switch (ccb->ccb_h.func_code) { - /* perform SCSI I/O */ case XPT_SCSI_IO: if (!mly_cam_action_io(sim, (struct ccb_scsiio *)&ccb->csio)) @@ -2816,7 +2809,6 @@ mly_print_controller(int controller) } } #endif - /******************************************************************************** ******************************************************************************** Modified: head/sys/dev/mly/mlyvar.h ============================================================================== --- head/sys/dev/mly/mlyvar.h Tue Sep 1 22:07:26 2020 (r365205) +++ head/sys/dev/mly/mlyvar.h Tue Sep 1 22:07:37 2020 (r365206) @@ -309,7 +309,6 @@ struct mly_softc { sc->mly_qstat[qname].q_max = 0; \ } while(0) - #define MLYQ_COMMAND_QUEUE(name, index) \ static __inline void \ mly_initq_ ## name (struct mly_softc *sc) \ From owner-svn-src-all@freebsd.org Tue Sep 1 22:08:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 00E3537E87D; Tue, 1 Sep 2020 22:08:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1R56CC9z4fxn; Tue, 1 Sep 2020 22:08:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B913B205EA; Tue, 1 Sep 2020 22:08:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M81vq056042; Tue, 1 Sep 2020 22:08:01 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M7xw5056028; Tue, 1 Sep 2020 22:07:59 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012207.081M7xw5056028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:07:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365207 - head/sys/dev/mii X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mii X-SVN-Commit-Revision: 365207 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:08:02 -0000 Author: mjg Date: Tue Sep 1 22:07:59 2020 New Revision: 365207 URL: https://svnweb.freebsd.org/changeset/base/365207 Log: mii: clean up empty lines in .c and .h files Modified: head/sys/dev/mii/amphyreg.h head/sys/dev/mii/bmtphyreg.h head/sys/dev/mii/brgphy.c head/sys/dev/mii/brgphyreg.h head/sys/dev/mii/icsphyreg.h head/sys/dev/mii/mlphy.c head/sys/dev/mii/nsphyterreg.h head/sys/dev/mii/qsphy.c head/sys/dev/mii/rlswitch.c head/sys/dev/mii/tdkphyreg.h head/sys/dev/mii/tlphyreg.h Modified: head/sys/dev/mii/amphyreg.h ============================================================================== --- head/sys/dev/mii/amphyreg.h Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/amphyreg.h Tue Sep 1 22:07:59 2020 (r365207) @@ -41,7 +41,6 @@ * AMD Am79C873 registers. */ - #define MII_AMPHY_DSCR 0x10 /* Specified configuration register */a #define DSCR_BP4B5B 0x8000 /* Bypass 4B5B encoding */ #define DSCR_BPSCR 0x4000 /* Bypass scrambler */ Modified: head/sys/dev/mii/bmtphyreg.h ============================================================================== --- head/sys/dev/mii/bmtphyreg.h Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/bmtphyreg.h Tue Sep 1 22:07:59 2020 (r365207) @@ -49,7 +49,6 @@ #define AUX_CTL_BASEWANDER_DIS 0x0040 /* disable baseline wander correction */ #define AUX_CTL_FEF_EN 0x0020 /* far-end fault enable */ - #define MII_BMTPHY_AUX_STS 0x11 /* auxiliary status */ #define AUX_STS_FX_MODE 0x0400 /* 100base-FX mode (strap pin) */ #define AUX_STS_LOCKED 0x0200 /* descrambler locked */ @@ -63,22 +62,17 @@ #define AUX_STS_LOCKERROR 0x0002 /* lock error detected */ #define AUX_STS_MLT3ERROR 0x0001 /* MLT3 code error detected */ - #define MII_BMTPHY_RXERROR_CTR 0x12 /* 100base-X Rx error counter */ #define RXERROR_CTR_MASK 0x00ff - #define MII_BMTPHY_FCS_CTR 0x13 /* 100base-X false carrier counter */ #define FCS_CTR_MASK 0x00ff - #define MII_BMTPHY_DIS_CTR 0x14 /* 100base-X disconnect counter */ #define DIS_CTR_MASK 0x00ff - #define MII_BMTPHY_PTEST 0x17 /* PTEST */ - #define MII_BMTPHY_AUX_CSR 0x18 /* auxiliary control/status */ #define AUX_CSR_JABBER_DIS 0x8000 /* jabber disable */ #define AUX_CSR_FLINK 0x4000 /* force 10baseT link pass */ @@ -91,7 +85,6 @@ #define AUX_CSR_SPEED 0x0002 /* 1 = 100, 0 = 10 */ #define AUX_CSR_FDX 0x0001 /* full-duplex */ - #define MII_BMTPHY_AUX_SS 0x19 /* auxiliary status summary */ #define AUX_SS_ACOMP 0x8000 /* auto-negotiation complete */ #define AUX_SS_ACOMP_ACK 0x4000 /* auto-negotiation compl. ack */ @@ -114,7 +107,6 @@ #define AUX_SS_ANEN 0x0002 /* auto-neg. enabled */ #define AUX_SS_JABBER 0x0001 /* jabber detected */ - #define MII_BMTPHY_INTR 0x1a /* interrupt register */ #define INTR_FDX_LED 0x8000 /* full-duplex led enable */ #define INTR_INTR_EN 0x4000 /* interrupt enable */ @@ -127,7 +119,6 @@ #define INTR_LINK_CHANGE 0x0002 /* link change */ #define INTR_INTR_STATUS 0x0001 /* interrupt status */ - #define MII_BMTPHY_AUX2 0x1b /* auliliary mode 2 */ #define AUX2_BLOCK_RXDV 0x0200 /* block RXDV mode enabled */ #define AUX2_ANPDQ 0x0100 /* auto-neg parallel detection Q mode */ @@ -138,7 +129,6 @@ #define AUX2_TWOLINK_LED 0x0004 /* two link LEDs */ #define AUX2_SQE_DIS 0x0002 /* disable SQE pulse */ - #define MII_BMTPHY_AUXERR 0x1c /* auxiliary error */ #define AUXERR_MANCHESTER 0x0400 /* Manchester code error */ #define AUXERR_EOF 0x0200 /* EOF detection error */ @@ -148,13 +138,11 @@ #define AUXERR_SPEED 0x0002 /* 1 = 100, 0 = 10 */ #define AUXERR_FDX 0x0001 /* full-duplex */ - #define MII_BMTPHY_AUXMODE 0x1d /* auxiliary mode */ #define AUXMODE_ACT_LED_DIS 0x0010 /* activity LED disable */ #define AUXMODE_LINK_LED_DIS 0x0008 /* link LED disable */ #define AUXMODE_BLOCK_TXEN 0x0002 /* enable block TXEN */ - #define MII_BMTPHY_AUXMPHY 0x1e /* auxiliary multiple phy register */ #define AUXMPHY_HCD_TX_FDX 0x8000 /* res. is 100baseTX-FDX */ #define AUXMPHY_HCD_T4 0x4000 /* res. is 100baseT4 */ @@ -169,8 +157,6 @@ #define AUXMPHY_SUPER_ISO 0x0008 /* super-isolate mode */ #define AUXMPHY_10T_SERIAL 0x0002 /* 10baseT serial mode */ - #define MII_BMTPHY_TEST 0x1d /* Broadcom test register */ - #endif /* _DEV_MII_BMTPHYREG_H_ */ Modified: head/sys/dev/mii/brgphy.c ============================================================================== --- head/sys/dev/mii/brgphy.c Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/brgphy.c Tue Sep 1 22:07:59 2020 (r365207) @@ -381,7 +381,6 @@ brgphy_service(struct mii_softc *sc, struct mii_data * if (sc->mii_ticks <= sc->mii_anegticks) break; - /* Retry autonegotiation */ sc->mii_ticks = 0; brgphy_mii_phy_auto(sc, ife->ifm_media); @@ -1031,7 +1030,6 @@ brgphy_reset(struct mii_softc *sc) } else if (bce_sc) { if (BCE_CHIP_NUM(bce_sc) == BCE_CHIP_NUM_5708 && (bce_sc->bce_phy_flags & BCE_PHY_SERDES_FLAG)) { - /* Store autoneg capabilities/results in digital block (Page 0) */ PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR, BRGPHY_5708S_DIG3_PG2); PHY_WRITE(sc, BRGPHY_5708S_PG2_DIGCTL_3_0, @@ -1080,7 +1078,6 @@ brgphy_reset(struct mii_softc *sc) } } else if (BCE_CHIP_NUM(bce_sc) == BCE_CHIP_NUM_5709 && (bce_sc->bce_phy_flags & BCE_PHY_SERDES_FLAG)) { - /* Select the SerDes Digital block of the AN MMD. */ PHY_WRITE(sc, BRGPHY_BLOCK_ADDR, BRGPHY_BLOCK_ADDR_SERDES_DIG); val = PHY_READ(sc, BRGPHY_SERDES_DIG_1000X_CTL1); Modified: head/sys/dev/mii/brgphyreg.h ============================================================================== --- head/sys/dev/mii/brgphyreg.h Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/brgphyreg.h Tue Sep 1 22:07:59 2020 (r365207) @@ -360,7 +360,6 @@ #define BRGPHY_5708S_PG0_1000X_STAT1_SPEED_1G (0x2 << 3) #define BRGPHY_5708S_PG0_1000X_STAT1_SPEED_25G (0x3 << 3) - #define BRGPHY_5708S_PG0_1000X_CTL2 0x11 #define BRGPHY_5708S_PG0_1000X_CTL2_PAR_DET_EN 0x0001 Modified: head/sys/dev/mii/icsphyreg.h ============================================================================== --- head/sys/dev/mii/icsphyreg.h Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/icsphyreg.h Tue Sep 1 22:07:59 2020 (r365207) @@ -94,7 +94,6 @@ #define TTR_NOLINK 0x0002 /* Disable Link check */ #define TTR_NOSQUELCH 0x0001 /* Disable squelch */ - /* * Extended Control Register 2 * Modified: head/sys/dev/mii/mlphy.c ============================================================================== --- head/sys/dev/mii/mlphy.c Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/mlphy.c Tue Sep 1 22:07:59 2020 (r365207) @@ -237,7 +237,6 @@ mlphy_service(xsc, mii, cmd) break; default: return (EINVAL); - } break; Modified: head/sys/dev/mii/nsphyterreg.h ============================================================================== --- head/sys/dev/mii/nsphyterreg.h Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/nsphyterreg.h Tue Sep 1 22:07:59 2020 (r365207) @@ -71,14 +71,12 @@ #define PHYSTS_MP_JABBER 0x0020 /* jabber detect */ #define PHYSTS_MP_NWAYCOMP 0x0010 /* NWAY complete */ - #define MII_NSPHYTER_MIPSCR 0x11 /* MII interrupt PHY specific control */ #define MIPSCR_INTEN 0x0002 /* interrupt enable */ #define MIPSCR_TINT 0x0001 /* test interrupt */ - #define MII_NSPHYTER_MIPGSR 0x12 /* MII interrupt PHY generic status */ #define MIPGSR_MINT 0x8000 /* MII interrupt pending */ @@ -96,7 +94,6 @@ #define MII_NSPHYTER_RECR 0x15 /* Receive error counter */ - #define MII_NSPHYTER_PCSR 0x16 /* PCS configuration and status */ #define PCSR_SINGLE_SD 0x8000 /* single-ended SD mode */ #define PCSR_FEFI_EN 0x4000 /* far end fault indication mode */ @@ -121,7 +118,6 @@ #define PCSR_MP_SD_OPTION 0x0100 /* enhanced signal detection alg. */ #define PCSR_MP_NRZI_BYPASS 0x0004 /* NRZI bypass enabled */ - /* The bits below are not on MacPHYTER. */ #define MII_NSPHYTER_LBR 0x17 /* loopback and bypass */ #define LBR_BP_STRETCH 0x4000 /* bypass LED stretching */ @@ -133,7 +129,6 @@ #define LBR_TW_LBEN 0x0020 /* TWISTER loopback enable */ #define LBR_10_ENDEC_LB 0x0010 /* 10Mb/s ENDEC loopback */ - /* The bits below are not on MacPHYTER. */ #define MII_NSPHYTER_10BTSCR 0x18 /* 10baseT status and control */ #define BTSCR_AUI_TPI 0x2000 /* TREX operating mode */ @@ -150,7 +145,6 @@ #define BTSCR_THIN_SEL 0x0008 /* thin ethernet select */ #define BTSCR_TX_FILT_DS 0x0004 /* TPI receive filter disable */ - #define MII_NSPHYTER_PHYCTRL 0x19 /* PHY control */ #define PHYCTRL_TW_EQSEL 0x3000 /* TWISTER e.q. select */ #define PHYCTRL_BLW_DS 0x0800 /* TWISTER base line wander disable */ @@ -165,7 +159,6 @@ #define PHYCTRL_MP_BIST_START 0x0200 /* start BIST */ #define PHYCTRL_MP_BP_STRETCH 0x0100 /* bypass LED stretching */ #define PHYCTRL_MP_PAUSE_STS 0x0080 /* pause status */ - /* The bits below are MacPHYTER only. */ #define MII_MACPHYTER_TBTCTL 0x1a /* 10baseT Control */ Modified: head/sys/dev/mii/qsphy.c ============================================================================== --- head/sys/dev/mii/qsphy.c Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/qsphy.c Tue Sep 1 22:07:59 2020 (r365207) @@ -32,7 +32,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - + /*- * Copyright (c) 1997 Manuel Bouyer. All rights reserved. * Modified: head/sys/dev/mii/rlswitch.c ============================================================================== --- head/sys/dev/mii/rlswitch.c Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/rlswitch.c Tue Sep 1 22:07:59 2020 (r365207) @@ -136,7 +136,7 @@ rlswitch_attach(device_t dev) #ifdef RL_DEBUG rlswitch_phydump(dev); #endif - + #ifdef RL_VLAN int val; Modified: head/sys/dev/mii/tdkphyreg.h ============================================================================== --- head/sys/dev/mii/tdkphyreg.h Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/tdkphyreg.h Tue Sep 1 22:07:59 2020 (r365207) @@ -72,13 +72,11 @@ #define INT_CTRL_RXERR 0x4000 #define INT_CTRL_JABBER 0x8000 - #define MII_DIAG 18 #define DIAG_RLOCK 0x0100 #define DIAG_RPASS 0x0200 #define DIAG_RATE_100 0x0400 #define DIAG_DUPLEX 0x0800 #define DIAG_NEGFAIL 0x1000 - #endif Modified: head/sys/dev/mii/tlphyreg.h ============================================================================== --- head/sys/dev/mii/tlphyreg.h Tue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/tlphyreg.h Tue Sep 1 22:07:59 2020 (r365207) @@ -1,5 +1,5 @@ /* $NetBSD: tlphyreg.h,v 1.1 1998/08/10 23:59:58 thorpej Exp $ */ - + /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD * From owner-svn-src-all@freebsd.org Tue Sep 1 22:08:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 963F737EB9E; Tue, 1 Sep 2020 22:08:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1RM3YtZz4frG; Tue, 1 Sep 2020 22:08:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F20F20783; Tue, 1 Sep 2020 22:08:15 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M8Fgc056098; Tue, 1 Sep 2020 22:08:15 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M8Ffi056096; Tue, 1 Sep 2020 22:08:15 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012208.081M8Ffi056096@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:08:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365208 - head/sys/dev/mgb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mgb X-SVN-Commit-Revision: 365208 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:08:15 -0000 Author: mjg Date: Tue Sep 1 22:08:14 2020 New Revision: 365208 URL: https://svnweb.freebsd.org/changeset/base/365208 Log: mgb: clean up empty lines in .c and .h files Modified: head/sys/dev/mgb/if_mgb.c head/sys/dev/mgb/if_mgb.h Modified: head/sys/dev/mgb/if_mgb.c ============================================================================== --- head/sys/dev/mgb/if_mgb.c Tue Sep 1 22:07:59 2020 (r365207) +++ head/sys/dev/mgb/if_mgb.c Tue Sep 1 22:08:14 2020 (r365208) @@ -241,7 +241,6 @@ static device_method_t mgb_iflib_methods[] = { DEVMETHOD(ifdi_intr_enable, mgb_intr_enable_all), DEVMETHOD(ifdi_intr_disable, mgb_intr_disable_all), - #if 0 /* Not yet implemented IFLIB methods */ /* * Set multicast addresses, mtu and promiscuous mode @@ -323,7 +322,6 @@ struct if_shared_ctx mgb_sctx_init = { }; /*********************************************************************/ - static void * mgb_register(device_t dev) Modified: head/sys/dev/mgb/if_mgb.h ============================================================================== --- head/sys/dev/mgb/if_mgb.h Tue Sep 1 22:07:59 2020 (r365207) +++ head/sys/dev/mgb/if_mgb.h Tue Sep 1 22:08:14 2020 (r365208) @@ -217,7 +217,6 @@ #define MGB_INTR_VEC_STS(_v) (1 << (_v)) #define MGB_INTR_RX_VEC_STS(_qid) MGB_INTR_VEC_STS((_qid) + 1) - #define MGB_STS_OK ( 0 ) #define MGB_STS_TIMEOUT (-1 ) @@ -322,7 +321,6 @@ struct mgb_softc { struct mtx mtx; struct callout watchdog; int timer; - bus_dma_tag_t dma_parent_tag; struct mgb_ring_data rx_ring_data; From owner-svn-src-all@freebsd.org Tue Sep 1 22:08:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7CF7537E9F9; Tue, 1 Sep 2020 22:08:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Rc2nClz4g7K; Tue, 1 Sep 2020 22:08:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42AC820784; Tue, 1 Sep 2020 22:08:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M8SuF056162; Tue, 1 Sep 2020 22:08:28 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M8Ru8056154; Tue, 1 Sep 2020 22:08:27 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012208.081M8Ru8056154@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:08:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365209 - head/sys/dev/mfi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mfi X-SVN-Commit-Revision: 365209 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:08:28 -0000 Author: mjg Date: Tue Sep 1 22:08:26 2020 New Revision: 365209 URL: https://svnweb.freebsd.org/changeset/base/365209 Log: mfi: clean up empty lines in .c and .h files Modified: head/sys/dev/mfi/mfi.c head/sys/dev/mfi/mfi_cam.c head/sys/dev/mfi/mfi_tbolt.c head/sys/dev/mfi/mfireg.h head/sys/dev/mfi/mfivar.h Modified: head/sys/dev/mfi/mfi.c ============================================================================== --- head/sys/dev/mfi/mfi.c Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfi.c Tue Sep 1 22:08:26 2020 (r365209) @@ -362,7 +362,6 @@ mfi_addr_cb(void *arg, bus_dma_segment_t *segs, int ns *addr = segs[0].ds_addr; } - int mfi_attach(struct mfi_softc *sc) { @@ -422,7 +421,6 @@ mfi_attach(struct mfi_softc *sc) sc->mfi_issue_cmd = mfi_issue_cmd_ppc; } - /* Before we get too far, see if the firmware is working */ if ((error = mfi_transition_firmware(sc)) != 0) { device_printf(sc->mfi_dev, "Firmware not in READY state, " @@ -1330,7 +1328,6 @@ mfi_shutdown(struct mfi_softc *sc) struct mfi_command *cm; int error; - if (sc->mfi_aen_cm != NULL) { sc->cm_aen_abort = 1; mfi_abort(sc, &sc->mfi_aen_cm); @@ -2525,7 +2522,6 @@ mfi_std_send_frame(struct mfi_softc *sc, struct mfi_co return (0); } - void mfi_complete(struct mfi_softc *sc, struct mfi_command *cm) { @@ -2932,7 +2928,6 @@ mfi_check_for_sscd(struct mfi_softc *sc, struct mfi_co mfi_release_command(ld_cm); free(ld_info, M_MFIBUF); - } return error; } @@ -3031,7 +3026,6 @@ mfi_user_command(struct mfi_softc *sc, struct mfi_ioc_ void *ioc_buf = NULL; uint32_t context; int error = 0, locked; - if (ioc->buf_size > 0) { if (ioc->buf_size > 1024 * 1024) Modified: head/sys/dev/mfi/mfi_cam.c ============================================================================== --- head/sys/dev/mfi/mfi_cam.c Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfi_cam.c Tue Sep 1 22:08:26 2020 (r365209) @@ -474,4 +474,3 @@ mfip_cam_poll(struct cam_sim *sim) mfisc->mfi_intr_ptr(mfisc); } - Modified: head/sys/dev/mfi/mfi_tbolt.c ============================================================================== --- head/sys/dev/mfi/mfi_tbolt.c Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfi_tbolt.c Tue Sep 1 22:08:26 2020 (r365209) @@ -31,7 +31,6 @@ * official policies,either expressed or implied, of the FreeBSD Project. */ - #include __FBSDID("$FreeBSD$"); @@ -84,7 +83,6 @@ static void mfi_queue_map_sync(struct mfi_softc *sc); #define MFI_FUSION_ENABLE_INTERRUPT_MASK (0x00000008) - extern int mfi_polled_cmd_timeout; static int mfi_fw_reset_test = 0; #ifdef MFI_DEBUG @@ -135,7 +133,6 @@ mfi_tbolt_check_clear_intr_ppc(struct mfi_softc *sc) return 0; } - void mfi_tbolt_issue_cmd_ppc(struct mfi_softc *sc, bus_addr_t bus_add, uint32_t frame_cnt) @@ -804,7 +801,6 @@ mfi_tbolt_get_request_descriptor(struct mfi_softc *sc, return (union mfi_mpi2_request_descriptor *)p; } - /* Used to build IOCTL cmd */ uint8_t mfi_build_mpt_pass_thru(struct mfi_softc *sc, struct mfi_command *mfi_cmd) @@ -939,7 +935,6 @@ mfi_tbolt_build_io(struct mfi_softc *sc, struct mfi_co return 0; } - static int mfi_tbolt_make_sgl(struct mfi_softc *sc, struct mfi_command *mfi_cmd, pMpi25IeeeSgeChain64_t sgl_ptr, struct mfi_cmd_tbolt *cmd) @@ -1186,7 +1181,6 @@ mfi_issue_pending_cmds_again(struct mfi_softc *sc) mtx_assert(&sc->mfi_io_lock, MA_OWNED); TAILQ_FOREACH_REVERSE_SAFE(cm, &sc->mfi_busy, BUSYQ, cm_link, tmp) { - cm->retry_for_fw_reset++; /* Modified: head/sys/dev/mfi/mfireg.h ============================================================================== --- head/sys/dev/mfi/mfireg.h Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfireg.h Tue Sep 1 22:08:26 2020 (r365209) @@ -307,7 +307,6 @@ typedef enum { #define MR_CTRL_EVENT_WAIT_SMID 2 #define MR_INTERNAL_DRIVER_RESET_SMID 3 - /* MFI Status codes */ typedef enum { MFI_STAT_OK = 0x00, @@ -1545,7 +1544,6 @@ typedef struct _MPI2_SCSI_IO_VENDOR_UNIQUE { #define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) | \ MPI2_HEADER_VERSION_DEV) - /* IOCInit Request message */ struct MPI2_IOC_INIT_REQUEST { uint8_t WhoInit; /* 0x00 */ @@ -1685,7 +1683,6 @@ typedef struct { uint32_t TransferLength; /* 0x1C */ } MPI2_SCSI_IO_CDB_EEDP32; - typedef union _MPI2_IEEE_SGE_CHAIN_UNION { struct MPI2_IEEE_SGE_SIMPLE32 Chain32; struct MPI2_IEEE_SGE_SIMPLE64 Chain64; @@ -1709,7 +1706,6 @@ typedef union { MPI2_SGE_SIMPLE_UNION SGE; } MPI2_SCSI_IO_CDB_UNION; - /* MPI 2.5 SGLs */ #define MPI25_IEEE_SGE_FLAGS_END_OF_LIST (0x40) @@ -1724,7 +1720,6 @@ typedef struct _MPI25_IEEE_SGE_CHAIN64 { /* use MPI2_IEEE_SGE_FLAGS_ defines for the Flags field */ - /********/ /* @@ -1814,7 +1809,6 @@ union mfi_mpi2_request_descriptor { struct mfi_mpi2_request_scsi_target scsi_target; uint64_t words; }; - struct mfi_mpi2_reply_header { uint8_t ReplyFlags; /* 0x00 */ Modified: head/sys/dev/mfi/mfivar.h ============================================================================== --- head/sys/dev/mfi/mfivar.h Tue Sep 1 22:08:14 2020 (r365208) +++ head/sys/dev/mfi/mfivar.h Tue Sep 1 22:08:26 2020 (r365209) @@ -593,7 +593,6 @@ mfi_print_sense(struct mfi_softc *sc, void *sense) "asc %d, ascq %d\n", error, key, asc, ascq); } - #define MFI_WRITE4(sc, reg, val) bus_space_write_4((sc)->mfi_btag, \ sc->mfi_bhandle, (reg), (val)) #define MFI_READ4(sc, reg) bus_space_read_4((sc)->mfi_btag, \ From owner-svn-src-all@freebsd.org Tue Sep 1 22:08:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61FFB37EBA7; Tue, 1 Sep 2020 22:08:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Rr1tYdz4gJK; Tue, 1 Sep 2020 22:08:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2305E20330; Tue, 1 Sep 2020 22:08:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M8eGi056223; Tue, 1 Sep 2020 22:08:40 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M8eQ7056222; Tue, 1 Sep 2020 22:08:40 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012208.081M8eQ7056222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:08:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365210 - head/sys/dev/mem X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/mem X-SVN-Commit-Revision: 365210 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:08:40 -0000 Author: mjg Date: Tue Sep 1 22:08:39 2020 New Revision: 365210 URL: https://svnweb.freebsd.org/changeset/base/365210 Log: mem: clean up empty lines in .c and .h files Modified: head/sys/dev/mem/memdev.c Modified: head/sys/dev/mem/memdev.c ============================================================================== --- head/sys/dev/mem/memdev.c Tue Sep 1 22:08:26 2020 (r365209) +++ head/sys/dev/mem/memdev.c Tue Sep 1 22:08:39 2020 (r365210) @@ -108,7 +108,6 @@ mem_modevent(module_t mod __unused, int type, void *da default: return(EOPNOTSUPP); - } return (0); From owner-svn-src-all@freebsd.org Tue Sep 1 22:08:52 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EFC9C37ED38; Tue, 1 Sep 2020 22:08:52 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1S46802z3RSX; Tue, 1 Sep 2020 22:08:52 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A214B202C3; Tue, 1 Sep 2020 22:08:52 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M8qiu056278; Tue, 1 Sep 2020 22:08:52 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M8qV9056277; Tue, 1 Sep 2020 22:08:52 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012208.081M8qV9056277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:08:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365211 - head/sys/dev/md X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/md X-SVN-Commit-Revision: 365211 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:08:53 -0000 Author: mjg Date: Tue Sep 1 22:08:52 2020 New Revision: 365211 URL: https://svnweb.freebsd.org/changeset/base/365211 Log: md: clean up empty lines in .c and .h files Modified: head/sys/dev/md/md.c Modified: head/sys/dev/md/md.c ============================================================================== --- head/sys/dev/md/md.c Tue Sep 1 22:08:39 2020 (r365210) +++ head/sys/dev/md/md.c Tue Sep 1 22:08:52 2020 (r365211) @@ -226,7 +226,6 @@ struct g_class g_md_class = { DECLARE_GEOM_CLASS(g_md_class, g_md); - static LIST_HEAD(, md_s) md_softc_list = LIST_HEAD_INITIALIZER(md_softc_list); #define NINDIR (PAGE_SIZE / sizeof(uintptr_t)) @@ -444,7 +443,6 @@ s_write(struct indir *ip, off_t offset, uintptr_t ptr) return (0); } - static int g_md_access(struct g_provider *pp, int r, int w, int e) { @@ -1373,7 +1371,6 @@ mdcreate_malloc(struct md_s *sc, struct md_req *mdr) } return (error); } - static int mdsetcred(struct md_s *sc, struct ucred *cred) From owner-svn-src-all@freebsd.org Tue Sep 1 22:09:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 93B1037ED4C; Tue, 1 Sep 2020 22:09:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Sl3Nksz3RYV; Tue, 1 Sep 2020 22:09:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58B6E205EB; Tue, 1 Sep 2020 22:09:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M9RpA056351; Tue, 1 Sep 2020 22:09:27 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M9RPG056350; Tue, 1 Sep 2020 22:09:27 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012209.081M9RPG056350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:09:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365212 - head/sys/dev/cadence X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/cadence X-SVN-Commit-Revision: 365212 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:09:27 -0000 Author: mjg Date: Tue Sep 1 22:09:26 2020 New Revision: 365212 URL: https://svnweb.freebsd.org/changeset/base/365212 Log: cadence: clean up empty lines in .c and .h files Modified: head/sys/dev/cadence/if_cgem.c Modified: head/sys/dev/cadence/if_cgem.c ============================================================================== --- head/sys/dev/cadence/if_cgem.c Tue Sep 1 22:08:52 2020 (r365211) +++ head/sys/dev/cadence/if_cgem.c Tue Sep 1 22:09:26 2020 (r365212) @@ -89,7 +89,6 @@ __FBSDID("$FreeBSD$"); #define MAX_DESC_RING_SIZE (MAX(CGEM_NUM_RX_DESCS*sizeof(struct cgem_rx_desc),\ CGEM_NUM_TX_DESCS*sizeof(struct cgem_tx_desc))) - /* Default for sysctl rxbufs. Must be < CGEM_NUM_RX_DESCS of course. */ #define DEFAULT_NUM_RX_BUFS 256 /* number of receive bufs to queue. */ @@ -511,7 +510,6 @@ cgem_recv(struct cgem_softc *sc) m_tl = &m_hd; while (sc->rxring_queued > 0 && (sc->rxring[sc->rxring_tl_ptr].addr & CGEM_RXDESC_OWN) != 0) { - ctl = sc->rxring[sc->rxring_tl_ptr].ctl; /* Grab filled mbuf. */ @@ -611,7 +609,6 @@ cgem_clean_tx(struct cgem_softc *sc) while (sc->txring_queued > 0 && ((ctl = sc->txring[sc->txring_tl_ptr].ctl) & CGEM_TXDESC_USED) != 0) { - /* Sync cache. */ bus_dmamap_sync(sc->mbuf_dma_tag, sc->txring_m_dmamap[sc->txring_tl_ptr], @@ -689,7 +686,6 @@ cgem_start_locked(if_t ifp) /* Check that there is room in the descriptor ring. */ if (sc->txring_queued >= CGEM_NUM_TX_DESCS - TX_MAX_DMA_SEGS * 2) { - /* Try to make room. */ cgem_clean_tx(sc); @@ -1135,7 +1131,6 @@ cgem_stop(struct cgem_softc *sc) sc->mii_media_active = 0; } - static int cgem_ioctl(if_t ifp, u_long cmd, caddr_t data) { @@ -1625,7 +1620,6 @@ cgem_add_sysctls(device_t dev) CTLFLAG_RD, &sc->stats.rx_udp_csum_errs, 0, "Number frames received with UDP checksum errors"); } - static int cgem_probe(device_t dev) From owner-svn-src-all@freebsd.org Tue Sep 1 22:09:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3B2A537ECE2; Tue, 1 Sep 2020 22:09:43 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1T25WPvz3Rck; Tue, 1 Sep 2020 22:09:42 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 54CAA20785; Tue, 1 Sep 2020 22:09:42 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M9gFt056526; Tue, 1 Sep 2020 22:09:42 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M9fwO056525; Tue, 1 Sep 2020 22:09:41 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012209.081M9fwO056525@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:09:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365213 - head/sys/dev/cardbus X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/cardbus X-SVN-Commit-Revision: 365213 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:09:44 -0000 Author: mjg Date: Tue Sep 1 22:09:41 2020 New Revision: 365213 URL: https://svnweb.freebsd.org/changeset/base/365213 Log: cardbus: clean up empty lines in .c and .h files Modified: head/sys/dev/cardbus/cardbus.c head/sys/dev/cardbus/cardbus_cis.c Modified: head/sys/dev/cardbus/cardbus.c ============================================================================== --- head/sys/dev/cardbus/cardbus.c Tue Sep 1 22:09:26 2020 (r365212) +++ head/sys/dev/cardbus/cardbus.c Tue Sep 1 22:09:41 2020 (r365213) @@ -360,7 +360,6 @@ static device_method_t cardbus_methods[] = { /* PCI interface */ DEVMETHOD(pci_alloc_devinfo, cardbus_alloc_devinfo), - {0,0} }; Modified: head/sys/dev/cardbus/cardbus_cis.c ============================================================================== --- head/sys/dev/cardbus/cardbus_cis.c Tue Sep 1 22:09:26 2020 (r365212) +++ head/sys/dev/cardbus/cardbus_cis.c Tue Sep 1 22:09:41 2020 (r365213) @@ -108,7 +108,6 @@ static int decode_tuple(device_t cbdev, device_t child int len, uint8_t *tupledata, uint32_t start, uint32_t *off, struct tuple_callbacks *callbacks, void *); - #define MAKETUPLE(NAME,FUNC) { CISTPL_ ## NAME, #NAME, decode_tuple_ ## FUNC } static char *funcnames[] = { From owner-svn-src-all@freebsd.org Tue Sep 1 22:10:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4906537EB7B; Tue, 1 Sep 2020 22:10:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1TP1G0Qz3SCR; Tue, 1 Sep 2020 22:10:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0561220641; Tue, 1 Sep 2020 22:10:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MA0EU056623; Tue, 1 Sep 2020 22:10:00 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MA0kt056621; Tue, 1 Sep 2020 22:10:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012210.081MA0kt056621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:10:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365214 - head/sys/dev/ce X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ce X-SVN-Commit-Revision: 365214 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:10:01 -0000 Author: mjg Date: Tue Sep 1 22:10:00 2020 New Revision: 365214 URL: https://svnweb.freebsd.org/changeset/base/365214 Log: ce: clean up empty lines in .c and .h files Modified: head/sys/dev/ce/ceddk.c head/sys/dev/ce/ceddk.h head/sys/dev/ce/if_ce.c Modified: head/sys/dev/ce/ceddk.c ============================================================================== --- head/sys/dev/ce/ceddk.c Tue Sep 1 22:09:41 2020 (r365213) +++ head/sys/dev/ce/ceddk.c Tue Sep 1 22:10:00 2020 (r365214) @@ -72,13 +72,13 @@ __FBSDID("$FreeBSD$"); (*last) = (item); \ (item)->next = NULL; \ } while (0) - + #define CE_ENQUEUE_HEAD(list,item) \ do { \ (item)->next = list; \ list = item; \ } while (0) - + #define CE_DEQUEUE(list,item) \ do { \ item = list; \ @@ -86,7 +86,7 @@ __FBSDID("$FreeBSD$"); list = (item)->next; \ } \ } while (0) - + #define CE_PREREQUEST(b,c,list,item) \ do { \ item = list; \ @@ -120,7 +120,7 @@ __FBSDID("$FreeBSD$"); } \ } \ } while (0) - + #define CE_LAST_ITEM(list,item) \ do { \ TAU32_UserRequest **last; \ @@ -227,7 +227,7 @@ static void TAU32_CALLBACK_TYPE ce_on_receive len = req->Io.Rx.Received; error = req->ErrorCode; - + c->rintr++; if (error == TAU32_SUCCESSFUL) { if (req->Io.Rx.FrameEnd) { @@ -247,7 +247,7 @@ static void TAU32_CALLBACK_TYPE ce_on_receive CE_DDK_DEBUG (b, c, ("Another receive error: %x\n", error)); /* Do some procesing */ } - + CE_ASSERT (!req->pInternal); CE_ENQUEUE (c->rx_queue, req); while (c->rx_queue) { @@ -285,7 +285,7 @@ static void TAU32_CALLBACK_TYPE ce_on_transmit len = req->Io.Tx.Transmitted; error = req->ErrorCode; - + c->tintr++; if (error == TAU32_SUCCESSFUL) { c->obytes += len; @@ -299,10 +299,10 @@ static void TAU32_CALLBACK_TYPE ce_on_transmit error)); /* Do some procesing */ } - + CE_ENQUEUE (c->tx_queue, req); c->tx_pending--; - + if (c->transmit) c->transmit (c, 0, len); EXIT (); @@ -317,7 +317,7 @@ int ce_send_packet (ce_chan_t *c, unsigned char *buf, { TAU32_UserRequest *req; ce_buf_item_t *item; - + ENTER (); if (!ce_transmit_space (c)) { @@ -372,7 +372,7 @@ static void TAU32_CALLBACK_TYPE ce_on_config_stop TAU32_UserRequest *rreq; ce_board_t *b = (ce_board_t *) pContext; ce_chan_t *c = b->chan + req->Io.ChannelNumber; - + ENTER (); /* Stop all requests */ CE_ASSERT (0);/* Buggy */ @@ -397,7 +397,7 @@ static void TAU32_CALLBACK_TYPE ce_on_config_stop break; } } - + c->tx_pending = 0; /* c->rx_pending = 0;*/ EXIT (); @@ -414,7 +414,7 @@ static int ce_cfg_submit (ce_board_t *b) req->pCallback = ce_on_config; b->cr.pending++; - + CE_DDK_DEBUG (b, (ce_chan_t *)0, ("config request pending: %d\n", b->cr.pending)); @@ -424,7 +424,7 @@ static int ce_cfg_submit (ce_board_t *b) b->cr.pending--; EXIT (0); } - + EXIT (1); } @@ -558,7 +558,7 @@ void ce_start_chan (ce_chan_t *c, int tx, int rx, ce_b c->tx_pending = 0; c->rx_pending = 0; } - + /* submit rx */ while (1) { ce_buf_item_t *item; @@ -583,7 +583,7 @@ void ce_start_chan (ce_chan_t *c, int tx, int rx, ce_b break; } } - + if (tx | rx) { TAU32_UserRequest *req; CE_PREREQUEST (b, c, b->cr.queue, req); @@ -599,7 +599,7 @@ void ce_start_chan (ce_chan_t *c, int tx, int rx, ce_b return; } } - + /* If we run just after ce_board_init we have prope values. * Else I hope you didn't set ts to incorrect value. */ @@ -638,7 +638,7 @@ void ce_stop_chan (ce_chan_t *c) req->Io.ChannelNumber = c->num; req->pCallback = ce_on_config_stop; b->cr.pending++; - + if (!TAU32_SubmitRequest (b->ddk.pControllerObject, req)) { CE_ENQUEUE_HEAD (b->cr.queue, req); CE_DDK_DEBUG (b, c, ("Can't stop chan\n")); @@ -646,7 +646,6 @@ void ce_stop_chan (ce_chan_t *c) } } - void ce_register_transmit (ce_chan_t *c, void (*func) (ce_chan_t*, void*, int)) { @@ -758,10 +757,10 @@ void ce_e1_timer (ce_chan_t *c) if (c->num >= b->ddk.Interfaces) return; - + state = &b->ddk.InterfacesInfo[c->num]; acc_status = c->acc_status; - + /* Clear acc_status */ c->acc_status = b->ddk.InterfacesInfo[c->num].Status; @@ -814,7 +813,7 @@ void ce_e1_timer (ce_chan_t *c) /* Controlled slip second -- any slip event. */ css = state->TransmitSlips + state->ReceiveSlips; } - + /* Clear state */ state->RxViolations = 0; state->FasErrors = 0; @@ -939,11 +938,11 @@ void ce_set_baud (ce_chan_t *c, unsigned long baud) unsigned long cfg = c->config & ~TAU32_framing_mode_mask; unsigned long ts; unsigned long kbps = (baud + 32000) / 64000 * 64; - + if (!c->unfram || c->num != 0 || baud == c->baud || b->cr.pending >= CONFREQSZ) return; - + if (!kbps || kbps > 1024) { ts = 0xffffffffUL; cfg |= TAU32_unframed_2048; @@ -1085,7 +1084,7 @@ static void _ce_set_ts (ce_chan_t *c, unsigned long ts if (b->dxc[i] != TAU32_CROSS_OFF) pts++; } - + CE_DDK_DEBUG (b, c, ("pts: %d ots: %d nts: %d ts: %lx\n", pts, ots, nts, ts)); /* 32 - all busy + my old busy == free */ @@ -1110,7 +1109,7 @@ static void _ce_set_ts (ce_chan_t *c, unsigned long ts omask |= (1ul << t); } } - + k = 0; /* Set */ for (i = 0; i < 32; i++) { @@ -1130,7 +1129,7 @@ static void _ce_set_ts (ce_chan_t *c, unsigned long ts b->dxc[(c->dir?32:64) + i] = TAU32_CROSS_OFF; mask |= (1ul << k); } - + c->ts = ts; c->baud = nts*64000; @@ -1141,12 +1140,12 @@ static void _ce_set_ts (ce_chan_t *c, unsigned long ts req->Command = TAU32_Timeslots_Channel | TAU32_Configure_Commit; req->Io.ChannelNumber = c->num; req->Io.ChannelConfig.AssignedTsMask = mask; - + if (c->phony) { b->pmask &= ~omask; b->pmask |= mask; } - + CE_DDK_DEBUG (b, c, ("ts=%lx mask=%lx omask=%lx pmask=%lx\n", c->ts, mask, omask, b->pmask)); CE_DDK_DEBUG (b, c, ("Crossmatrix table:\n")); @@ -1164,7 +1163,7 @@ static void _ce_set_ts (ce_chan_t *c, unsigned long ts /* Do some error processing */ return; } - + CE_DDK_DEBUG (b, c, ("SetCrossMatrix\n")); if (!TAU32_SetCrossMatrix(b->ddk.pControllerObject, b->dxc, b->pmask)) { CE_DDK_DEBUG (b, c, ("Faild to SetCrossMatrix\n")); @@ -1191,7 +1190,7 @@ void ce_set_ts (ce_chan_t *c, unsigned long ts) continue; ts &= ~x->ts; } - + _ce_set_ts (c, ts); } @@ -1201,12 +1200,12 @@ void ce_set_unfram (ce_chan_t *c, unsigned char on) ce_board_t *b = c->board; unsigned long cfg = c->config & ~TAU32_framing_mode_mask; unsigned long i; - + if (c->num != 0 || b->cr.pending + 2*32 + 3>= CONFREQSZ) return; on = on ? 1 : 0; - + if (on == c->unfram) return; @@ -1267,11 +1266,11 @@ void ce_set_phony (ce_chan_t *c, unsigned char on) ce_board_t *b = c->board; unsigned long mask = 0; int i; - + if ((c->phony && on) || (c->phony == 0 && on == 0) || b->cr.pending >= CONFREQSZ) return; - + CE_PREREQUEST (b, c, b->cr.queue, req); if (!req) return; @@ -1293,9 +1292,9 @@ void ce_set_phony (ce_chan_t *c, unsigned char on) if (c->ts & (1ul << t)) mask |= (1ul << t); } - + CE_DDK_DEBUG (b, c, ("phony mask:%lx\n", mask)); - + if (on) { b->pmask |= mask; } else { @@ -1303,7 +1302,7 @@ void ce_set_phony (ce_chan_t *c, unsigned char on) } c->phony = on ? 1 : 0; - + CE_DDK_DEBUG (b, c, ("Submit (setcrosmatrix) phony\n")); if (!TAU32_SetCrossMatrix(b->ddk.pControllerObject, b->dxc, b->pmask)) { /* Do some error processing */ @@ -1397,15 +1396,15 @@ void ce_set_use16 (ce_chan_t *c, unsigned char on) cfg[0] = b->chan[0].config & ~TAU32_framing_mode_mask; cfg[1] = b->chan[1].config & ~TAU32_framing_mode_mask; - + on = on ? 1 : 0; - + if (c->use16 == on || b->chan->unfram) return; use[0] = b->chan[0].use16; use[1] = b->chan[1].use16; - + /* Correct value */ use[c->num] = on; @@ -1481,7 +1480,7 @@ void ce_set_gsyn (ce_chan_t *c, int syn) if (c->num >= b->ddk.Interfaces) return; - + if (syn == GSYN_RCV) syn = c->num ? GSYN_RCV1 : GSYN_RCV0; Modified: head/sys/dev/ce/ceddk.h ============================================================================== --- head/sys/dev/ce/ceddk.h Tue Sep 1 22:09:41 2020 (r365213) +++ head/sys/dev/ce/ceddk.h Tue Sep 1 22:10:00 2020 (r365214) @@ -63,7 +63,7 @@ typedef struct _ce_chan_t { #define T_NONE 0 /* no channel */ #define T_E1 3 /* E1 */ #define T_DATA 6 /* no physical interface */ - + struct _ce_board_t *board; unsigned char dtr; unsigned char rts; Modified: head/sys/dev/ce/if_ce.c ============================================================================== --- head/sys/dev/ce/if_ce.c Tue Sep 1 22:09:41 2020 (r365213) +++ head/sys/dev/ce/if_ce.c Tue Sep 1 22:10:00 2020 (r365214) @@ -2487,7 +2487,7 @@ static int ng_ce_connect (hook_p hook) CE_DEBUG (d, ("Connect\n")); callout_reset (&d->timeout_handle, hz, ce_watchdog_timer, d); } - + return 0; } From owner-svn-src-all@freebsd.org Tue Sep 1 22:10:13 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F2BCA37EE42; Tue, 1 Sep 2020 22:10:12 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Tc4Z6nz3SC4; Tue, 1 Sep 2020 22:10:12 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 148262070E; Tue, 1 Sep 2020 22:10:12 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MABDt056676; Tue, 1 Sep 2020 22:10:11 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MABW5056675; Tue, 1 Sep 2020 22:10:11 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012210.081MABW5056675@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:10:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365215 - head/sys/dev/cesa X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/cesa X-SVN-Commit-Revision: 365215 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:10:13 -0000 Author: mjg Date: Tue Sep 1 22:10:11 2020 New Revision: 365215 URL: https://svnweb.freebsd.org/changeset/base/365215 Log: cesa: clean up empty lines in .c and .h files Modified: head/sys/dev/cesa/cesa.c Modified: head/sys/dev/cesa/cesa.c ============================================================================== --- head/sys/dev/cesa/cesa.c Tue Sep 1 22:10:00 2020 (r365214) +++ head/sys/dev/cesa/cesa.c Tue Sep 1 22:10:11 2020 (r365215) @@ -1413,7 +1413,7 @@ cesa_detach(device_t dev) { struct cesa_softc *sc; int i; - + sc = device_get_softc(dev); /* TODO: Wait for queued requests completion before shutdown. */ @@ -1639,7 +1639,7 @@ cesa_newsession(device_t dev, crypto_session_t cses, struct cesa_session *cs; struct cesa_softc *sc; int error; - + sc = device_get_softc(dev); error = 0; From owner-svn-src-all@freebsd.org Tue Sep 1 22:10:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E277F37EDD8; Tue, 1 Sep 2020 22:10:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Ts2fnhz3SMG; Tue, 1 Sep 2020 22:10:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 258F620642; Tue, 1 Sep 2020 22:10:25 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MAPcr056734; Tue, 1 Sep 2020 22:10:25 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MAOuT056731; Tue, 1 Sep 2020 22:10:24 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012210.081MAOuT056731@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:10:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365216 - head/sys/dev/cfe X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/cfe X-SVN-Commit-Revision: 365216 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:10:26 -0000 Author: mjg Date: Tue Sep 1 22:10:24 2020 New Revision: 365216 URL: https://svnweb.freebsd.org/changeset/base/365216 Log: cfe: clean up empty lines in .c and .h files Modified: head/sys/dev/cfe/cfe_api.h head/sys/dev/cfe/cfe_error.h head/sys/dev/cfe/cfe_ioctl.h Modified: head/sys/dev/cfe/cfe_api.h ============================================================================== --- head/sys/dev/cfe/cfe_api.h Tue Sep 1 22:10:11 2020 (r365215) +++ head/sys/dev/cfe/cfe_api.h Tue Sep 1 22:10:24 2020 (r365216) @@ -71,7 +71,6 @@ #define cfe_strlen(x) strlen(x) /* End customization. */ - /* ********************************************************************* * Constants ********************************************************************* */ @@ -123,7 +122,6 @@ typedef struct { int64_t fwi_bootarea_pa; /* PA of boot area */ int64_t fwi_bootarea_size; /* size of boot area */ } cfe_fwinfo_t; - /* * cfe_strlen is handled specially: If already defined, it has been Modified: head/sys/dev/cfe/cfe_error.h ============================================================================== --- head/sys/dev/cfe/cfe_error.h Tue Sep 1 22:10:11 2020 (r365215) +++ head/sys/dev/cfe/cfe_error.h Tue Sep 1 22:10:24 2020 (r365216) @@ -48,7 +48,6 @@ * ********************************************************************* */ - #define CFE_OK 0 #define CFE_ERR -1 /* generic error */ #define CFE_ERR_INV_COMMAND -2 Modified: head/sys/dev/cfe/cfe_ioctl.h ============================================================================== --- head/sys/dev/cfe/cfe_ioctl.h Tue Sep 1 22:10:11 2020 (r365215) +++ head/sys/dev/cfe/cfe_ioctl.h Tue Sep 1 22:10:24 2020 (r365216) @@ -46,7 +46,6 @@ * ********************************************************************* */ - /* ********************************************************************* * NVFAM and FLASH stuff ********************************************************************* */ From owner-svn-src-all@freebsd.org Tue Sep 1 22:10:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7BC6337EB35; Tue, 1 Sep 2020 22:10:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1V56Ps7z3SN0; Tue, 1 Sep 2020 22:10:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7A8A2070F; Tue, 1 Sep 2020 22:10:35 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MAZqV057522; Tue, 1 Sep 2020 22:10:35 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MAZd1056993; Tue, 1 Sep 2020 22:10:35 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012210.081MAZd1056993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:10:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365217 - head/sys/dev/cfi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/cfi X-SVN-Commit-Revision: 365217 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:10:38 -0000 Author: mjg Date: Tue Sep 1 22:10:34 2020 New Revision: 365217 URL: https://svnweb.freebsd.org/changeset/base/365217 Log: cfi: clean up empty lines in .c and .h files Modified: head/sys/dev/cfi/cfi_bus_nexus.c head/sys/dev/cfi/cfi_core.c head/sys/dev/cfi/cfi_disk.c Modified: head/sys/dev/cfi/cfi_bus_nexus.c ============================================================================== --- head/sys/dev/cfi/cfi_bus_nexus.c Tue Sep 1 22:10:24 2020 (r365216) +++ head/sys/dev/cfi/cfi_bus_nexus.c Tue Sep 1 22:10:34 2020 (r365217) @@ -72,7 +72,6 @@ static device_method_t cfi_nexus_methods[] = { DEVMETHOD(device_probe, cfi_nexus_probe), DEVMETHOD(device_attach, cfi_nexus_attach), DEVMETHOD(device_detach, cfi_detach), - {0, 0} }; Modified: head/sys/dev/cfi/cfi_core.c ============================================================================== --- head/sys/dev/cfi/cfi_core.c Tue Sep 1 22:10:24 2020 (r365216) +++ head/sys/dev/cfi/cfi_core.c Tue Sep 1 22:10:34 2020 (r365217) @@ -162,7 +162,7 @@ uint8_t cfi_read_qry(struct cfi_softc *sc, u_int ofs) { uint8_t val; - + cfi_write(sc, CFI_QRY_CMD_ADDR * sc->sc_width, CFI_QRY_CMD_DATA); val = cfi_read(sc, ofs * sc->sc_width); cfi_reset_default(sc); @@ -751,12 +751,10 @@ cfi_write_block(struct cfi_softc *sc) /* Fall through to single word case */ break; } - } /* Write the block one byte/word at a time. */ for (i = 0; i < sc->sc_wrbufsz; i += sc->sc_width) { - /* Avoid writing unless we are actually changing bits */ if (!neederase) { switch (sc->sc_width) { Modified: head/sys/dev/cfi/cfi_disk.c ============================================================================== --- head/sys/dev/cfi/cfi_disk.c Tue Sep 1 22:10:24 2020 (r365216) +++ head/sys/dev/cfi/cfi_disk.c Tue Sep 1 22:10:34 2020 (r365217) @@ -309,7 +309,6 @@ cfi_disk_getattr(struct bio *bp) return (0); } - static void cfi_disk_strategy(struct bio *bp) { @@ -350,7 +349,6 @@ static device_method_t cfi_disk_methods[] = { DEVMETHOD(device_probe, cfi_disk_probe), DEVMETHOD(device_attach, cfi_disk_attach), DEVMETHOD(device_detach, cfi_disk_detach), - { 0, 0 } }; static driver_t cfi_disk_driver = { From owner-svn-src-all@freebsd.org Tue Sep 1 22:10:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B54B837F107; Tue, 1 Sep 2020 22:10:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1VS4SRjz3SfF; Tue, 1 Sep 2020 22:10:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7BDC52064B; Tue, 1 Sep 2020 22:10:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MAuvS059903; Tue, 1 Sep 2020 22:10:56 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MAtxw059900; Tue, 1 Sep 2020 22:10:55 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012210.081MAtxw059900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:10:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365218 - head/sys/dev/ciss X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/ciss X-SVN-Commit-Revision: 365218 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:10:56 -0000 Author: mjg Date: Tue Sep 1 22:10:55 2020 New Revision: 365218 URL: https://svnweb.freebsd.org/changeset/base/365218 Log: ciss: clean up empty lines in .c and .h files Modified: head/sys/dev/ciss/ciss.c head/sys/dev/ciss/cissreg.h head/sys/dev/ciss/cissvar.h Modified: head/sys/dev/ciss/ciss.c ============================================================================== --- head/sys/dev/ciss/ciss.c Tue Sep 1 22:10:34 2020 (r365217) +++ head/sys/dev/ciss/ciss.c Tue Sep 1 22:10:55 2020 (r365218) @@ -272,7 +272,6 @@ TUNABLE_INT("hw.ciss.force_transport", &ciss_force_tra static int ciss_force_interrupt = 0; TUNABLE_INT("hw.ciss.force_interrupt", &ciss_force_interrupt); - /************************************************************************ * CISS adapters amazingly don't have a defined programming interface * value. (One could say some very despairing things about PCI and @@ -1457,7 +1456,6 @@ ciss_init_logical(struct ciss_softc *sc) sc->ciss_logical[i][j].cl_status = CISS_LD_NONEXISTENT; } - for (i = 0; i < sc->ciss_cfg->max_logical_supported; i++) { if (i < ndrives) { struct ciss_ldrive *ld; @@ -1476,7 +1474,6 @@ ciss_init_logical(struct ciss_softc *sc) */ if (ld->cl_lstatus->media_exchanged) ciss_accept_media(sc, ld); - } } @@ -2127,7 +2124,6 @@ ciss_done(struct ciss_softc *sc, cr_qhead_t *qh) * to the completed queue. */ for (;;) { - tag = CISS_TL_SIMPLE_FETCH_CMD(sc); if (tag == CISS_TL_SIMPLE_OPQ_EMPTY) break; @@ -2229,7 +2225,6 @@ ciss_perf_msi_intr(void *arg) mtx_unlock(&sc->ciss_mtx); } - /************************************************************************ * Process completed requests. * @@ -2482,7 +2477,6 @@ ciss_abort_request(struct ciss_request *ar) } #endif - /************************************************************************ * Fetch and initialise a request */ @@ -2983,7 +2977,6 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb) physical = CISS_IS_PHYSICAL(bus); switch (ccb->ccb_h.func_code) { - /* perform SCSI I/O */ case XPT_SCSI_IO: if (!ciss_cam_action_io(sim, csio)) @@ -3399,7 +3392,6 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct (cdb[1] & SI_EVPD) == 0 && (csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN && csio->dxfer_len >= SHORT_INQUIRY_LENGTH) { - inq = (struct scsi_inquiry_data *)csio->data_ptr; target = csio->ccb_h.target_id; bus = cam_sim_bus(xpt_path_sim(csio->ccb_h.path)); @@ -3430,7 +3422,6 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct } } - /******************************************************************************** * Name the device at (target) * @@ -4205,7 +4196,6 @@ ciss_notify_thread(void *arg) } ciss_release_request(cr); - } sc->ciss_notify_thread = NULL; wakeup(&sc->ciss_notify_thread); @@ -4478,7 +4468,6 @@ ciss_decode_ldrive_status(int status) return(CISS_LD_OFFLINE); } } - /************************************************************************ * Return a name for a logical drive's organisation. Modified: head/sys/dev/ciss/cissreg.h ============================================================================== --- head/sys/dev/ciss/cissreg.h Tue Sep 1 22:10:34 2020 (r365217) +++ head/sys/dev/ciss/cissreg.h Tue Sep 1 22:10:55 2020 (r365218) @@ -855,6 +855,4 @@ struct ciss_bmic_flush_cache { CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, \ CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR) & ~(sc)->ciss_interrupt_mask) - - #endif /* _KERNEL */ Modified: head/sys/dev/ciss/cissvar.h ============================================================================== --- head/sys/dev/ciss/cissvar.h Tue Sep 1 22:10:34 2020 (r365217) +++ head/sys/dev/ciss/cissvar.h Tue Sep 1 22:10:55 2020 (r365218) @@ -315,7 +315,6 @@ struct ciss_softc sc->ciss_qstat[qname].q_max = 0; \ } while(0) - #define CISSQ_REQUEST_QUEUE(name, index) \ static __inline void \ ciss_initq_ ## name (struct ciss_softc *sc) \ From owner-svn-src-all@freebsd.org Tue Sep 1 22:11:08 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 41C4E37EB56; Tue, 1 Sep 2020 22:11:08 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Vh10TPz3Snv; Tue, 1 Sep 2020 22:11:08 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5280B205F1; Tue, 1 Sep 2020 22:11:06 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MB6Ni059990; Tue, 1 Sep 2020 22:11:06 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MB50m059989; Tue, 1 Sep 2020 22:11:05 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012211.081MB50m059989@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:11:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365219 - head/sys/dev/cmx X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/cmx X-SVN-Commit-Revision: 365219 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:11:08 -0000 Author: mjg Date: Tue Sep 1 22:11:05 2020 New Revision: 365219 URL: https://svnweb.freebsd.org/changeset/base/365219 Log: cmx: clean up empty lines in .c and .h files Modified: head/sys/dev/cmx/cmx.c head/sys/dev/cmx/cmx_pccard.c Modified: head/sys/dev/cmx/cmx.c ============================================================================== --- head/sys/dev/cmx/cmx.c Tue Sep 1 22:10:55 2020 (r365218) +++ head/sys/dev/cmx/cmx.c Tue Sep 1 22:11:05 2020 (r365219) @@ -700,4 +700,3 @@ cmx_intr(void *arg) return; } #endif - Modified: head/sys/dev/cmx/cmx_pccard.c ============================================================================== --- head/sys/dev/cmx/cmx_pccard.c Tue Sep 1 22:10:55 2020 (r365218) +++ head/sys/dev/cmx/cmx_pccard.c Tue Sep 1 22:11:05 2020 (r365219) @@ -103,7 +103,6 @@ static device_method_t cmx_pccard_methods[] = { DEVMETHOD(device_probe, cmx_pccard_probe), DEVMETHOD(device_attach, cmx_pccard_attach), DEVMETHOD(device_detach, cmx_detach), - { 0, 0 } }; From owner-svn-src-all@freebsd.org Tue Sep 1 22:11:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AD30937EF79; Tue, 1 Sep 2020 22:11:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Vy4Bddz3Sk7; Tue, 1 Sep 2020 22:11:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 723AA20720; Tue, 1 Sep 2020 22:11:22 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MBM7Q060895; Tue, 1 Sep 2020 22:11:22 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MBM2E060894; Tue, 1 Sep 2020 22:11:22 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012211.081MBM2E060894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:11:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365220 - head/sys/dev/cpuctl X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/cpuctl X-SVN-Commit-Revision: 365220 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:11:22 -0000 Author: mjg Date: Tue Sep 1 22:11:22 2020 New Revision: 365220 URL: https://svnweb.freebsd.org/changeset/base/365220 Log: cpuctl: clean up empty lines in .c and .h files Modified: head/sys/dev/cpuctl/cpuctl.c Modified: head/sys/dev/cpuctl/cpuctl.c ============================================================================== --- head/sys/dev/cpuctl/cpuctl.c Tue Sep 1 22:11:05 2020 (r365219) +++ head/sys/dev/cpuctl/cpuctl.c Tue Sep 1 22:11:22 2020 (r365220) @@ -552,7 +552,6 @@ cpuctl_do_eval_cpu_features(int cpu, struct thread *td return (0); } - int cpuctl_open(struct cdev *dev, int flags, int fmt __unused, struct thread *td) { From owner-svn-src-all@freebsd.org Tue Sep 1 22:11:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5ABDC37F2B7; Tue, 1 Sep 2020 22:11:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1WT1n8zz3T1h; Tue, 1 Sep 2020 22:11:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 20A7D2033B; Tue, 1 Sep 2020 22:11:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MBnI4060957; Tue, 1 Sep 2020 22:11:49 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MBncf060956; Tue, 1 Sep 2020 22:11:49 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012211.081MBncf060956@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:11:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365221 - head/sys/dev/cpufreq X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/cpufreq X-SVN-Commit-Revision: 365221 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:11:49 -0000 Author: mjg Date: Tue Sep 1 22:11:48 2020 New Revision: 365221 URL: https://svnweb.freebsd.org/changeset/base/365221 Log: cpufreq: clean up empty lines in .c and .h files Modified: head/sys/dev/cpufreq/cpufreq_dt.c Modified: head/sys/dev/cpufreq/cpufreq_dt.c ============================================================================== --- head/sys/dev/cpufreq/cpufreq_dt.c Tue Sep 1 22:11:22 2020 (r365220) +++ head/sys/dev/cpufreq/cpufreq_dt.c Tue Sep 1 22:11:48 2020 (r365221) @@ -253,7 +253,6 @@ cpufreq_dt_set(device_t dev, const struct cf_setting * return (0); } - static int cpufreq_dt_type(device_t dev, int *type) { @@ -546,7 +545,6 @@ cpufreq_dt_attach(device_t dev) return (0); } - static device_method_t cpufreq_dt_methods[] = { /* Device interface */ From owner-svn-src-all@freebsd.org Tue Sep 1 22:12:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6DBF837F250; Tue, 1 Sep 2020 22:12:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1XZ1XjPz3TT7; Tue, 1 Sep 2020 22:12:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1803120732; Tue, 1 Sep 2020 22:12:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MCkef062744; Tue, 1 Sep 2020 22:12:46 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MCXli062679; Tue, 1 Sep 2020 22:12:33 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012212.081MCXli062679@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:12:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365222 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 365222 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:12:46 -0000 Author: mjg Date: Tue Sep 1 22:12:32 2020 New Revision: 365222 URL: https://svnweb.freebsd.org/changeset/base/365222 Log: kern: clean up empty lines in .c and .h files Modified: head/sys/kern/imgact_elf.c head/sys/kern/init_main.c head/sys/kern/kern_acct.c head/sys/kern/kern_alq.c head/sys/kern/kern_clock.c head/sys/kern/kern_conf.c head/sys/kern/kern_cons.c head/sys/kern/kern_cpu.c head/sys/kern/kern_cpuset.c head/sys/kern/kern_environment.c head/sys/kern/kern_et.c head/sys/kern/kern_event.c head/sys/kern/kern_fail.c head/sys/kern/kern_fork.c head/sys/kern/kern_jail.c head/sys/kern/kern_ktr.c head/sys/kern/kern_linker.c head/sys/kern/kern_lock.c head/sys/kern/kern_lockf.c head/sys/kern/kern_malloc.c head/sys/kern/kern_mbuf.c head/sys/kern/kern_module.c head/sys/kern/kern_ntptime.c head/sys/kern/kern_pmc.c head/sys/kern/kern_proc.c head/sys/kern/kern_prot.c head/sys/kern/kern_racct.c head/sys/kern/kern_rctl.c head/sys/kern/kern_resource.c head/sys/kern/kern_sendfile.c head/sys/kern/kern_sig.c head/sys/kern/kern_sysctl.c head/sys/kern/kern_time.c head/sys/kern/kern_timeout.c head/sys/kern/kern_xxx.c head/sys/kern/link_elf.c head/sys/kern/link_elf_obj.c head/sys/kern/posix4_mib.c head/sys/kern/sched_4bsd.c head/sys/kern/subr_blist.c head/sys/kern/subr_bufring.c head/sys/kern/subr_bus.c head/sys/kern/subr_busdma_bufalloc.c head/sys/kern/subr_counter.c head/sys/kern/subr_csan.c head/sys/kern/subr_devmap.c head/sys/kern/subr_filter.c head/sys/kern/subr_intr.c head/sys/kern/subr_kobj.c head/sys/kern/subr_lock.c head/sys/kern/subr_log.c head/sys/kern/subr_mchain.c head/sys/kern/subr_module.c head/sys/kern/subr_msgbuf.c head/sys/kern/subr_power.c head/sys/kern/subr_scanf.c head/sys/kern/subr_smp.c head/sys/kern/subr_terminal.c head/sys/kern/subr_turnstile.c head/sys/kern/subr_uio.c head/sys/kern/subr_unit.c head/sys/kern/subr_witness.c head/sys/kern/sys_generic.c head/sys/kern/sys_pipe.c head/sys/kern/sys_socket.c head/sys/kern/sysv_msg.c head/sys/kern/uipc_mbuf.c head/sys/kern/uipc_mqueue.c head/sys/kern/uipc_sem.c head/sys/kern/uipc_shm.c head/sys/kern/uipc_sockbuf.c head/sys/kern/uipc_socket.c head/sys/kern/uipc_usrreq.c head/sys/kern/vfs_bio.c head/sys/kern/vfs_export.c head/sys/kern/vfs_subr.c Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/imgact_elf.c Tue Sep 1 22:12:32 2020 (r365222) @@ -908,7 +908,7 @@ __elfN(enforce_limits)(struct image_params *imgp, cons } total_size += seg_size; } - + if (data_addr == 0 && data_size == 0) { data_addr = text_addr; data_size = text_size; Modified: head/sys/kern/init_main.c ============================================================================== --- head/sys/kern/init_main.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/init_main.c Tue Sep 1 22:12:32 2020 (r365222) @@ -277,7 +277,6 @@ restart: * Perform each task, and continue on to the next task. */ for (sipp = sysinit; sipp < sysinit_end; sipp++) { - if ((*sipp)->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -723,7 +722,7 @@ start_init(void *dummy) freeenv(var); } free_init_path = tmp_init_path = strdup(init_path, M_TEMP); - + while ((path = strsep(&tmp_init_path, ":")) != NULL) { if (bootverbose) printf("start_init: trying %s\n", path); Modified: head/sys/kern/kern_acct.c ============================================================================== --- head/sys/kern/kern_acct.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_acct.c Tue Sep 1 22:12:32 2020 (r365222) @@ -635,7 +635,6 @@ acct_thread(void *dummy) /* Loop until we are asked to exit. */ while (!(acct_state & ACCT_EXITREQ)) { - /* Perform our periodic checks. */ acctwatch(); Modified: head/sys/kern/kern_alq.c ============================================================================== --- head/sys/kern/kern_alq.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_alq.c Tue Sep 1 22:12:32 2020 (r365222) @@ -923,7 +923,7 @@ static int alq_load_handler(module_t mod, int what, void *arg) { int ret; - + ret = 0; switch (what) { Modified: head/sys/kern/kern_clock.c ============================================================================== --- head/sys/kern/kern_clock.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_clock.c Tue Sep 1 22:12:32 2020 (r365222) @@ -229,7 +229,6 @@ deadlres_td_sleep_q(struct proc *p, struct thread *td, slptype = sleepq_type(wchan); if ((slptype == SLEEPQ_SX || slptype == SLEEPQ_LK) && tticks > slpticks) { - /* * Accordingly with provided thresholds, this thread is stuck * for too long on a sleepqueue. Modified: head/sys/kern/kern_conf.c ============================================================================== --- head/sys/kern/kern_conf.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_conf.c Tue Sep 1 22:12:32 2020 (r365222) @@ -664,7 +664,7 @@ prep_cdevsw(struct cdevsw *devsw, int flags) devsw->d_dump = dead_dump; devsw->d_kqfilter = dead_kqfilter; } - + if (devsw->d_flags & D_NEEDGIANT) { printf("WARNING: Device \"%s\" is Giant locked and may be " "deleted before FreeBSD 13.0.\n", @@ -1399,7 +1399,7 @@ clone_cleanup(struct clonedevs **cdp) struct cdev *dev; struct cdev_priv *cp; struct clonedevs *cd; - + cd = *cdp; if (cd == NULL) return; Modified: head/sys/kern/kern_cons.c ============================================================================== --- head/sys/kern/kern_cons.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_cons.c Tue Sep 1 22:12:32 2020 (r365222) @@ -779,4 +779,3 @@ vty_set_preferred(unsigned vty) vty_prefer &= ~VTY_VT; #endif } - Modified: head/sys/kern/kern_cpu.c ============================================================================== --- head/sys/kern/kern_cpu.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_cpu.c Tue Sep 1 22:12:32 2020 (r365222) @@ -695,7 +695,6 @@ cf_levels_method(device_t dev, struct cf_level *levels /* Finally, output the list of levels. */ i = 0; TAILQ_FOREACH(lev, &sc->all_levels, link) { - /* Skip levels that have a frequency that is too low. */ if (lev->total_set.freq < cf_lowest_freq) { sc->all_count--; Modified: head/sys/kern/kern_cpuset.c ============================================================================== --- head/sys/kern/kern_cpuset.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_cpuset.c Tue Sep 1 22:12:32 2020 (r365222) @@ -488,7 +488,7 @@ _domainset_create(struct domainset *domain, struct dom else uma_zfree(domainset_zone, domain); return (ndomain); - + } /* @@ -1893,7 +1893,6 @@ kern_cpuset_setaffinity(struct thread *td, cpulevel_t error = EINVAL; goto out; } - } switch (level) { case CPU_LEVEL_ROOT: @@ -2148,7 +2147,6 @@ kern_cpuset_setdomain(struct thread *td, cpulevel_t le error = EINVAL; goto out; } - } DOMAINSET_COPY(mask, &domain.ds_mask); domain.ds_policy = policy; Modified: head/sys/kern/kern_environment.c ============================================================================== --- head/sys/kern/kern_environment.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_environment.c Tue Sep 1 22:12:32 2020 (r365222) @@ -696,7 +696,6 @@ getenv_array(const char *name, void *pdata, int size, n = 0; for (ptr = buf; *ptr != 0; ) { - value = strtoq(ptr, &end, 0); /* check if signed numbers are allowed */ Modified: head/sys/kern/kern_et.c ============================================================================== --- head/sys/kern/kern_et.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_et.c Tue Sep 1 22:12:32 2020 (r365222) @@ -268,4 +268,3 @@ sysctl_kern_eventtimer_choice(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_kern_eventtimer, OID_AUTO, choice, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, 0, 0, sysctl_kern_eventtimer_choice, "A", "Present event timers"); - Modified: head/sys/kern/kern_event.c ============================================================================== --- head/sys/kern/kern_event.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_event.c Tue Sep 1 22:12:32 2020 (r365222) @@ -1561,7 +1561,7 @@ findkn: goto done; } } - + if (kev->flags & EV_DELETE) { kn_enter_flux(kn); KQ_UNLOCK(kq); Modified: head/sys/kern/kern_fail.c ============================================================================== --- head/sys/kern/kern_fail.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_fail.c Tue Sep 1 22:12:32 2020 (r365222) @@ -563,7 +563,6 @@ fail_point_eval_nontrivial(struct fail_point *fp, int goto abort; TAILQ_FOREACH(ent, &fp_setting->fp_entry_queue, fe_entries) { - if (ent->fe_stale) continue; Modified: head/sys/kern/kern_fork.c ============================================================================== --- head/sys/kern/kern_fork.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_fork.c Tue Sep 1 22:12:32 2020 (r365222) @@ -704,7 +704,7 @@ do_fork(struct thread *td, struct fork_req *fr, struct procdesc_finit(p2->p_procdesc, fp_procdesc); fdrop(fp_procdesc, td); } - + /* * Speculative check for PTRACE_FORK. PTRACE_FORK is not * synced with forks in progress so it is OK if we miss it Modified: head/sys/kern/kern_jail.c ============================================================================== --- head/sys/kern/kern_jail.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_jail.c Tue Sep 1 22:12:32 2020 (r365222) @@ -3173,7 +3173,6 @@ prison_priv_check(struct ucred *cred, int priv) #endif /* VIMAGE */ switch (priv) { - /* * Allow ktrace privileges for root in jail. */ Modified: head/sys/kern/kern_ktr.c ============================================================================== --- head/sys/kern/kern_ktr.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_ktr.c Tue Sep 1 22:12:32 2020 (r365222) @@ -419,7 +419,7 @@ static int db_mach_vtrace(void); DB_SHOW_COMMAND(ktr, db_ktr_all) { - + tstate.cur = (ktr_idx - 1) % ktr_entries; tstate.first = -1; db_ktr_verbose = 0; Modified: head/sys/kern/kern_linker.c ============================================================================== --- head/sys/kern/kern_linker.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_linker.c Tue Sep 1 22:12:32 2020 (r365222) @@ -480,7 +480,6 @@ linker_load_file(const char *filename, linker_file_t * * the module was not found. */ if (foundfile) { - /* * If the file type has not been recognized by the last try * printout a message before to fail. @@ -668,7 +667,6 @@ linker_file_unload(linker_file_t file, int flags) MOD_SLOCK; for (mod = TAILQ_FIRST(&file->modules); mod; mod = module_getfnext(mod)) { - error = module_quiesce(mod); if (error != 0 && flags != LINKER_UNLOAD_FORCE) { KLD_DPF(FILE, ("linker_file_unload: module %s" @@ -2044,7 +2042,6 @@ linker_hwpmc_list_objects(void) M_LINKER, M_WAITOK | M_ZERO); i = 0; TAILQ_FOREACH(lf, &linker_files, link) { - /* Save the info for this linker file. */ kobase[i].pm_file = lf->filename; kobase[i].pm_address = (uintptr_t)lf->address; Modified: head/sys/kern/kern_lock.c ============================================================================== --- head/sys/kern/kern_lock.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_lock.c Tue Sep 1 22:12:32 2020 (r365222) @@ -364,7 +364,6 @@ retry_sleepq: } } else { - /* * Exclusive waiters sleeping with LK_SLEEPFAIL on * and using interruptible sleeps/timeout may have @@ -1186,7 +1185,6 @@ lockmgr_xunlock_hard(struct lock *lk, uintptr_t x, u_i queue = SQ_SHARED_QUEUE; } } else { - /* * Exclusive waiters sleeping with LK_SLEEPFAIL * on and using interruptible sleeps/timeout @@ -1486,7 +1484,6 @@ __lockmgr_args(struct lock *lk, u_int flags, struct lo queue = SQ_EXCLUSIVE_QUEUE; v &= ~LK_EXCLUSIVE_WAITERS; } else { - /* * Exclusive waiters sleeping with * LK_SLEEPFAIL on and using Modified: head/sys/kern/kern_lockf.c ============================================================================== --- head/sys/kern/kern_lockf.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_lockf.c Tue Sep 1 22:12:32 2020 (r365222) @@ -441,7 +441,6 @@ lf_advlockasync(struct vop_advlockasync_args *ap, stru * Convert the flock structure into a start and end. */ switch (fl->l_whence) { - case SEEK_SET: case SEEK_CUR: /* @@ -2440,7 +2439,7 @@ graph_free_vertex(struct owner_graph *g, struct owner_ int i; sx_assert(&lf_owner_graph_lock, SX_XLOCKED); - + KASSERT(LIST_EMPTY(&v->v_outedges), ("Freeing vertex with edges")); KASSERT(LIST_EMPTY(&v->v_inedges), ("Freeing vertex with edges")); Modified: head/sys/kern/kern_malloc.c ============================================================================== --- head/sys/kern/kern_malloc.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_malloc.c Tue Sep 1 22:12:32 2020 (r365222) @@ -1108,7 +1108,6 @@ mallocinit(void *dummy) } for (;i <= size; i+= KMEM_ZBASE) kmemsize[i >> KMEM_ZSHIFT] = indx; - } } SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_SECOND, mallocinit, NULL); @@ -1260,7 +1259,6 @@ sysctl_kern_malloc_stats(SYSCTL_HANDLER_ARGS) for (; i < MAXCPU; i++) { (void)sbuf_bcat(&sbuf, &zeromts, sizeof(zeromts)); } - } mtx_unlock(&malloc_mtx); error = sbuf_finish(&sbuf); Modified: head/sys/kern/kern_mbuf.c ============================================================================== --- head/sys/kern/kern_mbuf.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_mbuf.c Tue Sep 1 22:12:32 2020 (r365222) @@ -1427,7 +1427,6 @@ m_getm2(struct mbuf *m, int len, int how, short type, if (len > MCLBYTES) { mb = m_getjcl(M_NOWAIT, type, (flags & M_PKTHDR), MJUMPAGESIZE); - } if (mb == NULL) { if (len >= MINCLSIZE) Modified: head/sys/kern/kern_module.c ============================================================================== --- head/sys/kern/kern_module.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_module.c Tue Sep 1 22:12:32 2020 (r365222) @@ -200,7 +200,7 @@ module_release(module_t mod) panic("module_release: bad reference count"); MOD_DPF(REFS, ("module_release: before, refs=%d\n", mod->refs)); - + mod->refs--; if (mod->refs == 0) { TAILQ_REMOVE(&modules, mod, link); Modified: head/sys/kern/kern_ntptime.c ============================================================================== --- head/sys/kern/kern_ntptime.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_ntptime.c Tue Sep 1 22:12:32 2020 (r365222) @@ -514,7 +514,6 @@ ntp_update_second(int64_t *adjustment, time_t *newsec) * is always monotonic. */ switch (time_state) { - /* * No warning. */ @@ -588,7 +587,7 @@ ntp_update_second(int64_t *adjustment, time_t *newsec) time_adj = ftemp; L_SUB(time_offset, ftemp); L_ADD(time_adj, time_freq); - + /* * Apply any correction from adjtime(2). If more than one second * off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500PPM) Modified: head/sys/kern/kern_pmc.c ============================================================================== --- head/sys/kern/kern_pmc.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_pmc.c Tue Sep 1 22:12:32 2020 (r365222) @@ -364,4 +364,3 @@ init_hwpmc(void *dummy __unused) } SYSINIT(hwpmc, SI_SUB_KDTRACE, SI_ORDER_FIRST, init_hwpmc, NULL); - Modified: head/sys/kern/kern_proc.c ============================================================================== --- head/sys/kern/kern_proc.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_proc.c Tue Sep 1 22:12:32 2020 (r365222) @@ -1613,7 +1613,6 @@ sysctl_kern_proc_iterate(struct proc *p, void *origarg * do by session. */ switch (oid_number) { - case KERN_PROC_GID: if (p->p_ucred->cr_gid != (gid_t)name[0]) goto skip; @@ -1667,7 +1666,6 @@ sysctl_kern_proc_iterate(struct proc *p, void *origarg default: break; - } error = sysctl_out_proc(p, req, flags); PROC_LOCK_ASSERT(p, MA_NOTOWNED); Modified: head/sys/kern/kern_prot.c ============================================================================== --- head/sys/kern/kern_prot.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_prot.c Tue Sep 1 22:12:32 2020 (r365222) @@ -1381,7 +1381,7 @@ int cr_canseeothergids(struct ucred *u1, struct ucred *u2) { int i, match; - + if (!see_other_gids) { match = 0; for (i = 0; i < u1->cr_ngroups; i++) { @@ -2227,7 +2227,7 @@ crsetgroups_locked(struct ucred *cr, int ngrp, gid_t * int i; int j; gid_t g; - + KASSERT(cr->cr_agroups >= ngrp, ("cr_ngroups is too small")); bcopy(groups, cr->cr_groups, ngrp * sizeof(gid_t)); Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_racct.c Tue Sep 1 22:12:32 2020 (r365222) @@ -528,7 +528,7 @@ racct_adjust_resource(struct racct *racct, int resourc ("%s: resource %d usage < 0", __func__, resource)); racct->r_resources[resource] = 0; } - + /* * There are some cases where the racct %cpu resource would grow * beyond 100% per core. For example in racct_proc_exit() we add Modified: head/sys/kern/kern_rctl.c ============================================================================== --- head/sys/kern/kern_rctl.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_rctl.c Tue Sep 1 22:12:32 2020 (r365222) @@ -1063,16 +1063,16 @@ static void rctl_rule_free(void *context, int pending) { struct rctl_rule *rule; - + rule = (struct rctl_rule *)context; ASSERT_RACCT_ENABLED(); KASSERT(rule->rr_refcount == 0, ("rule->rr_refcount != 0")); - + /* * We don't need locking here; rule is guaranteed to be inaccessible. */ - + rctl_rule_release_subject(rule); uma_zfree(rctl_rule_zone, rule); } @@ -2021,7 +2021,7 @@ again: rulecnt--; } } - + LIST_FOREACH(link, &newuip->ui_racct->r_rule_links, rrl_next) { if (newlink == NULL) goto goaround; @@ -2208,35 +2208,35 @@ rctl_init(void) int sys_rctl_get_racct(struct thread *td, struct rctl_get_racct_args *uap) { - + return (ENOSYS); } int sys_rctl_get_rules(struct thread *td, struct rctl_get_rules_args *uap) { - + return (ENOSYS); } int sys_rctl_get_limits(struct thread *td, struct rctl_get_limits_args *uap) { - + return (ENOSYS); } int sys_rctl_add_rule(struct thread *td, struct rctl_add_rule_args *uap) { - + return (ENOSYS); } int sys_rctl_remove_rule(struct thread *td, struct rctl_remove_rule_args *uap) { - + return (ENOSYS); } Modified: head/sys/kern/kern_resource.c ============================================================================== --- head/sys/kern/kern_resource.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_resource.c Tue Sep 1 22:12:32 2020 (r365222) @@ -105,7 +105,6 @@ kern_getpriority(struct thread *td, int which, int who error = 0; low = PRIO_MAX + 1; switch (which) { - case PRIO_PROCESS: if (who == 0) low = td->td_proc->p_nice; @@ -691,7 +690,6 @@ kern_proc_setrlimit(struct thread *td, struct proc *p, alimp = &newlim->pl_rlimit[which]; switch (which) { - case RLIMIT_CPU: if (limp->rlim_cur != RLIM_INFINITY && p->p_cpulimit == RLIM_INFINITY) Modified: head/sys/kern/kern_sendfile.c ============================================================================== --- head/sys/kern/kern_sendfile.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_sendfile.c Tue Sep 1 22:12:32 2020 (r365222) @@ -1313,7 +1313,7 @@ out: int sys_sendfile(struct thread *td, struct sendfile_args *uap) { - + return (sendfile(td, uap, 0)); } Modified: head/sys/kern/kern_sig.c ============================================================================== --- head/sys/kern/kern_sig.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_sig.c Tue Sep 1 22:12:32 2020 (r365222) @@ -2961,7 +2961,6 @@ issignal(struct thread *td) * to clear it from the pending mask. */ switch ((intptr_t)p->p_sigacts->ps_sigact[_SIG_IDX(sig)]) { - case (intptr_t)SIG_DFL: /* * Don't take default actions on system processes. Modified: head/sys/kern/kern_sysctl.c ============================================================================== --- head/sys/kern/kern_sysctl.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_sysctl.c Tue Sep 1 22:12:32 2020 (r365222) @@ -970,7 +970,6 @@ sysctl_sysctl_debug_dump_node(struct sysctl_oid_list * SYSCTL_ASSERT_LOCKED(); SLIST_FOREACH(oidp, l, oid_link) { - for (k=0; ksigev_signo)) return (EINVAL); } - + if (p->p_itimers == NULL) itimers_alloc(p); - + it = uma_zalloc(itimer_zone, M_WAITOK); it->it_flags = 0; it->it_usecount = 0; @@ -1491,7 +1491,7 @@ static int realtimer_delete(struct itimer *it) { mtx_assert(&it->it_mtx, MA_OWNED); - + /* * clear timer's value and interval to tell realtimer_expire * to not rearm the timer. @@ -1545,7 +1545,7 @@ realtimer_settime(struct itimer *it, int flags, } else { timespecclear(&val.it_interval); } - + if (ovalue != NULL) realtimer_gettime(it, ovalue); Modified: head/sys/kern/kern_timeout.c ============================================================================== --- head/sys/kern/kern_timeout.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_timeout.c Tue Sep 1 22:12:32 2020 (r365222) @@ -654,7 +654,7 @@ softclock_call_cc(struct callout *c, struct callout_cp c_arg = c->c_arg; c_iflags = c->c_iflags; c->c_iflags &= ~CALLOUT_PENDING; - + cc_exec_curr(cc, direct) = c; cc_exec_last_func(cc, direct) = c_func; cc_exec_last_arg(cc, direct) = c_arg; Modified: head/sys/kern/kern_xxx.c ============================================================================== --- head/sys/kern/kern_xxx.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/kern_xxx.c Tue Sep 1 22:12:32 2020 (r365222) @@ -173,7 +173,6 @@ ogetkerninfo(struct thread *td, struct ogetkerninfo_ar u_int needed = 0; switch (uap->op & 0xff00) { - case KINFO_RT: name[0] = CTL_NET; name[1] = PF_ROUTE; Modified: head/sys/kern/link_elf.c ============================================================================== --- head/sys/kern/link_elf.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/link_elf.c Tue Sep 1 22:12:32 2020 (r365222) @@ -213,7 +213,6 @@ elf_set_add(struct elf_set_head *list, Elf_Addr start, set->es_base = base; TAILQ_FOREACH(iter, list, es_link) { - KASSERT((set->es_start < iter->es_start && set->es_stop < iter->es_stop) || (set->es_start > iter->es_start && set->es_stop > iter->es_stop), ("linker sets intersection: to insert: 0x%jx-0x%jx; inserted: 0x%jx-0x%jx", Modified: head/sys/kern/link_elf_obj.c ============================================================================== --- head/sys/kern/link_elf_obj.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/link_elf_obj.c Tue Sep 1 22:12:32 2020 (r365222) @@ -1457,7 +1457,7 @@ link_elf_each_function_name(linker_file_t file, elf_file_t ef = (elf_file_t)file; const Elf_Sym *symp; int i, error; - + /* Exhaustive search */ for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) { if (symp->st_value != 0 && Modified: head/sys/kern/posix4_mib.c ============================================================================== --- head/sys/kern/posix4_mib.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/posix4_mib.c Tue Sep 1 22:12:32 2020 (r365222) @@ -176,4 +176,3 @@ p31b_set_standard(void *dummy) SYSINIT(p31b_set_standard, SI_SUB_P1003_1B, SI_ORDER_ANY, p31b_set_standard, NULL); - Modified: head/sys/kern/sched_4bsd.c ============================================================================== --- head/sys/kern/sched_4bsd.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/sched_4bsd.c Tue Sep 1 22:12:32 2020 (r365222) @@ -1262,7 +1262,7 @@ sched_pickcpu(struct thread *td) CPU_FOREACH(cpu) { if (!THREAD_CAN_SCHED(td, cpu)) continue; - + if (best == NOCPU) best = cpu; else if (runq_length[cpu] < runq_length[best]) @@ -1311,7 +1311,6 @@ sched_add(struct thread *td, int flags) td->td_lock = &sched_lock; else thread_lock_set(td, &sched_lock); - } TD_SET_RUNQ(td); @@ -1629,7 +1628,7 @@ sched_pctcpu_delta(struct thread *td) u_int sched_estcpu(struct thread *td) { - + return (td_get_sched(td)->ts_estcpu); } Modified: head/sys/kern/subr_blist.c ============================================================================== --- head/sys/kern/subr_blist.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_blist.c Tue Sep 1 22:12:32 2020 (r365222) @@ -650,7 +650,7 @@ blst_next_leaf_alloc(blmeta_t *scan, daddr_t start, in } } } - + /* * 'scan' is the last leaf that provides blocks. Clear from 1 to * BLIST_RADIX bits to represent the allocation of those last blocks. Modified: head/sys/kern/subr_bufring.c ============================================================================== --- head/sys/kern/subr_bufring.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_bufring.c Tue Sep 1 22:12:32 2020 (r365222) @@ -42,7 +42,7 @@ buf_ring_alloc(int count, struct malloc_type *type, in struct buf_ring *br; KASSERT(powerof2(count), ("buf ring must be size power of 2")); - + br = malloc(sizeof(struct buf_ring) + count*sizeof(caddr_t), type, flags|M_ZERO); if (br == NULL) Modified: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_bus.c Tue Sep 1 22:12:32 2020 (r365222) @@ -169,7 +169,6 @@ static bool device_frozen; static int bus_debug = 1; SYSCTL_INT(_debug, OID_AUTO, bus_debug, CTLFLAG_RWTUN, &bus_debug, 0, "Bus debug level"); - #define PDEBUG(a) if (bus_debug) {printf("%s:%d: ", __func__, __LINE__), printf a; printf("\n");} #define DEVICENAME(d) ((d)? device_get_name(d): "no device") @@ -1921,7 +1920,7 @@ device_delete_child(device_t dev, device_t child) /* detach parent before deleting children, if any */ if ((error = device_detach(child)) != 0) return (error); - + /* remove children second */ while ((grandchild = TAILQ_FIRST(&child->children)) != NULL) { error = device_delete_child(child, grandchild); Modified: head/sys/kern/subr_busdma_bufalloc.c ============================================================================== --- head/sys/kern/subr_busdma_bufalloc.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_busdma_bufalloc.c Tue Sep 1 22:12:32 2020 (r365222) @@ -171,4 +171,3 @@ busdma_bufalloc_free_uncacheable(void *item, vm_size_t kmem_free((vm_offset_t)item, size); } - Modified: head/sys/kern/subr_counter.c ============================================================================== --- head/sys/kern/subr_counter.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_counter.c Tue Sep 1 22:12:32 2020 (r365222) @@ -113,7 +113,7 @@ sysctl_handle_counter_u64_array(SYSCTL_HANDLER_ARGS) */ for (int i = 0; i < arg2; i++) counter_u64_zero(((counter_u64_t *)arg1)[i]); - + return (0); } Modified: head/sys/kern/subr_csan.c ============================================================================== --- head/sys/kern/subr_csan.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_csan.c Tue Sep 1 22:12:32 2020 (r365222) @@ -878,4 +878,3 @@ CSAN_BUS_SET_FUNC(multi_stream, 8, uint64_t) CSAN_BUS_SET_FUNC(region_stream, 8, uint64_t) #endif #endif - Modified: head/sys/kern/subr_devmap.c ============================================================================== --- head/sys/kern/subr_devmap.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_devmap.c Tue Sep 1 22:12:32 2020 (r365222) @@ -348,4 +348,3 @@ DB_SHOW_COMMAND(devmap, db_show_devmap) } #endif /* DDB */ - Modified: head/sys/kern/subr_filter.c ============================================================================== --- head/sys/kern/subr_filter.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_filter.c Tue Sep 1 22:12:32 2020 (r365222) @@ -76,7 +76,7 @@ setup_time_filter(struct time_filter *tf, int fil_type { uint64_t set_val; int i; - + /* * You must specify either a MIN or MAX filter, * though its up to the user to use the correct @@ -107,7 +107,7 @@ setup_time_filter_small(struct time_filter_small *tf, { uint32_t set_val; int i; - + /* * You must specify either a MIN or MAX filter, * though its up to the user to use the correct @@ -333,7 +333,6 @@ tick_filter_clock(struct time_filter *tf, uint32_t now tf->entries[i].value = tf->entries[(i+1)].value; tf->entries[i].time_up = tf->entries[(i+1)].time_up; } - } } @@ -365,7 +364,6 @@ tick_filter_clock_small(struct time_filter_small *tf, tf->entries[i].value = tf->entries[(i+1)].value; tf->entries[i].time_up = tf->entries[(i+1)].time_up; } - } } @@ -373,7 +371,7 @@ uint32_t apply_filter_min(struct time_filter *tf, uint64_t value, uint32_t now) { int i, j; - + if (value <= tf->entries[0].value) { /* Zap them all */ for(i=0; ientries[0].value) { /* Zap them all */ for(i=0; i= tf->entries[0].value) { /* Zap them all */ for(i=0; i= tf->entries[0].value) { /* Zap them all */ for(i=0; ipic_dev))); return (PIC_MAP_INTR(pic->pic_dev, data, isrc)); - } } @@ -1318,7 +1317,6 @@ intr_alloc_msi(device_t pci, device_t child, intptr_t msi-> isrc = isrc[i]; irqs[i] = intr_map_irq(pic->pic_dev, xref, (struct intr_map_data *)msi); - } free(isrc, M_INTRNG); Modified: head/sys/kern/subr_kobj.c ============================================================================== --- head/sys/kern/subr_kobj.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_kobj.c Tue Sep 1 22:12:32 2020 (r365222) @@ -253,7 +253,7 @@ kobj_class_free(kobj_class_t cls) ops = cls->ops; cls->ops = NULL; } - + KOBJ_UNLOCK(); if (ops) Modified: head/sys/kern/subr_lock.c ============================================================================== --- head/sys/kern/subr_lock.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_lock.c Tue Sep 1 22:12:32 2020 (r365222) @@ -548,7 +548,6 @@ lock_profile_lookup(struct lock_object *lo, int spin, if (lp->line == line && lp->file == p && lp->name == lo->lo_name) return (lp); - } lp = SLIST_FIRST(&type->lpt_lpalloc); if (lp == NULL) { Modified: head/sys/kern/subr_log.c ============================================================================== --- head/sys/kern/subr_log.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_log.c Tue Sep 1 22:12:32 2020 (r365222) @@ -258,7 +258,6 @@ logioctl(struct cdev *dev, u_long com, caddr_t data, i { switch (com) { - /* return number of characters immediately available */ case FIONREAD: *(int *)data = msgbuf_getcount(msgbufp); Modified: head/sys/kern/subr_mchain.c ============================================================================== --- head/sys/kern/subr_mchain.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_mchain.c Tue Sep 1 22:12:32 2020 (r365222) @@ -473,7 +473,7 @@ md_get_mem(struct mdchain *mdp, caddr_t target, int si int error; u_int count; u_char *s; - + while (size > 0) { if (m == NULL) { MBERROR("incomplete copy\n"); Modified: head/sys/kern/subr_module.c ============================================================================== --- head/sys/kern/subr_module.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_module.c Tue Sep 1 22:12:32 2020 (r365222) @@ -54,7 +54,6 @@ preload_search_by_name(const char *name) int next; if (preload_metadata != NULL) { - curp = preload_metadata; for (;;) { hdr = (uint32_t *)curp; @@ -86,7 +85,6 @@ preload_search_by_type(const char *type) int next; if (preload_metadata != NULL) { - curp = preload_metadata; lname = NULL; for (;;) { @@ -123,7 +121,6 @@ preload_search_next_name(caddr_t base) int next; if (preload_metadata != NULL) { - /* Pick up where we left off last time */ if (base) { /* skip to next field */ @@ -184,7 +181,7 @@ preload_search_info(caddr_t mod, int inf) if (hdr[0] == type) break; } - + /* * Attribute match? Return pointer to data. * Consumer may safely assume that size value precedes @@ -216,7 +213,6 @@ preload_delete_name(const char *name) sz = 0; if (preload_metadata != NULL) { - clearing = 0; curp = preload_metadata; for (;;) { @@ -284,7 +280,6 @@ preload_bootstrap_relocate(vm_offset_t offset) int next; if (preload_metadata != NULL) { - curp = preload_metadata; for (;;) { hdr = (uint32_t *)curp; Modified: head/sys/kern/subr_msgbuf.c ============================================================================== --- head/sys/kern/subr_msgbuf.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_msgbuf.c Tue Sep 1 22:12:32 2020 (r365222) @@ -218,7 +218,6 @@ msgbuf_addstr(struct msgbuf *mbp, int pri, const char * insert a newline before this string. */ if (mbp->msg_lastpri != pri && (mbp->msg_flags & MSGBUF_NEEDNL) != 0) { - msgbuf_do_addchar(mbp, &seq, '\n'); mbp->msg_flags &= ~MSGBUF_NEEDNL; } @@ -239,7 +238,6 @@ msgbuf_addstr(struct msgbuf *mbp, int pri, const char if (msgbuf_show_timestamp && needtime == 1 && (mbp->msg_flags & MSGBUF_NEEDNL) == 0) { - snprintf(buf, sizeof(buf), "[%jd] ", (intmax_t)time_uptime); for (j = 0; buf[j] != '\0'; j++) Modified: head/sys/kern/subr_power.c ============================================================================== --- head/sys/kern/subr_power.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_power.c Tue Sep 1 22:12:32 2020 (r365222) @@ -121,4 +121,3 @@ power_profile_set_state(int state) if (changed) EVENTHANDLER_INVOKE(power_profile_change, 0); } - Modified: head/sys/kern/subr_scanf.c ============================================================================== --- head/sys/kern/subr_scanf.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_scanf.c Tue Sep 1 22:12:32 2020 (r365222) @@ -97,7 +97,7 @@ sscanf(const char *ibuf, const char *fmt, ...) { va_list ap; int ret; - + va_start(ap, fmt); ret = vsscanf(ibuf, fmt, ap); va_end(ap); @@ -128,7 +128,7 @@ vsscanf(const char *inp, char const *fmt0, va_list ap) { 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }; inr = strlen(inp); - + nassigned = 0; nconversions = 0; nread = 0; @@ -309,7 +309,6 @@ literal: * Do the conversion. */ switch (c) { - case CT_CHAR: /* scan arbitrary characters (sets NOSKIP) */ if (width == 0) @@ -434,7 +433,6 @@ literal: * if we accept it as a part of number. */ switch (c) { - /* * The digit 0 is always legal, but is * special. For %i conversions, if no @@ -565,7 +563,6 @@ literal: nread += p - buf; nconversions++; break; - } } input_failure: @@ -613,7 +610,6 @@ __sccl(char *tab, const u_char *fmt) doswitch: n = *fmt++; /* and examine the next */ switch (n) { - case 0: /* format ended too soon */ return (fmt - 1); @@ -665,4 +661,3 @@ doswitch: } /* NOTREACHED */ } - Modified: head/sys/kern/subr_smp.c ============================================================================== --- head/sys/kern/subr_smp.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_smp.c Tue Sep 1 22:12:32 2020 (r365222) @@ -493,7 +493,7 @@ smp_rendezvous_action(void) #ifdef INVARIANTS owepreempt = td->td_owepreempt; #endif - + /* * If requested, run a setup function before the main action * function. Ensure all CPUs have completed the setup @@ -720,7 +720,7 @@ smp_topo_none(void) top->cg_children = 0; top->cg_level = CG_SHARE_NONE; top->cg_flags = 0; - + return (top); } @@ -1302,4 +1302,3 @@ topo_analyze(struct topo_node *topo_root, int all, } #endif /* SMP */ - Modified: head/sys/kern/subr_terminal.c ============================================================================== --- head/sys/kern/subr_terminal.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_terminal.c Tue Sep 1 22:12:32 2020 (r365222) @@ -192,7 +192,7 @@ terminal_init(struct terminal *tm) default_message.ta_bgcolor |= TC_LIGHT; kernel_message.ta_bgcolor |= TC_LIGHT; } - + if (default_message.ta_bgcolor == TC_BLACK && default_message.ta_fgcolor < TC_NCOLORS) kernel_message.ta_fgcolor |= TC_LIGHT; Modified: head/sys/kern/subr_turnstile.c ============================================================================== --- head/sys/kern/subr_turnstile.c Tue Sep 1 22:11:48 2020 (r365221) +++ head/sys/kern/subr_turnstile.c Tue Sep 1 22:12:32 2020 (r365222) @@ -342,7 +342,6 @@ turnstile_adjust_thread(struct turnstile *ts, struct t td2 = TAILQ_NEXT(td, td_lockq); if ((td1 != NULL && td->td_priority < td1->td_priority) || (td2 != NULL && td->td_priority > td2->td_priority)) { - *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 22:13:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CF46F37F4BD; Tue, 1 Sep 2020 22:13:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Y25XTjz3TXJ; Tue, 1 Sep 2020 22:13:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 89006202D8; Tue, 1 Sep 2020 22:13:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MDAwN062864; Tue, 1 Sep 2020 22:13:10 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MCwg8062798; Tue, 1 Sep 2020 22:12:58 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012212.081MCwg8062798@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:12:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365223 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 365223 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:13:10 -0000 Author: mjg Date: Tue Sep 1 22:12:58 2020 New Revision: 365223 URL: https://svnweb.freebsd.org/changeset/base/365223 Log: sys: clean up empty lines in .c and .h files Modified: head/sys/sys/_atomic64e.h head/sys/sys/_rangeset.h head/sys/sys/_stdarg.h head/sys/sys/_termios.h head/sys/sys/assym.h head/sys/sys/ata.h head/sys/sys/blist.h head/sys/sys/buf_ring.h head/sys/sys/bus.h head/sys/sys/bus_dma_internal.h head/sys/sys/cdio.h head/sys/sys/chio.h head/sys/sys/cnv.h head/sys/sys/conf.h head/sys/sys/copyright.h head/sys/sys/disk.h head/sys/sys/domainset.h head/sys/sys/endian.h head/sys/sys/event.h head/sys/sys/fail.h head/sys/sys/fcntl.h head/sys/sys/fdcio.h head/sys/sys/imgact_aout.h head/sys/sys/intr.h head/sys/sys/iov.h head/sys/sys/ipmi.h head/sys/sys/kernel.h head/sys/sys/kobj.h head/sys/sys/kthread.h head/sys/sys/libkern.h head/sys/sys/linker.h head/sys/sys/lock.h head/sys/sys/lock_profile.h head/sys/sys/lockstat.h head/sys/sys/mtio.h head/sys/sys/pmc.h head/sys/sys/posix4.h head/sys/sys/power.h head/sys/sys/proc.h head/sys/sys/queue.h head/sys/sys/random.h head/sys/sys/rwlock.h head/sys/sys/serial.h head/sys/sys/socket.h head/sys/sys/sockopt.h head/sys/sys/soundcard.h head/sys/sys/stats.h head/sys/sys/stdatomic.h head/sys/sys/sysproto.h head/sys/sys/systm.h head/sys/sys/tiio.h head/sys/sys/tim_filter.h head/sys/sys/timeet.h head/sys/sys/timepps.h head/sys/sys/tree.h head/sys/sys/vnode.h Modified: head/sys/sys/_atomic64e.h ============================================================================== --- head/sys/sys/_atomic64e.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/_atomic64e.h Tue Sep 1 22:12:58 2020 (r365223) @@ -27,7 +27,6 @@ * $FreeBSD$ */ - #ifndef _SYS_ATOMIC64E_H_ #define _SYS_ATOMIC64E_H_ Modified: head/sys/sys/_rangeset.h ============================================================================== --- head/sys/sys/_rangeset.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/_rangeset.h Tue Sep 1 22:12:58 2020 (r365223) @@ -48,4 +48,3 @@ struct rangeset { }; #endif - Modified: head/sys/sys/_stdarg.h ============================================================================== --- head/sys/sys/_stdarg.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/_stdarg.h Tue Sep 1 22:12:58 2020 (r365223) @@ -52,4 +52,3 @@ #endif #endif /* ! _SYS__STDARG_H_ */ - Modified: head/sys/sys/_termios.h ============================================================================== --- head/sys/sys/_termios.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/_termios.h Tue Sep 1 22:12:58 2020 (r365223) @@ -146,7 +146,6 @@ #define CNO_RTSDTR 0x00200000 /* Do not assert RTS or DTR automatically */ #endif - /* * "Local" flags - dumping ground for other state * Modified: head/sys/sys/assym.h ============================================================================== --- head/sys/sys/assym.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/assym.h Tue Sep 1 22:12:58 2020 (r365223) @@ -43,7 +43,6 @@ char name ## w1[((ASSYM_ABS(value) & 0xFFFF0000UL) >> char name ## w2[((ASSYM_ABS(value) & 0xFFFF00000000ULL) >> 32) + ASSYM_BIAS]; \ char name ## w3[((ASSYM_ABS(value) & 0xFFFF000000000000ULL) >> 48) + ASSYM_BIAS] - /* char name ## _datatype_ ## STRINGIFY(typeof(((struct parenttype *)(0x0))-> name)) [1]; */ #ifdef OFFSET_TEST #define OFFSET_CTASSERT CTASSERT Modified: head/sys/sys/ata.h ============================================================================== --- head/sys/sys/ata.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/ata.h Tue Sep 1 22:12:58 2020 (r365223) @@ -384,7 +384,6 @@ struct ata_params { #define ATA_SA600 0x49 #define ATA_DMA_MAX 0x4f - /* ATA commands */ #define ATA_NOP 0x00 /* NOP */ #define ATA_NF_FLUSHQUEUE 0x00 /* flush queued cmd's */ @@ -517,7 +516,6 @@ struct ata_params { #define ATA_READ_NATIVE_MAX_ADDRESS 0xf8 /* read native max address */ #define ATA_SET_MAX_ADDRESS 0xf9 /* set max address */ - /* ATAPI commands */ #define ATAPI_TEST_UNIT_READY 0x00 /* check if device is ready */ #define ATAPI_REZERO 0x01 /* rewind */ @@ -578,7 +576,6 @@ struct ata_params { #define ATAPI_READ_CD 0xbe /* read data */ #define ATAPI_POLL_DSC 0xff /* poll DSC status bit */ - struct ata_ioc_devices { int channel; char name[2][32]; @@ -629,7 +626,7 @@ struct atapi_sense { u_int8_t specific; /* sense key specific */ #define ATA_SENSE_SPEC_VALID 0x80 #define ATA_SENSE_SPEC_MASK 0x7f - + u_int8_t specific1; /* sense key specific */ u_int8_t specific2; /* sense key specific */ } __packed; @@ -1008,7 +1005,6 @@ struct ata_security_password { #define IOCATAGSPINDOWN _IOR('a', 104, int) #define IOCATASSPINDOWN _IOW('a', 105, int) - struct ata_ioc_raid_config { int lun; Modified: head/sys/sys/blist.h ============================================================================== --- head/sys/sys/blist.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/blist.h Tue Sep 1 22:12:58 2020 (r365223) @@ -102,4 +102,3 @@ void blist_resize(blist_t *pblist, daddr_t count, int void blist_stats(blist_t blist, struct sbuf *s); #endif /* _SYS_BLIST_H_ */ - Modified: head/sys/sys/buf_ring.h ============================================================================== --- head/sys/sys/buf_ring.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/buf_ring.h Tue Sep 1 22:12:58 2020 (r365223) @@ -197,12 +197,12 @@ buf_ring_dequeue_sc(struct buf_ring *br) cons_head = br->br_cons_head; #endif prod_tail = atomic_load_acq_32(&br->br_prod_tail); - + cons_next = (cons_head + 1) & br->br_cons_mask; #ifdef PREFETCH_DEFINED cons_next_next = (cons_head + 2) & br->br_cons_mask; #endif - + if (cons_head == prod_tail) return (NULL); @@ -238,10 +238,10 @@ buf_ring_advance_sc(struct buf_ring *br) { uint32_t cons_head, cons_next; uint32_t prod_tail; - + cons_head = br->br_cons_head; prod_tail = br->br_prod_tail; - + cons_next = (cons_head + 1) & br->br_cons_mask; if (cons_head == prod_tail) return; @@ -297,7 +297,7 @@ buf_ring_peek(struct buf_ring *br) */ if (br->br_cons_head == br->br_prod_tail) return (NULL); - + return (br->br_ring[br->br_cons_head]); } @@ -366,7 +366,5 @@ buf_ring_count(struct buf_ring *br) struct buf_ring *buf_ring_alloc(int count, struct malloc_type *type, int flags, struct mtx *); void buf_ring_free(struct buf_ring *br, struct malloc_type *type); - - #endif Modified: head/sys/sys/bus.h ============================================================================== --- head/sys/sys/bus.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/bus.h Tue Sep 1 22:12:58 2020 (r365223) @@ -311,7 +311,7 @@ struct resource_map { bus_size_t r_size; void *r_vaddr; }; - + /** * @brief Optional properties of a resource mapping request. */ Modified: head/sys/sys/bus_dma_internal.h ============================================================================== --- head/sys/sys/bus_dma_internal.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/bus_dma_internal.h Tue Sep 1 22:12:58 2020 (r365223) @@ -58,4 +58,3 @@ void _bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap void *callback_arg); #endif /* !_BUS_DMA_INTERNAL_H_ */ - Modified: head/sys/sys/cdio.h ============================================================================== --- head/sys/sys/cdio.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/cdio.h Tue Sep 1 22:12:58 2020 (r365223) @@ -108,7 +108,6 @@ struct cd_sub_channel_info { } what; }; - /***************************************************************\ * Ioctls for the CD drive * \***************************************************************/ @@ -121,14 +120,12 @@ struct ioc_play_track { }; #define CDIOCPLAYTRACKS _IOW('c',1,struct ioc_play_track) - struct ioc_play_blocks { int blk; int len; }; #define CDIOCPLAYBLOCKS _IOW('c',2,struct ioc_play_blocks) - struct ioc_read_subchannel { u_char address_format; #define CD_LBA_FORMAT 1 @@ -144,7 +141,6 @@ struct ioc_read_subchannel { }; #define CDIOCREADSUBCHANNEL _IOWR('c', 3 , struct ioc_read_subchannel ) - struct ioc_toc_header { u_short len; u_char starting_track; @@ -152,7 +148,6 @@ struct ioc_toc_header { }; #define CDIOREADTOCHEADER _IOR('c',4,struct ioc_toc_header) - struct ioc_read_toc_entry { u_char address_format; u_char starting_track; @@ -161,7 +156,6 @@ struct ioc_read_toc_entry { }; #define CDIOREADTOCENTRYS _IOWR('c',5,struct ioc_read_toc_entry) - struct ioc_read_toc_single_entry { u_char address_format; u_char track; @@ -169,13 +163,11 @@ struct ioc_read_toc_single_entry { }; #define CDIOREADTOCENTRY _IOWR('c',6,struct ioc_read_toc_single_entry) - struct ioc_patch { u_char patch[4]; /* one for each channel */ }; #define CDIOCSETPATCH _IOW('c',9,struct ioc_patch) - struct ioc_vol { u_char vol[4]; /* one for each channel */ }; @@ -210,7 +202,6 @@ struct ioc_vol { #define CDIOCEJECT _IO('c',24) - struct ioc_play_msf { u_char start_m; u_char start_s; @@ -229,7 +220,6 @@ struct ioc_play_msf { /*<1>causes the drive to close its door*/ /*<1>and make the media (if any) ready*/ #define CDIOCCLOSE _IO('c',28) /*<1>*/ - struct ioc_pitch { /*<1>For drives that support it, this*/ /*<1>call instructs the drive to play the*/ Modified: head/sys/sys/chio.h ============================================================================== --- head/sys/sys/chio.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/chio.h Tue Sep 1 22:12:58 2020 (r365223) @@ -248,7 +248,6 @@ struct changer_element_status_request { struct changer_element_status *cesr_element_status; }; - struct changer_set_voltag_request { u_int16_t csvr_type; u_int16_t csvr_addr; @@ -263,7 +262,6 @@ struct changer_set_voltag_request { changer_voltag_t csvr_voltag; }; - #define CESTATUS_BITS \ "\20\6INENAB\5EXENAB\4ACCESS\3EXCEPT\2IMPEXP\1FULL" Modified: head/sys/sys/cnv.h ============================================================================== --- head/sys/sys/cnv.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/cnv.h Tue Sep 1 22:12:58 2020 (r365223) @@ -75,7 +75,6 @@ int cnvlist_get_descriptor(const void *cookie); const int *cnvlist_get_descriptor_array(const void *cookie, size_t *nitemsp); #endif - /* * The cnvlist_take functions returns value associated with the given cookie and * remove the given entry from the nvlist. Modified: head/sys/sys/conf.h ============================================================================== --- head/sys/sys/conf.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/conf.h Tue Sep 1 22:12:58 2020 (r365223) @@ -272,7 +272,7 @@ struct make_dev_args { void make_dev_args_init_impl(struct make_dev_args *_args, size_t _sz); #define make_dev_args_init(a) \ make_dev_args_init_impl((a), sizeof(struct make_dev_args)) - + void delist_dev(struct cdev *_dev); void destroy_dev(struct cdev *_dev); int destroy_dev_sched(struct cdev *dev); Modified: head/sys/sys/copyright.h ============================================================================== --- head/sys/sys/copyright.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/copyright.h Tue Sep 1 22:12:58 2020 (r365223) @@ -27,7 +27,6 @@ * $FreeBSD$ */ - /* Copyrights macros */ /* Add a FreeBSD vendor copyright here */ Modified: head/sys/sys/disk.h ============================================================================== --- head/sys/sys/disk.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/disk.h Tue Sep 1 22:12:58 2020 (r365223) @@ -63,7 +63,7 @@ void disk_err(struct bio *bp, const char *what, int bl * Enable/Disable (the argument is boolean) the device for kernel * core dumps. */ - + #define DIOCGFRONTSTUFF _IOR('d', 134, off_t) /* * Many disk formats have some amount of space reserved at the Modified: head/sys/sys/domainset.h ============================================================================== --- head/sys/sys/domainset.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/domainset.h Tue Sep 1 22:12:58 2020 (r365223) @@ -43,7 +43,6 @@ sizeof("::") + sizeof(__XSTRING(DOMAINSET_POLICY_MAX)) + \ sizeof(__XSTRING(MAXMEMDOM))) - #define DOMAINSET_CLR(n, p) BIT_CLR(DOMAINSET_SETSIZE, n, p) #define DOMAINSET_COPY(f, t) BIT_COPY(DOMAINSET_SETSIZE, f, t) #define DOMAINSET_ISSET(n, p) BIT_ISSET(DOMAINSET_SETSIZE, n, p) Modified: head/sys/sys/endian.h ============================================================================== --- head/sys/sys/endian.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/endian.h Tue Sep 1 22:12:58 2020 (r365223) @@ -39,22 +39,22 @@ typedef __uint8_t uint8_t; #define _UINT8_T_DECLARED #endif - + #ifndef _UINT16_T_DECLARED typedef __uint16_t uint16_t; #define _UINT16_T_DECLARED #endif - + #ifndef _UINT32_T_DECLARED typedef __uint32_t uint32_t; #define _UINT32_T_DECLARED #endif - + #ifndef _UINT64_T_DECLARED typedef __uint64_t uint64_t; #define _UINT64_T_DECLARED #endif - + /* * General byte order swapping functions. */ Modified: head/sys/sys/event.h ============================================================================== --- head/sys/sys/event.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/event.h Tue Sep 1 22:12:58 2020 (r365223) @@ -230,7 +230,6 @@ struct knlist { int kl_autodestroy; }; - #ifdef _KERNEL /* Modified: head/sys/sys/fail.h ============================================================================== --- head/sys/sys/fail.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/fail.h Tue Sep 1 22:12:58 2020 (r365223) @@ -328,7 +328,6 @@ __END_DECLS _FAIL_POINT_EVAL(name, true, code) \ } while (0) - /** * Instantiate a failpoint which runs arbitrary code when triggered. * @param parent The parent sysctl under which to locate the sysctl Modified: head/sys/sys/fcntl.h ============================================================================== --- head/sys/sys/fcntl.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/fcntl.h Tue Sep 1 22:12:58 2020 (r365223) @@ -327,7 +327,6 @@ struct __oflock { #define POSIX_FADV_NOREUSE 5 /* access data only once */ #endif - #ifdef __BSD_VISIBLE /* * Magic value that specify that corresponding file descriptor to filename Modified: head/sys/sys/fdcio.h ============================================================================== --- head/sys/sys/fdcio.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/fdcio.h Tue Sep 1 22:12:58 2020 (r365223) @@ -125,7 +125,6 @@ enum fd_drivetype { FDT_288M }; - #define FD_FORM _IOW('F', 61, struct fd_formb) /* format a track */ #define FD_GTYPE _IOR('F', 62, struct fd_type) /* get drive type */ #define FD_STYPE _IOW('F', 63, struct fd_type) /* set drive type */ Modified: head/sys/sys/imgact_aout.h ============================================================================== --- head/sys/sys/imgact_aout.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/imgact_aout.h Tue Sep 1 22:12:58 2020 (r365223) @@ -70,7 +70,6 @@ N_GETMAGIC_NET(ex) != OMAGIC && N_GETMAGIC_NET(ex) != NMAGIC && \ N_GETMAGIC_NET(ex) != ZMAGIC && N_GETMAGIC_NET(ex) != QMAGIC) - /* Address of the bottom of the text segment. */ /* * This can not be done right. Abuse a_entry in some cases to handle kernels. Modified: head/sys/sys/intr.h ============================================================================== --- head/sys/sys/intr.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/intr.h Tue Sep 1 22:12:58 2020 (r365223) @@ -44,7 +44,7 @@ enum intr_map_data_type { INTR_MAP_DATA_FDT, INTR_MAP_DATA_GPIO, INTR_MAP_DATA_MSI, - + /* Placeholders for platform specific types */ INTR_MAP_DATA_PLAT_1 = 1000, INTR_MAP_DATA_PLAT_2, Modified: head/sys/sys/iov.h ============================================================================== --- head/sys/sys/iov.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/iov.h Tue Sep 1 22:12:58 2020 (r365223) @@ -256,4 +256,3 @@ struct pci_iov_arg #define IOV_GET_SCHEMA _IOWR('p', 12, struct pci_iov_schema) #endif - Modified: head/sys/sys/ipmi.h ============================================================================== --- head/sys/sys/ipmi.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/ipmi.h Tue Sep 1 22:12:58 2020 (r365223) @@ -127,7 +127,6 @@ struct ipmi_cmdspec { unsigned char cmd; }; - struct ipmi_addr { int addr_type; short channel; Modified: head/sys/sys/kernel.h ============================================================================== --- head/sys/sys/kernel.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/kernel.h Tue Sep 1 22:12:58 2020 (r365223) @@ -175,7 +175,6 @@ enum sysinit_sub_id { SI_SUB_LAST = 0xfffffff /* final initialization */ }; - /* * Some enumerated orders; "ANY" sorts last. */ @@ -191,7 +190,6 @@ enum sysinit_elem_order { SI_ORDER_MIDDLE = 0x1000000, /* somewhere in the middle */ SI_ORDER_ANY = 0xfffffff /* last*/ }; - /* * A system initialization call instance Modified: head/sys/sys/kobj.h ============================================================================== --- head/sys/sys/kobj.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/kobj.h Tue Sep 1 22:12:58 2020 (r365223) @@ -175,7 +175,6 @@ struct kobj_class classvar = { \ #name, methods, size, name ## _baseclasses \ } - /* * Compile the method table in a class. */ @@ -252,7 +251,6 @@ extern u_int kobj_lookup_misses; kobj_method_t* kobj_lookup_method(kobj_class_t cls, kobj_method_t **cep, kobjop_desc_t desc); - /* * Default method implementation. Returns ENXIO. Modified: head/sys/sys/kthread.h ============================================================================== --- head/sys/sys/kthread.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/kthread.h Tue Sep 1 22:12:58 2020 (r365223) @@ -77,5 +77,4 @@ void kthread_start(const void *); int kthread_suspend(struct thread *, int); void kthread_suspend_check(void); - #endif /* !_SYS_KTHREAD_H_ */ Modified: head/sys/sys/libkern.h ============================================================================== --- head/sys/sys/libkern.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/libkern.h Tue Sep 1 22:12:58 2020 (r365223) @@ -88,7 +88,6 @@ validbcd(int bcd) return (bcd == 0 || (bcd > 0 && bcd <= 0x99 && bcd2bin_data[bcd] != 0)); } - static __inline int imax(int a, int b) { return (a > b ? a : b); } static __inline int imin(int a, int b) { return (a < b ? a : b); } static __inline long lmax(long a, long b) { return (a > b ? a : b); } @@ -113,7 +112,6 @@ static __inline __uintmax_t ummin(__uintmax_t a, __uin } static __inline off_t omax(off_t a, off_t b) { return (a > b ? a : b); } static __inline off_t omin(off_t a, off_t b) { return (a < b ? a : b); } - static __inline int abs(int a) { return (a < 0 ? -a : a); } static __inline long labs(long a) { return (a < 0 ? -a : a); } static __inline quad_t qabs(quad_t a) { return (a < 0 ? -a : a); } Modified: head/sys/sys/linker.h ============================================================================== --- head/sys/sys/linker.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/linker.h Tue Sep 1 22:12:58 2020 (r365223) @@ -193,7 +193,6 @@ int linker_search_symbol_name_flags(caddr_t value, cha int linker_search_symbol_name(caddr_t value, char *buf, u_int buflen, long *offset); - /* HWPMC helper */ void *linker_hwpmc_list_objects(void); Modified: head/sys/sys/lock.h ============================================================================== --- head/sys/sys/lock.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/lock.h Tue Sep 1 22:12:58 2020 (r365223) @@ -137,7 +137,6 @@ struct lock_class { #define LOCK_LOG_TEST(lo, flags) 0 #endif - #define LOCK_LOG_LOCK(opname, lo, flags, recurse, file, line) do { \ if (LOCK_LOG_TEST((lo), (flags))) \ CTR6(KTR_LOCK, opname " (%s) %s %p r = %d at %s:%d", \ Modified: head/sys/sys/lock_profile.h ============================================================================== --- head/sys/sys/lock_profile.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/lock_profile.h Tue Sep 1 22:12:58 2020 (r365223) @@ -29,7 +29,6 @@ * $FreeBSD$ */ - #ifndef _SYS_LOCK_PROFILE_H_ #define _SYS_LOCK_PROFILE_H_ @@ -51,7 +50,6 @@ void lock_profile_obtain_lock_success(struct lock_obje uint64_t waittime, const char *file, int line); void lock_profile_release_lock(struct lock_object *lo); void lock_profile_thread_exit(struct thread *td); - static inline void lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested, Modified: head/sys/sys/lockstat.h ============================================================================== --- head/sys/sys/lockstat.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/lockstat.h Tue Sep 1 22:12:58 2020 (r365223) @@ -26,7 +26,7 @@ * * $FreeBSD$ */ - + /* * DTrace lockstat provider definitions */ Modified: head/sys/sys/mtio.h ============================================================================== --- head/sys/sys/mtio.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/mtio.h Tue Sep 1 22:12:58 2020 (r365223) @@ -174,7 +174,7 @@ struct scsi_tape_errors { u_int64_t nbytes; /* total # bytes processed */ } wterr, rderr; }; - + union mterrstat { struct scsi_tape_errors scsi_errstat; char _reserved_padding[256]; @@ -239,7 +239,6 @@ struct mtextget { #define MT_DENS_WRITE_OK 0x80 #define MT_DENS_DUP 0x40 #define MT_DENS_DEFLT 0x20 - #define MT_PARAM_FIXED_STR_LEN 32 union mt_param_value { Modified: head/sys/sys/pmc.h ============================================================================== --- head/sys/sys/pmc.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/pmc.h Tue Sep 1 22:12:58 2020 (r365223) @@ -356,14 +356,12 @@ enum pmc_event { __PMC_OP(CLOSELOG, "Close log file") \ __PMC_OP(GETDYNEVENTINFO, "Get dynamic events list") - enum pmc_ops { #undef __PMC_OP #define __PMC_OP(N, D) PMC_OP_##N, __PMC_OPS() }; - /* * Flags used in operations on PMCs. */ @@ -414,7 +412,6 @@ typedef uint64_t pmc_value_t; * number of hardware PMCs on this cpu. */ - #define PMC_ID_TO_ROWINDEX(ID) ((ID) & 0xFF) #define PMC_ID_TO_CLASS(ID) (((ID) & 0xF00) >> 8) #define PMC_ID_TO_MODE(ID) (((ID) & 0xFF000) >> 12) @@ -487,7 +484,6 @@ struct pmc_op_pmcsetcount { pmc_id_t pm_pmcid; /* PMC id to set */ }; - /* * OP PMCRW * @@ -495,14 +491,12 @@ struct pmc_op_pmcsetcount { * to have been previously allocated using PMCALLOCATE. */ - struct pmc_op_pmcrw { uint32_t pm_flags; /* PMC_F_{OLD,NEW}VALUE*/ pmc_id_t pm_pmcid; /* pmc id */ pmc_value_t pm_value; /* new&returned value */ }; - /* * OP GETPMCINFO * @@ -528,14 +522,12 @@ struct pmc_op_getpmcinfo { struct pmc_info pm_pmcs[]; /* space for 'npmc' structures */ }; - /* * OP GETCPUINFO * * Retrieve system CPU information. */ - struct pmc_classinfo { enum pmc_class pm_class; /* class id */ uint32_t pm_caps; /* counter capabilities */ @@ -1000,7 +992,6 @@ struct pmc_binding { int pb_cpu; /* if so, to which CPU */ }; - struct pmc_mdep; /* @@ -1137,7 +1128,7 @@ extern struct pmc_debugflags pmc_debugflags; CTR6(KTR_PMC, #M ":" #N ":" #L ": " F, p1, p2, p3, p4, \ p5, p6); \ } while (0) - + /* Major numbers */ #define PMC_DEBUG_MAJ_CPU 0 /* cpu switches */ #define PMC_DEBUG_MAJ_CSW 1 /* context switches */ Modified: head/sys/sys/posix4.h ============================================================================== --- head/sys/sys/posix4.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/posix4.h Tue Sep 1 22:12:58 2020 (r365223) @@ -55,7 +55,6 @@ int sys_ ## SC (struct thread *td, struct SC##_args *u return syscall_not_present(td, #SC , (struct nosys_args *)uap); \ } - MALLOC_DECLARE(M_P31B); int p31b_proc(struct proc *, pid_t, struct proc **); @@ -75,7 +74,6 @@ void p31b_unsetcfg(int); */ enum ksched_op { - #define KSCHED_OP_RW { 1, 0, 1, 0, 0, 0, 0, 0 } SCHED_SETPARAM, Modified: head/sys/sys/power.h ============================================================================== --- head/sys/sys/power.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/power.h Tue Sep 1 22:12:58 2020 (r365223) @@ -64,4 +64,3 @@ typedef void (*power_profile_change_hook)(void *, int) EVENTHANDLER_DECLARE(power_profile_change, power_profile_change_hook); #endif /* !_SYS_POWER_H_ */ - Modified: head/sys/sys/proc.h ============================================================================== --- head/sys/sys/proc.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/proc.h Tue Sep 1 22:12:58 2020 (r365223) @@ -859,7 +859,6 @@ extern pid_t pid_max; #define SESS_LEADER(p) ((p)->p_session->s_leader == (p)) - /* Lock and unlock a process. */ #define PROC_LOCK(p) mtx_lock(&(p)->p_mtx) #define PROC_TRYLOCK(p) mtx_trylock(&(p)->p_mtx) Modified: head/sys/sys/queue.h ============================================================================== --- head/sys/sys/queue.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/queue.h Tue Sep 1 22:12:58 2020 (r365223) @@ -437,7 +437,6 @@ struct { \ (head2)->stqh_last = &STAILQ_FIRST(head2); \ } while (0) - /* * List declarations. */ Modified: head/sys/sys/random.h ============================================================================== --- head/sys/sys/random.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/random.h Tue Sep 1 22:12:58 2020 (r365223) @@ -153,7 +153,6 @@ void random_harvest_deregister_source(enum random_entr #define random_harvest_queue_ether(a, b) do {} while (0) #endif /* defined(RANDOM_ENABLE_ETHER) */ - #endif /* _KERNEL */ #define GRND_NONBLOCK 0x1 Modified: head/sys/sys/rwlock.h ============================================================================== --- head/sys/sys/rwlock.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/rwlock.h Tue Sep 1 22:12:58 2020 (r365223) @@ -209,7 +209,6 @@ void __rw_assert(const volatile uintptr_t *c, int what __rw_assert(&(rw)->rw_lock, w, f, l) #endif - /* * Public interface for lock operations. */ Modified: head/sys/sys/serial.h ============================================================================== --- head/sys/sys/serial.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/serial.h Tue Sep 1 22:12:58 2020 (r365223) @@ -35,7 +35,6 @@ #ifndef _SYS_SERIAL_H_ #define _SYS_SERIAL_H_ - /* * Indentification of modem control signals. These definitions match * the TIOCMGET definitions in shifted a bit down, and Modified: head/sys/sys/socket.h ============================================================================== --- head/sys/sys/socket.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/socket.h Tue Sep 1 22:12:58 2020 (r365223) @@ -73,7 +73,7 @@ typedef __sa_family_t sa_family_t; typedef __socklen_t socklen_t; #define _SOCKLEN_T_DECLARED #endif - + #ifndef _SSIZE_T_DECLARED typedef __ssize_t ssize_t; #define _SSIZE_T_DECLARED @@ -618,7 +618,6 @@ struct omsghdr { #define PRU_FLUSH_WR SHUT_WR #define PRU_FLUSH_RDWR SHUT_RDWR #endif - #if __BSD_VISIBLE /* Modified: head/sys/sys/sockopt.h ============================================================================== --- head/sys/sys/sockopt.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/sockopt.h Tue Sep 1 22:12:58 2020 (r365223) @@ -39,7 +39,6 @@ #error "no user-serviceable parts inside" #endif - struct thread; struct socket; Modified: head/sys/sys/soundcard.h ============================================================================== --- head/sys/sys/soundcard.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/soundcard.h Tue Sep 1 22:12:58 2020 (r365223) @@ -802,7 +802,6 @@ typedef struct { #define SNDCTL_DSP_SUBDIVIDE _IOWR('P', 9, int) #define SNDCTL_DSP_SETFRAGMENT _IOWR('P',10, int) - #define SNDCTL_DSP_GETFMTS _IOR ('P',11, int) /* Returns a mask */ /* * Buffer status queries. @@ -1046,7 +1045,6 @@ typedef struct copr_msg { #define SOUND_MIXER_RADIO 23 /* Radio in */ #define SOUND_MIXER_MONITOR 24 /* Monitor (usually mic) volume */ - /* * Some on/off settings (SOUND_SPECIAL_MIN - SOUND_SPECIAL_MAX) * Not counted to SOUND_MIXER_NRDEVICES, but use the same number space @@ -1420,7 +1418,6 @@ void seqbuf_dump(void); /* This function must be provi #define SEQ_BENDER(dev, chn, value) \ _CHN_COMMON(dev, MIDI_PITCH_BEND, chn, 0, 0, value) - #define SEQ_V2_X_CONTROL(dev, voice, controller, value) { \ _SEQ_NEEDBUF(8);\ _seqbuf[_seqbufptr] = SEQ_EXTENDED;\ @@ -1595,7 +1592,6 @@ typedef struct audio_errinfo #define SNDCTL_DSP_GETPLAYVOL _IOR ('P', 24, int) #define SNDCTL_DSP_SETPLAYVOL _IOWR('P', 24, int) #define SNDCTL_DSP_GETERROR _IOR ('P', 25, audio_errinfo) - /* **************************************************************************** Modified: head/sys/sys/stats.h ============================================================================== --- head/sys/sys/stats.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/stats.h Tue Sep 1 22:12:58 2020 (r365223) @@ -557,7 +557,6 @@ extern const struct voistatdata_numeric numeric_limits #define STATS_VSS_DVHIST64_USR(vals, vsdflags) \ STATS_VSS_HIST(VSD_DTYPE_DVHIST64, HIST_HLPR_INFO(VSD_DTYPE_DVHIST64, \ BKT_USR, vsdflags, 0, 0, HIST_HLPR_INFO_USR_FIELDS(vals))) - #define DRBKT(lb, ub) { stats_ctor_vsd_numeric(lb), stats_ctor_vsd_numeric(ub) } #define DVBKT(val) DRBKT(val, val) #define CRBKT(lb) DRBKT(lb, lb) @@ -583,7 +582,7 @@ extern const struct voistatdata_numeric numeric_limits VSD_HIST_FIELD(hist, , hist_dtype, (void *)&,field) #define VSD_CONSTHIST_FIELDPTR(hist, hist_dtype, field) \ VSD_HIST_FIELD(hist, const, hist_dtype, (void *)&,field) - + #define VSD_CRHIST_FIELD(hist, cnst, hist_dtype, op, field) \ (VSD_DTYPE_CRHIST32 == (hist_dtype) ? \ op(_VSD(cnst, crhist32, hist)->field) : \ Modified: head/sys/sys/stdatomic.h ============================================================================== --- head/sys/sys/stdatomic.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/stdatomic.h Tue Sep 1 22:12:58 2020 (r365223) @@ -373,7 +373,6 @@ __extension__ ({ \ typedef struct { atomic_bool __flag; } atomic_flag; - #define ATOMIC_FLAG_INIT { ATOMIC_VAR_INIT(0) } static __inline _Bool Modified: head/sys/sys/sysproto.h ============================================================================== --- head/sys/sys/sysproto.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/sysproto.h Tue Sep 1 22:12:58 2020 (r365223) @@ -2404,7 +2404,6 @@ int ogetdirentries(struct thread *, struct ogetdirentr #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 struct freebsd4_getfsstat_args { @@ -2465,7 +2464,6 @@ int freebsd4_sigreturn(struct thread *, struct freebsd #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 struct freebsd6_pread_args { @@ -2531,7 +2529,6 @@ int freebsd6_lio_listio(struct thread *, struct freebs #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 struct freebsd7___semctl_args { @@ -2556,14 +2553,12 @@ int freebsd7_shmctl(struct thread *, struct freebsd7_s #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 int freebsd10_pipe(struct thread *, struct freebsd10_pipe_args *); #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 struct freebsd11_mknod_args { @@ -2670,7 +2665,6 @@ int freebsd11_fstatat(struct thread *, struct freebsd1 int freebsd11_mknodat(struct thread *, struct freebsd11_mknodat_args *); #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 Modified: head/sys/sys/systm.h ============================================================================== --- head/sys/sys/systm.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/systm.h Tue Sep 1 22:12:58 2020 (r365223) @@ -167,7 +167,7 @@ void kassert_panic(const char *fmt, ...) __printflike */ #define CRITICAL_ASSERT(td) \ KASSERT((td)->td_critnest >= 1, ("Not in critical section")); - + /* * If we have already panic'd and this is the thread that called * panic(), then don't block on any mutexes but silently succeed. @@ -268,7 +268,6 @@ void tablefull(const char *); extern int (*lkpi_alloc_current)(struct thread *, int); int linux_alloc_current_noop(struct thread *, int); - #if defined(KLD_MODULE) || defined(KTR_CRITICAL) || !defined(_KERNEL) || defined(GENOFFSET) #define critical_enter() critical_enter_KBI() #define critical_exit() critical_exit_KBI() @@ -300,7 +299,6 @@ critical_exit(void) } #endif - #ifdef EARLY_PRINTF typedef void early_putc_t(int ch); extern early_putc_t *early_putc; @@ -564,7 +562,6 @@ struct root_hold_token *root_mount_hold(const char *id void root_mount_hold_token(const char *identifier, struct root_hold_token *h); void root_mount_rel(struct root_hold_token *h); int root_mounted(void); - /* * Unit number allocation API. (kern/subr_unit.c) Modified: head/sys/sys/tiio.h ============================================================================== --- head/sys/sys/tiio.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/tiio.h Tue Sep 1 22:12:58 2020 (r365223) @@ -268,7 +268,6 @@ struct tg_mem { int len; }; - typedef enum { TI_PARAM_NONE = 0x00, TI_PARAM_STAT_TICKS = 0x01, Modified: head/sys/sys/tim_filter.h ============================================================================== --- head/sys/sys/tim_filter.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/tim_filter.h Tue Sep 1 22:12:58 2020 (r365223) @@ -102,7 +102,6 @@ get_cur_timelim(struct time_filter *tf) return(tf->cur_time_limit); } - int setup_time_filter_small(struct time_filter_small *tf, int fil_type, uint32_t time_len); void reset_time_small(struct time_filter_small *tf, uint32_t time_len); @@ -128,7 +127,6 @@ get_cur_timelim_small(struct time_filter_small *tf) { return(tf->cur_time_limit); } - #endif #endif Modified: head/sys/sys/timeet.h ============================================================================== --- head/sys/sys/timeet.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/timeet.h Tue Sep 1 22:12:58 2020 (r365223) @@ -105,4 +105,3 @@ int et_free(struct eventtimer *et); SYSCTL_DECL(_kern_eventtimer); #endif #endif /* !_SYS_TIMETC_H_ */ - Modified: head/sys/sys/timepps.h ============================================================================== --- head/sys/sys/timepps.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/timepps.h Tue Sep 1 22:12:58 2020 (r365223) @@ -81,7 +81,6 @@ typedef struct { #define assert_offset_ntpfp assert_off_tu.ntpfp #define clear_offset_ntpfp clear_off_tu.ntpfp - #define PPS_CAPTUREASSERT 0x01 #define PPS_CAPTURECLEAR 0x02 #define PPS_CAPTUREBOTH 0x03 Modified: head/sys/sys/tree.h ============================================================================== --- head/sys/sys/tree.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/tree.h Tue Sep 1 22:12:58 2020 (r365223) @@ -99,7 +99,7 @@ struct { \ SPLAY_RIGHT(tmp, field) = (head)->sph_root; \ (head)->sph_root = tmp; \ } while (/*CONSTCOND*/ 0) - + #define SPLAY_ROTATE_LEFT(head, tmp, field) do { \ SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field); \ SPLAY_LEFT(tmp, field) = (head)->sph_root; \ @@ -459,7 +459,6 @@ struct { \ RB_GENERATE_PREV(name, type, field, attr) \ RB_GENERATE_MINMAX(name, type, field, attr) \ RB_GENERATE_REINSERT(name, type, field, cmp, attr) - #define RB_GENERATE_INSERT_COLOR(name, type, field, attr) \ attr void \ Modified: head/sys/sys/vnode.h ============================================================================== --- head/sys/sys/vnode.h Tue Sep 1 22:12:32 2020 (r365222) +++ head/sys/sys/vnode.h Tue Sep 1 22:12:58 2020 (r365223) @@ -522,7 +522,6 @@ extern struct vnodeop_desc *vnodeop_descs[]; #define VOPARG_OFFSETTO(s_type, s_offset, struct_p) \ ((s_type)(((char*)(struct_p)) + (s_offset))) - #ifdef DEBUG_VFS_LOCKS /* * Support code to aid in debugging VFS locking problems. Not totally @@ -569,7 +568,6 @@ void assert_vop_unlocked(struct vnode *vp, const char #define ASSERT_VOP_NOT_IN_SEQC(vp) ((void)0) #endif /* DEBUG_VFS_LOCKS */ - /* * This call works for vnodes in the kernel. From owner-svn-src-all@freebsd.org Tue Sep 1 22:13:30 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5214437F63C; Tue, 1 Sep 2020 22:13:30 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1YQ1Chbz3Tdk; Tue, 1 Sep 2020 22:13:30 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0CCBA202D9; Tue, 1 Sep 2020 22:13:30 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MDTx2062927; Tue, 1 Sep 2020 22:13:29 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MDT0O062922; Tue, 1 Sep 2020 22:13:29 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012213.081MDT0O062922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:13:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365224 - head/sys/xdr X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/xdr X-SVN-Commit-Revision: 365224 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:13:30 -0000 Author: mjg Date: Tue Sep 1 22:13:28 2020 New Revision: 365224 URL: https://svnweb.freebsd.org/changeset/base/365224 Log: xdr: clean up empty lines in .c and .h files Modified: head/sys/xdr/xdr.c head/sys/xdr/xdr_array.c head/sys/xdr/xdr_mbuf.c head/sys/xdr/xdr_mem.c head/sys/xdr/xdr_reference.c Modified: head/sys/xdr/xdr.c ============================================================================== --- head/sys/xdr/xdr.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr.c Tue Sep 1 22:13:28 2020 (r365224) @@ -81,7 +81,7 @@ void xdr_free(xdrproc_t proc, void *objp) { XDR x; - + x.x_op = XDR_FREE; (*proc)(&x, objp); } @@ -96,7 +96,6 @@ xdr_void(void) return (TRUE); } - /* * XDR integers */ @@ -106,7 +105,6 @@ xdr_int(XDR *xdrs, int *ip) long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (long) *ip; return (XDR_PUTLONG(xdrs, &l)); @@ -134,7 +132,6 @@ xdr_u_int(XDR *xdrs, u_int *up) u_long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (u_long) *up; return (XDR_PUTLONG(xdrs, (long *)&l)); @@ -153,7 +150,6 @@ xdr_u_int(XDR *xdrs, u_int *up) return (FALSE); } - /* * XDR long integers * same as xdr_u_long - open coded to save a proc call! @@ -192,7 +188,6 @@ xdr_u_long(XDR *xdrs, u_long *ulp) return (FALSE); } - /* * XDR 32-bit integers * same as xdr_uint32_t - open coded to save a proc call! @@ -203,7 +198,6 @@ xdr_int32_t(XDR *xdrs, int32_t *int32_p) long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (long) *int32_p; return (XDR_PUTLONG(xdrs, &l)); @@ -232,7 +226,6 @@ xdr_uint32_t(XDR *xdrs, uint32_t *uint32_p) u_long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (u_long) *uint32_p; return (XDR_PUTLONG(xdrs, (long *)&l)); @@ -251,7 +244,6 @@ xdr_uint32_t(XDR *xdrs, uint32_t *uint32_p) return (FALSE); } - /* * XDR short integers */ @@ -261,7 +253,6 @@ xdr_short(XDR *xdrs, short *sp) long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (long) *sp; return (XDR_PUTLONG(xdrs, &l)); @@ -289,7 +280,6 @@ xdr_u_short(XDR *xdrs, u_short *usp) u_long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (u_long) *usp; return (XDR_PUTLONG(xdrs, (long *)&l)); @@ -308,7 +298,6 @@ xdr_u_short(XDR *xdrs, u_short *usp) return (FALSE); } - /* * XDR 16-bit integers */ @@ -318,7 +307,6 @@ xdr_int16_t(XDR *xdrs, int16_t *int16_p) long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (long) *int16_p; return (XDR_PUTLONG(xdrs, &l)); @@ -346,7 +334,6 @@ xdr_uint16_t(XDR *xdrs, uint16_t *uint16_p) u_long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (u_long) *uint16_p; return (XDR_PUTLONG(xdrs, (long *)&l)); @@ -365,7 +352,6 @@ xdr_uint16_t(XDR *xdrs, uint16_t *uint16_p) return (FALSE); } - /* * XDR a char */ @@ -407,7 +393,6 @@ xdr_bool(XDR *xdrs, bool_t *bp) long lb; switch (xdrs->x_op) { - case XDR_ENCODE: lb = *bp ? XDR_TRUE : XDR_FALSE; return (XDR_PUTLONG(xdrs, &lb)); @@ -524,7 +509,6 @@ xdr_bytes(XDR *xdrs, char **cpp, u_int *sizep, u_int m * now deal with the actual bytes */ switch (xdrs->x_op) { - case XDR_DECODE: if (nodesize == 0) { return (TRUE); @@ -614,13 +598,11 @@ xdr_union(XDR *xdrs, (*dfault)(xdrs, unp)); } - /* * Non-portable xdr primitives. * Care should be taken when moving these routines to new architectures. */ - /* * XDR null terminated ASCII strings * xdr_string deals with "C strings" - arrays of bytes that are @@ -664,7 +646,6 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) * now deal with the actual bytes */ switch (xdrs->x_op) { - case XDR_DECODE: if (nodesize == 0) { return (TRUE); @@ -747,7 +728,6 @@ xdr_int64_t(XDR *xdrs, int64_t *llp) return (FALSE); } - /* * XDR unsigned 64-bit integers */ @@ -778,7 +758,6 @@ xdr_uint64_t(XDR *xdrs, uint64_t *ullp) return (FALSE); } - /* * XDR hypers */ @@ -793,7 +772,6 @@ xdr_hyper(XDR *xdrs, longlong_t *llp) return (xdr_int64_t(xdrs, (int64_t *)llp)); } - /* * XDR unsigned hypers */ @@ -808,7 +786,6 @@ xdr_u_hyper(XDR *xdrs, u_longlong_t *ullp) return (xdr_uint64_t(xdrs, (uint64_t *)ullp)); } - /* * XDR longlong_t's */ @@ -822,7 +799,6 @@ xdr_longlong_t(XDR *xdrs, longlong_t *llp) */ return (xdr_int64_t(xdrs, (int64_t *)llp)); } - /* * XDR u_longlong_t's Modified: head/sys/xdr/xdr_array.c ============================================================================== --- head/sys/xdr/xdr_array.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr_array.c Tue Sep 1 22:13:28 2020 (r365224) @@ -108,7 +108,7 @@ xdr_array(XDR *xdrs, case XDR_ENCODE: break; } - + /* * now we xdr each element of array */ Modified: head/sys/xdr/xdr_mbuf.c ============================================================================== --- head/sys/xdr/xdr_mbuf.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr_mbuf.c Tue Sep 1 22:13:28 2020 (r365224) @@ -93,7 +93,7 @@ xdrmbuf_append(XDR *xdrs, struct mbuf *madd) m_freem(madd); return; } - + m = (struct mbuf *) xdrs->x_private; m->m_next = madd; @@ -206,7 +206,7 @@ xdrmbuf_getbytes(XDR *xdrs, char *addr, u_int len) xdrs->x_handy = 0; } } - + return (TRUE); } @@ -241,7 +241,7 @@ xdrmbuf_putbytes(XDR *xdrs, const char *addr, u_int le xdrs->x_handy = 0; } } - + return (TRUE); } Modified: head/sys/xdr/xdr_mem.c ============================================================================== --- head/sys/xdr/xdr_mem.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr_mem.c Tue Sep 1 22:13:28 2020 (r365224) @@ -67,7 +67,7 @@ static bool_t xdrmem_setpos(XDR *, u_int); static int32_t *xdrmem_inline_aligned(XDR *, u_int); static int32_t *xdrmem_inline_unaligned(XDR *, u_int); static bool_t xdrmem_control(XDR *xdrs, int request, void *info); - + static const struct xdr_ops xdrmem_ops_aligned = { xdrmem_getlong_aligned, xdrmem_putlong_aligned, @@ -240,7 +240,6 @@ xdrmem_control(XDR *xdrs, int request, void *info) int len; switch (request) { - case XDR_GET_BYTES_AVAIL: xptr = (xdr_bytesrec *)info; xptr->xc_is_last_record = TRUE; @@ -269,7 +268,6 @@ xdrmem_control(XDR *xdrs, int request, void *info) xdrs->x_handy -= len; xdrs->x_private = (char *)xdrs->x_private + len; return (TRUE); - } return (FALSE); } Modified: head/sys/xdr/xdr_reference.c ============================================================================== --- head/sys/xdr/xdr_reference.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr_reference.c Tue Sep 1 22:13:28 2020 (r365224) @@ -97,7 +97,6 @@ xdr_reference(XDR *xdrs, return (stat); } - /* * xdr_pointer(): * From owner-svn-src-all@freebsd.org Tue Sep 1 22:13:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B46D437F6AF; Tue, 1 Sep 2020 22:13:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Yw4cV5z3Tvn; Tue, 1 Sep 2020 22:13:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8138E2090C; Tue, 1 Sep 2020 22:13:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MDuNC063019; Tue, 1 Sep 2020 22:13:56 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MDnJj062982; Tue, 1 Sep 2020 22:13:49 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012213.081MDnJj062982@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:13:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365225 - in head/sys/cam: . ata ctl mmc nvme scsi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/cam: . ata ctl mmc nvme scsi X-SVN-Commit-Revision: 365225 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:13:56 -0000 Author: mjg Date: Tue Sep 1 22:13:48 2020 New Revision: 365225 URL: https://svnweb.freebsd.org/changeset/base/365225 Log: cam: clean up empty lines in .c and .h files Modified: head/sys/cam/ata/ata_all.c head/sys/cam/ata/ata_da.c head/sys/cam/ata/ata_pmp.c head/sys/cam/cam.c head/sys/cam/cam.h head/sys/cam/cam_ccb.h head/sys/cam/cam_compat.c head/sys/cam/cam_compat.h head/sys/cam/cam_iosched.c head/sys/cam/cam_periph.c head/sys/cam/cam_queue.c head/sys/cam/cam_queue.h head/sys/cam/cam_sim.h head/sys/cam/cam_xpt.c head/sys/cam/cam_xpt.h head/sys/cam/cam_xpt_internal.h head/sys/cam/cam_xpt_sim.h head/sys/cam/ctl/README.ctl.txt head/sys/cam/ctl/ctl.c head/sys/cam/ctl/ctl_backend.c head/sys/cam/ctl/ctl_backend.h head/sys/cam/ctl/ctl_backend_block.c head/sys/cam/ctl/ctl_cmd_table.c head/sys/cam/ctl/ctl_frontend_ioctl.c head/sys/cam/ctl/ctl_frontend_iscsi.c head/sys/cam/ctl/ctl_ha.c head/sys/cam/ctl/ctl_io.h head/sys/cam/ctl/ctl_scsi_all.c head/sys/cam/ctl/ctl_ser_table.c head/sys/cam/ctl/ctl_tpc.c head/sys/cam/ctl/ctl_tpc_local.c head/sys/cam/ctl/scsi_ctl.c head/sys/cam/mmc/mmc_da.c head/sys/cam/mmc/mmc_xpt.c head/sys/cam/nvme/nvme_all.c head/sys/cam/nvme/nvme_da.c head/sys/cam/nvme/nvme_xpt.c head/sys/cam/scsi/scsi_all.c head/sys/cam/scsi/scsi_all.h head/sys/cam/scsi/scsi_cd.c head/sys/cam/scsi/scsi_cd.h head/sys/cam/scsi/scsi_ch.c head/sys/cam/scsi/scsi_da.c head/sys/cam/scsi/scsi_da.h head/sys/cam/scsi/scsi_enc.c head/sys/cam/scsi/scsi_enc_safte.c head/sys/cam/scsi/scsi_enc_ses.c head/sys/cam/scsi/scsi_message.h head/sys/cam/scsi/scsi_pass.c head/sys/cam/scsi/scsi_pt.c head/sys/cam/scsi/scsi_sa.c head/sys/cam/scsi/scsi_sa.h head/sys/cam/scsi/scsi_ses.h head/sys/cam/scsi/scsi_sg.c head/sys/cam/scsi/scsi_targ_bh.c head/sys/cam/scsi/scsi_target.c head/sys/cam/scsi/scsi_xpt.c head/sys/cam/scsi/smp_all.c Modified: head/sys/cam/ata/ata_all.c ============================================================================== --- head/sys/cam/ata/ata_all.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ata/ata_all.c Tue Sep 1 22:13:48 2020 (r365225) @@ -920,7 +920,6 @@ ata_string2mode(char *str) return (-1); } - u_int ata_mode2speed(int mode) { @@ -995,7 +994,7 @@ ata_identify_match(caddr_t identbuffer, caddr_t table_ { struct scsi_inquiry_pattern *entry; struct ata_params *ident; - + entry = (struct scsi_inquiry_pattern *)table_entry; ident = (struct ata_params *)identbuffer; @@ -1013,7 +1012,7 @@ ata_static_identify_match(caddr_t identbuffer, caddr_t { struct scsi_static_inquiry_pattern *entry; struct ata_params *ident; - + entry = (struct scsi_static_inquiry_pattern *)table_entry; ident = (struct ata_params *)identbuffer; @@ -1107,7 +1106,6 @@ semb_write_buffer(struct ccb_ataio *ataio, ata_28bit_cmd(ataio, ATA_SEP_ATTN, length > 0 ? data_ptr[0] : 0, 0x80, length / 4); } - void ata_zac_mgmt_out(struct ccb_ataio *ataio, uint32_t retries, Modified: head/sys/cam/ata/ata_da.c ============================================================================== --- head/sys/cam/ata/ata_da.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ata/ata_da.c Tue Sep 1 22:13:48 2020 (r365225) @@ -211,7 +211,6 @@ static struct ada_zone_desc { {ADA_ZONE_FLAG_RWP_SUP, "Reset Write Pointer" }, }; - /* Offsets into our private area for storing information */ #define ccb_state ppriv_field0 #define ccb_bp ppriv_ptr1 @@ -1009,7 +1008,6 @@ adaclose(struct disk *dp) (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) != 0 && (periph->flags & CAM_PERIPH_INVALID) == 0 && cam_periph_hold(periph, PRIBIO) == 0) { - ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); cam_fill_ataio(&ccb->ataio, 1, @@ -1198,7 +1196,6 @@ adainit(void) printf("ada: Failed to attach master async callback " "due to status 0x%x!\n", status); } else if (ada_send_ordered) { - /* Register our event handlers */ if ((EVENTHANDLER_REGISTER(power_suspend, adasuspend, NULL, EVENTHANDLER_PRI_LAST)) == NULL) @@ -1462,7 +1459,6 @@ adazonesupsysctl(SYSCTL_HANDLER_ARGS) return (error); } - static void adasysctlinit(void *context, int pending) { @@ -2573,7 +2569,6 @@ out: break; } - ata_read_log(ataio, /*retries*/1, /*cbfcnp*/adadone, @@ -2838,7 +2833,6 @@ adazonedone(struct cam_periph *periph, union ccb *ccb) free(ccb->ataio.data_ptr, M_ATADA); } - static void adadone(struct cam_periph *periph, union ccb *done_ccb) { @@ -3082,8 +3076,6 @@ adadone(struct cam_periph *periph, union ccb *done_ccb /*getcount_only*/0); } } - - } free(ataio->data_ptr, M_ATADA); Modified: head/sys/cam/ata/ata_pmp.c ============================================================================== --- head/sys/cam/ata/ata_pmp.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ata/ata_pmp.c Tue Sep 1 22:13:48 2020 (r365225) @@ -274,7 +274,7 @@ pmpasync(void *callback_arg, u_int32_t code, { struct ccb_getdev *cgd; cam_status status; - + cgd = (struct ccb_getdev *)arg; if (cgd == NULL) break; Modified: head/sys/cam/cam.c ============================================================================== --- head/sys/cam/cam.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam.c Tue Sep 1 22:13:48 2020 (r365225) @@ -206,7 +206,6 @@ cam_strvis_sbuf(struct sbuf *sb, const u_int8_t *src, } } - /* * Compare string with pattern, returning 0 on match. * Short pattern matches trailing blanks in name, @@ -330,7 +329,6 @@ camstatusentrycomp(const void *key, const void *member return (status - table_entry->status_code); } - #ifdef _KERNEL char * cam_error_string(union ccb *ccb, char *str, int str_len, @@ -493,7 +491,6 @@ cam_error_string(struct cam_device *device, union ccb if ((proto_flags & CAM_ESF_PRINT_SENSE) && (ccb->csio.scsi_status == SCSI_STATUS_CHECK_COND) && (ccb->ccb_h.status & CAM_AUTOSNS_VALID)) { - #ifdef _KERNEL scsi_sense_sbuf(&ccb->csio, &sb, SSS_FLAG_NONE); Modified: head/sys/cam/cam.h ============================================================================== --- head/sys/cam/cam.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam.h Tue Sep 1 22:13:48 2020 (r365225) @@ -278,7 +278,6 @@ typedef enum { /* SCSI Bus Busy */ CAM_SCSI_BUSY = 0x3f, - /* * Flags */ @@ -304,7 +303,7 @@ typedef enum { /* * Target Specific Adjunct Status */ - + /* sent sense with status */ CAM_SENT_SENSE = 0x40000000 } cam_status; Modified: head/sys/cam/cam_ccb.h ============================================================================== --- head/sys/cam/cam_ccb.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_ccb.h Tue Sep 1 22:13:48 2020 (r365225) @@ -1111,7 +1111,6 @@ struct ccb_trans_settings { } xport_specific; }; - /* * Calculate the geometry parameters for a device * give the block size and volume size in blocks. @@ -1131,7 +1130,6 @@ struct ccb_calc_geometry { #define KNOB_VALID_ADDRESS 0x1 #define KNOB_VALID_ROLE 0x2 - #define KNOB_ROLE_NONE 0x0 #define KNOB_ROLE_INITIATOR 0x1 Modified: head/sys/cam/cam_compat.c ============================================================================== --- head/sys/cam/cam_compat.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_compat.c Tue Sep 1 22:13:48 2020 (r365225) @@ -373,7 +373,7 @@ cam_compat_translate_dev_match_0x18(union ccb *ccb) dm = ccb->cdm.matches; /* Translate in-place: old fields are smaller */ dm18 = (struct dev_match_result_0x18 *)(dm); - + for (i = 0; i < ccb->cdm.num_matches; i++) { dm18[i].type = dm[i].type; switch (dm[i].type) { @@ -420,4 +420,3 @@ cam_compat_translate_dev_match_0x18(union ccb *ccb) return (0); } - Modified: head/sys/cam/cam_compat.h ============================================================================== --- head/sys/cam/cam_compat.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_compat.h Tue Sep 1 22:13:48 2020 (r365225) @@ -40,7 +40,6 @@ int cam_compat_ioctl(struct cdev *dev, u_long cmd, cad struct thread *td, int(*cbfnp)(struct cdev *, u_long, caddr_t, int, struct thread *)); - /* Version 0x16 compatibility */ #define CAM_VERSION_0x16 0x16 Modified: head/sys/cam/cam_iosched.c ============================================================================== --- head/sys/cam/cam_iosched.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_iosched.c Tue Sep 1 22:13:48 2020 (r365225) @@ -241,7 +241,6 @@ struct iop_stats { struct cam_iosched_softc *softc; }; - typedef enum { set_max = 0, /* current = max */ read_latency, /* Steer read latency by throttling writes */ @@ -456,7 +455,6 @@ cam_iosched_iops_tick(struct iop_stats *ios) ios->l_value1 += new_ios; } - return 0; } @@ -542,7 +540,6 @@ cam_iosched_bw_caniop(struct iop_stats *ios, struct bi if (ios->current > 0 && ios->l_value1 <= 0) return EAGAIN; - return 0; } @@ -615,7 +612,6 @@ cam_iosched_ticker(void *arg) isc->total_ticks++; } - static void cam_iosched_cl_init(struct control_loop *clp, struct cam_iosched_softc *isc) { @@ -790,7 +786,6 @@ cam_iosched_has_more_trim(struct cam_iosched_softc *is #define cam_iosched_sort_queue(isc) ((isc)->sort_io_queue >= 0 ? \ (isc)->sort_io_queue : cam_sort_io_queues) - static inline bool cam_iosched_has_work(struct cam_iosched_softc *isc) Modified: head/sys/cam/cam_periph.c ============================================================================== --- head/sys/cam/cam_periph.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_periph.c Tue Sep 1 22:13:48 2020 (r365225) @@ -217,7 +217,6 @@ cam_periph_alloc(periph_ctor_t *periph_ctor, * handler. If it looks like a mistaken re-allocation, complain. */ if ((periph = cam_periph_find(path, name)) != NULL) { - if ((periph->flags & CAM_PERIPH_INVALID) != 0 && (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) == 0) { periph->flags |= CAM_PERIPH_NEW_DEV_FOUND; @@ -233,16 +232,15 @@ cam_periph_alloc(periph_ctor_t *periph_ctor, } return (CAM_REQ_INVALID); } - + periph = (struct cam_periph *)malloc(sizeof(*periph), M_CAMPERIPH, M_NOWAIT|M_ZERO); if (periph == NULL) return (CAM_RESRC_UNAVAIL); - + init_level++; - sim = xpt_path_sim(path); path_id = xpt_path_path_id(path); target_id = xpt_path_target_id(path); @@ -342,7 +340,6 @@ cam_periph_find(struct cam_path *path, char *name) xpt_lock_buses(); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { - if (name != NULL && (strcmp((*p_drv)->driver_name, name) != 0)) continue; @@ -380,7 +377,6 @@ retry: count = 0; xpt_lock_buses(); for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) { - TAILQ_FOREACH(periph, &(*p_drv)->units, unit_links) { if (xpt_path_comp(periph->path, path) != 0) continue; @@ -468,7 +464,7 @@ cam_periph_release(struct cam_periph *periph) if (periph == NULL) return; - + cam_periph_assert(periph, MA_NOTOWNED); mtx = cam_periph_mtx(periph); mtx_lock(mtx); @@ -549,7 +545,6 @@ camperiphnextunit(struct periph_driver *p_drv, u_int n periph_name = p_drv->driver_name; for (;;newunit++) { - for (periph = TAILQ_FIRST(&p_drv->units); periph != NULL && periph->unit_number != newunit; periph = TAILQ_NEXT(periph, unit_links)) @@ -930,7 +925,6 @@ cam_periph_mapmem(union ccb *ccb, struct cam_periph_ma PHOLD(curproc); for (i = 0; i < numbufs; i++) { - /* Save the user's data address. */ mapinfo->orig[i] = *data_ptrs[i]; @@ -1146,7 +1140,6 @@ cam_periph_ioctl(struct cam_periph *periph, u_long cmd ccb->cgdl.index = 0; ccb->cgdl.status = CAM_GDEVLIST_MORE_DEVS; while (ccb->cgdl.status == CAM_GDEVLIST_MORE_DEVS) { - /* we want the next device in the list */ xpt_action(ccb); if (strncmp(ccb->cgdl.periph_name, @@ -2032,7 +2025,6 @@ cam_periph_error(union ccb *ccb, cam_flags camflags, xpt_path_path_id(ccb->ccb_h.path), xpt_path_target_id(ccb->ccb_h.path), lun_id) == CAM_REQ_CMP) { - /* * Let peripheral drivers know that this * device has gone away. @@ -2052,7 +2044,6 @@ cam_periph_error(union ccb *ccb, cam_flags camflags, xpt_path_path_id(ccb->ccb_h.path), xpt_path_target_id(ccb->ccb_h.path), CAM_LUN_WILDCARD) == CAM_REQ_CMP) { - scan_ccb = xpt_alloc_ccb_nowait(); if (scan_ccb != NULL) { scan_ccb->ccb_h.path = newpath; Modified: head/sys/cam/cam_queue.c ============================================================================== --- head/sys/cam/cam_queue.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_queue.c Tue Sep 1 22:13:48 2020 (r365225) @@ -251,7 +251,7 @@ cam_ccbq_alloc(int openings) free(ccbq, M_CAMCCBQ); return (NULL); } - + return (ccbq); } @@ -348,7 +348,6 @@ heap_up(cam_pinfo **queue_array, int new_index) child = new_index; while (child != 1) { - parent = child >> 1; if (queue_cmp(queue_array, parent, child) <= 0) break; @@ -367,11 +366,10 @@ heap_down(cam_pinfo **queue_array, int index, int num_ { int child; int parent; - + parent = index; child = parent << 1; for (; child <= num_entries; child = parent << 1) { - if (child < num_entries) { /* child+1 is the right child of parent */ if (queue_cmp(queue_array, child + 1, child) < 0) Modified: head/sys/cam/cam_queue.h ============================================================================== --- head/sys/cam/cam_queue.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_queue.h Tue Sep 1 22:13:48 2020 (r365225) @@ -78,7 +78,6 @@ struct cam_devq { int send_active; }; - struct cam_devq *cam_devq_alloc(int devices, int openings); int cam_devq_init(struct cam_devq *devq, int devices, @@ -87,7 +86,7 @@ int cam_devq_init(struct cam_devq *devq, int devices void cam_devq_free(struct cam_devq *devq); u_int32_t cam_devq_resize(struct cam_devq *camq, int openings); - + /* * Allocate a cam_ccb_queue structure and initialize it. */ @@ -166,7 +165,6 @@ cam_ccbq_ccb_done(struct cam_ccbq *ccbq, union ccb *do static __inline void cam_ccbq_release_opening(struct cam_ccbq *ccbq); - static __inline int cam_ccbq_pending_ccb_count(struct cam_ccbq *ccbq) Modified: head/sys/cam/cam_sim.h ============================================================================== --- head/sys/cam/cam_sim.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_sim.h Tue Sep 1 22:13:48 2020 (r365225) @@ -78,7 +78,6 @@ void cam_sim_release(struct cam_sim *sim); /* Optional sim attributes may be set with these. */ void cam_sim_set_path(struct cam_sim *sim, u_int32_t path_id); - /* Generically useful offsets into the sim private area */ #define spriv_ptr0 sim_priv.entries[0].ptr #define spriv_ptr1 sim_priv.entries[1].ptr Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_xpt.c Tue Sep 1 22:13:48 2020 (r365225) @@ -234,7 +234,6 @@ static int xpt_init(void *); DECLARE_MODULE(cam, cam_moduledata, SI_SUB_CONFIGURE, SI_ORDER_SECOND); MODULE_VERSION(cam, 1); - static void xpt_async_bcast(struct async_list *async_head, u_int32_t async_code, struct cam_path *path, @@ -519,7 +518,6 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, bcopy(&ccb, inccb, sizeof(union ccb)); xpt_free_path(ccb.ccb_h.path); break; - } case XPT_DEV_MATCH: { struct cam_periph_map_info mapinfo; @@ -651,7 +649,6 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, */ for (periph = TAILQ_FIRST(&(*p_drv)->units); periph != NULL; periph = TAILQ_NEXT(periph, unit_links)) { - if (periph->unit_number == unit) break; } @@ -1036,7 +1033,6 @@ xpt_remove_periph(struct cam_periph *periph) } } - void xpt_announce_periph(struct cam_periph *periph, char *announce_string) { @@ -2675,7 +2671,6 @@ xpt_action_default(union ccb *start_ccb) if (device->protocol_version <= SCSI_REV_2 && start_ccb->ccb_h.target_lun < 8 && (start_ccb->ccb_h.flags & CAM_CDB_POINTER) == 0) { - start_ccb->csio.cdb_io.cdb_bytes[1] |= start_ccb->ccb_h.target_lun << 5; } @@ -2863,7 +2858,6 @@ call_sim: struct cam_ed *device; int found; - found = 0; /* @@ -3041,13 +3035,11 @@ call_sim: crs = &start_ccb->crs; dev = path->device; if (dev == NULL) { - crs->ccb_h.status = CAM_DEV_NOT_THERE; break; } if ((crs->release_flags & RELSIM_ADJUST_OPENINGS) != 0) { - /* Don't ever go below one opening */ if (crs->openings > 0) { xpt_dev_ccbq_resize(path, crs->openings); @@ -3061,9 +3053,7 @@ call_sim: mtx_lock(&dev->sim->devq->send_mtx); if ((crs->release_flags & RELSIM_RELEASE_AFTER_TIMEOUT) != 0) { - if ((dev->flags & CAM_DEV_REL_TIMEOUT_PENDING) != 0) { - /* * Just extend the old timeout and decrement * the freeze count so that a single timeout @@ -3072,7 +3062,6 @@ call_sim: start_ccb->ccb_h.flags &= ~CAM_DEV_QFREEZE; callout_stop(&dev->callout); } else { - start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE; } @@ -3081,11 +3070,9 @@ call_sim: xpt_release_devq_timeout, dev, 0); dev->flags |= CAM_DEV_REL_TIMEOUT_PENDING; - } if ((crs->release_flags & RELSIM_RELEASE_AFTER_CMDCMPLT) != 0) { - if ((dev->flags & CAM_DEV_REL_ON_COMPLETE) != 0) { /* * Decrement the freeze count so that a single @@ -3094,20 +3081,16 @@ call_sim: */ start_ccb->ccb_h.flags &= ~CAM_DEV_QFREEZE; } else { - dev->flags |= CAM_DEV_REL_ON_COMPLETE; start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE; } } if ((crs->release_flags & RELSIM_RELEASE_AFTER_QEMPTY) != 0) { - if ((dev->flags & CAM_DEV_REL_ON_QUEUE_EMPTY) != 0 || (dev->ccbq.dev_active == 0)) { - start_ccb->ccb_h.flags &= ~CAM_DEV_QFREEZE; } else { - dev->flags |= CAM_DEV_REL_ON_QUEUE_EMPTY; start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE; } @@ -3300,7 +3283,6 @@ xpt_schedule(struct cam_periph *periph, u_int32_t new_ } } - /* * Schedule a device to run on a given queue. * If the device was inserted as a new entry on the queue, @@ -3318,7 +3300,6 @@ xpt_schedule_dev(struct camq *queue, cam_pinfo *pinfo, CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_schedule_dev\n")); - old_priority = pinfo->priority; /* @@ -3381,7 +3362,6 @@ restart: periph->immediate_priority)) != CAM_PRIORITY_NONE && (periph->periph_allocated - (ccb != NULL ? 1 : 0) < device->ccbq.total_openings || prio <= CAM_PRIORITY_OOB)) { - if (ccb == NULL && (ccb = xpt_get_ccb_nowait(periph)) == NULL) { if (sleep) { @@ -3446,7 +3426,6 @@ xpt_run_devq(struct cam_devq *devq) } if ((work_ccb->ccb_h.flags & CAM_HIGH_POWER) != 0) { - mtx_lock(&xsoftc.xpt_highpower_lock); if (xsoftc.num_highpower <= 0) { /* @@ -4090,7 +4069,6 @@ xpt_bus_register(struct cam_sim *sim, device_t parent, /* Notify interested parties */ if (sim->path_id != CAM_XPT_PATH_ID) { - xpt_async(AC_PATH_REGISTERED, path, &cpi); if ((cpi.hba_misc & PIM_NOSCAN) == 0) { union ccb *scan_ccb; @@ -4692,8 +4670,6 @@ xpt_free_ccb(union ccb *free_ccb) free(free_ccb, M_CAMCCB); } - - /* Private XPT functions */ /* @@ -5399,7 +5375,6 @@ xpt_done_process(struct ccb_hdr *ccb_h) * Any high powered commands queued up? */ if (device != NULL) { - STAILQ_REMOVE_HEAD(hphead, highpowerq_entry); mtx_unlock(&xsoftc.xpt_highpower_lock); Modified: head/sys/cam/cam_xpt.h ============================================================================== --- head/sys/cam/cam_xpt.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_xpt.h Tue Sep 1 22:13:48 2020 (r365225) @@ -39,7 +39,6 @@ #include #endif - /* Forward Declarations */ union ccb; struct cam_periph; Modified: head/sys/cam/cam_xpt_internal.h ============================================================================== --- head/sys/cam/cam_xpt_internal.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_xpt_internal.h Tue Sep 1 22:13:48 2020 (r365225) @@ -92,7 +92,6 @@ SET_DECLARE(cam_xpt_proto_set, struct xpt_proto); #define CAM_XPT_PROTO(data) \ DATA_SET(cam_xpt_proto_set, data) - /* * The CAM EDT (Existing Device Table) contains the device information for * all devices for all buses in the system. The table contains a Modified: head/sys/cam/cam_xpt_sim.h ============================================================================== --- head/sys/cam/cam_xpt_sim.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/cam_xpt_sim.h Tue Sep 1 22:13:48 2020 (r365225) @@ -52,4 +52,3 @@ void xpt_done_direct(union ccb *done_ccb); #endif #endif /* _CAM_CAM_XPT_SIM_H */ - Modified: head/sys/cam/ctl/README.ctl.txt ============================================================================== --- head/sys/cam/ctl/README.ctl.txt Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/README.ctl.txt Tue Sep 1 22:13:48 2020 (r365225) @@ -162,7 +162,6 @@ LUN Backend Size (Blocks) BS Serial Number 11 ramdisk 204800000000000 512 MYSERIAL 1 MYDEVID 1 lun_type=0 - Revision 1.4 Changes ==================== - Added in the second HA mode (where CTL does the data transfers instead @@ -172,7 +171,7 @@ Revision 1.4 Changes - Fixed the phantom device problem in the CTL CAM SIM and improved the CAM SIM to automatically trigger a rescan when the port is enabled and disabled. - + - Made the number of threads in the block backend configurable via sysctl, loader tunable and the ctladm command line. (You can now specify -o num_threads=4 when creating a LUN with ctladm create.) Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl.c Tue Sep 1 22:13:48 2020 (r365225) @@ -584,7 +584,6 @@ static struct cdevsw ctl_cdevsw = { .d_name = "ctl", }; - MALLOC_DEFINE(M_CTL, "ctlmem", "Memory used for CTL"); static int ctl_module_event_handler(module_t, int /*modeventtype_t*/, void *); @@ -1916,7 +1915,6 @@ ctl_init(void) softc->ctl_ports = malloc(sizeof(struct ctl_port *) * ctl_max_ports, M_DEVBUF, M_WAITOK | M_ZERO); - /* * In Copan's HA scheme, the "master" and "slave" roles are * figured out through the slot the controller is in. Although it @@ -2472,7 +2470,6 @@ ctl_sbuf_printf_esc(struct sbuf *sb, char *str, int si if (retval != 0) break; - } return (retval); @@ -3985,7 +3982,6 @@ ctl_expand_number(const char *buf, uint64_t *num) return (0); } - /* * This routine could be used in the future to load default and/or saved * mode page parameters for a particuar lun. @@ -4002,7 +3998,6 @@ ctl_init_page_index(struct ctl_lun *lun) sizeof(page_index_template)); for (i = 0; i < CTL_NUM_MODE_PAGES; i++) { - page_index = &lun->mode_pages.index[i]; if (lun->be_lun->lun_type == T_DIRECT && (page_index->page_flags & CTL_PAGE_FLAG_DIRECT) == 0) @@ -4415,7 +4410,6 @@ ctl_init_log_page_index(struct ctl_lun *lun) prev = -1; for (i = 0, j = 0, k = 0; i < CTL_NUM_LOG_PAGES; i++) { - page_index = &lun->log_pages.index[i]; if (lun->be_lun->lun_type == T_DIRECT && (page_index->page_flags & CTL_PAGE_FLAG_DIRECT) == 0) @@ -5279,7 +5273,6 @@ ctl_start_stop(struct ctl_scsiio *ctsio) residx = ctl_get_initindex(&ctsio->io_hdr.nexus); if (ctl_get_prkey(lun, residx) == 0 || (lun->pr_res_idx != residx && lun->pr_res_type < 4)) { - ctl_set_reservation_conflict(ctsio); ctl_done((union ctl_io *)ctsio); return (CTL_RETVAL_COMPLETE); @@ -5996,7 +5989,6 @@ do_next_page: ctl_done((union ctl_io *)ctsio); return (CTL_RETVAL_COMPLETE); } else if (*len_left < sizeof(struct scsi_mode_page_header)) { - free(ctsio->kern_data_ptr, M_CTL); ctl_set_param_len_error(ctsio); ctl_done((union ctl_io *)ctsio); @@ -6004,14 +5996,12 @@ do_next_page: } else if ((page_header->page_code & SMPH_SPF) && (*len_left < sizeof(struct scsi_mode_page_header_sp))) { - free(ctsio->kern_data_ptr, M_CTL); ctl_set_param_len_error(ctsio); ctl_done((union ctl_io *)ctsio); return (CTL_RETVAL_COMPLETE); } - /* * XXX KDM should we do something with the block descriptor? */ @@ -8191,7 +8181,6 @@ ctl_pro_preempt_other(struct ctl_lun *lun, union ctl_h } - int ctl_persistent_reserve_out(struct ctl_scsiio *ctsio) { @@ -8310,7 +8299,6 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio) switch (cdb->action & SPRO_ACTION_MASK) { case SPRO_REGISTER: case SPRO_REG_IGNO: { - /* * We don't support any of these options, as we report in * the read capabilities request (see @@ -8397,7 +8385,6 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio) ctl_ha_msg_send(CTL_HA_CHAN_CTL, &persis_io, sizeof(persis_io.pr), M_WAITOK); } else /* sa_res_key != 0 */ { - /* * If we aren't registered currently then increment * the key count and set the registered flag. @@ -9497,7 +9484,6 @@ ctl_inquiry_evpd_serial(struct ctl_scsiio *ctsio, int return (CTL_RETVAL_COMPLETE); } - /* * SCSI VPD page 0x86, the Extended INQUIRY Data page. */ @@ -11586,7 +11572,6 @@ ctl_scsiio_precheck(struct ctl_softc *softc, struct ct } } - if (ctl_scsiio_lun_check(lun, entry, ctsio) != 0) { mtx_unlock(&lun->lun_lock); ctl_done((union ctl_io *)ctsio); @@ -11925,7 +11910,6 @@ ctl_abort_tasks_lun(struct ctl_lun *lun, uint32_t targ */ for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL; xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) { - if ((targ_port == UINT32_MAX || targ_port == xio->io_hdr.nexus.targ_port) && (init_id == UINT32_MAX || @@ -12077,7 +12061,6 @@ ctl_abort_task(union ctl_io *io) */ for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL; xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) { - if ((xio->io_hdr.nexus.targ_port != io->io_hdr.nexus.targ_port) || (xio->io_hdr.nexus.initid != io->io_hdr.nexus.initid) || (xio->io_hdr.flags & CTL_FLAG_ABORT)) @@ -12149,7 +12132,6 @@ ctl_query_task(union ctl_io *io, int task_set) mtx_unlock(&softc->ctl_lock); for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL; xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) { - if ((xio->io_hdr.nexus.targ_port != io->io_hdr.nexus.targ_port) || (xio->io_hdr.nexus.initid != io->io_hdr.nexus.initid) || (xio->io_hdr.flags & CTL_FLAG_ABORT)) @@ -12327,7 +12309,6 @@ ctl_handle_isc(union ctl_io *io) } - /* * Returns the match type in the case of a match, or CTL_LUN_PAT_NONE if * there is no match. @@ -12528,7 +12509,6 @@ ctl_datamove(union ctl_io *io) lun = CTL_LUN(io); if ((lun != NULL) && (lun->delay_info.datamove_delay > 0)) { - callout_init(&io->io_hdr.delay_callout, /*mpsafe*/ 1); io->io_hdr.flags |= CTL_FLAG_DELAY_DONE; callout_reset(&io->io_hdr.delay_callout, @@ -12798,7 +12778,6 @@ ctl_datamove_remote_xfer(union ctl_io *io, unsigned co if ((io->io_hdr.status & CTL_STATUS_MASK) != CTL_STATUS_NONE && (io->io_hdr.status & CTL_STATUS_MASK) != CTL_SUCCESS) { - if (rq != NULL) ctl_dt_req_free(rq); @@ -13339,7 +13318,6 @@ ctl_done(union ctl_io *io) if ((lun != NULL) && (lun->delay_info.done_delay > 0)) { - callout_init(&io->io_hdr.delay_callout, /*mpsafe*/ 1); io->io_hdr.flags |= CTL_FLAG_DELAY_DONE; callout_reset(&io->io_hdr.delay_callout, Modified: head/sys/cam/ctl/ctl_backend.c ============================================================================== --- head/sys/cam/ctl/ctl_backend.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_backend.c Tue Sep 1 22:13:48 2020 (r365225) @@ -139,4 +139,3 @@ ctl_backend_find(char *backend_name) return (NULL); } - Modified: head/sys/cam/ctl/ctl_backend.h ============================================================================== --- head/sys/cam/ctl/ctl_backend.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_backend.h Tue Sep 1 22:13:48 2020 (r365225) @@ -79,7 +79,6 @@ typedef enum { MODULE_DEPEND(name, ctl, 1, 1, 1); \ MODULE_DEPEND(name, cam, 1, 1, 1) - struct ctl_be_lun; typedef void (*be_callback_t)(struct ctl_be_lun *be_lun); Modified: head/sys/cam/ctl/ctl_backend_block.c ============================================================================== --- head/sys/cam/ctl/ctl_backend_block.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_backend_block.c Tue Sep 1 22:13:48 2020 (r365225) @@ -1317,7 +1317,6 @@ ctl_be_block_cw_dispatch_ws(struct ctl_be_block_lun *b pbo = 0; len_left = (uint64_t)lbalen->len * cbe_lun->blocksize; for (i = 0, lba = 0; i < CTLBLK_MAX_SEGS && len_left > 0; i++) { - /* * Setup the S/G entry for this chunk. */ @@ -2782,7 +2781,6 @@ ctl_be_block_init(void) SLIST_INIT(&softc->lun_list); return (0); } - static int ctl_be_block_shutdown(void) Modified: head/sys/cam/ctl/ctl_cmd_table.c ============================================================================== --- head/sys/cam/ctl/ctl_cmd_table.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_cmd_table.c Tue Sep 1 22:13:48 2020 (r365225) @@ -738,7 +738,6 @@ const struct ctl_cmd_entry ctl_cmd_table_9b[32] = /* 1d-1f */ }; - /* 9E SERVICE ACTION IN(16) */ const struct ctl_cmd_entry ctl_cmd_table_9e[32] = { Modified: head/sys/cam/ctl/ctl_frontend_ioctl.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_ioctl.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_frontend_ioctl.c Tue Sep 1 22:13:48 2020 (r365225) @@ -84,10 +84,8 @@ struct cfi_softc { TAILQ_HEAD(, cfi_port) ports; }; - static struct cfi_softc cfi_softc; - static int cfi_init(void); static int cfi_shutdown(void); static void cfi_datamove(union ctl_io *io); @@ -183,7 +181,7 @@ cfi_ioctl_port_create(struct ctl_req *req) val = dnvlist_get_string(req->args_nvl, "pp", NULL); if (val != NULL) pp = strtol(val, NULL, 10); - + val = dnvlist_get_string(req->args_nvl, "vp", NULL); if (val != NULL) vp = strtol(val, NULL, 10); Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Tue Sep 1 22:13:48 2020 (r365225) @@ -1183,7 +1183,6 @@ cfiscsi_maintenance_thread(void *arg) CFISCSI_SESSION_UNLOCK(cs); if (cs->cs_terminating && cs->cs_handoff_in_progress == false) { - /* * We used to wait up to 30 seconds to deliver queued * PDUs to the initiator. We also tried hard to deliver @@ -2136,7 +2135,6 @@ cfiscsi_ioctl_port_create(struct ctl_req *req) alias = dnvlist_get_string(req->args_nvl, "cfiscsi_target_alias", NULL); val = dnvlist_get_string(req->args_nvl, "cfiscsi_portal_group_tag", NULL); - if (target == NULL || val == NULL) { req->status = CTL_LUN_ERROR; Modified: head/sys/cam/ctl/ctl_ha.c ============================================================================== --- head/sys/cam/ctl/ctl_ha.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_ha.c Tue Sep 1 22:13:48 2020 (r365225) @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include #include - struct ha_msg_wire { uint32_t channel; uint32_t length; @@ -874,7 +873,6 @@ ctl_dt_event_handler(ctl_ha_channel channel, ctl_ha_ev printf("%s: Unknown event %d\n", __func__, event); } } - ctl_ha_status ctl_ha_msg_init(struct ctl_softc *ctl_softc) Modified: head/sys/cam/ctl/ctl_io.h ============================================================================== --- head/sys/cam/ctl/ctl_io.h Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_io.h Tue Sep 1 22:13:48 2020 (r365225) @@ -112,7 +112,6 @@ typedef enum { CTL_FLAG_SERSEQ_DONE = 0x20000000 /* All storage I/O started */ } ctl_io_flags; - struct ctl_lba_len { uint64_t lba; uint32_t len; @@ -374,7 +373,6 @@ struct ctl_taskio { uint8_t task_status; /* Complete, Succeeded, etc. */ uint8_t task_resp[3];/* Response information */ }; - /* * HA link messages. Modified: head/sys/cam/ctl/ctl_scsi_all.c ============================================================================== --- head/sys/cam/ctl/ctl_scsi_all.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_scsi_all.c Tue Sep 1 22:13:48 2020 (r365225) @@ -136,7 +136,6 @@ ctl_scsi_sense_sbuf(struct ctl_scsiio *ctsio, ctl_scsi_path_string((union ctl_io *)ctsio, path_str, sizeof(path_str)); if (flags & SSS_FLAG_PRINT_COMMAND) { - sbuf_cat(sb, path_str); ctl_scsi_command_string(ctsio, inq_data, sb); @@ -204,4 +203,3 @@ ctl_scsi_sense_print(struct ctl_scsiio *ctsio, } #endif /* _KERNEL */ - Modified: head/sys/cam/ctl/ctl_ser_table.c ============================================================================== --- head/sys/cam/ctl/ctl_ser_table.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_ser_table.c Tue Sep 1 22:13:48 2020 (r365225) @@ -81,4 +81,3 @@ ctl_serialize_table[CTL_SERIDX_COUNT][CTL_SERIDX_COUNT /*FORMAT */{ pS, bK, bK, bK, bK, bK, bK, pS, pS, bK, bK, bK, bK, bK}, /*START */{ bK, bK, bK, bK, bK, bK, bK, bK, pS, bK, bK, bK, bK, bK}, }; - Modified: head/sys/cam/ctl/ctl_tpc.c ============================================================================== --- head/sys/cam/ctl/ctl_tpc.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_tpc.c Tue Sep 1 22:13:48 2020 (r365225) @@ -2472,4 +2472,3 @@ ctl_report_all_rod_tokens(struct ctl_scsiio *ctsio) ctl_datamove((union ctl_io *)ctsio); return (retval); } - Modified: head/sys/cam/ctl/ctl_tpc_local.c ============================================================================== --- head/sys/cam/ctl/ctl_tpc_local.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/ctl_tpc_local.c Tue Sep 1 22:13:48 2020 (r365225) @@ -71,7 +71,6 @@ static int tpcl_shutdown(void); static void tpcl_datamove(union ctl_io *io); static void tpcl_done(union ctl_io *io); - static struct ctl_frontend tpcl_frontend = { .name = "tpc", Modified: head/sys/cam/ctl/scsi_ctl.c ============================================================================== --- head/sys/cam/ctl/scsi_ctl.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/ctl/scsi_ctl.c Tue Sep 1 22:13:48 2020 (r365225) @@ -383,7 +383,6 @@ ctlfeasync(void *callback_arg, uint32_t code, struct c break; } case AC_PATH_DEREGISTERED: { - if (softc != NULL) { /* * XXX KDM are we certain at this point that there @@ -463,7 +462,7 @@ ctlferegister(struct cam_periph *periph, void *arg) softc = (struct ctlfe_lun_softc *)arg; bus_softc = softc->parent_softc; - + STAILQ_INIT(&softc->work_queue); LIST_INIT(&softc->atio_list); LIST_INIT(&softc->inot_list); @@ -1116,7 +1115,6 @@ ctlfedone(struct cam_periph *periph, union ccb *done_c switch (done_ccb->ccb_h.func_code) { case XPT_ACCEPT_TARGET_IO: { - LIST_REMOVE(&done_ccb->ccb_h, periph_links.le); atio = &done_ccb->atio; status = atio->ccb_h.status & CAM_STATUS_MASK; Modified: head/sys/cam/mmc/mmc_da.c ============================================================================== --- head/sys/cam/mmc/mmc_da.c Tue Sep 1 22:13:28 2020 (r365224) +++ head/sys/cam/mmc/mmc_da.c Tue Sep 1 22:13:48 2020 (r365225) @@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$"); #include #include - #include #ifdef _KERNEL @@ -268,7 +267,6 @@ mmc_handle_reply(union ccb *ccb) return (0); /* Normal return */ } - static uint32_t mmc_get_bits(uint32_t *bits, int bit_len, int start, int size) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 22:14:20 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AFAEA37F676; Tue, 1 Sep 2020 22:14:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1ZN4YJVz3Tnj; Tue, 1 Sep 2020 22:14:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8016D20735; Tue, 1 Sep 2020 22:14:20 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MEKeu063137; Tue, 1 Sep 2020 22:14:20 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081ME9B6063081; Tue, 1 Sep 2020 22:14:09 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012214.081ME9B6063081@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:14:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365226 - in head/sys/geom: . bde cache concat eli gate label mirror mountver multipath nop part raid raid3 uzip vinum virstor zero X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/geom: . bde cache concat eli gate label mirror mountver multipath nop part raid raid3 uzip vinum virstor zero X-SVN-Commit-Revision: 365226 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:14:20 -0000 Author: mjg Date: Tue Sep 1 22:14:09 2020 New Revision: 365226 URL: https://svnweb.freebsd.org/changeset/base/365226 Log: geom: clean up empty lines in .c and .h files Modified: head/sys/geom/bde/g_bde.c head/sys/geom/bde/g_bde.h head/sys/geom/bde/g_bde_crypt.c head/sys/geom/cache/g_cache.c head/sys/geom/concat/g_concat.c head/sys/geom/eli/g_eli.c head/sys/geom/eli/g_eli_ctl.c head/sys/geom/gate/g_gate.c head/sys/geom/geom_ccd.c head/sys/geom/geom_ctl.c head/sys/geom/geom_disk.c head/sys/geom/geom_dump.c head/sys/geom/geom_event.c head/sys/geom/geom_flashmap.h head/sys/geom/geom_io.c head/sys/geom/geom_kern.c head/sys/geom/geom_map.c head/sys/geom/geom_subr.c head/sys/geom/label/g_label.c head/sys/geom/label/g_label_disk_ident.c head/sys/geom/label/g_label_iso9660.c head/sys/geom/label/g_label_msdosfs.c head/sys/geom/mirror/g_mirror.c head/sys/geom/mountver/g_mountver.c head/sys/geom/multipath/g_multipath.c head/sys/geom/nop/g_nop.c head/sys/geom/part/g_part.c head/sys/geom/part/g_part_bsd64.c head/sys/geom/part/g_part_ebr.c head/sys/geom/part/g_part_ldm.c head/sys/geom/raid/g_raid_ctl.c head/sys/geom/raid/md_ddf.c head/sys/geom/raid/md_intel.c head/sys/geom/raid/md_jmicron.c head/sys/geom/raid/md_nvidia.c head/sys/geom/raid/md_promise.c head/sys/geom/raid/md_sii.c head/sys/geom/raid/tr_concat.c head/sys/geom/raid/tr_raid1.c head/sys/geom/raid/tr_raid1e.c head/sys/geom/raid3/g_raid3.c head/sys/geom/raid3/g_raid3_ctl.c head/sys/geom/uzip/g_uzip_wrkthr.h head/sys/geom/vinum/geom_vinum.c head/sys/geom/vinum/geom_vinum.h head/sys/geom/vinum/geom_vinum_drive.c head/sys/geom/vinum/geom_vinum_init.c head/sys/geom/vinum/geom_vinum_list.c head/sys/geom/vinum/geom_vinum_plex.c head/sys/geom/vinum/geom_vinum_raid5.c head/sys/geom/vinum/geom_vinum_share.c head/sys/geom/vinum/geom_vinum_state.c head/sys/geom/vinum/geom_vinum_subr.c head/sys/geom/virstor/binstream.c head/sys/geom/virstor/binstream.h head/sys/geom/virstor/g_virstor.c head/sys/geom/virstor/g_virstor.h head/sys/geom/virstor/g_virstor_md.c head/sys/geom/virstor/g_virstor_md.h head/sys/geom/zero/g_zero.c Modified: head/sys/geom/bde/g_bde.c ============================================================================== --- head/sys/geom/bde/g_bde.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/bde/g_bde.c Tue Sep 1 22:14:09 2020 (r365226) @@ -129,7 +129,6 @@ g_bde_create_geom(struct gctl_req *req, struct g_class g_topology_assert(); gp = NULL; - gp = g_new_geomf(mp, "%s.bde", pp->name); cp = g_new_consumer(gp); g_attach(cp, pp); @@ -225,7 +224,6 @@ g_bde_create_geom(struct gctl_req *req, struct g_class } return; } - static int g_bde_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp) Modified: head/sys/geom/bde/g_bde.h ============================================================================== --- head/sys/geom/bde/g_bde.h Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/bde/g_bde.h Tue Sep 1 22:14:09 2020 (r365226) @@ -54,7 +54,6 @@ #define G_BDE_LOCKSIZE 384 #define NLOCK_FIELDS 13 - /* This just needs to be "large enough" */ #define G_BDE_KEYBYTES 304 Modified: head/sys/geom/bde/g_bde_crypt.c ============================================================================== --- head/sys/geom/bde/g_bde_crypt.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/bde/g_bde_crypt.c Tue Sep 1 22:14:09 2020 (r365226) @@ -124,7 +124,6 @@ g_bde_crypt_read(struct g_bde_work *wp) u_char skey[G_BDE_SKEYLEN]; keyInstance ki; cipherInstance ci; - AES_init(&ci); sc = wp->softc; @@ -164,7 +163,6 @@ g_bde_crypt_write(struct g_bde_work *wp) AES_init(&ci); o = 0; for (n = 0; o < wp->length; n++, o += sc->sectorsize) { - s = (u_char *)wp->data + o; d = (u_char *)wp->sp->data + o; arc4rand(skey, sizeof skey, 0); Modified: head/sys/geom/cache/g_cache.c ============================================================================== --- head/sys/geom/cache/g_cache.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/cache/g_cache.c Tue Sep 1 22:14:09 2020 (r365226) @@ -93,7 +93,6 @@ SYSCTL_PROC(_kern_geom_cache, OID_AUTO, used_hi, sysctl_handle_pct, "IU", ""); - static int g_cache_destroy(struct g_cache_softc *sc, boolean_t force); static g_ctl_destroy_geom_t g_cache_destroy_geom; @@ -111,7 +110,6 @@ struct g_class g_cache_class = { #define OFF2BNO(off, sc) ((off) >> (sc)->sc_bshift) #define BNO2OFF(bno, sc) ((bno) << (sc)->sc_bshift) - static struct g_cache_desc * g_cache_alloc(struct g_cache_softc *sc) Modified: head/sys/geom/concat/g_concat.c ============================================================================== --- head/sys/geom/concat/g_concat.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/concat/g_concat.c Tue Sep 1 22:14:09 2020 (r365226) @@ -70,7 +70,6 @@ struct g_class g_concat_class = { .destroy_geom = g_concat_destroy_geom }; - /* * Greatest Common Divisor. */ Modified: head/sys/geom/eli/g_eli.c ============================================================================== --- head/sys/geom/eli/g_eli.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/eli/g_eli.c Tue Sep 1 22:14:09 2020 (r365226) @@ -176,7 +176,6 @@ struct g_class g_eli_class = { .fini = g_eli_fini }; - /* * Code paths: * BIO_READ: @@ -184,7 +183,6 @@ struct g_class g_eli_class = { * BIO_WRITE: * g_eli_start -> g_eli_crypto_run -> g_eli_crypto_write_done -> g_io_request -> g_eli_write_done -> g_io_deliver */ - /* * EAGAIN from crypto(9) means, that we were probably balanced to another crypto Modified: head/sys/geom/eli/g_eli_ctl.c ============================================================================== --- head/sys/geom/eli/g_eli_ctl.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/eli/g_eli_ctl.c Tue Sep 1 22:14:09 2020 (r365226) @@ -49,9 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include - MALLOC_DECLARE(M_ELI); - static void g_eli_ctl_attach(struct gctl_req *req, struct g_class *mp) Modified: head/sys/geom/gate/g_gate.c ============================================================================== --- head/sys/geom/gate/g_gate.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/gate/g_gate.c Tue Sep 1 22:14:09 2020 (r365226) @@ -84,7 +84,6 @@ static struct cdevsw g_gate_cdevsw = { .d_name = G_GATE_CTL_NAME }; - static struct g_gate_softc **g_gate_units; static u_int g_gate_nunits; static struct mtx g_gate_units_lock; Modified: head/sys/geom/geom_ccd.c ============================================================================== --- head/sys/geom/geom_ccd.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_ccd.c Tue Sep 1 22:14:09 2020 (r365226) @@ -233,7 +233,6 @@ g_ccd_freesc(struct ccd_s *sc) g_free(sc); } - static int ccdinit(struct gctl_req *req, struct ccd_s *cs) { @@ -261,7 +260,6 @@ ccdinit(struct gctl_req *req, struct ccd_s *cs) cs->sc_offset = 0; else cs->sc_offset = CCD_OFFSET; - } for (ix = 0; ix < cs->sc_ndisks; ix++) { ci = &cs->sc_cinfo[ix]; @@ -358,7 +356,6 @@ ccdinterleave(struct ccd_s *cs) daddr_t bn, lbn; int ix; daddr_t size; - /* * Allocate an interleave table. The worst case occurs when each Modified: head/sys/geom/geom_ctl.c ============================================================================== --- head/sys/geom/geom_ctl.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_ctl.c Tue Sep 1 22:14:09 2020 (r365226) @@ -470,7 +470,6 @@ g_ctl_req(void *arg, int flag __unused) g_topology_assert(); } - static int g_ctl_ioctl_ctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td) { Modified: head/sys/geom/geom_disk.c ============================================================================== --- head/sys/geom/geom_disk.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_disk.c Tue Sep 1 22:14:09 2020 (r365226) @@ -1081,7 +1081,7 @@ sysctl_disks(SYSCTL_HANDLER_ARGS) sbuf_delete(sb); return error; } - + SYSCTL_PROC(_kern, OID_AUTO, disks, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, sysctl_disks, "A", "names of available disks"); Modified: head/sys/geom/geom_dump.c ============================================================================== --- head/sys/geom/geom_dump.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_dump.c Tue Sep 1 22:14:09 2020 (r365226) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void g_confdot_consumer(struct sbuf *sb, struct g_consumer *cp) { @@ -241,7 +240,6 @@ g_conf_provider(struct sbuf *sb, struct g_provider *pp } sbuf_cat(sb, "\t\n"); } - static void g_conf_geom(struct sbuf *sb, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp) Modified: head/sys/geom/geom_event.c ============================================================================== --- head/sys/geom/geom_event.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_event.c Tue Sep 1 22:14:09 2020 (r365226) @@ -131,7 +131,6 @@ g_attr_changed_event(void *arg, int flag) g_topology_assert(); if (flag != EV_CANCEL && g_shutdown == 0) { - /* * Tell all consumers of the change. */ @@ -170,7 +169,7 @@ g_orphan_provider(struct g_provider *pp, int error) KASSERT(error != 0, ("g_orphan_provider(%p(%s), 0) error must be non-zero\n", pp, pp->name)); - + pp->error = error; mtx_lock(&g_eventlock); KASSERT(!(pp->flags & G_PF_ORPHAN), Modified: head/sys/geom/geom_flashmap.h ============================================================================== --- head/sys/geom/geom_flashmap.h Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_flashmap.h Tue Sep 1 22:14:09 2020 (r365226) @@ -36,4 +36,3 @@ struct g_flashmap { }; #endif - Modified: head/sys/geom/geom_io.c ============================================================================== --- head/sys/geom/geom_io.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_io.c Tue Sep 1 22:14:09 2020 (r365226) @@ -305,7 +305,7 @@ g_io_zonecmd(struct disk_zone_args *zone_args, struct { struct bio *bp; int error; - + g_trace(G_T_BIO, "bio_zone(%d)", zone_args->zone_cmd); bp = g_alloc_bio(); bp->bio_cmd = BIO_ZONE; Modified: head/sys/geom/geom_kern.c ============================================================================== --- head/sys/geom/geom_kern.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_kern.c Tue Sep 1 22:14:09 2020 (r365226) @@ -187,7 +187,7 @@ sysctl_kern_geom_conftxt(SYSCTL_HANDLER_ARGS) return (sysctl_kern_geom_confany(req, g_conftxt, &hint)); } - + static int sysctl_kern_geom_confdot(SYSCTL_HANDLER_ARGS) { Modified: head/sys/geom/geom_map.c ============================================================================== --- head/sys/geom/geom_map.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_map.c Tue Sep 1 22:14:09 2020 (r365226) @@ -172,7 +172,6 @@ find_marker(struct g_consumer *cp, const char *line, o for (search_offset = search_start; search_offset < cp->provider->mediasize; search_offset += search_step) { - g_topology_unlock(); buf = g_read_data(cp, rounddown(search_offset, sectorsize), roundup(strlen(search_key), sectorsize), NULL); @@ -375,7 +374,6 @@ g_map_taste(struct g_class *mp, struct g_provider *pp, for (i = 0; i < MAP_MAXSLICE; i++) g_map_parse_part(mp, pp, cp, gp, sc, i); - g_access(cp, -1, 0, 0); if (LIST_EMPTY(&gp->provider)) { Modified: head/sys/geom/geom_subr.c ============================================================================== --- head/sys/geom/geom_subr.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/geom_subr.c Tue Sep 1 22:14:09 2020 (r365226) @@ -101,7 +101,7 @@ g_dbg_printf(const char *classname, int lvl, struct bi sbuf_cat(&sb, classname); if (lvl >= 0) sbuf_printf(&sb, "[%d]", lvl); - + va_start(ap, format); sbuf_vprintf(&sb, format, ap); va_end(ap); @@ -598,7 +598,6 @@ g_new_provider_event(void *arg, int flag) } } - struct g_provider * g_new_providerf(struct g_geom *gp, const char *fmt, ...) { @@ -717,7 +716,7 @@ g_resize_provider_event(void *arg, int flag) } pp->mediasize = size; - + LIST_FOREACH_SAFE(cp, &pp->consumers, consumers, cp2) { gp = cp->geom; if ((gp->flags & G_GEOM_WITHER) == 0 && gp->resize != NULL) Modified: head/sys/geom/label/g_label.c ============================================================================== --- head/sys/geom/label/g_label.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/label/g_label.c Tue Sep 1 22:14:09 2020 (r365226) @@ -203,7 +203,6 @@ g_label_mangle_name(char *label, size_t size) if (*label == '\0') return; - sb = sbuf_new(NULL, NULL, size, SBUF_FIXEDLEN); for (c = label; *c != '\0'; c++) { /* Trim leading whitespace. */ Modified: head/sys/geom/label/g_label_disk_ident.c ============================================================================== --- head/sys/geom/label/g_label_disk_ident.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/label/g_label_disk_ident.c Tue Sep 1 22:14:09 2020 (r365226) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include - static char* classes_pass[] = { G_DISK_CLASS_NAME, G_MULTIPATH_CLASS_NAME, NULL }; Modified: head/sys/geom/label/g_label_iso9660.c ============================================================================== --- head/sys/geom/label/g_label_iso9660.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/label/g_label_iso9660.c Tue Sep 1 22:14:09 2020 (r365226) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #define ISO9660_OFFSET 0x8000 #define VOLUME_LEN 32 - static void g_label_iso9660_taste(struct g_consumer *cp, char *label, size_t size) { Modified: head/sys/geom/label/g_label_msdosfs.c ============================================================================== --- head/sys/geom/label/g_label_msdosfs.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/label/g_label_msdosfs.c Tue Sep 1 22:14:09 2020 (r365226) @@ -82,7 +82,6 @@ g_label_msdosfs_taste(struct g_consumer *cp, char *lab goto error; } - /* * Test if this is really a FAT volume and determine the FAT type. */ Modified: head/sys/geom/mirror/g_mirror.c ============================================================================== --- head/sys/geom/mirror/g_mirror.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/mirror/g_mirror.c Tue Sep 1 22:14:09 2020 (r365226) @@ -110,7 +110,6 @@ struct g_class g_mirror_class = { .resize = g_mirror_resize }; - static void g_mirror_destroy_provider(struct g_mirror_softc *sc); static int g_mirror_update_disk(struct g_mirror_disk *disk, u_int state); static void g_mirror_update_device(struct g_mirror_softc *sc, bool force); @@ -124,7 +123,6 @@ static void g_mirror_sync_stop(struct g_mirror_disk *d static void g_mirror_register_request(struct g_mirror_softc *sc, struct bio *bp); static void g_mirror_sync_release(struct g_mirror_softc *sc); - static const char * g_mirror_disk_state2str(int state) Modified: head/sys/geom/mountver/g_mountver.c ============================================================================== --- head/sys/geom/mountver/g_mountver.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/mountver/g_mountver.c Tue Sep 1 22:14:09 2020 (r365226) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include - SYSCTL_DECL(_kern_geom); static SYSCTL_NODE(_kern_geom, OID_AUTO, mountver, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "GEOM_MOUNTVER stuff"); @@ -555,7 +554,7 @@ g_mountver_ident_matches(struct g_geom *gp) return (0); } - + static struct g_geom * g_mountver_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) { Modified: head/sys/geom/multipath/g_multipath.c ============================================================================== --- head/sys/geom/multipath/g_multipath.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/multipath/g_multipath.c Tue Sep 1 22:14:09 2020 (r365226) @@ -479,7 +479,6 @@ g_multipath_kt(void *arg) kproc_exit(0); } - static int g_multipath_access(struct g_provider *pp, int dr, int dw, int de) { Modified: head/sys/geom/nop/g_nop.c ============================================================================== --- head/sys/geom/nop/g_nop.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/nop/g_nop.c Tue Sep 1 22:14:09 2020 (r365226) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include - SYSCTL_DECL(_kern_geom); static SYSCTL_NODE(_kern_geom, OID_AUTO, nop, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "GEOM_NOP stuff"); Modified: head/sys/geom/part/g_part.c ============================================================================== --- head/sys/geom/part/g_part.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/part/g_part.c Tue Sep 1 22:14:09 2020 (r365226) @@ -317,7 +317,6 @@ g_part_get_physpath_done(struct bio *bp) g_std_done(bp); } - #define DPRINTF(...) if (bootverbose) { \ printf("GEOM_PART: " __VA_ARGS__); \ } Modified: head/sys/geom/part/g_part_bsd64.c ============================================================================== --- head/sys/geom/part/g_part_bsd64.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/part/g_part_bsd64.c Tue Sep 1 22:14:09 2020 (r365226) @@ -663,4 +663,3 @@ g_part_bsd64_write(struct g_part_table *basetable, str g_free(dlp); return (error); } - Modified: head/sys/geom/part/g_part_ebr.c ============================================================================== --- head/sys/geom/part/g_part_ebr.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/part/g_part_ebr.c Tue Sep 1 22:14:09 2020 (r365226) @@ -210,7 +210,6 @@ ebr_parse_type(const char *type, u_char *dp_typ) return (EINVAL); } - static void ebr_set_chs(struct g_part_table *table, uint32_t lba, u_char *cylp, u_char *hdp, u_char *secp) @@ -248,7 +247,6 @@ ebr_align(struct g_part_table *basetable, uint32_t *st return (EINVAL); return (0); } - static int g_part_ebr_add(struct g_part_table *basetable, struct g_part_entry *baseentry, Modified: head/sys/geom/part/g_part_ldm.c ============================================================================== --- head/sys/geom/part/g_part_ldm.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/part/g_part_ldm.c Tue Sep 1 22:14:09 2020 (r365226) @@ -1286,7 +1286,6 @@ g_part_ldm_probe(struct g_part_table *basetable, struc u_char *buf, type[64]; int error, idx; - pp = cp->provider; if (pp->sectorsize != 512) return (ENXIO); Modified: head/sys/geom/raid/g_raid_ctl.c ============================================================================== --- head/sys/geom/raid/g_raid_ctl.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/g_raid_ctl.c Tue Sep 1 22:14:09 2020 (r365226) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include "g_raid_md_if.h" - static struct g_raid_softc * g_raid_find_node(struct g_class *mp, const char *name) { Modified: head/sys/geom/raid/md_ddf.c ============================================================================== --- head/sys/geom/raid/md_ddf.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/md_ddf.c Tue Sep 1 22:14:09 2020 (r365226) @@ -2270,7 +2270,6 @@ g_raid_md_ctl_ddf(struct g_raid_md_object *md, error = 0; if (strcmp(verb, "label") == 0) { - if (*nargs < 4) { gctl_error(req, "Invalid number of arguments."); return (-1); @@ -2511,13 +2510,11 @@ g_raid_md_ctl_ddf(struct g_raid_md_object *md, return (0); } if (strcmp(verb, "add") == 0) { - gctl_error(req, "`add` command is not applicable, " "use `label` instead."); return (-99); } if (strcmp(verb, "delete") == 0) { - nodename = gctl_get_asciiparam(req, "arg0"); if (nodename != NULL && strcasecmp(sc->sc_name, nodename) != 0) nodename = NULL; Modified: head/sys/geom/raid/md_intel.c ============================================================================== --- head/sys/geom/raid/md_intel.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/md_intel.c Tue Sep 1 22:14:09 2020 (r365226) @@ -261,7 +261,6 @@ static struct g_raid_md_class g_raid_md_intel_class = .mdc_priority = 100 }; - static struct intel_raid_map * intel_get_map(struct intel_raid_vol *mvol, int i) { @@ -1454,7 +1453,7 @@ g_raid_md_get_label(struct g_consumer *cp, char *seria { char serial_buffer[DISK_IDENT_SIZE]; int len, error; - + len = sizeof(serial_buffer); error = g_io_getattr("GEOM::ident", cp, &len, serial_buffer); if (error != 0) @@ -1712,7 +1711,6 @@ g_raid_md_ctl_intel(struct g_raid_md_object *md, nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs)); error = 0; if (strcmp(verb, "label") == 0) { - if (*nargs < 4) { gctl_error(req, "Invalid number of arguments."); return (-1); @@ -1921,7 +1919,6 @@ g_raid_md_ctl_intel(struct g_raid_md_object *md, return (0); } if (strcmp(verb, "add") == 0) { - if (*nargs != 3) { gctl_error(req, "Invalid number of arguments."); return (-1); @@ -2108,7 +2105,6 @@ g_raid_md_ctl_intel(struct g_raid_md_object *md, return (0); } if (strcmp(verb, "delete") == 0) { - nodename = gctl_get_asciiparam(req, "arg0"); if (nodename != NULL && strcasecmp(sc->sc_name, nodename) != 0) nodename = NULL; Modified: head/sys/geom/raid/md_jmicron.c ============================================================================== --- head/sys/geom/raid/md_jmicron.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/md_jmicron.c Tue Sep 1 22:14:09 2020 (r365226) @@ -527,7 +527,6 @@ nofit: /* Welcome the new disk. */ g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE); TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) { - /* * Different disks may have different sizes/offsets, * especially in concat mode. Update. @@ -1044,7 +1043,6 @@ g_raid_md_ctl_jmicron(struct g_raid_md_object *md, nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs)); error = 0; if (strcmp(verb, "label") == 0) { - if (*nargs < 4) { gctl_error(req, "Invalid number of arguments."); return (-1); @@ -1238,7 +1236,6 @@ g_raid_md_ctl_jmicron(struct g_raid_md_object *md, return (0); } if (strcmp(verb, "delete") == 0) { - /* Check if some volume is still open. */ force = gctl_get_paraml(req, "force", sizeof(*force)); if (force != NULL && *force == 0 && Modified: head/sys/geom/raid/md_nvidia.c ============================================================================== --- head/sys/geom/raid/md_nvidia.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/md_nvidia.c Tue Sep 1 22:14:09 2020 (r365226) @@ -535,7 +535,6 @@ nofit: // else // g_raid_change_disk_state(disk, G_RAID_DISK_S_FAILED); TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) { - /* * Different disks may have different sizes, * in concat mode. Update from real disk size. @@ -1048,7 +1047,6 @@ g_raid_md_ctl_nvidia(struct g_raid_md_object *md, nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs)); error = 0; if (strcmp(verb, "label") == 0) { - if (*nargs < 4) { gctl_error(req, "Invalid number of arguments."); return (-1); @@ -1243,7 +1241,6 @@ g_raid_md_ctl_nvidia(struct g_raid_md_object *md, return (0); } if (strcmp(verb, "delete") == 0) { - /* Check if some volume is still open. */ force = gctl_get_paraml(req, "force", sizeof(*force)); if (force != NULL && *force == 0 && Modified: head/sys/geom/raid/md_promise.c ============================================================================== --- head/sys/geom/raid/md_promise.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/md_promise.c Tue Sep 1 22:14:09 2020 (r365226) @@ -189,7 +189,6 @@ static struct g_raid_md_class g_raid_md_promise_class .mdc_priority = 100 }; - static void g_raid_md_promise_print(struct promise_raid_conf *meta) { @@ -1281,7 +1280,6 @@ g_raid_md_ctl_promise(struct g_raid_md_object *md, nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs)); error = 0; if (strcmp(verb, "label") == 0) { - if (*nargs < 4) { gctl_error(req, "Invalid number of arguments."); return (-1); @@ -1502,13 +1500,11 @@ g_raid_md_ctl_promise(struct g_raid_md_object *md, return (0); } if (strcmp(verb, "add") == 0) { - gctl_error(req, "`add` command is not applicable, " "use `label` instead."); return (-99); } if (strcmp(verb, "delete") == 0) { - nodename = gctl_get_asciiparam(req, "arg0"); if (nodename != NULL && strcasecmp(sc->sc_name, nodename) != 0) nodename = NULL; Modified: head/sys/geom/raid/md_sii.c ============================================================================== --- head/sys/geom/raid/md_sii.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/md_sii.c Tue Sep 1 22:14:09 2020 (r365226) @@ -586,7 +586,6 @@ nofit: else g_raid_change_disk_state(disk, G_RAID_DISK_S_FAILED); TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) { - /* * Different disks may have different sizes, * in concat mode. Update from real disk size. @@ -1132,7 +1131,6 @@ g_raid_md_ctl_sii(struct g_raid_md_object *md, nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs)); error = 0; if (strcmp(verb, "label") == 0) { - if (*nargs < 4) { gctl_error(req, "Invalid number of arguments."); return (-1); @@ -1325,7 +1323,6 @@ g_raid_md_ctl_sii(struct g_raid_md_object *md, return (0); } if (strcmp(verb, "delete") == 0) { - /* Check if some volume is still open. */ force = gctl_get_paraml(req, "force", sizeof(*force)); if (force != NULL && *force == 0 && Modified: head/sys/geom/raid/tr_concat.c ============================================================================== --- head/sys/geom/raid/tr_concat.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/tr_concat.c Tue Sep 1 22:14:09 2020 (r365226) @@ -123,7 +123,6 @@ g_raid_tr_update_state_concat(struct g_raid_volume *vo s = G_RAID_VOLUME_S_BROKEN; } if (s != vol->v_state) { - /* * Some metadata modules may not know CONCAT volume * mediasize until all disks connected. Recalculate. Modified: head/sys/geom/raid/tr_raid1.c ============================================================================== --- head/sys/geom/raid/tr_raid1.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/tr_raid1.c Tue Sep 1 22:14:09 2020 (r365226) @@ -401,7 +401,6 @@ g_raid_tr_raid1_rebuild_start(struct g_raid_tr_object g_raid_tr_raid1_rebuild_some(tr); } - static void g_raid_tr_raid1_maybe_rebuild(struct g_raid_tr_object *tr, struct g_raid_subdisk *sd) @@ -409,7 +408,7 @@ g_raid_tr_raid1_maybe_rebuild(struct g_raid_tr_object struct g_raid_volume *vol; struct g_raid_tr_raid1_object *trs; int na, nr; - + /* * If we're stopping, don't do anything. If we don't have at least one * good disk and one bad disk, we don't do anything. And if there's a @@ -683,7 +682,6 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_object *tr, */ if (trs->trso_type == TR_RAID1_REBUILD) { if (bp->bio_cmd == BIO_READ) { - /* Immediately abort rebuild, if requested. */ if (trs->trso_flags & TR_RAID1_F_ABORT) { trs->trso_flags &= ~TR_RAID1_F_DOING_SOME; Modified: head/sys/geom/raid/tr_raid1e.c ============================================================================== --- head/sys/geom/raid/tr_raid1e.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid/tr_raid1e.c Tue Sep 1 22:14:09 2020 (r365226) @@ -560,7 +560,7 @@ g_raid_tr_raid1e_maybe_rebuild(struct g_raid_tr_object struct g_raid_volume *vol; struct g_raid_tr_raid1e_object *trs; int nr; - + vol = tr->tro_volume; trs = (struct g_raid_tr_raid1e_object *)tr; if (trs->trso_stopping) @@ -899,7 +899,6 @@ g_raid_tr_iodone_raid1e(struct g_raid_tr_object *tr, if (trs->trso_type == TR_RAID1E_REBUILD) { nsd = trs->trso_failed_sd; if (bp->bio_cmd == BIO_READ) { - /* Immediately abort rebuild, if requested. */ if (trs->trso_flags & TR_RAID1E_F_ABORT) { trs->trso_flags &= ~TR_RAID1E_F_DOING_SOME; Modified: head/sys/geom/raid3/g_raid3.c ============================================================================== --- head/sys/geom/raid3/g_raid3.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid3/g_raid3.c Tue Sep 1 22:14:09 2020 (r365226) @@ -117,7 +117,6 @@ struct g_class g_raid3_class = { .fini = g_raid3_fini }; - static void g_raid3_destroy_provider(struct g_raid3_softc *sc); static int g_raid3_update_disk(struct g_raid3_disk *disk, u_int state); static void g_raid3_update_device(struct g_raid3_softc *sc, boolean_t force); @@ -126,7 +125,6 @@ static void g_raid3_dumpconf(struct sbuf *sb, const ch static void g_raid3_sync_stop(struct g_raid3_softc *sc, int type); static int g_raid3_register_request(struct bio *pbp); static void g_raid3_sync_release(struct g_raid3_softc *sc); - static const char * g_raid3_disk_state2str(int state) Modified: head/sys/geom/raid3/g_raid3_ctl.c ============================================================================== --- head/sys/geom/raid3/g_raid3_ctl.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/raid3/g_raid3_ctl.c Tue Sep 1 22:14:09 2020 (r365226) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include - static struct g_raid3_softc * g_raid3_find_device(struct g_class *mp, const char *name) { Modified: head/sys/geom/uzip/g_uzip_wrkthr.h ============================================================================== --- head/sys/geom/uzip/g_uzip_wrkthr.h Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/uzip/g_uzip_wrkthr.h Tue Sep 1 22:14:09 2020 (r365226) @@ -27,4 +27,3 @@ */ void g_uzip_wrkthr(void *); - Modified: head/sys/geom/vinum/geom_vinum.c ============================================================================== --- head/sys/geom/vinum/geom_vinum.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum.c Tue Sep 1 22:14:09 2020 (r365226) @@ -61,14 +61,13 @@ static void gv_attach(struct gv_softc *, struct gctl_r static void gv_detach(struct gv_softc *, struct gctl_req *); static void gv_parityop(struct gv_softc *, struct gctl_req *); - static void gv_orphan(struct g_consumer *cp) { struct g_geom *gp; struct gv_softc *sc; struct gv_drive *d; - + g_topology_assert(); KASSERT(cp != NULL, ("gv_orphan: null cp")); @@ -89,7 +88,7 @@ gv_start(struct bio *bp) { struct g_geom *gp; struct gv_softc *sc; - + gp = bp->bio_to->geom; sc = gp->softc; @@ -114,7 +113,7 @@ gv_done(struct bio *bp) { struct g_geom *gp; struct gv_softc *sc; - + KASSERT(bp != NULL, ("NULL bp")); gp = bp->bio_from->geom; @@ -133,7 +132,7 @@ gv_access(struct g_provider *pp, int dr, int dw, int d struct gv_softc *sc; struct gv_drive *d, *d2; int error; - + gp = pp->geom; sc = gp->softc; /* @@ -367,7 +366,6 @@ gv_create(struct g_geom *gp, struct gctl_req *req) goto error; } - d = g_malloc(sizeof(*d), M_WAITOK | M_ZERO); bcopy(d2, d, sizeof(*d)); @@ -513,7 +511,7 @@ gv_config(struct gctl_req *req, struct g_class *mp, ch } else if (!strcmp(verb, "rename")) { gv_rename(gp, req); - + } else if (!strcmp(verb, "resetconfig")) { gv_post_event(sc, GV_EVENT_RESET_CONFIG, sc, NULL, 0, 0); @@ -580,7 +578,6 @@ gv_parityop(struct gv_softc *sc, struct gctl_req *req) else gv_post_event(sc, GV_EVENT_PARITY_CHECK, p, NULL, 0, 0); } - static struct g_geom * gv_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) Modified: head/sys/geom/vinum/geom_vinum.h ============================================================================== --- head/sys/geom/vinum/geom_vinum.h Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum.h Tue Sep 1 22:14:09 2020 (r365226) @@ -77,7 +77,6 @@ void gv_rm_drive(struct gv_softc *, struct gv_drive *, void gv_rm_plex(struct gv_softc *, struct gv_plex *); void gv_rm_vol(struct gv_softc *, struct gv_volume *); - /* geom_vinum_state.c */ int gv_sdstatemap(struct gv_plex *); void gv_setstate(struct g_geom *, struct gctl_req *); Modified: head/sys/geom/vinum/geom_vinum_drive.c ============================================================================== --- head/sys/geom/vinum/geom_vinum_drive.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum_drive.c Tue Sep 1 22:14:09 2020 (r365226) @@ -71,7 +71,6 @@ static int gv_legacy_header_type(uint8_t *, int); * format uses big-endian (network order). */ - /* Checks for legacy format depending on platform. */ static int gv_legacy_header_type(uint8_t *hdr, int bigendian) Modified: head/sys/geom/vinum/geom_vinum_init.c ============================================================================== --- head/sys/geom/vinum/geom_vinum_init.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum_init.c Tue Sep 1 22:14:09 2020 (r365226) @@ -241,7 +241,6 @@ gv_sync(struct gv_volume *v) sc = v->vinumconf; KASSERT(sc != NULL, ("gv_sync: NULL sc on %s", v->name)); - up = gv_find_good_plex(v); if (up == NULL) return (ENXIO); Modified: head/sys/geom/vinum/geom_vinum_list.c ============================================================================== --- head/sys/geom/vinum/geom_vinum_list.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum_list.c Tue Sep 1 22:14:09 2020 (r365226) @@ -228,7 +228,7 @@ gv_lv(struct g_geom *gp, struct gctl_req *req, struct LIST_FOREACH(v, &sc->volumes, volume) i++; - + sbuf_printf(sb, "%d volume%s:\n", i, i == 1 ? "" : "s"); if (i) { @@ -374,7 +374,7 @@ gv_ls(struct g_geom *gp, struct gctl_req *req, struct LIST_FOREACH(s, &sc->subdisks, sd) i++; - + sbuf_printf(sb, "%d subdisk%s:\n", i, i == 1 ? "" : "s"); if (i) { @@ -449,7 +449,7 @@ gv_ld(struct g_geom *gp, struct gctl_req *req, struct LIST_FOREACH(d, &sc->drives, drive) i++; - + sbuf_printf(sb, "%d drive%s:\n", i, i == 1 ? "" : "s"); if (i) { Modified: head/sys/geom/vinum/geom_vinum_plex.c ============================================================================== --- head/sys/geom/vinum/geom_vinum_plex.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum_plex.c Tue Sep 1 22:14:09 2020 (r365226) @@ -78,7 +78,7 @@ gv_plex_start(struct gv_plex *p, struct bio *bp) wp = gv_raid5_start(p, bp, addr, boff, bcount); if (wp == NULL) return; - + len = wp->length; if (TAILQ_EMPTY(&wp->bits)) @@ -499,7 +499,6 @@ gv_check_parity(struct gv_plex *p, struct bio *bp, str bp->bio_parent->bio_inbed++; g_destroy_bio(pbp); } - } return (finished); @@ -776,7 +775,6 @@ gv_grow_complete(struct gv_plex *p, struct bio *bp) } } - /* * Create an initialization BIO and send it off to the consumer. Assume that * we're given initialization data as parameter. @@ -1019,7 +1017,7 @@ gv_rebuild_complete(struct gv_plex *p, struct bio *bp) g_topology_lock(); gv_access(p->vol_sc->provider, -1, -1, 0); g_topology_unlock(); - + G_VINUM_DEBUG(0, "rebuild of %s failed at offset %jd errno: %d", p->name, (intmax_t)offset, error); p->flags &= ~GV_PLEX_REBUILDING; @@ -1035,7 +1033,7 @@ gv_rebuild_complete(struct gv_plex *p, struct bio *bp) g_topology_lock(); gv_access(p->vol_sc->provider, -1, -1, 0); g_topology_unlock(); - + G_VINUM_DEBUG(1, "rebuild of %s finished", p->name); gv_save_config(p->vinumconf); p->flags &= ~GV_PLEX_REBUILDING; Modified: head/sys/geom/vinum/geom_vinum_raid5.c ============================================================================== --- head/sys/geom/vinum/geom_vinum_raid5.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum_raid5.c Tue Sep 1 22:14:09 2020 (r365226) @@ -80,7 +80,7 @@ gv_raid5_start(struct gv_plex *p, struct bio *bp, cadd g_free(wp); return (NULL); } - + /* * Building the sub-request failed, we probably need to clean up a lot. */ Modified: head/sys/geom/vinum/geom_vinum_share.c ============================================================================== --- head/sys/geom/vinum/geom_vinum_share.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum_share.c Tue Sep 1 22:14:09 2020 (r365226) @@ -80,9 +80,8 @@ gv_tokenize(char *cptr, char *token[], int maxtoken) { int tokennr; /* Index of this token. */ char delim; /* Delimiter for searching for the partner. */ - - for (tokennr = 0; tokennr < maxtoken;) { + for (tokennr = 0; tokennr < maxtoken;) { /* Skip leading white space. */ while (iswhite(*cptr)) cptr++; @@ -137,7 +136,6 @@ gv_tokenize(char *cptr, char *token[], int maxtoken) return maxtoken; } - /* * Take a number with an optional scale factor and convert it to a number of * bytes. @@ -159,7 +157,7 @@ gv_sizespec(char *spec) uint64_t size; char *s; int sign; - + size = 0; sign = 1; if (spec != NULL) { /* we have a parameter */ @@ -171,7 +169,6 @@ gv_sizespec(char *spec) /* It's numeric. */ if ((*s >= '0') && (*s <= '9')) { - /* It's numeric. */ while ((*s >= '0') && (*s <= '9')) /* Convert it. */ @@ -599,8 +596,6 @@ gv_new_plex(int max, char *token[]) return (p); } - - /* Get a new subdisk object. */ struct gv_sd * gv_new_sd(int max, char *token[]) @@ -707,7 +702,7 @@ const char * gv_roughlength(off_t bytes, int lj) { static char desc[16]; - + /* Gigabytes. */ if (bytes > (off_t)MEGABYTE * 10000) snprintf(desc, sizeof(desc), lj ? "%jd GB" : "%10jd GB", Modified: head/sys/geom/vinum/geom_vinum_state.c ============================================================================== --- head/sys/geom/vinum/geom_vinum_state.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum_state.c Tue Sep 1 22:14:09 2020 (r365226) @@ -130,7 +130,7 @@ gv_set_drive_state(struct gv_drive *d, int newstate, i KASSERT(d != NULL, ("gv_set_drive_state: NULL d")); oldstate = d->state; - + if (newstate == oldstate) return (0); @@ -166,7 +166,7 @@ gv_set_sd_state(struct gv_sd *s, int newstate, int fla /* We are optimistic and assume it will work. */ status = 0; - + if (newstate == oldstate) return (0); @@ -385,7 +385,7 @@ gv_update_sd_state(struct gv_sd *s) KASSERT(d != NULL, ("gv_update_sd_state: NULL d")); oldstate = s->state; - + /* If our drive isn't up we cannot be up either. */ if (d->state != GV_DRIVE_UP) { s->state = GV_SD_DOWN; @@ -401,7 +401,7 @@ gv_update_sd_state(struct gv_sd *s) s->state = GV_SD_STALE; } else s->state = GV_SD_UP; - + if (s->state != oldstate) G_VINUM_DEBUG(1, "subdisk %s state change: %s -> %s", s->name, gv_sdstate(oldstate), gv_sdstate(s->state)); @@ -425,7 +425,7 @@ gv_update_plex_state(struct gv_plex *p) /* First, check the state of our subdisks. */ sdstates = gv_sdstatemap(p); - + /* If all subdisks are up, our plex can be up, too. */ if (sdstates == GV_SD_UPSTATE) p->state = GV_PLEX_UP; @@ -440,7 +440,6 @@ gv_update_plex_state(struct gv_plex *p) /* Some of our subdisks are initializing. */ } else if (sdstates & GV_SD_INITSTATE) { - if (p->flags & GV_PLEX_SYNCING || p->flags & GV_PLEX_REBUILDING) p->state = GV_PLEX_DEGRADED; @@ -507,7 +506,7 @@ gv_sdstatemap(struct gv_plex *p) int statemap; KASSERT(p != NULL, ("gv_sdstatemap: NULL p")); - + statemap = 0; p->sddown = 0; /* No subdisks down yet. */ Modified: head/sys/geom/vinum/geom_vinum_subr.c ============================================================================== --- head/sys/geom/vinum/geom_vinum_subr.c Tue Sep 1 22:13:48 2020 (r365225) +++ head/sys/geom/vinum/geom_vinum_subr.c Tue Sep 1 22:14:09 2020 (r365226) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Tue Sep 1 22:14:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 43B5937F6E8; Tue, 1 Sep 2020 22:14:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Zd19ZPz3V7M; Tue, 1 Sep 2020 22:14:33 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 899332090D; Tue, 1 Sep 2020 22:14:32 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MEWsC063198; Tue, 1 Sep 2020 22:14:32 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MEVc3063190; Tue, 1 Sep 2020 22:14:31 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012214.081MEVc3063190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:14:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365227 - head/sys/ddb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/ddb X-SVN-Commit-Revision: 365227 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:14:33 -0000 Author: mjg Date: Tue Sep 1 22:14:30 2020 New Revision: 365227 URL: https://svnweb.freebsd.org/changeset/base/365227 Log: ddb: clean up empty lines in .c and .h files Modified: head/sys/ddb/db_break.c head/sys/ddb/db_output.c head/sys/ddb/db_ps.c head/sys/ddb/db_sym.c head/sys/ddb/db_watch.c head/sys/ddb/db_write_cmd.c Modified: head/sys/ddb/db_break.c ============================================================================== --- head/sys/ddb/db_break.c Tue Sep 1 22:14:09 2020 (r365226) +++ head/sys/ddb/db_break.c Tue Sep 1 22:14:30 2020 (r365227) @@ -178,7 +178,6 @@ db_set_breakpoints(void) register db_breakpoint_t bkpt; if (!db_breakpoints_inserted) { - for (bkpt = db_breakpoint_list; bkpt != 0; bkpt = bkpt->link) @@ -195,7 +194,6 @@ db_clear_breakpoints(void) register db_breakpoint_t bkpt; if (db_breakpoints_inserted) { - for (bkpt = db_breakpoint_list; bkpt != 0; bkpt = bkpt->link) Modified: head/sys/ddb/db_output.c ============================================================================== --- head/sys/ddb/db_output.c Tue Sep 1 22:14:09 2020 (r365226) +++ head/sys/ddb/db_output.c Tue Sep 1 22:14:30 2020 (r365227) @@ -124,11 +124,9 @@ db_putchar(int c, void *arg) struct dbputchar_arg *dap = arg; if (dap->da_pbufr == NULL) { - /* No bufferized output is provided. */ db_putc(c); } else { - *dap->da_pnext++ = c; dap->da_remain--; Modified: head/sys/ddb/db_ps.c ============================================================================== --- head/sys/ddb/db_ps.c Tue Sep 1 22:14:09 2020 (r365226) +++ head/sys/ddb/db_ps.c Tue Sep 1 22:14:30 2020 (r365227) @@ -266,7 +266,7 @@ dumpthread(volatile struct proc *p, volatile struct th char state[9], wprefix; const char *wmesg; const void *wchan; - + if (all) { db_printf("%6d ", td->td_tid); switch (td->td_state) { Modified: head/sys/ddb/db_sym.c ============================================================================== --- head/sys/ddb/db_sym.c Tue Sep 1 22:14:09 2020 (r365226) +++ head/sys/ddb/db_sym.c Tue Sep 1 22:14:30 2020 (r365227) @@ -205,7 +205,6 @@ db_qualify(c_db_sym_t sym, char *symtabname) return tmp; } - bool db_eqname(const char *src, const char *dst, int c) { @@ -407,7 +406,6 @@ db_symbol_values(c_db_sym_t sym, const char **namep, d if (valuep) *valuep = value; } - /* * Print a the closest symbol to value Modified: head/sys/ddb/db_watch.c ============================================================================== --- head/sys/ddb/db_watch.c Tue Sep 1 22:14:09 2020 (r365226) +++ head/sys/ddb/db_watch.c Tue Sep 1 22:14:30 2020 (r365227) @@ -277,8 +277,6 @@ db_find_watchpoint(vm_map_t map, db_addr_t addr, db_re } #endif - - /* Delete hardware watchpoint */ /*ARGSUSED*/ void Modified: head/sys/ddb/db_write_cmd.c ============================================================================== --- head/sys/ddb/db_write_cmd.c Tue Sep 1 22:14:09 2020 (r365226) +++ head/sys/ddb/db_write_cmd.c Tue Sep 1 22:14:30 2020 (r365227) @@ -90,4 +90,3 @@ db_write_cmd(db_expr_t address, bool have_addr, db_exp db_skip_to_eol(); } - From owner-svn-src-all@freebsd.org Tue Sep 1 22:14:53 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C5FE937F7C6; Tue, 1 Sep 2020 22:14:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1b141q7z3V81; Tue, 1 Sep 2020 22:14:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D7DE20982; Tue, 1 Sep 2020 22:14:53 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MErMV063257; Tue, 1 Sep 2020 22:14:53 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MErau063255; Tue, 1 Sep 2020 22:14:53 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012214.081MErau063255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:14:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365228 - head/sys/nlm X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/nlm X-SVN-Commit-Revision: 365228 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:14:53 -0000 Author: mjg Date: Tue Sep 1 22:14:52 2020 New Revision: 365228 URL: https://svnweb.freebsd.org/changeset/base/365228 Log: nlm: clean up empty lines in .c and .h files Modified: head/sys/nlm/nlm_advlock.c head/sys/nlm/nlm_prot_impl.c Modified: head/sys/nlm/nlm_advlock.c ============================================================================== --- head/sys/nlm/nlm_advlock.c Tue Sep 1 22:14:30 2020 (r365227) +++ head/sys/nlm/nlm_advlock.c Tue Sep 1 22:14:52 2020 (r365228) @@ -940,7 +940,6 @@ nlm_setlock(struct nlm_host *host, struct rpc_callextr */ break; } - } } else { error = nlm_map_status(res.stat.stat); Modified: head/sys/nlm/nlm_prot_impl.c ============================================================================== --- head/sys/nlm/nlm_prot_impl.c Tue Sep 1 22:14:30 2020 (r365227) +++ head/sys/nlm/nlm_prot_impl.c Tue Sep 1 22:14:52 2020 (r365228) @@ -167,7 +167,6 @@ struct timeval nlm_zero_tv = { 0, 0 }; */ int nlm_nsm_state; - /* * A lock to protect the host list and waiting lock list. */ @@ -326,7 +325,6 @@ nlm_copy_netobj(struct netobj *dst, struct netobj *src nlm_make_netobj(dst, src->n_bytes, src->n_len, type); } - /* * Create an RPC client handle for the given (address,prog,vers) * triple using UDP. @@ -644,7 +642,7 @@ nlm_cancel_async_lock(struct nlm_async_lock *af) } mtx_lock(&host->nh_lock); - + if (!error) { NLM_DEBUG(2, "NLM: async lock %p for %s (sysid %d) " "cancelled\n", af, host->nh_caller_name, host->nh_sysid); @@ -1061,7 +1059,6 @@ nlm_find_host_by_addr(const struct sockaddr *addr, int strlcpy(tmp, "", sizeof(tmp)); } - mtx_lock(&nlm_global_lock); /* @@ -1334,7 +1331,7 @@ nlm_deregister_wait_lock(void *handle) mtx_lock(&nlm_global_lock); TAILQ_REMOVE(&nlm_waiting_locks, nw, nw_link); mtx_unlock(&nlm_global_lock); - + free(nw, M_NLM); } @@ -1394,7 +1391,6 @@ nlm_cancel_wait(struct vnode *vp) mtx_unlock(&nlm_global_lock); } - /**********************************************************************/ /* @@ -1703,7 +1699,6 @@ sys_nlm_syscall(struct thread *td, struct nlm_syscall_ * NLM implementation details, called from the RPC stubs. */ - void nlm_sm_notify(struct nlm_sm_status *argp) { @@ -1738,7 +1733,7 @@ nlm_get_vfs_state(struct nlm_host *host, struct svc_re int error; uint64_t exflags; struct ucred *cred = NULL, *credanon = NULL; - + memset(vs, 0, sizeof(*vs)); vs->vs_mp = vfs_getvfs(&fhp->fh_fsid); @@ -1840,7 +1835,7 @@ nlm_do_test(nlm4_testargs *argp, nlm4_testres *result, int error, sysid; struct flock fl; accmode_t accmode; - + memset(result, 0, sizeof(*result)); memset(&vs, 0, sizeof(vs)); @@ -1938,7 +1933,7 @@ nlm_do_lock(nlm4_lockargs *argp, nlm4_res *result, str int error, sysid; struct flock fl; accmode_t accmode; - + memset(result, 0, sizeof(*result)); memset(&vs, 0, sizeof(vs)); @@ -2127,7 +2122,7 @@ nlm_do_cancel(nlm4_cancargs *argp, nlm4_res *result, s int error, sysid; struct flock fl; struct nlm_async_lock *af; - + memset(result, 0, sizeof(*result)); memset(&vs, 0, sizeof(vs)); @@ -2216,7 +2211,7 @@ nlm_do_unlock(nlm4_unlockargs *argp, nlm4_res *result, struct nlm_host *host; int error, sysid; struct flock fl; - + memset(result, 0, sizeof(*result)); memset(&vs, 0, sizeof(vs)); @@ -2276,7 +2271,7 @@ nlm_do_granted(nlm4_testargs *argp, nlm4_res *result, { struct nlm_host *host; struct nlm_waiting_lock *nw; - + memset(result, 0, sizeof(*result)); host = nlm_find_host_by_addr(svc_getrpccaller(rqstp), rqstp->rq_vers); From owner-svn-src-all@freebsd.org Tue Sep 1 22:15:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D397E37FA0A; Tue, 1 Sep 2020 22:15:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1bF5MJbz3V8c; Tue, 1 Sep 2020 22:15:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C12C202DB; Tue, 1 Sep 2020 22:15:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MF5iD063340; Tue, 1 Sep 2020 22:15:05 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MF2dT063323; Tue, 1 Sep 2020 22:15:02 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012215.081MF2dT063323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:15:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365229 - in head/sys/kgssapi: . krb5 X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/kgssapi: . krb5 X-SVN-Commit-Revision: 365229 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:15:05 -0000 Author: mjg Date: Tue Sep 1 22:15:02 2020 New Revision: 365229 URL: https://svnweb.freebsd.org/changeset/base/365229 Log: kgssapi: clean up empty lines in .c and .h files Modified: head/sys/kgssapi/gss_canonicalize_name.c head/sys/kgssapi/gss_delete_sec_context.c head/sys/kgssapi/gss_display_status.c head/sys/kgssapi/gss_get_mic.c head/sys/kgssapi/gss_import_name.c head/sys/kgssapi/gss_names.c head/sys/kgssapi/gss_release_buffer.c head/sys/kgssapi/gss_release_name.c head/sys/kgssapi/gss_unwrap.c head/sys/kgssapi/gss_verify_mic.c head/sys/kgssapi/gssapi.h head/sys/kgssapi/gsstest.c head/sys/kgssapi/krb5/kcrypto_aes.c head/sys/kgssapi/krb5/krb5_mech.c Modified: head/sys/kgssapi/gss_canonicalize_name.c ============================================================================== --- head/sys/kgssapi/gss_canonicalize_name.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_canonicalize_name.c Tue Sep 1 22:15:02 2020 (r365229) @@ -61,7 +61,7 @@ gss_canonicalize_name(OM_uint32 *minor_status, args.input_name = input_name->handle; args.mech_type = mech_type; - + bzero(&res, sizeof(res)); stat = gssd_canonicalize_name_1(&args, &res, cl); CLNT_RELEASE(cl); Modified: head/sys/kgssapi/gss_delete_sec_context.c ============================================================================== --- head/sys/kgssapi/gss_delete_sec_context.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_delete_sec_context.c Tue Sep 1 22:15:02 2020 (r365229) @@ -70,7 +70,7 @@ gss_delete_sec_context(OM_uint32 *minor_status, gss_ct cl = kgss_gssd_client(); if (cl == NULL) return (GSS_S_FAILURE); - + bzero(&res, sizeof(res)); stat = gssd_delete_sec_context_1(&args, &res, cl); CLNT_RELEASE(cl); Modified: head/sys/kgssapi/gss_display_status.c ============================================================================== --- head/sys/kgssapi/gss_display_status.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_display_status.c Tue Sep 1 22:15:02 2020 (r365229) @@ -64,7 +64,7 @@ gss_display_status(OM_uint32 *minor_status, args.status_type = status_type; args.mech_type = mech_type; args.message_context = *message_context; - + bzero(&res, sizeof(res)); stat = gssd_display_status_1(&args, &res, cl); CLNT_RELEASE(cl); Modified: head/sys/kgssapi/gss_get_mic.c ============================================================================== --- head/sys/kgssapi/gss_get_mic.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_get_mic.c Tue Sep 1 22:15:02 2020 (r365229) @@ -88,4 +88,3 @@ gss_get_mic_mbuf(OM_uint32 *minor_status, const gss_ct return (KGSS_GET_MIC(ctx, minor_status, qop_req, m, micp)); } - Modified: head/sys/kgssapi/gss_import_name.c ============================================================================== --- head/sys/kgssapi/gss_import_name.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_import_name.c Tue Sep 1 22:15:02 2020 (r365229) @@ -63,7 +63,7 @@ gss_import_name(OM_uint32 *minor_status, args.input_name_buffer = *input_name_buffer; args.input_name_type = input_name_type; - + bzero(&res, sizeof(res)); stat = gssd_import_name_1(&args, &res, cl); CLNT_RELEASE(cl); Modified: head/sys/kgssapi/gss_names.c ============================================================================== --- head/sys/kgssapi/gss_names.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_names.c Tue Sep 1 22:15:02 2020 (r365229) @@ -174,5 +174,3 @@ gss_OID GSS_KRB5_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHI * this type is "GSS_KRB5_NT_STRING_UID_NAME". */ gss_OID GSS_KRB5_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_storage; - - Modified: head/sys/kgssapi/gss_release_buffer.c ============================================================================== --- head/sys/kgssapi/gss_release_buffer.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_release_buffer.c Tue Sep 1 22:15:02 2020 (r365229) @@ -51,4 +51,3 @@ gss_release_buffer(OM_uint32 *minor_status, gss_buffer return (GSS_S_COMPLETE); } - Modified: head/sys/kgssapi/gss_release_name.c ============================================================================== --- head/sys/kgssapi/gss_release_name.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_release_name.c Tue Sep 1 22:15:02 2020 (r365229) @@ -59,7 +59,7 @@ gss_release_name(OM_uint32 *minor_status, gss_name_t * if (*input_name) { name = *input_name; args.input_name = name->handle; - + cl = kgss_gssd_client(); if (cl == NULL) return (GSS_S_FAILURE); Modified: head/sys/kgssapi/gss_unwrap.c ============================================================================== --- head/sys/kgssapi/gss_unwrap.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_unwrap.c Tue Sep 1 22:15:02 2020 (r365229) @@ -96,4 +96,3 @@ gss_unwrap_mbuf(OM_uint32 *minor_status, return (KGSS_UNWRAP(ctx, minor_status, mp, conf_state, qop_state)); } - Modified: head/sys/kgssapi/gss_verify_mic.c ============================================================================== --- head/sys/kgssapi/gss_verify_mic.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_verify_mic.c Tue Sep 1 22:15:02 2020 (r365229) @@ -86,4 +86,3 @@ gss_verify_mic_mbuf(OM_uint32 *minor_status, const gss return (KGSS_VERIFY_MIC(ctx, minor_status, m, mic, qop_state)); } - Modified: head/sys/kgssapi/gssapi.h ============================================================================== --- head/sys/kgssapi/gssapi.h Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gssapi.h Tue Sep 1 22:15:02 2020 (r365229) @@ -249,7 +249,6 @@ extern gss_OID GSS_C_NT_HOSTBASED_SERVICE; */ extern gss_OID GSS_C_NT_ANONYMOUS; - /* * The implementation must reserve static storage for a * gss_OID_desc object containing the value Modified: head/sys/kgssapi/gsstest.c ============================================================================== --- head/sys/kgssapi/gsstest.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gsstest.c Tue Sep 1 22:15:02 2020 (r365229) @@ -375,7 +375,7 @@ gsstest_1(struct thread *td) || memcmp(message_buf.value, server_token.value, message_buf.length)) printf("unwrap result corrupt\n"); - + gss_release_buffer(&min_stat, &client_token); gss_release_buffer(&min_stat, &server_token); @@ -429,7 +429,6 @@ gsstest_2(struct thread *td, int step, const gss_buffe maj_stat = GSS_S_FAILURE; min_stat = 0; switch (step) { - case 1: if (server_context == GSS_C_NO_CONTEXT) { static char sbuf[512]; @@ -565,7 +564,7 @@ gsstest_2(struct thread *td, int step, const gss_buffe *maj_stat_res = maj_stat; *min_stat_res = min_stat; return (0); - + out: *maj_stat_res = maj_stat; *min_stat_res = min_stat; @@ -1126,7 +1125,6 @@ static int gsstest_offset = NO_SYSCALL; /* * The function called at load/unload. */ - static int gsstest_load(struct module *module, int cmd, void *arg) Modified: head/sys/kgssapi/krb5/kcrypto_aes.c ============================================================================== --- head/sys/kgssapi/krb5/kcrypto_aes.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/krb5/kcrypto_aes.c Tue Sep 1 22:15:02 2020 (r365229) @@ -121,7 +121,7 @@ aes_crypto_cb(struct cryptop *crp) { int error; struct aes_state *as = (struct aes_state *) crp->crp_opaque; - + if (crypto_ses2caps(crp->crp_session) & CRYPTOCAP_F_SYNC) return (0); Modified: head/sys/kgssapi/krb5/krb5_mech.c ============================================================================== --- head/sys/kgssapi/krb5/krb5_mech.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/krb5/krb5_mech.c Tue Sep 1 22:15:02 2020 (r365229) @@ -414,7 +414,7 @@ krb5_import(gss_ctx_id_t ctx, size_t len = context_token->length; uint32_t flags; int i; - + /* * We support heimdal 0.6 and heimdal 1.1 */ @@ -899,7 +899,7 @@ krb5_get_mic_old(struct krb5_context *kc, struct mbuf mic->m_next = NULL; mlast->m_next = NULL; m_free(tm); - + /* * SND_SEQ: * @@ -2113,7 +2113,6 @@ kgssapi_krb5_modevent(module_t mod, int type, void *da kgss_uninstall_mech(&krb5_mech_oid); break; } - return (0); } From owner-svn-src-all@freebsd.org Tue Sep 1 22:36:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27BDE3C00B6; Tue, 1 Sep 2020 22:36:25 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh23s0Dl8z3WXq; Tue, 1 Sep 2020 22:36:25 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E03FA20779; Tue, 1 Sep 2020 22:36:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MaOCO075662; Tue, 1 Sep 2020 22:36:24 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MaO8h075661; Tue, 1 Sep 2020 22:36:24 GMT (envelope-from bz@FreeBSD.org) Message-Id: <202009012236.081MaO8h075661@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Tue, 1 Sep 2020 22:36:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-svnadmin@freebsd.org Subject: svn commit: r365230 - svnadmin/conf X-SVN-Group: svnadmin X-SVN-Commit-Author: bz X-SVN-Commit-Paths: svnadmin/conf X-SVN-Commit-Revision: 365230 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:36:25 -0000 Author: bz Date: Tue Sep 1 22:36:24 2020 New Revision: 365230 URL: https://svnweb.freebsd.org/changeset/base/365230 Log: Release thj from mentorship. Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors ============================================================================== --- svnadmin/conf/mentors Tue Sep 1 22:15:02 2020 (r365229) +++ svnadmin/conf/mentors Tue Sep 1 22:36:24 2020 (r365230) @@ -23,5 +23,4 @@ nick philip Co-mentor: kp ram ken Co-mentor: mav rew kevans Co-mentor: allanjude scottph scottl Co-mentor: emaste, jhb -thj jtl Co-mentor: bz wosch cem From owner-svn-src-all@freebsd.org Tue Sep 1 22:41:51 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 36FBC3C0526; Tue, 1 Sep 2020 22:41:51 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh2B651dRz3WTc; Tue, 1 Sep 2020 22:41:50 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from [IPv6:2a02:8109:1140:c3d:20e8:4976:164f:167c] (unknown [IPv6:2a02:8109:1140:c3d:20e8:4976:164f:167c]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTPSA id F285B721E282D; Wed, 2 Sep 2020 00:41:43 +0200 (CEST) From: Michael Tuexen Message-Id: <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> Content-Type: multipart/signed; boundary="Apple-Mail=_D56F355E-7746-4C32-B4D1-9185488031E7"; protocol="application/pkcs7-signature"; micalg=sha-256 Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... Date: Wed, 2 Sep 2020 00:41:43 +0200 In-Reply-To: <202009012119.081LJERb018106@repo.freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org To: Mateusz Guzik References: <202009012119.081LJERb018106@repo.freebsd.org> X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4Bh2B651dRz3WTc X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:41:51 -0000 --Apple-Mail=_D56F355E-7746-4C32-B4D1-9185488031E7 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On 1. Sep 2020, at 23:19, Mateusz Guzik wrote: >=20 > Author: mjg > Date: Tue Sep 1 21:19:14 2020 > New Revision: 365071 > URL: https://svnweb.freebsd.org/changeset/base/365071 >=20 > Log: > net: clean up empty lines in .c and .h files Hi Mateusz, which rules are enforced? Why? Best regards Michael >=20 > Modified: > head/sys/net/altq/altq.h > head/sys/net/altq/altq_cbq.c > head/sys/net/altq/altq_cbq.h > head/sys/net/altq/altq_codel.c > head/sys/net/altq/altq_fairq.c > head/sys/net/altq/altq_hfsc.c > head/sys/net/altq/altq_hfsc.h > head/sys/net/altq/altq_priq.c > head/sys/net/altq/altq_priq.h > head/sys/net/altq/altq_red.c > head/sys/net/altq/altq_red.h > head/sys/net/altq/altq_rio.c > head/sys/net/altq/altq_rio.h > head/sys/net/altq/altq_rmclass.c > head/sys/net/altq/altq_subr.c > head/sys/net/altq/if_altq.h > head/sys/net/bpf.c > head/sys/net/bridgestp.c > head/sys/net/bridgestp.h > head/sys/net/debugnet_inet.c > head/sys/net/ieee8023ad_lacp.c > head/sys/net/if.c > head/sys/net/if.h > head/sys/net/if_bridge.c > head/sys/net/if_clone.c > head/sys/net/if_dl.h > head/sys/net/if_epair.c > head/sys/net/if_ethersubr.c > head/sys/net/if_gif.c > head/sys/net/if_ipsec.c > head/sys/net/if_lagg.c > head/sys/net/if_llatbl.c > head/sys/net/if_loop.c > head/sys/net/if_media.c > head/sys/net/if_media.h > head/sys/net/if_mib.c > head/sys/net/if_pfsync.h > head/sys/net/if_spppsubr.c > head/sys/net/if_tuntap.c > head/sys/net/if_vlan.c > head/sys/net/iflib.c > head/sys/net/iflib.h > head/sys/net/iflib_clone.c > head/sys/net/ifq.h > head/sys/net/mp_ring.c > head/sys/net/netisr.c > head/sys/net/netmap.h > head/sys/net/netmap_legacy.h > head/sys/net/netmap_user.h > head/sys/net/pfvar.h > head/sys/net/radix.c > head/sys/net/radix_mpath.c > head/sys/net/route.c > head/sys/net/route/nhop.c > head/sys/net/route/nhop.h > head/sys/net/route/nhop_ctl.c > head/sys/net/route/nhop_utils.c > head/sys/net/route/nhop_utils.h > head/sys/net/route/nhop_var.h > head/sys/net/route/route_ctl.c > head/sys/net/route/route_ctl.h > head/sys/net/route/route_helpers.c > head/sys/net/route/route_tables.c > head/sys/net/route/route_temporal.c > head/sys/net/route/route_var.h > head/sys/net/rss_config.c > head/sys/net/rtsock.c > head/sys/net/sff8436.h > head/sys/net/sff8472.h > head/sys/net/slcompress.c > head/sys/net/slcompress.h > head/sys/net/vnet.h > head/sys/net80211/ieee80211.h > head/sys/net80211/ieee80211_action.c > head/sys/net80211/ieee80211_ageq.c > head/sys/net80211/ieee80211_crypto.c > head/sys/net80211/ieee80211_crypto_tkip.c > head/sys/net80211/ieee80211_freebsd.c > head/sys/net80211/ieee80211_freebsd.h > head/sys/net80211/ieee80211_hostap.c > head/sys/net80211/ieee80211_ht.c > head/sys/net80211/ieee80211_hwmp.c > head/sys/net80211/ieee80211_input.c > head/sys/net80211/ieee80211_ioctl.c > head/sys/net80211/ieee80211_ioctl.h > head/sys/net80211/ieee80211_mesh.c > head/sys/net80211/ieee80211_mesh.h > head/sys/net80211/ieee80211_node.c > head/sys/net80211/ieee80211_output.c > head/sys/net80211/ieee80211_phy.c > head/sys/net80211/ieee80211_power.c > head/sys/net80211/ieee80211_proto.c > head/sys/net80211/ieee80211_radiotap.c > head/sys/net80211/ieee80211_radiotap.h > head/sys/net80211/ieee80211_scan.c > head/sys/net80211/ieee80211_scan_sta.c > head/sys/net80211/ieee80211_scan_sw.c > head/sys/net80211/ieee80211_sta.c > head/sys/net80211/ieee80211_superg.c > head/sys/net80211/ieee80211_tdma.h > head/sys/net80211/ieee80211_vht.c > head/sys/netgraph/atm/ccatm/ng_ccatm.c > head/sys/netgraph/atm/ng_sscop.h > head/sys/netgraph/atm/ngatmbase.c > head/sys/netgraph/atm/sscfu/ng_sscfu.c > head/sys/netgraph/atm/sscfu/ng_sscfu_cust.h > head/sys/netgraph/atm/sscop/ng_sscop.c > head/sys/netgraph/atm/sscop/ng_sscop_cust.h > head/sys/netgraph/atm/uni/ng_uni.c > head/sys/netgraph/bluetooth/common/ng_bluetooth.c > head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c > head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h > head/sys/netgraph/bluetooth/drivers/h4/ng_h4.c > head/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h > head/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h > head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c > head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h > head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c > head/sys/netgraph/bluetooth/hci/ng_hci_cmds.c > head/sys/netgraph/bluetooth/hci/ng_hci_cmds.h > head/sys/netgraph/bluetooth/hci/ng_hci_evnt.c > head/sys/netgraph/bluetooth/hci/ng_hci_evnt.h > head/sys/netgraph/bluetooth/hci/ng_hci_main.c > head/sys/netgraph/bluetooth/hci/ng_hci_misc.c > head/sys/netgraph/bluetooth/hci/ng_hci_misc.h > head/sys/netgraph/bluetooth/hci/ng_hci_prse.h > head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c > head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h > head/sys/netgraph/bluetooth/hci/ng_hci_var.h > head/sys/netgraph/bluetooth/include/ng_bluetooth.h > head/sys/netgraph/bluetooth/include/ng_bt3c.h > head/sys/netgraph/bluetooth/include/ng_btsocket.h > head/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h > head/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h > head/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h > head/sys/netgraph/bluetooth/include/ng_btsocket_sco.h > head/sys/netgraph/bluetooth/include/ng_h4.h > head/sys/netgraph/bluetooth/include/ng_hci.h > head/sys/netgraph/bluetooth/include/ng_l2cap.h > head/sys/netgraph/bluetooth/include/ng_ubt.h > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h > head/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h > head/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c > head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c > head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c > head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c > head/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c > head/sys/netgraph/netflow/netflow.c > head/sys/netgraph/netflow/netflow.h > head/sys/netgraph/netflow/netflow_v9.c > head/sys/netgraph/netflow/ng_netflow.c > head/sys/netgraph/netflow/ng_netflow.h > head/sys/netgraph/netgraph.h > head/sys/netgraph/ng_UI.c > head/sys/netgraph/ng_UI.h > head/sys/netgraph/ng_async.c > head/sys/netgraph/ng_base.c > head/sys/netgraph/ng_bpf.c > head/sys/netgraph/ng_bridge.c > head/sys/netgraph/ng_bridge.h > head/sys/netgraph/ng_car.c > head/sys/netgraph/ng_checksum.c > head/sys/netgraph/ng_cisco.c > head/sys/netgraph/ng_cisco.h > head/sys/netgraph/ng_deflate.c > head/sys/netgraph/ng_deflate.h > head/sys/netgraph/ng_device.c > head/sys/netgraph/ng_echo.c > head/sys/netgraph/ng_eiface.c > head/sys/netgraph/ng_etf.c > head/sys/netgraph/ng_ether.c > head/sys/netgraph/ng_ether_echo.c > head/sys/netgraph/ng_frame_relay.c > head/sys/netgraph/ng_gif.c > head/sys/netgraph/ng_hub.c > head/sys/netgraph/ng_iface.c > head/sys/netgraph/ng_ipfw.c > head/sys/netgraph/ng_ksocket.c > head/sys/netgraph/ng_l2tp.c > head/sys/netgraph/ng_lmi.c > head/sys/netgraph/ng_message.h > head/sys/netgraph/ng_mppc.c > head/sys/netgraph/ng_mppc.h > head/sys/netgraph/ng_nat.c > head/sys/netgraph/ng_one2many.h > head/sys/netgraph/ng_parse.c > head/sys/netgraph/ng_parse.h > head/sys/netgraph/ng_patch.c > head/sys/netgraph/ng_pipe.c > head/sys/netgraph/ng_ppp.c > head/sys/netgraph/ng_pppoe.c > head/sys/netgraph/ng_pppoe.h > head/sys/netgraph/ng_pptpgre.c > head/sys/netgraph/ng_pred1.c > head/sys/netgraph/ng_pred1.h > head/sys/netgraph/ng_rfc1490.c > head/sys/netgraph/ng_sample.c > head/sys/netgraph/ng_socket.c > head/sys/netgraph/ng_socket.h > head/sys/netgraph/ng_split.c > head/sys/netgraph/ng_split.h > head/sys/netgraph/ng_sppp.c > head/sys/netgraph/ng_tag.c > head/sys/netgraph/ng_tcpmss.c > head/sys/netgraph/ng_tcpmss.h > head/sys/netgraph/ng_tty.c > head/sys/netgraph/ng_vjc.c > head/sys/netgraph/ng_vlan.c > head/sys/netgraph/ng_vlan.h > head/sys/netinet/accf_http.c > head/sys/netinet/cc/cc_cubic.c > head/sys/netinet/cc/cc_htcp.c > head/sys/netinet/icmp_var.h > head/sys/netinet/if_ether.c > head/sys/netinet/igmp.c > head/sys/netinet/in.c > head/sys/netinet/in_fib.c > head/sys/netinet/in_fib.h > head/sys/netinet/in_gif.c > head/sys/netinet/in_mcast.c > head/sys/netinet/in_pcb.c > head/sys/netinet/in_rmx.c > head/sys/netinet/ip_carp.c > head/sys/netinet/ip_dummynet.h > head/sys/netinet/ip_fw.h > head/sys/netinet/ip_icmp.c > head/sys/netinet/ip_input.c > head/sys/netinet/ip_mroute.c > head/sys/netinet/ip_mroute.h > head/sys/netinet/ip_options.c > head/sys/netinet/ip_output.c > head/sys/netinet/libalias/alias.c > head/sys/netinet/libalias/alias.h > head/sys/netinet/libalias/alias_db.c > head/sys/netinet/libalias/alias_dummy.c > head/sys/netinet/libalias/alias_ftp.c > head/sys/netinet/libalias/alias_irc.c > head/sys/netinet/libalias/alias_local.h > head/sys/netinet/libalias/alias_nbt.c > head/sys/netinet/libalias/alias_pptp.c > head/sys/netinet/libalias/alias_proxy.c > head/sys/netinet/libalias/alias_sctp.c > head/sys/netinet/libalias/alias_sctp.h > head/sys/netinet/libalias/alias_skinny.c > head/sys/netinet/libalias/alias_smedia.c > head/sys/netinet/libalias/alias_util.c > head/sys/netinet/sctp.h > head/sys/netinet/sctp_asconf.c > head/sys/netinet/sctp_asconf.h > head/sys/netinet/sctp_auth.c > head/sys/netinet/sctp_auth.h > head/sys/netinet/sctp_bsd_addr.c > head/sys/netinet/sctp_bsd_addr.h > head/sys/netinet/sctp_cc_functions.c > head/sys/netinet/sctp_constants.h > head/sys/netinet/sctp_header.h > head/sys/netinet/sctp_indata.c > head/sys/netinet/sctp_indata.h > head/sys/netinet/sctp_input.c > head/sys/netinet/sctp_input.h > head/sys/netinet/sctp_lock_bsd.h > head/sys/netinet/sctp_os.h > head/sys/netinet/sctp_os_bsd.h > head/sys/netinet/sctp_output.c > head/sys/netinet/sctp_output.h > head/sys/netinet/sctp_pcb.c > head/sys/netinet/sctp_pcb.h > head/sys/netinet/sctp_ss_functions.c > head/sys/netinet/sctp_structs.h > head/sys/netinet/sctp_sysctl.c > head/sys/netinet/sctp_sysctl.h > head/sys/netinet/sctp_timer.c > head/sys/netinet/sctp_timer.h > head/sys/netinet/sctp_uio.h > head/sys/netinet/sctp_usrreq.c > head/sys/netinet/sctp_var.h > head/sys/netinet/sctputil.c > head/sys/netinet/sctputil.h > head/sys/netinet/siftr.c > head/sys/netinet/tcp.h > head/sys/netinet/tcp_fastopen.c > head/sys/netinet/tcp_hpts.c > head/sys/netinet/tcp_hpts.h > head/sys/netinet/tcp_input.c > head/sys/netinet/tcp_log_buf.c > head/sys/netinet/tcp_log_buf.h > head/sys/netinet/tcp_lro.c > head/sys/netinet/tcp_output.c > head/sys/netinet/tcp_ratelimit.c > head/sys/netinet/tcp_reass.c > head/sys/netinet/tcp_sack.c > head/sys/netinet/tcp_stacks/bbr.c > head/sys/netinet/tcp_stacks/rack.c > head/sys/netinet/tcp_stacks/rack_bbr_common.c > head/sys/netinet/tcp_stacks/tcp_bbr.h > head/sys/netinet/tcp_stacks/tcp_rack.h > head/sys/netinet/tcp_subr.c > head/sys/netinet/tcp_syncache.c > head/sys/netinet/tcp_usrreq.c > head/sys/netinet/toecore.c > head/sys/netinet/udp_usrreq.c > head/sys/netinet6/frag6.c > head/sys/netinet6/in6.c > head/sys/netinet6/in6_cksum.c > head/sys/netinet6/in6_fib.c > head/sys/netinet6/in6_fib.h > head/sys/netinet6/in6_mcast.c > head/sys/netinet6/in6_rmx.c > head/sys/netinet6/in6_src.c > head/sys/netinet6/ip6_fastfwd.c > head/sys/netinet6/ip6_input.c > head/sys/netinet6/ip6_mroute.c > head/sys/netinet6/ip6_output.c > head/sys/netinet6/ip_fw_nptv6.h > head/sys/netinet6/mld6.c > head/sys/netinet6/nd6.c > head/sys/netinet6/nd6_nbr.c > head/sys/netinet6/nd6_rtr.c > head/sys/netinet6/scope6.c > head/sys/netinet6/sctp6_usrreq.c > head/sys/netinet6/udp6_usrreq.c > head/sys/netipsec/esp.h > head/sys/netipsec/ipsec.c > head/sys/netipsec/ipsec_input.c > head/sys/netipsec/ipsec_output.c > head/sys/netipsec/ipsec_pcb.c > head/sys/netipsec/key.c > head/sys/netipsec/key_debug.c > head/sys/netipsec/udpencap.c > head/sys/netpfil/ipfw/dn_aqm.h > head/sys/netpfil/ipfw/dn_aqm_codel.c > head/sys/netpfil/ipfw/dn_aqm_codel.h > head/sys/netpfil/ipfw/dn_aqm_pie.c > head/sys/netpfil/ipfw/dn_aqm_pie.h > head/sys/netpfil/ipfw/dn_sched_fq_codel.c > head/sys/netpfil/ipfw/dn_sched_fq_codel.h > head/sys/netpfil/ipfw/dn_sched_fq_codel_helper.h > head/sys/netpfil/ipfw/dn_sched_fq_pie.c > head/sys/netpfil/ipfw/dn_sched_prio.c > head/sys/netpfil/ipfw/dn_sched_qfq.c > head/sys/netpfil/ipfw/dn_sched_rr.c > head/sys/netpfil/ipfw/dn_sched_wf2q.c > head/sys/netpfil/ipfw/ip_dn_glue.c > head/sys/netpfil/ipfw/ip_dn_io.c > head/sys/netpfil/ipfw/ip_dn_private.h > head/sys/netpfil/ipfw/ip_dummynet.c > head/sys/netpfil/ipfw/ip_fw2.c > head/sys/netpfil/ipfw/ip_fw_bpf.c > head/sys/netpfil/ipfw/ip_fw_dynamic.c > head/sys/netpfil/ipfw/ip_fw_iface.c > head/sys/netpfil/ipfw/ip_fw_nat.c > head/sys/netpfil/ipfw/ip_fw_private.h > head/sys/netpfil/ipfw/ip_fw_sockopt.c > head/sys/netpfil/ipfw/ip_fw_table.c > head/sys/netpfil/ipfw/ip_fw_table.h > head/sys/netpfil/ipfw/ip_fw_table_algo.c > head/sys/netpfil/ipfw/ip_fw_table_value.c > head/sys/netpfil/ipfw/nat64/nat64_translate.c > head/sys/netpfil/ipfw/nat64/nat64_translate.h > head/sys/netpfil/ipfw/nat64/nat64clat_control.c > head/sys/netpfil/ipfw/nat64/nat64lsn.c > head/sys/netpfil/ipfw/nat64/nat64lsn_control.c > head/sys/netpfil/ipfw/nat64/nat64stl.c > head/sys/netpfil/ipfw/nat64/nat64stl.h > head/sys/netpfil/ipfw/nat64/nat64stl_control.c > head/sys/netpfil/ipfw/nptv6/nptv6.c > head/sys/netpfil/ipfw/nptv6/nptv6.h > head/sys/netpfil/ipfw/pmod/pmod.h > head/sys/netpfil/ipfw/pmod/tcpmod.c > head/sys/netpfil/ipfw/test/dn_test.h > head/sys/netpfil/ipfw/test/main.c > head/sys/netpfil/ipfw/test/mylist.h > head/sys/netpfil/pf/if_pfsync.c > head/sys/netpfil/pf/pf.c > head/sys/netpfil/pf/pf_ioctl.c > head/sys/netpfil/pf/pf_norm.c > head/sys/netpfil/pf/pf_osfp.c > head/sys/netpfil/pf/pf_ruleset.c > head/sys/netpfil/pf/pf_table.c > head/sys/netsmb/smb.h > head/sys/netsmb/smb_conn.c > head/sys/netsmb/smb_conn.h > head/sys/netsmb/smb_crypt.c > head/sys/netsmb/smb_dev.c > head/sys/netsmb/smb_dev.h > head/sys/netsmb/smb_iod.c > head/sys/netsmb/smb_rq.c > head/sys/netsmb/smb_rq.h > head/sys/netsmb/smb_smb.c > head/sys/netsmb/smb_subr.h > head/sys/netsmb/smb_trantcp.c > head/sys/netsmb/smb_trantcp.h >=20 > Modified: head/sys/net/altq/altq.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -38,7 +38,6 @@ > #define ALTQ3_CLFIER_COMPAT /* for compatibility with altq-3 = classifier */ > #endif >=20 > - > /* altq discipline type */ > #define ALTQT_NONE 0 /* reserved */ > #define ALTQT_CBQ 1 /* cbq */ > @@ -57,14 +56,12 @@ > #define ALTQT_CODEL 14 /* CoDel */ > #define ALTQT_MAX 15 /* should be max = discipline type + 1 */ >=20 > - > /* simple token backet meter profile */ > struct tb_profile { > u_int64_t rate; /* rate in bit-per-sec */ > u_int32_t depth; /* depth in bytes */ > }; >=20 > - > /* > * generic packet counter > */ > @@ -76,7 +73,6 @@ struct pktcntr { > #define PKTCNTR_ADD(cntr, len) \ > do { (cntr)->packets++; (cntr)->bytes +=3D len; } while = (/*CONSTCOND*/ 0) >=20 > - > #ifdef _KERNEL > #include > #endif > @@ -105,5 +101,5 @@ static inline int altq_stats_version(int = scheduler) > default: return (0); > } > } > -=09 > + > #endif /* _ALTQ_ALTQ_H_ */ >=20 > Modified: head/sys/net/altq/altq_cbq.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_cbq.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_cbq.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -55,7 +55,6 @@ > #include > #include >=20 > - > /* > * Forward Declarations. > */ >=20 > Modified: head/sys/net/altq/altq_cbq.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_cbq.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_cbq.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -111,7 +111,6 @@ typedef struct _cbq_class_stats_ { > * header. > */ >=20 > - > #ifdef _KERNEL > /* > * Define macros only good for kernel drivers and modules. > @@ -121,7 +120,6 @@ typedef struct _cbq_class_stats_ { > #define CBQ_LS_TIMEOUT (20 * hz / 1000) >=20 > #define CBQ_MAX_CLASSES 256 > - >=20 > /* > * Define State structures. >=20 > Modified: head/sys/net/altq/altq_codel.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_codel.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_codel.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -246,7 +246,6 @@ codel_dequeue(struct ifaltq *ifq, int op) > if (op =3D=3D ALTDQ_POLL) > return (qhead(cif->cl_q)); >=20 > - > m =3D codel_getq(&cif->codel, cif->cl_q); > if (m !=3D NULL) { > IFQ_DEC_LEN(ifq); >=20 > Modified: head/sys/net/altq/altq_fairq.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_fairq.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_fairq.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -157,7 +157,6 @@ fairq_add_altq(struct ifnet *ifp, struct pf_altq = *a) > if (!ALTQ_IS_READY(&ifp->if_snd)) > return (ENODEV); >=20 > - > pif =3D malloc(sizeof(struct fairq_if), > M_DEVBUF, M_WAITOK | M_ZERO); > pif->pif_bandwidth =3D a->ifbandwidth; >=20 > Modified: head/sys/net/altq/altq_hfsc.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_hfsc.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_hfsc.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -133,8 +133,6 @@ static void = get_class_stats_v1(struct hfsc_classsta > struct hfsc_class *); > static struct hfsc_class *clh_to_clp(struct hfsc_if *, = u_int32_t); >=20 > - > - > /* > * macros > */ > @@ -142,7 +140,6 @@ static struct hfsc_class *clh_to_clp(struct = hfsc_if *, >=20 > #define HT_INFINITY 0xffffffffffffffffULL /* infinite time = value */ >=20 > - > int > hfsc_pfattach(struct pf_altq *a) > { > @@ -307,7 +304,6 @@ hfsc_clear_interface(struct hfsc_if *hif) > { > struct hfsc_class *cl; >=20 > - > /* clear out the classes */ > while (hif->hif_rootclass !=3D NULL && > (cl =3D hif->hif_rootclass->cl_children) !=3D NULL) { > @@ -569,7 +565,6 @@ hfsc_class_destroy(struct hfsc_class *cl) > s =3D splnet(); > IFQ_LOCK(cl->cl_hif->hif_ifq); >=20 > - > if (!qempty(cl->cl_q)) > hfsc_purgeq(cl); >=20 > @@ -729,7 +724,6 @@ hfsc_dequeue(struct ifaltq *ifq, int op) > cur_time =3D read_machclk(); >=20 > if (op =3D=3D ALTDQ_REMOVE && hif->hif_pollcache !=3D NULL) { > - > cl =3D hif->hif_pollcache; > hif->hif_pollcache =3D NULL; > /* check if the class was scheduled by real-time = criteria */ > @@ -754,7 +748,6 @@ hfsc_dequeue(struct ifaltq *ifq, int op) > */ > cl =3D hif->hif_rootclass; > while (is_a_parent_class(cl)) { > - > cl =3D actlist_firstfit(cl, cur_time); > if (cl =3D=3D NULL) { > #ifdef ALTQ_DEBUG > @@ -962,7 +955,6 @@ init_vf(struct hfsc_class *cl, int len) > cur_time =3D 0; > go_active =3D 1; > for ( ; cl->cl_parent !=3D NULL; cl =3D cl->cl_parent) { > - > if (go_active && cl->cl_nactive++ =3D=3D 0) > go_active =3D 1; > else > @@ -1052,7 +1044,6 @@ update_vf(struct hfsc_class *cl, int len, = u_int64_t cu > go_passive =3D qempty(cl->cl_q); >=20 > for (; cl->cl_parent !=3D NULL; cl =3D cl->cl_parent) { > - > cl->cl_total +=3D len; >=20 > if (cl->cl_fsc =3D=3D NULL || cl->cl_nactive =3D=3D 0) > @@ -1596,7 +1587,7 @@ get_class_stats_v0(struct hfsc_classstats_v0 = *sp, stru > } >=20 > #undef SATU32 > -=09 > + > sp->total =3D cl->cl_total; > sp->cumul =3D cl->cl_cumul; >=20 > @@ -1741,6 +1732,5 @@ clh_to_clp(struct hfsc_if *hif, u_int32_t = chandle) > return (cl); > return (NULL); > } > - >=20 > #endif /* ALTQ_HFSC */ >=20 > Modified: head/sys/net/altq/altq_hfsc.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_hfsc.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_hfsc.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -57,7 +57,7 @@ struct service_curve_v1 { >=20 > /* Latest version of struct service_curve_vX */ > #define HFSC_SERVICE_CURVE_VERSION 1 > -=09 > + > /* special class handles */ > #define HFSC_NULLCLASS_HANDLE 0 > #define HFSC_MAX_CLASSES 64 > @@ -167,7 +167,6 @@ struct hfsc_classstats_v1 { > * from mixing of public-API and internal bits in each = scheduler-specific > * header. > */ > -=09 >=20 > #ifdef _KERNEL > /* >=20 > Modified: head/sys/net/altq/altq_priq.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_priq.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_priq.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -74,11 +74,9 @@ static struct mbuf *priq_getq(struct priq_class *); > static struct mbuf *priq_pollq(struct priq_class *); > static void priq_purgeq(struct priq_class *); >=20 > - > static void get_class_stats(struct priq_classstats *, struct = priq_class *); > static struct priq_class *clh_to_clp(struct priq_if *, u_int32_t); >=20 > - > int > priq_pfattach(struct pf_altq *a) > { > @@ -639,6 +637,5 @@ clh_to_clp(struct priq_if *pif, u_int32_t chandle) >=20 > return (NULL); > } > - >=20 > #endif /* ALTQ_PRIQ */ >=20 > Modified: head/sys/net/altq/altq_priq.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_priq.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_priq.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -42,7 +42,6 @@ extern "C" { >=20 > #define PRIQ_MAXPRI 16 /* upper limit of the number of = priorities */ >=20 > - > /* priq class flags */ > #define PRCF_RED 0x0001 /* use RED */ > #define PRCF_ECN 0x0002 /* use RED/ECN */ > @@ -54,7 +53,6 @@ extern "C" { > /* special class handles */ > #define PRIQ_NULLCLASS_HANDLE 0 >=20 > - > struct priq_classstats { > u_int32_t class_handle; >=20 > @@ -75,7 +73,6 @@ struct priq_classstats { > * from mixing of public-API and internal bits in each = scheduler-specific > * header. > */ > - >=20 > #ifdef _KERNEL >=20 >=20 > Modified: head/sys/net/altq/altq_red.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_red.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_red.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -162,13 +162,11 @@ > * to switch to the random-drop policy, define "RED_RANDOM_DROP". > */ >=20 > - > /* default red parameter values */ > static int default_th_min =3D TH_MIN; > static int default_th_max =3D TH_MAX; > static int default_inv_pmax =3D INV_P_MAX; >=20 > - > /* > * red support routines > */ > @@ -628,6 +626,5 @@ pow_w(struct wtab *w, int n) > } > return (val); > } > - >=20 > #endif /* ALTQ_RED */ >=20 > Modified: head/sys/net/altq/altq_red.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_red.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_red.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -32,7 +32,6 @@ >=20 > #include >=20 > - > /* red flags */ > #define REDF_ECN4 0x01 /* use packet marking for IPv4 = packets */ > #define REDF_ECN6 0x02 /* use packet marking for IPv6 = packets */ > @@ -58,10 +57,8 @@ struct redstats { > u_int marked_packets; > }; >=20 > - > #ifdef _KERNEL >=20 > - > /* weight table structure for idle time calibration */ > struct wtab { > struct wtab *w_next; > @@ -96,7 +93,6 @@ typedef struct red { > struct wtab *red_wtab; /* weight table */ > struct timeval red_last; /* time when the queue becomes = idle */ >=20 > - > struct { > struct pktcntr xmit_cnt; > struct pktcntr drop_cnt; > @@ -105,7 +101,6 @@ typedef struct red { > u_int marked_packets; > } red_stats; > } red_t; > - >=20 > /* red drop types */ > #define DTYPE_NODROP 0 /* no drop */ >=20 > Modified: head/sys/net/altq/altq_rio.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_rio.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_rio.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -447,5 +447,4 @@ rio_getq(rio_t *rp, class_queue_t *q) > return (m); > } >=20 > - > #endif /* ALTQ_RIO */ >=20 > Modified: head/sys/net/altq/altq_rio.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_rio.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_rio.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -38,14 +38,12 @@ > */ > #define RIO_NDROPPREC 3 /* number of drop precedence = values */ >=20 > - > /* rio flags */ > #define RIOF_ECN4 0x01 /* use packet marking for IPv4 = packets */ > #define RIOF_ECN6 0x02 /* use packet marking for IPv6 = packets */ > #define RIOF_ECN (RIOF_ECN4 | RIOF_ECN6) > #define RIOF_CLEARDSCP 0x200 /* clear diffserv codepoint */ >=20 > - > #ifdef _KERNEL >=20 > typedef struct rio { > @@ -83,7 +81,6 @@ typedef struct rio { >=20 > struct redstats q_stats[RIO_NDROPPREC]; /* statistics */ > } rio_t; > - >=20 > extern rio_t *rio_alloc(int, struct redparams *, int, int); > extern void rio_destroy(rio_t *); >=20 > Modified: head/sys/net/altq/altq_rmclass.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_rmclass.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_rmclass.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -64,7 +64,6 @@ > /* > * Local Macros > */ > - > #define reset_cutoff(ifd) { ifd->cutoff_ =3D RM_MAXDEPTH; = } >=20 > /* > @@ -651,7 +650,6 @@ rmc_delete_class(struct rm_ifdat *ifd, struct = rm_class > free(cl->q_, M_DEVBUF); > free(cl, M_DEVBUF); > } > - >=20 > /* > * void >=20 > Modified: head/sys/net/altq/altq_subr.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/altq_subr.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/altq_subr.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -243,7 +243,7 @@ altq_disable(ifq) > ASSERT(ifq->ifq_len =3D=3D 0); > ifq->altq_flags &=3D ~(ALTQF_ENABLED|ALTQF_CLASSIFY); > splx(s); > -=09 > + > IFQ_UNLOCK(ifq); > return 0; > } > @@ -330,7 +330,7 @@ tbr_set(ifq, profile) > struct tb_profile *profile; > { > struct tb_regulator *tbr, *otbr; > -=09 > + > if (tbr_dequeue_ptr =3D=3D NULL) > tbr_dequeue_ptr =3D tbr_dequeue; >=20 > @@ -841,7 +841,6 @@ write_dsfield(struct mbuf *m, struct altq_pktattr = *pkt > return; > } >=20 > - > /* > * high resolution clock support taking advantage of a machine = dependent > * high resolution time counter (e.g., timestamp counter of intel = pentium). > @@ -1811,7 +1810,6 @@ filt2fibmask(filt) > return (mask); > } >=20 > - > /* > * helper functions to handle IPv4 fragments. > * currently only in-sequence fragments are handled. > @@ -1831,7 +1829,6 @@ static TAILQ_HEAD(ip4f_list, ip4_frag) = ip4f_list; /* I >=20 > #define IP4F_TABSIZE 16 /* IPv4 fragment cache = size */ >=20 > - > static void > ip4f_cache(ip, fin) > struct ip *ip; > @@ -1871,7 +1868,6 @@ ip4f_lookup(ip, fin) > ip->ip_src.s_addr =3D=3D fp->ip4f_info.fi_src.s_addr = && > ip->ip_dst.s_addr =3D=3D fp->ip4f_info.fi_dst.s_addr = && > ip->ip_p =3D=3D fp->ip4f_info.fi_proto) { > - > /* found the matching entry */ > fin->fi_sport =3D fp->ip4f_info.fi_sport; > fin->fi_dport =3D fp->ip4f_info.fi_dport; >=20 > Modified: head/sys/net/altq/if_altq.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/altq/if_altq.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/altq/if_altq.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -74,7 +74,6 @@ struct ifaltq { > struct top_cdnr *altq_cdnr; > }; >=20 > - > #ifdef _KERNEL >=20 > /* >=20 > Modified: head/sys/net/bpf.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/bpf.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/bpf.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -577,7 +577,6 @@ bpf_movein(struct uio *uio, int linktype, struct = ifnet > * for the link level header. > */ > switch (linktype) { > - > case DLT_SLIP: > sockp->sa_family =3D AF_INET; > hlen =3D 0; > @@ -1428,7 +1427,6 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t = addr, i >=20 > CURVNET_SET(TD_TO_VNET(td)); > switch (cmd) { > - > default: > error =3D EINVAL; > break; >=20 > Modified: head/sys/net/bridgestp.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/bridgestp.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/bridgestp.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -832,7 +832,6 @@ bstp_assign_roles(struct bstp_state *bs) > bp->bp_desg_fdelay =3D bs->bs_root_fdelay; > bp->bp_desg_htime =3D bs->bs_bridge_htime; >=20 > - > switch (bp->bp_infois) { > case BSTP_INFO_DISABLED: > bstp_set_port_role(bp, BSTP_ROLE_DISABLED); >=20 > Modified: head/sys/net/bridgestp.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/bridgestp.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/bridgestp.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -178,7 +178,6 @@ > #define BSTP_INFO_AGED 3 > #define BSTP_INFO_DISABLED 4 >=20 > - > #define BSTP_MESSAGE_AGE_INCR (1 * 256) /* in 256ths of = a second */ > #define BSTP_TICK_VAL (1 * 256) /* in 256ths of = a second */ > #define BSTP_LINK_TIMER (BSTP_TICK_VAL * 15) >=20 > Modified: head/sys/net/debugnet_inet.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/debugnet_inet.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/debugnet_inet.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -161,7 +161,6 @@ debugnet_handle_ip(struct debugnet_pcb *pcb, = struct mb > return; > } > if (m->m_pkthdr.len > ip->ip_len) { > - > /* Truncate the packet to the IP length. */ > if (m->m_len =3D=3D m->m_pkthdr.len) { > m->m_len =3D ip->ip_len; >=20 > Modified: head/sys/net/ieee8023ad_lacp.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/ieee8023ad_lacp.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/ieee8023ad_lacp.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -206,7 +206,6 @@ VNET_DEFINE_STATIC(int, lacp_default_strict_mode) = =3D 1; > SYSCTL_INT(_net_link_lagg_lacp, OID_AUTO, default_strict_mode, > CTLFLAG_RWTUN | CTLFLAG_VNET, = &VNET_NAME(lacp_default_strict_mode), 0, > "LACP strict protocol compliance default"); > - > #define LACP_DPRINTF(a) if (V_lacp_debug & 0x01) { lacp_dprintf a ; } > #define LACP_TRACE(a) if (V_lacp_debug & 0x02) { = lacp_dprintf(a,"%s\n",__func__); } > #define LACP_TPRINTF(a) if (V_lacp_debug & 0x04) { lacp_dprintf a ; } > @@ -607,7 +606,7 @@ lacp_req(struct lagg_softc *sc, void *data) > struct lacp_aggregator *la; >=20 > bzero(req, sizeof(struct lacp_opreq)); > -=09 > + > /* > * If the LACP softc is NULL, return with the opreq structure = full of > * zeros. It is normal for the softc to be NULL while the lagg = is > @@ -1102,7 +1101,6 @@ lacp_compose_key(struct lacp_port *lp) > uint16_t key; >=20 > if ((lp->lp_state & LACP_STATE_AGGREGATION) =3D=3D 0) { > - > /* > * non-aggregatable links should have unique keys. > * > @@ -1677,7 +1675,6 @@ lacp_sm_ptx_tx_schedule(struct lacp_port *lp) >=20 > if (!(lp->lp_state & LACP_STATE_ACTIVITY) && > !(lp->lp_partner.lip_state & LACP_STATE_ACTIVITY)) { > - > /* > * NO_PERIODIC > */ >=20 > Modified: head/sys/net/if.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if.c Tue Sep 1 21:18:40 2020 (r365070) > +++ head/sys/net/if.c Tue Sep 1 21:19:14 2020 (r365071) > @@ -488,7 +488,6 @@ VNET_SYSUNINIT(vnet_if_return, SI_SUB_VNET_DONE, = SI_OR > vnet_if_return, NULL); > #endif >=20 > - > static void * > if_grow(void) > { > @@ -688,7 +687,7 @@ if_rele(struct ifnet *ifp) > void > ifq_init(struct ifaltq *ifq, struct ifnet *ifp) > { > -=09 > + > mtx_init(&ifq->ifq_mtx, ifp->if_xname, "if send queue", = MTX_DEF); >=20 > if (ifq->ifq_maxlen =3D=3D 0)=20 > @@ -1838,7 +1837,6 @@ ifa_free(struct ifaddr *ifa) > NET_EPOCH_CALL(ifa_destroy, &ifa->ifa_epoch_ctx); > } >=20 > - > static int > ifa_maintain_loopback_route(int cmd, const char *otype, struct ifaddr = *ifa, > struct sockaddr *ia) > @@ -2358,7 +2356,7 @@ if_qflush(struct ifnet *ifp) > { > struct mbuf *m, *n; > struct ifaltq *ifq; > -=09 > + > ifq =3D &ifp->if_snd; > IFQ_LOCK(ifq); > #ifdef ALTQ > @@ -3142,7 +3140,7 @@ if_setflag(struct ifnet *ifp, int flag, int = pflag, int > /* Save ifnet parameters for if_ioctl() may fail */ > oldcount =3D *refcount; > oldflags =3D ifp->if_flags; > -=09 > + > /* > * See if we aren't the only and touching refcount is enough. > * Actually toggle interface flag if we are the first or last. > @@ -3430,7 +3428,6 @@ if_freemulti(struct ifmultiaddr *ifma) > NET_EPOCH_CALL(if_destroymulti, &ifma->ifma_epoch_ctx); > } >=20 > - > /* > * Register an additional multicast address with a network interface. > * > @@ -4029,7 +4026,7 @@ void > if_register_com_alloc(u_char type, > if_com_alloc_t *a, if_com_free_t *f) > { > -=09 > + > KASSERT(if_com_alloc[type] =3D=3D NULL, > ("if_register_com_alloc: %d already registered", type)); > KASSERT(if_com_free[type] =3D=3D NULL, > @@ -4042,7 +4039,7 @@ if_register_com_alloc(u_char type, > void > if_deregister_com_alloc(u_char type) > { > -=09 > + > KASSERT(if_com_alloc[type] !=3D NULL, > ("if_deregister_com_alloc: %d not registered", type)); > KASSERT(if_com_free[type] !=3D NULL, > @@ -4154,7 +4151,7 @@ if_getdrvflags(if_t ifp) > { > return ((struct ifnet *)ifp)->if_drv_flags; > } > -=20 > + > int > if_setdrvflags(if_t ifp, int flags) > { > @@ -4162,7 +4159,6 @@ if_setdrvflags(if_t ifp, int flags) > return (0); > } >=20 > - > int > if_setflags(if_t ifp, int flags) > { > @@ -4376,7 +4372,6 @@ if_getamcount(if_t ifp) > return ((struct ifnet *)ifp)->if_amcount; > } >=20 > - > int > if_setsendqready(if_t ifp) > { > @@ -4537,7 +4532,7 @@ if_settransmitfn(if_t ifp, if_transmit_fn_t = start_fn) > void if_setqflushfn(if_t ifp, if_qflush_fn_t flush_fn) > { > ((struct ifnet *)ifp)->if_qflush =3D flush_fn; > -=09 > + > } >=20 > void >=20 > Modified: head/sys/net/if.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if.h Tue Sep 1 21:18:40 2020 (r365070) > +++ head/sys/net/if.h Tue Sep 1 21:19:14 2020 (r365071) > @@ -164,7 +164,6 @@ struct if_data { > #define IFF_RENAMING 0x400000 /* (n) interface is = being renamed */ > #define IFF_NOGROUP 0x800000 /* (n) interface is not = part of any groups */ >=20 > - > /* > * Old names for driver flags so that user space tools can continue to = use > * the old (portable) names. >=20 > Modified: head/sys/net/if_bridge.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_bridge.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_bridge.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -364,7 +364,6 @@ static int bridge_fragment(struct ifnet *, = struct mbuf > static void bridge_linkstate(struct ifnet *ifp); > static void bridge_linkcheck(struct bridge_softc *sc); >=20 > - > /* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */ > #define VLANTAGOF(_m) \ > (_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) = : 1 > @@ -784,7 +783,6 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, = caddr_t da > NET_EPOCH_ENTER(et); >=20 > switch (cmd) { > - > case SIOCADDMULTI: > case SIOCDELMULTI: > break; >=20 > Modified: head/sys/net/if_clone.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_clone.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_clone.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -239,7 +239,7 @@ if_clone_createif(struct if_clone *ifc, char = *name, si > err =3D ifc_simple_create(ifc, name, len, params); > else > err =3D (*ifc->ifc_create)(ifc, name, len, params); > -=09 > + > if (!err) { > ifp =3D ifunit(name); > if (ifp =3D=3D NULL) > @@ -669,7 +669,7 @@ ifc_simple_match(struct if_clone *ifc, const char = *nam > { > const char *cp; > int i; > -=09 > + > /* Match the name */ > for (cp =3D name, i =3D 0; i < strlen(ifc->ifc_name); i++, cp++) = { > if (ifc->ifc_name[i] !=3D *cp) > @@ -721,7 +721,6 @@ ifc_simple_create(struct if_clone *ifc, char = *name, si > */ > panic("if_clone_create(): interface name too = long"); > } > - > } >=20 > return (0); >=20 > Modified: head/sys/net/if_dl.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_dl.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_dl.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -72,7 +72,6 @@ struct sockaddr_dl { > #define CLLADDR(s) ((c_caddr_t)((s)->sdl_data + (s)->sdl_nlen)) > #define LLINDEX(s) ((s)->sdl_index) >=20 > - > struct ifnet; > struct sockaddr_dl *link_alloc_sdl(size_t, int); > void link_free_sdl(struct sockaddr *sa); >=20 > Modified: head/sys/net/if_epair.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_epair.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_epair.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -489,7 +489,7 @@ epair_transmit_locked(struct ifnet *ifp, struct = mbuf * >=20 > if (m =3D=3D NULL) > return (0); > -=09 > + > /* > * We are not going to use the interface en/dequeue mechanism > * on the TX side. We are called from ether_output_frame() > @@ -609,7 +609,7 @@ static void > epair_qflush(struct ifnet *ifp) > { > struct epair_softc *sc; > -=09 > + > sc =3D ifp->if_softc; > KASSERT(sc !=3D NULL, ("%s: ifp=3D%p, epair_softc gone? = sc=3D%p\n", > __func__, ifp, sc)); > @@ -681,7 +681,6 @@ epair_init(void *dummy __unused) > { > } >=20 > - > /* > * Interface cloning functions. > * We use our private ones so that we can create/destroy our secondary > @@ -800,7 +799,7 @@ epair_clone_create(struct if_clone *ifc, char = *name, s > ifc_free_unit(ifc, unit); > return (ENOSPC); > } > -=09 > + > /* > * Cross-reference the interfaces so we will be able to free = both. > */ > @@ -825,7 +824,7 @@ epair_clone_create(struct if_clone *ifc, char = *name, s > ifmedia_init(&scb->media, 0, epair_media_change, = epair_media_status); > ifmedia_add(&scb->media, IFM_ETHER | IFM_10G_T, 0, NULL); > ifmedia_set(&scb->media, IFM_ETHER | IFM_10G_T); > -=09 > + > /* Finish initialization of interface a. */ > ifp =3D sca->ifp; > ifp->if_softc =3D sca; > @@ -932,7 +931,7 @@ epair_clone_destroy(struct if_clone *ifc, struct = ifnet > */ > if (ifp->if_softc =3D=3D NULL) > return (0); > -=09 > + > unit =3D ifp->if_dunit; > sca =3D ifp->if_softc; > oifp =3D sca->oifp; >=20 > Modified: head/sys/net/if_ethersubr.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_ethersubr.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_ethersubr.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -122,7 +122,6 @@ static void ether_reassign(struct ifnet *, = struct vnet > #endif > static int ether_requestencap(struct ifnet *, struct = if_encap_req *); >=20 > - > #define senderr(e) do { error =3D (e); goto bad;} while (0) >=20 > static void > @@ -200,7 +199,6 @@ ether_requestencap(struct ifnet *ifp, struct = if_encap_ > return (0); > } >=20 > - > static int > ether_resolve_addr(struct ifnet *ifp, struct mbuf *m, > const struct sockaddr *dst, struct route *ro, u_char *phdr, > @@ -545,7 +543,6 @@ ether_input_internal(struct ifnet *ifp, struct = mbuf *m > /* draft-ietf-6man-ipv6only-flag */ > /* Catch ETHERTYPE_IP, and ETHERTYPE_[REV]ARP if we are v6-only. = */ > if ((ND_IFINFO(ifp)->flags & ND6_IFF_IPV6_ONLY_MASK) !=3D 0) { > - > switch (etype) { > case ETHERTYPE_IP: > case ETHERTYPE_ARP: > @@ -774,7 +771,7 @@ vnet_ether_init(__unused void *arg) > } > VNET_SYSINIT(vnet_ether_init, SI_SUB_PROTO_IF, SI_ORDER_ANY, > vnet_ether_init, NULL); > -=20 > + > #ifdef VIMAGE > static void > vnet_ether_pfil_destroy(__unused void *arg) > @@ -794,8 +791,6 @@ vnet_ether_destroy(__unused void *arg) > VNET_SYSUNINIT(vnet_ether_uninit, SI_SUB_PROTO_IF, SI_ORDER_ANY, > vnet_ether_destroy, NULL); > #endif > - > - >=20 > static void > ether_input(struct ifnet *ifp, struct mbuf *m) >=20 > Modified: head/sys/net/if_gif.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_gif.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_gif.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -400,7 +400,6 @@ gif_qflush(struct ifnet *ifp __unused) >=20 > } >=20 > - > int > gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr = *dst, > struct route *ro) > @@ -721,4 +720,3 @@ gif_delete_tunnel(struct gif_softc *sc) > GIF2IFP(sc)->if_drv_flags &=3D ~IFF_DRV_RUNNING; > if_link_state_change(GIF2IFP(sc), LINK_STATE_DOWN); > } > - >=20 > Modified: head/sys/net/if_ipsec.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_ipsec.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_ipsec.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -1003,7 +1003,6 @@ ipsec_set_addresses(struct ifnet *ifp, struct = sockaddr > key_sockaddrcmp(&saidx->src.sa, src, 0) =3D=3D 0 && > key_sockaddrcmp(&saidx->dst.sa, dst, 0) =3D=3D 0) > return (0); /* Nothing has been changed. */ > - > } > /* If reqid is not set, generate new one. */ > if (ipsec_init_reqid(sc) !=3D 0) >=20 > Modified: head/sys/net/if_lagg.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_lagg.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_lagg.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -803,7 +803,6 @@ lagg_port_create(struct lagg_softc *sc, struct = ifnet * >=20 > lagg_setmulti(lp); >=20 > - > if ((error =3D lagg_proto_addport(sc, lp)) !=3D 0) { > /* Remove the port, without calling pr_delport. */ > lagg_port_destroy(lp, 0); > @@ -1046,7 +1045,6 @@ lagg_get_counter(struct ifnet *ifp, ift_counter = cnt) > */ > vsum +=3D sc->detached_counters.val[cnt]; >=20 > - > return (vsum); > } >=20 > @@ -2425,4 +2423,3 @@ lagg_lacp_input(struct lagg_softc *sc, struct = lagg_por > m->m_pkthdr.rcvif =3D ifp; > return (m); > } > - >=20 > Modified: head/sys/net/if_llatbl.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_llatbl.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_llatbl.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -874,7 +874,6 @@ llatbl_llt_show(struct lltable *llt) >=20 > for (i =3D 0; i < llt->llt_hsize; i++) { > CK_LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { > - > llatbl_lle_show((struct llentry_sa *)lle); > if (db_pager_quit) > return; >=20 > Modified: head/sys/net/if_loop.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_loop.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_loop.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -393,7 +393,6 @@ loioctl(struct ifnet *ifp, u_long cmd, caddr_t = data) > break; > } > switch (ifr->ifr_addr.sa_family) { > - > #ifdef INET > case AF_INET: > break; >=20 > Modified: head/sys/net/if_media.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_media.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_media.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -233,7 +233,6 @@ ifmedia_ioctl(ifp, ifr, ifm, cmd) > return(EINVAL); >=20 > switch (cmd) { > - > /* > * Set the current media. > */ > @@ -390,7 +389,7 @@ ifmedia_baudrate(int mword) > /* Not known. */ > return (0); > } > -=20 > + > #ifdef IFMEDIA_DEBUG > static const struct ifmedia_description ifm_type_descriptions[] =3D > IFM_TYPE_DESCRIPTIONS; >=20 > Modified: head/sys/net/if_media.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_media.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_media.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -108,7 +108,6 @@ void ifmedia_set(struct ifmedia *ifm, int = mword); > int ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, > struct ifmedia *ifm, u_long cmd); >=20 > - > /* Compute baudrate for a given media. */ > uint64_t ifmedia_baudrate(int); >=20 >=20 > Modified: head/sys/net/if_mib.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_mib.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_mib.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -150,4 +150,3 @@ out: > static SYSCTL_NODE(_net_link_generic, IFMIB_IFDATA, ifdata, > CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ifdata, > "Interface table"); > - >=20 > Modified: head/sys/net/if_pfsync.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_pfsync.h Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_pfsync.h Tue Sep 1 21:19:14 2020 = (r365071) > @@ -47,7 +47,6 @@ > * $FreeBSD$ > */ >=20 > - > #ifndef _NET_IF_PFSYNC_H_ > #define _NET_IF_PFSYNC_H_ >=20 >=20 > Modified: head/sys/net/if_spppsubr.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_spppsubr.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_spppsubr.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -742,7 +742,7 @@ static void > sppp_ifstart_sched(void *dummy) > { > struct sppp *sp =3D dummy; > -=09 > + > sp->if_start(SP2IFP(sp)); > } >=20 > @@ -1005,7 +1005,7 @@ sppp_attach(struct ifnet *ifp) >=20 > /* Initialize mtx lock */ > mtx_init(&sp->mtx, "sppp", MTX_NETWORK_LOCK, MTX_DEF | = MTX_RECURSE); > -=09 > + > /* Initialize keepalive handler. */ > callout_init(&sp->keepalive_callout, 1); > callout_reset(&sp->keepalive_callout, hz * 10, sppp_keepalive, > @@ -1863,7 +1863,6 @@ sppp_cp_input(const struct cp *cp, struct sppp = *sp, st > } > } >=20 > - > /* > * The generic part of all Up/Down/Open/Close/TO event handlers. > * Basically, the state transition handling in the automaton. > @@ -1930,7 +1929,6 @@ sppp_down_event(const struct cp *cp, struct sppp = *sp) > } > } >=20 > - > static void > sppp_open_event(const struct cp *cp, struct sppp *sp) > { > @@ -1980,7 +1978,6 @@ sppp_open_event(const struct cp *cp, struct sppp = *sp) > } > } >=20 > - > static void > sppp_close_event(const struct cp *cp, struct sppp *sp) > { > @@ -2680,7 +2677,7 @@ sppp_lcp_tlu(struct sppp *sp) > /* notify low-level driver of state change */ > if (sp->pp_chg) > sp->pp_chg(sp, (int)sp->pp_phase); > -=09 > + > if (sp->pp_phase =3D=3D PHASE_NETWORK) > /* if no NCP is starting, close down */ > sppp_lcp_check_and_close(sp); > @@ -3070,7 +3067,6 @@ sppp_ipcp_RCR(struct sppp *sp, struct lcp_header = *h, i > else > log(-1, "%s [not agreed] ", > = sppp_dotted_quad(desiredaddr)); > - > } > p[2] =3D hisaddr >> 24; > p[3] =3D hisaddr >> 16; > @@ -3836,7 +3832,6 @@ static void sppp_ipv6cp_down(struct sppp *sp) > { > } >=20 > - > static void sppp_ipv6cp_open(struct sppp *sp) > { > } > @@ -4188,7 +4183,6 @@ sppp_chap_input(struct sppp *sp, struct mbuf *m) > log(-1, ">\n"); > } > break; > - > } > } >=20 > @@ -4506,7 +4500,6 @@ sppp_pap_input(struct sppp *sp, struct mbuf *m) > log(-1, ">\n"); > } > break; > - > } > } >=20 > @@ -5227,7 +5220,6 @@ sppp_phase_network(struct sppp *sp) > /* if no NCP is starting, all this was in vain, close down */ > sppp_lcp_check_and_close(sp); > } > - >=20 > static const char * > sppp_cp_type_name(u_char type) >=20 > Modified: head/sys/net/if_tuntap.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_tuntap.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_tuntap.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -168,7 +168,6 @@ struct tuntap_softc { > #define TAP_ALL_OFFLOAD (CSUM_TSO | CSUM_TCP | CSUM_UDP = |\ > CSUM_TCP_IPV6 | CSUM_UDP_IPV6) >=20 > - > /* > * All mutable global variables in if_tun are locked using tunmtx, = with > * the exception of tundebug, which is used unlocked, and the drivers' = *clones, > @@ -387,7 +386,6 @@ tun_busy(struct tuntap_softc *tp) > return (ret); > } >=20 > - > static void > tun_unbusy(struct tuntap_softc *tp) > { > @@ -475,8 +473,6 @@ tuntap_driver_from_flags(int tun_flags) >=20 > return (NULL); > } > - > - >=20 > static int > tun_clone_match(struct if_clone *ifc, const char *name) >=20 > Modified: head/sys/net/if_vlan.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/net/if_vlan.c Tue Sep 1 21:18:40 2020 = (r365070) > +++ head/sys/net/if_vlan.c Tue Sep 1 21:19:14 2020 = (r365071) > @@ -342,7 +342,7 @@ static void >=20 > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** --Apple-Mail=_D56F355E-7746-4C32-B4D1-9185488031E7 Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCCEKow ggUSMIID+qADAgECAgkA4wvV+K8l2YEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkRFMSsw KQYDVQQKDCJULVN5c3RlbXMgRW50ZXJwcmlzZSBTZXJ2aWNlcyBHbWJIMR8wHQYDVQQLDBZULVN5 c3RlbXMgVHJ1c3QgQ2VudGVyMSUwIwYDVQQDDBxULVRlbGVTZWMgR2xvYmFsUm9vdCBDbGFzcyAy MB4XDTE2MDIyMjEzMzgyMloXDTMxMDIyMjIzNTk1OVowgZUxCzAJBgNVBAYTAkRFMUUwQwYDVQQK EzxWZXJlaW4genVyIEZvZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMg ZS4gVi4xEDAOBgNVBAsTB0RGTi1QS0kxLTArBgNVBAMTJERGTi1WZXJlaW4gQ2VydGlmaWNhdGlv biBBdXRob3JpdHkgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtg1/9moUHN0vqH l4pzq5lN6mc5WqFggEcVToyVsuXPztNXS43O+FZsFVV2B+pG/cgDRWM+cNSrVICxI5y+NyipCf8F XRgPxJiZN7Mg9mZ4F4fCnQ7MSjLnFp2uDo0peQcAIFTcFV9Kltd4tjTTwXS1nem/wHdN6r1ZB+Ba L2w8pQDcNb1lDY9/Mm3yWmpLYgHurDg0WUU2SQXaeMpqbVvAgWsRzNI8qIv4cRrKO+KA3Ra0Z3qL NupOkSk9s1FcragMvp0049ENF4N1xDkesJQLEvHVaY4l9Lg9K7/AjsMeO6W/VRCrKq4Xl14zzsjz 9AkH4wKGMUZrAcUQDBHHWekCAwEAAaOCAXQwggFwMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU k+PYMiba1fFKpZFK4OpL4qIMz+EwHwYDVR0jBBgwFoAUv1kgNgB5oKAia4zV8mHSuCzLgkowEgYD VR0TAQH/BAgwBgEB/wIBAjAzBgNVHSAELDAqMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC LB4wCAYGZ4EMAQICMEwGA1UdHwRFMEMwQaA/oD2GO2h0dHA6Ly9wa2kwMzM2LnRlbGVzZWMuZGUv cmwvVGVsZVNlY19HbG9iYWxSb290X0NsYXNzXzIuY3JsMIGGBggrBgEFBQcBAQR6MHgwLAYIKwYB BQUHMAGGIGh0dHA6Ly9vY3NwMDMzNi50ZWxlc2VjLmRlL29jc3ByMEgGCCsGAQUFBzAChjxodHRw Oi8vcGtpMDMzNi50ZWxlc2VjLmRlL2NydC9UZWxlU2VjX0dsb2JhbFJvb3RfQ2xhc3NfMi5jZXIw DQYJKoZIhvcNAQELBQADggEBAIcL/z4Cm2XIVi3WO5qYi3FP2ropqiH5Ri71sqQPrhE4eTizDnS6 dl2e6BiClmLbTDPo3flq3zK9LExHYFV/53RrtCyD2HlrtrdNUAtmB7Xts5et6u5/MOaZ/SLick0+ hFvu+c+Z6n/XUjkurJgARH5pO7917tALOxrN5fcPImxHhPalR6D90Bo0fa3SPXez7vTXTf/D6OWS T1k+kEcQSrCFWMBvf/iu7QhCnh7U3xQuTY+8npTD5+32GPg8SecmqKc22CzeIs2LgtjZeOJVEqM7 h0S2EQvVDFKvaYwPBt/QolOLV5h7z/0HJPT8vcP9SpIClxvyt7bPZYoaorVyGTkwggWsMIIElKAD AgECAgcbY7rQHiw9MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVy ZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYu MRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IDIwHhcNMTYwNTI0MTEzODQwWhcNMzEwMjIyMjM1OTU5WjCBjTELMAkGA1UEBhMCREUx RTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5lcyBEZXV0c2NoZW4gRm9yc2NodW5n c25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMGA1UEAwwcREZOLVZlcmVpbiBHbG9i YWwgSXNzdWluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ07eRxH3h+Gy8Zp 1xCeOdfZojDbchwFfylfS2jxrRnWTOFrG7ELf6Gr4HuLi9gtzm6IOhDuV+UefwRRNuu6cG1joL6W LkDh0YNMZj0cZGnlm6Stcq5oOVGHecwX064vXWNxSzl660Knl5BpBb+Q/6RAcL0D57+eGIgfn5mI TQ5HjUhfZZkQ0tkqSe3BuS0dnxLLFdM/fx5ULzquk1enfnjK1UriGuXtQX1TX8izKvWKMKztFwUk P7agCwf9TRqaA1KgNpzeJIdl5Of6x5ZzJBTN0OgbaJ4YWa52fvfRCng8h0uwN89Tyjo4EPPLR22M ZD08WkVKusqAfLjz56dMTM0CAwEAAaOCAgUwggIBMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0P AQH/BAQDAgEGMCkGA1UdIAQiMCAwDQYLKwYBBAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAdBgNV HQ4EFgQUazqYi/nyU4na4K2yMh4JH+iqO3QwHwYDVR0jBBgwFoAUk+PYMiba1fFKpZFK4OpL4qIM z+EwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9v dC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9n bG9iYWwtcm9vdC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYI KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEF BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9vdC1nMi1jYS9wdWIvY2FjZXJ0 L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJv b3QtZzItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCBeEWkTqR/ DlXwCbFqPnjMaDWpHPOVnj/z+N9rOHeJLI21rT7H8pTNoAauusyosa0zCLYkhmI2THhuUPDVbmCN T1IxQ5dGdfBi5G5mUcFCMWdQ5UnnOR7Ln8qGSN4IFP8VSytmm6A4nwDO/afr0X9XLchMX9wQEZc+ lgQCXISoKTlslPwQkgZ7nu7YRrQbtQMMONncsKk/cQYLsgMHM8KNSGMlJTx6e1du94oFOO+4oK4v 9NsH1VuEGMGpuEvObJAaguS5Pfp38dIfMwK/U+d2+dwmJUFvL6Yb+qQTkPp8ftkLYF3sv8pBoGH7 EUkp2KgtdRXYShjqFu9VNCIaE40GMIIF4DCCBMigAwIBAgIMIRX9tDE2QqO3mVLXMA0GCSqGSIb3 DQEBCwUAMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVp bmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUw IwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTE5MDYwNDE0MjkxMFoXDTIy MDYwMzE0MjkxMFowfDELMAkGA1UEBhMCREUxIDAeBgNVBAoMF0ZhY2hob2Noc2NodWxlIE11ZW5z dGVyMTIwMAYDVQQLDClGYWNoYmVyZWljaCBFbGVrdHJvdGVjaG5payB1bmQgSW5mb3JtYXRpazEX MBUGA1UEAwwOTWljaGFlbCBUdWV4ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM r8qQcPxLFCxzPtXvRyM9KeQaxyMA8gwUNc7IIiATs6mRQFe5ib/mvwT9nc0bAa+94go6HJDiD3FJ NkTo4u8aBsIcTt5pJtdBQLm88PLakbe3+fp/00//n7xxbTh7mAtFVCf25LxDCKkrdGk/+jglRq/R VdwhZZ3VpYCrx8YfI/hIzdRL3+4I4z/mnQ8K0X8d2MVVPG+9nBEngdnYGez5f/8wIVOgEYYBc21k yvMnVXLu2Ing+LwBd0gDG9Vasv87MNHCOZfJTNBlLhI2UDei/uNg9Zd4ynlMpPWZ7v0oiDWvmv8E OuD4oric8heyD0OYK2FL4qcVC4dn4pnyulfHAgMBAAGjggJOMIICSjA+BgNVHSAENzA1MA8GDSsG AQQBga0hgiwBAQQwEAYOKwYBBAGBrSGCLAEBBAQwEAYOKwYBBAGBrSGCLAIBBAQwCQYDVR0TBAIw ADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQW BBTxiodBVL/lA4p5iNesIsJRhhgd6zAfBgNVHSMEGDAWgBRrOpiL+fJTidrgrbIyHgkf6Ko7dDAg BgNVHREEGTAXgRV0dWV4ZW5AZmgtbXVlbnN0ZXIuZGUwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0 cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jcmwvY2FjcmwuY3JsMD+g PaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNy bC5jcmwwgdsGCCsGAQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu LmRlL09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv ZGZuLWNhLWdsb2JhbC1nMi9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6 Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2JhbC1nMi9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw DQYJKoZIhvcNAQELBQADggEBABs3VlmIZ1VF3HkaQdjInZYmamRabbdgJ7cz6m6o/agKL7+Vhwx7 1BaaYs2gMa5Nu/GJ3YfdqIsUlYtKdl58Yhp/89E6xBfJkItS+rE8RFdf2XgklGlx7GmsvdA3tId5 b6K6r9a5wpVN0epxY6K8wwpzEib6fJLcHylybQXZ7JSOaLRLp6WU3QPoyTT7FpvAe/0b2MSCbPX4 fc53PCn2aGgXuRFVQeCn1SP1BF3QW1ppkFhcF6G+0JcUxYFAXE6r/71WZBvUHqoG/th2hAwQnS+Y KhUYh4SZQH3/ursXXJYXQ5vyIhkN1FZlmtWA8+ofdCnoqSTbiSX2Aa/kKbTapwgxggOdMIIDmQIB ATCBnjCBjTELMAkGA1UEBhMCREUxRTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5l cyBEZXV0c2NoZW4gRm9yc2NodW5nc25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMG A1UEAwwcREZOLVZlcmVpbiBHbG9iYWwgSXNzdWluZyBDQQIMIRX9tDE2QqO3mVLXMA0GCWCGSAFl AwQCAQUAoIIBzzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yMDA5 MDEyMjQxNDNaMC8GCSqGSIb3DQEJBDEiBCAPMzTQczb6qdS2GVd2RVMmmh51dwUdQ6STQWOuckPI ezCBrwYJKwYBBAGCNxAEMYGhMIGeMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1 ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYD VQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBAgwhFf20 MTZCo7eZUtcwgbEGCyqGSIb3DQEJEAILMYGhoIGeMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8 VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUu IFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5n IENBAgwhFf20MTZCo7eZUtcwDQYJKoZIhvcNAQEBBQAEggEANuS5v07TiYkJt4L1VYVEVQ8g0vTD gEc2Fdr6lhREtdDCRC4x0vrzeg2fEA+k5JgCIiAhjNKrf4BS5zXI6mP46SLfE6ML7rxoMxfc+ElW O8XHfiatyJkAiyj1S5obwwHs3FNC52Lxqn9cCiT0dftpMxYecS0tQeXoiVuuJIHxm45XqZA6DH1q 9NZVw7eI0o7/GjsYTfxH7U9bW8eIi0C/2BGy1oynr7MI8aH5POSTG2LQrTKmtyPY8MDgEcRCoHgG HPKGJM9xRCPD1dB2eE8TK8z10iMgwjPGVfb61BTeECrqaZJhUUEa+GfLlv3nbuY+nfGbr8DpfSLi Z1fTAjDseAAAAAAAAA== --Apple-Mail=_D56F355E-7746-4C32-B4D1-9185488031E7-- From owner-svn-src-all@freebsd.org Tue Sep 1 23:16:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3EA8C3C117E; Tue, 1 Sep 2020 23:16:41 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh2yK1Dfdz3Z1s; Tue, 1 Sep 2020 23:16:41 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E3312106B; Tue, 1 Sep 2020 23:16:41 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081NGfvo099985; Tue, 1 Sep 2020 23:16:41 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081NGdYI099977; Tue, 1 Sep 2020 23:16:39 GMT (envelope-from erj@FreeBSD.org) Message-Id: <202009012316.081NGdYI099977@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Tue, 1 Sep 2020 23:16:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365231 - head/sys/dev/ixl X-SVN-Group: head X-SVN-Commit-Author: erj X-SVN-Commit-Paths: head/sys/dev/ixl X-SVN-Commit-Revision: 365231 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 23:16:41 -0000 Author: erj Date: Tue Sep 1 23:16:38 2020 New Revision: 365231 URL: https://svnweb.freebsd.org/changeset/base/365231 Log: ixl(4): Add support for X710-T*L devices Add support for new devices which are capable of 2.5 and 5G speeds, as well as Energy Efficient Ethernet (EEE): - introduce new device ids - add ability to select 2.5 and 5G speeds on devices which support it - add sysctls to enable EEE and read related statistics Submitted by: Krzysztof Galazka Reviewed by: #IntelNetworking MFC after: 3 days Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D25549 Modified: head/sys/dev/ixl/i40e_adminq_cmd.h head/sys/dev/ixl/i40e_common.c head/sys/dev/ixl/i40e_devids.h head/sys/dev/ixl/i40e_prototype.h head/sys/dev/ixl/i40e_type.h head/sys/dev/ixl/if_ixl.c head/sys/dev/ixl/ixl_pf.h head/sys/dev/ixl/ixl_pf_main.c head/sys/dev/ixl/virtchnl.h Modified: head/sys/dev/ixl/i40e_adminq_cmd.h ============================================================================== --- head/sys/dev/ixl/i40e_adminq_cmd.h Tue Sep 1 22:36:24 2020 (r365230) +++ head/sys/dev/ixl/i40e_adminq_cmd.h Tue Sep 1 23:16:38 2020 (r365231) @@ -1940,6 +1940,8 @@ enum i40e_aq_phy_type { I40E_PHY_TYPE_25GBASE_LR = 0x22, I40E_PHY_TYPE_25GBASE_AOC = 0x23, I40E_PHY_TYPE_25GBASE_ACC = 0x24, + I40E_PHY_TYPE_2_5GBASE_T = 0x30, + I40E_PHY_TYPE_5GBASE_T = 0x31, I40E_PHY_TYPE_MAX, I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP = 0xFD, I40E_PHY_TYPE_EMPTY = 0xFE, @@ -1981,19 +1983,25 @@ enum i40e_aq_phy_type { BIT_ULL(I40E_PHY_TYPE_25GBASE_SR) | \ BIT_ULL(I40E_PHY_TYPE_25GBASE_LR) | \ BIT_ULL(I40E_PHY_TYPE_25GBASE_AOC) | \ - BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC)) + BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC) | \ + BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T) | \ + BIT_ULL(I40E_PHY_TYPE_5GBASE_T)) +#define I40E_LINK_SPEED_2_5GB_SHIFT 0x0 #define I40E_LINK_SPEED_100MB_SHIFT 0x1 #define I40E_LINK_SPEED_1000MB_SHIFT 0x2 #define I40E_LINK_SPEED_10GB_SHIFT 0x3 #define I40E_LINK_SPEED_40GB_SHIFT 0x4 #define I40E_LINK_SPEED_20GB_SHIFT 0x5 #define I40E_LINK_SPEED_25GB_SHIFT 0x6 +#define I40E_LINK_SPEED_5GB_SHIFT 0x7 enum i40e_aq_link_speed { I40E_LINK_SPEED_UNKNOWN = 0, I40E_LINK_SPEED_100MB = (1 << I40E_LINK_SPEED_100MB_SHIFT), I40E_LINK_SPEED_1GB = (1 << I40E_LINK_SPEED_1000MB_SHIFT), + I40E_LINK_SPEED_2_5GB = (1 << I40E_LINK_SPEED_2_5GB_SHIFT), + I40E_LINK_SPEED_5GB = (1 << I40E_LINK_SPEED_5GB_SHIFT), I40E_LINK_SPEED_10GB = (1 << I40E_LINK_SPEED_10GB_SHIFT), I40E_LINK_SPEED_40GB = (1 << I40E_LINK_SPEED_40GB_SHIFT), I40E_LINK_SPEED_20GB = (1 << I40E_LINK_SPEED_20GB_SHIFT), @@ -2030,6 +2038,8 @@ struct i40e_aq_get_phy_abilities_resp { #define I40E_AQ_EEE_1000BASE_KX 0x0010 #define I40E_AQ_EEE_10GBASE_KX4 0x0020 #define I40E_AQ_EEE_10GBASE_KR 0x0040 +#define I40E_AQ_EEE_2_5GBASE_T 0x0100 +#define I40E_AQ_EEE_5GBASE_T 0x0200 __le32 eeer_val; u8 d3_lpan; #define I40E_AQ_SET_PHY_D3_LPAN_ENA 0x01 @@ -2040,6 +2050,8 @@ struct i40e_aq_get_phy_abilities_resp { #define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 #define I40E_AQ_PHY_TYPE_EXT_25G_AOC 0x10 #define I40E_AQ_PHY_TYPE_EXT_25G_ACC 0x20 +#define I40E_AQ_PHY_TYPE_EXT_2_5GBASE_T 0x40 +#define I40E_AQ_PHY_TYPE_EXT_5GBASE_T 0x80 u8 fec_cfg_curr_mod_ext_info; #define I40E_AQ_ENABLE_FEC_KR 0x01 #define I40E_AQ_ENABLE_FEC_RS 0x02 @@ -2282,15 +2294,32 @@ enum i40e_aq_phy_reg_type { I40E_AQC_PHY_REG_EXERNAL_MODULE = 0x3 }; +#pragma pack(1) /* Run PHY Activity (0x0626) */ struct i40e_aqc_run_phy_activity { - __le16 activity_id; - u8 flags; - u8 reserved1; - __le32 control; - __le32 data; - u8 reserved2[4]; + u8 cmd_flags; + __le16 activity_id; +#define I40E_AQ_RUN_PHY_ACT_ID_USR_DFND 0x10 + u8 reserved; + union { + struct { + __le32 dnl_opcode; +#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT_DUR 0x801a +#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT 0x801b +#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_DUR 0x1801b + __le32 data; + u8 reserved2[4]; + } cmd; + struct { + __le32 cmd_status; +#define I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC 0x4 +#define I40E_AQ_RUN_PHY_ACT_CMD_STAT_MASK 0xFFFF + __le32 data0; + __le32 data1; + } resp; + } params; }; +#pragma pack() I40E_CHECK_CMD_LENGTH(i40e_aqc_run_phy_activity); Modified: head/sys/dev/ixl/i40e_common.c ============================================================================== --- head/sys/dev/ixl/i40e_common.c Tue Sep 1 22:36:24 2020 (r365230) +++ head/sys/dev/ixl/i40e_common.c Tue Sep 1 23:16:38 2020 (r365231) @@ -62,6 +62,10 @@ enum i40e_status_code i40e_set_mac_type(struct i40e_hw case I40E_DEV_ID_QSFP_C: case I40E_DEV_ID_10G_BASE_T: case I40E_DEV_ID_10G_BASE_T4: + case I40E_DEV_ID_10G_BASE_T_BC: + case I40E_DEV_ID_10G_B: + case I40E_DEV_ID_10G_SFP: + case I40E_DEV_ID_5G_BASE_T_BC: case I40E_DEV_ID_20G_KR2: case I40E_DEV_ID_20G_KR2_A: case I40E_DEV_ID_25G_B: @@ -1251,6 +1255,8 @@ static enum i40e_media_type i40e_get_media_type(struct break; case I40E_PHY_TYPE_100BASE_TX: case I40E_PHY_TYPE_1000BASE_T: + case I40E_PHY_TYPE_2_5GBASE_T: + case I40E_PHY_TYPE_5GBASE_T: case I40E_PHY_TYPE_10GBASE_T: media = I40E_MEDIA_TYPE_BASET; break; @@ -1516,7 +1522,8 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int id u32 gpio_val = 0; u32 port; - if (!hw->func_caps.led[idx]) + if (!I40E_IS_X710TL_DEVICE(hw->device_id) && + !hw->func_caps.led[idx]) return 0; gpio_val = rd32(hw, I40E_GLGEN_GPIO_CTL(idx)); port = (gpio_val & I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK) >> @@ -1635,6 +1642,19 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool b break; } + if (I40E_IS_X710TL_DEVICE(hw->device_id)) { + u32 pin_func = 0; + + if (mode & I40E_FW_LED) + pin_func = I40E_PIN_FUNC_SDP; + else + pin_func = I40E_PIN_FUNC_LED; + + gpio_val &= ~I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK; + gpio_val |= ((pin_func << + I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) & + I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK); + } gpio_val &= ~I40E_GLGEN_GPIO_CTL_LED_MODE_MASK; /* this & is a bit of paranoia, but serves as a range check */ gpio_val |= ((mode << I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) & @@ -6230,7 +6250,72 @@ enum i40e_status_code i40e_aq_debug_dump(struct i40e_h return status; } + /** + * i40e_enable_eee + * @hw: pointer to the hardware structure + * @enable: state of Energy Efficient Ethernet mode to be set + * + * Enables or disables Energy Efficient Ethernet (EEE) mode + * accordingly to @enable parameter. + **/ +enum i40e_status_code i40e_enable_eee(struct i40e_hw *hw, bool enable) +{ + struct i40e_aq_get_phy_abilities_resp abilities; + struct i40e_aq_set_phy_config config; + enum i40e_status_code status; + __le16 eee_capability; + + /* Get initial PHY capabilities */ + status = i40e_aq_get_phy_capabilities(hw, FALSE, TRUE, &abilities, + NULL); + if (status) + goto err; + + /* Check whether NIC configuration is compatible with Energy Efficient + * Ethernet (EEE) mode. + */ + if (abilities.eee_capability == 0) { + status = I40E_ERR_CONFIG; + goto err; + } + + /* Cache initial EEE capability */ + eee_capability = abilities.eee_capability; + + /* Get current configuration */ + status = i40e_aq_get_phy_capabilities(hw, FALSE, false, &abilities, + NULL); + if (status) + goto err; + + /* Cache current configuration */ + config.phy_type = abilities.phy_type; + config.phy_type_ext = abilities.phy_type_ext; + config.link_speed = abilities.link_speed; + config.abilities = abilities.abilities | + I40E_AQ_PHY_ENABLE_ATOMIC_LINK; + config.eeer = abilities.eeer_val; + config.low_power_ctrl = abilities.d3_lpan; + config.fec_config = abilities.fec_cfg_curr_mod_ext_info & + I40E_AQ_PHY_FEC_CONFIG_MASK; + + /* Set desired EEE state */ + if (enable) { + config.eee_capability = eee_capability; + config.eeer |= I40E_PRTPM_EEER_TX_LPI_EN_MASK; + } else { + config.eee_capability = 0; + config.eeer &= ~I40E_PRTPM_EEER_TX_LPI_EN_MASK; + } + + /* Save modified config */ + status = i40e_aq_set_phy_config(hw, &config, NULL); +err: + return status; +} + +/** * i40e_read_bw_from_alt_ram * @hw: pointer to the hardware structure * @max_bw: pointer for max_bw read @@ -6550,6 +6635,8 @@ enum i40e_status_code i40e_write_phy_register(struct i break; case I40E_DEV_ID_10G_BASE_T: case I40E_DEV_ID_10G_BASE_T4: + case I40E_DEV_ID_10G_BASE_T_BC: + case I40E_DEV_ID_5G_BASE_T_BC: case I40E_DEV_ID_10G_BASE_T_X722: case I40E_DEV_ID_25G_B: case I40E_DEV_ID_25G_SFP28: @@ -6586,6 +6673,8 @@ enum i40e_status_code i40e_read_phy_register(struct i4 break; case I40E_DEV_ID_10G_BASE_T: case I40E_DEV_ID_10G_BASE_T4: + case I40E_DEV_ID_10G_BASE_T_BC: + case I40E_DEV_ID_5G_BASE_T_BC: case I40E_DEV_ID_10G_BASE_T_X722: case I40E_DEV_ID_25G_B: case I40E_DEV_ID_25G_SFP28: @@ -6842,6 +6931,196 @@ restore_config: } /** + * i40e_get_phy_lpi_status - read LPI status from PHY or MAC register + * @hw: pointer to the hw struct + * @stat: pointer to structure with status of rx and tx lpi + * + * Read LPI state directly from external PHY register or from MAC + * register, depending on device ID and current link speed. + */ +enum i40e_status_code i40e_get_phy_lpi_status(struct i40e_hw *hw, + struct i40e_hw_port_stats *stat) +{ + enum i40e_status_code ret = I40E_SUCCESS; + u32 val; + + stat->rx_lpi_status = 0; + stat->tx_lpi_status = 0; + + if ((hw->device_id == I40E_DEV_ID_10G_BASE_T_BC || + hw->device_id == I40E_DEV_ID_5G_BASE_T_BC) && + (hw->phy.link_info.link_speed == I40E_LINK_SPEED_2_5GB || + hw->phy.link_info.link_speed == I40E_LINK_SPEED_5GB)) { + ret = i40e_aq_get_phy_register(hw, + I40E_AQ_PHY_REG_ACCESS_EXTERNAL, + I40E_BCM_PHY_PCS_STATUS1_PAGE, + TRUE, + I40E_BCM_PHY_PCS_STATUS1_REG, + &val, NULL); + + if (ret != I40E_SUCCESS) + return ret; + + stat->rx_lpi_status = !!(val & I40E_BCM_PHY_PCS_STATUS1_RX_LPI); + stat->tx_lpi_status = !!(val & I40E_BCM_PHY_PCS_STATUS1_TX_LPI); + + return ret; + } + + val = rd32(hw, I40E_PRTPM_EEE_STAT); + stat->rx_lpi_status = (val & I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_MASK) >> + I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_SHIFT; + stat->tx_lpi_status = (val & I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_MASK) >> + I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_SHIFT; + + return ret; +} + +/** + * i40e_get_lpi_counters - read LPI counters from EEE statistics + * @hw: pointer to the hw struct + * @tx_counter: pointer to memory for TX LPI counter + * @rx_counter: pointer to memory for RX LPI counter + * @is_clear: returns TRUE if counters are clear after read + * + * Read Low Power Idle (LPI) mode counters from Energy Efficient + * Ethernet (EEE) statistics. + **/ +enum i40e_status_code i40e_get_lpi_counters(struct i40e_hw *hw, + u32 *tx_counter, u32 *rx_counter, + bool *is_clear) +{ + /* only X710-T*L requires special handling of counters + * for other devices we just read the MAC registers + */ + if ((hw->device_id == I40E_DEV_ID_10G_BASE_T_BC || + hw->device_id == I40E_DEV_ID_5G_BASE_T_BC) && + hw->phy.link_info.link_speed != I40E_LINK_SPEED_1GB) { + enum i40e_status_code retval; + u32 cmd_status; + + *is_clear = FALSE; + retval = i40e_aq_run_phy_activity(hw, + I40E_AQ_RUN_PHY_ACT_ID_USR_DFND, + I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT, + &cmd_status, tx_counter, rx_counter, NULL); + + if (!retval && cmd_status != I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC) + retval = I40E_ERR_ADMIN_QUEUE_ERROR; + + return retval; + } + + *is_clear = TRUE; + *tx_counter = rd32(hw, I40E_PRTPM_TLPIC); + *rx_counter = rd32(hw, I40E_PRTPM_RLPIC); + + return I40E_SUCCESS; +} + +/** + * i40e_get_lpi_duration - read LPI time duration from EEE statistics + * @hw: pointer to the hw struct + * @stat: pointer to structure with status of rx and tx lpi + * @tx_duration: pointer to memory for TX LPI time duration + * @rx_duration: pointer to memory for RX LPI time duration + * + * Read Low Power Idle (LPI) mode time duration from Energy Efficient + * Ethernet (EEE) statistics. + */ +enum i40e_status_code i40e_get_lpi_duration(struct i40e_hw *hw, + struct i40e_hw_port_stats *stat, + u64 *tx_duration, u64 *rx_duration) +{ + u32 tx_time_dur, rx_time_dur; + enum i40e_status_code retval; + u32 cmd_status; + + if (hw->device_id != I40E_DEV_ID_10G_BASE_T_BC && + hw->device_id != I40E_DEV_ID_5G_BASE_T_BC) + return I40E_ERR_NOT_IMPLEMENTED; + + retval = i40e_aq_run_phy_activity + (hw, I40E_AQ_RUN_PHY_ACT_ID_USR_DFND, + I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_DUR, + &cmd_status, &tx_time_dur, &rx_time_dur, NULL); + + if (retval) + return retval; + if ((cmd_status & I40E_AQ_RUN_PHY_ACT_CMD_STAT_MASK) != + I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC) + return I40E_ERR_ADMIN_QUEUE_ERROR; + + if (hw->phy.link_info.link_speed == I40E_LINK_SPEED_1GB && + !tx_time_dur && !rx_time_dur && + stat->tx_lpi_status && stat->rx_lpi_status) { + retval = i40e_aq_run_phy_activity + (hw, I40E_AQ_RUN_PHY_ACT_ID_USR_DFND, + I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT_DUR, + &cmd_status, + &tx_time_dur, &rx_time_dur, NULL); + + if (retval) + return retval; + if ((cmd_status & I40E_AQ_RUN_PHY_ACT_CMD_STAT_MASK) != + I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC) + return I40E_ERR_ADMIN_QUEUE_ERROR; + tx_time_dur = 0; + rx_time_dur = 0; + } + + *tx_duration = tx_time_dur; + *rx_duration = rx_time_dur; + + return retval; +} + +/** + * i40e_lpi_stat_update - update LPI counters with values relative to offset + * @hw: pointer to the hw struct + * @offset_loaded: flag indicating need of writing current value to offset + * @tx_offset: pointer to offset of TX LPI counter + * @tx_stat: pointer to value of TX LPI counter + * @rx_offset: pointer to offset of RX LPI counter + * @rx_stat: pointer to value of RX LPI counter + * + * Update Low Power Idle (LPI) mode counters while having regard to passed + * offsets. + **/ +enum i40e_status_code i40e_lpi_stat_update(struct i40e_hw *hw, + bool offset_loaded, u64 *tx_offset, + u64 *tx_stat, u64 *rx_offset, + u64 *rx_stat) +{ + enum i40e_status_code retval; + u32 tx_counter, rx_counter; + bool is_clear; + + retval = i40e_get_lpi_counters(hw, &tx_counter, &rx_counter, &is_clear); + if (retval) + goto err; + + if (is_clear) { + *tx_stat += tx_counter; + *rx_stat += rx_counter; + } else { + if (!offset_loaded) { + *tx_offset = tx_counter; + *rx_offset = rx_counter; + } + + *tx_stat = (tx_counter >= *tx_offset) ? + (u32)(tx_counter - *tx_offset) : + (u32)((tx_counter + BIT_ULL(32)) - *tx_offset); + *rx_stat = (rx_counter >= *rx_offset) ? + (u32)(rx_counter - *rx_offset) : + (u32)((rx_counter + BIT_ULL(32)) - *rx_offset); + } +err: + return retval; +} + +/** * i40e_aq_rx_ctl_read_register - use FW to read from an Rx control register * @hw: pointer to the hw struct * @reg_addr: register address @@ -7083,6 +7362,52 @@ i40e_aq_get_phy_register_ext(struct i40e_hw *hw, return status; } + +/** + * i40e_aq_run_phy_activity + * @hw: pointer to the hw struct + * @activity_id: ID of DNL activity to run + * @dnl_opcode: opcode passed to DNL script + * @cmd_status: pointer to memory to write return value of DNL script + * @data0: pointer to memory for first 4 bytes of data returned by DNL script + * @data1: pointer to memory for last 4 bytes of data returned by DNL script + * @cmd_details: pointer to command details structure or NULL + * + * Run DNL admin command. + **/ +enum i40e_status_code +i40e_aq_run_phy_activity(struct i40e_hw *hw, u16 activity_id, u32 dnl_opcode, + u32 *cmd_status, u32 *data0, u32 *data1, + struct i40e_asq_cmd_details *cmd_details) +{ + struct i40e_aqc_run_phy_activity *cmd; + enum i40e_status_code retval; + struct i40e_aq_desc desc; + + cmd = (struct i40e_aqc_run_phy_activity *)&desc.params.raw; + + if (!cmd_status || !data0 || !data1) { + retval = I40E_ERR_PARAM; + goto err; + } + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_run_phy_activity); + + cmd->activity_id = CPU_TO_LE16(activity_id); + cmd->params.cmd.dnl_opcode = CPU_TO_LE32(dnl_opcode); + + retval = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details); + if (retval) + goto err; + + *cmd_status = LE32_TO_CPU(cmd->params.resp.cmd_status); + *data0 = LE32_TO_CPU(cmd->params.resp.data0); + *data1 = LE32_TO_CPU(cmd->params.resp.data1); +err: + return retval; +} + /** * i40e_aq_send_msg_to_pf Modified: head/sys/dev/ixl/i40e_devids.h ============================================================================== --- head/sys/dev/ixl/i40e_devids.h Tue Sep 1 22:36:24 2020 (r365230) +++ head/sys/dev/ixl/i40e_devids.h Tue Sep 1 23:16:38 2020 (r365231) @@ -54,6 +54,13 @@ #define I40E_DEV_ID_10G_BASE_T4 0x1589 #define I40E_DEV_ID_25G_B 0x158A #define I40E_DEV_ID_25G_SFP28 0x158B +#define I40E_DEV_ID_10G_BASE_T_BC 0x15FF +#define I40E_DEV_ID_10G_B 0x104F +#define I40E_DEV_ID_10G_SFP 0x104E +#define I40E_DEV_ID_5G_BASE_T_BC 0x101F +#define I40E_IS_X710TL_DEVICE(d) \ + (((d) == I40E_DEV_ID_10G_BASE_T_BC) || \ + ((d) == I40E_DEV_ID_5G_BASE_T_BC)) #define I40E_DEV_ID_VF 0x154C #define I40E_DEV_ID_VF_HV 0x1571 #define I40E_DEV_ID_ADAPTIVE_VF 0x1889 Modified: head/sys/dev/ixl/i40e_prototype.h ============================================================================== --- head/sys/dev/ixl/i40e_prototype.h Tue Sep 1 22:36:24 2020 (r365230) +++ head/sys/dev/ixl/i40e_prototype.h Tue Sep 1 23:16:38 2020 (r365231) @@ -104,6 +104,17 @@ enum i40e_status_code i40e_led_get_reg(struct i40e_hw u32 *reg_val); enum i40e_status_code i40e_led_set_reg(struct i40e_hw *hw, u16 led_addr, u32 reg_val); +enum i40e_status_code i40e_get_phy_lpi_status(struct i40e_hw *hw, + struct i40e_hw_port_stats *stats); +enum i40e_status_code i40e_get_lpi_counters(struct i40e_hw *hw, u32 *tx_counter, + u32 *rx_counter, bool *is_clear); +enum i40e_status_code i40e_lpi_stat_update(struct i40e_hw *hw, + bool offset_loaded, u64 *tx_offset, + u64 *tx_stat, u64 *rx_offset, + u64 *rx_stat); +enum i40e_status_code i40e_get_lpi_duration(struct i40e_hw *hw, + struct i40e_hw_port_stats *stat, + u64 *tx_duration, u64 *rx_duration); /* admin send queue commands */ enum i40e_status_code i40e_aq_get_firmware_version(struct i40e_hw *hw, @@ -479,6 +490,7 @@ void i40e_nvmupd_check_wait_event(struct i40e_hw *hw, struct i40e_aq_desc *desc); void i40e_nvmupd_clear_wait_state(struct i40e_hw *hw); void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status); +enum i40e_status_code i40e_enable_eee(struct i40e_hw *hw, bool enable); enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw); @@ -506,6 +518,10 @@ i40e_virtchnl_link_speed(enum i40e_aq_link_speed link_ return VIRTCHNL_LINK_SPEED_100MB; case I40E_LINK_SPEED_1GB: return VIRTCHNL_LINK_SPEED_1GB; + case I40E_LINK_SPEED_2_5GB: + return VIRTCHNL_LINK_SPEED_2_5GB; + case I40E_LINK_SPEED_5GB: + return VIRTCHNL_LINK_SPEED_5GB; case I40E_LINK_SPEED_10GB: return VIRTCHNL_LINK_SPEED_10GB; case I40E_LINK_SPEED_40GB: @@ -575,6 +591,11 @@ i40e_aq_get_phy_register_ext(struct i40e_hw *hw, i40e_aq_set_phy_register_ext(hw, ps, da, pc, FALSE, 0, ra, rv, cd) #define i40e_aq_get_phy_register(hw, ps, da, pc, ra, rv, cd) \ i40e_aq_get_phy_register_ext(hw, ps, da, pc, FALSE, 0, ra, rv, cd) + +enum i40e_status_code +i40e_aq_run_phy_activity(struct i40e_hw *hw, u16 activity_id, u32 opcode, + u32 *cmd_status, u32 *data0, u32 *data1, + struct i40e_asq_cmd_details *cmd_details); enum i40e_status_code i40e_aq_set_arp_proxy_config(struct i40e_hw *hw, struct i40e_aqc_arp_proxy_data *proxy_config, Modified: head/sys/dev/ixl/i40e_type.h ============================================================================== --- head/sys/dev/ixl/i40e_type.h Tue Sep 1 22:36:24 2020 (r365230) +++ head/sys/dev/ixl/i40e_type.h Tue Sep 1 23:16:38 2020 (r365231) @@ -347,6 +347,12 @@ struct i40e_phy_info { I40E_PHY_TYPE_OFFSET) #define I40E_CAP_PHY_TYPE_25GBASE_ACC BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC + \ I40E_PHY_TYPE_OFFSET) +/* Offset for 2.5G/5G PHY Types value to bit number conversion */ +#define I40E_PHY_TYPE_OFFSET2 (-10) +#define I40E_CAP_PHY_TYPE_2_5GBASE_T BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T + \ + I40E_PHY_TYPE_OFFSET2) +#define I40E_CAP_PHY_TYPE_5GBASE_T BIT_ULL(I40E_PHY_TYPE_5GBASE_T + \ + I40E_PHY_TYPE_OFFSET2) #define I40E_HW_CAP_MAX_GPIO 30 #define I40E_HW_CAP_MDIO_PORT_MODE_MDIO 0 #define I40E_HW_CAP_MDIO_PORT_MODE_I2C 1 @@ -1490,6 +1496,8 @@ struct i40e_hw_port_stats { u32 rx_lpi_status; u64 tx_lpi_count; /* etlpic */ u64 rx_lpi_count; /* erlpic */ + u64 tx_lpi_duration; + u64 rx_lpi_duration; }; /* Checksum and Shadow RAM pointers */ @@ -1542,6 +1550,7 @@ struct i40e_hw_port_stats { #define I40E_SR_FEATURE_CONFIGURATION_PTR 0x49 #define I40E_SR_CONFIGURATION_METADATA_PTR 0x4D #define I40E_SR_IMMEDIATE_VALUES_PTR 0x4E +#define I40E_SR_5TH_FREE_PROVISION_AREA_PTR 0x50 /* Auxiliary field, mask and shift definition for Shadow RAM and NVM Flash */ #define I40E_SR_VPD_MODULE_MAX_SIZE 1024 @@ -1728,4 +1737,9 @@ struct i40e_lldp_variables { #define I40E_FLEX_56_MASK (0x1ULL << I40E_FLEX_56_SHIFT) #define I40E_FLEX_57_SHIFT 6 #define I40E_FLEX_57_MASK (0x1ULL << I40E_FLEX_57_SHIFT) +#define I40E_BCM_PHY_PCS_STATUS1_PAGE 0x3 +#define I40E_BCM_PHY_PCS_STATUS1_REG 0x0001 +#define I40E_BCM_PHY_PCS_STATUS1_RX_LPI BIT(8) +#define I40E_BCM_PHY_PCS_STATUS1_TX_LPI BIT(9) + #endif /* _I40E_TYPE_H_ */ Modified: head/sys/dev/ixl/if_ixl.c ============================================================================== --- head/sys/dev/ixl/if_ixl.c Tue Sep 1 22:36:24 2020 (r365230) +++ head/sys/dev/ixl/if_ixl.c Tue Sep 1 23:16:38 2020 (r365231) @@ -48,7 +48,7 @@ * Driver version *********************************************************************/ #define IXL_DRIVER_VERSION_MAJOR 2 -#define IXL_DRIVER_VERSION_MINOR 2 +#define IXL_DRIVER_VERSION_MINOR 3 #define IXL_DRIVER_VERSION_BUILD 0 #define IXL_DRIVER_VERSION_STRING \ @@ -82,6 +82,10 @@ static pci_vendor_info_t ixl_vendor_info_array[] = PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_SFP_I_X722, "Intel(R) Ethernet Connection X722 for 10GbE SFP+"), PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_25G_B, "Intel(R) Ethernet Controller XXV710 for 25GbE backplane"), PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_25G_SFP28, "Intel(R) Ethernet Controller XXV710 for 25GbE SFP28"), + PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_BASE_T_BC, "Intel(R) Ethernet Controller X710 for 10GBASE-T"), + PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_SFP, "Intel(R) Ethernet Controller X710 for 10GbE SFP+"), + PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_B, "Intel(R) Ethernet Controller X710 for 10GbE backplane"), + PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_5G_BASE_T_BC, "Intel(R) Ethernet Controller V710 for 5GBASE-T"), /* required last entry */ PVID_END }; @@ -599,6 +603,12 @@ ixl_if_attach_pre(if_ctx_t ctx) pf->state |= IXL_PF_STATE_FW_LLDP_DISABLED; } + /* Try enabling Energy Efficient Ethernet (EEE) mode */ + if (i40e_enable_eee(hw, true) == I40E_SUCCESS) + atomic_set_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + else + atomic_clear_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + /* Get MAC addresses from hardware */ i40e_get_mac_addr(hw, hw->mac.addr); error = i40e_validate_mac_addr(hw->mac.addr); @@ -1490,6 +1500,14 @@ ixl_if_media_status(if_ctx_t ctx, struct ifmediareq *i break; case I40E_PHY_TYPE_1000BASE_T_OPTICAL: ifmr->ifm_active |= IFM_1000_T; + break; + /* 2.5 G */ + case I40E_PHY_TYPE_2_5GBASE_T: + ifmr->ifm_active |= IFM_2500_T; + break; + /* 5 G */ + case I40E_PHY_TYPE_5GBASE_T: + ifmr->ifm_active |= IFM_5000_T; break; /* 10 G */ case I40E_PHY_TYPE_10GBASE_SFPP_CU: Modified: head/sys/dev/ixl/ixl_pf.h ============================================================================== --- head/sys/dev/ixl/ixl_pf.h Tue Sep 1 22:36:24 2020 (r365230) +++ head/sys/dev/ixl/ixl_pf.h Tue Sep 1 23:16:38 2020 (r365231) @@ -87,6 +87,7 @@ enum ixl_pf_state { IXL_PF_STATE_GLOB_RESET_REQ = (1 << 7), IXL_PF_STATE_EMP_RESET_REQ = (1 << 8), IXL_PF_STATE_FW_LLDP_DISABLED = (1 << 9), + IXL_PF_STATE_EEE_ENABLED = (1 << 10), }; #define IXL_PF_IN_RECOVERY_MODE(pf) \ @@ -191,7 +192,9 @@ struct ixl_pf { "\t 0x4 - advertise 10G\n" \ "\t 0x8 - advertise 20G\n" \ "\t0x10 - advertise 25G\n" \ -"\t0x20 - advertise 40G\n\n" \ +"\t0x20 - advertise 40G\n" \ +"\t0x40 - advertise 2.5G\n" \ +"\t0x80 - advertise 5G\n\n" \ "Set to 0 to disable link.\n" \ "Use \"sysctl -x\" to view flags properly." @@ -203,7 +206,9 @@ struct ixl_pf { "\t 0x4 - 10G\n" \ "\t 0x8 - 20G\n" \ "\t0x10 - 25G\n" \ -"\t0x20 - 40G\n\n" \ +"\t0x20 - 40G\n" \ +"\t0x40 - 2.5G\n" \ +"\t0x80 - 5G\n\n" \ "Use \"sysctl -x\" to view flags properly." #define IXL_SYSCTL_HELP_FC \ Modified: head/sys/dev/ixl/ixl_pf_main.c ============================================================================== --- head/sys/dev/ixl/ixl_pf_main.c Tue Sep 1 22:36:24 2020 (r365230) +++ head/sys/dev/ixl/ixl_pf_main.c Tue Sep 1 23:16:38 2020 (r365231) @@ -61,6 +61,8 @@ static int ixl_sysctl_unallocated_queues(SYSCTL_HANDLE static int ixl_sysctl_pf_tx_itr(SYSCTL_HANDLER_ARGS); static int ixl_sysctl_pf_rx_itr(SYSCTL_HANDLER_ARGS); +static int ixl_sysctl_eee_enable(SYSCTL_HANDLER_ARGS); + /* Debug Sysctls */ static int ixl_sysctl_link_status(SYSCTL_HANDLER_ARGS); static int ixl_sysctl_phy_abilities(SYSCTL_HANDLER_ARGS); @@ -620,6 +622,12 @@ ixl_add_ifmedia(struct ifmedia *media, u64 phy_types) if (phy_types & (I40E_CAP_PHY_TYPE_1000BASE_LX)) ifmedia_add(media, IFM_ETHER | IFM_1000_LX, 0, NULL); + if (phy_types & (I40E_CAP_PHY_TYPE_2_5GBASE_T)) + ifmedia_add(media, IFM_ETHER | IFM_2500_T, 0, NULL); + + if (phy_types & (I40E_CAP_PHY_TYPE_5GBASE_T)) + ifmedia_add(media, IFM_ETHER | IFM_5000_T, 0, NULL); + if (phy_types & (I40E_CAP_PHY_TYPE_XAUI) || phy_types & (I40E_CAP_PHY_TYPE_XFI) || phy_types & (I40E_CAP_PHY_TYPE_10GBASE_SFPP_CU)) @@ -1891,6 +1899,13 @@ ixl_update_stats_counters(struct ixl_pf *pf) ixl_stat_update32(hw, I40E_GLPRT_RJC(hw->port), pf->stat_offsets_loaded, &osd->rx_jabber, &nsd->rx_jabber); + /* EEE */ + i40e_get_phy_lpi_status(hw, nsd); + + i40e_lpi_stat_update(hw, pf->stat_offsets_loaded, + &osd->tx_lpi_count, &nsd->tx_lpi_count, + &osd->rx_lpi_count, &nsd->rx_lpi_count); + pf->stat_offsets_loaded = true; /* End hw stats */ @@ -2154,6 +2169,8 @@ ixl_add_device_sysctls(struct ixl_pf *pf) struct sysctl_oid *fec_node; struct sysctl_oid_list *fec_list; + struct sysctl_oid *eee_node; + struct sysctl_oid_list *eee_list; /* Set up sysctls */ SYSCTL_ADD_PROC(ctx, ctx_list, @@ -2246,6 +2263,32 @@ ixl_add_device_sysctls(struct ixl_pf *pf) OID_AUTO, "fw_lldp", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, pf, 0, ixl_sysctl_fw_lldp, "I", IXL_SYSCTL_HELP_FW_LLDP); + eee_node = SYSCTL_ADD_NODE(ctx, ctx_list, + OID_AUTO, "eee", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, + "Energy Efficient Ethernet (EEE) Sysctls"); + eee_list = SYSCTL_CHILDREN(eee_node); + + SYSCTL_ADD_PROC(ctx, eee_list, + OID_AUTO, "enable", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, + pf, 0, ixl_sysctl_eee_enable, "I", + "Enable Energy Efficient Ethernet (EEE)"); + + SYSCTL_ADD_UINT(ctx, eee_list, OID_AUTO, "tx_lpi_status", + CTLFLAG_RD | CTLFLAG_MPSAFE, &pf->stats.tx_lpi_status, 0, + "TX LPI status"); + + SYSCTL_ADD_UINT(ctx, eee_list, OID_AUTO, "rx_lpi_status", + CTLFLAG_RD | CTLFLAG_MPSAFE, &pf->stats.rx_lpi_status, 0, + "RX LPI status"); + + SYSCTL_ADD_UQUAD(ctx, eee_list, OID_AUTO, "tx_lpi_count", + CTLFLAG_RD | CTLFLAG_MPSAFE, &pf->stats.tx_lpi_count, + "TX LPI count"); + + SYSCTL_ADD_UQUAD(ctx, eee_list, OID_AUTO, "rx_lpi_count", + CTLFLAG_RD | CTLFLAG_MPSAFE, &pf->stats.rx_lpi_count, + "RX LPI count"); + /* Add sysctls meant to print debug information, but don't list them * in "sysctl -a" output. */ debug_node = SYSCTL_ADD_NODE(ctx, ctx_list, @@ -2375,6 +2418,8 @@ ixl_link_speed_string(enum i40e_aq_link_speed link_spe "40 Gbps", "20 Gbps", "25 Gbps", + "2.5 Gbps", + "5 Gbps" }; int index; @@ -2397,6 +2442,12 @@ ixl_link_speed_string(enum i40e_aq_link_speed link_spe case I40E_LINK_SPEED_25GB: index = 6; break; + case I40E_LINK_SPEED_2_5GB: + index = 7; + break; + case I40E_LINK_SPEED_5GB: + index = 8; + break; case I40E_LINK_SPEED_UNKNOWN: default: index = 0; @@ -2430,14 +2481,16 @@ ixl_sysctl_current_speed(SYSCTL_HANDLER_ARGS) static u8 ixl_convert_sysctl_aq_link_speed(u8 speeds, bool to_aq) { -#define SPEED_MAP_SIZE 6 +#define SPEED_MAP_SIZE 8 static u16 speedmap[SPEED_MAP_SIZE] = { (I40E_LINK_SPEED_100MB | (0x1 << 8)), (I40E_LINK_SPEED_1GB | (0x2 << 8)), (I40E_LINK_SPEED_10GB | (0x4 << 8)), (I40E_LINK_SPEED_20GB | (0x8 << 8)), (I40E_LINK_SPEED_25GB | (0x10 << 8)), - (I40E_LINK_SPEED_40GB | (0x20 << 8)) + (I40E_LINK_SPEED_40GB | (0x20 << 8)), + (I40E_LINK_SPEED_2_5GB | (0x40 << 8)), + (I40E_LINK_SPEED_5GB | (0x80 << 8)), }; u8 retval = 0; @@ -2509,6 +2562,8 @@ ixl_set_advertised_speeds(struct ixl_pf *pf, int speed ** 0x8 - 20G ** 0x10 - 25G ** 0x20 - 40G +** 0x40 - 2.5G +** 0x80 - 5G */ static int ixl_sysctl_supported_speeds(SYSCTL_HANDLER_ARGS) @@ -2528,6 +2583,8 @@ ixl_sysctl_supported_speeds(SYSCTL_HANDLER_ARGS) ** 0x8 - advertise 20G ** 0x10 - advertise 25G ** 0x20 - advertise 40G +** 0x40 - advertise 2.5G +** 0x80 - advertise 5G ** ** Set to 0 to disable link */ @@ -2552,7 +2609,7 @@ ixl_sysctl_set_advertise(SYSCTL_HANDLER_ARGS) } /* Error out if bits outside of possible flag range are set */ - if ((requested_ls & ~((u8)0x3F)) != 0) { + if ((requested_ls & ~((u8)0xFF)) != 0) { device_printf(dev, "Input advertised speed out of range; " "valid flags are: 0x%02x\n", ixl_convert_sysctl_aq_link_speed(pf->supported_speeds, false)); @@ -2591,6 +2648,10 @@ ixl_max_aq_speed_to_value(u8 link_speeds) return IF_Gbps(20); if (link_speeds & I40E_LINK_SPEED_10GB) return IF_Gbps(10); + if (link_speeds & I40E_LINK_SPEED_5GB) + return IF_Gbps(5); + if (link_speeds & I40E_LINK_SPEED_2_5GB) + return IF_Mbps(2500); if (link_speeds & I40E_LINK_SPEED_1GB) return IF_Gbps(1); if (link_speeds & I40E_LINK_SPEED_100MB) @@ -2875,8 +2936,8 @@ ixl_phy_type_string(u32 bit_pos, bool ext) "25GBASE-LR", "25GBASE-AOC", "25GBASE-ACC", - "Reserved (6)", - "Reserved (7)" + "2.5GBASE-T", + "5GBASE-T" }; if (ext && bit_pos > 7) return "Invalid_Ext"; @@ -4101,6 +4162,43 @@ ixl_sysctl_fw_lldp(SYSCTL_HANDLER_ARGS) return ixl_stop_fw_lldp(pf); return ixl_start_fw_lldp(pf); +} + +static int +ixl_sysctl_eee_enable(SYSCTL_HANDLER_ARGS) +{ + struct ixl_pf *pf = (struct ixl_pf *)arg1; + int state, new_state; + int sysctl_handle_status = 0; + enum i40e_status_code cmd_status; + + /* Init states' values */ + state = new_state = (!!(pf->state & IXL_PF_STATE_EEE_ENABLED)); + + /* Get requested mode */ + sysctl_handle_status = sysctl_handle_int(oidp, &new_state, 0, req); + if ((sysctl_handle_status) || (req->newptr == NULL)) + return (sysctl_handle_status); + + /* Check if state has changed */ + if (new_state == state) + return (0); + + /* Set new state */ + cmd_status = i40e_enable_eee(&pf->hw, (bool)(!!new_state)); + + /* Save new state or report error */ + if (!cmd_status) { + if (new_state == 0) + atomic_clear_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + else + atomic_set_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + } else if (cmd_status == I40E_ERR_CONFIG) + return (EPERM); + else + return (EIO); + + return (0); } int Modified: head/sys/dev/ixl/virtchnl.h ============================================================================== --- head/sys/dev/ixl/virtchnl.h Tue Sep 1 22:36:24 2020 (r365230) +++ head/sys/dev/ixl/virtchnl.h Tue Sep 1 23:16:38 2020 (r365231) @@ -77,12 +77,14 @@ enum virtchnl_status_code { VIRTCHNL_STATUS_NOT_SUPPORTED = -64, }; +#define VIRTCHNL_LINK_SPEED_2_5GB_SHIFT 0x0 #define VIRTCHNL_LINK_SPEED_100MB_SHIFT 0x1 #define VIRTCHNL_LINK_SPEED_1000MB_SHIFT 0x2 #define VIRTCHNL_LINK_SPEED_10GB_SHIFT 0x3 #define VIRTCHNL_LINK_SPEED_40GB_SHIFT 0x4 #define VIRTCHNL_LINK_SPEED_20GB_SHIFT 0x5 #define VIRTCHNL_LINK_SPEED_25GB_SHIFT 0x6 +#define VIRTCHNL_LINK_SPEED_5GB_SHIFT 0x7 enum virtchnl_link_speed { VIRTCHNL_LINK_SPEED_UNKNOWN = 0, @@ -92,6 +94,8 @@ enum virtchnl_link_speed { VIRTCHNL_LINK_SPEED_40GB = BIT(VIRTCHNL_LINK_SPEED_40GB_SHIFT), VIRTCHNL_LINK_SPEED_20GB = BIT(VIRTCHNL_LINK_SPEED_20GB_SHIFT), VIRTCHNL_LINK_SPEED_25GB = BIT(VIRTCHNL_LINK_SPEED_25GB_SHIFT), + VIRTCHNL_LINK_SPEED_2_5GB = BIT(VIRTCHNL_LINK_SPEED_2_5GB_SHIFT), + VIRTCHNL_LINK_SPEED_5GB = BIT(VIRTCHNL_LINK_SPEED_5GB_SHIFT), }; /* for hsplit_0 field of Rx HMC context */ From owner-svn-src-all@freebsd.org Wed Sep 2 01:29:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D2DCC3C4C43; Wed, 2 Sep 2020 01:29:34 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh5vf5Gl3z3yCv; Wed, 2 Sep 2020 01:29:34 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98D25226DA; Wed, 2 Sep 2020 01:29:34 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0821TYVb079978; Wed, 2 Sep 2020 01:29:34 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0821TY14079976; Wed, 2 Sep 2020 01:29:34 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202009020129.0821TY14079976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Wed, 2 Sep 2020 01:29:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365232 - in head/sys/modules: nfscl nfsd X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in head/sys/modules: nfscl nfsd X-SVN-Commit-Revision: 365232 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 01:29:34 -0000 Author: rmacklem Date: Wed Sep 2 01:29:33 2020 New Revision: 365232 URL: https://svnweb.freebsd.org/changeset/base/365232 Log: Fix the standalone build of the nfscl and nfsd modules. Reported by: jhs@berklix.com Modified: head/sys/modules/nfscl/Makefile head/sys/modules/nfsd/Makefile Modified: head/sys/modules/nfscl/Makefile ============================================================================== --- head/sys/modules/nfscl/Makefile Tue Sep 1 23:16:38 2020 (r365231) +++ head/sys/modules/nfscl/Makefile Wed Sep 2 01:29:33 2020 (r365232) @@ -17,6 +17,7 @@ SRCS= vnode_if.h \ opt_bootp.h \ opt_inet.h \ opt_inet6.h \ + opt_kern_tls.h \ opt_kgssapi.h \ opt_nfs.h \ opt_nfsroot.h \ Modified: head/sys/modules/nfsd/Makefile ============================================================================== --- head/sys/modules/nfsd/Makefile Tue Sep 1 23:16:38 2020 (r365231) +++ head/sys/modules/nfsd/Makefile Wed Sep 2 01:29:33 2020 (r365232) @@ -15,6 +15,7 @@ SRCS= vnode_if.h \ opt_nfs.h \ opt_inet.h \ opt_inet6.h \ + opt_kern_tls.h \ opt_kgssapi.h .include From owner-svn-src-all@freebsd.org Wed Sep 2 01:35:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A95133C526D; Wed, 2 Sep 2020 01:35:46 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh62p2xCcz3yws; Wed, 2 Sep 2020 01:35:46 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 490DE22B3D; Wed, 2 Sep 2020 01:35:46 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0821ZkD2085800; Wed, 2 Sep 2020 01:35:46 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0821ZjT2085796; Wed, 2 Sep 2020 01:35:45 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202009020135.0821ZjT2085796@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 2 Sep 2020 01:35:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365233 - in stable: 11/secure/caroot/trusted 12/secure/caroot/trusted X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable: 11/secure/caroot/trusted 12/secure/caroot/trusted X-SVN-Commit-Revision: 365233 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 01:35:46 -0000 Author: kevans Date: Wed Sep 2 01:35:45 2020 New Revision: 365233 URL: https://svnweb.freebsd.org/changeset/base/365233 Log: MFC r364943: carrot: update bundle Stats: - Seven (7) removed - Four (4) added Added: stable/11/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem stable/11/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem stable/11/secure/caroot/trusted/certSIGN_Root_CA_G2.pem - copied unchanged from r364943, head/secure/caroot/trusted/certSIGN_Root_CA_G2.pem stable/11/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem Deleted: stable/11/secure/caroot/trusted/AddTrust_External_Root.pem stable/11/secure/caroot/trusted/AddTrust_Low-Value_Services_Root.pem stable/11/secure/caroot/trusted/LuxTrust_Global_Root_2.pem stable/11/secure/caroot/trusted/Staat_der_Nederlanden_Root_CA_-_G2.pem stable/11/secure/caroot/trusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem stable/11/secure/caroot/trusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem stable/11/secure/caroot/trusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Modified: Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Added: stable/12/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem stable/12/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem stable/12/secure/caroot/trusted/certSIGN_Root_CA_G2.pem - copied unchanged from r364943, head/secure/caroot/trusted/certSIGN_Root_CA_G2.pem stable/12/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem Deleted: stable/12/secure/caroot/trusted/AddTrust_External_Root.pem stable/12/secure/caroot/trusted/AddTrust_Low-Value_Services_Root.pem stable/12/secure/caroot/trusted/LuxTrust_Global_Root_2.pem stable/12/secure/caroot/trusted/Staat_der_Nederlanden_Root_CA_-_G2.pem stable/12/secure/caroot/trusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem stable/12/secure/caroot/trusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem stable/12/secure/caroot/trusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Modified: Directory Properties: stable/12/ (props changed) Copied: stable/11/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem (from r364943, head/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem Wed Sep 2 01:35:45 2020 (r365233, copy of r364943, head/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem) @@ -0,0 +1,68 @@ +## +## Microsoft ECC Root Certificate Authority 2017 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 66:f2:3d:af:87:de:8b:b1:4a:ea:0c:57:31:01:c2:ec + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Microsoft Corporation, CN = Microsoft ECC Root Certificate Authority 2017 + Validity + Not Before: Dec 18 23:06:45 2019 GMT + Not After : Jul 18 23:16:04 2042 GMT + Subject: C = US, O = Microsoft Corporation, CN = Microsoft ECC Root Certificate Authority 2017 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:d4:bc:3d:02:42:75:41:13:23:cd:80:04:86:02: + 51:2f:6a:a8:81:62:0b:65:cc:f6:ca:9d:1e:6f:4a: + 66:51:a2:03:d9:9d:91:fa:b6:16:b1:8c:6e:de:7c: + cd:db:79:a6:2f:ce:bb:ce:71:2f:e5:a5:ab:28:ec: + 63:04:66:99:f8:fa:f2:93:10:05:e1:81:28:42:e3: + c6:68:f4:e6:1b:84:60:4a:89:af:ed:79:0f:3b:ce: + f1:f6:44:f5:01:78:c0 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + C8:CB:99:72:70:52:0C:F8:E6:BE:B2:04:57:29:2A:CF:42:10:ED:35 + 1.3.6.1.4.1.311.21.1: + ... + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:30:58:f2:4d:ea:0c:f9:5f:5e:ee:60:29:cb:3a:f2: + db:d6:32:84:19:3f:7c:d5:2f:c2:b1:cc:93:ae:50:bb:09:32: + c6:c6:ed:7e:c9:36:94:12:e4:68:85:06:a2:1b:d0:2f:02:31: + 00:99:e9:16:b4:0e:fa:56:48:d4:a4:30:16:91:78:db:54:8c: + 65:01:8a:e7:50:66:c2:31:b7:39:ba:b8:1a:22:07:4e:fc:6b: + 54:16:20:ff:2b:b5:e7:4c:0c:4d:a6:4f:73 +SHA1 Fingerprint=99:9A:64:C3:7F:F4:7D:9F:AB:95:F1:47:69:89:14:60:EE:C4:C3:C5 +-----BEGIN CERTIFICATE----- +MIICWTCCAd+gAwIBAgIQZvI9r4fei7FK6gxXMQHC7DAKBggqhkjOPQQDAzBlMQsw +CQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYD +VQQDEy1NaWNyb3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIw +MTcwHhcNMTkxMjE4MjMwNjQ1WhcNNDIwNzE4MjMxNjA0WjBlMQswCQYDVQQGEwJV +UzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNy +b3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATUvD0CQnVBEyPNgASGAlEvaqiBYgtlzPbKnR5vSmZR +ogPZnZH6thaxjG7efM3beaYvzrvOcS/lpaso7GMEZpn4+vKTEAXhgShC48Zo9OYb +hGBKia/teQ87zvH2RPUBeMCjVDBSMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBTIy5lycFIM+Oa+sgRXKSrPQhDtNTAQBgkrBgEEAYI3 +FQEEAwIBADAKBggqhkjOPQQDAwNoADBlAjBY8k3qDPlfXu5gKcs68tvWMoQZP3zV +L8KxzJOuULsJMsbG7X7JNpQS5GiFBqIb0C8CMQCZ6Ra0DvpWSNSkMBaReNtUjGUB +iudQZsIxtzm6uBoiB078a1QWIP8rtedMDE2mT3M= +-----END CERTIFICATE----- Copied: stable/11/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem (from r364943, head/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem Wed Sep 2 01:35:45 2020 (r365233, copy of r364943, head/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem) @@ -0,0 +1,136 @@ +## +## Microsoft RSA Root Certificate Authority 2017 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 1e:d3:97:09:5f:d8:b4:b3:47:70:1e:aa:be:7f:45:b3 + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = US, O = Microsoft Corporation, CN = Microsoft RSA Root Certificate Authority 2017 + Validity + Not Before: Dec 18 22:51:22 2019 GMT + Not After : Jul 18 23:00:23 2042 GMT + Subject: C = US, O = Microsoft Corporation, CN = Microsoft RSA Root Certificate Authority 2017 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:ca:5b:be:94:33:8c:29:95:91:16:0a:95:bd:47: + 62:c1:89:f3:99:36:df:46:90:c9:a5:ed:78:6a:6f: + 47:91:68:f8:27:67:50:33:1d:a1:a6:fb:e0:e5:43: + a3:84:02:57:01:5d:9c:48:40:82:53:10:bc:bf:c7: + 3b:68:90:b6:82:2d:e5:f4:65:d0:cc:6d:19:cc:95: + f9:7b:ac:4a:94:ad:0e:de:4b:43:1d:87:07:92:13: + 90:80:83:64:35:39:04:fc:e5:e9:6c:b3:b6:1f:50: + 94:38:65:50:5c:17:46:b9:b6:85:b5:1c:b5:17:e8: + d6:45:9d:d8:b2:26:b0:ca:c4:70:4a:ae:60:a4:dd: + b3:d9:ec:fc:3b:d5:57:72:bc:3f:c8:c9:b2:de:4b: + 6b:f8:23:6c:03:c0:05:bd:95:c7:cd:73:3b:66:80: + 64:e3:1a:ac:2e:f9:47:05:f2:06:b6:9b:73:f5:78: + 33:5b:c7:a1:fb:27:2a:a1:b4:9a:91:8c:91:d3:3a: + 82:3e:76:40:b4:cd:52:61:51:70:28:3f:c5:c5:5a: + f2:c9:8c:49:bb:14:5b:4d:c8:ff:67:4d:4c:12:96: + ad:f5:fe:78:a8:97:87:d7:fd:5e:20:80:dc:a1:4b: + 22:fb:d4:89:ad:ba:ce:47:97:47:55:7b:8f:45:c8: + 67:28:84:95:1c:68:30:ef:ef:49:e0:35:7b:64:e7: + 98:b0:94:da:4d:85:3b:3e:55:c4:28:af:57:f3:9e: + 13:db:46:27:9f:1e:a2:5e:44:83:a4:a5:ca:d5:13: + b3:4b:3f:c4:e3:c2:e6:86:61:a4:52:30:b9:7a:20: + 4f:6f:0f:38:53:cb:33:0c:13:2b:8f:d6:9a:bd:2a: + c8:2d:b1:1c:7d:4b:51:ca:47:d1:48:27:72:5d:87: + eb:d5:45:e6:48:65:9d:af:52:90:ba:5b:a2:18:65: + 57:12:9f:68:b9:d4:15:6b:94:c4:69:22:98:f4:33: + e0:ed:f9:51:8e:41:50:c9:34:4f:76:90:ac:fc:38: + c1:d8:e1:7b:b9:e3:e3:94:e1:46:69:cb:0e:0a:50: + 6b:13:ba:ac:0f:37:5a:b7:12:b5:90:81:1e:56:ae: + 57:22:86:d9:c9:d2:d1:d7:51:e3:ab:3b:c6:55:fd: + 1e:0e:d3:74:0a:d1:da:aa:ea:69:b8:97:28:8f:48: + c4:07:f8:52:43:3a:f4:ca:55:35:2c:b0:a6:6a:c0: + 9c:f9:f2:81:e1:12:6a:c0:45:d9:67:b3:ce:ff:23: + a2:89:0a:54:d4:14:b9:2a:a8:d7:ec:f9:ab:cd:25: + 58:32:79:8f:90:5b:98:39:c4:08:06:c1:ac:7f:0e: + 3d:00:a5 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 09:CB:59:7F:86:B2:70:8F:1A:C3:39:E3:C0:D9:E9:BF:BB:4D:B2:23 + 1.3.6.1.4.1.311.21.1: + ... + Signature Algorithm: sha384WithRSAEncryption + ac:af:3e:5d:c2:11:96:89:8e:a3:e7:92:d6:97:15:b8:13:a2: + a6:42:2e:02:cd:16:05:59:27:ca:20:e8:ba:b8:e8:1a:ec:4d: + a8:97:56:ae:65:43:b1:8f:00:9b:52:cd:55:cd:53:39:6d:62: + 4c:8b:0d:5b:7c:2e:44:bf:83:10:8f:f3:53:82:80:c3:4f:3a: + c7:6e:11:3f:e6:e3:16:91:84:fb:6d:84:7f:34:74:ad:89:a7: + ce:b9:d7:d7:9f:84:64:92:be:95:a1:ad:09:53:33:dd:ee:0a: + ea:4a:51:8e:6f:55:ab:ba:b5:94:46:ae:8c:7f:d8:a2:50:25: + 65:60:80:46:db:33:04:ae:6c:b5:98:74:54:25:dc:93:e4:f8: + e3:55:15:3d:b8:6d:c3:0a:a4:12:c1:69:85:6e:df:64:f1:53: + 99:e1:4a:75:20:9d:95:0f:e4:d6:dc:03:f1:59:18:e8:47:89: + b2:57:5a:94:b6:a9:d8:17:2b:17:49:e5:76:cb:c1:56:99:3a: + 37:b1:ff:69:2c:91:91:93:e1:df:4c:a3:37:76:4d:a1:9f:f8: + 6d:1e:1d:d3:fa:ec:fb:f4:45:1d:13:6d:cf:f7:59:e5:22:27: + 72:2b:86:f3:57:bb:30:ed:24:4d:dc:7d:56:bb:a3:b3:f8:34: + 79:89:c1:e0:f2:02:61:f7:a6:fc:0f:bb:1c:17:0b:ae:41:d9: + 7c:bd:27:a3:fd:2e:3a:d1:93:94:b1:73:1d:24:8b:af:5b:20: + 89:ad:b7:67:66:79:f5:3a:c6:a6:96:33:fe:53:92:c8:46:b1: + 11:91:c6:99:7f:8f:c9:d6:66:31:20:41:10:87:2d:0c:d6:c1: + af:34:98:ca:64:83:fb:13:57:d1:c1:f0:3c:7a:8c:a5:c1:fd: + 95:21:a0:71:c1:93:67:71:12:ea:8f:88:0a:69:19:64:99:23: + 56:fb:ac:2a:2e:70:be:66:c4:0c:84:ef:e5:8b:f3:93:01:f8: + 6a:90:93:67:4b:b2:68:a3:b5:62:8f:e9:3f:8c:7a:3b:5e:0f: + e7:8c:b8:c6:7c:ef:37:fd:74:e2:c8:4f:33:72:e1:94:39:6d: + bd:12:af:be:0c:4e:70:7c:1b:6f:8d:b3:32:93:73:44:16:6d: + e8:f4:f7:e0:95:80:8f:96:5d:38:a4:f4:ab:de:0a:30:87:93: + d8:4d:00:71:62:45:27:4b:3a:42:84:5b:7f:65:b7:67:34:52: + 2d:9c:16:6b:aa:a8:d8:7b:a3:42:4c:71:c7:0c:ca:3e:83:e4: + a6:ef:b7:01:30:5e:51:a3:79:f5:70:69:a6:41:44:0f:86:b0: + 2c:91:c6:3d:ea:ae:0f:84 +SHA1 Fingerprint=73:A5:E6:4A:3B:FF:83:16:FF:0E:DC:CC:61:8A:90:6E:4E:AE:4D:74 +-----BEGIN CERTIFICATE----- +MIIFqDCCA5CgAwIBAgIQHtOXCV/YtLNHcB6qvn9FszANBgkqhkiG9w0BAQwFADBl +MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYw +NAYDVQQDEy1NaWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5 +IDIwMTcwHhcNMTkxMjE4MjI1MTIyWhcNNDIwNzE4MjMwMDIzWjBlMQswCQYDVQQG +EwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1N +aWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKW76UM4wplZEWCpW9R2LBifOZ +Nt9GkMml7Xhqb0eRaPgnZ1AzHaGm++DlQ6OEAlcBXZxIQIJTELy/xztokLaCLeX0 +ZdDMbRnMlfl7rEqUrQ7eS0MdhweSE5CAg2Q1OQT85elss7YfUJQ4ZVBcF0a5toW1 +HLUX6NZFndiyJrDKxHBKrmCk3bPZ7Pw71VdyvD/IybLeS2v4I2wDwAW9lcfNcztm +gGTjGqwu+UcF8ga2m3P1eDNbx6H7JyqhtJqRjJHTOoI+dkC0zVJhUXAoP8XFWvLJ +jEm7FFtNyP9nTUwSlq31/niol4fX/V4ggNyhSyL71Imtus5Hl0dVe49FyGcohJUc +aDDv70ngNXtk55iwlNpNhTs+VcQor1fznhPbRiefHqJeRIOkpcrVE7NLP8TjwuaG +YaRSMLl6IE9vDzhTyzMMEyuP1pq9KsgtsRx9S1HKR9FIJ3Jdh+vVReZIZZ2vUpC6 +W6IYZVcSn2i51BVrlMRpIpj0M+Dt+VGOQVDJNE92kKz8OMHY4Xu54+OU4UZpyw4K +UGsTuqwPN1q3ErWQgR5WrlcihtnJ0tHXUeOrO8ZV/R4O03QK0dqq6mm4lyiPSMQH ++FJDOvTKVTUssKZqwJz58oHhEmrARdlns87/I6KJClTUFLkqqNfs+avNJVgyeY+Q +W5g5xAgGwax/Dj0ApQIDAQABo1QwUjAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/ +BAUwAwEB/zAdBgNVHQ4EFgQUCctZf4aycI8awznjwNnpv7tNsiMwEAYJKwYBBAGC +NxUBBAMCAQAwDQYJKoZIhvcNAQEMBQADggIBAKyvPl3CEZaJjqPnktaXFbgToqZC +LgLNFgVZJ8og6Lq46BrsTaiXVq5lQ7GPAJtSzVXNUzltYkyLDVt8LkS/gxCP81OC +gMNPOsduET/m4xaRhPtthH80dK2Jp86519efhGSSvpWhrQlTM93uCupKUY5vVau6 +tZRGrox/2KJQJWVggEbbMwSubLWYdFQl3JPk+ONVFT24bcMKpBLBaYVu32TxU5nh +SnUgnZUP5NbcA/FZGOhHibJXWpS2qdgXKxdJ5XbLwVaZOjex/2kskZGT4d9Mozd2 +TaGf+G0eHdP67Pv0RR0Tbc/3WeUiJ3IrhvNXuzDtJE3cfVa7o7P4NHmJweDyAmH3 +pvwPuxwXC65B2Xy9J6P9LjrRk5Sxcx0ki69bIImtt2dmefU6xqaWM/5TkshGsRGR +xpl/j8nWZjEgQRCHLQzWwa80mMpkg/sTV9HB8Dx6jKXB/ZUhoHHBk2dxEuqPiApp +GWSZI1b7rCoucL5mxAyE7+WL85MB+GqQk2dLsmijtWKP6T+MejteD+eMuMZ87zf9 +dOLITzNy4ZQ5bb0Sr74MTnB8G2+NszKTc0QWbej09+CVgI+WXTik9KveCjCHk9hN +AHFiRSdLOkKEW39lt2c0Ui2cFmuqqNh7o0JMcccMyj6D5KbvtwEwXlGjefVwaaZB +RA+GsCyRxj3qrg+E +-----END CERTIFICATE----- Copied: stable/11/secure/caroot/trusted/certSIGN_Root_CA_G2.pem (from r364943, head/secure/caroot/trusted/certSIGN_Root_CA_G2.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/trusted/certSIGN_Root_CA_G2.pem Wed Sep 2 01:35:45 2020 (r365233, copy of r364943, head/secure/caroot/trusted/certSIGN_Root_CA_G2.pem) @@ -0,0 +1,132 @@ +## +## certSIGN Root CA G2 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 11:00:34:b6:4e:c6:36:2d:36 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = RO, O = CERTSIGN SA, OU = certSIGN ROOT CA G2 + Validity + Not Before: Feb 6 09:27:35 2017 GMT + Not After : Feb 6 09:27:35 2042 GMT + Subject: C = RO, O = CERTSIGN SA, OU = certSIGN ROOT CA G2 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:c0:c5:75:19:91:7d:44:74:74:87:fe:0e:3b:96: + dc:d8:01:16:cc:ee:63:91:e7:0b:6f:ce:3b:0a:69: + 1a:7c:c2:e3:af:82:8e:86:d7:5e:8f:57:eb:d3:21: + 59:fd:39:37:42:30:be:50:ea:b6:0f:a9:88:d8:2e: + 2d:69:21:e7:d1:37:18:4e:7d:91:d5:16:5f:6b:5b: + 00:c2:39:43:0d:36:85:52:b9:53:65:0f:1d:42:e5: + 8f:cf:05:d3:ee:dc:0c:1a:d9:b8:8b:78:22:67:e4: + 69:b0:68:c5:3c:e4:6c:5a:46:e7:cd:c7:fa:ef:c4: + ec:4b:bd:6a:a4:ac:fd:cc:28:51:ef:92:b4:29:ab: + ab:35:9a:4c:e4:c4:08:c6:26:cc:f8:69:9f:e4:9c: + f0:29:d3:5c:f9:c6:16:25:9e:23:c3:20:c1:3d:0f: + 3f:38:40:b0:fe:82:44:38:aa:5a:1a:8a:6b:63:58: + 38:b4:15:d3:b6:11:69:7b:1e:54:ee:8c:1a:22:ac: + 72:97:3f:23:59:9b:c9:22:84:c1:07:4f:cc:7f:e2: + 57:ca:12:70:bb:a6:65:f3:69:75:63:bd:95:fb:1b: + 97:cd:e4:a8:af:f6:d1:4e:a8:d9:8a:71:24:cd:36: + 3d:bc:96:c4:f1:6c:a9:ae:e5:cf:0d:6e:28:0d:b0: + 0e:b5:ca:51:7b:78:14:c3:20:2f:7f:fb:14:55:e1: + 11:99:fd:d5:0a:a1:9e:02:e3:62:5f:eb:35:4b:2c: + b8:72:e8:3e:3d:4f:ac:2c:bb:2e:86:e2:a3:76:8f: + e5:93:2a:cf:a5:ab:c8:5c:8d:4b:06:ff:12:46:ac: + 78:cb:14:07:35:e0:a9:df:8b:e9:af:15:4f:16:89: + 5b:bd:f6:8d:c6:59:ae:88:85:0e:c1:89:eb:1f:67: + c5:45:8e:ff:6d:37:36:2b:78:66:83:91:51:2b:3d: + ff:51:77:76:62:a1:ec:67:3e:3e:81:83:e0:56:a9: + 50:1f:1f:7a:99:ab:63:bf:84:17:77:f1:0d:3b:df: + f7:9c:61:b3:35:98:8a:3a:b2:ec:3c:1a:37:3f:7e: + 8f:92:cf:d9:12:14:64:da:10:02:15:41:ff:4f:c4: + eb:1c:a3:c9:fa:99:f7:46:e9:e1:18:d9:b1:b8:32: + 2d:cb:14:0c:50:d8:83:65:83:ee:b9:5c:cf:cb:05: + 5a:4c:fa:19:97:6b:d6:5d:13:d3:c2:5c:54:bc:32: + 73:a0:78:f5:f1:6d:1e:cb:9f:a5:a6:9f:22:dc:d1: + 51:9e:82:79:64:60:29:13:3e:a3:fd:4f:72:6a:ab: + e2:d4:e5:b8:24:55:2c:44:4b:8a:88:44:9c:ca:84: + d3:2a:3b + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 82:21:2D:66:C6:D7:A0:E0:15:EB:CE:4C:09:77:C4:60:9E:54:6E:03 + Signature Algorithm: sha256WithRSAEncryption + 60:de:1a:b8:e7:f2:60:82:d5:03:33:81:cb:06:8a:f1:22:49: + e9:e8:ea:91:7f:c6:33:5e:68:19:03:86:3b:43:01:cf:07:70: + e4:08:1e:65:85:91:e6:11:22:b7:f5:02:23:8e:ae:b9:1e:7d: + 1f:7e:6c:e6:bd:25:d5:95:1a:f2:05:a6:af:85:02:6f:ae:f8: + d6:31:ff:25:c9:4a:c8:c7:8a:a9:d9:9f:4b:49:9b:11:57:99: + 92:43:11:de:b6:33:a4:cc:d7:8d:64:7d:d4:cd:3c:28:2c:b4: + 9a:96:ea:4d:f5:c4:44:c4:25:aa:20:80:d8:29:55:f7:e0:41: + fc:06:26:ff:b9:36:f5:43:14:03:66:78:e1:11:b1:da:20:5f: + 46:00:78:00:21:a5:1e:00:28:61:78:6f:a8:01:01:8f:9d:34: + 9a:ff:f4:38:90:fb:b8:d1:b3:72:06:c9:71:e6:81:c5:79:ed: + 0b:a6:79:f2:13:0b:9c:f7:5d:0e:7b:24:93:b4:48:db:86:5f: + de:50:86:78:e7:40:e6:31:a8:90:76:70:61:af:9c:37:2c:11: + b5:82:b7:aa:ae:24:34:5b:72:0c:69:0d:cd:59:9f:f6:71:af: + 9c:0b:d1:0a:38:f9:06:22:83:53:25:0c:fc:51:c4:e6:be:e2: + 39:95:0b:24:ad:af:d1:95:e4:96:d7:74:64:6b:71:4e:02:3c: + aa:85:f3:20:a3:43:39:76:5b:6c:50:fe:9a:9c:14:1e:65:14: + 8a:15:bd:a3:82:45:5a:49:56:6a:d2:9c:b1:63:32:e5:61:e0: + 53:22:0e:a7:0a:49:ea:cb:7e:1f:a8:e2:62:80:f6:10:45:52: + 98:06:18:de:a5:cd:2f:7f:aa:d4:e9:3e:08:72:ec:23:03:02: + 3c:a6:aa:d8:bc:67:74:3d:14:17:fb:54:4b:17:e3:d3:79:3d: + 6d:6b:49:c9:28:0e:2e:74:50:bf:0c:d9:46:3a:10:86:c9:a7: + 3f:e9:a0:ec:7f:eb:a5:77:58:69:71:e6:83:0a:37:f2:86:49: + 6a:be:79:08:90:f6:02:16:64:3e:e5:da:4c:7e:0c:34:c9:f9: + 5f:b6:b3:28:51:a7:a7:2b:aa:49:fa:8d:65:29:4e:e3:6b:13: + a7:94:a3:2d:51:6d:78:0c:44:cb:df:de:08:6f:ce:a3:64:ab: + d3:95:84:d4:b9:52:54:72:7b:96:25:cc:bc:69:e3:48:6e:0d: + d0:c7:9d:27:9a:aa:f8:13:92:dd:1e:df:63:9f:35:a9:16:36: + ec:8c:b8:83:f4:3d:89:8f:cd:b4:17:5e:d7:b3:17:41:10:5d: + 27:73:60:85:57:49:22:07 +SHA1 Fingerprint=26:F9:93:B4:ED:3D:28:27:B0:B9:4B:A7:E9:15:1D:A3:8D:92:E5:32 +-----BEGIN CERTIFICATE----- +MIIFRzCCAy+gAwIBAgIJEQA0tk7GNi02MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +BAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJR04g +Uk9PVCBDQSBHMjAeFw0xNzAyMDYwOTI3MzVaFw00MjAyMDYwOTI3MzVaMEExCzAJ +BgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJ +R04gUk9PVCBDQSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDF +dRmRfUR0dIf+DjuW3NgBFszuY5HnC2/OOwppGnzC46+CjobXXo9X69MhWf05N0Iw +vlDqtg+piNguLWkh59E3GE59kdUWX2tbAMI5Qw02hVK5U2UPHULlj88F0+7cDBrZ +uIt4ImfkabBoxTzkbFpG583H+u/E7Eu9aqSs/cwoUe+StCmrqzWaTOTECMYmzPhp +n+Sc8CnTXPnGFiWeI8MgwT0PPzhAsP6CRDiqWhqKa2NYOLQV07YRaXseVO6MGiKs +cpc/I1mbySKEwQdPzH/iV8oScLumZfNpdWO9lfsbl83kqK/20U6o2YpxJM02PbyW +xPFsqa7lzw1uKA2wDrXKUXt4FMMgL3/7FFXhEZn91QqhngLjYl/rNUssuHLoPj1P +rCy7Lobio3aP5ZMqz6WryFyNSwb/EkaseMsUBzXgqd+L6a8VTxaJW732jcZZroiF +DsGJ6x9nxUWO/203Nit4ZoORUSs9/1F3dmKh7Gc+PoGD4FapUB8fepmrY7+EF3fx +DTvf95xhszWYijqy7DwaNz9+j5LP2RIUZNoQAhVB/0/E6xyjyfqZ90bp4RjZsbgy +LcsUDFDYg2WD7rlcz8sFWkz6GZdr1l0T08JcVLwyc6B49fFtHsufpaafItzRUZ6C +eWRgKRM+o/1Pcmqr4tTluCRVLERLiohEnMqE0yo7AgMBAAGjQjBAMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSCIS1mxteg4BXrzkwJ +d8RgnlRuAzANBgkqhkiG9w0BAQsFAAOCAgEAYN4auOfyYILVAzOBywaK8SJJ6ejq +kX/GM15oGQOGO0MBzwdw5AgeZYWR5hEit/UCI46uuR59H35s5r0l1ZUa8gWmr4UC +b6741jH/JclKyMeKqdmfS0mbEVeZkkMR3rYzpMzXjWR91M08KCy0mpbqTfXERMQl +qiCA2ClV9+BB/AYm/7k29UMUA2Z44RGx2iBfRgB4ACGlHgAoYXhvqAEBj500mv/0 +OJD7uNGzcgbJceaBxXntC6Z58hMLnPddDnskk7RI24Zf3lCGeOdA5jGokHZwYa+c +NywRtYK3qq4kNFtyDGkNzVmf9nGvnAvRCjj5BiKDUyUM/FHE5r7iOZULJK2v0ZXk +ltd0ZGtxTgI8qoXzIKNDOXZbbFD+mpwUHmUUihW9o4JFWklWatKcsWMy5WHgUyIO +pwpJ6st+H6jiYoD2EEVSmAYY3qXNL3+q1Ok+CHLsIwMCPKaq2LxndD0UF/tUSxfj +03k9bWtJySgOLnRQvwzZRjoQhsmnP+mg7H/rpXdYaXHmgwo38oZJar55CJD2AhZk +PuXaTH4MNMn5X7azKFGnpyuqSfqNZSlO42sTp5SjLVFteAxEy9/eCG/Oo2Sr05WE +1LlSVHJ7liXMvGnjSG4N0MedJ5qq+BOS3R7fY581qRY27Iy4g/Q9iY/NtBde17MX +QRBdJ3NghVdJIgc= +-----END CERTIFICATE----- Copied: stable/11/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem (from r364943, head/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem Wed Sep 2 01:35:45 2020 (r365233, copy of r364943, head/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem) @@ -0,0 +1,65 @@ +## +## e-Szigno Root CA 2017 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 01:54:48:ef:21:fd:97:59:0d:f5:04:0a + Signature Algorithm: ecdsa-with-SHA256 + Issuer: C = HU, L = Budapest, O = Microsec Ltd., organizationIdentifier = VATHU-23584497, CN = e-Szigno Root CA 2017 + Validity + Not Before: Aug 22 12:07:06 2017 GMT + Not After : Aug 22 12:07:06 2042 GMT + Subject: C = HU, L = Budapest, O = Microsec Ltd., organizationIdentifier = VATHU-23584497, CN = e-Szigno Root CA 2017 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (256 bit) + pub: + 04:96:dc:3d:8a:d8:b0:7b:6f:c6:27:be:44:90:b1: + b3:56:15:7b:8e:43:24:7d:1a:84:59:ee:63:68:b2: + c6:5e:87:d0:15:48:1e:a8:90:ad:bd:53:a2:da:de: + 3a:90:a6:60:5f:68:32:b5:86:41:df:87:5b:2c:7b: + c5:fe:7c:7a:da + ASN1 OID: prime256v1 + NIST CURVE: P-256 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 87:11:15:08:D1:AA:C1:78:0C:B1:AF:CE:C6:C9:90:EF:BF:30:04:C0 + X509v3 Authority Key Identifier: + keyid:87:11:15:08:D1:AA:C1:78:0C:B1:AF:CE:C6:C9:90:EF:BF:30:04:C0 + + Signature Algorithm: ecdsa-with-SHA256 + 30:46:02:21:00:b5:57:dd:d7:8a:55:0b:36:e1:86:44:fa:d4: + d9:68:8d:b8:dc:23:8a:8a:0d:d4:2f:7d:ea:73:ec:bf:4d:6c: + a8:02:21:00:cb:a5:b4:12:fa:e7:b5:e8:cf:7e:93:fc:f3:35: + 8f:6f:4e:5a:7c:b4:bc:4e:b2:fc:72:aa:5b:59:f9:e7:dc:31 +SHA1 Fingerprint=89:D4:83:03:4F:9E:9A:48:80:5F:72:37:D4:A9:A6:EF:CB:7C:1F:D1 +-----BEGIN CERTIFICATE----- +MIICQDCCAeWgAwIBAgIMAVRI7yH9l1kN9QQKMAoGCCqGSM49BAMCMHExCzAJBgNV +BAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRk +LjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25vIFJv +b3QgQ0EgMjAxNzAeFw0xNzA4MjIxMjA3MDZaFw00MjA4MjIxMjA3MDZaMHExCzAJ +BgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMg +THRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25v +IFJvb3QgQ0EgMjAxNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJbcPYrYsHtv +xie+RJCxs1YVe45DJH0ahFnuY2iyxl6H0BVIHqiQrb1TotreOpCmYF9oMrWGQd+H +Wyx7xf58etqjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G +A1UdDgQWBBSHERUI0arBeAyxr87GyZDvvzAEwDAfBgNVHSMEGDAWgBSHERUI0arB +eAyxr87GyZDvvzAEwDAKBggqhkjOPQQDAgNJADBGAiEAtVfd14pVCzbhhkT61Nlo +jbjcI4qKDdQvfepz7L9NbKgCIQDLpbQS+ue16M9+k/zzNY9vTlp8tLxOsvxyqltZ ++efcMQ== +-----END CERTIFICATE----- From owner-svn-src-all@freebsd.org Wed Sep 2 01:35:47 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 55F953C54DA; Wed, 2 Sep 2020 01:35:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh62q1slLz3ywt; Wed, 2 Sep 2020 01:35:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 220CE2277C; Wed, 2 Sep 2020 01:35:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0821ZlRh085811; Wed, 2 Sep 2020 01:35:47 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0821ZkYK085806; Wed, 2 Sep 2020 01:35:46 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202009020135.0821ZkYK085806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 2 Sep 2020 01:35:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365233 - in stable: 11/secure/caroot/trusted 12/secure/caroot/trusted X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable: 11/secure/caroot/trusted 12/secure/caroot/trusted X-SVN-Commit-Revision: 365233 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 01:35:47 -0000 Author: kevans Date: Wed Sep 2 01:35:45 2020 New Revision: 365233 URL: https://svnweb.freebsd.org/changeset/base/365233 Log: MFC r364943: carrot: update bundle Stats: - Seven (7) removed - Four (4) added Added: stable/12/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem stable/12/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem stable/12/secure/caroot/trusted/certSIGN_Root_CA_G2.pem - copied unchanged from r364943, head/secure/caroot/trusted/certSIGN_Root_CA_G2.pem stable/12/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem Deleted: stable/12/secure/caroot/trusted/AddTrust_External_Root.pem stable/12/secure/caroot/trusted/AddTrust_Low-Value_Services_Root.pem stable/12/secure/caroot/trusted/LuxTrust_Global_Root_2.pem stable/12/secure/caroot/trusted/Staat_der_Nederlanden_Root_CA_-_G2.pem stable/12/secure/caroot/trusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem stable/12/secure/caroot/trusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem stable/12/secure/caroot/trusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Modified: Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Added: stable/11/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem stable/11/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem stable/11/secure/caroot/trusted/certSIGN_Root_CA_G2.pem - copied unchanged from r364943, head/secure/caroot/trusted/certSIGN_Root_CA_G2.pem stable/11/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem - copied unchanged from r364943, head/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem Deleted: stable/11/secure/caroot/trusted/AddTrust_External_Root.pem stable/11/secure/caroot/trusted/AddTrust_Low-Value_Services_Root.pem stable/11/secure/caroot/trusted/LuxTrust_Global_Root_2.pem stable/11/secure/caroot/trusted/Staat_der_Nederlanden_Root_CA_-_G2.pem stable/11/secure/caroot/trusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem stable/11/secure/caroot/trusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem stable/11/secure/caroot/trusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Modified: Directory Properties: stable/11/ (props changed) Copied: stable/12/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem (from r364943, head/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem Wed Sep 2 01:35:45 2020 (r365233, copy of r364943, head/secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem) @@ -0,0 +1,68 @@ +## +## Microsoft ECC Root Certificate Authority 2017 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 66:f2:3d:af:87:de:8b:b1:4a:ea:0c:57:31:01:c2:ec + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Microsoft Corporation, CN = Microsoft ECC Root Certificate Authority 2017 + Validity + Not Before: Dec 18 23:06:45 2019 GMT + Not After : Jul 18 23:16:04 2042 GMT + Subject: C = US, O = Microsoft Corporation, CN = Microsoft ECC Root Certificate Authority 2017 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:d4:bc:3d:02:42:75:41:13:23:cd:80:04:86:02: + 51:2f:6a:a8:81:62:0b:65:cc:f6:ca:9d:1e:6f:4a: + 66:51:a2:03:d9:9d:91:fa:b6:16:b1:8c:6e:de:7c: + cd:db:79:a6:2f:ce:bb:ce:71:2f:e5:a5:ab:28:ec: + 63:04:66:99:f8:fa:f2:93:10:05:e1:81:28:42:e3: + c6:68:f4:e6:1b:84:60:4a:89:af:ed:79:0f:3b:ce: + f1:f6:44:f5:01:78:c0 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + C8:CB:99:72:70:52:0C:F8:E6:BE:B2:04:57:29:2A:CF:42:10:ED:35 + 1.3.6.1.4.1.311.21.1: + ... + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:30:58:f2:4d:ea:0c:f9:5f:5e:ee:60:29:cb:3a:f2: + db:d6:32:84:19:3f:7c:d5:2f:c2:b1:cc:93:ae:50:bb:09:32: + c6:c6:ed:7e:c9:36:94:12:e4:68:85:06:a2:1b:d0:2f:02:31: + 00:99:e9:16:b4:0e:fa:56:48:d4:a4:30:16:91:78:db:54:8c: + 65:01:8a:e7:50:66:c2:31:b7:39:ba:b8:1a:22:07:4e:fc:6b: + 54:16:20:ff:2b:b5:e7:4c:0c:4d:a6:4f:73 +SHA1 Fingerprint=99:9A:64:C3:7F:F4:7D:9F:AB:95:F1:47:69:89:14:60:EE:C4:C3:C5 +-----BEGIN CERTIFICATE----- +MIICWTCCAd+gAwIBAgIQZvI9r4fei7FK6gxXMQHC7DAKBggqhkjOPQQDAzBlMQsw +CQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYD +VQQDEy1NaWNyb3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIw +MTcwHhcNMTkxMjE4MjMwNjQ1WhcNNDIwNzE4MjMxNjA0WjBlMQswCQYDVQQGEwJV +UzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNy +b3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATUvD0CQnVBEyPNgASGAlEvaqiBYgtlzPbKnR5vSmZR +ogPZnZH6thaxjG7efM3beaYvzrvOcS/lpaso7GMEZpn4+vKTEAXhgShC48Zo9OYb +hGBKia/teQ87zvH2RPUBeMCjVDBSMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBTIy5lycFIM+Oa+sgRXKSrPQhDtNTAQBgkrBgEEAYI3 +FQEEAwIBADAKBggqhkjOPQQDAwNoADBlAjBY8k3qDPlfXu5gKcs68tvWMoQZP3zV +L8KxzJOuULsJMsbG7X7JNpQS5GiFBqIb0C8CMQCZ6Ra0DvpWSNSkMBaReNtUjGUB +iudQZsIxtzm6uBoiB078a1QWIP8rtedMDE2mT3M= +-----END CERTIFICATE----- Copied: stable/12/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem (from r364943, head/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem Wed Sep 2 01:35:45 2020 (r365233, copy of r364943, head/secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem) @@ -0,0 +1,136 @@ +## +## Microsoft RSA Root Certificate Authority 2017 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 1e:d3:97:09:5f:d8:b4:b3:47:70:1e:aa:be:7f:45:b3 + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = US, O = Microsoft Corporation, CN = Microsoft RSA Root Certificate Authority 2017 + Validity + Not Before: Dec 18 22:51:22 2019 GMT + Not After : Jul 18 23:00:23 2042 GMT + Subject: C = US, O = Microsoft Corporation, CN = Microsoft RSA Root Certificate Authority 2017 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:ca:5b:be:94:33:8c:29:95:91:16:0a:95:bd:47: + 62:c1:89:f3:99:36:df:46:90:c9:a5:ed:78:6a:6f: + 47:91:68:f8:27:67:50:33:1d:a1:a6:fb:e0:e5:43: + a3:84:02:57:01:5d:9c:48:40:82:53:10:bc:bf:c7: + 3b:68:90:b6:82:2d:e5:f4:65:d0:cc:6d:19:cc:95: + f9:7b:ac:4a:94:ad:0e:de:4b:43:1d:87:07:92:13: + 90:80:83:64:35:39:04:fc:e5:e9:6c:b3:b6:1f:50: + 94:38:65:50:5c:17:46:b9:b6:85:b5:1c:b5:17:e8: + d6:45:9d:d8:b2:26:b0:ca:c4:70:4a:ae:60:a4:dd: + b3:d9:ec:fc:3b:d5:57:72:bc:3f:c8:c9:b2:de:4b: + 6b:f8:23:6c:03:c0:05:bd:95:c7:cd:73:3b:66:80: + 64:e3:1a:ac:2e:f9:47:05:f2:06:b6:9b:73:f5:78: + 33:5b:c7:a1:fb:27:2a:a1:b4:9a:91:8c:91:d3:3a: + 82:3e:76:40:b4:cd:52:61:51:70:28:3f:c5:c5:5a: + f2:c9:8c:49:bb:14:5b:4d:c8:ff:67:4d:4c:12:96: + ad:f5:fe:78:a8:97:87:d7:fd:5e:20:80:dc:a1:4b: + 22:fb:d4:89:ad:ba:ce:47:97:47:55:7b:8f:45:c8: + 67:28:84:95:1c:68:30:ef:ef:49:e0:35:7b:64:e7: + 98:b0:94:da:4d:85:3b:3e:55:c4:28:af:57:f3:9e: + 13:db:46:27:9f:1e:a2:5e:44:83:a4:a5:ca:d5:13: + b3:4b:3f:c4:e3:c2:e6:86:61:a4:52:30:b9:7a:20: + 4f:6f:0f:38:53:cb:33:0c:13:2b:8f:d6:9a:bd:2a: + c8:2d:b1:1c:7d:4b:51:ca:47:d1:48:27:72:5d:87: + eb:d5:45:e6:48:65:9d:af:52:90:ba:5b:a2:18:65: + 57:12:9f:68:b9:d4:15:6b:94:c4:69:22:98:f4:33: + e0:ed:f9:51:8e:41:50:c9:34:4f:76:90:ac:fc:38: + c1:d8:e1:7b:b9:e3:e3:94:e1:46:69:cb:0e:0a:50: + 6b:13:ba:ac:0f:37:5a:b7:12:b5:90:81:1e:56:ae: + 57:22:86:d9:c9:d2:d1:d7:51:e3:ab:3b:c6:55:fd: + 1e:0e:d3:74:0a:d1:da:aa:ea:69:b8:97:28:8f:48: + c4:07:f8:52:43:3a:f4:ca:55:35:2c:b0:a6:6a:c0: + 9c:f9:f2:81:e1:12:6a:c0:45:d9:67:b3:ce:ff:23: + a2:89:0a:54:d4:14:b9:2a:a8:d7:ec:f9:ab:cd:25: + 58:32:79:8f:90:5b:98:39:c4:08:06:c1:ac:7f:0e: + 3d:00:a5 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 09:CB:59:7F:86:B2:70:8F:1A:C3:39:E3:C0:D9:E9:BF:BB:4D:B2:23 + 1.3.6.1.4.1.311.21.1: + ... + Signature Algorithm: sha384WithRSAEncryption + ac:af:3e:5d:c2:11:96:89:8e:a3:e7:92:d6:97:15:b8:13:a2: + a6:42:2e:02:cd:16:05:59:27:ca:20:e8:ba:b8:e8:1a:ec:4d: + a8:97:56:ae:65:43:b1:8f:00:9b:52:cd:55:cd:53:39:6d:62: + 4c:8b:0d:5b:7c:2e:44:bf:83:10:8f:f3:53:82:80:c3:4f:3a: + c7:6e:11:3f:e6:e3:16:91:84:fb:6d:84:7f:34:74:ad:89:a7: + ce:b9:d7:d7:9f:84:64:92:be:95:a1:ad:09:53:33:dd:ee:0a: + ea:4a:51:8e:6f:55:ab:ba:b5:94:46:ae:8c:7f:d8:a2:50:25: + 65:60:80:46:db:33:04:ae:6c:b5:98:74:54:25:dc:93:e4:f8: + e3:55:15:3d:b8:6d:c3:0a:a4:12:c1:69:85:6e:df:64:f1:53: + 99:e1:4a:75:20:9d:95:0f:e4:d6:dc:03:f1:59:18:e8:47:89: + b2:57:5a:94:b6:a9:d8:17:2b:17:49:e5:76:cb:c1:56:99:3a: + 37:b1:ff:69:2c:91:91:93:e1:df:4c:a3:37:76:4d:a1:9f:f8: + 6d:1e:1d:d3:fa:ec:fb:f4:45:1d:13:6d:cf:f7:59:e5:22:27: + 72:2b:86:f3:57:bb:30:ed:24:4d:dc:7d:56:bb:a3:b3:f8:34: + 79:89:c1:e0:f2:02:61:f7:a6:fc:0f:bb:1c:17:0b:ae:41:d9: + 7c:bd:27:a3:fd:2e:3a:d1:93:94:b1:73:1d:24:8b:af:5b:20: + 89:ad:b7:67:66:79:f5:3a:c6:a6:96:33:fe:53:92:c8:46:b1: + 11:91:c6:99:7f:8f:c9:d6:66:31:20:41:10:87:2d:0c:d6:c1: + af:34:98:ca:64:83:fb:13:57:d1:c1:f0:3c:7a:8c:a5:c1:fd: + 95:21:a0:71:c1:93:67:71:12:ea:8f:88:0a:69:19:64:99:23: + 56:fb:ac:2a:2e:70:be:66:c4:0c:84:ef:e5:8b:f3:93:01:f8: + 6a:90:93:67:4b:b2:68:a3:b5:62:8f:e9:3f:8c:7a:3b:5e:0f: + e7:8c:b8:c6:7c:ef:37:fd:74:e2:c8:4f:33:72:e1:94:39:6d: + bd:12:af:be:0c:4e:70:7c:1b:6f:8d:b3:32:93:73:44:16:6d: + e8:f4:f7:e0:95:80:8f:96:5d:38:a4:f4:ab:de:0a:30:87:93: + d8:4d:00:71:62:45:27:4b:3a:42:84:5b:7f:65:b7:67:34:52: + 2d:9c:16:6b:aa:a8:d8:7b:a3:42:4c:71:c7:0c:ca:3e:83:e4: + a6:ef:b7:01:30:5e:51:a3:79:f5:70:69:a6:41:44:0f:86:b0: + 2c:91:c6:3d:ea:ae:0f:84 +SHA1 Fingerprint=73:A5:E6:4A:3B:FF:83:16:FF:0E:DC:CC:61:8A:90:6E:4E:AE:4D:74 +-----BEGIN CERTIFICATE----- +MIIFqDCCA5CgAwIBAgIQHtOXCV/YtLNHcB6qvn9FszANBgkqhkiG9w0BAQwFADBl +MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYw +NAYDVQQDEy1NaWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5 +IDIwMTcwHhcNMTkxMjE4MjI1MTIyWhcNNDIwNzE4MjMwMDIzWjBlMQswCQYDVQQG +EwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1N +aWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKW76UM4wplZEWCpW9R2LBifOZ +Nt9GkMml7Xhqb0eRaPgnZ1AzHaGm++DlQ6OEAlcBXZxIQIJTELy/xztokLaCLeX0 +ZdDMbRnMlfl7rEqUrQ7eS0MdhweSE5CAg2Q1OQT85elss7YfUJQ4ZVBcF0a5toW1 +HLUX6NZFndiyJrDKxHBKrmCk3bPZ7Pw71VdyvD/IybLeS2v4I2wDwAW9lcfNcztm +gGTjGqwu+UcF8ga2m3P1eDNbx6H7JyqhtJqRjJHTOoI+dkC0zVJhUXAoP8XFWvLJ +jEm7FFtNyP9nTUwSlq31/niol4fX/V4ggNyhSyL71Imtus5Hl0dVe49FyGcohJUc +aDDv70ngNXtk55iwlNpNhTs+VcQor1fznhPbRiefHqJeRIOkpcrVE7NLP8TjwuaG +YaRSMLl6IE9vDzhTyzMMEyuP1pq9KsgtsRx9S1HKR9FIJ3Jdh+vVReZIZZ2vUpC6 +W6IYZVcSn2i51BVrlMRpIpj0M+Dt+VGOQVDJNE92kKz8OMHY4Xu54+OU4UZpyw4K +UGsTuqwPN1q3ErWQgR5WrlcihtnJ0tHXUeOrO8ZV/R4O03QK0dqq6mm4lyiPSMQH ++FJDOvTKVTUssKZqwJz58oHhEmrARdlns87/I6KJClTUFLkqqNfs+avNJVgyeY+Q +W5g5xAgGwax/Dj0ApQIDAQABo1QwUjAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/ +BAUwAwEB/zAdBgNVHQ4EFgQUCctZf4aycI8awznjwNnpv7tNsiMwEAYJKwYBBAGC +NxUBBAMCAQAwDQYJKoZIhvcNAQEMBQADggIBAKyvPl3CEZaJjqPnktaXFbgToqZC +LgLNFgVZJ8og6Lq46BrsTaiXVq5lQ7GPAJtSzVXNUzltYkyLDVt8LkS/gxCP81OC +gMNPOsduET/m4xaRhPtthH80dK2Jp86519efhGSSvpWhrQlTM93uCupKUY5vVau6 +tZRGrox/2KJQJWVggEbbMwSubLWYdFQl3JPk+ONVFT24bcMKpBLBaYVu32TxU5nh +SnUgnZUP5NbcA/FZGOhHibJXWpS2qdgXKxdJ5XbLwVaZOjex/2kskZGT4d9Mozd2 +TaGf+G0eHdP67Pv0RR0Tbc/3WeUiJ3IrhvNXuzDtJE3cfVa7o7P4NHmJweDyAmH3 +pvwPuxwXC65B2Xy9J6P9LjrRk5Sxcx0ki69bIImtt2dmefU6xqaWM/5TkshGsRGR +xpl/j8nWZjEgQRCHLQzWwa80mMpkg/sTV9HB8Dx6jKXB/ZUhoHHBk2dxEuqPiApp +GWSZI1b7rCoucL5mxAyE7+WL85MB+GqQk2dLsmijtWKP6T+MejteD+eMuMZ87zf9 +dOLITzNy4ZQ5bb0Sr74MTnB8G2+NszKTc0QWbej09+CVgI+WXTik9KveCjCHk9hN +AHFiRSdLOkKEW39lt2c0Ui2cFmuqqNh7o0JMcccMyj6D5KbvtwEwXlGjefVwaaZB +RA+GsCyRxj3qrg+E +-----END CERTIFICATE----- Copied: stable/12/secure/caroot/trusted/certSIGN_Root_CA_G2.pem (from r364943, head/secure/caroot/trusted/certSIGN_Root_CA_G2.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/trusted/certSIGN_Root_CA_G2.pem Wed Sep 2 01:35:45 2020 (r365233, copy of r364943, head/secure/caroot/trusted/certSIGN_Root_CA_G2.pem) @@ -0,0 +1,132 @@ +## +## certSIGN Root CA G2 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 11:00:34:b6:4e:c6:36:2d:36 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = RO, O = CERTSIGN SA, OU = certSIGN ROOT CA G2 + Validity + Not Before: Feb 6 09:27:35 2017 GMT + Not After : Feb 6 09:27:35 2042 GMT + Subject: C = RO, O = CERTSIGN SA, OU = certSIGN ROOT CA G2 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:c0:c5:75:19:91:7d:44:74:74:87:fe:0e:3b:96: + dc:d8:01:16:cc:ee:63:91:e7:0b:6f:ce:3b:0a:69: + 1a:7c:c2:e3:af:82:8e:86:d7:5e:8f:57:eb:d3:21: + 59:fd:39:37:42:30:be:50:ea:b6:0f:a9:88:d8:2e: + 2d:69:21:e7:d1:37:18:4e:7d:91:d5:16:5f:6b:5b: + 00:c2:39:43:0d:36:85:52:b9:53:65:0f:1d:42:e5: + 8f:cf:05:d3:ee:dc:0c:1a:d9:b8:8b:78:22:67:e4: + 69:b0:68:c5:3c:e4:6c:5a:46:e7:cd:c7:fa:ef:c4: + ec:4b:bd:6a:a4:ac:fd:cc:28:51:ef:92:b4:29:ab: + ab:35:9a:4c:e4:c4:08:c6:26:cc:f8:69:9f:e4:9c: + f0:29:d3:5c:f9:c6:16:25:9e:23:c3:20:c1:3d:0f: + 3f:38:40:b0:fe:82:44:38:aa:5a:1a:8a:6b:63:58: + 38:b4:15:d3:b6:11:69:7b:1e:54:ee:8c:1a:22:ac: + 72:97:3f:23:59:9b:c9:22:84:c1:07:4f:cc:7f:e2: + 57:ca:12:70:bb:a6:65:f3:69:75:63:bd:95:fb:1b: + 97:cd:e4:a8:af:f6:d1:4e:a8:d9:8a:71:24:cd:36: + 3d:bc:96:c4:f1:6c:a9:ae:e5:cf:0d:6e:28:0d:b0: + 0e:b5:ca:51:7b:78:14:c3:20:2f:7f:fb:14:55:e1: + 11:99:fd:d5:0a:a1:9e:02:e3:62:5f:eb:35:4b:2c: + b8:72:e8:3e:3d:4f:ac:2c:bb:2e:86:e2:a3:76:8f: + e5:93:2a:cf:a5:ab:c8:5c:8d:4b:06:ff:12:46:ac: + 78:cb:14:07:35:e0:a9:df:8b:e9:af:15:4f:16:89: + 5b:bd:f6:8d:c6:59:ae:88:85:0e:c1:89:eb:1f:67: + c5:45:8e:ff:6d:37:36:2b:78:66:83:91:51:2b:3d: + ff:51:77:76:62:a1:ec:67:3e:3e:81:83:e0:56:a9: + 50:1f:1f:7a:99:ab:63:bf:84:17:77:f1:0d:3b:df: + f7:9c:61:b3:35:98:8a:3a:b2:ec:3c:1a:37:3f:7e: + 8f:92:cf:d9:12:14:64:da:10:02:15:41:ff:4f:c4: + eb:1c:a3:c9:fa:99:f7:46:e9:e1:18:d9:b1:b8:32: + 2d:cb:14:0c:50:d8:83:65:83:ee:b9:5c:cf:cb:05: + 5a:4c:fa:19:97:6b:d6:5d:13:d3:c2:5c:54:bc:32: + 73:a0:78:f5:f1:6d:1e:cb:9f:a5:a6:9f:22:dc:d1: + 51:9e:82:79:64:60:29:13:3e:a3:fd:4f:72:6a:ab: + e2:d4:e5:b8:24:55:2c:44:4b:8a:88:44:9c:ca:84: + d3:2a:3b + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 82:21:2D:66:C6:D7:A0:E0:15:EB:CE:4C:09:77:C4:60:9E:54:6E:03 + Signature Algorithm: sha256WithRSAEncryption + 60:de:1a:b8:e7:f2:60:82:d5:03:33:81:cb:06:8a:f1:22:49: + e9:e8:ea:91:7f:c6:33:5e:68:19:03:86:3b:43:01:cf:07:70: + e4:08:1e:65:85:91:e6:11:22:b7:f5:02:23:8e:ae:b9:1e:7d: + 1f:7e:6c:e6:bd:25:d5:95:1a:f2:05:a6:af:85:02:6f:ae:f8: + d6:31:ff:25:c9:4a:c8:c7:8a:a9:d9:9f:4b:49:9b:11:57:99: + 92:43:11:de:b6:33:a4:cc:d7:8d:64:7d:d4:cd:3c:28:2c:b4: + 9a:96:ea:4d:f5:c4:44:c4:25:aa:20:80:d8:29:55:f7:e0:41: + fc:06:26:ff:b9:36:f5:43:14:03:66:78:e1:11:b1:da:20:5f: + 46:00:78:00:21:a5:1e:00:28:61:78:6f:a8:01:01:8f:9d:34: + 9a:ff:f4:38:90:fb:b8:d1:b3:72:06:c9:71:e6:81:c5:79:ed: + 0b:a6:79:f2:13:0b:9c:f7:5d:0e:7b:24:93:b4:48:db:86:5f: + de:50:86:78:e7:40:e6:31:a8:90:76:70:61:af:9c:37:2c:11: + b5:82:b7:aa:ae:24:34:5b:72:0c:69:0d:cd:59:9f:f6:71:af: + 9c:0b:d1:0a:38:f9:06:22:83:53:25:0c:fc:51:c4:e6:be:e2: + 39:95:0b:24:ad:af:d1:95:e4:96:d7:74:64:6b:71:4e:02:3c: + aa:85:f3:20:a3:43:39:76:5b:6c:50:fe:9a:9c:14:1e:65:14: + 8a:15:bd:a3:82:45:5a:49:56:6a:d2:9c:b1:63:32:e5:61:e0: + 53:22:0e:a7:0a:49:ea:cb:7e:1f:a8:e2:62:80:f6:10:45:52: + 98:06:18:de:a5:cd:2f:7f:aa:d4:e9:3e:08:72:ec:23:03:02: + 3c:a6:aa:d8:bc:67:74:3d:14:17:fb:54:4b:17:e3:d3:79:3d: + 6d:6b:49:c9:28:0e:2e:74:50:bf:0c:d9:46:3a:10:86:c9:a7: + 3f:e9:a0:ec:7f:eb:a5:77:58:69:71:e6:83:0a:37:f2:86:49: + 6a:be:79:08:90:f6:02:16:64:3e:e5:da:4c:7e:0c:34:c9:f9: + 5f:b6:b3:28:51:a7:a7:2b:aa:49:fa:8d:65:29:4e:e3:6b:13: + a7:94:a3:2d:51:6d:78:0c:44:cb:df:de:08:6f:ce:a3:64:ab: + d3:95:84:d4:b9:52:54:72:7b:96:25:cc:bc:69:e3:48:6e:0d: + d0:c7:9d:27:9a:aa:f8:13:92:dd:1e:df:63:9f:35:a9:16:36: + ec:8c:b8:83:f4:3d:89:8f:cd:b4:17:5e:d7:b3:17:41:10:5d: + 27:73:60:85:57:49:22:07 +SHA1 Fingerprint=26:F9:93:B4:ED:3D:28:27:B0:B9:4B:A7:E9:15:1D:A3:8D:92:E5:32 +-----BEGIN CERTIFICATE----- +MIIFRzCCAy+gAwIBAgIJEQA0tk7GNi02MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV +BAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJR04g +Uk9PVCBDQSBHMjAeFw0xNzAyMDYwOTI3MzVaFw00MjAyMDYwOTI3MzVaMEExCzAJ +BgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJ +R04gUk9PVCBDQSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDF +dRmRfUR0dIf+DjuW3NgBFszuY5HnC2/OOwppGnzC46+CjobXXo9X69MhWf05N0Iw +vlDqtg+piNguLWkh59E3GE59kdUWX2tbAMI5Qw02hVK5U2UPHULlj88F0+7cDBrZ +uIt4ImfkabBoxTzkbFpG583H+u/E7Eu9aqSs/cwoUe+StCmrqzWaTOTECMYmzPhp +n+Sc8CnTXPnGFiWeI8MgwT0PPzhAsP6CRDiqWhqKa2NYOLQV07YRaXseVO6MGiKs +cpc/I1mbySKEwQdPzH/iV8oScLumZfNpdWO9lfsbl83kqK/20U6o2YpxJM02PbyW +xPFsqa7lzw1uKA2wDrXKUXt4FMMgL3/7FFXhEZn91QqhngLjYl/rNUssuHLoPj1P +rCy7Lobio3aP5ZMqz6WryFyNSwb/EkaseMsUBzXgqd+L6a8VTxaJW732jcZZroiF +DsGJ6x9nxUWO/203Nit4ZoORUSs9/1F3dmKh7Gc+PoGD4FapUB8fepmrY7+EF3fx +DTvf95xhszWYijqy7DwaNz9+j5LP2RIUZNoQAhVB/0/E6xyjyfqZ90bp4RjZsbgy +LcsUDFDYg2WD7rlcz8sFWkz6GZdr1l0T08JcVLwyc6B49fFtHsufpaafItzRUZ6C +eWRgKRM+o/1Pcmqr4tTluCRVLERLiohEnMqE0yo7AgMBAAGjQjBAMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSCIS1mxteg4BXrzkwJ +d8RgnlRuAzANBgkqhkiG9w0BAQsFAAOCAgEAYN4auOfyYILVAzOBywaK8SJJ6ejq +kX/GM15oGQOGO0MBzwdw5AgeZYWR5hEit/UCI46uuR59H35s5r0l1ZUa8gWmr4UC +b6741jH/JclKyMeKqdmfS0mbEVeZkkMR3rYzpMzXjWR91M08KCy0mpbqTfXERMQl +qiCA2ClV9+BB/AYm/7k29UMUA2Z44RGx2iBfRgB4ACGlHgAoYXhvqAEBj500mv/0 +OJD7uNGzcgbJceaBxXntC6Z58hMLnPddDnskk7RI24Zf3lCGeOdA5jGokHZwYa+c +NywRtYK3qq4kNFtyDGkNzVmf9nGvnAvRCjj5BiKDUyUM/FHE5r7iOZULJK2v0ZXk +ltd0ZGtxTgI8qoXzIKNDOXZbbFD+mpwUHmUUihW9o4JFWklWatKcsWMy5WHgUyIO +pwpJ6st+H6jiYoD2EEVSmAYY3qXNL3+q1Ok+CHLsIwMCPKaq2LxndD0UF/tUSxfj +03k9bWtJySgOLnRQvwzZRjoQhsmnP+mg7H/rpXdYaXHmgwo38oZJar55CJD2AhZk +PuXaTH4MNMn5X7azKFGnpyuqSfqNZSlO42sTp5SjLVFteAxEy9/eCG/Oo2Sr05WE +1LlSVHJ7liXMvGnjSG4N0MedJ5qq+BOS3R7fY581qRY27Iy4g/Q9iY/NtBde17MX +QRBdJ3NghVdJIgc= +-----END CERTIFICATE----- Copied: stable/12/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem (from r364943, head/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem Wed Sep 2 01:35:45 2020 (r365233, copy of r364943, head/secure/caroot/trusted/e-Szigno_Root_CA_2017.pem) @@ -0,0 +1,65 @@ +## +## e-Szigno Root CA 2017 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 01:54:48:ef:21:fd:97:59:0d:f5:04:0a + Signature Algorithm: ecdsa-with-SHA256 + Issuer: C = HU, L = Budapest, O = Microsec Ltd., organizationIdentifier = VATHU-23584497, CN = e-Szigno Root CA 2017 + Validity + Not Before: Aug 22 12:07:06 2017 GMT + Not After : Aug 22 12:07:06 2042 GMT + Subject: C = HU, L = Budapest, O = Microsec Ltd., organizationIdentifier = VATHU-23584497, CN = e-Szigno Root CA 2017 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (256 bit) + pub: + 04:96:dc:3d:8a:d8:b0:7b:6f:c6:27:be:44:90:b1: + b3:56:15:7b:8e:43:24:7d:1a:84:59:ee:63:68:b2: + c6:5e:87:d0:15:48:1e:a8:90:ad:bd:53:a2:da:de: + 3a:90:a6:60:5f:68:32:b5:86:41:df:87:5b:2c:7b: + c5:fe:7c:7a:da + ASN1 OID: prime256v1 + NIST CURVE: P-256 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 87:11:15:08:D1:AA:C1:78:0C:B1:AF:CE:C6:C9:90:EF:BF:30:04:C0 + X509v3 Authority Key Identifier: + keyid:87:11:15:08:D1:AA:C1:78:0C:B1:AF:CE:C6:C9:90:EF:BF:30:04:C0 + + Signature Algorithm: ecdsa-with-SHA256 + 30:46:02:21:00:b5:57:dd:d7:8a:55:0b:36:e1:86:44:fa:d4: + d9:68:8d:b8:dc:23:8a:8a:0d:d4:2f:7d:ea:73:ec:bf:4d:6c: + a8:02:21:00:cb:a5:b4:12:fa:e7:b5:e8:cf:7e:93:fc:f3:35: + 8f:6f:4e:5a:7c:b4:bc:4e:b2:fc:72:aa:5b:59:f9:e7:dc:31 +SHA1 Fingerprint=89:D4:83:03:4F:9E:9A:48:80:5F:72:37:D4:A9:A6:EF:CB:7C:1F:D1 +-----BEGIN CERTIFICATE----- +MIICQDCCAeWgAwIBAgIMAVRI7yH9l1kN9QQKMAoGCCqGSM49BAMCMHExCzAJBgNV +BAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRk +LjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25vIFJv +b3QgQ0EgMjAxNzAeFw0xNzA4MjIxMjA3MDZaFw00MjA4MjIxMjA3MDZaMHExCzAJ +BgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMg +THRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25v +IFJvb3QgQ0EgMjAxNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJbcPYrYsHtv +xie+RJCxs1YVe45DJH0ahFnuY2iyxl6H0BVIHqiQrb1TotreOpCmYF9oMrWGQd+H +Wyx7xf58etqjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G +A1UdDgQWBBSHERUI0arBeAyxr87GyZDvvzAEwDAfBgNVHSMEGDAWgBSHERUI0arB +eAyxr87GyZDvvzAEwDAKBggqhkjOPQQDAgNJADBGAiEAtVfd14pVCzbhhkT61Nlo +jbjcI4qKDdQvfepz7L9NbKgCIQDLpbQS+ue16M9+k/zzNY9vTlp8tLxOsvxyqltZ ++efcMQ== +-----END CERTIFICATE----- From owner-svn-src-all@freebsd.org Wed Sep 2 02:05:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EBB743C6E63; Wed, 2 Sep 2020 02:05:07 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh6hg5zklz4232; Wed, 2 Sep 2020 02:05:07 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1599012307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7WXzQCX45o0M5oXdmw+cQT9lBvVCr+ymfIkWYqJoRog=; b=WfQce5vE4g0JMIGG3ZuKq+H6L4i8pxChyxR8W46q+EYS4eGufZlTb/KWDcdN4RU9aalBvu +fuHyP0rrryd3dCjgzX3b/IFa1hFldUUyecCLky2eebpWws+MY9K+L/h/K8vu3A/qEGd8k qqMlHng/vVaQyQcKF5NgIx1uIihEPEs38iQceWfGVM3dT7yNU6ENxa+UMLnzHu826Y8O6Y ToYSTse2Nrod87kgfoeY+Px15l9lJah25/Up2Ri6a+7WtA0hKRsnTrx9GbrMnnxWv5r6Ns n8+K9kmb2Wdfo3pUPPf/8YLcKw72L1m5K0WF2Md0SrBot8U/ndpxmrr+ZmaZrA== Received: by freefall.freebsd.org (Postfix, from userid 1033) id BC78D1ED7E; Wed, 2 Sep 2020 02:05:07 +0000 (UTC) Date: Wed, 2 Sep 2020 02:05:07 +0000 From: Alexey Dokuchaev To: Michael Tuexen Cc: Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... Message-ID: <20200902020507.GA38274@FreeBSD.org> References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1599012307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7WXzQCX45o0M5oXdmw+cQT9lBvVCr+ymfIkWYqJoRog=; b=Oe2X/p0YEfAnntbj3S/WKszzmpXU8US7ZowHrQPsRpC3xlqNUMquYhOSz2vlk1DqdTfxnd +ZyXjwpoYYAZ9uts2TR/TIdzm3F/PSflwaeYwnSmG6AcVk8L9xUFOpFz+UumQlX668XyC/ ahhgtSMjPs3KRItyHEOQoFrl4Mo2sf3tSoGfpW7bwJC0FXQUKe/SckxOUye49cOfFG6NTA mwCHGcEYq3qecKVbTg1iUlxS4J5vWlpblxsKNbP8/qFgyhEWodTd768Feb4ysDt7Ycqs5u +LoPrHdx3rpm7tkPWZdhjFG8Eq2yht322Mn8I3pyuTtHOna4m4DCQ7+A1Sv/ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1599012307; a=rsa-sha256; cv=none; b=TZXYFN5jptRxGIsZInu6m/DqMp4WL/NkR85cQE7YEAmBwvjDbx+zz0/XS8HJ7T9giBQ+WU EQW5ZDuj33RftrJlvdX58v0Hm/zaQNyTxHG5+RhhaZVlU7rqiG9GdUBNcOQlAOrc44xdjZ ns3bdt1iO9jNzkn9JBdXH5rmiv3mvA869QKRGEMOXRLlJZ/ZbvBt/m1QRgrf0rJVMv8MEI 5VT8LkC+obJ47v/DDT6YB8i3SeQ4VqryXraXNiibSuTb6KXXQOeJZBbJ7DC7lA7gffuw+j 5KWimPB8G6W4aH612dOowMhV6r9n7TRbxpdr7yAHE5KuLTHZY7+DoyGDJ3nHsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 02:05:08 -0000 On Wed, Sep 02, 2020 at 12:41:43AM +0200, Michael Tuexen wrote: > > On 1. Sep 2020, at 23:19, Mateusz Guzik wrote: > > Author: mjg > > Date: Tue Sep 1 21:19:14 2020 > > New Revision: 365071 > > URL: https://svnweb.freebsd.org/changeset/base/365071 > > > > Log: > > net: clean up empty lines in .c and .h files > > Hi Mateusz, > > which rules are enforced? Why? This is common sense. I can't count how often I wanted to hack on something in the base/kernel and was turned away by this atrocious excessive whitespace mess. Thank you Mateusz for cleaning this up. ./danfe From owner-svn-src-all@freebsd.org Wed Sep 2 07:24:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05B0C3CF4A3; Wed, 2 Sep 2020 07:24:40 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from drew.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhFnM05c6z4Mvx; Wed, 2 Sep 2020 07:24:38 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from [IPv6:2a02:8109:1140:c3d:71d8:89a0:7886:2b93] (unknown [IPv6:2a02:8109:1140:c3d:71d8:89a0:7886:2b93]) (Authenticated sender: macmic) by drew.franken.de (Postfix) with ESMTPSA id DEFFA72DC135F; Wed, 2 Sep 2020 09:24:28 +0200 (CEST) From: Michael Tuexen Message-Id: <72651F4F-C362-4199-BB8E-8D738349DDC6@fh-muenster.de> Content-Type: multipart/signed; boundary="Apple-Mail=_E2A75BE8-9A00-42AA-9F69-00693570DD84"; protocol="application/pkcs7-signature"; micalg=sha-256 Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... Date: Wed, 2 Sep 2020 09:24:26 +0200 In-Reply-To: <20200902020507.GA38274@FreeBSD.org> Cc: Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org To: Alexey Dokuchaev References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4BhFnM05c6z4Mvx X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of tuexen@fh-muenster.de has no SPF policy when checking 2001:638:a02:a001:20e:cff:fe4a:feaa) smtp.mailfrom=tuexen@fh-muenster.de X-Spamd-Result: default: False [0.45 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[tuexen]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; HAS_ATTACHMENT(0.00)[]; SIGNED_SMIME(-2.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-0.10)[-0.102]; NEURAL_SPAM_MEDIUM(0.64)[0.644]; ARC_NA(0.00)[]; NEURAL_SPAM_SHORT(0.61)[0.609]; MID_RHS_MATCH_FROM(0.00)[]; DMARC_NA(0.00)[fh-muenster.de]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:680, ipnet:2001:638::/32, country:DE]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 07:24:40 -0000 --Apple-Mail=_E2A75BE8-9A00-42AA-9F69-00693570DD84 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii > On 2. Sep 2020, at 04:05, Alexey Dokuchaev wrote: > > On Wed, Sep 02, 2020 at 12:41:43AM +0200, Michael Tuexen wrote: >>> On 1. Sep 2020, at 23:19, Mateusz Guzik wrote: >>> Author: mjg >>> Date: Tue Sep 1 21:19:14 2020 >>> New Revision: 365071 >>> URL: https://svnweb.freebsd.org/changeset/base/365071 >>> >>> Log: >>> net: clean up empty lines in .c and .h files >> >> Hi Mateusz, >> >> which rules are enforced? Why? > > This is common sense. I can't count how often I wanted to hack on > something in the base/kernel and was turned away by this atrocious > excessive whitespace mess. This answers why. What rules were violated? Best regards Michael > > Thank you Mateusz for cleaning this up. > > ./danfe --Apple-Mail=_E2A75BE8-9A00-42AA-9F69-00693570DD84 Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCCEKow ggUSMIID+qADAgECAgkA4wvV+K8l2YEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkRFMSsw KQYDVQQKDCJULVN5c3RlbXMgRW50ZXJwcmlzZSBTZXJ2aWNlcyBHbWJIMR8wHQYDVQQLDBZULVN5 c3RlbXMgVHJ1c3QgQ2VudGVyMSUwIwYDVQQDDBxULVRlbGVTZWMgR2xvYmFsUm9vdCBDbGFzcyAy MB4XDTE2MDIyMjEzMzgyMloXDTMxMDIyMjIzNTk1OVowgZUxCzAJBgNVBAYTAkRFMUUwQwYDVQQK EzxWZXJlaW4genVyIEZvZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMg ZS4gVi4xEDAOBgNVBAsTB0RGTi1QS0kxLTArBgNVBAMTJERGTi1WZXJlaW4gQ2VydGlmaWNhdGlv biBBdXRob3JpdHkgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtg1/9moUHN0vqH l4pzq5lN6mc5WqFggEcVToyVsuXPztNXS43O+FZsFVV2B+pG/cgDRWM+cNSrVICxI5y+NyipCf8F XRgPxJiZN7Mg9mZ4F4fCnQ7MSjLnFp2uDo0peQcAIFTcFV9Kltd4tjTTwXS1nem/wHdN6r1ZB+Ba L2w8pQDcNb1lDY9/Mm3yWmpLYgHurDg0WUU2SQXaeMpqbVvAgWsRzNI8qIv4cRrKO+KA3Ra0Z3qL NupOkSk9s1FcragMvp0049ENF4N1xDkesJQLEvHVaY4l9Lg9K7/AjsMeO6W/VRCrKq4Xl14zzsjz 9AkH4wKGMUZrAcUQDBHHWekCAwEAAaOCAXQwggFwMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU k+PYMiba1fFKpZFK4OpL4qIMz+EwHwYDVR0jBBgwFoAUv1kgNgB5oKAia4zV8mHSuCzLgkowEgYD VR0TAQH/BAgwBgEB/wIBAjAzBgNVHSAELDAqMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC LB4wCAYGZ4EMAQICMEwGA1UdHwRFMEMwQaA/oD2GO2h0dHA6Ly9wa2kwMzM2LnRlbGVzZWMuZGUv cmwvVGVsZVNlY19HbG9iYWxSb290X0NsYXNzXzIuY3JsMIGGBggrBgEFBQcBAQR6MHgwLAYIKwYB BQUHMAGGIGh0dHA6Ly9vY3NwMDMzNi50ZWxlc2VjLmRlL29jc3ByMEgGCCsGAQUFBzAChjxodHRw Oi8vcGtpMDMzNi50ZWxlc2VjLmRlL2NydC9UZWxlU2VjX0dsb2JhbFJvb3RfQ2xhc3NfMi5jZXIw DQYJKoZIhvcNAQELBQADggEBAIcL/z4Cm2XIVi3WO5qYi3FP2ropqiH5Ri71sqQPrhE4eTizDnS6 dl2e6BiClmLbTDPo3flq3zK9LExHYFV/53RrtCyD2HlrtrdNUAtmB7Xts5et6u5/MOaZ/SLick0+ hFvu+c+Z6n/XUjkurJgARH5pO7917tALOxrN5fcPImxHhPalR6D90Bo0fa3SPXez7vTXTf/D6OWS T1k+kEcQSrCFWMBvf/iu7QhCnh7U3xQuTY+8npTD5+32GPg8SecmqKc22CzeIs2LgtjZeOJVEqM7 h0S2EQvVDFKvaYwPBt/QolOLV5h7z/0HJPT8vcP9SpIClxvyt7bPZYoaorVyGTkwggWsMIIElKAD AgECAgcbY7rQHiw9MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVy ZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYu MRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IDIwHhcNMTYwNTI0MTEzODQwWhcNMzEwMjIyMjM1OTU5WjCBjTELMAkGA1UEBhMCREUx RTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5lcyBEZXV0c2NoZW4gRm9yc2NodW5n c25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMGA1UEAwwcREZOLVZlcmVpbiBHbG9i YWwgSXNzdWluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ07eRxH3h+Gy8Zp 1xCeOdfZojDbchwFfylfS2jxrRnWTOFrG7ELf6Gr4HuLi9gtzm6IOhDuV+UefwRRNuu6cG1joL6W LkDh0YNMZj0cZGnlm6Stcq5oOVGHecwX064vXWNxSzl660Knl5BpBb+Q/6RAcL0D57+eGIgfn5mI TQ5HjUhfZZkQ0tkqSe3BuS0dnxLLFdM/fx5ULzquk1enfnjK1UriGuXtQX1TX8izKvWKMKztFwUk P7agCwf9TRqaA1KgNpzeJIdl5Of6x5ZzJBTN0OgbaJ4YWa52fvfRCng8h0uwN89Tyjo4EPPLR22M ZD08WkVKusqAfLjz56dMTM0CAwEAAaOCAgUwggIBMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0P AQH/BAQDAgEGMCkGA1UdIAQiMCAwDQYLKwYBBAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAdBgNV HQ4EFgQUazqYi/nyU4na4K2yMh4JH+iqO3QwHwYDVR0jBBgwFoAUk+PYMiba1fFKpZFK4OpL4qIM z+EwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9v dC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9n bG9iYWwtcm9vdC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYI KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEF BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9vdC1nMi1jYS9wdWIvY2FjZXJ0 L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJv b3QtZzItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCBeEWkTqR/ DlXwCbFqPnjMaDWpHPOVnj/z+N9rOHeJLI21rT7H8pTNoAauusyosa0zCLYkhmI2THhuUPDVbmCN T1IxQ5dGdfBi5G5mUcFCMWdQ5UnnOR7Ln8qGSN4IFP8VSytmm6A4nwDO/afr0X9XLchMX9wQEZc+ lgQCXISoKTlslPwQkgZ7nu7YRrQbtQMMONncsKk/cQYLsgMHM8KNSGMlJTx6e1du94oFOO+4oK4v 9NsH1VuEGMGpuEvObJAaguS5Pfp38dIfMwK/U+d2+dwmJUFvL6Yb+qQTkPp8ftkLYF3sv8pBoGH7 EUkp2KgtdRXYShjqFu9VNCIaE40GMIIF4DCCBMigAwIBAgIMIRX9tDE2QqO3mVLXMA0GCSqGSIb3 DQEBCwUAMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVp bmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUw IwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTE5MDYwNDE0MjkxMFoXDTIy MDYwMzE0MjkxMFowfDELMAkGA1UEBhMCREUxIDAeBgNVBAoMF0ZhY2hob2Noc2NodWxlIE11ZW5z dGVyMTIwMAYDVQQLDClGYWNoYmVyZWljaCBFbGVrdHJvdGVjaG5payB1bmQgSW5mb3JtYXRpazEX MBUGA1UEAwwOTWljaGFlbCBUdWV4ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM r8qQcPxLFCxzPtXvRyM9KeQaxyMA8gwUNc7IIiATs6mRQFe5ib/mvwT9nc0bAa+94go6HJDiD3FJ NkTo4u8aBsIcTt5pJtdBQLm88PLakbe3+fp/00//n7xxbTh7mAtFVCf25LxDCKkrdGk/+jglRq/R VdwhZZ3VpYCrx8YfI/hIzdRL3+4I4z/mnQ8K0X8d2MVVPG+9nBEngdnYGez5f/8wIVOgEYYBc21k yvMnVXLu2Ing+LwBd0gDG9Vasv87MNHCOZfJTNBlLhI2UDei/uNg9Zd4ynlMpPWZ7v0oiDWvmv8E OuD4oric8heyD0OYK2FL4qcVC4dn4pnyulfHAgMBAAGjggJOMIICSjA+BgNVHSAENzA1MA8GDSsG AQQBga0hgiwBAQQwEAYOKwYBBAGBrSGCLAEBBAQwEAYOKwYBBAGBrSGCLAIBBAQwCQYDVR0TBAIw ADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQW BBTxiodBVL/lA4p5iNesIsJRhhgd6zAfBgNVHSMEGDAWgBRrOpiL+fJTidrgrbIyHgkf6Ko7dDAg BgNVHREEGTAXgRV0dWV4ZW5AZmgtbXVlbnN0ZXIuZGUwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0 cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jcmwvY2FjcmwuY3JsMD+g PaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNy bC5jcmwwgdsGCCsGAQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu LmRlL09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv ZGZuLWNhLWdsb2JhbC1nMi9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6 Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2JhbC1nMi9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw DQYJKoZIhvcNAQELBQADggEBABs3VlmIZ1VF3HkaQdjInZYmamRabbdgJ7cz6m6o/agKL7+Vhwx7 1BaaYs2gMa5Nu/GJ3YfdqIsUlYtKdl58Yhp/89E6xBfJkItS+rE8RFdf2XgklGlx7GmsvdA3tId5 b6K6r9a5wpVN0epxY6K8wwpzEib6fJLcHylybQXZ7JSOaLRLp6WU3QPoyTT7FpvAe/0b2MSCbPX4 fc53PCn2aGgXuRFVQeCn1SP1BF3QW1ppkFhcF6G+0JcUxYFAXE6r/71WZBvUHqoG/th2hAwQnS+Y KhUYh4SZQH3/ursXXJYXQ5vyIhkN1FZlmtWA8+ofdCnoqSTbiSX2Aa/kKbTapwgxggOdMIIDmQIB ATCBnjCBjTELMAkGA1UEBhMCREUxRTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5l cyBEZXV0c2NoZW4gRm9yc2NodW5nc25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMG A1UEAwwcREZOLVZlcmVpbiBHbG9iYWwgSXNzdWluZyBDQQIMIRX9tDE2QqO3mVLXMA0GCWCGSAFl AwQCAQUAoIIBzzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yMDA5 MDIwNzI0MjZaMC8GCSqGSIb3DQEJBDEiBCCsYkaQG6yRdER4+Q0XcsCZKhuRxtYEH06KxtZym+zl FDCBrwYJKwYBBAGCNxAEMYGhMIGeMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1 ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYD VQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBAgwhFf20 MTZCo7eZUtcwgbEGCyqGSIb3DQEJEAILMYGhoIGeMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8 VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUu IFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5n IENBAgwhFf20MTZCo7eZUtcwDQYJKoZIhvcNAQEBBQAEggEAUCQvwOUW0A7K+FBSHYyxzkpCFiLb aWiU7dISCq8tmaFvb9twq+rptzy/pUnaClDqJKI28Y4hNZX8DkjI7M42WckIBZMVEflF7v9JtUPE QAkASXnxC86gp6FqFG5CL7F3sNMtm3pO49pW14WRm9XnvINAh7wftO3NWqDwo7V9V+aKN4qE3qyu eQ0TQiJNVHIJ6nJeMzVgm0n+0dkJVYZLXlqOdeL99EbsN+QGQkLPSWw2xTUfAYwnd1A1f2CsYbRL 4FAftQhslYGxeSHUGjCfKtWZFEHOCItmTHsI2vjGQza/+Kpb3B5aU1DMG36Fg76NeoHqsSmv0FkW YXhMPuc10QAAAAAAAA== --Apple-Mail=_E2A75BE8-9A00-42AA-9F69-00693570DD84-- From owner-svn-src-all@freebsd.org Wed Sep 2 09:04:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 472AF3D1A40; Wed, 2 Sep 2020 09:04:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhJ0918J7z4TH5; Wed, 2 Sep 2020 09:04:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B77881DE; Wed, 2 Sep 2020 09:04:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082948cn065843; Wed, 2 Sep 2020 09:04:08 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082948BO065842; Wed, 2 Sep 2020 09:04:08 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <202009020904.082948BO065842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 2 Sep 2020 09:04:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365234 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 365234 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 09:04:09 -0000 Author: andrew Date: Wed Sep 2 09:04:08 2020 New Revision: 365234 URL: https://svnweb.freebsd.org/changeset/base/365234 Log: Partially revert r365069. This whitespace was intentionally added to help differentiate the different register groups within this file. While here add missing whitespace from earlier in the file, Sponsored by: Innovate UK Modified: head/sys/arm64/arm64/identcpu.c Modified: head/sys/arm64/arm64/identcpu.c ============================================================================== --- head/sys/arm64/arm64/identcpu.c Wed Sep 2 01:35:45 2020 (r365233) +++ head/sys/arm64/arm64/identcpu.c Wed Sep 2 09:04:08 2020 (r365234) @@ -82,6 +82,7 @@ sysctl_hw_machine(SYSCTL_HANDLER_ARGS) static const char machine32[] = "arm"; #endif int error; + #ifdef SCTL_MASK32 if ((req->flags & SCTL_MASK32) != 0 && adaptive_machine_arch) error = SYSCTL_OUT(req, machine32, sizeof(machine32)); @@ -188,6 +189,7 @@ static const struct cpu_parts cpu_parts_arm[] = { { CPU_PART_NEOVERSE_N1, "Neoverse-N1" }, CPU_PART_NONE, }; + /* Cavium */ static const struct cpu_parts cpu_parts_cavium[] = { { CPU_PART_THUNDERX, "ThunderX" }, @@ -263,6 +265,7 @@ struct mrs_field_value { MRS_FIELD_VALUE(13ul<< _reg ## _ ## _field ## _SHIFT, "14 "_desc "s"), \ MRS_FIELD_VALUE(14ul<< _reg ## _ ## _field ## _SHIFT, "15 "_desc "s"), \ MRS_FIELD_VALUE(15ul<< _reg ## _ ## _field ## _SHIFT, "16 "_desc "s") + #define MRS_FIELD_VALUE_END { .desc = NULL } struct mrs_field { @@ -283,6 +286,7 @@ struct mrs_field { .mask = _register ## _ ## _name ## _MASK, \ .values = (_values), \ } + #define MRS_FIELD_END { .type = MRS_INVALID, } /* ID_AA64AFR0_EL1 */ @@ -290,11 +294,13 @@ static struct mrs_field id_aa64afr0_fields[] = { MRS_FIELD_END, }; + /* ID_AA64AFR1_EL1 */ static struct mrs_field id_aa64afr1_fields[] = { MRS_FIELD_END, }; + /* ID_AA64DFR0_EL1 */ static struct mrs_field_value id_aa64dfr0_pmsver[] = { MRS_FIELD_VALUE(ID_AA64DFR0_PMSVer_NONE, ""), @@ -352,11 +358,13 @@ static struct mrs_field id_aa64dfr0_fields[] = { MRS_FIELD_END, }; + /* ID_AA64DFR1 */ static struct mrs_field id_aa64dfr1_fields[] = { MRS_FIELD_END, }; + /* ID_AA64ISAR0_EL1 */ static struct mrs_field_value id_aa64isar0_rndr[] = { MRS_FIELD_VALUE(ID_AA64ISAR0_RNDR_NONE, ""), @@ -453,6 +461,7 @@ static struct mrs_field id_aa64isar0_fields[] = { MRS_FIELD_END, }; + /* ID_AA64ISAR1_EL1 */ static struct mrs_field_value id_aa64isar1_i8mm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ISAR1, I8MM, NONE, IMPL), @@ -549,6 +558,7 @@ static struct mrs_field id_aa64isar1_fields[] = { MRS_FIELD_END, }; + /* ID_AA64MMFR0_EL1 */ static struct mrs_field_value id_aa64mmfr0_tgran4[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR0, TGran4, NONE, IMPL), @@ -614,6 +624,7 @@ static struct mrs_field id_aa64mmfr0_fields[] = { MRS_FIELD_END, }; + /* ID_AA64MMFR1_EL1 */ static struct mrs_field_value id_aa64mmfr1_xnx[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR1, XNX, NONE, IMPL), @@ -675,6 +686,7 @@ static struct mrs_field id_aa64mmfr1_fields[] = { MRS_FIELD_END, }; + /* ID_AA64MMFR2_EL1 */ static struct mrs_field_value id_aa64mmfr2_nv[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR2, NV, NONE, IMPL), @@ -725,6 +737,7 @@ static struct mrs_field id_aa64mmfr2_fields[] = { MRS_FIELD_END, }; + /* ID_AA64PFR0_EL1 */ static struct mrs_field_value id_aa64pfr0_csv3[] = { MRS_FIELD_VALUE(ID_AA64PFR0_CSV3_NONE, ""), @@ -831,6 +844,7 @@ static struct mrs_field id_aa64pfr0_fields[] = { MRS_FIELD(ID_AA64PFR0, EL0, false, MRS_LOWER, id_aa64pfr0_el0), MRS_FIELD_END, }; + /* ID_AA64PFR1_EL1 */ static struct mrs_field_value id_aa64pfr1_bt[] = { From owner-svn-src-all@freebsd.org Wed Sep 2 09:17:30 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF7003D1E36; Wed, 2 Sep 2020 09:17:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhJHZ3cSrz4V3h; Wed, 2 Sep 2020 09:17:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5C5C227E7E; Wed, 2 Sep 2020 09:17:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0829HU53072146; Wed, 2 Sep 2020 09:17:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0829HUpZ072145; Wed, 2 Sep 2020 09:17:30 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009020917.0829HUpZ072145@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 09:17:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365235 - in head/sys: modules/epoch_test tests/epoch X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head/sys: modules/epoch_test tests/epoch X-SVN-Commit-Revision: 365235 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 09:17:30 -0000 Author: hselasky Date: Wed Sep 2 09:17:29 2020 New Revision: 365235 URL: https://svnweb.freebsd.org/changeset/base/365235 Log: Fix build of epoch_test module. While at it add missing epoch_free() call. MFC after: 1 week Sponsored by: Mellanox Technologies // NVIDIA Networking Modified: head/sys/modules/epoch_test/Makefile head/sys/tests/epoch/epoch_test.c Modified: head/sys/modules/epoch_test/Makefile ============================================================================== --- head/sys/modules/epoch_test/Makefile Wed Sep 2 09:04:08 2020 (r365234) +++ head/sys/modules/epoch_test/Makefile Wed Sep 2 09:17:29 2020 (r365235) @@ -2,6 +2,8 @@ .PATH: ${SRCTOP}/sys/tests/epoch KMOD= epoch_test -SRCS= epoch_test.c +SRCS= epoch_test.c \ + bus_if.h \ + device_if.h .include Modified: head/sys/tests/epoch/epoch_test.c ============================================================================== --- head/sys/tests/epoch/epoch_test.c Wed Sep 2 09:04:08 2020 (r365234) +++ head/sys/tests/epoch/epoch_test.c Wed Sep 2 09:17:29 2020 (r365235) @@ -141,7 +141,7 @@ test_modinit(void) int i, error, pri_range, pri_off; pri_range = PRI_MIN_TIMESHARE - PRI_MIN_REALTIME; - test_epoch = epoch_alloc(EPOCH_PREEMPT); + test_epoch = epoch_alloc("test_epoch", EPOCH_PREEMPT); for (i = 0; i < mp_ncpus*2; i++) { etilist[i].threadid = i; error = kthread_add(testloop, &etilist[i], NULL, &testthreads[i], @@ -209,6 +209,7 @@ epoch_test_module_event_handler(module_t mod, int what mtx_unlock(&state_mtx); /* yes --- gross */ pause("epoch unload", 3*hz); + epoch_free(test_epoch); break; default: return (EOPNOTSUPP); From owner-svn-src-all@freebsd.org Wed Sep 2 09:20:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C51343D1F9A; Wed, 2 Sep 2020 09:20:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhJMF4vvCz4VCf; Wed, 2 Sep 2020 09:20:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8BE9C85A0; Wed, 2 Sep 2020 09:20:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0829KfhL072900; Wed, 2 Sep 2020 09:20:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0829Kfvs072537; Wed, 2 Sep 2020 09:20:41 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009020920.0829Kfvs072537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 09:20:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365236 - head/sys/tests/runtest X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/tests/runtest X-SVN-Commit-Revision: 365236 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 09:20:41 -0000 Author: hselasky Date: Wed Sep 2 09:20:40 2020 New Revision: 365236 URL: https://svnweb.freebsd.org/changeset/base/365236 Log: Add small tool to invoke kernel test framework tests. MFC after: 1 week Sponsored by: Mellanox Technologies // NVIDIA Networking Added: head/sys/tests/runtest/ head/sys/tests/runtest/Makefile (contents, props changed) head/sys/tests/runtest/runtest.c (contents, props changed) Added: head/sys/tests/runtest/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/tests/runtest/Makefile Wed Sep 2 09:20:40 2020 (r365236) @@ -0,0 +1,8 @@ +# +# $FreeBSD$ +# +PROG= runtest +MAN= +SRCS= runtest.c + +.include Added: head/sys/tests/runtest/runtest.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/tests/runtest/runtest.c Wed Sep 2 09:20:40 2020 (r365236) @@ -0,0 +1,93 @@ +/* $FreeBSD$ */ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2020 Mellanox Technologies. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include + +#include + +#include "../kern_testfrwk.h" +#include "../callout_test.h" + +static struct kern_test kern_test = { + .num_threads = 1, + .tot_threads_running = 1, +}; + +static struct callout_test callout_test = { + .number_of_callouts = 1, + .test_number = 0, +}; + +static void +usage() +{ + fprintf(stderr, "Usage: runtest -n -j [ -c -t ]\n"); + exit(0); +} + +int +main(int argc, char **argv) +{ + static const char options[] = "n:j:c:t:h"; + int ch; + + while ((ch = getopt(argc, argv, options)) != -1) { + switch (ch) { + case 'n': + strlcpy(kern_test.name, optarg, sizeof(kern_test.name)); + break; + case 'j': + kern_test.num_threads = + kern_test.tot_threads_running = atoi(optarg); + break; + case 'c': + callout_test.number_of_callouts = atoi(optarg); + break; + case 't': + callout_test.test_number = atoi(optarg); + break; + default: + usage(); + break; + } + } + + if (kern_test.name[0] == 0) + usage(); + if (strcmp(kern_test.name, "callout_test") == 0) + memcpy(kern_test.test_options, &callout_test, sizeof(callout_test)); + + if (sysctlbyname("kern.testfrwk.runtest", NULL, NULL, &kern_test, sizeof(kern_test)) != 0) + errx(1, "Test '%s' could not be started", kern_test.name); + return (0); +} From owner-svn-src-all@freebsd.org Wed Sep 2 09:44:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D7C13D2795; Wed, 2 Sep 2020 09:44:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhJt90j3dz4WGR; Wed, 2 Sep 2020 09:44:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E29C887EB; Wed, 2 Sep 2020 09:44:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0829i07o090606; Wed, 2 Sep 2020 09:44:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0829i092090605; Wed, 2 Sep 2020 09:44:00 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009020944.0829i092090605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 09:44:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365237 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 365237 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 09:44:01 -0000 Author: hselasky Date: Wed Sep 2 09:44:00 2020 New Revision: 365237 URL: https://svnweb.freebsd.org/changeset/base/365237 Log: Micro optimise _callout_stop_safe() by removing dead code. The CS_DRAIN flag cannot be set at the same time like the async-drain function pointer is set. These are orthogonal features. Assert this at the beginning of the function. Before: if (flags & CS_DRAIN) { /* FALLTHROUGH */ } else if (xxx) { return yyy; } if (drain) { zzz = drain; } After: if (flags & CS_DRAIN) { /* FALLTHROUGH */ } else if (xxx) { return yyy; } else { if (drain) { zzz = drain; } } Reviewed by: markj@ Tested by: callout_test Differential Revision: https://reviews.freebsd.org/D26285 MFC after: 1 week Sponsored by: Mellanox Technologies // NVIDIA Networking Modified: head/sys/kern/kern_timeout.c Modified: head/sys/kern/kern_timeout.c ============================================================================== --- head/sys/kern/kern_timeout.c Wed Sep 2 09:20:40 2020 (r365236) +++ head/sys/kern/kern_timeout.c Wed Sep 2 09:44:00 2020 (r365237) @@ -1075,6 +1075,9 @@ _callout_stop_safe(struct callout *c, int flags, callo WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, c->c_lock, "calling %s", __func__); + KASSERT((flags & CS_DRAIN) == 0 || drain == NULL, + ("Cannot set drain callback and CS_DRAIN flag at the same time")); + /* * Some old subsystems don't hold Giant while running a callout_stop(), * so just discard this check for the moment. @@ -1270,11 +1273,12 @@ again: } CC_UNLOCK(cc); return ((flags & CS_EXECUTING) != 0); - } - CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p", - c, c->c_func, c->c_arg); - if (drain) { - cc_exec_drain(cc, direct) = drain; + } else { + CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p", + c, c->c_func, c->c_arg); + if (drain) { + cc_exec_drain(cc, direct) = drain; + } } KASSERT(!sq_locked, ("sleepqueue chain still locked")); cancelled = ((flags & CS_EXECUTING) != 0); From owner-svn-src-all@freebsd.org Wed Sep 2 10:00:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 80C4D3D3146; Wed, 2 Sep 2020 10:00:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhKFC2qnDz4XDy; Wed, 2 Sep 2020 10:00:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4497E8E05; Wed, 2 Sep 2020 10:00:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082A0Vs0096871; Wed, 2 Sep 2020 10:00:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082A0VfB096870; Wed, 2 Sep 2020 10:00:31 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009021000.082A0VfB096870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 10:00:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365238 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 365238 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 10:00:31 -0000 Author: hselasky Date: Wed Sep 2 10:00:30 2020 New Revision: 365238 URL: https://svnweb.freebsd.org/changeset/base/365238 Log: Assert that cc_exec_drain(cc, direct) is NULL before assigning a new value. Suggested by: markj@ Tested by: callout_test MFC after: 1 week Sponsored by: Mellanox Technologies // NVIDIA Networking Modified: head/sys/kern/kern_timeout.c Modified: head/sys/kern/kern_timeout.c ============================================================================== --- head/sys/kern/kern_timeout.c Wed Sep 2 09:44:00 2020 (r365237) +++ head/sys/kern/kern_timeout.c Wed Sep 2 10:00:30 2020 (r365238) @@ -1269,6 +1269,9 @@ again: CTR3(KTR_CALLOUT, "postponing stop %p func %p arg %p", c, c->c_func, c->c_arg); if (drain) { + KASSERT(cc_exec_drain(cc, direct) == NULL, + ("callout drain function already set to %p", + cc_exec_drain(cc, direct))); cc_exec_drain(cc, direct) = drain; } CC_UNLOCK(cc); @@ -1277,6 +1280,9 @@ again: CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p", c, c->c_func, c->c_arg); if (drain) { + KASSERT(cc_exec_drain(cc, direct) == NULL, + ("callout drain function already set to %p", + cc_exec_drain(cc, direct))); cc_exec_drain(cc, direct) = drain; } } From owner-svn-src-all@freebsd.org Wed Sep 2 10:10:29 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 167153D316A; Wed, 2 Sep 2020 10:10:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhKSh6jk4z4Xm7; Wed, 2 Sep 2020 10:10:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA38D88F5; Wed, 2 Sep 2020 10:10:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082AASVT003605; Wed, 2 Sep 2020 10:10:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082AASvR003604; Wed, 2 Sep 2020 10:10:28 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009021010.082AASvR003604@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 10:10:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365239 - stable/12/sys/dev/usb/controller X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/dev/usb/controller X-SVN-Commit-Revision: 365239 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 10:10:29 -0000 Author: hselasky Date: Wed Sep 2 10:10:28 2020 New Revision: 365239 URL: https://svnweb.freebsd.org/changeset/base/365239 Log: MFC r364347: Check the XHCI endpoint state before issuing XHCI endpoint commands. Differential Revision: https://reviews.freebsd.org/D26064 Reviewed by: kp@ and bz@ Sponsored by: Mellanox Technologies Modified: stable/12/sys/dev/usb/controller/xhci.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/usb/controller/xhci.c ============================================================================== --- stable/12/sys/dev/usb/controller/xhci.c Wed Sep 2 10:00:30 2020 (r365238) +++ stable/12/sys/dev/usb/controller/xhci.c Wed Sep 2 10:10:28 2020 (r365239) @@ -3807,6 +3807,28 @@ alloc_dma_set: } } +static uint8_t +xhci_get_endpoint_state(struct usb_device *udev, uint8_t epno) +{ + struct xhci_softc *sc = XHCI_BUS2SC(udev->bus); + struct usb_page_search buf_dev; + struct xhci_hw_dev *hdev; + struct xhci_dev_ctx *pdev; + uint32_t temp; + + MPASS(epno != 0); + + hdev = &sc->sc_hw.devs[udev->controller_slot_id]; + + usbd_get_page(&hdev->device_pc, 0, &buf_dev); + pdev = buf_dev.buffer; + usb_pc_cpu_invalidate(&hdev->device_pc); + + temp = xhci_ctx_get_le32(sc, &pdev->ctx_ep[epno - 1].dwEpCtx0); + + return (XHCI_EPCTX_0_EPSTATE_GET(temp)); +} + static usb_error_t xhci_configure_reset_endpoint(struct usb_xfer *xfer) { @@ -3860,16 +3882,20 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) * Get the endpoint into the stopped state according to the * endpoint context state diagram in the XHCI specification: */ - - err = xhci_cmd_stop_ep(sc, 0, epno, index); - - if (err != 0) - DPRINTF("Could not stop endpoint %u\n", epno); - - err = xhci_cmd_reset_ep(sc, 0, epno, index); - - if (err != 0) - DPRINTF("Could not reset endpoint %u\n", epno); + switch (xhci_get_endpoint_state(udev, epno)) { + case XHCI_EPCTX_0_EPSTATE_STOPPED: + break; + case XHCI_EPCTX_0_EPSTATE_HALTED: + err = xhci_cmd_reset_ep(sc, 0, epno, index); + if (err != 0) + DPRINTF("Could not reset endpoint %u\n", epno); + break; + default: + err = xhci_cmd_stop_ep(sc, 0, epno, index); + if (err != 0) + DPRINTF("Could not stop endpoint %u\n", epno); + break; + } err = xhci_cmd_set_tr_dequeue_ptr(sc, (pepext->physaddr + (stream_id * sizeof(struct xhci_trb) * From owner-svn-src-all@freebsd.org Wed Sep 2 10:11:21 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D3A203D3363; Wed, 2 Sep 2020 10:11:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhKTj5DsFz4Xyd; Wed, 2 Sep 2020 10:11:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 984108C6A; Wed, 2 Sep 2020 10:11:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082ABLd6004437; Wed, 2 Sep 2020 10:11:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082ABLcE004436; Wed, 2 Sep 2020 10:11:21 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009021011.082ABLcE004436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 10:11:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365240 - stable/11/sys/dev/usb/controller X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/dev/usb/controller X-SVN-Commit-Revision: 365240 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 10:11:21 -0000 Author: hselasky Date: Wed Sep 2 10:11:21 2020 New Revision: 365240 URL: https://svnweb.freebsd.org/changeset/base/365240 Log: MFC r364347: Check the XHCI endpoint state before issuing XHCI endpoint commands. Differential Revision: https://reviews.freebsd.org/D26064 Reviewed by: kp@ and bz@ Sponsored by: Mellanox Technologies Modified: stable/11/sys/dev/usb/controller/xhci.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/usb/controller/xhci.c ============================================================================== --- stable/11/sys/dev/usb/controller/xhci.c Wed Sep 2 10:10:28 2020 (r365239) +++ stable/11/sys/dev/usb/controller/xhci.c Wed Sep 2 10:11:21 2020 (r365240) @@ -3807,6 +3807,28 @@ alloc_dma_set: } } +static uint8_t +xhci_get_endpoint_state(struct usb_device *udev, uint8_t epno) +{ + struct xhci_softc *sc = XHCI_BUS2SC(udev->bus); + struct usb_page_search buf_dev; + struct xhci_hw_dev *hdev; + struct xhci_dev_ctx *pdev; + uint32_t temp; + + MPASS(epno != 0); + + hdev = &sc->sc_hw.devs[udev->controller_slot_id]; + + usbd_get_page(&hdev->device_pc, 0, &buf_dev); + pdev = buf_dev.buffer; + usb_pc_cpu_invalidate(&hdev->device_pc); + + temp = xhci_ctx_get_le32(sc, &pdev->ctx_ep[epno - 1].dwEpCtx0); + + return (XHCI_EPCTX_0_EPSTATE_GET(temp)); +} + static usb_error_t xhci_configure_reset_endpoint(struct usb_xfer *xfer) { @@ -3860,16 +3882,20 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) * Get the endpoint into the stopped state according to the * endpoint context state diagram in the XHCI specification: */ - - err = xhci_cmd_stop_ep(sc, 0, epno, index); - - if (err != 0) - DPRINTF("Could not stop endpoint %u\n", epno); - - err = xhci_cmd_reset_ep(sc, 0, epno, index); - - if (err != 0) - DPRINTF("Could not reset endpoint %u\n", epno); + switch (xhci_get_endpoint_state(udev, epno)) { + case XHCI_EPCTX_0_EPSTATE_STOPPED: + break; + case XHCI_EPCTX_0_EPSTATE_HALTED: + err = xhci_cmd_reset_ep(sc, 0, epno, index); + if (err != 0) + DPRINTF("Could not reset endpoint %u\n", epno); + break; + default: + err = xhci_cmd_stop_ep(sc, 0, epno, index); + if (err != 0) + DPRINTF("Could not stop endpoint %u\n", epno); + break; + } err = xhci_cmd_set_tr_dequeue_ptr(sc, (pepext->physaddr + (stream_id * sizeof(struct xhci_trb) * From owner-svn-src-all@freebsd.org Wed Sep 2 10:13:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 990C03D3808; Wed, 2 Sep 2020 10:13:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhKWw3dPcz4Y80; Wed, 2 Sep 2020 10:13:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60F3E8F50; Wed, 2 Sep 2020 10:13:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082ADGfQ009363; Wed, 2 Sep 2020 10:13:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082ADG0u009362; Wed, 2 Sep 2020 10:13:16 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009021013.082ADG0u009362@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 10:13:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365241 - stable/12/sys/dev/sound/usb X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/dev/sound/usb X-SVN-Commit-Revision: 365241 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 10:13:16 -0000 Author: hselasky Date: Wed Sep 2 10:13:15 2020 New Revision: 365241 URL: https://svnweb.freebsd.org/changeset/base/365241 Log: MFC r364374: Print current buffer latency in dmesg for the USB audio driver and not just the maximum. Sponsored by: Mellanox Technologies Modified: stable/12/sys/dev/sound/usb/uaudio.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/12/sys/dev/sound/usb/uaudio.c Wed Sep 2 10:11:21 2020 (r365240) +++ stable/12/sys/dev/sound/usb/uaudio.c Wed Sep 2 10:13:15 2020 (r365241) @@ -1029,10 +1029,11 @@ uaudio_attach(device_t dev) } for (x = 0; x != sc->sc_play_chan[i].num_alt; x++) { device_printf(dev, "Play[%u]: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", i, + "2x%dms buffer.\n", i, sc->sc_play_chan[i].usb_alt[x].sample_rate, sc->sc_play_chan[i].usb_alt[x].channels, - sc->sc_play_chan[i].usb_alt[x].p_fmt->description); + sc->sc_play_chan[i].usb_alt[x].p_fmt->description, + uaudio_buffer_ms); } } if (i == 0) @@ -1058,10 +1059,11 @@ uaudio_attach(device_t dev) } for (x = 0; x != sc->sc_rec_chan[i].num_alt; x++) { device_printf(dev, "Record[%u]: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", i, + "2x%dms buffer.\n", i, sc->sc_rec_chan[i].usb_alt[x].sample_rate, sc->sc_rec_chan[i].usb_alt[x].channels, - sc->sc_rec_chan[i].usb_alt[x].p_fmt->description); + sc->sc_rec_chan[i].usb_alt[x].p_fmt->description, + uaudio_buffer_ms); } } if (i == 0) From owner-svn-src-all@freebsd.org Wed Sep 2 10:14:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F3C2C3D389E; Wed, 2 Sep 2020 10:14:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhKXx6B5Rz4YQ5; Wed, 2 Sep 2020 10:14:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B75848F52; Wed, 2 Sep 2020 10:14:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082AE9vu009462; Wed, 2 Sep 2020 10:14:09 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082AE91K009461; Wed, 2 Sep 2020 10:14:09 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009021014.082AE91K009461@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 10:14:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365242 - stable/11/sys/dev/sound/usb X-SVN-Group: stable-11 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/11/sys/dev/sound/usb X-SVN-Commit-Revision: 365242 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 10:14:10 -0000 Author: hselasky Date: Wed Sep 2 10:14:09 2020 New Revision: 365242 URL: https://svnweb.freebsd.org/changeset/base/365242 Log: MFC r364374: Print current buffer latency in dmesg for the USB audio driver and not just the maximum. Sponsored by: Mellanox Technologies Modified: stable/11/sys/dev/sound/usb/uaudio.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/11/sys/dev/sound/usb/uaudio.c Wed Sep 2 10:13:15 2020 (r365241) +++ stable/11/sys/dev/sound/usb/uaudio.c Wed Sep 2 10:14:09 2020 (r365242) @@ -1027,10 +1027,11 @@ uaudio_attach(device_t dev) } for (x = 0; x != sc->sc_play_chan[i].num_alt; x++) { device_printf(dev, "Play[%u]: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", i, + "2x%dms buffer.\n", i, sc->sc_play_chan[i].usb_alt[x].sample_rate, sc->sc_play_chan[i].usb_alt[x].channels, - sc->sc_play_chan[i].usb_alt[x].p_fmt->description); + sc->sc_play_chan[i].usb_alt[x].p_fmt->description, + uaudio_buffer_ms); } } if (i == 0) @@ -1056,10 +1057,11 @@ uaudio_attach(device_t dev) } for (x = 0; x != sc->sc_rec_chan[i].num_alt; x++) { device_printf(dev, "Record[%u]: %d Hz, %d ch, %s format, " - "2x8ms buffer.\n", i, + "2x%dms buffer.\n", i, sc->sc_rec_chan[i].usb_alt[x].sample_rate, sc->sc_rec_chan[i].usb_alt[x].channels, - sc->sc_rec_chan[i].usb_alt[x].p_fmt->description); + sc->sc_rec_chan[i].usb_alt[x].p_fmt->description, + uaudio_buffer_ms); } } if (i == 0) From owner-svn-src-all@freebsd.org Wed Sep 2 10:16:03 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 15D3A3D3652 for ; Wed, 2 Sep 2020 10:16:03 +0000 (UTC) (envelope-from mw@semihalf.com) Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhKb61W8wz4Yc4 for ; Wed, 2 Sep 2020 10:16:02 +0000 (UTC) (envelope-from mw@semihalf.com) Received: by mail-qk1-x741.google.com with SMTP id w12so3680035qki.6 for ; Wed, 02 Sep 2020 03:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=EE0H+/71b4wQ01Ex650V8LSsk0esomsMxh+pNTnaWQM=; b=D+42nCNe2V/12tK7zensvYl3Frcbf5A+ZITrIM4EuXG3LOioerOewtrTD4I6Eng1q0 f/4HDDic89X+3rMETJcZY1h83f/nMSNDe1KnKwUzNck8lit0zi6WOPXyHMBG33x0m9i9 GiMhMKJMDArkgcXGbPbvUHvp2duY+i/xuMKeVbnmj1AagKgGhzKuPeE5g9nZEQ5qbgkY zPllmrSZyagD5Rx+azDfdbKNB14JRyrJcWW1RUFHGB+PojjDb51tyRy8QbukFiTK/71v L8Jfy4qb5qpkwDm9bbwO4EFy8ePLkYn3iKL2P9l0edweMPJf8CdhbDPjfu1LWqXycdBA 4JuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EE0H+/71b4wQ01Ex650V8LSsk0esomsMxh+pNTnaWQM=; b=kJa+POhylnycj70gJ9L0BDuTJIIG4aSOOq2GaGv/jgECXBbdf2K/r+g3KXNsY0u1ui Hxl7vAgCRCZ/qpMgh2/cSQlr0emeE2V1pMoMz3E/Bst/w1fC2S0K3qhRJZ6ypWpOxnuc qJzZGR5jZ84//h5iK7xbPA6Mu65Ye8xvnBmGUCsV3lC6GL+VpXkrmIatBR8EW+T3VUV3 q9H9yRvsALYx/oPW0yGtsxdW/PyixGGir0y/2NinqVOBCujN+CaRYC3MMnIIvdtzKXED /xKytBw9DDFG6xx8ZbFYZdmzzdaOE5VsRhNUh4hHG8RlPqccfouJ27CLm3BNrfKxkPj8 yHHw== X-Gm-Message-State: AOAM533+NzeITEF+AZKsNBXeHiZnwJe+Se1I5Xpt9OtIicTVP01bGKYb C8uqywbtPAeMLnpv/hYx4nPhFg+SH7POhGV0yiJGJA== X-Google-Smtp-Source: ABdhPJyhguk0HJUE4JAk0WKSYxZpbhT6BQIpks701GlLdPIqR1XEYv7/6sjIR7rI/ZHm8y5Qt7nHoKRuXB2l9Ej/9x4= X-Received: by 2002:a05:620a:1f1:: with SMTP id x17mr6111436qkn.419.1599041760967; Wed, 02 Sep 2020 03:16:00 -0700 (PDT) MIME-Version: 1.0 References: <202009011617.081GHL8e031671@repo.freebsd.org> In-Reply-To: From: Marcin Wojtas Date: Wed, 2 Sep 2020 12:15:48 +0200 Message-ID: Subject: Re: svn commit: r365054 - in head/sys: conf dev/sdhci To: Mateusz Guzik Cc: Marcin Wojtas , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 4BhKb61W8wz4Yc4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=D+42nCNe; dmarc=none; spf=none (mx1.freebsd.org: domain of mw@semihalf.com has no SPF policy when checking 2607:f8b0:4864:20::741) smtp.mailfrom=mw@semihalf.com X-Spamd-Result: default: False [-2.78 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[semihalf-com.20150623.gappssmtp.com:s=20150623]; FREEFALL_USER(0.00)[mw]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-0.93)[-0.931]; NEURAL_HAM_LONG(-1.05)[-1.051]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[semihalf.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[semihalf-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.50)[-0.495]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::741:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 10:16:03 -0000 wt., 1 wrz 2020 o 22:37 Mateusz Guzik napisa=C5=82(a): > This commit breaks numerous kernels, e.g. _.arm.RPI-B: > > In file included from /usr/src/sys/dev/sdhci/sdhci_fsl_fdt.c:45: > /usr/src/sys/dev/extres/clk/clk.h:37:10: fatal error: 'clknode_if.h' > file not found > #include "clknode_if.h" > > Unfortunately yes, fixing it. > On 9/1/20, Marcin Wojtas wrote: > > Author: mw > > Date: Tue Sep 1 16:17:21 2020 > > New Revision: 365054 > > URL: https://svnweb.freebsd.org/changeset/base/365054 > > > > Log: > > Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs > > > > Implement support for an eSDHC controller found in NXP QorIQ Layersca= pe > > SoCs. > > > > This driver has been tested with NXP LS1046A and LX2160A (Honeycomb > > board), > > which is incompatible with the existing sdhci_fsl driver (aiming at > older > > chips from this family). As such, it is not intended as replacement f= or > > the old driver, but rather serves as an improved alternative for SoCs > > that > > support it. > > It comes with support for both PIO and Single DMA modes and samples t= he > > clock from the extres clk API. > > > > Submitted by: Artur Rojek > > Reviewed by: manu, mmel, kibab > > Obtained from: Semihalf > > Sponsored by: Alstom Group > > Differential Revision: https://reviews.freebsd.org/D26153 > > > > Added: > > head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed) > > Modified: > > head/sys/conf/files > > > > Modified: head/sys/conf/files > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- head/sys/conf/files Tue Sep 1 16:13:09 2020 (r365053) > > +++ head/sys/conf/files Tue Sep 1 16:17:21 2020 (r365054) > > @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optional scc > > dev/sdhci/sdhci.c optional sdhci > > dev/sdhci/sdhci_fdt.c optional sdhci fdt > > dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio > > +dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio > > dev/sdhci/sdhci_if.m optional sdhci > > dev/sdhci/sdhci_acpi.c optional sdhci acpi > > dev/sdhci/sdhci_pci.c optional sdhci pci > > > > Added: head/sys/dev/sdhci/sdhci_fsl_fdt.c > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > > +++ head/sys/dev/sdhci/sdhci_fsl_fdt.c Tue Sep 1 16:17:21 2020 > (r365054) > > @@ -0,0 +1,680 @@ > > +/*- > > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > > + * > > + * Copyright (c) 2020 Alstom Group. > > + * Copyright (c) 2020 Semihalf. > > + * > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions > > + * are met: > > + * 1. Redistributions of source code must retain the above copyright > > + * notice, this list of conditions and the following disclaimer. > > + * 2. Redistributions in binary form must reproduce the above copyrigh= t > > + * notice, this list of conditions and the following disclaimer in > the > > + * documentation and/or other materials provided with the > distribution. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' > AND > > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, T= HE > > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > > PURPOSE > > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE > LIABLE > > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > > CONSEQUENTIAL > > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE > GOODS > > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTIO= N) > > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > > STRICT > > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN A= NY > > WAY > > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY > OF > > + * SUCH DAMAGE. > > + */ > > + > > +/* eSDHC controller driver for NXP QorIQ Layerscape SoCs. */ > > + > > +#include > > +__FBSDID("$FreeBSD$"); > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include > > +#include > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include "mmcbr_if.h" > > +#include "sdhci_if.h" > > + > > +#define RD4 (sc->read) > > +#define WR4 (sc->write) > > + > > +#define SDHCI_FSL_PRES_STATE 0x24 > > +#define SDHCI_FSL_PRES_SDSTB (1 << 3) > > +#define SDHCI_FSL_PRES_COMPAT_MASK 0x000f0f07 > > + > > +#define SDHCI_FSL_PROT_CTRL 0x28 > > +#define SDHCI_FSL_PROT_CTRL_WIDTH_1BIT (0 << 1) > > +#define SDHCI_FSL_PROT_CTRL_WIDTH_4BIT (1 << 1) > > +#define SDHCI_FSL_PROT_CTRL_WIDTH_8BIT (2 << 1) > > +#define SDHCI_FSL_PROT_CTRL_WIDTH_MASK (3 << 1) > > +#define SDHCI_FSL_PROT_CTRL_BYTE_SWAP (0 << 4) > > +#define SDHCI_FSL_PROT_CTRL_BYTE_NATIVE (2 << 4) > > +#define SDHCI_FSL_PROT_CTRL_BYTE_MASK (3 << 4) > > +#define SDHCI_FSL_PROT_CTRL_DMA_MASK (3 << 8) > > + > > +#define SDHCI_FSL_SYS_CTRL 0x2c > > +#define SDHCI_FSL_CLK_IPGEN (1 << 0) > > +#define SDHCI_FSL_CLK_SDCLKEN (1 << 3) > > +#define SDHCI_FSL_CLK_DIVIDER_MASK 0x000000f0 > > +#define SDHCI_FSL_CLK_DIVIDER_SHIFT 4 > > +#define SDHCI_FSL_CLK_PRESCALE_MASK 0x0000ff00 > > +#define SDHCI_FSL_CLK_PRESCALE_SHIFT 8 > > + > > +#define SDHCI_FSL_WTMK_LVL 0x44 > > +#define SDHCI_FSL_WTMK_RD_512B (0 << 0) > > +#define SDHCI_FSL_WTMK_WR_512B (0 << 15) > > + > > +#define SDHCI_FSL_HOST_VERSION 0xfc > > +#define SDHCI_FSL_CAPABILITIES2 0x114 > > + > > +#define SDHCI_FSL_ESDHC_CTRL 0x40c > > +#define SDHCI_FSL_ESDHC_CTRL_SNOOP (1 << 6) > > +#define SDHCI_FSL_ESDHC_CTRL_CLK_DIV2 (1 << 19) > > + > > +struct sdhci_fsl_fdt_softc { > > + device_t dev; > > + const struct sdhci_fsl_fdt_soc_data *soc_data; > > + struct resource *mem_res; > > + struct resource *irq_res; > > + void *irq_cookie; > > + uint32_t baseclk_hz; > > + struct sdhci_fdt_gpio *gpio; > > + struct sdhci_slot slot; > > + bool slot_init_done; > > + uint32_t cmd_and_mode; > > + uint16_t sdclk_bits; > > + > > + uint32_t (* read)(struct sdhci_fsl_fdt_softc *, bus_size_t); > > + void (* write)(struct sdhci_fsl_fdt_softc *, bus_size_t, uint32_t= ); > > +}; > > + > > +struct sdhci_fsl_fdt_soc_data { > > + int quirks; > > +}; > > + > > +static const struct sdhci_fsl_fdt_soc_data > sdhci_fsl_fdt_ls1046a_soc_data =3D > > { > > + .quirks =3D SDHCI_QUIRK_DONT_SET_HISPD_BIT | > SDHCI_QUIRK_BROKEN_AUTO_STOP > > +}; > > + > > +static const struct sdhci_fsl_fdt_soc_data sdhci_fsl_fdt_gen_data =3D = { > > + .quirks =3D 0, > > +}; > > + > > +static const struct ofw_compat_data sdhci_fsl_fdt_compat_data[] =3D { > > + {"fsl,ls1046a-esdhc", > (uintptr_t)&sdhci_fsl_fdt_ls1046a_soc_data}, > > + {"fsl,esdhc", (uintptr_t)&sdhci_fsl_fdt_gen_data}, > > + {NULL, 0} > > +}; > > + > > +static uint32_t > > +read_be(struct sdhci_fsl_fdt_softc *sc, bus_size_t off) > > +{ > > + > > + return (be32toh(bus_read_4(sc->mem_res, off))); > > +} > > + > > +static void > > +write_be(struct sdhci_fsl_fdt_softc *sc, bus_size_t off, uint32_t val) > > +{ > > + > > + bus_write_4(sc->mem_res, off, htobe32(val)); > > +} > > + > > +static uint32_t > > +read_le(struct sdhci_fsl_fdt_softc *sc, bus_size_t off) > > +{ > > + > > + return (bus_read_4(sc->mem_res, off)); > > +} > > + > > +static void > > +write_le(struct sdhci_fsl_fdt_softc *sc, bus_size_t off, uint32_t val) > > +{ > > + > > + bus_write_4(sc->mem_res, off, val); > > +} > > + > > + > > +static uint16_t > > +sdhci_fsl_fdt_get_clock(struct sdhci_fsl_fdt_softc *sc) > > +{ > > + uint16_t val; > > + > > + val =3D sc->sdclk_bits | SDHCI_CLOCK_INT_EN; > > + if (RD4(sc, SDHCI_FSL_PRES_STATE) & SDHCI_FSL_PRES_SDSTB) > > + val |=3D SDHCI_CLOCK_INT_STABLE; > > + if (RD4(sc, SDHCI_FSL_SYS_CTRL) & SDHCI_FSL_CLK_SDCLKEN) > > + val |=3D SDHCI_CLOCK_CARD_EN; > > + > > + return (val); > > +} > > + > > +static void > > +fsl_sdhc_fdt_set_clock(struct sdhci_fsl_fdt_softc *sc, uint16_t val) > > +{ > > + uint32_t div, freq, prescale, val32; > > + > > + sc->sdclk_bits =3D val & SDHCI_DIVIDERS_MASK; > > + val32 =3D RD4(sc, SDHCI_CLOCK_CONTROL); > > + > > + if ((val & SDHCI_CLOCK_CARD_EN) =3D=3D 0) { > > + WR4(sc, SDHCI_CLOCK_CONTROL, val32 & > ~SDHCI_FSL_CLK_SDCLKEN); > > + return; > > + } > > + > > + div =3D ((val >> SDHCI_DIVIDER_SHIFT) & SDHCI_DIVIDER_MASK) | > > + ((val >> SDHCI_DIVIDER_HI_SHIFT) & SDHCI_DIVIDER_HI_MASK) << > > + SDHCI_DIVIDER_MASK_LEN; > > + if (div =3D=3D 0) > > + freq =3D sc->baseclk_hz; > > + else > > + freq =3D sc->baseclk_hz / (2 * div); > > + > > + for (prescale =3D 2; freq < sc->baseclk_hz / (prescale * 16); ) > > + prescale <<=3D 1; > > + for (div =3D 1; freq < sc->baseclk_hz / (prescale * div); ) > > + ++div; > > + > > +#ifdef DEBUG > > + device_printf(sc->dev, > > + "Desired SD/MMC freq: %d, actual: %d; base %d prescale %d > divisor > > %d\n", > > + freq, sc->baseclk_hz / (prescale * div), > > + sc->baseclk_hz, prescale, div); > > +#endif > > + > > + prescale >>=3D 1; > > + div -=3D 1; > > + > > + val32 &=3D ~(SDHCI_FSL_CLK_DIVIDER_MASK | > SDHCI_FSL_CLK_PRESCALE_MASK); > > + val32 |=3D div << SDHCI_FSL_CLK_DIVIDER_SHIFT; > > + val32 |=3D prescale << SDHCI_FSL_CLK_PRESCALE_SHIFT; > > + val32 |=3D SDHCI_FSL_CLK_IPGEN | SDHCI_FSL_CLK_SDCLKEN; > > + WR4(sc, SDHCI_CLOCK_CONTROL, val32); > > +} > > + > > +static uint8_t > > +sdhci_fsl_fdt_read_1(device_t dev, struct sdhci_slot *slot, bus_size_t > > off) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + uint32_t wrk32, val32; > > + > > + sc =3D device_get_softc(dev); > > + > > + switch (off) { > > + case SDHCI_HOST_CONTROL: > > + wrk32 =3D RD4(sc, SDHCI_FSL_PROT_CTRL); > > + val32 =3D wrk32 & (SDHCI_CTRL_LED | SDHCI_CTRL_CARD_DET | > > + SDHCI_CTRL_FORCE_CARD); > > + if (wrk32 & SDHCI_FSL_PROT_CTRL_WIDTH_4BIT) > > + val32 |=3D SDHCI_CTRL_4BITBUS; > > + else if (wrk32 & SDHCI_FSL_PROT_CTRL_WIDTH_8BIT) > > + val32 |=3D SDHCI_CTRL_8BITBUS; > > + return (val32); > > + case SDHCI_POWER_CONTROL: > > + return (SDHCI_POWER_ON | SDHCI_POWER_300); > > + default: > > + break; > > + } > > + > > + return ((RD4(sc, off & ~3) >> (off & 3) * 8) & UINT8_MAX); > > +} > > + > > +static uint16_t > > +sdhci_fsl_fdt_read_2(device_t dev, struct sdhci_slot *slot, bus_size_t > > off) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + uint32_t val32; > > + > > + sc =3D device_get_softc(dev); > > + > > + switch (off) { > > + case SDHCI_CLOCK_CONTROL: > > + return (sdhci_fsl_fdt_get_clock(sc)); > > + case SDHCI_HOST_VERSION: > > + return (RD4(sc, SDHCI_FSL_HOST_VERSION) & UINT16_MAX); > > + case SDHCI_TRANSFER_MODE: > > + return (sc->cmd_and_mode & UINT16_MAX); > > + case SDHCI_COMMAND_FLAGS: > > + return (sc->cmd_and_mode >> 16); > > + case SDHCI_SLOT_INT_STATUS: > > + /* > > + * eSDHC hardware manages only a single slot. > > + * Synthesize a slot interrupt status register for slot 1 below. > > + */ > > + val32 =3D RD4(sc, SDHCI_INT_STATUS); > > + val32 &=3D RD4(sc, SDHCI_SIGNAL_ENABLE); > > + return (!!val32); > > + default: > > + return ((RD4(sc, off & ~3) >> (off & 3) * 8) & UINT16_MAX= ); > > + } > > +} > > + > > +static uint32_t > > +sdhci_fsl_fdt_read_4(device_t dev, struct sdhci_slot *slot, bus_size_t > > off) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + uint32_t wrk32, val32; > > + > > + sc =3D device_get_softc(dev); > > + > > + if (off =3D=3D SDHCI_BUFFER) > > + return (bus_read_4(sc->mem_res, off)); > > + if (off =3D=3D SDHCI_CAPABILITIES2) > > + off =3D SDHCI_FSL_CAPABILITIES2; > > + > > + val32 =3D RD4(sc, off); > > + > > + switch (off) { > > + case SDHCI_CAPABILITIES: > > + val32 &=3D ~(SDHCI_CAN_DO_SUSPEND | SDHCI_CAN_VDD_180); > > + break; > > + case SDHCI_PRESENT_STATE: > > + wrk32 =3D val32; > > + val32 &=3D SDHCI_FSL_PRES_COMPAT_MASK; > > + val32 |=3D (wrk32 >> 4) & SDHCI_STATE_DAT_MASK; > > + val32 |=3D (wrk32 << 1) & SDHCI_STATE_CMD; > > + break; > > + default: > > + break; > > + } > > + > > + return (val32); > > +} > > + > > +static void > > +sdhci_fsl_fdt_read_multi_4(device_t dev, struct sdhci_slot *slot, > > bus_size_t off, > > + uint32_t *data, bus_size_t count) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + > > + sc =3D device_get_softc(dev); > > + bus_read_multi_4(sc->mem_res, off, data, count); > > +} > > + > > +static void > > +sdhci_fsl_fdt_write_1(device_t dev, struct sdhci_slot *slot, bus_size_= t > > off, > > + uint8_t val) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + uint32_t val32; > > + > > + sc =3D device_get_softc(dev); > > + > > + switch (off) { > > + case SDHCI_HOST_CONTROL: > > + val32 =3D RD4(sc, SDHCI_FSL_PROT_CTRL); > > + val32 &=3D ~SDHCI_FSL_PROT_CTRL_WIDTH_MASK; > > + val32 |=3D (val & SDHCI_CTRL_LED); > > + > > + if (val & SDHCI_CTRL_8BITBUS) > > + val32 |=3D SDHCI_FSL_PROT_CTRL_WIDTH_8BIT; > > + else > > + /* Bus width is 1-bit when this flag is not set. = */ > > + val32 |=3D (val & SDHCI_CTRL_4BITBUS); > > + /* Enable SDMA by masking out this field. */ > > + val32 &=3D ~SDHCI_FSL_PROT_CTRL_DMA_MASK; > > + val32 &=3D ~(SDHCI_CTRL_CARD_DET | SDHCI_CTRL_FORCE_CARD)= ; > > + val32 |=3D (val & (SDHCI_CTRL_CARD_DET | > > + SDHCI_CTRL_FORCE_CARD)); > > + WR4(sc, SDHCI_FSL_PROT_CTRL, val32); > > + return; > > + case SDHCI_POWER_CONTROL: > > + return; > > + case SDHCI_SOFTWARE_RESET: > > + val &=3D ~SDHCI_RESET_ALL; > > + /* FALLTHROUGH. */ > > + default: > > + val32 =3D RD4(sc, off & ~3); > > + val32 &=3D ~(UINT8_MAX << (off & 3) * 8); > > + val32 |=3D (val << (off & 3) * 8); > > + WR4(sc, off & ~3, val32); > > + return; > > + } > > +} > > + > > +static void > > +sdhci_fsl_fdt_write_2(device_t dev, struct sdhci_slot *slot, bus_size_= t > > off, > > + uint16_t val) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + uint32_t val32; > > + > > + sc =3D device_get_softc(dev); > > + > > + switch (off) { > > + case SDHCI_CLOCK_CONTROL: > > + fsl_sdhc_fdt_set_clock(sc, val); > > + return; > > + /* > > + * eSDHC hardware combines command and mode into a single > > + * register. Cache it here, so that command isn't written > > + * until after mode. > > + */ > > + case SDHCI_TRANSFER_MODE: > > + sc->cmd_and_mode =3D val; > > + return; > > + case SDHCI_COMMAND_FLAGS: > > + sc->cmd_and_mode =3D > > + (sc->cmd_and_mode & UINT16_MAX) | (val << 16); > > + WR4(sc, SDHCI_TRANSFER_MODE, sc->cmd_and_mode); > > + sc->cmd_and_mode =3D 0; > > + return; > > + default: > > + val32 =3D RD4(sc, off & ~3); > > + val32 &=3D ~(UINT16_MAX << (off & 3) * 8); > > + val32 |=3D ((val & UINT16_MAX) << (off & 3) * 8); > > + WR4(sc, off & ~3, val32); > > + return; > > + } > > +} > > + > > +static void > > +sdhci_fsl_fdt_write_4(device_t dev, struct sdhci_slot *slot, bus_size_= t > > off, > > + uint32_t val) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + > > + sc =3D device_get_softc(dev); > > + > > + switch (off) { > > + case SDHCI_BUFFER: > > + bus_write_4(sc->mem_res, off, val); > > + return; > > + /* > > + * eSDHC hardware lacks support for the SDMA buffer boundary > > + * feature and instead generates SDHCI_INT_DMA_END interrupts > > + * after each completed DMA data transfer. > > + * Since this duplicates the SDHCI_INT_DATA_END functionality, > > + * mask out the unneeded SDHCI_INT_DMA_END interrupt. > > + */ > > + case SDHCI_INT_ENABLE: > > + case SDHCI_SIGNAL_ENABLE: > > + val &=3D ~SDHCI_INT_DMA_END; > > + /* FALLTHROUGH. */ > > + default: > > + WR4(sc, off, val); > > + return; > > + } > > +} > > + > > +static void > > +sdhci_fsl_fdt_write_multi_4(device_t dev, struct sdhci_slot *slot, > > + bus_size_t off, uint32_t *data, bus_size_t count) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + > > + sc =3D device_get_softc(dev); > > + bus_write_multi_4(sc->mem_res, off, data, count); > > +} > > + > > +static void > > +sdhci_fsl_fdt_irq(void *arg) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + > > + sc =3D arg; > > + sdhci_generic_intr(&sc->slot); > > + return; > > +} > > + > > +static int > > +sdhci_fsl_fdt_get_ro(device_t bus, device_t child) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + > > + sc =3D device_get_softc(bus); > > + return (sdhci_fdt_gpio_get_readonly(sc->gpio)); > > +} > > + > > +static bool > > +sdhci_fsl_fdt_get_card_present(device_t dev, struct sdhci_slot *slot) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + > > + sc =3D device_get_softc(dev); > > + return (sdhci_fdt_gpio_get_present(sc->gpio)); > > +} > > + > > +static int > > +sdhci_fsl_fdt_attach(device_t dev) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + uint32_t val, buf_order; > > + uintptr_t ocd_data; > > + uint64_t clk_hz; > > + phandle_t node; > > + int rid, ret; > > + clk_t clk; > > + > > + node =3D ofw_bus_get_node(dev); > > + sc =3D device_get_softc(dev); > > + ocd_data =3D ofw_bus_search_compatible(dev, > > + sdhci_fsl_fdt_compat_data)->ocd_data; > > + sc->soc_data =3D (struct sdhci_fsl_fdt_soc_data *)ocd_data; > > + sc->dev =3D dev; > > + sc->slot.quirks =3D sc->soc_data->quirks; > > + > > + rid =3D 0; > > + sc->mem_res =3D bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, > > + RF_ACTIVE); > > + if (sc->mem_res =3D=3D NULL) { > > + device_printf(dev, > > + "Could not allocate resources for controller\n"); > > + return (ENOMEM); > > + } > > + > > + rid =3D 0; > > + sc->irq_res =3D bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, > > + RF_ACTIVE); > > + if (sc->irq_res =3D=3D NULL) { > > + device_printf(dev, > > + "Could not allocate irq resources for controller\n"); > > + ret =3D ENOMEM; > > + goto err_free_mem; > > + } > > + > > + ret =3D bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO | INTR_MPS= AFE, > > + NULL, sdhci_fsl_fdt_irq, sc, &sc->irq_cookie); > > + if (ret !=3D 0) { > > + device_printf(dev, "Could not setup IRQ handler\n"); > > + goto err_free_irq_res; > > + } > > + > > + ret =3D clk_get_by_ofw_index(dev, node, 0, &clk); > > + if (ret !=3D 0) { > > + device_printf(dev, "Parent clock not found\n"); > > + goto err_free_irq; > > + } > > + > > + ret =3D clk_get_freq(clk, &clk_hz); > > + if (ret !=3D 0) { > > + device_printf(dev, > > + "Could not get parent clock frequency\n"); > > + goto err_free_irq; > > + } > > + > > + sc->baseclk_hz =3D clk_hz / 2; > > + > > + /* Figure out eSDHC block endianness before we touch any HW regs. > */ > > + if (OF_hasprop(node, "little-endian")) { > > + sc->read =3D read_le; > > + sc->write =3D write_le; > > + buf_order =3D SDHCI_FSL_PROT_CTRL_BYTE_NATIVE; > > + } else { > > + sc->read =3D read_be; > > + sc->write =3D write_be; > > + buf_order =3D SDHCI_FSL_PROT_CTRL_BYTE_SWAP; > > + } > > + > > + /* > > + * Setting this register affects byte order in SDHCI_BUFFER only. > > + * If the eSDHC block is connected over a big-endian bus, the dat= a > > + * read from/written to the buffer will be already byte swapped. > > + * In such a case, setting SDHCI_FSL_PROT_CTRL_BYTE_SWAP will > convert > > + * the byte order again, resulting in a native byte order. > > + * The read/write callbacks accommodate for this behavior. > > + */ > > + val =3D RD4(sc, SDHCI_FSL_PROT_CTRL); > > + val &=3D ~SDHCI_FSL_PROT_CTRL_BYTE_MASK; > > + WR4(sc, SDHCI_FSL_PROT_CTRL, val | buf_order); > > + > > + /* > > + * Gate the SD clock and set its source to peripheral clock / 2. > > + * The frequency in baseclk_hz is set to match this. > > + */ > > + val =3D RD4(sc, SDHCI_CLOCK_CONTROL); > > + WR4(sc, SDHCI_CLOCK_CONTROL, val & ~SDHCI_FSL_CLK_SDCLKEN); > > + val =3D RD4(sc, SDHCI_FSL_ESDHC_CTRL); > > + WR4(sc, SDHCI_FSL_ESDHC_CTRL, val | SDHCI_FSL_ESDHC_CTRL_CLK_DIV2= ); > > + sc->slot.max_clk =3D sc->baseclk_hz; > > + sc->gpio =3D sdhci_fdt_gpio_setup(dev, &sc->slot); > > + > > + /* > > + * Set the buffer watermark level to 128 words (512 bytes) for bo= th > > + * read and write. The hardware has a restriction that when the > read or > > + * write ready status is asserted, that means you can read exactl= y > the > > + * number of words set in the watermark register before you have = to > > + * re-check the status and potentially wait for more data. The ma= in > > + * sdhci driver provides no hook for doing status checking on les= s > than > > + * a full block boundary, so we set the watermark level to be a > full > > + * block. Reads and writes where the block size is less than the > > + * watermark size will work correctly too, no need to change the > > + * watermark for different size blocks. However, 128 is the maxim= um > > + * allowed for the watermark, so PIO is limitted to 512 byte > blocks. > > + */ > > + WR4(sc, SDHCI_FSL_WTMK_LVL, SDHCI_FSL_WTMK_WR_512B | > > + SDHCI_FSL_WTMK_RD_512B); > > + > > + ret =3D sdhci_init_slot(dev, &sc->slot, 0); > > + if (ret !=3D 0) > > + goto err_free_gpio; > > + sc->slot_init_done =3D true; > > + sdhci_start_slot(&sc->slot); > > + > > + return (bus_generic_attach(dev)); > > + > > +err_free_gpio: > > + sdhci_fdt_gpio_teardown(sc->gpio); > > +err_free_irq: > > + bus_teardown_intr(dev, sc->irq_res, sc->irq_cookie); > > +err_free_irq_res: > > + bus_free_resource(dev, SYS_RES_IRQ, sc->irq_res); > > +err_free_mem: > > + bus_free_resource(dev, SYS_RES_MEMORY, sc->mem_res); > > + return (ret); > > +} > > + > > +static int > > +sdhci_fsl_fdt_detach(device_t dev) > > +{ > > + struct sdhci_fsl_fdt_softc *sc; > > + > > + sc =3D device_get_softc(dev); > > + if (sc->slot_init_done) > > + sdhci_cleanup_slot(&sc->slot); > > + if (sc->gpio !=3D NULL) > > + sdhci_fdt_gpio_teardown(sc->gpio); > > + if (sc->irq_cookie !=3D NULL) > > + bus_teardown_intr(dev, sc->irq_res, sc->irq_cookie); > > + if (sc->irq_res !=3D NULL) > > + bus_free_resource(dev, SYS_RES_IRQ, sc->irq_res); > > + if (sc->mem_res !=3D NULL) > > + bus_free_resource(dev, SYS_RES_MEMORY, sc->mem_res); > > + return (0); > > +} > > + > > +static int > > +sdhci_fsl_fdt_probe(device_t dev) > > +{ > > + > > + if (!ofw_bus_status_okay(dev)) > > + return (ENXIO); > > + > > + if (!ofw_bus_search_compatible(dev, > > + sdhci_fsl_fdt_compat_data)->ocd_data) > > + return (ENXIO); > > + > > + device_set_desc(dev, "NXP QorIQ Layerscape eSDHC controller"); > > + return (BUS_PROBE_DEFAULT); > > +} > > + > > +static int > > +sdhci_fsl_fdt_read_ivar(device_t bus, device_t child, int which, > > + uintptr_t *result) > > +{ > > + struct sdhci_slot *slot =3D device_get_ivars(child); > > + > > + if (which =3D=3D MMCBR_IVAR_MAX_DATA && (slot->opt & SDHCI_HAVE_D= MA)) { > > + /* > > + * In the absence of SDMA buffer boundary functionality, > > + * limit the maximum data length per read/write command > > + * to bounce buffer size. > > + */ > > + *result =3D howmany(slot->sdma_bbufsz, 512); > > + return (0); > > + } > > + return (sdhci_generic_read_ivar(bus, child, which, result)); > > +} > > + > > +static const device_method_t sdhci_fsl_fdt_methods[] =3D { > > + /* Device interface. */ > > + DEVMETHOD(device_probe, sdhci_fsl_fdt_probe), > > + DEVMETHOD(device_attach, sdhci_fsl_fdt_attach), > > + DEVMETHOD(device_detach, sdhci_fsl_fdt_detach), > > + > > + /* Bus interface. */ > > + DEVMETHOD(bus_read_ivar, sdhci_fsl_fdt_read_ivar), > > + DEVMETHOD(bus_write_ivar, sdhci_generic_write_ivar)= , > > + > > + /* MMC bridge interface. */ > > + DEVMETHOD(mmcbr_update_ios, sdhci_generic_update_ios)= , > > + DEVMETHOD(mmcbr_request, sdhci_generic_request), > > + DEVMETHOD(mmcbr_get_ro, sdhci_fsl_fdt_get_ro), > > + DEVMETHOD(mmcbr_acquire_host, > sdhci_generic_acquire_host), > > + DEVMETHOD(mmcbr_release_host, > sdhci_generic_release_host), > > + > > + /* SDHCI accessors. */ > > + DEVMETHOD(sdhci_read_1, sdhci_fsl_fdt_read_1), > > + DEVMETHOD(sdhci_read_2, sdhci_fsl_fdt_read_2), > > + DEVMETHOD(sdhci_read_4, sdhci_fsl_fdt_read_4), > > + DEVMETHOD(sdhci_read_multi_4, > sdhci_fsl_fdt_read_multi_4), > > + DEVMETHOD(sdhci_write_1, sdhci_fsl_fdt_write_1), > > + DEVMETHOD(sdhci_write_2, sdhci_fsl_fdt_write_2), > > + DEVMETHOD(sdhci_write_4, sdhci_fsl_fdt_write_4), > > + DEVMETHOD(sdhci_write_multi_4, > sdhci_fsl_fdt_write_multi_4), > > + DEVMETHOD(sdhci_get_card_present, > sdhci_fsl_fdt_get_card_present), > > + DEVMETHOD_END > > +}; > > + > > +static devclass_t sdhci_fsl_fdt_devclass; > > +static driver_t sdhci_fsl_fdt_driver =3D { > > + "sdhci_fsl_fdt", > > + sdhci_fsl_fdt_methods, > > + sizeof(struct sdhci_fsl_fdt_softc), > > +}; > > + > > +DRIVER_MODULE(sdhci_fsl_fdt, simplebus, sdhci_fsl_fdt_driver, > > + sdhci_fsl_fdt_devclass, NULL, NULL); > > +SDHCI_DEPEND(sdhci_fsl_fdt); > > + > > +#ifndef MMCCAM > > +MMC_DECLARE_BRIDGE(sdhci_fsl_fdt); > > +#endif > > _______________________________________________ > > svn-src-all@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/svn-src-all > > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" > > > > > -- > Mateusz Guzik > From owner-svn-src-all@freebsd.org Wed Sep 2 10:16:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 07E953D3A89; Wed, 2 Sep 2020 10:16:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhKbl6TgPz4YnR; Wed, 2 Sep 2020 10:16:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C20199284; Wed, 2 Sep 2020 10:16:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082AGZZm009627; Wed, 2 Sep 2020 10:16:35 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082AGZYN009626; Wed, 2 Sep 2020 10:16:35 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009021016.082AGZYN009626@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 10:16:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365243 - stable/12/share/man/man4 X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/share/man/man4 X-SVN-Commit-Revision: 365243 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 10:16:36 -0000 Author: hselasky Date: Wed Sep 2 10:16:35 2020 New Revision: 365243 URL: https://svnweb.freebsd.org/changeset/base/365243 Log: MFC r364758: Add mlx5en(4) to the list of supported netdump network drivers. Sponsored by: Mellanox Technologies Modified: stable/12/share/man/man4/netdump.4 Directory Properties: stable/12/ (props changed) Modified: stable/12/share/man/man4/netdump.4 ============================================================================== --- stable/12/share/man/man4/netdump.4 Wed Sep 2 10:14:09 2020 (r365242) +++ stable/12/share/man/man4/netdump.4 Wed Sep 2 10:16:35 2020 (r365243) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 5, 2018 +.Dd August 25, 2020 .Dt NETDUMP 4 .Os .Sh NAME @@ -107,6 +107,7 @@ The following network drivers support netdump: .Xr ix 4 , .Xr ixl 4 , .Xr mlx4en 4 , +.Xr mlx5en 4 , .Xr re 4 , .Xr vtnet 4 . .Sh SYSCTL VARIABLES From owner-svn-src-all@freebsd.org Wed Sep 2 10:47:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F05193D4314; Wed, 2 Sep 2020 10:47:15 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhLH71N0dz4b4X; Wed, 2 Sep 2020 10:47:14 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2020.home.selasky.org (unknown [178.17.145.105]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id DF5CE2601DE; Wed, 2 Sep 2020 12:47:06 +0200 (CEST) Subject: Re: svn commit: r365054 - in head/sys: conf dev/sdhci To: Marcin Wojtas , Mateusz Guzik Cc: Marcin Wojtas , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009011617.081GHL8e031671@repo.freebsd.org> From: Hans Petter Selasky Message-ID: <2b48c5e2-4f25-05c5-2ad6-01fc1cafb4eb@selasky.org> Date: Wed, 2 Sep 2020 12:46:39 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BhLH71N0dz4b4X X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 2a01:4f8:c17:6c4b::2 as permitted sender) smtp.mailfrom=hps@selasky.org X-Spamd-Result: default: False [-2.40 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net]; NEURAL_HAM_LONG(-1.04)[-1.035]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[selasky.org]; ARC_NA(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.11)[-0.107]; NEURAL_HAM_MEDIUM(-0.95)[-0.955]; FREEMAIL_TO(0.00)[semihalf.com,gmail.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 10:47:16 -0000 Does this patch fix the problem: Index: sys/conf/files =================================================================== --- sys/conf/files (revision 365234) +++ sys/conf/files (working copy) @@ -3058,7 +3058,7 @@ dev/sdhci/sdhci.c optional sdhci dev/sdhci/sdhci_fdt.c optional sdhci fdt dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio -dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio +dev/sdhci/sdhci_fsl_fdt.c optional ext_resources sdhci fdt gpio dev/sdhci/sdhci_if.m optional sdhci dev/sdhci/sdhci_acpi.c optional sdhci acpi dev/sdhci/sdhci_pci.c optional sdhci pci --HPS From owner-svn-src-all@freebsd.org Wed Sep 2 11:18:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 46E793D462C; Wed, 2 Sep 2020 11:18:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhLz20xwjz4c3n; Wed, 2 Sep 2020 11:18:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 052EB9A54; Wed, 2 Sep 2020 11:18:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082BILri046444; Wed, 2 Sep 2020 11:18:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082BIL1P046443; Wed, 2 Sep 2020 11:18:21 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202009021118.082BIL1P046443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 2 Sep 2020 11:18:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365244 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 365244 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 11:18:22 -0000 Author: hselasky Date: Wed Sep 2 11:18:21 2020 New Revision: 365244 URL: https://svnweb.freebsd.org/changeset/base/365244 Log: Fix build fallout after r365054 . Make sure that building dev/sdhci/sdhci_fsl_fdt.c has all the right dependencies until a proper fix can be made. Sponsored by: Mellanox Technologies // NVIDIA Networking Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed Sep 2 10:16:35 2020 (r365243) +++ head/sys/conf/files Wed Sep 2 11:18:21 2020 (r365244) @@ -3058,7 +3058,7 @@ dev/scc/scc_dev_z8530.c optional scc dev/sdhci/sdhci.c optional sdhci dev/sdhci/sdhci_fdt.c optional sdhci fdt dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio -dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio +dev/sdhci/sdhci_fsl_fdt.c optional sdhci ext_resources fdt gpio dev/sdhci/sdhci_if.m optional sdhci dev/sdhci/sdhci_acpi.c optional sdhci acpi dev/sdhci/sdhci_pci.c optional sdhci pci From owner-svn-src-all@freebsd.org Wed Sep 2 11:26:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2734B3D463E; Wed, 2 Sep 2020 11:26:48 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhM8l21pYz4cY1; Wed, 2 Sep 2020 11:26:47 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2020.home.selasky.org (unknown [178.17.145.105]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id C64362601DE; Wed, 2 Sep 2020 13:26:45 +0200 (CEST) Subject: Re: svn commit: r364740 - head/sys/contrib/openzfs To: Matt Macy , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008242331.07ONVRt7037234@repo.freebsd.org> From: Hans Petter Selasky Message-ID: Date: Wed, 2 Sep 2020 13:26:18 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <202008242331.07ONVRt7037234@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BhM8l21pYz4cY1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 2a01:4f8:c17:6c4b::2 as permitted sender) smtp.mailfrom=hps@selasky.org X-Spamd-Result: default: False [-2.76 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[selasky.org]; NEURAL_HAM_LONG(-1.01)[-1.010]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.978]; NEURAL_HAM_SHORT(-0.47)[-0.473]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 11:26:48 -0000 On 2020-08-25 01:31, Matt Macy wrote: > Author: mmacy > Date: Mon Aug 24 23:31:26 2020 > New Revision: 364740 > URL: https://svnweb.freebsd.org/changeset/base/364740 > > Log: > Initial import from vendor-sys branch of openzfs > > Added: > head/sys/contrib/openzfs/ > - copied from r364739, vendor-sys/openzfs/dist/ > FYI - build failure. Should probably use uintptr_t ?? https://ci.freebsd.org/job/FreeBSD-head-amd64-gcc6_build/lastFailedBuild/console > 10:45:48 /workspace/src/sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c:58:16: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] > 10:45:48 zp.zfs_cmd = (uint64_t)zc; > 10:45:48 ^ > 10:45:48 /workspace/src/sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c:67:16: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] > 10:45:48 zp.zfs_cmd = (uint64_t)zc_c; > 10:45:48 ^ > 10:45:48 --- cddl/lib/libctf__L --- --HPS From owner-svn-src-all@freebsd.org Wed Sep 2 11:33:32 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2DCB93D4DAD; Wed, 2 Sep 2020 11:33:32 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhMJX0TPXz4cdL; Wed, 2 Sep 2020 11:33:32 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7D2A9F16; Wed, 2 Sep 2020 11:33:31 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082BXVxH058211; Wed, 2 Sep 2020 11:33:31 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082BXVp7058210; Wed, 2 Sep 2020 11:33:31 GMT (envelope-from kp@FreeBSD.org) Message-Id: <202009021133.082BXVp7058210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Wed, 2 Sep 2020 11:33:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365245 - head/sys/riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/sys/riscv/riscv X-SVN-Commit-Revision: 365245 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 11:33:32 -0000 Author: kp Date: Wed Sep 2 11:33:31 2020 New Revision: 365245 URL: https://svnweb.freebsd.org/changeset/base/365245 Log: riscv: very large dma mappings can cause integer overflow Fix the return type for _bus_dmamap_addseg(). Based on the same fix done for arm64 in r348571. Sponsored by: Axiado Modified: head/sys/riscv/riscv/busdma_bounce.c Modified: head/sys/riscv/riscv/busdma_bounce.c ============================================================================== --- head/sys/riscv/riscv/busdma_bounce.c Wed Sep 2 11:18:21 2020 (r365244) +++ head/sys/riscv/riscv/busdma_bounce.c Wed Sep 2 11:33:31 2020 (r365245) @@ -633,7 +633,7 @@ _bus_dmamap_reserve_pages(bus_dma_tag_t dmat, bus_dmam /* * Add a single contiguous physical range to the segment list. */ -static int +static bus_size_t _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr, bus_size_t sgsize, bus_dma_segment_t *segs, int *segp) { From owner-svn-src-all@freebsd.org Wed Sep 2 11:49:23 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6C06D3D509B; Wed, 2 Sep 2020 11:49:23 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhMfq29lbz4dD2; Wed, 2 Sep 2020 11:49:23 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 10C8CA199; Wed, 2 Sep 2020 11:49:23 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082BnMED064950; Wed, 2 Sep 2020 11:49:22 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082BnMdV064948; Wed, 2 Sep 2020 11:49:22 GMT (envelope-from kp@FreeBSD.org) Message-Id: <202009021149.082BnMdV064948@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Wed, 2 Sep 2020 11:49:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365246 - head/sys/netgraph X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/sys/netgraph X-SVN-Commit-Revision: 365246 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 11:49:23 -0000 Author: kp Date: Wed Sep 2 11:49:22 2020 New Revision: 365246 URL: https://svnweb.freebsd.org/changeset/base/365246 Log: ng_ether: Enter NET_EPOCH where required We must enter NET_EPOCH before calling ether_output_frame(). Several of the functions it calls (pfil_run_hooks, if_transmit) expect to be running in the NET_EPOCH. While here remove an unneeded EPOCH entry (which wasn't wide enough to cover BRIDGE_INPUT). PR: 248958 Reviewed by: glebius, bz (previous version), melifaro (previous version) Tested by: manu Differential Revision: https://reviews.freebsd.org/D26226 Modified: head/sys/netgraph/ng_ether.c head/sys/netgraph/ng_pppoe.c Modified: head/sys/netgraph/ng_ether.c ============================================================================== --- head/sys/netgraph/ng_ether.c Wed Sep 2 11:33:31 2020 (r365245) +++ head/sys/netgraph/ng_ether.c Wed Sep 2 11:49:22 2020 (r365246) @@ -711,7 +711,6 @@ ng_ether_rcv_lower(hook_p hook, item_p item) static int ng_ether_rcv_upper(hook_p hook, item_p item) { - struct epoch_tracker et; struct mbuf *m; const node_p node = NG_HOOK_NODE(hook); const priv_p priv = NG_NODE_PRIVATE(node); @@ -739,9 +738,7 @@ ng_ether_rcv_upper(hook_p hook, item_p item) } /* Route packet back in */ - NET_EPOCH_ENTER(et); ether_demux(ifp, m); - NET_EPOCH_EXIT(et); return (0); } Modified: head/sys/netgraph/ng_pppoe.c ============================================================================== --- head/sys/netgraph/ng_pppoe.c Wed Sep 2 11:33:31 2020 (r365245) +++ head/sys/netgraph/ng_pppoe.c Wed Sep 2 11:49:22 2020 (r365246) @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -761,6 +762,7 @@ ng_pppoe_connect(hook_p hook) static int ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasthook) { + struct epoch_tracker et; priv_p privp = NG_NODE_PRIVATE(node); struct ngpppoe_init_data *ourmsg = NULL; struct ng_mesg *resp = NULL; @@ -980,7 +982,9 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth neg->service.hdr.tag_len = htons((uint16_t)srvlen); bcopy(ourmsg->data + srvpos, neg->service.data, srvlen); neg->service_len = srvlen; + NET_EPOCH_ENTER(et); pppoe_start(sp); + NET_EPOCH_EXIT(et); break; } case NGM_PPPOE_LISTEN: @@ -1166,8 +1170,10 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) + ourmsg->data_len; wh->ph.length = htons(sizeof(*tag) + ourmsg->data_len); + NET_EPOCH_ENTER(et); NG_SEND_DATA_ONLY(error, privp->ethernet_hook, m); + NET_EPOCH_EXIT(et); } break; } @@ -1209,8 +1215,10 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasth m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) + ourmsg->data_len; wh->ph.length = htons(sizeof(*tag) + ourmsg->data_len); + NET_EPOCH_ENTER(et); NG_SEND_DATA_ONLY(error, privp->ethernet_hook, m); + NET_EPOCH_EXIT(et); } break; } From owner-svn-src-all@freebsd.org Wed Sep 2 11:53:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 21D583D5614; Wed, 2 Sep 2020 11:53:27 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhMlV5VmDz4f9r; Wed, 2 Sep 2020 11:53:26 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A129DA39C; Wed, 2 Sep 2020 11:53:26 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082BrQM3070868; Wed, 2 Sep 2020 11:53:26 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082BrQEO070867; Wed, 2 Sep 2020 11:53:26 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <202009021153.082BrQEO070867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 2 Sep 2020 11:53:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365247 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 365247 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 11:53:27 -0000 Author: andrew Date: Wed Sep 2 11:53:26 2020 New Revision: 365247 URL: https://svnweb.freebsd.org/changeset/base/365247 Log: When CPUTYPE is an architecture name use -march Allow architecture names to be passed in to the build system via CPUTYPE. This allows the user to use values such as armv8.1-a or armv8-a+crc as the CPUTYPE. Sponsored by: Innovate UK Modified: head/share/mk/bsd.cpu.mk Modified: head/share/mk/bsd.cpu.mk ============================================================================== --- head/share/mk/bsd.cpu.mk Wed Sep 2 11:49:22 2020 (r365246) +++ head/share/mk/bsd.cpu.mk Wed Sep 2 11:53:26 2020 (r365247) @@ -145,7 +145,13 @@ _CPUCFLAGS = -march=${CPUTYPE} _CPUCFLAGS = -march=${CPUTYPE:S/^mips//} . endif . elif ${MACHINE_CPUARCH} == "aarch64" +. if ${CPUTYPE:Marmv*} != "" +# Use -march when the CPU type is an architecture value, e.g. armv8.1-a +_CPUCFLAGS = -march=${CPUTYPE} +. else +# Otherwise assume we have a CPU type _CPUCFLAGS = -mcpu=${CPUTYPE} +. endif . endif # Set up the list of CPU features based on the CPU type. This is an From owner-svn-src-all@freebsd.org Wed Sep 2 12:23:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 951D83D68B2 for ; Wed, 2 Sep 2020 12:23:22 +0000 (UTC) (envelope-from mw@semihalf.com) Received: from mail-qt1-x832.google.com (mail-qt1-x832.google.com [IPv6:2607:f8b0:4864:20::832]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhNQ133B0z4gXh for ; Wed, 2 Sep 2020 12:23:21 +0000 (UTC) (envelope-from mw@semihalf.com) Received: by mail-qt1-x832.google.com with SMTP id e7so3328094qtj.11 for ; Wed, 02 Sep 2020 05:23:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=23gwVW2NqRUeeQBMDA9GH+iNhA8w6Crl+zjH4KJUMbQ=; b=vVxArLHf69cU8HAvKKuU8KKRBsam8bPnBDXXCbce+hLAvPopDtJLpyBPseczUu+L9P 6MZYqHLOegVp0Fy/czm5giYGcUaHP0jtLORgLQJUu37DljBVkr3bq1d1d6xoZMDqWK8e DlKNxDQQ34CAomZzRbavJoEgDxgkmMndP4MRQi3YDwDXcTHK1tQbsapcqNbc52z2lbpG onIwS1g16ZZxyWcsXA7cd4sFmNvYi6E90Qf5QAASvIUjohA0KsNvdInYuFeKECVK8H2T bK2ikpZxFtu2KK9/nTcJj5WKdKFKxLsfHudr/bIvJ6iQYMCmnCv/Y8z2L3UUWLslZczf 1r4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=23gwVW2NqRUeeQBMDA9GH+iNhA8w6Crl+zjH4KJUMbQ=; b=l+Irshh46XLk+TmS4Gekw0kl5JRMwIfL+O5imjH7LAmiJXk4ethkhxasrllmzsvYE7 U2/7q1vSMVgpxxhZwDwlfSYLbs4t/qAR3akxzh8D4ck/gW2DbEMPmFIzfsUUIMeU7e46 HMAw0+BkAMnQruyPo0LdVFlqAOsPO+oiF9tMSzYs1SMWQpoMf6Gm7yjIEsHyU9kY3JaC uJP/bqdABSABSUgZ+ojZwlp2HerRbUv74KSWg9JQPsD3MtyiWv9nZpnB2RosmR5ESVW3 AcQU31LRDIR7e0JQAsqZrRHGQ7e1B+Oh3i23bsT7Jr9Vejc71E8yFG/xd5x3+bBJLttp 4YPg== X-Gm-Message-State: AOAM533isquhINcpp/QwLMHE+48sz56lWuC+ObzFz4Oxgad9xplcIAzJ E53re+rmBZ5HhtbjdYS7zvUtWKapv8UK8DGnZQ89hQ== X-Google-Smtp-Source: ABdhPJz3czo+9ywTiS3lyqumGFOvmktYGbtTeLKjBk8IXbOG5TOSNQEz2Gi4B2qgvehPVnDWleJu7CXvhKo2oHh6QpU= X-Received: by 2002:ac8:6c5d:: with SMTP id z29mr6479012qtu.244.1599049400299; Wed, 02 Sep 2020 05:23:20 -0700 (PDT) MIME-Version: 1.0 References: <202009011617.081GHL8e031671@repo.freebsd.org> <2b48c5e2-4f25-05c5-2ad6-01fc1cafb4eb@selasky.org> In-Reply-To: <2b48c5e2-4f25-05c5-2ad6-01fc1cafb4eb@selasky.org> From: Marcin Wojtas Date: Wed, 2 Sep 2020 14:23:08 +0200 Message-ID: Subject: Re: svn commit: r365054 - in head/sys: conf dev/sdhci To: Hans Petter Selasky Cc: Mateusz Guzik , Marcin Wojtas , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4BhNQ133B0z4gXh X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=vVxArLHf; dmarc=none; spf=none (mx1.freebsd.org: domain of mw@semihalf.com has no SPF policy when checking 2607:f8b0:4864:20::832) smtp.mailfrom=mw@semihalf.com X-Spamd-Result: default: False [-2.62 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[semihalf-com.20150623.gappssmtp.com:s=20150623]; FREEFALL_USER(0.00)[mw]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.01)[-1.013]; NEURAL_HAM_LONG(-1.03)[-1.029]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[semihalf.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[semihalf-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.27)[-0.274]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::832:from]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org]; MAILMAN_DEST(0.00)[svn-src-all]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 12:23:22 -0000 Hi Hans, =C5=9Br., 2 wrz 2020 o 12:47 Hans Petter Selasky napisa= =C5=82(a): > > Does this patch fix the problem: > > Index: sys/conf/files > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- sys/conf/files (revision 365234) > +++ sys/conf/files (working copy) > @@ -3058,7 +3058,7 @@ > dev/sdhci/sdhci.c optional sdhci > dev/sdhci/sdhci_fdt.c optional sdhci fdt > dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio > -dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio > +dev/sdhci/sdhci_fsl_fdt.c optional ext_resources sdhci fdt gpio > dev/sdhci/sdhci_if.m optional sdhci > dev/sdhci/sdhci_acpi.c optional sdhci acpi > dev/sdhci/sdhci_pci.c optional sdhci pci > Yes, it does - I found out that you already submitted a patch during the svn commit (thank you). I only added extra option requested by Andrew (SOC_NXP_LS) - I'll wait with this until resolving discussion with Justin. Best regards, Marcin From owner-svn-src-all@freebsd.org Wed Sep 2 12:57:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E9F003D707B; Wed, 2 Sep 2020 12:57:36 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhP9X6DqMz4j54; Wed, 2 Sep 2020 12:57:36 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B493CAD29; Wed, 2 Sep 2020 12:57:36 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082CvaYu008001; Wed, 2 Sep 2020 12:57:36 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082CvZZA007994; Wed, 2 Sep 2020 12:57:35 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202009021257.082CvZZA007994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 2 Sep 2020 12:57:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365248 - head/secure/caroot/blacklisted X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/secure/caroot/blacklisted X-SVN-Commit-Revision: 365248 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 12:57:37 -0000 Author: kevans Date: Wed Sep 2 12:57:34 2020 New Revision: 365248 URL: https://svnweb.freebsd.org/changeset/base/365248 Log: caroot: properly remove old distrusted roots The proper procedure was not followed in r364943; all of these that were deleted should have instead been moved over to the blacklist so that certctl can DTRT. Users must still `certctl rehash` after this, but this should generally be done by one of mergemaster/etcupdate/freebsd-update/pkgbase already; note that freebsd-update doesn't come into play for this particular update, as these have not yet made it into a release. Future work (after svn -> git) will likely change the script that updatecert invokes to facilitate the process, rather than trusting that kevans or whomever updates in the future will remember. Reported by: Helge Oldach MFC after: 3 days Added: head/secure/caroot/blacklisted/AddTrust_External_Root.pem - copied unchanged from r364942, head/secure/caroot/trusted/AddTrust_External_Root.pem head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem - copied unchanged from r364942, head/secure/caroot/trusted/AddTrust_Low-Value_Services_Root.pem head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem - copied unchanged from r364942, head/secure/caroot/trusted/LuxTrust_Global_Root_2.pem head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem - copied unchanged from r364942, head/secure/caroot/trusted/Staat_der_Nederlanden_Root_CA_-_G2.pem head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r364942, head/secure/caroot/trusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r364942, head/secure/caroot/trusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem - copied unchanged from r364942, head/secure/caroot/trusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Copied: head/secure/caroot/blacklisted/AddTrust_External_Root.pem (from r364942, head/secure/caroot/trusted/AddTrust_External_Root.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/secure/caroot/blacklisted/AddTrust_External_Root.pem Wed Sep 2 12:57:34 2020 (r365248, copy of r364942, head/secure/caroot/trusted/AddTrust_External_Root.pem) @@ -0,0 +1,99 @@ +## +## AddTrust External Root +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root + Validity + Not Before: May 30 10:48:38 2000 GMT + Not After : May 30 10:48:38 2020 GMT + Subject: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:b7:f7:1a:33:e6:f2:00:04:2d:39:e0:4e:5b:ed: + 1f:bc:6c:0f:cd:b5:fa:23:b6:ce:de:9b:11:33:97: + a4:29:4c:7d:93:9f:bd:4a:bc:93:ed:03:1a:e3:8f: + cf:e5:6d:50:5a:d6:97:29:94:5a:80:b0:49:7a:db: + 2e:95:fd:b8:ca:bf:37:38:2d:1e:3e:91:41:ad:70: + 56:c7:f0:4f:3f:e8:32:9e:74:ca:c8:90:54:e9:c6: + 5f:0f:78:9d:9a:40:3c:0e:ac:61:aa:5e:14:8f:9e: + 87:a1:6a:50:dc:d7:9a:4e:af:05:b3:a6:71:94:9c: + 71:b3:50:60:0a:c7:13:9d:38:07:86:02:a8:e9:a8: + 69:26:18:90:ab:4c:b0:4f:23:ab:3a:4f:84:d8:df: + ce:9f:e1:69:6f:bb:d7:42:d7:6b:44:e4:c7:ad:ee: + 6d:41:5f:72:5a:71:08:37:b3:79:65:a4:59:a0:94: + 37:f7:00:2f:0d:c2:92:72:da:d0:38:72:db:14:a8: + 45:c4:5d:2a:7d:b7:b4:d6:c4:ee:ac:cd:13:44:b7: + c9:2b:dd:43:00:25:fa:61:b9:69:6a:58:23:11:b7: + a7:33:8f:56:75:59:f5:cd:29:d7:46:b7:0a:2b:65: + b6:d3:42:6f:15:b2:b8:7b:fb:ef:e9:5d:53:d5:34: + 5a:27 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A + X509v3 Key Usage: + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A + DirName:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root + serial:01 + + Signature Algorithm: sha1WithRSAEncryption + b0:9b:e0:85:25:c2:d6:23:e2:0f:96:06:92:9d:41:98:9c:d9: + 84:79:81:d9:1e:5b:14:07:23:36:65:8f:b0:d8:77:bb:ac:41: + 6c:47:60:83:51:b0:f9:32:3d:e7:fc:f6:26:13:c7:80:16:a5: + bf:5a:fc:87:cf:78:79:89:21:9a:e2:4c:07:0a:86:35:bc:f2: + de:51:c4:d2:96:b7:dc:7e:4e:ee:70:fd:1c:39:eb:0c:02:51: + 14:2d:8e:bd:16:e0:c1:df:46:75:e7:24:ad:ec:f4:42:b4:85: + 93:70:10:67:ba:9d:06:35:4a:18:d3:2b:7a:cc:51:42:a1:7a: + 63:d1:e6:bb:a1:c5:2b:c2:36:be:13:0d:e6:bd:63:7e:79:7b: + a7:09:0d:40:ab:6a:dd:8f:8a:c3:f6:f6:8c:1a:42:05:51:d4: + 45:f5:9f:a7:62:21:68:15:20:43:3c:99:e7:7c:bd:24:d8:a9: + 91:17:73:88:3f:56:1b:31:38:18:b4:71:0f:9a:cd:c8:0e:9e: + 8e:2e:1b:e1:8c:98:83:cb:1f:31:f1:44:4c:c6:04:73:49:76: + 60:0f:c7:f8:bd:17:80:6b:2e:e9:cc:4c:0e:5a:9a:79:0f:20: + 0a:2e:d5:9e:63:26:1e:55:92:94:d8:82:17:5a:7b:d0:bc:c7: + 8f:4e:86:04 +SHA1 Fingerprint=02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68 +-----BEGIN CERTIFICATE----- +MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs +IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 +MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux +FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h +bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v +dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt +H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 +uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX +mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX +a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN +E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 +WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD +VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 +Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU +cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx +IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN +AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH +YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC +Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX +c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a +mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +-----END CERTIFICATE----- Copied: head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem (from r364942, head/secure/caroot/trusted/AddTrust_Low-Value_Services_Root.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem Wed Sep 2 12:57:34 2020 (r365248, copy of r364942, head/secure/caroot/trusted/AddTrust_Low-Value_Services_Root.pem) @@ -0,0 +1,98 @@ +## +## AddTrust Low-Value Services Root +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root + Validity + Not Before: May 30 10:38:31 2000 GMT + Not After : May 30 10:38:31 2020 GMT + Subject: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:96:96:d4:21:49:60:e2:6b:e8:41:07:0c:de:c4: + e0:dc:13:23:cd:c1:35:c7:fb:d6:4e:11:0a:67:5e: + f5:06:5b:6b:a5:08:3b:5b:29:16:3a:e7:87:b2:34: + 06:c5:bc:05:a5:03:7c:82:cb:29:10:ae:e1:88:81: + bd:d6:9e:d3:fe:2d:56:c1:15:ce:e3:26:9d:15:2e: + 10:fb:06:8f:30:04:de:a7:b4:63:b4:ff:b1:9c:ae: + 3c:af:77:b6:56:c5:b5:ab:a2:e9:69:3a:3d:0e:33: + 79:32:3f:70:82:92:99:61:6d:8d:30:08:8f:71:3f: + a6:48:57:19:f8:25:dc:4b:66:5c:a5:74:8f:98:ae: + c8:f9:c0:06:22:e7:ac:73:df:a5:2e:fb:52:dc:b1: + 15:65:20:fa:35:66:69:de:df:2c:f1:6e:bc:30:db: + 2c:24:12:db:eb:35:35:68:90:cb:00:b0:97:21:3d: + 74:21:23:65:34:2b:bb:78:59:a3:d6:e1:76:39:9a: + a4:49:8e:8c:74:af:6e:a4:9a:a3:d9:9b:d2:38:5c: + 9b:a2:18:cc:75:23:84:be:eb:e2:4d:33:71:8e:1a: + f0:c2:f8:c7:1d:a2:ad:03:97:2c:f8:cf:25:c6:f6: + b8:24:31:b1:63:5d:92:7f:63:f0:25:c9:53:2e:1f: + bf:4d + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B + X509v3 Key Usage: + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B + DirName:/C=SE/O=AddTrust AB/OU=AddTrust TTP Network/CN=AddTrust Class 1 CA Root + serial:01 + + Signature Algorithm: sha1WithRSAEncryption + 2c:6d:64:1b:1f:cd:0d:dd:b9:01:fa:96:63:34:32:48:47:99: + ae:97:ed:fd:72:16:a6:73:47:5a:f4:eb:dd:e9:f5:d6:fb:45: + cc:29:89:44:5d:bf:46:39:3d:e8:ee:bc:4d:54:86:1e:1d:6c: + e3:17:27:43:e1:89:56:2b:a9:6f:72:4e:49:33:e3:72:7c:2a: + 23:9a:bc:3e:ff:28:2a:ed:a3:ff:1c:23:ba:43:57:09:67:4d: + 4b:62:06:2d:f8:ff:6c:9d:60:1e:d8:1c:4b:7d:b5:31:2f:d9: + d0:7c:5d:f8:de:6b:83:18:78:37:57:2f:e8:33:07:67:df:1e: + c7:6b:2a:95:76:ae:8f:57:a3:f0:f4:52:b4:a9:53:08:cf:e0: + 4f:d3:7a:53:8b:fd:bb:1c:56:36:f2:fe:b2:b6:e5:76:bb:d5: + 22:65:a7:3f:fe:d1:66:ad:0b:bc:6b:99:86:ef:3f:7d:f3:18: + 32:ca:7b:c6:e3:ab:64:46:95:f8:26:69:d9:55:83:7b:2c:96: + 07:ff:59:2c:44:a3:c6:e5:e9:a9:dc:a1:63:80:5a:21:5e:21: + cf:53:54:f0:ba:6f:89:db:a8:aa:95:cf:8b:e3:71:cc:1e:1b: + 20:44:08:c0:7a:b6:40:fd:c4:e4:35:e1:1d:16:1c:d0:bc:2b: + 8e:d6:71:d9 +SHA1 Fingerprint=CC:AB:0E:A0:4C:23:01:D6:69:7B:DD:37:9F:CD:12:EB:24:E3:94:9D +-----BEGIN CERTIFICATE----- +MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw +MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD +VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul +CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n +tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl +dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch +PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC ++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O +BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl +MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk +ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB +IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X +7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz +43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY +eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl +pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA +WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= +-----END CERTIFICATE----- Copied: head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem (from r364942, head/secure/caroot/trusted/LuxTrust_Global_Root_2.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem Wed Sep 2 12:57:34 2020 (r365248, copy of r364942, head/secure/caroot/trusted/LuxTrust_Global_Root_2.pem) @@ -0,0 +1,141 @@ +## +## LuxTrust Global Root 2 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 0a:7e:a6:df:4b:44:9e:da:6a:24:85:9e:e6:b8:15:d3:16:7f:bb:b1 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = LU, O = LuxTrust S.A., CN = LuxTrust Global Root 2 + Validity + Not Before: Mar 5 13:21:57 2015 GMT + Not After : Mar 5 13:21:57 2035 GMT + Subject: C = LU, O = LuxTrust S.A., CN = LuxTrust Global Root 2 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:d7:85:97:bf:11:98:e9:f0:62:83:4c:3c:87:f9: + 53:6a:37:0b:f2:0f:3c:87:ce:6f:dc:26:29:bd:c5: + 89:ba:c9:83:3d:f7:ee:ca:5b:c6:6d:49:73:b4:c9: + 46:a3:1b:34:13:3f:c1:89:45:57:f4:d9:b1:fb:36: + 65:4b:fb:08:e2:48:71:11:c8:6e:3b:9e:9d:df:89: + 65:37:a6:85:f6:3b:44:18:b6:c6:37:30:62:44:92: + 97:69:7d:42:30:24:e4:0d:0c:89:6b:63:de:c5:e1: + df:4e:a9:14:6c:53:e0:61:ce:f6:17:2f:1d:3c:bd: + e6:22:4c:1d:93:f5:10:c4:a1:76:ec:6a:de:c5:6c: + df:96:b4:56:40:42:c0:62:92:30:a1:2d:15:94:a0: + d2:20:06:09:6e:6a:6d:e5:eb:b7:be:d4:f0:f1:15: + 7c:8b:e6:4e:ba:13:cc:4b:27:5e:99:3c:17:5d:8f: + 81:7f:33:3d:4f:d3:3f:1b:ec:5c:3f:f0:3c:4c:75: + 6e:f2:a6:d5:9d:da:2d:07:63:02:c6:72:e9:94:bc: + 4c:49:95:4f:88:52:c8:db:e8:69:82:f8:cc:34:5b: + 22:f0:86:a7:89:bd:48:0a:6d:66:81:6d:c8:c8:64: + fb:01:e1:f4:e1:de:d9:9e:dd:db:5b:d4:2a:99:26: + 15:1b:1e:4c:92:29:82:9e:d5:92:81:92:41:70:19: + f7:a4:e5:93:4b:bc:77:67:31:dd:1c:fd:31:70:0d: + 17:99:0c:f9:0c:39:19:2a:17:b5:30:71:55:d5:0f: + ae:58:e1:3d:2f:34:9b:cf:9f:f6:78:85:c2:93:7a: + 72:3e:66:8f:9c:16:11:60:8f:9e:89:6f:67:be:e0: + 47:5a:3b:0c:9a:67:8b:cf:46:c6:ae:38:a3:f2:a7: + bc:e6:d6:85:6b:33:24:70:22:4b:cb:08:9b:bb:c8: + f8:02:29:1d:be:20:0c:46:bf:6b:87:9b:b3:2a:66: + 42:35:46:6c:aa:ba:ad:f9:98:7b:e9:50:55:14:31: + bf:b1:da:2d:ed:80:ad:68:24:fb:69:ab:d8:71:13: + 30:e6:67:b3:87:40:fd:89:7e:f2:43:d1:11:df:2f: + 65:2f:64:ce:5f:14:b9:b1:bf:31:bd:87:78:5a:59: + 65:88:aa:fc:59:32:48:86:d6:4c:b9:29:4b:95:d3: + 76:f3:77:25:6d:42:1c:38:83:4d:fd:a3:5f:9b:7f: + 2d:ac:79:1b:0e:42:31:97:63:a4:fb:8a:69:d5:22: + 0d:34:90:30:2e:a8:b4:e0:6d:b6:94:ac:bc:8b:4e: + d7:70:fc:c5:38:8e:64:25:e1:4d:39:90:ce:c9:87: + 84:58:71 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Certificate Policies: + Policy: 1.3.171.1.1.1.10 + CPS: https://repository.luxtrust.lu + + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Authority Key Identifier: + keyid:FF:18:28:76:F9:48:05:2C:A1:AE:F1:2B:1B:2B:B2:53:F8:4B:7C:B3 + + X509v3 Subject Key Identifier: + FF:18:28:76:F9:48:05:2C:A1:AE:F1:2B:1B:2B:B2:53:F8:4B:7C:B3 + Signature Algorithm: sha256WithRSAEncryption + 6a:19:14:ed:6e:79:c1:2c:87:d4:0d:70:7e:d7:f6:78:c9:0b: + 04:4e:c4:b1:ce:93:70:fe:b0:54:c0:32:cd:99:30:64:17:bf: + 0f:e5:e2:33:fd:07:36:40:72:0e:1a:b6:6a:59:d6:00:e5:68: + 20:dd:2e:72:0d:1f:6a:64:31:20:84:7d:49:a6:5a:37:eb:45: + c9:85:f5:d4:c7:17:99:07:e6:9b:55:e4:0c:e8:a9:b4:ce:8c: + 5b:b5:11:5c:cf:8a:0e:0d:d6:ac:77:81:fe:32:9c:24:9e:72: + ce:54:f3:d0:6f:a2:56:d6:ec:c3:37:2c:65:58:be:57:00:1a: + f2:35:fa:eb:7b:31:5d:c2:c1:12:3d:96:81:88:96:89:c1:59: + 5c:7a:e6:7f:70:34:e7:83:e2:b1:e1:e1:b8:58:ef:d4:95:e4: + 60:9c:f0:96:97:72:8c:eb:84:02:2e:65:8f:a4:b7:d2:7f:67: + dd:c8:d3:9e:5c:aa:a9:a4:a0:25:14:06:9b:ec:4f:7e:2d:0b: + 7f:1d:75:f1:33:d8:ed:ce:b8:75:6d:3e:5b:b9:98:1d:31:0d: + 56:d8:43:0f:30:91:b2:04:6b:dd:56:be:95:80:55:67:be:d8: + cd:83:d9:18:ee:2e:0f:86:2d:92:9e:70:13:ec:de:51:c9:43: + 78:02:a5:4d:c8:f9:5f:c4:91:58:46:16:77:5a:74:aa:40:bc: + 07:9f:30:b9:b1:f7:12:17:dd:e3:ff:24:40:1d:7a:6a:d1:4f: + 18:0a:aa:90:1d:eb:40:1e:df:a1:1e:44:92:10:9a:f2:8d:e1: + d1:4b:46:9e:e8:45:42:97:ea:45:99:f3:ec:66:d5:02:fa:f2: + a6:4a:24:aa:de:ce:b9:ca:f9:3f:93:6f:f9:a3:ba:ea:a5:3e: + 99:ad:fd:ff:7b:99:f5:65:ee:f0:59:28:67:d7:90:95:a4:13: + 84:a9:84:c1:e8:ce:ce:75:93:63:1a:bc:3c:ea:d5:64:1f:2d: + 2a:12:39:c6:c3:5a:32:ed:47:91:16:0e:bc:38:c1:50:de:8f: + ca:2a:90:34:1c:ee:41:94:9c:5e:19:2e:f8:45:49:99:74:91: + b0:04:6f:e3:04:5a:b1:ab:2a:ab:fe:c7:d0:96:b6:da:e1:4a: + 64:06:6e:60:4d:bd:42:4e:ff:78:da:24:ca:1b:b4:d7:96:39: + 6c:ae:f1:0e:aa:a7:7d:48:8b:20:4c:cf:64:d6:b8:97:46:b0: + 4e:d1:2a:56:3a:a0:93:bd:af:80:24:e0:0a:7e:e7:ca:d5:ca: + e8:85:55:dc:36:2a:e1:94:68:93:c7:66:72:44:0f:80:21:32: + 6c:25:c7:23:80:83:0a:eb +SHA1 Fingerprint=1E:0E:56:19:0A:D1:8B:25:98:B2:04:44:FF:66:8A:04:17:99:5F:3F +-----BEGIN CERTIFICATE----- +MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQEL +BQAwRjELMAkGA1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNV +BAMMFkx1eFRydXN0IEdsb2JhbCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUw +MzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEWMBQGA1UECgwNTHV4VHJ1c3QgUy5B +LjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wmKb3F +ibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTem +hfY7RBi2xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1 +EMShduxq3sVs35a0VkBCwGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsn +Xpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4 +zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkmFRseTJIpgp7VkoGSQXAZ +96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niFwpN6cj5m +j5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4g +DEa/a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+ +8kPREd8vZS9kzl8UubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2j +X5t/Lax5Gw5CMZdjpPuKadUiDTSQMC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmH +hFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB/zBCBgNVHSAEOzA5MDcGByuB +KwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5Lmx1eHRydXN0 +Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT ++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQEL +BQADggIBAGoZFO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9 +BzZAcg4atmpZ1gDlaCDdLnINH2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTO +jFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW7MM3LGVYvlcAGvI1+ut7MV3CwRI9 +loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIuZY+kt9J/Z93I055c +qqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWAVWe+ +2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/ +JEAdemrRTxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKre +zrnK+T+Tb/mjuuqlPpmt/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQf +LSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+ +x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31IiyBMz2TWuJdGsE7RKlY6 +oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr +-----END CERTIFICATE----- Copied: head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem (from r364942, head/secure/caroot/trusted/Staat_der_Nederlanden_Root_CA_-_G2.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem Wed Sep 2 12:57:34 2020 (r365248, copy of r364942, head/secure/caroot/trusted/Staat_der_Nederlanden_Root_CA_-_G2.pem) @@ -0,0 +1,137 @@ +## +## Staat der Nederlanden Root CA - G2 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 10000012 (0x98968c) + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = NL, O = Staat der Nederlanden, CN = Staat der Nederlanden Root CA - G2 + Validity + Not Before: Mar 26 11:18:17 2008 GMT + Not After : Mar 25 11:03:10 2020 GMT + Subject: C = NL, O = Staat der Nederlanden, CN = Staat der Nederlanden Root CA - G2 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:c5:59:e7:6f:75:aa:3e:4b:9c:b5:b8:ac:9e:0b: + e4:f9:d9:ca:ab:5d:8f:b5:39:10:82:d7:af:51:e0: + 3b:e1:00:48:6a:cf:da:e1:06:43:11:99:aa:14:25: + 12:ad:22:e8:00:6d:43:c4:a9:b8:e5:1f:89:4b:67: + bd:61:48:ef:fd:d2:e0:60:88:e5:b9:18:60:28:c3: + 77:2b:ad:b0:37:aa:37:de:64:59:2a:46:57:e4:4b: + b9:f8:37:7c:d5:36:e7:80:c1:b6:f3:d4:67:9b:96: + e8:ce:d7:c6:0a:53:d0:6b:49:96:f3:a3:0b:05:77: + 48:f7:25:e5:70:ac:30:14:20:25:e3:7f:75:5a:e5: + 48:f8:4e:7b:03:07:04:fa:82:61:87:6e:f0:3b:c4: + a4:c7:d0:f5:74:3e:a5:5d:1a:08:f2:9b:25:d2:f6: + ac:04:26:3e:55:3a:62:28:a5:7b:b2:30:af:f8:37: + c2:d1:ba:d6:38:fd:f4:ef:49:30:37:99:26:21:48: + 85:01:a9:e5:16:e7:dc:90:55:df:0f:e8:38:cd:99: + 37:21:4f:5d:f5:22:6f:6a:c5:12:16:60:17:55:f2: + 65:66:a6:a7:30:91:38:c1:38:1d:86:04:84:ba:1a: + 25:78:5e:9d:af:cc:50:60:d6:13:87:52:ed:63:1f: + 6d:65:7d:c2:15:18:74:ca:e1:7e:64:29:8c:72:d8: + 16:13:7d:0b:49:4a:f1:28:1b:20:74:6b:c5:3d:dd: + b0:aa:48:09:3d:2e:82:94:cd:1a:65:d9:2b:88:9a: + 99:bc:18:7e:9f:ee:7d:66:7c:3e:bd:94:b8:81:ce: + cd:98:30:78:c1:6f:67:d0:be:5f:e0:68:ed:de:e2: + b1:c9:2c:59:78:92:aa:df:2b:60:63:f2:e5:5e:b9: + e3:ca:fa:7f:50:86:3e:a2:34:18:0c:09:68:28:11: + 1c:e4:e1:b9:5c:3e:47:ba:32:3f:18:cc:5b:84:f5: + f3:6b:74:c4:72:74:e1:e3:8b:a0:4a:bd:8d:66:2f: + ea:ad:35:da:20:d3:88:82:61:f0:12:22:b6:bc:d0: + d5:a4:ec:af:54:88:25:24:3c:a7:6d:b1:72:29:3f: + 3e:57:a6:7f:55:af:6e:26:c6:fe:e7:cc:40:5c:51: + 44:81:0a:78:de:4a:ce:55:bf:1d:d5:d9:b7:56:ef: + f0:76:ff:0b:79:b5:af:bd:fb:a9:69:91:46:97:68: + 80:14:36:1d:b3:7f:bb:29:98:36:a5:20:fa:82:60: + 62:33:a4:ec:d6:ba:07:a7:6e:c5:cf:14:a6:e7:d6: + 92:34:d8:81:f5:fc:1d:5d:aa:5c:1e:f6:a3:4d:3b: + b8:f7:39 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Certificate Policies: + Policy: X509v3 Any Policy + CPS: http://www.pkioverheid.nl/policies/root-policy-G2 + + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 91:68:32:87:15:1D:89:E2:B5:F1:AC:36:28:34:8D:0B:7C:62:88:EB + Signature Algorithm: sha256WithRSAEncryption + a8:41:4a:67:2a:92:81:82:50:6e:e1:d7:d8:b3:39:3b:f3:02: + 15:09:50:51:ef:2d:bd:24:7b:88:86:3b:f9:b4:bc:92:09:96: + b9:f6:c0:ab:23:60:06:79:8c:11:4e:51:d2:79:80:33:fb:9d: + 48:be:ec:41:43:81:1f:7e:47:40:1c:e5:7a:08:ca:aa:8b:75: + ad:14:c4:c2:e8:66:3c:82:07:a7:e6:27:82:5b:18:e6:0f:6e: + d9:50:3e:8a:42:18:29:c6:b4:56:fc:56:10:a0:05:17:bd:0c: + 23:7f:f4:93:ed:9c:1a:51:be:dd:45:41:bf:91:24:b4:1f:8c: + e9:5f:cf:7b:21:99:9f:95:9f:39:3a:46:1c:6c:f9:cd:7b:9c: + 90:cd:28:a9:c7:a9:55:bb:ac:62:34:62:35:13:4b:14:3a:55: + 83:b9:86:8d:92:a6:c6:f4:07:25:54:cc:16:57:12:4a:82:78: + c8:14:d9:17:82:26:2d:5d:20:1f:79:ae:fe:d4:70:16:16:95: + 83:d8:35:39:ff:52:5d:75:1c:16:c5:13:55:cf:47:cc:75:65: + 52:4a:de:f0:b0:a7:e4:0a:96:0b:fb:ad:c2:e2:25:84:b2:dd: + e4:bd:7e:59:6c:9b:f0:f0:d8:e7:ca:f2:e9:97:38:7e:89:be: + cc:fb:39:17:61:3f:72:db:3a:91:d8:65:01:19:1d:ad:50:a4: + 57:0a:7c:4b:bc:9c:71:73:2a:45:51:19:85:cc:8e:fd:47:a7: + 74:95:1d:a8:d1:af:4e:17:b1:69:26:c2:aa:78:57:5b:c5:4d: + a7:e5:9e:05:17:94:ca:b2:5f:a0:49:18:8d:34:e9:26:6c:48: + 1e:aa:68:92:05:e1:82:73:5a:9b:dc:07:5b:08:6d:7d:9d:d7: + 8d:21:d9:fc:14:20:aa:c2:45:df:3f:e7:00:b2:51:e4:c2:f8: + 05:b9:79:1a:8c:34:f3:9e:5b:e4:37:5b:6b:4a:df:2c:57:8a: + 40:5a:36:ba:dd:75:44:08:37:42:70:0c:fe:dc:5e:21:a0:a3: + 8a:c0:90:9c:68:da:50:e6:45:10:47:78:b6:4e:d2:65:c9:c3: + 37:df:e1:42:63:b0:57:37:45:2d:7b:8a:9c:bf:05:ea:65:55: + 33:f7:39:10:c5:28:2a:21:7a:1b:8a:c4:24:f9:3f:15:c8:9a: + 15:20:f5:55:62:96:ed:6d:93:50:bc:e4:aa:78:ad:d9:cb:0a: + 65:87:a6:66:c1:c4:81:a3:77:3a:58:1e:0b:ee:83:8b:9d:1e: + d2:52:a4:cc:1d:6f:b0:98:6d:94:31:b5:f8:71:0a:dc:b9:fc: + 7d:32:60:e6:eb:af:8a:01 +SHA1 Fingerprint=59:AF:82:79:91:86:C7:B4:75:07:CB:CF:03:57:46:EB:04:DD:B7:16 +-----BEGIN CERTIFICATE----- +MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO +TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh +dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX +DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl +ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv +b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291 +qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp +uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU +Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE +pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp +5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M +UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN +GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy +5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv +6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK +eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6 +B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/ +BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov +L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG +SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS +CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen +5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897 +IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK +gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL ++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL +vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm +bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk +N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC +Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z +ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ== +-----END CERTIFICATE----- Copied: head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem (from r364942, head/secure/caroot/trusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem Wed Sep 2 12:57:34 2020 (r365248, copy of r364942, head/secure/caroot/trusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem) @@ -0,0 +1,68 @@ +## +## Symantec Class 1 Public Primary Certification Authority - G4 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 21:6e:33:a5:cb:d3:88:a4:6f:29:07:b4:27:3c:c4:d8 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 1 Public Primary Certification Authority - G4 + Validity + Not Before: Oct 5 00:00:00 2011 GMT + Not After : Jan 18 23:59:59 2038 GMT + Subject: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 1 Public Primary Certification Authority - G4 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:d7:66:b5:1b:db:ae:b3:60:ee:46:ea:88:63:75: + 3b:2a:94:6d:f3:5f:12:f6:e3:0f:9e:b6:0a:14:53: + 48:52:c8:dc:3a:b3:cb:48:20:26:12:4e:fa:89:84: + d4:df:91:e4:29:7d:28:01:d9:db:18:43:69:a1:1f: + b5:d3:86:16:dc:c7:7f:67:23:df:df:31:31:83:03: + 35:70:b1:4b:b7:c8:17:bb:51:cb:dc:94:17:db:ea: + 09:3b:76:12:de:aa:b5 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 65:C0:8D:25:F5:0C:BA:97:77:90:3F:9E:2E:E0:5A:F5:CE:D5:E1:E4 + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:a5:ae:e3:46:53:f8:98:36:e3:22:fa:2e:28: + 49:0d:ee:30:7e:33:f3:ec:3f:71:5e:cc:55:89:78:99:ac:b2: + fd:dc:1c:5c:33:8e:29:b9:6b:17:c8:11:68:b5:dc:83:07:02: + 31:00:9c:c8:44:da:69:c2:36:c3:54:19:10:85:02:da:9d:47: + ef:41:e7:6c:26:9d:09:3d:f7:6d:90:d1:05:44:2f:b0:bc:83: + 93:68:f2:0c:45:49:39:bf:99:04:1c:d3:10:a0 +SHA1 Fingerprint=84:F2:E3:DD:83:13:3E:A9:1D:19:52:7F:02:D7:29:BF:C1:5F:E6:67 +-----BEGIN CERTIFICATE----- +MIICqDCCAi2gAwIBAgIQIW4zpcvTiKRvKQe0JzzE2DAKBggqhkjOPQQDAzCBlDEL +MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD +VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD +bGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g +RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC +VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h +bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAxIFB1 +YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATXZrUb266zYO5G6ohjdTsqlG3zXxL24w+etgoUU0hS +yNw6s8tIICYSTvqJhNTfkeQpfSgB2dsYQ2mhH7XThhbcx39nI9/fMTGDAzVwsUu3 +yBe7UcvclBfb6gk7dhLeqrWjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBRlwI0l9Qy6l3eQP54u4Fr1ztXh5DAKBggqhkjOPQQD +AwNpADBmAjEApa7jRlP4mDbjIvouKEkN7jB+M/PsP3FezFWJeJmssv3cHFwzjim5 +axfIEWi13IMHAjEAnMhE2mnCNsNUGRCFAtqdR+9B52wmnQk9922Q0QVEL7C8g5No +8gxFSTm/mQQc0xCg +-----END CERTIFICATE----- Copied: head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem (from r364942, head/secure/caroot/trusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem Wed Sep 2 12:57:34 2020 (r365248, copy of r364942, head/secure/caroot/trusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem) @@ -0,0 +1,68 @@ +## +## Symantec Class 2 Public Primary Certification Authority - G4 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 34:17:65:12:40:3b:b7:56:80:2d:80:cb:79:55:a6:1e + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 2 Public Primary Certification Authority - G4 + Validity + Not Before: Oct 5 00:00:00 2011 GMT + Not After : Jan 18 23:59:59 2038 GMT + Subject: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 2 Public Primary Certification Authority - G4 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:d1:d9:4a:8e:4c:0d:84:4a:51:ba:7c:ef:d3:cc: + fa:3a:9a:b5:a7:63:13:3d:01:e0:49:3e:fa:c1:47: + c9:92:b3:3a:d7:fe:6f:9c:f7:9a:3a:0f:f5:0e:0a: + 0a:c3:3f:c8:e7:12:14:8e:d5:d5:6d:98:2c:b3:71: + 32:0a:eb:2a:bd:f6:d7:6a:20:0b:67:45:9c:d2:b2: + bf:53:22:66:09:5d:db:11:f3:f1:05:33:58:a3:e2: + b8:cf:7c:cd:82:9b:bd + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 3D:32:F3:3A:A9:0C:90:84:F9:A2:8C:69:06:61:54:2F:87:72:FE:05 + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:c8:a6:a9:af:41:7f:b5:c9:11:42:16:68:69: + 4c:5c:b8:27:18:b6:98:f1:c0:7f:90:6d:87:d3:8c:46:17:f0: + 3e:4f:fc:ea:b0:08:c4:7a:4b:bc:08:2f:c7:e2:a7:6f:65:02: + 31:00:d6:59:de:86:ce:5f:0e:ca:54:d5:c6:d0:15:0e:fc:8b: + 94:72:d4:8e:00:58:53:cf:7e:b1:4b:0d:e5:50:86:eb:9e:6b: + df:ff:29:a6:d8:47:d9:a0:96:18:db:f2:45:b3 +SHA1 Fingerprint=67:24:90:2E:48:01:B0:22:96:40:10:46:B4:B1:67:2C:A9:75:FD:2B +-----BEGIN CERTIFICATE----- +MIICqDCCAi2gAwIBAgIQNBdlEkA7t1aALYDLeVWmHjAKBggqhkjOPQQDAzCBlDEL +MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD +VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD +bGFzcyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g +RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC +VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h +bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAyIFB1 +YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATR2UqOTA2ESlG6fO/TzPo6mrWnYxM9AeBJPvrBR8mS +szrX/m+c95o6D/UOCgrDP8jnEhSO1dVtmCyzcTIK6yq99tdqIAtnRZzSsr9TImYJ +XdsR8/EFM1ij4rjPfM2Cm72jQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBQ9MvM6qQyQhPmijGkGYVQvh3L+BTAKBggqhkjOPQQD +AwNpADBmAjEAyKapr0F/tckRQhZoaUxcuCcYtpjxwH+QbYfTjEYX8D5P/OqwCMR6 +S7wIL8fip29lAjEA1lnehs5fDspU1cbQFQ78i5Ry1I4AWFPPfrFLDeVQhuuea9// +KabYR9mglhjb8kWz +-----END CERTIFICATE----- Copied: head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem (from r364942, head/secure/caroot/trusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Wed Sep 2 12:57:34 2020 (r365248, copy of r364942, head/secure/caroot/trusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem) @@ -0,0 +1,87 @@ +## +## Verisign Class 3 Public Primary Certification Authority - G3 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 1 (0x0) + Serial Number: + 9b:7e:06:49:a3:3e:62:b9:d5:ee:90:48:71:29:ef:57 + Signature Algorithm: sha1WithRSAEncryption + Issuer: C = US, O = "VeriSign, Inc.", OU = VeriSign Trust Network, OU = "(c) 1999 VeriSign, Inc. - For authorized use only", CN = VeriSign Class 3 Public Primary Certification Authority - G3 + Validity + Not Before: Oct 1 00:00:00 1999 GMT + Not After : Jul 16 23:59:59 2036 GMT + Subject: C = US, O = "VeriSign, Inc.", OU = VeriSign Trust Network, OU = "(c) 1999 VeriSign, Inc. - For authorized use only", CN = VeriSign Class 3 Public Primary Certification Authority - G3 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:cb:ba:9c:52:fc:78:1f:1a:1e:6f:1b:37:73:bd: + f8:c9:6b:94:12:30:4f:f0:36:47:f5:d0:91:0a:f5: + 17:c8:a5:61:c1:16:40:4d:fb:8a:61:90:e5:76:20: + c1:11:06:7d:ab:2c:6e:a6:f5:11:41:8e:fa:2d:ad: + 2a:61:59:a4:67:26:4c:d0:e8:bc:52:5b:70:20:04: + 58:d1:7a:c9:a4:69:bc:83:17:64:ad:05:8b:bc:d0: + 58:ce:8d:8c:f5:eb:f0:42:49:0b:9d:97:27:67:32: + 6e:e1:ae:93:15:1c:70:bc:20:4d:2f:18:de:92:88: + e8:6c:85:57:11:1a:e9:7e:e3:26:11:54:a2:45:96: + 55:83:ca:30:89:e8:dc:d8:a3:ed:2a:80:3f:7f:79: + 65:57:3e:15:20:66:08:2f:95:93:bf:aa:47:2f:a8: + 46:97:f0:12:e2:fe:c2:0a:2b:51:e6:76:e6:b7:46: + b7:e2:0d:a6:cc:a8:c3:4c:59:55:89:e6:e8:53:5c: + 1c:ea:9d:f0:62:16:0b:a7:c9:5f:0c:f0:de:c2:76: + ce:af:f7:6a:f2:fa:41:a6:a2:33:14:c9:e5:7a:63: + d3:9e:62:37:d5:85:65:9e:0e:e6:53:24:74:1b:5e: + 1d:12:53:5b:c7:2c:e7:83:49:3b:15:ae:8a:68:b9: + 57:97 + Exponent: 65537 (0x10001) + Signature Algorithm: sha1WithRSAEncryption + 11:14:96:c1:ab:92:08:f7:3f:2f:c9:b2:fe:e4:5a:9f:64:de: + db:21:4f:86:99:34:76:36:57:dd:d0:15:2f:c5:ad:7f:15:1f: + 37:62:73:3e:d4:e7:5f:ce:17:03:db:35:fa:2b:db:ae:60:09: + 5f:1e:5f:8f:6e:bb:0b:3d:ea:5a:13:1e:0c:60:6f:b5:c0:b5: + 23:22:2e:07:0b:cb:a9:74:cb:47:bb:1d:c1:d7:a5:6b:cc:2f: + d2:42:fd:49:dd:a7:89:cf:53:ba:da:00:5a:28:bf:82:df:f8: + ba:13:1d:50:86:82:fd:8e:30:8f:29:46:b0:1e:3d:35:da:38: + 62:16:18:4a:ad:e6:b6:51:6c:de:af:62:eb:01:d0:1e:24:fe: + 7a:8f:12:1a:12:68:b8:fb:66:99:14:14:45:5c:ae:e7:ae:69: + 17:81:2b:5a:37:c9:5e:2a:f4:c6:e2:a1:5c:54:9b:a6:54:00: + cf:f0:f1:c1:c7:98:30:1a:3b:36:16:db:a3:6e:ea:fd:ad:b2: + c2:da:ef:02:47:13:8a:c0:f1:b3:31:ad:4f:1c:e1:4f:9c:af: + 0f:0c:9d:f7:78:0d:d8:f4:35:56:80:da:b7:6d:17:8f:9d:1e: + 81:64:e1:fe:c5:45:ba:ad:6b:b9:0a:7a:4e:4f:4b:84:ee:4b: + f1:7d:dd:11 +SHA1 Fingerprint=13:2D:0D:45:53:4B:69:97:CD:B2:D5:C3:39:E2:55:76:60:9B:5C:C6 +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b +N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t +KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu +kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm +CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ +Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu +imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te +2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe +DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC +/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p +F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt +TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== +-----END CERTIFICATE----- From owner-svn-src-all@freebsd.org Wed Sep 2 14:28:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A31C53D8F49; Wed, 2 Sep 2020 14:28:55 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhRBv3tgBz4nTT; Wed, 2 Sep 2020 14:28:55 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63725BAE0; Wed, 2 Sep 2020 14:28:55 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082EStw2062828; Wed, 2 Sep 2020 14:28:55 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082EStuD062827; Wed, 2 Sep 2020 14:28:55 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009021428.082EStuD062827@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 2 Sep 2020 14:28:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365249 - head X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 365249 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 14:28:55 -0000 Author: imp Date: Wed Sep 2 14:28:54 2020 New Revision: 365249 URL: https://svnweb.freebsd.org/changeset/base/365249 Log: Add note about needing to manually import the zfs pools or update /etc/rc.d due to the cache file moving to /etc. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Sep 2 12:57:34 2020 (r365248) +++ head/UPDATING Wed Sep 2 14:28:54 2020 (r365249) @@ -36,6 +36,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: scenarios have been tested and fixed, but rebuilding kernels without rebuilding world may fail. + The ZFS cache file has moved from /boot to /etc to match the OpenZFS + upstream default. This means your zpool won't auto import until you + upgrade your /etc/rc.d files or you import them manually. + 20200824: The resume code now notifies devd with the 'kernel' system rather than the old 'kern' subsystem to be consistent with From owner-svn-src-all@freebsd.org Wed Sep 2 15:18:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B5783D9E90; Wed, 2 Sep 2020 15:18:18 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhSHs6WW1z4rFx; Wed, 2 Sep 2020 15:18:17 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from [192.168.0.5] (unknown [181.52.72.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: pfg) by smtp.freebsd.org (Postfix) with ESMTPSA id 2340024AA9; Wed, 2 Sep 2020 15:18:17 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Alexey Dokuchaev , Michael Tuexen Cc: Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> From: Pedro Giffuni Organization: FreeBSD Message-ID: Date: Wed, 2 Sep 2020 10:18:15 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200902020507.GA38274@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 15:18:18 -0000 On 01/09/2020 21:05, Alexey Dokuchaev wrote: > On Wed, Sep 02, 2020 at 12:41:43AM +0200, Michael Tuexen wrote: >>> On 1. Sep 2020, at 23:19, Mateusz Guzik wrote: >>> Author: mjg >>> Date: Tue Sep 1 21:19:14 2020 >>> New Revision: 365071 >>> URL: https://svnweb.freebsd.org/changeset/base/365071 >>> >>> Log: >>> net: clean up empty lines in .c and .h files >> Hi Mateusz, >> >> which rules are enforced? Why? > This is common sense. I can't count how often I wanted to hack on > something in the base/kernel and was turned away by this atrocious > excessive whitespace mess. > > Thank you Mateusz for cleaning this up. I honestly don't care much, but spaces do no harm and can make the code more readable. Sort of a silent comment, or what you do in written language when you start a new paragraph. Pedro. From owner-svn-src-all@freebsd.org Wed Sep 2 15:20:11 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CECD83DA10A; Wed, 2 Sep 2020 15:20:11 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhSL3567tz4rfJ; Wed, 2 Sep 2020 15:20:11 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 92774C74C; Wed, 2 Sep 2020 15:20:11 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082FKBlt094143; Wed, 2 Sep 2020 15:20:11 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082FKB3P094141; Wed, 2 Sep 2020 15:20:11 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202009021520.082FKB3P094141@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Wed, 2 Sep 2020 15:20:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365250 - in head/cddl/sbin: zfs zpool X-SVN-Group: head X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: in head/cddl/sbin: zfs zpool X-SVN-Commit-Revision: 365250 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 15:20:11 -0000 Author: freqlabs Date: Wed Sep 2 15:20:10 2020 New Revision: 365250 URL: https://svnweb.freebsd.org/changeset/base/365250 Log: Use MLINKS where appropriate for zfs/zpool subcommand pages Reported by: Julian H. Stacey Sponsored by: iXsystems, Inc. Modified: head/cddl/sbin/zfs/Makefile head/cddl/sbin/zpool/Makefile Modified: head/cddl/sbin/zfs/Makefile ============================================================================== --- head/cddl/sbin/zfs/Makefile Wed Sep 2 14:28:54 2020 (r365249) +++ head/cddl/sbin/zfs/Makefile Wed Sep 2 15:20:10 2020 (r365250) @@ -12,42 +12,43 @@ MAN= \ zfs.8 \ zfs-allow.8 \ zfs-bookmark.8 \ - zfs-change-key.8 \ zfs-clone.8 \ zfs-create.8 \ zfs-destroy.8 \ zfs-diff.8 \ - zfs-get.8 \ - zfs-groupspace.8 \ zfs-hold.8 \ - zfs-inherit.8 \ zfs-jail.8 \ zfs-list.8 \ zfs-load-key.8 \ zfs-mount.8 \ zfs-program.8 \ zfs-project.8 \ - zfs-projectspace.8 \ zfs-promote.8 \ zfs-receive.8 \ - zfs-recv.8 \ - zfs-redact.8 \ - zfs-release.8 \ zfs-rename.8 \ zfs-rollback.8 \ zfs-send.8 \ zfs-set.8 \ zfs-share.8 \ zfs-snapshot.8 \ - zfs-unallow.8 \ - zfs-unjail.8 \ - zfs-unload-key.8 \ - zfs-unmount.8 \ zfs-upgrade.8 \ zfs-userspace.8 \ zfs-wait.8 \ zfsconcepts.8 \ zfsprops.8 +MLINKS= \ + zfs-allow.8 zfs-unallow.8 \ + zfs-hold.8 zfs-release.8 \ + zfs-jail.8 zfs-unjail.8 \ + zfs-load-key.8 zfs-change-key.8 \ + zfs-load-key.8 zfs-unload-key.8 \ + zfs-mount.8 zfs-unmount.8 \ + zfs-receive.8 zfs-recv.8 \ + zfs-send.8 zfs-redact.8 \ + zfs-set.8 zfs-get.8 \ + zfs-set.8 zfs-inherit.8 \ + zfs-userspace.8 zfs-groupspace.8 \ + zfs-userspace.8 zfs-projectspace.8 SRCS= \ zfs_iter.c \ zfs_iter.h \ Modified: head/cddl/sbin/zpool/Makefile ============================================================================== --- head/cddl/sbin/zpool/Makefile Wed Sep 2 14:28:54 2020 (r365249) +++ head/cddl/sbin/zpool/Makefile Wed Sep 2 15:20:10 2020 (r365250) @@ -33,14 +33,12 @@ MAN= \ zpool-labelclear.8 \ zpool-list.8 \ zpool-offline.8 \ - zpool-online.8 \ zpool-reguid.8 \ zpool-remove.8 \ zpool-reopen.8 \ zpool-replace.8 \ zpool-resilver.8 \ zpool-scrub.8 \ - zpool-set.8 \ zpool-split.8 \ zpool-status.8 \ zpool-sync.8 \ @@ -49,6 +47,9 @@ MAN= \ zpool-wait.8 \ zpoolconcepts.8 \ zpoolprops.8 +MLINKS= \ + zpool-offline.8 zpool-online.8 \ + zpool-get.8 zpool-set.8 SRCS= \ zpool_iter.c \ zpool_main.c \ From owner-svn-src-all@freebsd.org Wed Sep 2 15:23:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E8A0C3DA064; Wed, 2 Sep 2020 15:23:07 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhSPR5xlQz4s23; Wed, 2 Sep 2020 15:23:07 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from Ryans-MBP.attlocal.net (unknown [IPv6:2600:1700:358a:c660:cc6b:be18:7e3b:e0e7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: freqlabs/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 87EE7249AB; Wed, 2 Sep 2020 15:23:07 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Subject: Re: svn commit: r365249 - head To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009021428.082EStuD062827@repo.freebsd.org> From: Ryan Moeller Message-ID: <9c0dfb3c-7dcf-b973-b2b5-95cf56dd4322@FreeBSD.org> Date: Wed, 2 Sep 2020 11:23:06 -0400 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <202009021428.082EStuD062827@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 15:23:08 -0000 On 9/2/20 10:28 AM, Warner Losh wrote: > Author: imp > Date: Wed Sep 2 14:28:54 2020 > New Revision: 365249 > URL: https://svnweb.freebsd.org/changeset/base/365249 > > Log: > Add note about needing to manually import the zfs pools or update > /etc/rc.d due to the cache file moving to /etc. > > Modified: > head/UPDATING > > Modified: head/UPDATING > ============================================================================== > --- head/UPDATING Wed Sep 2 12:57:34 2020 (r365248) > +++ head/UPDATING Wed Sep 2 14:28:54 2020 (r365249) > @@ -36,6 +36,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: > scenarios have been tested and fixed, but rebuilding kernels without > rebuilding world may fail. > > + The ZFS cache file has moved from /boot to /etc to match the OpenZFS > + upstream default. This means your zpool won't auto import until you > + upgrade your /etc/rc.d files or you import them manually. > + > 20200824: > The resume code now notifies devd with the 'kernel' system > rather than the old 'kern' subsystem to be consistent with Thanks, enough people seemed to be getting tripped up by this. -Ryan From owner-svn-src-all@freebsd.org Wed Sep 2 15:43:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D78FA3DA771; Wed, 2 Sep 2020 15:43:34 +0000 (UTC) (envelope-from agapon@gmail.com) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhSs15C0qz4sxt; Wed, 2 Sep 2020 15:43:33 +0000 (UTC) (envelope-from agapon@gmail.com) Received: by mail-lj1-f195.google.com with SMTP id v23so6511047ljd.1; Wed, 02 Sep 2020 08:43:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=5heUVIthHBENUHQcHDCc0ZYHTf0MJvhhJttRiwAWHM4=; b=EztpszmcEL2nUcrHBNjDfQYPrn6diiYwO7Epbnqgwt4d/tgXCEBIzYs0GA3Qg+4xT3 Bj7+r01V1qaH1WiT0xbvKgz0RKTr6ZkCnKgzfD9YnzZbaO5KzG9MBIg80/5jsS+83k+q EF3CWABG/AXN9vun+lW+fMjEh4Pj95VbFu00Lx+aB8/9EURwIiujTKN2tLEpb9hX2Q04 7zIWi44EBIGlb4QNeue0AP6tvxMd89920U5SPlBBdbvLh4Gss6Ubkbz2+SP310n04FIh 0Zf3/zGcWAFzm4IoEBvJ9UWwwgMSDl3uoFVBLtNvf2lMfWdlpIMCwz2vAG2VFbyGKkMp 57pQ== X-Gm-Message-State: AOAM530JdNLY5BM+IhDrb1U9m252BZf7loI99LrT6FzWl5F9FwE94H49 dNlr74gEg1IJHQL/mR9u+iiwgDYv4wI= X-Google-Smtp-Source: ABdhPJwMwJX0JtWUB8y///6A+blGJUg1Bs19zEYz3wzakg1JLgLiQj9eum/lb5ZSFOcKP4/ZDWurEA== X-Received: by 2002:a2e:9103:: with SMTP id m3mr3381634ljg.94.1599061411665; Wed, 02 Sep 2020 08:43:31 -0700 (PDT) Received: from [192.168.0.88] (east.meadow.volia.net. [93.72.151.96]) by smtp.googlemail.com with ESMTPSA id a21sm1047437ljh.114.2020.09.02.08.43.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Sep 2020 08:43:30 -0700 (PDT) Subject: Re: svn commit: r365249 - head To: Ryan Moeller , Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009021428.082EStuD062827@repo.freebsd.org> <9c0dfb3c-7dcf-b973-b2b5-95cf56dd4322@FreeBSD.org> From: Andriy Gapon Openpgp: preference=signencrypt Autocrypt: addr=avg@FreeBSD.org; prefer-encrypt=mutual; keydata= mQINBFm4LIgBEADNB/3lT7f15UKeQ52xCFQx/GqHkSxEdVyLFZTmY3KyNPQGBtyvVyBfprJ7 mAeXZWfhat6cKNRAGZcL5EmewdQuUfQfBdYmKjbw3a9GFDsDNuhDA2QwFt8BmkiVMRYyvI7l N0eVzszWCUgdc3qqM6qqcgBaqsVmJluwpvwp4ZBXmch5BgDDDb1MPO8AZ2QZfIQmplkj8Y6Z AiNMknkmgaekIINSJX8IzRzKD5WwMsin70psE8dpL/iBsA2cpJGzWMObVTtCxeDKlBCNqM1i gTXta1ukdUT7JgLEFZk9ceYQQMJJtUwzWu1UHfZn0Fs29HTqawfWPSZVbulbrnu5q55R4PlQ /xURkWQUTyDpqUvb4JK371zhepXiXDwrrpnyyZABm3SFLkk2bHlheeKU6Yql4pcmSVym1AS4 dV8y0oHAfdlSCF6tpOPf2+K9nW1CFA8b/tw4oJBTtfZ1kxXOMdyZU5fiG7xb1qDgpQKgHUX8 7Rd2T1UVLVeuhYlXNw2F+a2ucY+cMoqz3LtpksUiBppJhw099gEXehcN2JbUZ2TueJdt1FdS ztnZmsHUXLxrRBtGwqnFL7GSd6snpGIKuuL305iaOGODbb9c7ne1JqBbkw1wh8ci6vvwGlzx rexzimRaBzJxlkjNfMx8WpCvYebGMydNoeEtkWldtjTNVsUAtQARAQABtB5BbmRyaXkgR2Fw b24gPGF2Z0BGcmVlQlNELm9yZz6JAlQEEwEIAD4WIQS+LEO7ngQnXA4Bjr538m7TUc1yjwUC WbgsiAIbIwUJBaOagAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRB38m7TUc1yj+JAEACV l9AK/nOWAt/9cufV2fRj0hdOqB1aCshtSrwHk/exXsDa4/FkmegxXQGY+3GWX3deIyesbVRL rYdtdK0dqJyT1SBqXK1h3/at9rxr9GQA6KWOxTjUFURsU7ok/6SIlm8uLRPNKO+yq0GDjgaO LzN+xykuBA0FlhQAXJnpZLcVfPJdWv7sSHGedL5ln8P8rxR+XnmsA5TUaaPcbhTB+mG+iKFj GghASDSfGqLWFPBlX/fpXikBDZ1gvOr8nyMY9nXhgfXpq3B6QCRYKPy58ChrZ5weeJZ29b7/ QdEO8NFNWHjSD9meiLdWQaqo9Y7uUxN3wySc/YUZxtS0bhAd8zJdNPsJYG8sXgKjeBQMVGuT eCAJFEYJqbwWvIXMfVWop4+O4xB+z2YE3jAbG/9tB/GSnQdVSj3G8MS80iLS58frnt+RSEw/ psahrfh0dh6SFHttE049xYiC+cM8J27Aaf0i9RflyITq57NuJm+AHJoU9SQUkIF0nc6lfA+o JRiyRlHZHKoRQkIg4aiKaZSWjQYRl5Txl0IZUP1dSWMX4s3XTMurC/pnja45dge/4ESOtJ9R 8XuIWg45Oq6MeIWdjKddGhRj3OohsltKgkEU3eLKYtB6qRTQypHHUawCXz88uYt5e3w4V16H lCpSTZV/EVHnNe45FVBlvK7k7HFfDDkryLkCDQRZuCyIARAAlq0slcsVboY/+IUJdcbEiJRW be9HKVz4SUchq0z9MZPX/0dcnvz/gkyYA+OuM78dNS7Mbby5dTvOqfpLJfCuhaNYOhlE0wY+ 1T6Tf1f4c/uA3U/YiadukQ3+6TJuYGAdRZD5EqYFIkreARTVWg87N9g0fT9BEqLw9lJtEGDY EWUE7L++B8o4uu3LQFEYxcrb4K/WKmgtmFcm77s0IKDrfcX4doV92QTIpLiRxcOmCC/OCYuO jB1oaaqXQzZrCutXRK0L5XN1Y1PYjIrEzHMIXmCDlLYnpFkK+itlXwlE2ZQxkfMruCWdQXye syl2fynAe8hvp7Mms9qU2r2K9EcJiR5N1t1C2/kTKNUhcRv7Yd/vwusK7BqJbhlng5ZgRx0m WxdntU/JLEntz3QBsBsWM9Y9wf2V4tLv6/DuDBta781RsCB/UrU2zNuOEkSixlUiHxw1dccI 6CVlaWkkJBxmHX22GdDFrcjvwMNIbbyfQLuBq6IOh8nvu9vuItup7qemDG3Ms6TVwA7BD3j+ 3fGprtyW8Fd/RR2bW2+LWkMrqHffAr6Y6V3h5kd2G9Q8ZWpEJk+LG6Mk3fhZhmCnHhDu6CwN MeUvxXDVO+fqc3JjFm5OxhmfVeJKrbCEUJyM8ESWLoNHLqjywdZga4Q7P12g8DUQ1mRxYg/L HgZY3zfKOqcAEQEAAYkCPAQYAQgAJhYhBL4sQ7ueBCdcDgGOvnfybtNRzXKPBQJZuCyIAhsM BQkFo5qAAAoJEHfybtNRzXKPBVwQAKfFy9P7N3OsLDMB56A4Kf+ZT+d5cIx0Yiaf4n6w7m3i ImHHHk9FIetI4Xe54a2IXh4Bq5UkAGY0667eIs+Z1Ea6I2i27Sdo7DxGwq09Qnm/Y65ADvXs 3aBvokCcm7FsM1wky395m8xUos1681oV5oxgqeRI8/76qy0hD9WR65UW+HQgZRIcIjSel9vR XDaD2HLGPTTGr7u4v00UeTMs6qvPsa2PJagogrKY8RXdFtXvweQFz78NbXhluwix2Tb9ETPk LIpDrtzV73CaE2aqBG/KrboXT2C67BgFtnk7T7Y7iKq4/XvEdDWscz2wws91BOXuMMd4c/c4 OmGW9m3RBLufFrOag1q5yUS9QbFfyqL6dftJP3Zq/xe+mr7sbWbhPVCQFrH3r26mpmy841ym dwQnNcsbIGiBASBSKksOvIDYKa2Wy8htPmWFTEOPRpFXdGQ27awcjjnB42nngyCK5ukZDHi6 w0qK5DNQQCkiweevCIC6wc3p67jl1EMFY5+z+zdTPb3h7LeVnGqW0qBQl99vVFgzLxchKcl0 R/paSFgwqXCZhAKMuUHncJuynDOP7z5LirUeFI8qsBAJi1rXpQoLJTVcW72swZ42IdPiboqx NbTMiNOiE36GqMcTPfKylCbF45JNX4nF9ElM0E+Y8gi4cizJYBRr2FBJgay0b9Cp Message-ID: <780dd0e7-c521-e83a-7d57-aa0e99d64b75@FreeBSD.org> Date: Wed, 2 Sep 2020 18:43:29 +0300 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Firefox/60.0 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <9c0dfb3c-7dcf-b973-b2b5-95cf56dd4322@FreeBSD.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4BhSs15C0qz4sxt X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of agapon@gmail.com designates 209.85.208.195 as permitted sender) smtp.mailfrom=agapon@gmail.com X-Spamd-Result: default: False [-1.38 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; ARC_NA(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-0.99)[-0.991]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-0.24)[-0.240]; NEURAL_HAM_SHORT(-0.15)[-0.149]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.195:from]; RECEIVED_SPAMHAUS_PBL(0.00)[93.72.151.96:received]; FORGED_SENDER(0.30)[avg@FreeBSD.org,agapon@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.195:from]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[avg@FreeBSD.org,agapon@gmail.com]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 15:43:34 -0000 On 02/09/2020 18:23, Ryan Moeller wrote: > > On 9/2/20 10:28 AM, Warner Losh wrote: >> Author: imp >> Date: Wed Sep  2 14:28:54 2020 >> New Revision: 365249 >> URL: https://svnweb.freebsd.org/changeset/base/365249 >> >> Log: >>    Add note about needing to manually import the zfs pools or update >>    /etc/rc.d due to the cache file moving to /etc. >> >> Modified: >>    head/UPDATING >> >> Modified: head/UPDATING >> ============================================================================== >> --- head/UPDATING    Wed Sep  2 12:57:34 2020    (r365248) >> +++ head/UPDATING    Wed Sep  2 14:28:54 2020    (r365249) >> @@ -36,6 +36,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: >>       scenarios have been tested and fixed, but rebuilding kernels without >>       rebuilding world may fail. >>   +    The ZFS cache file has moved from /boot to /etc to match the OpenZFS >> +    upstream default. This means your zpool won't auto import until you >> +    upgrade your /etc/rc.d files or you import them manually. >> + >>   20200824: >>       The resume code now notifies devd with the 'kernel' system >>       rather than the old 'kern' subsystem to be consistent with > Thanks, enough people seemed to be getting tripped up by this. I think that this is a very useful note. But I do not see a direct connection between the change of zpool.cache location and the new ZFS's not automatically importing zpool.cache pools on boot. -- Andriy Gapon From owner-svn-src-all@freebsd.org Wed Sep 2 15:53:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E22F73DACE0; Wed, 2 Sep 2020 15:53:58 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhT525fsHz4tsW; Wed, 2 Sep 2020 15:53:58 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from Ryans-MBP.attlocal.net (unknown [IPv6:2600:1700:358a:c660:cc6b:be18:7e3b:e0e7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: freqlabs/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 688A224DE9; Wed, 2 Sep 2020 15:53:58 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Subject: Re: svn commit: r365249 - head To: Andriy Gapon , Ryan Moeller , Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009021428.082EStuD062827@repo.freebsd.org> <9c0dfb3c-7dcf-b973-b2b5-95cf56dd4322@FreeBSD.org> <780dd0e7-c521-e83a-7d57-aa0e99d64b75@FreeBSD.org> From: Ryan Moeller Message-ID: <72524bda-bc15-cc19-2a7f-21a56e7d6ba5@FreeBSD.org> Date: Wed, 2 Sep 2020 11:53:57 -0400 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <780dd0e7-c521-e83a-7d57-aa0e99d64b75@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 15:53:58 -0000 On 9/2/20 11:43 AM, Andriy Gapon wrote: > On 02/09/2020 18:23, Ryan Moeller wrote: >> On 9/2/20 10:28 AM, Warner Losh wrote: >>> Author: imp >>> Date: Wed Sep  2 14:28:54 2020 >>> New Revision: 365249 >>> URL: https://svnweb.freebsd.org/changeset/base/365249 >>> >>> Log: >>>    Add note about needing to manually import the zfs pools or update >>>    /etc/rc.d due to the cache file moving to /etc. >>> >>> Modified: >>>    head/UPDATING >>> >>> Modified: head/UPDATING >>> ============================================================================== >>> --- head/UPDATING    Wed Sep  2 12:57:34 2020    (r365248) >>> +++ head/UPDATING    Wed Sep  2 14:28:54 2020    (r365249) >>> @@ -36,6 +36,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: >>>       scenarios have been tested and fixed, but rebuilding kernels without >>>       rebuilding world may fail. >>>   +    The ZFS cache file has moved from /boot to /etc to match the OpenZFS >>> +    upstream default. This means your zpool won't auto import until you >>> +    upgrade your /etc/rc.d files or you import them manually. >>> + >>>   20200824: >>>       The resume code now notifies devd with the 'kernel' system >>>       rather than the old 'kern' subsystem to be consistent with >> Thanks, enough people seemed to be getting tripped up by this. > I think that this is a very useful note. > > But I do not see a direct connection between the change of zpool.cache location > and the new ZFS's not automatically importing zpool.cache pools on boot. > True, the real reason is that the kernel module in OpenZFS does not autoimport pools. Instead we explicitly "zpool import -a" in one of the ZFS rc scripts. I'll amend the UPDATING message. -Ryan From owner-svn-src-all@freebsd.org Wed Sep 2 15:55:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 29ADE3DB01E; Wed, 2 Sep 2020 15:55:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhT6Y0Ngpz4v1f; Wed, 2 Sep 2020 15:55:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C6DC4CA72; Wed, 2 Sep 2020 15:55:16 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082FtGQX018237; Wed, 2 Sep 2020 15:55:16 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082FtGNT018236; Wed, 2 Sep 2020 15:55:16 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202009021555.082FtGNT018236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 2 Sep 2020 15:55:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365251 - head/sys/amd64/amd64 X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/amd64/amd64 X-SVN-Commit-Revision: 365251 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 15:55:17 -0000 Author: kib Date: Wed Sep 2 15:55:16 2020 New Revision: 365251 URL: https://svnweb.freebsd.org/changeset/base/365251 Log: Fix a page table pages leak after LA57. If the call to _pmap_allocpte() is not sleepable, it is possible that allocation of PML4 or PDP page is successful but either PDP or PD page is not. Restructured code in _pmap_allocpte() leaves zero-referenced page in the paging structure. Handle it by checking refcount of the page one level above failed alloc and free that page if its reference count is zero. Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D26293 Modified: head/sys/amd64/amd64/pmap.c Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Wed Sep 2 15:20:10 2020 (r365250) +++ head/sys/amd64/amd64/pmap.c Wed Sep 2 15:55:16 2020 (r365251) @@ -4101,6 +4101,21 @@ pmap_pinit(pmap_t pmap) return (pmap_pinit_type(pmap, PT_X86, pmap_flags)); } +static void +pmap_allocpte_free_unref(pmap_t pmap, vm_offset_t va, pt_entry_t *pte) +{ + vm_page_t mpg; + struct spglist free; + + mpg = PHYS_TO_VM_PAGE(*pte & PG_FRAME); + if (mpg->ref_count != 0) + return; + SLIST_INIT(&free); + _pmap_unwire_ptp(pmap, va, mpg, &free); + pmap_invalidate_page(pmap, va); + vm_page_free_pages_toq(&free, true); +} + static pml4_entry_t * pmap_allocpte_getpml4(pmap_t pmap, struct rwlock **lockp, vm_offset_t va, bool addref) @@ -4157,8 +4172,12 @@ pmap_allocpte_getpdp(pmap_t pmap, struct rwlock **lock if ((*pml4 & PG_V) == 0) { /* Have to allocate a new pdp, recurse */ if (_pmap_allocpte(pmap, pmap_pml4e_pindex(va), lockp, va) == - NULL) + NULL) { + if (pmap_is_la57(pmap)) + pmap_allocpte_free_unref(pmap, va, + pmap_pml5e(pmap, va)); return (NULL); + } allocated = true; } else { allocated = false; @@ -4332,6 +4351,8 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, str /* Have to allocate a new pd, recurse */ if (_pmap_allocpte(pmap, pmap_pdpe_pindex(va), lockp, va) == NULL) { + pmap_allocpte_free_unref(pmap, va, + pmap_pml4e(pmap, va)); vm_page_unwire_noq(m); vm_page_free_zero(m); return (NULL); From owner-svn-src-all@freebsd.org Wed Sep 2 16:03:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D7F6C3DB16B; Wed, 2 Sep 2020 16:03:33 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhTJ55Qmpz4vFN; Wed, 2 Sep 2020 16:03:33 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DF18CEBA; Wed, 2 Sep 2020 16:03:33 +0000 (UTC) (envelope-from freqlabs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082G3Xu7024414; Wed, 2 Sep 2020 16:03:33 GMT (envelope-from freqlabs@FreeBSD.org) Received: (from freqlabs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082G3XYT024413; Wed, 2 Sep 2020 16:03:33 GMT (envelope-from freqlabs@FreeBSD.org) Message-Id: <202009021603.082G3XYT024413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to freqlabs@FreeBSD.org using -f From: Ryan Moeller Date: Wed, 2 Sep 2020 16:03:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365252 - head X-SVN-Group: head X-SVN-Commit-Author: freqlabs X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 365252 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 16:03:33 -0000 Author: freqlabs Date: Wed Sep 2 16:03:33 2020 New Revision: 365252 URL: https://svnweb.freebsd.org/changeset/base/365252 Log: Correct and expand on OpenZFS cache file and auto import Reported by: avg Sponsored by: iXsystems, Inc. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Sep 2 15:55:16 2020 (r365251) +++ head/UPDATING Wed Sep 2 16:03:33 2020 (r365252) @@ -37,8 +37,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: rebuilding world may fail. The ZFS cache file has moved from /boot to /etc to match the OpenZFS - upstream default. This means your zpool won't auto import until you - upgrade your /etc/rc.d files or you import them manually. + upstream default. A fallback to /boot has been added for mountroot. + + Pool auto import behavior at boot has been moved from the kernel module + to an explicit "zpool import -a" in one of the rc scripts enabled by + zfs_enable=YES. This means your non-root zpools won't auto import until + you upgrade your /etc/rc.d files. 20200824: The resume code now notifies devd with the 'kernel' system From owner-svn-src-all@freebsd.org Wed Sep 2 16:21:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D54E33DB8FF; Wed, 2 Sep 2020 16:21:28 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhThm5Lj8z3SMH; Wed, 2 Sep 2020 16:21:28 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9AC6AD35D; Wed, 2 Sep 2020 16:21:28 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082GLSra034069; Wed, 2 Sep 2020 16:21:28 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082GLSVd034066; Wed, 2 Sep 2020 16:21:28 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009021621.082GLSVd034066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Wed, 2 Sep 2020 16:21:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365253 - in releng: 11.3/sys/compat/linux 11.4/sys/compat/linux 12.1/sys/compat/linux X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/sys/compat/linux 11.4/sys/compat/linux 12.1/sys/compat/linux X-SVN-Commit-Revision: 365253 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 16:21:28 -0000 Author: gordon Date: Wed Sep 2 16:21:27 2020 New Revision: 365253 URL: https://svnweb.freebsd.org/changeset/base/365253 Log: Fix FreeBSD Linux ABI kernel panic. Approved by: so Security: FreeBSD-EN-20:17.linuxthread Modified: releng/11.3/sys/compat/linux/linux_emul.c releng/11.4/sys/compat/linux/linux_emul.c releng/12.1/sys/compat/linux/linux_emul.c Modified: releng/11.3/sys/compat/linux/linux_emul.c ============================================================================== --- releng/11.3/sys/compat/linux/linux_emul.c Wed Sep 2 16:03:33 2020 (r365252) +++ releng/11.3/sys/compat/linux/linux_emul.c Wed Sep 2 16:21:27 2020 (r365253) @@ -261,22 +261,13 @@ linux_common_execve(struct thread *td, struct image_ar void linux_proc_exec(void *arg __unused, struct proc *p, struct image_params *imgp) { - struct thread *td = curthread; + struct thread *td; struct thread *othertd; #if defined(__amd64__) struct linux_pemuldata *pem; #endif - /* - * In a case of execing from Linux binary properly detach - * other threads from the user space. - */ - if (__predict_false(SV_PROC_ABI(p) == SV_ABI_LINUX)) { - FOREACH_THREAD_IN_PROC(p, othertd) { - if (td != othertd) - (p->p_sysent->sv_thread_detach)(othertd); - } - } + td = curthread; /* * In a case of execing to Linux binary we create Linux @@ -284,11 +275,32 @@ linux_proc_exec(void *arg __unused, struct proc *p, st */ if (__predict_false((imgp->sysent->sv_flags & SV_ABI_MASK) == SV_ABI_LINUX)) { - - if (SV_PROC_ABI(p) == SV_ABI_LINUX) + if (SV_PROC_ABI(p) == SV_ABI_LINUX) { + /* + * Process already was under Linuxolator + * before exec. Update emuldata to reflect + * single-threaded cleaned state after exec. + */ linux_proc_init(td, NULL, 0); - else + } else { + /* + * We are switching the process to Linux emulator. + */ linux_proc_init(td, td, 0); + + /* + * Create a transient td_emuldata for all suspended + * threads, so that p->p_sysent->sv_thread_detach() == + * linux_thread_detach() can find expected but unused + * emuldata. + */ + FOREACH_THREAD_IN_PROC(td->td_proc, othertd) { + if (othertd != td) { + linux_proc_init(td, othertd, + LINUX_CLONE_THREAD); + } + } + } #if defined(__amd64__) /* * An IA32 executable which has executable stack will have the Modified: releng/11.4/sys/compat/linux/linux_emul.c ============================================================================== --- releng/11.4/sys/compat/linux/linux_emul.c Wed Sep 2 16:03:33 2020 (r365252) +++ releng/11.4/sys/compat/linux/linux_emul.c Wed Sep 2 16:21:27 2020 (r365253) @@ -261,22 +261,13 @@ linux_common_execve(struct thread *td, struct image_ar void linux_proc_exec(void *arg __unused, struct proc *p, struct image_params *imgp) { - struct thread *td = curthread; + struct thread *td; struct thread *othertd; #if defined(__amd64__) struct linux_pemuldata *pem; #endif - /* - * In a case of execing from Linux binary properly detach - * other threads from the user space. - */ - if (__predict_false(SV_PROC_ABI(p) == SV_ABI_LINUX)) { - FOREACH_THREAD_IN_PROC(p, othertd) { - if (td != othertd) - (p->p_sysent->sv_thread_detach)(othertd); - } - } + td = curthread; /* * In a case of execing to Linux binary we create Linux @@ -284,11 +275,32 @@ linux_proc_exec(void *arg __unused, struct proc *p, st */ if (__predict_false((imgp->sysent->sv_flags & SV_ABI_MASK) == SV_ABI_LINUX)) { - - if (SV_PROC_ABI(p) == SV_ABI_LINUX) + if (SV_PROC_ABI(p) == SV_ABI_LINUX) { + /* + * Process already was under Linuxolator + * before exec. Update emuldata to reflect + * single-threaded cleaned state after exec. + */ linux_proc_init(td, NULL, 0); - else + } else { + /* + * We are switching the process to Linux emulator. + */ linux_proc_init(td, td, 0); + + /* + * Create a transient td_emuldata for all suspended + * threads, so that p->p_sysent->sv_thread_detach() == + * linux_thread_detach() can find expected but unused + * emuldata. + */ + FOREACH_THREAD_IN_PROC(td->td_proc, othertd) { + if (othertd != td) { + linux_proc_init(td, othertd, + LINUX_CLONE_THREAD); + } + } + } #if defined(__amd64__) /* * An IA32 executable which has executable stack will have the Modified: releng/12.1/sys/compat/linux/linux_emul.c ============================================================================== --- releng/12.1/sys/compat/linux/linux_emul.c Wed Sep 2 16:03:33 2020 (r365252) +++ releng/12.1/sys/compat/linux/linux_emul.c Wed Sep 2 16:21:27 2020 (r365253) @@ -261,22 +261,13 @@ linux_common_execve(struct thread *td, struct image_ar void linux_proc_exec(void *arg __unused, struct proc *p, struct image_params *imgp) { - struct thread *td = curthread; + struct thread *td; struct thread *othertd; #if defined(__amd64__) struct linux_pemuldata *pem; #endif - /* - * In a case of execing from Linux binary properly detach - * other threads from the user space. - */ - if (__predict_false(SV_PROC_ABI(p) == SV_ABI_LINUX)) { - FOREACH_THREAD_IN_PROC(p, othertd) { - if (td != othertd) - (p->p_sysent->sv_thread_detach)(othertd); - } - } + td = curthread; /* * In a case of execing to Linux binary we create Linux @@ -284,11 +275,32 @@ linux_proc_exec(void *arg __unused, struct proc *p, st */ if (__predict_false((imgp->sysent->sv_flags & SV_ABI_MASK) == SV_ABI_LINUX)) { - - if (SV_PROC_ABI(p) == SV_ABI_LINUX) + if (SV_PROC_ABI(p) == SV_ABI_LINUX) { + /* + * Process already was under Linuxolator + * before exec. Update emuldata to reflect + * single-threaded cleaned state after exec. + */ linux_proc_init(td, NULL, 0); - else + } else { + /* + * We are switching the process to Linux emulator. + */ linux_proc_init(td, td, 0); + + /* + * Create a transient td_emuldata for all suspended + * threads, so that p->p_sysent->sv_thread_detach() == + * linux_thread_detach() can find expected but unused + * emuldata. + */ + FOREACH_THREAD_IN_PROC(td->td_proc, othertd) { + if (othertd != td) { + linux_proc_init(td, othertd, + LINUX_CLONE_THREAD); + } + } + } #if defined(__amd64__) /* * An IA32 executable which has executable stack will have the From owner-svn-src-all@freebsd.org Wed Sep 2 16:22:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D09163DBD9B; Wed, 2 Sep 2020 16:22:14 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhTjf5G2Hz3Sfq; Wed, 2 Sep 2020 16:22:14 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9909CD24C; Wed, 2 Sep 2020 16:22:14 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082GMEZ8036298; Wed, 2 Sep 2020 16:22:14 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082GMEXj036002; Wed, 2 Sep 2020 16:22:14 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009021622.082GMEXj036002@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Wed, 2 Sep 2020 16:22:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365254 - in releng: 11.3/sys/kern 11.4/sys/kern X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/sys/kern 11.4/sys/kern X-SVN-Commit-Revision: 365254 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 16:22:14 -0000 Author: gordon Date: Wed Sep 2 16:22:14 2020 New Revision: 365254 URL: https://svnweb.freebsd.org/changeset/base/365254 Log: Fix getfsstat compatibility system call panic. Approved by: so Security: FreeBSD-EN-20:18.getfsstat Modified: releng/11.3/sys/kern/vfs_syscalls.c releng/11.4/sys/kern/vfs_syscalls.c Modified: releng/11.3/sys/kern/vfs_syscalls.c ============================================================================== --- releng/11.3/sys/kern/vfs_syscalls.c Wed Sep 2 16:21:27 2020 (r365253) +++ releng/11.3/sys/kern/vfs_syscalls.c Wed Sep 2 16:22:14 2020 (r365254) @@ -409,6 +409,8 @@ kern_getfsstat(struct thread *td, struct statfs **buf, case MNT_NOWAIT: break; default: + if (bufseg == UIO_SYSSPACE) + *buf = NULL; return (EINVAL); } restart: Modified: releng/11.4/sys/kern/vfs_syscalls.c ============================================================================== --- releng/11.4/sys/kern/vfs_syscalls.c Wed Sep 2 16:21:27 2020 (r365253) +++ releng/11.4/sys/kern/vfs_syscalls.c Wed Sep 2 16:22:14 2020 (r365254) @@ -409,6 +409,8 @@ kern_getfsstat(struct thread *td, struct statfs **buf, case MNT_NOWAIT: break; default: + if (bufseg == UIO_SYSSPACE) + *buf = NULL; return (EINVAL); } restart: From owner-svn-src-all@freebsd.org Wed Sep 2 16:23:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C69103DC088 for ; Wed, 2 Sep 2020 16:23:10 +0000 (UTC) (envelope-from tsoome@me.com) Received: from pv50p00im-tydg10021701.me.com (pv50p00im-tydg10021701.me.com [17.58.6.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhTkk0Jhkz3SvR for ; Wed, 2 Sep 2020 16:23:09 +0000 (UTC) (envelope-from tsoome@me.com) Received: from nazgul.lan (148-52-235-80.sta.estpak.ee [80.235.52.148]) by pv50p00im-tydg10021701.me.com (Postfix) with ESMTPSA id 86841840705; Wed, 2 Sep 2020 16:23:05 +0000 (UTC) From: Toomas Soome Message-Id: <045C502C-7650-4345-BAF4-A2AF1D5441AA@me.com> Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: svn commit: r365249 - head Date: Wed, 2 Sep 2020 19:23:03 +0300 In-Reply-To: <72524bda-bc15-cc19-2a7f-21a56e7d6ba5@FreeBSD.org> Cc: Andriy Gapon , Warner Losh , src-committers , svn-src-all , svn-src-head@freebsd.org To: Ryan Moeller References: <202009021428.082EStuD062827@repo.freebsd.org> <9c0dfb3c-7dcf-b973-b2b5-95cf56dd4322@FreeBSD.org> <780dd0e7-c521-e83a-7d57-aa0e99d64b75@FreeBSD.org> <72524bda-bc15-cc19-2a7f-21a56e7d6ba5@FreeBSD.org> X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-09-02_11:2020-09-02, 2020-09-02 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-2006250000 definitions=main-2009020157 X-Rspamd-Queue-Id: 4BhTkk0Jhkz3SvR X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.35 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[me.com]; MV_CASE(0.50)[]; RWL_MAILSPIKE_GOOD(0.00)[17.58.6.54:from]; R_SPF_ALLOW(-0.20)[+ip4:17.58.0.0/16]; RCPT_COUNT_FIVE(0.00)[6]; DKIM_TRACE(0.00)[me.com:+]; DMARC_POLICY_ALLOW(-0.50)[me.com,quarantine]; NEURAL_HAM_SHORT(-0.68)[-0.675]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[me.com]; ASN(0.00)[asn:714, ipnet:17.58.0.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[17.58.6.54:from]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.04)[-1.039]; R_DKIM_ALLOW(-0.20)[me.com:s=1a1hai]; FREEFALL_USER(0.00)[tsoome]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.03)[-1.033]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DWL_DNSWL_LOW(-1.00)[me.com:dkim]; RECEIVED_SPAMHAUS_PBL(0.00)[80.235.52.148:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all] Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 16:23:10 -0000 > On 2. Sep 2020, at 18:53, Ryan Moeller wrote: >=20 >=20 > On 9/2/20 11:43 AM, Andriy Gapon wrote: >> On 02/09/2020 18:23, Ryan Moeller wrote: >>> On 9/2/20 10:28 AM, Warner Losh wrote: >>>> Author: imp >>>> Date: Wed Sep 2 14:28:54 2020 >>>> New Revision: 365249 >>>> URL: https://svnweb.freebsd.org/changeset/base/365249 >>>>=20 >>>> Log: >>>> Add note about needing to manually import the zfs pools or = update >>>> /etc/rc.d due to the cache file moving to /etc. >>>>=20 >>>> Modified: >>>> head/UPDATING >>>>=20 >>>> Modified: head/UPDATING >>>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>>> --- head/UPDATING Wed Sep 2 12:57:34 2020 (r365248) >>>> +++ head/UPDATING Wed Sep 2 14:28:54 2020 (r365249) >>>> @@ -36,6 +36,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS = SLOW: >>>> scenarios have been tested and fixed, but rebuilding kernels = without >>>> rebuilding world may fail. >>>> + The ZFS cache file has moved from /boot to /etc to match the = OpenZFS >>>> + upstream default. This means your zpool won't auto import = until you >>>> + upgrade your /etc/rc.d files or you import them manually. >>>> + >>>> 20200824: >>>> The resume code now notifies devd with the 'kernel' system >>>> rather than the old 'kern' subsystem to be consistent with >>> Thanks, enough people seemed to be getting tripped up by this. >> I think that this is a very useful note. >>=20 >> But I do not see a direct connection between the change of = zpool.cache location >> and the new ZFS's not automatically importing zpool.cache pools on = boot. >>=20 >=20 > True, the real reason is that the kernel module in OpenZFS does not = autoimport pools. > Instead we explicitly "zpool import -a" in one of the ZFS rc scripts. = I'll amend the > UPDATING message. >=20 > -Ryan please note that zpool import -a can be dangerous for multihomed = setups. rgds, toomas From owner-svn-src-all@freebsd.org Wed Sep 2 16:23:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B5E6D3DC106; Wed, 2 Sep 2020 16:23:16 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhTkr0plVz3T3v; Wed, 2 Sep 2020 16:23:16 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DBEEDCFCD; Wed, 2 Sep 2020 16:23:15 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082GNFVI036762; Wed, 2 Sep 2020 16:23:15 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082GNFQL036761; Wed, 2 Sep 2020 16:23:15 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009021623.082GNFQL036761@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Wed, 2 Sep 2020 16:23:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365255 - releng/11.3/sys/netinet6 X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: releng/11.3/sys/netinet6 X-SVN-Commit-Revision: 365255 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 16:23:17 -0000 Author: gordon Date: Wed Sep 2 16:23:15 2020 New Revision: 365255 URL: https://svnweb.freebsd.org/changeset/base/365255 Log: Fix IPv6 Hop-by-Hop options use-after-free. Approved by: so Security: FreeBSD-SA-20:24.ipv6 Security: CVE-2020-7462 Modified: releng/11.3/sys/netinet6/ip6_input.c Modified: releng/11.3/sys/netinet6/ip6_input.c ============================================================================== --- releng/11.3/sys/netinet6/ip6_input.c Wed Sep 2 16:22:14 2020 (r365254) +++ releng/11.3/sys/netinet6/ip6_input.c Wed Sep 2 16:23:15 2020 (r365255) @@ -402,20 +402,22 @@ VNET_SYSUNINIT(inet6, SI_SUB_PROTO_DOMAIN, SI_ORDER_TH #endif static int -ip6_input_hbh(struct mbuf *m, uint32_t *plen, uint32_t *rtalert, int *off, +ip6_input_hbh(struct mbuf **mp, uint32_t *plen, uint32_t *rtalert, int *off, int *nxt, int *ours) { + struct mbuf *m; struct ip6_hdr *ip6; struct ip6_hbh *hbh; - if (ip6_hopopts_input(plen, rtalert, &m, off)) { + if (ip6_hopopts_input(plen, rtalert, mp, off)) { #if 0 /*touches NULL pointer*/ - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard); + in6_ifstat_inc((*mp)->m_pkthdr.rcvif, ifs6_in_discard); #endif goto out; /* m have already been freed */ } /* adjust pointer */ + m = *mp; ip6 = mtod(m, struct ip6_hdr *); /* @@ -855,7 +857,7 @@ passin: */ plen = (u_int32_t)ntohs(ip6->ip6_plen); if (ip6->ip6_nxt == IPPROTO_HOPOPTS) { - if (ip6_input_hbh(m, &plen, &rtalert, &off, &nxt, &ours) != 0) + if (ip6_input_hbh(&m, &plen, &rtalert, &off, &nxt, &ours) != 0) return; } else nxt = ip6->ip6_nxt; From owner-svn-src-all@freebsd.org Wed Sep 2 16:24:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 548723DBDF4; Wed, 2 Sep 2020 16:24:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhTmN1sv8z3TPK; Wed, 2 Sep 2020 16:24:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 234B6D253; Wed, 2 Sep 2020 16:24:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082GOaRq037009; Wed, 2 Sep 2020 16:24:36 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082GOWI5036990; Wed, 2 Sep 2020 16:24:32 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009021624.082GOWI5036990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Wed, 2 Sep 2020 16:24:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365256 - in releng: 11.3/sys/netinet 11.4/sys/netinet 12.1/sys/netinet X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/sys/netinet 11.4/sys/netinet 12.1/sys/netinet X-SVN-Commit-Revision: 365256 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 16:24:36 -0000 Author: gordon Date: Wed Sep 2 16:24:32 2020 New Revision: 365256 URL: https://svnweb.freebsd.org/changeset/base/365256 Log: Fix SCTP socket use-after-free. Approved by: so Security: FreeBSD-SA-20:25.sctp Security: CVE-2020-7463 Modified: releng/11.3/sys/netinet/sctp_input.c releng/11.3/sys/netinet/sctp_output.c releng/11.3/sys/netinet/sctp_pcb.c releng/11.3/sys/netinet/sctp_structs.h releng/11.3/sys/netinet/sctputil.c releng/11.3/sys/netinet/sctputil.h releng/11.4/sys/netinet/sctp_input.c releng/11.4/sys/netinet/sctp_output.c releng/11.4/sys/netinet/sctp_pcb.c releng/11.4/sys/netinet/sctp_structs.h releng/11.4/sys/netinet/sctputil.c releng/11.4/sys/netinet/sctputil.h releng/12.1/sys/netinet/sctp_input.c releng/12.1/sys/netinet/sctp_output.c releng/12.1/sys/netinet/sctp_pcb.c releng/12.1/sys/netinet/sctp_structs.h releng/12.1/sys/netinet/sctputil.c releng/12.1/sys/netinet/sctputil.h Modified: releng/11.3/sys/netinet/sctp_input.c ============================================================================== --- releng/11.3/sys/netinet/sctp_input.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.3/sys/netinet/sctp_input.c Wed Sep 2 16:24:32 2020 (r365256) @@ -839,7 +839,6 @@ sctp_handle_abort(struct sctp_abort_chunk *abort, SCTP_TCB_LOCK(stcb); atomic_subtract_int(&stcb->asoc.refcnt, 1); #endif - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); (void)sctp_free_assoc(stcb->sctp_ep, stcb, SCTP_NORMAL_PROC, SCTP_FROM_SCTP_INPUT + SCTP_LOC_8); #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) @@ -1989,7 +1988,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphle /* send up all the data */ SCTP_TCB_SEND_LOCK(stcb); - sctp_report_all_outbound(stcb, 0, 1, SCTP_SO_LOCKED); + sctp_report_all_outbound(stcb, 0, SCTP_SO_LOCKED); for (i = 0; i < stcb->asoc.streamoutcnt; i++) { stcb->asoc.strmout[i].chunks_on_queues = 0; #if defined(SCTP_DETAILED_STR_STATS) Modified: releng/11.3/sys/netinet/sctp_output.c ============================================================================== --- releng/11.3/sys/netinet/sctp_output.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.3/sys/netinet/sctp_output.c Wed Sep 2 16:24:32 2020 (r365256) @@ -13159,11 +13159,10 @@ skip_preblock: error = EINVAL; goto out; } - SCTP_TCB_SEND_UNLOCK(stcb); - strm = &stcb->asoc.strmout[srcv->sinfo_stream]; if (strm->last_msg_incomplete == 0) { do_a_copy_in: + SCTP_TCB_SEND_UNLOCK(stcb); sp = sctp_copy_it_in(stcb, asoc, srcv, uio, net, max_len, user_marks_eor, &error); if (error) { goto out; @@ -13189,13 +13188,11 @@ skip_preblock: if (srcv->sinfo_flags & SCTP_UNORDERED) { SCTP_STAT_INCR(sctps_sends_with_unord); } + sp->processing = 1; TAILQ_INSERT_TAIL(&strm->outqueue, sp, next); stcb->asoc.ss_functions.sctp_ss_add_to_stream(stcb, asoc, strm, sp, 1); - SCTP_TCB_SEND_UNLOCK(stcb); } else { - SCTP_TCB_SEND_LOCK(stcb); sp = TAILQ_LAST(&strm->outqueue, sctp_streamhead); - SCTP_TCB_SEND_UNLOCK(stcb); if (sp == NULL) { /* ???? Huh ??? last msg is gone */ #ifdef INVARIANTS @@ -13207,7 +13204,16 @@ skip_preblock: goto do_a_copy_in; } + if (sp->processing) { + SCTP_TCB_SEND_UNLOCK(stcb); + SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL); + error = EINVAL; + goto out; + } else { + sp->processing = 1; + } } + SCTP_TCB_SEND_UNLOCK(stcb); while (uio->uio_resid > 0) { /* How much room do we have? */ struct mbuf *new_tail, *mm; @@ -13232,20 +13238,29 @@ skip_preblock: if (mm) { sctp_m_freem(mm); } + SCTP_TCB_SEND_LOCK(stcb); + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto out; } /* Update the mbuf and count */ SCTP_TCB_SEND_LOCK(stcb); - if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) || + (stcb->asoc.state & SCTP_STATE_WAS_ABORTED)) { /* * we need to get out. Peer probably * aborted. */ sctp_m_freem(mm); - if (stcb->asoc.state & SCTP_PCB_FLAGS_WAS_ABORTED) { + if (stcb->asoc.state & SCTP_STATE_WAS_ABORTED) { SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, ECONNRESET); error = ECONNRESET; } + if (sp != NULL) { + sp->processing = 0; + } SCTP_TCB_SEND_UNLOCK(stcb); goto out; } @@ -13305,6 +13320,11 @@ skip_preblock: /* wait for space now */ if (non_blocking) { /* Non-blocking io in place out */ + SCTP_TCB_SEND_LOCK(stcb); + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto skip_out_eof; } /* What about the INIT, send it maybe */ @@ -13428,6 +13448,11 @@ skip_preblock: } } SOCKBUF_UNLOCK(&so->so_snd); + SCTP_TCB_SEND_LOCK(stcb); + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } @@ -13437,12 +13462,19 @@ skip_preblock: } } SOCKBUF_UNLOCK(&so->so_snd); + SCTP_TCB_SEND_LOCK(stcb); if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } + SCTP_TCB_SEND_UNLOCK(stcb); } SCTP_TCB_SEND_LOCK(stcb); - if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) || + (stcb->asoc.state & SCTP_STATE_WAS_ABORTED)) { SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } @@ -13458,6 +13490,7 @@ skip_preblock: strm->last_msg_incomplete = 0; asoc->stream_locked = 0; } + sp->processing = 0; } else { SCTP_PRINTF("Huh no sp TSNH?\n"); strm->last_msg_incomplete = 0; Modified: releng/11.3/sys/netinet/sctp_pcb.c ============================================================================== --- releng/11.3/sys/netinet/sctp_pcb.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.3/sys/netinet/sctp_pcb.c Wed Sep 2 16:24:32 2020 (r365256) @@ -4722,6 +4722,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* there is no asoc, really TSNH :-0 */ return (1); } + SCTP_TCB_SEND_LOCK(stcb); if (stcb->asoc.alternate) { sctp_free_remote_addr(stcb->asoc.alternate); stcb->asoc.alternate = NULL; @@ -4756,6 +4757,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* nope, reader or writer in the way */ sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL); /* no asoc destroyed */ + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); #ifdef SCTP_LOG_CLOSING sctp_log_closing(inp, stcb, 8); @@ -4853,6 +4855,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc SCTP_CLEAR_SUBSTATE(stcb, SCTP_STATE_IN_ACCEPT_QUEUE); sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL); } + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE)) @@ -4886,10 +4889,12 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc if (from_inpcbfree == SCTP_NORMAL_PROC) { atomic_add_int(&stcb->asoc.refcnt, 1); + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); SCTP_INP_INFO_WLOCK(); SCTP_INP_WLOCK(inp); SCTP_TCB_LOCK(stcb); + SCTP_TCB_SEND_LOCK(stcb); } /* Double check the GONE flag */ if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || @@ -4938,6 +4943,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc SCTP_INP_INFO_WUNLOCK(); SCTP_INP_WUNLOCK(inp); } + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); return (0); } @@ -4981,7 +4987,6 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc * in case. */ /* anything on the wheel needs to be removed */ - SCTP_TCB_SEND_LOCK(stcb); for (i = 0; i < asoc->streamoutcnt; i++) { struct sctp_stream_out *outs; @@ -5012,7 +5017,6 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc sctp_free_a_strmoq(stcb, sp, SCTP_SO_LOCKED); } } - SCTP_TCB_SEND_UNLOCK(stcb); /* sa_ignore FREED_MEMORY */ TAILQ_FOREACH_SAFE(strrst, &asoc->resetHead, next_resp, nstrrst) { TAILQ_REMOVE(&asoc->resetHead, strrst, next_resp); @@ -5214,6 +5218,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* Insert new items here :> */ /* Get rid of LOCK */ + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); SCTP_TCB_LOCK_DESTROY(stcb); SCTP_TCB_SEND_LOCK_DESTROY(stcb); Modified: releng/11.3/sys/netinet/sctp_structs.h ============================================================================== --- releng/11.3/sys/netinet/sctp_structs.h Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.3/sys/netinet/sctp_structs.h Wed Sep 2 16:24:32 2020 (r365256) @@ -535,6 +535,7 @@ struct sctp_stream_queue_pending { uint8_t sender_all_done; uint8_t put_last_out; uint8_t discard_rest; + uint8_t processing; }; /* Modified: releng/11.3/sys/netinet/sctputil.c ============================================================================== --- releng/11.3/sys/netinet/sctputil.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.3/sys/netinet/sctputil.c Wed Sep 2 16:24:32 2020 (r365256) @@ -3858,7 +3858,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb } void -sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int holds_lock, int so_locked +sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int so_locked #if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING) SCTP_UNUSED #endif @@ -3884,9 +3884,6 @@ sctp_report_all_outbound(struct sctp_tcb *stcb, uint16 return; } /* now through all the gunk freeing chunks */ - if (holds_lock == 0) { - SCTP_TCB_SEND_LOCK(stcb); - } /* sent queue SHOULD be empty */ TAILQ_FOREACH_SAFE(chk, &asoc->sent_queue, sctp_next, nchk) { TAILQ_REMOVE(&asoc->sent_queue, chk, sctp_next); @@ -3963,10 +3960,6 @@ sctp_report_all_outbound(struct sctp_tcb *stcb, uint16 /* sa_ignore FREED_MEMORY */ } } - - if (holds_lock == 0) { - SCTP_TCB_SEND_UNLOCK(stcb); - } } void @@ -3990,8 +3983,11 @@ sctp_abort_notification(struct sctp_tcb *stcb, uint8_t (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { return; } + SCTP_TCB_SEND_LOCK(stcb); + SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); /* Tell them we lost the asoc */ - sctp_report_all_outbound(stcb, error, 0, so_locked); + sctp_report_all_outbound(stcb, error, so_locked); + SCTP_TCB_SEND_UNLOCK(stcb); if (from_peer) { sctp_ulp_notify(SCTP_NOTIFY_ASSOC_REM_ABORTED, stcb, error, abort, so_locked); } else { @@ -4023,7 +4019,6 @@ sctp_abort_association(struct sctp_inpcb *inp, struct if (stcb != NULL) { /* We have a TCB to abort, send notification too */ sctp_abort_notification(stcb, 0, 0, NULL, SCTP_SO_NOT_LOCKED); - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); /* Ok, now lets free it */ #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) so = SCTP_INP_SO(inp); @@ -4133,8 +4128,6 @@ sctp_abort_an_association(struct sctp_inpcb *inp, stru } } return; - } else { - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); } /* notify the peer */ sctp_send_abort_tcb(stcb, op_err, so_locked); Modified: releng/11.3/sys/netinet/sctputil.h ============================================================================== --- releng/11.3/sys/netinet/sctputil.h Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.3/sys/netinet/sctputil.h Wed Sep 2 16:24:32 2020 (r365256) @@ -163,7 +163,7 @@ sctp_pull_off_control_to_new_inp(struct sctp_inpcb *ol void sctp_stop_timers_for_shutdown(struct sctp_tcb *); void -sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int +sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int #if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING) SCTP_UNUSED #endif Modified: releng/11.4/sys/netinet/sctp_input.c ============================================================================== --- releng/11.4/sys/netinet/sctp_input.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.4/sys/netinet/sctp_input.c Wed Sep 2 16:24:32 2020 (r365256) @@ -846,7 +846,6 @@ sctp_handle_abort(struct sctp_abort_chunk *abort, SCTP_TCB_LOCK(stcb); atomic_subtract_int(&stcb->asoc.refcnt, 1); #endif - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); (void)sctp_free_assoc(stcb->sctp_ep, stcb, SCTP_NORMAL_PROC, SCTP_FROM_SCTP_INPUT + SCTP_LOC_8); #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) @@ -1995,7 +1994,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphle /* send up all the data */ SCTP_TCB_SEND_LOCK(stcb); - sctp_report_all_outbound(stcb, 0, 1, SCTP_SO_LOCKED); + sctp_report_all_outbound(stcb, 0, SCTP_SO_LOCKED); for (i = 0; i < stcb->asoc.streamoutcnt; i++) { stcb->asoc.strmout[i].chunks_on_queues = 0; #if defined(SCTP_DETAILED_STR_STATS) Modified: releng/11.4/sys/netinet/sctp_output.c ============================================================================== --- releng/11.4/sys/netinet/sctp_output.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.4/sys/netinet/sctp_output.c Wed Sep 2 16:24:32 2020 (r365256) @@ -13202,11 +13202,10 @@ skip_preblock: error = EINVAL; goto out; } - SCTP_TCB_SEND_UNLOCK(stcb); - strm = &stcb->asoc.strmout[srcv->sinfo_stream]; if (strm->last_msg_incomplete == 0) { do_a_copy_in: + SCTP_TCB_SEND_UNLOCK(stcb); sp = sctp_copy_it_in(stcb, asoc, srcv, uio, net, max_len, user_marks_eor, &error); if (error) { goto out; @@ -13232,13 +13231,11 @@ skip_preblock: if (sinfo_flags & SCTP_UNORDERED) { SCTP_STAT_INCR(sctps_sends_with_unord); } + sp->processing = 1; TAILQ_INSERT_TAIL(&strm->outqueue, sp, next); stcb->asoc.ss_functions.sctp_ss_add_to_stream(stcb, asoc, strm, sp, 1); - SCTP_TCB_SEND_UNLOCK(stcb); } else { - SCTP_TCB_SEND_LOCK(stcb); sp = TAILQ_LAST(&strm->outqueue, sctp_streamhead); - SCTP_TCB_SEND_UNLOCK(stcb); if (sp == NULL) { /* ???? Huh ??? last msg is gone */ #ifdef INVARIANTS @@ -13250,7 +13247,16 @@ skip_preblock: goto do_a_copy_in; } + if (sp->processing) { + SCTP_TCB_SEND_UNLOCK(stcb); + SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL); + error = EINVAL; + goto out; + } else { + sp->processing = 1; + } } + SCTP_TCB_SEND_UNLOCK(stcb); while (uio->uio_resid > 0) { /* How much room do we have? */ struct mbuf *new_tail, *mm; @@ -13275,20 +13281,29 @@ skip_preblock: if (mm) { sctp_m_freem(mm); } + SCTP_TCB_SEND_LOCK(stcb); + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto out; } /* Update the mbuf and count */ SCTP_TCB_SEND_LOCK(stcb); - if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) || + (stcb->asoc.state & SCTP_STATE_WAS_ABORTED)) { /* * we need to get out. Peer probably * aborted. */ sctp_m_freem(mm); - if (stcb->asoc.state & SCTP_PCB_FLAGS_WAS_ABORTED) { + if (stcb->asoc.state & SCTP_STATE_WAS_ABORTED) { SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, ECONNRESET); error = ECONNRESET; } + if (sp != NULL) { + sp->processing = 0; + } SCTP_TCB_SEND_UNLOCK(stcb); goto out; } @@ -13348,6 +13363,11 @@ skip_preblock: /* wait for space now */ if (non_blocking) { /* Non-blocking io in place out */ + SCTP_TCB_SEND_LOCK(stcb); + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto skip_out_eof; } /* What about the INIT, send it maybe */ @@ -13471,6 +13491,11 @@ skip_preblock: } } SOCKBUF_UNLOCK(&so->so_snd); + SCTP_TCB_SEND_LOCK(stcb); + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } @@ -13480,12 +13505,19 @@ skip_preblock: } } SOCKBUF_UNLOCK(&so->so_snd); + SCTP_TCB_SEND_LOCK(stcb); if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } + SCTP_TCB_SEND_UNLOCK(stcb); } SCTP_TCB_SEND_LOCK(stcb); - if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) || + (stcb->asoc.state & SCTP_STATE_WAS_ABORTED)) { SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } @@ -13501,6 +13533,7 @@ skip_preblock: strm->last_msg_incomplete = 0; asoc->stream_locked = 0; } + sp->processing = 0; } else { SCTP_PRINTF("Huh no sp TSNH?\n"); strm->last_msg_incomplete = 0; Modified: releng/11.4/sys/netinet/sctp_pcb.c ============================================================================== --- releng/11.4/sys/netinet/sctp_pcb.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.4/sys/netinet/sctp_pcb.c Wed Sep 2 16:24:32 2020 (r365256) @@ -4725,6 +4725,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* there is no asoc, really TSNH :-0 */ return (1); } + SCTP_TCB_SEND_LOCK(stcb); if (stcb->asoc.alternate) { sctp_free_remote_addr(stcb->asoc.alternate); stcb->asoc.alternate = NULL; @@ -4759,6 +4760,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* nope, reader or writer in the way */ sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL); /* no asoc destroyed */ + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); #ifdef SCTP_LOG_CLOSING sctp_log_closing(inp, stcb, 8); @@ -4827,6 +4829,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc SCTP_CLEAR_SUBSTATE(stcb, SCTP_STATE_IN_ACCEPT_QUEUE); sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL); } + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE)) @@ -4860,10 +4863,12 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc if (from_inpcbfree == SCTP_NORMAL_PROC) { atomic_add_int(&stcb->asoc.refcnt, 1); + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); SCTP_INP_INFO_WLOCK(); SCTP_INP_WLOCK(inp); SCTP_TCB_LOCK(stcb); + SCTP_TCB_SEND_LOCK(stcb); } /* Double check the GONE flag */ if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || @@ -4911,6 +4916,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc SCTP_INP_INFO_WUNLOCK(); SCTP_INP_WUNLOCK(inp); } + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); return (0); } @@ -4942,7 +4948,6 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc * in case. */ /* anything on the wheel needs to be removed */ - SCTP_TCB_SEND_LOCK(stcb); for (i = 0; i < asoc->streamoutcnt; i++) { struct sctp_stream_out *outs; @@ -4973,7 +4978,6 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc sctp_free_a_strmoq(stcb, sp, SCTP_SO_LOCKED); } } - SCTP_TCB_SEND_UNLOCK(stcb); /* sa_ignore FREED_MEMORY */ TAILQ_FOREACH_SAFE(strrst, &asoc->resetHead, next_resp, nstrrst) { TAILQ_REMOVE(&asoc->resetHead, strrst, next_resp); @@ -5175,6 +5179,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* Insert new items here :> */ /* Get rid of LOCK */ + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); SCTP_TCB_LOCK_DESTROY(stcb); SCTP_TCB_SEND_LOCK_DESTROY(stcb); Modified: releng/11.4/sys/netinet/sctp_structs.h ============================================================================== --- releng/11.4/sys/netinet/sctp_structs.h Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.4/sys/netinet/sctp_structs.h Wed Sep 2 16:24:32 2020 (r365256) @@ -535,6 +535,7 @@ struct sctp_stream_queue_pending { uint8_t sender_all_done; uint8_t put_last_out; uint8_t discard_rest; + uint8_t processing; }; /* Modified: releng/11.4/sys/netinet/sctputil.c ============================================================================== --- releng/11.4/sys/netinet/sctputil.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.4/sys/netinet/sctputil.c Wed Sep 2 16:24:32 2020 (r365256) @@ -3921,7 +3921,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb } void -sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int holds_lock, int so_locked +sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int so_locked #if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING) SCTP_UNUSED #endif @@ -3947,9 +3947,6 @@ sctp_report_all_outbound(struct sctp_tcb *stcb, uint16 return; } /* now through all the gunk freeing chunks */ - if (holds_lock == 0) { - SCTP_TCB_SEND_LOCK(stcb); - } /* sent queue SHOULD be empty */ TAILQ_FOREACH_SAFE(chk, &asoc->sent_queue, sctp_next, nchk) { TAILQ_REMOVE(&asoc->sent_queue, chk, sctp_next); @@ -4026,10 +4023,6 @@ sctp_report_all_outbound(struct sctp_tcb *stcb, uint16 /* sa_ignore FREED_MEMORY */ } } - - if (holds_lock == 0) { - SCTP_TCB_SEND_UNLOCK(stcb); - } } void @@ -4053,8 +4046,11 @@ sctp_abort_notification(struct sctp_tcb *stcb, uint8_t (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { return; } + SCTP_TCB_SEND_LOCK(stcb); + SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); /* Tell them we lost the asoc */ - sctp_report_all_outbound(stcb, error, 0, so_locked); + sctp_report_all_outbound(stcb, error, so_locked); + SCTP_TCB_SEND_UNLOCK(stcb); if (from_peer) { sctp_ulp_notify(SCTP_NOTIFY_ASSOC_REM_ABORTED, stcb, error, abort, so_locked); } else { @@ -4086,7 +4082,6 @@ sctp_abort_association(struct sctp_inpcb *inp, struct if (stcb != NULL) { /* We have a TCB to abort, send notification too */ sctp_abort_notification(stcb, 0, 0, NULL, SCTP_SO_NOT_LOCKED); - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); /* Ok, now lets free it */ #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) so = SCTP_INP_SO(inp); @@ -4196,8 +4191,6 @@ sctp_abort_an_association(struct sctp_inpcb *inp, stru } } return; - } else { - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); } /* notify the peer */ sctp_send_abort_tcb(stcb, op_err, so_locked); Modified: releng/11.4/sys/netinet/sctputil.h ============================================================================== --- releng/11.4/sys/netinet/sctputil.h Wed Sep 2 16:23:15 2020 (r365255) +++ releng/11.4/sys/netinet/sctputil.h Wed Sep 2 16:24:32 2020 (r365256) @@ -166,7 +166,7 @@ void sctp_stop_timers_for_shutdown(struct sctp_tcb *); void sctp_stop_association_timers(struct sctp_tcb *, bool); void -sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int +sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int #if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING) SCTP_UNUSED #endif Modified: releng/12.1/sys/netinet/sctp_input.c ============================================================================== --- releng/12.1/sys/netinet/sctp_input.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/12.1/sys/netinet/sctp_input.c Wed Sep 2 16:24:32 2020 (r365256) @@ -841,7 +841,6 @@ sctp_handle_abort(struct sctp_abort_chunk *abort, SCTP_TCB_LOCK(stcb); atomic_subtract_int(&stcb->asoc.refcnt, 1); #endif - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); (void)sctp_free_assoc(stcb->sctp_ep, stcb, SCTP_NORMAL_PROC, SCTP_FROM_SCTP_INPUT + SCTP_LOC_8); #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) @@ -1987,7 +1986,7 @@ sctp_process_cookie_existing(struct mbuf *m, int iphle /* send up all the data */ SCTP_TCB_SEND_LOCK(stcb); - sctp_report_all_outbound(stcb, 0, 1, SCTP_SO_LOCKED); + sctp_report_all_outbound(stcb, 0, SCTP_SO_LOCKED); for (i = 0; i < stcb->asoc.streamoutcnt; i++) { stcb->asoc.strmout[i].chunks_on_queues = 0; #if defined(SCTP_DETAILED_STR_STATS) Modified: releng/12.1/sys/netinet/sctp_output.c ============================================================================== --- releng/12.1/sys/netinet/sctp_output.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/12.1/sys/netinet/sctp_output.c Wed Sep 2 16:24:32 2020 (r365256) @@ -13207,11 +13207,10 @@ skip_preblock: error = EINVAL; goto out; } - SCTP_TCB_SEND_UNLOCK(stcb); - strm = &stcb->asoc.strmout[srcv->sinfo_stream]; if (strm->last_msg_incomplete == 0) { do_a_copy_in: + SCTP_TCB_SEND_UNLOCK(stcb); sp = sctp_copy_it_in(stcb, asoc, srcv, uio, net, max_len, user_marks_eor, &error); if (error) { goto out; @@ -13237,13 +13236,11 @@ skip_preblock: if (sinfo_flags & SCTP_UNORDERED) { SCTP_STAT_INCR(sctps_sends_with_unord); } + sp->processing = 1; TAILQ_INSERT_TAIL(&strm->outqueue, sp, next); stcb->asoc.ss_functions.sctp_ss_add_to_stream(stcb, asoc, strm, sp, 1); - SCTP_TCB_SEND_UNLOCK(stcb); } else { - SCTP_TCB_SEND_LOCK(stcb); sp = TAILQ_LAST(&strm->outqueue, sctp_streamhead); - SCTP_TCB_SEND_UNLOCK(stcb); if (sp == NULL) { /* ???? Huh ??? last msg is gone */ #ifdef INVARIANTS @@ -13255,7 +13252,16 @@ skip_preblock: goto do_a_copy_in; } + if (sp->processing) { + SCTP_TCB_SEND_UNLOCK(stcb); + SCTP_LTRACE_ERR_RET(inp, stcb, net, SCTP_FROM_SCTP_OUTPUT, EINVAL); + error = EINVAL; + goto out; + } else { + sp->processing = 1; + } } + SCTP_TCB_SEND_UNLOCK(stcb); while (uio->uio_resid > 0) { /* How much room do we have? */ struct mbuf *new_tail, *mm; @@ -13280,20 +13286,29 @@ skip_preblock: if (mm) { sctp_m_freem(mm); } + SCTP_TCB_SEND_LOCK(stcb); + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto out; } /* Update the mbuf and count */ SCTP_TCB_SEND_LOCK(stcb); - if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) || + (stcb->asoc.state & SCTP_STATE_WAS_ABORTED)) { /* * we need to get out. Peer probably * aborted. */ sctp_m_freem(mm); - if (stcb->asoc.state & SCTP_PCB_FLAGS_WAS_ABORTED) { + if (stcb->asoc.state & SCTP_STATE_WAS_ABORTED) { SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_OUTPUT, ECONNRESET); error = ECONNRESET; } + if (sp != NULL) { + sp->processing = 0; + } SCTP_TCB_SEND_UNLOCK(stcb); goto out; } @@ -13353,6 +13368,11 @@ skip_preblock: /* wait for space now */ if (non_blocking) { /* Non-blocking io in place out */ + SCTP_TCB_SEND_LOCK(stcb); + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto skip_out_eof; } /* What about the INIT, send it maybe */ @@ -13476,6 +13496,11 @@ skip_preblock: } } SOCKBUF_UNLOCK(&so->so_snd); + SCTP_TCB_SEND_LOCK(stcb); + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } @@ -13485,12 +13510,19 @@ skip_preblock: } } SOCKBUF_UNLOCK(&so->so_snd); + SCTP_TCB_SEND_LOCK(stcb); if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if (sp != NULL) { + sp->processing = 0; + } + SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } + SCTP_TCB_SEND_UNLOCK(stcb); } SCTP_TCB_SEND_LOCK(stcb); - if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) || + (stcb->asoc.state & SCTP_STATE_WAS_ABORTED)) { SCTP_TCB_SEND_UNLOCK(stcb); goto out_unlocked; } @@ -13506,6 +13538,7 @@ skip_preblock: strm->last_msg_incomplete = 0; asoc->stream_locked = 0; } + sp->processing = 0; } else { SCTP_PRINTF("Huh no sp TSNH?\n"); strm->last_msg_incomplete = 0; Modified: releng/12.1/sys/netinet/sctp_pcb.c ============================================================================== --- releng/12.1/sys/netinet/sctp_pcb.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/12.1/sys/netinet/sctp_pcb.c Wed Sep 2 16:24:32 2020 (r365256) @@ -4726,6 +4726,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* there is no asoc, really TSNH :-0 */ return (1); } + SCTP_TCB_SEND_LOCK(stcb); if (stcb->asoc.alternate) { sctp_free_remote_addr(stcb->asoc.alternate); stcb->asoc.alternate = NULL; @@ -4760,6 +4761,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* nope, reader or writer in the way */ sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL); /* no asoc destroyed */ + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); #ifdef SCTP_LOG_CLOSING sctp_log_closing(inp, stcb, 8); @@ -4857,6 +4859,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc SCTP_CLEAR_SUBSTATE(stcb, SCTP_STATE_IN_ACCEPT_QUEUE); sctp_timer_start(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL); } + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE)) @@ -4890,10 +4893,12 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc if (from_inpcbfree == SCTP_NORMAL_PROC) { atomic_add_int(&stcb->asoc.refcnt, 1); + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); SCTP_INP_INFO_WLOCK(); SCTP_INP_WLOCK(inp); SCTP_TCB_LOCK(stcb); + SCTP_TCB_SEND_LOCK(stcb); } /* Double check the GONE flag */ if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || @@ -4941,6 +4946,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc SCTP_INP_INFO_WUNLOCK(); SCTP_INP_WUNLOCK(inp); } + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); return (0); } @@ -4984,7 +4990,6 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc * in case. */ /* anything on the wheel needs to be removed */ - SCTP_TCB_SEND_LOCK(stcb); for (i = 0; i < asoc->streamoutcnt; i++) { struct sctp_stream_out *outs; @@ -5015,7 +5020,6 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc sctp_free_a_strmoq(stcb, sp, SCTP_SO_LOCKED); } } - SCTP_TCB_SEND_UNLOCK(stcb); /* sa_ignore FREED_MEMORY */ TAILQ_FOREACH_SAFE(strrst, &asoc->resetHead, next_resp, nstrrst) { TAILQ_REMOVE(&asoc->resetHead, strrst, next_resp); @@ -5217,6 +5221,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc /* Insert new items here :> */ /* Get rid of LOCK */ + SCTP_TCB_SEND_UNLOCK(stcb); SCTP_TCB_UNLOCK(stcb); SCTP_TCB_LOCK_DESTROY(stcb); SCTP_TCB_SEND_LOCK_DESTROY(stcb); Modified: releng/12.1/sys/netinet/sctp_structs.h ============================================================================== --- releng/12.1/sys/netinet/sctp_structs.h Wed Sep 2 16:23:15 2020 (r365255) +++ releng/12.1/sys/netinet/sctp_structs.h Wed Sep 2 16:24:32 2020 (r365256) @@ -537,6 +537,7 @@ struct sctp_stream_queue_pending { uint8_t sender_all_done; uint8_t put_last_out; uint8_t discard_rest; + uint8_t processing; }; /* Modified: releng/12.1/sys/netinet/sctputil.c ============================================================================== --- releng/12.1/sys/netinet/sctputil.c Wed Sep 2 16:23:15 2020 (r365255) +++ releng/12.1/sys/netinet/sctputil.c Wed Sep 2 16:24:32 2020 (r365256) @@ -3870,7 +3870,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb } void -sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int holds_lock, int so_locked +sctp_report_all_outbound(struct sctp_tcb *stcb, uint16_t error, int so_locked #if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING) SCTP_UNUSED #endif @@ -3896,9 +3896,6 @@ sctp_report_all_outbound(struct sctp_tcb *stcb, uint16 return; } /* now through all the gunk freeing chunks */ - if (holds_lock == 0) { - SCTP_TCB_SEND_LOCK(stcb); - } /* sent queue SHOULD be empty */ TAILQ_FOREACH_SAFE(chk, &asoc->sent_queue, sctp_next, nchk) { TAILQ_REMOVE(&asoc->sent_queue, chk, sctp_next); @@ -3975,10 +3972,6 @@ sctp_report_all_outbound(struct sctp_tcb *stcb, uint16 /* sa_ignore FREED_MEMORY */ } } - - if (holds_lock == 0) { - SCTP_TCB_SEND_UNLOCK(stcb); - } } void @@ -4002,8 +3995,11 @@ sctp_abort_notification(struct sctp_tcb *stcb, uint8_t (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { return; } + SCTP_TCB_SEND_LOCK(stcb); + SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); /* Tell them we lost the asoc */ - sctp_report_all_outbound(stcb, error, 0, so_locked); + sctp_report_all_outbound(stcb, error, so_locked); + SCTP_TCB_SEND_UNLOCK(stcb); if (from_peer) { sctp_ulp_notify(SCTP_NOTIFY_ASSOC_REM_ABORTED, stcb, error, abort, so_locked); } else { @@ -4035,7 +4031,6 @@ sctp_abort_association(struct sctp_inpcb *inp, struct if (stcb != NULL) { /* We have a TCB to abort, send notification too */ sctp_abort_notification(stcb, 0, 0, NULL, SCTP_SO_NOT_LOCKED); - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); /* Ok, now lets free it */ #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) so = SCTP_INP_SO(inp); @@ -4145,8 +4140,6 @@ sctp_abort_an_association(struct sctp_inpcb *inp, stru } } return; - } else { - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_WAS_ABORTED); } /* notify the peer */ sctp_send_abort_tcb(stcb, op_err, so_locked); Modified: releng/12.1/sys/netinet/sctputil.h ============================================================================== --- releng/12.1/sys/netinet/sctputil.h Wed Sep 2 16:23:15 2020 (r365255) +++ releng/12.1/sys/netinet/sctputil.h Wed Sep 2 16:24:32 2020 (r365256) @@ -165,7 +165,7 @@ sctp_pull_off_control_to_new_inp(struct sctp_inpcb *ol void sctp_stop_timers_for_shutdown(struct sctp_tcb *); void -sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int +sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int #if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING) SCTP_UNUSED #endif From owner-svn-src-all@freebsd.org Wed Sep 2 16:25:32 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9AB4F3DBFED; Wed, 2 Sep 2020 16:25:32 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhTnS3bKpz3TVj; Wed, 2 Sep 2020 16:25:32 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5EA09D254; Wed, 2 Sep 2020 16:25:32 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082GPWUD037107; Wed, 2 Sep 2020 16:25:32 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082GPVEu037104; Wed, 2 Sep 2020 16:25:31 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009021625.082GPVEu037104@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Wed, 2 Sep 2020 16:25:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365257 - in releng: 11.3/sbin/dhclient 11.4/sbin/dhclient 12.1/sbin/dhclient X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/sbin/dhclient 11.4/sbin/dhclient 12.1/sbin/dhclient X-SVN-Commit-Revision: 365257 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 16:25:32 -0000 Author: gordon Date: Wed Sep 2 16:25:31 2020 New Revision: 365257 URL: https://svnweb.freebsd.org/changeset/base/365257 Log: Fix dhclient heap overflow. Approved by: so Security: FreeBSD-SA-20:26.dhclient Security: CVE-2020-7461 Modified: releng/11.3/sbin/dhclient/options.c releng/11.4/sbin/dhclient/options.c releng/12.1/sbin/dhclient/options.c Modified: releng/11.3/sbin/dhclient/options.c ============================================================================== --- releng/11.3/sbin/dhclient/options.c Wed Sep 2 16:24:32 2020 (r365256) +++ releng/11.3/sbin/dhclient/options.c Wed Sep 2 16:25:31 2020 (r365257) @@ -296,6 +296,8 @@ find_search_domain_name_len(struct option_data *option pointed_len = find_search_domain_name_len(option, &pointer); + if (pointed_len < 0) + return (-1); domain_name_len += pointed_len; *offset = i + 2; Modified: releng/11.4/sbin/dhclient/options.c ============================================================================== --- releng/11.4/sbin/dhclient/options.c Wed Sep 2 16:24:32 2020 (r365256) +++ releng/11.4/sbin/dhclient/options.c Wed Sep 2 16:25:31 2020 (r365257) @@ -296,6 +296,8 @@ find_search_domain_name_len(struct option_data *option pointed_len = find_search_domain_name_len(option, &pointer); + if (pointed_len < 0) + return (-1); domain_name_len += pointed_len; *offset = i + 2; Modified: releng/12.1/sbin/dhclient/options.c ============================================================================== --- releng/12.1/sbin/dhclient/options.c Wed Sep 2 16:24:32 2020 (r365256) +++ releng/12.1/sbin/dhclient/options.c Wed Sep 2 16:25:31 2020 (r365257) @@ -298,6 +298,8 @@ find_search_domain_name_len(struct option_data *option pointed_len = find_search_domain_name_len(option, &pointer); + if (pointed_len < 0) + return (-1); domain_name_len += pointed_len; *offset = i + 2; From owner-svn-src-all@freebsd.org Wed Sep 2 16:29:42 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 730443DC32C; Wed, 2 Sep 2020 16:29:42 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhTtG2VPcz3TcH; Wed, 2 Sep 2020 16:29:42 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 341B1D47B; Wed, 2 Sep 2020 16:29:42 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082GTgwQ037330; Wed, 2 Sep 2020 16:29:42 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082GTf4Q037322; Wed, 2 Sep 2020 16:29:41 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009021629.082GTf4Q037322@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Wed, 2 Sep 2020 16:29:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365258 - in releng: 11.3 11.3/sys/conf 11.4 11.4/sys/conf 12.1 12.1/sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3 11.3/sys/conf 11.4 11.4/sys/conf 12.1 12.1/sys/conf X-SVN-Commit-Revision: 365258 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 16:29:42 -0000 Author: gordon Date: Wed Sep 2 16:29:40 2020 New Revision: 365258 URL: https://svnweb.freebsd.org/changeset/base/365258 Log: Add UPDATING entries and bump version. Approved by: so Modified: releng/11.3/UPDATING releng/11.3/sys/conf/newvers.sh releng/11.4/UPDATING releng/11.4/sys/conf/newvers.sh releng/12.1/UPDATING releng/12.1/sys/conf/newvers.sh Modified: releng/11.3/UPDATING ============================================================================== --- releng/11.3/UPDATING Wed Sep 2 16:25:31 2020 (r365257) +++ releng/11.3/UPDATING Wed Sep 2 16:29:40 2020 (r365258) @@ -16,6 +16,22 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20200902 p13 FreeBSD-EN-20:17.linuxthread + FreeBSD-EN-20:18.getfsstat + FreeBSD-SA-20:24.ipv6 + FreeBSD-SA-20:25.sctp + FreeBSD-SA-20:26.dhclient + + Fix FreeBSD Linux ABI kernel panic. [EN-20:17.linuxthread] + + Fix getfsstat compatibility system call panic. [EN-20:18.getfsstat] + + Fix IPv6 Hop-by-Hop options use-after-free. [SA-20:24.ipv6] + + Fix SCTP socket use-after-free. [SA-20:25.sctp] + + Fix dhclient heap overflow. [SA-20:26.dhclient] + 20200805 p12 FreeBSD-SA-20:21.usb_net FreeBSD-SA-20:22.unbound FreeBSD-SA-20:23.ipv6 Modified: releng/11.3/sys/conf/newvers.sh ============================================================================== --- releng/11.3/sys/conf/newvers.sh Wed Sep 2 16:25:31 2020 (r365257) +++ releng/11.3/sys/conf/newvers.sh Wed Sep 2 16:29:40 2020 (r365258) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.3" -BRANCH="RELEASE-p12" +BRANCH="RELEASE-p13" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/11.4/UPDATING ============================================================================== --- releng/11.4/UPDATING Wed Sep 2 16:25:31 2020 (r365257) +++ releng/11.4/UPDATING Wed Sep 2 16:29:40 2020 (r365258) @@ -16,6 +16,19 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20200902 p3 FreeBSD-EN-20:17.linuxthread + FreeBSD-EN-20:18.getfsstat + FreeBSD-SA-20:25.sctp + FreeBSD-SA-20:26.dhclient + + Fix FreeBSD Linux ABI kernel panic. [EN-20:17.linuxthread] + + Fix getfsstat compatibility system call panic. [EN-20:18.getfsstat] + + Fix SCTP socket use-after-free. [SA-20:25.sctp] + + Fix dhclient heap overflow. [SA-20:26.dhclient] + 20200805 p2 FreeBSD-SA-20:21.usb_net FreeBSD-SA-20:22.unbound FreeBSD-SA-20:23.ipv6 Modified: releng/11.4/sys/conf/newvers.sh ============================================================================== --- releng/11.4/sys/conf/newvers.sh Wed Sep 2 16:25:31 2020 (r365257) +++ releng/11.4/sys/conf/newvers.sh Wed Sep 2 16:29:40 2020 (r365258) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.4" -BRANCH="RELEASE-p2" +BRANCH="RELEASE-p3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/12.1/UPDATING ============================================================================== --- releng/12.1/UPDATING Wed Sep 2 16:25:31 2020 (r365257) +++ releng/12.1/UPDATING Wed Sep 2 16:29:40 2020 (r365258) @@ -16,6 +16,16 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20200902 p9 FreeBSD-EN-20:17.linuxthread + FreeBSD-SA-20:25.sctp + FreeBSD-SA-20:26.dhclient + + Fix FreeBSD Linux ABI kernel panic. [EN-20:17.linuxthread] + + Fix SCTP socket use-after-free. [SA-20:25.sctp] + + Fix dhclient heap overflow. [SA-20:26.dhclient] + 20200805 p8 FreeBSD-EN-20:16.vmx FreeBSD-SA-20:21.usb_net FreeBSD-SA-20:22.unbound Modified: releng/12.1/sys/conf/newvers.sh ============================================================================== --- releng/12.1/sys/conf/newvers.sh Wed Sep 2 16:25:31 2020 (r365257) +++ releng/12.1/sys/conf/newvers.sh Wed Sep 2 16:29:40 2020 (r365258) @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.1" -BRANCH="RELEASE-p8" +BRANCH="RELEASE-p9" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-all@freebsd.org Wed Sep 2 17:36:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3D6823DD7F6; Wed, 2 Sep 2020 17:36:31 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhWMM0wphz3Ypk; Wed, 2 Sep 2020 17:36:31 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 031F6E305; Wed, 2 Sep 2020 17:36:31 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082HaUuH080486; Wed, 2 Sep 2020 17:36:30 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082HaUkw080485; Wed, 2 Sep 2020 17:36:30 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <202009021736.082HaUkw080485@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 2 Sep 2020 17:36:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365262 - head/usr.bin/nfsstat X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/usr.bin/nfsstat X-SVN-Commit-Revision: 365262 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 17:36:31 -0000 Author: asomers Date: Wed Sep 2 17:36:30 2020 New Revision: 365262 URL: https://svnweb.freebsd.org/changeset/base/365262 Log: Fix output of nfsstat -cE in json or xml mode Due to a copy/paste error, the "getacl" field was duplicated, but only in XML or JSON mode, not in txt mode. Discussed with: rmacklem MFC after: 1 week Sponsored by: Axcient Modified: head/usr.bin/nfsstat/nfsstat.c Modified: head/usr.bin/nfsstat/nfsstat.c ============================================================================== --- head/usr.bin/nfsstat/nfsstat.c Wed Sep 2 17:31:06 2020 (r365261) +++ head/usr.bin/nfsstat/nfsstat.c Wed Sep 2 17:36:30 2020 (r365262) @@ -721,7 +721,7 @@ exp_intpr(int clientOnly, int serverOnly, int nfs41) "{T:PutRootFH/%13.13s}{T:DelegRet/%13.13s}" "{T:GetAcl/%13.13s}{T:SetAcl/%13.13s}\n"); xo_emit("{:rellckown/%13ju}{:freestateid/%13ju}" - "{:getacl/%13ju}{:delegret/%13ju}" + "{:putrootfh/%13ju}{:delegret/%13ju}" "{:getacl/%13ju}{:setacl/%13ju}\n", (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_RELEASELCKOWN], (uintmax_t)ext_nfsstats.rpccnt[NFSPROC_FREESTATEID], From owner-svn-src-all@freebsd.org Wed Sep 2 17:46:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5C7283DECE1; Wed, 2 Sep 2020 17:46:57 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhWbP0vVGz3bn8; Wed, 2 Sep 2020 17:46:57 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCC30E2AE; Wed, 2 Sep 2020 17:46:56 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082HkuHo086361; Wed, 2 Sep 2020 17:46:56 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082HkuwY086360; Wed, 2 Sep 2020 17:46:56 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202009021746.082HkuwY086360@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 2 Sep 2020 17:46:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365263 - stable/12/bin/date X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/bin/date X-SVN-Commit-Revision: 365263 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 17:46:57 -0000 Author: emaste Date: Wed Sep 2 17:46:56 2020 New Revision: 365263 URL: https://svnweb.freebsd.org/changeset/base/365263 Log: MFC r364790: date.1: note possibly surprising behaviour of -j -f PR: 248918 Modified: stable/12/bin/date/date.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/bin/date/date.1 ============================================================================== --- stable/12/bin/date/date.1 Wed Sep 2 17:36:30 2020 (r365262) +++ stable/12/bin/date/date.1 Wed Sep 2 17:46:56 2020 (r365263) @@ -32,7 +32,7 @@ .\" @(#)date.1 8.3 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd August 4, 2018 +.Dd August 25, 2020 .Dt DATE 1 .Os .Sh NAME @@ -154,6 +154,9 @@ This allows you to use the flag in addition to the .Cm + option to convert one date format to another. +Note that any date or time components unspecified by the +.Fl f +format string take their values from the current time. .It Fl n By default, if the .Xr timed 8 From owner-svn-src-all@freebsd.org Wed Sep 2 17:51:44 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91D9D3C0A3A for ; Wed, 2 Sep 2020 17:51:44 +0000 (UTC) (envelope-from mw@semihalf.com) Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhWhv4gC9z3fKD for ; Wed, 2 Sep 2020 17:51:43 +0000 (UTC) (envelope-from mw@semihalf.com) Received: by mail-qk1-x744.google.com with SMTP id u3so488155qkd.9 for ; Wed, 02 Sep 2020 10:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=MFVil+lyegSDrvFxlAC1YBPsFrkXmC4aII509zx5OeU=; b=nOp9pzQdUyYlVgOxatuutDkl8ZKONEu7fQnfpG21PeqpeVwG1VSGT6H1J+scNL5dDe aOJIUz3xkaDONm4vAKxtKJBNdyAekkHyLROpTn+xOwK7Xt1tLCcbKfRGMZbPFbXIFf/H POI5NcmsgIgBhViZujxSqKSCHilMB+pfolCouIkHNzk1IK+IkStr/xNu2d8jnEY4sSBE rnKOZMeMEh6H9NwKpuIC5UK8nXJDwZD1+CFtTHEZExl/USIFnCnzTAGHe4AbbzwOH/U7 WVWxfXMg3/cFmf9bUAeOMRJDr+yK9l1a/uRLzbh7n/sR1C+Ur7mSrU6AQf3zJQwrq9uS vCHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=MFVil+lyegSDrvFxlAC1YBPsFrkXmC4aII509zx5OeU=; b=m7eDyGEc3NV53rB+gk1UzVJOZV4TWJkd3JjnQbjFABFlXeV6l6QP1ek6fV545HQ26M KAllmFAuQ0vFLGl+EODA6CGe1sFIZeEPvAmhGKtDZC1xwqVsJQIH2ST0ZbPaj6QrWSQa Ulqqs6fuoiHdMwMz90Q1UM8jLHnw6yKzsiofhb/ihHle3xTXGYUGQq+K2oYGi68xzAY8 C1ec31CLWQQk2512Q16Y7Rdd7g9n/4DnfLtAZCbGSQxPh1Er4hefMHOYDlJsjvNyeYxa 6pONa8RMXReEPVcDJpCUQJhM7o18xXVV6VAlom8IciiTd4Tzh+v3tqxTM/OCOP2QzRZO crBg== X-Gm-Message-State: AOAM531KwpBVbfCGHM/vKEUc5ISt7PwGWmjt9wXm0M895ACLawjIzFub gEGyu0aYYlHzQm9sjkr9cF5277e0jNwLAoT1QrrFwg== X-Google-Smtp-Source: ABdhPJyx068SmGaQqC8GYL8oViwjFi77vMEdcv7yXhrgVr/9ZL4yij/W7XEISuiZBPOZByBcSYHYYgADJ5Y1cC2chUw= X-Received: by 2002:a37:4c15:: with SMTP id z21mr7644646qka.334.1599069102133; Wed, 02 Sep 2020 10:51:42 -0700 (PDT) MIME-Version: 1.0 References: <202009011617.081GHL8e031671@repo.freebsd.org> In-Reply-To: From: Marcin Wojtas Date: Wed, 2 Sep 2020 19:51:29 +0200 Message-ID: Subject: Re: svn commit: r365054 - in head/sys: conf dev/sdhci To: Justin Hibbits Cc: Marcin Wojtas , Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org, Artur Rojek Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4BhWhv4gC9z3fKD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=nOp9pzQd; dmarc=none; spf=none (mx1.freebsd.org: domain of mw@semihalf.com has no SPF policy when checking 2607:f8b0:4864:20::744) smtp.mailfrom=mw@semihalf.com X-Spamd-Result: default: False [-2.47 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[semihalf-com.20150623.gappssmtp.com:s=20150623]; FREEFALL_USER(0.00)[mw]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-0.97)[-0.969]; NEURAL_HAM_LONG(-1.04)[-1.044]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[semihalf.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[semihalf-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.16)[-0.161]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::744:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 17:51:44 -0000 Hi Justin, Thanks for your input. Please see inline. wt., 1 wrz 2020 o 23:30 Justin Hibbits napisa=C5=82(= a): > > Sep 1, 2020 11:17:35 Marcin Wojtas : > > > Author: mw > > Date: Tue Sep 1 16:17:21 2020 > > New Revision: 365054 > > URL: https://svnweb.freebsd.org/changeset/base/365054 > > > > Log: > > Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs > > > > Implement support for an eSDHC controller found in NXP QorIQ Layerscape= SoCs. > > > > This driver has been tested with NXP LS1046A and LX2160A (Honeycomb boa= rd), > > which is incompatible with the existing sdhci_fsl driver (aiming at old= er > > chips from this family). As such, it is not intended as replacement for > > the old driver, but rather serves as an improved alternative for SoCs t= hat > > support it. > > It comes with support for both PIO and Single DMA modes and samples the > > clock from the extres clk API. > > How is it incompatible? > > > > > Submitted by: Artur Rojek > > Reviewed by: manu, mmel, kibab > > Obtained from: Semihalf > > Sponsored by: Alstom Group > > Differential Revision: https://reviews.freebsd.org/D26153 > > > > Added: > > head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed) > > The name choice here is odd, given there is already fsl_sdhci.c > > > Modified: > > head/sys/conf/files > > > > Modified: head/sys/conf/files > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/conf/files Tue Sep 1 16:13:09 2020 (r365053) > > +++ head/sys/conf/files Tue Sep 1 16:17:21 2020 (r365054) > > @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optional scc > > dev/sdhci/sdhci.c optional sdhci > > dev/sdhci/sdhci_fdt.c optional sdhci fdt > > dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio > > +dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio > > dev/sdhci/sdhci_if.m optional sdhci > > dev/sdhci/sdhci_acpi.c optional sdhci acpi > > dev/sdhci/sdhci_pci.c optional sdhci pci > > > > Added: head/sys/dev/sdhci/sdhci_fsl_fdt.c > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > > +++ head/sys/dev/sdhci/sdhci_fsl_fdt.c Tue Sep 1 16:17:21 2020 (r365= 054) > > @@ -0,0 +1,680 @@ > > +/*- > > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > > + * > > + * Copyright (c) 2020 Alstom Group. > > + * Copyright (c) 2020 Semihalf. > > + * > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions > > + * are met: > > + * 1. Redistributions of source code must retain the above copyright > > + * notice, this list of conditions and the following disclaimer. > > + * 2. Redistributions in binary form must reproduce the above copyrigh= t > > + * notice, this list of conditions and the following disclaimer in = the > > + * documentation and/or other materials provided with the distribut= ion. > > + * > > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' = AND > > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, T= HE > > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR = PURPOSE > > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LI= ABLE > > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQ= UENTIAL > > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE G= OODS > > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTIO= N) > > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,= STRICT > > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN A= NY WAY > > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY= OF > > + * SUCH DAMAGE. > > + */ > > + > > +/* eSDHC controller driver for NXP QorIQ Layerscape SoCs. */ > > + > > +#include > > +__FBSDID("$FreeBSD$"); > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include > > +#include > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include "mmcbr_if.h" > > +#include "sdhci_if.h" > > + > > +#define RD4 (sc->read) > > +#define WR4 (sc->write) > > + > > +#define SDHCI_FSL_PRES_STATE 0x24 > > +#define SDHCI_FSL_PRES_SDSTB (1 << 3) > > +#define SDHCI_FSL_PRES_COMPAT_MASK 0x000f0f07 > > + > > +#define SDHCI_FSL_PROT_CTRL 0x28 > > +#define SDHCI_FSL_PROT_CTRL_WIDTH_1BIT (0 << 1) > > +#define SDHCI_FSL_PROT_CTRL_WIDTH_4BIT (1 << 1) > > +#define SDHCI_FSL_PROT_CTRL_WIDTH_8BIT (2 << 1) > > +#define SDHCI_FSL_PROT_CTRL_WIDTH_MASK (3 << 1) > > +#define SDHCI_FSL_PROT_CTRL_BYTE_SWAP (0 << 4) > > +#define SDHCI_FSL_PROT_CTRL_BYTE_NATIVE (2 << 4) > > +#define SDHCI_FSL_PROT_CTRL_BYTE_MASK (3 << 4) > > +#define SDHCI_FSL_PROT_CTRL_DMA_MASK (3 << 8) > > + > > +#define SDHCI_FSL_SYS_CTRL 0x2c > > +#define SDHCI_FSL_CLK_IPGEN (1 << 0) > > +#define SDHCI_FSL_CLK_SDCLKEN (1 << 3) > > +#define SDHCI_FSL_CLK_DIVIDER_MASK 0x000000f0 > > +#define SDHCI_FSL_CLK_DIVIDER_SHIFT 4 > > +#define SDHCI_FSL_CLK_PRESCALE_MASK 0x0000ff00 > > +#define SDHCI_FSL_CLK_PRESCALE_SHIFT 8 > > + > > +#define SDHCI_FSL_WTMK_LVL 0x44 > > +#define SDHCI_FSL_WTMK_RD_512B (0 << 0) > > +#define SDHCI_FSL_WTMK_WR_512B (0 << 15) > > + > > +#define SDHCI_FSL_HOST_VERSION 0xfc > > +#define SDHCI_FSL_CAPABILITIES2 0x114 > > + > > +#define SDHCI_FSL_ESDHC_CTRL 0x40c > > +#define SDHCI_FSL_ESDHC_CTRL_SNOOP (1 << 6) > > +#define SDHCI_FSL_ESDHC_CTRL_CLK_DIV2 (1 << 19) > > + > > +struct sdhci_fsl_fdt_softc { > > + device_t dev; > > + const struct sdhci_fsl_fdt_soc_data *soc_data; > > + struct resource *mem_res; > > + struct resource *irq_res; > > + void *irq_cookie; > > + uint32_t baseclk_hz; > > + struct sdhci_fdt_gpio *gpio; > > + struct sdhci_slot slot; > > + bool slot_init_done; > > + uint32_t cmd_and_mode; > > + uint16_t sdclk_bits; > > + > > + uint32_t (* read)(struct sdhci_fsl_fdt_softc *, bus_size_t); > > + void (* write)(struct sdhci_fsl_fdt_softc *, bus_size_t, uint32_t); > > +}; > > + > > +struct sdhci_fsl_fdt_soc_data { > > + int quirks; > > +}; > > + > > +static const struct sdhci_fsl_fdt_soc_data sdhci_fsl_fdt_ls1046a_soc_d= ata =3D { > > + .quirks =3D SDHCI_QUIRK_DONT_SET_HISPD_BIT | SDHCI_QUIRK_BROKEN_AUTO_= STOP > > +}; > > + > > +static const struct sdhci_fsl_fdt_soc_data sdhci_fsl_fdt_gen_data =3D = { > > + .quirks =3D 0, > > +}; > > + > > +static const struct ofw_compat_data sdhci_fsl_fdt_compat_data[] =3D { > > + {"fsl,ls1046a-esdhc", (uintptr_t)&sdhci_fsl_fdt_ls1046a_soc_data}, > > + {"fsl,esdhc", (uintptr_t)&sdhci_fsl_fdt_gen_data}, > > + {NULL, 0} > > +}; > > The existing driver is compatible with fsl,esdhc. How are you preventing= collisions? The pure "fsl,esdhc" compatibility jumped in during review, as it was tested with the LX2K SoC by mmel. Frankly we didn't expect it would work without modifications, but I get your point and agree, this now may lead to confusion now. > > Why couldn't you make these changes to the existing driver? I see some i= mprovements in this one that would be nice to have in the other driver. To shed some light on the decision - the fsl_sdhci.c was initially considered, but we had following issues, causing the bring-up debug extremely painful (especially in terms of our DMA enablement requirement from our customer): * ext_resources * __arm__ and __powerpc__ ifdefs * fixed quirks and other hardcoded settings in attach * Another level of complexity is added by the USDHC/ESDHC Introducing the __aarch64__ and EXT_RESOURCES ifdef level would cause even more tangled and illegible code. We also did not have full clarity, whether we can consider the IP as 1:1, as the work was done on the LS1046A. Therefore we decided to do a clean version of the driver supporting ESDHC for ARM64-based NXP LayerScape SoCs (which eventually and surprisingly to us worked out of the box with "fsl,esdhc" on the LX2K...). On the other hand in the new driver there is a slightly improved endiannes handling, which may suggest that it would be easy to try the powerpc QoriQ machine with the "fsl,esdhc" (with only hack to avoid the ext_resources). Now I am wondering what to do with this (keeping required effort aside for now), e.g.: * update and switch to fsl_sdhci.c fully (likely to cause regressions, we also don't have iMX/QoriQ platforms to test) * switch partially - use the ext_resources conditionally and start to use at least some platforms that prove to work fine with the new driver, gaining the SDMA support * possibly rename and move build enablement only to files.arm64, depending additionally on the SOC_NXP_LS option * some other solution? Looking forward to your feedback. Best regards, Marcin From owner-svn-src-all@freebsd.org Wed Sep 2 18:04:50 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 28AD63C3618; Wed, 2 Sep 2020 18:04:50 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhX020H4wz3yPJ; Wed, 2 Sep 2020 18:04:50 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C135CE4CD; Wed, 2 Sep 2020 18:04:49 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082I4nIh098927; Wed, 2 Sep 2020 18:04:49 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082I4nJ0098926; Wed, 2 Sep 2020 18:04:49 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202009021804.082I4nJ0098926@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 2 Sep 2020 18:04:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365264 - head/sys/dev/drm2 X-SVN-Group: head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: head/sys/dev/drm2 X-SVN-Commit-Revision: 365264 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 18:04:50 -0000 Author: zeising (doc,ports committer) Date: Wed Sep 2 18:04:49 2020 New Revision: 365264 URL: https://svnweb.freebsd.org/changeset/base/365264 Log: drm2: Further improve deprecation message Further improve the drm2 deprecation message, only displaying information about the port for relevant architectures, and skipping the message completely from arm, which uses some parts of drm2 still. This is mostly intended to be merged to 12, since the base bits of drm2 on FreeBSD 13 are only really used on arm. Reviewed by: manu, mmel Approved by: manu MFC after: 3 days X-MFC-with: r364737 Differential Revision: https://reviews.freebsd.org/D26275 Modified: head/sys/dev/drm2/drm_os_freebsd.h Modified: head/sys/dev/drm2/drm_os_freebsd.h ============================================================================== --- head/sys/dev/drm2/drm_os_freebsd.h Wed Sep 2 17:46:56 2020 (r365263) +++ head/sys/dev/drm2/drm_os_freebsd.h Wed Sep 2 18:04:49 2020 (r365264) @@ -154,15 +154,21 @@ typedef void irqreturn_t; *(volatile u_int64_t *)(((vm_offset_t)(map)->handle) + \ (vm_offset_t)(offset)) = htole64(val) -#define DRM_PORT "graphics/drm-kmod" +#if !defined(__arm__) +#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || defined(__aarch64__) +#define DRM_MSG "This code is deprecated. Install the graphics/drm-kmod pkg\n" +#else +#define DRM_MSG "This code is deprecated." +#endif #define DRM_OBSOLETE(dev) \ do { \ device_printf(dev, "=======================================================\n"); \ - device_printf(dev, "This code is deprecated. Install the " DRM_PORT " pkg\n"); \ + device_printf(dev, DRM_MSG); \ device_printf(dev, "=======================================================\n"); \ gone_in_dev(dev, 13, "drm2 drivers"); \ } while (0) +#endif /* __arm__ */ /* DRM_READMEMORYBARRIER() prevents reordering of reads. * DRM_WRITEMEMORYBARRIER() prevents reordering of writes. From owner-svn-src-all@freebsd.org Wed Sep 2 18:06:26 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AF3E33C35B6; Wed, 2 Sep 2020 18:06:26 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhX1t4Dtvz3ykf; Wed, 2 Sep 2020 18:06:26 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1599069986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=OdcC9QyAaZJhDDKef+SH40GQetdb5QZXyJIXQlZnc70=; b=ZRAPZWso7yefaFkc8vPMhnKhISkyQ7eKgLXXjaiiOffngJb9DSKToI6CQRyF8OPboHfwDm T0NiTBP9zAyMXtqoBKVQ4bwXGROt1w867d4xHpubD+cd6adwiydUuE8hWRrTo4DDJeoRIV 6XjAGt5PmdndcmcygCXmcmrV3a/ecohdoyHJElapPkQ9GB7brNxs6i1rMwq9oMnuynfAUp SExPfbbz/tml8pDC/etkPYULSkKk9I+xqbmCStNBCAPqIIXvcKt52dsIYw/xVy/PjGdZ5H R3l/0wXtma27FKRaM7TFfufcTgYa48Qgh3WChFWRB/J5Ufw3CGsKkcwMgTWG8w== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 7C6D3D803; Wed, 2 Sep 2020 18:06:26 +0000 (UTC) Date: Wed, 2 Sep 2020 18:06:26 +0000 From: Alexey Dokuchaev To: Pedro Giffuni Cc: Michael Tuexen , Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... Message-ID: <20200902180626.GA88595@FreeBSD.org> References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1599069986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=OdcC9QyAaZJhDDKef+SH40GQetdb5QZXyJIXQlZnc70=; b=Ipk/zeRgcBMLqH6cvsNN2wPN4D0TSM9Kij+BRIDv4RBjVW0DwhG5T6wUyHUipzhJ0KpznP cP1fogfFxUb0gwxd5E5dRmI6KGeqQMHKSiPuIoGsYqY5wfpkUzctViv8GjBZQqHA/E6nVS rm9X40p06QYneHeVc5llleMPupauWASYD9YtoKTeMVx8TSI9dCZnjMx2xHAB6JqoAzR99e E/IfT3IgsTO0t4wkSXC0Nrv4rvfZs/Ah+f8ao1Y5N1pUXkk78A6sxgZ+POMR6FbBfy5n85 gKUHGPa9xfgUdyLk5PhJAASw8EoVckLnmNzOypCDeVbCiYLqbzqdeD98CaJ08Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1599069986; a=rsa-sha256; cv=none; b=CFU6/gGCpSN8W2lrzeLyEYTksuTYB7HslYTCRwnYjs8MOQr9nYxhoF3Oxw7CiuZa0N1GKb ffdKbdCoOcvq3YDxHKvFgZ81y6Bh4NMJQVXUcm5pbB8QWJHLNu78Mm7rD6x/iCdKOUYWCA lwr5H1z9DMLPW2DagiWFHA4Fj4aE3ZZbpSgdJ6Re0EgcUlQOMvj67gLCT70jprHLX7F9cd Cap6KqpeqzmYEdwUIT2FSLVAC9vKWq4GTSm0DgulxuDdtLNEiEX88qdJS2+deU6GJGmIZk YjEycbdHo2gWaj4KJsRyPfwNZmt64fGH3lxf9RURTC3kc4rWYS9KJ1Pz2xAv/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 18:06:26 -0000 On Wed, Sep 02, 2020 at 10:18:15AM -0500, Pedro Giffuni wrote: > On 01/09/2020 21:05, Alexey Dokuchaev wrote: > > ... > > This is common sense. I can't count how often I wanted to hack on > > something in the base/kernel and was turned away by this atrocious > > excessive whitespace mess. > > > > Thank you Mateusz for cleaning this up. > > I honestly don't care much, but spaces do no harm and can make the code > more readable. Sort of a silent comment, or what you do in written > language when you start a new paragraph. Right, but that's the example of appropriate usage of whitespace. I was talking about *excessive* whitespace, that is, more than two \n's in a row if we speak of newlines (subject of these commits). ./danfe From owner-svn-src-all@freebsd.org Wed Sep 2 18:12:51 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D34903C37EC; Wed, 2 Sep 2020 18:12:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhX9H5Ykmz40C3; Wed, 2 Sep 2020 18:12:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A19C9E661; Wed, 2 Sep 2020 18:12:51 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082ICp7e005138; Wed, 2 Sep 2020 18:12:51 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082ICloe005120; Wed, 2 Sep 2020 18:12:47 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009021812.082ICloe005120@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 2 Sep 2020 18:12:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365265 - in head: share/man/man4 sys/amd64/amd64 sys/amd64/include sys/arm/arm sys/arm/include sys/arm64/arm64 sys/arm64/include sys/dev/mem sys/i386/i386 sys/i386/include sys/mips/inc... X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head: share/man/man4 sys/amd64/amd64 sys/amd64/include sys/arm/arm sys/arm/include sys/arm64/arm64 sys/arm64/include sys/dev/mem sys/i386/i386 sys/i386/include sys/mips/include sys/mips/mips sys/po... X-SVN-Commit-Revision: 365265 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 18:12:51 -0000 Author: markj Date: Wed Sep 2 18:12:47 2020 New Revision: 365265 URL: https://svnweb.freebsd.org/changeset/base/365265 Log: Add the MEM_EXTRACT_PADDR ioctl to /dev/mem. This allows privileged userspace processes to find information about the physical page backing a given mapping. It is useful in applications such as DPDK which perform some of their own memory management. Reviewed by: kib, jhb (previous version) MFC after: 2 weeks Sponsored by: Juniper Networks, Inc. Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D26237 Modified: head/share/man/man4/mem.4 head/sys/amd64/amd64/mem.c head/sys/amd64/include/memdev.h head/sys/arm/arm/mem.c head/sys/arm/include/memdev.h head/sys/arm64/arm64/mem.c head/sys/arm64/include/memdev.h head/sys/dev/mem/memdev.c head/sys/i386/i386/mem.c head/sys/i386/include/memdev.h head/sys/mips/include/memdev.h head/sys/mips/mips/mem.c head/sys/powerpc/include/memdev.h head/sys/powerpc/powerpc/mem.c head/sys/riscv/include/memdev.h head/sys/riscv/riscv/mem.c head/sys/sys/memrange.h Modified: head/share/man/man4/mem.4 ============================================================================== --- head/share/man/man4/mem.4 Wed Sep 2 18:04:49 2020 (r365264) +++ head/share/man/man4/mem.4 Wed Sep 2 18:12:47 2020 (r365265) @@ -28,7 +28,7 @@ .\" @(#)mem.4 5.3 (Berkeley) 5/2/91 .\" $FreeBSD$ .\" -.Dd October 3, 2004 +.Dd August 25, 2020 .Dt MEM 4 .Os .Sh NAME @@ -54,11 +54,7 @@ in the same manner as .Pa /dev/mem . Only kernel virtual addresses that are currently mapped to memory are allowed. .Pp -On -.Tn ISA -the -.Tn I/O -memory space begins at physical address 0x000a0000 +On ISA the I/O memory space begins at physical address 0x000a0000 and runs to 0x00100000. The per-process data @@ -69,6 +65,46 @@ is long, and ends at virtual address 0xf0000000. .Sh IOCTL INTERFACE +The +.Dv MEM_EXTRACT_PADDR +ioctl can be used to look up the physical address and NUMA domain of a given +virtual address in the calling process' address space. +The request is described by +.Bd -literal +struct mem_extract { + uint64_t me_vaddr; /* input */ + uint64_t me_paddr; /* output */ + int me_domain; /* output */ + int me_state; /* output */ +}; +.Ed +.Pp +The ioctl returns an error if the address is not valid. +The information returned by +.Dv MEM_EXTRACT_PADDR +may be out of date by the time that the ioctl call returns. +Specifically, concurrent system calls, page faults, or system page reclamation +activity may have unmapped the virtual page or replaced the backing physical +page before the ioctl call returns. +Wired pages, e.g., those locked by +.Xr mlock 2 , +will not be reclaimed by the system. +.Pp +The +.Fa me_state +field provides information about the state of the virtual page: +.Bl -tag -width indent +.It Dv ME_STATE_INVALID +The virtual address is invalid. +.It Dv ME_STATE_VALID +The virtual address is valid but is not mapped at the time of the ioctl call. +.It Dv ME_STATE_MAPPED +The virtual address corresponds to a physical page mapping, and the +.Fa me_paddr +and +.Fa me_domain +fields are valid. +.Pp Several architectures allow attributes to be associated with ranges of physical memory. These attributes can be manipulated via @@ -95,12 +131,13 @@ The region cannot be written to. .El .Pp Memory ranges are described by -.Vt struct mem_range_desc : -.Bd -literal -offset indent -uint64_t mr_base; /\(** physical base address \(**/ -uint64_t mr_len; /\(** physical length of region \(**/ -int mr_flags; /\(** attributes of region \(**/ -char mr_owner[8]; +.Bd -literal +struct mem_range_desc { + uint64_t mr_base; /* physical base address */ + uint64_t mr_len; /* physical length of region */ + int mr_flags; /* attributes of region */ + char mr_owner[8]; +}; .Ed .Pp In addition to the region attributes listed above, the following flags @@ -126,10 +163,11 @@ altered. .El .Pp Operations are performed using -.Fa struct mem_range_op : -.Bd -literal -offset indent -struct mem_range_desc *mo_desc; -int mo_arg[2]; +.Bd -literal +struct mem_range_op { + struct mem_range_desc *mo_desc; + int mo_arg[2]; +}; .Ed .Pp The @@ -165,7 +203,7 @@ to remove a range. .It Bq Er EOPNOTSUPP Memory range operations are not supported on this architecture. .It Bq Er ENXIO -No memory range descriptors are available (e.g.\& firmware has not enabled +No memory range descriptors are available (e.g., firmware has not enabled any). .It Bq Er EINVAL The memory range supplied as an argument is invalid or overlaps another @@ -174,7 +212,7 @@ range in a fashion not supported by this architecture. An attempt to remove or update a range failed because the range is busy. .It Bq Er ENOSPC An attempt to create a new range failed due to a shortage of hardware -resources (e.g.\& descriptor slots). +resources (e.g., descriptor slots). .It Bq Er ENOENT An attempt to remove a range failed because no range matches the descriptor base/length supplied. Modified: head/sys/amd64/amd64/mem.c ============================================================================== --- head/sys/amd64/amd64/mem.c Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/amd64/amd64/mem.c Wed Sep 2 18:12:47 2020 (r365265) @@ -185,9 +185,8 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_padd * This is basically just an ioctl shim for mem_range_attr_get * and mem_range_attr_set. */ -/* ARGSUSED */ int -memioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags, +memioctl_md(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags, struct thread *td) { int nd, error = 0; Modified: head/sys/amd64/include/memdev.h ============================================================================== --- head/sys/amd64/include/memdev.h Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/amd64/include/memdev.h Wed Sep 2 18:12:47 2020 (r365265) @@ -36,7 +36,7 @@ d_open_t memopen; d_read_t memrw; -d_ioctl_t memioctl; +d_ioctl_t memioctl_md; d_mmap_t memmmap; #endif /* _MACHINE_MEMDEV_H_ */ Modified: head/sys/arm/arm/mem.c ============================================================================== --- head/sys/arm/arm/mem.c Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/arm/arm/mem.c Wed Sep 2 18:12:47 2020 (r365265) @@ -172,3 +172,10 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_padd } return (-1); } + +int +memioctl_md(struct cdev *dev __unused, u_long cmd __unused, + caddr_t data __unused, int flags __unused, struct thread *td __unused) +{ + return (ENOTTY); +} Modified: head/sys/arm/include/memdev.h ============================================================================== --- head/sys/arm/include/memdev.h Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/arm/include/memdev.h Wed Sep 2 18:12:47 2020 (r365265) @@ -37,6 +37,6 @@ d_open_t memopen; d_read_t memrw; d_mmap_t memmmap; -#define memioctl (d_ioctl_t *)NULL +d_ioctl_t memioctl_md; #endif /* _MACHINE_MEMDEV_H_ */ Modified: head/sys/arm64/arm64/mem.c ============================================================================== --- head/sys/arm64/arm64/mem.c Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/arm64/arm64/mem.c Wed Sep 2 18:12:47 2020 (r365265) @@ -129,3 +129,10 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_padd } return (-1); } + +int +memioctl_md(struct cdev *dev __unused, u_long cmd __unused, + caddr_t data __unused, int flags __unused, struct thread *td __unused) +{ + return (ENOTTY); +} Modified: head/sys/arm64/include/memdev.h ============================================================================== --- head/sys/arm64/include/memdev.h Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/arm64/include/memdev.h Wed Sep 2 18:12:47 2020 (r365265) @@ -34,7 +34,7 @@ d_open_t memopen; d_read_t memrw; -#define memioctl (d_ioctl_t *)NULL +d_ioctl_t memioctl_md; d_mmap_t memmmap; #endif /* _MACHINE_MEMDEV_H_ */ Modified: head/sys/dev/mem/memdev.c ============================================================================== --- head/sys/dev/mem/memdev.c Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/dev/mem/memdev.c Wed Sep 2 18:12:47 2020 (r365265) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -46,12 +47,19 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include +#include +#include +#include +#include #include static struct cdev *memdev, *kmemdev; +static d_ioctl_t memioctl; + static struct cdevsw mem_cdevsw = { .d_version = D_VERSION, .d_flags = D_MEM, @@ -79,6 +87,43 @@ memopen(struct cdev *dev __unused, int flags, int fmt error = securelevel_gt(td->td_ucred, 0); } + return (error); +} + +static int +memioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, + struct thread *td) +{ + vm_map_t map; + vm_map_entry_t entry; + struct mem_extract *me; + int error; + + error = 0; + switch (cmd) { + case MEM_EXTRACT_PADDR: + me = (struct mem_extract *)data; + + map = &td->td_proc->p_vmspace->vm_map; + vm_map_lock_read(map); + if (vm_map_lookup_entry(map, me->me_vaddr, &entry)) { + me->me_paddr = pmap_extract( + &td->td_proc->p_vmspace->vm_pmap, me->me_vaddr); + if (me->me_paddr != 0) { + me->me_state = ME_STATE_MAPPED; + me->me_domain = _vm_phys_domain(me->me_paddr); + } else { + me->me_state = ME_STATE_VALID; + } + } else { + me->me_state = ME_STATE_INVALID; + } + vm_map_unlock_read(map); + break; + default: + error = memioctl_md(dev, cmd, data, flags, td); + break; + } return (error); } Modified: head/sys/i386/i386/mem.c ============================================================================== --- head/sys/i386/i386/mem.c Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/i386/i386/mem.c Wed Sep 2 18:12:47 2020 (r365265) @@ -176,9 +176,8 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_padd * This is basically just an ioctl shim for mem_range_attr_get * and mem_range_attr_set. */ -/* ARGSUSED */ int -memioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags, +memioctl_md(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags, struct thread *td) { int nd, error = 0; Modified: head/sys/i386/include/memdev.h ============================================================================== --- head/sys/i386/include/memdev.h Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/i386/include/memdev.h Wed Sep 2 18:12:47 2020 (r365265) @@ -36,7 +36,7 @@ d_open_t memopen; d_read_t memrw; -d_ioctl_t memioctl; +d_ioctl_t memioctl_md; d_mmap_t memmmap; #endif /* _MACHINE_MEMDEV_H_ */ Modified: head/sys/mips/include/memdev.h ============================================================================== --- head/sys/mips/include/memdev.h Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/mips/include/memdev.h Wed Sep 2 18:12:47 2020 (r365265) @@ -37,7 +37,7 @@ d_open_t memopen; d_read_t memrw; -#define memioctl (d_ioctl_t *)NULL +d_ioctl_t memioctl_md; d_mmap_t memmmap; #endif /* _MACHINE_MEMDEV_H_ */ Modified: head/sys/mips/mips/mem.c ============================================================================== --- head/sys/mips/mips/mem.c Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/mips/mips/mem.c Wed Sep 2 18:12:47 2020 (r365265) @@ -160,3 +160,10 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_padd return (0); } + +int +memioctl_md(struct cdev *dev __unused, u_long cmd __unused, + caddr_t data __unused, int flags __unused, struct thread *td __unused) +{ + return (ENOTTY); +} Modified: head/sys/powerpc/include/memdev.h ============================================================================== --- head/sys/powerpc/include/memdev.h Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/powerpc/include/memdev.h Wed Sep 2 18:12:47 2020 (r365265) @@ -36,7 +36,7 @@ d_open_t memopen; d_read_t memrw; -d_ioctl_t memioctl; +d_ioctl_t memioctl_md; d_mmap_t memmmap; #endif /* _MACHINE_MEMDEV_H_ */ Modified: head/sys/powerpc/powerpc/mem.c ============================================================================== --- head/sys/powerpc/powerpc/mem.c Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/powerpc/powerpc/mem.c Wed Sep 2 18:12:47 2020 (r365265) @@ -278,9 +278,8 @@ ppc_mrset(struct mem_range_softc *sc, struct mem_range * This is basically just an ioctl shim for mem_range_attr_get * and mem_range_attr_set. */ -/* ARGSUSED */ int -memioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags, +memioctl_md(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags, struct thread *td) { int nd, error = 0; Modified: head/sys/riscv/include/memdev.h ============================================================================== --- head/sys/riscv/include/memdev.h Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/riscv/include/memdev.h Wed Sep 2 18:12:47 2020 (r365265) @@ -34,7 +34,7 @@ d_open_t memopen; d_read_t memrw; -#define memioctl (d_ioctl_t *)NULL +d_ioctl_t memioctl_md; #define memmmap (d_mmap_t *)NULL #endif /* _MACHINE_MEMDEV_H_ */ Modified: head/sys/riscv/riscv/mem.c ============================================================================== --- head/sys/riscv/riscv/mem.c Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/riscv/riscv/mem.c Wed Sep 2 18:12:47 2020 (r365265) @@ -121,3 +121,10 @@ memrw(struct cdev *dev, struct uio *uio, int flags) return (error); } + +int +memioctl_md(struct cdev *dev __unused, u_long cmd __unused, + caddr_t data __unused, int flags __unused, struct thread *td __unused) +{ + return (ENOTTY); +} Modified: head/sys/sys/memrange.h ============================================================================== --- head/sys/sys/memrange.h Wed Sep 2 18:04:49 2020 (r365264) +++ head/sys/sys/memrange.h Wed Sep 2 18:12:47 2020 (r365265) @@ -45,6 +45,20 @@ struct mem_range_op #define MEMRANGE_GET _IOWR('m', 50, struct mem_range_op) #define MEMRANGE_SET _IOW('m', 51, struct mem_range_op) +#define ME_STATE_INVALID 0 +#define ME_STATE_VALID 1 +#define ME_STATE_MAPPED 2 + +struct mem_extract { + uint64_t me_vaddr; + uint64_t me_paddr; + int me_domain; + int me_state; + uint64_t pad1[5]; +}; + +#define MEM_EXTRACT_PADDR _IOWR('m', 52, struct mem_extract) + #ifdef _KERNEL MALLOC_DECLARE(M_MEMDESC); From owner-svn-src-all@freebsd.org Wed Sep 2 18:15:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0AA973C3764; Wed, 2 Sep 2020 18:15:58 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhXDs6ZjLz40NT; Wed, 2 Sep 2020 18:15:57 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C59DEEA14; Wed, 2 Sep 2020 18:15:57 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082IFvos005347; Wed, 2 Sep 2020 18:15:57 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082IFvIM005346; Wed, 2 Sep 2020 18:15:57 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202009021815.082IFvIM005346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Wed, 2 Sep 2020 18:15:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365266 - head/sbin/kldstat X-SVN-Group: head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: head/sbin/kldstat X-SVN-Commit-Revision: 365266 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 18:15:58 -0000 Author: fernape (ports committer) Date: Wed Sep 2 18:15:57 2020 New Revision: 365266 URL: https://svnweb.freebsd.org/changeset/base/365266 Log: kldstat(8): Add EXAMPLES to the man page Add EXAMPLES for all the flags Approved by: manpages (bcr@) Differential Revision: https://reviews.freebsd.org/D26283 Modified: head/sbin/kldstat/kldstat.8 Modified: head/sbin/kldstat/kldstat.8 ============================================================================== --- head/sbin/kldstat/kldstat.8 Wed Sep 2 18:12:47 2020 (r365265) +++ head/sbin/kldstat/kldstat.8 Wed Sep 2 18:15:57 2020 (r365266) @@ -63,12 +63,84 @@ Display the status of only the file with this ID. .It Fl n Ar filename Display the status of only the file with this filename. .It Fl q -Only check if module is loaded or compiled into the kernel. +Only check if file is loaded or compiled into the kernel. .It Fl m Ar modname Display the status of only the module with this modname. .El .Sh EXIT STATUS .Ex -std +.Sh EXAMPLES +Show files dynamically linked into the kernel. +Note the kernel itself is shown in the list. +.Em Refs +shows the number of modules referenced by each file: +.Bd -literal -offset indent +$ kldstat +Id Refs Address Size Name + 1 38 0xffffffff80200000 2448f20 kernel + 2 3 0xffffffff82649000 b7bd8 linux.ko + 3 5 0xffffffff82701000 9698 linux_common.ko + 4 1 0xffffffff82b11000 1eae linsysfs.ko + 5 1 0xffffffff82b13000 f2af8 nvidia-modeset.ko + 6 1 0xffffffff82c06000 122b020 nvidia.ko + 7 1 0xffffffff83e32000 2668 intpm.ko + 8 1 0xffffffff83e35000 b50 smbus.ko + 9 1 0xffffffff83e36000 18a0 uhid.ko +10 1 0xffffffff83e38000 2928 ums.ko +11 1 0xffffffff83e3b000 1aa0 wmt.ko +12 1 0xffffffff83e3d000 cd70 snd_uaudio.ko +.Ed +.Pp +Show the verbose status of the +.Em linux +file and show the size in a human readable fashion: +.Bd -literal -offset indent +$ kldstat -h -v -n linux +Id Refs Address Size Name + 2 3 0xffffffff82649000 735K linux.ko (/boot/kernel/linux.ko) + Contains modules: + Id Name + 2 linuxelf +.Ed +.Pp +Same as above using the +.Em id +of the file: +.Bd -literal -offset indent +$ kldstat -h -i 2 -v +Id Refs Address Size Name + 2 3 0xffffffff82649000 735K linux.ko (/boot/kernel/linux.ko) + Contains modules: + Id Name + 2 linuxelf +.Ed +.Pp +Show the status of the +.Em linuxelf +module obtained from the example above: +.Bd -literal -offset indent +$ kldstat -v -m linuxelf +Id Refs Name + 2 1 linuxelf +.Ed +.Pp +Show the module specific data for the +.Em g_raid +module: +.Bd -literal -offset indent +$ kldstat -d -m g_raid +Id Refs Name data..(int, uint, ulong) +366 1 g_raid (0, 0, 0x0) +.Ed +.Pp +Check if the module +.Em fakefile +is linked. +Returns 0 if it is, 1 otherwise: +.Bd -literal -offset indent +$ kldstat -q -n fakefile || echo file not linked +file not linked +.Ed .Sh SEE ALSO .Xr kldstat 2 , .Xr kldload 8 , From owner-svn-src-all@freebsd.org Wed Sep 2 18:16:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 896CD3C3C04; Wed, 2 Sep 2020 18:16:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhXFn376cz40fb; Wed, 2 Sep 2020 18:16:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F6C2E82F; Wed, 2 Sep 2020 18:16:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082IGjZW005537; Wed, 2 Sep 2020 18:16:45 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082IGhml005525; Wed, 2 Sep 2020 18:16:43 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009021816.082IGhml005525@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 2 Sep 2020 18:16:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365267 - in head: lib/libc/sys sys/amd64/amd64 sys/arm/arm sys/arm64/arm64 sys/i386/i386 sys/powerpc/aim sys/riscv/riscv sys/sys sys/vm X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head: lib/libc/sys sys/amd64/amd64 sys/arm/arm sys/arm64/arm64 sys/i386/i386 sys/powerpc/aim sys/riscv/riscv sys/sys sys/vm X-SVN-Commit-Revision: 365267 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 18:16:45 -0000 Author: markj Date: Wed Sep 2 18:16:43 2020 New Revision: 365267 URL: https://svnweb.freebsd.org/changeset/base/365267 Log: Include the psind in data returned by mincore(2). Currently we use a single bit to indicate whether the virtual page is part of a superpage. To support a forthcoming implementation of non-transparent 1GB superpages, it is useful to provide more detailed information about large page sizes. The change converts MINCORE_SUPER into a mask for MINCORE_PSIND(psind) values, indicating a mapping of size psind, where psind is an index into the pagesizes array returned by getpagesizes(3), which in turn comes from the hw.pagesizes sysctl. MINCORE_PSIND(1) is equal to the old value of MINCORE_SUPER. For now, two bits are used to record the page size, permitting values of MAXPAGESIZES up to 4. Reviewed by: alc, kib Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D26238 Modified: head/lib/libc/sys/mincore.2 head/sys/amd64/amd64/pmap.c head/sys/arm/arm/pmap-v6.c head/sys/arm64/arm64/pmap.c head/sys/i386/i386/pmap.c head/sys/powerpc/aim/mmu_radix.c head/sys/riscv/riscv/pmap.c head/sys/sys/mman.h head/sys/vm/vm_mmap.c Modified: head/lib/libc/sys/mincore.2 ============================================================================== --- head/lib/libc/sys/mincore.2 Wed Sep 2 18:15:57 2020 (r365266) +++ head/lib/libc/sys/mincore.2 Wed Sep 2 18:16:43 2020 (r365267) @@ -28,7 +28,7 @@ .\" @(#)mincore.2 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd January 7, 2019 +.Dd August 23, 2020 .Dt MINCORE 2 .Os .Sh NAME @@ -73,9 +73,19 @@ Page has been modified by us. Page has been referenced. .It Dv MINCORE_MODIFIED_OTHER Page has been modified. -.It Dv MINCORE_SUPER +.It Dv MINCORE_PSIND(i) Page is part of a large .Pq Dq super +page with size given by index +.Dv i +in the array returned by +.Xr getpagesizes 3 . +.It Dv MINCORE_SUPER +A mask of the valid +.Dv MINCORE_PSIND() +values. +If any bits in this mask are set, the page is part of a large +.Pq Dq super page. .El .Pp @@ -98,6 +108,17 @@ and statuses. Otherwise, if the sysctl value is zero, all resident pages backing the specified address range are examined, regardless of the mapping state. +.Sh IMPLEMENTATION NOTES +Prior to the introduction of +.Dv MINCORE_PSIND() +in +.Fx 13.0 , +.Dv MINCORE_SUPER +consisted of a single bit equal to +.Dv MINCORE_PSIND(1) . +In particular, applications compiled using the old value of +.Dv MINCORE_SUPER +will not identify large pages with size index 2 as being large pages. .Sh RETURN VALUES .Rv -std mincore .Sh ERRORS @@ -122,7 +143,8 @@ argument points to an illegal address. .Xr mprotect 2 , .Xr msync 2 , .Xr munmap 2 , -.Xr getpagesize 3 +.Xr getpagesize 3 , +.Xr getpagesizes 3 .Sh HISTORY The .Fn mincore Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Wed Sep 2 18:15:57 2020 (r365266) +++ head/sys/amd64/amd64/pmap.c Wed Sep 2 18:16:43 2020 (r365267) @@ -9149,7 +9149,7 @@ pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t /* Compute the physical address of the 4KB page. */ pa = ((*pdep & PG_PS_FRAME) | (addr & PDRMASK)) & PG_FRAME; - val = MINCORE_SUPER; + val = MINCORE_PSIND(1); } else { pte = *pmap_pde_to_pte(pdep, addr); pa = pte & PG_FRAME; Modified: head/sys/arm/arm/pmap-v6.c ============================================================================== --- head/sys/arm/arm/pmap-v6.c Wed Sep 2 18:15:57 2020 (r365266) +++ head/sys/arm/arm/pmap-v6.c Wed Sep 2 18:16:43 2020 (r365267) @@ -6235,7 +6235,7 @@ pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t if (pte1_is_section(pte1)) { pa = trunc_page(pte1_pa(pte1) | (addr & PTE1_OFFSET)); managed = pte1_is_managed(pte1); - val = MINCORE_SUPER | MINCORE_INCORE; + val = MINCORE_PSIND(1) | MINCORE_INCORE; if (pte1_is_dirty(pte1)) val |= MINCORE_MODIFIED | MINCORE_MODIFIED_OTHER; if (pte1 & PTE1_A) Modified: head/sys/arm64/arm64/pmap.c ============================================================================== --- head/sys/arm64/arm64/pmap.c Wed Sep 2 18:15:57 2020 (r365266) +++ head/sys/arm64/arm64/pmap.c Wed Sep 2 18:16:43 2020 (r365267) @@ -5956,7 +5956,7 @@ pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t managed = (tpte & ATTR_SW_MANAGED) != 0; val = MINCORE_INCORE; if (lvl != 3) - val |= MINCORE_SUPER; + val |= MINCORE_PSIND(3 - lvl); if ((managed && pmap_pte_dirty(pmap, tpte)) || (!managed && (tpte & ATTR_S1_AP_RW_BIT) == ATTR_S1_AP(ATTR_S1_AP_RW))) val |= MINCORE_MODIFIED | MINCORE_MODIFIED_OTHER; Modified: head/sys/i386/i386/pmap.c ============================================================================== --- head/sys/i386/i386/pmap.c Wed Sep 2 18:15:57 2020 (r365266) +++ head/sys/i386/i386/pmap.c Wed Sep 2 18:16:43 2020 (r365267) @@ -5755,7 +5755,7 @@ __CONCAT(PMTYPE, mincore)(pmap_t pmap, vm_offset_t add /* Compute the physical address of the 4KB page. */ pa = ((pde & PG_PS_FRAME) | (addr & PDRMASK)) & PG_FRAME; - val = MINCORE_SUPER; + val = MINCORE_PSIND(1); } else { pte = pmap_pte_ufast(pmap, addr, pde); pa = pte & PG_FRAME; Modified: head/sys/powerpc/aim/mmu_radix.c ============================================================================== --- head/sys/powerpc/aim/mmu_radix.c Wed Sep 2 18:15:57 2020 (r365266) +++ head/sys/powerpc/aim/mmu_radix.c Wed Sep 2 18:16:43 2020 (r365267) @@ -5689,7 +5689,7 @@ mmu_radix_mincore(pmap_t pmap, vm_offset_t addr, vm_pa /* Compute the physical address of the 4KB page. */ pa = ((*l3ep & PG_PS_FRAME) | (addr & L3_PAGE_MASK)) & PG_FRAME; - val = MINCORE_SUPER; + val = MINCORE_PSIND(1); } else { pte = *pmap_l3e_to_pte(l3ep, addr); pa = pte & PG_FRAME; Modified: head/sys/riscv/riscv/pmap.c ============================================================================== --- head/sys/riscv/riscv/pmap.c Wed Sep 2 18:15:57 2020 (r365266) +++ head/sys/riscv/riscv/pmap.c Wed Sep 2 18:16:43 2020 (r365267) @@ -4217,7 +4217,7 @@ pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t if (l2 != NULL && ((tpte = pmap_load(l2)) & PTE_V) != 0) { if ((tpte & PTE_RWX) != 0) { pa = PTE_TO_PHYS(tpte) | (addr & L2_OFFSET); - val = MINCORE_INCORE | MINCORE_SUPER; + val = MINCORE_INCORE | MINCORE_PSIND(1); } else { l3 = pmap_l2_to_l3(l2, addr); tpte = pmap_load(l3); Modified: head/sys/sys/mman.h ============================================================================== --- head/sys/sys/mman.h Wed Sep 2 18:15:57 2020 (r365266) +++ head/sys/sys/mman.h Wed Sep 2 18:16:43 2020 (r365267) @@ -179,7 +179,8 @@ #define MINCORE_MODIFIED 0x4 /* Page has been modified by us */ #define MINCORE_REFERENCED_OTHER 0x8 /* Page has been referenced */ #define MINCORE_MODIFIED_OTHER 0x10 /* Page has been modified */ -#define MINCORE_SUPER 0x20 /* Page is a "super" page */ +#define MINCORE_SUPER 0x60 /* Page is a "super" page */ +#define MINCORE_PSIND(i) (((i) << 5) & MINCORE_SUPER) /* Page size */ /* * Anonymous object constant for shm_open(). Modified: head/sys/vm/vm_mmap.c ============================================================================== --- head/sys/vm/vm_mmap.c Wed Sep 2 18:15:57 2020 (r365266) +++ head/sys/vm/vm_mmap.c Wed Sep 2 18:16:43 2020 (r365267) @@ -112,6 +112,8 @@ SYSCTL_INT(_vm, OID_AUTO, imply_prot_max, CTLFLAG_RWTU #define MAP_32BIT_MAX_ADDR ((vm_offset_t)1 << 31) #endif +_Static_assert(MAXPAGESIZES <= 4, "MINCORE_SUPER too narrow"); + #ifndef _SYS_SYSPROTO_H_ struct sbrk_args { int incr; From owner-svn-src-all@freebsd.org Wed Sep 2 18:17:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E1CD3C3C0F; Wed, 2 Sep 2020 18:17:09 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhXGF2D6Wz40jY; Wed, 2 Sep 2020 18:17:09 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2FAE2E830; Wed, 2 Sep 2020 18:17:09 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082IH9L7005601; Wed, 2 Sep 2020 18:17:09 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082IH8nM005599; Wed, 2 Sep 2020 18:17:08 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009021817.082IH8nM005599@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 2 Sep 2020 18:17:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365268 - in head: sbin/sysctl sys/kern X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head: sbin/sysctl sys/kern X-SVN-Commit-Revision: 365268 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 18:17:09 -0000 Author: markj Date: Wed Sep 2 18:17:08 2020 New Revision: 365268 URL: https://svnweb.freebsd.org/changeset/base/365268 Log: Add sysctl(8) formatting for hw.pagesizes. - Change the type of hw.pagesizes to OPAQUE, since it returns an array. - Modify the handler to only truncate the returned length if the caller supplied an output buffer. This allows use of the trick of passing a NULL output buffer to fetch the output size, while preserving compatibility if MAXPAGESIZES is increased. - Add a "S,pagesize" formatter to sysctl(8). Reviewed by: alc, kib MFC after: 2 weeks Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D26239 Modified: head/sbin/sysctl/sysctl.c head/sys/kern/kern_mib.c Modified: head/sbin/sysctl/sysctl.c ============================================================================== --- head/sbin/sysctl/sysctl.c Wed Sep 2 18:16:43 2020 (r365267) +++ head/sbin/sysctl/sysctl.c Wed Sep 2 18:17:08 2020 (r365268) @@ -697,6 +697,29 @@ S_input_id(size_t l2, void *p) return (0); } +static int +S_pagesizes(size_t l2, void *p) +{ + char buf[256]; + u_long *ps; + size_t l; + int i; + + l = snprintf(buf, sizeof(buf), "{ "); + ps = p; + for (i = 0; i * sizeof(*ps) < l2 && ps[i] != 0 && l < sizeof(buf); + i++) { + l += snprintf(&buf[l], sizeof(buf) - l, + "%s%lu", i == 0 ? "" : ", ", ps[i]); + } + if (l < sizeof(buf)) + (void)snprintf(&buf[l], sizeof(buf) - l, " }"); + + printf("%s", buf); + + return (0); +} + #ifdef __amd64__ static int S_efi_map(size_t l2, void *p) @@ -1002,6 +1025,8 @@ show_var(int *oid, int nlen) func = S_vmtotal; else if (strcmp(fmt, "S,input_id") == 0) func = S_input_id; + else if (strcmp(fmt, "S,pagesizes") == 0) + func = S_pagesizes; #ifdef __amd64__ else if (strcmp(fmt, "S,efi_map_header") == 0) func = S_efi_map; Modified: head/sys/kern/kern_mib.c ============================================================================== --- head/sys/kern/kern_mib.c Wed Sep 2 18:16:43 2020 (r365267) +++ head/sys/kern/kern_mib.c Wed Sep 2 18:17:08 2020 (r365268) @@ -246,22 +246,22 @@ sysctl_hw_pagesizes(SYSCTL_HANDLER_ARGS) pagesizes32[i] = (uint32_t)pagesizes[i]; len = sizeof(pagesizes32); - if (len > req->oldlen) + if (len > req->oldlen && req->oldptr != NULL) len = req->oldlen; error = SYSCTL_OUT(req, pagesizes32, len); } else #endif { len = sizeof(pagesizes); - if (len > req->oldlen) + if (len > req->oldlen && req->oldptr != NULL) len = req->oldlen; error = SYSCTL_OUT(req, pagesizes, len); } return (error); } SYSCTL_PROC(_hw, OID_AUTO, pagesizes, - CTLTYPE_ULONG | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, - sysctl_hw_pagesizes, "LU", + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, + sysctl_hw_pagesizes, "S,pagesizes", "Supported page sizes"); int adaptive_machine_arch = 1; From owner-svn-src-all@freebsd.org Wed Sep 2 18:28:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E7C63C41A7; Wed, 2 Sep 2020 18:28:16 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhXW43FkHz41Dy; Wed, 2 Sep 2020 18:28:16 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from [192.168.0.5] (unknown [181.52.72.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: pfg) by smtp.freebsd.org (Postfix) with ESMTPSA id A806C25DB2; Wed, 2 Sep 2020 18:28:15 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Alexey Dokuchaev Cc: Michael Tuexen , Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> From: Pedro Giffuni Organization: FreeBSD Message-ID: <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> Date: Wed, 2 Sep 2020 13:28:14 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200902180626.GA88595@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 18:28:16 -0000 On 02/09/2020 13:06, Alexey Dokuchaev wrote: > On Wed, Sep 02, 2020 at 10:18:15AM -0500, Pedro Giffuni wrote: >> On 01/09/2020 21:05, Alexey Dokuchaev wrote: >>> ... >>> This is common sense. I can't count how often I wanted to hack on >>> something in the base/kernel and was turned away by this atrocious >>> excessive whitespace mess. >>> >>> Thank you Mateusz for cleaning this up. >> I honestly don't care much, but spaces do no harm and can make the code >> more readable. Sort of a silent comment, or what you do in written >> language when you start a new paragraph. > Right, but that's the example of appropriate usage of whitespace. I was > talking about *excessive* whitespace, that is, more than two \n's in a row > if we speak of newlines (subject of these commits). But how much space is rather subjective so Michael is right in asking what rule has been violated. No one is asking for the change to be reverted: the damage, if any, is already done. Pedro. > ./danfe From owner-svn-src-all@freebsd.org Wed Sep 2 18:43:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E57A13C47E3; Wed, 2 Sep 2020 18:43:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhXsB5shZz42X5; Wed, 2 Sep 2020 18:43:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-274.local (unknown [IPv6:2601:648:8681:1cb0:dce5:13fe:b1b9:a95d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4214A2638E; Wed, 2 Sep 2020 18:43:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r365268 - in head: sbin/sysctl sys/kern To: Mark Johnston , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009021817.082IH8nM005599@repo.freebsd.org> From: John Baldwin Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <043d4fe6-9961-c6fe-e93e-eb2533e0f130@FreeBSD.org> Date: Wed, 2 Sep 2020 11:43:56 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <202009021817.082IH8nM005599@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 18:43:59 -0000 On 9/2/20 11:17 AM, Mark Johnston wrote: > Author: markj > Date: Wed Sep 2 18:17:08 2020 > New Revision: 365268 > URL: https://svnweb.freebsd.org/changeset/base/365268 > > Log: > Add sysctl(8) formatting for hw.pagesizes. > > - Change the type of hw.pagesizes to OPAQUE, since it returns an array. > - Modify the handler to only truncate the returned length if the caller > supplied an output buffer. This allows use of the trick of passing a > NULL output buffer to fetch the output size, while preserving > compatibility if MAXPAGESIZES is increased. > - Add a "S,pagesize" formatter to sysctl(8). Doesn't sysctl(8) handle scalar types that are arrays? That is, couldn't this change just be the change to not truncate 'len' without needing to make it opaque and needing a custom printer, etc.? -- John Baldwin From owner-svn-src-all@freebsd.org Wed Sep 2 18:44:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A8A313C454E; Wed, 2 Sep 2020 18:44:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhXsG464Jz42Rd; Wed, 2 Sep 2020 18:44:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71060EB67; Wed, 2 Sep 2020 18:44:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082Ii2a3023900; Wed, 2 Sep 2020 18:44:02 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082Ii2I2023897; Wed, 2 Sep 2020 18:44:02 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202009021844.082Ii2I2023897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 2 Sep 2020 18:44:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365269 - stable/11/release/doc/share/xml X-SVN-Group: stable-11 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: stable/11/release/doc/share/xml X-SVN-Commit-Revision: 365269 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 18:44:02 -0000 Author: gjb Date: Wed Sep 2 18:44:01 2020 New Revision: 365269 URL: https://svnweb.freebsd.org/changeset/base/365269 Log: Document EN-20:13-18, SA-20:18-26 Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: stable/11/release/doc/share/xml/errata.xml stable/11/release/doc/share/xml/security.xml Modified: stable/11/release/doc/share/xml/errata.xml ============================================================================== --- stable/11/release/doc/share/xml/errata.xml Wed Sep 2 18:17:08 2020 (r365268) +++ stable/11/release/doc/share/xml/errata.xml Wed Sep 2 18:44:01 2020 (r365269) @@ -19,9 +19,24 @@ - No notices. -   -   + FreeBSD-EN-20:15.mps + 8 July 2020 + Kernel panic + + + + FreeBSD-EN-20:17.linuxthread + 2 September 2020 + Kernel panic + + + + FreeBSD-EN-20:18.getfsstat + 2 September 2020 + Kernel panic Modified: stable/11/release/doc/share/xml/security.xml ============================================================================== --- stable/11/release/doc/share/xml/security.xml Wed Sep 2 18:17:08 2020 (r365268) +++ stable/11/release/doc/share/xml/security.xml Wed Sep 2 18:44:01 2020 (r365269) @@ -19,9 +19,66 @@ - No advisories. -   -   + FreeBSD-SA-20:18.posix_spawnp + 8 July 2020 + Buffer overflow + + + + FreeBSD-SA-20:19.unbound + 8 July 2020 + Multiple vulnerabilities + + + + FreeBSD-SA-20:20.ipv6 + 8 July 2020 + Race condition and use-after-free + + + + FreeBSD-SA-20:21.usb_net + 5 August 2020 + Memory corruption + + + + FreeBSD-SA-20:22.sqlite + 5 August 2020 + Multiple vulnerabilities + + + + FreeBSD-SA-20:23.sendmsg + 5 August 2020 + Privilege escalation + + + + FreeBSD-SA-20:24.ipv6 + 2 September 2020 + Use-after-free bug + + + + FreeBSD-SA-20:25.sctp + 2 September 2020 + Use-after-free bug + + + + FreeBSD-SA-20:26.dhclient + 2 September 2020 + Heap overflow From owner-svn-src-all@freebsd.org Wed Sep 2 19:02:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 444B23C66C0; Wed, 2 Sep 2020 19:02:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhYGx142Sz457P; Wed, 2 Sep 2020 19:02:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 07CFCF0CB; Wed, 2 Sep 2020 19:02:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082J2mw5036166; Wed, 2 Sep 2020 19:02:48 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082J2mw8036163; Wed, 2 Sep 2020 19:02:48 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009021902.082J2mw8036163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 19:02:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365270 - in stable: 11/sys/conf 11/sys/modules/ipsec 11/sys/modules/tcp/tcpmd5 12/sys/conf 12/sys/modules/ipsec 12/sys/modules/tcp/tcpmd5 X-SVN-Group: stable-12 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable: 11/sys/conf 11/sys/modules/ipsec 11/sys/modules/tcp/tcpmd5 12/sys/conf 12/sys/modules/ipsec 12/sys/modules/tcp/tcpmd5 X-SVN-Commit-Revision: 365270 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 19:02:49 -0000 Author: jhb Date: Wed Sep 2 19:02:48 2020 New Revision: 365270 URL: https://svnweb.freebsd.org/changeset/base/365270 Log: MFC 361632: Honor opt_ipsec.h from kernel builds. To make this simpler, set the default contents of opt_ipsec.h for standalone modules in sys/conf/config.mk. Modified: stable/12/sys/conf/config.mk stable/12/sys/modules/ipsec/Makefile stable/12/sys/modules/tcp/tcpmd5/Makefile Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/conf/config.mk stable/11/sys/modules/ipsec/Makefile stable/11/sys/modules/tcp/tcpmd5/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/conf/config.mk ============================================================================== --- stable/12/sys/conf/config.mk Wed Sep 2 18:44:01 2020 (r365269) +++ stable/12/sys/conf/config.mk Wed Sep 2 19:02:48 2020 (r365270) @@ -19,6 +19,8 @@ opt_inet.h: opt_inet6.h: @echo "#define INET6 1" > ${.TARGET} .endif +opt_ipsec.h: + @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} .if ${MK_RATELIMIT} != "no" opt_ratelimit.h: @echo "#define RATELIMIT 1" > ${.TARGET} Modified: stable/12/sys/modules/ipsec/Makefile ============================================================================== --- stable/12/sys/modules/ipsec/Makefile Wed Sep 2 18:44:01 2020 (r365269) +++ stable/12/sys/modules/ipsec/Makefile Wed Sep 2 19:02:48 2020 (r365270) @@ -8,7 +8,4 @@ SRCS= if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ip opt_inet.h opt_inet6.h opt_ipsec.h opt_sctp.h SRCS.INET= udpencap.c -opt_ipsec.h: - @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} - .include Modified: stable/12/sys/modules/tcp/tcpmd5/Makefile ============================================================================== --- stable/12/sys/modules/tcp/tcpmd5/Makefile Wed Sep 2 18:44:01 2020 (r365269) +++ stable/12/sys/modules/tcp/tcpmd5/Makefile Wed Sep 2 19:02:48 2020 (r365270) @@ -5,7 +5,4 @@ KMOD= tcpmd5 SRCS= xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h -opt_ipsec.h: - @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} - .include From owner-svn-src-all@freebsd.org Wed Sep 2 19:02:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EE2B73C6644; Wed, 2 Sep 2020 19:02:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhYGx62Drz45Fk; Wed, 2 Sep 2020 19:02:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B25ADF410; Wed, 2 Sep 2020 19:02:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082J2nJb036175; Wed, 2 Sep 2020 19:02:49 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082J2nuN036173; Wed, 2 Sep 2020 19:02:49 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009021902.082J2nuN036173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 19:02:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365270 - in stable: 11/sys/conf 11/sys/modules/ipsec 11/sys/modules/tcp/tcpmd5 12/sys/conf 12/sys/modules/ipsec 12/sys/modules/tcp/tcpmd5 X-SVN-Group: stable-11 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable: 11/sys/conf 11/sys/modules/ipsec 11/sys/modules/tcp/tcpmd5 12/sys/conf 12/sys/modules/ipsec 12/sys/modules/tcp/tcpmd5 X-SVN-Commit-Revision: 365270 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 19:02:50 -0000 Author: jhb Date: Wed Sep 2 19:02:48 2020 New Revision: 365270 URL: https://svnweb.freebsd.org/changeset/base/365270 Log: MFC 361632: Honor opt_ipsec.h from kernel builds. To make this simpler, set the default contents of opt_ipsec.h for standalone modules in sys/conf/config.mk. Modified: stable/11/sys/conf/config.mk stable/11/sys/modules/ipsec/Makefile stable/11/sys/modules/tcp/tcpmd5/Makefile Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/sys/conf/config.mk stable/12/sys/modules/ipsec/Makefile stable/12/sys/modules/tcp/tcpmd5/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/11/sys/conf/config.mk ============================================================================== --- stable/11/sys/conf/config.mk Wed Sep 2 18:44:01 2020 (r365269) +++ stable/11/sys/conf/config.mk Wed Sep 2 19:02:48 2020 (r365270) @@ -19,6 +19,8 @@ opt_inet.h: opt_inet6.h: @echo "#define INET6 1" > ${.TARGET} .endif +opt_ipsec.h: + @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} .if ${MK_EISA} != "no" opt_eisa.h: @echo "#define DEV_EISA 1" > ${.TARGET} Modified: stable/11/sys/modules/ipsec/Makefile ============================================================================== --- stable/11/sys/modules/ipsec/Makefile Wed Sep 2 18:44:01 2020 (r365269) +++ stable/11/sys/modules/ipsec/Makefile Wed Sep 2 19:02:48 2020 (r365270) @@ -8,7 +8,4 @@ SRCS= if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ip opt_inet.h opt_inet6.h opt_ipsec.h opt_sctp.h SRCS.INET= udpencap.c -opt_ipsec.h: - @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} - .include Modified: stable/11/sys/modules/tcp/tcpmd5/Makefile ============================================================================== --- stable/11/sys/modules/tcp/tcpmd5/Makefile Wed Sep 2 18:44:01 2020 (r365269) +++ stable/11/sys/modules/tcp/tcpmd5/Makefile Wed Sep 2 19:02:48 2020 (r365270) @@ -5,7 +5,4 @@ KMOD= tcpmd5 SRCS= xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h -opt_ipsec.h: - @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} - .include From owner-svn-src-all@freebsd.org Wed Sep 2 19:09:24 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 627AF3C68D1; Wed, 2 Sep 2020 19:09:24 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhYQX1nZkz45hr; Wed, 2 Sep 2020 19:09:24 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x741.google.com with SMTP id f2so793732qkh.3; Wed, 02 Sep 2020 12:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=PB0TAN9QtKlDh2GsMp5HPj2uGMfQYPv+k2b9/THMWUA=; b=U6FRe/++FFXHizoxtccUXDYEuYntkkwx5KFVxuPgAKoi9vPVnaPND6yEwQyq67Gbbn b+RhoFFyJifcK1MS/FgDXyw//Z9431iDiBcbu6G2HP7qhkKxajc+yUSX3eD05QIZ/Y8O yDwWbCWVIJ/EMbfG0G5EQHto3UsCSlzg9pApzM2kg13q+Xl4MRYKlM6/H9JJXoBsOfUx lJyrZKcLYxidufwT3pVTFBp3JvcXZzUkagrUZFPwYZIoGUHJolSG8LXL0WEop3VeAbYI qkujD22cKjlONKqGx4+7SXdsKKTpiZM0ibZSEwQGWSxbS7ahs8GQiYeKVctOdFEapD0/ XIEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=PB0TAN9QtKlDh2GsMp5HPj2uGMfQYPv+k2b9/THMWUA=; b=Gxks+p4pEhqPxW+tI4WzxupwAEkQsTEhO7C30fvM8BhTLv9DVYcJIGdYJfgIWtZY7W l5mvs8akrychZajF17QtXTpFGxNGC5n99/MSIUcQY1GUASyiRCwSHS/uM4QTQtlFG35B CSpJieE4dEeG+8E1ggLFVdDMijL9gizdUWRfupNZgaRTnYJi50b6xzeop9bJjxcYMg45 3zyvHzsVO9+7amLhaTdCxjfw2z6sIc6S+wTppfXw2va3G1qTfGZxHhp2m1958I+mE16u eWK4UDrTRglb8/55PkfFGz5dYPC+WzvjykAPyomjjzEIoMs0g87W0XWi6vlTHYn4bDWv vBYw== X-Gm-Message-State: AOAM53290VLiVT/KboR40LaIA813mA9Z1qtY1YCb3aPj+yrm6dsLib/e 9r7qq/bLNT53Ro1DkmQM73nzIEEjAZqHmg== X-Google-Smtp-Source: ABdhPJzuFMxIapNN0CWuHCLmCt/YxhBU0iVUsonFpFLpXZDT8X0ayzeASkSYZWzQiDZ/NFHIeJYo+w== X-Received: by 2002:a37:9f57:: with SMTP id i84mr8679712qke.101.1599073762942; Wed, 02 Sep 2020 12:09:22 -0700 (PDT) Received: from raichu (toroon0560w-lp130-08-67-71-176-35.dsl.bell.ca. [67.71.176.35]) by smtp.gmail.com with ESMTPSA id w128sm449358qkb.6.2020.09.02.12.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 12:09:21 -0700 (PDT) Sender: Mark Johnston Date: Wed, 2 Sep 2020 15:09:17 -0400 From: Mark Johnston To: John Baldwin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r365268 - in head: sbin/sysctl sys/kern Message-ID: <20200902190917.GA12944@raichu> References: <202009021817.082IH8nM005599@repo.freebsd.org> <043d4fe6-9961-c6fe-e93e-eb2533e0f130@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <043d4fe6-9961-c6fe-e93e-eb2533e0f130@FreeBSD.org> X-Rspamd-Queue-Id: 4BhYQX1nZkz45hr X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 19:09:24 -0000 On Wed, Sep 02, 2020 at 11:43:56AM -0700, John Baldwin wrote: > On 9/2/20 11:17 AM, Mark Johnston wrote: > > Author: markj > > Date: Wed Sep 2 18:17:08 2020 > > New Revision: 365268 > > URL: https://svnweb.freebsd.org/changeset/base/365268 > > > > Log: > > Add sysctl(8) formatting for hw.pagesizes. > > > > - Change the type of hw.pagesizes to OPAQUE, since it returns an array. > > - Modify the handler to only truncate the returned length if the caller > > supplied an output buffer. This allows use of the trick of passing a > > NULL output buffer to fetch the output size, while preserving > > compatibility if MAXPAGESIZES is increased. > > - Add a "S,pagesize" formatter to sysctl(8). > > Doesn't sysctl(8) handle scalar types that are arrays? That is, couldn't > this change just be the change to not truncate 'len' without needing to make > it opaque and needing a custom printer, etc.? I think you are right. I didn't know sysctl(8) could do that. From owner-svn-src-all@freebsd.org Wed Sep 2 19:18:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2A4673C6E36; Wed, 2 Sep 2020 19:18:28 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhYd00Lknz468d; Wed, 2 Sep 2020 19:18:28 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E359CF431; Wed, 2 Sep 2020 19:18:27 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082JIReE042652; Wed, 2 Sep 2020 19:18:27 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082JIR3B042650; Wed, 2 Sep 2020 19:18:27 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009021918.082JIR3B042650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Wed, 2 Sep 2020 19:18:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365271 - in head: lib/libbe/tests sbin/bectl/tests X-SVN-Group: head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head: lib/libbe/tests sbin/bectl/tests X-SVN-Commit-Revision: 365271 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 19:18:28 -0000 Author: lwhsu Date: Wed Sep 2 19:18:27 2020 New Revision: 365271 URL: https://svnweb.freebsd.org/changeset/base/365271 Log: Temporarily skip tests panic i386 kernel in CI lib.libbe.be_create.libbe_create sbin.bectl.bectl_test.bectl_create PR: 249055 Sponsored by: The FreeBSD Foundation Modified: head/lib/libbe/tests/be_create.sh head/sbin/bectl/tests/bectl_test.sh Modified: head/lib/libbe/tests/be_create.sh ============================================================================== --- head/lib/libbe/tests/be_create.sh Wed Sep 2 19:02:48 2020 (r365270) +++ head/lib/libbe/tests/be_create.sh Wed Sep 2 19:18:27 2020 (r365271) @@ -88,6 +88,11 @@ libbe_create_head() } libbe_create_body() { + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + cwd=$(atf_get_srcdir) zpool=$(make_zpool_name) disk=${cwd}/disk.img Modified: head/sbin/bectl/tests/bectl_test.sh ============================================================================== --- head/sbin/bectl/tests/bectl_test.sh Wed Sep 2 19:02:48 2020 (r365270) +++ head/sbin/bectl/tests/bectl_test.sh Wed Sep 2 19:18:27 2020 (r365271) @@ -93,6 +93,11 @@ bectl_create_head() } bectl_create_body() { + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + cwd=$(realpath .) zpool=$(make_zpool_name) disk=${cwd}/disk.img From owner-svn-src-all@freebsd.org Wed Sep 2 19:21:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AE01E3C6F0D; Wed, 2 Sep 2020 19:21:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhYh64BqBz46d7; Wed, 2 Sep 2020 19:21:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 747DDF357; Wed, 2 Sep 2020 19:21:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082JLAne042871; Wed, 2 Sep 2020 19:21:10 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082JLAc1042870; Wed, 2 Sep 2020 19:21:10 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009021921.082JLAc1042870@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 2 Sep 2020 19:21:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365272 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 365272 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 19:21:10 -0000 Author: mjg Date: Wed Sep 2 19:21:10 2020 New Revision: 365272 URL: https://svnweb.freebsd.org/changeset/base/365272 Log: vfs: purge cache entries early on vgone There is no reason for them to linger across reclaim and it is an invariant that doomed vnodes are not added to the namecache. Modified: head/sys/kern/vfs_subr.c Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Wed Sep 2 19:18:27 2020 (r365271) +++ head/sys/kern/vfs_subr.c Wed Sep 2 19:21:10 2020 (r365272) @@ -3850,6 +3850,7 @@ vgonel(struct vnode *vp) VNASSERT(vp->v_holdcnt > 0, vp, ("vnode without hold count")); VI_UNLOCK(vp); } + cache_purge_vgone(vp); vfs_notify_upper(vp, VFS_NOTIFY_UPPER_RECLAIM); /* @@ -3923,7 +3924,6 @@ vgonel(struct vnode *vp) * Delete from old mount point vnode list. */ delmntque(vp); - cache_purge_vgone(vp); /* * Done with purge, reset to the standard lock and invalidate * the vnode. From owner-svn-src-all@freebsd.org Wed Sep 2 19:21:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 364B53C6F2D; Wed, 2 Sep 2020 19:21:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhYhf0k72z46kP; Wed, 2 Sep 2020 19:21:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1625F362; Wed, 2 Sep 2020 19:21:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082JLbmu045268; Wed, 2 Sep 2020 19:21:37 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082JLbAv045264; Wed, 2 Sep 2020 19:21:37 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009021921.082JLbAv045264@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 2 Sep 2020 19:21:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365273 - in head/sys: kern sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: kern sys X-SVN-Commit-Revision: 365273 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 19:21:38 -0000 Author: mjg Date: Wed Sep 2 19:21:37 2020 New Revision: 365273 URL: https://svnweb.freebsd.org/changeset/base/365273 Log: vfs: retire vholdl as a symbol Similarly to vrefl in r364283. Modified: head/sys/kern/vfs_subr.c head/sys/sys/vnode.h Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Wed Sep 2 19:21:10 2020 (r365272) +++ head/sys/kern/vfs_subr.c Wed Sep 2 19:21:37 2020 (r365273) @@ -3227,15 +3227,6 @@ vhold(struct vnode *vp) } void -vholdl(struct vnode *vp) -{ - - ASSERT_VI_LOCKED(vp, __func__); - CTR2(KTR_VFS, "%s: vp %p", __func__, vp); - vhold(vp); -} - -void vholdnz(struct vnode *vp) { Modified: head/sys/sys/vnode.h ============================================================================== --- head/sys/sys/vnode.h Wed Sep 2 19:21:10 2020 (r365272) +++ head/sys/sys/vnode.h Wed Sep 2 19:21:37 2020 (r365273) @@ -688,7 +688,6 @@ void vget_finish_ref(struct vnode *vp, enum vgetstate void vget_abort(struct vnode *vp, enum vgetstate vs); void vgone(struct vnode *vp); void vhold(struct vnode *); -void vholdl(struct vnode *); void vholdnz(struct vnode *); bool vhold_smr(struct vnode *); void vinactive(struct vnode *vp); @@ -974,6 +973,11 @@ vrefcnt(struct vnode *vp) return (vp->v_usecount); } + +#define vholdl(vp) do { \ + ASSERT_VI_LOCKED(vp, __func__); \ + vhold(vp); \ +} while (0) #define vrefl(vp) do { \ ASSERT_VI_LOCKED(vp, __func__); \ From owner-svn-src-all@freebsd.org Wed Sep 2 19:37:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 515F53C763E; Wed, 2 Sep 2020 19:37:48 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhZ3J1Tw2z47pn; Wed, 2 Sep 2020 19:37:48 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 172CEF631; Wed, 2 Sep 2020 19:37:48 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082Jbl61055272; Wed, 2 Sep 2020 19:37:47 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082JblRc055270; Wed, 2 Sep 2020 19:37:47 GMT (envelope-from ian@FreeBSD.org) Message-Id: <202009021937.082JblRc055270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 2 Sep 2020 19:37:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365274 - in head: share/man/man4 sys/dev/iicbus/mux X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: in head: share/man/man4 sys/dev/iicbus/mux X-SVN-Commit-Revision: 365274 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 19:37:48 -0000 Author: ian Date: Wed Sep 2 19:37:47 2020 New Revision: 365274 URL: https://svnweb.freebsd.org/changeset/base/365274 Log: In ltc430x(4), add the ability to configure control register 2 via FDT or hints data. Control register 2 holds the settings a user might want to configure, such as the timeout value for idle busses and whether to enable the mass-writes feature. Also add hint support for disconnecting idle busses (which was already supported using FDT data). Update the manpage with the new features, and also split the hints section into separate lists of required and optional hints. Modified: head/share/man/man4/ltc430x.4 head/sys/dev/iicbus/mux/ltc430x.c Modified: head/share/man/man4/ltc430x.4 ============================================================================== --- head/share/man/man4/ltc430x.4 Wed Sep 2 19:21:37 2020 (r365273) +++ head/share/man/man4/ltc430x.4 Wed Sep 2 19:37:47 2020 (r365274) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 1, 2020 +.Dd September 2, 2020 .Dt LTC430X 4 .Os .Sh NAME @@ -85,12 +85,19 @@ ltc,downstream-accelerators-enable .It ltc,upstream-accelerators-enable .El +.Pp +In addition, the following additional property is supported: +.Bl -tag -offset indent -width indent +.It Va freebsd,ctlreg2 +A value to store into the chip's control register 2 during initialization. +Consult the chip datasheet for the meaning of the various bits in +the register. +.El .Sh HINTS CONFIGURATION On a .Xr device.hints 5 -based system, these values are configurable for -.Nm : -.Bl -tag -width indent +based system, the following hints are required: +.Bl -tag -offset indent -width indent .It Va hint.ltc430x..at The upstream .Xr iicbus 4 @@ -101,11 +108,33 @@ instance is attached to. The slave address of the .Nm instance on the upstream bus. +.It Va hint.ltc430x..chip_type +The type of chip the driver is controlling. +Valid values are +.Dq ltc4305 +and +.Dq ltc4306 . .El .Pp +The following hints are optional: +.Bl -tag -offset indent -width indent +.It Va hint.ltc430x..ctlreg2 +A value to store into the chip's control register 2 during initialization. +Consult the chip datasheet for the meaning of the various bits in +the register. +This hint is optional; when missing, the driver does not update control +register 2. +.It Va hint.ltc430x..idle_disconnect +Whether to disconnect all downstream busses from the upstream bus when idle. +If set to zero, the most recently used downstream bus is left connected to +the upstream bus after IO completes. +Any non-zero value causes all downstream busses to be disconnected when idle. +This hint is optional; when missing, the driver behaves as if it were zero. +.El +.Pp When configured via hints, the driver automatically adds an iicbus instance for every downstream bus supported by the chip. -There is currently no way to indicate used versus unused channels. +There is currently no way to indicate used versus unused downstream channels. .Sh SEE ALSO .Xr iicbus 4 , .Xr iicmux 4 , Modified: head/sys/dev/iicbus/mux/ltc430x.c ============================================================================== --- head/sys/dev/iicbus/mux/ltc430x.c Wed Sep 2 19:21:37 2020 (r365273) +++ head/sys/dev/iicbus/mux/ltc430x.c Wed Sep 2 19:37:47 2020 (r365274) @@ -79,6 +79,7 @@ struct ltc430x_softc { #define LTC430X_CTLREG_0 0 #define LTC430X_CTLREG_1 1 #define LTC430X_CTLREG_2 2 +#define LTC430X_CR2_ENABLE_MW (1u << 3) /* Enable mass write address. */ #define LTC430X_CTLREG_3 3 static int @@ -157,17 +158,39 @@ static int ltc430x_attach(device_t dev) { struct ltc430x_softc *sc __unused; - int chip, err, numchan; + int chip, err, numchan, val; + uint8_t busbits, ctlreg2; sc = device_get_softc(dev); + busbits = 0; + ctlreg2 = LTC430X_CR2_ENABLE_MW; + + /* + * Check for the idle-disconnect and ctlreg2 options, first in FDT data, + * then allow them to be overriden by hints data. + */ #ifdef FDT phandle_t node; node = ofw_bus_get_node(dev); sc->idle_disconnect = OF_hasprop(node, "i2c-mux-idle-disconnect"); + + if (OF_getprop(macnode, "freebsd,ctlreg2", &val, sizeof(val)) > 0) { + ctlreg2 = val; + } #endif + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "idle_disconnect", &val) == 0) { + sc->idle_disconnect = val; + } + + if (resource_int_value(device_get_name(dev), device_get_unit(dev), + "ctlreg2", &val) == 0) { + ctlreg2 = val; + } + /* We found the chip type when probing, so now it "can't fail". */ if ((chip = ltc430x_find_chiptype(dev)) == CHIP_NONE) { device_printf(dev, "impossible: can't identify chip type\n"); @@ -175,8 +198,22 @@ ltc430x_attach(device_t dev) } numchan = chip_infos[chip].numchannels; + /* Set control reg 2 with configured (or default) values. */ + iicdev_writeto(dev, LTC430X_CTLREG_2, &ctlreg2, sizeof(ctlreg2), + IIC_WAIT); + + /* If configured for idle-disconnect, ensure we start disconnected. */ + if (sc->idle_disconnect) { + iicdev_writeto(dev, LTC430X_CTLREG_3, &busbits, sizeof(busbits), + IIC_WAIT); + } + + /* + * Invoke the iicmux framework's attach code, and if it succeeds, invoke + * the probe and attach code of any child iicbus instances it added. + */ if ((err = iicmux_attach(dev, device_get_parent(dev), numchan)) == 0) - bus_generic_attach(dev); + bus_generic_attach(dev); return (err); } From owner-svn-src-all@freebsd.org Wed Sep 2 19:59:26 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E6793C8201; Wed, 2 Sep 2020 19:59:26 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhZXG1rK1z4BsB; Wed, 2 Sep 2020 19:59:26 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1DA21FBA1; Wed, 2 Sep 2020 19:59:26 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082JxPDd068125; Wed, 2 Sep 2020 19:59:25 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082JxP5X068124; Wed, 2 Sep 2020 19:59:25 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009021959.082JxP5X068124@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Wed, 2 Sep 2020 19:59:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365275 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 365275 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 19:59:26 -0000 Author: markj Date: Wed Sep 2 19:59:25 2020 New Revision: 365275 URL: https://svnweb.freebsd.org/changeset/base/365275 Log: Avoid unnecessary object locking in vm_page_grab_pages_unlocked(). We were needlessly acquiring the object lock to call vm_page_grab_pages() even when all of the requested pages were looked up locklessly. Fix that, stop testing for count == 0 in vm_page_grab_pages(), and add assertions to help catch this kind of mistake. Reported by: cem Reviewed by: alc, cem, dougm, jeff Differential Revision: https://reviews.freebsd.org/D26304 Modified: head/sys/vm/vm_page.c Modified: head/sys/vm/vm_page.c ============================================================================== --- head/sys/vm/vm_page.c Wed Sep 2 19:37:47 2020 (r365274) +++ head/sys/vm/vm_page.c Wed Sep 2 19:59:25 2020 (r365275) @@ -4724,12 +4724,11 @@ vm_page_grab_pages(vm_object_t object, vm_pindex_t pin VM_OBJECT_ASSERT_WLOCKED(object); KASSERT(((u_int)allocflags >> VM_ALLOC_COUNT_SHIFT) == 0, ("vm_page_grap_pages: VM_ALLOC_COUNT() is not allowed")); + KASSERT(count > 0, + ("vm_page_grab_pages: invalid page count %d", count)); vm_page_grab_check(allocflags); pflags = vm_page_grab_pflags(allocflags); - if (count == 0) - return (0); - i = 0; retrylookup: m = vm_radix_lookup_le(&object->rtree, pindex + i); @@ -4783,6 +4782,8 @@ vm_page_grab_pages_unlocked(vm_object_t object, vm_pin int flags; int i; + KASSERT(count > 0, + ("vm_page_grab_pages_unlocked: invalid page count %d", count)); vm_page_grab_check(allocflags); /* @@ -4805,7 +4806,7 @@ vm_page_grab_pages_unlocked(vm_object_t object, vm_pin vm_page_grab_release(m, allocflags); pred = ma[i] = m; } - if ((allocflags & VM_ALLOC_NOCREAT) != 0) + if (i == count || (allocflags & VM_ALLOC_NOCREAT) != 0) return (i); count -= i; VM_OBJECT_WLOCK(object); From owner-svn-src-all@freebsd.org Wed Sep 2 20:04:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2946B3C8A11; Wed, 2 Sep 2020 20:04:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhZf30Fvlz4CqP; Wed, 2 Sep 2020 20:04:27 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E01C1FE52; Wed, 2 Sep 2020 20:04:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082K4QUh074060; Wed, 2 Sep 2020 20:04:26 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082K4Q2r074059; Wed, 2 Sep 2020 20:04:26 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009022004.082K4Q2r074059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 20:04:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365276 - head/lib/libc/stdlib X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/lib/libc/stdlib X-SVN-Commit-Revision: 365276 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 20:04:27 -0000 Author: jhb Date: Wed Sep 2 20:04:26 2020 New Revision: 365276 URL: https://svnweb.freebsd.org/changeset/base/365276 Log: Compute the correct size of the string to move forward. Previously this was counting the amount of spare room at the start of the buffer that the string needed to move forward and passing that as the number of bytes to copy to memmove rather than the length of the string to be copied. In the strfmon test in the test suite this caused the memmove to overflow the allocated buffer by one byte which CHERI caught. Reported by: CHERI Reviewed by: kevans Obtained from: CheriBSD MFC after: 1 week Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26280 Modified: head/lib/libc/stdlib/strfmon.c Modified: head/lib/libc/stdlib/strfmon.c ============================================================================== --- head/lib/libc/stdlib/strfmon.c Wed Sep 2 19:59:25 2020 (r365275) +++ head/lib/libc/stdlib/strfmon.c Wed Sep 2 20:04:26 2020 (r365276) @@ -645,7 +645,7 @@ __format_grouped_double(double value, int *flags, memset(bufend, pad_char, padded); } - bufsize = bufsize - (bufend - rslt) + 1; + bufsize = rslt + bufsize - bufend; memmove(rslt, bufend, bufsize); free(avalue); return (rslt); From owner-svn-src-all@freebsd.org Wed Sep 2 20:10:50 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 21A733C8949; Wed, 2 Sep 2020 20:10:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhZnQ079Cz4CsP; Wed, 2 Sep 2020 20:10:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-274.local (unknown [IPv6:2601:648:8681:1cb0:dce5:13fe:b1b9:a95d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 6C350270F9; Wed, 2 Sep 2020 20:10:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r365268 - in head: sbin/sysctl sys/kern To: Mark Johnston Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009021817.082IH8nM005599@repo.freebsd.org> <043d4fe6-9961-c6fe-e93e-eb2533e0f130@FreeBSD.org> <20200902190917.GA12944@raichu> From: John Baldwin Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <688a0c4e-a0b3-a74f-dc6d-d52d1e5deaed@FreeBSD.org> Date: Wed, 2 Sep 2020 13:10:47 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200902190917.GA12944@raichu> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 20:10:50 -0000 On 9/2/20 12:09 PM, Mark Johnston wrote: > On Wed, Sep 02, 2020 at 11:43:56AM -0700, John Baldwin wrote: >> On 9/2/20 11:17 AM, Mark Johnston wrote: >>> Author: markj >>> Date: Wed Sep 2 18:17:08 2020 >>> New Revision: 365268 >>> URL: https://svnweb.freebsd.org/changeset/base/365268 >>> >>> Log: >>> Add sysctl(8) formatting for hw.pagesizes. >>> >>> - Change the type of hw.pagesizes to OPAQUE, since it returns an array. >>> - Modify the handler to only truncate the returned length if the caller >>> supplied an output buffer. This allows use of the trick of passing a >>> NULL output buffer to fetch the output size, while preserving >>> compatibility if MAXPAGESIZES is increased. >>> - Add a "S,pagesize" formatter to sysctl(8). >> >> Doesn't sysctl(8) handle scalar types that are arrays? That is, couldn't >> this change just be the change to not truncate 'len' without needing to make >> it opaque and needing a custom printer, etc.? > > I think you are right. I didn't know sysctl(8) could do that. I only know from dealing with it in the past. kern.cp_time is an array for example. In the past year or so I updated sysctl to permit setting an array of values (for dev.t6nex.0.toe.rx_tls_ports which takes a list of TCP ports to enable TOE TLS on). -- John Baldwin From owner-svn-src-all@freebsd.org Wed Sep 2 20:36:35 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0AF893C8EC9; Wed, 2 Sep 2020 20:36:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhbM66Cn7z4FZr; Wed, 2 Sep 2020 20:36:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B943F101B6; Wed, 2 Sep 2020 20:36:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082KaYIo092822; Wed, 2 Sep 2020 20:36:34 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082KaXeH092815; Wed, 2 Sep 2020 20:36:33 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009022036.082KaXeH092815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 20:36:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365277 - in stable: 11/sys/net 11/sys/netipsec 12/sys/net 12/sys/netipsec X-SVN-Group: stable-12 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable: 11/sys/net 11/sys/netipsec 12/sys/net 12/sys/netipsec X-SVN-Commit-Revision: 365277 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 20:36:35 -0000 Author: jhb Date: Wed Sep 2 20:36:33 2020 New Revision: 365277 URL: https://svnweb.freebsd.org/changeset/base/365277 Log: MFC 361633: Consistently include opt_ipsec.h for consumers of . This fixes ipsec.ko to include all of IPSEC_DEBUG. Modified: stable/12/sys/net/if_enc.c stable/12/sys/net/if_ipsec.c stable/12/sys/netipsec/ipsec.h stable/12/sys/netipsec/ipsec_mbuf.c stable/12/sys/netipsec/xform_ah.c stable/12/sys/netipsec/xform_esp.c stable/12/sys/netipsec/xform_ipcomp.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/net/if_enc.c stable/11/sys/net/if_ipsec.c stable/11/sys/netipsec/ipsec.h stable/11/sys/netipsec/ipsec_mbuf.c stable/11/sys/netipsec/xform_ah.c stable/11/sys/netipsec/xform_esp.c stable/11/sys/netipsec/xform_ipcomp.c Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/net/if_enc.c ============================================================================== --- stable/12/sys/net/if_enc.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/12/sys/net/if_enc.c Wed Sep 2 20:36:33 2020 (r365277) @@ -32,6 +32,7 @@ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include Modified: stable/12/sys/net/if_ipsec.c ============================================================================== --- stable/12/sys/net/if_ipsec.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/12/sys/net/if_ipsec.c Wed Sep 2 20:36:33 2020 (r365277) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include Modified: stable/12/sys/netipsec/ipsec.h ============================================================================== --- stable/12/sys/netipsec/ipsec.h Wed Sep 2 20:04:26 2020 (r365276) +++ stable/12/sys/netipsec/ipsec.h Wed Sep 2 20:36:33 2020 (r365277) @@ -39,11 +39,6 @@ #ifndef _NETIPSEC_IPSEC_H_ #define _NETIPSEC_IPSEC_H_ -#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE) -#include "opt_inet.h" -#include "opt_ipsec.h" -#endif - #include #include Modified: stable/12/sys/netipsec/ipsec_mbuf.c ============================================================================== --- stable/12/sys/netipsec/ipsec_mbuf.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/12/sys/netipsec/ipsec_mbuf.c Wed Sep 2 20:36:33 2020 (r365277) @@ -32,6 +32,8 @@ * IPsec-specific mbuf routines. */ +#include "opt_ipsec.h" + #include #include #include Modified: stable/12/sys/netipsec/xform_ah.c ============================================================================== --- stable/12/sys/netipsec/xform_ah.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/12/sys/netipsec/xform_ah.c Wed Sep 2 20:36:33 2020 (r365277) @@ -38,6 +38,7 @@ */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include Modified: stable/12/sys/netipsec/xform_esp.c ============================================================================== --- stable/12/sys/netipsec/xform_esp.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/12/sys/netipsec/xform_esp.c Wed Sep 2 20:36:33 2020 (r365277) @@ -37,6 +37,7 @@ */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include Modified: stable/12/sys/netipsec/xform_ipcomp.c ============================================================================== --- stable/12/sys/netipsec/xform_ipcomp.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/12/sys/netipsec/xform_ipcomp.c Wed Sep 2 20:36:33 2020 (r365277) @@ -33,6 +33,7 @@ /* IP payload compression protocol (IPComp), see RFC 2393 */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include From owner-svn-src-all@freebsd.org Wed Sep 2 20:36:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8FD7E3C9294; Wed, 2 Sep 2020 20:36:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhbM83KRFz4FT1; Wed, 2 Sep 2020 20:36:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 550EAFF76; Wed, 2 Sep 2020 20:36:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082KaaVf092842; Wed, 2 Sep 2020 20:36:36 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082KaYQQ092828; Wed, 2 Sep 2020 20:36:34 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009022036.082KaYQQ092828@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 20:36:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365277 - in stable: 11/sys/net 11/sys/netipsec 12/sys/net 12/sys/netipsec X-SVN-Group: stable-11 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable: 11/sys/net 11/sys/netipsec 12/sys/net 12/sys/netipsec X-SVN-Commit-Revision: 365277 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 20:36:36 -0000 Author: jhb Date: Wed Sep 2 20:36:33 2020 New Revision: 365277 URL: https://svnweb.freebsd.org/changeset/base/365277 Log: MFC 361633: Consistently include opt_ipsec.h for consumers of . This fixes ipsec.ko to include all of IPSEC_DEBUG. Modified: stable/11/sys/net/if_enc.c stable/11/sys/net/if_ipsec.c stable/11/sys/netipsec/ipsec.h stable/11/sys/netipsec/ipsec_mbuf.c stable/11/sys/netipsec/xform_ah.c stable/11/sys/netipsec/xform_esp.c stable/11/sys/netipsec/xform_ipcomp.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/sys/net/if_enc.c stable/12/sys/net/if_ipsec.c stable/12/sys/netipsec/ipsec.h stable/12/sys/netipsec/ipsec_mbuf.c stable/12/sys/netipsec/xform_ah.c stable/12/sys/netipsec/xform_esp.c stable/12/sys/netipsec/xform_ipcomp.c Directory Properties: stable/12/ (props changed) Modified: stable/11/sys/net/if_enc.c ============================================================================== --- stable/11/sys/net/if_enc.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/11/sys/net/if_enc.c Wed Sep 2 20:36:33 2020 (r365277) @@ -30,6 +30,7 @@ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include Modified: stable/11/sys/net/if_ipsec.c ============================================================================== --- stable/11/sys/net/if_ipsec.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/11/sys/net/if_ipsec.c Wed Sep 2 20:36:33 2020 (r365277) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include Modified: stable/11/sys/netipsec/ipsec.h ============================================================================== --- stable/11/sys/netipsec/ipsec.h Wed Sep 2 20:04:26 2020 (r365276) +++ stable/11/sys/netipsec/ipsec.h Wed Sep 2 20:36:33 2020 (r365277) @@ -37,11 +37,6 @@ #ifndef _NETIPSEC_IPSEC_H_ #define _NETIPSEC_IPSEC_H_ -#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE) -#include "opt_inet.h" -#include "opt_ipsec.h" -#endif - #include #include Modified: stable/11/sys/netipsec/ipsec_mbuf.c ============================================================================== --- stable/11/sys/netipsec/ipsec_mbuf.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/11/sys/netipsec/ipsec_mbuf.c Wed Sep 2 20:36:33 2020 (r365277) @@ -30,6 +30,8 @@ * IPsec-specific mbuf routines. */ +#include "opt_ipsec.h" + #include #include #include Modified: stable/11/sys/netipsec/xform_ah.c ============================================================================== --- stable/11/sys/netipsec/xform_ah.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/11/sys/netipsec/xform_ah.c Wed Sep 2 20:36:33 2020 (r365277) @@ -38,6 +38,7 @@ */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include Modified: stable/11/sys/netipsec/xform_esp.c ============================================================================== --- stable/11/sys/netipsec/xform_esp.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/11/sys/netipsec/xform_esp.c Wed Sep 2 20:36:33 2020 (r365277) @@ -37,6 +37,7 @@ */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include Modified: stable/11/sys/netipsec/xform_ipcomp.c ============================================================================== --- stable/11/sys/netipsec/xform_ipcomp.c Wed Sep 2 20:04:26 2020 (r365276) +++ stable/11/sys/netipsec/xform_ipcomp.c Wed Sep 2 20:36:33 2020 (r365277) @@ -31,6 +31,7 @@ /* IP payload compression protocol (IPComp), see RFC 2393 */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include #include From owner-svn-src-all@freebsd.org Wed Sep 2 20:43:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 10F073C9696; Wed, 2 Sep 2020 20:43:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhbVh6h9dz4Fvj; Wed, 2 Sep 2020 20:43:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C96151014D; Wed, 2 Sep 2020 20:43:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082Kh8V7098868; Wed, 2 Sep 2020 20:43:08 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082Kh8nT098867; Wed, 2 Sep 2020 20:43:08 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009022043.082Kh8nT098867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 20:43:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365278 - head/lib/libc/gen X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/lib/libc/gen X-SVN-Commit-Revision: 365278 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 20:43:09 -0000 Author: jhb Date: Wed Sep 2 20:43:08 2020 New Revision: 365278 URL: https://svnweb.freebsd.org/changeset/base/365278 Log: Don't assume objects in program sections have a size of a pointer. The size of the object at 'addr' is unknown and might be smaller than the size of a pointer (e.g. some x86 instructions are smaller than a pointer). Instead, just check that the address is in the bounds of the program header. Reported by: CHERI (indirectly) Reviewed by: kib, brooks Obtained from: CheriBSD MFC after: 1 week Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26279 Modified: head/lib/libc/gen/elf_utils.c Modified: head/lib/libc/gen/elf_utils.c ============================================================================== --- head/lib/libc/gen/elf_utils.c Wed Sep 2 20:36:33 2020 (r365277) +++ head/lib/libc/gen/elf_utils.c Wed Sep 2 20:43:08 2020 (r365278) @@ -65,7 +65,7 @@ __elf_phdr_match_addr(struct dl_phdr_info *phdr_info, #endif if (phdr_info->dlpi_addr + ph->p_vaddr <= (uintptr_t)addr && - (uintptr_t)addr + sizeof(addr) < phdr_info->dlpi_addr + + (uintptr_t)addr < phdr_info->dlpi_addr + ph->p_vaddr + ph->p_memsz) break; } From owner-svn-src-all@freebsd.org Wed Sep 2 21:14:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD9553CA4D8; Wed, 2 Sep 2020 21:14:36 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhcC054zKz4JgQ; Wed, 2 Sep 2020 21:14:36 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 91B4110A1E; Wed, 2 Sep 2020 21:14:36 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082LEauh017565; Wed, 2 Sep 2020 21:14:36 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082LEaWb017564; Wed, 2 Sep 2020 21:14:36 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202009022114.082LEaWb017564@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Wed, 2 Sep 2020 21:14:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365279 - head/sbin/init X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sbin/init X-SVN-Commit-Revision: 365279 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 21:14:36 -0000 Author: brooks Date: Wed Sep 2 21:14:36 2020 New Revision: 365279 URL: https://svnweb.freebsd.org/changeset/base/365279 Log: Remove risky compatability with old kernels The badsys() handler for SIGSYS was added as a transtion aid for kernels lacking sysctl() in 1993. It is unsafe and unsound so remove it rather than running the risk of a privilege-dropping system call being silently omitted. This partially reverts SCCSID 6.12 (Berkeley) 03/03/93 "add code to change the system security level". Reviewed by: mckusick, imp, kevans Obtained from: CheriBSD MFC after: 1 week Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26289 Modified: head/sbin/init/init.c Modified: head/sbin/init/init.c ============================================================================== --- head/sbin/init/init.c Wed Sep 2 20:43:08 2020 (r365278) +++ head/sbin/init/init.c Wed Sep 2 21:14:36 2020 (r365279) @@ -106,7 +106,6 @@ static void stall(const char *, ...) __printflike(1, 2 static void warning(const char *, ...) __printflike(1, 2); static void emergency(const char *, ...) __printflike(1, 2); static void disaster(int); -static void badsys(int); static void revoke_ttys(void); static int runshutdown(void); static char *strk(char *); @@ -307,9 +306,8 @@ invalid: * We catch or block signals rather than ignore them, * so that they get reset on exec. */ - handle(badsys, SIGSYS, 0); - handle(disaster, SIGABRT, SIGFPE, SIGILL, SIGSEGV, SIGBUS, SIGXCPU, - SIGXFSZ, 0); + handle(disaster, SIGABRT, SIGFPE, SIGILL, SIGSEGV, SIGBUS, SIGSYS, + SIGXCPU, SIGXFSZ, 0); handle(transition_handler, SIGHUP, SIGINT, SIGEMT, SIGTERM, SIGTSTP, SIGUSR1, SIGUSR2, SIGWINCH, 0); handle(alrm_handler, SIGALRM, 0); @@ -504,22 +502,6 @@ emergency(const char *message, ...) vsyslog(LOG_EMERG, message, ap); va_end(ap); -} - -/* - * Catch a SIGSYS signal. - * - * These may arise if a system does not support sysctl. - * We tolerate up to 25 of these, then throw in the towel. - */ -static void -badsys(int sig) -{ - static int badcount = 0; - - if (badcount++ < 25) - return; - disaster(sig); } /* From owner-svn-src-all@freebsd.org Wed Sep 2 21:17:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7D05D3CA5AF; Wed, 2 Sep 2020 21:17:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhcGq1Yzxz4K0x; Wed, 2 Sep 2020 21:17:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC11B10C02; Wed, 2 Sep 2020 21:17:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082LHsTX017783; Wed, 2 Sep 2020 21:17:54 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082LHsE7017782; Wed, 2 Sep 2020 21:17:54 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009022117.082LHsE7017782@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 21:17:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365280 - head/lib/libc/tests/sys X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/lib/libc/tests/sys X-SVN-Commit-Revision: 365280 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 21:17:55 -0000 Author: jhb Date: Wed Sep 2 21:17:54 2020 New Revision: 365280 URL: https://svnweb.freebsd.org/changeset/base/365280 Log: Pass a valid mode with O_CREATE to open(2). CheriABI is pickier about the arguments to open(2) and crashes with a fault if a mode isn't passed to an open() when O_CREATE is specified. Reported by: CHERI Reviewed by: brooks Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26281 Modified: head/lib/libc/tests/sys/sendfile_test.c Modified: head/lib/libc/tests/sys/sendfile_test.c ============================================================================== --- head/lib/libc/tests/sys/sendfile_test.c Wed Sep 2 21:14:36 2020 (r365279) +++ head/lib/libc/tests/sys/sendfile_test.c Wed Sep 2 21:17:54 2020 (r365280) @@ -781,7 +781,7 @@ hdtr_negative_bad_pointers_test(int domain) hdtr3.trl_cnt = 1; hdtr3.trailers = (struct iovec*)-1; - fd = open(SOURCE_FILE, O_CREAT|O_RDWR); + fd = open(SOURCE_FILE, O_CREAT|O_RDWR, 0600); ATF_REQUIRE_MSG(fd != -1, "open failed: %s", strerror(errno)); server_sock = setup_tcp_server(domain, port); @@ -836,7 +836,7 @@ offset_negative_value_less_than_zero_test(int domain) server_sock = setup_tcp_server(domain, port); client_sock = setup_tcp_client(domain, port); - fd = open(SOURCE_FILE, O_CREAT|O_RDWR); + fd = open(SOURCE_FILE, O_CREAT|O_RDWR, 0600); ATF_REQUIRE_MSG(fd != -1, "open failed: %s", strerror(errno)); error = sendfile(fd, client_sock, -1, 0, NULL, NULL, SF_FLAGS(0, 0)); @@ -985,7 +985,7 @@ s_negative_not_connected_socket_test(int domain) port = generate_random_port(__LINE__ + domain); client_sock = setup_tcp_server(domain, port); - fd = open(SOURCE_FILE, O_CREAT|O_RDWR); + fd = open(SOURCE_FILE, O_CREAT|O_RDWR, 0600); ATF_REQUIRE_MSG(fd != -1, "open failed: %s", strerror(errno)); error = sendfile(fd, client_sock, 0, 0, NULL, NULL, SF_FLAGS(0, 0)); @@ -1037,7 +1037,7 @@ ATF_TC_BODY(s_negative_not_descriptor, tc) client_sock = -1; - fd = open(SOURCE_FILE, O_CREAT|O_RDWR); + fd = open(SOURCE_FILE, O_CREAT|O_RDWR, 0600); ATF_REQUIRE_MSG(fd != -1, "open failed: %s", strerror(errno)); error = sendfile(fd, client_sock, 0, 0, NULL, NULL, SF_FLAGS(0, 0)); @@ -1058,7 +1058,7 @@ ATF_TC_BODY(s_negative_not_socket_file_descriptor, tc) { int client_sock, error, fd; - fd = open(SOURCE_FILE, O_CREAT|O_RDWR); + fd = open(SOURCE_FILE, O_CREAT|O_RDWR, 0600); ATF_REQUIRE_MSG(fd != -1, "open failed: %s", strerror(errno)); client_sock = open(_PATH_DEVNULL, O_WRONLY); @@ -1079,7 +1079,7 @@ s_negative_udp_socket_test(int domain) port = generate_random_port(__LINE__ + domain); client_sock = setup_client(domain, SOCK_DGRAM, port); - fd = open(SOURCE_FILE, O_CREAT|O_RDWR); + fd = open(SOURCE_FILE, O_CREAT|O_RDWR, 0600); ATF_REQUIRE_MSG(fd != -1, "open failed: %s", strerror(errno)); error = sendfile(fd, client_sock, 0, 0, NULL, NULL, SF_FLAGS(0, 0)); From owner-svn-src-all@freebsd.org Wed Sep 2 21:36:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4BE9A3CA726; Wed, 2 Sep 2020 21:36:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhchm1KJdz4L1m; Wed, 2 Sep 2020 21:36:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 10B8C10E14; Wed, 2 Sep 2020 21:36:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082Latlp029949; Wed, 2 Sep 2020 21:36:55 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082LatjO029946; Wed, 2 Sep 2020 21:36:55 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009022136.082LatjO029946@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 21:36:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365281 - in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp X-SVN-Group: stable-12 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp X-SVN-Commit-Revision: 365281 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 21:36:56 -0000 Author: jhb Date: Wed Sep 2 21:36:55 2020 New Revision: 365281 URL: https://svnweb.freebsd.org/changeset/base/365281 Log: MFC 361638,361712: Only build ipsec modules for kernels with IPSEC_SUPPORT. 361638: Only build ipsec modules if the kernel includes IPSEC_SUPPORT. Honoring the kernel-supplied opt_ipsec.h in r361632 causes builds of ipsec modules to fail if the kernel doesn't include IPSEC_SUPPORT. However, the module can never be loaded into such a kernel, so only build the modules if the kernel includes IPSEC_SUPPORT. 361712: (kevans) modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, not both. Refrain from building if IPSEC is set, as the resulting module won't be able to load anyways if it's built into the kernel. KERN_OPTS is safe here; for tied modules, it will reflect the kernel configuration. For untied modules, it will defer to whatever is set in ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter situation has some risk to it for uncommon scenarios, but such is the life of untied kernel modules. Modified: stable/12/sys/conf/config.mk stable/12/sys/modules/Makefile stable/12/sys/modules/tcp/Makefile Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/conf/config.mk stable/11/sys/modules/Makefile stable/11/sys/modules/tcp/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/conf/config.mk ============================================================================== --- stable/12/sys/conf/config.mk Wed Sep 2 21:17:54 2020 (r365280) +++ stable/12/sys/conf/config.mk Wed Sep 2 21:36:55 2020 (r365281) @@ -19,8 +19,10 @@ opt_inet.h: opt_inet6.h: @echo "#define INET6 1" > ${.TARGET} .endif +.if ${MK_IPSEC_SUPPORT} != "no" opt_ipsec.h: @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} +.endif .if ${MK_RATELIMIT} != "no" opt_ratelimit.h: @echo "#define RATELIMIT 1" > ${.TARGET} @@ -50,6 +52,9 @@ KERN_OPTS+= INET TCP_OFFLOAD .endif .if ${MK_INET6_SUPPORT} != "no" KERN_OPTS+= INET6 +.endif +.if ${MK_IPSEC_SUPPORT} != "no" +KERN_OPTS+= IPSEC_SUPPORT .endif .if ${MK_SCTP_SUPPORT} != "no" KERN_OPTS+= SCTP_SUPPORT Modified: stable/12/sys/modules/Makefile ============================================================================== --- stable/12/sys/modules/Makefile Wed Sep 2 21:17:54 2020 (r365280) +++ stable/12/sys/modules/Makefile Wed Sep 2 21:36:55 2020 (r365281) @@ -8,6 +8,8 @@ SUBDIR_PARALLEL= # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). +.include "${SYSDIR}/conf/config.mk" + .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES) SUBDIR=${MODULES_OVERRIDE} .else @@ -459,7 +461,7 @@ _if_enc= if_enc _if_gif= if_gif _if_gre= if_gre _ipfw_pmod= ipfw_pmod -.if ${MK_IPSEC_SUPPORT} != "no" +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} _ipsec= ipsec .endif .if ${MK_SCTP_SUPPORT} != "no" || ${MK_SCTP} != "no" @@ -868,8 +870,6 @@ afterinstall: .PHONY kldxref ${DESTDIR}${KMODDIR}; \ fi .endif - -.include "${SYSDIR}/conf/config.mk" SUBDIR:= ${SUBDIR:u:O} Modified: stable/12/sys/modules/tcp/Makefile ============================================================================== --- stable/12/sys/modules/tcp/Makefile Wed Sep 2 21:17:54 2020 (r365280) +++ stable/12/sys/modules/tcp/Makefile Wed Sep 2 21:36:55 2020 (r365281) @@ -15,7 +15,7 @@ _tcp_rack= rack .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) -.if ${MK_IPSEC_SUPPORT} != "no" +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} _tcpmd5= tcpmd5 .endif .endif From owner-svn-src-all@freebsd.org Wed Sep 2 21:36:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4578E3CABD8; Wed, 2 Sep 2020 21:36:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhchm6ywKz4Krj; Wed, 2 Sep 2020 21:36:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D26E210F9E; Wed, 2 Sep 2020 21:36:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082LauDh029959; Wed, 2 Sep 2020 21:36:56 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082Lau4P029956; Wed, 2 Sep 2020 21:36:56 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009022136.082Lau4P029956@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 21:36:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365281 - in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp X-SVN-Group: stable-11 X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp X-SVN-Commit-Revision: 365281 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 21:36:57 -0000 Author: jhb Date: Wed Sep 2 21:36:55 2020 New Revision: 365281 URL: https://svnweb.freebsd.org/changeset/base/365281 Log: MFC 361638,361712: Only build ipsec modules for kernels with IPSEC_SUPPORT. 361638: Only build ipsec modules if the kernel includes IPSEC_SUPPORT. Honoring the kernel-supplied opt_ipsec.h in r361632 causes builds of ipsec modules to fail if the kernel doesn't include IPSEC_SUPPORT. However, the module can never be loaded into such a kernel, so only build the modules if the kernel includes IPSEC_SUPPORT. 361712: (kevans) modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, not both. Refrain from building if IPSEC is set, as the resulting module won't be able to load anyways if it's built into the kernel. KERN_OPTS is safe here; for tied modules, it will reflect the kernel configuration. For untied modules, it will defer to whatever is set in ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter situation has some risk to it for uncommon scenarios, but such is the life of untied kernel modules. Modified: stable/11/sys/conf/config.mk stable/11/sys/modules/Makefile stable/11/sys/modules/tcp/Makefile Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/sys/conf/config.mk stable/12/sys/modules/Makefile stable/12/sys/modules/tcp/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/11/sys/conf/config.mk ============================================================================== --- stable/11/sys/conf/config.mk Wed Sep 2 21:17:54 2020 (r365280) +++ stable/11/sys/conf/config.mk Wed Sep 2 21:36:55 2020 (r365281) @@ -19,8 +19,10 @@ opt_inet.h: opt_inet6.h: @echo "#define INET6 1" > ${.TARGET} .endif +.if ${MK_IPSEC_SUPPORT} != "no" opt_ipsec.h: @echo "#define IPSEC_SUPPORT 1" > ${.TARGET} +.endif .if ${MK_EISA} != "no" opt_eisa.h: @echo "#define DEV_EISA 1" > ${.TARGET} @@ -47,6 +49,9 @@ KERN_OPTS+= INET TCP_OFFLOAD .endif .if ${MK_INET6_SUPPORT} != "no" KERN_OPTS+= INET6 +.endif +.if ${MK_IPSEC_SUPPORT} != "no" +KERN_OPTS+= IPSEC_SUPPORT .endif .if ${MK_EISA} != "no" KERN_OPTS+= DEV_EISA Modified: stable/11/sys/modules/Makefile ============================================================================== --- stable/11/sys/modules/Makefile Wed Sep 2 21:17:54 2020 (r365280) +++ stable/11/sys/modules/Makefile Wed Sep 2 21:36:55 2020 (r365281) @@ -8,6 +8,8 @@ SUBDIR_PARALLEL= # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). +.include "${SYSDIR}/conf/config.mk" + .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES) SUBDIR=${MODULES_OVERRIDE} .else @@ -468,7 +470,7 @@ _if_enc= if_enc _if_gif= if_gif _if_gre= if_gre _ipfw_pmod= ipfw_pmod -.if ${MK_IPSEC_SUPPORT} != "no" +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} _ipsec= ipsec .endif .endif @@ -853,8 +855,6 @@ afterinstall: .PHONY kldxref ${DESTDIR}${KMODDIR}; \ fi .endif - -.include "${SYSDIR}/conf/config.mk" SUBDIR:= ${SUBDIR:u:O} Modified: stable/11/sys/modules/tcp/Makefile ============================================================================== --- stable/11/sys/modules/tcp/Makefile Wed Sep 2 21:17:54 2020 (r365280) +++ stable/11/sys/modules/tcp/Makefile Wed Sep 2 21:36:55 2020 (r365281) @@ -15,7 +15,7 @@ _tcp_fastpath= fastpath .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) -.if ${MK_IPSEC_SUPPORT} != "no" +.if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC} _tcpmd5= tcpmd5 .endif .endif From owner-svn-src-all@freebsd.org Wed Sep 2 21:39:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6EA933CAB6A; Wed, 2 Sep 2020 21:39:59 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhcmG24g5z4L4c; Wed, 2 Sep 2020 21:39:57 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from mbp.fritz.box (ip4d15f5fc.dynamic.kabel-deutschland.de [77.21.245.252]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTPSA id 7F1DC73AA93DE; Wed, 2 Sep 2020 23:39:52 +0200 (CEST) From: Michael Tuexen Message-Id: <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> Content-Type: multipart/signed; boundary="Apple-Mail=_700931A9-3F19-4D97-B091-67E083C0B004"; protocol="application/pkcs7-signature"; micalg=sha-256 Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... Date: Wed, 2 Sep 2020 23:39:51 +0200 In-Reply-To: <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> Cc: Alexey Dokuchaev , Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org To: Pedro Giffuni References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4BhcmG24g5z4L4c X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of tuexen@fh-muenster.de has no SPF policy when checking 193.175.24.27) smtp.mailfrom=tuexen@fh-muenster.de X-Spamd-Result: default: False [-0.87 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; HAS_ATTACHMENT(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; RECEIVED_SPAMHAUS_PBL(0.00)[77.21.245.252:received]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[193.175.24.27:from]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[tuexen]; FROM_HAS_DN(0.00)[]; SIGNED_SMIME(-2.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.78)[-0.785]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[fh-muenster.de]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.30)[0.297]; NEURAL_SPAM_SHORT(0.42)[0.418]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 21:39:59 -0000 --Apple-Mail=_700931A9-3F19-4D97-B091-67E083C0B004 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On 2. Sep 2020, at 20:28, Pedro Giffuni wrote: >=20 >=20 > On 02/09/2020 13:06, Alexey Dokuchaev wrote: >> On Wed, Sep 02, 2020 at 10:18:15AM -0500, Pedro Giffuni wrote: >>> On 01/09/2020 21:05, Alexey Dokuchaev wrote: >>>> ... >>>> This is common sense. I can't count how often I wanted to hack on >>>> something in the base/kernel and was turned away by this atrocious >>>> excessive whitespace mess. >>>>=20 >>>> Thank you Mateusz for cleaning this up. >>> I honestly don't care much, but spaces do no harm and can make the = code >>> more readable. Sort of a silent comment, or what you do in written >>> language when you start a new paragraph. >> Right, but that's the example of appropriate usage of whitespace. I = was >> talking about *excessive* whitespace, that is, more than two \n's in = a row >> if we speak of newlines (subject of these commits). >=20 > But how much space is rather subjective so Michael is right in asking = what rule has been violated. >=20 > No one is asking for the change to be reverted: the damage, if any, is = already done. Just to be clear: I have NOT asked for reverting, I did not mentioned = it. I want to understand which rules have to be followed (and why). The why was explained: Some developers don't work on files which violate whitespace rules. I just want to know the rules. Without knowing them, I can't follow = them... Best regards Michael >=20 > Pedro. >=20 >=20 >> ./danfe --Apple-Mail=_700931A9-3F19-4D97-B091-67E083C0B004 Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCCEKow ggUSMIID+qADAgECAgkA4wvV+K8l2YEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkRFMSsw KQYDVQQKDCJULVN5c3RlbXMgRW50ZXJwcmlzZSBTZXJ2aWNlcyBHbWJIMR8wHQYDVQQLDBZULVN5 c3RlbXMgVHJ1c3QgQ2VudGVyMSUwIwYDVQQDDBxULVRlbGVTZWMgR2xvYmFsUm9vdCBDbGFzcyAy MB4XDTE2MDIyMjEzMzgyMloXDTMxMDIyMjIzNTk1OVowgZUxCzAJBgNVBAYTAkRFMUUwQwYDVQQK EzxWZXJlaW4genVyIEZvZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMg ZS4gVi4xEDAOBgNVBAsTB0RGTi1QS0kxLTArBgNVBAMTJERGTi1WZXJlaW4gQ2VydGlmaWNhdGlv biBBdXRob3JpdHkgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtg1/9moUHN0vqH l4pzq5lN6mc5WqFggEcVToyVsuXPztNXS43O+FZsFVV2B+pG/cgDRWM+cNSrVICxI5y+NyipCf8F XRgPxJiZN7Mg9mZ4F4fCnQ7MSjLnFp2uDo0peQcAIFTcFV9Kltd4tjTTwXS1nem/wHdN6r1ZB+Ba L2w8pQDcNb1lDY9/Mm3yWmpLYgHurDg0WUU2SQXaeMpqbVvAgWsRzNI8qIv4cRrKO+KA3Ra0Z3qL NupOkSk9s1FcragMvp0049ENF4N1xDkesJQLEvHVaY4l9Lg9K7/AjsMeO6W/VRCrKq4Xl14zzsjz 9AkH4wKGMUZrAcUQDBHHWekCAwEAAaOCAXQwggFwMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU k+PYMiba1fFKpZFK4OpL4qIMz+EwHwYDVR0jBBgwFoAUv1kgNgB5oKAia4zV8mHSuCzLgkowEgYD VR0TAQH/BAgwBgEB/wIBAjAzBgNVHSAELDAqMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC LB4wCAYGZ4EMAQICMEwGA1UdHwRFMEMwQaA/oD2GO2h0dHA6Ly9wa2kwMzM2LnRlbGVzZWMuZGUv cmwvVGVsZVNlY19HbG9iYWxSb290X0NsYXNzXzIuY3JsMIGGBggrBgEFBQcBAQR6MHgwLAYIKwYB BQUHMAGGIGh0dHA6Ly9vY3NwMDMzNi50ZWxlc2VjLmRlL29jc3ByMEgGCCsGAQUFBzAChjxodHRw Oi8vcGtpMDMzNi50ZWxlc2VjLmRlL2NydC9UZWxlU2VjX0dsb2JhbFJvb3RfQ2xhc3NfMi5jZXIw DQYJKoZIhvcNAQELBQADggEBAIcL/z4Cm2XIVi3WO5qYi3FP2ropqiH5Ri71sqQPrhE4eTizDnS6 dl2e6BiClmLbTDPo3flq3zK9LExHYFV/53RrtCyD2HlrtrdNUAtmB7Xts5et6u5/MOaZ/SLick0+ hFvu+c+Z6n/XUjkurJgARH5pO7917tALOxrN5fcPImxHhPalR6D90Bo0fa3SPXez7vTXTf/D6OWS T1k+kEcQSrCFWMBvf/iu7QhCnh7U3xQuTY+8npTD5+32GPg8SecmqKc22CzeIs2LgtjZeOJVEqM7 h0S2EQvVDFKvaYwPBt/QolOLV5h7z/0HJPT8vcP9SpIClxvyt7bPZYoaorVyGTkwggWsMIIElKAD AgECAgcbY7rQHiw9MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVy ZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYu MRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IDIwHhcNMTYwNTI0MTEzODQwWhcNMzEwMjIyMjM1OTU5WjCBjTELMAkGA1UEBhMCREUx RTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5lcyBEZXV0c2NoZW4gRm9yc2NodW5n c25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMGA1UEAwwcREZOLVZlcmVpbiBHbG9i YWwgSXNzdWluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ07eRxH3h+Gy8Zp 1xCeOdfZojDbchwFfylfS2jxrRnWTOFrG7ELf6Gr4HuLi9gtzm6IOhDuV+UefwRRNuu6cG1joL6W LkDh0YNMZj0cZGnlm6Stcq5oOVGHecwX064vXWNxSzl660Knl5BpBb+Q/6RAcL0D57+eGIgfn5mI TQ5HjUhfZZkQ0tkqSe3BuS0dnxLLFdM/fx5ULzquk1enfnjK1UriGuXtQX1TX8izKvWKMKztFwUk P7agCwf9TRqaA1KgNpzeJIdl5Of6x5ZzJBTN0OgbaJ4YWa52fvfRCng8h0uwN89Tyjo4EPPLR22M ZD08WkVKusqAfLjz56dMTM0CAwEAAaOCAgUwggIBMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0P AQH/BAQDAgEGMCkGA1UdIAQiMCAwDQYLKwYBBAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAdBgNV HQ4EFgQUazqYi/nyU4na4K2yMh4JH+iqO3QwHwYDVR0jBBgwFoAUk+PYMiba1fFKpZFK4OpL4qIM z+EwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9v dC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9n bG9iYWwtcm9vdC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYI KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEF BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9vdC1nMi1jYS9wdWIvY2FjZXJ0 L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJv b3QtZzItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCBeEWkTqR/ DlXwCbFqPnjMaDWpHPOVnj/z+N9rOHeJLI21rT7H8pTNoAauusyosa0zCLYkhmI2THhuUPDVbmCN T1IxQ5dGdfBi5G5mUcFCMWdQ5UnnOR7Ln8qGSN4IFP8VSytmm6A4nwDO/afr0X9XLchMX9wQEZc+ lgQCXISoKTlslPwQkgZ7nu7YRrQbtQMMONncsKk/cQYLsgMHM8KNSGMlJTx6e1du94oFOO+4oK4v 9NsH1VuEGMGpuEvObJAaguS5Pfp38dIfMwK/U+d2+dwmJUFvL6Yb+qQTkPp8ftkLYF3sv8pBoGH7 EUkp2KgtdRXYShjqFu9VNCIaE40GMIIF4DCCBMigAwIBAgIMIRX9tDE2QqO3mVLXMA0GCSqGSIb3 DQEBCwUAMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVp bmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUw IwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTE5MDYwNDE0MjkxMFoXDTIy MDYwMzE0MjkxMFowfDELMAkGA1UEBhMCREUxIDAeBgNVBAoMF0ZhY2hob2Noc2NodWxlIE11ZW5z dGVyMTIwMAYDVQQLDClGYWNoYmVyZWljaCBFbGVrdHJvdGVjaG5payB1bmQgSW5mb3JtYXRpazEX MBUGA1UEAwwOTWljaGFlbCBUdWV4ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM r8qQcPxLFCxzPtXvRyM9KeQaxyMA8gwUNc7IIiATs6mRQFe5ib/mvwT9nc0bAa+94go6HJDiD3FJ NkTo4u8aBsIcTt5pJtdBQLm88PLakbe3+fp/00//n7xxbTh7mAtFVCf25LxDCKkrdGk/+jglRq/R VdwhZZ3VpYCrx8YfI/hIzdRL3+4I4z/mnQ8K0X8d2MVVPG+9nBEngdnYGez5f/8wIVOgEYYBc21k yvMnVXLu2Ing+LwBd0gDG9Vasv87MNHCOZfJTNBlLhI2UDei/uNg9Zd4ynlMpPWZ7v0oiDWvmv8E OuD4oric8heyD0OYK2FL4qcVC4dn4pnyulfHAgMBAAGjggJOMIICSjA+BgNVHSAENzA1MA8GDSsG AQQBga0hgiwBAQQwEAYOKwYBBAGBrSGCLAEBBAQwEAYOKwYBBAGBrSGCLAIBBAQwCQYDVR0TBAIw ADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQW BBTxiodBVL/lA4p5iNesIsJRhhgd6zAfBgNVHSMEGDAWgBRrOpiL+fJTidrgrbIyHgkf6Ko7dDAg BgNVHREEGTAXgRV0dWV4ZW5AZmgtbXVlbnN0ZXIuZGUwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0 cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jcmwvY2FjcmwuY3JsMD+g PaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNy bC5jcmwwgdsGCCsGAQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu LmRlL09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv ZGZuLWNhLWdsb2JhbC1nMi9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6 Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2JhbC1nMi9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw DQYJKoZIhvcNAQELBQADggEBABs3VlmIZ1VF3HkaQdjInZYmamRabbdgJ7cz6m6o/agKL7+Vhwx7 1BaaYs2gMa5Nu/GJ3YfdqIsUlYtKdl58Yhp/89E6xBfJkItS+rE8RFdf2XgklGlx7GmsvdA3tId5 b6K6r9a5wpVN0epxY6K8wwpzEib6fJLcHylybQXZ7JSOaLRLp6WU3QPoyTT7FpvAe/0b2MSCbPX4 fc53PCn2aGgXuRFVQeCn1SP1BF3QW1ppkFhcF6G+0JcUxYFAXE6r/71WZBvUHqoG/th2hAwQnS+Y KhUYh4SZQH3/ursXXJYXQ5vyIhkN1FZlmtWA8+ofdCnoqSTbiSX2Aa/kKbTapwgxggOdMIIDmQIB ATCBnjCBjTELMAkGA1UEBhMCREUxRTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5l cyBEZXV0c2NoZW4gRm9yc2NodW5nc25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMG A1UEAwwcREZOLVZlcmVpbiBHbG9iYWwgSXNzdWluZyBDQQIMIRX9tDE2QqO3mVLXMA0GCWCGSAFl AwQCAQUAoIIBzzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0yMDA5 MDIyMTM5NTFaMC8GCSqGSIb3DQEJBDEiBCAyuFx2VmXlBvezaY52la0+s3cRO9yQZ7XBcQmXIAf8 NDCBrwYJKwYBBAGCNxAEMYGhMIGeMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1 ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYD VQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBAgwhFf20 MTZCo7eZUtcwgbEGCyqGSIb3DQEJEAILMYGhoIGeMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8 VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUu IFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5n IENBAgwhFf20MTZCo7eZUtcwDQYJKoZIhvcNAQEBBQAEggEABLNRtcRDy5Nl6EEvqYgCW7fgRVHY JGyvdX+L+Fi8X+7YPUylB8uwlnTWxvN9v+lAIL5vv7lSVwlvWvigbLCQXqssStTJkbehEstYsI5S TvBSlz78aPJXrm0vmondBcClHRBMzPFDQIo34oPIwFUbyzk7PhLPXP1yHwibV/ICBWxaaPv+RKDg SNcabZEFRf95ai4r36UCP9y6PYcNW28ohyN3lWE1FejjNnAGFq4c8tL6mUafl/sCG6DYLujb8eDo KfkcuLZI8T6+ov/bWbEuDR4Z8yNCrs/BxSCQeq2XsnYuRqpW2FLXeCb5tZpM+9pWFCAimhHM8uru gR0c/Ucz5QAAAAAAAA== --Apple-Mail=_700931A9-3F19-4D97-B091-67E083C0B004-- From owner-svn-src-all@freebsd.org Wed Sep 2 21:47:08 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C43C33CB0A7; Wed, 2 Sep 2020 21:47:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhcwX4p05z4Ldw; Wed, 2 Sep 2020 21:47:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-274.local (unknown [IPv6:2601:648:8681:1cb0:dce5:13fe:b1b9:a95d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 14CCA27A0E; Wed, 2 Sep 2020 21:47:07 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r365281 - in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp From: John Baldwin To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org References: <202009022136.082LatjO029946@repo.freebsd.org> Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: Date: Wed, 2 Sep 2020 14:47:06 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <202009022136.082LatjO029946@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 21:47:08 -0000 On 9/2/20 2:36 PM, John Baldwin wrote: > Author: jhb > Date: Wed Sep 2 21:36:55 2020 > New Revision: 365281 > URL: https://svnweb.freebsd.org/changeset/base/365281 > > Log: > MFC 361638,361712: Only build ipsec modules for kernels with IPSEC_SUPPORT. > > 361638: > Only build ipsec modules if the kernel includes IPSEC_SUPPORT. > > Honoring the kernel-supplied opt_ipsec.h in r361632 causes builds of > ipsec modules to fail if the kernel doesn't include IPSEC_SUPPORT. > However, the module can never be loaded into such a kernel, so only > build the modules if the kernel includes IPSEC_SUPPORT. > > 361712: (kevans) > modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC > > IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, > not both. Refrain from building if IPSEC is set, as the resulting module > won't be able to load anyways if it's built into the kernel. > > KERN_OPTS is safe here; for tied modules, it will reflect the kernel > configuration. For untied modules, it will defer to whatever is set in > ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter > situation has some risk to it for uncommon scenarios, but such is the life > of untied kernel modules. This should fix the build breakage from r365270 (sorry). -- John Baldwin From owner-svn-src-all@freebsd.org Wed Sep 2 22:10:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 34FE43CB656; Wed, 2 Sep 2020 22:10:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhdR50fRDz4MnN; Wed, 2 Sep 2020 22:10:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EED4A111D2; Wed, 2 Sep 2020 22:10:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082MA8qB048692; Wed, 2 Sep 2020 22:10:08 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082MA8it048689; Wed, 2 Sep 2020 22:10:08 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009022210.082MA8it048689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 22:10:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365282 - in head: lib/libifconfig rescue/rescue share/mk X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head: lib/libifconfig rescue/rescue share/mk X-SVN-Commit-Revision: 365282 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 22:10:09 -0000 Author: jhb Date: Wed Sep 2 22:10:08 2020 New Revision: 365282 URL: https://svnweb.freebsd.org/changeset/base/365282 Log: libifconfig now depends on libm due to usage of log10(). ld.bfd in particular requires -lm to come after libifconfig on the command line when linking rescue. Reviewed by: freqlabs, adrian Differential Revision: https://reviews.freebsd.org/D26258 Modified: head/lib/libifconfig/Makefile head/rescue/rescue/Makefile head/share/mk/src.libnames.mk Modified: head/lib/libifconfig/Makefile ============================================================================== --- head/lib/libifconfig/Makefile Wed Sep 2 21:36:55 2020 (r365281) +++ head/lib/libifconfig/Makefile Wed Sep 2 22:10:08 2020 (r365282) @@ -4,6 +4,8 @@ PACKAGE= lib${LIB} LIB= ifconfig INTERNALLIB= true +LIBADD= m + SHLIBDIR?= /lib SHLIB_MAJOR= 1 SRCS= libifconfig.c \ Modified: head/rescue/rescue/Makefile ============================================================================== --- head/rescue/rescue/Makefile Wed Sep 2 21:36:55 2020 (r365281) +++ head/rescue/rescue/Makefile Wed Sep 2 22:10:08 2020 (r365282) @@ -222,10 +222,11 @@ CRUNCH_PROGS_usr.sbin+= chroot CRUNCH_PROGS_usr.sbin+= chown CRUNCH_ALIAS_chown= chgrp ################################################################## -CRUNCH_LIBS+= -lm CRUNCH_LIBS+= ${OBJTOP}/lib/libifconfig/libifconfig.a CRUNCH_BUILDOPTS+= CRUNCH_CFLAGS+=-I${OBJTOP}/lib/libifconfig + +CRUNCH_LIBS+= -lm .if ${MK_ISCSI} != "no" CRUNCH_PROGS_usr.bin+= iscsictl Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Wed Sep 2 21:36:55 2020 (r365281) +++ head/share/mk/src.libnames.mk Wed Sep 2 22:10:08 2020 (r365282) @@ -390,6 +390,7 @@ _DP_zpool= md pthread z icp spl nvpair avl umem _DP_zutil= avl tpool _DP_be= zfs spl nvpair _DP_netmap= +_DP_ifconfig= m # OFED support .if ${MK_OFED} != "no" From owner-svn-src-all@freebsd.org Wed Sep 2 22:27:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D5C03CC2C1; Wed, 2 Sep 2020 22:27:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhdq73hCbz4PB4; Wed, 2 Sep 2020 22:27:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 61B5F114C5; Wed, 2 Sep 2020 22:27:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082MRV5j061206; Wed, 2 Sep 2020 22:27:31 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082MRVHX061205; Wed, 2 Sep 2020 22:27:31 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009022227.082MRVHX061205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 2 Sep 2020 22:27:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365283 - head/sys/dev/iicbus/mux X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/dev/iicbus/mux X-SVN-Commit-Revision: 365283 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 22:27:31 -0000 Author: jhb Date: Wed Sep 2 22:27:30 2020 New Revision: 365283 URL: https://svnweb.freebsd.org/changeset/base/365283 Log: Fix the variable name passed to OF_getprop(). Reported by: tinderbox Modified: head/sys/dev/iicbus/mux/ltc430x.c Modified: head/sys/dev/iicbus/mux/ltc430x.c ============================================================================== --- head/sys/dev/iicbus/mux/ltc430x.c Wed Sep 2 22:10:08 2020 (r365282) +++ head/sys/dev/iicbus/mux/ltc430x.c Wed Sep 2 22:27:30 2020 (r365283) @@ -176,7 +176,7 @@ ltc430x_attach(device_t dev) node = ofw_bus_get_node(dev); sc->idle_disconnect = OF_hasprop(node, "i2c-mux-idle-disconnect"); - if (OF_getprop(macnode, "freebsd,ctlreg2", &val, sizeof(val)) > 0) { + if (OF_getprop(node, "freebsd,ctlreg2", &val, sizeof(val)) > 0) { ctlreg2 = val; } #endif From owner-svn-src-all@freebsd.org Wed Sep 2 23:17:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 942D63CCBF7; Wed, 2 Sep 2020 23:17:34 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhfwt3D8nz4Qtq; Wed, 2 Sep 2020 23:17:34 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4E72912214; Wed, 2 Sep 2020 23:17:34 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082NHY8G091493; Wed, 2 Sep 2020 23:17:34 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082NHYlo091492; Wed, 2 Sep 2020 23:17:34 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202009022317.082NHYlo091492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Wed, 2 Sep 2020 23:17:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365284 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 365284 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 23:17:34 -0000 Author: brooks Date: Wed Sep 2 23:17:33 2020 New Revision: 365284 URL: https://svnweb.freebsd.org/changeset/base/365284 Log: Always report ENOSYS in init While rare, encountering an unimplemented system call early in init is catastrophic and difficult to debug. Even after a SIGSYS handler is registered, such configurations are problematic. As such, always report such events for pid 1 (following kern.lognosys if non-zero). Reviewed by: kevans, imp Obtained from: CheriBSD (plus suggestions from kevans) MFC after: 1 week Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26288 Modified: head/sys/kern/kern_sig.c Modified: head/sys/kern/kern_sig.c ============================================================================== --- head/sys/kern/kern_sig.c Wed Sep 2 22:27:30 2020 (r365283) +++ head/sys/kern/kern_sig.c Wed Sep 2 23:17:33 2020 (r365284) @@ -3794,7 +3794,8 @@ nosys(struct thread *td, struct nosys_args *args) uprintf("pid %d comm %s: nosys %d\n", p->p_pid, p->p_comm, td->td_sa.code); } - if (kern_lognosys == 2 || kern_lognosys == 3) { + if (kern_lognosys == 2 || kern_lognosys == 3 || + (p->p_pid == 1 && (kern_lognosys & 3) == 0)) { printf("pid %d comm %s: nosys %d\n", p->p_pid, p->p_comm, td->td_sa.code); } From owner-svn-src-all@freebsd.org Thu Sep 3 02:17:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ACC453D2181; Thu, 3 Sep 2020 02:17:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhkwz490Cz4bBv; Thu, 3 Sep 2020 02:17:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7265A1458D; Thu, 3 Sep 2020 02:17:55 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0832Htkg002085; Thu, 3 Sep 2020 02:17:55 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0832HtW2002084; Thu, 3 Sep 2020 02:17:55 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202009030217.0832HtW2002084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 3 Sep 2020 02:17:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365285 - head/sys/dev/mgb X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/dev/mgb X-SVN-Commit-Revision: 365285 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 02:17:55 -0000 Author: emaste Date: Thu Sep 3 02:17:55 2020 New Revision: 365285 URL: https://svnweb.freebsd.org/changeset/base/365285 Log: mgb: correct macro argument name mgb had a longstanding typo in function-like macro MGB_NEXT_RING_IDX's argument, but the macro had no consumers. r365061 introduced a use of the macro, after which mgb failed to build. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/mgb/if_mgb.h Modified: head/sys/dev/mgb/if_mgb.h ============================================================================== --- head/sys/dev/mgb/if_mgb.h Wed Sep 2 23:17:33 2020 (r365284) +++ head/sys/dev/mgb/if_mgb.h Thu Sep 3 02:17:55 2020 (r365285) @@ -178,8 +178,8 @@ #define MGB_DESC_GET_FRAME_LEN(_desc) \ (((_desc)->ctl & MGB_DESC_FRAME_LEN_MASK) >> 16) -#define MGB_NEXT_RING_IDX(_idx) (((_idx) == MGB_DMA_RING_SIZE - 1) ? 0 : ((_idx_) + 1)) -#define MGB_PREV_RING_IDX(_idx) (((_idx) == 0) ? (MGB_DMA_RING_SIZE - 1) : ((_idx_) - 1)) +#define MGB_NEXT_RING_IDX(_idx) (((_idx) == MGB_DMA_RING_SIZE - 1) ? 0 : ((_idx) + 1)) +#define MGB_PREV_RING_IDX(_idx) (((_idx) == 0) ? (MGB_DMA_RING_SIZE - 1) : ((_idx) - 1)) #define MGB_RING_SPACE(_sc) \ ((((_sc)->tx_ring_data.last_head - (_sc)->tx_ring_data.last_tail - 1) \ + MGB_DMA_RING_SIZE ) % MGB_DMA_RING_SIZE ) From owner-svn-src-all@freebsd.org Thu Sep 3 02:42:26 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B26253D3E3B; Thu, 3 Sep 2020 02:42:26 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhlTG4JHlz4dsc; Thu, 3 Sep 2020 02:42:26 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1599100946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YYhD0YejjfAOu/V5XvjhlD2tjsTepFVzBQpgNa8zT5U=; b=bQuH2kLFJ6wKqMDiy452j30fdHI0wqwq2WniA3mU3W/Tj1UVoSZdyryWs88j+cMiKJ17uR 7h1SOFliofeNDzFdVbak0CHqQL/xjdzYmo7l8OgPUd3uj0pUefUf3k/Z5wBkfqp7angeU1 +Ub444lUt8GwKhkJGmBH7x+ffTsHwddX/a5B/iZWkrtBI1IaQKZNI+eCVMFhg+PIv0hz3r vglgP2Q/uTJ/lk+7JY6KnPzMeFFutmR0J2UVeBQkJHm/AwtxD0nKfWdYiuj4U+a0BuHp8k Ov8HMj2g72XXYTV3L7YeEwFK8eGbnQfrw7Gr0dp7Tm1D2qAvfHjgk9yddWZ80w== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 8C91516608; Thu, 3 Sep 2020 02:42:26 +0000 (UTC) Date: Thu, 3 Sep 2020 02:42:26 +0000 From: Alexey Dokuchaev To: Michael Tuexen Cc: Pedro Giffuni , Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... Message-ID: <20200903024226.GA54078@FreeBSD.org> References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1599100946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YYhD0YejjfAOu/V5XvjhlD2tjsTepFVzBQpgNa8zT5U=; b=AgmMuAXhGnqWJWVm0zNH5fOsVgSpB0ILrolmB46m90/hatVvQVO1ERbY/YG12KW5cphQwS sk/+J2/UE6PV18tAurRC9/w9F8vj5slIVLDg4fv4dWRxZSuK26ajJNHB1zgNy0uPggFfpd 6XL/ACC+1j0hKdAztWj3KIEocAkLr7wAX0p9fIcE+bXIBs4XcIlwcgiRLJIcbCSl5U2zWo t6RYOpQyJ4oW+ivtfUhG5yDISJK4dwr2zzC8ctIPNQpaDzj0lywA8WYomhLsv+RzYYsxsD GNEGGG5/bpvIWnE0NLI4BnStZG36qYobSWAXo+kLZvvlQjUvE+/NLpQaihl6Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1599100946; a=rsa-sha256; cv=none; b=XfpFInODpgEHevFWXZ6CjE8uqQaRNfF3pZ9A/l7j47IP/JnPR4Aqm9Pr9Z/y1i1XJAGQ4J +HihKni6mlj7oAGkGyFjvI+eSSwt3OdHxRtSvKsWa4FlM8e921PI+Ej5jEqQ/SUHAYHFvB ZRJtvMn5nfTTI35qt7iIyScwih2x/gWt/bmp2kNInW6yE7ragBachW1OOZlJPsjNKt8KdU 0pQsp6wS/jEuw0dZc8tUoCdVwtBYbgGsvwefORim1S5gATFj0sUNA5NYtDlOY9Yzd6hwAP T69reonNDaMXZoHYXWJKcklX20TgmZUoVl+PZJIb54GEpkRl5Sm/mSjL8UY45w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 02:42:26 -0000 On Wed, Sep 02, 2020 at 11:39:51PM +0200, Michael Tuexen wrote: > > On 2. Sep 2020, at 20:28, Pedro Giffuni wrote: > > On 02/09/2020 13:06, Alexey Dokuchaev wrote: > >> On Wed, Sep 02, 2020 at 10:18:15AM -0500, Pedro Giffuni wrote: > >>> On 01/09/2020 21:05, Alexey Dokuchaev wrote: > >>>> ... > >>>> This is common sense. I can't count how often I wanted to hack on > >>>> something in the base/kernel and was turned away by this atrocious > >>>> excessive whitespace mess. > >>>> > >>>> Thank you Mateusz for cleaning this up. > >>> I honestly don't care much, but spaces do no harm and can make the code > >>> more readable. Sort of a silent comment, or what you do in written > >>> language when you start a new paragraph. > >> Right, but that's the example of appropriate usage of whitespace. I was > >> talking about *excessive* whitespace, that is, more than two \n's in a > >> row if we speak of newlines (subject of these commits). > > > > But how much space is rather subjective so Michael is right in asking > > what rule has been violated. > > > > No one is asking for the change to be reverted: the damage, if any, > > is already done. > > Just to be clear: I have NOT asked for reverting, I did not mentioned it. Wow wow, come down people. Indeed, no one was asking for reverting and I don't understand why we're talking about it. :-) > The why was explained: Some developers don't work on files which > violate whitespace rules. Usually they still will, but would often prefer to fix the style issues first so they don't get in the way. This is a bit frustrating because, per style(9), stylistic changes are hard on the source repository (e.g. they pessimize "svn blame") and should be avoided without good reason, but we cannot just seat and watch how style bugs accumulate and make the code harder and harder to work with. > I want to understand which rules have to be followed (and why). In general, FreeBSD code we write should follow style(9); it specifically mentions "do not add whitespace at the end of a line" and "... followed by one blank line" but doesn't go as far as explicitly forbidding multiple consecutive newlines. To me it's pretty obvious, and while others might have different sens esthe'tique, usually it is lack thereof (no offense) or mere ignorance. ./danfe P.S. Old-school tools like indent(1) or `uncrustify' were never widely popular, I guess, because they did not possess enough knowledge of the language to always produce correct results. Perhaps new era tools, like clang-format, could bring this to a whole new level. From owner-svn-src-all@freebsd.org Thu Sep 3 03:48:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0ABC83D7A48; Thu, 3 Sep 2020 03:48:43 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhmxk6Vxcz3W4g; Thu, 3 Sep 2020 03:48:42 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C425715770; Thu, 3 Sep 2020 03:48:42 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0833mgMV059138; Thu, 3 Sep 2020 03:48:42 GMT (envelope-from stevek@FreeBSD.org) Received: (from stevek@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0833mghN059137; Thu, 3 Sep 2020 03:48:42 GMT (envelope-from stevek@FreeBSD.org) Message-Id: <202009030348.0833mghN059137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stevek set sender to stevek@FreeBSD.org using -f From: "Stephen J. Kiernan" Date: Thu, 3 Sep 2020 03:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365286 - head/lib/libucl X-SVN-Group: head X-SVN-Commit-Author: stevek X-SVN-Commit-Paths: head/lib/libucl X-SVN-Commit-Revision: 365286 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 03:48:43 -0000 Author: stevek Date: Thu Sep 3 03:48:42 2020 New Revision: 365286 URL: https://svnweb.freebsd.org/changeset/base/365286 Log: Avoid issues with STAGING by using LIBUCL_DIR for the source directory variable name instead of LIBUCL (which would otherwise end up with the staging directory used instead of the wanted source directory.) Reviewed by: sjg Obtained from: Juniper Networks, Inc. Modified: head/lib/libucl/Makefile Modified: head/lib/libucl/Makefile ============================================================================== --- head/lib/libucl/Makefile Thu Sep 3 02:17:55 2020 (r365285) +++ head/lib/libucl/Makefile Thu Sep 3 03:48:42 2020 (r365286) @@ -1,6 +1,6 @@ # $FreeBSD$ -LIBUCL= ${SRCTOP}/contrib/libucl +LIBUCL_DIR= ${SRCTOP}/contrib/libucl PACKAGE=lib${LIB} LIB= ucl @@ -16,18 +16,18 @@ SRCS= ucl_emitter_streamline.c \ ucl_sexp.c \ ucl_util.c -.PATH: ${LIBUCL}/src \ - ${LIBUCL}/include \ - ${LIBUCL}/doc +.PATH: ${LIBUCL_DIR}/src \ + ${LIBUCL_DIR}/include \ + ${LIBUCL_DIR}/doc INCS= ucl.h LIBADD= m WARNS= 1 -CFLAGS+= -I${LIBUCL}/include \ - -I${LIBUCL}/src \ - -I${LIBUCL}/uthash \ - -I${LIBUCL}/klib +CFLAGS+= -I${LIBUCL_DIR}/include \ + -I${LIBUCL_DIR}/src \ + -I${LIBUCL_DIR}/uthash \ + -I${LIBUCL_DIR}/klib MAN+= libucl.3 From owner-svn-src-all@freebsd.org Thu Sep 3 04:11:30 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 286203D8852; Thu, 3 Sep 2020 04:11:30 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhnS20J3Bz3XQh; Thu, 3 Sep 2020 04:11:30 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from [192.168.1.10] (c-98-207-126-143.hsd1.ca.comcast.net [98.207.126.143]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 60E482A8A2; Thu, 3 Sep 2020 04:11:29 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.40.20081000 Date: Wed, 02 Sep 2020 21:11:23 -0700 Subject: Re: svn commit: r365264 - head/sys/dev/drm2 From: Ravi Pokala To: Niclas Zeising , , , Message-ID: <21223AE2-4D91-4DE4-90A5-CA991059FE2B@panasas.com> Thread-Topic: svn commit: r365264 - head/sys/dev/drm2 References: <202009021804.082I4nJ0098926@repo.freebsd.org> In-Reply-To: <202009021804.082I4nJ0098926@repo.freebsd.org> Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 04:11:30 -0000 This appears to have broken tinderbox: [${SRCTOP}] rpokala% less _.arm.TEGRA124 ... ${SRCTOP}/sys/dev/drm2/drm_os_freebsd.c:129:3: error: implicit declarat= ion of function 'DRM_OBSOLETE' is invalid in C99 [-Werror,-Wimplicit-functio= n-declaration] DRM_OBSOLETE(kdev); ^ 1 error generated. --- drm_os_freebsd.o --- -Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: on behalf of Niclas Zeising Date: 2020-09-02, Wednesday at 11:04 To: , , Subject: svn commit: r365264 - head/sys/dev/drm2 Author: zeising (doc,ports committer) Date: Wed Sep 2 18:04:49 2020 New Revision: 365264 URL: https://svnweb.freebsd.org/changeset/base/365264 Log: drm2: Further improve deprecation message Further improve the drm2 deprecation message, only displaying informa= tion about the port for relevant architectures, and skipping the message completely from arm, which uses some parts of drm2 still. This is mostly intended to be merged to 12, since the base bits of dr= m2 on FreeBSD 13 are only really used on arm. Reviewed by: manu, mmel Approved by: manu MFC after: 3 days X-MFC-with: r364737 Differential Revision: https://reviews.freebsd.org/D26275 Modified: head/sys/dev/drm2/drm_os_freebsd.h Modified: head/sys/dev/drm2/drm_os_freebsd.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D --- head/sys/dev/drm2/drm_os_freebsd.h Wed Sep 2 17:46:56 2020 (r36526= 3) +++ head/sys/dev/drm2/drm_os_freebsd.h Wed Sep 2 18:04:49 2020 (r36526= 4) @@ -154,15 +154,21 @@ typedef void irqreturn_t; *(volatile u_int64_t *)(((vm_offset_t)(map)->handle) + \ (vm_offset_t)(offset)) =3D htole64(val) -#define DRM_PORT "graphics/drm-kmod" +#if !defined(__arm__) +#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) ||= defined(__aarch64__) +#define DRM_MSG "This code is deprecated. Install the graphics/drm-km= od pkg\n" +#else +#define DRM_MSG "This code is deprecated." +#endif #define DRM_OBSOLETE(dev) \ do { \ device_printf(dev, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D\n"); \ - device_printf(dev, "This code is deprecated. Install the " DRM_PORT = " pkg\n"); \ + device_printf(dev, DRM_MSG); \ device_printf(dev, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D\n"); \ gone_in_dev(dev, 13, "drm2 drivers"); \ } while (0) +#endif /* __arm__ */ /* DRM_READMEMORYBARRIER() prevents reordering of reads. * DRM_WRITEMEMORYBARRIER() prevents reordering of writes. From owner-svn-src-all@freebsd.org Thu Sep 3 05:25:40 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8191F3DB1B1; Thu, 3 Sep 2020 05:25:40 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhq5c1t4sz3cGC; Thu, 3 Sep 2020 05:25:40 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23CBE16777; Thu, 3 Sep 2020 05:25:40 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0835PefR019843; Thu, 3 Sep 2020 05:25:40 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0835PeKh019842; Thu, 3 Sep 2020 05:25:40 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202009030525.0835PeKh019842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 3 Sep 2020 05:25:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365287 - head/sys/dev/drm2 X-SVN-Group: head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: head/sys/dev/drm2 X-SVN-Commit-Revision: 365287 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 05:25:40 -0000 Author: zeising (doc,ports committer) Date: Thu Sep 3 05:25:39 2020 New Revision: 365287 URL: https://svnweb.freebsd.org/changeset/base/365287 Log: drm2: Fix build after r365264 Fix the build after r365264, I forgot to exclude arm in one more place. Reported by: rpokala Approved by: manu (implicit, build fix) MFC after: 3 days X-MFC-With: 365264 Pointy-hat to: zeising Modified: head/sys/dev/drm2/drm_os_freebsd.c Modified: head/sys/dev/drm2/drm_os_freebsd.c ============================================================================== --- head/sys/dev/drm2/drm_os_freebsd.c Thu Sep 3 03:48:42 2020 (r365286) +++ head/sys/dev/drm2/drm_os_freebsd.c Thu Sep 3 05:25:39 2020 (r365287) @@ -126,7 +126,9 @@ drm_probe_helper(device_t kdev, const drm_pci_id_list_ device_get_nameunit(kdev), id_entry->name); device_set_desc(kdev, id_entry->name); } +#if !defined(__arm__) DRM_OBSOLETE(kdev); +#endif return (-BUS_PROBE_GENERIC); } From owner-svn-src-all@freebsd.org Thu Sep 3 05:28:39 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C5B83DB1D1; Thu, 3 Sep 2020 05:28:39 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.daemonic.se (mail.daemonic.se [176.58.89.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhq926VWjz3cSF; Thu, 3 Sep 2020 05:28:38 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from cid.daemonic.se (localhost [IPv6:::1]) by mail.daemonic.se (Postfix) with ESMTP id 4Bhq8v3zhLz3n4g; Thu, 3 Sep 2020 05:28:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mail.daemonic.se ([IPv6:::1]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256) by cid.daemonic.se (mailscanner.daemonic.se [IPv6:::1]) (amavisd-new, port 10587) with ESMTPS id s3YgLMEGTfJw; Thu, 3 Sep 2020 05:28:31 +0000 (UTC) Received: from vivi.daemonic.se (vivi.daemonic.se [IPv6:2001:470:dca9:1200::4]) by mail.daemonic.se (Postfix) with ESMTPSA id 4Bhq8t6r8Cz3myt; Thu, 3 Sep 2020 05:28:30 +0000 (UTC) Subject: Re: svn commit: r365264 - head/sys/dev/drm2 To: Ravi Pokala , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009021804.082I4nJ0098926@repo.freebsd.org> <21223AE2-4D91-4DE4-90A5-CA991059FE2B@panasas.com> From: Niclas Zeising Message-ID: Date: Thu, 3 Sep 2020 07:28:28 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <21223AE2-4D91-4DE4-90A5-CA991059FE2B@panasas.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Bhq926VWjz3cSF X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36236, ipnet:176.58.89.0/24, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 05:28:39 -0000 On 2020-09-03 06:11, Ravi Pokala wrote: > This appears to have broken tinderbox: > > [${SRCTOP}] rpokala% less _.arm.TEGRA124 > ... > ${SRCTOP}/sys/dev/drm2/drm_os_freebsd.c:129:3: error: implicit declaration of function 'DRM_OBSOLETE' is invalid in C99 [-Werror,-Wimplicit-function-declaration] > DRM_OBSOLETE(kdev); > ^ Yeah, sorry about that. Should be fixed in 365287. ponty_hat_collection++; Regards -- Niclas Zeising From owner-svn-src-all@freebsd.org Thu Sep 3 05:43:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7764C3DB92A; Thu, 3 Sep 2020 05:43:10 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhqTp2XY6z3dqr; Thu, 3 Sep 2020 05:43:10 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from [192.168.1.10] (unknown [IPv6:2601:641:300:6e9f:f8c7:f903:9abe:b9b4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id B0DC12B1E7; Thu, 3 Sep 2020 05:43:09 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.40.20081000 Date: Wed, 02 Sep 2020 22:43:05 -0700 Subject: Re: svn commit: r365264 - head/sys/dev/drm2 From: Ravi Pokala To: Niclas Zeising , , , Message-ID: Thread-Topic: svn commit: r365264 - head/sys/dev/drm2 References: <202009021804.082I4nJ0098926@repo.freebsd.org> <21223AE2-4D91-4DE4-90A5-CA991059FE2B@panasas.com> In-Reply-To: Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 05:43:10 -0000 -----Original Message----- From: on behalf of Niclas Zeising Date: 2020-09-02, Wednesday at 22:28 To: Ravi Pokala , , , Subject: Re: svn commit: r365264 - head/sys/dev/drm2 On 2020-09-03 06:11, Ravi Pokala wrote: > This appears to have broken tinderbox: > > [${SRCTOP}] rpokala% less _.arm.TEGRA124 > ... > ${SRCTOP}/sys/dev/drm2/drm_os_freebsd.c:129:3: error: implicit declaration of function 'DRM_OBSOLETE' is invalid in C99 [-Werror,-Wimplicit-function-declaration] > DRM_OBSOLETE(kdev); > ^ Yeah, sorry about that. Should be fixed in 365287. Confirmed. Thanks for the quick turnaround on the fix. -Ravi (rpokala@) ponty_hat_collection++; Regards -- Niclas Zeising From owner-svn-src-all@freebsd.org Thu Sep 3 07:16:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C00523DDDD2; Thu, 3 Sep 2020 07:16:05 +0000 (UTC) (envelope-from gonzo@bluezbox.com) Received: from id.bluezbox.com (id.bluezbox.com [45.55.20.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhsY03Bjdz41jN; Thu, 3 Sep 2020 07:16:04 +0000 (UTC) (envelope-from gonzo@bluezbox.com) Received: from localhost ([127.0.0.1] helo=id.bluezbox.com) by id.bluezbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94 (FreeBSD)) (envelope-from ) id 1kDjTQ-000A3d-SR; Thu, 03 Sep 2020 00:15:57 -0700 Received: (from gonzo@localhost) by id.bluezbox.com (8.15.2/8.15.2/Submit) id 0837Fu7r038664; Thu, 3 Sep 2020 00:15:56 -0700 (PDT) (envelope-from gonzo@bluezbox.com) X-Authentication-Warning: id.bluezbox.com: gonzo set sender to gonzo@bluezbox.com using -f Date: Thu, 3 Sep 2020 00:15:56 -0700 From: Oleksandr Tymoshenko To: Gleb Smirnoff Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r353419 - head/sys/net Message-ID: <20200903071556.GA38593@bluezbox.com> References: <201910102342.x9ANguvu083989@repo.freebsd.org> <20200828213130.GA74775@bluezbox.com> <20200830174431.GB5338@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200830174431.GB5338@FreeBSD.org> X-Operating-System: FreeBSD/11.2-RELEASE-p10 (amd64) X-Spam-Level: -- X-Spam-Report: Spam detection software, running on the system "id.bluezbox.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see The administrator of that system for details. Content preview: Gleb Smirnoff (glebius@freebsd.org) wrote: > On Fri, Aug 28, 2020 at 02:31:30PM -0700, Oleksandr Tymoshenko wrote: > O> Gleb Smirnoff (glebius@FreeBSD.org) wrote: > O> > Author: glebius > O> > Date: T [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Rspamd-Queue-Id: 4BhsY03Bjdz41jN X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of gonzo@bluezbox.com designates 45.55.20.155 as permitted sender) smtp.mailfrom=gonzo@bluezbox.com X-Spamd-Result: default: False [-2.16 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[gonzo]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; DMARC_NA(0.00)[bluezbox.com]; MID_RHS_MATCH_FROM(0.00)[]; NEURAL_HAM_LONG(-1.01)[-1.013]; NEURAL_HAM_MEDIUM(-0.98)[-0.984]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_SPAM_SHORT(0.14)[0.138]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:14061, ipnet:45.55.0.0/19, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 07:16:05 -0000 Gleb Smirnoff (glebius@freebsd.org) wrote: > On Fri, Aug 28, 2020 at 02:31:30PM -0700, Oleksandr Tymoshenko wrote: > O> Gleb Smirnoff (glebius@FreeBSD.org) wrote: > O> > Author: glebius > O> > Date: Thu Oct 10 23:42:55 2019 > O> > New Revision: 353419 > O> > URL: https://svnweb.freebsd.org/changeset/base/353419 > O> > > O> > Log: > O> > Provide new KPI for network drivers to access lists of interface > O> > addresses. The KPI doesn't reveal neither how addresses are stored, > O> > how the access to them is synchronized, neither reveal struct ifaddr > O> > and struct ifmaddr. > O> > > O> > Reviewed by: gallatin, erj, hselasky, philip, stevek > O> > Differential Revision: https://reviews.freebsd.org/D21943 > O> > O> Hi Gleb, > O> > O> Are there any plans to MFC this change and the subsequent API consumer changes? > O> Lack of this API in 12 makes MFCing unrelated eth driver fixes hard. > > I don't plan to MFC it, but there is nothing that would blocks such MFC. > > Of course internals of the functions would be different - using mutex instead > of the epoch to sync access to address lists. > > I can provide patch for you, but you would be responsive for MFC. I don't > have any 12-based systems to test changes. I only need it for if_dwc, I don't plan to merge code for any other drivers. I tested this patch[1] and there were no issues. Does it look sane? Do I need to run specific steps to trigger codepaths with these new API calls? [1] https://people.freebsd.org/~gonzo/patches/if-foreach-mfc.diff -- gonzo From owner-svn-src-all@freebsd.org Thu Sep 3 07:42:54 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E25A3DE43B; Thu, 3 Sep 2020 07:42:54 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bht7y0nktz42ty; Thu, 3 Sep 2020 07:42:54 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F39C318347; Thu, 3 Sep 2020 07:42:53 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0837grCq006710; Thu, 3 Sep 2020 07:42:53 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0837grkL006709; Thu, 3 Sep 2020 07:42:53 GMT (envelope-from avg@FreeBSD.org) Message-Id: <202009030742.0837grkL006709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 3 Sep 2020 07:42:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365288 - head/sys/dev/iicbus/twsi X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/dev/iicbus/twsi X-SVN-Commit-Revision: 365288 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 07:42:54 -0000 Author: avg Date: Thu Sep 3 07:42:53 2020 New Revision: 365288 URL: https://svnweb.freebsd.org/changeset/base/365288 Log: twsi: replace a couple of errno codes with i2c error codes Reviewed by: manu MFC after: 1 week Modified: head/sys/dev/iicbus/twsi/twsi.c Modified: head/sys/dev/iicbus/twsi/twsi.c ============================================================================== --- head/sys/dev/iicbus/twsi/twsi.c Thu Sep 3 05:25:39 2020 (r365287) +++ head/sys/dev/iicbus/twsi/twsi.c Thu Sep 3 07:42:53 2020 (r365288) @@ -579,7 +579,7 @@ twsi_intr(void *arg) case TWSI_STATUS_ADDR_R_NACK: debugf(sc->dev, "No ack received after transmitting the address\n"); sc->transfer = 0; - sc->error = ETIMEDOUT; + sc->error = IIC_ENOACK; sc->control_val = 0; wakeup(sc); break; @@ -660,7 +660,7 @@ twsi_intr(void *arg) default: debugf(sc->dev, "status=%x hot handled\n", status); sc->transfer = 0; - sc->error = ENXIO; + sc->error = IIC_EBUSERR; sc->control_val = 0; wakeup(sc); break; From owner-svn-src-all@freebsd.org Thu Sep 3 08:01:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A22E3DED30; Thu, 3 Sep 2020 08:01:22 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhtYG1YqRz43bM; Thu, 3 Sep 2020 08:01:22 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 190821872B; Thu, 3 Sep 2020 08:01:22 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08381LKI017288; Thu, 3 Sep 2020 08:01:21 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08381Ln2017287; Thu, 3 Sep 2020 08:01:21 GMT (envelope-from avg@FreeBSD.org) Message-Id: <202009030801.08381Ln2017287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 3 Sep 2020 08:01:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365289 - head/sys/dev/iicbus/twsi X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/dev/iicbus/twsi X-SVN-Commit-Revision: 365289 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 08:01:22 -0000 Author: avg Date: Thu Sep 3 08:01:21 2020 New Revision: 365289 URL: https://svnweb.freebsd.org/changeset/base/365289 Log: twsi: no need to compare boolean with boolean constant Testing the boolean directly is shorter and more idiomatic. MFC after: 1 week Modified: head/sys/dev/iicbus/twsi/twsi.c Modified: head/sys/dev/iicbus/twsi/twsi.c ============================================================================== --- head/sys/dev/iicbus/twsi/twsi.c Thu Sep 3 07:42:53 2020 (r365288) +++ head/sys/dev/iicbus/twsi/twsi.c Thu Sep 3 08:01:21 2020 (r365289) @@ -484,7 +484,7 @@ twsi_transfer(device_t dev, struct iic_msg *msgs, uint sc = device_get_softc(dev); - if (sc->have_intr == false) + if (!sc->have_intr) return (iicbus_transfer_gen(dev, msgs, nmsgs)); sc->error = 0; From owner-svn-src-all@freebsd.org Thu Sep 3 08:02:20 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 099BF3DEFA7; Thu, 3 Sep 2020 08:02:20 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhtZM6TsVz44D0; Thu, 3 Sep 2020 08:02:19 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C2AC918B02; Thu, 3 Sep 2020 08:02:19 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08382JO0018899; Thu, 3 Sep 2020 08:02:19 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08382JSm018898; Thu, 3 Sep 2020 08:02:19 GMT (envelope-from avg@FreeBSD.org) Message-Id: <202009030802.08382JSm018898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 3 Sep 2020 08:02:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365290 - head/sys/dev/iicbus X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/dev/iicbus X-SVN-Commit-Revision: 365290 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 08:02:20 -0000 Author: avg Date: Thu Sep 3 08:02:19 2020 New Revision: 365290 URL: https://svnweb.freebsd.org/changeset/base/365290 Log: move defintion of hw.i2c sysctl node from iicbb to iicbus MFC after: 2 weeks Modified: head/sys/dev/iicbus/iicbb.c head/sys/dev/iicbus/iicbus.c Modified: head/sys/dev/iicbus/iicbb.c ============================================================================== --- head/sys/dev/iicbus/iicbb.c Thu Sep 3 08:01:21 2020 (r365289) +++ head/sys/dev/iicbus/iicbb.c Thu Sep 3 08:02:19 2020 (r365290) @@ -228,7 +228,7 @@ iicbb_print_child(device_t bus, device_t dev) #ifdef IICBB_DEBUG static int i2c_debug = 0; -static SYSCTL_NODE(_hw, OID_AUTO, i2c, CTLFLAG_RW, 0, "i2c debug"); +SYSCTL_DECL(_hw_i2c); SYSCTL_INT(_hw_i2c, OID_AUTO, iicbb_debug, CTLFLAG_RWTUN, &i2c_debug, 0, "Enable i2c bit-banging driver debug"); Modified: head/sys/dev/iicbus/iicbus.c ============================================================================== --- head/sys/dev/iicbus/iicbus.c Thu Sep 3 08:01:21 2020 (r365289) +++ head/sys/dev/iicbus/iicbus.c Thu Sep 3 08:02:19 2020 (r365290) @@ -52,6 +52,8 @@ __FBSDID("$FreeBSD$"); /* See comments below for why auto-scanning is a bad idea. */ #define SCAN_IICBUS 0 +SYSCTL_NODE(_hw, OID_AUTO, i2c, CTLFLAG_RW, 0, "i2c controls"); + static int iicbus_probe(device_t dev) { From owner-svn-src-all@freebsd.org Thu Sep 3 08:16:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 313E13DF22A; Thu, 3 Sep 2020 08:16:58 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhtvG0C2Mz4585; Thu, 3 Sep 2020 08:16:58 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C499C18AA9; Thu, 3 Sep 2020 08:16:57 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0838Gvk0025558; Thu, 3 Sep 2020 08:16:57 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0838GvD5025557; Thu, 3 Sep 2020 08:16:57 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009030816.0838GvD5025557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 3 Sep 2020 08:16:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365291 - head/sbin/bectl/tests X-SVN-Group: head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/sbin/bectl/tests X-SVN-Commit-Revision: 365291 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 08:16:58 -0000 Author: lwhsu Date: Thu Sep 3 08:16:57 2020 New Revision: 365291 URL: https://svnweb.freebsd.org/changeset/base/365291 Log: Temporarily skip sbin.bectl.bectl_test.* i386 kernel in CI kldload zfs.ko on i386 hangs in CI Sponsored by: The FreeBSD Foundation Modified: head/sbin/bectl/tests/bectl_test.sh Modified: head/sbin/bectl/tests/bectl_test.sh ============================================================================== --- head/sbin/bectl/tests/bectl_test.sh Thu Sep 3 08:02:19 2020 (r365290) +++ head/sbin/bectl/tests/bectl_test.sh Thu Sep 3 08:16:57 2020 (r365291) @@ -148,6 +148,11 @@ bectl_destroy_head() } bectl_destroy_body() { + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + cwd=$(realpath .) zpool=$(make_zpool_name) disk=${cwd}/disk.img @@ -228,6 +233,11 @@ bectl_export_import_head() } bectl_export_import_body() { + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + cwd=$(realpath .) zpool=$(make_zpool_name) disk=${cwd}/disk.img @@ -256,6 +266,11 @@ bectl_list_head() } bectl_list_body() { + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + cwd=$(realpath .) zpool=$(make_zpool_name) disk=${cwd}/disk.img @@ -291,6 +306,11 @@ bectl_mount_head() } bectl_mount_body() { + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + cwd=$(realpath .) zpool=$(make_zpool_name) disk=${cwd}/disk.img @@ -325,6 +345,11 @@ bectl_rename_head() } bectl_rename_body() { + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + cwd=$(realpath .) zpool=$(make_zpool_name) disk=${cwd}/disk.img @@ -352,6 +377,11 @@ bectl_jail_head() } bectl_jail_body() { + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + cwd=$(realpath .) zpool=$(make_zpool_name) disk=${cwd}/disk.img From owner-svn-src-all@freebsd.org Thu Sep 3 08:38:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 51D9D3DF523; Thu, 3 Sep 2020 08:38:05 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhvMd1Tqyz45c4; Thu, 3 Sep 2020 08:38:05 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 15FB118B60; Thu, 3 Sep 2020 08:38:05 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0838c4VA038103; Thu, 3 Sep 2020 08:38:04 GMT (envelope-from rscheff@FreeBSD.org) Received: (from rscheff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0838c4Ef038100; Thu, 3 Sep 2020 08:38:04 GMT (envelope-from rscheff@FreeBSD.org) Message-Id: <202009030838.0838c4Ef038100@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rscheff set sender to rscheff@FreeBSD.org using -f From: Richard Scheffenegger Date: Thu, 3 Sep 2020 08:38:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365292 - stable/12/sys/netinet X-SVN-Group: stable-12 X-SVN-Commit-Author: rscheff X-SVN-Commit-Paths: stable/12/sys/netinet X-SVN-Commit-Revision: 365292 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 08:38:05 -0000 Author: rscheff Date: Thu Sep 3 08:38:04 2020 New Revision: 365292 URL: https://svnweb.freebsd.org/changeset/base/365292 Log: MFC r364195: Improve SACK support code for RFC6675 and PRR Adding proper accounting of sacked_bytes and (per-ACK) delivered data to the SACK scoreboard. This will allow more aspects of RFC6675 to be implemented as well as Proportional Rate Reduction (RFC6937). Prior to this change, the pipe calculation controlled with net.inet.tcp.rfc6675_pipe was also susceptible to incorrect results when more than 3 (or 4) holes in the sequence space were present, which can no longer all fit into a single ACK's SACK option. Reviewed by: kbowling, rgrimes (mentor) Approved by: rgrimes (blanket) MFC after: 3 weeks Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D18624 Modified: stable/12/sys/netinet/tcp_input.c stable/12/sys/netinet/tcp_sack.c stable/12/sys/netinet/tcp_var.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netinet/tcp_input.c ============================================================================== --- stable/12/sys/netinet/tcp_input.c Thu Sep 3 08:16:57 2020 (r365291) +++ stable/12/sys/netinet/tcp_input.c Thu Sep 3 08:38:04 2020 (r365292) @@ -2715,9 +2715,16 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru tp->t_dupacks = 0; /* * If this ack also has new SACK info, increment the - * counter as per rfc6675. + * counter as per rfc6675. The variable + * sack_changed tracks all changes to the SACK + * scoreboard, including when partial ACKs without + * SACK options are received, and clear the scoreboard + * from the left side. Such partial ACKs should not be + * counted as dupacks here. */ - if ((tp->t_flags & TF_SACK_PERMIT) && sack_changed) + if ((tp->t_flags & TF_SACK_PERMIT) && + (to.to_flags & TOF_SACK) && + sack_changed) tp->t_dupacks++; } Modified: stable/12/sys/netinet/tcp_sack.c ============================================================================== --- stable/12/sys/netinet/tcp_sack.c Thu Sep 3 08:16:57 2020 (r365291) +++ stable/12/sys/netinet/tcp_sack.c Thu Sep 3 08:38:04 2020 (r365292) @@ -534,9 +534,7 @@ tcp_sackhole_remove(struct tcpcb *tp, struct sackhole * tp->snd_holes is an ordered list of holes (oldest to newest, in terms of * the sequence space). * Returns 1 if incoming ACK has previously unknown SACK information, - * 0 otherwise. Note: We treat (snd_una, th_ack) as a sack block so any changes - * to that (i.e. left edge moving) would also be considered a change in SACK - * information which is slightly different than rfc6675. + * 0 otherwise. */ int tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tcp_seq th_ack) @@ -544,16 +542,21 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc struct sackhole *cur, *temp; struct sackblk sack, sack_blocks[TCP_MAX_SACK + 1], *sblkp; int i, j, num_sack_blks, sack_changed; + int delivered_data, left_edge_delta; INP_WLOCK_ASSERT(tp->t_inpcb); num_sack_blks = 0; sack_changed = 0; + delivered_data = 0; + left_edge_delta = 0; /* * If SND.UNA will be advanced by SEG.ACK, and if SACK holes exist, * treat [SND.UNA, SEG.ACK) as if it is a SACK block. + * Account changes to SND.UNA always in delivered data. */ if (SEQ_LT(tp->snd_una, th_ack) && !TAILQ_EMPTY(&tp->snd_holes)) { + left_edge_delta = th_ack - tp->snd_una; sack_blocks[num_sack_blks].start = tp->snd_una; sack_blocks[num_sack_blks++].end = th_ack; } @@ -562,7 +565,6 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc * received new blocks from the other side. */ if (to->to_flags & TOF_SACK) { - tp->sackhint.sacked_bytes = 0; /* reset */ for (i = 0; i < to->to_nsacks; i++) { bcopy((to->to_sacks + i * TCPOLEN_SACK), &sack, sizeof(sack)); @@ -575,8 +577,6 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc SEQ_GT(sack.end, tp->snd_una) && SEQ_LEQ(sack.end, tp->snd_max)) { sack_blocks[num_sack_blks++] = sack; - tp->sackhint.sacked_bytes += - (sack.end-sack.start); } } } @@ -601,7 +601,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc } } } - if (TAILQ_EMPTY(&tp->snd_holes)) + if (TAILQ_EMPTY(&tp->snd_holes)) { /* * Empty scoreboard. Need to initialize snd_fack (it may be * uninitialized or have a bogus value). Scoreboard holes @@ -610,6 +610,8 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc * scoreboard). */ tp->snd_fack = SEQ_MAX(tp->snd_una, th_ack); + tp->sackhint.sacked_bytes = 0; /* reset */ + } /* * In the while-loop below, incoming SACK blocks (sack_blocks[]) and * SACK holes (snd_holes) are traversed from their tails with just @@ -633,6 +635,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc */ temp = tcp_sackhole_insert(tp, tp->snd_fack,sblkp->start,NULL); if (temp != NULL) { + delivered_data += sblkp->end - sblkp->start; tp->snd_fack = sblkp->end; /* Go to the previous sack block. */ sblkp--; @@ -650,11 +653,15 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc SEQ_LT(tp->snd_fack, sblkp->start)) sblkp--; if (sblkp >= sack_blocks && - SEQ_LT(tp->snd_fack, sblkp->end)) + SEQ_LT(tp->snd_fack, sblkp->end)) { + delivered_data += sblkp->end - tp->snd_fack; tp->snd_fack = sblkp->end; + sack_changed = 1; + } } } else if (SEQ_LT(tp->snd_fack, sblkp->end)) { /* fack is advanced. */ + delivered_data += sblkp->end - tp->snd_fack; tp->snd_fack = sblkp->end; sack_changed = 1; } @@ -688,6 +695,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc /* Data acks at least the beginning of hole. */ if (SEQ_GEQ(sblkp->end, cur->end)) { /* Acks entire hole, so delete hole. */ + delivered_data += (cur->end - cur->start); temp = cur; cur = TAILQ_PREV(cur, sackhole_head, scblink); tcp_sackhole_remove(tp, temp); @@ -699,6 +707,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc continue; } else { /* Move start of hole forward. */ + delivered_data += (sblkp->end - cur->start); cur->start = sblkp->end; cur->rxmit = SEQ_MAX(cur->rxmit, cur->start); } @@ -706,6 +715,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc /* Data acks at least the end of hole. */ if (SEQ_GEQ(sblkp->end, cur->end)) { /* Move end of hole backward. */ + delivered_data += (cur->end - sblkp->start); cur->end = sblkp->start; cur->rxmit = SEQ_MIN(cur->rxmit, cur->end); } else { @@ -725,6 +735,7 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc cur->end = sblkp->start; cur->rxmit = SEQ_MIN(cur->rxmit, cur->end); + delivered_data += (sblkp->end - sblkp->start); } } } @@ -739,6 +750,10 @@ tcp_sack_doack(struct tcpcb *tp, struct tcpopt *to, tc else sblkp--; } + tp->sackhint.delivered_data = delivered_data; + tp->sackhint.sacked_bytes += delivered_data - left_edge_delta; + KASSERT((delivered_data >= 0), ("delivered_data < 0")); + KASSERT((tp->sackhint.sacked_bytes >= 0), ("sacked_bytes < 0")); return (sack_changed); } Modified: stable/12/sys/netinet/tcp_var.h ============================================================================== --- stable/12/sys/netinet/tcp_var.h Thu Sep 3 08:16:57 2020 (r365291) +++ stable/12/sys/netinet/tcp_var.h Thu Sep 3 08:38:04 2020 (r365292) @@ -70,12 +70,12 @@ struct sackhole { struct sackhint { struct sackhole *nexthole; - int sack_bytes_rexmit; + int32_t sack_bytes_rexmit; tcp_seq last_sack_ack; /* Most recent/largest sacked ack */ - int ispare; /* explicit pad for 64bit alignment */ - int sacked_bytes; /* - * Total sacked bytes reported by the + int32_t delivered_data; /* Newly acked data from last SACK */ + + int32_t sacked_bytes; /* Total sacked bytes reported by the * receiver via sack option */ uint32_t _pad1[1]; /* TBD */ From owner-svn-src-all@freebsd.org Thu Sep 3 08:41:39 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B68CB3DF3ED; Thu, 3 Sep 2020 08:41:39 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhvRl4VDWz4615; Thu, 3 Sep 2020 08:41:39 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B91118DC7; Thu, 3 Sep 2020 08:41:39 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0838fdgq040677; Thu, 3 Sep 2020 08:41:39 GMT (envelope-from rscheff@FreeBSD.org) Received: (from rscheff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0838fdO3040676; Thu, 3 Sep 2020 08:41:39 GMT (envelope-from rscheff@FreeBSD.org) Message-Id: <202009030841.0838fdO3040676@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rscheff set sender to rscheff@FreeBSD.org using -f From: Richard Scheffenegger Date: Thu, 3 Sep 2020 08:41:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365293 - stable/12/sys/netinet/cc X-SVN-Group: stable-12 X-SVN-Commit-Author: rscheff X-SVN-Commit-Paths: stable/12/sys/netinet/cc X-SVN-Commit-Revision: 365293 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 08:41:39 -0000 Author: rscheff Date: Thu Sep 3 08:41:38 2020 New Revision: 365293 URL: https://svnweb.freebsd.org/changeset/base/365293 Log: MFC r364196: TCP Cubic: After leaving slowstart fix unintended cwnd jump. Initializing K to zero in D23655 introduced a miscalculation, where cwnd would suddenly jump to cwnd_max instead of gradually increasing, after leaving slow-start. Properly calculating K instead of resetting it to zero resolves this issue. Also making sure, that cwnd is recalculated at the earliest opportunity once slow-start is over. Reported by: chengc_netapp.com Reviewed by: chengc_netapp.com, tuexen (mentor), rgrimes (mentor) Approved by: tuexen (mentor), rgrimes (mentor) MFC after: 3 weeks Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D25746 Modified: stable/12/sys/netinet/cc/cc_cubic.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netinet/cc/cc_cubic.c ============================================================================== --- stable/12/sys/netinet/cc/cc_cubic.c Thu Sep 3 08:38:04 2020 (r365292) +++ stable/12/sys/netinet/cc/cc_cubic.c Thu Sep 3 08:41:38 2020 (r365293) @@ -132,19 +132,29 @@ cubic_ack_received(struct cc_var *ccv, uint16_t type) /* * Regular ACK and we're not in cong/fast recovery and we're cwnd - * limited and we're either not doing ABC or are slow starting or are - * doing ABC and we've sent a cwnd's worth of bytes. + * limited and we're either not doing ABC or are just coming out + * from slow-start or were application limited or are slow starting + * or are doing ABC and we've sent a cwnd's worth of bytes. */ if (type == CC_ACK && !IN_RECOVERY(CCV(ccv, t_flags)) && (ccv->flags & CCF_CWND_LIMITED) && (!V_tcp_do_rfc3465 || + (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART | CUBICFLAG_IN_APPLIMIT)) || CCV(ccv, snd_cwnd) <= CCV(ccv, snd_ssthresh) || - (V_tcp_do_rfc3465 && ccv->flags & CCF_ABC_SENTAWND))) { + (V_tcp_do_rfc3465 && (ccv->flags & CCF_ABC_SENTAWND)))) { /* Use the logic in NewReno ack_received() for slow start. */ if (CCV(ccv, snd_cwnd) <= CCV(ccv, snd_ssthresh) || cubic_data->min_rtt_ticks == TCPTV_SRTTBASE) { cubic_data->flags |= CUBICFLAG_IN_SLOWSTART; newreno_cc_algo.ack_received(ccv, type); } else { + if (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART | + CUBICFLAG_IN_APPLIMIT)) { + cubic_data->flags &= ~(CUBICFLAG_IN_SLOWSTART | + CUBICFLAG_IN_APPLIMIT); + cubic_data->t_last_cong = ticks; + cubic_data->K = cubic_k(cubic_data->max_cwnd / + CCV(ccv, t_maxseg)); + } if ((ticks_since_cong = ticks - cubic_data->t_last_cong) < 0) { /* @@ -152,14 +162,6 @@ cubic_ack_received(struct cc_var *ccv, uint16_t type) */ ticks_since_cong = INT_MAX; cubic_data->t_last_cong = ticks - INT_MAX; - } - - if (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART | - CUBICFLAG_IN_APPLIMIT)) { - cubic_data->flags &= ~(CUBICFLAG_IN_SLOWSTART | - CUBICFLAG_IN_APPLIMIT); - cubic_data->t_last_cong = ticks; - cubic_data->K = 0; } /* * The mean RTT is used to best reflect the equations in From owner-svn-src-all@freebsd.org Thu Sep 3 08:45:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A54943DFA7B; Thu, 3 Sep 2020 08:45:22 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhvX23sRlz46T3; Thu, 3 Sep 2020 08:45:22 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67DAA186F8; Thu, 3 Sep 2020 08:45:22 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0838jMYT043917; Thu, 3 Sep 2020 08:45:22 GMT (envelope-from rscheff@FreeBSD.org) Received: (from rscheff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0838jMmU043916; Thu, 3 Sep 2020 08:45:22 GMT (envelope-from rscheff@FreeBSD.org) Message-Id: <202009030845.0838jMmU043916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rscheff set sender to rscheff@FreeBSD.org using -f From: Richard Scheffenegger Date: Thu, 3 Sep 2020 08:45:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365294 - stable/12/sys/netinet/cc X-SVN-Group: stable-12 X-SVN-Commit-Author: rscheff X-SVN-Commit-Paths: stable/12/sys/netinet/cc X-SVN-Commit-Revision: 365294 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 08:45:22 -0000 Author: rscheff Date: Thu Sep 3 08:45:21 2020 New Revision: 365294 URL: https://svnweb.freebsd.org/changeset/base/365294 Log: MFC r364197: TCP Cubic: Have Fast Convergence Heuristic work for ECN, and align concave region The Cubic concave region was not aligned nicely for the very first exit from slow start, where a 50% cwnd reduction is done instead of the normal 30%. This addresses an issue, where a short line-rate burst could result from that sudden jump of cwnd. In addition, the Fast Convergence Heuristic has been expanded to work also with ECN induced congestion response. Submitted by: chengc_netapp.com Reported by: chengc_netapp.com Reviewed by: tuexen (mentor), rgrimes (mentor) Approved by: tuexen (mentor), rgrimes (mentor) MFC after: 3 weeks Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D25976 Modified: stable/12/sys/netinet/cc/cc_cubic.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netinet/cc/cc_cubic.c ============================================================================== --- stable/12/sys/netinet/cc/cc_cubic.c Thu Sep 3 08:41:38 2020 (r365293) +++ stable/12/sys/netinet/cc/cc_cubic.c Thu Sep 3 08:45:21 2020 (r365294) @@ -286,8 +286,7 @@ cubic_cong_signal(struct cc_var *ccv, uint32_t type) if (!IN_CONGRECOVERY(CCV(ccv, t_flags))) { cubic_ssthresh_update(ccv); cubic_data->flags |= CUBICFLAG_CONG_EVENT; - cubic_data->prev_max_cwnd = cubic_data->max_cwnd; - cubic_data->max_cwnd = CCV(ccv, snd_cwnd); + cubic_data->t_last_cong = ticks; cubic_data->K = cubic_k(cubic_data->max_cwnd / CCV(ccv, t_maxseg)); } ENTER_RECOVERY(CCV(ccv, t_flags)); @@ -298,8 +297,6 @@ cubic_cong_signal(struct cc_var *ccv, uint32_t type) if (!IN_CONGRECOVERY(CCV(ccv, t_flags))) { cubic_ssthresh_update(ccv); cubic_data->flags |= CUBICFLAG_CONG_EVENT; - cubic_data->prev_max_cwnd = cubic_data->max_cwnd; - cubic_data->max_cwnd = CCV(ccv, snd_cwnd); cubic_data->t_last_cong = ticks; cubic_data->K = cubic_k(cubic_data->max_cwnd / CCV(ccv, t_maxseg)); CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh); @@ -361,11 +358,6 @@ cubic_post_recovery(struct cc_var *ccv) cubic_data = ccv->cc_data; pipe = 0; - /* Fast convergence heuristic. */ - if (cubic_data->max_cwnd < cubic_data->prev_max_cwnd) - cubic_data->max_cwnd = (cubic_data->max_cwnd * CUBIC_FC_FACTOR) - >> CUBIC_SHIFT; - if (IN_FASTRECOVERY(CCV(ccv, t_flags))) { /* * If inflight data is less than ssthresh, set cwnd @@ -392,7 +384,6 @@ cubic_post_recovery(struct cc_var *ccv) CUBIC_BETA) >> CUBIC_SHIFT, 2 * CCV(ccv, t_maxseg)); } - cubic_data->t_last_cong = ticks; /* Calculate the average RTT between congestion epochs. */ if (cubic_data->epoch_ack_count > 0 && @@ -403,7 +394,6 @@ cubic_post_recovery(struct cc_var *ccv) cubic_data->epoch_ack_count = 0; cubic_data->sum_rtt_ticks = 0; - cubic_data->K = cubic_k(cubic_data->max_cwnd / CCV(ccv, t_maxseg)); } /* @@ -457,18 +447,32 @@ cubic_ssthresh_update(struct cc_var *ccv) { struct cubic *cubic_data; uint32_t ssthresh; + uint32_t cwnd; cubic_data = ccv->cc_data; + cwnd = CCV(ccv, snd_cwnd); + /* Fast convergence heuristic. */ + if (cwnd < cubic_data->max_cwnd) { + cwnd = ((uint64_t)cwnd * CUBIC_FC_FACTOR) >> CUBIC_SHIFT; + } + cubic_data->prev_max_cwnd = cubic_data->max_cwnd; + cubic_data->max_cwnd = cwnd; + /* - * On the first congestion event, set ssthresh to cwnd * 0.5, on - * subsequent congestion events, set it to cwnd * beta. + * On the first congestion event, set ssthresh to cwnd * 0.5 + * and reduce max_cwnd to cwnd * beta. This aligns the cubic concave + * region appropriately. On subsequent congestion events, set + * ssthresh to cwnd * beta. */ - if ((cubic_data->flags & CUBICFLAG_CONG_EVENT) == 0) - ssthresh = CCV(ccv, snd_cwnd) >> 1; - else - ssthresh = ((uint64_t)CCV(ccv, snd_cwnd) * + if ((cubic_data->flags & CUBICFLAG_CONG_EVENT) == 0) { + ssthresh = cwnd >> 1; + cubic_data->max_cwnd = ((uint64_t)cwnd * CUBIC_BETA) >> CUBIC_SHIFT; + } else { + ssthresh = ((uint64_t)cwnd * + CUBIC_BETA) >> CUBIC_SHIFT; + } CCV(ccv, snd_ssthresh) = max(ssthresh, 2 * CCV(ccv, t_maxseg)); } From owner-svn-src-all@freebsd.org Thu Sep 3 09:09:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 55E123E03BC; Thu, 3 Sep 2020 09:09:45 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhw491dLfz47hB; Thu, 3 Sep 2020 09:09:45 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B17219432; Thu, 3 Sep 2020 09:09:45 +0000 (UTC) (envelope-from rscheff@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08399iYn056863; Thu, 3 Sep 2020 09:09:44 GMT (envelope-from rscheff@FreeBSD.org) Received: (from rscheff@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08399ikC056862; Thu, 3 Sep 2020 09:09:44 GMT (envelope-from rscheff@FreeBSD.org) Message-Id: <202009030909.08399ikC056862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rscheff set sender to rscheff@FreeBSD.org using -f From: Richard Scheffenegger Date: Thu, 3 Sep 2020 09:09:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365295 - stable/12/sys/netinet/cc X-SVN-Group: stable-12 X-SVN-Commit-Author: rscheff X-SVN-Commit-Paths: stable/12/sys/netinet/cc X-SVN-Commit-Revision: 365295 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 09:09:45 -0000 Author: rscheff Date: Thu Sep 3 09:09:44 2020 New Revision: 365295 URL: https://svnweb.freebsd.org/changeset/base/365295 Log: MFC r364354: TCP Cubic: recalculate cwnd for every ACK. Since cubic calculates cwnd based on absolute time, retaining RFC3465 (ABC) once-per-window updates can lead to dramatic changes of cwnd in the convex region. Updating cwnd for each incoming ack minimizes this delta, preventing unintentional line-rate bursts. Reviewed by: chengc_netapp.com, tuexen (mentor) MFC after: 2 weeks Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D26060 Modified: stable/12/sys/netinet/cc/cc_cubic.c Modified: stable/12/sys/netinet/cc/cc_cubic.c ============================================================================== --- stable/12/sys/netinet/cc/cc_cubic.c Thu Sep 3 08:45:21 2020 (r365294) +++ stable/12/sys/netinet/cc/cc_cubic.c Thu Sep 3 09:09:44 2020 (r365295) @@ -131,16 +131,11 @@ cubic_ack_received(struct cc_var *ccv, uint16_t type) cubic_record_rtt(ccv); /* - * Regular ACK and we're not in cong/fast recovery and we're cwnd - * limited and we're either not doing ABC or are just coming out - * from slow-start or were application limited or are slow starting - * or are doing ABC and we've sent a cwnd's worth of bytes. + * For a regular ACK and we're not in cong/fast recovery and + * we're cwnd limited, always recalculate cwnd. */ if (type == CC_ACK && !IN_RECOVERY(CCV(ccv, t_flags)) && - (ccv->flags & CCF_CWND_LIMITED) && (!V_tcp_do_rfc3465 || - (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART | CUBICFLAG_IN_APPLIMIT)) || - CCV(ccv, snd_cwnd) <= CCV(ccv, snd_ssthresh) || - (V_tcp_do_rfc3465 && (ccv->flags & CCF_ABC_SENTAWND)))) { + (ccv->flags & CCF_CWND_LIMITED)) { /* Use the logic in NewReno ack_received() for slow start. */ if (CCV(ccv, snd_cwnd) <= CCV(ccv, snd_ssthresh) || cubic_data->min_rtt_ticks == TCPTV_SRTTBASE) { @@ -193,15 +188,8 @@ cubic_ack_received(struct cc_var *ccv, uint16_t type) * cwnd growth. * Only update snd_cwnd, if it doesn't shrink. */ - if (V_tcp_do_rfc3465) - CCV(ccv, snd_cwnd) = ulmin(w_cubic_next, - INT_MAX); - else - CCV(ccv, snd_cwnd) += ulmax(1, - ((ulmin(w_cubic_next, INT_MAX) - - CCV(ccv, snd_cwnd)) * - CCV(ccv, t_maxseg)) / - CCV(ccv, snd_cwnd)); + CCV(ccv, snd_cwnd) = ulmin(w_cubic_next, + INT_MAX); } /* From owner-svn-src-all@freebsd.org Thu Sep 3 10:11:13 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8BDC63E1790; Thu, 3 Sep 2020 10:11:13 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhxR538vrz4DRF; Thu, 3 Sep 2020 10:11:13 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5136B19DB9; Thu, 3 Sep 2020 10:11:13 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083ABDg7097964; Thu, 3 Sep 2020 10:11:13 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083ABCQE097961; Thu, 3 Sep 2020 10:11:12 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <202009031011.083ABCQE097961@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Thu, 3 Sep 2020 10:11:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365296 - in head/sys/arm64: arm64 include X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: in head/sys/arm64: arm64 include X-SVN-Commit-Revision: 365296 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 10:11:13 -0000 Author: andrew Date: Thu Sep 3 10:11:12 2020 New Revision: 365296 URL: https://svnweb.freebsd.org/changeset/base/365296 Log: Switch to an empty ttbr0 pagetable when the MMU is enabled We don't need these pagetables after the early boot. Remove the chance we write to memory we didn't expect to and remove architectural undefined behaviour. Reviewed by: alc (earlier version), mmel Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D22606 Modified: head/sys/arm64/arm64/locore.S head/sys/arm64/arm64/machdep.c head/sys/arm64/include/machdep.h Modified: head/sys/arm64/arm64/locore.S ============================================================================== --- head/sys/arm64/arm64/locore.S Thu Sep 3 09:09:44 2020 (r365295) +++ head/sys/arm64/arm64/locore.S Thu Sep 3 10:11:12 2020 (r365296) @@ -128,6 +128,9 @@ _start: /* Enable the mmu */ bl start_mmu + /* Load the new ttbr0 pagetable */ + adr x27, pagetable_l0_ttbr0 + /* Jump to the virtual address space */ ldr x15, .Lvirtdone br x15 @@ -166,6 +169,7 @@ virtdone: str x25, [x0, #BP_KERN_STACK] str x24, [x0, #BP_KERN_L0PT] str x23, [x0, #BP_BOOT_EL] + str x27, [x0, 40] /* kern_ttbr0 */ /* trace back starts here */ mov fp, #0 @@ -204,11 +208,14 @@ ENTRY(mpentry) /* Load the kernel page table */ adr x24, pagetable_l0_ttbr1 /* Load the identity page table */ - adr x27, pagetable_l0_ttbr0 + adr x27, pagetable_l0_ttbr0_boostrap /* Enable the mmu */ bl start_mmu + /* Load the new ttbr0 pagetable */ + adr x27, pagetable_l0_ttbr0 + /* Jump to the virtual address space */ ldr x15, =mp_virtdone br x15 @@ -218,6 +225,16 @@ mp_virtdone: ldr x4, =bootstack ldr x4, [x4] mov sp, x4 + + /* Load the kernel ttbr0 pagetable */ + msr ttbr0_el1, x27 + isb + + /* Invalidate the TLB */ + tlbi vmalle1 + dsb sy + isb + b init_secondary END(mpentry) #endif @@ -760,10 +777,13 @@ abort: //.section .init_pagetable .align 12 /* 4KiB aligned */ /* - * 3 initial tables (in the following order): + * 6 initial tables (in the following order): * L2 for kernel (High addresses) * L1 for kernel - * L1 for user (Low addresses) + * L0 for kernel + * L1 bootstrap for user (Low addresses) + * L0 bootstrap for user + * L0 for user */ pagetable: .space PAGE_SIZE @@ -771,7 +791,9 @@ pagetable_l1_ttbr1: .space PAGE_SIZE pagetable_l0_ttbr1: .space PAGE_SIZE -pagetable_l1_ttbr0: +pagetable_l1_ttbr0_bootstrap: + .space PAGE_SIZE +pagetable_l0_ttbr0_boostrap: .space PAGE_SIZE pagetable_l0_ttbr0: .space PAGE_SIZE Modified: head/sys/arm64/arm64/machdep.c ============================================================================== --- head/sys/arm64/arm64/machdep.c Thu Sep 3 09:09:44 2020 (r365295) +++ head/sys/arm64/arm64/machdep.c Thu Sep 3 10:11:12 2020 (r365296) @@ -1235,6 +1235,8 @@ initarm(struct arm64_bootparams *abp) valid = bus_probe(); cninit(); + set_ttbr0(abp->kern_ttbr0); + cpu_tlb_flushID(); if (!valid) panic("Invalid bus configuration: %s", Modified: head/sys/arm64/include/machdep.h ============================================================================== --- head/sys/arm64/include/machdep.h Thu Sep 3 09:09:44 2020 (r365295) +++ head/sys/arm64/include/machdep.h Thu Sep 3 10:11:12 2020 (r365296) @@ -37,6 +37,7 @@ struct arm64_bootparams { uint64_t kern_delta; vm_offset_t kern_stack; vm_offset_t kern_l0pt; /* L1 page table for the kernel */ + vm_paddr_t kern_ttbr0; int boot_el; /* EL the kernel booted from */ int pad; }; From owner-svn-src-all@freebsd.org Thu Sep 3 13:22:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF5B33E6437; Thu, 3 Sep 2020 13:22:09 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj1gP4j4cz4QlW; Thu, 3 Sep 2020 13:22:09 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 851C21C1BE; Thu, 3 Sep 2020 13:22:09 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083DM9nb013122; Thu, 3 Sep 2020 13:22:09 GMT (envelope-from gbe@FreeBSD.org) Received: (from gbe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083DM90W013121; Thu, 3 Sep 2020 13:22:09 GMT (envelope-from gbe@FreeBSD.org) Message-Id: <202009031322.083DM90W013121@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gbe set sender to gbe@FreeBSD.org using -f From: Gordon Bergling Date: Thu, 3 Sep 2020 13:22:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365297 - stable/12/bin/ls X-SVN-Group: stable-12 X-SVN-Commit-Author: gbe X-SVN-Commit-Paths: stable/12/bin/ls X-SVN-Commit-Revision: 365297 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 13:22:09 -0000 Author: gbe (doc committer) Date: Thu Sep 3 13:22:09 2020 New Revision: 365297 URL: https://svnweb.freebsd.org/changeset/base/365297 Log: MFC r364449, r365004: ls(1): Update POSIX conformance - Update the POSIX references for non-standard ls(1) options - Simplify the STANDARDS section by mention both supported POSIX versions Verified by checking [1]. [1] https://pubs.opengroup.org/onlinepubs/9699919799.2016edition/toc.htm PR: 140435 (based on) Submitted by: Dan Lukes Reviewed by: hrs, bcr Approved by: hrs, bcr Differential Revision: https://reviews.freebsd.org/D26210 Modified: stable/12/bin/ls/ls.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/bin/ls/ls.1 ============================================================================== --- stable/12/bin/ls/ls.1 Thu Sep 3 10:11:12 2020 (r365296) +++ stable/12/bin/ls/ls.1 Thu Sep 3 13:22:09 2020 (r365297) @@ -32,7 +32,7 @@ .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" $FreeBSD$ .\" -.Dd May 21, 2020 +.Dd August 31, 2020 .Dt LS 1 .Os .Sh NAME @@ -89,7 +89,7 @@ where .Va xxx is the numeric value of the character in octal. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl C Force multi-column output; this is the default when output is to a terminal. .It Fl D Ar format @@ -108,7 +108,7 @@ This option overrides the .Fl T option. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl F Display a slash .Pq Ql / @@ -141,7 +141,7 @@ in the environment and setting This functionality can be compiled out by removing the definition of .Ev COLORLS . This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl H Symbolic links on the command line are followed. This option is assumed if @@ -155,7 +155,7 @@ Prevent .Fl A from being automatically set for the super-user. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl L If argument is a symbolic link, list the file or directory the link references rather than the link itself. @@ -184,20 +184,20 @@ The .Fl D option gives even more control over the output format. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl U Use time when file was created for sorting or printing. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl W Display whiteouts when scanning directories. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl Z Display each file's MAC label; see .Xr maclabel 7 . This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl a Include directory entries whose names begin with a dot @@ -209,7 +209,7 @@ but use .Tn C escape codes whenever possible. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl c Use time when file status was last changed for sorting or printing. .It Fl -color Ns = Ns Ar when @@ -292,7 +292,7 @@ and .Fl t options. As allowed by -.St -p1003.1-2001 , +.St -p1003.1-2008 , this option has no effect on the .Fl d , .Fl l , @@ -308,7 +308,7 @@ where it was used to display the group name in the lon .Pq Fl l format output. This option is incompatible with -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl h When used with the .Fl l @@ -316,7 +316,7 @@ option, use unit suffixes: Byte, Kilobyte, Megabyte, G and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. This option is not defined in -.St -p1003.1-2001 . +.St -p1003.1-2008 . .It Fl i For each file, print the file's file serial number (inode number). .It Fl k @@ -343,7 +343,7 @@ Include the file flags in a long .Pq Fl l output. This option is incompatible with -.St -p1003.1-2001 . +.St -p1003.1-2008 . See .Xr chflags 1 for a list of file flags and their meanings. @@ -895,13 +895,14 @@ and the .Nm utility conforms to -.St -p1003.1-2001 . +.St -p1003.1-2001 +and +.St -p1003.1-2008 . The options .Fl B , D , G , I , T , U , W , Z , b , h , w , y and .Fl , -are compatible extensions not defined in -.St -p1003.1-2001 . +are non-standard extensions. .Pp The ACL support is compatible with .Tn IEEE From owner-svn-src-all@freebsd.org Thu Sep 3 13:56:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 397D63E7047; Thu, 3 Sep 2020 13:56:31 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj2R273zWz4T6x; Thu, 3 Sep 2020 13:56:30 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D73591C9A7; Thu, 3 Sep 2020 13:56:30 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083DuU54035838; Thu, 3 Sep 2020 13:56:30 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083DuU3m035837; Thu, 3 Sep 2020 13:56:30 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009031356.083DuU3m035837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 3 Sep 2020 13:56:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365298 - stable/12/sys/dev/sound/pci X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/dev/sound/pci X-SVN-Commit-Revision: 365298 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 13:56:31 -0000 Author: markj Date: Thu Sep 3 13:56:30 2020 New Revision: 365298 URL: https://svnweb.freebsd.org/changeset/base/365298 Log: MFC r364873: snd_ich(4): Handle errors from ich_init() properly during resume. PR: 248941 Modified: stable/12/sys/dev/sound/pci/ich.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/sound/pci/ich.c ============================================================================== --- stable/12/sys/dev/sound/pci/ich.c Thu Sep 3 13:22:09 2020 (r365297) +++ stable/12/sys/dev/sound/pci/ich.c Thu Sep 3 13:56:30 2020 (r365298) @@ -1190,16 +1190,17 @@ static int ich_pci_resume(device_t dev) { struct sc_info *sc; - int i; + int err, i; sc = pcm_getdevinfo(dev); ICH_LOCK(sc); /* Reinit audio device */ - if (ich_init(sc) == -1) { + err = ich_init(sc); + if (err != 0) { device_printf(dev, "unable to reinitialize the card\n"); ICH_UNLOCK(sc); - return (ENXIO); + return (err); } /* Reinit mixer */ ich_pci_codec_reset(sc); From owner-svn-src-all@freebsd.org Thu Sep 3 13:56:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 635B13E7317; Thu, 3 Sep 2020 13:56:48 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj2RN1xyQz4Sxr; Thu, 3 Sep 2020 13:56:48 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 243E51C8C9; Thu, 3 Sep 2020 13:56:48 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083DumhT035910; Thu, 3 Sep 2020 13:56:48 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083DulXf035909; Thu, 3 Sep 2020 13:56:47 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009031356.083DulXf035909@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 3 Sep 2020 13:56:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365299 - stable/12/sys/dev/asmc X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/dev/asmc X-SVN-Commit-Revision: 365299 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 13:56:48 -0000 Author: markj Date: Thu Sep 3 13:56:47 2020 New Revision: 365299 URL: https://svnweb.freebsd.org/changeset/base/365299 Log: MFC r364871: asmc(4): Handle errors from asmc_key_read() properly. PR: 248939 Modified: stable/12/sys/dev/asmc/asmc.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/asmc/asmc.c ============================================================================== --- stable/12/sys/dev/asmc/asmc.c Thu Sep 3 13:56:30 2020 (r365298) +++ stable/12/sys/dev/asmc/asmc.c Thu Sep 3 13:56:47 2020 (r365299) @@ -1062,7 +1062,7 @@ asmc_fan_count(device_t dev) { uint8_t buf[1]; - if (asmc_key_read(dev, ASMC_KEY_FANCOUNT, buf, sizeof buf) < 0) + if (asmc_key_read(dev, ASMC_KEY_FANCOUNT, buf, sizeof buf) != 0) return (-1); return (buf[0]); @@ -1076,7 +1076,7 @@ asmc_fan_getvalue(device_t dev, const char *key, int f char fankey[5]; snprintf(fankey, sizeof(fankey), key, fan); - if (asmc_key_read(dev, fankey, buf, sizeof buf) < 0) + if (asmc_key_read(dev, fankey, buf, sizeof buf) != 0) return (-1); speed = (buf[0] << 6) | (buf[1] >> 2); @@ -1090,7 +1090,7 @@ asmc_fan_getstring(device_t dev, const char *key, int char* desc; snprintf(fankey, sizeof(fankey), key, fan); - if (asmc_key_read(dev, fankey, buf, buflen) < 0) + if (asmc_key_read(dev, fankey, buf, buflen) != 0) return (NULL); desc = buf+4; @@ -1229,7 +1229,7 @@ asmc_temp_getvalue(device_t dev, const char *key) /* * Check for invalid temperatures. */ - if (asmc_key_read(dev, key, buf, sizeof buf) < 0) + if (asmc_key_read(dev, key, buf, sizeof buf) != 0) return (-1); return (buf[0]); From owner-svn-src-all@freebsd.org Thu Sep 3 13:57:06 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B107D3E6DE3; Thu, 3 Sep 2020 13:57:06 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj2Rk4H8Yz4TQC; Thu, 3 Sep 2020 13:57:06 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 766971C57D; Thu, 3 Sep 2020 13:57:06 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083Dv6IP035986; Thu, 3 Sep 2020 13:57:06 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083Dv633035985; Thu, 3 Sep 2020 13:57:06 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009031357.083Dv633035985@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 3 Sep 2020 13:57:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365300 - stable/12/sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/kern X-SVN-Commit-Revision: 365300 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 13:57:06 -0000 Author: markj Date: Thu Sep 3 13:57:05 2020 New Revision: 365300 URL: https://svnweb.freebsd.org/changeset/base/365300 Log: MFC r364876: Fix writing of the final block of encrypted, compressed kernel dumps. Modified: stable/12/sys/kern/kern_shutdown.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/kern_shutdown.c ============================================================================== --- stable/12/sys/kern/kern_shutdown.c Thu Sep 3 13:56:47 2020 (r365299) +++ stable/12/sys/kern/kern_shutdown.c Thu Sep 3 13:57:05 2020 (r365300) @@ -1302,6 +1302,7 @@ kerneldumpcomp_write_cb(void *base, size_t length, off } resid = length - rlength; memmove(di->blockbuf, (uint8_t *)base + rlength, resid); + bzero((uint8_t *)di->blockbuf + resid, di->blocksize - resid); di->kdcomp->kdc_resid = resid; return (EAGAIN); } @@ -1518,9 +1519,10 @@ dump_finish(struct dumperinfo *di, struct kerneldumphe error = compressor_flush(di->kdcomp->kdc_stream); if (error == EAGAIN) { /* We have residual data in di->blockbuf. */ - error = dump_write(di, di->blockbuf, 0, di->dumpoff, - di->blocksize); - di->dumpoff += di->kdcomp->kdc_resid; + error = _dump_append(di, di->blockbuf, 0, di->blocksize); + if (error == 0) + /* Compensate for _dump_append()'s adjustment. */ + di->dumpoff -= di->blocksize - di->kdcomp->kdc_resid; di->kdcomp->kdc_resid = 0; } if (error != 0) From owner-svn-src-all@freebsd.org Thu Sep 3 13:57:21 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9521B3E706C; Thu, 3 Sep 2020 13:57:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj2S13TgPz4TQp; Thu, 3 Sep 2020 13:57:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5BC921C57E; Thu, 3 Sep 2020 13:57:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083DvL5I036045; Thu, 3 Sep 2020 13:57:21 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083DvL7F036044; Thu, 3 Sep 2020 13:57:21 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009031357.083DvL7F036044@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 3 Sep 2020 13:57:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365301 - stable/12/sys/dev/fdc X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/dev/fdc X-SVN-Commit-Revision: 365301 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 13:57:21 -0000 Author: markj Date: Thu Sep 3 13:57:20 2020 New Revision: 365301 URL: https://svnweb.freebsd.org/changeset/base/365301 Log: MFC r364872: fdc(4): Handle errors from fdc_in() properly. PR: 248940 Modified: stable/12/sys/dev/fdc/fdc.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/fdc/fdc.c ============================================================================== --- stable/12/sys/dev/fdc/fdc.c Thu Sep 3 13:57:05 2020 (r365300) +++ stable/12/sys/dev/fdc/fdc.c Thu Sep 3 13:57:20 2020 (r365301) @@ -491,7 +491,7 @@ fdc_cmd(struct fdc_data *fdc, int n_out, ...) n_in = va_arg(ap, int); for (n = 0; n < n_in; n++) { int *ptr = va_arg(ap, int *); - if (fdc_in(fdc, ptr) < 0) { + if (fdc_in(fdc, ptr) != 0) { char msg[50]; snprintf(msg, sizeof(msg), "cmd %02x failed at in byte %d of %d\n", @@ -586,7 +586,7 @@ fdc_sense_int(struct fdc_data *fdc, int *st0p, int *cy return (FD_NOT_VALID); } - if (fdc_in(fdc, &cyl) < 0) + if (fdc_in(fdc, &cyl) != 0) return fdc_err(fdc, "can't get cyl num\n"); if (cylp) From owner-svn-src-all@freebsd.org Thu Sep 3 14:50:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 393F43C0824; Thu, 3 Sep 2020 14:50:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj3d40prkz4Xc9; Thu, 3 Sep 2020 14:50:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F35AD1D510; Thu, 3 Sep 2020 14:50:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083EoFFY071557; Thu, 3 Sep 2020 14:50:15 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083EoFFV071556; Thu, 3 Sep 2020 14:50:15 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009031450.083EoFFV071556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 3 Sep 2020 14:50:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365302 - head/lib/libc/tests/resolv X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/lib/libc/tests/resolv X-SVN-Commit-Revision: 365302 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 14:50:16 -0000 Author: jhb Date: Thu Sep 3 14:50:15 2020 New Revision: 365302 URL: https://svnweb.freebsd.org/changeset/base/365302 Log: Various fixes to the load() function. - Use getline() instead of fgetln(). This ensures the returned string is always null-terminated without losing the last character if the last line in a file doesn't have a newline. Also, while fgetln says the returned buffer can be modified, that doesn't actually seem safe as the current implementation means you are modifying stdio's internal buffer. - Remove a spurious if before an ATF_REQUIRE that was clearly supposed to be non-optional. - Remove a pointless compare of 'ptr' against '\0' (really NULL) that duplicated the middle condition in the for(). - Once a comment is found, skip the rest of the line, not just the current word. Reviewed by: kevans Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26278 Modified: head/lib/libc/tests/resolv/resolv_test.c Modified: head/lib/libc/tests/resolv/resolv_test.c ============================================================================== --- head/lib/libc/tests/resolv/resolv_test.c Thu Sep 3 13:57:20 2020 (r365301) +++ head/lib/libc/tests/resolv/resolv_test.c Thu Sep 3 14:50:15 2020 (r365302) @@ -70,22 +70,23 @@ static void load(const char *fname) { FILE *fp; - size_t len; + size_t linecap; char *line; - if ((fp = fopen(fname, "r")) == NULL) + fp = fopen(fname, "r"); ATF_REQUIRE(fp != NULL); - while ((line = fgetln(fp, &len)) != NULL) { - char c = line[len - 1]; + line = NULL; + linecap = 0; + while (getline(&line, &linecap, fp) >= 0) { char *ptr; - line[len - 1] = '\0'; + for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) { - if (ptr == '\0' || ptr[0] == '#') - continue; + if (ptr[0] == '#') + break; sl_add(hosts, strdup(ptr)); } - line[len - 1] = c; } + free(line); (void)fclose(fp); } From owner-svn-src-all@freebsd.org Thu Sep 3 17:07:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4F4D33C48F9; Thu, 3 Sep 2020 17:07:59 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj6gz0blNz3V20; Thu, 3 Sep 2020 17:07:59 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC45C1EBF6; Thu, 3 Sep 2020 17:07:58 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083H7wYc057589; Thu, 3 Sep 2020 17:07:58 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083H7wlF057588; Thu, 3 Sep 2020 17:07:58 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202009031707.083H7wlF057588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Thu, 3 Sep 2020 17:07:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365304 - head/sys/arm64/include X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: head/sys/arm64/include X-SVN-Commit-Revision: 365304 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 17:07:59 -0000 Author: mhorne Date: Thu Sep 3 17:07:58 2020 New Revision: 365304 URL: https://svnweb.freebsd.org/changeset/base/365304 Log: arm64: update the set of HWCAP definitions This is in sync with what is defined for Linux 5.8. Note that all bits in HWCAP are exhausted, and HWCAP2 has been added. This also revealed an error in some of the existing definitions. We are missing HWCAP_ASIMDHP, and as a result a portion of the HWCAP values are shifted right by one bit. This will be fixed in an upcoming change, but the values being added now are compatible with what Linux defines. Reviewed by: emaste, markj, manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26030 Modified: head/sys/arm64/include/elf.h Modified: head/sys/arm64/include/elf.h ============================================================================== --- head/sys/arm64/include/elf.h Thu Sep 3 15:57:37 2020 (r365303) +++ head/sys/arm64/include/elf.h Thu Sep 3 17:07:58 2020 (r365304) @@ -92,33 +92,58 @@ __ElfType(Auxinfo); #endif /* HWCAP */ +#define HWCAP_FP 0x00000001 +#define HWCAP_ASIMD 0x00000002 +#define HWCAP_EVTSTRM 0x00000004 +#define HWCAP_AES 0x00000008 +#define HWCAP_PMULL 0x00000010 +#define HWCAP_SHA1 0x00000020 +#define HWCAP_SHA2 0x00000040 +#define HWCAP_CRC32 0x00000080 +#define HWCAP_ATOMICS 0x00000100 +#define HWCAP_FPHP 0x00000200 +/* XXX: The following bits don't match the Linux definitions */ +#define HWCAP_CPUID 0x00000400 +#define HWCAP_ASIMDRDM 0x00000800 +#define HWCAP_JSCVT 0x00001000 +#define HWCAP_FCMA 0x00002000 +#define HWCAP_LRCPC 0x00004000 +#define HWCAP_DCPOP 0x00008000 +#define HWCAP_SHA3 0x00010000 +#define HWCAP_SM3 0x00020000 +#define HWCAP_SM4 0x00040000 +#define HWCAP_ASIMDDP 0x00080000 +#define HWCAP_SHA512 0x00100000 +#define HWCAP_SVE 0x00200000 +#define HWCAP_ASIMDFHM 0x00400000 +#define HWCAP_DIT 0x00800000 +#define HWCAP_USCAT 0x01000000 +#define HWCAP_ILRCPC 0x02000000 +#define HWCAP_FLAGM 0x04000000 +/* XXX: end of incorrect definitions */ +#define HWCAP_SSBS 0x10000000 +#define HWCAP_SB 0x20000000 +#define HWCAP_PACA 0x40000000 +#define HWCAP_PACG 0x80000000 -#define HWCAP_FP 0x00000001 -#define HWCAP_ASIMD 0x00000002 -#define HWCAP_EVTSTRM 0x00000004 -#define HWCAP_AES 0x00000008 -#define HWCAP_PMULL 0x00000010 -#define HWCAP_SHA1 0x00000020 -#define HWCAP_SHA2 0x00000040 -#define HWCAP_CRC32 0x00000080 -#define HWCAP_ATOMICS 0x00000100 -#define HWCAP_FPHP 0x00000200 -#define HWCAP_CPUID 0x00000400 -#define HWCAP_ASIMDRDM 0x00000800 -#define HWCAP_JSCVT 0x00001000 -#define HWCAP_FCMA 0x00002000 -#define HWCAP_LRCPC 0x00004000 -#define HWCAP_DCPOP 0x00008000 -#define HWCAP_SHA3 0x00010000 -#define HWCAP_SM3 0x00020000 -#define HWCAP_SM4 0x00040000 -#define HWCAP_ASIMDDP 0x00080000 -#define HWCAP_SHA512 0x00100000 -#define HWCAP_SVE 0x00200000 -#define HWCAP_ASIMDFHM 0x00400000 -#define HWCAP_DIT 0x00800000 -#define HWCAP_USCAT 0x01000000 -#define HWCAP_ILRCPC 0x02000000 -#define HWCAP_FLAGM 0x04000000 +/* HWCAP2 */ +#define HWCAP2_DCPODP 0x00000001 +#define HWCAP2_SVE2 0x00000002 +#define HWCAP2_SVEAES 0x00000004 +#define HWCAP2_SVEPMULL 0x00000008 +#define HWCAP2_SVEBITPERM 0x00000010 +#define HWCAP2_SVESHA3 0x00000020 +#define HWCAP2_SVESM4 0x00000040 +#define HWCAP2_FLAGM2 0x00000080 +#define HWCAP2_FRINT 0x00000100 +#define HWCAP2_SVEI8MM 0x00000200 +#define HWCAP2_SVEF32MM 0x00000400 +#define HWCAP2_SVEF64MM 0x00000800 +#define HWCAP2_SVEBF16 0x00001000 +#define HWCAP2_I8MM 0x00002000 +#define HWCAP2_BF16 0x00004000 +#define HWCAP2_DGH 0x00008000 +#define HWCAP2_RNG 0x00010000 +#define HWCAP2_BTI 0x00020000 #endif /* !_MACHINE_ELF_H_ */ From owner-svn-src-all@freebsd.org Thu Sep 3 17:49:55 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F4293C51F1; Thu, 3 Sep 2020 17:49:55 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj7cL6h2rz3WW8; Thu, 3 Sep 2020 17:49:54 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id C2AF210738; Thu, 3 Sep 2020 17:49:54 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f54.google.com with SMTP id ef16so1722872qvb.8; Thu, 03 Sep 2020 10:49:54 -0700 (PDT) X-Gm-Message-State: AOAM530ypaVJYqOj451xmvpMewvkefYbWc8+rM11kcbLCE8IEE6DaMH1 LiD7FQlXpvJsEQ/fbOO7y2tJeqwwkUkmQQSkjug= X-Google-Smtp-Source: ABdhPJzNrXhW8URiX/Advwoh3HPi+nnEzBu8kn68tcjJQCb7K9ES70atSeeC4TvPUHGe1l7QifoOX0yqj0MWOnTlNXw= X-Received: by 2002:a05:6214:1928:: with SMTP id es8mr3921343qvb.197.1599155394264; Thu, 03 Sep 2020 10:49:54 -0700 (PDT) MIME-Version: 1.0 References: <202004170605.03H658mu067039@repo.freebsd.org> In-Reply-To: <202004170605.03H658mu067039@repo.freebsd.org> From: Kyle Evans Date: Thu, 3 Sep 2020 12:49:41 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r360037 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs To: Gleb Smirnoff Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 17:49:55 -0000 On Fri, Apr 17, 2020 at 1:05 AM Gleb Smirnoff wrote: > > Author: glebius > Date: Fri Apr 17 06:05:08 2020 > New Revision: 360037 > URL: https://svnweb.freebsd.org/changeset/base/360037 > > Log: > Make ZFS depend on xdr.ko only. It doesn't need kernel RPC. > > Differential Revision: https://reviews.freebsd.org/D24408 > Would you object to me MFC'ing this series to stable/12? It's pretty useful for building a good MINIMAL config with zfs support, and would probably allow us to drop a __FreeBSD_version split of dependencies in the short-to-mid term from OpenZFS if we don't need to pretend that OpenZFS will build on 11. None of it looked too invasive for stable from a cursory glance. Thanks, Kyle Evans From owner-svn-src-all@freebsd.org Thu Sep 3 18:16:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F41713C6470; Thu, 3 Sep 2020 18:16:32 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from hz.grosbein.net (hz.grosbein.net [IPv6:2a01:4f8:c2c:26d8::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj8C36vjYz3YDh; Thu, 3 Sep 2020 18:16:30 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [IPv6:2a03:3100:c:13:0:0:0:5]) by hz.grosbein.net (8.15.2/8.15.2) with ESMTPS id 083IG8wK030393 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 3 Sep 2020 18:16:11 GMT (envelope-from eugen@grosbein.net) X-Envelope-From: eugen@grosbein.net X-Envelope-To: jhb@FreeBSD.org Received: from [10.58.0.10] (dadvw [10.58.0.10]) by eg.sd.rdtc.ru (8.16.1/8.16.1) with ESMTPS id 083IGBnt008373 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 4 Sep 2020 01:16:12 +0700 (+07) (envelope-from eugen@grosbein.net) Subject: Re: svn commit: r365281 - in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp To: John Baldwin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org References: <202009022136.082LatjO029946@repo.freebsd.org> From: Eugene Grosbein Message-ID: Date: Fri, 4 Sep 2020 01:16:02 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_00,LOCAL_FROM, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 X-Spam-Report: * -2.3 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record * -0.0 SPF_PASS SPF: sender matches SPF record * 2.6 LOCAL_FROM From my domains * -0.3 NICE_REPLY_A Looks like a legit reply (A) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: 4Bj8C36vjYz3YDh X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=permerror (mx1.freebsd.org: domain of eugen@grosbein.net uses mechanism not recognized by this client) smtp.mailfrom=eugen@grosbein.net X-Spamd-Result: default: False [-1.74 / 15.00]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[eugen]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.87)[-0.868]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[grosbein.net]; NEURAL_HAM_MEDIUM(-0.91)[-0.911]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_SPAM_SHORT(0.14)[0.138]; R_SPF_PERMFAIL(0.00)[empty SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-stable-12,svn-src-stable,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 18:16:33 -0000 03.09.2020 4:47, John Baldwin wrote: > On 9/2/20 2:36 PM, John Baldwin wrote: >> Author: jhb >> Date: Wed Sep 2 21:36:55 2020 >> New Revision: 365281 >> URL: https://svnweb.freebsd.org/changeset/base/365281 >> >> Log: >> MFC 361638,361712: Only build ipsec modules for kernels with IPSEC_SUPPORT. >> >> 361638: >> Only build ipsec modules if the kernel includes IPSEC_SUPPORT. >> >> Honoring the kernel-supplied opt_ipsec.h in r361632 causes builds of >> ipsec modules to fail if the kernel doesn't include IPSEC_SUPPORT. >> However, the module can never be loaded into such a kernel, so only >> build the modules if the kernel includes IPSEC_SUPPORT. >> >> 361712: (kevans) >> modules: don't build ipsec/tcpmd5 if the kernel is configured for IPSEC >> >> IPSEC_SUPPORT can currently only cope with either IPSEC || IPSEC_SUPPORT, >> not both. Refrain from building if IPSEC is set, as the resulting module >> won't be able to load anyways if it's built into the kernel. >> >> KERN_OPTS is safe here; for tied modules, it will reflect the kernel >> configuration. For untied modules, it will defer to whatever is set in >> ^/sys/conf/config.mk, which doesn't set IPSEC for modules. The latter >> situation has some risk to it for uncommon scenarios, but such is the life >> of untied kernel modules. > > This should fix the build breakage from r365270 (sorry). buildworld is still broken for me at stable/11 amd64 r365304. Specifically, I build stable/11 for my PPPoE servers that use no IPSec as module nor have it in the kernel in any way. /etc/make.conf contains: MODULES_WITH_WORLD= KERNCONF?= PPPOE WITHOUT_LLVM_TARGET_ALL= WITH_LLVM_TARGET_X86= WITHOUT_CLANG_FULL= WITHOUT_LLDB= WITHOUT_KERNEL_SYMBOLS= WITHOUT_DEBUG_FILES= WITHOUT_TESTS= WITHOUT_INET6= It fails early: ... -------------------------------------------------------------- >>> stage 2.2: rebuilding the object tree -------------------------------------------------------------- ... ===> sys/modules/sysvipc/sysvmsg (obj) --- obj_subdir_sys/modules/tcp --- make[6]: "/home/src/sys/modules/tcp/Makefile" line 18: Malformed conditional (${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC}) make[6]: Fatal errors encountered -- cannot continue Rollback for both of r365270 and r365281 fixes this. From owner-svn-src-all@freebsd.org Thu Sep 3 18:21:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AAA483C6478; Thu, 3 Sep 2020 18:21:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj8KM47ZVz3Yv4; Thu, 3 Sep 2020 18:21:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 714511F7EA; Thu, 3 Sep 2020 18:21:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083ILxxF003905; Thu, 3 Sep 2020 18:21:59 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083ILxUm003903; Thu, 3 Sep 2020 18:21:59 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202009031821.083ILxUm003903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 3 Sep 2020 18:21:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365305 - in head: . tools/build/mk X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head: . tools/build/mk X-SVN-Commit-Revision: 365305 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 18:21:59 -0000 Author: dim Date: Thu Sep 3 18:21:58 2020 New Revision: 365305 URL: https://svnweb.freebsd.org/changeset/base/365305 Log: Ensure zpool-features(5) doesn't get removed by make delete-old. Apparently, somewhere in 2012 ZFS-on-FreeBSD moved it from section 5 to 7, but ZFS-on-Linux never did. Modified: head/ObsoleteFiles.inc head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Thu Sep 3 17:07:58 2020 (r365304) +++ head/ObsoleteFiles.inc Thu Sep 3 18:21:58 2020 (r365305) @@ -7605,8 +7605,6 @@ OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a # 20121230: remove wrongly created directories for auditdistd OLD_DIRS+=var/dist OLD_DIRS+=var/remote -# 20121114: zpool-features manual page moved from section 5 to 7 -OLD_FILES+=usr/share/man/man5/zpool-features.5.gz # 20121022: remove harp, hfa and idt man page OLD_FILES+=usr/share/man/man4/harp.4.gz OLD_FILES+=usr/share/man/man4/hfa.4.gz Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Thu Sep 3 17:07:58 2020 (r365304) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Thu Sep 3 18:21:58 2020 (r365305) @@ -1173,7 +1173,7 @@ OLD_FILES+=usr/sbin/zfsd OLD_FILES+=usr/sbin/zhack OLD_FILES+=usr/sbin/zdb OLD_FILES+=usr/share/man/man3/libbe.3.gz -OLD_FILES+=usr/share/man/man7/zpool-features.7.gz +OLD_FILES+=usr/share/man/man5/zpool-features.5.gz OLD_FILES+=usr/share/man/man8/bectl.8.gz OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz OLD_FILES+=usr/share/man/man8/zdb.8.gz From owner-svn-src-all@freebsd.org Thu Sep 3 18:27:14 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D6853C69F9; Thu, 3 Sep 2020 18:27:14 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj8RQ0RFXz3Z28; Thu, 3 Sep 2020 18:27:14 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E66671F7F2; Thu, 3 Sep 2020 18:27:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083IRDMv006503; Thu, 3 Sep 2020 18:27:13 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083IRDhR006502; Thu, 3 Sep 2020 18:27:13 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202009031827.083IRDhR006502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 3 Sep 2020 18:27:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365306 - head/lib/clang/libllvm X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: head/lib/clang/libllvm X-SVN-Commit-Revision: 365306 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 18:27:14 -0000 Author: dim Date: Thu Sep 3 18:27:13 2020 New Revision: 365306 URL: https://svnweb.freebsd.org/changeset/base/365306 Log: Add a few more files to libllvm, which are required when doing sanitized builds, for example with -fsanitize=undefined. MFC after: 6 weeks X-MFC-With: r364284 Modified: head/lib/clang/libllvm/Makefile Modified: head/lib/clang/libllvm/Makefile ============================================================================== --- head/lib/clang/libllvm/Makefile Thu Sep 3 18:21:58 2020 (r365305) +++ head/lib/clang/libllvm/Makefile Thu Sep 3 18:27:13 2020 (r365306) @@ -850,11 +850,14 @@ SRCS_MIN+= ProfileData/ProfileSummaryBuilder.cpp SRCS_MIN+= ProfileData/SampleProf.cpp SRCS_MIN+= ProfileData/SampleProfReader.cpp SRCS_MIN+= ProfileData/SampleProfWriter.cpp +SRCS_MIN+= Remarks/BitstreamRemarkParser.cpp SRCS_MIN+= Remarks/BitstreamRemarkSerializer.cpp SRCS_MIN+= Remarks/RemarkFormat.cpp +SRCS_MIN+= Remarks/RemarkParser.cpp SRCS_MIN+= Remarks/RemarkSerializer.cpp SRCS_MIN+= Remarks/RemarkStreamer.cpp SRCS_MIN+= Remarks/RemarkStringTable.cpp +SRCS_MIN+= Remarks/YAMLRemarkParser.cpp SRCS_MIN+= Remarks/YAMLRemarkSerializer.cpp SRCS_MIN+= Support/AArch64TargetParser.cpp SRCS_MIN+= Support/ABIBreak.cpp From owner-svn-src-all@freebsd.org Thu Sep 3 18:34:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5C6223C7010; Thu, 3 Sep 2020 18:34:02 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj8bG1q23z3ZbK; Thu, 3 Sep 2020 18:34:02 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21AE51FE62; Thu, 3 Sep 2020 18:34:02 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083IY2hf012445; Thu, 3 Sep 2020 18:34:02 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083IY2uG012444; Thu, 3 Sep 2020 18:34:02 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202009031834.083IY2uG012444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 3 Sep 2020 18:34:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365307 - head/contrib/llvm-project/llvm/include/llvm/ADT X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: head/contrib/llvm-project/llvm/include/llvm/ADT X-SVN-Commit-Revision: 365307 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 18:34:02 -0000 Author: dim Date: Thu Sep 3 18:34:01 2020 New Revision: 365307 URL: https://svnweb.freebsd.org/changeset/base/365307 Log: Merge commit f26fc568402f from llvm git (by me): Eliminate the sizing template parameter N from CoalescingBitVector Since the parameter is not used anywhere, and the default size of 16 apparently causes PR47359, remove it. This ensures that IntervalMap will automatically determine the optimal size, using its NodeSizer struct. Reviewed By: dblaikie Differential Revision: https://reviews.llvm.org/D87044 This should fix 'Assertion failed: (Elements + Grow <= Nodes * Capacity && "Not enough room for elements"), function distribute, file /usr/src/contrib/llvm-project/llvm/lib/Support/IntervalMap.cpp, line 123.' when building the x11-toolkits/py-wxPython40 port on a i386 host. Reported by: zeising MFC after: 6 weeks X-MFC-With: r364284 Modified: head/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h Modified: head/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h ============================================================================== --- head/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h Thu Sep 3 18:27:13 2020 (r365306) +++ head/contrib/llvm-project/llvm/include/llvm/ADT/CoalescingBitVector.h Thu Sep 3 18:34:01 2020 (r365307) @@ -34,15 +34,14 @@ namespace llvm { /// performance for non-sequential find() operations. /// /// \tparam IndexT - The type of the index into the bitvector. -/// \tparam N - The first N coalesced intervals of set bits are stored in-place. -template class CoalescingBitVector { +template class CoalescingBitVector { static_assert(std::is_unsigned::value, "Index must be an unsigned integer."); - using ThisT = CoalescingBitVector; + using ThisT = CoalescingBitVector; /// An interval map for closed integer ranges. The mapped values are unused. - using MapT = IntervalMap; + using MapT = IntervalMap; using UnderlyingIterator = typename MapT::const_iterator; From owner-svn-src-all@freebsd.org Thu Sep 3 18:39:04 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 498F23C7164; Thu, 3 Sep 2020 18:39:04 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj8j36r3tz3ZgC; Thu, 3 Sep 2020 18:39:03 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f173.google.com with SMTP id q6so3822810ild.12; Thu, 03 Sep 2020 11:39:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=w35OQhD66iuwJp1pOVMe2zY+g/Rg6JucfuMafVAcnX8=; b=XvfFjKdT0rPt0REGopzSd0EHlDa6jcSP3+29jhbJsyyCwzbEiuEusS6WUQ/LYrn7oJ 61X3lUZqr2GCgrahwB0DHi7cUgFuMqypdQS3Bpv1R7dwPq3i14hSsLYPl/CqCVcvZ0Gp qpgfVHYaXbvukc94DAtxC6mePnYKsgu3dSAxo1ck1GVjwDKNewpF+C2o8An/I4BvpF1E 9RKG1IEj3CnB/yJaLUh2mLQyWc0jwOxxnI4x5W9xPiFRivFDNOG4iengSofpf14MHn4/ 7P3PGn/Q22bXvkVOzSoJkev/PcBf0tOc/yHP0n0v30SV/lntaOmgfugbekkXsHFYcrM7 3RTQ== X-Gm-Message-State: AOAM532xtX6NqPNhXhZ9HbdRcDWehvDATgmYWwhsGi5dts6WHY9Hxj19 TqvTrHBpYoM+VfvwxQ8VF2jCHZoPUxQe9gjJIdW0yJDs X-Google-Smtp-Source: ABdhPJxHwZ4VJ0A96NyP6pWU2G1VpU3hjhVY6vcR8mSePFqgOTOgvPV+KxyzhfxYfBPgIXdqWscc9zZUP1LuH9KIMHo= X-Received: by 2002:a92:4f:: with SMTP id 76mr4303367ila.11.1599158341952; Thu, 03 Sep 2020 11:39:01 -0700 (PDT) MIME-Version: 1.0 References: <202009031821.083ILxUm003903@repo.freebsd.org> In-Reply-To: <202009031821.083ILxUm003903@repo.freebsd.org> From: Ed Maste Date: Thu, 3 Sep 2020 14:38:50 -0400 Message-ID: Subject: Re: svn commit: r365305 - in head: . tools/build/mk To: Dimitry Andric Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Bj8j36r3tz3ZgC X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 18:39:04 -0000 On Thu, 3 Sep 2020 at 14:22, Dimitry Andric wrote: > > Author: dim > Date: Thu Sep 3 18:21:58 2020 > New Revision: 365305 > URL: https://svnweb.freebsd.org/changeset/base/365305 > > Log: > Ensure zpool-features(5) doesn't get removed by make delete-old. > > Apparently, somewhere in 2012 ZFS-on-FreeBSD moved it from section 5 to > 7, but ZFS-on-Linux never did. Certainly it's silly for us to install zpool-features.5 and then remove it again and this change is sensible in the immediate term, although it looks like this should actually be in section 7. From owner-svn-src-all@freebsd.org Thu Sep 3 18:40:12 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 215283C71F4; Thu, 3 Sep 2020 18:40:12 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from hz.grosbein.net (hz.grosbein.net [IPv6:2a01:4f8:c2c:26d8::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bj8kM3ckKz3ZwS; Thu, 3 Sep 2020 18:40:11 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from eg.sd.rdtc.ru (eg.sd.rdtc.ru [IPv6:2a03:3100:c:13:0:0:0:5]) by hz.grosbein.net (8.15.2/8.15.2) with ESMTPS id 083IdvoH030819 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 3 Sep 2020 18:39:58 GMT (envelope-from eugen@grosbein.net) X-Envelope-From: eugen@grosbein.net X-Envelope-To: jhb@FreeBSD.org Received: from [10.58.0.10] (dadvw [10.58.0.10]) by eg.sd.rdtc.ru (8.16.1/8.16.1) with ESMTPS id 083Ie3wI008705 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 4 Sep 2020 01:40:04 +0700 (+07) (envelope-from eugen@grosbein.net) Subject: Re: svn commit: r365281 - in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp To: John Baldwin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org References: <202009022136.082LatjO029946@repo.freebsd.org> From: Eugene Grosbein Message-ID: <7795ab88-6220-150b-38e9-0ffae40a6093@grosbein.net> Date: Fri, 4 Sep 2020 01:39:53 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_00,LOCAL_FROM, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 X-Spam-Report: * -2.3 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record * -0.0 SPF_PASS SPF: sender matches SPF record * 2.6 LOCAL_FROM From my domains * -0.3 NICE_REPLY_A Looks like a legit reply (A) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on hz.grosbein.net X-Rspamd-Queue-Id: 4Bj8kM3ckKz3ZwS X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=permerror (mx1.freebsd.org: domain of eugen@grosbein.net uses mechanism not recognized by this client) smtp.mailfrom=eugen@grosbein.net X-Spamd-Result: default: False [-1.49 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.87)[-0.873]; FREEFALL_USER(0.00)[eugen]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[grosbein.net]; NEURAL_HAM_LONG(-0.88)[-0.881]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_SPAM_SHORT(0.37)[0.367]; R_SPF_PERMFAIL(0.00)[empty SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-stable-12,svn-src-stable,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 18:40:12 -0000 04.09.2020 1:16, Eugene Grosbein wrote: >> This should fix the build breakage from r365270 (sorry). > > buildworld is still broken for me at stable/11 amd64 r365304. > Specifically, I build stable/11 for my PPPoE servers that use no IPSec as module nor have it in the kernel in any way. > > /etc/make.conf contains: > > MODULES_WITH_WORLD= > KERNCONF?= PPPOE > WITHOUT_LLVM_TARGET_ALL= > WITH_LLVM_TARGET_X86= > WITHOUT_CLANG_FULL= > WITHOUT_LLDB= > WITHOUT_KERNEL_SYMBOLS= > WITHOUT_DEBUG_FILES= > WITHOUT_TESTS= > WITHOUT_INET6= > > It fails early: > > ... > -------------------------------------------------------------- >>>> stage 2.2: rebuilding the object tree > -------------------------------------------------------------- > ... > ===> sys/modules/sysvipc/sysvmsg (obj) > --- obj_subdir_sys/modules/tcp --- > make[6]: "/home/src/sys/modules/tcp/Makefile" line 18: Malformed conditional (${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC}) > make[6]: Fatal errors encountered -- cannot continue > > > Rollback for both of r365270 and r365281 fixes this. Oops, I was too quick. Rollback of these allows it running OK until >>> stage 4.3: building everything but then it fails there: ===> sys/modules/if_enc (all) Building /usr/local/obj/home/src/sys/modules/if_enc/if_enc.o --- if_enc.o --- /home/src/sys/net/if_enc.c:33:10: fatal error: 'opt_ipsec.h' file not found #include "opt_ipsec.h" ^~~~~~~~~~~~~ Additional rollback of r365277 gave me successfull buildworld. From owner-svn-src-all@freebsd.org Thu Sep 3 19:13:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D1FE3C84D3 for ; Thu, 3 Sep 2020 19:13:43 +0000 (UTC) (envelope-from Nolan.Hamon@live.fr) Received: from mail.info (tempo33.imicro.online [51.77.97.217]) by mx1.freebsd.org (Postfix) with ESMTP id 4Bj9T25Gwvz3dGq for ; Thu, 3 Sep 2020 19:13:42 +0000 (UTC) (envelope-from Nolan.Hamon@live.fr) Message-Id: Mime-Version: 1.0 From: Nolan.Hamon To: svn-src-all svn-src-allaabbfreebsd.org Subject: =?utf-8?Q?1_Commande_pass=C3=A9e_=_1_arbre_plant=C3=A9?= Date: Thu, 3 Sep 2020 21:13:35 +0200 X-Mailer: 161056750005_13 X-Rspamd-Queue-Id: 4Bj9T25Gwvz3dGq X-Spamd-Bar: ++++++++++++++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=live.fr (policy=none); spf=softfail (mx1.freebsd.org: 51.77.97.217 is neither permitted nor denied by domain of Nolan.Hamon@live.fr) smtp.mailfrom=Nolan.Hamon@live.fr X-Spamd-Result: default: False [14.69 / 15.00]; FREEMAIL_FROM(0.00)[live.fr]; MV_CASE(0.50)[]; HFILTER_HELO_IP_A(1.00)[mail.info]; HFILTER_HELO_NORES_A_OR_MX(0.30)[mail.info]; R_SPF_SOFTFAIL(0.00)[~all]; TO_DN_ALL(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[live.fr]; ASN(0.00)[asn:16276, ipnet:51.77.0.0/16, country:FR]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; SUBJECT_HAS_QUESTION(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.002]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DBL_SPAM(6.50)[directannonce.work:url]; NEURAL_SPAM_MEDIUM(0.91)[0.909]; RCPT_COUNT_ONE(0.00)[1]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_SPAM_LONG(0.98)[0.981]; GREYLIST(0.00)[pass,meta]; MAILMAN_DEST(0.00)[svn-src-all]; DMARC_POLICY_SOFTFAIL(0.10)[live.fr : No valid SPF, No valid DKIM,none] X-Spam: Yes Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 19:13:43 -0000 Pour visualiser correctement ce message, acc=C3=A9dez =C3=A0 la version en = ligne Madame, Mademoiselle, Monsieur, Pour ne plus recevoir de courriels de notre part, veuillez utiliser ce lien= =2E From owner-svn-src-all@freebsd.org Thu Sep 3 20:30:53 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 25F343CA3B0; Thu, 3 Sep 2020 20:30:53 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjCB50Dk7z3yyL; Thu, 3 Sep 2020 20:30:53 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF791212B1; Thu, 3 Sep 2020 20:30:52 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083KUquq082991; Thu, 3 Sep 2020 20:30:52 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083KUqF0082990; Thu, 3 Sep 2020 20:30:52 GMT (envelope-from avg@FreeBSD.org) Message-Id: <202009032030.083KUqF0082990@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Thu, 3 Sep 2020 20:30:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365308 - head/sys/security/mac X-SVN-Group: head X-SVN-Commit-Author: avg X-SVN-Commit-Paths: head/sys/security/mac X-SVN-Commit-Revision: 365308 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 20:30:53 -0000 Author: avg Date: Thu Sep 3 20:30:52 2020 New Revision: 365308 URL: https://svnweb.freebsd.org/changeset/base/365308 Log: mac_framework.h: fix build with DEBUG_VFS_LOCKS and !MAC I have such a custom kernel configuration and its build failed with: linking kernel.full ld: error: undefined symbol: mac_vnode_assert_locked >>> referenced by mac_framework.h:556 (/usr/devel/git/apu2c4/sys/security/mac/mac_framework.h:556) >>> tmpfs_vnops.o:(mac_vnode_check_stat) >>> referenced by mac_framework.h:556 (/usr/devel/git/apu2c4/sys/security/mac/mac_framework.h:556) >>> vfs_default.o:(mac_vnode_check_stat) >>> referenced by mac_framework.h:556 (/usr/devel/git/apu2c4/sys/security/mac/mac_framework.h:556) >>> ufs_vnops.o:(mac_vnode_check_stat) Modified: head/sys/security/mac/mac_framework.h Modified: head/sys/security/mac/mac_framework.h ============================================================================== --- head/sys/security/mac/mac_framework.h Thu Sep 3 18:34:01 2020 (r365307) +++ head/sys/security/mac/mac_framework.h Thu Sep 3 20:30:52 2020 (r365308) @@ -400,7 +400,7 @@ void mac_sysvshm_init(struct shmid_kernel *); void mac_thread_userret(struct thread *td); -#ifdef DEBUG_VFS_LOCKS +#if defined(MAC) && defined(DEBUG_VFS_LOCKS) void mac_vnode_assert_locked(struct vnode *vp, const char *func); #else #define mac_vnode_assert_locked(vp, func) do { } while (0) From owner-svn-src-all@freebsd.org Thu Sep 3 20:42:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61BE03CA912; Thu, 3 Sep 2020 20:42:31 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjCRW1tzdz40lr; Thu, 3 Sep 2020 20:42:31 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 24A5E21906; Thu, 3 Sep 2020 20:42:31 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083KgV46094961; Thu, 3 Sep 2020 20:42:31 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083KgVL7094960; Thu, 3 Sep 2020 20:42:31 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202009032042.083KgVL7094960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 3 Sep 2020 20:42:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365309 - head/share/snmp/mibs X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/share/snmp/mibs X-SVN-Commit-Revision: 365309 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 20:42:31 -0000 Author: rmacklem Date: Thu Sep 3 20:42:30 2020 New Revision: 365309 URL: https://svnweb.freebsd.org/changeset/base/365309 Log: Add entries for the OID used for NFS-over-TLS "user@domain". The NFS-over-TLS server daemon (rpc.tlsservd) can optionally replace user credentials in the RPC header with ones derived from a username specified by the form "user@domain", if this exists in the client's X.509 v3 certificate. Specifically, "user@domain" needs to be in the "otherName" component of subjectjAltName, with a unique OID as assigned by this update. This patch adds a subtree for the "otherName" component of subjectAltName in X.509 v3 cerificates and a value for "user@domain" as used by NFS-over-TLS. Reviewed by: phk, gordon Differential Revision: https://reviews.freebsd.org/D26225 Modified: head/share/snmp/mibs/FREEBSD-MIB.txt Modified: head/share/snmp/mibs/FREEBSD-MIB.txt ============================================================================== --- head/share/snmp/mibs/FREEBSD-MIB.txt Thu Sep 3 20:30:52 2020 (r365308) +++ head/share/snmp/mibs/FREEBSD-MIB.txt Thu Sep 3 20:42:30 2020 (r365309) @@ -16,7 +16,7 @@ IMPORTS FROM SNMPv2-SMI; freeBSD MODULE-IDENTITY - LAST-UPDATED "200610311000Z" + LAST-UPDATED "202009032030Z" ORGANIZATION "The FreeBSD Project." CONTACT-INFO "phk@FreeBSD.org is contact person for this file. @@ -24,6 +24,9 @@ freeBSD MODULE-IDENTITY DESCRIPTION "The Structure of Management Information for the FreeBSD Project enterprise MIB subtree." + REVISION "202009031900Z" + DESCRIPTION + "Added entries for the otherName component of a X.509 cert" REVISION "200610310800Z" DESCRIPTION "Initial version of this MIB module." @@ -35,6 +38,21 @@ freeBSDsrc OBJECT-IDENTITY DESCRIPTION "Subtree for things which lives in the src tree." ::= { freeBSD 1 } + +freeBSDsrcCertOtherName OBJECT-IDENTITY + STATUS current + DESCRIPTION + "Subtree for X.509 Certificate otherName entries" + ::= { freeBSDsrc 1 } + +-- +-- For NFS over TLS, a user@domain can optionally be handled by rpc.tlsservd +-- +freeBSDsrcCertNFSuser OBJECT-IDENTITY + STATUS current + DESCRIPTION + "Entry for X.509 Certificate for NFS user@domain name" + ::= { freeBSDsrcCertOtherName 1 } freeBSDports OBJECT-IDENTITY STATUS current From owner-svn-src-all@freebsd.org Thu Sep 3 22:24:53 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 722D33CD01D; Thu, 3 Sep 2020 22:24:53 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjFjd2RN5z467k; Thu, 3 Sep 2020 22:24:53 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36BA322B73; Thu, 3 Sep 2020 22:24:53 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083MOrmh057043; Thu, 3 Sep 2020 22:24:53 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083MOr1W057042; Thu, 3 Sep 2020 22:24:53 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202009032224.083MOr1W057042@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Thu, 3 Sep 2020 22:24:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365315 - head/sys/net/route X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: head/sys/net/route X-SVN-Commit-Revision: 365315 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 22:24:53 -0000 Author: melifaro Date: Thu Sep 3 22:24:52 2020 New Revision: 365315 URL: https://svnweb.freebsd.org/changeset/base/365315 Log: Fix regression for IPv6 loopback routes. After nexthop introduction, loopback routes for the interface addresses were created without embedding actual interface index in the gateway. The latter is needed to pass the IPv6 scope during transmission via loopback.. Fix the regression by actually using passed gateway data with interface index. Differential Revision: https://reviews.freebsd.org/D26306 Modified: head/sys/net/route/nhop_ctl.c Modified: head/sys/net/route/nhop_ctl.c ============================================================================== --- head/sys/net/route/nhop_ctl.c Thu Sep 3 22:20:27 2020 (r365314) +++ head/sys/net/route/nhop_ctl.c Thu Sep 3 22:24:52 2020 (r365315) @@ -225,6 +225,7 @@ set_nhop_gw_from_info(struct nhop_object *nh, struct r } memcpy(&nh->gw_sa, gw, gw->sa_len); } else { + /* * Interface route. Currently the route.c code adds * sa of type AF_LINK, which is 56 bytes long. The only @@ -235,7 +236,21 @@ set_nhop_gw_from_info(struct nhop_object *nh, struct r * in the separate field (nh_aifp, see below), write AF_LINK * compatible sa with shorter total length. */ - fill_sdl_from_ifp(&nh->gwl_sa, nh->nh_ifp); + struct sockaddr_dl *sdl; + struct ifnet *ifp; + + /* Fetch and validate interface index */ + sdl = (struct sockaddr_dl *)gw; + if (sdl->sdl_family != AF_LINK) { + DPRINTF("unsupported AF: %d", sdl->sdl_family); + return (ENOTSUP); + } + ifp = ifnet_byindex(sdl->sdl_index); + if (ifp == NULL) { + DPRINTF("invalid ifindex %d", sdl->sdl_index); + return (EINVAL); + } + fill_sdl_from_ifp(&nh->gwl_sa, ifp); } return (0); @@ -272,12 +287,13 @@ fill_nhop_from_info(struct nhop_priv *nh_priv, struct nh->nh_flags = convert_rt_to_nh_flags(rt_flags); set_nhop_mtu_from_info(nh, info); + if ((error = set_nhop_gw_from_info(nh, info)) != 0) + return (error); + nh->nh_ifp = info->rti_ifa->ifa_ifp; nh->nh_ifa = info->rti_ifa; + /* depends on the gateway */ nh->nh_aifp = get_aifp(nh, 0); - - if ((error = set_nhop_gw_from_info(nh, info)) != 0) - return (error); /* * Note some of the remaining data is set by the From owner-svn-src-all@freebsd.org Thu Sep 3 22:40:52 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B92B3CD5C3; Thu, 3 Sep 2020 22:40:52 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjG441LWgz46qp; Thu, 3 Sep 2020 22:40:52 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1278122878; Thu, 3 Sep 2020 22:40:52 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083Mepnn063579; Thu, 3 Sep 2020 22:40:51 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083MepPL063578; Thu, 3 Sep 2020 22:40:51 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202009032240.083MepPL063578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Thu, 3 Sep 2020 22:40:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365316 - head/sys/rpc/rpcsec_tls X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: head/sys/rpc/rpcsec_tls X-SVN-Commit-Revision: 365316 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 22:40:52 -0000 Author: mhorne Date: Thu Sep 3 22:40:51 2020 New Revision: 365316 URL: https://svnweb.freebsd.org/changeset/base/365316 Log: Remove a duplicate declaration This is already declared in sys/file.h, which is included directly. Compiling with GCC9 emits an error. Discussed with: rmacklem Modified: head/sys/rpc/rpcsec_tls/rpctls_impl.c Modified: head/sys/rpc/rpcsec_tls/rpctls_impl.c ============================================================================== --- head/sys/rpc/rpcsec_tls/rpctls_impl.c Thu Sep 3 22:24:52 2020 (r365315) +++ head/sys/rpc/rpcsec_tls/rpctls_impl.c Thu Sep 3 22:40:51 2020 (r365316) @@ -62,8 +62,6 @@ __FBSDID("$FreeBSD$"); #include "rpctlscd.h" #include "rpctlssd.h" -extern struct fileops badfileops; - /* * Syscall hooks */ From owner-svn-src-all@freebsd.org Thu Sep 3 23:17:26 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E7333CE05C; Thu, 3 Sep 2020 23:17:26 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjGtG1sw9z48vW; Thu, 3 Sep 2020 23:17:26 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23B2D233D7; Thu, 3 Sep 2020 23:17:26 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 083NHQNE087580; Thu, 3 Sep 2020 23:17:26 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083NHQOQ087579; Thu, 3 Sep 2020 23:17:26 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202009032317.083NHQOQ087579@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Thu, 3 Sep 2020 23:17:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365317 - stable/12/sys/riscv/riscv X-SVN-Group: stable-12 X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: stable/12/sys/riscv/riscv X-SVN-Commit-Revision: 365317 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 23:17:26 -0000 Author: mhorne Date: Thu Sep 3 23:17:25 2020 New Revision: 365317 URL: https://svnweb.freebsd.org/changeset/base/365317 Log: MFC r364193: Enable interrupts while handling traps Modified: stable/12/sys/riscv/riscv/trap.c Modified: stable/12/sys/riscv/riscv/trap.c ============================================================================== --- stable/12/sys/riscv/riscv/trap.c Thu Sep 3 22:40:51 2020 (r365316) +++ stable/12/sys/riscv/riscv/trap.c Thu Sep 3 23:17:25 2020 (r365317) @@ -194,14 +194,22 @@ data_abort(struct trapframe *frame, int usermode) "Kernel page fault") != 0) goto fatal; - if (usermode) + if (usermode) { map = &td->td_proc->p_vmspace->vm_map; - else if (stval >= VM_MAX_USER_ADDRESS) - map = kernel_map; - else { - if (pcb->pcb_onfault == 0) - goto fatal; - map = &td->td_proc->p_vmspace->vm_map; + } else { + /* + * Enable interrupts for the duration of the page fault. For + * user faults this was done already in do_trap_user(). + */ + intr_enable(); + + if (stval >= VM_MAX_USER_ADDRESS) { + map = kernel_map; + } else { + if (pcb->pcb_onfault == 0) + goto fatal; + map = &td->td_proc->p_vmspace->vm_map; + } } va = trunc_page(stval); @@ -320,6 +328,7 @@ do_trap_user(struct trapframe *frame) riscv_cpu_intr(frame); return; } + intr_enable(); CTR3(KTR_TRAP, "do_trap_user: curthread: %p, sepc: %lx, frame: %p", curthread, frame->tf_sepc, frame); From owner-svn-src-all@freebsd.org Fri Sep 4 00:11:02 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 60C293CFE29; Fri, 4 Sep 2020 00:11:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjJ461vyRz4F6l; Fri, 4 Sep 2020 00:11:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 257462385D; Fri, 4 Sep 2020 00:11:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0840B2NJ020289; Fri, 4 Sep 2020 00:11:02 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0840B2pe020288; Fri, 4 Sep 2020 00:11:02 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202009040011.0840B2pe020288@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 4 Sep 2020 00:11:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365318 - head/stand/efi/loader X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/stand/efi/loader X-SVN-Commit-Revision: 365318 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 00:11:02 -0000 Author: jhb Date: Fri Sep 4 00:11:01 2020 New Revision: 365318 URL: https://svnweb.freebsd.org/changeset/base/365318 Log: Quiet int-to-pointer-cast warnings on i386 with GCC 9. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D26200 Modified: head/stand/efi/loader/copy.c Modified: head/stand/efi/loader/copy.c ============================================================================== --- head/stand/efi/loader/copy.c Thu Sep 3 23:17:25 2020 (r365317) +++ head/stand/efi/loader/copy.c Fri Sep 4 00:11:01 2020 (r365318) @@ -290,8 +290,8 @@ before_staging: * translation still works. */ staging_base = addr; - memmove((void *)staging_base, (void *)staging, - staging_end - staging); + memmove((void *)(uintptr_t)staging_base, + (void *)(uintptr_t)staging, staging_end - staging); stage_offset -= (staging - staging_base); staging = staging_base; return (true); From owner-svn-src-all@freebsd.org Fri Sep 4 00:12:29 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A9D2D3CFDE0; Fri, 4 Sep 2020 00:12:29 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjJ5n43qrz4FH3; Fri, 4 Sep 2020 00:12:29 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6EB4D2400E; Fri, 4 Sep 2020 00:12:29 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0840CT9i024202; Fri, 4 Sep 2020 00:12:29 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0840CSfD024198; Fri, 4 Sep 2020 00:12:28 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009040012.0840CSfD024198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 4 Sep 2020 00:12:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365319 - in head/sys/compat: lindebugfs linsysfs linux X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in head/sys/compat: lindebugfs linsysfs linux X-SVN-Commit-Revision: 365319 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 00:12:29 -0000 Author: markj Date: Fri Sep 4 00:12:28 2020 New Revision: 365319 URL: https://svnweb.freebsd.org/changeset/base/365319 Log: Add emulation support for the Linux kcov(4) ioctl API. This makes it possible to run an unmodified Linux syzkaller executor against the Linuxulator, and have it gather code coverage information. Sponsored by: The FreeBSD Foundation Modified: head/sys/compat/lindebugfs/lindebugfs.c head/sys/compat/linsysfs/linsysfs.c head/sys/compat/linux/linux_ioctl.c head/sys/compat/linux/linux_ioctl.h Modified: head/sys/compat/lindebugfs/lindebugfs.c ============================================================================== --- head/sys/compat/lindebugfs/lindebugfs.c Fri Sep 4 00:11:01 2020 (r365318) +++ head/sys/compat/lindebugfs/lindebugfs.c Fri Sep 4 00:12:28 2020 (r365319) @@ -299,6 +299,9 @@ debugfs_init(PFS_INIT_ARGS) { debugfs_root = pi->pi_root; + + (void)debugfs_create_symlink("kcov", NULL, "/dev/kcov"); + return (0); } Modified: head/sys/compat/linsysfs/linsysfs.c ============================================================================== --- head/sys/compat/linsysfs/linsysfs.c Fri Sep 4 00:11:01 2020 (r365318) +++ head/sys/compat/linsysfs/linsysfs.c Fri Sep 4 00:12:28 2020 (r365319) @@ -624,6 +624,8 @@ linsysfs_init(PFS_INIT_ARGS) struct pfs_node *net; struct pfs_node *power_supply; struct pfs_node *devdir, *chardev; + struct pfs_node *kernel; + struct pfs_node *debug; devclass_t devclass; device_t dev; @@ -671,6 +673,11 @@ linsysfs_init(PFS_INIT_ARGS) linsysfs_listcpus(cpu); linsysfs_listnics(net); + + /* /sys/kernel */ + kernel = pfs_create_dir(root, "kernel", NULL, NULL, NULL, 0); + /* /sys/kernel/debug, mountpoint for lindebugfs. */ + debug = pfs_create_dir(kernel, "debug", NULL, NULL, NULL, 0); return (0); } Modified: head/sys/compat/linux/linux_ioctl.c ============================================================================== --- head/sys/compat/linux/linux_ioctl.c Fri Sep 4 00:11:01 2020 (r365318) +++ head/sys/compat/linux/linux_ioctl.c Fri Sep 4 00:12:28 2020 (r365319) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -117,6 +118,7 @@ static linux_ioctl_function_t linux_ioctl_v4l2; static linux_ioctl_function_t linux_ioctl_special; static linux_ioctl_function_t linux_ioctl_fbsd_usb; static linux_ioctl_function_t linux_ioctl_evdev; +static linux_ioctl_function_t linux_ioctl_kcov; static struct linux_ioctl_handler cdrom_handler = { linux_ioctl_cdrom, LINUX_IOCTL_CDROM_MIN, LINUX_IOCTL_CDROM_MAX }; @@ -146,6 +148,8 @@ static struct linux_ioctl_handler fbsd_usb = { linux_ioctl_fbsd_usb, FBSD_LUSB_MIN, FBSD_LUSB_MAX }; static struct linux_ioctl_handler evdev_handler = { linux_ioctl_evdev, LINUX_IOCTL_EVDEV_MIN, LINUX_IOCTL_EVDEV_MAX }; +static struct linux_ioctl_handler kcov_handler = +{ linux_ioctl_kcov, LINUX_KCOV_MIN, LINUX_KCOV_MAX }; DATA_SET(linux_ioctl_handler_set, cdrom_handler); DATA_SET(linux_ioctl_handler_set, vfat_handler); @@ -161,6 +165,7 @@ DATA_SET(linux_ioctl_handler_set, video_handler); DATA_SET(linux_ioctl_handler_set, video2_handler); DATA_SET(linux_ioctl_handler_set, fbsd_usb); DATA_SET(linux_ioctl_handler_set, evdev_handler); +DATA_SET(linux_ioctl_handler_set, kcov_handler); /* * Keep sorted by low. @@ -3570,6 +3575,38 @@ linux_ioctl_evdev(struct thread *td, struct linux_ioct args->cmd = (args->cmd & ~IOC_DIRMASK) | IOC_INOUT; return (sys_ioctl(td, (struct ioctl_args *)args)); +} + +static int +linux_ioctl_kcov(struct thread *td, struct linux_ioctl_args *args) +{ + int error; + + error = 0; + switch (args->cmd & 0xffff) { + case LINUX_KCOV_INIT_TRACE: + args->cmd = KIOSETBUFSIZE; + break; + case LINUX_KCOV_ENABLE: + args->cmd = KIOENABLE; + if (args->arg == 0) + args->arg = KCOV_MODE_TRACE_PC; + else if (args->arg == 1) + args->arg = KCOV_MODE_TRACE_CMP; + else + error = EINVAL; + break; + case LINUX_KCOV_DISABLE: + args->cmd = KIODISABLE; + break; + default: + error = ENOTTY; + break; + } + + if (error == 0) + error = sys_ioctl(td, (struct ioctl_args *)args); + return (error); } /* Modified: head/sys/compat/linux/linux_ioctl.h ============================================================================== --- head/sys/compat/linux/linux_ioctl.h Fri Sep 4 00:11:01 2020 (r365318) +++ head/sys/compat/linux/linux_ioctl.h Fri Sep 4 00:12:28 2020 (r365319) @@ -762,6 +762,17 @@ #define LINUX_IOCTL_EVDEV_MAX 0x45ff #define LINUX_IOCTL_EVDEV_CLK LINUX_CLOCK_REALTIME | \ LINUX_CLOCK_MONOTONIC |LINUX_CLOCK_BOOTTIME + +/* + * kcov(4) shims + */ +#define LINUX_KCOV_MIN 0x6300 +#define LINUX_KCOV_MAX 0x63ff +#define LINUX_KCOV_INIT_TRACE 0x6301 +#define LINUX_KCOV_ENABLE 0x6364 +#define LINUX_KCOV_DISABLE 0x6365 +#define LINUX_KCOV_REMOTE_ENABLE 0x6366 + /* * Pluggable ioctl handlers */ From owner-svn-src-all@freebsd.org Fri Sep 4 00:22:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 773F73D0442; Fri, 4 Sep 2020 00:22:25 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjJKF2cdDz4FqZ; Fri, 4 Sep 2020 00:22:25 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3D08923FAE; Fri, 4 Sep 2020 00:22:25 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0840MP2G029439; Fri, 4 Sep 2020 00:22:25 GMT (envelope-from jamie@FreeBSD.org) Received: (from jamie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0840MPOU029438; Fri, 4 Sep 2020 00:22:25 GMT (envelope-from jamie@FreeBSD.org) Message-Id: <202009040022.0840MPOU029438@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jamie set sender to jamie@FreeBSD.org using -f From: Jamie Gritton Date: Fri, 4 Sep 2020 00:22:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365320 - stable/12/usr.sbin/jail X-SVN-Group: stable-12 X-SVN-Commit-Author: jamie X-SVN-Commit-Paths: stable/12/usr.sbin/jail X-SVN-Commit-Revision: 365320 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 00:22:25 -0000 Author: jamie Date: Fri Sep 4 00:22:24 2020 New Revision: 365320 URL: https://svnweb.freebsd.org/changeset/base/365320 Log: MFC r364850: Don't allow jail.conf variables to have the same names as jail parameters. It was already not allowed in many cases, but crashed instead of giving an error. PR: 248444 Modified: stable/12/usr.sbin/jail/config.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/jail/config.c ============================================================================== --- stable/12/usr.sbin/jail/config.c Fri Sep 4 00:12:28 2020 (r365319) +++ stable/12/usr.sbin/jail/config.c Fri Sep 4 00:22:24 2020 (r365320) @@ -366,8 +366,13 @@ add_param(struct cfjail *j, const struct cfparam *p, e break; if (dp != NULL) { /* Found it - append or replace. */ + if ((flags ^ dp->flags) & PF_VAR) { + jail_warnx(j, "variable \"$%s\" cannot have the same " + "name as a parameter.", name); + return; + } if (dp->flags & PF_IMMUTABLE) { - jail_warnx(j, "cannot redefine variable \"%s\".", + jail_warnx(j, "cannot redefine parameter \"%s\".", dp->name); return; } @@ -394,6 +399,14 @@ add_param(struct cfjail *j, const struct cfparam *p, e for (ipnum = IP__NULL + 1; ipnum < IP_NPARAM; ipnum++) if (!(intparams[ipnum].flags & PF_CONV) && equalopts(name, intparams[ipnum].name)) { + if (flags & PF_VAR) { + jail_warnx(j, + "variable \"$%s\" " + "cannot have the same " + "name as a parameter.", + name); + return; + } j->intparams[ipnum] = np; np->flags |= intparams[ipnum].flags; break; From owner-svn-src-all@freebsd.org Fri Sep 4 00:24:32 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 52C4B3D017A; Fri, 4 Sep 2020 00:24:32 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjJMh1Pcdz4G9Z; Fri, 4 Sep 2020 00:24:32 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13255242D7; Fri, 4 Sep 2020 00:24:32 +0000 (UTC) (envelope-from jamie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0840OVF7030590; Fri, 4 Sep 2020 00:24:31 GMT (envelope-from jamie@FreeBSD.org) Received: (from jamie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0840OVZ9030589; Fri, 4 Sep 2020 00:24:31 GMT (envelope-from jamie@FreeBSD.org) Message-Id: <202009040024.0840OVZ9030589@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jamie set sender to jamie@FreeBSD.org using -f From: Jamie Gritton Date: Fri, 4 Sep 2020 00:24:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365321 - stable/12/sys/sys X-SVN-Group: stable-12 X-SVN-Commit-Author: jamie X-SVN-Commit-Paths: stable/12/sys/sys X-SVN-Commit-Revision: 365321 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 00:24:32 -0000 Author: jamie Date: Fri Sep 4 00:24:31 2020 New Revision: 365321 URL: https://svnweb.freebsd.org/changeset/base/365321 Log: MFC r364970: Add __BEGIN_DECLS to jail.h to keep C++ happy. PR: 238928 Reported by: yuri@ Modified: stable/12/sys/sys/jail.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/sys/jail.h ============================================================================== --- stable/12/sys/sys/jail.h Fri Sep 4 00:22:24 2020 (r365320) +++ stable/12/sys/sys/jail.h Fri Sep 4 00:24:31 2020 (r365321) @@ -110,11 +110,13 @@ struct xprison { struct iovec; +__BEGIN_DECLS int jail(struct jail *); int jail_set(struct iovec *, unsigned int, int); int jail_get(struct iovec *, unsigned int, int); int jail_attach(int); int jail_remove(int); +__END_DECLS #else /* _KERNEL */ From owner-svn-src-all@freebsd.org Fri Sep 4 00:25:03 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5B99B3D0734; Fri, 4 Sep 2020 00:25:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjJNH1lnGz4G00; Fri, 4 Sep 2020 00:25:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 20192242DA; Fri, 4 Sep 2020 00:25:03 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0840P3MC030696; Fri, 4 Sep 2020 00:25:03 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0840P32q030695; Fri, 4 Sep 2020 00:25:03 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <202009040025.0840P32q030695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Fri, 4 Sep 2020 00:25:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365322 - stable/12/sys/dev/extres/clk X-SVN-Group: stable-12 X-SVN-Commit-Author: gonzo X-SVN-Commit-Paths: stable/12/sys/dev/extres/clk X-SVN-Commit-Revision: 365322 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 00:25:03 -0000 Author: gonzo Date: Fri Sep 4 00:25:02 2020 New Revision: 365322 URL: https://svnweb.freebsd.org/changeset/base/365322 Log: MFC r363122: Assigned clocks: fix off-by-one bug, don't leak allocated memory. MFC after: 1 week Modified: stable/12/sys/dev/extres/clk/clk.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/extres/clk/clk.c ============================================================================== --- stable/12/sys/dev/extres/clk/clk.c Fri Sep 4 00:24:31 2020 (r365321) +++ stable/12/sys/dev/extres/clk/clk.c Fri Sep 4 00:25:02 2020 (r365322) @@ -1420,15 +1420,17 @@ clk_set_assigned(device_t dev, phandle_t node) } /* First set it's parent if needed */ - if (i <= nparents) + if (i < nparents) clk_set_assigned_parent(dev, clk, i); /* Then set a new frequency */ - if (i <= nrates && rates[i] != 0) + if (i < nrates && rates[i] != 0) clk_set_assigned_rates(dev, clk, rates[i]); clk_release(clk); } + if (rates != NULL) + OF_prop_free(rates); return (0); } From owner-svn-src-all@freebsd.org Fri Sep 4 04:31:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 519C73D5D55; Fri, 4 Sep 2020 04:31:57 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjPs91RDgz4VN1; Fri, 4 Sep 2020 04:31:57 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1469626CCC; Fri, 4 Sep 2020 04:31:57 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0844VuJ2086641; Fri, 4 Sep 2020 04:31:56 GMT (envelope-from stevek@FreeBSD.org) Received: (from stevek@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0844Vup9086639; Fri, 4 Sep 2020 04:31:56 GMT (envelope-from stevek@FreeBSD.org) Message-Id: <202009040431.0844Vup9086639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stevek set sender to stevek@FreeBSD.org using -f From: "Stephen J. Kiernan" Date: Fri, 4 Sep 2020 04:31:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365325 - head/usr.sbin/fmtree X-SVN-Group: head X-SVN-Commit-Author: stevek X-SVN-Commit-Paths: head/usr.sbin/fmtree X-SVN-Commit-Revision: 365325 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 04:31:57 -0000 Author: stevek Date: Fri Sep 4 04:31:56 2020 New Revision: 365325 URL: https://svnweb.freebsd.org/changeset/base/365325 Log: Avoid collisions with function names in openssl headers. Just using MD5, SHA1, RMD160 and SHA256 for defines collides with functions of the same name in OpenSSL. This can cause compilation issues in downstream consumers if they use OpenSSL for the hash functions instead of libmd. Reviewed by: sjg Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D26321 Modified: head/usr.sbin/fmtree/Makefile head/usr.sbin/fmtree/compare.c Modified: head/usr.sbin/fmtree/Makefile ============================================================================== --- head/usr.sbin/fmtree/Makefile Fri Sep 4 02:22:27 2020 (r365324) +++ head/usr.sbin/fmtree/Makefile Fri Sep 4 04:31:56 2020 (r365325) @@ -10,7 +10,7 @@ MAN= fmtree.8 SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c SRCS+= specspec.c -CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256 +CFLAGS+= -DWITH_MD5 -DWITH_SHA1 -DWITH_RMD160 -DWITH_SHA256 LIBADD= md CLEANFILES+= fmtree.8 Modified: head/usr.sbin/fmtree/compare.c ============================================================================== --- head/usr.sbin/fmtree/compare.c Fri Sep 4 02:22:27 2020 (r365324) +++ head/usr.sbin/fmtree/compare.c Fri Sep 4 04:31:56 2020 (r365325) @@ -43,16 +43,16 @@ __FBSDID("$FreeBSD$"); #include #include #include -#ifdef MD5 +#ifdef WITH_MD5 #include #endif -#ifdef RMD160 +#ifdef WITH_RMD160 #include #endif -#ifdef SHA1 +#ifdef WITH_SHA1 #include #endif -#ifdef SHA256 +#ifdef WITH_SHA256 #include #endif #include @@ -244,7 +244,7 @@ typeerr: LABEL; (void)printf("\n"); tab = "\t"; } -#ifdef MD5 +#ifdef WITH_MD5 if (s->flags & F_MD5) { char *new_digest, buf[33]; @@ -262,7 +262,7 @@ typeerr: LABEL; } } #endif /* MD5 */ -#ifdef SHA1 +#ifdef WITH_SHA1 if (s->flags & F_SHA1) { char *new_digest, buf[41]; @@ -280,7 +280,7 @@ typeerr: LABEL; } } #endif /* SHA1 */ -#ifdef RMD160 +#ifdef WITH_RMD160 if (s->flags & F_RMD160) { char *new_digest, buf[41]; @@ -298,7 +298,7 @@ typeerr: LABEL; } } #endif /* RMD160 */ -#ifdef SHA256 +#ifdef WITH_SHA256 if (s->flags & F_SHA256) { char *new_digest, buf[65]; From owner-svn-src-all@freebsd.org Fri Sep 4 11:22:19 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20CFE3DDE0D; Fri, 4 Sep 2020 11:22:19 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjZyg0223z3cBt; Fri, 4 Sep 2020 11:22:19 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D96C5BF76; Fri, 4 Sep 2020 11:22:18 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084BMIAO040629; Fri, 4 Sep 2020 11:22:18 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084BMIYn040628; Fri, 4 Sep 2020 11:22:18 GMT (envelope-from mw@FreeBSD.org) Message-Id: <202009041122.084BMIYn040628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Fri, 4 Sep 2020 11:22:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365326 - stable/12/sys/sys X-SVN-Group: stable-12 X-SVN-Commit-Author: mw X-SVN-Commit-Paths: stable/12/sys/sys X-SVN-Commit-Revision: 365326 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 11:22:19 -0000 Author: mw Date: Fri Sep 4 11:22:18 2020 New Revision: 365326 URL: https://svnweb.freebsd.org/changeset/base/365326 Log: MFC: r346593 Add barrier in buf ring peek function to prevent race in ARM and ARM64. Obtained from: Semihalf Sponsored by: Amazon, Inc. Modified: stable/12/sys/sys/buf_ring.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/sys/buf_ring.h ============================================================================== --- stable/12/sys/sys/buf_ring.h Fri Sep 4 04:31:56 2020 (r365325) +++ stable/12/sys/sys/buf_ring.h Fri Sep 4 11:22:18 2020 (r365326) @@ -310,14 +310,23 @@ buf_ring_peek_clear_sc(struct buf_ring *br) if (!mtx_owned(br->br_lock)) panic("lock not held on single consumer dequeue"); #endif - /* - * I believe it is safe to not have a memory barrier - * here because we control cons and tail is worst case - * a lagging indicator so we worst case we might - * return NULL immediately after a buffer has been enqueued - */ + if (br->br_cons_head == br->br_prod_tail) return (NULL); + +#if defined(__arm__) || defined(__aarch64__) + /* + * The barrier is required there on ARM and ARM64 to ensure, that + * br->br_ring[br->br_cons_head] will not be fetched before the above + * condition is checked. + * Without the barrier, it is possible, that buffer will be fetched + * before the enqueue will put mbuf into br, then, in the meantime, the + * enqueue will update the array and the br_prod_tail, and the + * conditional check will be true, so we will return previously fetched + * (and invalid) buffer. + */ + atomic_thread_fence_acq(); +#endif #ifdef DEBUG_BUFRING /* From owner-svn-src-all@freebsd.org Fri Sep 4 12:52:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8662A3C13A4; Fri, 4 Sep 2020 12:52:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjcyT32MNz412H; Fri, 4 Sep 2020 12:52:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BA2BD00C; Fri, 4 Sep 2020 12:52:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084CqHqd097564; Fri, 4 Sep 2020 12:52:17 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084CqHmO097563; Fri, 4 Sep 2020 12:52:17 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202009041252.084CqHmO097563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 4 Sep 2020 12:52:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365327 - head/tests/sys/kern X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/tests/sys/kern X-SVN-Commit-Revision: 365327 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 12:52:17 -0000 Author: kib Date: Fri Sep 4 12:52:16 2020 New Revision: 365327 URL: https://svnweb.freebsd.org/changeset/base/365327 Log: Fix kern_copyin test. Main part is that kern_copyin on amd64 after LA57 should query the top of UVA for correct operations. In fact it should started doing that after the workaround for AMD bug with IRET in the last user page was fixed by reducing UVA by a page. Also since we started calculating top of UVA, fix MIPS according to the comment. Reported by: lwhsu PR: 248933 Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D26312 Modified: head/tests/sys/kern/kern_copyin.c Modified: head/tests/sys/kern/kern_copyin.c ============================================================================== --- head/tests/sys/kern/kern_copyin.c Fri Sep 4 11:22:18 2020 (r365326) +++ head/tests/sys/kern/kern_copyin.c Fri Sep 4 12:52:16 2020 (r365327) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015 The FreeBSD Foundation + * Copyright (c) 2015, 2020 The FreeBSD Foundation * All rights reserved. * * This software was developed by Konstantin Belousov @@ -31,6 +31,8 @@ __FBSDID("$FreeBSD$"); #include +#include +#include #include #include #include @@ -52,21 +54,54 @@ copyin_checker(uintptr_t uaddr, size_t len) return (ret == -1 ? errno : 0); } +#ifdef __amd64__ +static uintptr_t +get_maxuser_address(void) +{ + size_t len; + uintptr_t psstrings; + int error, mib[4]; + + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PS_STRINGS; + mib[3] = getpid(); + error = sysctl(mib, nitems(mib), &psstrings, &len, NULL, 0); + if (error != 0) + return (0); + + if (psstrings == PS_STRINGS_LA57) + return (VM_MAXUSER_ADDRESS_LA57); + if (psstrings == PS_STRINGS_LA48) + return (VM_MAXUSER_ADDRESS_LA48); + /* AMD LA48 with clipped UVA */ + if (psstrings == PS_STRINGS_LA48 - PAGE_SIZE) + return (VM_MAXUSER_ADDRESS_LA48 - PAGE_SIZE); + return (0); +} +#endif + #define FMAX ULONG_MAX ATF_TC_WITHOUT_HEAD(kern_copyin); ATF_TC_BODY(kern_copyin, tc) { char template[] = "copyin.XXXXXX"; + uintptr_t maxuser; -#ifdef __mips__ +#if defined(__mips__) /* * MIPS has different VM layout: the UVA map on mips ends the * highest mapped entry at the VM_MAXUSER_ADDRESS - PAGE_SIZE, * while all other arches map either stack or shared page up * to the VM_MAXUSER_ADDRESS. */ - atf_tc_skip("Platform is not supported."); + maxuser = VM_MAXUSER_ADDRESS - PAGE_SIZE; +#elif defined(__amd64__) + maxuser = get_maxuser_address(); + ATF_REQUIRE(maxuser != 0); +#else + maxuser = VM_MAXUSER_ADDRESS; #endif scratch_file = mkstemp(template); @@ -74,15 +109,15 @@ ATF_TC_BODY(kern_copyin, tc) unlink(template); ATF_CHECK(copyin_checker(0, 0) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 10, 9) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 10, 10) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 10, 11) == EFAULT); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS - 1, 1) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS, 0) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS, 1) == EFAULT); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS, 2) == EFAULT); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS + 1, 0) == 0); - ATF_CHECK(copyin_checker(VM_MAXUSER_ADDRESS + 1, 2) == EFAULT); + ATF_CHECK(copyin_checker(maxuser - 10, 9) == 0); + ATF_CHECK(copyin_checker(maxuser - 10, 10) == 0); + ATF_CHECK(copyin_checker(maxuser - 10, 11) == EFAULT); + ATF_CHECK(copyin_checker(maxuser - 1, 1) == 0); + ATF_CHECK(copyin_checker(maxuser, 0) == 0); + ATF_CHECK(copyin_checker(maxuser, 1) == EFAULT); + ATF_CHECK(copyin_checker(maxuser, 2) == EFAULT); + ATF_CHECK(copyin_checker(maxuser + 1, 0) == 0); + ATF_CHECK(copyin_checker(maxuser + 1, 2) == EFAULT); ATF_CHECK(copyin_checker(FMAX - 10, 9) == EFAULT); ATF_CHECK(copyin_checker(FMAX - 10, 10) == EFAULT); ATF_CHECK(copyin_checker(FMAX - 10, 11) == EFAULT); From owner-svn-src-all@freebsd.org Fri Sep 4 13:05:00 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E5E463C196B; Fri, 4 Sep 2020 13:05:00 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjdF85lrNz422t; Fri, 4 Sep 2020 13:05:00 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8ED1D279; Fri, 4 Sep 2020 13:05:00 +0000 (UTC) (envelope-from gbe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084D50HT004016; Fri, 4 Sep 2020 13:05:00 GMT (envelope-from gbe@FreeBSD.org) Received: (from gbe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084D50U2004015; Fri, 4 Sep 2020 13:05:00 GMT (envelope-from gbe@FreeBSD.org) Message-Id: <202009041305.084D50U2004015@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gbe set sender to gbe@FreeBSD.org using -f From: Gordon Bergling Date: Fri, 4 Sep 2020 13:05:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365328 - head/usr.bin/fortune/datfiles X-SVN-Group: head X-SVN-Commit-Author: gbe X-SVN-Commit-Paths: head/usr.bin/fortune/datfiles X-SVN-Commit-Revision: 365328 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 13:05:01 -0000 Author: gbe (doc committer) Date: Fri Sep 4 13:05:00 2020 New Revision: 365328 URL: https://svnweb.freebsd.org/changeset/base/365328 Log: fortune(6): Grammar fix for a hint on searching ports PR: 249078 Submitted by: PauAmma Reported by: PauAmma MFC after: 3 days Modified: head/usr.bin/fortune/datfiles/freebsd-tips Modified: head/usr.bin/fortune/datfiles/freebsd-tips ============================================================================== --- head/usr.bin/fortune/datfiles/freebsd-tips Fri Sep 4 12:52:16 2020 (r365327) +++ head/usr.bin/fortune/datfiles/freebsd-tips Fri Sep 4 13:05:00 2020 (r365328) @@ -304,8 +304,8 @@ been replaced with other messages, look at /var/run/dm Want colour in your directory listings? Use "ls -G". "ls -F" is also useful, and they can be combined as "ls -FG". % -Want to find a specific port, just type the following under /usr/ports -or one its subdirectories: +Want to find a specific port? Just type the following under /usr/ports +or one of its subdirectories: make search name= or From owner-svn-src-all@freebsd.org Fri Sep 4 13:09:57 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0DBC53C1F28; Fri, 4 Sep 2020 13:09:57 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjdLr1YRwz4279; Fri, 4 Sep 2020 13:09:55 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 084D9kvY017845 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 4 Sep 2020 16:09:49 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 084D9kvY017845 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 084D9kI4017844; Fri, 4 Sep 2020 16:09:46 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 4 Sep 2020 16:09:46 +0300 From: Konstantin Belousov To: Marcin Wojtas Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: Re: svn commit: r365326 - stable/12/sys/sys Message-ID: <20200904130946.GG94807@kib.kiev.ua> References: <202009041122.084BMIYn040628@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202009041122.084BMIYn040628@repo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 4BjdLr1YRwz4279 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 13:09:57 -0000 On Fri, Sep 04, 2020 at 11:22:18AM +0000, Marcin Wojtas wrote: > Author: mw > Date: Fri Sep 4 11:22:18 2020 > New Revision: 365326 > URL: https://svnweb.freebsd.org/changeset/base/365326 > > Log: > MFC: r346593 > > Add barrier in buf ring peek function to prevent race in ARM and ARM64. > > Obtained from: Semihalf > Sponsored by: Amazon, Inc. > > Modified: > stable/12/sys/sys/buf_ring.h > Directory Properties: > stable/12/ (props changed) > > Modified: stable/12/sys/sys/buf_ring.h > ============================================================================== > --- stable/12/sys/sys/buf_ring.h Fri Sep 4 04:31:56 2020 (r365325) > +++ stable/12/sys/sys/buf_ring.h Fri Sep 4 11:22:18 2020 (r365326) > @@ -310,14 +310,23 @@ buf_ring_peek_clear_sc(struct buf_ring *br) > if (!mtx_owned(br->br_lock)) > panic("lock not held on single consumer dequeue"); > #endif > - /* > - * I believe it is safe to not have a memory barrier > - * here because we control cons and tail is worst case > - * a lagging indicator so we worst case we might > - * return NULL immediately after a buffer has been enqueued > - */ > + > if (br->br_cons_head == br->br_prod_tail) > return (NULL); > + > +#if defined(__arm__) || defined(__aarch64__) > + /* > + * The barrier is required there on ARM and ARM64 to ensure, that > + * br->br_ring[br->br_cons_head] will not be fetched before the above > + * condition is checked. > + * Without the barrier, it is possible, that buffer will be fetched > + * before the enqueue will put mbuf into br, then, in the meantime, the > + * enqueue will update the array and the br_prod_tail, and the > + * conditional check will be true, so we will return previously fetched > + * (and invalid) buffer. > + */ > + atomic_thread_fence_acq(); > +#endif Putting the semantic of the change aside, why did you added the fence (it is a fence, not barrier as stated in the comment) only to arm* ? If it is needed, it is needed for all arches. > > #ifdef DEBUG_BUFRING > /* From owner-svn-src-all@freebsd.org Fri Sep 4 13:17:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3BD553C22CE; Fri, 4 Sep 2020 13:17:56 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjdX40sf0z42sl; Fri, 4 Sep 2020 13:17:56 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00FB6CF6F; Fri, 4 Sep 2020 13:17:56 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084DHtxE010737; Fri, 4 Sep 2020 13:17:55 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084DHtP7010736; Fri, 4 Sep 2020 13:17:55 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009041317.084DHtP7010736@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 4 Sep 2020 13:17:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365329 - stable/12/sys/dev/qlxgb X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/sys/dev/qlxgb X-SVN-Commit-Revision: 365329 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 13:17:56 -0000 Author: markj Date: Fri Sep 4 13:17:55 2020 New Revision: 365329 URL: https://svnweb.freebsd.org/changeset/base/365329 Log: MFC r365060: qlxgb: Initialize if_mtu before setting max_frame_size. PR: 249050 Modified: stable/12/sys/dev/qlxgb/qla_os.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/qlxgb/qla_os.c ============================================================================== --- stable/12/sys/dev/qlxgb/qla_os.c Fri Sep 4 13:05:00 2020 (r365328) +++ stable/12/sys/dev/qlxgb/qla_os.c Fri Sep 4 13:17:55 2020 (r365329) @@ -672,6 +672,7 @@ qla_init_ifnet(device_t dev, qla_host_t *ha) if_initname(ifp, device_get_name(dev), device_get_unit(dev)); + ifp->if_mtu = ETHERMTU; ifp->if_baudrate = IF_Gbps(10); ifp->if_init = qla_init; ifp->if_softc = ha; From owner-svn-src-all@freebsd.org Fri Sep 4 13:19:19 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 965243C2279; Fri, 4 Sep 2020 13:19:19 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjdYg3Rn7z42pC; Fri, 4 Sep 2020 13:19:19 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 594B4D3C6; Fri, 4 Sep 2020 13:19:19 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084DJJUg010858; Fri, 4 Sep 2020 13:19:19 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084DJJtN010857; Fri, 4 Sep 2020 13:19:19 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009041319.084DJJtN010857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 4 Sep 2020 13:19:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365330 - stable/11/sys/dev/qlxgb X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/dev/qlxgb X-SVN-Commit-Revision: 365330 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 13:19:19 -0000 Author: markj Date: Fri Sep 4 13:19:18 2020 New Revision: 365330 URL: https://svnweb.freebsd.org/changeset/base/365330 Log: MFC r365060: qlxgb: Initialize if_mtu before setting max_frame_size. PR: 249050 Modified: stable/11/sys/dev/qlxgb/qla_os.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/qlxgb/qla_os.c ============================================================================== --- stable/11/sys/dev/qlxgb/qla_os.c Fri Sep 4 13:17:55 2020 (r365329) +++ stable/11/sys/dev/qlxgb/qla_os.c Fri Sep 4 13:19:18 2020 (r365330) @@ -670,6 +670,7 @@ qla_init_ifnet(device_t dev, qla_host_t *ha) if_initname(ifp, device_get_name(dev), device_get_unit(dev)); + ifp->if_mtu = ETHERMTU; ifp->if_baudrate = IF_Gbps(10); ifp->if_init = qla_init; ifp->if_softc = ha; From owner-svn-src-all@freebsd.org Fri Sep 4 13:36:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D6B8F3C2E15 for ; Fri, 4 Sep 2020 13:36:34 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjdxZ0nwYz43rt for ; Fri, 4 Sep 2020 13:36:33 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f67.google.com with SMTP id k15so6754382wrn.10 for ; Fri, 04 Sep 2020 06:36:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=5xrhtPTmjjeuEYVDZ4OEFtzGfLaJIMXboJ6zads1oJg=; b=kgHjCgtsmaMkaHLKDLg+ISqR1wFMhK4sXbliaJjpnghpD68jb4DjeMTqrXV+6JCV83 edPLYvsonLXA84CuyIxLnf89ZHiuXssLRQ8kPYy4NGtjRhJB9Z/euE7E8xBENMPNggoh ucmupRw6wUo5rXs8OC9tCyUn61sfwD3G3PtxzqxhKUY2WfkqJ5TcekzD7nftj4bLebap ym/lg5LUjh3Ck9uiN8aieVIWUZyUfEdXRfbRB6R9gBpF623YxSka88Q+nMTEXlucPsAn Nh4cWfnYikmQ+30G5Had3ALylWXsseQG516uxbS61QwDzg0JhPaaVJsp3k6gFfRSX+hM HeXw== X-Gm-Message-State: AOAM533HgrEq3oV49LqpZhN4rL07zrS3IKfMqj7wsRvkhTjbEdhdnJtr Nlm4UX1NkpVFfkBCabrAF3Axjg== X-Google-Smtp-Source: ABdhPJz3xMIi3L+prDTIMriSuy5RPADIt4MVC26xJkACFDAKc8/KmjjoNbiNdxnRgDP86vxv4n/14w== X-Received: by 2002:adf:f24d:: with SMTP id b13mr7519752wrp.316.1599226592511; Fri, 04 Sep 2020 06:36:32 -0700 (PDT) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id u126sm15308055wmu.9.2020.09.04.06.36.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Sep 2020 06:36:31 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: svn commit: r365326 - stable/12/sys/sys From: Jessica Clarke In-Reply-To: <20200904130946.GG94807@kib.kiev.ua> Date: Fri, 4 Sep 2020 14:36:29 +0100 Cc: Marcin Wojtas , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202009041122.084BMIYn040628@repo.freebsd.org> <20200904130946.GG94807@kib.kiev.ua> To: Konstantin Belousov X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Rspamd-Queue-Id: 4BjdxZ0nwYz43rt X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.21 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.69)[-0.691]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.02)[-1.022]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.67:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.67:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 13:36:34 -0000 On 4 Sep 2020, at 14:09, Konstantin Belousov = wrote: > On Fri, Sep 04, 2020 at 11:22:18AM +0000, Marcin Wojtas wrote: >> Author: mw >> Date: Fri Sep 4 11:22:18 2020 >> New Revision: 365326 >> URL: https://svnweb.freebsd.org/changeset/base/365326 >>=20 >> Log: >> MFC: r346593 >>=20 >> Add barrier in buf ring peek function to prevent race in ARM and = ARM64. >>=20 >> Obtained from: Semihalf >> Sponsored by: Amazon, Inc. >>=20 >> Modified: >> stable/12/sys/sys/buf_ring.h >> Directory Properties: >> stable/12/ (props changed) >>=20 >> Modified: stable/12/sys/sys/buf_ring.h >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- stable/12/sys/sys/buf_ring.h Fri Sep 4 04:31:56 2020 = (r365325) >> +++ stable/12/sys/sys/buf_ring.h Fri Sep 4 11:22:18 2020 = (r365326) >> @@ -310,14 +310,23 @@ buf_ring_peek_clear_sc(struct buf_ring *br) >> if (!mtx_owned(br->br_lock)) >> panic("lock not held on single consumer dequeue"); >> #endif=09 >> - /* >> - * I believe it is safe to not have a memory barrier >> - * here because we control cons and tail is worst case >> - * a lagging indicator so we worst case we might >> - * return NULL immediately after a buffer has been enqueued >> - */ >> + >> if (br->br_cons_head =3D=3D br->br_prod_tail) >> return (NULL); >> + >> +#if defined(__arm__) || defined(__aarch64__) >> + /* >> + * The barrier is required there on ARM and ARM64 to ensure, = that >> + * br->br_ring[br->br_cons_head] will not be fetched before the = above >> + * condition is checked. >> + * Without the barrier, it is possible, that buffer will be = fetched >> + * before the enqueue will put mbuf into br, then, in the = meantime, the >> + * enqueue will update the array and the br_prod_tail, and the >> + * conditional check will be true, so we will return previously = fetched >> + * (and invalid) buffer. >> + */ >> + atomic_thread_fence_acq(); >> +#endif >=20 > Putting the semantic of the change aside, why did you added the fence = (it is > a fence, not barrier as stated in the comment) only to arm* ? If it = is > needed, it is needed for all arches. Agreed. The code looks fine, though I would have made it an acquire load of br_prod_tail myself to be able to take advantage load-acquire instructions when present, and better document what the exact issue is. I also don't think the comment needs to be quite so extensive (especially since atomic_load_acq_32 is somewhat self-documenting in terms of one half of the race); if we had a comment like this for every fence in the kernel we'd never get anything done. There's also an ARM-specific fence in buf_ring_dequeue_sc: > /* > * This is a workaround to allow using buf_ring on ARM and = ARM64. > * ARM64TODO: Fix buf_ring in a generic way. > * REMARKS: It is suspected that br_cons_head does not require > * load_acq operation, but this change was extensively tested > * and confirmed it's working. To be reviewed once again in > * FreeBSD-12. > * > * Preventing following situation: >=20 > * Core(0) - buf_ring_enqueue() = Core(1) - buf_ring_dequeue_sc() > * ----------------------------------------- = ---------------------------------------------- > * > * = cons_head =3D br->br_cons_head; > * atomic_cmpset_acq_32(&br->br_prod_head, ...)); > * = buf =3D br->br_ring[cons_head]; > > * br->br_ring[prod_head] =3D buf; > * atomic_store_rel_32(&br->br_prod_tail, ...); > * = prod_tail =3D br->br_prod_tail; > * = if (cons_head =3D=3D prod_tail)=20 > * = return (NULL); > * = `=09 > * > * <1> Load (on core 1) from br->br_ring[cons_head] can be = reordered (speculative readed) by CPU. > */=09 > #if defined(__arm__) || defined(__aarch64__) > cons_head =3D atomic_load_acq_32(&br->br_cons_head); > #else > cons_head =3D br->br_cons_head; > #endif > prod_tail =3D atomic_load_acq_32(&br->br_prod_tail); The comment is completely correct that the ARM-specific fence is a waste of time. It's the single-consumer path, so such fences are just synchronising with the current thread and thus pointless. The important one is the load-acquire of br_prod_tail, as has been discovered (sort of) in the peek case leading to this comment, which already stops the reordering in question. Jess From owner-svn-src-all@freebsd.org Fri Sep 4 15:33:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E53B53C5A39; Fri, 4 Sep 2020 15:33:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjhXl5njsz4Cfl; Fri, 4 Sep 2020 15:33:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-274.local (unknown [IPv6:2601:648:8681:1cb0:fc3e:e311:1088:b5c0]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 189341A770; Fri, 4 Sep 2020 15:33:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r365281 - in stable: 11/sys/conf 11/sys/modules 11/sys/modules/tcp 12/sys/conf 12/sys/modules 12/sys/modules/tcp To: Eugene Grosbein , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org References: <202009022136.082LatjO029946@repo.freebsd.org> <7795ab88-6220-150b-38e9-0ffae40a6093@grosbein.net> From: John Baldwin Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: Date: Fri, 4 Sep 2020 08:33:41 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <7795ab88-6220-150b-38e9-0ffae40a6093@grosbein.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 15:33:44 -0000 On 9/3/20 11:39 AM, Eugene Grosbein wrote: > 04.09.2020 1:16, Eugene Grosbein wrote: > >>> This should fix the build breakage from r365270 (sorry). >> >> buildworld is still broken for me at stable/11 amd64 r365304. >> Specifically, I build stable/11 for my PPPoE servers that use no IPSec as module nor have it in the kernel in any way. >> >> /etc/make.conf contains: >> >> MODULES_WITH_WORLD= >> KERNCONF?= PPPOE >> WITHOUT_LLVM_TARGET_ALL= >> WITH_LLVM_TARGET_X86= >> WITHOUT_CLANG_FULL= >> WITHOUT_LLDB= >> WITHOUT_KERNEL_SYMBOLS= >> WITHOUT_DEBUG_FILES= >> WITHOUT_TESTS= >> WITHOUT_INET6= >> >> It fails early: >> >> ... >> -------------------------------------------------------------- >>>>> stage 2.2: rebuilding the object tree >> -------------------------------------------------------------- >> ... >> ===> sys/modules/sysvipc/sysvmsg (obj) >> --- obj_subdir_sys/modules/tcp --- >> make[6]: "/home/src/sys/modules/tcp/Makefile" line 18: Malformed conditional (${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MIPSEC}) >> make[6]: Fatal errors encountered -- cannot continue >> >> >> Rollback for both of r365270 and r365281 fixes this. > > Oops, I was too quick. Rollback of these allows it running OK until >>> stage 4.3: building everything > but then it fails there: > > ===> sys/modules/if_enc (all) > Building /usr/local/obj/home/src/sys/modules/if_enc/if_enc.o > --- if_enc.o --- > /home/src/sys/net/if_enc.c:33:10: fatal error: 'opt_ipsec.h' file not found > #include "opt_ipsec.h" > ^~~~~~~~~~~~~ > > Additional rollback of r365277 gave me successfull buildworld. Ah, it is MODULES_WITH_WORLD that is tripping you up. What is probably needed to fix this is merging kmod.opts.mk. I can work on that. -- John Baldwin From owner-svn-src-all@freebsd.org Fri Sep 4 17:36:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BDC253C9D19; Fri, 4 Sep 2020 17:36:15 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjlG74cV1z4M1w; Fri, 4 Sep 2020 17:36:15 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81C47102EA; Fri, 4 Sep 2020 17:36:15 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084HaF3n070421; Fri, 4 Sep 2020 17:36:15 GMT (envelope-from gallatin@FreeBSD.org) Received: (from gallatin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084HaFtf070420; Fri, 4 Sep 2020 17:36:15 GMT (envelope-from gallatin@FreeBSD.org) Message-Id: <202009041736.084HaFtf070420@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gallatin set sender to gallatin@FreeBSD.org using -f From: Andrew Gallatin Date: Fri, 4 Sep 2020 17:36:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365331 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: gallatin X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 365331 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 17:36:15 -0000 Author: gallatin Date: Fri Sep 4 17:36:15 2020 New Revision: 365331 URL: https://svnweb.freebsd.org/changeset/base/365331 Log: ktls: Check for a NULL send tag in ktls_cleanup() When using ifnet ktls, and when ktls_reset_send_tag() fails to allocate a replacement tag, it leaves the tls session's snd_tag pointer NULL. ktls_cleanup() tries to release the send tag, and will trip over this NULL pointer and panic unless NULL is checked for. Reviewed by: jhb Sponsored by: Netflix Modified: head/sys/kern/uipc_ktls.c Modified: head/sys/kern/uipc_ktls.c ============================================================================== --- head/sys/kern/uipc_ktls.c Fri Sep 4 13:19:18 2020 (r365330) +++ head/sys/kern/uipc_ktls.c Fri Sep 4 17:36:15 2020 (r365331) @@ -680,7 +680,8 @@ ktls_cleanup(struct ktls_session *tls) counter_u64_add(ktls_ifnet_gcm, -1); break; } - m_snd_tag_rele(tls->snd_tag); + if (tls->snd_tag != NULL) + m_snd_tag_rele(tls->snd_tag); break; #ifdef TCP_OFFLOAD case TCP_TLS_MODE_TOE: From owner-svn-src-all@freebsd.org Fri Sep 4 17:38:00 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20D643C9C48; Fri, 4 Sep 2020 17:38:00 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjlJ803lMz4MGS; Fri, 4 Sep 2020 17:38:00 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DAD211060A; Fri, 4 Sep 2020 17:37:59 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084Hbx4k070536; Fri, 4 Sep 2020 17:37:59 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084HbxVo070532; Fri, 4 Sep 2020 17:37:59 GMT (envelope-from erj@FreeBSD.org) Message-Id: <202009041737.084HbxVo070532@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Fri, 4 Sep 2020 17:37:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365332 - in head/sys: conf contrib/dev/ice modules/ice_ddp X-SVN-Group: head X-SVN-Commit-Author: erj X-SVN-Commit-Paths: in head/sys: conf contrib/dev/ice modules/ice_ddp X-SVN-Commit-Revision: 365332 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 17:38:00 -0000 Author: erj Date: Fri Sep 4 17:37:58 2020 New Revision: 365332 URL: https://svnweb.freebsd.org/changeset/base/365332 Log: ice_ddp: Update package file to 1.3.16.0 This package is intended to be used with ice(4) version 0.26.16. That update will happen in a forthcoming commit. MFC after: 3 days Sponsored by: Intel Corporation Added: head/sys/contrib/dev/ice/ice-1.3.16.0.pkg - copied, changed from r365331, head/sys/contrib/dev/ice/ice-1.3.9.0.pkg Deleted: head/sys/contrib/dev/ice/ice-1.3.9.0.pkg Modified: head/sys/conf/files.amd64 head/sys/conf/files.arm64 head/sys/contrib/dev/ice/README head/sys/modules/ice_ddp/Makefile Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Fri Sep 4 17:36:15 2020 (r365331) +++ head/sys/conf/files.amd64 Fri Sep 4 17:37:58 2020 (r365332) @@ -177,7 +177,7 @@ dev/ice/ice_sriov.c optional ice pci \ dev/ice/ice_switch.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01030900 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031000 -mice_ddp -c${.TARGET}" \ no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp \ @@ -186,8 +186,8 @@ ice_ddp.fwo optional ice_ddp \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.9.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.9.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.16.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.16.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/ioat/ioat.c optional ioat pci Modified: head/sys/conf/files.arm64 ============================================================================== --- head/sys/conf/files.arm64 Fri Sep 4 17:36:15 2020 (r365331) +++ head/sys/conf/files.arm64 Fri Sep 4 17:37:58 2020 (r365332) @@ -288,7 +288,7 @@ dev/ice/ice_sriov.c optional ice pci \ dev/ice/ice_switch.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01030900 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031000 -mice_ddp -c${.TARGET}" \ no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp \ @@ -297,8 +297,8 @@ ice_ddp.fwo optional ice_ddp \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.9.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.9.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.16.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.16.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/iicbus/sy8106a.c optional sy8106a fdt Modified: head/sys/contrib/dev/ice/README ============================================================================== --- head/sys/contrib/dev/ice/README Fri Sep 4 17:36:15 2020 (r365331) +++ head/sys/contrib/dev/ice/README Fri Sep 4 17:37:58 2020 (r365332) @@ -1,6 +1,6 @@ Dynamic Device Personalization (DDP) Package ============================================ -February 21, 2020 +July 7, 2020 Contents @@ -59,6 +59,7 @@ The OS-default DDP package supports the following: - GRE - NVGRE - RoCEv2 +- MPLS (up to 5 consecutive MPLS labels in the outermost Layer 2 header group) Safe Mode Copied and modified: head/sys/contrib/dev/ice/ice-1.3.16.0.pkg (from r365331, head/sys/contrib/dev/ice/ice-1.3.9.0.pkg) ============================================================================== Binary file (source and/or target). No diff available. Modified: head/sys/modules/ice_ddp/Makefile ============================================================================== --- head/sys/modules/ice_ddp/Makefile Fri Sep 4 17:36:15 2020 (r365331) +++ head/sys/modules/ice_ddp/Makefile Fri Sep 4 17:37:58 2020 (r365332) @@ -1,6 +1,6 @@ # $FreeBSD$ KMOD= ice_ddp -FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.9.0.pkg:ice_ddp:0x01030900 +FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.16.0.pkg:ice_ddp:0x01031000 .include From owner-svn-src-all@freebsd.org Fri Sep 4 18:15:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E999A3CAD43; Fri, 4 Sep 2020 18:15:07 +0000 (UTC) (envelope-from gallatin@cs.duke.edu) Received: from duke.cs.duke.edu (duke.cs.duke.edu [152.3.140.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjm6z1FfTz4PPR; Fri, 4 Sep 2020 18:15:06 +0000 (UTC) (envelope-from gallatin@cs.duke.edu) Received: from [192.168.1.2] (pool-74-110-137-7.rcmdva.fios.verizon.net [74.110.137.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: gallatin) by duke.cs.duke.edu (Postfix) with ESMTPSA id 4EFBC270033E; Fri, 4 Sep 2020 14:15:05 -0400 (EDT) DMARC-Filter: OpenDMARC Filter v1.3.1 duke.cs.duke.edu 4EFBC270033E DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cs.duke.edu; s=mail0816; t=1599243305; bh=v9/u4lB3u1mEodHLzi588LmaRUoD1A+bFCuGi9NuQ5I=; h=Subject:To:From:Date:From; b=BCaAV3SQK+Z/q7C+7tutGeaM91SQcO9DY6qZ+tUfYM2LKUGewh38tTwnnRu+KVjFh osYJIwaIBnRwp2EbdtcXjZL/Fc+vr9LOTxnIHl0T+t/HHwsoPvH3YAMwAfvk3AoMK4 zqiS3Z86OBLC65mJgtvSL5JPPWhgbPwrylrYqxDC3JXDlkzXkjQ8cH8F8hIyAMZone 2GSmT3x6FXVqWt0kqeRm39rNeT0xITCLlLt1DF4wy8EAbBIWIoBvwsR5OcUHCufP4U TTOAuhBBCORfW4taa/y5Cn8ZsMsVODdqkLgSXsTOJ5fxKwYFL+cj/AW9r3rNfXpbBJ ++DKy6REQJcqg== Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Alexey Dokuchaev , Michael Tuexen Cc: Pedro Giffuni , Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> From: Andrew Gallatin Message-ID: <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> Date: Fri, 4 Sep 2020 14:15:04 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200903024226.GA54078@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Bjm6z1FfTz4PPR X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=cs.duke.edu header.s=mail0816 header.b=BCaAV3SQ; dmarc=pass (policy=none) header.from=cs.duke.edu; spf=pass (mx1.freebsd.org: domain of gallatin@cs.duke.edu designates 152.3.140.1 as permitted sender) smtp.mailfrom=gallatin@cs.duke.edu X-Spamd-Result: default: False [-5.01 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[cs.duke.edu:s=mail0816]; FREEFALL_USER(0.00)[gallatin]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:152.3.140.0/23]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.00)[-0.997]; DWL_DNSWL_LOW(-1.00)[duke.edu:dkim]; RCVD_IN_DNSWL_LOW(-0.10)[152.3.140.1:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[cs.duke.edu:+]; DMARC_POLICY_ALLOW(-0.50)[cs.duke.edu,none]; RCPT_COUNT_SEVEN(0.00)[7]; NEURAL_HAM_SHORT(-0.94)[-0.938]; RECEIVED_SPAMHAUS_PBL(0.00)[74.110.137.7:received]; NEURAL_HAM_MEDIUM(-0.97)[-0.972]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13371, ipnet:152.3.128.0/17, country:US]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 18:15:08 -0000 On 2020-09-02 22:42, Alexey Dokuchaev wrote: >> I want to understand which rules have to be followed (and why). > > In general, FreeBSD code we write should follow style(9); it specifically > mentions "do not add whitespace at the end of a line" and "... followed by > one blank line" but doesn't go as far as explicitly forbidding multiple > consecutive newlines. To me it's pretty obvious, and while others might > have different sens esthe'tique, usually it is lack thereof (no offense) > or mere ignorance. > > ./danfe > > P.S. Old-school tools like indent(1) or `uncrustify' were never widely > popular, I guess, because they did not possess enough knowledge of the > language to always produce correct results. Perhaps new era tools, like > clang-format, could bring this to a whole new level. > I do the upstream sync between the Netflix tree and FreeBSD-current about every 3 weeks (unless glebius beats me to the punch and does it first :). I anticipate that this blank line sweep will cause lots of conflicts for us. I understand this is progress, and I don't object, and I'm not asking for a revert, but please understand that cleanups like this do have hidden costs. I expect that other commercial entities who contribute to FreeBSD will have the same issue, and I also anticipate it will cause problems with MFCs Rather than doing more sweeps like this, is it possible to come up with a clang-format rule that's 95% of style(9), do just one more sweep of the tree to apply that rule, add that rule as a pre-commit hook, and be done forever with style(9) related changes? Thanks, Drew From owner-svn-src-all@freebsd.org Fri Sep 4 18:18:06 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1F5A23CAE43; Fri, 4 Sep 2020 18:18:06 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjmBQ031Hz4PdM; Fri, 4 Sep 2020 18:18:06 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8FBA10BB7; Fri, 4 Sep 2020 18:18:05 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084II5Z2095046; Fri, 4 Sep 2020 18:18:05 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084II5HI095045; Fri, 4 Sep 2020 18:18:05 GMT (envelope-from bz@FreeBSD.org) Message-Id: <202009041818.084II5HI095045@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 4 Sep 2020 18:18:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365333 - head/sys/cam X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: head/sys/cam X-SVN-Commit-Revision: 365333 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 18:18:06 -0000 Author: bz Date: Fri Sep 4 18:18:05 2020 New Revision: 365333 URL: https://svnweb.freebsd.org/changeset/base/365333 Log: cam_sim: harmonize code related to acquiring a mtx cam_sim_free(), cam_sim_release(), and cam_sim_hold() all assign a mtx variable during declaration and then if NULL or the mtx is held may re-asign the variable and/or acquire/release a lock. Harmonize the code, avoiding double assignments and make it look the same for all three function (with cam_sim_free() not needing an extra case). No functional changes intended. Reviewed by: imp; no-objections by: mav MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D26286 Modified: head/sys/cam/cam_sim.c Modified: head/sys/cam/cam_sim.c ============================================================================== --- head/sys/cam/cam_sim.c Fri Sep 4 17:37:58 2020 (r365332) +++ head/sys/cam/cam_sim.c Fri Sep 4 18:18:05 2020 (r365333) @@ -124,14 +124,15 @@ cam_sim_alloc_dev(sim_action_func sim_action, sim_poll void cam_sim_free(struct cam_sim *sim, int free_devq) { - struct mtx *mtx = sim->mtx; + struct mtx *mtx; int error; - if (mtx) { - mtx_assert(mtx, MA_OWNED); - } else { + if (sim->mtx == NULL) { mtx = &cam_sim_free_mtx; mtx_lock(mtx); + } else { + mtx = sim->mtx; + mtx_assert(mtx, MA_OWNED); } sim->refcount--; if (sim->refcount > 0) { @@ -139,7 +140,7 @@ cam_sim_free(struct cam_sim *sim, int free_devq) KASSERT(error == 0, ("invalid error value for msleep(9)")); } KASSERT(sim->refcount == 0, ("sim->refcount == 0")); - if (sim->mtx == NULL) + if (mtx == &cam_sim_free_mtx) /* sim->mtx == NULL */ mtx_unlock(mtx); if (free_devq) @@ -150,17 +151,16 @@ cam_sim_free(struct cam_sim *sim, int free_devq) void cam_sim_release(struct cam_sim *sim) { - struct mtx *mtx = sim->mtx; + struct mtx *mtx; - if (mtx) { - if (!mtx_owned(mtx)) - mtx_lock(mtx); - else - mtx = NULL; - } else { + if (sim->mtx == NULL) mtx = &cam_sim_free_mtx; + else if (!mtx_owned(sim->mtx)) + mtx = sim->mtx; + else + mtx = NULL; /* We hold the lock. */ + if (mtx) mtx_lock(mtx); - } KASSERT(sim->refcount >= 1, ("sim->refcount >= 1")); sim->refcount--; if (sim->refcount == 0) @@ -172,17 +172,16 @@ cam_sim_release(struct cam_sim *sim) void cam_sim_hold(struct cam_sim *sim) { - struct mtx *mtx = sim->mtx; + struct mtx *mtx; - if (mtx) { - if (!mtx_owned(mtx)) - mtx_lock(mtx); - else - mtx = NULL; - } else { + if (sim->mtx == NULL) mtx = &cam_sim_free_mtx; + else if (!mtx_owned(sim->mtx)) + mtx = sim->mtx; + else + mtx = NULL; /* We hold the lock. */ + if (mtx) mtx_lock(mtx); - } KASSERT(sim->refcount >= 1, ("sim->refcount >= 1")); sim->refcount++; if (mtx) From owner-svn-src-all@freebsd.org Fri Sep 4 18:21:32 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 73E203CB01E; Fri, 4 Sep 2020 18:21:32 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjmGN2X8dz4Ppb; Fri, 4 Sep 2020 18:21:32 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from auth2-smtp.messagingengine.com (auth2-smtp.messagingengine.com [66.111.4.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bdragon/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 39D641B830; Fri, 4 Sep 2020 18:21:32 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id D5EE527C0054; Fri, 4 Sep 2020 14:21:31 -0400 (EDT) Received: from imap1 ([10.202.2.51]) by compute4.internal (MEProxy); Fri, 04 Sep 2020 14:21:31 -0400 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudegfedguddvhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enfghrlhcuvffnffculddutddmnecujfgurhepofgfggfkjghffffhvffutgesthdtredt reerjeenucfhrhhomhepfdeurhgrnhguohhnuceuvghrghhrvghnfdcuoegsughrrghgoh hnsefhrhgvvgeuufffrdhorhhgqeenucggtffrrghtthgvrhhnpeejhfeftddutdelgeek gedtgeejkeffvdejtddthefggfevuefggfefledvgefhgfenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegsughrrghgohhnodhmvghsmhhtphgr uhhthhhpvghrshhonhgrlhhithihqddutdegvdefheekieegqddukedutdekheduqdgsug hrrghgohhnpeephfhrvggvuefuffdrohhrghesihhmrghprdgttg X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 21AB6C200A5; Fri, 4 Sep 2020 14:21:31 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.0-259-g88fbbfa-fm-20200903.003-g88fbbfa3 Mime-Version: 1.0 Message-Id: In-Reply-To: <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> Date: Fri, 04 Sep 2020 13:21:11 -0500 From: "Brandon Bergren" To: "Andrew Gallatin" , "Alexey Dokuchaev" , "Michael Tuexen" Cc: "Pedro Giffuni" , "Mateusz Guzik" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: =?UTF-8?Q?Re:_svn_commit:_r365071_-_in_head/sys:_net_net/altq_net/route_?= =?UTF-8?Q?net80211_netgraph_netgraph/atm_netgraph/atm/ccatm_netgraph/at?= =?UTF-8?Q?m/sscfu_netgraph/atm/sscop_netgraph/atm/uni_netgraph/bluetoot?= =?UTF-8?Q?h/common_netgraph...?= Content-Type: text/plain X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 18:21:32 -0000 On Fri, Sep 4, 2020, at 1:15 PM, Andrew Gallatin wrote: > Rather than doing more sweeps like this, is it possible to > come up with a clang-format rule that's 95% of style(9), do > just one more sweep of the tree to apply that rule, add that > rule as a pre-commit hook, and be done forever with style(9) > related changes? Only for a subset of the tree. sys/contrib for example can't be subject to this sort of auto-formatting. > -- Brandon Bergren bdragon@FreeBSD.org From owner-svn-src-all@freebsd.org Fri Sep 4 18:26:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6A11D3CB0FE; Fri, 4 Sep 2020 18:26:36 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjmND2DV6z4PvR; Fri, 4 Sep 2020 18:26:36 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2FD2210E22; Fri, 4 Sep 2020 18:26:36 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084IQapW001535; Fri, 4 Sep 2020 18:26:36 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084IQaWX001534; Fri, 4 Sep 2020 18:26:36 GMT (envelope-from bz@FreeBSD.org) Message-Id: <202009041826.084IQaWX001534@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 4 Sep 2020 18:26:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365334 - head/sys/dev/usb/storage X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: head/sys/dev/usb/storage X-SVN-Commit-Revision: 365334 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 18:26:36 -0000 Author: bz Date: Fri Sep 4 18:26:35 2020 New Revision: 365334 URL: https://svnweb.freebsd.org/changeset/base/365334 Log: umass: fix a cam_sim leak in error case While debugging a hang I noticed that in case of error in umass_cam_attach_sim() we miss a cam_sim_free() call. Added that to not leak resources. Reviewed by: hselasky MFC after: 3 days Differential Revision: D26287 Modified: head/sys/dev/usb/storage/umass.c Modified: head/sys/dev/usb/storage/umass.c ============================================================================== --- head/sys/dev/usb/storage/umass.c Fri Sep 4 18:18:05 2020 (r365333) +++ head/sys/dev/usb/storage/umass.c Fri Sep 4 18:26:35 2020 (r365334) @@ -2094,6 +2094,7 @@ umass_cam_attach_sim(struct umass_softc *sc) if (xpt_bus_register(sc->sc_sim, sc->sc_dev, sc->sc_unit) != CAM_SUCCESS) { + cam_sim_free(sc->sc_sim, /* free_devq */ TRUE); mtx_unlock(&sc->sc_mtx); return (ENOMEM); } From owner-svn-src-all@freebsd.org Fri Sep 4 18:29:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CA8273CB469; Fri, 4 Sep 2020 18:29:59 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjmS74zV8z4Qv2; Fri, 4 Sep 2020 18:29:59 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F65910A5D; Fri, 4 Sep 2020 18:29:59 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084ITx7t002034; Fri, 4 Sep 2020 18:29:59 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084ITx6G002032; Fri, 4 Sep 2020 18:29:59 GMT (envelope-from bz@FreeBSD.org) Message-Id: <202009041829.084ITx6G002032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 4 Sep 2020 18:29:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365335 - head/sys/dev/usb/storage X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: head/sys/dev/usb/storage X-SVN-Commit-Revision: 365335 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 18:29:59 -0000 Author: bz Date: Fri Sep 4 18:29:59 2020 New Revision: 365335 URL: https://svnweb.freebsd.org/changeset/base/365335 Log: umass: enhance debugging Investigating a hang I found having some more error information available would be helpful, so be more verbose and also tell cam/xpt status in case of error/panic. Reviewed by: hselasky MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D26287 Modified: head/sys/dev/usb/storage/umass.c Modified: head/sys/dev/usb/storage/umass.c ============================================================================== --- head/sys/dev/usb/storage/umass.c Fri Sep 4 18:26:35 2020 (r365334) +++ head/sys/dev/usb/storage/umass.c Fri Sep 4 18:29:59 2020 (r365335) @@ -2063,6 +2063,7 @@ static int umass_cam_attach_sim(struct umass_softc *sc) { struct cam_devq *devq; /* Per device Queue */ + cam_status status; /* * A HBA is attached to the CAM layer. @@ -2091,11 +2092,12 @@ umass_cam_attach_sim(struct umass_softc *sc) } mtx_lock(&sc->sc_mtx); - - if (xpt_bus_register(sc->sc_sim, sc->sc_dev, - sc->sc_unit) != CAM_SUCCESS) { + status = xpt_bus_register(sc->sc_sim, sc->sc_dev, sc->sc_unit); + if (status != CAM_SUCCESS) { cam_sim_free(sc->sc_sim, /* free_devq */ TRUE); mtx_unlock(&sc->sc_mtx); + printf("%s: xpt_bus_register failed with status %#x\n", + __func__, status); return (ENOMEM); } mtx_unlock(&sc->sc_mtx); @@ -2121,14 +2123,22 @@ umass_cam_attach(struct umass_softc *sc) static void umass_cam_detach_sim(struct umass_softc *sc) { + cam_status status; + if (sc->sc_sim != NULL) { - if (xpt_bus_deregister(cam_sim_path(sc->sc_sim))) { + status = xpt_bus_deregister(cam_sim_path(sc->sc_sim)); + if (status == CAM_REQ_CMP) { /* accessing the softc is not possible after this */ sc->sc_sim->softc = NULL; + DPRINTF(sc, UDMASS_SCSI, "%s: %s:%d:%d caling " + "cam_sim_free sim %p refc %u mtx %p\n", + __func__, sc->sc_name, cam_sim_path(sc->sc_sim), + sc->sc_unit, sc->sc_sim, + sc->sc_sim->refcount, sc->sc_sim->mtx); cam_sim_free(sc->sc_sim, /* free_devq */ TRUE); } else { - panic("%s: CAM layer is busy\n", - sc->sc_name); + panic("%s: %s: CAM layer is busy: %#x\n", + __func__, sc->sc_name, status); } sc->sc_sim = NULL; } From owner-svn-src-all@freebsd.org Fri Sep 4 18:55:04 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 82F443CC1FD; Fri, 4 Sep 2020 18:55:04 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjn142tRTz4Sgs; Fri, 4 Sep 2020 18:55:04 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 421C210FDF; Fri, 4 Sep 2020 18:55:04 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084It42K019952; Fri, 4 Sep 2020 18:55:04 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084It4oE019951; Fri, 4 Sep 2020 18:55:04 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202009041855.084It4oE019951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 4 Sep 2020 18:55:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365336 - head/sys/modules/zfs X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/modules/zfs X-SVN-Commit-Revision: 365336 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 18:55:04 -0000 Author: markj Date: Fri Sep 4 18:55:03 2020 New Revision: 365336 URL: https://svnweb.freebsd.org/changeset/base/365336 Log: Stop setting DEBUG_FLAGS in the zfs.ko Makefile. Rely on system settings to decide whether or not to build with debug symbols and extract them to a separate file. Reported and tested by: rm Modified: head/sys/modules/zfs/Makefile Modified: head/sys/modules/zfs/Makefile ============================================================================== --- head/sys/modules/zfs/Makefile Fri Sep 4 18:29:59 2020 (r365335) +++ head/sys/modules/zfs/Makefile Fri Sep 4 18:55:03 2020 (r365336) @@ -44,8 +44,6 @@ CFLAGS+= -DDEBUG_VFS_LOCKS CFLAGS+= -fprofile-arcs -ftest-coverage .endif -DEBUG_FLAGS=-g - .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm" CFLAGS+= -DBITS_PER_LONG=32 From owner-svn-src-all@freebsd.org Fri Sep 4 19:01:29 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A7A993CCAA8; Fri, 4 Sep 2020 19:01:29 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjn8S3nZDz4TQ3; Fri, 4 Sep 2020 19:01:28 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wr1-x42e.google.com with SMTP id c15so7873342wrs.11; Fri, 04 Sep 2020 12:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=h97cv+DfIJbjcuJrRJhEvReF/IdLrZvleWQWewth5JM=; b=YpbKE5UE/PTaxvixj45PUzeKwGPMejGix7wcuUQCw6qdWaE6WUOnj6KQSguIHT2MYQ VJTIU6YaFYtCCVv5lde5s2s5UJWXoC4pbE0/CjINr7iPNIGoGME1XmG+McEltfLOi5Vk 4Fc/3qCvyBK8T9OVrLCvSW5lwRE5vkjrxSGlZ2sIc8u9eTO/TdPwqUcq0nEeU1Q7UZzt MI4m0BJbJI7pQaMWDK9adQ18EmsxxTuEQdu7ZEu5ZG7ls0duSMbngnENubGvOfUEooP+ 8yHlm9HCjpYPeKFExPXix5va6drBMYXD4tG7WmZBiseNXf6QP72JwS/n9RTx7MZOHxx/ 2/sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=h97cv+DfIJbjcuJrRJhEvReF/IdLrZvleWQWewth5JM=; b=YJvwQt7aDZ9rndJ00i4GSPUYg/YU0b53rrWKmeNtBDfxox6B9KjkDKlAc+Oz01aHcM QRUw7GJQ8UF1949RkD0Hg/91h+QDO3ZUEtsQhQciq7qThvghGuy/kKk8Q6vvGRK0C68r T8k44wqn5bkcZUwjZ0Yiy3EJxjDcNmU3sTMvqCfJqVPxVklM7ydyXQx3kN+pHH9o7nMh yEcrmCdb3nNnVtKPZxCIdlTpU3b8i4cyKoEtEUnsNqZEfqc8HEN5Nszhy4Qeyd8mcKEo 61MtHPOLuZojTxvxd0C+baxEDFM+jaAtQz6lh14EzzomGxfvd07kpwDdsq9aCPzZE7OA ItqA== X-Gm-Message-State: AOAM533cVyj1wH1XULctnwCox890AM6hSylzQgR9gP6anJXGILooS0jj caVQXEDWYOiCRw7krgaUeRQ6yRQK5E49blIzlQ7+ojCpcco= X-Google-Smtp-Source: ABdhPJycocwRw5SjmvtpAuFmJPqbD5U30FoIH7nhPYhNk8ntyyCkB2+2dgZk4A041Cpr+aCODP5lIWOG42Z7qvJEMKg= X-Received: by 2002:a5d:4ccc:: with SMTP id c12mr8771132wrt.160.1599246086945; Fri, 04 Sep 2020 12:01:26 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6000:187:0:0:0:0 with HTTP; Fri, 4 Sep 2020 12:01:25 -0700 (PDT) In-Reply-To: <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> From: Mateusz Guzik Date: Fri, 4 Sep 2020 21:01:25 +0200 Message-ID: Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Andrew Gallatin Cc: Alexey Dokuchaev , Michael Tuexen , Pedro Giffuni , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Bjn8S3nZDz4TQ3 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=YpbKE5UE; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2a00:1450:4864:20::42e as permitted sender) smtp.mailfrom=mjguzik@gmail.com X-Spamd-Result: default: False [-3.53 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-0.97)[-0.969]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::42e:from]; NEURAL_HAM_SHORT(-0.57)[-0.566]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 19:01:29 -0000 On 9/4/20, Andrew Gallatin wrote: > On 2020-09-02 22:42, Alexey Dokuchaev wrote: > >>> I want to understand which rules have to be followed (and why). >> >> In general, FreeBSD code we write should follow style(9); it specifically >> mentions "do not add whitespace at the end of a line" and "... followed >> by >> one blank line" but doesn't go as far as explicitly forbidding multiple >> consecutive newlines. To me it's pretty obvious, and while others might >> have different sens esthe'tique, usually it is lack thereof (no offense) >> or mere ignorance. >> >> ./danfe >> >> P.S. Old-school tools like indent(1) or `uncrustify' were never widely >> popular, I guess, because they did not possess enough knowledge of the >> language to always produce correct results. Perhaps new era tools, like >> clang-format, could bring this to a whole new level. >> > > I do the upstream sync between the Netflix tree and > FreeBSD-current about every 3 weeks (unless glebius beats > me to the punch and does it first :). I anticipate that > this blank line sweep will cause lots of conflicts for us. > I understand this is progress, and I don't object, and I'm > not asking for a revert, but please understand that cleanups > like this do have hidden costs. I expect that other commercial > entities who contribute to FreeBSD will have the same issue, > and I also anticipate it will cause problems with MFCs > > Rather than doing more sweeps like this, is it possible to > come up with a clang-format rule that's 95% of style(9), do > just one more sweep of the tree to apply that rule, add that > rule as a pre-commit hook, and be done forever with style(9) > related changes? > For starters I completely agree with the need for tooling to prevent addition of more non-conformant code, but I'm leaving this for someone else. I don't intend to do any more sweeps (modulo perhaps vfs code). I would like to note that directories like contrib, zfs, netmap and others which have known upstream got intentionally skipped during to not mess with imports. Of course this does not necessary cover all merges. Merges regardless of the above (or going the other way) should not be very problematic though. No design changes are needed, let alone any testing on account of the above. Worst case this is just minor annoyance which can be cleaned up while watching The Sopranos with one eye. Note that ultimately there is a hidden cost to previous state as well. What perhaps is not clear from the commit message and wont be seen unless you scrutinize the diffs, some lines got changed from having tabs and/or spaces instead of just a newline. This kind of stuff is jumps at you every time if you have an editor configured to report it (you can find a vim snipped at the bottom of interested). That being said, I understand this generated work for some people but I don't think it consitutes a problem. Also I don't think a heads up would change anything here. If I was planning more invasive work I would definitely try to coordinate. Also note the changeset does not interfere with git blame (unless you want to look at empty lines). Here is vim snipped I stole from someone several years back: highlight ExtraWhitespace ctermbg=red guibg=red autocmd BufWinEnter *.{c,pl,pm} match ExtraWhitespace /^\s* \|\s\+$/ autocmd InsertEnter *.{c,pl,pm} match ExtraWhitespace /^\s* \|\s\+\%#\@ From owner-svn-src-all@freebsd.org Fri Sep 4 19:24:29 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6EDC83CD527; Fri, 4 Sep 2020 19:24:29 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjng03T3cz4VQM; Fri, 4 Sep 2020 19:24:28 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A3AD11735; Fri, 4 Sep 2020 19:24:28 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084JOR5X038283; Fri, 4 Sep 2020 19:24:27 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084JORGv038282; Fri, 4 Sep 2020 19:24:27 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009041924.084JORGv038282@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Fri, 4 Sep 2020 19:24:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365337 - head/tests/sys/kern X-SVN-Group: head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: head/tests/sys/kern X-SVN-Commit-Revision: 365337 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 19:24:29 -0000 Author: lwhsu Date: Fri Sep 4 19:24:27 2020 New Revision: 365337 URL: https://svnweb.freebsd.org/changeset/base/365337 Log: Initialize len to avoid ENOMEM from sysctl(3). PR: 248933 Sponsored by: The FreeBSD Foundation Modified: head/tests/sys/kern/kern_copyin.c Modified: head/tests/sys/kern/kern_copyin.c ============================================================================== --- head/tests/sys/kern/kern_copyin.c Fri Sep 4 18:55:03 2020 (r365336) +++ head/tests/sys/kern/kern_copyin.c Fri Sep 4 19:24:27 2020 (r365337) @@ -66,6 +66,7 @@ get_maxuser_address(void) mib[1] = KERN_PROC; mib[2] = KERN_PROC_PS_STRINGS; mib[3] = getpid(); + len = sizeof(psstrings); error = sysctl(mib, nitems(mib), &psstrings, &len, NULL, 0); if (error != 0) return (0); From owner-svn-src-all@freebsd.org Fri Sep 4 19:30:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 48D423CD571; Fri, 4 Sep 2020 19:30:16 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjnnh1DD2z4Vmj; Fri, 4 Sep 2020 19:30:16 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0D53411BD9; Fri, 4 Sep 2020 19:30:16 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084JUFGa038855; Fri, 4 Sep 2020 19:30:15 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084JUF9p038854; Fri, 4 Sep 2020 19:30:15 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009041930.084JUF9p038854@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Fri, 4 Sep 2020 19:30:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365338 - head/sys/fs/tmpfs X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/fs/tmpfs X-SVN-Commit-Revision: 365338 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 19:30:16 -0000 Author: mjg Date: Fri Sep 4 19:30:15 2020 New Revision: 365338 URL: https://svnweb.freebsd.org/changeset/base/365338 Log: tmpfs: drop spurious cache_purge in tmpfs_reclaim vgone already performs it. Modified: head/sys/fs/tmpfs/tmpfs_vnops.c Modified: head/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vnops.c Fri Sep 4 19:24:27 2020 (r365337) +++ head/sys/fs/tmpfs/tmpfs_vnops.c Fri Sep 4 19:30:15 2020 (r365338) @@ -1435,8 +1435,6 @@ tmpfs_reclaim(struct vop_reclaim_args *v) if (vp->v_type == VREG) tmpfs_destroy_vobject(vp, node->tn_reg.tn_aobj); vp->v_object = NULL; - if (tmpfs_use_nc(vp)) - cache_purge(vp); TMPFS_NODE_LOCK(node); tmpfs_free_vp(vp); From owner-svn-src-all@freebsd.org Fri Sep 4 21:21:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C9B283CFA74; Fri, 4 Sep 2020 21:21:25 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjrFx5LDnz4cXm; Fri, 4 Sep 2020 21:21:25 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A649129E8; Fri, 4 Sep 2020 21:21:25 +0000 (UTC) (envelope-from erj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084LLPJ0008843; Fri, 4 Sep 2020 21:21:25 GMT (envelope-from erj@FreeBSD.org) Received: (from erj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084LLNIJ008833; Fri, 4 Sep 2020 21:21:23 GMT (envelope-from erj@FreeBSD.org) Message-Id: <202009042121.084LLNIJ008833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org using -f From: Eric Joyner Date: Fri, 4 Sep 2020 21:21:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365339 - stable/12/sys/dev/ixl X-SVN-Group: stable-12 X-SVN-Commit-Author: erj X-SVN-Commit-Paths: stable/12/sys/dev/ixl X-SVN-Commit-Revision: 365339 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 21:21:25 -0000 Author: erj Date: Fri Sep 4 21:21:23 2020 New Revision: 365339 URL: https://svnweb.freebsd.org/changeset/base/365339 Log: MFC r365231: ixl(4): Add support for X710-T*L devices PR: 249058 Sponsored by: Intel Corporation Modified: stable/12/sys/dev/ixl/i40e_adminq_cmd.h stable/12/sys/dev/ixl/i40e_common.c stable/12/sys/dev/ixl/i40e_devids.h stable/12/sys/dev/ixl/i40e_prototype.h stable/12/sys/dev/ixl/i40e_type.h stable/12/sys/dev/ixl/if_ixl.c stable/12/sys/dev/ixl/ixl_pf.h stable/12/sys/dev/ixl/ixl_pf_main.c stable/12/sys/dev/ixl/virtchnl.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/ixl/i40e_adminq_cmd.h ============================================================================== --- stable/12/sys/dev/ixl/i40e_adminq_cmd.h Fri Sep 4 19:30:15 2020 (r365338) +++ stable/12/sys/dev/ixl/i40e_adminq_cmd.h Fri Sep 4 21:21:23 2020 (r365339) @@ -1940,6 +1940,8 @@ enum i40e_aq_phy_type { I40E_PHY_TYPE_25GBASE_LR = 0x22, I40E_PHY_TYPE_25GBASE_AOC = 0x23, I40E_PHY_TYPE_25GBASE_ACC = 0x24, + I40E_PHY_TYPE_2_5GBASE_T = 0x30, + I40E_PHY_TYPE_5GBASE_T = 0x31, I40E_PHY_TYPE_MAX, I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP = 0xFD, I40E_PHY_TYPE_EMPTY = 0xFE, @@ -1981,19 +1983,25 @@ enum i40e_aq_phy_type { BIT_ULL(I40E_PHY_TYPE_25GBASE_SR) | \ BIT_ULL(I40E_PHY_TYPE_25GBASE_LR) | \ BIT_ULL(I40E_PHY_TYPE_25GBASE_AOC) | \ - BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC)) + BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC) | \ + BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T) | \ + BIT_ULL(I40E_PHY_TYPE_5GBASE_T)) +#define I40E_LINK_SPEED_2_5GB_SHIFT 0x0 #define I40E_LINK_SPEED_100MB_SHIFT 0x1 #define I40E_LINK_SPEED_1000MB_SHIFT 0x2 #define I40E_LINK_SPEED_10GB_SHIFT 0x3 #define I40E_LINK_SPEED_40GB_SHIFT 0x4 #define I40E_LINK_SPEED_20GB_SHIFT 0x5 #define I40E_LINK_SPEED_25GB_SHIFT 0x6 +#define I40E_LINK_SPEED_5GB_SHIFT 0x7 enum i40e_aq_link_speed { I40E_LINK_SPEED_UNKNOWN = 0, I40E_LINK_SPEED_100MB = (1 << I40E_LINK_SPEED_100MB_SHIFT), I40E_LINK_SPEED_1GB = (1 << I40E_LINK_SPEED_1000MB_SHIFT), + I40E_LINK_SPEED_2_5GB = (1 << I40E_LINK_SPEED_2_5GB_SHIFT), + I40E_LINK_SPEED_5GB = (1 << I40E_LINK_SPEED_5GB_SHIFT), I40E_LINK_SPEED_10GB = (1 << I40E_LINK_SPEED_10GB_SHIFT), I40E_LINK_SPEED_40GB = (1 << I40E_LINK_SPEED_40GB_SHIFT), I40E_LINK_SPEED_20GB = (1 << I40E_LINK_SPEED_20GB_SHIFT), @@ -2030,6 +2038,8 @@ struct i40e_aq_get_phy_abilities_resp { #define I40E_AQ_EEE_1000BASE_KX 0x0010 #define I40E_AQ_EEE_10GBASE_KX4 0x0020 #define I40E_AQ_EEE_10GBASE_KR 0x0040 +#define I40E_AQ_EEE_2_5GBASE_T 0x0100 +#define I40E_AQ_EEE_5GBASE_T 0x0200 __le32 eeer_val; u8 d3_lpan; #define I40E_AQ_SET_PHY_D3_LPAN_ENA 0x01 @@ -2040,6 +2050,8 @@ struct i40e_aq_get_phy_abilities_resp { #define I40E_AQ_PHY_TYPE_EXT_25G_LR 0x08 #define I40E_AQ_PHY_TYPE_EXT_25G_AOC 0x10 #define I40E_AQ_PHY_TYPE_EXT_25G_ACC 0x20 +#define I40E_AQ_PHY_TYPE_EXT_2_5GBASE_T 0x40 +#define I40E_AQ_PHY_TYPE_EXT_5GBASE_T 0x80 u8 fec_cfg_curr_mod_ext_info; #define I40E_AQ_ENABLE_FEC_KR 0x01 #define I40E_AQ_ENABLE_FEC_RS 0x02 @@ -2282,15 +2294,32 @@ enum i40e_aq_phy_reg_type { I40E_AQC_PHY_REG_EXERNAL_MODULE = 0x3 }; +#pragma pack(1) /* Run PHY Activity (0x0626) */ struct i40e_aqc_run_phy_activity { - __le16 activity_id; - u8 flags; - u8 reserved1; - __le32 control; - __le32 data; - u8 reserved2[4]; + u8 cmd_flags; + __le16 activity_id; +#define I40E_AQ_RUN_PHY_ACT_ID_USR_DFND 0x10 + u8 reserved; + union { + struct { + __le32 dnl_opcode; +#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT_DUR 0x801a +#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT 0x801b +#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_DUR 0x1801b + __le32 data; + u8 reserved2[4]; + } cmd; + struct { + __le32 cmd_status; +#define I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC 0x4 +#define I40E_AQ_RUN_PHY_ACT_CMD_STAT_MASK 0xFFFF + __le32 data0; + __le32 data1; + } resp; + } params; }; +#pragma pack() I40E_CHECK_CMD_LENGTH(i40e_aqc_run_phy_activity); Modified: stable/12/sys/dev/ixl/i40e_common.c ============================================================================== --- stable/12/sys/dev/ixl/i40e_common.c Fri Sep 4 19:30:15 2020 (r365338) +++ stable/12/sys/dev/ixl/i40e_common.c Fri Sep 4 21:21:23 2020 (r365339) @@ -62,6 +62,10 @@ enum i40e_status_code i40e_set_mac_type(struct i40e_hw case I40E_DEV_ID_QSFP_C: case I40E_DEV_ID_10G_BASE_T: case I40E_DEV_ID_10G_BASE_T4: + case I40E_DEV_ID_10G_BASE_T_BC: + case I40E_DEV_ID_10G_B: + case I40E_DEV_ID_10G_SFP: + case I40E_DEV_ID_5G_BASE_T_BC: case I40E_DEV_ID_20G_KR2: case I40E_DEV_ID_20G_KR2_A: case I40E_DEV_ID_25G_B: @@ -1251,6 +1255,8 @@ static enum i40e_media_type i40e_get_media_type(struct break; case I40E_PHY_TYPE_100BASE_TX: case I40E_PHY_TYPE_1000BASE_T: + case I40E_PHY_TYPE_2_5GBASE_T: + case I40E_PHY_TYPE_5GBASE_T: case I40E_PHY_TYPE_10GBASE_T: media = I40E_MEDIA_TYPE_BASET; break; @@ -1516,7 +1522,8 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int id u32 gpio_val = 0; u32 port; - if (!hw->func_caps.led[idx]) + if (!I40E_IS_X710TL_DEVICE(hw->device_id) && + !hw->func_caps.led[idx]) return 0; gpio_val = rd32(hw, I40E_GLGEN_GPIO_CTL(idx)); port = (gpio_val & I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK) >> @@ -1635,6 +1642,19 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool b break; } + if (I40E_IS_X710TL_DEVICE(hw->device_id)) { + u32 pin_func = 0; + + if (mode & I40E_FW_LED) + pin_func = I40E_PIN_FUNC_SDP; + else + pin_func = I40E_PIN_FUNC_LED; + + gpio_val &= ~I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK; + gpio_val |= ((pin_func << + I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) & + I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK); + } gpio_val &= ~I40E_GLGEN_GPIO_CTL_LED_MODE_MASK; /* this & is a bit of paranoia, but serves as a range check */ gpio_val |= ((mode << I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) & @@ -6230,7 +6250,72 @@ enum i40e_status_code i40e_aq_debug_dump(struct i40e_h return status; } + /** + * i40e_enable_eee + * @hw: pointer to the hardware structure + * @enable: state of Energy Efficient Ethernet mode to be set + * + * Enables or disables Energy Efficient Ethernet (EEE) mode + * accordingly to @enable parameter. + **/ +enum i40e_status_code i40e_enable_eee(struct i40e_hw *hw, bool enable) +{ + struct i40e_aq_get_phy_abilities_resp abilities; + struct i40e_aq_set_phy_config config; + enum i40e_status_code status; + __le16 eee_capability; + + /* Get initial PHY capabilities */ + status = i40e_aq_get_phy_capabilities(hw, FALSE, TRUE, &abilities, + NULL); + if (status) + goto err; + + /* Check whether NIC configuration is compatible with Energy Efficient + * Ethernet (EEE) mode. + */ + if (abilities.eee_capability == 0) { + status = I40E_ERR_CONFIG; + goto err; + } + + /* Cache initial EEE capability */ + eee_capability = abilities.eee_capability; + + /* Get current configuration */ + status = i40e_aq_get_phy_capabilities(hw, FALSE, false, &abilities, + NULL); + if (status) + goto err; + + /* Cache current configuration */ + config.phy_type = abilities.phy_type; + config.phy_type_ext = abilities.phy_type_ext; + config.link_speed = abilities.link_speed; + config.abilities = abilities.abilities | + I40E_AQ_PHY_ENABLE_ATOMIC_LINK; + config.eeer = abilities.eeer_val; + config.low_power_ctrl = abilities.d3_lpan; + config.fec_config = abilities.fec_cfg_curr_mod_ext_info & + I40E_AQ_PHY_FEC_CONFIG_MASK; + + /* Set desired EEE state */ + if (enable) { + config.eee_capability = eee_capability; + config.eeer |= I40E_PRTPM_EEER_TX_LPI_EN_MASK; + } else { + config.eee_capability = 0; + config.eeer &= ~I40E_PRTPM_EEER_TX_LPI_EN_MASK; + } + + /* Save modified config */ + status = i40e_aq_set_phy_config(hw, &config, NULL); +err: + return status; +} + +/** * i40e_read_bw_from_alt_ram * @hw: pointer to the hardware structure * @max_bw: pointer for max_bw read @@ -6550,6 +6635,8 @@ enum i40e_status_code i40e_write_phy_register(struct i break; case I40E_DEV_ID_10G_BASE_T: case I40E_DEV_ID_10G_BASE_T4: + case I40E_DEV_ID_10G_BASE_T_BC: + case I40E_DEV_ID_5G_BASE_T_BC: case I40E_DEV_ID_10G_BASE_T_X722: case I40E_DEV_ID_25G_B: case I40E_DEV_ID_25G_SFP28: @@ -6586,6 +6673,8 @@ enum i40e_status_code i40e_read_phy_register(struct i4 break; case I40E_DEV_ID_10G_BASE_T: case I40E_DEV_ID_10G_BASE_T4: + case I40E_DEV_ID_10G_BASE_T_BC: + case I40E_DEV_ID_5G_BASE_T_BC: case I40E_DEV_ID_10G_BASE_T_X722: case I40E_DEV_ID_25G_B: case I40E_DEV_ID_25G_SFP28: @@ -6842,6 +6931,196 @@ restore_config: } /** + * i40e_get_phy_lpi_status - read LPI status from PHY or MAC register + * @hw: pointer to the hw struct + * @stat: pointer to structure with status of rx and tx lpi + * + * Read LPI state directly from external PHY register or from MAC + * register, depending on device ID and current link speed. + */ +enum i40e_status_code i40e_get_phy_lpi_status(struct i40e_hw *hw, + struct i40e_hw_port_stats *stat) +{ + enum i40e_status_code ret = I40E_SUCCESS; + u32 val; + + stat->rx_lpi_status = 0; + stat->tx_lpi_status = 0; + + if ((hw->device_id == I40E_DEV_ID_10G_BASE_T_BC || + hw->device_id == I40E_DEV_ID_5G_BASE_T_BC) && + (hw->phy.link_info.link_speed == I40E_LINK_SPEED_2_5GB || + hw->phy.link_info.link_speed == I40E_LINK_SPEED_5GB)) { + ret = i40e_aq_get_phy_register(hw, + I40E_AQ_PHY_REG_ACCESS_EXTERNAL, + I40E_BCM_PHY_PCS_STATUS1_PAGE, + TRUE, + I40E_BCM_PHY_PCS_STATUS1_REG, + &val, NULL); + + if (ret != I40E_SUCCESS) + return ret; + + stat->rx_lpi_status = !!(val & I40E_BCM_PHY_PCS_STATUS1_RX_LPI); + stat->tx_lpi_status = !!(val & I40E_BCM_PHY_PCS_STATUS1_TX_LPI); + + return ret; + } + + val = rd32(hw, I40E_PRTPM_EEE_STAT); + stat->rx_lpi_status = (val & I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_MASK) >> + I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_SHIFT; + stat->tx_lpi_status = (val & I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_MASK) >> + I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_SHIFT; + + return ret; +} + +/** + * i40e_get_lpi_counters - read LPI counters from EEE statistics + * @hw: pointer to the hw struct + * @tx_counter: pointer to memory for TX LPI counter + * @rx_counter: pointer to memory for RX LPI counter + * @is_clear: returns TRUE if counters are clear after read + * + * Read Low Power Idle (LPI) mode counters from Energy Efficient + * Ethernet (EEE) statistics. + **/ +enum i40e_status_code i40e_get_lpi_counters(struct i40e_hw *hw, + u32 *tx_counter, u32 *rx_counter, + bool *is_clear) +{ + /* only X710-T*L requires special handling of counters + * for other devices we just read the MAC registers + */ + if ((hw->device_id == I40E_DEV_ID_10G_BASE_T_BC || + hw->device_id == I40E_DEV_ID_5G_BASE_T_BC) && + hw->phy.link_info.link_speed != I40E_LINK_SPEED_1GB) { + enum i40e_status_code retval; + u32 cmd_status; + + *is_clear = FALSE; + retval = i40e_aq_run_phy_activity(hw, + I40E_AQ_RUN_PHY_ACT_ID_USR_DFND, + I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT, + &cmd_status, tx_counter, rx_counter, NULL); + + if (!retval && cmd_status != I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC) + retval = I40E_ERR_ADMIN_QUEUE_ERROR; + + return retval; + } + + *is_clear = TRUE; + *tx_counter = rd32(hw, I40E_PRTPM_TLPIC); + *rx_counter = rd32(hw, I40E_PRTPM_RLPIC); + + return I40E_SUCCESS; +} + +/** + * i40e_get_lpi_duration - read LPI time duration from EEE statistics + * @hw: pointer to the hw struct + * @stat: pointer to structure with status of rx and tx lpi + * @tx_duration: pointer to memory for TX LPI time duration + * @rx_duration: pointer to memory for RX LPI time duration + * + * Read Low Power Idle (LPI) mode time duration from Energy Efficient + * Ethernet (EEE) statistics. + */ +enum i40e_status_code i40e_get_lpi_duration(struct i40e_hw *hw, + struct i40e_hw_port_stats *stat, + u64 *tx_duration, u64 *rx_duration) +{ + u32 tx_time_dur, rx_time_dur; + enum i40e_status_code retval; + u32 cmd_status; + + if (hw->device_id != I40E_DEV_ID_10G_BASE_T_BC && + hw->device_id != I40E_DEV_ID_5G_BASE_T_BC) + return I40E_ERR_NOT_IMPLEMENTED; + + retval = i40e_aq_run_phy_activity + (hw, I40E_AQ_RUN_PHY_ACT_ID_USR_DFND, + I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_DUR, + &cmd_status, &tx_time_dur, &rx_time_dur, NULL); + + if (retval) + return retval; + if ((cmd_status & I40E_AQ_RUN_PHY_ACT_CMD_STAT_MASK) != + I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC) + return I40E_ERR_ADMIN_QUEUE_ERROR; + + if (hw->phy.link_info.link_speed == I40E_LINK_SPEED_1GB && + !tx_time_dur && !rx_time_dur && + stat->tx_lpi_status && stat->rx_lpi_status) { + retval = i40e_aq_run_phy_activity + (hw, I40E_AQ_RUN_PHY_ACT_ID_USR_DFND, + I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT_DUR, + &cmd_status, + &tx_time_dur, &rx_time_dur, NULL); + + if (retval) + return retval; + if ((cmd_status & I40E_AQ_RUN_PHY_ACT_CMD_STAT_MASK) != + I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC) + return I40E_ERR_ADMIN_QUEUE_ERROR; + tx_time_dur = 0; + rx_time_dur = 0; + } + + *tx_duration = tx_time_dur; + *rx_duration = rx_time_dur; + + return retval; +} + +/** + * i40e_lpi_stat_update - update LPI counters with values relative to offset + * @hw: pointer to the hw struct + * @offset_loaded: flag indicating need of writing current value to offset + * @tx_offset: pointer to offset of TX LPI counter + * @tx_stat: pointer to value of TX LPI counter + * @rx_offset: pointer to offset of RX LPI counter + * @rx_stat: pointer to value of RX LPI counter + * + * Update Low Power Idle (LPI) mode counters while having regard to passed + * offsets. + **/ +enum i40e_status_code i40e_lpi_stat_update(struct i40e_hw *hw, + bool offset_loaded, u64 *tx_offset, + u64 *tx_stat, u64 *rx_offset, + u64 *rx_stat) +{ + enum i40e_status_code retval; + u32 tx_counter, rx_counter; + bool is_clear; + + retval = i40e_get_lpi_counters(hw, &tx_counter, &rx_counter, &is_clear); + if (retval) + goto err; + + if (is_clear) { + *tx_stat += tx_counter; + *rx_stat += rx_counter; + } else { + if (!offset_loaded) { + *tx_offset = tx_counter; + *rx_offset = rx_counter; + } + + *tx_stat = (tx_counter >= *tx_offset) ? + (u32)(tx_counter - *tx_offset) : + (u32)((tx_counter + BIT_ULL(32)) - *tx_offset); + *rx_stat = (rx_counter >= *rx_offset) ? + (u32)(rx_counter - *rx_offset) : + (u32)((rx_counter + BIT_ULL(32)) - *rx_offset); + } +err: + return retval; +} + +/** * i40e_aq_rx_ctl_read_register - use FW to read from an Rx control register * @hw: pointer to the hw struct * @reg_addr: register address @@ -7083,6 +7362,52 @@ i40e_aq_get_phy_register_ext(struct i40e_hw *hw, return status; } + +/** + * i40e_aq_run_phy_activity + * @hw: pointer to the hw struct + * @activity_id: ID of DNL activity to run + * @dnl_opcode: opcode passed to DNL script + * @cmd_status: pointer to memory to write return value of DNL script + * @data0: pointer to memory for first 4 bytes of data returned by DNL script + * @data1: pointer to memory for last 4 bytes of data returned by DNL script + * @cmd_details: pointer to command details structure or NULL + * + * Run DNL admin command. + **/ +enum i40e_status_code +i40e_aq_run_phy_activity(struct i40e_hw *hw, u16 activity_id, u32 dnl_opcode, + u32 *cmd_status, u32 *data0, u32 *data1, + struct i40e_asq_cmd_details *cmd_details) +{ + struct i40e_aqc_run_phy_activity *cmd; + enum i40e_status_code retval; + struct i40e_aq_desc desc; + + cmd = (struct i40e_aqc_run_phy_activity *)&desc.params.raw; + + if (!cmd_status || !data0 || !data1) { + retval = I40E_ERR_PARAM; + goto err; + } + + i40e_fill_default_direct_cmd_desc(&desc, + i40e_aqc_opc_run_phy_activity); + + cmd->activity_id = CPU_TO_LE16(activity_id); + cmd->params.cmd.dnl_opcode = CPU_TO_LE32(dnl_opcode); + + retval = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details); + if (retval) + goto err; + + *cmd_status = LE32_TO_CPU(cmd->params.resp.cmd_status); + *data0 = LE32_TO_CPU(cmd->params.resp.data0); + *data1 = LE32_TO_CPU(cmd->params.resp.data1); +err: + return retval; +} + /** * i40e_aq_send_msg_to_pf Modified: stable/12/sys/dev/ixl/i40e_devids.h ============================================================================== --- stable/12/sys/dev/ixl/i40e_devids.h Fri Sep 4 19:30:15 2020 (r365338) +++ stable/12/sys/dev/ixl/i40e_devids.h Fri Sep 4 21:21:23 2020 (r365339) @@ -54,6 +54,13 @@ #define I40E_DEV_ID_10G_BASE_T4 0x1589 #define I40E_DEV_ID_25G_B 0x158A #define I40E_DEV_ID_25G_SFP28 0x158B +#define I40E_DEV_ID_10G_BASE_T_BC 0x15FF +#define I40E_DEV_ID_10G_B 0x104F +#define I40E_DEV_ID_10G_SFP 0x104E +#define I40E_DEV_ID_5G_BASE_T_BC 0x101F +#define I40E_IS_X710TL_DEVICE(d) \ + (((d) == I40E_DEV_ID_10G_BASE_T_BC) || \ + ((d) == I40E_DEV_ID_5G_BASE_T_BC)) #define I40E_DEV_ID_VF 0x154C #define I40E_DEV_ID_VF_HV 0x1571 #define I40E_DEV_ID_ADAPTIVE_VF 0x1889 Modified: stable/12/sys/dev/ixl/i40e_prototype.h ============================================================================== --- stable/12/sys/dev/ixl/i40e_prototype.h Fri Sep 4 19:30:15 2020 (r365338) +++ stable/12/sys/dev/ixl/i40e_prototype.h Fri Sep 4 21:21:23 2020 (r365339) @@ -104,6 +104,17 @@ enum i40e_status_code i40e_led_get_reg(struct i40e_hw u32 *reg_val); enum i40e_status_code i40e_led_set_reg(struct i40e_hw *hw, u16 led_addr, u32 reg_val); +enum i40e_status_code i40e_get_phy_lpi_status(struct i40e_hw *hw, + struct i40e_hw_port_stats *stats); +enum i40e_status_code i40e_get_lpi_counters(struct i40e_hw *hw, u32 *tx_counter, + u32 *rx_counter, bool *is_clear); +enum i40e_status_code i40e_lpi_stat_update(struct i40e_hw *hw, + bool offset_loaded, u64 *tx_offset, + u64 *tx_stat, u64 *rx_offset, + u64 *rx_stat); +enum i40e_status_code i40e_get_lpi_duration(struct i40e_hw *hw, + struct i40e_hw_port_stats *stat, + u64 *tx_duration, u64 *rx_duration); /* admin send queue commands */ enum i40e_status_code i40e_aq_get_firmware_version(struct i40e_hw *hw, @@ -479,6 +490,7 @@ void i40e_nvmupd_check_wait_event(struct i40e_hw *hw, struct i40e_aq_desc *desc); void i40e_nvmupd_clear_wait_state(struct i40e_hw *hw); void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status); +enum i40e_status_code i40e_enable_eee(struct i40e_hw *hw, bool enable); enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw); @@ -506,6 +518,10 @@ i40e_virtchnl_link_speed(enum i40e_aq_link_speed link_ return VIRTCHNL_LINK_SPEED_100MB; case I40E_LINK_SPEED_1GB: return VIRTCHNL_LINK_SPEED_1GB; + case I40E_LINK_SPEED_2_5GB: + return VIRTCHNL_LINK_SPEED_2_5GB; + case I40E_LINK_SPEED_5GB: + return VIRTCHNL_LINK_SPEED_5GB; case I40E_LINK_SPEED_10GB: return VIRTCHNL_LINK_SPEED_10GB; case I40E_LINK_SPEED_40GB: @@ -575,6 +591,11 @@ i40e_aq_get_phy_register_ext(struct i40e_hw *hw, i40e_aq_set_phy_register_ext(hw, ps, da, pc, FALSE, 0, ra, rv, cd) #define i40e_aq_get_phy_register(hw, ps, da, pc, ra, rv, cd) \ i40e_aq_get_phy_register_ext(hw, ps, da, pc, FALSE, 0, ra, rv, cd) + +enum i40e_status_code +i40e_aq_run_phy_activity(struct i40e_hw *hw, u16 activity_id, u32 opcode, + u32 *cmd_status, u32 *data0, u32 *data1, + struct i40e_asq_cmd_details *cmd_details); enum i40e_status_code i40e_aq_set_arp_proxy_config(struct i40e_hw *hw, struct i40e_aqc_arp_proxy_data *proxy_config, Modified: stable/12/sys/dev/ixl/i40e_type.h ============================================================================== --- stable/12/sys/dev/ixl/i40e_type.h Fri Sep 4 19:30:15 2020 (r365338) +++ stable/12/sys/dev/ixl/i40e_type.h Fri Sep 4 21:21:23 2020 (r365339) @@ -347,6 +347,12 @@ struct i40e_phy_info { I40E_PHY_TYPE_OFFSET) #define I40E_CAP_PHY_TYPE_25GBASE_ACC BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC + \ I40E_PHY_TYPE_OFFSET) +/* Offset for 2.5G/5G PHY Types value to bit number conversion */ +#define I40E_PHY_TYPE_OFFSET2 (-10) +#define I40E_CAP_PHY_TYPE_2_5GBASE_T BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T + \ + I40E_PHY_TYPE_OFFSET2) +#define I40E_CAP_PHY_TYPE_5GBASE_T BIT_ULL(I40E_PHY_TYPE_5GBASE_T + \ + I40E_PHY_TYPE_OFFSET2) #define I40E_HW_CAP_MAX_GPIO 30 #define I40E_HW_CAP_MDIO_PORT_MODE_MDIO 0 #define I40E_HW_CAP_MDIO_PORT_MODE_I2C 1 @@ -1490,6 +1496,8 @@ struct i40e_hw_port_stats { u32 rx_lpi_status; u64 tx_lpi_count; /* etlpic */ u64 rx_lpi_count; /* erlpic */ + u64 tx_lpi_duration; + u64 rx_lpi_duration; }; /* Checksum and Shadow RAM pointers */ @@ -1542,6 +1550,7 @@ struct i40e_hw_port_stats { #define I40E_SR_FEATURE_CONFIGURATION_PTR 0x49 #define I40E_SR_CONFIGURATION_METADATA_PTR 0x4D #define I40E_SR_IMMEDIATE_VALUES_PTR 0x4E +#define I40E_SR_5TH_FREE_PROVISION_AREA_PTR 0x50 /* Auxiliary field, mask and shift definition for Shadow RAM and NVM Flash */ #define I40E_SR_VPD_MODULE_MAX_SIZE 1024 @@ -1728,4 +1737,9 @@ struct i40e_lldp_variables { #define I40E_FLEX_56_MASK (0x1ULL << I40E_FLEX_56_SHIFT) #define I40E_FLEX_57_SHIFT 6 #define I40E_FLEX_57_MASK (0x1ULL << I40E_FLEX_57_SHIFT) +#define I40E_BCM_PHY_PCS_STATUS1_PAGE 0x3 +#define I40E_BCM_PHY_PCS_STATUS1_REG 0x0001 +#define I40E_BCM_PHY_PCS_STATUS1_RX_LPI BIT(8) +#define I40E_BCM_PHY_PCS_STATUS1_TX_LPI BIT(9) + #endif /* _I40E_TYPE_H_ */ Modified: stable/12/sys/dev/ixl/if_ixl.c ============================================================================== --- stable/12/sys/dev/ixl/if_ixl.c Fri Sep 4 19:30:15 2020 (r365338) +++ stable/12/sys/dev/ixl/if_ixl.c Fri Sep 4 21:21:23 2020 (r365339) @@ -48,7 +48,7 @@ * Driver version *********************************************************************/ #define IXL_DRIVER_VERSION_MAJOR 2 -#define IXL_DRIVER_VERSION_MINOR 2 +#define IXL_DRIVER_VERSION_MINOR 3 #define IXL_DRIVER_VERSION_BUILD 0 #define IXL_DRIVER_VERSION_STRING \ @@ -82,6 +82,10 @@ static pci_vendor_info_t ixl_vendor_info_array[] = PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_SFP_I_X722, "Intel(R) Ethernet Connection X722 for 10GbE SFP+"), PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_25G_B, "Intel(R) Ethernet Controller XXV710 for 25GbE backplane"), PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_25G_SFP28, "Intel(R) Ethernet Controller XXV710 for 25GbE SFP28"), + PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_BASE_T_BC, "Intel(R) Ethernet Controller X710 for 10GBASE-T"), + PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_SFP, "Intel(R) Ethernet Controller X710 for 10GbE SFP+"), + PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_10G_B, "Intel(R) Ethernet Controller X710 for 10GbE backplane"), + PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_5G_BASE_T_BC, "Intel(R) Ethernet Controller V710 for 5GBASE-T"), /* required last entry */ PVID_END }; @@ -599,6 +603,12 @@ ixl_if_attach_pre(if_ctx_t ctx) pf->state |= IXL_PF_STATE_FW_LLDP_DISABLED; } + /* Try enabling Energy Efficient Ethernet (EEE) mode */ + if (i40e_enable_eee(hw, true) == I40E_SUCCESS) + atomic_set_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + else + atomic_clear_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + /* Get MAC addresses from hardware */ i40e_get_mac_addr(hw, hw->mac.addr); error = i40e_validate_mac_addr(hw->mac.addr); @@ -1491,6 +1501,14 @@ ixl_if_media_status(if_ctx_t ctx, struct ifmediareq *i break; case I40E_PHY_TYPE_1000BASE_T_OPTICAL: ifmr->ifm_active |= IFM_1000_T; + break; + /* 2.5 G */ + case I40E_PHY_TYPE_2_5GBASE_T: + ifmr->ifm_active |= IFM_2500_T; + break; + /* 5 G */ + case I40E_PHY_TYPE_5GBASE_T: + ifmr->ifm_active |= IFM_5000_T; break; /* 10 G */ case I40E_PHY_TYPE_10GBASE_SFPP_CU: Modified: stable/12/sys/dev/ixl/ixl_pf.h ============================================================================== --- stable/12/sys/dev/ixl/ixl_pf.h Fri Sep 4 19:30:15 2020 (r365338) +++ stable/12/sys/dev/ixl/ixl_pf.h Fri Sep 4 21:21:23 2020 (r365339) @@ -87,6 +87,7 @@ enum ixl_pf_state { IXL_PF_STATE_GLOB_RESET_REQ = (1 << 7), IXL_PF_STATE_EMP_RESET_REQ = (1 << 8), IXL_PF_STATE_FW_LLDP_DISABLED = (1 << 9), + IXL_PF_STATE_EEE_ENABLED = (1 << 10), }; #define IXL_PF_IN_RECOVERY_MODE(pf) \ @@ -191,7 +192,9 @@ struct ixl_pf { "\t 0x4 - advertise 10G\n" \ "\t 0x8 - advertise 20G\n" \ "\t0x10 - advertise 25G\n" \ -"\t0x20 - advertise 40G\n\n" \ +"\t0x20 - advertise 40G\n" \ +"\t0x40 - advertise 2.5G\n" \ +"\t0x80 - advertise 5G\n\n" \ "Set to 0 to disable link.\n" \ "Use \"sysctl -x\" to view flags properly." @@ -203,7 +206,9 @@ struct ixl_pf { "\t 0x4 - 10G\n" \ "\t 0x8 - 20G\n" \ "\t0x10 - 25G\n" \ -"\t0x20 - 40G\n\n" \ +"\t0x20 - 40G\n" \ +"\t0x40 - 2.5G\n" \ +"\t0x80 - 5G\n\n" \ "Use \"sysctl -x\" to view flags properly." #define IXL_SYSCTL_HELP_FC \ Modified: stable/12/sys/dev/ixl/ixl_pf_main.c ============================================================================== --- stable/12/sys/dev/ixl/ixl_pf_main.c Fri Sep 4 19:30:15 2020 (r365338) +++ stable/12/sys/dev/ixl/ixl_pf_main.c Fri Sep 4 21:21:23 2020 (r365339) @@ -61,6 +61,8 @@ static int ixl_sysctl_unallocated_queues(SYSCTL_HANDLE static int ixl_sysctl_pf_tx_itr(SYSCTL_HANDLER_ARGS); static int ixl_sysctl_pf_rx_itr(SYSCTL_HANDLER_ARGS); +static int ixl_sysctl_eee_enable(SYSCTL_HANDLER_ARGS); + /* Debug Sysctls */ static int ixl_sysctl_link_status(SYSCTL_HANDLER_ARGS); static int ixl_sysctl_phy_abilities(SYSCTL_HANDLER_ARGS); @@ -631,6 +633,12 @@ ixl_add_ifmedia(struct ifmedia *media, u64 phy_types) if (phy_types & (I40E_CAP_PHY_TYPE_1000BASE_LX)) ifmedia_add(media, IFM_ETHER | IFM_1000_LX, 0, NULL); + if (phy_types & (I40E_CAP_PHY_TYPE_2_5GBASE_T)) + ifmedia_add(media, IFM_ETHER | IFM_2500_T, 0, NULL); + + if (phy_types & (I40E_CAP_PHY_TYPE_5GBASE_T)) + ifmedia_add(media, IFM_ETHER | IFM_5000_T, 0, NULL); + if (phy_types & (I40E_CAP_PHY_TYPE_XAUI) || phy_types & (I40E_CAP_PHY_TYPE_XFI) || phy_types & (I40E_CAP_PHY_TYPE_10GBASE_SFPP_CU)) @@ -1898,6 +1906,13 @@ ixl_update_stats_counters(struct ixl_pf *pf) ixl_stat_update32(hw, I40E_GLPRT_RJC(hw->port), pf->stat_offsets_loaded, &osd->rx_jabber, &nsd->rx_jabber); + /* EEE */ + i40e_get_phy_lpi_status(hw, nsd); + + i40e_lpi_stat_update(hw, pf->stat_offsets_loaded, + &osd->tx_lpi_count, &nsd->tx_lpi_count, + &osd->rx_lpi_count, &nsd->rx_lpi_count); + pf->stat_offsets_loaded = true; /* End hw stats */ @@ -2161,6 +2176,8 @@ ixl_add_device_sysctls(struct ixl_pf *pf) struct sysctl_oid *fec_node; struct sysctl_oid_list *fec_list; + struct sysctl_oid *eee_node; + struct sysctl_oid_list *eee_list; /* Set up sysctls */ SYSCTL_ADD_PROC(ctx, ctx_list, @@ -2237,6 +2254,32 @@ ixl_add_device_sysctls(struct ixl_pf *pf) OID_AUTO, "fw_lldp", CTLTYPE_INT | CTLFLAG_RW, pf, 0, ixl_sysctl_fw_lldp, "I", IXL_SYSCTL_HELP_FW_LLDP); + eee_node = SYSCTL_ADD_NODE(ctx, ctx_list, + OID_AUTO, "eee", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, + "Energy Efficient Ethernet (EEE) Sysctls"); + eee_list = SYSCTL_CHILDREN(eee_node); + + SYSCTL_ADD_PROC(ctx, eee_list, + OID_AUTO, "enable", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, + pf, 0, ixl_sysctl_eee_enable, "I", + "Enable Energy Efficient Ethernet (EEE)"); + + SYSCTL_ADD_UINT(ctx, eee_list, OID_AUTO, "tx_lpi_status", + CTLFLAG_RD | CTLFLAG_MPSAFE, &pf->stats.tx_lpi_status, 0, + "TX LPI status"); + + SYSCTL_ADD_UINT(ctx, eee_list, OID_AUTO, "rx_lpi_status", + CTLFLAG_RD | CTLFLAG_MPSAFE, &pf->stats.rx_lpi_status, 0, + "RX LPI status"); + + SYSCTL_ADD_UQUAD(ctx, eee_list, OID_AUTO, "tx_lpi_count", + CTLFLAG_RD | CTLFLAG_MPSAFE, &pf->stats.tx_lpi_count, + "TX LPI count"); + + SYSCTL_ADD_UQUAD(ctx, eee_list, OID_AUTO, "rx_lpi_count", + CTLFLAG_RD | CTLFLAG_MPSAFE, &pf->stats.rx_lpi_count, + "RX LPI count"); + /* Add sysctls meant to print debug information, but don't list them * in "sysctl -a" output. */ debug_node = SYSCTL_ADD_NODE(ctx, ctx_list, @@ -2348,6 +2391,8 @@ ixl_link_speed_string(enum i40e_aq_link_speed link_spe "40 Gbps", "20 Gbps", "25 Gbps", + "2.5 Gbps", + "5 Gbps" }; int index; @@ -2370,6 +2415,12 @@ ixl_link_speed_string(enum i40e_aq_link_speed link_spe case I40E_LINK_SPEED_25GB: index = 6; break; + case I40E_LINK_SPEED_2_5GB: + index = 7; + break; + case I40E_LINK_SPEED_5GB: + index = 8; + break; case I40E_LINK_SPEED_UNKNOWN: default: index = 0; @@ -2403,14 +2454,16 @@ ixl_sysctl_current_speed(SYSCTL_HANDLER_ARGS) static u8 ixl_convert_sysctl_aq_link_speed(u8 speeds, bool to_aq) { -#define SPEED_MAP_SIZE 6 +#define SPEED_MAP_SIZE 8 static u16 speedmap[SPEED_MAP_SIZE] = { (I40E_LINK_SPEED_100MB | (0x1 << 8)), (I40E_LINK_SPEED_1GB | (0x2 << 8)), (I40E_LINK_SPEED_10GB | (0x4 << 8)), (I40E_LINK_SPEED_20GB | (0x8 << 8)), (I40E_LINK_SPEED_25GB | (0x10 << 8)), - (I40E_LINK_SPEED_40GB | (0x20 << 8)) + (I40E_LINK_SPEED_40GB | (0x20 << 8)), + (I40E_LINK_SPEED_2_5GB | (0x40 << 8)), + (I40E_LINK_SPEED_5GB | (0x80 << 8)), }; u8 retval = 0; @@ -2482,6 +2535,8 @@ ixl_set_advertised_speeds(struct ixl_pf *pf, int speed ** 0x8 - 20G ** 0x10 - 25G ** 0x20 - 40G +** 0x40 - 2.5G +** 0x80 - 5G */ static int ixl_sysctl_supported_speeds(SYSCTL_HANDLER_ARGS) @@ -2501,6 +2556,8 @@ ixl_sysctl_supported_speeds(SYSCTL_HANDLER_ARGS) ** 0x8 - advertise 20G ** 0x10 - advertise 25G ** 0x20 - advertise 40G +** 0x40 - advertise 2.5G +** 0x80 - advertise 5G ** ** Set to 0 to disable link */ @@ -2525,7 +2582,7 @@ ixl_sysctl_set_advertise(SYSCTL_HANDLER_ARGS) } /* Error out if bits outside of possible flag range are set */ - if ((requested_ls & ~((u8)0x3F)) != 0) { + if ((requested_ls & ~((u8)0xFF)) != 0) { device_printf(dev, "Input advertised speed out of range; " "valid flags are: 0x%02x\n", ixl_convert_sysctl_aq_link_speed(pf->supported_speeds, false)); @@ -2564,6 +2621,10 @@ ixl_max_aq_speed_to_value(u8 link_speeds) return IF_Gbps(20); if (link_speeds & I40E_LINK_SPEED_10GB) return IF_Gbps(10); + if (link_speeds & I40E_LINK_SPEED_5GB) + return IF_Gbps(5); + if (link_speeds & I40E_LINK_SPEED_2_5GB) + return IF_Mbps(2500); if (link_speeds & I40E_LINK_SPEED_1GB) return IF_Gbps(1); if (link_speeds & I40E_LINK_SPEED_100MB) @@ -2848,8 +2909,8 @@ ixl_phy_type_string(u32 bit_pos, bool ext) "25GBASE-LR", "25GBASE-AOC", "25GBASE-ACC", - "Reserved (6)", - "Reserved (7)" + "2.5GBASE-T", + "5GBASE-T" }; if (ext && bit_pos > 7) return "Invalid_Ext"; @@ -4074,6 +4135,43 @@ ixl_sysctl_fw_lldp(SYSCTL_HANDLER_ARGS) return ixl_stop_fw_lldp(pf); return ixl_start_fw_lldp(pf); +} + +static int +ixl_sysctl_eee_enable(SYSCTL_HANDLER_ARGS) +{ + struct ixl_pf *pf = (struct ixl_pf *)arg1; + int state, new_state; + int sysctl_handle_status = 0; + enum i40e_status_code cmd_status; + + /* Init states' values */ + state = new_state = (!!(pf->state & IXL_PF_STATE_EEE_ENABLED)); + + /* Get requested mode */ + sysctl_handle_status = sysctl_handle_int(oidp, &new_state, 0, req); + if ((sysctl_handle_status) || (req->newptr == NULL)) + return (sysctl_handle_status); + + /* Check if state has changed */ + if (new_state == state) + return (0); + + /* Set new state */ + cmd_status = i40e_enable_eee(&pf->hw, (bool)(!!new_state)); + + /* Save new state or report error */ + if (!cmd_status) { + if (new_state == 0) + atomic_clear_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + else + atomic_set_32(&pf->state, IXL_PF_STATE_EEE_ENABLED); + } else if (cmd_status == I40E_ERR_CONFIG) + return (EPERM); + else + return (EIO); + + return (0); } int Modified: stable/12/sys/dev/ixl/virtchnl.h ============================================================================== --- stable/12/sys/dev/ixl/virtchnl.h Fri Sep 4 19:30:15 2020 (r365338) +++ stable/12/sys/dev/ixl/virtchnl.h Fri Sep 4 21:21:23 2020 (r365339) @@ -77,12 +77,14 @@ enum virtchnl_status_code { VIRTCHNL_STATUS_NOT_SUPPORTED = -64, }; +#define VIRTCHNL_LINK_SPEED_2_5GB_SHIFT 0x0 #define VIRTCHNL_LINK_SPEED_100MB_SHIFT 0x1 #define VIRTCHNL_LINK_SPEED_1000MB_SHIFT 0x2 #define VIRTCHNL_LINK_SPEED_10GB_SHIFT 0x3 #define VIRTCHNL_LINK_SPEED_40GB_SHIFT 0x4 #define VIRTCHNL_LINK_SPEED_20GB_SHIFT 0x5 #define VIRTCHNL_LINK_SPEED_25GB_SHIFT 0x6 +#define VIRTCHNL_LINK_SPEED_5GB_SHIFT 0x7 enum virtchnl_link_speed { VIRTCHNL_LINK_SPEED_UNKNOWN = 0, @@ -92,6 +94,8 @@ enum virtchnl_link_speed { VIRTCHNL_LINK_SPEED_40GB = BIT(VIRTCHNL_LINK_SPEED_40GB_SHIFT), VIRTCHNL_LINK_SPEED_20GB = BIT(VIRTCHNL_LINK_SPEED_20GB_SHIFT), VIRTCHNL_LINK_SPEED_25GB = BIT(VIRTCHNL_LINK_SPEED_25GB_SHIFT), + VIRTCHNL_LINK_SPEED_2_5GB = BIT(VIRTCHNL_LINK_SPEED_2_5GB_SHIFT), + VIRTCHNL_LINK_SPEED_5GB = BIT(VIRTCHNL_LINK_SPEED_5GB_SHIFT), }; /* for hsplit_0 field of Rx HMC context */ From owner-svn-src-all@freebsd.org Fri Sep 4 21:32:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4278C3D0346; Fri, 4 Sep 2020 21:32:05 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjrVF1Ljpz4d8S; Fri, 4 Sep 2020 21:32:05 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1127B1319A; Fri, 4 Sep 2020 21:32:05 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084LW5du017956; Fri, 4 Sep 2020 21:32:05 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084LVxU1017922; Fri, 4 Sep 2020 21:31:59 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <202009042131.084LVxU1017922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Fri, 4 Sep 2020 21:31:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r365340 - in vendor-sys/openzfs/dist: . cmd/zfs config etc/systemd/system etc/systemd/system-generators include include/os/freebsd/spl/sys include/os/freebsd/zfs/sys include/os/linux/ke... X-SVN-Group: vendor-sys X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in vendor-sys/openzfs/dist: . cmd/zfs config etc/systemd/system etc/systemd/system-generators include include/os/freebsd/spl/sys include/os/freebsd/zfs/sys include/os/linux/kernel/linux include/os/lin... X-SVN-Commit-Revision: 365340 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 21:32:05 -0000 Author: mmacy Date: Fri Sep 4 21:31:58 2020 New Revision: 365340 URL: https://svnweb.freebsd.org/changeset/base/365340 Log: Update vendor openzfs to fd20a8 Added: vendor-sys/openzfs/dist/include/sys/zfs_vfsops.h (contents, props changed) vendor-sys/openzfs/dist/lib/libspl/os/freebsd/zone.c (contents, props changed) vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_nounmount.ksh Modified: vendor-sys/openzfs/dist/cmd/zfs/zfs_main.c vendor-sys/openzfs/dist/config/kernel-global_page_state.m4 vendor-sys/openzfs/dist/config/zfs-build.m4 vendor-sys/openzfs/dist/etc/systemd/system-generators/zfs-mount-generator.in vendor-sys/openzfs/dist/etc/systemd/system/zfs-mount.service.in vendor-sys/openzfs/dist/include/libzfs.h vendor-sys/openzfs/dist/include/libzfs_impl.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/cred.h vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/zone.h vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/Makefile.am vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops.h vendor-sys/openzfs/dist/include/os/linux/kernel/linux/page_compat.h vendor-sys/openzfs/dist/include/os/linux/spl/sys/vmsystm.h vendor-sys/openzfs/dist/include/os/linux/zfs/sys/Makefile.am vendor-sys/openzfs/dist/include/sys/Makefile.am vendor-sys/openzfs/dist/lib/libspl/Makefile.am vendor-sys/openzfs/dist/lib/libspl/include/limits.h vendor-sys/openzfs/dist/lib/libspl/include/zone.h vendor-sys/openzfs/dist/lib/libspl/zone.c vendor-sys/openzfs/dist/lib/libzfs/libzfs_changelist.c vendor-sys/openzfs/dist/lib/libzfs/libzfs_dataset.c vendor-sys/openzfs/dist/lib/libzpool/kernel.c vendor-sys/openzfs/dist/man/man8/zfs-rename.8 vendor-sys/openzfs/dist/module/avl/avl.c vendor-sys/openzfs/dist/module/nvpair/nvpair.c vendor-sys/openzfs/dist/module/os/freebsd/spl/spl_kstat.c vendor-sys/openzfs/dist/module/os/freebsd/spl/spl_zone.c vendor-sys/openzfs/dist/module/os/freebsd/zfs/spa_stats.c vendor-sys/openzfs/dist/module/os/freebsd/zfs/zfs_vfsops.c vendor-sys/openzfs/dist/module/os/freebsd/zfs/zvol_os.c vendor-sys/openzfs/dist/module/os/linux/spl/spl-kstat.c vendor-sys/openzfs/dist/module/os/linux/zfs/Makefile.in vendor-sys/openzfs/dist/module/os/linux/zfs/arc_os.c vendor-sys/openzfs/dist/module/os/linux/zfs/spa_stats.c vendor-sys/openzfs/dist/module/os/linux/zfs/zfs_vfsops.c vendor-sys/openzfs/dist/module/os/linux/zfs/zpl_super.c vendor-sys/openzfs/dist/module/zfs/Makefile.in vendor-sys/openzfs/dist/module/zfs/arc.c vendor-sys/openzfs/dist/module/zfs/dsl_dir.c vendor-sys/openzfs/dist/module/zfs/spa.c vendor-sys/openzfs/dist/module/zfs/spa_config.c vendor-sys/openzfs/dist/module/zfs/vdev.c vendor-sys/openzfs/dist/module/zfs/vdev_indirect.c vendor-sys/openzfs/dist/module/zfs/vdev_raidz.c vendor-sys/openzfs/dist/module/zfs/zfs_fm.c vendor-sys/openzfs/dist/module/zfs/zfs_ioctl.c vendor-sys/openzfs/dist/module/zfs/zio.c vendor-sys/openzfs/dist/tests/runfiles/common.run vendor-sys/openzfs/dist/tests/zfs-tests/include/tunables.cfg vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_mountpoint.ksh Directory Properties: vendor-sys/openzfs/dist/zfs.release.in (props changed) Modified: vendor-sys/openzfs/dist/cmd/zfs/zfs_main.c ============================================================================== --- vendor-sys/openzfs/dist/cmd/zfs/zfs_main.c Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/cmd/zfs/zfs_main.c Fri Sep 4 21:31:58 2020 (r365340) @@ -311,7 +311,8 @@ get_usage(zfs_help_t idx) case HELP_RENAME: return (gettext("\trename [-f] " "\n" - "\trename [-f] -p \n" + "\trename -p [-f] \n" + "\trename -u [-f] \n" "\trename -r \n")); case HELP_ROLLBACK: return (gettext("\trollback [-rRf] \n")); @@ -401,7 +402,7 @@ get_usage(zfs_help_t idx) "<-a | filesystem|volume>\n")); case HELP_CHANGE_KEY: return (gettext("\tchange-key [-l] [-o keyformat=]\n" - "\t [-o keylocation=] [-o pbkfd2iters=]\n" + "\t [-o keylocation=] [-o pbkdf2iters=]\n" "\t \n" "\tchange-key -i [-l] \n")); case HELP_VERSION: @@ -3603,36 +3604,40 @@ zfs_do_list(int argc, char **argv) } /* - * zfs rename [-f] + * zfs rename [-fu] * zfs rename [-f] -p - * zfs rename -r + * zfs rename [-u] -r * * Renames the given dataset to another of the same type. * * The '-p' flag creates all the non-existing ancestors of the target first. + * The '-u' flag prevents file systems from being remounted during rename. */ /* ARGSUSED */ static int zfs_do_rename(int argc, char **argv) { zfs_handle_t *zhp; + renameflags_t flags = { 0 }; int c; int ret = 0; - boolean_t recurse = B_FALSE; + int types; boolean_t parents = B_FALSE; - boolean_t force_unmount = B_FALSE; /* check options */ - while ((c = getopt(argc, argv, "prf")) != -1) { + while ((c = getopt(argc, argv, "pruf")) != -1) { switch (c) { case 'p': parents = B_TRUE; break; case 'r': - recurse = B_TRUE; + flags.recursive = B_TRUE; break; + case 'u': + flags.nounmount = B_TRUE; + break; case 'f': - force_unmount = B_TRUE; + flags.forceunmount = B_TRUE; break; case '?': default: @@ -3661,20 +3666,32 @@ zfs_do_rename(int argc, char **argv) usage(B_FALSE); } - if (recurse && parents) { + if (flags.recursive && parents) { (void) fprintf(stderr, gettext("-p and -r options are mutually " "exclusive\n")); usage(B_FALSE); } - if (recurse && strchr(argv[0], '@') == 0) { + if (flags.nounmount && parents) { + (void) fprintf(stderr, gettext("-u and -p options are mutually " + "exclusive\n")); + usage(B_FALSE); + } + + if (flags.recursive && strchr(argv[0], '@') == 0) { (void) fprintf(stderr, gettext("source dataset for recursive " "rename must be a snapshot\n")); usage(B_FALSE); } - if ((zhp = zfs_open(g_zfs, argv[0], parents ? ZFS_TYPE_FILESYSTEM | - ZFS_TYPE_VOLUME : ZFS_TYPE_DATASET)) == NULL) + if (flags.nounmount) + types = ZFS_TYPE_FILESYSTEM; + else if (parents) + types = ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME; + else + types = ZFS_TYPE_DATASET; + + if ((zhp = zfs_open(g_zfs, argv[0], types)) == NULL) return (1); /* If we were asked and the name looks good, try to create ancestors. */ @@ -3684,7 +3701,7 @@ zfs_do_rename(int argc, char **argv) return (1); } - ret = (zfs_rename(zhp, argv[1], recurse, force_unmount) != 0); + ret = (zfs_rename(zhp, argv[1], flags) != 0); zfs_close(zhp); return (ret); Modified: vendor-sys/openzfs/dist/config/kernel-global_page_state.m4 ============================================================================== --- vendor-sys/openzfs/dist/config/kernel-global_page_state.m4 Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/config/kernel-global_page_state.m4 Fri Sep 4 21:31:58 2020 (r365340) @@ -94,9 +94,6 @@ AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY] ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_FILE_PAGES]) ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_INACTIVE_ANON]) ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_INACTIVE_FILE]) - AS_IF([test -z "$ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B"],[ - ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_SLAB_RECLAIMABLE]) - ]) AC_MSG_RESULT(yes) ]) @@ -119,18 +116,12 @@ AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE], [ [node_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE], [node_stat_item], [$LINUX/include/linux/mmzone.h]) - ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE], - [node_stat_item], [$LINUX/include/linux/mmzone.h]) - ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE_B], - [node_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE], - [zone_stat_item], [$LINUX/include/linux/mmzone.h]) - ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY Modified: vendor-sys/openzfs/dist/config/zfs-build.m4 ============================================================================== --- vendor-sys/openzfs/dist/config/zfs-build.m4 Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/config/zfs-build.m4 Fri Sep 4 21:31:58 2020 (r365340) @@ -418,33 +418,43 @@ dnl # package type for 'make pkg': (rpm | deb | tgz) dnl # AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ AC_MSG_CHECKING([os distribution]) - if test -f /etc/toss-release ; then - VENDOR=toss ; - elif test -f /etc/fedora-release ; then - VENDOR=fedora ; - elif test -f /etc/redhat-release ; then - VENDOR=redhat ; - elif test -f /etc/gentoo-release ; then - VENDOR=gentoo ; - elif test -f /etc/arch-release ; then - VENDOR=arch ; - elif test -f /etc/SuSE-release ; then - VENDOR=sles ; - elif test -f /etc/slackware-version ; then - VENDOR=slackware ; - elif test -f /etc/lunar.release ; then - VENDOR=lunar ; - elif test -f /etc/lsb-release ; then - VENDOR=ubuntu ; - elif test -f /etc/debian_version ; then - VENDOR=debian ; - elif test -f /etc/alpine-release ; then - VENDOR=alpine ; - elif test -f /bin/freebsd-version ; then - VENDOR=freebsd ; - else - VENDOR= ; - fi + AC_ARG_WITH([vendor], + [AS_HELP_STRING([--with-vendor], + [Distribution vendor @<:@default=check@:>@])], + [with_vendor=$withval], + [with_vendor=check]) + AS_IF([test "x$with_vendor" = "xcheck"],[ + if test -f /etc/toss-release ; then + VENDOR=toss ; + elif test -f /etc/fedora-release ; then + VENDOR=fedora ; + elif test -f /etc/redhat-release ; then + VENDOR=redhat ; + elif test -f /etc/gentoo-release ; then + VENDOR=gentoo ; + elif test -f /etc/arch-release ; then + VENDOR=arch ; + elif test -f /etc/SuSE-release ; then + VENDOR=sles ; + elif test -f /etc/slackware-version ; then + VENDOR=slackware ; + elif test -f /etc/lunar.release ; then + VENDOR=lunar ; + elif test -f /etc/lsb-release ; then + VENDOR=ubuntu ; + elif test -f /etc/debian_version ; then + VENDOR=debian ; + elif test -f /etc/alpine-release ; then + VENDOR=alpine ; + elif test -f /bin/freebsd-version ; then + VENDOR=freebsd ; + else + VENDOR= ; + fi], + [ test "x${with_vendor}" != x],[ + VENDOR="$with_vendor" ], + [ VENDOR= ; ] + ) AC_MSG_RESULT([$VENDOR]) AC_SUBST(VENDOR) Modified: vendor-sys/openzfs/dist/etc/systemd/system-generators/zfs-mount-generator.in ============================================================================== --- vendor-sys/openzfs/dist/etc/systemd/system-generators/zfs-mount-generator.in Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/etc/systemd/system-generators/zfs-mount-generator.in Fri Sep 4 21:31:58 2020 (r365340) @@ -38,8 +38,6 @@ do_fail() { is_known() { query="$1" IFS=' ' - # protect against special characters - set -f for element in $2 ; do if [ "$query" = "$element" ] ; then return 0 @@ -54,8 +52,7 @@ is_known() { create_dependencies() { unitfile="$1" suffix="$2" - # protect against special characters - set -f + IFS=' ' for target in $3 ; do target_dir="${dest_norm}/${target}.${suffix}/" mkdir -p "${target_dir}" @@ -72,6 +69,7 @@ else do_fail "zero or three arguments required" fi +pools=$(zpool list -H -o name || true) # All needed information about each ZFS is available from # zfs list -H -t filesystem -o @@ -83,11 +81,11 @@ process_line() { # zfs list -H -o name,... # fields are tab separated IFS="$(printf '\t')" - # protect against special characters in, e.g., mountpoints - set -f # shellcheck disable=SC2086 set -- $1 + dataset="${1}" + pool="${dataset%%/*}" p_mountpoint="${2}" p_canmount="${3}" p_atime="${4}" @@ -120,6 +118,25 @@ process_line() { requiredby="" noauto="off" + # If the pool is already imported, zfs-import.target is not needed. This + # avoids a dependency loop on root-on-ZFS systems: + # systemd-random-seed.service After (via RequiresMountsFor) var-lib.mount + # After zfs-import.target After zfs-import-{cache,scan}.service After + # cryptsetup.service After systemd-random-seed.service. + # + # Pools are newline-separated and may contain spaces in their names. + # There is no better portable way to set IFS to just a newline. Using + # $(printf '\n') doesn't work because $(...) strips trailing newlines. + IFS=" +" + for p in $pools ; do + if [ "$p" = "$pool" ] ; then + after="" + wants="" + break + fi + done + if [ -n "${p_systemd_after}" ] && \ [ "${p_systemd_after}" != "-" ] ; then after="${p_systemd_after} ${after}" @@ -204,6 +221,10 @@ ${keymountdep} [Service] Type=oneshot RemainAfterExit=yes +# This avoids a dependency loop involving systemd-journald.socket if this +# dataset is a parent of the root filesystem. +StandardOutput=null +StandardError=null ExecStart=${keyloadcmd} ExecStop=${keyunloadcmd}" > "${dest_norm}/${keyloadunit}" fi @@ -438,6 +459,8 @@ Options=defaults${opts},zfsutil" > "${dest_norm}/${mou } for cachefile in "${FSLIST}/"* ; do + # Disable glob expansion to protect against special characters when parsing. + set -f # Sort cachefile's lines by canmount, "on" before "noauto" # and feed each line into process_line sort -t "$(printf '\t')" -k 3 -r "${cachefile}" | \ Modified: vendor-sys/openzfs/dist/etc/systemd/system/zfs-mount.service.in ============================================================================== --- vendor-sys/openzfs/dist/etc/systemd/system/zfs-mount.service.in Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/etc/systemd/system/zfs-mount.service.in Fri Sep 4 21:31:58 2020 (r365340) @@ -6,7 +6,6 @@ After=systemd-udev-settle.service After=zfs-import.target After=systemd-remount-fs.service Before=local-fs.target -Before=systemd-random-seed.service ConditionPathIsDirectory=/sys/module/zfs [Service] Modified: vendor-sys/openzfs/dist/include/libzfs.h ============================================================================== --- vendor-sys/openzfs/dist/include/libzfs.h Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/libzfs.h Fri Sep 4 21:31:58 2020 (r365340) @@ -642,7 +642,19 @@ extern int zfs_snapshot(libzfs_handle_t *, const char extern int zfs_snapshot_nvl(libzfs_handle_t *hdl, nvlist_t *snaps, nvlist_t *props); extern int zfs_rollback(zfs_handle_t *, zfs_handle_t *, boolean_t); -extern int zfs_rename(zfs_handle_t *, const char *, boolean_t, boolean_t); + +typedef struct renameflags { + /* recursive rename */ + int recursive : 1; + + /* don't unmount file systems */ + int nounmount : 1; + + /* force unmount file systems */ + int forceunmount : 1; +} renameflags_t; + +extern int zfs_rename(zfs_handle_t *, const char *, renameflags_t); typedef struct sendflags { /* Amount of extra information to print. */ Modified: vendor-sys/openzfs/dist/include/libzfs_impl.h ============================================================================== --- vendor-sys/openzfs/dist/include/libzfs_impl.h Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/libzfs_impl.h Fri Sep 4 21:31:58 2020 (r365340) @@ -166,6 +166,10 @@ int zprop_expand_list(libzfs_handle_t *hdl, zprop_list * changelist_gather() flag to force it to iterate on mounted datasets only */ #define CL_GATHER_ITER_MOUNTED 2 +/* + * Use this changelist_gather() flag to prevent unmounting of file systems. + */ +#define CL_GATHER_DONT_UNMOUNT 4 typedef struct prop_changelist prop_changelist_t; Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/cred.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/cred.h Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/cred.h Fri Sep 4 21:31:58 2020 (r365340) @@ -93,7 +93,7 @@ extern cred_t *zone_kcred(void); extern gid_t crgetrgid(const cred_t *); extern gid_t crgetsgid(const cred_t *); -#define crgetzoneid(x) (0) +#define crgetzoneid(cr) ((cr)->cr_prison->pr_id) extern projid_t crgetprojid(const cred_t *); extern cred_t *crgetmapped(const cred_t *); Modified: vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/zone.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/zone.h Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/os/freebsd/spl/sys/zone.h Fri Sep 4 21:31:58 2020 (r365340) @@ -29,6 +29,8 @@ #ifndef _OPENSOLARIS_SYS_ZONE_H_ #define _OPENSOLARIS_SYS_ZONE_H_ +#include + /* * Macros to help with zone visibility restrictions. */ @@ -36,12 +38,9 @@ #define GLOBAL_ZONEID 0 /* - * Is thread in the global zone? + * Is proc in the global zone? */ -#define INGLOBALZONE(p) in_globalzone((p)) - - -extern boolean_t in_globalzone(struct proc *); +#define INGLOBALZONE(proc) (!jailed((proc)->p_ucred)) /* * Attach the given dataset to the given jail. Modified: vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/Makefile.am ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/Makefile.am Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/Makefile.am Fri Sep 4 21:31:58 2020 (r365340) @@ -6,7 +6,7 @@ KERNEL_H = \ zfs_ctldir.h \ zfs_dir.h \ zfs_ioctl_compat.h \ - zfs_vfsops.h \ + zfs_vfsops_os.h \ zfs_vnops.h \ zfs_znode_impl.h \ zpl.h Modified: vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops.h Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops.h Fri Sep 4 21:31:58 2020 (r365340) @@ -168,7 +168,6 @@ extern boolean_t zfs_is_readonly(zfsvfs_t *zfsvfs); extern int zfs_get_temporary_prop(struct dsl_dataset *ds, zfs_prop_t zfs_prop, uint64_t *val, char *setpoint); extern int zfs_busy(void); -extern void zfsvfs_update_fromname(const char *oldname, const char *newname); #ifdef __cplusplus } Modified: vendor-sys/openzfs/dist/include/os/linux/kernel/linux/page_compat.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/linux/kernel/linux/page_compat.h Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/os/linux/kernel/linux/page_compat.h Fri Sep 4 21:31:58 2020 (r365340) @@ -35,16 +35,6 @@ #else #define nr_inactive_file_pages() global_zone_page_state(NR_INACTIVE_FILE) #endif -#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B) -#define nr_slab_reclaimable_pages() \ - global_node_page_state(NR_SLAB_RECLAIMABLE_B) -#else -#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE) -#define nr_slab_reclaimable_pages() global_node_page_state(NR_SLAB_RECLAIMABLE) -#else -#define nr_slab_reclaimable_pages() global_zone_page_state(NR_SLAB_RECLAIMABLE) -#endif -#endif #elif defined(ZFS_GLOBAL_NODE_PAGE_STATE) @@ -64,16 +54,6 @@ #else #define nr_inactive_file_pages() global_page_state(NR_INACTIVE_FILE) #endif -#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B) -#define nr_slab_reclaimable_pages() \ - global_node_page_state(NR_SLAB_RECLAIMABLE_B) -#else -#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE) -#define nr_slab_reclaimable_pages() global_node_page_state(NR_SLAB_RECLAIMABLE) -#else -#define nr_slab_reclaimable_pages() global_page_state(NR_SLAB_RECLAIMABLE) -#endif -#endif #else @@ -81,11 +61,6 @@ #define nr_file_pages() global_page_state(NR_FILE_PAGES) #define nr_inactive_anon_pages() global_page_state(NR_INACTIVE_ANON) #define nr_inactive_file_pages() global_page_state(NR_INACTIVE_FILE) -#ifdef ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B -#define nr_slab_reclaimable_pages() global_page_state(NR_SLAB_RECLAIMABLE_B) -#else -#define nr_slab_reclaimable_pages() global_page_state(NR_SLAB_RECLAIMABLE) -#endif /* ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B */ #endif /* ZFS_GLOBAL_ZONE_PAGE_STATE */ Modified: vendor-sys/openzfs/dist/include/os/linux/spl/sys/vmsystm.h ============================================================================== --- vendor-sys/openzfs/dist/include/os/linux/spl/sys/vmsystm.h Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/os/linux/spl/sys/vmsystm.h Fri Sep 4 21:31:58 2020 (r365340) @@ -47,17 +47,6 @@ #define membar_producer() smp_wmb() #define physmem zfs_totalram_pages -#ifdef ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B -#define freemem (nr_free_pages() + \ - global_page_state(NR_INACTIVE_FILE) + \ - global_page_state(NR_INACTIVE_ANON) + \ - global_page_state(NR_SLAB_RECLAIMABLE_B)) -#else -#define freemem (nr_free_pages() + \ - global_page_state(NR_INACTIVE_FILE) + \ - global_page_state(NR_INACTIVE_ANON) + \ - global_page_state(NR_SLAB_RECLAIMABLE)) -#endif /* ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B */ #define xcopyin(from, to, size) copy_from_user(to, from, size) #define xcopyout(from, to, size) copy_to_user(to, from, size) Modified: vendor-sys/openzfs/dist/include/os/linux/zfs/sys/Makefile.am ============================================================================== --- vendor-sys/openzfs/dist/include/os/linux/zfs/sys/Makefile.am Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/os/linux/zfs/sys/Makefile.am Fri Sep 4 21:31:58 2020 (r365340) @@ -19,7 +19,7 @@ KERNEL_H = \ zfs_context_os.h \ zfs_ctldir.h \ zfs_dir.h \ - zfs_vfsops.h \ + zfs_vfsops_os.h \ zfs_vnops.h \ zfs_znode_impl.h \ zpl.h Modified: vendor-sys/openzfs/dist/include/sys/Makefile.am ============================================================================== --- vendor-sys/openzfs/dist/include/sys/Makefile.am Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/include/sys/Makefile.am Fri Sep 4 21:31:58 2020 (r365340) @@ -115,6 +115,7 @@ COMMON_H = \ zfs_sa.h \ zfs_stat.h \ zfs_sysfs.h \ + zfs_vfsops.h \ zfs_znode.h \ zil.h \ zil_impl.h \ Added: vendor-sys/openzfs/dist/include/sys/zfs_vfsops.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/openzfs/dist/include/sys/zfs_vfsops.h Fri Sep 4 21:31:58 2020 (r365340) @@ -0,0 +1,35 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Portions Copyright 2020 iXsystems, Inc. + */ + +#ifndef _SYS_ZFS_VFSOPS_H +#define _SYS_ZFS_VFSOPS_H + +#ifdef _KERNEL +#include +#endif + +extern void zfsvfs_update_fromname(const char *, const char *); + +#endif /* _SYS_ZFS_VFSOPS_H */ Modified: vendor-sys/openzfs/dist/lib/libspl/Makefile.am ============================================================================== --- vendor-sys/openzfs/dist/lib/libspl/Makefile.am Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/lib/libspl/Makefile.am Fri Sep 4 21:31:58 2020 (r365340) @@ -27,7 +27,6 @@ USER_C = \ strlcat.c \ strlcpy.c \ timestamp.c \ - zone.c \ include/sys/list.h \ include/sys/list_impl.h @@ -35,7 +34,8 @@ if BUILD_LINUX USER_C += \ os/linux/getexecname.c \ os/linux/gethostid.c \ - os/linux/getmntany.c + os/linux/getmntany.c \ + os/linux/zone.c endif if BUILD_FREEBSD @@ -43,7 +43,8 @@ USER_C += \ os/freebsd/getexecname.c \ os/freebsd/gethostid.c \ os/freebsd/getmntany.c \ - os/freebsd/mnttab.c + os/freebsd/mnttab.c \ + os/freebsd/zone.c endif libspl_la_SOURCES = \ Modified: vendor-sys/openzfs/dist/lib/libspl/include/limits.h ============================================================================== --- vendor-sys/openzfs/dist/lib/libspl/include/limits.h Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/lib/libspl/include/limits.h Fri Sep 4 21:31:58 2020 (r365340) @@ -25,16 +25,21 @@ */ #include_next +#include #ifndef _LIBSPL_LIMITS_H #define _LIBSPL_LIMITS_H +#ifndef DBL_DIG #define DBL_DIG 15 #define DBL_MAX 1.7976931348623157081452E+308 #define DBL_MIN 2.2250738585072013830903E-308 +#endif +#ifndef FLT_DIG #define FLT_DIG 6 #define FLT_MAX 3.4028234663852885981170E+38F #define FLT_MIN 1.1754943508222875079688E-38F +#endif #endif /* _LIBSPL_LIMITS_H */ Modified: vendor-sys/openzfs/dist/lib/libspl/include/zone.h ============================================================================== --- vendor-sys/openzfs/dist/lib/libspl/include/zone.h Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/lib/libspl/include/zone.h Fri Sep 4 21:31:58 2020 (r365340) @@ -26,25 +26,16 @@ #ifndef _LIBSPL_ZONE_H #define _LIBSPL_ZONE_H - - #include #include -#include #ifdef __cplusplus extern "C" { #endif #define GLOBAL_ZONEID 0 -#define GLOBAL_ZONEID_NAME "global" -/* - * Functions for mapping between id and name for active zones. - */ extern zoneid_t getzoneid(void); -extern zoneid_t getzoneidbyname(const char *); -extern ssize_t getzonenamebyid(zoneid_t, char *, size_t); #ifdef __cplusplus } Added: vendor-sys/openzfs/dist/lib/libspl/os/freebsd/zone.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/openzfs/dist/lib/libspl/os/freebsd/zone.c Fri Sep 4 21:31:58 2020 (r365340) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2007 Pawel Jakub Dawidek + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#include +#include +#include +#include +#include + +zoneid_t +getzoneid(void) +{ + size_t size; + int jailid; + + /* Information that we are in jail or not is enough for our needs. */ + size = sizeof (jailid); + if (sysctlbyname("security.jail.jailed", &jailid, &size, NULL, 0) == -1) + assert(!"No security.jail.jailed sysctl!"); + return ((zoneid_t)jailid); +} Modified: vendor-sys/openzfs/dist/lib/libspl/zone.c ============================================================================== --- vendor-sys/openzfs/dist/lib/libspl/zone.c Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/lib/libspl/zone.c Fri Sep 4 21:31:58 2020 (r365340) @@ -24,40 +24,9 @@ */ #include -#include -#include zoneid_t getzoneid() { return (GLOBAL_ZONEID); -} - -zoneid_t -getzoneidbyname(const char *name) -{ - if (name == NULL) - return (GLOBAL_ZONEID); - - if (strcmp(name, GLOBAL_ZONEID_NAME) == 0) - return (GLOBAL_ZONEID); - - return (EINVAL); -} - -ssize_t -getzonenamebyid(zoneid_t id, char *buf, size_t buflen) -{ - if (id != GLOBAL_ZONEID) - return (EINVAL); - - ssize_t ret = strlen(GLOBAL_ZONEID_NAME) + 1; - - if (buf == NULL || buflen == 0) - return (ret); - - strncpy(buf, GLOBAL_ZONEID_NAME, buflen); - buf[buflen - 1] = '\0'; - - return (ret); } Modified: vendor-sys/openzfs/dist/lib/libzfs/libzfs_changelist.c ============================================================================== --- vendor-sys/openzfs/dist/lib/libzfs/libzfs_changelist.c Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/lib/libzfs/libzfs_changelist.c Fri Sep 4 21:31:58 2020 (r365340) @@ -128,6 +128,8 @@ changelist_prefix(prop_changelist_t *clp) */ switch (clp->cl_prop) { case ZFS_PROP_MOUNTPOINT: + if (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT) + break; if (zfs_unmount(cn->cn_handle, NULL, clp->cl_mflags) != 0) { ret = -1; @@ -184,7 +186,8 @@ changelist_postfix(prop_changelist_t *clp) if ((cn = uu_avl_last(clp->cl_tree)) == NULL) return (0); - if (clp->cl_prop == ZFS_PROP_MOUNTPOINT) + if (clp->cl_prop == ZFS_PROP_MOUNTPOINT && + !(clp->cl_gflags & CL_GATHER_DONT_UNMOUNT)) remove_mountpoint(cn->cn_handle); /* @@ -235,7 +238,8 @@ changelist_postfix(prop_changelist_t *clp) needs_key = (zfs_prop_get_int(cn->cn_handle, ZFS_PROP_KEYSTATUS) == ZFS_KEYSTATUS_UNAVAILABLE); - mounted = zfs_is_mounted(cn->cn_handle, NULL); + mounted = (clp->cl_gflags & CL_GATHER_DONT_UNMOUNT) || + zfs_is_mounted(cn->cn_handle, NULL); if (!mounted && !needs_key && (cn->cn_mounted || ((sharenfs || sharesmb || clp->cl_waslegacy) && Modified: vendor-sys/openzfs/dist/lib/libzfs/libzfs_dataset.c ============================================================================== --- vendor-sys/openzfs/dist/lib/libzfs/libzfs_dataset.c Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/lib/libzfs/libzfs_dataset.c Fri Sep 4 21:31:58 2020 (r365340) @@ -4370,14 +4370,14 @@ zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, bo * Renames the given dataset. */ int -zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive, - boolean_t force_unmount) +zfs_rename(zfs_handle_t *zhp, const char *target, renameflags_t flags) { int ret = 0; zfs_cmd_t zc = {"\0"}; char *delim; prop_changelist_t *cl = NULL; char parent[ZFS_MAX_DATASET_NAME_LEN]; + char property[ZFS_MAXPROPLEN]; libzfs_handle_t *hdl = zhp->zfs_hdl; char errbuf[1024]; @@ -4429,7 +4429,7 @@ zfs_rename(zfs_handle_t *zhp, const char *target, bool if (!zfs_validate_name(hdl, target, zhp->zfs_type, B_TRUE)) return (zfs_error(hdl, EZFS_INVALIDNAME, errbuf)); } else { - if (recursive) { + if (flags.recursive) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "recursive rename must be a snapshot")); return (zfs_error(hdl, EZFS_BADTYPE, errbuf)); @@ -4470,8 +4470,19 @@ zfs_rename(zfs_handle_t *zhp, const char *target, bool return (zfs_error(hdl, EZFS_ZONED, errbuf)); } - if (recursive) { - zfs_handle_t *zhrp; + /* + * Avoid unmounting file systems with mountpoint property set to + * 'legacy' or 'none' even if -u option is not given. + */ + if (zhp->zfs_type == ZFS_TYPE_FILESYSTEM && + !flags.recursive && !flags.nounmount && + zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, property, + sizeof (property), NULL, NULL, 0, B_FALSE) == 0 && + (strcmp(property, "legacy") == 0 || + strcmp(property, "none") == 0)) { + flags.nounmount = B_TRUE; + } + if (flags.recursive) { char *parentname = zfs_strdup(zhp->zfs_hdl, zhp->zfs_name); if (parentname == NULL) { ret = -1; @@ -4479,7 +4490,8 @@ zfs_rename(zfs_handle_t *zhp, const char *target, bool } delim = strchr(parentname, '@'); *delim = '\0'; - zhrp = zfs_open(zhp->zfs_hdl, parentname, ZFS_TYPE_DATASET); + zfs_handle_t *zhrp = zfs_open(zhp->zfs_hdl, parentname, + ZFS_TYPE_DATASET); free(parentname); if (zhrp == NULL) { ret = -1; @@ -4488,8 +4500,9 @@ zfs_rename(zfs_handle_t *zhp, const char *target, bool zfs_close(zhrp); } else if (zhp->zfs_type != ZFS_TYPE_SNAPSHOT) { if ((cl = changelist_gather(zhp, ZFS_PROP_NAME, + flags.nounmount ? CL_GATHER_DONT_UNMOUNT : CL_GATHER_ITER_MOUNTED, - force_unmount ? MS_FORCE : 0)) == NULL) + flags.forceunmount ? MS_FORCE : 0)) == NULL) return (-1); if (changelist_haszonedchild(cl)) { @@ -4513,7 +4526,8 @@ zfs_rename(zfs_handle_t *zhp, const char *target, bool (void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name)); (void) strlcpy(zc.zc_value, target, sizeof (zc.zc_value)); - zc.zc_cookie = recursive; + zc.zc_cookie = !!flags.recursive; + zc.zc_cookie |= (!!flags.nounmount) << 1; if ((ret = zfs_ioctl(zhp->zfs_hdl, ZFS_IOC_RENAME, &zc)) != 0) { /* @@ -4523,7 +4537,7 @@ zfs_rename(zfs_handle_t *zhp, const char *target, bool (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN, "cannot rename '%s'"), zc.zc_name); - if (recursive && errno == EEXIST) { + if (flags.recursive && errno == EEXIST) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "a child dataset already has a snapshot " "with the new name")); Modified: vendor-sys/openzfs/dist/lib/libzpool/kernel.c ============================================================================== --- vendor-sys/openzfs/dist/lib/libzpool/kernel.c Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/lib/libzpool/kernel.c Fri Sep 4 21:31:58 2020 (r365340) @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -1407,4 +1408,9 @@ void zfs_file_put(int fd) { abort(); +} + +void +zfsvfs_update_fromname(const char *oldname, const char *newname) +{ } Modified: vendor-sys/openzfs/dist/man/man8/zfs-rename.8 ============================================================================== --- vendor-sys/openzfs/dist/man/man8/zfs-rename.8 Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/man/man8/zfs-rename.8 Fri Sep 4 21:31:58 2020 (r365340) @@ -44,9 +44,16 @@ .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm .Cm rename -.Op Fl fp +.Fl p +.Op Fl f .Ar filesystem Ns | Ns Ar volume .Ar filesystem Ns | Ns Ar volume +.Nm +.Cm rename +.Fl u +.Op Fl f +.Ar filesystem +.Ar filesystem .Sh DESCRIPTION .Bl -tag -width "" .It Xo @@ -59,10 +66,19 @@ .It Xo .Nm .Cm rename -.Op Fl fp +.Fl p +.Op Fl f .Ar filesystem Ns | Ns Ar volume .Ar filesystem Ns | Ns Ar volume .Xc +.It Xo +.Nm +.Cm rename +.Fl u +.Op Fl f +.Ar filesystem +.Ar filesystem +.Xc Renames the given dataset. The new target can be located anywhere in the ZFS hierarchy, with the exception of snapshots. @@ -73,12 +89,24 @@ Renamed file systems can inherit new mount points, in unmounted and remounted at the new mount point. .Bl -tag -width "-a" .It Fl f -Force unmount any filesystems that need to be unmounted in the process. +Force unmount any file systems that need to be unmounted in the process. +This flag has no effect if used together with the +.Fl u +flag. .It Fl p Creates all the nonexistent parent datasets. Datasets created in this manner are automatically mounted according to the .Sy mountpoint property inherited from their parent. +.It Fl u +Do not remount file systems during rename. +If a file system's +.Sy mountpoint +property is set to +.Sy legacy +or +.Sy none , +the file system is not unmounted even if this option is not given. .El .It Xo .Nm Modified: vendor-sys/openzfs/dist/module/avl/avl.c ============================================================================== --- vendor-sys/openzfs/dist/module/avl/avl.c Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/module/avl/avl.c Fri Sep 4 21:31:58 2020 (r365340) @@ -96,6 +96,9 @@ * which each have their own compilation environments and subsequent * requirements. Each of these environments must be considered when adding * dependencies from avl.c. + * + * Link to Illumos.org for more information on avl function: + * [1] https://illumos.org/man/9f/avl */ #include Modified: vendor-sys/openzfs/dist/module/nvpair/nvpair.c ============================================================================== --- vendor-sys/openzfs/dist/module/nvpair/nvpair.c Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/module/nvpair/nvpair.c Fri Sep 4 21:31:58 2020 (r365340) @@ -25,6 +25,15 @@ * Copyright 2018 RackTop Systems. */ +/* + * Links to Illumos.org for more information on Interface Libraries: + * [1] https://illumos.org/man/3lib/libnvpair + * [2] https://illumos.org/man/3nvpair/nvlist_alloc + * [3] https://illumos.org/man/9f/nvlist_alloc + * [4] https://illumos.org/man/9f/nvlist_next_nvpair + * [5] https://illumos.org/man/9f/nvpair_value_byte + */ + #include #include #include Modified: vendor-sys/openzfs/dist/module/os/freebsd/spl/spl_kstat.c ============================================================================== --- vendor-sys/openzfs/dist/module/os/freebsd/spl/spl_kstat.c Fri Sep 4 21:21:23 2020 (r365339) +++ vendor-sys/openzfs/dist/module/os/freebsd/spl/spl_kstat.c Fri Sep 4 21:31:58 2020 (r365340) @@ -22,6 +22,10 @@ * 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. + * + * Links to Illumos.org for more information on kstat function: + * [1] https://illumos.org/man/1M/kstat + * [2] https://illumos.org/man/9f/kstat_create */ #include @@ -34,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include static MALLOC_DEFINE(M_KSTAT, "kstat_data", "Kernel statistics"); @@ -61,6 +66,156 @@ kstat_default_update(kstat_t *ksp, int rw) return (0); } +static int +kstat_resize_raw(kstat_t *ksp) +{ + if (ksp->ks_raw_bufsize == KSTAT_RAW_MAX) + return (ENOMEM); + + free(ksp->ks_raw_buf, M_TEMP); + ksp->ks_raw_bufsize = MIN(ksp->ks_raw_bufsize * 2, KSTAT_RAW_MAX); + ksp->ks_raw_buf = malloc(ksp->ks_raw_bufsize, M_TEMP, M_WAITOK); + + return (0); +} + +static void * +kstat_raw_default_addr(kstat_t *ksp, loff_t n) +{ + if (n == 0) + return (ksp->ks_data); + return (NULL); +} + +static int +kstat_sysctl(SYSCTL_HANDLER_ARGS) +{ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Fri Sep 4 21:34:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 54C073D0634; Fri, 4 Sep 2020 21:34:48 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjrYN1ZDQz4dJX; Fri, 4 Sep 2020 21:34:48 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0079412ED8; Fri, 4 Sep 2020 21:34:48 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084LYlWk018820; Fri, 4 Sep 2020 21:34:47 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084LYl8i018819; Fri, 4 Sep 2020 21:34:47 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <202009042134.084LYl8i018819@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Fri, 4 Sep 2020 21:34:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r365341 - vendor-sys/openzfs/2.0-rc1-gfd20a8 X-SVN-Group: vendor-sys X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: vendor-sys/openzfs/2.0-rc1-gfd20a8 X-SVN-Commit-Revision: 365341 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 21:34:48 -0000 Author: mmacy Date: Fri Sep 4 21:34:47 2020 New Revision: 365341 URL: https://svnweb.freebsd.org/changeset/base/365341 Log: snapshot openzfs 2.0-rc1 update Added: vendor-sys/openzfs/2.0-rc1-gfd20a8/ - copied from r365340, vendor-sys/openzfs/dist/ From owner-svn-src-all@freebsd.org Fri Sep 4 21:46:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D471C3D0CDA; Fri, 4 Sep 2020 21:46:10 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjrpV5G4dz4f1K; Fri, 4 Sep 2020 21:46:10 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 97CE112EFA; Fri, 4 Sep 2020 21:46:10 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084LkAcK024894; Fri, 4 Sep 2020 21:46:10 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084LkAMJ024893; Fri, 4 Sep 2020 21:46:10 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202009042146.084LkAMJ024893@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 4 Sep 2020 21:46:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365342 - head/libexec/rtld-elf/riscv X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/libexec/rtld-elf/riscv X-SVN-Commit-Revision: 365342 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 21:46:10 -0000 Author: brooks Date: Fri Sep 4 21:46:10 2020 New Revision: 365342 URL: https://svnweb.freebsd.org/changeset/base/365342 Log: Maintain a stack alignment of 16-bytes. This violated the RISC-V 64-bit ABI. On CheriBSD this manifested as a trap when attempting to store 16-byte aligned types while zeroing the stack. Reported by: CHERI, jrtc27 Reviewed by: mhorne, br Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26327 Modified: head/libexec/rtld-elf/riscv/rtld_start.S Modified: head/libexec/rtld-elf/riscv/rtld_start.S ============================================================================== --- head/libexec/rtld-elf/riscv/rtld_start.S Fri Sep 4 21:34:47 2020 (r365341) +++ head/libexec/rtld-elf/riscv/rtld_start.S Fri Sep 4 21:46:10 2020 (r365342) @@ -64,7 +64,8 @@ END(.rtld_start) */ ENTRY(_rtld_bind_start) /* Save the arguments and ra */ - addi sp, sp, -(8 * 17) + /* We require 17 dwords, but the stack must be aligned to 16-bytes */ + addi sp, sp, -(8 * 18) sd a0, (8 * 0)(sp) sd a1, (8 * 1)(sp) sd a2, (8 * 2)(sp) @@ -122,7 +123,7 @@ ENTRY(_rtld_bind_start) fld fa6, (8 * 15)(sp) fld fa7, (8 * 16)(sp) #endif - addi sp, sp, (8 * 17) + addi sp, sp, (8 * 18) /* Call into the correct function */ jr t0 From owner-svn-src-all@freebsd.org Fri Sep 4 21:48:37 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8CBCC3D0D70; Fri, 4 Sep 2020 21:48:37 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjrsK3VBjz4f6Z; Fri, 4 Sep 2020 21:48:37 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 568C013664; Fri, 4 Sep 2020 21:48:37 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084LmbvN025044; Fri, 4 Sep 2020 21:48:37 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084Lmab1025042; Fri, 4 Sep 2020 21:48:36 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <202009042148.084Lmab1025042@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Fri, 4 Sep 2020 21:48:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r365343 - in vendor-sys/openzfs/dist/include/os: freebsd/zfs/sys linux/zfs/sys X-SVN-Group: vendor-sys X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in vendor-sys/openzfs/dist/include/os: freebsd/zfs/sys linux/zfs/sys X-SVN-Commit-Revision: 365343 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 21:48:37 -0000 Author: mmacy Date: Fri Sep 4 21:48:36 2020 New Revision: 365343 URL: https://svnweb.freebsd.org/changeset/base/365343 Log: Add missed move Added: vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops_os.h - copied unchanged from r365342, vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops.h vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops_os.h - copied unchanged from r365342, vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops.h Deleted: vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops.h vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops.h Copied: vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops_os.h (from r365342, vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops_os.h Fri Sep 4 21:48:36 2020 (r365343, copy of r365342, vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops.h) @@ -0,0 +1,176 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011 Pawel Jakub Dawidek . + * All rights reserved. + */ + +#ifndef _SYS_FS_ZFS_VFSOPS_H +#define _SYS_FS_ZFS_VFSOPS_H + +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct zfsvfs zfsvfs_t; +struct znode; + +struct zfsvfs { + vfs_t *z_vfs; /* generic fs struct */ + zfsvfs_t *z_parent; /* parent fs */ + objset_t *z_os; /* objset reference */ + uint64_t z_flags; /* super_block flags */ + uint64_t z_root; /* id of root znode */ + uint64_t z_unlinkedobj; /* id of unlinked zapobj */ + uint64_t z_max_blksz; /* maximum block size for files */ + uint64_t z_fuid_obj; /* fuid table object number */ + uint64_t z_fuid_size; /* fuid table size */ + avl_tree_t z_fuid_idx; /* fuid tree keyed by index */ + avl_tree_t z_fuid_domain; /* fuid tree keyed by domain */ + krwlock_t z_fuid_lock; /* fuid lock */ + boolean_t z_fuid_loaded; /* fuid tables are loaded */ + boolean_t z_fuid_dirty; /* need to sync fuid table ? */ + struct zfs_fuid_info *z_fuid_replay; /* fuid info for replay */ + zilog_t *z_log; /* intent log pointer */ + uint_t z_acl_mode; /* acl chmod/mode behavior */ + uint_t z_acl_inherit; /* acl inheritance behavior */ + zfs_case_t z_case; /* case-sense */ + boolean_t z_utf8; /* utf8-only */ + int z_norm; /* normalization flags */ + boolean_t z_atime; /* enable atimes mount option */ + boolean_t z_unmounted; /* unmounted */ + rrmlock_t z_teardown_lock; + krwlock_t z_teardown_inactive_lock; + list_t z_all_znodes; /* all vnodes in the fs */ + uint64_t z_nr_znodes; /* number of znodes in the fs */ + kmutex_t z_znodes_lock; /* lock for z_all_znodes */ + struct zfsctl_root *z_ctldir; /* .zfs directory pointer */ + boolean_t z_show_ctldir; /* expose .zfs in the root dir */ + boolean_t z_issnap; /* true if this is a snapshot */ + boolean_t z_vscan; /* virus scan on/off */ + boolean_t z_use_fuids; /* version allows fuids */ + boolean_t z_replay; /* set during ZIL replay */ + boolean_t z_use_sa; /* version allow system attributes */ + boolean_t z_xattr_sa; /* allow xattrs to be stores as SA */ + boolean_t z_use_namecache; /* make use of FreeBSD name cache */ + uint8_t z_xattr; /* xattr type in use */ + uint64_t z_version; /* ZPL version */ + uint64_t z_shares_dir; /* hidden shares dir */ + dataset_kstats_t z_kstat; /* fs kstats */ + kmutex_t z_lock; + uint64_t z_userquota_obj; + uint64_t z_groupquota_obj; + uint64_t z_userobjquota_obj; + uint64_t z_groupobjquota_obj; + uint64_t z_projectquota_obj; + uint64_t z_projectobjquota_obj; + uint64_t z_replay_eof; /* New end of file - replay only */ + sa_attr_type_t *z_attr_table; /* SA attr mapping->id */ +#define ZFS_OBJ_MTX_SZ 64 + kmutex_t z_hold_mtx[ZFS_OBJ_MTX_SZ]; /* znode hold locks */ + struct task z_unlinked_drain_task; +}; + +#define ZSB_XATTR 0x0001 /* Enable user xattrs */ +/* + * Normal filesystems (those not under .zfs/snapshot) have a total + * file ID size limited to 12 bytes (including the length field) due to + * NFSv2 protocol's limitation of 32 bytes for a filehandle. For historical + * reasons, this same limit is being imposed by the Solaris NFSv3 implementation + * (although the NFSv3 protocol actually permits a maximum of 64 bytes). It + * is not possible to expand beyond 12 bytes without abandoning support + * of NFSv2. + * + * For normal filesystems, we partition up the available space as follows: + * 2 bytes fid length (required) + * 6 bytes object number (48 bits) + * 4 bytes generation number (32 bits) + * + * We reserve only 48 bits for the object number, as this is the limit + * currently defined and imposed by the DMU. + */ +typedef struct zfid_short { + uint16_t zf_len; + uint8_t zf_object[6]; /* obj[i] = obj >> (8 * i) */ + uint8_t zf_gen[4]; /* gen[i] = gen >> (8 * i) */ +} zfid_short_t; + +/* + * Filesystems under .zfs/snapshot have a total file ID size of 22[*] bytes + * (including the length field). This makes files under .zfs/snapshot + * accessible by NFSv3 and NFSv4, but not NFSv2. + * + * For files under .zfs/snapshot, we partition up the available space + * as follows: + * 2 bytes fid length (required) + * 6 bytes object number (48 bits) + * 4 bytes generation number (32 bits) + * 6 bytes objset id (48 bits) + * 4 bytes[**] currently just zero (32 bits) + * + * We reserve only 48 bits for the object number and objset id, as these are + * the limits currently defined and imposed by the DMU. + * + * [*] 20 bytes on FreeBSD to fit into the size of struct fid. + * [**] 2 bytes on FreeBSD for the above reason. + */ +typedef struct zfid_long { + zfid_short_t z_fid; + uint8_t zf_setid[6]; /* obj[i] = obj >> (8 * i) */ + uint8_t zf_setgen[2]; /* gen[i] = gen >> (8 * i) */ +} zfid_long_t; + +#define SHORT_FID_LEN (sizeof (zfid_short_t) - sizeof (uint16_t)) +#define LONG_FID_LEN (sizeof (zfid_long_t) - sizeof (uint16_t)) + +extern uint_t zfs_fsyncer_key; +extern int zfs_super_owner; + +extern void zfs_init(void); +extern void zfs_fini(void); + +extern int zfs_suspend_fs(zfsvfs_t *zfsvfs); +extern int zfs_resume_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds); +extern int zfs_end_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds); +extern int zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers); +extern int zfsvfs_create(const char *name, boolean_t readonly, zfsvfs_t **zfvp); +extern int zfsvfs_create_impl(zfsvfs_t **zfvp, zfsvfs_t *zfsvfs, objset_t *os); +extern void zfsvfs_free(zfsvfs_t *zfsvfs); +extern int zfs_check_global_label(const char *dsname, const char *hexsl); +extern boolean_t zfs_is_readonly(zfsvfs_t *zfsvfs); +extern int zfs_get_temporary_prop(struct dsl_dataset *ds, zfs_prop_t zfs_prop, + uint64_t *val, char *setpoint); +extern int zfs_busy(void); + +#ifdef __cplusplus +} +#endif + +#endif /* _SYS_FS_ZFS_VFSOPS_H */ Copied: vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops_os.h (from r365342, vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops_os.h Fri Sep 4 21:48:36 2020 (r365343, copy of r365342, vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops.h) @@ -0,0 +1,227 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2018 by Delphix. All rights reserved. + */ + +#ifndef _SYS_FS_ZFS_VFSOPS_H +#define _SYS_FS_ZFS_VFSOPS_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct zfsvfs zfsvfs_t; +struct znode; + +/* + * This structure emulates the vfs_t from other platforms. It's purpose + * is to facilitate the handling of mount options and minimize structural + * differences between the platforms. + */ +typedef struct vfs { + struct zfsvfs *vfs_data; + char *vfs_mntpoint; /* Primary mount point */ + uint64_t vfs_xattr; + boolean_t vfs_readonly; + boolean_t vfs_do_readonly; + boolean_t vfs_setuid; + boolean_t vfs_do_setuid; + boolean_t vfs_exec; + boolean_t vfs_do_exec; + boolean_t vfs_devices; + boolean_t vfs_do_devices; + boolean_t vfs_do_xattr; + boolean_t vfs_atime; + boolean_t vfs_do_atime; + boolean_t vfs_relatime; + boolean_t vfs_do_relatime; + boolean_t vfs_nbmand; + boolean_t vfs_do_nbmand; +} vfs_t; + +typedef struct zfs_mnt { + const char *mnt_osname; /* Objset name */ + char *mnt_data; /* Raw mount options */ +} zfs_mnt_t; + +struct zfsvfs { + vfs_t *z_vfs; /* generic fs struct */ + struct super_block *z_sb; /* generic super_block */ + struct zfsvfs *z_parent; /* parent fs */ + objset_t *z_os; /* objset reference */ + uint64_t z_flags; /* super_block flags */ + uint64_t z_root; /* id of root znode */ + uint64_t z_unlinkedobj; /* id of unlinked zapobj */ + uint64_t z_max_blksz; /* maximum block size for files */ + uint64_t z_fuid_obj; /* fuid table object number */ + uint64_t z_fuid_size; /* fuid table size */ + avl_tree_t z_fuid_idx; /* fuid tree keyed by index */ + avl_tree_t z_fuid_domain; /* fuid tree keyed by domain */ + krwlock_t z_fuid_lock; /* fuid lock */ + boolean_t z_fuid_loaded; /* fuid tables are loaded */ + boolean_t z_fuid_dirty; /* need to sync fuid table ? */ + struct zfs_fuid_info *z_fuid_replay; /* fuid info for replay */ + zilog_t *z_log; /* intent log pointer */ + uint_t z_acl_mode; /* acl chmod/mode behavior */ + uint_t z_acl_inherit; /* acl inheritance behavior */ + uint_t z_acl_type; /* type of ACL usable on this FS */ + zfs_case_t z_case; /* case-sense */ + boolean_t z_utf8; /* utf8-only */ + int z_norm; /* normalization flags */ + boolean_t z_relatime; /* enable relatime mount option */ + boolean_t z_unmounted; /* unmounted */ + rrmlock_t z_teardown_lock; + krwlock_t z_teardown_inactive_lock; + list_t z_all_znodes; /* all znodes in the fs */ + uint64_t z_nr_znodes; /* number of znodes in the fs */ + unsigned long z_rollback_time; /* last online rollback time */ + unsigned long z_snap_defer_time; /* last snapshot unmount deferral */ + kmutex_t z_znodes_lock; /* lock for z_all_znodes */ + arc_prune_t *z_arc_prune; /* called by ARC to prune caches */ + struct inode *z_ctldir; /* .zfs directory inode */ + boolean_t z_show_ctldir; /* expose .zfs in the root dir */ + boolean_t z_issnap; /* true if this is a snapshot */ + boolean_t z_vscan; /* virus scan on/off */ + boolean_t z_use_fuids; /* version allows fuids */ + boolean_t z_replay; /* set during ZIL replay */ + boolean_t z_use_sa; /* version allow system attributes */ + boolean_t z_xattr_sa; /* allow xattrs to be stores as SA */ + boolean_t z_draining; /* is true when drain is active */ + boolean_t z_drain_cancel; /* signal the unlinked drain to stop */ + uint64_t z_version; /* ZPL version */ + uint64_t z_shares_dir; /* hidden shares dir */ + dataset_kstats_t z_kstat; /* fs kstats */ + kmutex_t z_lock; + uint64_t z_userquota_obj; + uint64_t z_groupquota_obj; + uint64_t z_userobjquota_obj; + uint64_t z_groupobjquota_obj; + uint64_t z_projectquota_obj; + uint64_t z_projectobjquota_obj; + uint64_t z_replay_eof; /* New end of file - replay only */ + sa_attr_type_t *z_attr_table; /* SA attr mapping->id */ + uint64_t z_hold_size; /* znode hold array size */ + avl_tree_t *z_hold_trees; /* znode hold trees */ + kmutex_t *z_hold_locks; /* znode hold locks */ + taskqid_t z_drain_task; /* task id for the unlink drain task */ +}; + +#define ZSB_XATTR 0x0001 /* Enable user xattrs */ + +/* + * Allow a maximum number of links. While ZFS does not internally limit + * this the inode->i_nlink member is defined as an unsigned int. To be + * safe we use 2^31-1 as the limit. + */ +#define ZFS_LINK_MAX ((1U << 31) - 1U) + +/* + * Normal filesystems (those not under .zfs/snapshot) have a total + * file ID size limited to 12 bytes (including the length field) due to + * NFSv2 protocol's limitation of 32 bytes for a filehandle. For historical + * reasons, this same limit is being imposed by the Solaris NFSv3 implementation + * (although the NFSv3 protocol actually permits a maximum of 64 bytes). It + * is not possible to expand beyond 12 bytes without abandoning support + * of NFSv2. + * + * For normal filesystems, we partition up the available space as follows: + * 2 bytes fid length (required) + * 6 bytes object number (48 bits) + * 4 bytes generation number (32 bits) + * + * We reserve only 48 bits for the object number, as this is the limit + * currently defined and imposed by the DMU. + */ +typedef struct zfid_short { + uint16_t zf_len; + uint8_t zf_object[6]; /* obj[i] = obj >> (8 * i) */ + uint8_t zf_gen[4]; /* gen[i] = gen >> (8 * i) */ +} zfid_short_t; + +/* + * Filesystems under .zfs/snapshot have a total file ID size of 22 bytes + * (including the length field). This makes files under .zfs/snapshot + * accessible by NFSv3 and NFSv4, but not NFSv2. + * + * For files under .zfs/snapshot, we partition up the available space + * as follows: + * 2 bytes fid length (required) + * 6 bytes object number (48 bits) + * 4 bytes generation number (32 bits) + * 6 bytes objset id (48 bits) + * 4 bytes currently just zero (32 bits) + * + * We reserve only 48 bits for the object number and objset id, as these are + * the limits currently defined and imposed by the DMU. + */ +typedef struct zfid_long { + zfid_short_t z_fid; + uint8_t zf_setid[6]; /* obj[i] = obj >> (8 * i) */ + uint8_t zf_setgen[4]; /* gen[i] = gen >> (8 * i) */ +} zfid_long_t; + +#define SHORT_FID_LEN (sizeof (zfid_short_t) - sizeof (uint16_t)) +#define LONG_FID_LEN (sizeof (zfid_long_t) - sizeof (uint16_t)) + +extern void zfs_init(void); +extern void zfs_fini(void); + +extern int zfs_suspend_fs(zfsvfs_t *zfsvfs); +extern int zfs_resume_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds); +extern int zfs_end_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds); +extern void zfs_exit_fs(zfsvfs_t *zfsvfs); +extern int zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers); +extern int zfsvfs_create(const char *name, boolean_t readony, zfsvfs_t **zfvp); +extern int zfsvfs_create_impl(zfsvfs_t **zfvp, zfsvfs_t *zfsvfs, objset_t *os); +extern void zfsvfs_free(zfsvfs_t *zfsvfs); +extern int zfs_check_global_label(const char *dsname, const char *hexsl); + +extern boolean_t zfs_is_readonly(zfsvfs_t *zfsvfs); +extern int zfs_domount(struct super_block *sb, zfs_mnt_t *zm, int silent); +extern void zfs_preumount(struct super_block *sb); +extern int zfs_umount(struct super_block *sb); +extern int zfs_remount(struct super_block *sb, int *flags, zfs_mnt_t *zm); +extern int zfs_statvfs(struct inode *ip, struct kstatfs *statp); +extern int zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp); +extern int zfs_prune(struct super_block *sb, unsigned long nr_to_scan, + int *objects); +extern int zfs_get_temporary_prop(dsl_dataset_t *ds, zfs_prop_t zfs_prop, + uint64_t *val, char *setpoint); + +#ifdef __cplusplus +} +#endif + +#endif /* _SYS_FS_ZFS_VFSOPS_H */ From owner-svn-src-all@freebsd.org Fri Sep 4 21:55:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EBD573D10C5; Fri, 4 Sep 2020 21:55:22 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjs165x6wz4fvt; Fri, 4 Sep 2020 21:55:22 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF0AF135DD; Fri, 4 Sep 2020 21:55:22 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084LtMDx030994; Fri, 4 Sep 2020 21:55:22 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084LtMbv030993; Fri, 4 Sep 2020 21:55:22 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202009042155.084LtMbv030993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 4 Sep 2020 21:55:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365344 - head/sys/riscv/riscv X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/riscv/riscv X-SVN-Commit-Revision: 365344 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 21:55:23 -0000 Author: brooks Date: Fri Sep 4 21:55:22 2020 New Revision: 365344 URL: https://svnweb.freebsd.org/changeset/base/365344 Log: Round TF_SIZE up to the stack alignment (16-bytes). The kernel adjusts the stack by TF_SIZE and the RISC-V ABI requires that it remain 16-byte aligned. Reported by: CHERI, jrtc27 Reviewed by: mhorne Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26328 Modified: head/sys/riscv/riscv/genassym.c Modified: head/sys/riscv/riscv/genassym.c ============================================================================== --- head/sys/riscv/riscv/genassym.c Fri Sep 4 21:48:36 2020 (r365343) +++ head/sys/riscv/riscv/genassym.c Fri Sep 4 21:55:22 2020 (r365344) @@ -87,7 +87,7 @@ ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TD_MD, offsetof(struct thread, td_md)); ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); -ASSYM(TF_SIZE, sizeof(struct trapframe)); +ASSYM(TF_SIZE, roundup2(sizeof(struct trapframe), STACKALIGNBYTES + 1)); ASSYM(TF_RA, offsetof(struct trapframe, tf_ra)); ASSYM(TF_SP, offsetof(struct trapframe, tf_sp)); ASSYM(TF_GP, offsetof(struct trapframe, tf_gp)); From owner-svn-src-all@freebsd.org Fri Sep 4 21:55:35 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D040E3D129E; Fri, 4 Sep 2020 21:55:35 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjs1M5DS2z4fy8; Fri, 4 Sep 2020 21:55:35 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98108132F3; Fri, 4 Sep 2020 21:55:35 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084LtZKA031047; Fri, 4 Sep 2020 21:55:35 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084LtZBF031046; Fri, 4 Sep 2020 21:55:35 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <202009042155.084LtZBF031046@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Fri, 4 Sep 2020 21:55:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r365345 - in vendor-sys/openzfs/dist/lib/libspl: . os/linux X-SVN-Group: vendor-sys X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in vendor-sys/openzfs/dist/lib/libspl: . os/linux X-SVN-Commit-Revision: 365345 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 21:55:35 -0000 Author: mmacy Date: Fri Sep 4 21:55:35 2020 New Revision: 365345 URL: https://svnweb.freebsd.org/changeset/base/365345 Log: Another missed move Added: vendor-sys/openzfs/dist/lib/libspl/os/linux/zone.c - copied unchanged from r365344, vendor-sys/openzfs/dist/lib/libspl/zone.c Deleted: vendor-sys/openzfs/dist/lib/libspl/zone.c Copied: vendor-sys/openzfs/dist/lib/libspl/os/linux/zone.c (from r365344, vendor-sys/openzfs/dist/lib/libspl/zone.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/openzfs/dist/lib/libspl/os/linux/zone.c Fri Sep 4 21:55:35 2020 (r365345, copy of r365344, vendor-sys/openzfs/dist/lib/libspl/zone.c) @@ -0,0 +1,32 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright 2006 Ricardo Correia. All rights reserved. + * Use is subject to license terms. + */ + +#include + +zoneid_t +getzoneid() +{ + return (GLOBAL_ZONEID); +} From owner-svn-src-all@freebsd.org Fri Sep 4 22:11:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 47F773D1880; Fri, 4 Sep 2020 22:11:59 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjsNH1Wygz4gBN; Fri, 4 Sep 2020 22:11:59 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1796013631; Fri, 4 Sep 2020 22:11:59 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084MBw75040178; Fri, 4 Sep 2020 22:11:58 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084MBwUu040177; Fri, 4 Sep 2020 22:11:58 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <202009042211.084MBwUu040177@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Fri, 4 Sep 2020 22:11:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r365346 - in vendor-sys/openzfs/dist/module: os/freebsd/zfs os/linux/zfs zfs X-SVN-Group: vendor-sys X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in vendor-sys/openzfs/dist/module: os/freebsd/zfs os/linux/zfs zfs X-SVN-Commit-Revision: 365346 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 22:11:59 -0000 Author: mmacy Date: Fri Sep 4 22:11:58 2020 New Revision: 365346 URL: https://svnweb.freebsd.org/changeset/base/365346 Log: make spa_stats.c common Added: vendor-sys/openzfs/dist/module/zfs/spa_stats.c - copied unchanged from r365345, vendor-sys/openzfs/dist/module/os/linux/zfs/spa_stats.c Deleted: vendor-sys/openzfs/dist/module/os/freebsd/zfs/spa_stats.c vendor-sys/openzfs/dist/module/os/linux/zfs/spa_stats.c Copied: vendor-sys/openzfs/dist/module/zfs/spa_stats.c (from r365345, vendor-sys/openzfs/dist/module/os/linux/zfs/spa_stats.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor-sys/openzfs/dist/module/zfs/spa_stats.c Fri Sep 4 22:11:58 2020 (r365346, copy of r365345, vendor-sys/openzfs/dist/module/os/linux/zfs/spa_stats.c) @@ -0,0 +1,1043 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +#include +#include +#include +#include +#include + +/* + * Keeps stats on last N reads per spa_t, disabled by default. + */ +int zfs_read_history = 0; + +/* + * Include cache hits in history, disabled by default. + */ +int zfs_read_history_hits = 0; + +/* + * Keeps stats on the last 100 txgs by default. + */ +int zfs_txg_history = 100; + +/* + * Keeps stats on the last N MMP updates, disabled by default. + */ +int zfs_multihost_history = 0; + +/* + * ========================================================================== + * SPA Read History Routines + * ========================================================================== + */ + +/* + * Read statistics - Information exported regarding each arc_read call + */ +typedef struct spa_read_history { + hrtime_t start; /* time read completed */ + uint64_t objset; /* read from this objset */ + uint64_t object; /* read of this object number */ + uint64_t level; /* block's indirection level */ + uint64_t blkid; /* read of this block id */ + char origin[24]; /* read originated from here */ + uint32_t aflags; /* ARC flags (cached, prefetch, etc.) */ + pid_t pid; /* PID of task doing read */ + char comm[16]; /* process name of task doing read */ + procfs_list_node_t srh_node; +} spa_read_history_t; + +static int +spa_read_history_show_header(struct seq_file *f) +{ + seq_printf(f, "%-8s %-16s %-8s %-8s %-8s %-8s %-8s " + "%-24s %-8s %-16s\n", "UID", "start", "objset", "object", + "level", "blkid", "aflags", "origin", "pid", "process"); + + return (0); +} + +static int +spa_read_history_show(struct seq_file *f, void *data) +{ + spa_read_history_t *srh = (spa_read_history_t *)data; + + seq_printf(f, "%-8llu %-16llu 0x%-6llx " + "%-8lli %-8lli %-8lli 0x%-6x %-24s %-8i %-16s\n", + (u_longlong_t)srh->srh_node.pln_id, srh->start, + (longlong_t)srh->objset, (longlong_t)srh->object, + (longlong_t)srh->level, (longlong_t)srh->blkid, + srh->aflags, srh->origin, srh->pid, srh->comm); + + return (0); +} + +/* Remove oldest elements from list until there are no more than 'size' left */ +static void +spa_read_history_truncate(spa_history_list_t *shl, unsigned int size) +{ + spa_read_history_t *srh; + while (shl->size > size) { + srh = list_remove_head(&shl->procfs_list.pl_list); + ASSERT3P(srh, !=, NULL); + kmem_free(srh, sizeof (spa_read_history_t)); + shl->size--; + } + + if (size == 0) + ASSERT(list_is_empty(&shl->procfs_list.pl_list)); +} + +static int +spa_read_history_clear(procfs_list_t *procfs_list) +{ + spa_history_list_t *shl = procfs_list->pl_private; + mutex_enter(&procfs_list->pl_lock); + spa_read_history_truncate(shl, 0); + mutex_exit(&procfs_list->pl_lock); + return (0); +} + +static void +spa_read_history_init(spa_t *spa) +{ + spa_history_list_t *shl = &spa->spa_stats.read_history; + char *module; + + shl->size = 0; + + module = kmem_asprintf("zfs/%s", spa_name(spa)); + + shl->procfs_list.pl_private = shl; + procfs_list_install(module, + "reads", + 0600, + &shl->procfs_list, + spa_read_history_show, + spa_read_history_show_header, + spa_read_history_clear, + offsetof(spa_read_history_t, srh_node)); + + kmem_strfree(module); +} + +static void +spa_read_history_destroy(spa_t *spa) +{ + spa_history_list_t *shl = &spa->spa_stats.read_history; + procfs_list_uninstall(&shl->procfs_list); + spa_read_history_truncate(shl, 0); + procfs_list_destroy(&shl->procfs_list); +} + +void +spa_read_history_add(spa_t *spa, const zbookmark_phys_t *zb, uint32_t aflags) +{ + spa_history_list_t *shl = &spa->spa_stats.read_history; + spa_read_history_t *srh; + + ASSERT3P(spa, !=, NULL); + ASSERT3P(zb, !=, NULL); + + if (zfs_read_history == 0 && shl->size == 0) + return; + + if (zfs_read_history_hits == 0 && (aflags & ARC_FLAG_CACHED)) + return; + + srh = kmem_zalloc(sizeof (spa_read_history_t), KM_SLEEP); + strlcpy(srh->comm, getcomm(), sizeof (srh->comm)); + srh->start = gethrtime(); + srh->objset = zb->zb_objset; + srh->object = zb->zb_object; + srh->level = zb->zb_level; + srh->blkid = zb->zb_blkid; + srh->aflags = aflags; + srh->pid = getpid(); + + mutex_enter(&shl->procfs_list.pl_lock); + + procfs_list_add(&shl->procfs_list, srh); + shl->size++; + + spa_read_history_truncate(shl, zfs_read_history); + + mutex_exit(&shl->procfs_list.pl_lock); +} + +/* + * ========================================================================== + * SPA TXG History Routines + * ========================================================================== + */ + +/* + * Txg statistics - Information exported regarding each txg sync + */ + +typedef struct spa_txg_history { + uint64_t txg; /* txg id */ + txg_state_t state; /* active txg state */ + uint64_t nread; /* number of bytes read */ + uint64_t nwritten; /* number of bytes written */ + uint64_t reads; /* number of read operations */ + uint64_t writes; /* number of write operations */ + uint64_t ndirty; /* number of dirty bytes */ + hrtime_t times[TXG_STATE_COMMITTED]; /* completion times */ + procfs_list_node_t sth_node; +} spa_txg_history_t; + +static int +spa_txg_history_show_header(struct seq_file *f) +{ + seq_printf(f, "%-8s %-16s %-5s %-12s %-12s %-12s " + "%-8s %-8s %-12s %-12s %-12s %-12s\n", "txg", "birth", "state", + "ndirty", "nread", "nwritten", "reads", "writes", + "otime", "qtime", "wtime", "stime"); + return (0); +} + +static int +spa_txg_history_show(struct seq_file *f, void *data) +{ + spa_txg_history_t *sth = (spa_txg_history_t *)data; + uint64_t open = 0, quiesce = 0, wait = 0, sync = 0; + char state; + + switch (sth->state) { + case TXG_STATE_BIRTH: state = 'B'; break; + case TXG_STATE_OPEN: state = 'O'; break; + case TXG_STATE_QUIESCED: state = 'Q'; break; + case TXG_STATE_WAIT_FOR_SYNC: state = 'W'; break; + case TXG_STATE_SYNCED: state = 'S'; break; + case TXG_STATE_COMMITTED: state = 'C'; break; + default: state = '?'; break; + } + + if (sth->times[TXG_STATE_OPEN]) + open = sth->times[TXG_STATE_OPEN] - + sth->times[TXG_STATE_BIRTH]; + + if (sth->times[TXG_STATE_QUIESCED]) + quiesce = sth->times[TXG_STATE_QUIESCED] - + sth->times[TXG_STATE_OPEN]; + + if (sth->times[TXG_STATE_WAIT_FOR_SYNC]) + wait = sth->times[TXG_STATE_WAIT_FOR_SYNC] - + sth->times[TXG_STATE_QUIESCED]; + + if (sth->times[TXG_STATE_SYNCED]) + sync = sth->times[TXG_STATE_SYNCED] - + sth->times[TXG_STATE_WAIT_FOR_SYNC]; + + seq_printf(f, "%-8llu %-16llu %-5c %-12llu " + "%-12llu %-12llu %-8llu %-8llu %-12llu %-12llu %-12llu %-12llu\n", + (longlong_t)sth->txg, sth->times[TXG_STATE_BIRTH], state, + (u_longlong_t)sth->ndirty, + (u_longlong_t)sth->nread, (u_longlong_t)sth->nwritten, + (u_longlong_t)sth->reads, (u_longlong_t)sth->writes, + (u_longlong_t)open, (u_longlong_t)quiesce, (u_longlong_t)wait, + (u_longlong_t)sync); + + return (0); +} + +/* Remove oldest elements from list until there are no more than 'size' left */ +static void +spa_txg_history_truncate(spa_history_list_t *shl, unsigned int size) +{ + spa_txg_history_t *sth; + while (shl->size > size) { + sth = list_remove_head(&shl->procfs_list.pl_list); + ASSERT3P(sth, !=, NULL); + kmem_free(sth, sizeof (spa_txg_history_t)); + shl->size--; + } + + if (size == 0) + ASSERT(list_is_empty(&shl->procfs_list.pl_list)); + +} + +static int +spa_txg_history_clear(procfs_list_t *procfs_list) +{ + spa_history_list_t *shl = procfs_list->pl_private; + mutex_enter(&procfs_list->pl_lock); + spa_txg_history_truncate(shl, 0); + mutex_exit(&procfs_list->pl_lock); + return (0); +} + +static void +spa_txg_history_init(spa_t *spa) +{ + spa_history_list_t *shl = &spa->spa_stats.txg_history; + char *module; + + shl->size = 0; + + module = kmem_asprintf("zfs/%s", spa_name(spa)); + + shl->procfs_list.pl_private = shl; + procfs_list_install(module, + "txgs", + 0644, + &shl->procfs_list, + spa_txg_history_show, + spa_txg_history_show_header, + spa_txg_history_clear, + offsetof(spa_txg_history_t, sth_node)); + + kmem_strfree(module); +} + +static void +spa_txg_history_destroy(spa_t *spa) +{ + spa_history_list_t *shl = &spa->spa_stats.txg_history; + procfs_list_uninstall(&shl->procfs_list); + spa_txg_history_truncate(shl, 0); + procfs_list_destroy(&shl->procfs_list); +} + +/* + * Add a new txg to historical record. + */ +void +spa_txg_history_add(spa_t *spa, uint64_t txg, hrtime_t birth_time) +{ + spa_history_list_t *shl = &spa->spa_stats.txg_history; + spa_txg_history_t *sth; + + if (zfs_txg_history == 0 && shl->size == 0) + return; + + sth = kmem_zalloc(sizeof (spa_txg_history_t), KM_SLEEP); + sth->txg = txg; + sth->state = TXG_STATE_OPEN; + sth->times[TXG_STATE_BIRTH] = birth_time; + + mutex_enter(&shl->procfs_list.pl_lock); + procfs_list_add(&shl->procfs_list, sth); + shl->size++; + spa_txg_history_truncate(shl, zfs_txg_history); + mutex_exit(&shl->procfs_list.pl_lock); +} + +/* + * Set txg state completion time and increment current state. + */ +int +spa_txg_history_set(spa_t *spa, uint64_t txg, txg_state_t completed_state, + hrtime_t completed_time) +{ + spa_history_list_t *shl = &spa->spa_stats.txg_history; + spa_txg_history_t *sth; + int error = ENOENT; + + if (zfs_txg_history == 0) + return (0); + + mutex_enter(&shl->procfs_list.pl_lock); + for (sth = list_tail(&shl->procfs_list.pl_list); sth != NULL; + sth = list_prev(&shl->procfs_list.pl_list, sth)) { + if (sth->txg == txg) { + sth->times[completed_state] = completed_time; + sth->state++; + error = 0; + break; + } + } + mutex_exit(&shl->procfs_list.pl_lock); + + return (error); +} + +/* + * Set txg IO stats. + */ +static int +spa_txg_history_set_io(spa_t *spa, uint64_t txg, uint64_t nread, + uint64_t nwritten, uint64_t reads, uint64_t writes, uint64_t ndirty) +{ + spa_history_list_t *shl = &spa->spa_stats.txg_history; + spa_txg_history_t *sth; + int error = ENOENT; + + if (zfs_txg_history == 0) + return (0); + + mutex_enter(&shl->procfs_list.pl_lock); + for (sth = list_tail(&shl->procfs_list.pl_list); sth != NULL; + sth = list_prev(&shl->procfs_list.pl_list, sth)) { + if (sth->txg == txg) { + sth->nread = nread; + sth->nwritten = nwritten; + sth->reads = reads; + sth->writes = writes; + sth->ndirty = ndirty; + error = 0; + break; + } + } + mutex_exit(&shl->procfs_list.pl_lock); + + return (error); +} + +txg_stat_t * +spa_txg_history_init_io(spa_t *spa, uint64_t txg, dsl_pool_t *dp) +{ + txg_stat_t *ts; + + if (zfs_txg_history == 0) + return (NULL); + + ts = kmem_alloc(sizeof (txg_stat_t), KM_SLEEP); + + spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER); + vdev_get_stats(spa->spa_root_vdev, &ts->vs1); + spa_config_exit(spa, SCL_CONFIG, FTAG); + + ts->txg = txg; + ts->ndirty = dp->dp_dirty_pertxg[txg & TXG_MASK]; + + spa_txg_history_set(spa, txg, TXG_STATE_WAIT_FOR_SYNC, gethrtime()); + + return (ts); +} + +void +spa_txg_history_fini_io(spa_t *spa, txg_stat_t *ts) +{ + if (ts == NULL) + return; + + if (zfs_txg_history == 0) { + kmem_free(ts, sizeof (txg_stat_t)); + return; + } + + spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER); + vdev_get_stats(spa->spa_root_vdev, &ts->vs2); + spa_config_exit(spa, SCL_CONFIG, FTAG); + + spa_txg_history_set(spa, ts->txg, TXG_STATE_SYNCED, gethrtime()); + spa_txg_history_set_io(spa, ts->txg, + ts->vs2.vs_bytes[ZIO_TYPE_READ] - ts->vs1.vs_bytes[ZIO_TYPE_READ], + ts->vs2.vs_bytes[ZIO_TYPE_WRITE] - ts->vs1.vs_bytes[ZIO_TYPE_WRITE], + ts->vs2.vs_ops[ZIO_TYPE_READ] - ts->vs1.vs_ops[ZIO_TYPE_READ], + ts->vs2.vs_ops[ZIO_TYPE_WRITE] - ts->vs1.vs_ops[ZIO_TYPE_WRITE], + ts->ndirty); + + kmem_free(ts, sizeof (txg_stat_t)); +} + +/* + * ========================================================================== + * SPA TX Assign Histogram Routines + * ========================================================================== + */ + +/* + * Tx statistics - Information exported regarding dmu_tx_assign time. + */ + +/* + * When the kstat is written zero all buckets. When the kstat is read + * count the number of trailing buckets set to zero and update ks_ndata + * such that they are not output. + */ +static int +spa_tx_assign_update(kstat_t *ksp, int rw) +{ + spa_t *spa = ksp->ks_private; + spa_history_kstat_t *shk = &spa->spa_stats.tx_assign_histogram; + int i; + + if (rw == KSTAT_WRITE) { + for (i = 0; i < shk->count; i++) + ((kstat_named_t *)shk->priv)[i].value.ui64 = 0; + } + + for (i = shk->count; i > 0; i--) + if (((kstat_named_t *)shk->priv)[i-1].value.ui64 != 0) + break; + + ksp->ks_ndata = i; + ksp->ks_data_size = i * sizeof (kstat_named_t); + + return (0); +} + +static void +spa_tx_assign_init(spa_t *spa) +{ + spa_history_kstat_t *shk = &spa->spa_stats.tx_assign_histogram; + char *name; + kstat_named_t *ks; + kstat_t *ksp; + int i; + + mutex_init(&shk->lock, NULL, MUTEX_DEFAULT, NULL); + + shk->count = 42; /* power of two buckets for 1ns to 2,199s */ + shk->size = shk->count * sizeof (kstat_named_t); + shk->priv = kmem_alloc(shk->size, KM_SLEEP); + + name = kmem_asprintf("zfs/%s", spa_name(spa)); + + for (i = 0; i < shk->count; i++) { + ks = &((kstat_named_t *)shk->priv)[i]; + ks->data_type = KSTAT_DATA_UINT64; + ks->value.ui64 = 0; + (void) snprintf(ks->name, KSTAT_STRLEN, "%llu ns", + (u_longlong_t)1 << i); + } + + ksp = kstat_create(name, 0, "dmu_tx_assign", "misc", + KSTAT_TYPE_NAMED, 0, KSTAT_FLAG_VIRTUAL); + shk->kstat = ksp; + + if (ksp) { + ksp->ks_lock = &shk->lock; + ksp->ks_data = shk->priv; + ksp->ks_ndata = shk->count; + ksp->ks_data_size = shk->size; + ksp->ks_private = spa; + ksp->ks_update = spa_tx_assign_update; + kstat_install(ksp); + } + kmem_strfree(name); +} + +static void +spa_tx_assign_destroy(spa_t *spa) +{ + spa_history_kstat_t *shk = &spa->spa_stats.tx_assign_histogram; + kstat_t *ksp; + + ksp = shk->kstat; + if (ksp) + kstat_delete(ksp); + + kmem_free(shk->priv, shk->size); + mutex_destroy(&shk->lock); +} + +void +spa_tx_assign_add_nsecs(spa_t *spa, uint64_t nsecs) +{ + spa_history_kstat_t *shk = &spa->spa_stats.tx_assign_histogram; + uint64_t idx = 0; + + while (((1ULL << idx) < nsecs) && (idx < shk->size - 1)) + idx++; + + atomic_inc_64(&((kstat_named_t *)shk->priv)[idx].value.ui64); +} + +/* + * ========================================================================== + * SPA IO History Routines + * ========================================================================== + */ +static int +spa_io_history_update(kstat_t *ksp, int rw) +{ + if (rw == KSTAT_WRITE) + memset(ksp->ks_data, 0, ksp->ks_data_size); + + return (0); +} + +static void +spa_io_history_init(spa_t *spa) +{ + spa_history_kstat_t *shk = &spa->spa_stats.io_history; + char *name; + kstat_t *ksp; + + mutex_init(&shk->lock, NULL, MUTEX_DEFAULT, NULL); + + name = kmem_asprintf("zfs/%s", spa_name(spa)); + + ksp = kstat_create(name, 0, "io", "disk", KSTAT_TYPE_IO, 1, 0); + shk->kstat = ksp; + + if (ksp) { + ksp->ks_lock = &shk->lock; + ksp->ks_private = spa; + ksp->ks_update = spa_io_history_update; + kstat_install(ksp); + } + kmem_strfree(name); +} + +static void +spa_io_history_destroy(spa_t *spa) +{ + spa_history_kstat_t *shk = &spa->spa_stats.io_history; + + if (shk->kstat) + kstat_delete(shk->kstat); + + mutex_destroy(&shk->lock); +} + +/* + * ========================================================================== + * SPA MMP History Routines + * ========================================================================== + */ + +/* + * MMP statistics - Information exported regarding attempted MMP writes + * For MMP writes issued, fields used as per comments below. + * For MMP writes skipped, an entry represents a span of time when + * writes were skipped for same reason (error from mmp_random_leaf). + * Differences are: + * timestamp time first write skipped, if >1 skipped in a row + * mmp_delay delay value at timestamp + * vdev_guid number of writes skipped + * io_error one of enum mmp_error + * duration time span (ns) of skipped writes + */ + +typedef struct spa_mmp_history { + uint64_t mmp_node_id; /* unique # for updates */ + uint64_t txg; /* txg of last sync */ + uint64_t timestamp; /* UTC time MMP write issued */ + uint64_t mmp_delay; /* mmp_thread.mmp_delay at timestamp */ + uint64_t vdev_guid; /* unique ID of leaf vdev */ + char *vdev_path; + int vdev_label; /* vdev label */ + int io_error; /* error status of MMP write */ + hrtime_t error_start; /* hrtime of start of error period */ + hrtime_t duration; /* time from submission to completion */ + procfs_list_node_t smh_node; +} spa_mmp_history_t; + +static int +spa_mmp_history_show_header(struct seq_file *f) +{ + seq_printf(f, "%-10s %-10s %-10s %-6s %-10s %-12s %-24s " + "%-10s %s\n", "id", "txg", "timestamp", "error", "duration", + "mmp_delay", "vdev_guid", "vdev_label", "vdev_path"); + return (0); +} + +static int +spa_mmp_history_show(struct seq_file *f, void *data) +{ + spa_mmp_history_t *smh = (spa_mmp_history_t *)data; + char skip_fmt[] = "%-10llu %-10llu %10llu %#6llx %10lld %12llu %-24llu " + "%-10lld %s\n"; + char write_fmt[] = "%-10llu %-10llu %10llu %6lld %10lld %12llu %-24llu " + "%-10lld %s\n"; + + seq_printf(f, (smh->error_start ? skip_fmt : write_fmt), + (u_longlong_t)smh->mmp_node_id, (u_longlong_t)smh->txg, + (u_longlong_t)smh->timestamp, (longlong_t)smh->io_error, + (longlong_t)smh->duration, (u_longlong_t)smh->mmp_delay, + (u_longlong_t)smh->vdev_guid, (u_longlong_t)smh->vdev_label, + (smh->vdev_path ? smh->vdev_path : "-")); + + return (0); +} + +/* Remove oldest elements from list until there are no more than 'size' left */ +static void +spa_mmp_history_truncate(spa_history_list_t *shl, unsigned int size) +{ + spa_mmp_history_t *smh; + while (shl->size > size) { + smh = list_remove_head(&shl->procfs_list.pl_list); + if (smh->vdev_path) + kmem_strfree(smh->vdev_path); + kmem_free(smh, sizeof (spa_mmp_history_t)); + shl->size--; + } + + if (size == 0) + ASSERT(list_is_empty(&shl->procfs_list.pl_list)); + +} + +static int +spa_mmp_history_clear(procfs_list_t *procfs_list) +{ + spa_history_list_t *shl = procfs_list->pl_private; + mutex_enter(&procfs_list->pl_lock); + spa_mmp_history_truncate(shl, 0); + mutex_exit(&procfs_list->pl_lock); + return (0); +} + +static void +spa_mmp_history_init(spa_t *spa) +{ + spa_history_list_t *shl = &spa->spa_stats.mmp_history; + char *module; + + shl->size = 0; + + module = kmem_asprintf("zfs/%s", spa_name(spa)); + + shl->procfs_list.pl_private = shl; + procfs_list_install(module, + "multihost", + 0644, + &shl->procfs_list, + spa_mmp_history_show, + spa_mmp_history_show_header, + spa_mmp_history_clear, + offsetof(spa_mmp_history_t, smh_node)); + + kmem_strfree(module); +} + +static void +spa_mmp_history_destroy(spa_t *spa) +{ + spa_history_list_t *shl = &spa->spa_stats.mmp_history; + procfs_list_uninstall(&shl->procfs_list); + spa_mmp_history_truncate(shl, 0); + procfs_list_destroy(&shl->procfs_list); +} + +/* + * Set duration in existing "skip" record to how long we have waited for a leaf + * vdev to become available. + * + * Important that we start search at the tail of the list where new + * records are inserted, so this is normally an O(1) operation. + */ +int +spa_mmp_history_set_skip(spa_t *spa, uint64_t mmp_node_id) +{ + spa_history_list_t *shl = &spa->spa_stats.mmp_history; + spa_mmp_history_t *smh; + int error = ENOENT; + + if (zfs_multihost_history == 0 && shl->size == 0) + return (0); + + mutex_enter(&shl->procfs_list.pl_lock); + for (smh = list_tail(&shl->procfs_list.pl_list); smh != NULL; + smh = list_prev(&shl->procfs_list.pl_list, smh)) { + if (smh->mmp_node_id == mmp_node_id) { + ASSERT3U(smh->io_error, !=, 0); + smh->duration = gethrtime() - smh->error_start; + smh->vdev_guid++; + error = 0; + break; + } + } + mutex_exit(&shl->procfs_list.pl_lock); + + return (error); +} + +/* + * Set MMP write duration and error status in existing record. + * See comment re: search order above spa_mmp_history_set_skip(). + */ +int +spa_mmp_history_set(spa_t *spa, uint64_t mmp_node_id, int io_error, + hrtime_t duration) +{ + spa_history_list_t *shl = &spa->spa_stats.mmp_history; + spa_mmp_history_t *smh; + int error = ENOENT; + + if (zfs_multihost_history == 0 && shl->size == 0) + return (0); + + mutex_enter(&shl->procfs_list.pl_lock); + for (smh = list_tail(&shl->procfs_list.pl_list); smh != NULL; + smh = list_prev(&shl->procfs_list.pl_list, smh)) { + if (smh->mmp_node_id == mmp_node_id) { + ASSERT(smh->io_error == 0); + smh->io_error = io_error; + smh->duration = duration; + error = 0; + break; + } + } + mutex_exit(&shl->procfs_list.pl_lock); + + return (error); +} + +/* + * Add a new MMP historical record. + * error == 0 : a write was issued. + * error != 0 : a write was not issued because no leaves were found. + */ +void +spa_mmp_history_add(spa_t *spa, uint64_t txg, uint64_t timestamp, + uint64_t mmp_delay, vdev_t *vd, int label, uint64_t mmp_node_id, + int error) +{ + spa_history_list_t *shl = &spa->spa_stats.mmp_history; + spa_mmp_history_t *smh; + + if (zfs_multihost_history == 0 && shl->size == 0) + return; + + smh = kmem_zalloc(sizeof (spa_mmp_history_t), KM_SLEEP); + smh->txg = txg; + smh->timestamp = timestamp; + smh->mmp_delay = mmp_delay; + if (vd) { + smh->vdev_guid = vd->vdev_guid; + if (vd->vdev_path) + smh->vdev_path = kmem_strdup(vd->vdev_path); + } + smh->vdev_label = label; + smh->mmp_node_id = mmp_node_id; + + if (error) { + smh->io_error = error; + smh->error_start = gethrtime(); + smh->vdev_guid = 1; + } + + mutex_enter(&shl->procfs_list.pl_lock); + procfs_list_add(&shl->procfs_list, smh); + shl->size++; + spa_mmp_history_truncate(shl, zfs_multihost_history); + mutex_exit(&shl->procfs_list.pl_lock); +} + +static void * +spa_state_addr(kstat_t *ksp, loff_t n) +{ + if (n == 0) + return (ksp->ks_private); /* return the spa_t */ + return (NULL); +} + +static int +spa_state_data(char *buf, size_t size, void *data) +{ + spa_t *spa = (spa_t *)data; + (void) snprintf(buf, size, "%s\n", spa_state_to_name(spa)); + return (0); +} + +/* + * Return the state of the pool in /proc/spl/kstat/zfs//state. + * + * This is a lock-less read of the pool's state (unlike using 'zpool', which + * can potentially block for seconds). Because it doesn't block, it can useful + * as a pool heartbeat value. + */ +static void +spa_state_init(spa_t *spa) +{ + spa_history_kstat_t *shk = &spa->spa_stats.state; + char *name; + kstat_t *ksp; + + mutex_init(&shk->lock, NULL, MUTEX_DEFAULT, NULL); + + name = kmem_asprintf("zfs/%s", spa_name(spa)); + ksp = kstat_create(name, 0, "state", "misc", + KSTAT_TYPE_RAW, 0, KSTAT_FLAG_VIRTUAL); + + shk->kstat = ksp; + if (ksp) { + ksp->ks_lock = &shk->lock; + ksp->ks_data = NULL; + ksp->ks_private = spa; + ksp->ks_flags |= KSTAT_FLAG_NO_HEADERS; + kstat_set_raw_ops(ksp, NULL, spa_state_data, spa_state_addr); + kstat_install(ksp); + } + + kmem_strfree(name); +} + +static void +spa_health_destroy(spa_t *spa) +{ + spa_history_kstat_t *shk = &spa->spa_stats.state; + kstat_t *ksp = shk->kstat; + if (ksp) + kstat_delete(ksp); + + mutex_destroy(&shk->lock); +} + +static spa_iostats_t spa_iostats_template = { + { "trim_extents_written", KSTAT_DATA_UINT64 }, + { "trim_bytes_written", KSTAT_DATA_UINT64 }, + { "trim_extents_skipped", KSTAT_DATA_UINT64 }, + { "trim_bytes_skipped", KSTAT_DATA_UINT64 }, + { "trim_extents_failed", KSTAT_DATA_UINT64 }, + { "trim_bytes_failed", KSTAT_DATA_UINT64 }, + { "autotrim_extents_written", KSTAT_DATA_UINT64 }, + { "autotrim_bytes_written", KSTAT_DATA_UINT64 }, + { "autotrim_extents_skipped", KSTAT_DATA_UINT64 }, + { "autotrim_bytes_skipped", KSTAT_DATA_UINT64 }, + { "autotrim_extents_failed", KSTAT_DATA_UINT64 }, + { "autotrim_bytes_failed", KSTAT_DATA_UINT64 }, + { "simple_trim_extents_written", KSTAT_DATA_UINT64 }, + { "simple_trim_bytes_written", KSTAT_DATA_UINT64 }, + { "simple_trim_extents_skipped", KSTAT_DATA_UINT64 }, + { "simple_trim_bytes_skipped", KSTAT_DATA_UINT64 }, + { "simple_trim_extents_failed", KSTAT_DATA_UINT64 }, + { "simple_trim_bytes_failed", KSTAT_DATA_UINT64 }, +}; + +#define SPA_IOSTATS_ADD(stat, val) \ + atomic_add_64(&iostats->stat.value.ui64, (val)); + +void +spa_iostats_trim_add(spa_t *spa, trim_type_t type, + uint64_t extents_written, uint64_t bytes_written, + uint64_t extents_skipped, uint64_t bytes_skipped, + uint64_t extents_failed, uint64_t bytes_failed) +{ + spa_history_kstat_t *shk = &spa->spa_stats.iostats; + kstat_t *ksp = shk->kstat; + spa_iostats_t *iostats; + + if (ksp == NULL) + return; + + iostats = ksp->ks_data; + if (type == TRIM_TYPE_MANUAL) { + SPA_IOSTATS_ADD(trim_extents_written, extents_written); + SPA_IOSTATS_ADD(trim_bytes_written, bytes_written); + SPA_IOSTATS_ADD(trim_extents_skipped, extents_skipped); + SPA_IOSTATS_ADD(trim_bytes_skipped, bytes_skipped); + SPA_IOSTATS_ADD(trim_extents_failed, extents_failed); + SPA_IOSTATS_ADD(trim_bytes_failed, bytes_failed); + } else if (type == TRIM_TYPE_AUTO) { + SPA_IOSTATS_ADD(autotrim_extents_written, extents_written); + SPA_IOSTATS_ADD(autotrim_bytes_written, bytes_written); + SPA_IOSTATS_ADD(autotrim_extents_skipped, extents_skipped); + SPA_IOSTATS_ADD(autotrim_bytes_skipped, bytes_skipped); + SPA_IOSTATS_ADD(autotrim_extents_failed, extents_failed); + SPA_IOSTATS_ADD(autotrim_bytes_failed, bytes_failed); + } else { + SPA_IOSTATS_ADD(simple_trim_extents_written, extents_written); + SPA_IOSTATS_ADD(simple_trim_bytes_written, bytes_written); + SPA_IOSTATS_ADD(simple_trim_extents_skipped, extents_skipped); + SPA_IOSTATS_ADD(simple_trim_bytes_skipped, bytes_skipped); + SPA_IOSTATS_ADD(simple_trim_extents_failed, extents_failed); + SPA_IOSTATS_ADD(simple_trim_bytes_failed, bytes_failed); + } +} + +static int +spa_iostats_update(kstat_t *ksp, int rw) +{ + if (rw == KSTAT_WRITE) { + memcpy(ksp->ks_data, &spa_iostats_template, + sizeof (spa_iostats_t)); + } + + return (0); +} + +static void +spa_iostats_init(spa_t *spa) +{ + spa_history_kstat_t *shk = &spa->spa_stats.iostats; + + mutex_init(&shk->lock, NULL, MUTEX_DEFAULT, NULL); + + char *name = kmem_asprintf("zfs/%s", spa_name(spa)); + kstat_t *ksp = kstat_create(name, 0, "iostats", "misc", + KSTAT_TYPE_NAMED, sizeof (spa_iostats_t) / sizeof (kstat_named_t), + KSTAT_FLAG_VIRTUAL); + + shk->kstat = ksp; + if (ksp) { + int size = sizeof (spa_iostats_t); + ksp->ks_lock = &shk->lock; + ksp->ks_private = spa; + ksp->ks_update = spa_iostats_update; + ksp->ks_data = kmem_alloc(size, KM_SLEEP); + memcpy(ksp->ks_data, &spa_iostats_template, size); + kstat_install(ksp); + } + + kmem_strfree(name); +} + +static void +spa_iostats_destroy(spa_t *spa) +{ + spa_history_kstat_t *shk = &spa->spa_stats.iostats; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Fri Sep 4 22:25:19 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 25AA73D191C; Fri, 4 Sep 2020 22:25:19 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjsgg0L6xz4gpr; Fri, 4 Sep 2020 22:25:19 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DECC913B2B; Fri, 4 Sep 2020 22:25:18 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084MPILu049487; Fri, 4 Sep 2020 22:25:18 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084MPE3K049467; Fri, 4 Sep 2020 22:25:14 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <202009042225.084MPE3K049467@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Fri, 4 Sep 2020 22:25:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365347 - in head: lib/libbe sys/conf sys/contrib/openzfs sys/contrib/openzfs/cmd/zfs sys/contrib/openzfs/config sys/contrib/openzfs/etc/systemd/system sys/contrib/openzfs/etc/systemd/s... X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in head: lib/libbe sys/conf sys/contrib/openzfs sys/contrib/openzfs/cmd/zfs sys/contrib/openzfs/config sys/contrib/openzfs/etc/systemd/system sys/contrib/openzfs/etc/systemd/system-generators sys/cont... X-SVN-Commit-Revision: 365347 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 22:25:19 -0000 Author: mmacy Date: Fri Sep 4 22:25:14 2020 New Revision: 365347 URL: https://svnweb.freebsd.org/changeset/base/365347 Log: ZFS: MFV 2.0-rc1-gfd20a8 - fixes jail delegation - fixes raw kstat unsupported complaints - exposes dbgmsg, dbuf, and checksum benchmark stats - restore rename -u support Added: head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h - copied unchanged from r365345, vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops_os.h head/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_vfsops_os.h - copied unchanged from r365345, vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops_os.h head/sys/contrib/openzfs/include/sys/zfs_vfsops.h - copied unchanged from r365345, vendor-sys/openzfs/dist/include/sys/zfs_vfsops.h head/sys/contrib/openzfs/lib/libspl/os/freebsd/zone.c - copied unchanged from r365345, vendor-sys/openzfs/dist/lib/libspl/os/freebsd/zone.c head/sys/contrib/openzfs/lib/libspl/os/linux/zone.c - copied unchanged from r365345, vendor-sys/openzfs/dist/lib/libspl/os/linux/zone.c head/sys/contrib/openzfs/module/zfs/spa_stats.c - copied unchanged from r365346, vendor-sys/openzfs/dist/module/zfs/spa_stats.c head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_nounmount.ksh - copied unchanged from r365345, vendor-sys/openzfs/dist/tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_nounmount.ksh Deleted: head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops.h head/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_vfsops.h head/sys/contrib/openzfs/lib/libspl/zone.c head/sys/contrib/openzfs/module/os/freebsd/zfs/spa_stats.c head/sys/contrib/openzfs/module/os/linux/zfs/spa_stats.c Modified: head/lib/libbe/be.c head/sys/conf/files head/sys/contrib/openzfs/cmd/zfs/zfs_main.c head/sys/contrib/openzfs/config/kernel-global_page_state.m4 head/sys/contrib/openzfs/config/zfs-build.m4 head/sys/contrib/openzfs/etc/systemd/system-generators/zfs-mount-generator.in head/sys/contrib/openzfs/etc/systemd/system/zfs-mount.service.in head/sys/contrib/openzfs/include/libzfs.h head/sys/contrib/openzfs/include/libzfs_impl.h head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cred.h head/sys/contrib/openzfs/include/os/freebsd/spl/sys/zone.h head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/Makefile.am head/sys/contrib/openzfs/include/os/linux/kernel/linux/page_compat.h head/sys/contrib/openzfs/include/os/linux/spl/sys/vmsystm.h head/sys/contrib/openzfs/include/os/linux/zfs/sys/Makefile.am head/sys/contrib/openzfs/include/sys/Makefile.am head/sys/contrib/openzfs/lib/libspl/Makefile.am head/sys/contrib/openzfs/lib/libspl/include/limits.h head/sys/contrib/openzfs/lib/libspl/include/zone.h head/sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c head/sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c head/sys/contrib/openzfs/lib/libzpool/kernel.c head/sys/contrib/openzfs/man/man8/zfs-rename.8 head/sys/contrib/openzfs/module/avl/avl.c head/sys/contrib/openzfs/module/nvpair/nvpair.c head/sys/contrib/openzfs/module/os/freebsd/spl/spl_kstat.c head/sys/contrib/openzfs/module/os/freebsd/spl/spl_zone.c head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c head/sys/contrib/openzfs/module/os/freebsd/zfs/zvol_os.c head/sys/contrib/openzfs/module/os/linux/spl/spl-kstat.c head/sys/contrib/openzfs/module/os/linux/zfs/Makefile.in head/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c head/sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c head/sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c head/sys/contrib/openzfs/module/zfs/Makefile.in head/sys/contrib/openzfs/module/zfs/arc.c head/sys/contrib/openzfs/module/zfs/dsl_dir.c head/sys/contrib/openzfs/module/zfs/spa.c head/sys/contrib/openzfs/module/zfs/spa_config.c head/sys/contrib/openzfs/module/zfs/vdev.c head/sys/contrib/openzfs/module/zfs/vdev_indirect.c head/sys/contrib/openzfs/module/zfs/vdev_raidz.c head/sys/contrib/openzfs/module/zfs/zfs_fm.c head/sys/contrib/openzfs/module/zfs/zfs_ioctl.c head/sys/contrib/openzfs/module/zfs/zio.c head/sys/contrib/openzfs/tests/runfiles/common.run head/sys/contrib/openzfs/tests/zfs-tests/include/tunables.cfg head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rename/Makefile.am head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_mountpoint.ksh Directory Properties: head/sys/contrib/openzfs/ (props changed) head/sys/contrib/openzfs/zfs.release.in (props changed) Modified: head/lib/libbe/be.c ============================================================================== --- head/lib/libbe/be.c Fri Sep 4 22:11:58 2020 (r365346) +++ head/lib/libbe/be.c Fri Sep 4 22:25:14 2020 (r365347) @@ -996,8 +996,11 @@ be_rename(libbe_handle_t *lbh, const char *old, const ZFS_TYPE_FILESYSTEM)) == NULL) return (set_error(lbh, BE_ERR_ZFSOPEN)); - - err = zfs_rename(zfs_hdl,full_new, B_FALSE, B_FALSE); + /* recurse, nounmount, forceunmount */ + struct renameflags flags = { + .nounmount = 1, + }; + err = zfs_rename(zfs_hdl, full_new, flags); zfs_close(zfs_hdl); if (err != 0) Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/conf/files Fri Sep 4 22:25:14 2020 (r365347) @@ -206,7 +206,6 @@ contrib/openzfs/module/os/freebsd/zfs/dmu_os.c option contrib/openzfs/module/os/freebsd/zfs/hkdf.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/os/freebsd/zfs/kmod_core.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/os/freebsd/zfs/spa_os.c optional zfs compile-with "${ZFS_C}" -contrib/openzfs/module/os/freebsd/zfs/spa_stats.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c optional zfs compile-with "${ZFS_C} -include $S/modules/zfs/zfs_config.h" contrib/openzfs/module/os/freebsd/zfs/vdev_file.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/os/freebsd/zfs/vdev_label_os.c optional zfs compile-with "${ZFS_C}" @@ -304,6 +303,7 @@ contrib/openzfs/module/zfs/spa_errlog.c optional zfs contrib/openzfs/module/zfs/spa_history.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/spa_log_spacemap.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/spa_misc.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/spa_stats.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/space_map.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/space_reftree.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zfs/txg.c optional zfs compile-with "${ZFS_C}" Modified: head/sys/contrib/openzfs/cmd/zfs/zfs_main.c ============================================================================== --- head/sys/contrib/openzfs/cmd/zfs/zfs_main.c Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/cmd/zfs/zfs_main.c Fri Sep 4 22:25:14 2020 (r365347) @@ -311,7 +311,8 @@ get_usage(zfs_help_t idx) case HELP_RENAME: return (gettext("\trename [-f] " "\n" - "\trename [-f] -p \n" + "\trename -p [-f] \n" + "\trename -u [-f] \n" "\trename -r \n")); case HELP_ROLLBACK: return (gettext("\trollback [-rRf] \n")); @@ -401,7 +402,7 @@ get_usage(zfs_help_t idx) "<-a | filesystem|volume>\n")); case HELP_CHANGE_KEY: return (gettext("\tchange-key [-l] [-o keyformat=]\n" - "\t [-o keylocation=] [-o pbkfd2iters=]\n" + "\t [-o keylocation=] [-o pbkdf2iters=]\n" "\t \n" "\tchange-key -i [-l] \n")); case HELP_VERSION: @@ -3603,36 +3604,40 @@ zfs_do_list(int argc, char **argv) } /* - * zfs rename [-f] + * zfs rename [-fu] * zfs rename [-f] -p - * zfs rename -r + * zfs rename [-u] -r * * Renames the given dataset to another of the same type. * * The '-p' flag creates all the non-existing ancestors of the target first. + * The '-u' flag prevents file systems from being remounted during rename. */ /* ARGSUSED */ static int zfs_do_rename(int argc, char **argv) { zfs_handle_t *zhp; + renameflags_t flags = { 0 }; int c; int ret = 0; - boolean_t recurse = B_FALSE; + int types; boolean_t parents = B_FALSE; - boolean_t force_unmount = B_FALSE; /* check options */ - while ((c = getopt(argc, argv, "prf")) != -1) { + while ((c = getopt(argc, argv, "pruf")) != -1) { switch (c) { case 'p': parents = B_TRUE; break; case 'r': - recurse = B_TRUE; + flags.recursive = B_TRUE; break; + case 'u': + flags.nounmount = B_TRUE; + break; case 'f': - force_unmount = B_TRUE; + flags.forceunmount = B_TRUE; break; case '?': default: @@ -3661,20 +3666,32 @@ zfs_do_rename(int argc, char **argv) usage(B_FALSE); } - if (recurse && parents) { + if (flags.recursive && parents) { (void) fprintf(stderr, gettext("-p and -r options are mutually " "exclusive\n")); usage(B_FALSE); } - if (recurse && strchr(argv[0], '@') == 0) { + if (flags.nounmount && parents) { + (void) fprintf(stderr, gettext("-u and -p options are mutually " + "exclusive\n")); + usage(B_FALSE); + } + + if (flags.recursive && strchr(argv[0], '@') == 0) { (void) fprintf(stderr, gettext("source dataset for recursive " "rename must be a snapshot\n")); usage(B_FALSE); } - if ((zhp = zfs_open(g_zfs, argv[0], parents ? ZFS_TYPE_FILESYSTEM | - ZFS_TYPE_VOLUME : ZFS_TYPE_DATASET)) == NULL) + if (flags.nounmount) + types = ZFS_TYPE_FILESYSTEM; + else if (parents) + types = ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME; + else + types = ZFS_TYPE_DATASET; + + if ((zhp = zfs_open(g_zfs, argv[0], types)) == NULL) return (1); /* If we were asked and the name looks good, try to create ancestors. */ @@ -3684,7 +3701,7 @@ zfs_do_rename(int argc, char **argv) return (1); } - ret = (zfs_rename(zhp, argv[1], recurse, force_unmount) != 0); + ret = (zfs_rename(zhp, argv[1], flags) != 0); zfs_close(zhp); return (ret); Modified: head/sys/contrib/openzfs/config/kernel-global_page_state.m4 ============================================================================== --- head/sys/contrib/openzfs/config/kernel-global_page_state.m4 Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/config/kernel-global_page_state.m4 Fri Sep 4 22:25:14 2020 (r365347) @@ -94,9 +94,6 @@ AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY] ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_FILE_PAGES]) ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_INACTIVE_ANON]) ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_INACTIVE_FILE]) - AS_IF([test -z "$ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B"],[ - ZFS_AC_KERNEL_GLOBAL_PAGE_STATE_ENUM_CHECK([NR_SLAB_RECLAIMABLE]) - ]) AC_MSG_RESULT(yes) ]) @@ -119,18 +116,12 @@ AC_DEFUN([ZFS_AC_KERNEL_GLOBAL_PAGE_STATE], [ [node_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE], [node_stat_item], [$LINUX/include/linux/mmzone.h]) - ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE], - [node_stat_item], [$LINUX/include/linux/mmzone.h]) - ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE_B], - [node_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_ENUM_MEMBER([NR_FILE_PAGES], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_ANON], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_ENUM_MEMBER([NR_INACTIVE_FILE], - [zone_stat_item], [$LINUX/include/linux/mmzone.h]) - ZFS_AC_KERNEL_ENUM_MEMBER([NR_SLAB_RECLAIMABLE], [zone_stat_item], [$LINUX/include/linux/mmzone.h]) ZFS_AC_KERNEL_GLOBAL_ZONE_PAGE_STATE_SANITY Modified: head/sys/contrib/openzfs/config/zfs-build.m4 ============================================================================== --- head/sys/contrib/openzfs/config/zfs-build.m4 Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/config/zfs-build.m4 Fri Sep 4 22:25:14 2020 (r365347) @@ -418,33 +418,43 @@ dnl # package type for 'make pkg': (rpm | deb | tgz) dnl # AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [ AC_MSG_CHECKING([os distribution]) - if test -f /etc/toss-release ; then - VENDOR=toss ; - elif test -f /etc/fedora-release ; then - VENDOR=fedora ; - elif test -f /etc/redhat-release ; then - VENDOR=redhat ; - elif test -f /etc/gentoo-release ; then - VENDOR=gentoo ; - elif test -f /etc/arch-release ; then - VENDOR=arch ; - elif test -f /etc/SuSE-release ; then - VENDOR=sles ; - elif test -f /etc/slackware-version ; then - VENDOR=slackware ; - elif test -f /etc/lunar.release ; then - VENDOR=lunar ; - elif test -f /etc/lsb-release ; then - VENDOR=ubuntu ; - elif test -f /etc/debian_version ; then - VENDOR=debian ; - elif test -f /etc/alpine-release ; then - VENDOR=alpine ; - elif test -f /bin/freebsd-version ; then - VENDOR=freebsd ; - else - VENDOR= ; - fi + AC_ARG_WITH([vendor], + [AS_HELP_STRING([--with-vendor], + [Distribution vendor @<:@default=check@:>@])], + [with_vendor=$withval], + [with_vendor=check]) + AS_IF([test "x$with_vendor" = "xcheck"],[ + if test -f /etc/toss-release ; then + VENDOR=toss ; + elif test -f /etc/fedora-release ; then + VENDOR=fedora ; + elif test -f /etc/redhat-release ; then + VENDOR=redhat ; + elif test -f /etc/gentoo-release ; then + VENDOR=gentoo ; + elif test -f /etc/arch-release ; then + VENDOR=arch ; + elif test -f /etc/SuSE-release ; then + VENDOR=sles ; + elif test -f /etc/slackware-version ; then + VENDOR=slackware ; + elif test -f /etc/lunar.release ; then + VENDOR=lunar ; + elif test -f /etc/lsb-release ; then + VENDOR=ubuntu ; + elif test -f /etc/debian_version ; then + VENDOR=debian ; + elif test -f /etc/alpine-release ; then + VENDOR=alpine ; + elif test -f /bin/freebsd-version ; then + VENDOR=freebsd ; + else + VENDOR= ; + fi], + [ test "x${with_vendor}" != x],[ + VENDOR="$with_vendor" ], + [ VENDOR= ; ] + ) AC_MSG_RESULT([$VENDOR]) AC_SUBST(VENDOR) Modified: head/sys/contrib/openzfs/etc/systemd/system-generators/zfs-mount-generator.in ============================================================================== --- head/sys/contrib/openzfs/etc/systemd/system-generators/zfs-mount-generator.in Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/etc/systemd/system-generators/zfs-mount-generator.in Fri Sep 4 22:25:14 2020 (r365347) @@ -38,8 +38,6 @@ do_fail() { is_known() { query="$1" IFS=' ' - # protect against special characters - set -f for element in $2 ; do if [ "$query" = "$element" ] ; then return 0 @@ -54,8 +52,7 @@ is_known() { create_dependencies() { unitfile="$1" suffix="$2" - # protect against special characters - set -f + IFS=' ' for target in $3 ; do target_dir="${dest_norm}/${target}.${suffix}/" mkdir -p "${target_dir}" @@ -72,6 +69,7 @@ else do_fail "zero or three arguments required" fi +pools=$(zpool list -H -o name || true) # All needed information about each ZFS is available from # zfs list -H -t filesystem -o @@ -83,11 +81,11 @@ process_line() { # zfs list -H -o name,... # fields are tab separated IFS="$(printf '\t')" - # protect against special characters in, e.g., mountpoints - set -f # shellcheck disable=SC2086 set -- $1 + dataset="${1}" + pool="${dataset%%/*}" p_mountpoint="${2}" p_canmount="${3}" p_atime="${4}" @@ -120,6 +118,25 @@ process_line() { requiredby="" noauto="off" + # If the pool is already imported, zfs-import.target is not needed. This + # avoids a dependency loop on root-on-ZFS systems: + # systemd-random-seed.service After (via RequiresMountsFor) var-lib.mount + # After zfs-import.target After zfs-import-{cache,scan}.service After + # cryptsetup.service After systemd-random-seed.service. + # + # Pools are newline-separated and may contain spaces in their names. + # There is no better portable way to set IFS to just a newline. Using + # $(printf '\n') doesn't work because $(...) strips trailing newlines. + IFS=" +" + for p in $pools ; do + if [ "$p" = "$pool" ] ; then + after="" + wants="" + break + fi + done + if [ -n "${p_systemd_after}" ] && \ [ "${p_systemd_after}" != "-" ] ; then after="${p_systemd_after} ${after}" @@ -204,6 +221,10 @@ ${keymountdep} [Service] Type=oneshot RemainAfterExit=yes +# This avoids a dependency loop involving systemd-journald.socket if this +# dataset is a parent of the root filesystem. +StandardOutput=null +StandardError=null ExecStart=${keyloadcmd} ExecStop=${keyunloadcmd}" > "${dest_norm}/${keyloadunit}" fi @@ -438,6 +459,8 @@ Options=defaults${opts},zfsutil" > "${dest_norm}/${mou } for cachefile in "${FSLIST}/"* ; do + # Disable glob expansion to protect against special characters when parsing. + set -f # Sort cachefile's lines by canmount, "on" before "noauto" # and feed each line into process_line sort -t "$(printf '\t')" -k 3 -r "${cachefile}" | \ Modified: head/sys/contrib/openzfs/etc/systemd/system/zfs-mount.service.in ============================================================================== --- head/sys/contrib/openzfs/etc/systemd/system/zfs-mount.service.in Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/etc/systemd/system/zfs-mount.service.in Fri Sep 4 22:25:14 2020 (r365347) @@ -6,7 +6,6 @@ After=systemd-udev-settle.service After=zfs-import.target After=systemd-remount-fs.service Before=local-fs.target -Before=systemd-random-seed.service ConditionPathIsDirectory=/sys/module/zfs [Service] Modified: head/sys/contrib/openzfs/include/libzfs.h ============================================================================== --- head/sys/contrib/openzfs/include/libzfs.h Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/include/libzfs.h Fri Sep 4 22:25:14 2020 (r365347) @@ -642,7 +642,19 @@ extern int zfs_snapshot(libzfs_handle_t *, const char extern int zfs_snapshot_nvl(libzfs_handle_t *hdl, nvlist_t *snaps, nvlist_t *props); extern int zfs_rollback(zfs_handle_t *, zfs_handle_t *, boolean_t); -extern int zfs_rename(zfs_handle_t *, const char *, boolean_t, boolean_t); + +typedef struct renameflags { + /* recursive rename */ + int recursive : 1; + + /* don't unmount file systems */ + int nounmount : 1; + + /* force unmount file systems */ + int forceunmount : 1; +} renameflags_t; + +extern int zfs_rename(zfs_handle_t *, const char *, renameflags_t); typedef struct sendflags { /* Amount of extra information to print. */ Modified: head/sys/contrib/openzfs/include/libzfs_impl.h ============================================================================== --- head/sys/contrib/openzfs/include/libzfs_impl.h Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/include/libzfs_impl.h Fri Sep 4 22:25:14 2020 (r365347) @@ -166,6 +166,10 @@ int zprop_expand_list(libzfs_handle_t *hdl, zprop_list * changelist_gather() flag to force it to iterate on mounted datasets only */ #define CL_GATHER_ITER_MOUNTED 2 +/* + * Use this changelist_gather() flag to prevent unmounting of file systems. + */ +#define CL_GATHER_DONT_UNMOUNT 4 typedef struct prop_changelist prop_changelist_t; Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cred.h ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cred.h Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cred.h Fri Sep 4 22:25:14 2020 (r365347) @@ -93,7 +93,7 @@ extern cred_t *zone_kcred(void); extern gid_t crgetrgid(const cred_t *); extern gid_t crgetsgid(const cred_t *); -#define crgetzoneid(x) (0) +#define crgetzoneid(cr) ((cr)->cr_prison->pr_id) extern projid_t crgetprojid(const cred_t *); extern cred_t *crgetmapped(const cred_t *); Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/zone.h ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/zone.h Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/zone.h Fri Sep 4 22:25:14 2020 (r365347) @@ -29,6 +29,8 @@ #ifndef _OPENSOLARIS_SYS_ZONE_H_ #define _OPENSOLARIS_SYS_ZONE_H_ +#include + /* * Macros to help with zone visibility restrictions. */ @@ -36,12 +38,9 @@ #define GLOBAL_ZONEID 0 /* - * Is thread in the global zone? + * Is proc in the global zone? */ -#define INGLOBALZONE(p) in_globalzone((p)) - - -extern boolean_t in_globalzone(struct proc *); +#define INGLOBALZONE(proc) (!jailed((proc)->p_ucred)) /* * Attach the given dataset to the given jail. Modified: head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/Makefile.am ============================================================================== --- head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/Makefile.am Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/Makefile.am Fri Sep 4 22:25:14 2020 (r365347) @@ -6,7 +6,7 @@ KERNEL_H = \ zfs_ctldir.h \ zfs_dir.h \ zfs_ioctl_compat.h \ - zfs_vfsops.h \ + zfs_vfsops_os.h \ zfs_vnops.h \ zfs_znode_impl.h \ zpl.h Copied: head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h (from r365345, vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops_os.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vfsops_os.h Fri Sep 4 22:25:14 2020 (r365347, copy of r365345, vendor-sys/openzfs/dist/include/os/freebsd/zfs/sys/zfs_vfsops_os.h) @@ -0,0 +1,176 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011 Pawel Jakub Dawidek . + * All rights reserved. + */ + +#ifndef _SYS_FS_ZFS_VFSOPS_H +#define _SYS_FS_ZFS_VFSOPS_H + +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct zfsvfs zfsvfs_t; +struct znode; + +struct zfsvfs { + vfs_t *z_vfs; /* generic fs struct */ + zfsvfs_t *z_parent; /* parent fs */ + objset_t *z_os; /* objset reference */ + uint64_t z_flags; /* super_block flags */ + uint64_t z_root; /* id of root znode */ + uint64_t z_unlinkedobj; /* id of unlinked zapobj */ + uint64_t z_max_blksz; /* maximum block size for files */ + uint64_t z_fuid_obj; /* fuid table object number */ + uint64_t z_fuid_size; /* fuid table size */ + avl_tree_t z_fuid_idx; /* fuid tree keyed by index */ + avl_tree_t z_fuid_domain; /* fuid tree keyed by domain */ + krwlock_t z_fuid_lock; /* fuid lock */ + boolean_t z_fuid_loaded; /* fuid tables are loaded */ + boolean_t z_fuid_dirty; /* need to sync fuid table ? */ + struct zfs_fuid_info *z_fuid_replay; /* fuid info for replay */ + zilog_t *z_log; /* intent log pointer */ + uint_t z_acl_mode; /* acl chmod/mode behavior */ + uint_t z_acl_inherit; /* acl inheritance behavior */ + zfs_case_t z_case; /* case-sense */ + boolean_t z_utf8; /* utf8-only */ + int z_norm; /* normalization flags */ + boolean_t z_atime; /* enable atimes mount option */ + boolean_t z_unmounted; /* unmounted */ + rrmlock_t z_teardown_lock; + krwlock_t z_teardown_inactive_lock; + list_t z_all_znodes; /* all vnodes in the fs */ + uint64_t z_nr_znodes; /* number of znodes in the fs */ + kmutex_t z_znodes_lock; /* lock for z_all_znodes */ + struct zfsctl_root *z_ctldir; /* .zfs directory pointer */ + boolean_t z_show_ctldir; /* expose .zfs in the root dir */ + boolean_t z_issnap; /* true if this is a snapshot */ + boolean_t z_vscan; /* virus scan on/off */ + boolean_t z_use_fuids; /* version allows fuids */ + boolean_t z_replay; /* set during ZIL replay */ + boolean_t z_use_sa; /* version allow system attributes */ + boolean_t z_xattr_sa; /* allow xattrs to be stores as SA */ + boolean_t z_use_namecache; /* make use of FreeBSD name cache */ + uint8_t z_xattr; /* xattr type in use */ + uint64_t z_version; /* ZPL version */ + uint64_t z_shares_dir; /* hidden shares dir */ + dataset_kstats_t z_kstat; /* fs kstats */ + kmutex_t z_lock; + uint64_t z_userquota_obj; + uint64_t z_groupquota_obj; + uint64_t z_userobjquota_obj; + uint64_t z_groupobjquota_obj; + uint64_t z_projectquota_obj; + uint64_t z_projectobjquota_obj; + uint64_t z_replay_eof; /* New end of file - replay only */ + sa_attr_type_t *z_attr_table; /* SA attr mapping->id */ +#define ZFS_OBJ_MTX_SZ 64 + kmutex_t z_hold_mtx[ZFS_OBJ_MTX_SZ]; /* znode hold locks */ + struct task z_unlinked_drain_task; +}; + +#define ZSB_XATTR 0x0001 /* Enable user xattrs */ +/* + * Normal filesystems (those not under .zfs/snapshot) have a total + * file ID size limited to 12 bytes (including the length field) due to + * NFSv2 protocol's limitation of 32 bytes for a filehandle. For historical + * reasons, this same limit is being imposed by the Solaris NFSv3 implementation + * (although the NFSv3 protocol actually permits a maximum of 64 bytes). It + * is not possible to expand beyond 12 bytes without abandoning support + * of NFSv2. + * + * For normal filesystems, we partition up the available space as follows: + * 2 bytes fid length (required) + * 6 bytes object number (48 bits) + * 4 bytes generation number (32 bits) + * + * We reserve only 48 bits for the object number, as this is the limit + * currently defined and imposed by the DMU. + */ +typedef struct zfid_short { + uint16_t zf_len; + uint8_t zf_object[6]; /* obj[i] = obj >> (8 * i) */ + uint8_t zf_gen[4]; /* gen[i] = gen >> (8 * i) */ +} zfid_short_t; + +/* + * Filesystems under .zfs/snapshot have a total file ID size of 22[*] bytes + * (including the length field). This makes files under .zfs/snapshot + * accessible by NFSv3 and NFSv4, but not NFSv2. + * + * For files under .zfs/snapshot, we partition up the available space + * as follows: + * 2 bytes fid length (required) + * 6 bytes object number (48 bits) + * 4 bytes generation number (32 bits) + * 6 bytes objset id (48 bits) + * 4 bytes[**] currently just zero (32 bits) + * + * We reserve only 48 bits for the object number and objset id, as these are + * the limits currently defined and imposed by the DMU. + * + * [*] 20 bytes on FreeBSD to fit into the size of struct fid. + * [**] 2 bytes on FreeBSD for the above reason. + */ +typedef struct zfid_long { + zfid_short_t z_fid; + uint8_t zf_setid[6]; /* obj[i] = obj >> (8 * i) */ + uint8_t zf_setgen[2]; /* gen[i] = gen >> (8 * i) */ +} zfid_long_t; + +#define SHORT_FID_LEN (sizeof (zfid_short_t) - sizeof (uint16_t)) +#define LONG_FID_LEN (sizeof (zfid_long_t) - sizeof (uint16_t)) + +extern uint_t zfs_fsyncer_key; +extern int zfs_super_owner; + +extern void zfs_init(void); +extern void zfs_fini(void); + +extern int zfs_suspend_fs(zfsvfs_t *zfsvfs); +extern int zfs_resume_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds); +extern int zfs_end_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds); +extern int zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers); +extern int zfsvfs_create(const char *name, boolean_t readonly, zfsvfs_t **zfvp); +extern int zfsvfs_create_impl(zfsvfs_t **zfvp, zfsvfs_t *zfsvfs, objset_t *os); +extern void zfsvfs_free(zfsvfs_t *zfsvfs); +extern int zfs_check_global_label(const char *dsname, const char *hexsl); +extern boolean_t zfs_is_readonly(zfsvfs_t *zfsvfs); +extern int zfs_get_temporary_prop(struct dsl_dataset *ds, zfs_prop_t zfs_prop, + uint64_t *val, char *setpoint); +extern int zfs_busy(void); + +#ifdef __cplusplus +} +#endif + +#endif /* _SYS_FS_ZFS_VFSOPS_H */ Modified: head/sys/contrib/openzfs/include/os/linux/kernel/linux/page_compat.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/kernel/linux/page_compat.h Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/include/os/linux/kernel/linux/page_compat.h Fri Sep 4 22:25:14 2020 (r365347) @@ -35,16 +35,6 @@ #else #define nr_inactive_file_pages() global_zone_page_state(NR_INACTIVE_FILE) #endif -#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B) -#define nr_slab_reclaimable_pages() \ - global_node_page_state(NR_SLAB_RECLAIMABLE_B) -#else -#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE) -#define nr_slab_reclaimable_pages() global_node_page_state(NR_SLAB_RECLAIMABLE) -#else -#define nr_slab_reclaimable_pages() global_zone_page_state(NR_SLAB_RECLAIMABLE) -#endif -#endif #elif defined(ZFS_GLOBAL_NODE_PAGE_STATE) @@ -64,16 +54,6 @@ #else #define nr_inactive_file_pages() global_page_state(NR_INACTIVE_FILE) #endif -#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B) -#define nr_slab_reclaimable_pages() \ - global_node_page_state(NR_SLAB_RECLAIMABLE_B) -#else -#if defined(ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE) -#define nr_slab_reclaimable_pages() global_node_page_state(NR_SLAB_RECLAIMABLE) -#else -#define nr_slab_reclaimable_pages() global_page_state(NR_SLAB_RECLAIMABLE) -#endif -#endif #else @@ -81,11 +61,6 @@ #define nr_file_pages() global_page_state(NR_FILE_PAGES) #define nr_inactive_anon_pages() global_page_state(NR_INACTIVE_ANON) #define nr_inactive_file_pages() global_page_state(NR_INACTIVE_FILE) -#ifdef ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B -#define nr_slab_reclaimable_pages() global_page_state(NR_SLAB_RECLAIMABLE_B) -#else -#define nr_slab_reclaimable_pages() global_page_state(NR_SLAB_RECLAIMABLE) -#endif /* ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B */ #endif /* ZFS_GLOBAL_ZONE_PAGE_STATE */ Modified: head/sys/contrib/openzfs/include/os/linux/spl/sys/vmsystm.h ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/spl/sys/vmsystm.h Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/include/os/linux/spl/sys/vmsystm.h Fri Sep 4 22:25:14 2020 (r365347) @@ -47,17 +47,6 @@ #define membar_producer() smp_wmb() #define physmem zfs_totalram_pages -#ifdef ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B -#define freemem (nr_free_pages() + \ - global_page_state(NR_INACTIVE_FILE) + \ - global_page_state(NR_INACTIVE_ANON) + \ - global_page_state(NR_SLAB_RECLAIMABLE_B)) -#else -#define freemem (nr_free_pages() + \ - global_page_state(NR_INACTIVE_FILE) + \ - global_page_state(NR_INACTIVE_ANON) + \ - global_page_state(NR_SLAB_RECLAIMABLE)) -#endif /* ZFS_ENUM_NODE_STAT_ITEM_NR_SLAB_RECLAIMABLE_B */ #define xcopyin(from, to, size) copy_from_user(to, from, size) #define xcopyout(from, to, size) copy_to_user(to, from, size) Modified: head/sys/contrib/openzfs/include/os/linux/zfs/sys/Makefile.am ============================================================================== --- head/sys/contrib/openzfs/include/os/linux/zfs/sys/Makefile.am Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/include/os/linux/zfs/sys/Makefile.am Fri Sep 4 22:25:14 2020 (r365347) @@ -19,7 +19,7 @@ KERNEL_H = \ zfs_context_os.h \ zfs_ctldir.h \ zfs_dir.h \ - zfs_vfsops.h \ + zfs_vfsops_os.h \ zfs_vnops.h \ zfs_znode_impl.h \ zpl.h Copied: head/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_vfsops_os.h (from r365345, vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops_os.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_vfsops_os.h Fri Sep 4 22:25:14 2020 (r365347, copy of r365345, vendor-sys/openzfs/dist/include/os/linux/zfs/sys/zfs_vfsops_os.h) @@ -0,0 +1,227 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2018 by Delphix. All rights reserved. + */ + +#ifndef _SYS_FS_ZFS_VFSOPS_H +#define _SYS_FS_ZFS_VFSOPS_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct zfsvfs zfsvfs_t; +struct znode; + +/* + * This structure emulates the vfs_t from other platforms. It's purpose + * is to facilitate the handling of mount options and minimize structural + * differences between the platforms. + */ +typedef struct vfs { + struct zfsvfs *vfs_data; + char *vfs_mntpoint; /* Primary mount point */ + uint64_t vfs_xattr; + boolean_t vfs_readonly; + boolean_t vfs_do_readonly; + boolean_t vfs_setuid; + boolean_t vfs_do_setuid; + boolean_t vfs_exec; + boolean_t vfs_do_exec; + boolean_t vfs_devices; + boolean_t vfs_do_devices; + boolean_t vfs_do_xattr; + boolean_t vfs_atime; + boolean_t vfs_do_atime; + boolean_t vfs_relatime; + boolean_t vfs_do_relatime; + boolean_t vfs_nbmand; + boolean_t vfs_do_nbmand; +} vfs_t; + +typedef struct zfs_mnt { + const char *mnt_osname; /* Objset name */ + char *mnt_data; /* Raw mount options */ +} zfs_mnt_t; + +struct zfsvfs { + vfs_t *z_vfs; /* generic fs struct */ + struct super_block *z_sb; /* generic super_block */ + struct zfsvfs *z_parent; /* parent fs */ + objset_t *z_os; /* objset reference */ + uint64_t z_flags; /* super_block flags */ + uint64_t z_root; /* id of root znode */ + uint64_t z_unlinkedobj; /* id of unlinked zapobj */ + uint64_t z_max_blksz; /* maximum block size for files */ + uint64_t z_fuid_obj; /* fuid table object number */ + uint64_t z_fuid_size; /* fuid table size */ + avl_tree_t z_fuid_idx; /* fuid tree keyed by index */ + avl_tree_t z_fuid_domain; /* fuid tree keyed by domain */ + krwlock_t z_fuid_lock; /* fuid lock */ + boolean_t z_fuid_loaded; /* fuid tables are loaded */ + boolean_t z_fuid_dirty; /* need to sync fuid table ? */ + struct zfs_fuid_info *z_fuid_replay; /* fuid info for replay */ + zilog_t *z_log; /* intent log pointer */ + uint_t z_acl_mode; /* acl chmod/mode behavior */ + uint_t z_acl_inherit; /* acl inheritance behavior */ + uint_t z_acl_type; /* type of ACL usable on this FS */ + zfs_case_t z_case; /* case-sense */ + boolean_t z_utf8; /* utf8-only */ + int z_norm; /* normalization flags */ + boolean_t z_relatime; /* enable relatime mount option */ + boolean_t z_unmounted; /* unmounted */ + rrmlock_t z_teardown_lock; + krwlock_t z_teardown_inactive_lock; + list_t z_all_znodes; /* all znodes in the fs */ + uint64_t z_nr_znodes; /* number of znodes in the fs */ + unsigned long z_rollback_time; /* last online rollback time */ + unsigned long z_snap_defer_time; /* last snapshot unmount deferral */ + kmutex_t z_znodes_lock; /* lock for z_all_znodes */ + arc_prune_t *z_arc_prune; /* called by ARC to prune caches */ + struct inode *z_ctldir; /* .zfs directory inode */ + boolean_t z_show_ctldir; /* expose .zfs in the root dir */ + boolean_t z_issnap; /* true if this is a snapshot */ + boolean_t z_vscan; /* virus scan on/off */ + boolean_t z_use_fuids; /* version allows fuids */ + boolean_t z_replay; /* set during ZIL replay */ + boolean_t z_use_sa; /* version allow system attributes */ + boolean_t z_xattr_sa; /* allow xattrs to be stores as SA */ + boolean_t z_draining; /* is true when drain is active */ + boolean_t z_drain_cancel; /* signal the unlinked drain to stop */ + uint64_t z_version; /* ZPL version */ + uint64_t z_shares_dir; /* hidden shares dir */ + dataset_kstats_t z_kstat; /* fs kstats */ + kmutex_t z_lock; + uint64_t z_userquota_obj; + uint64_t z_groupquota_obj; + uint64_t z_userobjquota_obj; + uint64_t z_groupobjquota_obj; + uint64_t z_projectquota_obj; + uint64_t z_projectobjquota_obj; + uint64_t z_replay_eof; /* New end of file - replay only */ + sa_attr_type_t *z_attr_table; /* SA attr mapping->id */ + uint64_t z_hold_size; /* znode hold array size */ + avl_tree_t *z_hold_trees; /* znode hold trees */ + kmutex_t *z_hold_locks; /* znode hold locks */ + taskqid_t z_drain_task; /* task id for the unlink drain task */ +}; + +#define ZSB_XATTR 0x0001 /* Enable user xattrs */ + +/* + * Allow a maximum number of links. While ZFS does not internally limit + * this the inode->i_nlink member is defined as an unsigned int. To be + * safe we use 2^31-1 as the limit. + */ +#define ZFS_LINK_MAX ((1U << 31) - 1U) + +/* + * Normal filesystems (those not under .zfs/snapshot) have a total + * file ID size limited to 12 bytes (including the length field) due to + * NFSv2 protocol's limitation of 32 bytes for a filehandle. For historical + * reasons, this same limit is being imposed by the Solaris NFSv3 implementation + * (although the NFSv3 protocol actually permits a maximum of 64 bytes). It + * is not possible to expand beyond 12 bytes without abandoning support + * of NFSv2. + * + * For normal filesystems, we partition up the available space as follows: + * 2 bytes fid length (required) + * 6 bytes object number (48 bits) + * 4 bytes generation number (32 bits) + * + * We reserve only 48 bits for the object number, as this is the limit + * currently defined and imposed by the DMU. + */ +typedef struct zfid_short { + uint16_t zf_len; + uint8_t zf_object[6]; /* obj[i] = obj >> (8 * i) */ + uint8_t zf_gen[4]; /* gen[i] = gen >> (8 * i) */ +} zfid_short_t; + +/* + * Filesystems under .zfs/snapshot have a total file ID size of 22 bytes + * (including the length field). This makes files under .zfs/snapshot + * accessible by NFSv3 and NFSv4, but not NFSv2. + * + * For files under .zfs/snapshot, we partition up the available space + * as follows: + * 2 bytes fid length (required) + * 6 bytes object number (48 bits) + * 4 bytes generation number (32 bits) + * 6 bytes objset id (48 bits) + * 4 bytes currently just zero (32 bits) + * + * We reserve only 48 bits for the object number and objset id, as these are + * the limits currently defined and imposed by the DMU. + */ +typedef struct zfid_long { + zfid_short_t z_fid; + uint8_t zf_setid[6]; /* obj[i] = obj >> (8 * i) */ + uint8_t zf_setgen[4]; /* gen[i] = gen >> (8 * i) */ +} zfid_long_t; + +#define SHORT_FID_LEN (sizeof (zfid_short_t) - sizeof (uint16_t)) +#define LONG_FID_LEN (sizeof (zfid_long_t) - sizeof (uint16_t)) + +extern void zfs_init(void); +extern void zfs_fini(void); + +extern int zfs_suspend_fs(zfsvfs_t *zfsvfs); +extern int zfs_resume_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds); +extern int zfs_end_fs(zfsvfs_t *zfsvfs, struct dsl_dataset *ds); +extern void zfs_exit_fs(zfsvfs_t *zfsvfs); +extern int zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers); +extern int zfsvfs_create(const char *name, boolean_t readony, zfsvfs_t **zfvp); +extern int zfsvfs_create_impl(zfsvfs_t **zfvp, zfsvfs_t *zfsvfs, objset_t *os); +extern void zfsvfs_free(zfsvfs_t *zfsvfs); +extern int zfs_check_global_label(const char *dsname, const char *hexsl); + +extern boolean_t zfs_is_readonly(zfsvfs_t *zfsvfs); +extern int zfs_domount(struct super_block *sb, zfs_mnt_t *zm, int silent); +extern void zfs_preumount(struct super_block *sb); +extern int zfs_umount(struct super_block *sb); +extern int zfs_remount(struct super_block *sb, int *flags, zfs_mnt_t *zm); +extern int zfs_statvfs(struct inode *ip, struct kstatfs *statp); +extern int zfs_vget(struct super_block *sb, struct inode **ipp, fid_t *fidp); +extern int zfs_prune(struct super_block *sb, unsigned long nr_to_scan, + int *objects); +extern int zfs_get_temporary_prop(dsl_dataset_t *ds, zfs_prop_t zfs_prop, + uint64_t *val, char *setpoint); + +#ifdef __cplusplus +} +#endif + +#endif /* _SYS_FS_ZFS_VFSOPS_H */ Modified: head/sys/contrib/openzfs/include/sys/Makefile.am ============================================================================== --- head/sys/contrib/openzfs/include/sys/Makefile.am Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/include/sys/Makefile.am Fri Sep 4 22:25:14 2020 (r365347) @@ -115,6 +115,7 @@ COMMON_H = \ zfs_sa.h \ zfs_stat.h \ zfs_sysfs.h \ + zfs_vfsops.h \ zfs_znode.h \ zil.h \ zil_impl.h \ Copied: head/sys/contrib/openzfs/include/sys/zfs_vfsops.h (from r365345, vendor-sys/openzfs/dist/include/sys/zfs_vfsops.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/contrib/openzfs/include/sys/zfs_vfsops.h Fri Sep 4 22:25:14 2020 (r365347, copy of r365345, vendor-sys/openzfs/dist/include/sys/zfs_vfsops.h) @@ -0,0 +1,35 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Portions Copyright 2020 iXsystems, Inc. + */ + +#ifndef _SYS_ZFS_VFSOPS_H +#define _SYS_ZFS_VFSOPS_H + +#ifdef _KERNEL +#include +#endif + +extern void zfsvfs_update_fromname(const char *, const char *); + +#endif /* _SYS_ZFS_VFSOPS_H */ Modified: head/sys/contrib/openzfs/lib/libspl/Makefile.am ============================================================================== --- head/sys/contrib/openzfs/lib/libspl/Makefile.am Fri Sep 4 22:11:58 2020 (r365346) +++ head/sys/contrib/openzfs/lib/libspl/Makefile.am Fri Sep 4 22:25:14 2020 (r365347) @@ -27,7 +27,6 @@ USER_C = \ strlcat.c \ strlcpy.c \ timestamp.c \ - zone.c \ include/sys/list.h \ include/sys/list_impl.h @@ -35,7 +34,8 @@ if BUILD_LINUX USER_C += \ os/linux/getexecname.c \ os/linux/gethostid.c \ - os/linux/getmntany.c + os/linux/getmntany.c \ + os/linux/zone.c endif if BUILD_FREEBSD @@ -43,7 +43,8 @@ USER_C += \ os/freebsd/getexecname.c \ os/freebsd/gethostid.c \ os/freebsd/getmntany.c \ - os/freebsd/mnttab.c + os/freebsd/mnttab.c \ + os/freebsd/zone.c endif *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Fri Sep 4 23:36:44 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B73E33D3036; Fri, 4 Sep 2020 23:36:44 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjvG44FLHz4lLv; Fri, 4 Sep 2020 23:36:44 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 70895144D7; Fri, 4 Sep 2020 23:36:44 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084NaiLe092375; Fri, 4 Sep 2020 23:36:44 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084Naigg092373; Fri, 4 Sep 2020 23:36:44 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <202009042336.084Naigg092373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 4 Sep 2020 23:36:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365348 - head/libexec/rc/rc.d X-SVN-Group: head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: head/libexec/rc/rc.d X-SVN-Commit-Revision: 365348 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 23:36:44 -0000 Author: delphij Date: Fri Sep 4 23:36:43 2020 New Revision: 365348 URL: https://svnweb.freebsd.org/changeset/base/365348 Log: Make zpool on GELI work again. After OpenZFS import, zpool auto import behavior was moved to an explicit "zpool import -a", and the zpool rc.d script was added as a prerequisite of zvol. However, in r299839, zvol was added as a prerequisite of dumpon, making it to start very early and before all 'disks' providers. At this time, dumping on a zvol is not supported, so remove this requirement and make zpool depend on disks to allow zpool on full disk encryption work. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D26333 Modified: head/libexec/rc/rc.d/zpool head/libexec/rc/rc.d/zvol Modified: head/libexec/rc/rc.d/zpool ============================================================================== --- head/libexec/rc/rc.d/zpool Fri Sep 4 22:25:14 2020 (r365347) +++ head/libexec/rc/rc.d/zpool Fri Sep 4 23:36:43 2020 (r365348) @@ -4,7 +4,7 @@ # # PROVIDE: zpool -# REQUIRE: hostid +# REQUIRE: hostid disks # BEFORE: zvol mountcritlocal # KEYWORD: nojail Modified: head/libexec/rc/rc.d/zvol ============================================================================== --- head/libexec/rc/rc.d/zvol Fri Sep 4 22:25:14 2020 (r365347) +++ head/libexec/rc/rc.d/zvol Fri Sep 4 23:36:43 2020 (r365348) @@ -5,7 +5,6 @@ # PROVIDE: zvol # REQUIRE: zpool -# BEFORE: dumpon # KEYWORD: nojail . /etc/rc.subr From owner-svn-src-all@freebsd.org Sat Sep 5 00:19:41 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2FE6C3D3CCE; Sat, 5 Sep 2020 00:19:41 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjwCd0Vz6z4nDK; Sat, 5 Sep 2020 00:19:41 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E8C2314ED6; Sat, 5 Sep 2020 00:19:40 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0850JeV4017246; Sat, 5 Sep 2020 00:19:40 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0850JefS017245; Sat, 5 Sep 2020 00:19:40 GMT (envelope-from bz@FreeBSD.org) Message-Id: <202009050019.0850JefS017245@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 5 Sep 2020 00:19:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365349 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 365349 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 00:19:41 -0000 Author: bz Date: Sat Sep 5 00:19:40 2020 New Revision: 365349 URL: https://svnweb.freebsd.org/changeset/base/365349 Log: uipc_ktls: remove unused static function m_segments() was added with r363464 but never used. Remove it to avoid warnings when compiling kernels. Reported by: rmacklem (also says jhb) Reviewed by: gallatin, jhb Differential Revision: https://reviews.freebsd.org/D26330 Modified: head/sys/kern/uipc_ktls.c Modified: head/sys/kern/uipc_ktls.c ============================================================================== --- head/sys/kern/uipc_ktls.c Fri Sep 4 23:36:43 2020 (r365348) +++ head/sys/kern/uipc_ktls.c Sat Sep 5 00:19:40 2020 (r365349) @@ -1643,21 +1643,6 @@ out: return (top); } -static int -m_segments(struct mbuf *m, int skip) -{ - int count; - - while (skip >= m->m_len) { - skip -= m->m_len; - m = m->m_next; - } - - for (count = 0; m != NULL; count++) - m = m->m_next; - return (count); -} - static void ktls_decrypt(struct socket *so) { From owner-svn-src-all@freebsd.org Sat Sep 5 00:20:33 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7ED593D3A76; Sat, 5 Sep 2020 00:20:33 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjwDd2pL2z4nR9; Sat, 5 Sep 2020 00:20:33 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 436DE1518C; Sat, 5 Sep 2020 00:20:33 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0850KX9m017364; Sat, 5 Sep 2020 00:20:33 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0850KXtd017363; Sat, 5 Sep 2020 00:20:33 GMT (envelope-from bz@FreeBSD.org) Message-Id: <202009050020.0850KXtd017363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 5 Sep 2020 00:20:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365350 - head/sys/netinet/tcp_stacks X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: head/sys/netinet/tcp_stacks X-SVN-Commit-Revision: 365350 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 00:20:33 -0000 Author: bz Date: Sat Sep 5 00:20:32 2020 New Revision: 365350 URL: https://svnweb.freebsd.org/changeset/base/365350 Log: bbr: remove unused static function bbr_log_type_hrdwtso() is a file local static unused function. Remove it to avoid warnings on kernel compiles. Reviewed by: gallatin Differential Revision: https://reviews.freebsd.org/D26331 Modified: head/sys/netinet/tcp_stacks/bbr.c Modified: head/sys/netinet/tcp_stacks/bbr.c ============================================================================== --- head/sys/netinet/tcp_stacks/bbr.c Sat Sep 5 00:19:40 2020 (r365349) +++ head/sys/netinet/tcp_stacks/bbr.c Sat Sep 5 00:20:32 2020 (r365350) @@ -11716,31 +11716,6 @@ done_with_input: } static void -bbr_log_type_hrdwtso(struct tcpcb *tp, struct tcp_bbr *bbr, int len, int mod, int what_we_can_send) -{ - if (tp->t_logstate != TCP_LOG_STATE_OFF) { - union tcp_log_stackspecific log; - struct timeval tv; - uint32_t cts; - - cts = tcp_get_usecs(&tv); - bbr_fill_in_logging_data(bbr, &log.u_bbr, cts); - log.u_bbr.flex1 = bbr->r_ctl.rc_pace_min_segs; - log.u_bbr.flex2 = what_we_can_send; - log.u_bbr.flex3 = bbr->r_ctl.rc_pace_max_segs; - log.u_bbr.flex4 = len; - log.u_bbr.flex5 = 0; - log.u_bbr.flex7 = mod; - log.u_bbr.flex8 = 1; - TCP_LOG_EVENTP(tp, NULL, - &tp->t_inpcb->inp_socket->so_rcv, - &tp->t_inpcb->inp_socket->so_snd, - TCP_HDWR_TLS, 0, - 0, &log, false, &tv); - } -} - -static void bbr_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, struct tcpcb *tp, int32_t drop_hdrlen, int32_t tlen, uint8_t iptos) { From owner-svn-src-all@freebsd.org Sat Sep 5 00:26:04 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 976183D3DE9; Sat, 5 Sep 2020 00:26:04 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjwM03R9Zz4nm9; Sat, 5 Sep 2020 00:26:04 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5605514D52; Sat, 5 Sep 2020 00:26:04 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0850Q47e023052; Sat, 5 Sep 2020 00:26:04 GMT (envelope-from chs@FreeBSD.org) Received: (from chs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0850Q4Gk023051; Sat, 5 Sep 2020 00:26:04 GMT (envelope-from chs@FreeBSD.org) Message-Id: <202009050026.0850Q4Gk023051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: chs set sender to chs@FreeBSD.org using -f From: Chuck Silvers Date: Sat, 5 Sep 2020 00:26:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365351 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: chs X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 365351 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 00:26:04 -0000 Author: chs Date: Sat Sep 5 00:26:03 2020 New Revision: 365351 URL: https://svnweb.freebsd.org/changeset/base/365351 Log: vfs: avoid exposing partially constructed vnodes If multiple threads race calling vfs_hash_insert() while creating vnodes with the same identity, all of the vnodes which lose the race must be destroyed before any other thread can see them. Previously this was accomplished by the vput() in vfs_hash_insert() resulting in the vnode's VOP_INACTIVE() method calling vgone() before the vnode lock was unlocked, but at some point changes to the the vnode refcount/inactive logic have caused that to no longer work, leading to crashes, so instead vfs_hash_insert() must call vgone() itself before calling vput() on vnodes which lose the race. Reviewed by: mjg, kib Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D26291 Modified: head/sys/kern/vfs_hash.c Modified: head/sys/kern/vfs_hash.c ============================================================================== --- head/sys/kern/vfs_hash.c Sat Sep 5 00:20:32 2020 (r365350) +++ head/sys/kern/vfs_hash.c Sat Sep 5 00:26:03 2020 (r365351) @@ -172,6 +172,7 @@ vfs_hash_insert(struct vnode *vp, u_int hash, int flag rw_wlock(&vfs_hash_lock); LIST_INSERT_HEAD(&vfs_hash_side, vp, v_hashlist); rw_wunlock(&vfs_hash_lock); + vgone(vp); vput(vp); if (!error) *vpp = vp2; From owner-svn-src-all@freebsd.org Sat Sep 5 00:45:47 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5CE7F3D464C; Sat, 5 Sep 2020 00:45:47 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjwnl1jnbz4ptN; Sat, 5 Sep 2020 00:45:47 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A48C151FB; Sat, 5 Sep 2020 00:45:47 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0850jkrN035598; Sat, 5 Sep 2020 00:45:46 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0850jkYI035597; Sat, 5 Sep 2020 00:45:46 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <202009050045.0850jkYI035597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sat, 5 Sep 2020 00:45:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365354 - head/libexec/rc/rc.d X-SVN-Group: head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: head/libexec/rc/rc.d X-SVN-Commit-Revision: 365354 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 00:45:47 -0000 Author: delphij Date: Sat Sep 5 00:45:46 2020 New Revision: 365354 URL: https://svnweb.freebsd.org/changeset/base/365354 Log: Declare dependency relationship once instead of twice for zpool and zvol. Modified: head/libexec/rc/rc.d/zpool Modified: head/libexec/rc/rc.d/zpool ============================================================================== --- head/libexec/rc/rc.d/zpool Sat Sep 5 00:28:21 2020 (r365353) +++ head/libexec/rc/rc.d/zpool Sat Sep 5 00:45:46 2020 (r365354) @@ -5,7 +5,7 @@ # PROVIDE: zpool # REQUIRE: hostid disks -# BEFORE: zvol mountcritlocal +# BEFORE: mountcritlocal # KEYWORD: nojail . /etc/rc.subr From owner-svn-src-all@freebsd.org Sat Sep 5 00:50:53 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 93E823D4C00; Sat, 5 Sep 2020 00:50:53 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjwvd3KBtz4q3T; Sat, 5 Sep 2020 00:50:53 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5645E151FF; Sat, 5 Sep 2020 00:50:53 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0850orpA035899; Sat, 5 Sep 2020 00:50:53 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0850orou035898; Sat, 5 Sep 2020 00:50:53 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202009050050.0850orou035898@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 5 Sep 2020 00:50:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365355 - head/sys/rpc X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/sys/rpc X-SVN-Commit-Revision: 365355 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 00:50:53 -0000 Author: rmacklem Date: Sat Sep 5 00:50:52 2020 New Revision: 365355 URL: https://svnweb.freebsd.org/changeset/base/365355 Log: Fix a potential memory leak in the NFS over TLS handling code. For the TLS case where there is a "user@domain" name specified in the X.509 v3 certificate presented by the client in the otherName component of subjectAltName, a gid list is allocated via mem_alloc(). This needs to be free'd. Otherwise xp_gidp == NULL and free() handles that. (The size argument to mem_free() is not used by FreeBSD, so it can be 0.) This leak would not have occurred for any other case than NFS over TLS with the "user@domain" in the client's certificate. Modified: head/sys/rpc/svc.c Modified: head/sys/rpc/svc.c ============================================================================== --- head/sys/rpc/svc.c Sat Sep 5 00:45:46 2020 (r365354) +++ head/sys/rpc/svc.c Sat Sep 5 00:50:52 2020 (r365355) @@ -902,6 +902,8 @@ svc_xprt_free(SVCXPRT *xprt) { mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT)); + /* The size argument is ignored, so 0 is ok. */ + mem_free(xprt->xp_gidp, 0); mem_free(xprt, sizeof(SVCXPRT)); } From owner-svn-src-all@freebsd.org Sat Sep 5 01:05:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 55D933D4F39; Sat, 5 Sep 2020 01:05:15 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from mail.soaustin.net (mail.soaustin.net [18.222.6.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.soaustin.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjxDB4r6gz4qyP; Sat, 5 Sep 2020 01:05:14 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from lonesome.com (unknown [18.188.142.31]) by mail.soaustin.net (Postfix) with ESMTPSA id 2156F4E396; Sat, 5 Sep 2020 01:05:12 +0000 (UTC) Date: Sat, 5 Sep 2020 01:05:11 +0000 From: Mark Linimon To: Andrew Gallatin Cc: Alexey Dokuchaev , Michael Tuexen , Pedro Giffuni , Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... Message-ID: <20200905010510.GA26297@lonesome.com> References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> User-Agent: Mutt/1.5.21 (2010-09-15) X-Rspamd-Queue-Id: 4BjxDB4r6gz4qyP X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of linimon@lonesome.com has no SPF policy when checking 18.222.6.11) smtp.mailfrom=linimon@lonesome.com X-Spamd-Result: default: False [-1.51 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[linimon]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[lonesome.com]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-0.83)[-0.835]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_MED(-0.20)[18.222.6.11:from]; NEURAL_HAM_SHORT(-0.36)[-0.364]; RCPT_COUNT_SEVEN(0.00)[8]; NEURAL_HAM_MEDIUM(-1.01)[-1.007]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16509, ipnet:18.220.0.0/14, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 01:05:15 -0000 On Fri, Sep 04, 2020 at 02:15:04PM -0400, Andrew Gallatin wrote: > and I also anticipate it will cause problems with MFCs And existing PRs and DRs. mcl From owner-svn-src-all@freebsd.org Sat Sep 5 02:16:13 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 777583D6DA4; Sat, 5 Sep 2020 02:16:13 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjyp52MVxz4thx; Sat, 5 Sep 2020 02:16:13 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2FBE91623F; Sat, 5 Sep 2020 02:16:13 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0852GD2W090088; Sat, 5 Sep 2020 02:16:13 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0852GBBg090078; Sat, 5 Sep 2020 02:16:11 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202009050216.0852GBBg090078@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 5 Sep 2020 02:16:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365356 - in stable/12/sys: cddl/contrib/opensolaris/uts/common/fs/zfs conf modules modules/krpc modules/xdr rpc sys xdr X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/12/sys: cddl/contrib/opensolaris/uts/common/fs/zfs conf modules modules/krpc modules/xdr rpc sys xdr X-SVN-Commit-Revision: 365356 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 02:16:13 -0000 Author: kevans Date: Sat Sep 5 02:16:10 2020 New Revision: 365356 URL: https://svnweb.freebsd.org/changeset/base/365356 Log: MFC r360035-r360037: Split XDR off, minimize ZFS dependency __FreeBSD_version bumped to indicate the change. r360035: Move M_RPC malloc type into XDR. Both RPC and XDR libraries use this type, but since RPC depends on XDR (not vice versa) we need it defined in XDR to make the module loadable without RPC. r360036: Split XDR into separate kernel module. Make krpc depend on xdr. r360037: Make ZFS depend on xdr.ko only. It doesn't need kernel RPC. Added: stable/12/sys/modules/xdr/ - copied from r360036, head/sys/modules/xdr/ Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c stable/12/sys/conf/files stable/12/sys/conf/options stable/12/sys/modules/Makefile stable/12/sys/modules/krpc/Makefile stable/12/sys/rpc/rpc_generic.c stable/12/sys/rpc/rpc_prot.c stable/12/sys/sys/param.h stable/12/sys/xdr/xdr.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sat Sep 5 00:50:52 2020 (r365355) +++ stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sat Sep 5 02:16:10 2020 (r365356) @@ -7342,5 +7342,5 @@ static moduledata_t zfs_mod = { DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); MODULE_VERSION(zfsctrl, 1); MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1); -MODULE_DEPEND(zfsctrl, krpc, 1, 1, 1); +MODULE_DEPEND(zfsctrl, xdr, 1, 1, 1); MODULE_DEPEND(zfsctrl, acl_nfs4, 1, 1, 1); Modified: stable/12/sys/conf/files ============================================================================== --- stable/12/sys/conf/files Sat Sep 5 00:50:52 2020 (r365355) +++ stable/12/sys/conf/files Sat Sep 5 02:16:10 2020 (r365356) @@ -5044,9 +5044,9 @@ xen/xenbus/xenbusb.c optional xenhvm xen/xenbus/xenbusb_front.c optional xenhvm xen/xenbus/xenbusb_back.c optional xenhvm xen/xenmem/xenmem_if.m optional xenhvm -xdr/xdr.c optional krpc | nfslockd | nfscl | nfsd -xdr/xdr_array.c optional krpc | nfslockd | nfscl | nfsd -xdr/xdr_mbuf.c optional krpc | nfslockd | nfscl | nfsd -xdr/xdr_mem.c optional krpc | nfslockd | nfscl | nfsd -xdr/xdr_reference.c optional krpc | nfslockd | nfscl | nfsd -xdr/xdr_sizeof.c optional krpc | nfslockd | nfscl | nfsd +xdr/xdr.c optional xdr | krpc | nfslockd | nfscl | nfsd +xdr/xdr_array.c optional xdr | krpc | nfslockd | nfscl | nfsd +xdr/xdr_mbuf.c optional xdr | krpc | nfslockd | nfscl | nfsd +xdr/xdr_mem.c optional xdr | krpc | nfslockd | nfscl | nfsd +xdr/xdr_reference.c optional xdr | krpc | nfslockd | nfscl | nfsd +xdr/xdr_sizeof.c optional xdr | krpc | nfslockd | nfscl | nfsd Modified: stable/12/sys/conf/options ============================================================================== --- stable/12/sys/conf/options Sat Sep 5 00:50:52 2020 (r365355) +++ stable/12/sys/conf/options Sat Sep 5 02:16:10 2020 (r365356) @@ -472,6 +472,7 @@ TCP_RFC7413_MAX_KEYS opt_inet.h TCP_RFC7413_MAX_PSKS opt_inet.h TCP_SIGNATURE opt_ipsec.h VLAN_ARRAY opt_vlan.h +XDR XBONEHACK # Modified: stable/12/sys/modules/Makefile ============================================================================== --- stable/12/sys/modules/Makefile Sat Sep 5 00:50:52 2020 (r365355) +++ stable/12/sys/modules/Makefile Sat Sep 5 02:16:10 2020 (r365356) @@ -422,6 +422,7 @@ SUBDIR= \ ${_wpi} \ ${_wpifw} \ ${_x86bios} \ + xdr \ ${_xe} \ xl \ xz \ Modified: stable/12/sys/modules/krpc/Makefile ============================================================================== --- stable/12/sys/modules/krpc/Makefile Sat Sep 5 00:50:52 2020 (r365355) +++ stable/12/sys/modules/krpc/Makefile Sat Sep 5 02:16:10 2020 (r365356) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/sys/rpc ${SRCTOP}/sys/xdr +.PATH: ${SRCTOP}/sys/rpc KMOD= krpc SRCS= auth_none.c \ auth_unix.c \ @@ -22,13 +22,6 @@ SRCS= auth_none.c \ svc_dg.c \ svc_generic.c \ svc_vc.c \ - -SRCS+= xdr.c \ - xdr_array.c \ - xdr_mbuf.c \ - xdr_mem.c \ - xdr_reference.c \ - xdr_sizeof.c SRCS+= opt_inet6.h Modified: stable/12/sys/rpc/rpc_generic.c ============================================================================== --- stable/12/sys/rpc/rpc_generic.c Sat Sep 5 00:50:52 2020 (r365355) +++ stable/12/sys/rpc/rpc_generic.c Sat Sep 5 02:16:10 2020 (r365356) @@ -886,3 +886,4 @@ DECLARE_MODULE(krpc, krpc_mod, SI_SUB_VFS, SI_ORDER_AN /* So that loader and kldload(2) can find us, wherever we are.. */ MODULE_VERSION(krpc, 1); +MODULE_DEPEND(krpc, xdr, 1, 1, 1); Modified: stable/12/sys/rpc/rpc_prot.c ============================================================================== --- stable/12/sys/rpc/rpc_prot.c Sat Sep 5 00:50:52 2020 (r365355) +++ stable/12/sys/rpc/rpc_prot.c Sat Sep 5 02:16:10 2020 (r365356) @@ -61,8 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include -MALLOC_DEFINE(M_RPC, "rpc", "Remote Procedure Call"); - #define assert(exp) KASSERT(exp, ("bad arguments")) static enum clnt_stat accepted(enum accept_stat, struct rpc_err *); Modified: stable/12/sys/sys/param.h ============================================================================== --- stable/12/sys/sys/param.h Sat Sep 5 00:50:52 2020 (r365355) +++ stable/12/sys/sys/param.h Sat Sep 5 02:16:10 2020 (r365356) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1201523 /* Master, propagated to newvers */ +#define __FreeBSD_version 1201524 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: stable/12/sys/xdr/xdr.c ============================================================================== --- stable/12/sys/xdr/xdr.c Sat Sep 5 00:50:52 2020 (r365355) +++ stable/12/sys/xdr/xdr.c Sat Sep 5 02:16:10 2020 (r365356) @@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -65,6 +66,8 @@ typedef u_quad_t u_longlong_t; /* ANSI unsign #define XDR_FALSE ((long) 0) #define XDR_TRUE ((long) 1) +MALLOC_DEFINE(M_RPC, "rpc", "Remote Procedure Call"); + /* * for unit alignment */ @@ -834,3 +837,20 @@ xdr_u_longlong_t(XDR *xdrs, u_longlong_t *ullp) */ return (xdr_uint64_t(xdrs, (uint64_t *)ullp)); } + +/* + * Kernel module glue + */ +static int +xdr_modevent(module_t mod, int type, void *data) +{ + + return (0); +} +static moduledata_t xdr_mod = { + "xdr", + xdr_modevent, + NULL, +}; +DECLARE_MODULE(xdr, xdr_mod, SI_SUB_VFS, SI_ORDER_ANY); +MODULE_VERSION(xdr, 1); From owner-svn-src-all@freebsd.org Sat Sep 5 02:22:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 604BC3D7111; Sat, 5 Sep 2020 02:22:09 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjywx2Fvhz4vJm; Sat, 5 Sep 2020 02:22:09 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3141016808; Sat, 5 Sep 2020 02:22:09 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0852M994095189; Sat, 5 Sep 2020 02:22:09 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0852M7LH095182; Sat, 5 Sep 2020 02:22:07 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202009050222.0852M7LH095182@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 5 Sep 2020 02:22:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365357 - in stable: 11/secure/caroot/blacklisted 12/secure/caroot/blacklisted X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable: 11/secure/caroot/blacklisted 12/secure/caroot/blacklisted X-SVN-Commit-Revision: 365357 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 02:22:09 -0000 Author: kevans Date: Sat Sep 5 02:22:07 2020 New Revision: 365357 URL: https://svnweb.freebsd.org/changeset/base/365357 Log: MFC r365248: caroot: properly remove old distrusted roots The proper procedure was not followed in r364943; all of these that were deleted should have instead been moved over to the blacklist so that certctl can DTRT. Users must still `certctl rehash` after this, but this should generally be done by one of mergemaster/etcupdate/freebsd-update/pkgbase already; note that freebsd-update doesn't come into play for this particular update, as these have not yet made it into a release. Future work (after svn -> git) will likely change the script that updatecert invokes to facilitate the process, rather than trusting that kevans or whomever updates in the future will remember. Added: stable/11/secure/caroot/blacklisted/AddTrust_External_Root.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/AddTrust_External_Root.pem stable/11/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem stable/11/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem stable/11/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem stable/11/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem stable/11/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem stable/11/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Modified: Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Added: stable/12/secure/caroot/blacklisted/AddTrust_External_Root.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/AddTrust_External_Root.pem stable/12/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem stable/12/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem stable/12/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem stable/12/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem stable/12/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem stable/12/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Modified: Directory Properties: stable/12/ (props changed) Copied: stable/11/secure/caroot/blacklisted/AddTrust_External_Root.pem (from r365248, head/secure/caroot/blacklisted/AddTrust_External_Root.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/blacklisted/AddTrust_External_Root.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/AddTrust_External_Root.pem) @@ -0,0 +1,99 @@ +## +## AddTrust External Root +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root + Validity + Not Before: May 30 10:48:38 2000 GMT + Not After : May 30 10:48:38 2020 GMT + Subject: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:b7:f7:1a:33:e6:f2:00:04:2d:39:e0:4e:5b:ed: + 1f:bc:6c:0f:cd:b5:fa:23:b6:ce:de:9b:11:33:97: + a4:29:4c:7d:93:9f:bd:4a:bc:93:ed:03:1a:e3:8f: + cf:e5:6d:50:5a:d6:97:29:94:5a:80:b0:49:7a:db: + 2e:95:fd:b8:ca:bf:37:38:2d:1e:3e:91:41:ad:70: + 56:c7:f0:4f:3f:e8:32:9e:74:ca:c8:90:54:e9:c6: + 5f:0f:78:9d:9a:40:3c:0e:ac:61:aa:5e:14:8f:9e: + 87:a1:6a:50:dc:d7:9a:4e:af:05:b3:a6:71:94:9c: + 71:b3:50:60:0a:c7:13:9d:38:07:86:02:a8:e9:a8: + 69:26:18:90:ab:4c:b0:4f:23:ab:3a:4f:84:d8:df: + ce:9f:e1:69:6f:bb:d7:42:d7:6b:44:e4:c7:ad:ee: + 6d:41:5f:72:5a:71:08:37:b3:79:65:a4:59:a0:94: + 37:f7:00:2f:0d:c2:92:72:da:d0:38:72:db:14:a8: + 45:c4:5d:2a:7d:b7:b4:d6:c4:ee:ac:cd:13:44:b7: + c9:2b:dd:43:00:25:fa:61:b9:69:6a:58:23:11:b7: + a7:33:8f:56:75:59:f5:cd:29:d7:46:b7:0a:2b:65: + b6:d3:42:6f:15:b2:b8:7b:fb:ef:e9:5d:53:d5:34: + 5a:27 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A + X509v3 Key Usage: + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A + DirName:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root + serial:01 + + Signature Algorithm: sha1WithRSAEncryption + b0:9b:e0:85:25:c2:d6:23:e2:0f:96:06:92:9d:41:98:9c:d9: + 84:79:81:d9:1e:5b:14:07:23:36:65:8f:b0:d8:77:bb:ac:41: + 6c:47:60:83:51:b0:f9:32:3d:e7:fc:f6:26:13:c7:80:16:a5: + bf:5a:fc:87:cf:78:79:89:21:9a:e2:4c:07:0a:86:35:bc:f2: + de:51:c4:d2:96:b7:dc:7e:4e:ee:70:fd:1c:39:eb:0c:02:51: + 14:2d:8e:bd:16:e0:c1:df:46:75:e7:24:ad:ec:f4:42:b4:85: + 93:70:10:67:ba:9d:06:35:4a:18:d3:2b:7a:cc:51:42:a1:7a: + 63:d1:e6:bb:a1:c5:2b:c2:36:be:13:0d:e6:bd:63:7e:79:7b: + a7:09:0d:40:ab:6a:dd:8f:8a:c3:f6:f6:8c:1a:42:05:51:d4: + 45:f5:9f:a7:62:21:68:15:20:43:3c:99:e7:7c:bd:24:d8:a9: + 91:17:73:88:3f:56:1b:31:38:18:b4:71:0f:9a:cd:c8:0e:9e: + 8e:2e:1b:e1:8c:98:83:cb:1f:31:f1:44:4c:c6:04:73:49:76: + 60:0f:c7:f8:bd:17:80:6b:2e:e9:cc:4c:0e:5a:9a:79:0f:20: + 0a:2e:d5:9e:63:26:1e:55:92:94:d8:82:17:5a:7b:d0:bc:c7: + 8f:4e:86:04 +SHA1 Fingerprint=02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68 +-----BEGIN CERTIFICATE----- +MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs +IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 +MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux +FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h +bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v +dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt +H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 +uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX +mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX +a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN +E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 +WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD +VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 +Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU +cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx +IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN +AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH +YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC +Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX +c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a +mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +-----END CERTIFICATE----- Copied: stable/11/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem (from r365248, head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem) @@ -0,0 +1,98 @@ +## +## AddTrust Low-Value Services Root +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root + Validity + Not Before: May 30 10:38:31 2000 GMT + Not After : May 30 10:38:31 2020 GMT + Subject: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:96:96:d4:21:49:60:e2:6b:e8:41:07:0c:de:c4: + e0:dc:13:23:cd:c1:35:c7:fb:d6:4e:11:0a:67:5e: + f5:06:5b:6b:a5:08:3b:5b:29:16:3a:e7:87:b2:34: + 06:c5:bc:05:a5:03:7c:82:cb:29:10:ae:e1:88:81: + bd:d6:9e:d3:fe:2d:56:c1:15:ce:e3:26:9d:15:2e: + 10:fb:06:8f:30:04:de:a7:b4:63:b4:ff:b1:9c:ae: + 3c:af:77:b6:56:c5:b5:ab:a2:e9:69:3a:3d:0e:33: + 79:32:3f:70:82:92:99:61:6d:8d:30:08:8f:71:3f: + a6:48:57:19:f8:25:dc:4b:66:5c:a5:74:8f:98:ae: + c8:f9:c0:06:22:e7:ac:73:df:a5:2e:fb:52:dc:b1: + 15:65:20:fa:35:66:69:de:df:2c:f1:6e:bc:30:db: + 2c:24:12:db:eb:35:35:68:90:cb:00:b0:97:21:3d: + 74:21:23:65:34:2b:bb:78:59:a3:d6:e1:76:39:9a: + a4:49:8e:8c:74:af:6e:a4:9a:a3:d9:9b:d2:38:5c: + 9b:a2:18:cc:75:23:84:be:eb:e2:4d:33:71:8e:1a: + f0:c2:f8:c7:1d:a2:ad:03:97:2c:f8:cf:25:c6:f6: + b8:24:31:b1:63:5d:92:7f:63:f0:25:c9:53:2e:1f: + bf:4d + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B + X509v3 Key Usage: + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B + DirName:/C=SE/O=AddTrust AB/OU=AddTrust TTP Network/CN=AddTrust Class 1 CA Root + serial:01 + + Signature Algorithm: sha1WithRSAEncryption + 2c:6d:64:1b:1f:cd:0d:dd:b9:01:fa:96:63:34:32:48:47:99: + ae:97:ed:fd:72:16:a6:73:47:5a:f4:eb:dd:e9:f5:d6:fb:45: + cc:29:89:44:5d:bf:46:39:3d:e8:ee:bc:4d:54:86:1e:1d:6c: + e3:17:27:43:e1:89:56:2b:a9:6f:72:4e:49:33:e3:72:7c:2a: + 23:9a:bc:3e:ff:28:2a:ed:a3:ff:1c:23:ba:43:57:09:67:4d: + 4b:62:06:2d:f8:ff:6c:9d:60:1e:d8:1c:4b:7d:b5:31:2f:d9: + d0:7c:5d:f8:de:6b:83:18:78:37:57:2f:e8:33:07:67:df:1e: + c7:6b:2a:95:76:ae:8f:57:a3:f0:f4:52:b4:a9:53:08:cf:e0: + 4f:d3:7a:53:8b:fd:bb:1c:56:36:f2:fe:b2:b6:e5:76:bb:d5: + 22:65:a7:3f:fe:d1:66:ad:0b:bc:6b:99:86:ef:3f:7d:f3:18: + 32:ca:7b:c6:e3:ab:64:46:95:f8:26:69:d9:55:83:7b:2c:96: + 07:ff:59:2c:44:a3:c6:e5:e9:a9:dc:a1:63:80:5a:21:5e:21: + cf:53:54:f0:ba:6f:89:db:a8:aa:95:cf:8b:e3:71:cc:1e:1b: + 20:44:08:c0:7a:b6:40:fd:c4:e4:35:e1:1d:16:1c:d0:bc:2b: + 8e:d6:71:d9 +SHA1 Fingerprint=CC:AB:0E:A0:4C:23:01:D6:69:7B:DD:37:9F:CD:12:EB:24:E3:94:9D +-----BEGIN CERTIFICATE----- +MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw +MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD +VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul +CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n +tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl +dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch +PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC ++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O +BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl +MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk +ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB +IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X +7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz +43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY +eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl +pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA +WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= +-----END CERTIFICATE----- Copied: stable/11/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem (from r365248, head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem) @@ -0,0 +1,141 @@ +## +## LuxTrust Global Root 2 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 0a:7e:a6:df:4b:44:9e:da:6a:24:85:9e:e6:b8:15:d3:16:7f:bb:b1 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = LU, O = LuxTrust S.A., CN = LuxTrust Global Root 2 + Validity + Not Before: Mar 5 13:21:57 2015 GMT + Not After : Mar 5 13:21:57 2035 GMT + Subject: C = LU, O = LuxTrust S.A., CN = LuxTrust Global Root 2 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:d7:85:97:bf:11:98:e9:f0:62:83:4c:3c:87:f9: + 53:6a:37:0b:f2:0f:3c:87:ce:6f:dc:26:29:bd:c5: + 89:ba:c9:83:3d:f7:ee:ca:5b:c6:6d:49:73:b4:c9: + 46:a3:1b:34:13:3f:c1:89:45:57:f4:d9:b1:fb:36: + 65:4b:fb:08:e2:48:71:11:c8:6e:3b:9e:9d:df:89: + 65:37:a6:85:f6:3b:44:18:b6:c6:37:30:62:44:92: + 97:69:7d:42:30:24:e4:0d:0c:89:6b:63:de:c5:e1: + df:4e:a9:14:6c:53:e0:61:ce:f6:17:2f:1d:3c:bd: + e6:22:4c:1d:93:f5:10:c4:a1:76:ec:6a:de:c5:6c: + df:96:b4:56:40:42:c0:62:92:30:a1:2d:15:94:a0: + d2:20:06:09:6e:6a:6d:e5:eb:b7:be:d4:f0:f1:15: + 7c:8b:e6:4e:ba:13:cc:4b:27:5e:99:3c:17:5d:8f: + 81:7f:33:3d:4f:d3:3f:1b:ec:5c:3f:f0:3c:4c:75: + 6e:f2:a6:d5:9d:da:2d:07:63:02:c6:72:e9:94:bc: + 4c:49:95:4f:88:52:c8:db:e8:69:82:f8:cc:34:5b: + 22:f0:86:a7:89:bd:48:0a:6d:66:81:6d:c8:c8:64: + fb:01:e1:f4:e1:de:d9:9e:dd:db:5b:d4:2a:99:26: + 15:1b:1e:4c:92:29:82:9e:d5:92:81:92:41:70:19: + f7:a4:e5:93:4b:bc:77:67:31:dd:1c:fd:31:70:0d: + 17:99:0c:f9:0c:39:19:2a:17:b5:30:71:55:d5:0f: + ae:58:e1:3d:2f:34:9b:cf:9f:f6:78:85:c2:93:7a: + 72:3e:66:8f:9c:16:11:60:8f:9e:89:6f:67:be:e0: + 47:5a:3b:0c:9a:67:8b:cf:46:c6:ae:38:a3:f2:a7: + bc:e6:d6:85:6b:33:24:70:22:4b:cb:08:9b:bb:c8: + f8:02:29:1d:be:20:0c:46:bf:6b:87:9b:b3:2a:66: + 42:35:46:6c:aa:ba:ad:f9:98:7b:e9:50:55:14:31: + bf:b1:da:2d:ed:80:ad:68:24:fb:69:ab:d8:71:13: + 30:e6:67:b3:87:40:fd:89:7e:f2:43:d1:11:df:2f: + 65:2f:64:ce:5f:14:b9:b1:bf:31:bd:87:78:5a:59: + 65:88:aa:fc:59:32:48:86:d6:4c:b9:29:4b:95:d3: + 76:f3:77:25:6d:42:1c:38:83:4d:fd:a3:5f:9b:7f: + 2d:ac:79:1b:0e:42:31:97:63:a4:fb:8a:69:d5:22: + 0d:34:90:30:2e:a8:b4:e0:6d:b6:94:ac:bc:8b:4e: + d7:70:fc:c5:38:8e:64:25:e1:4d:39:90:ce:c9:87: + 84:58:71 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Certificate Policies: + Policy: 1.3.171.1.1.1.10 + CPS: https://repository.luxtrust.lu + + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Authority Key Identifier: + keyid:FF:18:28:76:F9:48:05:2C:A1:AE:F1:2B:1B:2B:B2:53:F8:4B:7C:B3 + + X509v3 Subject Key Identifier: + FF:18:28:76:F9:48:05:2C:A1:AE:F1:2B:1B:2B:B2:53:F8:4B:7C:B3 + Signature Algorithm: sha256WithRSAEncryption + 6a:19:14:ed:6e:79:c1:2c:87:d4:0d:70:7e:d7:f6:78:c9:0b: + 04:4e:c4:b1:ce:93:70:fe:b0:54:c0:32:cd:99:30:64:17:bf: + 0f:e5:e2:33:fd:07:36:40:72:0e:1a:b6:6a:59:d6:00:e5:68: + 20:dd:2e:72:0d:1f:6a:64:31:20:84:7d:49:a6:5a:37:eb:45: + c9:85:f5:d4:c7:17:99:07:e6:9b:55:e4:0c:e8:a9:b4:ce:8c: + 5b:b5:11:5c:cf:8a:0e:0d:d6:ac:77:81:fe:32:9c:24:9e:72: + ce:54:f3:d0:6f:a2:56:d6:ec:c3:37:2c:65:58:be:57:00:1a: + f2:35:fa:eb:7b:31:5d:c2:c1:12:3d:96:81:88:96:89:c1:59: + 5c:7a:e6:7f:70:34:e7:83:e2:b1:e1:e1:b8:58:ef:d4:95:e4: + 60:9c:f0:96:97:72:8c:eb:84:02:2e:65:8f:a4:b7:d2:7f:67: + dd:c8:d3:9e:5c:aa:a9:a4:a0:25:14:06:9b:ec:4f:7e:2d:0b: + 7f:1d:75:f1:33:d8:ed:ce:b8:75:6d:3e:5b:b9:98:1d:31:0d: + 56:d8:43:0f:30:91:b2:04:6b:dd:56:be:95:80:55:67:be:d8: + cd:83:d9:18:ee:2e:0f:86:2d:92:9e:70:13:ec:de:51:c9:43: + 78:02:a5:4d:c8:f9:5f:c4:91:58:46:16:77:5a:74:aa:40:bc: + 07:9f:30:b9:b1:f7:12:17:dd:e3:ff:24:40:1d:7a:6a:d1:4f: + 18:0a:aa:90:1d:eb:40:1e:df:a1:1e:44:92:10:9a:f2:8d:e1: + d1:4b:46:9e:e8:45:42:97:ea:45:99:f3:ec:66:d5:02:fa:f2: + a6:4a:24:aa:de:ce:b9:ca:f9:3f:93:6f:f9:a3:ba:ea:a5:3e: + 99:ad:fd:ff:7b:99:f5:65:ee:f0:59:28:67:d7:90:95:a4:13: + 84:a9:84:c1:e8:ce:ce:75:93:63:1a:bc:3c:ea:d5:64:1f:2d: + 2a:12:39:c6:c3:5a:32:ed:47:91:16:0e:bc:38:c1:50:de:8f: + ca:2a:90:34:1c:ee:41:94:9c:5e:19:2e:f8:45:49:99:74:91: + b0:04:6f:e3:04:5a:b1:ab:2a:ab:fe:c7:d0:96:b6:da:e1:4a: + 64:06:6e:60:4d:bd:42:4e:ff:78:da:24:ca:1b:b4:d7:96:39: + 6c:ae:f1:0e:aa:a7:7d:48:8b:20:4c:cf:64:d6:b8:97:46:b0: + 4e:d1:2a:56:3a:a0:93:bd:af:80:24:e0:0a:7e:e7:ca:d5:ca: + e8:85:55:dc:36:2a:e1:94:68:93:c7:66:72:44:0f:80:21:32: + 6c:25:c7:23:80:83:0a:eb +SHA1 Fingerprint=1E:0E:56:19:0A:D1:8B:25:98:B2:04:44:FF:66:8A:04:17:99:5F:3F +-----BEGIN CERTIFICATE----- +MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQEL +BQAwRjELMAkGA1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNV +BAMMFkx1eFRydXN0IEdsb2JhbCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUw +MzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEWMBQGA1UECgwNTHV4VHJ1c3QgUy5B +LjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wmKb3F +ibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTem +hfY7RBi2xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1 +EMShduxq3sVs35a0VkBCwGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsn +Xpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4 +zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkmFRseTJIpgp7VkoGSQXAZ +96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niFwpN6cj5m +j5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4g +DEa/a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+ +8kPREd8vZS9kzl8UubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2j +X5t/Lax5Gw5CMZdjpPuKadUiDTSQMC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmH +hFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB/zBCBgNVHSAEOzA5MDcGByuB +KwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5Lmx1eHRydXN0 +Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT ++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQEL +BQADggIBAGoZFO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9 +BzZAcg4atmpZ1gDlaCDdLnINH2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTO +jFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW7MM3LGVYvlcAGvI1+ut7MV3CwRI9 +loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIuZY+kt9J/Z93I055c +qqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWAVWe+ +2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/ +JEAdemrRTxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKre +zrnK+T+Tb/mjuuqlPpmt/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQf +LSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+ +x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31IiyBMz2TWuJdGsE7RKlY6 +oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr +-----END CERTIFICATE----- Copied: stable/11/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem (from r365248, head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem) @@ -0,0 +1,137 @@ +## +## Staat der Nederlanden Root CA - G2 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 10000012 (0x98968c) + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = NL, O = Staat der Nederlanden, CN = Staat der Nederlanden Root CA - G2 + Validity + Not Before: Mar 26 11:18:17 2008 GMT + Not After : Mar 25 11:03:10 2020 GMT + Subject: C = NL, O = Staat der Nederlanden, CN = Staat der Nederlanden Root CA - G2 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:c5:59:e7:6f:75:aa:3e:4b:9c:b5:b8:ac:9e:0b: + e4:f9:d9:ca:ab:5d:8f:b5:39:10:82:d7:af:51:e0: + 3b:e1:00:48:6a:cf:da:e1:06:43:11:99:aa:14:25: + 12:ad:22:e8:00:6d:43:c4:a9:b8:e5:1f:89:4b:67: + bd:61:48:ef:fd:d2:e0:60:88:e5:b9:18:60:28:c3: + 77:2b:ad:b0:37:aa:37:de:64:59:2a:46:57:e4:4b: + b9:f8:37:7c:d5:36:e7:80:c1:b6:f3:d4:67:9b:96: + e8:ce:d7:c6:0a:53:d0:6b:49:96:f3:a3:0b:05:77: + 48:f7:25:e5:70:ac:30:14:20:25:e3:7f:75:5a:e5: + 48:f8:4e:7b:03:07:04:fa:82:61:87:6e:f0:3b:c4: + a4:c7:d0:f5:74:3e:a5:5d:1a:08:f2:9b:25:d2:f6: + ac:04:26:3e:55:3a:62:28:a5:7b:b2:30:af:f8:37: + c2:d1:ba:d6:38:fd:f4:ef:49:30:37:99:26:21:48: + 85:01:a9:e5:16:e7:dc:90:55:df:0f:e8:38:cd:99: + 37:21:4f:5d:f5:22:6f:6a:c5:12:16:60:17:55:f2: + 65:66:a6:a7:30:91:38:c1:38:1d:86:04:84:ba:1a: + 25:78:5e:9d:af:cc:50:60:d6:13:87:52:ed:63:1f: + 6d:65:7d:c2:15:18:74:ca:e1:7e:64:29:8c:72:d8: + 16:13:7d:0b:49:4a:f1:28:1b:20:74:6b:c5:3d:dd: + b0:aa:48:09:3d:2e:82:94:cd:1a:65:d9:2b:88:9a: + 99:bc:18:7e:9f:ee:7d:66:7c:3e:bd:94:b8:81:ce: + cd:98:30:78:c1:6f:67:d0:be:5f:e0:68:ed:de:e2: + b1:c9:2c:59:78:92:aa:df:2b:60:63:f2:e5:5e:b9: + e3:ca:fa:7f:50:86:3e:a2:34:18:0c:09:68:28:11: + 1c:e4:e1:b9:5c:3e:47:ba:32:3f:18:cc:5b:84:f5: + f3:6b:74:c4:72:74:e1:e3:8b:a0:4a:bd:8d:66:2f: + ea:ad:35:da:20:d3:88:82:61:f0:12:22:b6:bc:d0: + d5:a4:ec:af:54:88:25:24:3c:a7:6d:b1:72:29:3f: + 3e:57:a6:7f:55:af:6e:26:c6:fe:e7:cc:40:5c:51: + 44:81:0a:78:de:4a:ce:55:bf:1d:d5:d9:b7:56:ef: + f0:76:ff:0b:79:b5:af:bd:fb:a9:69:91:46:97:68: + 80:14:36:1d:b3:7f:bb:29:98:36:a5:20:fa:82:60: + 62:33:a4:ec:d6:ba:07:a7:6e:c5:cf:14:a6:e7:d6: + 92:34:d8:81:f5:fc:1d:5d:aa:5c:1e:f6:a3:4d:3b: + b8:f7:39 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Certificate Policies: + Policy: X509v3 Any Policy + CPS: http://www.pkioverheid.nl/policies/root-policy-G2 + + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 91:68:32:87:15:1D:89:E2:B5:F1:AC:36:28:34:8D:0B:7C:62:88:EB + Signature Algorithm: sha256WithRSAEncryption + a8:41:4a:67:2a:92:81:82:50:6e:e1:d7:d8:b3:39:3b:f3:02: + 15:09:50:51:ef:2d:bd:24:7b:88:86:3b:f9:b4:bc:92:09:96: + b9:f6:c0:ab:23:60:06:79:8c:11:4e:51:d2:79:80:33:fb:9d: + 48:be:ec:41:43:81:1f:7e:47:40:1c:e5:7a:08:ca:aa:8b:75: + ad:14:c4:c2:e8:66:3c:82:07:a7:e6:27:82:5b:18:e6:0f:6e: + d9:50:3e:8a:42:18:29:c6:b4:56:fc:56:10:a0:05:17:bd:0c: + 23:7f:f4:93:ed:9c:1a:51:be:dd:45:41:bf:91:24:b4:1f:8c: + e9:5f:cf:7b:21:99:9f:95:9f:39:3a:46:1c:6c:f9:cd:7b:9c: + 90:cd:28:a9:c7:a9:55:bb:ac:62:34:62:35:13:4b:14:3a:55: + 83:b9:86:8d:92:a6:c6:f4:07:25:54:cc:16:57:12:4a:82:78: + c8:14:d9:17:82:26:2d:5d:20:1f:79:ae:fe:d4:70:16:16:95: + 83:d8:35:39:ff:52:5d:75:1c:16:c5:13:55:cf:47:cc:75:65: + 52:4a:de:f0:b0:a7:e4:0a:96:0b:fb:ad:c2:e2:25:84:b2:dd: + e4:bd:7e:59:6c:9b:f0:f0:d8:e7:ca:f2:e9:97:38:7e:89:be: + cc:fb:39:17:61:3f:72:db:3a:91:d8:65:01:19:1d:ad:50:a4: + 57:0a:7c:4b:bc:9c:71:73:2a:45:51:19:85:cc:8e:fd:47:a7: + 74:95:1d:a8:d1:af:4e:17:b1:69:26:c2:aa:78:57:5b:c5:4d: + a7:e5:9e:05:17:94:ca:b2:5f:a0:49:18:8d:34:e9:26:6c:48: + 1e:aa:68:92:05:e1:82:73:5a:9b:dc:07:5b:08:6d:7d:9d:d7: + 8d:21:d9:fc:14:20:aa:c2:45:df:3f:e7:00:b2:51:e4:c2:f8: + 05:b9:79:1a:8c:34:f3:9e:5b:e4:37:5b:6b:4a:df:2c:57:8a: + 40:5a:36:ba:dd:75:44:08:37:42:70:0c:fe:dc:5e:21:a0:a3: + 8a:c0:90:9c:68:da:50:e6:45:10:47:78:b6:4e:d2:65:c9:c3: + 37:df:e1:42:63:b0:57:37:45:2d:7b:8a:9c:bf:05:ea:65:55: + 33:f7:39:10:c5:28:2a:21:7a:1b:8a:c4:24:f9:3f:15:c8:9a: + 15:20:f5:55:62:96:ed:6d:93:50:bc:e4:aa:78:ad:d9:cb:0a: + 65:87:a6:66:c1:c4:81:a3:77:3a:58:1e:0b:ee:83:8b:9d:1e: + d2:52:a4:cc:1d:6f:b0:98:6d:94:31:b5:f8:71:0a:dc:b9:fc: + 7d:32:60:e6:eb:af:8a:01 +SHA1 Fingerprint=59:AF:82:79:91:86:C7:B4:75:07:CB:CF:03:57:46:EB:04:DD:B7:16 +-----BEGIN CERTIFICATE----- +MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO +TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh +dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX +DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl +ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv +b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291 +qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp +uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU +Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE +pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp +5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M +UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN +GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy +5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv +6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK +eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6 +B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/ +BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov +L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG +SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS +CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen +5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897 +IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK +gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL ++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL +vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm +bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk +N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC +Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z +ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ== +-----END CERTIFICATE----- Copied: stable/11/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem (from r365248, head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem) @@ -0,0 +1,68 @@ +## +## Symantec Class 1 Public Primary Certification Authority - G4 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 21:6e:33:a5:cb:d3:88:a4:6f:29:07:b4:27:3c:c4:d8 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 1 Public Primary Certification Authority - G4 + Validity + Not Before: Oct 5 00:00:00 2011 GMT + Not After : Jan 18 23:59:59 2038 GMT + Subject: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 1 Public Primary Certification Authority - G4 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:d7:66:b5:1b:db:ae:b3:60:ee:46:ea:88:63:75: + 3b:2a:94:6d:f3:5f:12:f6:e3:0f:9e:b6:0a:14:53: + 48:52:c8:dc:3a:b3:cb:48:20:26:12:4e:fa:89:84: + d4:df:91:e4:29:7d:28:01:d9:db:18:43:69:a1:1f: + b5:d3:86:16:dc:c7:7f:67:23:df:df:31:31:83:03: + 35:70:b1:4b:b7:c8:17:bb:51:cb:dc:94:17:db:ea: + 09:3b:76:12:de:aa:b5 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 65:C0:8D:25:F5:0C:BA:97:77:90:3F:9E:2E:E0:5A:F5:CE:D5:E1:E4 + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:a5:ae:e3:46:53:f8:98:36:e3:22:fa:2e:28: + 49:0d:ee:30:7e:33:f3:ec:3f:71:5e:cc:55:89:78:99:ac:b2: + fd:dc:1c:5c:33:8e:29:b9:6b:17:c8:11:68:b5:dc:83:07:02: + 31:00:9c:c8:44:da:69:c2:36:c3:54:19:10:85:02:da:9d:47: + ef:41:e7:6c:26:9d:09:3d:f7:6d:90:d1:05:44:2f:b0:bc:83: + 93:68:f2:0c:45:49:39:bf:99:04:1c:d3:10:a0 +SHA1 Fingerprint=84:F2:E3:DD:83:13:3E:A9:1D:19:52:7F:02:D7:29:BF:C1:5F:E6:67 +-----BEGIN CERTIFICATE----- +MIICqDCCAi2gAwIBAgIQIW4zpcvTiKRvKQe0JzzE2DAKBggqhkjOPQQDAzCBlDEL +MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD +VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD +bGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g +RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC +VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h +bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAxIFB1 +YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATXZrUb266zYO5G6ohjdTsqlG3zXxL24w+etgoUU0hS +yNw6s8tIICYSTvqJhNTfkeQpfSgB2dsYQ2mhH7XThhbcx39nI9/fMTGDAzVwsUu3 +yBe7UcvclBfb6gk7dhLeqrWjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBRlwI0l9Qy6l3eQP54u4Fr1ztXh5DAKBggqhkjOPQQD +AwNpADBmAjEApa7jRlP4mDbjIvouKEkN7jB+M/PsP3FezFWJeJmssv3cHFwzjim5 +axfIEWi13IMHAjEAnMhE2mnCNsNUGRCFAtqdR+9B52wmnQk9922Q0QVEL7C8g5No +8gxFSTm/mQQc0xCg +-----END CERTIFICATE----- Copied: stable/11/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem (from r365248, head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem) @@ -0,0 +1,68 @@ +## +## Symantec Class 2 Public Primary Certification Authority - G4 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 34:17:65:12:40:3b:b7:56:80:2d:80:cb:79:55:a6:1e + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 2 Public Primary Certification Authority - G4 + Validity + Not Before: Oct 5 00:00:00 2011 GMT + Not After : Jan 18 23:59:59 2038 GMT + Subject: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 2 Public Primary Certification Authority - G4 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:d1:d9:4a:8e:4c:0d:84:4a:51:ba:7c:ef:d3:cc: + fa:3a:9a:b5:a7:63:13:3d:01:e0:49:3e:fa:c1:47: + c9:92:b3:3a:d7:fe:6f:9c:f7:9a:3a:0f:f5:0e:0a: + 0a:c3:3f:c8:e7:12:14:8e:d5:d5:6d:98:2c:b3:71: + 32:0a:eb:2a:bd:f6:d7:6a:20:0b:67:45:9c:d2:b2: + bf:53:22:66:09:5d:db:11:f3:f1:05:33:58:a3:e2: + b8:cf:7c:cd:82:9b:bd + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 3D:32:F3:3A:A9:0C:90:84:F9:A2:8C:69:06:61:54:2F:87:72:FE:05 + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:c8:a6:a9:af:41:7f:b5:c9:11:42:16:68:69: + 4c:5c:b8:27:18:b6:98:f1:c0:7f:90:6d:87:d3:8c:46:17:f0: + 3e:4f:fc:ea:b0:08:c4:7a:4b:bc:08:2f:c7:e2:a7:6f:65:02: + 31:00:d6:59:de:86:ce:5f:0e:ca:54:d5:c6:d0:15:0e:fc:8b: + 94:72:d4:8e:00:58:53:cf:7e:b1:4b:0d:e5:50:86:eb:9e:6b: + df:ff:29:a6:d8:47:d9:a0:96:18:db:f2:45:b3 +SHA1 Fingerprint=67:24:90:2E:48:01:B0:22:96:40:10:46:B4:B1:67:2C:A9:75:FD:2B +-----BEGIN CERTIFICATE----- +MIICqDCCAi2gAwIBAgIQNBdlEkA7t1aALYDLeVWmHjAKBggqhkjOPQQDAzCBlDEL +MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD +VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD +bGFzcyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g +RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC +VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h +bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAyIFB1 +YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATR2UqOTA2ESlG6fO/TzPo6mrWnYxM9AeBJPvrBR8mS +szrX/m+c95o6D/UOCgrDP8jnEhSO1dVtmCyzcTIK6yq99tdqIAtnRZzSsr9TImYJ +XdsR8/EFM1ij4rjPfM2Cm72jQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBQ9MvM6qQyQhPmijGkGYVQvh3L+BTAKBggqhkjOPQQD +AwNpADBmAjEAyKapr0F/tckRQhZoaUxcuCcYtpjxwH+QbYfTjEYX8D5P/OqwCMR6 +S7wIL8fip29lAjEA1lnehs5fDspU1cbQFQ78i5Ry1I4AWFPPfrFLDeVQhuuea9// +KabYR9mglhjb8kWz +-----END CERTIFICATE----- Copied: stable/11/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem (from r365248, head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/11/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem) @@ -0,0 +1,87 @@ +## +## Verisign Class 3 Public Primary Certification Authority - G3 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 1 (0x0) + Serial Number: + 9b:7e:06:49:a3:3e:62:b9:d5:ee:90:48:71:29:ef:57 + Signature Algorithm: sha1WithRSAEncryption + Issuer: C = US, O = "VeriSign, Inc.", OU = VeriSign Trust Network, OU = "(c) 1999 VeriSign, Inc. - For authorized use only", CN = VeriSign Class 3 Public Primary Certification Authority - G3 + Validity + Not Before: Oct 1 00:00:00 1999 GMT + Not After : Jul 16 23:59:59 2036 GMT + Subject: C = US, O = "VeriSign, Inc.", OU = VeriSign Trust Network, OU = "(c) 1999 VeriSign, Inc. - For authorized use only", CN = VeriSign Class 3 Public Primary Certification Authority - G3 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:cb:ba:9c:52:fc:78:1f:1a:1e:6f:1b:37:73:bd: + f8:c9:6b:94:12:30:4f:f0:36:47:f5:d0:91:0a:f5: + 17:c8:a5:61:c1:16:40:4d:fb:8a:61:90:e5:76:20: + c1:11:06:7d:ab:2c:6e:a6:f5:11:41:8e:fa:2d:ad: + 2a:61:59:a4:67:26:4c:d0:e8:bc:52:5b:70:20:04: + 58:d1:7a:c9:a4:69:bc:83:17:64:ad:05:8b:bc:d0: + 58:ce:8d:8c:f5:eb:f0:42:49:0b:9d:97:27:67:32: + 6e:e1:ae:93:15:1c:70:bc:20:4d:2f:18:de:92:88: + e8:6c:85:57:11:1a:e9:7e:e3:26:11:54:a2:45:96: + 55:83:ca:30:89:e8:dc:d8:a3:ed:2a:80:3f:7f:79: + 65:57:3e:15:20:66:08:2f:95:93:bf:aa:47:2f:a8: + 46:97:f0:12:e2:fe:c2:0a:2b:51:e6:76:e6:b7:46: + b7:e2:0d:a6:cc:a8:c3:4c:59:55:89:e6:e8:53:5c: + 1c:ea:9d:f0:62:16:0b:a7:c9:5f:0c:f0:de:c2:76: + ce:af:f7:6a:f2:fa:41:a6:a2:33:14:c9:e5:7a:63: + d3:9e:62:37:d5:85:65:9e:0e:e6:53:24:74:1b:5e: + 1d:12:53:5b:c7:2c:e7:83:49:3b:15:ae:8a:68:b9: + 57:97 + Exponent: 65537 (0x10001) + Signature Algorithm: sha1WithRSAEncryption + 11:14:96:c1:ab:92:08:f7:3f:2f:c9:b2:fe:e4:5a:9f:64:de: + db:21:4f:86:99:34:76:36:57:dd:d0:15:2f:c5:ad:7f:15:1f: + 37:62:73:3e:d4:e7:5f:ce:17:03:db:35:fa:2b:db:ae:60:09: + 5f:1e:5f:8f:6e:bb:0b:3d:ea:5a:13:1e:0c:60:6f:b5:c0:b5: + 23:22:2e:07:0b:cb:a9:74:cb:47:bb:1d:c1:d7:a5:6b:cc:2f: + d2:42:fd:49:dd:a7:89:cf:53:ba:da:00:5a:28:bf:82:df:f8: + ba:13:1d:50:86:82:fd:8e:30:8f:29:46:b0:1e:3d:35:da:38: + 62:16:18:4a:ad:e6:b6:51:6c:de:af:62:eb:01:d0:1e:24:fe: + 7a:8f:12:1a:12:68:b8:fb:66:99:14:14:45:5c:ae:e7:ae:69: + 17:81:2b:5a:37:c9:5e:2a:f4:c6:e2:a1:5c:54:9b:a6:54:00: + cf:f0:f1:c1:c7:98:30:1a:3b:36:16:db:a3:6e:ea:fd:ad:b2: + c2:da:ef:02:47:13:8a:c0:f1:b3:31:ad:4f:1c:e1:4f:9c:af: + 0f:0c:9d:f7:78:0d:d8:f4:35:56:80:da:b7:6d:17:8f:9d:1e: + 81:64:e1:fe:c5:45:ba:ad:6b:b9:0a:7a:4e:4f:4b:84:ee:4b: + f1:7d:dd:11 +SHA1 Fingerprint=13:2D:0D:45:53:4B:69:97:CD:B2:D5:C3:39:E2:55:76:60:9B:5C:C6 +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b +N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t +KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu +kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm +CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ +Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu +imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te +2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe +DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC +/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p +F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt +TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== +-----END CERTIFICATE----- From owner-svn-src-all@freebsd.org Sat Sep 5 02:22:11 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 74FF93D70BC; Sat, 5 Sep 2020 02:22:11 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjywy6TSmz4vGT; Sat, 5 Sep 2020 02:22:10 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB7A91678A; Sat, 5 Sep 2020 02:22:10 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0852MAZr095201; Sat, 5 Sep 2020 02:22:10 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0852M9qH095194; Sat, 5 Sep 2020 02:22:09 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202009050222.0852M9qH095194@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 5 Sep 2020 02:22:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365357 - in stable: 11/secure/caroot/blacklisted 12/secure/caroot/blacklisted X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable: 11/secure/caroot/blacklisted 12/secure/caroot/blacklisted X-SVN-Commit-Revision: 365357 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 02:22:11 -0000 Author: kevans Date: Sat Sep 5 02:22:07 2020 New Revision: 365357 URL: https://svnweb.freebsd.org/changeset/base/365357 Log: MFC r365248: caroot: properly remove old distrusted roots The proper procedure was not followed in r364943; all of these that were deleted should have instead been moved over to the blacklist so that certctl can DTRT. Users must still `certctl rehash` after this, but this should generally be done by one of mergemaster/etcupdate/freebsd-update/pkgbase already; note that freebsd-update doesn't come into play for this particular update, as these have not yet made it into a release. Future work (after svn -> git) will likely change the script that updatecert invokes to facilitate the process, rather than trusting that kevans or whomever updates in the future will remember. Added: stable/12/secure/caroot/blacklisted/AddTrust_External_Root.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/AddTrust_External_Root.pem stable/12/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem stable/12/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem stable/12/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem stable/12/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem stable/12/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem stable/12/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Modified: Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Added: stable/11/secure/caroot/blacklisted/AddTrust_External_Root.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/AddTrust_External_Root.pem stable/11/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem stable/11/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem stable/11/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem stable/11/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem stable/11/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem stable/11/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem - copied unchanged from r365248, head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Modified: Directory Properties: stable/11/ (props changed) Copied: stable/12/secure/caroot/blacklisted/AddTrust_External_Root.pem (from r365248, head/secure/caroot/blacklisted/AddTrust_External_Root.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/blacklisted/AddTrust_External_Root.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/AddTrust_External_Root.pem) @@ -0,0 +1,99 @@ +## +## AddTrust External Root +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root + Validity + Not Before: May 30 10:48:38 2000 GMT + Not After : May 30 10:48:38 2020 GMT + Subject: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:b7:f7:1a:33:e6:f2:00:04:2d:39:e0:4e:5b:ed: + 1f:bc:6c:0f:cd:b5:fa:23:b6:ce:de:9b:11:33:97: + a4:29:4c:7d:93:9f:bd:4a:bc:93:ed:03:1a:e3:8f: + cf:e5:6d:50:5a:d6:97:29:94:5a:80:b0:49:7a:db: + 2e:95:fd:b8:ca:bf:37:38:2d:1e:3e:91:41:ad:70: + 56:c7:f0:4f:3f:e8:32:9e:74:ca:c8:90:54:e9:c6: + 5f:0f:78:9d:9a:40:3c:0e:ac:61:aa:5e:14:8f:9e: + 87:a1:6a:50:dc:d7:9a:4e:af:05:b3:a6:71:94:9c: + 71:b3:50:60:0a:c7:13:9d:38:07:86:02:a8:e9:a8: + 69:26:18:90:ab:4c:b0:4f:23:ab:3a:4f:84:d8:df: + ce:9f:e1:69:6f:bb:d7:42:d7:6b:44:e4:c7:ad:ee: + 6d:41:5f:72:5a:71:08:37:b3:79:65:a4:59:a0:94: + 37:f7:00:2f:0d:c2:92:72:da:d0:38:72:db:14:a8: + 45:c4:5d:2a:7d:b7:b4:d6:c4:ee:ac:cd:13:44:b7: + c9:2b:dd:43:00:25:fa:61:b9:69:6a:58:23:11:b7: + a7:33:8f:56:75:59:f5:cd:29:d7:46:b7:0a:2b:65: + b6:d3:42:6f:15:b2:b8:7b:fb:ef:e9:5d:53:d5:34: + 5a:27 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A + X509v3 Key Usage: + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A + DirName:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root + serial:01 + + Signature Algorithm: sha1WithRSAEncryption + b0:9b:e0:85:25:c2:d6:23:e2:0f:96:06:92:9d:41:98:9c:d9: + 84:79:81:d9:1e:5b:14:07:23:36:65:8f:b0:d8:77:bb:ac:41: + 6c:47:60:83:51:b0:f9:32:3d:e7:fc:f6:26:13:c7:80:16:a5: + bf:5a:fc:87:cf:78:79:89:21:9a:e2:4c:07:0a:86:35:bc:f2: + de:51:c4:d2:96:b7:dc:7e:4e:ee:70:fd:1c:39:eb:0c:02:51: + 14:2d:8e:bd:16:e0:c1:df:46:75:e7:24:ad:ec:f4:42:b4:85: + 93:70:10:67:ba:9d:06:35:4a:18:d3:2b:7a:cc:51:42:a1:7a: + 63:d1:e6:bb:a1:c5:2b:c2:36:be:13:0d:e6:bd:63:7e:79:7b: + a7:09:0d:40:ab:6a:dd:8f:8a:c3:f6:f6:8c:1a:42:05:51:d4: + 45:f5:9f:a7:62:21:68:15:20:43:3c:99:e7:7c:bd:24:d8:a9: + 91:17:73:88:3f:56:1b:31:38:18:b4:71:0f:9a:cd:c8:0e:9e: + 8e:2e:1b:e1:8c:98:83:cb:1f:31:f1:44:4c:c6:04:73:49:76: + 60:0f:c7:f8:bd:17:80:6b:2e:e9:cc:4c:0e:5a:9a:79:0f:20: + 0a:2e:d5:9e:63:26:1e:55:92:94:d8:82:17:5a:7b:d0:bc:c7: + 8f:4e:86:04 +SHA1 Fingerprint=02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68 +-----BEGIN CERTIFICATE----- +MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs +IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 +MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux +FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h +bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v +dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt +H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 +uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX +mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX +a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN +E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 +WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD +VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 +Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU +cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx +IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN +AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH +YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 +6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC +Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX +c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a +mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= +-----END CERTIFICATE----- Copied: stable/12/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem (from r365248, head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem) @@ -0,0 +1,98 @@ +## +## AddTrust Low-Value Services Root +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root + Validity + Not Before: May 30 10:38:31 2000 GMT + Not After : May 30 10:38:31 2020 GMT + Subject: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:96:96:d4:21:49:60:e2:6b:e8:41:07:0c:de:c4: + e0:dc:13:23:cd:c1:35:c7:fb:d6:4e:11:0a:67:5e: + f5:06:5b:6b:a5:08:3b:5b:29:16:3a:e7:87:b2:34: + 06:c5:bc:05:a5:03:7c:82:cb:29:10:ae:e1:88:81: + bd:d6:9e:d3:fe:2d:56:c1:15:ce:e3:26:9d:15:2e: + 10:fb:06:8f:30:04:de:a7:b4:63:b4:ff:b1:9c:ae: + 3c:af:77:b6:56:c5:b5:ab:a2:e9:69:3a:3d:0e:33: + 79:32:3f:70:82:92:99:61:6d:8d:30:08:8f:71:3f: + a6:48:57:19:f8:25:dc:4b:66:5c:a5:74:8f:98:ae: + c8:f9:c0:06:22:e7:ac:73:df:a5:2e:fb:52:dc:b1: + 15:65:20:fa:35:66:69:de:df:2c:f1:6e:bc:30:db: + 2c:24:12:db:eb:35:35:68:90:cb:00:b0:97:21:3d: + 74:21:23:65:34:2b:bb:78:59:a3:d6:e1:76:39:9a: + a4:49:8e:8c:74:af:6e:a4:9a:a3:d9:9b:d2:38:5c: + 9b:a2:18:cc:75:23:84:be:eb:e2:4d:33:71:8e:1a: + f0:c2:f8:c7:1d:a2:ad:03:97:2c:f8:cf:25:c6:f6: + b8:24:31:b1:63:5d:92:7f:63:f0:25:c9:53:2e:1f: + bf:4d + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B + X509v3 Key Usage: + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B + DirName:/C=SE/O=AddTrust AB/OU=AddTrust TTP Network/CN=AddTrust Class 1 CA Root + serial:01 + + Signature Algorithm: sha1WithRSAEncryption + 2c:6d:64:1b:1f:cd:0d:dd:b9:01:fa:96:63:34:32:48:47:99: + ae:97:ed:fd:72:16:a6:73:47:5a:f4:eb:dd:e9:f5:d6:fb:45: + cc:29:89:44:5d:bf:46:39:3d:e8:ee:bc:4d:54:86:1e:1d:6c: + e3:17:27:43:e1:89:56:2b:a9:6f:72:4e:49:33:e3:72:7c:2a: + 23:9a:bc:3e:ff:28:2a:ed:a3:ff:1c:23:ba:43:57:09:67:4d: + 4b:62:06:2d:f8:ff:6c:9d:60:1e:d8:1c:4b:7d:b5:31:2f:d9: + d0:7c:5d:f8:de:6b:83:18:78:37:57:2f:e8:33:07:67:df:1e: + c7:6b:2a:95:76:ae:8f:57:a3:f0:f4:52:b4:a9:53:08:cf:e0: + 4f:d3:7a:53:8b:fd:bb:1c:56:36:f2:fe:b2:b6:e5:76:bb:d5: + 22:65:a7:3f:fe:d1:66:ad:0b:bc:6b:99:86:ef:3f:7d:f3:18: + 32:ca:7b:c6:e3:ab:64:46:95:f8:26:69:d9:55:83:7b:2c:96: + 07:ff:59:2c:44:a3:c6:e5:e9:a9:dc:a1:63:80:5a:21:5e:21: + cf:53:54:f0:ba:6f:89:db:a8:aa:95:cf:8b:e3:71:cc:1e:1b: + 20:44:08:c0:7a:b6:40:fd:c4:e4:35:e1:1d:16:1c:d0:bc:2b: + 8e:d6:71:d9 +SHA1 Fingerprint=CC:AB:0E:A0:4C:23:01:D6:69:7B:DD:37:9F:CD:12:EB:24:E3:94:9D +-----BEGIN CERTIFICATE----- +MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU +MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 +b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw +MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML +QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD +VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul +CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n +tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl +dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch +PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC ++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O +BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl +MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk +ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB +IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X +7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz +43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY +eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl +pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA +WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= +-----END CERTIFICATE----- Copied: stable/12/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem (from r365248, head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/LuxTrust_Global_Root_2.pem) @@ -0,0 +1,141 @@ +## +## LuxTrust Global Root 2 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 0a:7e:a6:df:4b:44:9e:da:6a:24:85:9e:e6:b8:15:d3:16:7f:bb:b1 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = LU, O = LuxTrust S.A., CN = LuxTrust Global Root 2 + Validity + Not Before: Mar 5 13:21:57 2015 GMT + Not After : Mar 5 13:21:57 2035 GMT + Subject: C = LU, O = LuxTrust S.A., CN = LuxTrust Global Root 2 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:d7:85:97:bf:11:98:e9:f0:62:83:4c:3c:87:f9: + 53:6a:37:0b:f2:0f:3c:87:ce:6f:dc:26:29:bd:c5: + 89:ba:c9:83:3d:f7:ee:ca:5b:c6:6d:49:73:b4:c9: + 46:a3:1b:34:13:3f:c1:89:45:57:f4:d9:b1:fb:36: + 65:4b:fb:08:e2:48:71:11:c8:6e:3b:9e:9d:df:89: + 65:37:a6:85:f6:3b:44:18:b6:c6:37:30:62:44:92: + 97:69:7d:42:30:24:e4:0d:0c:89:6b:63:de:c5:e1: + df:4e:a9:14:6c:53:e0:61:ce:f6:17:2f:1d:3c:bd: + e6:22:4c:1d:93:f5:10:c4:a1:76:ec:6a:de:c5:6c: + df:96:b4:56:40:42:c0:62:92:30:a1:2d:15:94:a0: + d2:20:06:09:6e:6a:6d:e5:eb:b7:be:d4:f0:f1:15: + 7c:8b:e6:4e:ba:13:cc:4b:27:5e:99:3c:17:5d:8f: + 81:7f:33:3d:4f:d3:3f:1b:ec:5c:3f:f0:3c:4c:75: + 6e:f2:a6:d5:9d:da:2d:07:63:02:c6:72:e9:94:bc: + 4c:49:95:4f:88:52:c8:db:e8:69:82:f8:cc:34:5b: + 22:f0:86:a7:89:bd:48:0a:6d:66:81:6d:c8:c8:64: + fb:01:e1:f4:e1:de:d9:9e:dd:db:5b:d4:2a:99:26: + 15:1b:1e:4c:92:29:82:9e:d5:92:81:92:41:70:19: + f7:a4:e5:93:4b:bc:77:67:31:dd:1c:fd:31:70:0d: + 17:99:0c:f9:0c:39:19:2a:17:b5:30:71:55:d5:0f: + ae:58:e1:3d:2f:34:9b:cf:9f:f6:78:85:c2:93:7a: + 72:3e:66:8f:9c:16:11:60:8f:9e:89:6f:67:be:e0: + 47:5a:3b:0c:9a:67:8b:cf:46:c6:ae:38:a3:f2:a7: + bc:e6:d6:85:6b:33:24:70:22:4b:cb:08:9b:bb:c8: + f8:02:29:1d:be:20:0c:46:bf:6b:87:9b:b3:2a:66: + 42:35:46:6c:aa:ba:ad:f9:98:7b:e9:50:55:14:31: + bf:b1:da:2d:ed:80:ad:68:24:fb:69:ab:d8:71:13: + 30:e6:67:b3:87:40:fd:89:7e:f2:43:d1:11:df:2f: + 65:2f:64:ce:5f:14:b9:b1:bf:31:bd:87:78:5a:59: + 65:88:aa:fc:59:32:48:86:d6:4c:b9:29:4b:95:d3: + 76:f3:77:25:6d:42:1c:38:83:4d:fd:a3:5f:9b:7f: + 2d:ac:79:1b:0e:42:31:97:63:a4:fb:8a:69:d5:22: + 0d:34:90:30:2e:a8:b4:e0:6d:b6:94:ac:bc:8b:4e: + d7:70:fc:c5:38:8e:64:25:e1:4d:39:90:ce:c9:87: + 84:58:71 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Certificate Policies: + Policy: 1.3.171.1.1.1.10 + CPS: https://repository.luxtrust.lu + + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Authority Key Identifier: + keyid:FF:18:28:76:F9:48:05:2C:A1:AE:F1:2B:1B:2B:B2:53:F8:4B:7C:B3 + + X509v3 Subject Key Identifier: + FF:18:28:76:F9:48:05:2C:A1:AE:F1:2B:1B:2B:B2:53:F8:4B:7C:B3 + Signature Algorithm: sha256WithRSAEncryption + 6a:19:14:ed:6e:79:c1:2c:87:d4:0d:70:7e:d7:f6:78:c9:0b: + 04:4e:c4:b1:ce:93:70:fe:b0:54:c0:32:cd:99:30:64:17:bf: + 0f:e5:e2:33:fd:07:36:40:72:0e:1a:b6:6a:59:d6:00:e5:68: + 20:dd:2e:72:0d:1f:6a:64:31:20:84:7d:49:a6:5a:37:eb:45: + c9:85:f5:d4:c7:17:99:07:e6:9b:55:e4:0c:e8:a9:b4:ce:8c: + 5b:b5:11:5c:cf:8a:0e:0d:d6:ac:77:81:fe:32:9c:24:9e:72: + ce:54:f3:d0:6f:a2:56:d6:ec:c3:37:2c:65:58:be:57:00:1a: + f2:35:fa:eb:7b:31:5d:c2:c1:12:3d:96:81:88:96:89:c1:59: + 5c:7a:e6:7f:70:34:e7:83:e2:b1:e1:e1:b8:58:ef:d4:95:e4: + 60:9c:f0:96:97:72:8c:eb:84:02:2e:65:8f:a4:b7:d2:7f:67: + dd:c8:d3:9e:5c:aa:a9:a4:a0:25:14:06:9b:ec:4f:7e:2d:0b: + 7f:1d:75:f1:33:d8:ed:ce:b8:75:6d:3e:5b:b9:98:1d:31:0d: + 56:d8:43:0f:30:91:b2:04:6b:dd:56:be:95:80:55:67:be:d8: + cd:83:d9:18:ee:2e:0f:86:2d:92:9e:70:13:ec:de:51:c9:43: + 78:02:a5:4d:c8:f9:5f:c4:91:58:46:16:77:5a:74:aa:40:bc: + 07:9f:30:b9:b1:f7:12:17:dd:e3:ff:24:40:1d:7a:6a:d1:4f: + 18:0a:aa:90:1d:eb:40:1e:df:a1:1e:44:92:10:9a:f2:8d:e1: + d1:4b:46:9e:e8:45:42:97:ea:45:99:f3:ec:66:d5:02:fa:f2: + a6:4a:24:aa:de:ce:b9:ca:f9:3f:93:6f:f9:a3:ba:ea:a5:3e: + 99:ad:fd:ff:7b:99:f5:65:ee:f0:59:28:67:d7:90:95:a4:13: + 84:a9:84:c1:e8:ce:ce:75:93:63:1a:bc:3c:ea:d5:64:1f:2d: + 2a:12:39:c6:c3:5a:32:ed:47:91:16:0e:bc:38:c1:50:de:8f: + ca:2a:90:34:1c:ee:41:94:9c:5e:19:2e:f8:45:49:99:74:91: + b0:04:6f:e3:04:5a:b1:ab:2a:ab:fe:c7:d0:96:b6:da:e1:4a: + 64:06:6e:60:4d:bd:42:4e:ff:78:da:24:ca:1b:b4:d7:96:39: + 6c:ae:f1:0e:aa:a7:7d:48:8b:20:4c:cf:64:d6:b8:97:46:b0: + 4e:d1:2a:56:3a:a0:93:bd:af:80:24:e0:0a:7e:e7:ca:d5:ca: + e8:85:55:dc:36:2a:e1:94:68:93:c7:66:72:44:0f:80:21:32: + 6c:25:c7:23:80:83:0a:eb +SHA1 Fingerprint=1E:0E:56:19:0A:D1:8B:25:98:B2:04:44:FF:66:8A:04:17:99:5F:3F +-----BEGIN CERTIFICATE----- +MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQEL +BQAwRjELMAkGA1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNV +BAMMFkx1eFRydXN0IEdsb2JhbCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUw +MzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEWMBQGA1UECgwNTHV4VHJ1c3QgUy5B +LjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wmKb3F +ibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTem +hfY7RBi2xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1 +EMShduxq3sVs35a0VkBCwGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsn +Xpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4 +zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkmFRseTJIpgp7VkoGSQXAZ +96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niFwpN6cj5m +j5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4g +DEa/a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+ +8kPREd8vZS9kzl8UubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2j +X5t/Lax5Gw5CMZdjpPuKadUiDTSQMC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmH +hFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB/zBCBgNVHSAEOzA5MDcGByuB +KwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5Lmx1eHRydXN0 +Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT ++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQEL +BQADggIBAGoZFO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9 +BzZAcg4atmpZ1gDlaCDdLnINH2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTO +jFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW7MM3LGVYvlcAGvI1+ut7MV3CwRI9 +loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIuZY+kt9J/Z93I055c +qqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWAVWe+ +2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/ +JEAdemrRTxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKre +zrnK+T+Tb/mjuuqlPpmt/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQf +LSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+ +x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31IiyBMz2TWuJdGsE7RKlY6 +oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr +-----END CERTIFICATE----- Copied: stable/12/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem (from r365248, head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem) @@ -0,0 +1,137 @@ +## +## Staat der Nederlanden Root CA - G2 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 10000012 (0x98968c) + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = NL, O = Staat der Nederlanden, CN = Staat der Nederlanden Root CA - G2 + Validity + Not Before: Mar 26 11:18:17 2008 GMT + Not After : Mar 25 11:03:10 2020 GMT + Subject: C = NL, O = Staat der Nederlanden, CN = Staat der Nederlanden Root CA - G2 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:c5:59:e7:6f:75:aa:3e:4b:9c:b5:b8:ac:9e:0b: + e4:f9:d9:ca:ab:5d:8f:b5:39:10:82:d7:af:51:e0: + 3b:e1:00:48:6a:cf:da:e1:06:43:11:99:aa:14:25: + 12:ad:22:e8:00:6d:43:c4:a9:b8:e5:1f:89:4b:67: + bd:61:48:ef:fd:d2:e0:60:88:e5:b9:18:60:28:c3: + 77:2b:ad:b0:37:aa:37:de:64:59:2a:46:57:e4:4b: + b9:f8:37:7c:d5:36:e7:80:c1:b6:f3:d4:67:9b:96: + e8:ce:d7:c6:0a:53:d0:6b:49:96:f3:a3:0b:05:77: + 48:f7:25:e5:70:ac:30:14:20:25:e3:7f:75:5a:e5: + 48:f8:4e:7b:03:07:04:fa:82:61:87:6e:f0:3b:c4: + a4:c7:d0:f5:74:3e:a5:5d:1a:08:f2:9b:25:d2:f6: + ac:04:26:3e:55:3a:62:28:a5:7b:b2:30:af:f8:37: + c2:d1:ba:d6:38:fd:f4:ef:49:30:37:99:26:21:48: + 85:01:a9:e5:16:e7:dc:90:55:df:0f:e8:38:cd:99: + 37:21:4f:5d:f5:22:6f:6a:c5:12:16:60:17:55:f2: + 65:66:a6:a7:30:91:38:c1:38:1d:86:04:84:ba:1a: + 25:78:5e:9d:af:cc:50:60:d6:13:87:52:ed:63:1f: + 6d:65:7d:c2:15:18:74:ca:e1:7e:64:29:8c:72:d8: + 16:13:7d:0b:49:4a:f1:28:1b:20:74:6b:c5:3d:dd: + b0:aa:48:09:3d:2e:82:94:cd:1a:65:d9:2b:88:9a: + 99:bc:18:7e:9f:ee:7d:66:7c:3e:bd:94:b8:81:ce: + cd:98:30:78:c1:6f:67:d0:be:5f:e0:68:ed:de:e2: + b1:c9:2c:59:78:92:aa:df:2b:60:63:f2:e5:5e:b9: + e3:ca:fa:7f:50:86:3e:a2:34:18:0c:09:68:28:11: + 1c:e4:e1:b9:5c:3e:47:ba:32:3f:18:cc:5b:84:f5: + f3:6b:74:c4:72:74:e1:e3:8b:a0:4a:bd:8d:66:2f: + ea:ad:35:da:20:d3:88:82:61:f0:12:22:b6:bc:d0: + d5:a4:ec:af:54:88:25:24:3c:a7:6d:b1:72:29:3f: + 3e:57:a6:7f:55:af:6e:26:c6:fe:e7:cc:40:5c:51: + 44:81:0a:78:de:4a:ce:55:bf:1d:d5:d9:b7:56:ef: + f0:76:ff:0b:79:b5:af:bd:fb:a9:69:91:46:97:68: + 80:14:36:1d:b3:7f:bb:29:98:36:a5:20:fa:82:60: + 62:33:a4:ec:d6:ba:07:a7:6e:c5:cf:14:a6:e7:d6: + 92:34:d8:81:f5:fc:1d:5d:aa:5c:1e:f6:a3:4d:3b: + b8:f7:39 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Certificate Policies: + Policy: X509v3 Any Policy + CPS: http://www.pkioverheid.nl/policies/root-policy-G2 + + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 91:68:32:87:15:1D:89:E2:B5:F1:AC:36:28:34:8D:0B:7C:62:88:EB + Signature Algorithm: sha256WithRSAEncryption + a8:41:4a:67:2a:92:81:82:50:6e:e1:d7:d8:b3:39:3b:f3:02: + 15:09:50:51:ef:2d:bd:24:7b:88:86:3b:f9:b4:bc:92:09:96: + b9:f6:c0:ab:23:60:06:79:8c:11:4e:51:d2:79:80:33:fb:9d: + 48:be:ec:41:43:81:1f:7e:47:40:1c:e5:7a:08:ca:aa:8b:75: + ad:14:c4:c2:e8:66:3c:82:07:a7:e6:27:82:5b:18:e6:0f:6e: + d9:50:3e:8a:42:18:29:c6:b4:56:fc:56:10:a0:05:17:bd:0c: + 23:7f:f4:93:ed:9c:1a:51:be:dd:45:41:bf:91:24:b4:1f:8c: + e9:5f:cf:7b:21:99:9f:95:9f:39:3a:46:1c:6c:f9:cd:7b:9c: + 90:cd:28:a9:c7:a9:55:bb:ac:62:34:62:35:13:4b:14:3a:55: + 83:b9:86:8d:92:a6:c6:f4:07:25:54:cc:16:57:12:4a:82:78: + c8:14:d9:17:82:26:2d:5d:20:1f:79:ae:fe:d4:70:16:16:95: + 83:d8:35:39:ff:52:5d:75:1c:16:c5:13:55:cf:47:cc:75:65: + 52:4a:de:f0:b0:a7:e4:0a:96:0b:fb:ad:c2:e2:25:84:b2:dd: + e4:bd:7e:59:6c:9b:f0:f0:d8:e7:ca:f2:e9:97:38:7e:89:be: + cc:fb:39:17:61:3f:72:db:3a:91:d8:65:01:19:1d:ad:50:a4: + 57:0a:7c:4b:bc:9c:71:73:2a:45:51:19:85:cc:8e:fd:47:a7: + 74:95:1d:a8:d1:af:4e:17:b1:69:26:c2:aa:78:57:5b:c5:4d: + a7:e5:9e:05:17:94:ca:b2:5f:a0:49:18:8d:34:e9:26:6c:48: + 1e:aa:68:92:05:e1:82:73:5a:9b:dc:07:5b:08:6d:7d:9d:d7: + 8d:21:d9:fc:14:20:aa:c2:45:df:3f:e7:00:b2:51:e4:c2:f8: + 05:b9:79:1a:8c:34:f3:9e:5b:e4:37:5b:6b:4a:df:2c:57:8a: + 40:5a:36:ba:dd:75:44:08:37:42:70:0c:fe:dc:5e:21:a0:a3: + 8a:c0:90:9c:68:da:50:e6:45:10:47:78:b6:4e:d2:65:c9:c3: + 37:df:e1:42:63:b0:57:37:45:2d:7b:8a:9c:bf:05:ea:65:55: + 33:f7:39:10:c5:28:2a:21:7a:1b:8a:c4:24:f9:3f:15:c8:9a: + 15:20:f5:55:62:96:ed:6d:93:50:bc:e4:aa:78:ad:d9:cb:0a: + 65:87:a6:66:c1:c4:81:a3:77:3a:58:1e:0b:ee:83:8b:9d:1e: + d2:52:a4:cc:1d:6f:b0:98:6d:94:31:b5:f8:71:0a:dc:b9:fc: + 7d:32:60:e6:eb:af:8a:01 +SHA1 Fingerprint=59:AF:82:79:91:86:C7:B4:75:07:CB:CF:03:57:46:EB:04:DD:B7:16 +-----BEGIN CERTIFICATE----- +MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO +TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh +dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX +DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl +ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv +b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291 +qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp +uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU +Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE +pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp +5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M +UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN +GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy +5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv +6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK +eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6 +B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/ +BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov +L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV +HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG +SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS +CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen +5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897 +IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK +gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL ++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL +vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm +bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk +N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC +Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z +ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ== +-----END CERTIFICATE----- Copied: stable/12/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem (from r365248, head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem) @@ -0,0 +1,68 @@ +## +## Symantec Class 1 Public Primary Certification Authority - G4 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 21:6e:33:a5:cb:d3:88:a4:6f:29:07:b4:27:3c:c4:d8 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 1 Public Primary Certification Authority - G4 + Validity + Not Before: Oct 5 00:00:00 2011 GMT + Not After : Jan 18 23:59:59 2038 GMT + Subject: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 1 Public Primary Certification Authority - G4 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:d7:66:b5:1b:db:ae:b3:60:ee:46:ea:88:63:75: + 3b:2a:94:6d:f3:5f:12:f6:e3:0f:9e:b6:0a:14:53: + 48:52:c8:dc:3a:b3:cb:48:20:26:12:4e:fa:89:84: + d4:df:91:e4:29:7d:28:01:d9:db:18:43:69:a1:1f: + b5:d3:86:16:dc:c7:7f:67:23:df:df:31:31:83:03: + 35:70:b1:4b:b7:c8:17:bb:51:cb:dc:94:17:db:ea: + 09:3b:76:12:de:aa:b5 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 65:C0:8D:25:F5:0C:BA:97:77:90:3F:9E:2E:E0:5A:F5:CE:D5:E1:E4 + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:a5:ae:e3:46:53:f8:98:36:e3:22:fa:2e:28: + 49:0d:ee:30:7e:33:f3:ec:3f:71:5e:cc:55:89:78:99:ac:b2: + fd:dc:1c:5c:33:8e:29:b9:6b:17:c8:11:68:b5:dc:83:07:02: + 31:00:9c:c8:44:da:69:c2:36:c3:54:19:10:85:02:da:9d:47: + ef:41:e7:6c:26:9d:09:3d:f7:6d:90:d1:05:44:2f:b0:bc:83: + 93:68:f2:0c:45:49:39:bf:99:04:1c:d3:10:a0 +SHA1 Fingerprint=84:F2:E3:DD:83:13:3E:A9:1D:19:52:7F:02:D7:29:BF:C1:5F:E6:67 +-----BEGIN CERTIFICATE----- +MIICqDCCAi2gAwIBAgIQIW4zpcvTiKRvKQe0JzzE2DAKBggqhkjOPQQDAzCBlDEL +MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD +VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD +bGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g +RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC +VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h +bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAxIFB1 +YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATXZrUb266zYO5G6ohjdTsqlG3zXxL24w+etgoUU0hS +yNw6s8tIICYSTvqJhNTfkeQpfSgB2dsYQ2mhH7XThhbcx39nI9/fMTGDAzVwsUu3 +yBe7UcvclBfb6gk7dhLeqrWjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBRlwI0l9Qy6l3eQP54u4Fr1ztXh5DAKBggqhkjOPQQD +AwNpADBmAjEApa7jRlP4mDbjIvouKEkN7jB+M/PsP3FezFWJeJmssv3cHFwzjim5 +axfIEWi13IMHAjEAnMhE2mnCNsNUGRCFAtqdR+9B52wmnQk9922Q0QVEL7C8g5No +8gxFSTm/mQQc0xCg +-----END CERTIFICATE----- Copied: stable/12/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem (from r365248, head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem) @@ -0,0 +1,68 @@ +## +## Symantec Class 2 Public Primary Certification Authority - G4 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 34:17:65:12:40:3b:b7:56:80:2d:80:cb:79:55:a6:1e + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 2 Public Primary Certification Authority - G4 + Validity + Not Before: Oct 5 00:00:00 2011 GMT + Not After : Jan 18 23:59:59 2038 GMT + Subject: C = US, O = Symantec Corporation, OU = Symantec Trust Network, CN = Symantec Class 2 Public Primary Certification Authority - G4 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:d1:d9:4a:8e:4c:0d:84:4a:51:ba:7c:ef:d3:cc: + fa:3a:9a:b5:a7:63:13:3d:01:e0:49:3e:fa:c1:47: + c9:92:b3:3a:d7:fe:6f:9c:f7:9a:3a:0f:f5:0e:0a: + 0a:c3:3f:c8:e7:12:14:8e:d5:d5:6d:98:2c:b3:71: + 32:0a:eb:2a:bd:f6:d7:6a:20:0b:67:45:9c:d2:b2: + bf:53:22:66:09:5d:db:11:f3:f1:05:33:58:a3:e2: + b8:cf:7c:cd:82:9b:bd + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 3D:32:F3:3A:A9:0C:90:84:F9:A2:8C:69:06:61:54:2F:87:72:FE:05 + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:c8:a6:a9:af:41:7f:b5:c9:11:42:16:68:69: + 4c:5c:b8:27:18:b6:98:f1:c0:7f:90:6d:87:d3:8c:46:17:f0: + 3e:4f:fc:ea:b0:08:c4:7a:4b:bc:08:2f:c7:e2:a7:6f:65:02: + 31:00:d6:59:de:86:ce:5f:0e:ca:54:d5:c6:d0:15:0e:fc:8b: + 94:72:d4:8e:00:58:53:cf:7e:b1:4b:0d:e5:50:86:eb:9e:6b: + df:ff:29:a6:d8:47:d9:a0:96:18:db:f2:45:b3 +SHA1 Fingerprint=67:24:90:2E:48:01:B0:22:96:40:10:46:B4:B1:67:2C:A9:75:FD:2B +-----BEGIN CERTIFICATE----- +MIICqDCCAi2gAwIBAgIQNBdlEkA7t1aALYDLeVWmHjAKBggqhkjOPQQDAzCBlDEL +MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD +VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD +bGFzcyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g +RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC +VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h +bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAyIFB1 +YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAATR2UqOTA2ESlG6fO/TzPo6mrWnYxM9AeBJPvrBR8mS +szrX/m+c95o6D/UOCgrDP8jnEhSO1dVtmCyzcTIK6yq99tdqIAtnRZzSsr9TImYJ +XdsR8/EFM1ij4rjPfM2Cm72jQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E +BTADAQH/MB0GA1UdDgQWBBQ9MvM6qQyQhPmijGkGYVQvh3L+BTAKBggqhkjOPQQD +AwNpADBmAjEAyKapr0F/tckRQhZoaUxcuCcYtpjxwH+QbYfTjEYX8D5P/OqwCMR6 +S7wIL8fip29lAjEA1lnehs5fDspU1cbQFQ78i5Ry1I4AWFPPfrFLDeVQhuuea9// +KabYR9mglhjb8kWz +-----END CERTIFICATE----- Copied: stable/12/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem (from r365248, head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/12/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem Sat Sep 5 02:22:07 2020 (r365357, copy of r365248, head/secure/caroot/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem) @@ -0,0 +1,87 @@ +## +## Verisign Class 3 Public Primary Certification Authority - G3 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## Extracted from nss +## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ +## +## @generated +## +Certificate: + Data: + Version: 1 (0x0) + Serial Number: + 9b:7e:06:49:a3:3e:62:b9:d5:ee:90:48:71:29:ef:57 + Signature Algorithm: sha1WithRSAEncryption + Issuer: C = US, O = "VeriSign, Inc.", OU = VeriSign Trust Network, OU = "(c) 1999 VeriSign, Inc. - For authorized use only", CN = VeriSign Class 3 Public Primary Certification Authority - G3 + Validity + Not Before: Oct 1 00:00:00 1999 GMT + Not After : Jul 16 23:59:59 2036 GMT + Subject: C = US, O = "VeriSign, Inc.", OU = VeriSign Trust Network, OU = "(c) 1999 VeriSign, Inc. - For authorized use only", CN = VeriSign Class 3 Public Primary Certification Authority - G3 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:cb:ba:9c:52:fc:78:1f:1a:1e:6f:1b:37:73:bd: + f8:c9:6b:94:12:30:4f:f0:36:47:f5:d0:91:0a:f5: + 17:c8:a5:61:c1:16:40:4d:fb:8a:61:90:e5:76:20: + c1:11:06:7d:ab:2c:6e:a6:f5:11:41:8e:fa:2d:ad: + 2a:61:59:a4:67:26:4c:d0:e8:bc:52:5b:70:20:04: + 58:d1:7a:c9:a4:69:bc:83:17:64:ad:05:8b:bc:d0: + 58:ce:8d:8c:f5:eb:f0:42:49:0b:9d:97:27:67:32: + 6e:e1:ae:93:15:1c:70:bc:20:4d:2f:18:de:92:88: + e8:6c:85:57:11:1a:e9:7e:e3:26:11:54:a2:45:96: + 55:83:ca:30:89:e8:dc:d8:a3:ed:2a:80:3f:7f:79: + 65:57:3e:15:20:66:08:2f:95:93:bf:aa:47:2f:a8: + 46:97:f0:12:e2:fe:c2:0a:2b:51:e6:76:e6:b7:46: + b7:e2:0d:a6:cc:a8:c3:4c:59:55:89:e6:e8:53:5c: + 1c:ea:9d:f0:62:16:0b:a7:c9:5f:0c:f0:de:c2:76: + ce:af:f7:6a:f2:fa:41:a6:a2:33:14:c9:e5:7a:63: + d3:9e:62:37:d5:85:65:9e:0e:e6:53:24:74:1b:5e: + 1d:12:53:5b:c7:2c:e7:83:49:3b:15:ae:8a:68:b9: + 57:97 + Exponent: 65537 (0x10001) + Signature Algorithm: sha1WithRSAEncryption + 11:14:96:c1:ab:92:08:f7:3f:2f:c9:b2:fe:e4:5a:9f:64:de: + db:21:4f:86:99:34:76:36:57:dd:d0:15:2f:c5:ad:7f:15:1f: + 37:62:73:3e:d4:e7:5f:ce:17:03:db:35:fa:2b:db:ae:60:09: + 5f:1e:5f:8f:6e:bb:0b:3d:ea:5a:13:1e:0c:60:6f:b5:c0:b5: + 23:22:2e:07:0b:cb:a9:74:cb:47:bb:1d:c1:d7:a5:6b:cc:2f: + d2:42:fd:49:dd:a7:89:cf:53:ba:da:00:5a:28:bf:82:df:f8: + ba:13:1d:50:86:82:fd:8e:30:8f:29:46:b0:1e:3d:35:da:38: + 62:16:18:4a:ad:e6:b6:51:6c:de:af:62:eb:01:d0:1e:24:fe: + 7a:8f:12:1a:12:68:b8:fb:66:99:14:14:45:5c:ae:e7:ae:69: + 17:81:2b:5a:37:c9:5e:2a:f4:c6:e2:a1:5c:54:9b:a6:54:00: + cf:f0:f1:c1:c7:98:30:1a:3b:36:16:db:a3:6e:ea:fd:ad:b2: + c2:da:ef:02:47:13:8a:c0:f1:b3:31:ad:4f:1c:e1:4f:9c:af: + 0f:0c:9d:f7:78:0d:d8:f4:35:56:80:da:b7:6d:17:8f:9d:1e: + 81:64:e1:fe:c5:45:ba:ad:6b:b9:0a:7a:4e:4f:4b:84:ee:4b: + f1:7d:dd:11 +SHA1 Fingerprint=13:2D:0D:45:53:4B:69:97:CD:B2:D5:C3:39:E2:55:76:60:9B:5C:C6 +-----BEGIN CERTIFICATE----- +MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl +cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu +LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT +aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp +dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD +VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT +aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ +bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu +IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg +LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b +N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t +KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu +kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm +CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ +Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu +imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te +2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe +DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC +/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p +F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt +TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== +-----END CERTIFICATE----- From owner-svn-src-all@freebsd.org Sat Sep 5 02:57:39 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 676793DA0B6 for ; Sat, 5 Sep 2020 02:57:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bjzjt3000z3Tyq for ; Sat, 5 Sep 2020 02:57:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x731.google.com with SMTP id w186so8387773qkd.1 for ; Fri, 04 Sep 2020 19:57:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=JXWQIB4W8LjUZMOYinRoFezwT1NEaEECi4WPAatIPmI=; b=pEcOsXMZ5SauwLEmPpxQMUu+XqHE3G/1GkeuTzcr6wBc18LGl48/GQxYsLLZOFSOor 82BPPO92X9VRDCizm3iAiQiv6NPpLT4rHYwn4t4tWN6oATQMRWqsZ3uDgz20eTQZ0lDa NSnaC9EPiC7A54NWcnhzM41+CvTFKob6dLrLbAGhrqfFLrvMBLfJLZvI9pAw+M0L5yru ebaYEeojQ6rjQWOiwhqnw4iq63SPRrUCkUog9WOY4SKFmIWE2HDVEBMLH9cVN7b85SJz o2LbSkb74J4VvSPfA+v6WcjyAA8c+xVrhZrY8P8YNpmzgFC1YaNkIPT+rb7LUBXaSpL4 xyGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=JXWQIB4W8LjUZMOYinRoFezwT1NEaEECi4WPAatIPmI=; b=YdxfP6IkJd6buD0QzUwULaQuZfAwRXJKQYgzHnEkA6N4Rd+SbYi4txKmFuoHTZ6rsY NuKFSTjDcOHxaEDPdadDrV0sYBuX8IaOH+T24ufT0pbJiZqmnPxBEW7n7Wvxqs3CyKyP FuOvsxwhmqIWEi6qFW784flFAk89G2IWdav0PRqyhWrj7HNJtmu+8F5pI8spu7InCAqw lkSJZ6sPrNmBszryc5uerWSGvjtyxZ8v2/szbCyoTx5h9msqSBUsPnU/6OSWO+5Tfei9 sCePhOVkbGIqLfIujz1m1abvBHXwvDCPGpC22iCdbxy/XwkvgIqGzF50uf0Jio9tgVeC 7LkA== X-Gm-Message-State: AOAM533hquwV9+hoEXinW8+hKRfOLYqwT740jmOyZ50+W2Pg2Ku432Yw LJPXcaUQC2G0HBRoOMm4sKJAO8DjNqddcax6sZwSUg== X-Google-Smtp-Source: ABdhPJwFV056P8NbdRJMmE/N45KcMdc5GO5kKL+EzV3CycE5lYeZolqZQsZlLebbtGVPjVSfvJuwXnJL6SsxS4rcG7k= X-Received: by 2002:a37:b801:: with SMTP id i1mr10182913qkf.240.1599274657108; Fri, 04 Sep 2020 19:57:37 -0700 (PDT) MIME-Version: 1.0 References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> <20200905010510.GA26297@lonesome.com> In-Reply-To: <20200905010510.GA26297@lonesome.com> From: Warner Losh Date: Fri, 4 Sep 2020 20:57:25 -0600 Message-ID: Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Mark Linimon Cc: Andrew Gallatin , Alexey Dokuchaev , Michael Tuexen , Pedro Giffuni , Mateusz Guzik , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 4Bjzjt3000z3Tyq X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=pEcOsXMZ; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::731) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.98 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.06)[-1.061]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.990]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.93)[-0.933]; RCPT_COUNT_SEVEN(0.00)[9]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::731:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[svn-src-all]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 02:57:39 -0000 On Fri, Sep 4, 2020, 7:05 PM Mark Linimon wrote: > On Fri, Sep 04, 2020 at 02:15:04PM -0400, Andrew Gallatin wrote: > > and I also anticipate it will cause problems with MFCs > > And existing PRs and DRs. > Or we could just not bother we these changes at all. It's a pipe dream we will ever be style(9) compliant in all our code, or that we can magically have a tool to enforce in new commits. We have better things to worry about. We should continue to ignore this non problem and for new users point them at the 95% correct format thing to run their submitted patches if they submit something too far out of whack. The last sweep deleted a boatload of blank lines that were in there on purpose. Not worth adding them back, but still annoying to no real benefit. I just don't see the benefits at all of doing anything here. The few reviews that I've seen mention it seem to be the right level of effort. Warner > From owner-svn-src-all@freebsd.org Sat Sep 5 04:20:30 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 84EC63DE202; Sat, 5 Sep 2020 04:20:30 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bk1YV2yZjz3bhH; Sat, 5 Sep 2020 04:20:30 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A25717F73; Sat, 5 Sep 2020 04:20:30 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0854KUWh065084; Sat, 5 Sep 2020 04:20:30 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0854KUfm065083; Sat, 5 Sep 2020 04:20:30 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009050420.0854KUfm065083@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 5 Sep 2020 04:20:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365358 - head/usr.bin/script X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/usr.bin/script X-SVN-Commit-Revision: 365358 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 04:20:30 -0000 Author: imp Date: Sat Sep 5 04:20:29 2020 New Revision: 365358 URL: https://svnweb.freebsd.org/changeset/base/365358 Log: Fix typo in comment. Noticed by: bapt@ Modified: head/usr.bin/script/script.c Modified: head/usr.bin/script/script.c ============================================================================== --- head/usr.bin/script/script.c Sat Sep 5 02:22:07 2020 (r365357) +++ head/usr.bin/script/script.c Sat Sep 5 04:20:29 2020 (r365358) @@ -119,7 +119,7 @@ main(int argc, char *argv[]) case 'd': usesleep = 0; break; - case 'e': /* Default behaior, accepted for linux compat */ + case 'e': /* Default behavior, accepted for linux compat */ break; case 'F': Fflg = 1; From owner-svn-src-all@freebsd.org Sat Sep 5 03:11:19 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B9933DBB0D for ; Sat, 5 Sep 2020 03:11:19 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-yb1-xb41.google.com (mail-yb1-xb41.google.com [IPv6:2607:f8b0:4864:20::b41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bk01f121Cz3WnG for ; Sat, 5 Sep 2020 03:11:17 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-yb1-xb41.google.com with SMTP id 195so5699150ybl.9 for ; Fri, 04 Sep 2020 20:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=CQRSc2g0r6U2T6y4uN0x3Jwh8pdSEBARNtwgRCw1SqI=; b=ISOsor3lk6Fwg0hEwV8qN/M88IZYc5vMoEKeTwZPCzj1PYtq0lK4TSG7PyRziROOsI 1zLWg92bf38Kdc/bwfKE/MJCVqRPQCfAO50OnIVKT9sMmArrdpFrF5oplH0yKpo0rJvM f7ZIUtJN/hmLW/c0ZoDRMLgc3JEQx7nK97cFI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=CQRSc2g0r6U2T6y4uN0x3Jwh8pdSEBARNtwgRCw1SqI=; b=t5FMWiBoZuUGRutWakMzA1Bwmsd7tEYioHEVHzf/1uaOj6wLqpp6VJ65JUJx9bMEZG u0bi3iCjLWO0CUTBPBYdzcePL2w/yS43jGlGCmTe+bIve5FdvHBN2YL1/0yA86SlTwkj I8IgA5F0wCDHY289S7DI8aL0LHXii6OUTcNdmDI0LmHnsVktw6ctshd7VPwJ7VKPMhrz YOulDzuYk3ArU5HCLN45mdc9Gx81kJrziLL4EFCGTbvxu2HSN6SIfOULD91BaniNAgWj fpu97whCMZtYO8grm5azJ/hlVKqfJSJAFywa/cQqm9yBesaQMCT6IY6QEF3X9Px0e8UL bmMw== X-Gm-Message-State: AOAM532aFCENoD2Jrs/6Ps+C8JNkmP9g2z5WTc6nEdYv24kOyxstQM2h cvOftGrVSj2yGu7t1cw1eKzg6bfsKHVg+BneFURqYg== X-Google-Smtp-Source: ABdhPJw2Kv8QADarHcYvta0R0K6BqZdSctA634ZPOYUM1j79O9VEfrruvoHhuL2nEj4RKtav3p6FEnfGODX40jG2f/A= X-Received: by 2002:a25:3403:: with SMTP id b3mr5243100yba.455.1599275476981; Fri, 04 Sep 2020 20:11:16 -0700 (PDT) MIME-Version: 1.0 References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> <20200905010510.GA26297@lonesome.com> In-Reply-To: From: Kevin Bowling Date: Fri, 4 Sep 2020 20:11:06 -0700 Message-ID: Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Warner Losh Cc: Mark Linimon , Andrew Gallatin , Alexey Dokuchaev , Michael Tuexen , Pedro Giffuni , Mateusz Guzik , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Bk01f121Cz3WnG X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none (invalid DKIM record) header.d=kev009.com header.s=google header.b=ISOsor3l; dmarc=none; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2607:f8b0:4864:20::b41 as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com X-Spamd-Result: default: False [-3.20 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.06)[-1.056]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; NEURAL_HAM_LONG(-0.99)[-0.994]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[kev009.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[kev009.com:~]; NEURAL_HAM_SHORT(-0.86)[-0.856]; RCPT_COUNT_SEVEN(0.00)[10]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b41:from]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all]; RCVD_COUNT_TWO(0.00)[2] X-Mailman-Approved-At: Sat, 05 Sep 2020 07:42:31 +0000 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 03:11:19 -0000 I disagree that the problem is intractable. It's just a decision and it has a one time cost with long term benefits like paying off a high interest loan. The intractability opinion seemed justifiable for a long time but it's been proven false by other communities, particularly Go and Rust and there is nothing syntactically special about these languages that enable this; it's just a decision to make the style fit an extant formatter. An arbitrary formater may leave a little bit of annoyance to each person's taste, but that is a tiny drop in the bucket compared to never having to discuss and especially correct (which may /seem/ helpful but is pretty offputting to newcomers). A tool does it, and it takes the wind out of any passive aggressive bike shed opportunities from either maintainer or contributor. It sucks that downstreams have to fall in line, but that doesn't stop progress on any other major changes in FreeBSD. On Fri, Sep 4, 2020 at 7:57 PM Warner Losh wrote: > > On Fri, Sep 4, 2020, 7:05 PM Mark Linimon wrote: > > > On Fri, Sep 04, 2020 at 02:15:04PM -0400, Andrew Gallatin wrote: > > > and I also anticipate it will cause problems with MFCs > > > > And existing PRs and DRs. > > > > Or we could just not bother we these changes at all. It's a pipe dream we > will ever be style(9) compliant in all our code, or that we can magically > have a tool to enforce in new commits. We have better things to worry > about. We should continue to ignore this non problem and for new users > point them at the 95% correct format thing to run their submitted patches > if they submit something too far out of whack. > > The last sweep deleted a boatload of blank lines that were in there on > purpose. Not worth adding them back, but still annoying to no real benefit. > > I just don't see the benefits at all of doing anything here. The few > reviews that I've seen mention it seem to be the right level of effort. > > Warner > > > > _______________________________________________ > 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-unsubscribe@freebsd.org" From owner-svn-src-all@freebsd.org Sat Sep 5 03:48:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 205713DCF0B for ; Sat, 5 Sep 2020 03:48:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bk0r82sDvz3YgP for ; Sat, 5 Sep 2020 03:48:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x730.google.com with SMTP id b14so8414204qkn.4 for ; Fri, 04 Sep 2020 20:48:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mQEB8YXPsMbSNX4aOHZZu9JlOR/ZacHciu3LAd2vYv0=; b=RsO8fTTewNumKzhIBFm71KmdQRyGhwFQJnUB5DEgo8C2PGkLIOjzteih3avxCuYL9I U47RrdoeJi/oFmpwI4K7AyRYeH2b5vLB/FzLrKj6El2vWaZmQj2tbrWtof7c3o6vgBA6 iVeFYntJJB/m3k83RM8rYKKhliTI1WF6mlmVH9Xcbe5nEC4el672Zcz1kriyBe8WYm5n DanxGc6D8LtzCTfj2ldUDJ/emE76pXn4sxf2BFzQlLhakJvij4EX38/h5xV8X0xZJa72 SOarno2V0NFfeosBcBcuN1PHYiagL3lJoQFlJ6+xIJA5vPO4NcfO0PB1VERZ+eLwvi6H mPVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mQEB8YXPsMbSNX4aOHZZu9JlOR/ZacHciu3LAd2vYv0=; b=PjDeCvl5lOpUQRFUwdLKmlp3EIo4JBbneu6gRFOnzenn//13d0wIhNlCKVdRGPFqAi zwX0RYdfNSpyhISL70GmheQZOWCG5osQ7rBzElJz6XQxuyvj3NGpyxTGqkPNp0cQMpf3 WfJc/J/gTqEsmgFmbylUBKuii4uTkdWO8HrI8RSXq6sbyNGBhEeW3OJrQXmQobtC7Xeg bV/wmla8au1o9pyGzBKWvO1gdh6ZJdyS/qQBoT4ycqXXz/yeBWSM9oMlNNrYy73CUQnr GbyJEQqJ3XaIwJzml94EtM/9Yn557JfeoJk96C75twAJE5MJ6f16smLwW/JYNLO6elMx DP3w== X-Gm-Message-State: AOAM533gzcEKVJv5qh4qHXnTqKUrQG5xavs9tjkWICbrnqkF2M5We8q5 o6TRL0GJ9nEki7JIgsOHaWq3twq5q4K6id18m0MWxQ== X-Google-Smtp-Source: ABdhPJz2mHLrBER1o5hULmGwzFZDCKrS8SXqklHrXq3Ija3QcJZpqs13Yzvmt/Id5rmhe37mP6XiXAdKFOxRiAOcZl8= X-Received: by 2002:ae9:f70d:: with SMTP id s13mr4102875qkg.215.1599277687351; Fri, 04 Sep 2020 20:48:07 -0700 (PDT) MIME-Version: 1.0 References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> <20200905010510.GA26297@lonesome.com> In-Reply-To: From: Warner Losh Date: Fri, 4 Sep 2020 21:47:55 -0600 Message-ID: Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Kevin Bowling Cc: Mark Linimon , Andrew Gallatin , Alexey Dokuchaev , Michael Tuexen , Pedro Giffuni , Mateusz Guzik , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 4Bk0r82sDvz3YgP X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=RsO8fTTe; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::730) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.06 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.06)[-1.061]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.003]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-0.997]; RCPT_COUNT_SEVEN(0.00)[10]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::730:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[svn-src-all]; RCVD_COUNT_TWO(0.00)[2] X-Mailman-Approved-At: Sat, 05 Sep 2020 07:43:08 +0000 Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 03:48:09 -0000 On Fri, Sep 4, 2020, 9:11 PM Kevin Bowling wrote: > I disagree that the problem is intractable. It's just a decision and > it has a one time cost with long term benefits like paying off a high > interest loan. The intractability opinion seemed justifiable for a > long time but it's been proven false by other communities, > particularly Go and Rust and there is nothing syntactically special > about these languages that enable this; it's just a decision to make > the style fit an extant formatter. An arbitrary formater may leave a > little bit of annoyance to each person's taste, but that is a tiny > drop in the bucket compared to never having to discuss and especially > correct (which may /seem/ helpful but is pretty offputting to > newcomers). A tool does it, and it takes the wind out of any passive > aggressive bike shed opportunities from either maintainer or > contributor. It sucks that downstreams have to fall in line, but that > doesn't stop progress on any other major changes in FreeBSD. > How often are there really such bikesheds these days? I've seen no evidence of them in the hundreds of phab reviews I've seen. It is the ghost of the past when 10 or 15 years ago it was a big deal. Why bother creating yet another barrier to commits because we used to suck, but now have barely a rumble of bad behavior around it... Warner On Fri, Sep 4, 2020 at 7:57 PM Warner Losh wrote: > > > > On Fri, Sep 4, 2020, 7:05 PM Mark Linimon wrote: > > > > > On Fri, Sep 04, 2020 at 02:15:04PM -0400, Andrew Gallatin wrote: > > > > and I also anticipate it will cause problems with MFCs > > > > > > And existing PRs and DRs. > > > > > > > Or we could just not bother we these changes at all. It's a pipe dream we > > will ever be style(9) compliant in all our code, or that we can magically > > have a tool to enforce in new commits. We have better things to worry > > about. We should continue to ignore this non problem and for new users > > point them at the 95% correct format thing to run their submitted patches > > if they submit something too far out of whack. > > > > The last sweep deleted a boatload of blank lines that were in there on > > purpose. Not worth adding them back, but still annoying to no real > benefit. > > > > I just don't see the benefits at all of doing anything here. The few > > reviews that I've seen mention it seem to be the right level of effort. > > > > Warner > > > > > > > _______________________________________________ > > 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-unsubscribe@freebsd.org" > From owner-svn-src-all@freebsd.org Sat Sep 5 05:24:45 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 285523E0646 for ; Sat, 5 Sep 2020 05:24:45 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-yb1-xb44.google.com (mail-yb1-xb44.google.com [IPv6:2607:f8b0:4864:20::b44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bk2zc1C3Qz3fpd for ; Sat, 5 Sep 2020 05:24:43 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-yb1-xb44.google.com with SMTP id h20so5832015ybj.8 for ; Fri, 04 Sep 2020 22:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=dYK8OUnGSozYcfEz8ZRHFzXsCpBH6NoBS3wcXX9MvVw=; b=Xw7ZlhkRUqk8/Fo2d9VxNqFveXkaA4loQUIHsdbaF+wxENv7+U2Ppu9G+k5C9GLhjj RxTcDSSr8qXc9JJrXakrBhPrXYfhi6sHDt7SHi+OwDc/nZbms3m9UmWR3rtdxdaKrdFa qk+EIpRrvF5TgKXeLui6hIHdeTTtH6BlubPdY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=dYK8OUnGSozYcfEz8ZRHFzXsCpBH6NoBS3wcXX9MvVw=; b=Ce3whZh653ANU7Vl4ZFvrPvxxlzyluxDEVFSFRxwZJjsQ+xbph9AcoLpMjoO/xx10J KQcklmNLwgeUoi+9hEYhcLt5tmC6fKlLoarwXjjwjQlSSFA5dba8elScrZOmnlYLGHHJ +jMTbVtoLtWELoAc10cz5CuXNSoVI20/ItbfT9y9kegcO5Jxzz3fTUTjZ+yCHgFGk5tw 3Rfa8E9liqN1hXzA6/fqHXP73OixVfDdkb09nNb5PDutlb+ZeVY6jbUb6drLOh3TdHEM k0WvlVL3s2x3FNkGj1FWVd9buqoJKn3XCnI+pLsggf/t0JNZUVJDJ+g+SciFddWqq1qw BQdQ== X-Gm-Message-State: AOAM533W/sl7ysq/zVTigu089nteG3jAlS5gTBV5yspAAQa/1inriPm+ YhiNXJePRUUISk/RpK2NNhY0tCg/U3BQhOSPpDqDMQ== X-Google-Smtp-Source: ABdhPJxwODih74Y2iTHRSJYHInTD+F9IN2V0ZbWNv4wQvMVAGUkfT+l/3/fA2sURliqWGG5NPFWZp1KXArijo6KxhnQ= X-Received: by 2002:a25:a2c8:: with SMTP id c8mr14959488ybn.123.1599283482127; Fri, 04 Sep 2020 22:24:42 -0700 (PDT) MIME-Version: 1.0 References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> <20200905010510.GA26297@lonesome.com> In-Reply-To: From: Kevin Bowling Date: Fri, 4 Sep 2020 22:24:31 -0700 Message-ID: Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Warner Losh Cc: Mark Linimon , Andrew Gallatin , Alexey Dokuchaev , Michael Tuexen , Pedro Giffuni , Mateusz Guzik , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4Bk2zc1C3Qz3fpd X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none (invalid DKIM record) header.d=kev009.com header.s=google header.b=Xw7ZlhkR; dmarc=none; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2607:f8b0:4864:20::b44 as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com X-Spamd-Result: default: False [-2.73 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.06)[-1.055]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; NEURAL_HAM_LONG(-0.99)[-0.994]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[kev009.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[kev009.com:~]; NEURAL_HAM_SHORT(-0.38)[-0.378]; RCPT_COUNT_SEVEN(0.00)[10]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b44:from]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all] X-Mailman-Approved-At: Sat, 05 Sep 2020 07:43:24 +0000 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 05:24:45 -0000 It's happening right now, and a few times a year at minimum from my memory. Any time someone proposes a formatter they are thrown shade, so the lack of progress there isn't surprising since the current culture would require a flame proof suit to make progress. It's kind of tautological that the status quo doesn't bother long time contributors due to selection bias, and doesn't mean for instance the lack of modern tooling is not off putting to younger developers that learn new tools and wonder why we remain in the stone age. An example we are finally overcoming is the git migration. Must we drag our feet every opportunity given to modernize ourselves from the other popular open source OS, or can we make obvious decisions to get ahead of them? I think if you ask anyone under the age of 30 you will get a pretty unanimous desire for automatic formatting. On Fri, Sep 4, 2020 at 8:48 PM Warner Losh wrote: > > > > On Fri, Sep 4, 2020, 9:11 PM Kevin Bowling wro= te: >> >> I disagree that the problem is intractable. It's just a decision and >> it has a one time cost with long term benefits like paying off a high >> interest loan. The intractability opinion seemed justifiable for a >> long time but it's been proven false by other communities, >> particularly Go and Rust and there is nothing syntactically special >> about these languages that enable this; it's just a decision to make >> the style fit an extant formatter. An arbitrary formater may leave a >> little bit of annoyance to each person's taste, but that is a tiny >> drop in the bucket compared to never having to discuss and especially >> correct (which may /seem/ helpful but is pretty offputting to >> newcomers). A tool does it, and it takes the wind out of any passive >> aggressive bike shed opportunities from either maintainer or >> contributor. It sucks that downstreams have to fall in line, but that >> doesn't stop progress on any other major changes in FreeBSD. > > > How often are there really such bikesheds these days? I've seen no eviden= ce of them in the hundreds of phab reviews I've seen. It is the ghost of th= e past when 10 or 15 years ago it was a big deal. Why bother creating yet a= nother barrier to commits because we used to suck, but now have barely a ru= mble of bad behavior around it... > > Warner > >> On Fri, Sep 4, 2020 at 7:57 PM Warner Losh wrote: >> > >> > On Fri, Sep 4, 2020, 7:05 PM Mark Linimon wrote= : >> > >> > > On Fri, Sep 04, 2020 at 02:15:04PM -0400, Andrew Gallatin wrote: >> > > > and I also anticipate it will cause problems with MFCs >> > > > > >> > > And existing PRs and DRs. >> > > >> > >> > Or we could just not bother we these changes at all. It's a pipe dream= we >> > will ever be style(9) compliant in all our code, or that we can magica= lly >> > have a tool to enforce in new commits. We have better things to worry >> > about. We should continue to ignore this non problem and for new users >> > point them at the 95% correct format thing to run their submitted patc= hes >> > if they submit something too far out of whack. >> > >> > The last sweep deleted a boatload of blank lines that were in there on >> > purpose. Not worth adding them back, but still annoying to no real ben= efit. >> > >> > I just don't see the benefits at all of doing anything here. The few >> > reviews that I've seen mention it seem to be the right level of effort= . >> > >> > Warner >> > >> > > >> > _______________________________________________ >> > 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-unsubscribe@freebsd.org= " From owner-svn-src-all@freebsd.org Sat Sep 5 06:00:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7C6BD3E1051 for ; Sat, 5 Sep 2020 06:00:27 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-yb1-xb44.google.com (mail-yb1-xb44.google.com [IPv6:2607:f8b0:4864:20::b44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bk3mp3T4Qz3yY2 for ; Sat, 5 Sep 2020 06:00:26 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-yb1-xb44.google.com with SMTP id h206so5860485ybc.11 for ; Fri, 04 Sep 2020 23:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=wnrxLNSrKdeQ1Nfm998YqL6aMYMa7azpKgnHQSzzRpc=; b=qt4H49AU7f4zrRhhECE7r8XC8eD4+SWuewkcxw7M870OIQz6AqCXvm0PKRiAXFbDZw 3vkL4KiZVN2vCM3HhuuyHIUUcp4AgJAxr4ozhou3LZ9+7vLFMzlL5JHF4ILDdx1I+XMD w22k89sEJwbUQhdDFR+8qvOa6fykMlgo0n854= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=wnrxLNSrKdeQ1Nfm998YqL6aMYMa7azpKgnHQSzzRpc=; b=fMV14TvQl+yhiKYMaVau2/wj8nRSm/ZzXdVIbjOQEdJbblFIp1D5ojUqOF6FmN0Haj 0lw6crK9StvTR8toz6agMqHW1TiErc18U1Y43Qrr1f1w1Synfxnyw6QGUWsRjhXzXYGd QhcCkch2ZsSKr/cnyomKnp+sBW3q6lNM/I3XtbnOheWjT57IZ7TmIHdrwxTe/v0GZm1T 88nILfCMKsszBNqktX8T/9YQJQZrglmmGlwwZT9pa+X4KWAMncyqZ26rEQrVR9rbTZuF cPRrwspEmYD1aI2ayX8ZQlrJGHTIJJ8s5dMTCecspKQlBE53zsOdkPCAEjEkOf/aNlyk BUdg== X-Gm-Message-State: AOAM531tmrC35UdsTRD9wJ5pjdkOTkTEJ6BeTWS5AvB/MfNQgrn9QbUh tWFlVsjEFO06Y3GOTo5tlEdLtTuhiV1Q9g1BEJ8hyQ== X-Google-Smtp-Source: ABdhPJyoQ6gRFHr5zp7wNKqp/MJmfadN6x3NAtYz3CfMNHdgFJErQdqIhlDnpjFsRAklaWJ/tEf2kHmmfUlaOlVe+9o= X-Received: by 2002:a25:3403:: with SMTP id b3mr5782278yba.455.1599285625374; Fri, 04 Sep 2020 23:00:25 -0700 (PDT) MIME-Version: 1.0 References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> <20200905010510.GA26297@lonesome.com> In-Reply-To: From: Kevin Bowling Date: Fri, 4 Sep 2020 23:00:14 -0700 Message-ID: Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Warner Losh Cc: Mark Linimon , Andrew Gallatin , Alexey Dokuchaev , Michael Tuexen , Pedro Giffuni , Mateusz Guzik , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4Bk3mp3T4Qz3yY2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none (invalid DKIM record) header.d=kev009.com header.s=google header.b=qt4H49AU; dmarc=none; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2607:f8b0:4864:20::b44 as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com X-Spamd-Result: default: False [-2.73 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.06)[-1.055]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; NEURAL_HAM_LONG(-0.99)[-0.994]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[kev009.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[kev009.com:~]; NEURAL_HAM_SHORT(-0.38)[-0.379]; RCPT_COUNT_SEVEN(0.00)[10]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b44:from]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all] X-Mailman-Approved-At: Sat, 05 Sep 2020 07:43:40 +0000 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 06:00:27 -0000 On Fri, Sep 4, 2020 at 10:30 PM Warner Losh wrote: > > > > On Fri, Sep 4, 2020, 11:24 PM Kevin Bowling wr= ote: >> >> It's happening right now, and a few times a year at minimum from my >> memory. > > > Can I get a pointer? >From recent lossy memory, intel networking drivers (multiply), and the TCP stacks which are not very conforming. If click differential in phab and insert the query "style" you can see a lot of patches to fix things incrementally, as well as people commenting about it in review (usually respectfully as part of other review), or asking for people to break style changes out of behavior changes. > Warner > >> Any time someone proposes a formatter they are thrown shade, >> so the lack of progress there isn't surprising since the current >> culture would require a flame proof suit to make progress. It's kind >> of tautological that the status quo doesn't bother long time >> contributors due to selection bias, and doesn't mean for instance the >> lack of modern tooling is not off putting to younger developers that >> learn new tools and wonder why >> >> we remain in the stone age. An example >> we are finally overcoming is the git migration. Must we drag our feet >> every opportunity given to modernize ourselves from the other popular >> open source OS, or can we make obvious decisions to get ahead of them? >> I think if you ask anyone under the age of 30 you will get a pretty >> unanimous desire for automatic formatting. > > > Why strictly enforce anything is my point? It's one more thing to bounce = a commit for an issue that's about 30th on the list of problems. Why put a= ny energy at all into this when there is all cost and no benefit. Is this a common opinion? If people are this relaxed about it then I agree with you. > Warner > > Warner > >> On Fri, Sep 4, 2020 at 8:48 PM Warner Losh wrote: >> > >> > >> > >> > On Fri, Sep 4, 2020, 9:11 PM Kevin Bowling = wrote: >> >> >> >> I disagree that the problem is intractable. It's just a decision and >> >> it has a one time cost with long term benefits like paying off a high >> >> interest loan. The intractability opinion seemed justifiable for a >> >> long time but it's been proven false by other communities, >> >> particularly Go and Rust and there is nothing syntactically special >> >> about these languages that enable this; it's just a decision to make >> >> the style fit an extant formatter. An arbitrary formater may leave a >> >> little bit of annoyance to each person's taste, but that is a tiny >> >> drop in the bucket compared to never having to discuss and especially >> >> correct (which may /seem/ helpful but is pretty offputting to >> >> newcomers). A tool does it, and it takes the wind out of any passive >> >> aggressive bike shed opportunities from either maintainer or >> >> contributor. It sucks that downstreams have to fall in line, but tha= t >> >> doesn't stop progress on any other major changes in FreeBSD. >> > >> > >> > How often are there really such bikesheds these days? I've seen no evi= dence of them in the hundreds of phab reviews I've seen. It is the ghost of= the past when 10 or 15 years ago it was a big deal. Why bother creating ye= t another barrier to commits because we used to suck, but now have barely a= rumble of bad behavior around it... >> > >> > Warner >> > >> >> On Fri, Sep 4, 2020 at 7:57 PM Warner Losh wrote: >> >> > >> >> > On Fri, Sep 4, 2020, 7:05 PM Mark Linimon wr= ote: >> >> > >> >> > > On Fri, Sep 04, 2020 at 02:15:04PM -0400, Andrew Gallatin wrote: >> >> > > > and I also anticipate it will cause problems with MFCs >> >> > > >> > >> > >> >> > > And existing PRs and DRs. >> >> > > >> >> > >> >> > Or we could just not bother we these changes at all. It's a pipe dr= eam we >> >> > will ever be style(9) compliant in all our code, or that we can mag= ically >> >> > have a tool to enforce in new commits. We have better things to wor= ry >> >> > about. We should continue to ignore this non problem and for new us= ers >> >> > point them at the 95% correct format thing to run their submitted p= atches >> >> > if they submit something too far out of whack. >> >> > >> >> > The last sweep deleted a boatload of blank lines that were in there= on >> >> > purpose. Not worth adding them back, but still annoying to no real = benefit. >> >> > >> >> > I just don't see the benefits at all of doing anything here. The fe= w >> >> > reviews that I've seen mention it seem to be the right level of eff= ort. >> >> > >> >> > Warner >> >> > >> >> > > >> >> > _______________________________________________ >> >> > 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-unsubscribe@freebsd.= org" From owner-svn-src-all@freebsd.org Sat Sep 5 06:14:20 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DFEEE3E1AC6 for ; Sat, 5 Sep 2020 06:14:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bk44r1dMGz40yJ for ; Sat, 5 Sep 2020 06:14:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x831.google.com with SMTP id t20so6441059qtr.8 for ; Fri, 04 Sep 2020 23:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=GuTQkE3+vul2f0wyoFRTBQNCdP/zJBWrUq+H5x4nTs8=; b=P4xsVZn9gTSyZYuJ//5BsUi/JhSbdtmBGig/WPeJJOlVQvwwGFOq62LqPQ3j4oN6/f zN7xgEYoFjGzq9UZcNwG/l+0AbZbD76bgLdx/a0qLmEWIFP9zpMl42SLSx0IKfBuxLs9 B9YcnebqHLRkcJcNrxi3scNQRZ6cV72Kl/qG6ZLJUcHYg/4ms0m7WGRH/zHKxHfaBtB+ +Q2KOkJY8mf0bSO8W94RGP9xuRsdno1SJwTDuQev0gNnbV1RG91PCYm98ovunR6OfSNX Lg5hP2+jCGbS/L8wKVLjyQEsYLhx0A2d19j6pwvVZlsDBa9wryb/VjA5CqO1Dot7K9WH cB3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GuTQkE3+vul2f0wyoFRTBQNCdP/zJBWrUq+H5x4nTs8=; b=rk5f7gwQ4tIuLWTn7WPVt1ep/WfnfZi8qJSNOU4U+FnA1La/0YRAbKAy9YD47Tg6dr cdUZFU9EGKA7Lp8pWFxUZaBBULxnaXDyRwthMa/TevFdEQn4Z7Com+ds+KKG+uJfovat pVG+cLcHaz0wEV2TVVJwxwXFg66QkU/idshyEAAOF+9B0+pPeu55pQnSIv9ZEC1zIZ8r om4GHgeVN/QzTXcLpk6BCHXGNqiPzLpgs92Z59F944KWICj7RI15bGwsOEVcybGV73P3 CCXuKqQ+M4aPo/8b4L6BnJNt1lASzqXrbwVe2JDPtGvljPVGIdch9chalUZPF33R5LlB DW3w== X-Gm-Message-State: AOAM530e17ypX83REYroDMWD0gAeZ8aLP0663y68qNV0mCmEJmMS7fKj RL01w0HRpAy84yGwJVQnktDKPOFju+rWVJcnmRaJ/A== X-Google-Smtp-Source: ABdhPJzQFs09a7x2/WC2nyRVfVSq1JtGe+k/W8jcfL210wZtlpINSCNDHSEvQVkoPuv2Z9nw4hcXpA03eJG/cPJQrKY= X-Received: by 2002:ac8:3261:: with SMTP id y30mr12226940qta.242.1599286458468; Fri, 04 Sep 2020 23:14:18 -0700 (PDT) MIME-Version: 1.0 References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> <20200905010510.GA26297@lonesome.com> In-Reply-To: From: Warner Losh Date: Sat, 5 Sep 2020 00:14:07 -0600 Message-ID: Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Kevin Bowling Cc: Mark Linimon , Andrew Gallatin , Alexey Dokuchaev , Michael Tuexen , Pedro Giffuni , Mateusz Guzik , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4Bk44r1dMGz40yJ X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=P4xsVZn9; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::831) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.76 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.07)[-1.068]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.01)[-1.009]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.68)[-0.683]; RCPT_COUNT_SEVEN(0.00)[10]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::831:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[svn-src-all]; RCVD_COUNT_TWO(0.00)[2] X-Mailman-Approved-At: Sat, 05 Sep 2020 07:43:50 +0000 Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 06:14:20 -0000 On Sat, Sep 5, 2020 at 12:00 AM Kevin Bowling wrote: > On Fri, Sep 4, 2020 at 10:30 PM Warner Losh wrote: > > > > > > > > On Fri, Sep 4, 2020, 11:24 PM Kevin Bowling > wrote: > >> > >> It's happening right now, and a few times a year at minimum from my > >> memory. > > > > > > Can I get a pointer? > > From recent lossy memory, intel networking drivers (multiply), and the > TCP stacks which are not very conforming. If click differential in > phab and insert the query "style" you can see a lot of patches to fix > things incrementally, as well as people commenting about it in review > (usually respectfully as part of other review), or asking for people > to break style changes out of behavior changes. > None of that is passive aggressive maintainers blocking things over style issues. Asking people to fix style issues is a normal patch review. I see it in the half a dozen other projects I subscribe to in enough detail to see. All the times I've seen it appear to be normal and healthy. I get asked to do it myself at times. We fixed the social dysfunction years ago in the project that had lead to the near weekly style(9) passive aggressive outbursts. I just don't see the passive aggressive side of this at all these days. To be clear: I'm not opposed to creating a style(9) tool to format code. In fact, we have one. I'm not opposed to people using it on their own code. I just don't think the relatively large amount of churn it would take would warrant a full-sale run on the tree. Nor do I think it adds enough value to be part of a pre-commit review process, especially given the strong culture of 'the file's style is more important.' And the issues in the TCP stacks I think proves the point. The style isn't super strict about style(9) yet conforms in spirit and is still easy to read for people that have read the rest of the kernel. Bulk reformatting that would be an even bigger mistake because it's still being actively developed and throwing a wrench into those efforts would negate a lot of the good will that FreeBSD has at Netflix. And that's not to mention all the other down streams that would have even more trouble rebasing their changes forward in our tree. So against those very tangible costs, the benefit is what exactly? I'm just not seeing any real ROI to enforcing that when we can't even go a week w/o at least one build breakage it seems and our performance is all over the map due to a very real lack of on-going horizontal regression testing. I think there's other, bigger fish to try than this one, that's all. Warner > > Warner > > > >> Any time someone proposes a formatter they are thrown shade, > >> so the lack of progress there isn't surprising since the current > >> culture would require a flame proof suit to make progress. It's kind > >> of tautological that the status quo doesn't bother long time > >> contributors due to selection bias, and doesn't mean for instance the > >> lack of modern tooling is not off putting to younger developers that > >> learn new tools and wonder why > >> > >> we remain in the stone age. An example > >> we are finally overcoming is the git migration. Must we drag our feet > >> every opportunity given to modernize ourselves from the other popular > >> open source OS, or can we make obvious decisions to get ahead of them? > >> I think if you ask anyone under the age of 30 you will get a pretty > >> unanimous desire for automatic formatting. > > > > > > Why strictly enforce anything is my point? It's one more thing to bounce > a commit for an issue that's about 30th on the list of problems. Why put > any energy at all into this when there is all cost and no benefit. > > Is this a common opinion? If people are this relaxed about it then I > agree with you. > > > Warner > > > > Warner > > > >> On Fri, Sep 4, 2020 at 8:48 PM Warner Losh wrote: > >> > > >> > > >> > > >> > On Fri, Sep 4, 2020, 9:11 PM Kevin Bowling > wrote: > >> >> > >> >> I disagree that the problem is intractable. It's just a decision and > >> >> it has a one time cost with long term benefits like paying off a high > >> >> interest loan. The intractability opinion seemed justifiable for a > >> >> long time but it's been proven false by other communities, > >> >> particularly Go and Rust and there is nothing syntactically special > >> >> about these languages that enable this; it's just a decision to make > >> >> the style fit an extant formatter. An arbitrary formater may leave a > >> >> little bit of annoyance to each person's taste, but that is a tiny > >> >> drop in the bucket compared to never having to discuss and especially > >> >> correct (which may /seem/ helpful but is pretty offputting to > >> >> newcomers). A tool does it, and it takes the wind out of any passive > >> >> aggressive bike shed opportunities from either maintainer or > >> >> contributor. It sucks that downstreams have to fall in line, but > that > >> >> doesn't stop progress on any other major changes in FreeBSD. > >> > > >> > > >> > How often are there really such bikesheds these days? I've seen no > evidence of them in the hundreds of phab reviews I've seen. It is the ghost > of the past when 10 or 15 years ago it was a big deal. Why bother creating > yet another barrier to commits because we used to suck, but now have barely > a rumble of bad behavior around it... > >> > > >> > Warner > >> > > >> >> On Fri, Sep 4, 2020 at 7:57 PM Warner Losh wrote: > >> >> > > >> >> > On Fri, Sep 4, 2020, 7:05 PM Mark Linimon > wrote: > >> >> > > >> >> > > On Fri, Sep 04, 2020 at 02:15:04PM -0400, Andrew Gallatin wrote: > >> >> > > > and I also anticipate it will cause problems with MFCs > >> >> > > > >> > > >> > > >> >> > > And existing PRs and DRs. > >> >> > > > >> >> > > >> >> > Or we could just not bother we these changes at all. It's a pipe > dream we > >> >> > will ever be style(9) compliant in all our code, or that we can > magically > >> >> > have a tool to enforce in new commits. We have better things to > worry > >> >> > about. We should continue to ignore this non problem and for new > users > >> >> > point them at the 95% correct format thing to run their submitted > patches > >> >> > if they submit something too far out of whack. > >> >> > > >> >> > The last sweep deleted a boatload of blank lines that were in > there on > >> >> > purpose. Not worth adding them back, but still annoying to no real > benefit. > >> >> > > >> >> > I just don't see the benefits at all of doing anything here. The > few > >> >> > reviews that I've seen mention it seem to be the right level of > effort. > >> >> > > >> >> > Warner > >> >> > > >> >> > > > >> >> > _______________________________________________ > >> >> > 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-unsubscribe@freebsd.org" > From owner-svn-src-all@freebsd.org Sat Sep 5 10:12:11 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BD1EB3E76DA; Sat, 5 Sep 2020 10:12:11 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bk9MG4Gsjz4HLY; Sat, 5 Sep 2020 10:12:10 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCC1D1C606; Sat, 5 Sep 2020 10:12:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085AC7aB090212; Sat, 5 Sep 2020 10:12:07 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085AC74O090209; Sat, 5 Sep 2020 10:12:07 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202009051012.085AC74O090209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 5 Sep 2020 10:12:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365359 - in stable/12/sys: kern sys X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/12/sys: kern sys X-SVN-Commit-Revision: 365359 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 10:12:12 -0000 Author: kib Date: Sat Sep 5 10:12:06 2020 New Revision: 365359 URL: https://svnweb.freebsd.org/changeset/base/365359 Log: MFC r361967 (by mjg), r362910 (by mjg), r364495: Fix several issues with process group orphanage. Modified: stable/12/sys/kern/kern_exit.c stable/12/sys/kern/kern_proc.c stable/12/sys/sys/proc.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/kern_exit.c ============================================================================== --- stable/12/sys/kern/kern_exit.c Sat Sep 5 04:20:29 2020 (r365358) +++ stable/12/sys/kern/kern_exit.c Sat Sep 5 10:12:06 2020 (r365359) @@ -394,7 +394,6 @@ exit1(struct thread *td, int rval, int signo) } vmspace_exit(td); - killjobc(); (void)acct_process(td); #ifdef KTRACE @@ -440,6 +439,12 @@ exit1(struct thread *td, int rval, int signo) PROC_LOCK(p); p->p_flag &= ~(P_TRACED | P_PPWAIT | P_PPTRACE); PROC_UNLOCK(p); + + /* + * killjobc() might drop and re-acquire proctree_lock to + * revoke control tty if exiting process was a session leader. + */ + killjobc(); /* * Reparent all children processes: Modified: stable/12/sys/kern/kern_proc.c ============================================================================== --- stable/12/sys/kern/kern_proc.c Sat Sep 5 04:20:29 2020 (r365358) +++ stable/12/sys/kern/kern_proc.c Sat Sep 5 10:12:06 2020 (r365359) @@ -108,13 +108,14 @@ MALLOC_DEFINE(M_SESSION, "session", "session header"); static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); MALLOC_DEFINE(M_SUBPROC, "subproc", "Proc sub-structures"); +static void fixjobc_enterpgrp(struct proc *p, struct pgrp *pgrp); static void doenterpgrp(struct proc *, struct pgrp *); static void orphanpg(struct pgrp *pg); static void fill_kinfo_aggregate(struct proc *p, struct kinfo_proc *kp); static void fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp); static void fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp, int preferthread); -static void pgadjustjobc(struct pgrp *pgrp, int entering); +static void pgadjustjobc(struct pgrp *pgrp, bool entering); static void pgdelete(struct pgrp *); static int proc_ctor(void *mem, int size, void *arg, int flags); static void proc_dtor(void *mem, int size, void *arg); @@ -545,6 +546,43 @@ enterthispgrp(struct proc *p, struct pgrp *pgrp) } /* + * If true, any child of q which belongs to group pgrp, qualifies the + * process group pgrp as not orphaned. + */ +static bool +isjobproc(struct proc *q, struct pgrp *pgrp) +{ + sx_assert(&proctree_lock, SX_LOCKED); + return (q->p_pgrp != pgrp && + q->p_pgrp->pg_session == pgrp->pg_session); +} + +#ifdef INVARIANTS +static void +check_pgrp_jobc(struct pgrp *pgrp) +{ + struct proc *q; + int cnt; + + sx_assert(&proctree_lock, SX_LOCKED); + PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED); + + cnt = 0; + PGRP_LOCK(pgrp); + LIST_FOREACH(q, &pgrp->pg_members, p_pglist) { + if ((q->p_treeflag & P_TREE_GRPEXITED) != 0 || + q->p_pptr == NULL) + continue; + if (isjobproc(q->p_pptr, pgrp)) + cnt++; + } + KASSERT(pgrp->pg_jobc == cnt, ("pgrp %d %p pg_jobc %d cnt %d", + pgrp->pg_id, pgrp, pgrp->pg_jobc, cnt)); + PGRP_UNLOCK(pgrp); +} +#endif + +/* * Move p to a process group */ static void @@ -560,13 +598,15 @@ doenterpgrp(struct proc *p, struct pgrp *pgrp) savepgrp = p->p_pgrp; +#ifdef INVARIANTS + check_pgrp_jobc(pgrp); + check_pgrp_jobc(savepgrp); +#endif + /* * Adjust eligibility of affected pgrps to participate in job control. - * Increment eligibility counts before decrementing, otherwise we - * could reach 0 spuriously during the first call. */ - fixjobc(p, pgrp, 1); - fixjobc(p, p->p_pgrp, 0); + fixjobc_enterpgrp(p, pgrp); PGRP_LOCK(pgrp); PGRP_LOCK(savepgrp); @@ -639,13 +679,15 @@ pgdelete(struct pgrp *pgrp) } static void -pgadjustjobc(struct pgrp *pgrp, int entering) +pgadjustjobc(struct pgrp *pgrp, bool entering) { PGRP_LOCK(pgrp); - if (entering) + if (entering) { + MPASS(pgrp->pg_jobc >= 0); pgrp->pg_jobc++; - else { + } else { + MPASS(pgrp->pg_jobc > 0); --pgrp->pg_jobc; if (pgrp->pg_jobc == 0) orphanpg(pgrp); @@ -660,43 +702,95 @@ pgadjustjobc(struct pgrp *pgrp, int entering) * process group of the same session). If that count reaches zero, the * process group becomes orphaned. Check both the specified process' * process group and that of its children. - * entering == 0 => p is leaving specified group. - * entering == 1 => p is entering specified group. + * We increment eligibility counts before decrementing, otherwise we + * could reach 0 spuriously during the decrement. */ -void -fixjobc(struct proc *p, struct pgrp *pgrp, int entering) +static void +fixjobc_enterpgrp(struct proc *p, struct pgrp *pgrp) { - struct pgrp *hispgrp; - struct session *mysession; struct proc *q; + struct pgrp *childpgrp; + bool future_jobc; sx_assert(&proctree_lock, SX_LOCKED); PROC_LOCK_ASSERT(p, MA_NOTOWNED); PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED); SESS_LOCK_ASSERT(pgrp->pg_session, MA_NOTOWNED); + if (p->p_pgrp == pgrp) + return; + + if (isjobproc(p->p_pptr, pgrp)) + pgadjustjobc(pgrp, true); + LIST_FOREACH(q, &p->p_children, p_sibling) { + if ((q->p_treeflag & P_TREE_GRPEXITED) != 0) + continue; + childpgrp = q->p_pgrp; + future_jobc = childpgrp != pgrp && + childpgrp->pg_session == pgrp->pg_session; + if (!isjobproc(p, childpgrp) && future_jobc) + pgadjustjobc(childpgrp, true); + } + + if (isjobproc(p->p_pptr, p->p_pgrp)) + pgadjustjobc(p->p_pgrp, false); + LIST_FOREACH(q, &p->p_children, p_sibling) { + if ((q->p_treeflag & P_TREE_GRPEXITED) != 0) + continue; + childpgrp = q->p_pgrp; + future_jobc = childpgrp != pgrp && + childpgrp->pg_session == pgrp->pg_session; + if (isjobproc(p, childpgrp) && !future_jobc) + pgadjustjobc(childpgrp, false); + } +} + +static void +fixjobc_kill(struct proc *p) +{ + struct proc *q; + struct pgrp *childpgrp, *pgrp; + + sx_assert(&proctree_lock, SX_LOCKED); + PROC_LOCK_ASSERT(p, MA_NOTOWNED); + pgrp = p->p_pgrp; + PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED); + SESS_LOCK_ASSERT(pgrp->pg_session, MA_NOTOWNED); + /* + * p no longer affects process group orphanage for children. + * It is marked by the flag because p is only physically + * removed from its process group on wait(2). + */ + p->p_treeflag |= P_TREE_GRPEXITED; + + /* * Check p's parent to see whether p qualifies its own process * group; if so, adjust count for p's process group. */ - mysession = pgrp->pg_session; - if ((hispgrp = p->p_pptr->p_pgrp) != pgrp && - hispgrp->pg_session == mysession) - pgadjustjobc(pgrp, entering); + if (isjobproc(p->p_pptr, pgrp)) + pgadjustjobc(pgrp, false); /* * Check this process' children to see whether they qualify - * their process groups; if so, adjust counts for children's - * process groups. + * their process groups after reparenting to reaper. If so, + * adjust counts for children's process groups. */ LIST_FOREACH(q, &p->p_children, p_sibling) { - hispgrp = q->p_pgrp; - if (hispgrp == pgrp || - hispgrp->pg_session != mysession) + if ((q->p_treeflag & P_TREE_GRPEXITED) != 0) continue; - if (q->p_state == PRS_ZOMBIE) + childpgrp = q->p_pgrp; + if (isjobproc(q->p_reaper, childpgrp) && + !isjobproc(p, childpgrp)) + pgadjustjobc(childpgrp, true); + } + LIST_FOREACH(q, &p->p_children, p_sibling) { + if ((q->p_treeflag & P_TREE_GRPEXITED) != 0) continue; - pgadjustjobc(hispgrp, entering); + childpgrp = q->p_pgrp; + if (!isjobproc(q->p_reaper, childpgrp) && + isjobproc(p, childpgrp)) + pgadjustjobc(childpgrp, false); } } @@ -710,20 +804,8 @@ killjobc(void) p = curproc; MPASS(p->p_flag & P_WEXIT); - /* - * Do a quick check to see if there is anything to do with the - * proctree_lock held. pgrp and LIST_EMPTY checks are for fixjobc(). - */ - PROC_LOCK(p); - if (!SESS_LEADER(p) && - (p->p_pgrp == p->p_pptr->p_pgrp) && - LIST_EMPTY(&p->p_children)) { - PROC_UNLOCK(p); - return; - } - PROC_UNLOCK(p); + sx_assert(&proctree_lock, SX_LOCKED); - sx_xlock(&proctree_lock); if (SESS_LEADER(p)) { sp = p->p_session; @@ -769,8 +851,7 @@ killjobc(void) sx_xlock(&proctree_lock); } } - fixjobc(p, p->p_pgrp, 0); - sx_xunlock(&proctree_lock); + fixjobc_kill(p); } /* Modified: stable/12/sys/sys/proc.h ============================================================================== --- stable/12/sys/sys/proc.h Sat Sep 5 04:20:29 2020 (r365358) +++ stable/12/sys/sys/proc.h Sat Sep 5 10:12:06 2020 (r365359) @@ -774,6 +774,7 @@ struct proc { #define P_TREE_FIRST_ORPHAN 0x00000002 /* First element of orphan list */ #define P_TREE_REAPER 0x00000004 /* Reaper of subtree */ +#define P_TREE_GRPEXITED 0x00000008 /* exit1() done with job ctl */ /* * These were process status values (p_stat), now they are only used in @@ -1036,7 +1037,6 @@ int enterpgrp(struct proc *p, pid_t pgid, struct pgrp struct session *sess); int enterthispgrp(struct proc *p, struct pgrp *pgrp); void faultin(struct proc *p); -void fixjobc(struct proc *p, struct pgrp *pgrp, int entering); int fork1(struct thread *, struct fork_req *); void fork_exit(void (*)(void *, struct trapframe *), void *, struct trapframe *); From owner-svn-src-all@freebsd.org Sat Sep 5 10:16:25 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 267FE3E79C1; Sat, 5 Sep 2020 10:16:25 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bk9S908Ymz4K6Z; Sat, 5 Sep 2020 10:16:25 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCAA51C60B; Sat, 5 Sep 2020 10:16:24 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085AGOIP091406; Sat, 5 Sep 2020 10:16:24 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085AGOU7091405; Sat, 5 Sep 2020 10:16:24 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202009051016.085AGOU7091405@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 5 Sep 2020 10:16:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365360 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 365360 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 10:16:25 -0000 Author: kib Date: Sat Sep 5 10:16:24 2020 New Revision: 365360 URL: https://svnweb.freebsd.org/changeset/base/365360 Log: rtld: Handle ELF dso with program headers outside the first page. Reported by: Alex Arslan PR: 229708 Reviewed by: dim (previous version), emaste Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D26323 Modified: head/libexec/rtld-elf/map_object.c Modified: head/libexec/rtld-elf/map_object.c ============================================================================== --- head/libexec/rtld-elf/map_object.c Sat Sep 5 10:12:06 2020 (r365359) +++ head/libexec/rtld-elf/map_object.c Sat Sep 5 10:16:24 2020 (r365360) @@ -40,11 +40,19 @@ #include "debug.h" #include "rtld.h" -static Elf_Ehdr *get_elf_header(int, const char *, const struct stat *); +static Elf_Ehdr *get_elf_header(int, const char *, const struct stat *, + Elf_Phdr **phdr); static int convert_flags(int); /* Elf flags -> mmap flags */ int __getosreldate(void); +static bool +phdr_in_zero_page(const Elf_Ehdr *hdr) +{ + return (hdr->e_phoff + hdr->e_phnum * sizeof(Elf_Phdr) < + (size_t)PAGE_SIZE); +} + /* * Map a shared object into memory. The "fd" argument is a file descriptor, * which must be open on the object and positioned at its beginning. @@ -95,17 +103,15 @@ map_object(int fd, const char *path, const struct stat size_t note_map_len; Elf_Addr text_end; - hdr = get_elf_header(fd, path, sb); + hdr = get_elf_header(fd, path, sb, &phdr); if (hdr == NULL) return (NULL); /* * Scan the program header entries, and save key information. - * * We expect that the loadable segments are ordered by load address. */ - phdr = (Elf_Phdr *)((char *)hdr + hdr->e_phoff); - phsize = hdr->e_phnum * sizeof (phdr[0]); + phsize = hdr->e_phnum * sizeof(phdr[0]); phlimit = phdr + hdr->e_phnum; nsegs = -1; phdyn = phinterp = phtls = NULL; @@ -332,14 +338,18 @@ error1: error: if (note_map != NULL && note_map != MAP_FAILED) munmap(note_map, note_map_len); + if (!phdr_in_zero_page(hdr)) + munmap(phdr, hdr->e_phnum * sizeof(phdr[0])); munmap(hdr, PAGE_SIZE); return (NULL); } static Elf_Ehdr * -get_elf_header(int fd, const char *path, const struct stat *sbp) +get_elf_header(int fd, const char *path, const struct stat *sbp, + Elf_Phdr **phdr_p) { Elf_Ehdr *hdr; + Elf_Phdr *phdr; /* Make sure file has enough data for the ELF header */ if (sbp != NULL && sbp->st_size < (off_t)sizeof(Elf_Ehdr)) { @@ -388,11 +398,19 @@ get_elf_header(int fd, const char *path, const struct "%s: invalid shared object: e_phentsize != sizeof(Elf_Phdr)", path); goto error; } - if (hdr->e_phoff + hdr->e_phnum * sizeof(Elf_Phdr) > - (size_t)PAGE_SIZE) { - _rtld_error("%s: program header too large", path); - goto error; + if (phdr_in_zero_page(hdr)) { + phdr = (Elf_Phdr *)((char *)hdr + hdr->e_phoff); + } else { + phdr = mmap(NULL, hdr->e_phnum * sizeof(phdr[0]), + PROT_READ, MAP_PRIVATE | MAP_PREFAULT_READ, fd, + hdr->e_phoff); + if (phdr == MAP_FAILED) { + _rtld_error("%s: error mapping phdr: %s", path, + rtld_strerror(errno)); + goto error; + } } + *phdr_p = phdr; return (hdr); error: From owner-svn-src-all@freebsd.org Sat Sep 5 13:17:54 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8FE403CC46C for ; Sat, 5 Sep 2020 13:17:54 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkFTY5ph9z4Rw4 for ; Sat, 5 Sep 2020 13:17:53 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wm1-f66.google.com with SMTP id e11so9256531wme.0 for ; Sat, 05 Sep 2020 06:17:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=fFIbdEijWefVUxPUFO4N2WJriomG3W/YYRfU4DEDRAQ=; b=TgYmt11UmVSoeW/4T4IJc3ZhJX18XaNpi4mLU8yqK1MgOWvm7OCmV1SFfhEDaaJpd+ uPkkbeDjJ5LKlLtXVwjnfSigjCk0tAwlEEi8UpRIiMxp3XY8fQxGHVqc1GA8JUHz8711 3siNQCmgcAIFa3VEhF67BpgSu5xAn9yp6pj1Wwv80ezoyesPKwCfo09/qSAzYR6YqHyl JecY5jqaFpH1kxzg+JgALrMS4o/5pQKuzBWxilDdPLyB06xshyyfjiE04oe7jZocbKHv r2LyBePDUKZMGDyhrLBKhnLZEQ/844Z4/QzIcJjgEyitoMg7Y1MqBoBygbvcqz/f0yQm cvJg== X-Gm-Message-State: AOAM5324QWbkCuAe3lXAcndC1pBXHcpnlRX+wxwlDVljrr6MJ3lH/4jU Z8pcMdj3RujseymYcdhQnuRQoA== X-Google-Smtp-Source: ABdhPJxBV0RhbrQrsz7ZslO/JzKY3TXGzMi4aFhpNS0X9qAJTvFwZDLeqJut7AZbi5eKfVFnnP79JA== X-Received: by 2002:a1c:3886:: with SMTP id f128mr12193792wma.121.1599311872036; Sat, 05 Sep 2020 06:17:52 -0700 (PDT) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id k22sm17940076wrd.29.2020.09.05.06.17.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Sep 2020 06:17:51 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: svn commit: r365326 - stable/12/sys/sys From: Jessica Clarke In-Reply-To: Date: Sat, 5 Sep 2020 14:17:49 +0100 Cc: Marcin Wojtas , src-committers , svn-src-all , svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <959A8958-54E7-4721-AEBD-C9FC71C0BA06@freebsd.org> References: <202009041122.084BMIYn040628@repo.freebsd.org> <20200904130946.GG94807@kib.kiev.ua> To: Konstantin Belousov X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Rspamd-Queue-Id: 4BkFTY5ph9z4Rw4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-2.32 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.76)[-0.764]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.03)[-1.033]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.02)[-1.023]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.66:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.66:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 13:17:54 -0000 On 4 Sep 2020, at 14:36, Jessica Clarke wrote: > On 4 Sep 2020, at 14:09, Konstantin Belousov = wrote: >> On Fri, Sep 04, 2020 at 11:22:18AM +0000, Marcin Wojtas wrote: >>> Author: mw >>> Date: Fri Sep 4 11:22:18 2020 >>> New Revision: 365326 >>> URL: https://svnweb.freebsd.org/changeset/base/365326 >>>=20 >>> Log: >>> MFC: r346593 >>>=20 >>> Add barrier in buf ring peek function to prevent race in ARM and = ARM64. >>>=20 >>> Obtained from: Semihalf >>> Sponsored by: Amazon, Inc. >>>=20 >>> Modified: >>> stable/12/sys/sys/buf_ring.h >>> Directory Properties: >>> stable/12/ (props changed) >>>=20 >>> Modified: stable/12/sys/sys/buf_ring.h >>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> --- stable/12/sys/sys/buf_ring.h Fri Sep 4 04:31:56 2020 = (r365325) >>> +++ stable/12/sys/sys/buf_ring.h Fri Sep 4 11:22:18 2020 = (r365326) >>> @@ -310,14 +310,23 @@ buf_ring_peek_clear_sc(struct buf_ring *br) >>> if (!mtx_owned(br->br_lock)) >>> panic("lock not held on single consumer dequeue"); >>> #endif=09 >>> - /* >>> - * I believe it is safe to not have a memory barrier >>> - * here because we control cons and tail is worst case >>> - * a lagging indicator so we worst case we might >>> - * return NULL immediately after a buffer has been enqueued >>> - */ >>> + >>> if (br->br_cons_head =3D=3D br->br_prod_tail) >>> return (NULL); >>> + >>> +#if defined(__arm__) || defined(__aarch64__) >>> + /* >>> + * The barrier is required there on ARM and ARM64 to ensure, = that >>> + * br->br_ring[br->br_cons_head] will not be fetched before the = above >>> + * condition is checked. >>> + * Without the barrier, it is possible, that buffer will be = fetched >>> + * before the enqueue will put mbuf into br, then, in the = meantime, the >>> + * enqueue will update the array and the br_prod_tail, and the >>> + * conditional check will be true, so we will return previously = fetched >>> + * (and invalid) buffer. >>> + */ >>> + atomic_thread_fence_acq(); >>> +#endif >>=20 >> Putting the semantic of the change aside, why did you added the fence = (it is >> a fence, not barrier as stated in the comment) only to arm* ? If it = is >> needed, it is needed for all arches. >=20 > Agreed. The code looks fine, though I would have made it an acquire > load of br_prod_tail myself to be able to take advantage load-acquire > instructions when present, and better document what the exact issue = is. > I also don't think the comment needs to be quite so extensive > (especially since atomic_load_acq_32 is somewhat self-documenting in > terms of one half of the race); if we had a comment like this for = every > fence in the kernel we'd never get anything done. >=20 > There's also an ARM-specific fence in buf_ring_dequeue_sc: >=20 >> /* >> * This is a workaround to allow using buf_ring on ARM and = ARM64. >> * ARM64TODO: Fix buf_ring in a generic way. >> * REMARKS: It is suspected that br_cons_head does not require >> * load_acq operation, but this change was extensively tested >> * and confirmed it's working. To be reviewed once again in >> * FreeBSD-12. >> * >> * Preventing following situation: >>=20 >> * Core(0) - buf_ring_enqueue() = Core(1) - buf_ring_dequeue_sc() >> * ----------------------------------------- = ---------------------------------------------- >> * >> * = cons_head =3D br->br_cons_head; >> * atomic_cmpset_acq_32(&br->br_prod_head, ...)); >> * = buf =3D br->br_ring[cons_head]; > >> * br->br_ring[prod_head] =3D buf; >> * atomic_store_rel_32(&br->br_prod_tail, ...); >> * = prod_tail =3D br->br_prod_tail; >> * = if (cons_head =3D=3D prod_tail)=20 >> * = return (NULL); >> * = `=09 >> * >> * <1> Load (on core 1) from br->br_ring[cons_head] can be = reordered (speculative readed) by CPU. >> */=09 >> #if defined(__arm__) || defined(__aarch64__) >> cons_head =3D atomic_load_acq_32(&br->br_cons_head); >> #else >> cons_head =3D br->br_cons_head; >> #endif >> prod_tail =3D atomic_load_acq_32(&br->br_prod_tail); >=20 >=20 > The comment is completely correct that the ARM-specific fence is a > waste of time. It's the single-consumer path, so such fences are just > synchronising with the current thread and thus pointless. The = important > one is the load-acquire of br_prod_tail, as has been discovered (sort > of) in the peek case leading to this comment, which already stops the > reordering in question. Fixes filed as https://reviews.freebsd.org/D26336 for those interested. Jess From owner-svn-src-all@freebsd.org Sat Sep 5 16:11:07 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 03A683CF9B3; Sat, 5 Sep 2020 16:11:07 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkKKQ5vC8z4b5c; Sat, 5 Sep 2020 16:11:06 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD3642026B; Sat, 5 Sep 2020 16:11:06 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085GB6cI007372; Sat, 5 Sep 2020 16:11:06 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085GB5gx007365; Sat, 5 Sep 2020 16:11:05 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <202009051611.085GB5gx007365@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sat, 5 Sep 2020 16:11:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r365361 - in vendor/NetBSD/bmake/dist: . lst.lib mk mk/sys unit-tests X-SVN-Group: vendor X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: in vendor/NetBSD/bmake/dist: . lst.lib mk mk/sys unit-tests X-SVN-Commit-Revision: 365361 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 16:11:07 -0000 Author: sjg Date: Sat Sep 5 16:11:04 2020 New Revision: 365361 URL: https://svnweb.freebsd.org/changeset/base/365361 Log: Import bmake-20200902 Lots of code refactoring, simplification and cleanup. Lots of new unit-tests providing much higher code coverage. All courtesy of rillig at netbsd. Other significant changes: o new read-only variable .SHELL which provides the path of the shell used to run scripts (as defined by the .SHELL target). o new debug option -dl: LINT mode, does the equivalent of := for all variable assignments so that file and line number are reported for variable parse errors. Added: vendor/NetBSD/bmake/dist/enum.c (contents, props changed) vendor/NetBSD/bmake/dist/enum.h (contents, props changed) vendor/NetBSD/bmake/dist/lst.c (contents, props changed) vendor/NetBSD/bmake/dist/mk/dirdeps-cache-update.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/archive-suffix.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/archive-suffix.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/archive.exp vendor/NetBSD/bmake/dist/unit-tests/archive.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cmd-interrupt.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cmd-interrupt.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cmdline.exp vendor/NetBSD/bmake/dist/unit-tests/cmdline.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-eq.exp vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-eq.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ge.exp vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ge.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-gt.exp vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-gt.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-le.exp vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-le.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-lt.exp vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-lt.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ne.exp vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ne.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric.exp vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-string.exp vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-string.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-func-commands.exp vendor/NetBSD/bmake/dist/unit-tests/cond-func-commands.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-func-defined.exp vendor/NetBSD/bmake/dist/unit-tests/cond-func-defined.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-func-empty.exp vendor/NetBSD/bmake/dist/unit-tests/cond-func-empty.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-func-exists.exp vendor/NetBSD/bmake/dist/unit-tests/cond-func-exists.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-func-make.exp vendor/NetBSD/bmake/dist/unit-tests/cond-func-make.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-func-target.exp vendor/NetBSD/bmake/dist/unit-tests/cond-func-target.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-func.exp vendor/NetBSD/bmake/dist/unit-tests/cond-func.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-op-and.exp vendor/NetBSD/bmake/dist/unit-tests/cond-op-and.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-op-not.exp vendor/NetBSD/bmake/dist/unit-tests/cond-op-not.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-op-or.exp vendor/NetBSD/bmake/dist/unit-tests/cond-op-or.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-op-parentheses.exp vendor/NetBSD/bmake/dist/unit-tests/cond-op-parentheses.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-op.exp vendor/NetBSD/bmake/dist/unit-tests/cond-op.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-token-number.exp vendor/NetBSD/bmake/dist/unit-tests/cond-token-number.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-token-plain.exp vendor/NetBSD/bmake/dist/unit-tests/cond-token-plain.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-token-string.exp vendor/NetBSD/bmake/dist/unit-tests/cond-token-string.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/cond-token-var.exp vendor/NetBSD/bmake/dist/unit-tests/cond-token-var.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/counter.exp vendor/NetBSD/bmake/dist/unit-tests/counter.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dep-colon.exp vendor/NetBSD/bmake/dist/unit-tests/dep-colon.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dep-double-colon.exp vendor/NetBSD/bmake/dist/unit-tests/dep-double-colon.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dep-exclam.exp vendor/NetBSD/bmake/dist/unit-tests/dep-exclam.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dep-none.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dep-none.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dep-var.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dep-var.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dep-wildcards.exp vendor/NetBSD/bmake/dist/unit-tests/dep-wildcards.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dep.exp vendor/NetBSD/bmake/dist/unit-tests/dep.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-exec.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-exec.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-ignore.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-ignore.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-made.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-made.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-make.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-make.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-meta.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-meta.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa_cmp.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa_cmp.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-nopath.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-nopath.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-notmain.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-notmain.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-optional.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-optional.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-phony.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-phony.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-precious.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-precious.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-recursive.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-recursive.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-silent.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-silent.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-use.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-use.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore-double-colon.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore-double-colon.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc-wait.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc-wait.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/depsrc.exp vendor/NetBSD/bmake/dist/unit-tests/depsrc.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-begin.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-begin.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-default.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-default.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-delete_on_error.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-delete_on_error.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-end.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-end.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-error.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-error.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-ignore.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-ignore.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-interrupt.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-interrupt.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-main.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-main.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-makeflags.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-makeflags.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-no_parallel.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-no_parallel.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-nopath.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-nopath.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-notparallel.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-notparallel.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-objdir.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-objdir.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-order.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-order.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-path-suffix.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-path-suffix.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-path.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-path.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-phony.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-phony.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-precious.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-precious.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-shell.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-shell.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-silent.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-silent.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-stale.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-stale.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt-suffixes.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt-suffixes.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/deptgt.exp vendor/NetBSD/bmake/dist/unit-tests/deptgt.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dir-expand-path.exp vendor/NetBSD/bmake/dist/unit-tests/dir-expand-path.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/dir.exp vendor/NetBSD/bmake/dist/unit-tests/dir.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-elif.exp vendor/NetBSD/bmake/dist/unit-tests/directive-elif.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-elifdef.exp vendor/NetBSD/bmake/dist/unit-tests/directive-elifdef.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-elifmake.exp vendor/NetBSD/bmake/dist/unit-tests/directive-elifmake.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-elifndef.exp vendor/NetBSD/bmake/dist/unit-tests/directive-elifndef.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-elifnmake.exp vendor/NetBSD/bmake/dist/unit-tests/directive-elifnmake.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-else.exp vendor/NetBSD/bmake/dist/unit-tests/directive-else.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-endif.exp vendor/NetBSD/bmake/dist/unit-tests/directive-endif.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-error.exp vendor/NetBSD/bmake/dist/unit-tests/directive-error.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-export-env.exp vendor/NetBSD/bmake/dist/unit-tests/directive-export-env.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-export-literal.exp vendor/NetBSD/bmake/dist/unit-tests/directive-export-literal.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-export.exp vendor/NetBSD/bmake/dist/unit-tests/directive-export.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-for-generating-endif.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-for-generating-endif.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-for.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-for.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-if.exp vendor/NetBSD/bmake/dist/unit-tests/directive-if.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-ifdef.exp vendor/NetBSD/bmake/dist/unit-tests/directive-ifdef.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-ifmake.exp vendor/NetBSD/bmake/dist/unit-tests/directive-ifmake.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-ifndef.exp vendor/NetBSD/bmake/dist/unit-tests/directive-ifndef.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-ifnmake.exp vendor/NetBSD/bmake/dist/unit-tests/directive-ifnmake.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-info.exp vendor/NetBSD/bmake/dist/unit-tests/directive-info.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-undef.exp vendor/NetBSD/bmake/dist/unit-tests/directive-undef.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-unexport-env.exp vendor/NetBSD/bmake/dist/unit-tests/directive-unexport-env.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-unexport.exp vendor/NetBSD/bmake/dist/unit-tests/directive-unexport.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive-warning.exp vendor/NetBSD/bmake/dist/unit-tests/directive-warning.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directive.exp vendor/NetBSD/bmake/dist/unit-tests/directive.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/directives.exp vendor/NetBSD/bmake/dist/unit-tests/directives.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/envfirst.exp vendor/NetBSD/bmake/dist/unit-tests/envfirst.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/export-variants.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/export-variants.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/lint.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/lint.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/make-exported.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/make-exported.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-backwards.exp vendor/NetBSD/bmake/dist/unit-tests/opt-backwards.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-chdir.exp vendor/NetBSD/bmake/dist/unit-tests/opt-chdir.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-debug-g1.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-debug-g1.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-debug.exp vendor/NetBSD/bmake/dist/unit-tests/opt-debug.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-define.exp vendor/NetBSD/bmake/dist/unit-tests/opt-define.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-env.exp vendor/NetBSD/bmake/dist/unit-tests/opt-env.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-file.exp vendor/NetBSD/bmake/dist/unit-tests/opt-file.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-ignore.exp vendor/NetBSD/bmake/dist/unit-tests/opt-ignore.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-include-dir.exp vendor/NetBSD/bmake/dist/unit-tests/opt-include-dir.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-jobs-internal.exp vendor/NetBSD/bmake/dist/unit-tests/opt-jobs-internal.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-jobs.exp vendor/NetBSD/bmake/dist/unit-tests/opt-jobs.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-keep-going.exp vendor/NetBSD/bmake/dist/unit-tests/opt-keep-going.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-m-include-dir.exp vendor/NetBSD/bmake/dist/unit-tests/opt-m-include-dir.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-no-action-at-all.exp vendor/NetBSD/bmake/dist/unit-tests/opt-no-action-at-all.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-no-action.exp vendor/NetBSD/bmake/dist/unit-tests/opt-no-action.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-query.exp vendor/NetBSD/bmake/dist/unit-tests/opt-query.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-raw.exp vendor/NetBSD/bmake/dist/unit-tests/opt-raw.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-silent.exp vendor/NetBSD/bmake/dist/unit-tests/opt-silent.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-touch.exp vendor/NetBSD/bmake/dist/unit-tests/opt-touch.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-tracefile.exp vendor/NetBSD/bmake/dist/unit-tests/opt-tracefile.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-var-expanded.exp vendor/NetBSD/bmake/dist/unit-tests/opt-var-expanded.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-var-literal.exp vendor/NetBSD/bmake/dist/unit-tests/opt-var-literal.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-warnings-as-errors.exp vendor/NetBSD/bmake/dist/unit-tests/opt-warnings-as-errors.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-where-am-i.exp vendor/NetBSD/bmake/dist/unit-tests/opt-where-am-i.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt-x-reduce-exported.exp vendor/NetBSD/bmake/dist/unit-tests/opt-x-reduce-exported.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/opt.exp vendor/NetBSD/bmake/dist/unit-tests/opt.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/recursive.exp vendor/NetBSD/bmake/dist/unit-tests/recursive.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-dots.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-dots.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-jobs-error.exp vendor/NetBSD/bmake/dist/unit-tests/sh-jobs-error.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-jobs.exp vendor/NetBSD/bmake/dist/unit-tests/sh-jobs.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-leading-at.exp vendor/NetBSD/bmake/dist/unit-tests/sh-leading-at.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-leading-hyphen.exp vendor/NetBSD/bmake/dist/unit-tests/sh-leading-hyphen.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-leading-plus.exp vendor/NetBSD/bmake/dist/unit-tests/sh-leading-plus.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-meta-chars.exp vendor/NetBSD/bmake/dist/unit-tests/sh-meta-chars.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-multi-line.exp vendor/NetBSD/bmake/dist/unit-tests/sh-multi-line.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh-single-line.exp vendor/NetBSD/bmake/dist/unit-tests/sh-single-line.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/sh.exp vendor/NetBSD/bmake/dist/unit-tests/sh.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/use-inference.exp vendor/NetBSD/bmake/dist/unit-tests/use-inference.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-class-cmdline.exp vendor/NetBSD/bmake/dist/unit-tests/var-class-cmdline.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-class-env.exp vendor/NetBSD/bmake/dist/unit-tests/var-class-env.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-class-global.exp vendor/NetBSD/bmake/dist/unit-tests/var-class-global.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-class-local-legacy.exp vendor/NetBSD/bmake/dist/unit-tests/var-class-local-legacy.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-class-local.exp vendor/NetBSD/bmake/dist/unit-tests/var-class-local.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-class.exp vendor/NetBSD/bmake/dist/unit-tests/var-class.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-op-append.exp vendor/NetBSD/bmake/dist/unit-tests/var-op-append.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-op-assign.exp vendor/NetBSD/bmake/dist/unit-tests/var-op-assign.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-op-default.exp vendor/NetBSD/bmake/dist/unit-tests/var-op-default.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-op-expand.exp vendor/NetBSD/bmake/dist/unit-tests/var-op-expand.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-op-shell.exp vendor/NetBSD/bmake/dist/unit-tests/var-op-shell.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/var-op.exp vendor/NetBSD/bmake/dist/unit-tests/var-op.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/vardebug.exp vendor/NetBSD/bmake/dist/unit-tests/vardebug.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varfind.exp vendor/NetBSD/bmake/dist/unit-tests/varfind.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-assign.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-assign.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-defined.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-defined.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-exclam-shell.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-exclam-shell.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-extension.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-extension.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-gmtime.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-gmtime.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-hash.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-hash.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-head.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-head.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-ifelse.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-ifelse.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-l-name-to-value.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-l-name-to-value.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-localtime.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-localtime.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-loop.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-loop.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-match-escape.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-match-escape.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-match.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-match.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-no-match.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-no-match.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-order-reverse.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-order-reverse.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-order-shuffle.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-order-shuffle.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-order.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-order.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-path.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-path.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-quote-dollar.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-quote-dollar.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-quote.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-quote.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-range.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-range.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-remember.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-remember.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-root.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-root.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-select-words.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-select-words.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-shell.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-shell.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-subst-regex.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-subst-regex.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-subst.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-subst.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-sysv.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-sysv.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-tail.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-tail.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-to-abs.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-to-abs.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-to-lower.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-to-lower.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-to-many-words.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-to-many-words.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-to-one-word.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-to-one-word.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-to-separator.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-to-separator.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-to-upper.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-to-upper.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-undefined.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-undefined.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod-unique.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-unique.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varmod.exp vendor/NetBSD/bmake/dist/unit-tests/varmod.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dollar.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dollar.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-alltargets.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-alltargets.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-curdir.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-curdir.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromdir.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromdir.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromfile.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromfile.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includes.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includes.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-libs.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-libs.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-dependfile.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-dependfile.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-expand_variables.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-expand_variables.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-exported.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-exported.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs-prefix.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs-prefix.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-level.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-level.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefile_preference.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefile_preference.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefiles.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefiles.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-bailiwick.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-bailiwick.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-created.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-created.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-files.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-files.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_filter.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_filter.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_paths.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_paths.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_patterns.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_patterns.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-prefix.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-prefix.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-mode.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-mode.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-path_filemon.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-path_filemon.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-pid.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-pid.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-ppid.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-ppid.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-save_dollars.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-save_dollars.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-makeoverrides.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-makeoverrides.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-newline.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-newline.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-objdir.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-objdir.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsedir.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsedir.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsefile.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsefile.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-path.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-path.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-shell.exp (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-shell.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-dot-targets.exp vendor/NetBSD/bmake/dist/unit-tests/varname-dot-targets.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-empty.exp vendor/NetBSD/bmake/dist/unit-tests/varname-empty.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-make.exp vendor/NetBSD/bmake/dist/unit-tests/varname-make.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-make_print_var_on_error.exp vendor/NetBSD/bmake/dist/unit-tests/varname-make_print_var_on_error.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-makeflags.exp vendor/NetBSD/bmake/dist/unit-tests/varname-makeflags.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-pwd.exp vendor/NetBSD/bmake/dist/unit-tests/varname-pwd.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname-vpath.exp vendor/NetBSD/bmake/dist/unit-tests/varname-vpath.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varname.exp vendor/NetBSD/bmake/dist/unit-tests/varname.mk (contents, props changed) vendor/NetBSD/bmake/dist/unit-tests/varparse-dynamic.exp vendor/NetBSD/bmake/dist/unit-tests/varparse-dynamic.mk (contents, props changed) Deleted: vendor/NetBSD/bmake/dist/lst.lib/Makefile vendor/NetBSD/bmake/dist/lst.lib/lstAppend.c vendor/NetBSD/bmake/dist/lst.lib/lstAtEnd.c vendor/NetBSD/bmake/dist/lst.lib/lstAtFront.c vendor/NetBSD/bmake/dist/lst.lib/lstClose.c vendor/NetBSD/bmake/dist/lst.lib/lstConcat.c vendor/NetBSD/bmake/dist/lst.lib/lstDatum.c vendor/NetBSD/bmake/dist/lst.lib/lstDeQueue.c vendor/NetBSD/bmake/dist/lst.lib/lstDestroy.c vendor/NetBSD/bmake/dist/lst.lib/lstDupl.c vendor/NetBSD/bmake/dist/lst.lib/lstEnQueue.c vendor/NetBSD/bmake/dist/lst.lib/lstFind.c vendor/NetBSD/bmake/dist/lst.lib/lstFindFrom.c vendor/NetBSD/bmake/dist/lst.lib/lstFirst.c vendor/NetBSD/bmake/dist/lst.lib/lstForEach.c vendor/NetBSD/bmake/dist/lst.lib/lstForEachFrom.c vendor/NetBSD/bmake/dist/lst.lib/lstInit.c vendor/NetBSD/bmake/dist/lst.lib/lstInsert.c vendor/NetBSD/bmake/dist/lst.lib/lstInt.h vendor/NetBSD/bmake/dist/lst.lib/lstIsAtEnd.c vendor/NetBSD/bmake/dist/lst.lib/lstIsEmpty.c vendor/NetBSD/bmake/dist/lst.lib/lstLast.c vendor/NetBSD/bmake/dist/lst.lib/lstMember.c vendor/NetBSD/bmake/dist/lst.lib/lstNext.c vendor/NetBSD/bmake/dist/lst.lib/lstOpen.c vendor/NetBSD/bmake/dist/lst.lib/lstPrev.c vendor/NetBSD/bmake/dist/lst.lib/lstRemove.c vendor/NetBSD/bmake/dist/lst.lib/lstReplace.c vendor/NetBSD/bmake/dist/lst.lib/lstSucc.c vendor/NetBSD/bmake/dist/sprite.h vendor/NetBSD/bmake/dist/unit-tests/modorder.exp vendor/NetBSD/bmake/dist/unit-tests/modorder.mk Modified: vendor/NetBSD/bmake/dist/ChangeLog vendor/NetBSD/bmake/dist/FILES vendor/NetBSD/bmake/dist/LICENSE vendor/NetBSD/bmake/dist/Makefile vendor/NetBSD/bmake/dist/VERSION vendor/NetBSD/bmake/dist/arch.c vendor/NetBSD/bmake/dist/bmake.1 vendor/NetBSD/bmake/dist/bmake.cat1 vendor/NetBSD/bmake/dist/bsd.after-import.mk vendor/NetBSD/bmake/dist/buf.c vendor/NetBSD/bmake/dist/buf.h vendor/NetBSD/bmake/dist/compat.c vendor/NetBSD/bmake/dist/cond.c vendor/NetBSD/bmake/dist/dir.c vendor/NetBSD/bmake/dist/dir.h vendor/NetBSD/bmake/dist/for.c vendor/NetBSD/bmake/dist/hash.c vendor/NetBSD/bmake/dist/hash.h vendor/NetBSD/bmake/dist/job.c vendor/NetBSD/bmake/dist/job.h vendor/NetBSD/bmake/dist/lst.h vendor/NetBSD/bmake/dist/main.c vendor/NetBSD/bmake/dist/make-conf.h vendor/NetBSD/bmake/dist/make.1 vendor/NetBSD/bmake/dist/make.c vendor/NetBSD/bmake/dist/make.h vendor/NetBSD/bmake/dist/make_malloc.c vendor/NetBSD/bmake/dist/make_malloc.h vendor/NetBSD/bmake/dist/meta.c vendor/NetBSD/bmake/dist/metachar.c vendor/NetBSD/bmake/dist/metachar.h vendor/NetBSD/bmake/dist/mk/ChangeLog vendor/NetBSD/bmake/dist/mk/FILES vendor/NetBSD/bmake/dist/mk/README vendor/NetBSD/bmake/dist/mk/auto.dep.mk vendor/NetBSD/bmake/dist/mk/auto.obj.mk vendor/NetBSD/bmake/dist/mk/autoconf.mk vendor/NetBSD/bmake/dist/mk/autodep.mk vendor/NetBSD/bmake/dist/mk/compiler.mk vendor/NetBSD/bmake/dist/mk/cython.mk vendor/NetBSD/bmake/dist/mk/dirdeps-options.mk vendor/NetBSD/bmake/dist/mk/dirdeps-targets.mk vendor/NetBSD/bmake/dist/mk/dirdeps.mk vendor/NetBSD/bmake/dist/mk/dpadd.mk vendor/NetBSD/bmake/dist/mk/files.mk vendor/NetBSD/bmake/dist/mk/gendirdeps.mk vendor/NetBSD/bmake/dist/mk/host-target.mk vendor/NetBSD/bmake/dist/mk/host.libnames.mk vendor/NetBSD/bmake/dist/mk/inc.mk vendor/NetBSD/bmake/dist/mk/init.mk vendor/NetBSD/bmake/dist/mk/install-mk vendor/NetBSD/bmake/dist/mk/install-new.mk vendor/NetBSD/bmake/dist/mk/java.mk vendor/NetBSD/bmake/dist/mk/lib.mk vendor/NetBSD/bmake/dist/mk/libnames.mk vendor/NetBSD/bmake/dist/mk/libs.mk vendor/NetBSD/bmake/dist/mk/links.mk vendor/NetBSD/bmake/dist/mk/manifest.mk vendor/NetBSD/bmake/dist/mk/meta.autodep.mk vendor/NetBSD/bmake/dist/mk/meta.stage.mk vendor/NetBSD/bmake/dist/mk/meta.subdir.mk vendor/NetBSD/bmake/dist/mk/meta.sys.mk vendor/NetBSD/bmake/dist/mk/meta2deps.py vendor/NetBSD/bmake/dist/mk/meta2deps.sh vendor/NetBSD/bmake/dist/mk/mk-files.txt vendor/NetBSD/bmake/dist/mk/mkopt.sh vendor/NetBSD/bmake/dist/mk/obj.mk vendor/NetBSD/bmake/dist/mk/options.mk vendor/NetBSD/bmake/dist/mk/own.mk vendor/NetBSD/bmake/dist/mk/prlist.mk vendor/NetBSD/bmake/dist/mk/prog.mk vendor/NetBSD/bmake/dist/mk/progs.mk vendor/NetBSD/bmake/dist/mk/rst2htm.mk vendor/NetBSD/bmake/dist/mk/scripts.mk vendor/NetBSD/bmake/dist/mk/srctop.mk vendor/NetBSD/bmake/dist/mk/stage-install.sh vendor/NetBSD/bmake/dist/mk/sys.clean-env.mk vendor/NetBSD/bmake/dist/mk/sys.debug.mk vendor/NetBSD/bmake/dist/mk/sys.dependfile.mk vendor/NetBSD/bmake/dist/mk/sys.mk vendor/NetBSD/bmake/dist/mk/sys.vars.mk vendor/NetBSD/bmake/dist/mk/sys/AIX.mk vendor/NetBSD/bmake/dist/mk/sys/Darwin.mk vendor/NetBSD/bmake/dist/mk/sys/Generic.mk vendor/NetBSD/bmake/dist/mk/sys/HP-UX.mk vendor/NetBSD/bmake/dist/mk/sys/IRIX.mk vendor/NetBSD/bmake/dist/mk/sys/Linux.mk vendor/NetBSD/bmake/dist/mk/sys/NetBSD.mk vendor/NetBSD/bmake/dist/mk/sys/OSF1.mk vendor/NetBSD/bmake/dist/mk/sys/OpenBSD.mk vendor/NetBSD/bmake/dist/mk/sys/SunOS.mk vendor/NetBSD/bmake/dist/mk/sys/UnixWare.mk vendor/NetBSD/bmake/dist/mk/target-flags.mk vendor/NetBSD/bmake/dist/mk/warnings.mk vendor/NetBSD/bmake/dist/mk/whats.mk vendor/NetBSD/bmake/dist/mk/yacc.mk vendor/NetBSD/bmake/dist/nonints.h vendor/NetBSD/bmake/dist/os.sh vendor/NetBSD/bmake/dist/parse.c vendor/NetBSD/bmake/dist/str.c vendor/NetBSD/bmake/dist/strlist.c vendor/NetBSD/bmake/dist/strlist.h vendor/NetBSD/bmake/dist/suff.c vendor/NetBSD/bmake/dist/targ.c vendor/NetBSD/bmake/dist/trace.c vendor/NetBSD/bmake/dist/unit-tests/Makefile vendor/NetBSD/bmake/dist/unit-tests/cond-late.exp vendor/NetBSD/bmake/dist/unit-tests/cond-late.mk vendor/NetBSD/bmake/dist/unit-tests/cond-short.mk vendor/NetBSD/bmake/dist/unit-tests/export-all.mk vendor/NetBSD/bmake/dist/unit-tests/export.exp vendor/NetBSD/bmake/dist/unit-tests/export.mk vendor/NetBSD/bmake/dist/unit-tests/forloop.mk vendor/NetBSD/bmake/dist/unit-tests/impsrc.exp vendor/NetBSD/bmake/dist/unit-tests/impsrc.mk vendor/NetBSD/bmake/dist/unit-tests/include-main.mk vendor/NetBSD/bmake/dist/unit-tests/moderrs.exp vendor/NetBSD/bmake/dist/unit-tests/moderrs.mk vendor/NetBSD/bmake/dist/unit-tests/modmatch.exp vendor/NetBSD/bmake/dist/unit-tests/modmatch.mk vendor/NetBSD/bmake/dist/unit-tests/modmisc.exp vendor/NetBSD/bmake/dist/unit-tests/modmisc.mk vendor/NetBSD/bmake/dist/unit-tests/modts.exp vendor/NetBSD/bmake/dist/unit-tests/modts.mk vendor/NetBSD/bmake/dist/unit-tests/phony-end.exp vendor/NetBSD/bmake/dist/unit-tests/posix1.mk vendor/NetBSD/bmake/dist/unit-tests/sysv.exp vendor/NetBSD/bmake/dist/unit-tests/sysv.mk vendor/NetBSD/bmake/dist/unit-tests/unexport-env.mk vendor/NetBSD/bmake/dist/unit-tests/unexport.mk vendor/NetBSD/bmake/dist/unit-tests/varmisc.exp vendor/NetBSD/bmake/dist/unit-tests/varmisc.mk vendor/NetBSD/bmake/dist/unit-tests/varmod-edge.exp vendor/NetBSD/bmake/dist/unit-tests/varmod-edge.mk vendor/NetBSD/bmake/dist/util.c vendor/NetBSD/bmake/dist/var.c Modified: vendor/NetBSD/bmake/dist/ChangeLog ============================================================================== --- vendor/NetBSD/bmake/dist/ChangeLog Sat Sep 5 10:16:24 2020 (r365360) +++ vendor/NetBSD/bmake/dist/ChangeLog Sat Sep 5 16:11:04 2020 (r365361) @@ -1,3 +1,243 @@ +2020-09-02 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200902 + Merge with NetBSD make, pick up + o use make_stat to ensure no confusion over valid fields + returned by cached_stat + o var.c: make VarQuote const-correct + o add unit tests for .for + +2020-09-01 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200901 + Merge with NetBSD make, pick up + o rename Hash_Table fields + o make data types in Dir_HasWildcards more precise + +2020-08-31 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200831 + Merge with NetBSD make, pick up + o suff.c: fix unbalanced Lst_Open/Lst_Close in SuffFindCmds + o lst.c: Lst_Open renable assert that list isn't open + o unit test for .TARGET dependent flags + o var.c: fix aliasing bug in VarUniq + o more unit tests for :u + +2020-08-30 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200830 + Merge with NetBSD make, pick up + o allow for strict type checking for Boolean + o Var_Parse never returns NULL + o Var_Subst never returns NULL + o Lst_Find now takes boolean match function + o rename Lst_Memeber to Lst_FindDatum + o rename LstNode functions to match their type + o rename GNode.iParents to implicitParents + o fix assertion failure for .SUFFIXES in archives + o compat.c: clean up documentation for CompatInterrupt and Compat_Run + remove unreachable code from CompatRunCommand + o main.c: simplify getBoolean + o stc.c: replace brk_string with simpler Str_Words + o suff.c: add debug macros + +2020-08-28 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200828 + Merge with NetBSD make, pick up + o lst.c: inline LstIsValid and LstNodeIsValid + o remove trailing S from Lst function names after migration complete + o more comment cleanup/clarification + o suff.c: clean up suffix handling + o more unit tests + +2020-08-26 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200826 + Merge with NetBSD make, pick up + o enum.c: distinguish between bitsets containing flags and + ordinary enums + o var.c: fix error message for ::!= modifier with shell error + o fix bugs in -DCLEANUP mode + +2020-08-24 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200824 + Merge with NetBSD make, pick up + o in debug mode, print GNode details in symbols + +2020-08-23 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200823 + Merge with NetBSD make, pick up + o lst.c: more asserts, + make args to Lst_Find match others. + o var.c: pass flags to VarAdd + o arch.c: use Buffer + o str.c: brk_string return size_t for nwords + o more unit tests + +2020-08-22 Simon J Gerraty + + * VERSION (_MAKE_VERSION): + Merge with NetBSD make, pick up + o var.c: support for read-only variables eg .SHELL + being the shell used to run scripts. + o lst.c: more simplification + o more documentation and style cleanup + o more unit tests + o ensure unit-test/Makefile is run by TEST_MAKE + o reduce duplication of header inclusion + +2020-08-21 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200821 + Merge with NetBSD make, pick up + o lst.c: revert invalid assertion - but document it + o dir.c: split Dir_Init into two functions + +2020-08-20 Simon J Gerraty + + * lst.c: needs inttypes.h on Linux + + * VERSION (_MAKE_VERSION): 20200820 + Merge with NetBSD make, pick up + o make.1: clarify some passages + o var.c: more cleanup, clarify comments + o make_malloc.c: remove unreachable code + o cond.c: make CondGetString easier to debug + o simplify list usage + o unit-tests: more + +2020-08-16 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200816 + Merge with NetBSD make, pick up + o refactor unit-tests to be more fine grained + not all tests moved yet + +2020-08-14 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200814 + Merge with NetBSD make, pick up + o more str_concat variants + o more enums for flags + o var.c: cleanup for higher warnings level + +2020-08-10 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200810 + Merge with NetBSD make, pick up + o more unit tests + o general comment and style cleanup + +2020-08-08 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200808 + Merge with NetBSD make, pick up + o enum.[ch]: streamline, enums for use in flags and debug output + o cond.c: cleanup + o var.c: reduce duplicate code for modifiers + debug logging for Var_Parse + more detailed debug output + o more unit tests + +2020-08-06 Simon J Gerraty + + * unit-tests/Makefile: -r for recursive and include Makefile.inc + so I can run tests in meta mode + supress extra noise if in meta mode + + * VERSION (_MAKE_VERSION): 20200806 + Merge with NetBSD make, pick up + o parse.c: remove VARE_WANTRES for LINT + we just want to check parsing (for now). + +2020-08-05 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200805 + Merge with NetBSD make, pick up + o make.1: Rework the description of dependence operators + +2020-08-03 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200803 + Merge with NetBSD make, pick up + o revert some C99 usage, for max portability + o unit-tests/lint + +2020-08-02 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200802 + Merge with NetBSD make, pick up + o more unit tests + +2020-08-01 Simon J Gerraty + + * Remove NetBSD specific plumbing from unit-tests/Makefile + + * VERSION (_MAKE_VERSION): 20200801 + Merge with NetBSD make, pick up + o make Var_Value return const + o size_t for buf sizes + o optimize some buffer operations - avoid strlen + +2020-07-31 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200731 + Merge with NetBSD make, pick up + o var.c: fix undefinded behavior for incomplete :t modifier + fixes unit-test/moderrs on Ubuntu + o parse.c: When parsing variable assignments other than := + if DEBUG(LINT) test substition of value, so we get a file and + line number in the resulting error. + o dir.c: fix parsing of nested braces in dependency lines + add unit-tests + +2020-07-30 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200730 + Merge with NetBSD make, pick up + o var.c: minor cleanup + o unit-tests: more tests to improve code coverage + +2020-07-28 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200728 + Merge with NetBSD make, pick up + o var.c: more optimizations + +2020-07-26 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200726 + Merge with NetBSD make, pick up + o collapse lsd.lib into lst.c - reduce code size and allow inlining + o lots of function comment updates + o var.c: more optimizations + o make return of Var_Parse const + +2020-07-20 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200720 + Merge with NetBSD make, pick up + o DEBUG_HASH report stats at end and tone down the noise + o var.c: each flag type gets its own prefix. + move SysV string matching to var.c + make ampersand in ${VAR:from=to&} an ordinary character + cleanup and simplify implementation of modifiers + o make.1: move documentation for assignment modifiers + +2020-07-18 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200718 + Merge with NetBSD make, pick up + o DEBUG_HASH to see how well the hash tables are working + +2020-07-11 Simon J Gerraty + + * bsd.after-import.mk: make sure we update unit-tests/Makefile + 2020-07-10 Simon J Gerraty * configure.in: use AC_INCLUDES_DEFAULT rather than AC_HEADER_STDC Modified: vendor/NetBSD/bmake/dist/FILES ============================================================================== --- vendor/NetBSD/bmake/dist/FILES Sat Sep 5 10:16:24 2020 (r365360) +++ vendor/NetBSD/bmake/dist/FILES Sat Sep 5 16:11:04 2020 (r365361) @@ -23,6 +23,8 @@ configure.in dir.c dir.h dirname.c +enum.c +enum.h filemon/filemon.h filemon/filemon_dev.c filemon/filemon_ktrace.c @@ -34,36 +36,8 @@ hash.h install-sh job.c job.h +lst.c lst.h -lst.lib/Makefile -lst.lib/lstAppend.c -lst.lib/lstAtEnd.c -lst.lib/lstAtFront.c -lst.lib/lstClose.c -lst.lib/lstConcat.c -lst.lib/lstDatum.c -lst.lib/lstDeQueue.c -lst.lib/lstDestroy.c -lst.lib/lstDupl.c -lst.lib/lstEnQueue.c -lst.lib/lstFind.c -lst.lib/lstFindFrom.c -lst.lib/lstFirst.c -lst.lib/lstForEach.c -lst.lib/lstForEachFrom.c -lst.lib/lstInit.c -lst.lib/lstInsert.c -lst.lib/lstInt.h -lst.lib/lstIsAtEnd.c -lst.lib/lstIsEmpty.c -lst.lib/lstLast.c -lst.lib/lstMember.c -lst.lib/lstNext.c -lst.lib/lstOpen.c -lst.lib/lstPrev.c -lst.lib/lstRemove.c -lst.lib/lstReplace.c -lst.lib/lstSucc.c machine.sh main.c make-bootstrap.sh.in @@ -88,7 +62,6 @@ ranlib.h realpath.c setenv.c sigcompat.c -sprite.h str.c stresep.c strlcpy.c @@ -100,22 +73,234 @@ trace.c trace.h unit-tests/Makefile unit-tests/Makefile.config.in +unit-tests/archive.exp +unit-tests/archive.mk +unit-tests/archive-suffix.exp +unit-tests/archive-suffix.mk +unit-tests/cmd-interrupt.exp +unit-tests/cmd-interrupt.mk +unit-tests/cmdline.exp +unit-tests/cmdline.mk unit-tests/comment.exp unit-tests/comment.mk +unit-tests/cond-cmp-numeric-eq.exp +unit-tests/cond-cmp-numeric-eq.mk +unit-tests/cond-cmp-numeric-ge.exp +unit-tests/cond-cmp-numeric-ge.mk +unit-tests/cond-cmp-numeric-gt.exp +unit-tests/cond-cmp-numeric-gt.mk +unit-tests/cond-cmp-numeric-le.exp +unit-tests/cond-cmp-numeric-le.mk +unit-tests/cond-cmp-numeric-lt.exp +unit-tests/cond-cmp-numeric-lt.mk +unit-tests/cond-cmp-numeric-ne.exp +unit-tests/cond-cmp-numeric-ne.mk +unit-tests/cond-cmp-numeric.exp +unit-tests/cond-cmp-numeric.mk +unit-tests/cond-cmp-string.exp +unit-tests/cond-cmp-string.mk +unit-tests/cond-func.exp +unit-tests/cond-func.mk +unit-tests/cond-func-commands.exp +unit-tests/cond-func-commands.mk +unit-tests/cond-func-defined.exp +unit-tests/cond-func-defined.mk +unit-tests/cond-func-empty.exp +unit-tests/cond-func-empty.mk +unit-tests/cond-func-exists.exp +unit-tests/cond-func-exists.mk +unit-tests/cond-func-make.exp +unit-tests/cond-func-make.mk +unit-tests/cond-func-target.exp +unit-tests/cond-func-target.mk +unit-tests/cond-late.exp +unit-tests/cond-late.mk +unit-tests/cond-op-and.exp +unit-tests/cond-op-and.mk +unit-tests/cond-op-not.exp +unit-tests/cond-op-not.mk +unit-tests/cond-op-or.exp +unit-tests/cond-op-or.mk +unit-tests/cond-op-parentheses.exp +unit-tests/cond-op-parentheses.mk +unit-tests/cond-op.exp +unit-tests/cond-op.mk +unit-tests/cond-short.exp +unit-tests/cond-short.mk +unit-tests/cond-token-number.exp +unit-tests/cond-token-number.mk +unit-tests/cond-token-plain.exp +unit-tests/cond-token-plain.mk +unit-tests/cond-token-string.exp +unit-tests/cond-token-string.mk +unit-tests/cond-token-var.exp +unit-tests/cond-token-var.mk unit-tests/cond1.exp unit-tests/cond1.mk unit-tests/cond2.exp unit-tests/cond2.mk -unit-tests/cond-late.mk -unit-tests/cond-late.exp -unit-tests/cond-short.mk -unit-tests/cond-short.exp +unit-tests/counter.exp +unit-tests/counter.mk +unit-tests/dep-colon.exp +unit-tests/dep-colon.mk +unit-tests/dep-double-colon.exp +unit-tests/dep-double-colon.mk +unit-tests/dep-exclam.exp +unit-tests/dep-exclam.mk +unit-tests/dep-none.exp +unit-tests/dep-none.mk +unit-tests/dep-var.exp +unit-tests/dep-var.mk +unit-tests/dep-wildcards.exp +unit-tests/dep-wildcards.mk +unit-tests/dep.exp +unit-tests/dep.mk +unit-tests/depsrc-exec.exp +unit-tests/depsrc-exec.mk +unit-tests/depsrc-ignore.exp +unit-tests/depsrc-ignore.mk +unit-tests/depsrc-made.exp +unit-tests/depsrc-made.mk +unit-tests/depsrc-make.exp +unit-tests/depsrc-make.mk +unit-tests/depsrc-meta.exp +unit-tests/depsrc-meta.mk +unit-tests/depsrc-nometa.exp +unit-tests/depsrc-nometa.mk +unit-tests/depsrc-nometa_cmp.exp +unit-tests/depsrc-nometa_cmp.mk +unit-tests/depsrc-nopath.exp +unit-tests/depsrc-nopath.mk +unit-tests/depsrc-notmain.exp +unit-tests/depsrc-notmain.mk +unit-tests/depsrc-optional.exp +unit-tests/depsrc-optional.mk +unit-tests/depsrc-phony.exp +unit-tests/depsrc-phony.mk +unit-tests/depsrc-precious.exp +unit-tests/depsrc-precious.mk +unit-tests/depsrc-recursive.exp +unit-tests/depsrc-recursive.mk +unit-tests/depsrc-silent.exp +unit-tests/depsrc-silent.mk +unit-tests/depsrc-use.exp +unit-tests/depsrc-use.mk +unit-tests/depsrc-usebefore.exp +unit-tests/depsrc-usebefore.mk +unit-tests/depsrc-usebefore-double-colon.exp +unit-tests/depsrc-usebefore-double-colon.mk +unit-tests/depsrc-wait.exp +unit-tests/depsrc-wait.mk +unit-tests/depsrc.exp +unit-tests/depsrc.mk +unit-tests/deptgt-begin.exp +unit-tests/deptgt-begin.mk +unit-tests/deptgt-default.exp +unit-tests/deptgt-default.mk +unit-tests/deptgt-delete_on_error.exp +unit-tests/deptgt-delete_on_error.mk +unit-tests/deptgt-end.exp +unit-tests/deptgt-end.mk +unit-tests/deptgt-error.exp +unit-tests/deptgt-error.mk +unit-tests/deptgt-ignore.exp +unit-tests/deptgt-ignore.mk +unit-tests/deptgt-interrupt.exp +unit-tests/deptgt-interrupt.mk +unit-tests/deptgt-main.exp +unit-tests/deptgt-main.mk +unit-tests/deptgt-makeflags.exp +unit-tests/deptgt-makeflags.mk +unit-tests/deptgt-no_parallel.exp +unit-tests/deptgt-no_parallel.mk +unit-tests/deptgt-nopath.exp +unit-tests/deptgt-nopath.mk +unit-tests/deptgt-notparallel.exp +unit-tests/deptgt-notparallel.mk +unit-tests/deptgt-objdir.exp +unit-tests/deptgt-objdir.mk +unit-tests/deptgt-order.exp +unit-tests/deptgt-order.mk +unit-tests/deptgt-path-suffix.exp +unit-tests/deptgt-path-suffix.mk +unit-tests/deptgt-path.exp +unit-tests/deptgt-path.mk +unit-tests/deptgt-phony.exp +unit-tests/deptgt-phony.mk +unit-tests/deptgt-precious.exp +unit-tests/deptgt-precious.mk +unit-tests/deptgt-shell.exp +unit-tests/deptgt-shell.mk +unit-tests/deptgt-silent.exp +unit-tests/deptgt-silent.mk +unit-tests/deptgt-stale.exp +unit-tests/deptgt-stale.mk +unit-tests/deptgt-suffixes.exp +unit-tests/deptgt-suffixes.mk +unit-tests/deptgt.exp +unit-tests/deptgt.mk +unit-tests/dir.exp +unit-tests/dir.mk +unit-tests/dir-expand-path.exp +unit-tests/dir-expand-path.mk +unit-tests/directive-elif.exp +unit-tests/directive-elif.mk +unit-tests/directive-elifdef.exp +unit-tests/directive-elifdef.mk +unit-tests/directive-elifmake.exp +unit-tests/directive-elifmake.mk +unit-tests/directive-elifndef.exp +unit-tests/directive-elifndef.mk +unit-tests/directive-elifnmake.exp +unit-tests/directive-elifnmake.mk +unit-tests/directive-else.exp +unit-tests/directive-else.mk +unit-tests/directive-endif.exp +unit-tests/directive-endif.mk +unit-tests/directive-error.exp +unit-tests/directive-error.mk +unit-tests/directive-export-env.exp +unit-tests/directive-export-env.mk +unit-tests/directive-export-literal.exp +unit-tests/directive-export-literal.mk +unit-tests/directive-export.exp +unit-tests/directive-export.mk +unit-tests/directive-for.exp +unit-tests/directive-for.mk +unit-tests/directive-for-generating-endif.exp +unit-tests/directive-for-generating-endif.mk +unit-tests/directive-if.exp +unit-tests/directive-if.mk +unit-tests/directive-ifdef.exp +unit-tests/directive-ifdef.mk +unit-tests/directive-ifmake.exp +unit-tests/directive-ifmake.mk +unit-tests/directive-ifndef.exp +unit-tests/directive-ifndef.mk +unit-tests/directive-ifnmake.exp +unit-tests/directive-ifnmake.mk +unit-tests/directive-info.exp +unit-tests/directive-info.mk +unit-tests/directive-undef.exp +unit-tests/directive-undef.mk +unit-tests/directive-unexport-env.exp +unit-tests/directive-unexport-env.mk +unit-tests/directive-unexport.exp +unit-tests/directive-unexport.mk +unit-tests/directive-warning.exp +unit-tests/directive-warning.mk +unit-tests/directive.exp +unit-tests/directive.mk +unit-tests/directives.exp +unit-tests/directives.mk unit-tests/dollar.exp unit-tests/dollar.mk unit-tests/doterror.exp unit-tests/doterror.mk unit-tests/dotwait.exp unit-tests/dotwait.mk +unit-tests/envfirst.exp +unit-tests/envfirst.mk unit-tests/error.exp unit-tests/error.mk unit-tests/escape.exp @@ -124,6 +309,8 @@ unit-tests/export-all.exp unit-tests/export-all.mk unit-tests/export-env.exp unit-tests/export-env.mk +unit-tests/export-variants.exp +unit-tests/export-variants.mk unit-tests/export.exp unit-tests/export.mk unit-tests/forloop.exp @@ -138,6 +325,10 @@ unit-tests/include-main.exp unit-tests/include-main.mk unit-tests/include-sub.mk unit-tests/include-subsub.mk +unit-tests/lint.exp +unit-tests/lint.mk +unit-tests/make-exported.exp +unit-tests/make-exported.mk unit-tests/misc.exp unit-tests/misc.mk unit-tests/moderrs.exp @@ -146,12 +337,62 @@ unit-tests/modmatch.exp unit-tests/modmatch.mk unit-tests/modmisc.exp unit-tests/modmisc.mk -unit-tests/modorder.exp -unit-tests/modorder.mk unit-tests/modts.exp unit-tests/modts.mk unit-tests/modword.exp unit-tests/modword.mk +unit-tests/opt-backwards.exp +unit-tests/opt-backwards.mk +unit-tests/opt-chdir.exp +unit-tests/opt-chdir.mk +unit-tests/opt-debug.exp +unit-tests/opt-debug.mk +unit-tests/opt-debug-g1.exp +unit-tests/opt-debug-g1.mk +unit-tests/opt-define.exp +unit-tests/opt-define.mk +unit-tests/opt-env.exp +unit-tests/opt-env.mk +unit-tests/opt-file.exp +unit-tests/opt-file.mk +unit-tests/opt-ignore.exp +unit-tests/opt-ignore.mk +unit-tests/opt-include-dir.exp +unit-tests/opt-include-dir.mk +unit-tests/opt-jobs-internal.exp +unit-tests/opt-jobs-internal.mk +unit-tests/opt-jobs.exp +unit-tests/opt-jobs.mk +unit-tests/opt-keep-going.exp +unit-tests/opt-keep-going.mk +unit-tests/opt-m-include-dir.exp +unit-tests/opt-m-include-dir.mk +unit-tests/opt-no-action-at-all.exp +unit-tests/opt-no-action-at-all.mk +unit-tests/opt-no-action.exp +unit-tests/opt-no-action.mk +unit-tests/opt-query.exp +unit-tests/opt-query.mk +unit-tests/opt-raw.exp +unit-tests/opt-raw.mk +unit-tests/opt-silent.exp +unit-tests/opt-silent.mk +unit-tests/opt-touch.exp +unit-tests/opt-touch.mk +unit-tests/opt-tracefile.exp +unit-tests/opt-tracefile.mk +unit-tests/opt-var-expanded.exp +unit-tests/opt-var-expanded.mk +unit-tests/opt-var-literal.exp +unit-tests/opt-var-literal.mk +unit-tests/opt-warnings-as-errors.exp +unit-tests/opt-warnings-as-errors.mk +unit-tests/opt-where-am-i.exp +unit-tests/opt-where-am-i.mk +unit-tests/opt-x-reduce-exported.exp +unit-tests/opt-x-reduce-exported.mk +unit-tests/opt.exp +unit-tests/opt.mk unit-tests/order.exp unit-tests/order.mk unit-tests/phony-end.exp @@ -162,6 +403,28 @@ unit-tests/posix1.exp unit-tests/posix1.mk unit-tests/qequals.exp unit-tests/qequals.mk +unit-tests/recursive.exp +unit-tests/recursive.mk +unit-tests/sh-dots.exp +unit-tests/sh-dots.mk +unit-tests/sh-jobs-error.exp +unit-tests/sh-jobs-error.mk +unit-tests/sh-jobs.exp +unit-tests/sh-jobs.mk +unit-tests/sh-leading-at.exp +unit-tests/sh-leading-at.mk +unit-tests/sh-leading-hyphen.exp +unit-tests/sh-leading-hyphen.mk +unit-tests/sh-leading-plus.exp +unit-tests/sh-leading-plus.mk +unit-tests/sh-meta-chars.exp +unit-tests/sh-meta-chars.mk +unit-tests/sh-multi-line.exp +unit-tests/sh-multi-line.mk +unit-tests/sh-single-line.exp +unit-tests/sh-single-line.mk +unit-tests/sh.exp +unit-tests/sh.mk unit-tests/suffixes.exp unit-tests/suffixes.mk unit-tests/sunshcmd.exp @@ -174,12 +437,204 @@ unit-tests/unexport-env.exp unit-tests/unexport-env.mk unit-tests/unexport.exp unit-tests/unexport.mk +unit-tests/use-inference.exp +unit-tests/use-inference.mk +unit-tests/var-class-cmdline.exp +unit-tests/var-class-cmdline.mk +unit-tests/var-class-env.exp +unit-tests/var-class-env.mk +unit-tests/var-class-global.exp +unit-tests/var-class-global.mk +unit-tests/var-class-local-legacy.exp +unit-tests/var-class-local-legacy.mk +unit-tests/var-class-local.exp +unit-tests/var-class-local.mk +unit-tests/var-class.exp +unit-tests/var-class.mk +unit-tests/var-op-append.exp +unit-tests/var-op-append.mk +unit-tests/var-op-assign.exp +unit-tests/var-op-assign.mk +unit-tests/var-op-default.exp +unit-tests/var-op-default.mk +unit-tests/var-op-expand.exp +unit-tests/var-op-expand.mk +unit-tests/var-op-shell.exp +unit-tests/var-op-shell.mk +unit-tests/var-op.exp +unit-tests/var-op.mk unit-tests/varcmd.exp unit-tests/varcmd.mk +unit-tests/vardebug.exp +unit-tests/vardebug.mk +unit-tests/varfind.exp +unit-tests/varfind.mk unit-tests/varmisc.exp unit-tests/varmisc.mk +unit-tests/varmod-assign.exp +unit-tests/varmod-assign.mk +unit-tests/varmod-defined.exp +unit-tests/varmod-defined.mk unit-tests/varmod-edge.exp unit-tests/varmod-edge.mk +unit-tests/varmod-exclam-shell.exp +unit-tests/varmod-exclam-shell.mk +unit-tests/varmod-extension.exp +unit-tests/varmod-extension.mk +unit-tests/varmod-gmtime.exp +unit-tests/varmod-gmtime.mk +unit-tests/varmod-hash.exp +unit-tests/varmod-hash.mk +unit-tests/varmod-head.exp +unit-tests/varmod-head.mk +unit-tests/varmod-ifelse.exp +unit-tests/varmod-ifelse.mk +unit-tests/varmod-l-name-to-value.exp +unit-tests/varmod-l-name-to-value.mk +unit-tests/varmod-localtime.exp +unit-tests/varmod-localtime.mk +unit-tests/varmod-loop.exp +unit-tests/varmod-loop.mk +unit-tests/varmod-match-escape.exp +unit-tests/varmod-match-escape.mk +unit-tests/varmod-match.exp +unit-tests/varmod-match.mk +unit-tests/varmod-no-match.exp +unit-tests/varmod-no-match.mk +unit-tests/varmod-order-reverse.exp +unit-tests/varmod-order-reverse.mk +unit-tests/varmod-order-shuffle.exp +unit-tests/varmod-order-shuffle.mk +unit-tests/varmod-order.exp +unit-tests/varmod-order.mk +unit-tests/varmod-path.exp +unit-tests/varmod-path.mk +unit-tests/varmod-quote-dollar.exp +unit-tests/varmod-quote-dollar.mk +unit-tests/varmod-quote.exp +unit-tests/varmod-quote.mk +unit-tests/varmod-range.exp +unit-tests/varmod-range.mk +unit-tests/varmod-remember.exp +unit-tests/varmod-remember.mk +unit-tests/varmod-root.exp +unit-tests/varmod-root.mk +unit-tests/varmod-select-words.exp +unit-tests/varmod-select-words.mk +unit-tests/varmod-shell.exp +unit-tests/varmod-shell.mk +unit-tests/varmod-subst-regex.exp +unit-tests/varmod-subst-regex.mk +unit-tests/varmod-subst.exp +unit-tests/varmod-subst.mk +unit-tests/varmod-sysv.exp +unit-tests/varmod-sysv.mk +unit-tests/varmod-tail.exp +unit-tests/varmod-tail.mk +unit-tests/varmod-to-abs.exp +unit-tests/varmod-to-abs.mk +unit-tests/varmod-to-lower.exp +unit-tests/varmod-to-lower.mk +unit-tests/varmod-to-many-words.exp +unit-tests/varmod-to-many-words.mk +unit-tests/varmod-to-one-word.exp +unit-tests/varmod-to-one-word.mk +unit-tests/varmod-to-separator.exp +unit-tests/varmod-to-separator.mk +unit-tests/varmod-to-upper.exp +unit-tests/varmod-to-upper.mk +unit-tests/varmod-undefined.exp +unit-tests/varmod-undefined.mk +unit-tests/varmod-unique.exp +unit-tests/varmod-unique.mk +unit-tests/varmod.exp +unit-tests/varmod.mk +unit-tests/varname-dollar.exp +unit-tests/varname-dollar.mk +unit-tests/varname-dot-alltargets.exp +unit-tests/varname-dot-alltargets.mk +unit-tests/varname-dot-curdir.exp +unit-tests/varname-dot-curdir.mk +unit-tests/varname-dot-includes.exp +unit-tests/varname-dot-includes.mk +unit-tests/varname-dot-includedfromdir.exp +unit-tests/varname-dot-includedfromdir.mk +unit-tests/varname-dot-includedfromfile.exp +unit-tests/varname-dot-includedfromfile.mk +unit-tests/varname-dot-libs.exp +unit-tests/varname-dot-libs.mk +unit-tests/varname-dot-make-dependfile.exp +unit-tests/varname-dot-make-dependfile.mk +unit-tests/varname-dot-make-expand_variables.exp +unit-tests/varname-dot-make-expand_variables.mk +unit-tests/varname-dot-make-exported.exp +unit-tests/varname-dot-make-exported.mk +unit-tests/varname-dot-make-jobs-prefix.exp +unit-tests/varname-dot-make-jobs-prefix.mk +unit-tests/varname-dot-make-jobs.exp +unit-tests/varname-dot-make-jobs.mk +unit-tests/varname-dot-make-level.exp +unit-tests/varname-dot-make-level.mk +unit-tests/varname-dot-make-makefile_preference.exp +unit-tests/varname-dot-make-makefile_preference.mk +unit-tests/varname-dot-make-makefiles.exp +unit-tests/varname-dot-make-makefiles.mk +unit-tests/varname-dot-make-meta-bailiwick.exp +unit-tests/varname-dot-make-meta-bailiwick.mk +unit-tests/varname-dot-make-meta-created.exp +unit-tests/varname-dot-make-meta-created.mk +unit-tests/varname-dot-make-meta-files.exp +unit-tests/varname-dot-make-meta-files.mk +unit-tests/varname-dot-make-meta-ignore_filter.exp +unit-tests/varname-dot-make-meta-ignore_filter.mk +unit-tests/varname-dot-make-meta-ignore_paths.exp +unit-tests/varname-dot-make-meta-ignore_paths.mk +unit-tests/varname-dot-make-meta-ignore_patterns.exp +unit-tests/varname-dot-make-meta-ignore_patterns.mk +unit-tests/varname-dot-make-meta-prefix.exp +unit-tests/varname-dot-make-meta-prefix.mk +unit-tests/varname-dot-make-mode.exp +unit-tests/varname-dot-make-mode.mk +unit-tests/varname-dot-make-path_filemon.exp +unit-tests/varname-dot-make-path_filemon.mk +unit-tests/varname-dot-make-pid.exp +unit-tests/varname-dot-make-pid.mk +unit-tests/varname-dot-make-ppid.exp +unit-tests/varname-dot-make-ppid.mk +unit-tests/varname-dot-make-save_dollars.exp +unit-tests/varname-dot-make-save_dollars.mk +unit-tests/varname-dot-makeoverrides.exp +unit-tests/varname-dot-makeoverrides.mk +unit-tests/varname-dot-newline.exp +unit-tests/varname-dot-newline.mk +unit-tests/varname-dot-objdir.exp +unit-tests/varname-dot-objdir.mk +unit-tests/varname-dot-parsedir.exp +unit-tests/varname-dot-parsedir.mk +unit-tests/varname-dot-parsefile.exp +unit-tests/varname-dot-parsefile.mk +unit-tests/varname-dot-path.exp +unit-tests/varname-dot-path.mk +unit-tests/varname-dot-shell.exp +unit-tests/varname-dot-shell.mk +unit-tests/varname-dot-targets.exp +unit-tests/varname-dot-targets.mk +unit-tests/varname-empty.exp +unit-tests/varname-empty.mk +unit-tests/varname-make.exp +unit-tests/varname-make.mk +unit-tests/varname-make_print_var_on_error.exp +unit-tests/varname-make_print_var_on_error.mk +unit-tests/varname-makeflags.exp +unit-tests/varname-makeflags.mk +unit-tests/varname-pwd.exp +unit-tests/varname-pwd.mk +unit-tests/varname-vpath.exp +unit-tests/varname-vpath.mk +unit-tests/varname.exp +unit-tests/varname.mk +unit-tests/varparse-dynamic.exp +unit-tests/varparse-dynamic.mk unit-tests/varquote.exp unit-tests/varquote.mk unit-tests/varshell.exp Modified: vendor/NetBSD/bmake/dist/LICENSE ============================================================================== --- vendor/NetBSD/bmake/dist/LICENSE Sat Sep 5 10:16:24 2020 (r365360) +++ vendor/NetBSD/bmake/dist/LICENSE Sat Sep 5 16:11:04 2020 (r365361) @@ -3,6 +3,7 @@ original contributors or assignees. Including: Copyright (c) 1993-2020, Simon J Gerraty + Copyright (c) 2020, Roland Illig Copyright (c) 2009-2016, Juniper Networks, Inc. Copyright (c) 2009, John Birrell. Copyright (c) 1997-2020 The NetBSD Foundation, Inc. Modified: vendor/NetBSD/bmake/dist/Makefile ============================================================================== --- vendor/NetBSD/bmake/dist/Makefile Sat Sep 5 10:16:24 2020 (r365360) +++ vendor/NetBSD/bmake/dist/Makefile Sat Sep 5 16:11:04 2020 (r365361) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.107 2020/06/07 21:18:46 sjg Exp $ +# $Id: Makefile,v 1.112 2020/08/28 16:26:17 sjg Exp $ PROG= bmake @@ -8,9 +8,11 @@ SRCS= \ compat.c \ cond.c \ dir.c \ + enum.c \ for.c \ hash.c \ job.c \ + lst.c \ main.c \ make.c \ make_malloc.c \ @@ -25,36 +27,6 @@ SRCS= \ util.c \ var.c -# from lst.lib/ -SRCS+= \ - lstAppend.c \ - lstAtEnd.c \ - lstAtFront.c \ - lstClose.c \ - lstConcat.c \ - lstDatum.c \ - lstDeQueue.c \ - lstDestroy.c \ - lstDupl.c \ - lstEnQueue.c \ - lstFind.c \ - lstFindFrom.c \ - lstFirst.c \ - lstForEach.c \ - lstForEachFrom.c \ - lstInit.c \ - lstInsert.c \ - lstIsAtEnd.c \ - lstIsEmpty.c \ - lstLast.c \ - lstMember.c \ - lstNext.c \ - lstOpen.c \ - lstPrev.c \ - lstRemove.c \ - lstReplace.c \ - lstSucc.c - .-include "VERSION" .-include "Makefile.inc" @@ -97,7 +69,6 @@ COPTS.filemon_dev.c += -DHAVE_FILEMON_H -I${FILEMON_H: .endif # USE_FILEMON .PATH: ${srcdir} -.PATH: ${srcdir}/lst.lib .if make(obj) || make(clean) SUBDIR+= unit-tests @@ -109,7 +80,7 @@ SUBDIR+= unit-tests # list of OS's which are derrived from BSD4.4 BSD44_LIST= NetBSD FreeBSD OpenBSD DragonFly MirBSD Bitrig # we are... -OS!= uname -s +OS := ${.MAKE.OS:U${uname -s:L:sh}} # are we 4.4BSD ? isBSD44:=${BSD44_LIST:M${OS}} @@ -237,5 +208,8 @@ install-mk: # end-delete2 # A simple unit-test driver to help catch regressions +TEST_MAKE ?= ${.OBJDIR}/${PROG:T} accept test: - cd ${.CURDIR}/unit-tests && MAKEFLAGS= ${.MAKE} -r -m / TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET} + cd ${.CURDIR}/unit-tests && \ + MAKEFLAGS= ${TEST_MAKE} -r -m / ${.TARGET} ${TESTS:DTESTS=${TESTS:Q}} + Modified: vendor/NetBSD/bmake/dist/VERSION ============================================================================== --- vendor/NetBSD/bmake/dist/VERSION Sat Sep 5 10:16:24 2020 (r365360) +++ vendor/NetBSD/bmake/dist/VERSION Sat Sep 5 16:11:04 2020 (r365361) @@ -1,2 +1,2 @@ # keep this compatible with sh and make -_MAKE_VERSION=20200710 +_MAKE_VERSION=20200902 Modified: vendor/NetBSD/bmake/dist/arch.c ============================================================================== --- vendor/NetBSD/bmake/dist/arch.c Sat Sep 5 10:16:24 2020 (r365360) +++ vendor/NetBSD/bmake/dist/arch.c Sat Sep 5 16:11:04 2020 (r365361) @@ -1,4 +1,4 @@ -/* $NetBSD: arch.c,v 1.73 2020/07/03 08:02:55 rillig Exp $ */ +/* $NetBSD: arch.c,v 1.107 2020/08/30 11:15:05 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: arch.c,v 1.73 2020/07/03 08:02:55 rillig Exp $"; +static char rcsid[] = "$NetBSD: arch.c,v 1.107 2020/08/30 11:15:05 rillig Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: arch.c,v 1.73 2020/07/03 08:02:55 rillig Exp $"); +__RCSID("$NetBSD: arch.c,v 1.107 2020/08/30 11:15:05 rillig Exp $"); #endif #endif /* not lint */ #endif @@ -94,7 +94,7 @@ __RCSID("$NetBSD: arch.c,v 1.73 2020/07/03 08:02:55 ri * The interface to this module is: * Arch_ParseArchive Given an archive specification, return a list * of GNode's, one for each member in the spec. - * FAILURE is returned if the specification is + * FALSE is returned if the specification is * invalid for some reason. * * Arch_Touch Alter the modification time of the archive @@ -184,12 +184,9 @@ typedef struct Arch { size_t fnamesize; /* Size of the string table */ } Arch; -static int ArchFindArchive(const void *, const void *); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Sat Sep 5 16:13:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF94D3CF9E7; Sat, 5 Sep 2020 16:13:36 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkKNJ4hkFz4bKh; Sat, 5 Sep 2020 16:13:36 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 848952063C; Sat, 5 Sep 2020 16:13:36 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085GDaN4010581; Sat, 5 Sep 2020 16:13:36 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085GDaos010579; Sat, 5 Sep 2020 16:13:36 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202009051613.085GDaos010579@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 5 Sep 2020 16:13:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365362 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 365362 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 16:13:36 -0000 Author: emaste Date: Sat Sep 5 16:13:36 2020 New Revision: 365362 URL: https://svnweb.freebsd.org/changeset/base/365362 Log: rtsock.c: remove extraneous space Submitted by: Neel Chauhan Differential Revision: https://reviews.freebsd.org/D26249 Modified: head/sys/net/rtsock.c Modified: head/sys/net/rtsock.c ============================================================================== --- head/sys/net/rtsock.c Sat Sep 5 16:11:04 2020 (r365361) +++ head/sys/net/rtsock.c Sat Sep 5 16:13:36 2020 (r365362) @@ -2137,7 +2137,7 @@ static struct protosw routesw[] = { static struct domain routedomain = { .dom_family = PF_ROUTE, - .dom_name = "route", + .dom_name = "route", .dom_protosw = routesw, .dom_protoswNPROTOSW = &routesw[nitems(routesw)] }; From owner-svn-src-all@freebsd.org Sat Sep 5 16:44:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0C9AF3D07DC; Sat, 5 Sep 2020 16:44:38 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkL456YSfz4dCP; Sat, 5 Sep 2020 16:44:37 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB06220B2E; Sat, 5 Sep 2020 16:44:37 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085Gibej029449; Sat, 5 Sep 2020 16:44:37 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085GibwG029448; Sat, 5 Sep 2020 16:44:37 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <202009051644.085GibwG029448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sat, 5 Sep 2020 16:44:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r365363 - vendor/NetBSD/bmake/20200902 X-SVN-Group: vendor X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: vendor/NetBSD/bmake/20200902 X-SVN-Commit-Revision: 365363 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 16:44:38 -0000 Author: sjg Date: Sat Sep 5 16:44:37 2020 New Revision: 365363 URL: https://svnweb.freebsd.org/changeset/base/365363 Log: tag bmake-20200902 Added: vendor/NetBSD/bmake/20200902/ - copied from r365362, vendor/NetBSD/bmake/dist/ From owner-svn-src-all@freebsd.org Sat Sep 5 17:02:50 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 370F33D0BF3; Sat, 5 Sep 2020 17:02:50 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkLT60jxcz4dyM; Sat, 5 Sep 2020 17:02:50 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F020920E41; Sat, 5 Sep 2020 17:02:49 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085H2nhG041803; Sat, 5 Sep 2020 17:02:49 GMT (envelope-from mr@FreeBSD.org) Received: (from mr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085H2nWR041800; Sat, 5 Sep 2020 17:02:49 GMT (envelope-from mr@FreeBSD.org) Message-Id: <202009051702.085H2nWR041800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mr set sender to mr@FreeBSD.org using -f From: Michael Reifenberger Date: Sat, 5 Sep 2020 17:02:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365364 - stable/12/usr.bin/systat X-SVN-Group: stable-12 X-SVN-Commit-Author: mr X-SVN-Commit-Paths: stable/12/usr.bin/systat X-SVN-Commit-Revision: 365364 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 17:02:50 -0000 Author: mr Date: Sat Sep 5 17:02:48 2020 New Revision: 365364 URL: https://svnweb.freebsd.org/changeset/base/365364 Log: MFC r363095: Handle device removal and removal+add cases to fix infinity rate. PR: 219829 Submitted by: ota@j.email.ne.jp Reported by: rezo@live.cn Differential Revision: https://reviews.freebsd.org/D25226 Modified: stable/12/usr.bin/systat/ifcmds.c stable/12/usr.bin/systat/ifstat.c stable/12/usr.bin/systat/systat.1 Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/systat/ifcmds.c ============================================================================== --- stable/12/usr.bin/systat/ifcmds.c Sat Sep 5 16:44:37 2020 (r365363) +++ stable/12/usr.bin/systat/ifcmds.c Sat Sep 5 17:02:48 2020 (r365364) @@ -74,6 +74,8 @@ ifcmd(const char *cmd, const char *args) } } else if (prefix(cmd, "pps")) showpps = !showpps; + else + return (0); return (1); } Modified: stable/12/usr.bin/systat/ifstat.c ============================================================================== --- stable/12/usr.bin/systat/ifstat.c Sat Sep 5 16:44:37 2020 (r365363) +++ stable/12/usr.bin/systat/ifstat.c Sat Sep 5 17:02:48 2020 (r365364) @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -67,7 +68,8 @@ SLIST_HEAD(, if_stat_disp) displist; struct if_stat { SLIST_ENTRY(if_stat) link; - char if_name[IF_NAMESIZE]; + char display_name[IF_NAMESIZE]; + char dev_name[IFNAMSIZ]; /* copied from ifmibdata */ struct ifmibdata if_mib; struct timeval tv; struct timeval tv_lastchanged; @@ -81,7 +83,7 @@ struct if_stat { uint64_t if_out_pps_peak; u_int if_row; /* Index into ifmib sysctl */ int if_ypos; /* -1 if not being displayed */ - u_int display; + bool display; u_int match; }; @@ -91,11 +93,13 @@ extern int showpps; extern int needsort; static int needclear = 0; +static bool displayall = false; -static void right_align_string(struct if_stat *); -static void getifmibdata(const int, struct ifmibdata *); +static void format_device_name(struct if_stat *); +static int getifmibdata(const int, struct ifmibdata *); static void sort_interface_list(void); static u_int getifnum(void); +static void clearifstat(void); #define IFSTAT_ERR(n, s) do { \ putchar('\014'); \ @@ -165,7 +169,7 @@ static u_int getifnum(void); } while (0) #define PUTNAME(p) do { \ - mvprintw(p->if_ypos, 0, "%s", p->if_name); \ + mvprintw(p->if_ypos, 0, "%s", p->display_name); \ mvprintw(p->if_ypos, col2-3, "%s", (const char *)"in"); \ mvprintw(p->if_ypos+1, col2-3, "%s", (const char *)"out"); \ } while (0) @@ -214,7 +218,7 @@ showifstat(void) SLIST_FOREACH(ifp, &curlist, link) { if (ifp->if_ypos < LINES - 3 && ifp->if_ypos != -1) - if (ifp->display == 0 || ifp->match == 0) { + if (!ifp->display || ifp->match == 0) { wmove(wnd, ifp->if_ypos, 0); wclrtoeol(wnd); wmove(wnd, ifp->if_ypos + 1, 0); @@ -235,7 +239,7 @@ int initifstat(void) { struct if_stat *p = NULL; - u_int n = 0, i = 0; + u_int n, i; n = getifnum(); if (n <= 0) @@ -247,18 +251,21 @@ initifstat(void) p = (struct if_stat *)calloc(1, sizeof(struct if_stat)); if (p == NULL) IFSTAT_ERR(1, "out of memory"); - SLIST_INSERT_HEAD(&curlist, p, link); p->if_row = i+1; - getifmibdata(p->if_row, &p->if_mib); - right_align_string(p); + if (getifmibdata(p->if_row, &p->if_mib) == -1) { + free(p); + continue; + } + SLIST_INSERT_HEAD(&curlist, p, link); + format_device_name(p); p->match = 1; /* * Initially, we only display interfaces that have - * received some traffic. + * received some traffic unless display-all is on. */ - if (p->if_mib.ifmd_data.ifi_ibytes != 0) - p->display = 1; + if (displayall || p->if_mib.ifmd_data.ifi_ibytes != 0) + p->display = true; } sort_interface_list(); @@ -269,13 +276,13 @@ initifstat(void) void fetchifstat(void) { - struct if_stat *ifp = NULL; + struct if_stat *ifp = NULL, *temp_var; struct timeval tv, new_tv, old_tv; double elapsed = 0.0; uint64_t new_inb, new_outb, old_inb, old_outb = 0; uint64_t new_inp, new_outp, old_inp, old_outp = 0; - SLIST_FOREACH(ifp, &curlist, link) { + SLIST_FOREACH_SAFE(ifp, &curlist, link, temp_var) { /* * Grab a copy of the old input/output values before we * call getifmibdata(). @@ -287,7 +294,22 @@ fetchifstat(void) ifp->tv_lastchanged = ifp->if_mib.ifmd_data.ifi_lastchange; (void)gettimeofday(&new_tv, NULL); - (void)getifmibdata(ifp->if_row, &ifp->if_mib); + if (getifmibdata(ifp->if_row, &ifp->if_mib) == -1 ) { + /* if a device was removed */ + SLIST_REMOVE(&curlist, ifp, if_stat, link); + free(ifp); + needsort = 1; + clearifstat(); + } else if (strcmp(ifp->dev_name, ifp->if_mib.ifmd_name) != 0 ) { + /* a device was removed and another one was added */ + format_device_name(ifp); + /* clear to the current value for the new device */ + old_inb = ifp->if_mib.ifmd_data.ifi_ibytes; + old_outb = ifp->if_mib.ifmd_data.ifi_obytes; + old_inp = ifp->if_mib.ifmd_data.ifi_ipackets; + old_outp = ifp->if_mib.ifmd_data.ifi_opackets; + needsort = 1; + } new_inb = ifp->if_mib.ifmd_data.ifi_ibytes; new_outb = ifp->if_mib.ifmd_data.ifi_obytes; @@ -295,8 +317,8 @@ fetchifstat(void) new_outp = ifp->if_mib.ifmd_data.ifi_opackets; /* Display interface if it's received some traffic. */ - if (new_inb > 0 && old_inb == 0) { - ifp->display = 1; + if (!ifp->display && new_inb > 0 && old_inb == 0) { + ifp->display = true; needsort = 1; } @@ -351,28 +373,18 @@ fetchifstat(void) /* * We want to right justify our interface names against the first column * (first sixteen or so characters), so we need to do some alignment. + * We save original name so that we can find a same spot is take by a + * different device. */ static void -right_align_string(struct if_stat *ifp) +format_device_name(struct if_stat *ifp) { - int str_len = 0, pad_len = 0; - char *newstr = NULL, *ptr = NULL; - if (ifp == NULL || ifp->if_mib.ifmd_name == NULL) - return; - else { - /* string length + '\0' */ - str_len = strlen(ifp->if_mib.ifmd_name)+1; - pad_len = IF_NAMESIZE-(str_len); - - newstr = ifp->if_name; - ptr = newstr + pad_len; - (void)memset((void *)newstr, (int)' ', IF_NAMESIZE); - (void)strncpy(ptr, (const char *)&ifp->if_mib.ifmd_name, - str_len); + if (ifp != NULL ) { + snprintf(ifp->display_name, IF_NAMESIZE, "%*s", IF_NAMESIZE-1, + ifp->if_mib.ifmd_name); + strcpy(ifp->dev_name, ifp->if_mib.ifmd_name); } - - return; } static int @@ -461,9 +473,10 @@ getifnum(void) return (data); } -static void +static int getifmibdata(int row, struct ifmibdata *data) { + int ret = 0; size_t datalen = 0; static int name[] = { CTL_NET, PF_LINK, @@ -474,9 +487,12 @@ getifmibdata(int row, struct ifmibdata *data) datalen = sizeof(*data); name[4] = row; - if ((sysctl(name, 6, (void *)data, (size_t *)&datalen, (void *)NULL, - (size_t)0) != 0) && (errno != ENOENT)) + ret = sysctl(name, 6, (void *)data, (size_t *)&datalen, (void *)NULL, + (size_t)0); + if ((ret != 0) && (errno != ENOENT)) IFSTAT_ERR(2, "sysctl error getting interface data"); + + return (ret); } int @@ -487,13 +503,23 @@ cmdifstat(const char *cmd, const char *args) retval = ifcmd(cmd, args); /* ifcmd() returns 1 on success */ if (retval == 1) { - if (needclear) { - showifstat(); - refresh(); - werase(wnd); - labelifstat(); - needclear = 0; - } + if (needclear) + clearifstat(); } + else if (prefix(cmd, "all")) { + retval = 1; + displayall = true; + } return (retval); +} + +static void +clearifstat(void) +{ + + showifstat(); + refresh(); + werase(wnd); + labelifstat(); + needclear = 0; } Modified: stable/12/usr.bin/systat/systat.1 ============================================================================== --- stable/12/usr.bin/systat/systat.1 Sat Sep 5 16:44:37 2020 (r365363) +++ stable/12/usr.bin/systat/systat.1 Sat Sep 5 17:02:48 2020 (r365364) @@ -680,6 +680,7 @@ in Silicon Graphics' system. .Sh BUGS Certain displays presume a minimum of 80 characters per line. +Ifstat does not detect new interfaces. The .Ic vmstat display looks out of place because it is (it was added in as From owner-svn-src-all@freebsd.org Sat Sep 5 19:03:34 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D49FE3D368D; Sat, 5 Sep 2020 19:03:34 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkP8Q59wpz3WS9; Sat, 5 Sep 2020 19:03:34 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 951C0224CF; Sat, 5 Sep 2020 19:03:34 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085J3Y3x015518; Sat, 5 Sep 2020 19:03:34 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085J3YCE015517; Sat, 5 Sep 2020 19:03:34 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202009051903.085J3YCE015517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 5 Sep 2020 19:03:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365365 - head/tools/boot X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/tools/boot X-SVN-Commit-Revision: 365365 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 19:03:34 -0000 Author: emaste Date: Sat Sep 5 19:03:34 2020 New Revision: 365365 URL: https://svnweb.freebsd.org/changeset/base/365365 Log: ci-qemu-test.sh: use pkgbase Reviewed by: bcran (earlier), manu (earlier), imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D24276 Modified: head/tools/boot/ci-qemu-test.sh Modified: head/tools/boot/ci-qemu-test.sh ============================================================================== --- head/tools/boot/ci-qemu-test.sh Sat Sep 5 17:02:48 2020 (r365364) +++ head/tools/boot/ci-qemu-test.sh Sat Sep 5 19:03:34 2020 (r365365) @@ -1,11 +1,12 @@ #!/bin/sh -# Install loader, kernel, and enough of userland to boot in QEMU and echo -# "Hello world." from init, as a very quick smoke test for CI. Uses QEMU's -# virtual FAT filesystem to avoid the need to create a disk image. While -# designed for CI automated testing, this script can also be run by hand as -# a quick smoke-test. The rootgen.sh and related scripts generate much more -# extensive tests for many combinations of boot env (ufs, zfs, geli, etc). +# Install pkgbase packages for loader, kernel, and enough of userland to boot +# in QEMU and echo "Hello world." from init, as a very quick smoke test for CI. +# Uses QEMU's virtual FAT filesystem to avoid the need to create a disk image. +# While designed for CI automated testing, this script can also be run by hand +# as a quick smoke-test as long as pkgbase packages have been built. The +# rootgen.sh and related scripts generate much more extensive tests for many +# combinations of boot env (ufs, zfs, geli, etc). # # $FreeBSD$ @@ -26,32 +27,22 @@ tempdir_cleanup() tempdir_setup() { # Create minimal directory structure and populate it. - # Caller must cd ${SRCTOP} before calling this function. for dir in dev bin efi/boot etc lib libexec sbin usr/lib usr/libexec; do mkdir -p ${ROOTDIR}/${dir} done # Install kernel, loader and minimal userland. + cat<${ROOTDIR}/pkg.conf +REPOS_DIR=[] +repositories={local {url = file://$(dirname $OBJTOP)/repo/\${ABI}/latest}} +EOF + ASSUME_ALWAYS_YES=true INSTALL_AS_USER=true pkg \ + -o ABI_FILE=$OBJTOP/bin/sh/sh \ + -C ${ROOTDIR}/pkg.conf -r ${ROOTDIR} install \ + FreeBSD-kernel-generic FreeBSD-bootloader \ + FreeBSD-clibs FreeBSD-runtime - make -DNO_ROOT DESTDIR=${ROOTDIR} \ - MODULES_OVERRIDE= \ - WITHOUT_DEBUG_FILES=yes \ - WITHOUT_KERNEL_SYMBOLS=yes \ - installkernel - for dir in stand \ - lib/libc lib/libedit lib/ncurses \ - libexec/rtld-elf \ - bin/sh sbin/init sbin/shutdown sbin/sysctl; do - make -DNO_ROOT DESTDIR=${ROOTDIR} INSTALL="install -U" \ - WITHOUT_DEBUG_FILES= \ - WITHOUT_MAN= \ - WITHOUT_PROFILE= \ - WITHOUT_TESTS= \ - WITHOUT_TOOLCHAIN= \ - -C ${dir} install - done - # Put loader in standard EFI location. mv ${ROOTDIR}/boot/loader.efi ${ROOTDIR}/efi/boot/BOOTx64.EFI @@ -80,6 +71,10 @@ EOF : ${SRCTOP:=$(make -V SRCTOP)} if [ -z "${SRCTOP}" ]; then die "Cannot locate top of source tree" +fi +: ${OBJTOP:=$(make -V OBJTOP)} +if [ -z "${OBJTOP}" ]; then + die "Cannot locate top of object tree" fi # Locate the uefi firmware file used by qemu. From owner-svn-src-all@freebsd.org Sat Sep 5 19:29:43 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CB59E3D3E2E; Sat, 5 Sep 2020 19:29:43 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkPkb3xwjz3XbV; Sat, 5 Sep 2020 19:29:43 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 69FBE229A1; Sat, 5 Sep 2020 19:29:43 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085JThdn027916; Sat, 5 Sep 2020 19:29:43 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085JTgl6027910; Sat, 5 Sep 2020 19:29:42 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <202009051929.085JTgl6027910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sat, 5 Sep 2020 19:29:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365366 - in head: contrib/bmake contrib/bmake/lst.lib contrib/bmake/mk contrib/bmake/mk/sys contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests X-SVN-Group: head X-SVN-Commit-Author: sjg X-SVN-Commit-Paths: in head: contrib/bmake contrib/bmake/lst.lib contrib/bmake/mk contrib/bmake/mk/sys contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests X-SVN-Commit-Revision: 365366 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 19:29:43 -0000 Author: sjg Date: Sat Sep 5 19:29:42 2020 New Revision: 365366 URL: https://svnweb.freebsd.org/changeset/base/365366 Log: Update to bmake-20200902 Lots of code refactoring, simplification and cleanup. Lots of new unit-tests providing much higher code coverage. All courtesy of rillig at netbsd. Other significant changes: o new read-only variable .SHELL which provides the path of the shell used to run scripts (as defined by the .SHELL target). o variable parsing detects more errors. o new debug option -dl: LINT mode, does the equivalent of := for all variable assignments so that file and line number are reported for variable parse errors. Added: head/contrib/bmake/enum.c - copied unchanged from r365363, vendor/NetBSD/bmake/dist/enum.c head/contrib/bmake/enum.h - copied unchanged from r365363, vendor/NetBSD/bmake/dist/enum.h head/contrib/bmake/lst.c - copied unchanged from r365363, vendor/NetBSD/bmake/dist/lst.c head/contrib/bmake/mk/dirdeps-cache-update.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/mk/dirdeps-cache-update.mk head/contrib/bmake/unit-tests/archive-suffix.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/archive-suffix.exp head/contrib/bmake/unit-tests/archive-suffix.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/archive-suffix.mk head/contrib/bmake/unit-tests/archive.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/archive.exp head/contrib/bmake/unit-tests/archive.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/archive.mk head/contrib/bmake/unit-tests/cmd-interrupt.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cmd-interrupt.exp head/contrib/bmake/unit-tests/cmd-interrupt.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cmd-interrupt.mk head/contrib/bmake/unit-tests/cmdline.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cmdline.exp head/contrib/bmake/unit-tests/cmdline.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cmdline.mk head/contrib/bmake/unit-tests/cond-cmp-numeric-eq.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-eq.exp head/contrib/bmake/unit-tests/cond-cmp-numeric-eq.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-eq.mk head/contrib/bmake/unit-tests/cond-cmp-numeric-ge.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ge.exp head/contrib/bmake/unit-tests/cond-cmp-numeric-ge.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ge.mk head/contrib/bmake/unit-tests/cond-cmp-numeric-gt.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-gt.exp head/contrib/bmake/unit-tests/cond-cmp-numeric-gt.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-gt.mk head/contrib/bmake/unit-tests/cond-cmp-numeric-le.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-le.exp head/contrib/bmake/unit-tests/cond-cmp-numeric-le.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-le.mk head/contrib/bmake/unit-tests/cond-cmp-numeric-lt.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-lt.exp head/contrib/bmake/unit-tests/cond-cmp-numeric-lt.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-lt.mk head/contrib/bmake/unit-tests/cond-cmp-numeric-ne.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ne.exp head/contrib/bmake/unit-tests/cond-cmp-numeric-ne.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric-ne.mk head/contrib/bmake/unit-tests/cond-cmp-numeric.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric.exp head/contrib/bmake/unit-tests/cond-cmp-numeric.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-numeric.mk head/contrib/bmake/unit-tests/cond-cmp-string.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-string.exp head/contrib/bmake/unit-tests/cond-cmp-string.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-cmp-string.mk head/contrib/bmake/unit-tests/cond-func-commands.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-commands.exp head/contrib/bmake/unit-tests/cond-func-commands.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-commands.mk head/contrib/bmake/unit-tests/cond-func-defined.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-defined.exp head/contrib/bmake/unit-tests/cond-func-defined.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-defined.mk head/contrib/bmake/unit-tests/cond-func-empty.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-empty.exp head/contrib/bmake/unit-tests/cond-func-empty.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-empty.mk head/contrib/bmake/unit-tests/cond-func-exists.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-exists.exp head/contrib/bmake/unit-tests/cond-func-exists.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-exists.mk head/contrib/bmake/unit-tests/cond-func-make.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-make.exp head/contrib/bmake/unit-tests/cond-func-make.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-make.mk head/contrib/bmake/unit-tests/cond-func-target.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-target.exp head/contrib/bmake/unit-tests/cond-func-target.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func-target.mk head/contrib/bmake/unit-tests/cond-func.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func.exp head/contrib/bmake/unit-tests/cond-func.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-func.mk head/contrib/bmake/unit-tests/cond-op-and.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-and.exp head/contrib/bmake/unit-tests/cond-op-and.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-and.mk head/contrib/bmake/unit-tests/cond-op-not.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-not.exp head/contrib/bmake/unit-tests/cond-op-not.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-not.mk head/contrib/bmake/unit-tests/cond-op-or.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-or.exp head/contrib/bmake/unit-tests/cond-op-or.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-or.mk head/contrib/bmake/unit-tests/cond-op-parentheses.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-parentheses.exp head/contrib/bmake/unit-tests/cond-op-parentheses.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op-parentheses.mk head/contrib/bmake/unit-tests/cond-op.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op.exp head/contrib/bmake/unit-tests/cond-op.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-op.mk head/contrib/bmake/unit-tests/cond-token-number.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-number.exp head/contrib/bmake/unit-tests/cond-token-number.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-number.mk head/contrib/bmake/unit-tests/cond-token-plain.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-plain.exp head/contrib/bmake/unit-tests/cond-token-plain.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-plain.mk head/contrib/bmake/unit-tests/cond-token-string.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-string.exp head/contrib/bmake/unit-tests/cond-token-string.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-string.mk head/contrib/bmake/unit-tests/cond-token-var.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-var.exp head/contrib/bmake/unit-tests/cond-token-var.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/cond-token-var.mk head/contrib/bmake/unit-tests/counter.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/counter.exp head/contrib/bmake/unit-tests/counter.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/counter.mk head/contrib/bmake/unit-tests/dep-colon.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-colon.exp head/contrib/bmake/unit-tests/dep-colon.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-colon.mk head/contrib/bmake/unit-tests/dep-double-colon.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-double-colon.exp head/contrib/bmake/unit-tests/dep-double-colon.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-double-colon.mk head/contrib/bmake/unit-tests/dep-exclam.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-exclam.exp head/contrib/bmake/unit-tests/dep-exclam.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-exclam.mk head/contrib/bmake/unit-tests/dep-none.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-none.exp head/contrib/bmake/unit-tests/dep-none.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-none.mk head/contrib/bmake/unit-tests/dep-var.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-var.exp head/contrib/bmake/unit-tests/dep-var.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-var.mk head/contrib/bmake/unit-tests/dep-wildcards.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-wildcards.exp head/contrib/bmake/unit-tests/dep-wildcards.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep-wildcards.mk head/contrib/bmake/unit-tests/dep.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep.exp head/contrib/bmake/unit-tests/dep.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dep.mk head/contrib/bmake/unit-tests/depsrc-exec.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-exec.exp head/contrib/bmake/unit-tests/depsrc-exec.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-exec.mk head/contrib/bmake/unit-tests/depsrc-ignore.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-ignore.exp head/contrib/bmake/unit-tests/depsrc-ignore.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-ignore.mk head/contrib/bmake/unit-tests/depsrc-made.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-made.exp head/contrib/bmake/unit-tests/depsrc-made.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-made.mk head/contrib/bmake/unit-tests/depsrc-make.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-make.exp head/contrib/bmake/unit-tests/depsrc-make.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-make.mk head/contrib/bmake/unit-tests/depsrc-meta.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-meta.exp head/contrib/bmake/unit-tests/depsrc-meta.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-meta.mk head/contrib/bmake/unit-tests/depsrc-nometa.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa.exp head/contrib/bmake/unit-tests/depsrc-nometa.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa.mk head/contrib/bmake/unit-tests/depsrc-nometa_cmp.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa_cmp.exp head/contrib/bmake/unit-tests/depsrc-nometa_cmp.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nometa_cmp.mk head/contrib/bmake/unit-tests/depsrc-nopath.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nopath.exp head/contrib/bmake/unit-tests/depsrc-nopath.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-nopath.mk head/contrib/bmake/unit-tests/depsrc-notmain.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-notmain.exp head/contrib/bmake/unit-tests/depsrc-notmain.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-notmain.mk head/contrib/bmake/unit-tests/depsrc-optional.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-optional.exp head/contrib/bmake/unit-tests/depsrc-optional.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-optional.mk head/contrib/bmake/unit-tests/depsrc-phony.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-phony.exp head/contrib/bmake/unit-tests/depsrc-phony.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-phony.mk head/contrib/bmake/unit-tests/depsrc-precious.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-precious.exp head/contrib/bmake/unit-tests/depsrc-precious.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-precious.mk head/contrib/bmake/unit-tests/depsrc-recursive.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-recursive.exp head/contrib/bmake/unit-tests/depsrc-recursive.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-recursive.mk head/contrib/bmake/unit-tests/depsrc-silent.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-silent.exp head/contrib/bmake/unit-tests/depsrc-silent.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-silent.mk head/contrib/bmake/unit-tests/depsrc-use.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-use.exp head/contrib/bmake/unit-tests/depsrc-use.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-use.mk head/contrib/bmake/unit-tests/depsrc-usebefore-double-colon.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore-double-colon.exp head/contrib/bmake/unit-tests/depsrc-usebefore-double-colon.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore-double-colon.mk head/contrib/bmake/unit-tests/depsrc-usebefore.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore.exp head/contrib/bmake/unit-tests/depsrc-usebefore.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-usebefore.mk head/contrib/bmake/unit-tests/depsrc-wait.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-wait.exp head/contrib/bmake/unit-tests/depsrc-wait.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc-wait.mk head/contrib/bmake/unit-tests/depsrc.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc.exp head/contrib/bmake/unit-tests/depsrc.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/depsrc.mk head/contrib/bmake/unit-tests/deptgt-begin.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-begin.exp head/contrib/bmake/unit-tests/deptgt-begin.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-begin.mk head/contrib/bmake/unit-tests/deptgt-default.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-default.exp head/contrib/bmake/unit-tests/deptgt-default.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-default.mk head/contrib/bmake/unit-tests/deptgt-delete_on_error.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-delete_on_error.exp head/contrib/bmake/unit-tests/deptgt-delete_on_error.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-delete_on_error.mk head/contrib/bmake/unit-tests/deptgt-end.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-end.exp head/contrib/bmake/unit-tests/deptgt-end.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-end.mk head/contrib/bmake/unit-tests/deptgt-error.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-error.exp head/contrib/bmake/unit-tests/deptgt-error.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-error.mk head/contrib/bmake/unit-tests/deptgt-ignore.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-ignore.exp head/contrib/bmake/unit-tests/deptgt-ignore.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-ignore.mk head/contrib/bmake/unit-tests/deptgt-interrupt.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-interrupt.exp head/contrib/bmake/unit-tests/deptgt-interrupt.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-interrupt.mk head/contrib/bmake/unit-tests/deptgt-main.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-main.exp head/contrib/bmake/unit-tests/deptgt-main.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-main.mk head/contrib/bmake/unit-tests/deptgt-makeflags.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-makeflags.exp head/contrib/bmake/unit-tests/deptgt-makeflags.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-makeflags.mk head/contrib/bmake/unit-tests/deptgt-no_parallel.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-no_parallel.exp head/contrib/bmake/unit-tests/deptgt-no_parallel.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-no_parallel.mk head/contrib/bmake/unit-tests/deptgt-nopath.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-nopath.exp head/contrib/bmake/unit-tests/deptgt-nopath.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-nopath.mk head/contrib/bmake/unit-tests/deptgt-notparallel.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-notparallel.exp head/contrib/bmake/unit-tests/deptgt-notparallel.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-notparallel.mk head/contrib/bmake/unit-tests/deptgt-objdir.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-objdir.exp head/contrib/bmake/unit-tests/deptgt-objdir.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-objdir.mk head/contrib/bmake/unit-tests/deptgt-order.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-order.exp head/contrib/bmake/unit-tests/deptgt-order.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-order.mk head/contrib/bmake/unit-tests/deptgt-path-suffix.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-path-suffix.exp head/contrib/bmake/unit-tests/deptgt-path-suffix.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-path-suffix.mk head/contrib/bmake/unit-tests/deptgt-path.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-path.exp head/contrib/bmake/unit-tests/deptgt-path.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-path.mk head/contrib/bmake/unit-tests/deptgt-phony.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-phony.exp head/contrib/bmake/unit-tests/deptgt-phony.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-phony.mk head/contrib/bmake/unit-tests/deptgt-precious.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-precious.exp head/contrib/bmake/unit-tests/deptgt-precious.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-precious.mk head/contrib/bmake/unit-tests/deptgt-shell.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-shell.exp head/contrib/bmake/unit-tests/deptgt-shell.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-shell.mk head/contrib/bmake/unit-tests/deptgt-silent.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-silent.exp head/contrib/bmake/unit-tests/deptgt-silent.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-silent.mk head/contrib/bmake/unit-tests/deptgt-stale.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-stale.exp head/contrib/bmake/unit-tests/deptgt-stale.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-stale.mk head/contrib/bmake/unit-tests/deptgt-suffixes.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-suffixes.exp head/contrib/bmake/unit-tests/deptgt-suffixes.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt-suffixes.mk head/contrib/bmake/unit-tests/deptgt.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt.exp head/contrib/bmake/unit-tests/deptgt.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/deptgt.mk head/contrib/bmake/unit-tests/dir-expand-path.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dir-expand-path.exp head/contrib/bmake/unit-tests/dir-expand-path.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dir-expand-path.mk head/contrib/bmake/unit-tests/dir.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dir.exp head/contrib/bmake/unit-tests/dir.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/dir.mk head/contrib/bmake/unit-tests/directive-elif.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elif.exp head/contrib/bmake/unit-tests/directive-elif.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elif.mk head/contrib/bmake/unit-tests/directive-elifdef.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifdef.exp head/contrib/bmake/unit-tests/directive-elifdef.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifdef.mk head/contrib/bmake/unit-tests/directive-elifmake.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifmake.exp head/contrib/bmake/unit-tests/directive-elifmake.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifmake.mk head/contrib/bmake/unit-tests/directive-elifndef.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifndef.exp head/contrib/bmake/unit-tests/directive-elifndef.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifndef.mk head/contrib/bmake/unit-tests/directive-elifnmake.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifnmake.exp head/contrib/bmake/unit-tests/directive-elifnmake.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-elifnmake.mk head/contrib/bmake/unit-tests/directive-else.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-else.exp head/contrib/bmake/unit-tests/directive-else.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-else.mk head/contrib/bmake/unit-tests/directive-endif.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-endif.exp head/contrib/bmake/unit-tests/directive-endif.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-endif.mk head/contrib/bmake/unit-tests/directive-error.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-error.exp head/contrib/bmake/unit-tests/directive-error.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-error.mk head/contrib/bmake/unit-tests/directive-export-env.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export-env.exp head/contrib/bmake/unit-tests/directive-export-env.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export-env.mk head/contrib/bmake/unit-tests/directive-export-literal.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export-literal.exp head/contrib/bmake/unit-tests/directive-export-literal.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export-literal.mk head/contrib/bmake/unit-tests/directive-export.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export.exp head/contrib/bmake/unit-tests/directive-export.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-export.mk head/contrib/bmake/unit-tests/directive-for-generating-endif.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-for-generating-endif.exp head/contrib/bmake/unit-tests/directive-for-generating-endif.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-for-generating-endif.mk head/contrib/bmake/unit-tests/directive-for.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-for.exp head/contrib/bmake/unit-tests/directive-for.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-for.mk head/contrib/bmake/unit-tests/directive-if.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-if.exp head/contrib/bmake/unit-tests/directive-if.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-if.mk head/contrib/bmake/unit-tests/directive-ifdef.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifdef.exp head/contrib/bmake/unit-tests/directive-ifdef.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifdef.mk head/contrib/bmake/unit-tests/directive-ifmake.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifmake.exp head/contrib/bmake/unit-tests/directive-ifmake.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifmake.mk head/contrib/bmake/unit-tests/directive-ifndef.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifndef.exp head/contrib/bmake/unit-tests/directive-ifndef.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifndef.mk head/contrib/bmake/unit-tests/directive-ifnmake.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifnmake.exp head/contrib/bmake/unit-tests/directive-ifnmake.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-ifnmake.mk head/contrib/bmake/unit-tests/directive-info.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-info.exp head/contrib/bmake/unit-tests/directive-info.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-info.mk head/contrib/bmake/unit-tests/directive-undef.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-undef.exp head/contrib/bmake/unit-tests/directive-undef.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-undef.mk head/contrib/bmake/unit-tests/directive-unexport-env.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-unexport-env.exp head/contrib/bmake/unit-tests/directive-unexport-env.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-unexport-env.mk head/contrib/bmake/unit-tests/directive-unexport.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-unexport.exp head/contrib/bmake/unit-tests/directive-unexport.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-unexport.mk head/contrib/bmake/unit-tests/directive-warning.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-warning.exp head/contrib/bmake/unit-tests/directive-warning.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive-warning.mk head/contrib/bmake/unit-tests/directive.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive.exp head/contrib/bmake/unit-tests/directive.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directive.mk head/contrib/bmake/unit-tests/directives.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directives.exp head/contrib/bmake/unit-tests/directives.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/directives.mk head/contrib/bmake/unit-tests/envfirst.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/envfirst.exp head/contrib/bmake/unit-tests/envfirst.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/envfirst.mk head/contrib/bmake/unit-tests/export-variants.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/export-variants.exp head/contrib/bmake/unit-tests/export-variants.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/export-variants.mk head/contrib/bmake/unit-tests/lint.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/lint.exp head/contrib/bmake/unit-tests/lint.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/lint.mk head/contrib/bmake/unit-tests/make-exported.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/make-exported.exp head/contrib/bmake/unit-tests/make-exported.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/make-exported.mk head/contrib/bmake/unit-tests/opt-backwards.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-backwards.exp head/contrib/bmake/unit-tests/opt-backwards.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-backwards.mk head/contrib/bmake/unit-tests/opt-chdir.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-chdir.exp head/contrib/bmake/unit-tests/opt-chdir.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-chdir.mk head/contrib/bmake/unit-tests/opt-debug-g1.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-debug-g1.exp head/contrib/bmake/unit-tests/opt-debug-g1.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-debug-g1.mk head/contrib/bmake/unit-tests/opt-debug.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-debug.exp head/contrib/bmake/unit-tests/opt-debug.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-debug.mk head/contrib/bmake/unit-tests/opt-define.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-define.exp head/contrib/bmake/unit-tests/opt-define.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-define.mk head/contrib/bmake/unit-tests/opt-env.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-env.exp head/contrib/bmake/unit-tests/opt-env.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-env.mk head/contrib/bmake/unit-tests/opt-file.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-file.exp head/contrib/bmake/unit-tests/opt-file.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-file.mk head/contrib/bmake/unit-tests/opt-ignore.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-ignore.exp head/contrib/bmake/unit-tests/opt-ignore.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-ignore.mk head/contrib/bmake/unit-tests/opt-include-dir.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-include-dir.exp head/contrib/bmake/unit-tests/opt-include-dir.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-include-dir.mk head/contrib/bmake/unit-tests/opt-jobs-internal.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-jobs-internal.exp head/contrib/bmake/unit-tests/opt-jobs-internal.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-jobs-internal.mk head/contrib/bmake/unit-tests/opt-jobs.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-jobs.exp head/contrib/bmake/unit-tests/opt-jobs.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-jobs.mk head/contrib/bmake/unit-tests/opt-keep-going.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-keep-going.exp head/contrib/bmake/unit-tests/opt-keep-going.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-keep-going.mk head/contrib/bmake/unit-tests/opt-m-include-dir.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-m-include-dir.exp head/contrib/bmake/unit-tests/opt-m-include-dir.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-m-include-dir.mk head/contrib/bmake/unit-tests/opt-no-action-at-all.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-no-action-at-all.exp head/contrib/bmake/unit-tests/opt-no-action-at-all.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-no-action-at-all.mk head/contrib/bmake/unit-tests/opt-no-action.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-no-action.exp head/contrib/bmake/unit-tests/opt-no-action.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-no-action.mk head/contrib/bmake/unit-tests/opt-query.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-query.exp head/contrib/bmake/unit-tests/opt-query.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-query.mk head/contrib/bmake/unit-tests/opt-raw.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-raw.exp head/contrib/bmake/unit-tests/opt-raw.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-raw.mk head/contrib/bmake/unit-tests/opt-silent.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-silent.exp head/contrib/bmake/unit-tests/opt-silent.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-silent.mk head/contrib/bmake/unit-tests/opt-touch.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-touch.exp head/contrib/bmake/unit-tests/opt-touch.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-touch.mk head/contrib/bmake/unit-tests/opt-tracefile.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-tracefile.exp head/contrib/bmake/unit-tests/opt-tracefile.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-tracefile.mk head/contrib/bmake/unit-tests/opt-var-expanded.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-var-expanded.exp head/contrib/bmake/unit-tests/opt-var-expanded.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-var-expanded.mk head/contrib/bmake/unit-tests/opt-var-literal.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-var-literal.exp head/contrib/bmake/unit-tests/opt-var-literal.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-var-literal.mk head/contrib/bmake/unit-tests/opt-warnings-as-errors.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-warnings-as-errors.exp head/contrib/bmake/unit-tests/opt-warnings-as-errors.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-warnings-as-errors.mk head/contrib/bmake/unit-tests/opt-where-am-i.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-where-am-i.exp head/contrib/bmake/unit-tests/opt-where-am-i.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-where-am-i.mk head/contrib/bmake/unit-tests/opt-x-reduce-exported.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-x-reduce-exported.exp head/contrib/bmake/unit-tests/opt-x-reduce-exported.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt-x-reduce-exported.mk head/contrib/bmake/unit-tests/opt.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt.exp head/contrib/bmake/unit-tests/opt.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/opt.mk head/contrib/bmake/unit-tests/recursive.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/recursive.exp head/contrib/bmake/unit-tests/recursive.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/recursive.mk head/contrib/bmake/unit-tests/sh-dots.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-dots.exp head/contrib/bmake/unit-tests/sh-dots.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-dots.mk head/contrib/bmake/unit-tests/sh-jobs-error.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-jobs-error.exp head/contrib/bmake/unit-tests/sh-jobs-error.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-jobs-error.mk head/contrib/bmake/unit-tests/sh-jobs.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-jobs.exp head/contrib/bmake/unit-tests/sh-jobs.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-jobs.mk head/contrib/bmake/unit-tests/sh-leading-at.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-at.exp head/contrib/bmake/unit-tests/sh-leading-at.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-at.mk head/contrib/bmake/unit-tests/sh-leading-hyphen.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-hyphen.exp head/contrib/bmake/unit-tests/sh-leading-hyphen.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-hyphen.mk head/contrib/bmake/unit-tests/sh-leading-plus.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-plus.exp head/contrib/bmake/unit-tests/sh-leading-plus.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-leading-plus.mk head/contrib/bmake/unit-tests/sh-meta-chars.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-meta-chars.exp head/contrib/bmake/unit-tests/sh-meta-chars.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-meta-chars.mk head/contrib/bmake/unit-tests/sh-multi-line.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-multi-line.exp head/contrib/bmake/unit-tests/sh-multi-line.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-multi-line.mk head/contrib/bmake/unit-tests/sh-single-line.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-single-line.exp head/contrib/bmake/unit-tests/sh-single-line.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh-single-line.mk head/contrib/bmake/unit-tests/sh.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh.exp head/contrib/bmake/unit-tests/sh.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/sh.mk head/contrib/bmake/unit-tests/use-inference.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/use-inference.exp head/contrib/bmake/unit-tests/use-inference.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/use-inference.mk head/contrib/bmake/unit-tests/var-class-cmdline.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-cmdline.exp head/contrib/bmake/unit-tests/var-class-cmdline.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-cmdline.mk head/contrib/bmake/unit-tests/var-class-env.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-env.exp head/contrib/bmake/unit-tests/var-class-env.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-env.mk head/contrib/bmake/unit-tests/var-class-global.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-global.exp head/contrib/bmake/unit-tests/var-class-global.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-global.mk head/contrib/bmake/unit-tests/var-class-local-legacy.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-local-legacy.exp head/contrib/bmake/unit-tests/var-class-local-legacy.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-local-legacy.mk head/contrib/bmake/unit-tests/var-class-local.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-local.exp head/contrib/bmake/unit-tests/var-class-local.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class-local.mk head/contrib/bmake/unit-tests/var-class.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class.exp head/contrib/bmake/unit-tests/var-class.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-class.mk head/contrib/bmake/unit-tests/var-op-append.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-append.exp head/contrib/bmake/unit-tests/var-op-append.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-append.mk head/contrib/bmake/unit-tests/var-op-assign.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-assign.exp head/contrib/bmake/unit-tests/var-op-assign.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-assign.mk head/contrib/bmake/unit-tests/var-op-default.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-default.exp head/contrib/bmake/unit-tests/var-op-default.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-default.mk head/contrib/bmake/unit-tests/var-op-expand.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-expand.exp head/contrib/bmake/unit-tests/var-op-expand.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-expand.mk head/contrib/bmake/unit-tests/var-op-shell.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-shell.exp head/contrib/bmake/unit-tests/var-op-shell.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op-shell.mk head/contrib/bmake/unit-tests/var-op.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op.exp head/contrib/bmake/unit-tests/var-op.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/var-op.mk head/contrib/bmake/unit-tests/vardebug.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/vardebug.exp head/contrib/bmake/unit-tests/vardebug.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/vardebug.mk head/contrib/bmake/unit-tests/varfind.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varfind.exp head/contrib/bmake/unit-tests/varfind.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varfind.mk head/contrib/bmake/unit-tests/varmod-assign.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-assign.exp head/contrib/bmake/unit-tests/varmod-assign.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-assign.mk head/contrib/bmake/unit-tests/varmod-defined.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-defined.exp head/contrib/bmake/unit-tests/varmod-defined.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-defined.mk head/contrib/bmake/unit-tests/varmod-exclam-shell.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-exclam-shell.exp head/contrib/bmake/unit-tests/varmod-exclam-shell.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-exclam-shell.mk head/contrib/bmake/unit-tests/varmod-extension.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-extension.exp head/contrib/bmake/unit-tests/varmod-extension.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-extension.mk head/contrib/bmake/unit-tests/varmod-gmtime.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-gmtime.exp head/contrib/bmake/unit-tests/varmod-gmtime.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-gmtime.mk head/contrib/bmake/unit-tests/varmod-hash.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-hash.exp head/contrib/bmake/unit-tests/varmod-hash.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-hash.mk head/contrib/bmake/unit-tests/varmod-head.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-head.exp head/contrib/bmake/unit-tests/varmod-head.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-head.mk head/contrib/bmake/unit-tests/varmod-ifelse.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-ifelse.exp head/contrib/bmake/unit-tests/varmod-ifelse.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-ifelse.mk head/contrib/bmake/unit-tests/varmod-l-name-to-value.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-l-name-to-value.exp head/contrib/bmake/unit-tests/varmod-l-name-to-value.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-l-name-to-value.mk head/contrib/bmake/unit-tests/varmod-localtime.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-localtime.exp head/contrib/bmake/unit-tests/varmod-localtime.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-localtime.mk head/contrib/bmake/unit-tests/varmod-loop.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-loop.exp head/contrib/bmake/unit-tests/varmod-loop.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-loop.mk head/contrib/bmake/unit-tests/varmod-match-escape.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-match-escape.exp head/contrib/bmake/unit-tests/varmod-match-escape.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-match-escape.mk head/contrib/bmake/unit-tests/varmod-match.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-match.exp head/contrib/bmake/unit-tests/varmod-match.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-match.mk head/contrib/bmake/unit-tests/varmod-no-match.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-no-match.exp head/contrib/bmake/unit-tests/varmod-no-match.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-no-match.mk head/contrib/bmake/unit-tests/varmod-order-reverse.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order-reverse.exp head/contrib/bmake/unit-tests/varmod-order-reverse.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order-reverse.mk head/contrib/bmake/unit-tests/varmod-order-shuffle.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order-shuffle.exp head/contrib/bmake/unit-tests/varmod-order-shuffle.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order-shuffle.mk head/contrib/bmake/unit-tests/varmod-order.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order.exp head/contrib/bmake/unit-tests/varmod-order.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-order.mk head/contrib/bmake/unit-tests/varmod-path.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-path.exp head/contrib/bmake/unit-tests/varmod-path.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-path.mk head/contrib/bmake/unit-tests/varmod-quote-dollar.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-quote-dollar.exp head/contrib/bmake/unit-tests/varmod-quote-dollar.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-quote-dollar.mk head/contrib/bmake/unit-tests/varmod-quote.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-quote.exp head/contrib/bmake/unit-tests/varmod-quote.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-quote.mk head/contrib/bmake/unit-tests/varmod-range.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-range.exp head/contrib/bmake/unit-tests/varmod-range.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-range.mk head/contrib/bmake/unit-tests/varmod-remember.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-remember.exp head/contrib/bmake/unit-tests/varmod-remember.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-remember.mk head/contrib/bmake/unit-tests/varmod-root.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-root.exp head/contrib/bmake/unit-tests/varmod-root.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-root.mk head/contrib/bmake/unit-tests/varmod-select-words.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-select-words.exp head/contrib/bmake/unit-tests/varmod-select-words.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-select-words.mk head/contrib/bmake/unit-tests/varmod-shell.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-shell.exp head/contrib/bmake/unit-tests/varmod-shell.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-shell.mk head/contrib/bmake/unit-tests/varmod-subst-regex.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-subst-regex.exp head/contrib/bmake/unit-tests/varmod-subst-regex.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-subst-regex.mk head/contrib/bmake/unit-tests/varmod-subst.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-subst.exp head/contrib/bmake/unit-tests/varmod-subst.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-subst.mk head/contrib/bmake/unit-tests/varmod-sysv.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-sysv.exp head/contrib/bmake/unit-tests/varmod-sysv.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-sysv.mk head/contrib/bmake/unit-tests/varmod-tail.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-tail.exp head/contrib/bmake/unit-tests/varmod-tail.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-tail.mk head/contrib/bmake/unit-tests/varmod-to-abs.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-abs.exp head/contrib/bmake/unit-tests/varmod-to-abs.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-abs.mk head/contrib/bmake/unit-tests/varmod-to-lower.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-lower.exp head/contrib/bmake/unit-tests/varmod-to-lower.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-lower.mk head/contrib/bmake/unit-tests/varmod-to-many-words.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-many-words.exp head/contrib/bmake/unit-tests/varmod-to-many-words.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-many-words.mk head/contrib/bmake/unit-tests/varmod-to-one-word.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-one-word.exp head/contrib/bmake/unit-tests/varmod-to-one-word.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-one-word.mk head/contrib/bmake/unit-tests/varmod-to-separator.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-separator.exp head/contrib/bmake/unit-tests/varmod-to-separator.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-separator.mk head/contrib/bmake/unit-tests/varmod-to-upper.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-upper.exp head/contrib/bmake/unit-tests/varmod-to-upper.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-to-upper.mk head/contrib/bmake/unit-tests/varmod-undefined.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-undefined.exp head/contrib/bmake/unit-tests/varmod-undefined.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-undefined.mk head/contrib/bmake/unit-tests/varmod-unique.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-unique.exp head/contrib/bmake/unit-tests/varmod-unique.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod-unique.mk head/contrib/bmake/unit-tests/varmod.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod.exp head/contrib/bmake/unit-tests/varmod.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varmod.mk head/contrib/bmake/unit-tests/varname-dollar.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dollar.exp head/contrib/bmake/unit-tests/varname-dollar.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dollar.mk head/contrib/bmake/unit-tests/varname-dot-alltargets.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-alltargets.exp head/contrib/bmake/unit-tests/varname-dot-alltargets.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-alltargets.mk head/contrib/bmake/unit-tests/varname-dot-curdir.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-curdir.exp head/contrib/bmake/unit-tests/varname-dot-curdir.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-curdir.mk head/contrib/bmake/unit-tests/varname-dot-includedfromdir.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromdir.exp head/contrib/bmake/unit-tests/varname-dot-includedfromdir.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromdir.mk head/contrib/bmake/unit-tests/varname-dot-includedfromfile.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromfile.exp head/contrib/bmake/unit-tests/varname-dot-includedfromfile.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includedfromfile.mk head/contrib/bmake/unit-tests/varname-dot-includes.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includes.exp head/contrib/bmake/unit-tests/varname-dot-includes.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-includes.mk head/contrib/bmake/unit-tests/varname-dot-libs.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-libs.exp head/contrib/bmake/unit-tests/varname-dot-libs.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-libs.mk head/contrib/bmake/unit-tests/varname-dot-make-dependfile.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-dependfile.exp head/contrib/bmake/unit-tests/varname-dot-make-dependfile.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-dependfile.mk head/contrib/bmake/unit-tests/varname-dot-make-expand_variables.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-expand_variables.exp head/contrib/bmake/unit-tests/varname-dot-make-expand_variables.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-expand_variables.mk head/contrib/bmake/unit-tests/varname-dot-make-exported.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-exported.exp head/contrib/bmake/unit-tests/varname-dot-make-exported.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-exported.mk head/contrib/bmake/unit-tests/varname-dot-make-jobs-prefix.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs-prefix.exp head/contrib/bmake/unit-tests/varname-dot-make-jobs-prefix.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs-prefix.mk head/contrib/bmake/unit-tests/varname-dot-make-jobs.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs.exp head/contrib/bmake/unit-tests/varname-dot-make-jobs.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-jobs.mk head/contrib/bmake/unit-tests/varname-dot-make-level.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-level.exp head/contrib/bmake/unit-tests/varname-dot-make-level.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-level.mk head/contrib/bmake/unit-tests/varname-dot-make-makefile_preference.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefile_preference.exp head/contrib/bmake/unit-tests/varname-dot-make-makefile_preference.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefile_preference.mk head/contrib/bmake/unit-tests/varname-dot-make-makefiles.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefiles.exp head/contrib/bmake/unit-tests/varname-dot-make-makefiles.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-makefiles.mk head/contrib/bmake/unit-tests/varname-dot-make-meta-bailiwick.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-bailiwick.exp head/contrib/bmake/unit-tests/varname-dot-make-meta-bailiwick.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-bailiwick.mk head/contrib/bmake/unit-tests/varname-dot-make-meta-created.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-created.exp head/contrib/bmake/unit-tests/varname-dot-make-meta-created.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-created.mk head/contrib/bmake/unit-tests/varname-dot-make-meta-files.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-files.exp head/contrib/bmake/unit-tests/varname-dot-make-meta-files.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-files.mk head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_filter.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_filter.exp head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_filter.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_filter.mk head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_paths.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_paths.exp head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_paths.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_paths.mk head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_patterns.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_patterns.exp head/contrib/bmake/unit-tests/varname-dot-make-meta-ignore_patterns.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-ignore_patterns.mk head/contrib/bmake/unit-tests/varname-dot-make-meta-prefix.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-prefix.exp head/contrib/bmake/unit-tests/varname-dot-make-meta-prefix.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-meta-prefix.mk head/contrib/bmake/unit-tests/varname-dot-make-mode.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-mode.exp head/contrib/bmake/unit-tests/varname-dot-make-mode.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-mode.mk head/contrib/bmake/unit-tests/varname-dot-make-path_filemon.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-path_filemon.exp head/contrib/bmake/unit-tests/varname-dot-make-path_filemon.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-path_filemon.mk head/contrib/bmake/unit-tests/varname-dot-make-pid.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-pid.exp head/contrib/bmake/unit-tests/varname-dot-make-pid.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-pid.mk head/contrib/bmake/unit-tests/varname-dot-make-ppid.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-ppid.exp head/contrib/bmake/unit-tests/varname-dot-make-ppid.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-ppid.mk head/contrib/bmake/unit-tests/varname-dot-make-save_dollars.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-save_dollars.exp head/contrib/bmake/unit-tests/varname-dot-make-save_dollars.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-make-save_dollars.mk head/contrib/bmake/unit-tests/varname-dot-makeoverrides.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-makeoverrides.exp head/contrib/bmake/unit-tests/varname-dot-makeoverrides.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-makeoverrides.mk head/contrib/bmake/unit-tests/varname-dot-newline.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-newline.exp head/contrib/bmake/unit-tests/varname-dot-newline.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-newline.mk head/contrib/bmake/unit-tests/varname-dot-objdir.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-objdir.exp head/contrib/bmake/unit-tests/varname-dot-objdir.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-objdir.mk head/contrib/bmake/unit-tests/varname-dot-parsedir.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsedir.exp head/contrib/bmake/unit-tests/varname-dot-parsedir.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsedir.mk head/contrib/bmake/unit-tests/varname-dot-parsefile.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsefile.exp head/contrib/bmake/unit-tests/varname-dot-parsefile.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-parsefile.mk head/contrib/bmake/unit-tests/varname-dot-path.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-path.exp head/contrib/bmake/unit-tests/varname-dot-path.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-path.mk head/contrib/bmake/unit-tests/varname-dot-shell.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-shell.exp head/contrib/bmake/unit-tests/varname-dot-shell.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-shell.mk head/contrib/bmake/unit-tests/varname-dot-targets.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-targets.exp head/contrib/bmake/unit-tests/varname-dot-targets.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-dot-targets.mk head/contrib/bmake/unit-tests/varname-empty.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-empty.exp head/contrib/bmake/unit-tests/varname-empty.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-empty.mk head/contrib/bmake/unit-tests/varname-make.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-make.exp head/contrib/bmake/unit-tests/varname-make.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-make.mk head/contrib/bmake/unit-tests/varname-make_print_var_on_error.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-make_print_var_on_error.exp head/contrib/bmake/unit-tests/varname-make_print_var_on_error.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-make_print_var_on_error.mk head/contrib/bmake/unit-tests/varname-makeflags.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-makeflags.exp head/contrib/bmake/unit-tests/varname-makeflags.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-makeflags.mk head/contrib/bmake/unit-tests/varname-pwd.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-pwd.exp head/contrib/bmake/unit-tests/varname-pwd.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-pwd.mk head/contrib/bmake/unit-tests/varname-vpath.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-vpath.exp head/contrib/bmake/unit-tests/varname-vpath.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname-vpath.mk head/contrib/bmake/unit-tests/varname.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname.exp head/contrib/bmake/unit-tests/varname.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varname.mk head/contrib/bmake/unit-tests/varparse-dynamic.exp - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varparse-dynamic.exp head/contrib/bmake/unit-tests/varparse-dynamic.mk - copied unchanged from r365363, vendor/NetBSD/bmake/dist/unit-tests/varparse-dynamic.mk Deleted: head/contrib/bmake/lst.lib/Makefile head/contrib/bmake/lst.lib/lstAppend.c head/contrib/bmake/lst.lib/lstAtEnd.c head/contrib/bmake/lst.lib/lstAtFront.c head/contrib/bmake/lst.lib/lstClose.c head/contrib/bmake/lst.lib/lstConcat.c head/contrib/bmake/lst.lib/lstDatum.c head/contrib/bmake/lst.lib/lstDeQueue.c head/contrib/bmake/lst.lib/lstDestroy.c head/contrib/bmake/lst.lib/lstDupl.c head/contrib/bmake/lst.lib/lstEnQueue.c head/contrib/bmake/lst.lib/lstFind.c head/contrib/bmake/lst.lib/lstFindFrom.c head/contrib/bmake/lst.lib/lstFirst.c head/contrib/bmake/lst.lib/lstForEach.c head/contrib/bmake/lst.lib/lstForEachFrom.c head/contrib/bmake/lst.lib/lstInit.c head/contrib/bmake/lst.lib/lstInsert.c head/contrib/bmake/lst.lib/lstInt.h head/contrib/bmake/lst.lib/lstIsAtEnd.c head/contrib/bmake/lst.lib/lstIsEmpty.c head/contrib/bmake/lst.lib/lstLast.c head/contrib/bmake/lst.lib/lstMember.c head/contrib/bmake/lst.lib/lstNext.c head/contrib/bmake/lst.lib/lstOpen.c head/contrib/bmake/lst.lib/lstPrev.c head/contrib/bmake/lst.lib/lstRemove.c head/contrib/bmake/lst.lib/lstReplace.c head/contrib/bmake/lst.lib/lstSucc.c head/contrib/bmake/sprite.h head/contrib/bmake/unit-tests/modorder.exp head/contrib/bmake/unit-tests/modorder.mk Modified: head/contrib/bmake/ChangeLog head/contrib/bmake/FILES head/contrib/bmake/LICENSE head/contrib/bmake/Makefile head/contrib/bmake/VERSION head/contrib/bmake/arch.c head/contrib/bmake/bmake.1 head/contrib/bmake/bmake.cat1 head/contrib/bmake/bsd.after-import.mk head/contrib/bmake/buf.c head/contrib/bmake/buf.h head/contrib/bmake/compat.c head/contrib/bmake/cond.c head/contrib/bmake/dir.c head/contrib/bmake/dir.h head/contrib/bmake/for.c head/contrib/bmake/hash.c head/contrib/bmake/hash.h head/contrib/bmake/job.c head/contrib/bmake/job.h head/contrib/bmake/lst.h head/contrib/bmake/main.c head/contrib/bmake/make-bootstrap.sh.in head/contrib/bmake/make-conf.h head/contrib/bmake/make.1 head/contrib/bmake/make.c head/contrib/bmake/make.h head/contrib/bmake/make_malloc.c head/contrib/bmake/make_malloc.h head/contrib/bmake/meta.c head/contrib/bmake/metachar.c head/contrib/bmake/metachar.h head/contrib/bmake/mk/ChangeLog head/contrib/bmake/mk/FILES head/contrib/bmake/mk/README head/contrib/bmake/mk/auto.dep.mk head/contrib/bmake/mk/auto.obj.mk head/contrib/bmake/mk/autoconf.mk head/contrib/bmake/mk/autodep.mk head/contrib/bmake/mk/compiler.mk head/contrib/bmake/mk/cython.mk head/contrib/bmake/mk/dirdeps-options.mk head/contrib/bmake/mk/dirdeps-targets.mk head/contrib/bmake/mk/dirdeps.mk head/contrib/bmake/mk/dpadd.mk head/contrib/bmake/mk/files.mk head/contrib/bmake/mk/gendirdeps.mk head/contrib/bmake/mk/host-target.mk head/contrib/bmake/mk/host.libnames.mk head/contrib/bmake/mk/inc.mk head/contrib/bmake/mk/init.mk head/contrib/bmake/mk/install-mk head/contrib/bmake/mk/install-new.mk head/contrib/bmake/mk/java.mk head/contrib/bmake/mk/lib.mk head/contrib/bmake/mk/libnames.mk head/contrib/bmake/mk/libs.mk head/contrib/bmake/mk/links.mk head/contrib/bmake/mk/manifest.mk head/contrib/bmake/mk/meta.autodep.mk head/contrib/bmake/mk/meta.stage.mk head/contrib/bmake/mk/meta.subdir.mk head/contrib/bmake/mk/meta.sys.mk head/contrib/bmake/mk/meta2deps.py head/contrib/bmake/mk/meta2deps.sh head/contrib/bmake/mk/mk-files.txt head/contrib/bmake/mk/mkopt.sh head/contrib/bmake/mk/obj.mk head/contrib/bmake/mk/options.mk head/contrib/bmake/mk/own.mk head/contrib/bmake/mk/prlist.mk head/contrib/bmake/mk/prog.mk head/contrib/bmake/mk/progs.mk head/contrib/bmake/mk/rst2htm.mk head/contrib/bmake/mk/scripts.mk head/contrib/bmake/mk/srctop.mk head/contrib/bmake/mk/stage-install.sh head/contrib/bmake/mk/sys.clean-env.mk head/contrib/bmake/mk/sys.debug.mk head/contrib/bmake/mk/sys.dependfile.mk head/contrib/bmake/mk/sys.mk head/contrib/bmake/mk/sys.vars.mk head/contrib/bmake/mk/sys/AIX.mk head/contrib/bmake/mk/sys/Darwin.mk head/contrib/bmake/mk/sys/Generic.mk head/contrib/bmake/mk/sys/HP-UX.mk head/contrib/bmake/mk/sys/IRIX.mk head/contrib/bmake/mk/sys/Linux.mk head/contrib/bmake/mk/sys/NetBSD.mk head/contrib/bmake/mk/sys/OSF1.mk head/contrib/bmake/mk/sys/OpenBSD.mk head/contrib/bmake/mk/sys/SunOS.mk head/contrib/bmake/mk/sys/UnixWare.mk head/contrib/bmake/mk/target-flags.mk head/contrib/bmake/mk/warnings.mk head/contrib/bmake/mk/whats.mk head/contrib/bmake/mk/yacc.mk head/contrib/bmake/nonints.h head/contrib/bmake/os.sh head/contrib/bmake/parse.c head/contrib/bmake/str.c head/contrib/bmake/strlist.c head/contrib/bmake/strlist.h head/contrib/bmake/suff.c head/contrib/bmake/targ.c head/contrib/bmake/trace.c head/contrib/bmake/unit-tests/Makefile head/contrib/bmake/unit-tests/cond-late.exp head/contrib/bmake/unit-tests/cond-late.mk head/contrib/bmake/unit-tests/cond-short.mk head/contrib/bmake/unit-tests/export-all.mk head/contrib/bmake/unit-tests/export.exp head/contrib/bmake/unit-tests/export.mk head/contrib/bmake/unit-tests/forloop.mk head/contrib/bmake/unit-tests/impsrc.exp head/contrib/bmake/unit-tests/impsrc.mk head/contrib/bmake/unit-tests/include-main.mk head/contrib/bmake/unit-tests/moderrs.exp head/contrib/bmake/unit-tests/moderrs.mk head/contrib/bmake/unit-tests/modmatch.exp head/contrib/bmake/unit-tests/modmatch.mk head/contrib/bmake/unit-tests/modmisc.exp head/contrib/bmake/unit-tests/modmisc.mk head/contrib/bmake/unit-tests/modts.exp head/contrib/bmake/unit-tests/modts.mk head/contrib/bmake/unit-tests/phony-end.exp head/contrib/bmake/unit-tests/posix1.mk head/contrib/bmake/unit-tests/sysv.exp head/contrib/bmake/unit-tests/sysv.mk head/contrib/bmake/unit-tests/unexport-env.mk head/contrib/bmake/unit-tests/unexport.mk head/contrib/bmake/unit-tests/varmisc.exp head/contrib/bmake/unit-tests/varmisc.mk head/contrib/bmake/unit-tests/varmod-edge.exp head/contrib/bmake/unit-tests/varmod-edge.mk head/contrib/bmake/util.c head/contrib/bmake/var.c head/usr.bin/bmake/Makefile head/usr.bin/bmake/Makefile.config head/usr.bin/bmake/unit-tests/Makefile Directory Properties: head/contrib/bmake/ (props changed) Modified: head/contrib/bmake/ChangeLog ============================================================================== --- head/contrib/bmake/ChangeLog Sat Sep 5 19:03:34 2020 (r365365) +++ head/contrib/bmake/ChangeLog Sat Sep 5 19:29:42 2020 (r365366) @@ -1,3 +1,243 @@ +2020-09-02 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200902 + Merge with NetBSD make, pick up + o use make_stat to ensure no confusion over valid fields + returned by cached_stat + o var.c: make VarQuote const-correct + o add unit tests for .for + +2020-09-01 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200901 + Merge with NetBSD make, pick up + o rename Hash_Table fields + o make data types in Dir_HasWildcards more precise + +2020-08-31 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200831 + Merge with NetBSD make, pick up + o suff.c: fix unbalanced Lst_Open/Lst_Close in SuffFindCmds + o lst.c: Lst_Open renable assert that list isn't open + o unit test for .TARGET dependent flags + o var.c: fix aliasing bug in VarUniq + o more unit tests for :u + +2020-08-30 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200830 + Merge with NetBSD make, pick up + o allow for strict type checking for Boolean + o Var_Parse never returns NULL + o Var_Subst never returns NULL + o Lst_Find now takes boolean match function + o rename Lst_Memeber to Lst_FindDatum + o rename LstNode functions to match their type + o rename GNode.iParents to implicitParents + o fix assertion failure for .SUFFIXES in archives + o compat.c: clean up documentation for CompatInterrupt and Compat_Run + remove unreachable code from CompatRunCommand + o main.c: simplify getBoolean + o stc.c: replace brk_string with simpler Str_Words + o suff.c: add debug macros + +2020-08-28 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200828 + Merge with NetBSD make, pick up + o lst.c: inline LstIsValid and LstNodeIsValid + o remove trailing S from Lst function names after migration complete + o more comment cleanup/clarification + o suff.c: clean up suffix handling + o more unit tests + +2020-08-26 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200826 + Merge with NetBSD make, pick up + o enum.c: distinguish between bitsets containing flags and + ordinary enums + o var.c: fix error message for ::!= modifier with shell error + o fix bugs in -DCLEANUP mode + +2020-08-24 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200824 + Merge with NetBSD make, pick up + o in debug mode, print GNode details in symbols + +2020-08-23 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200823 + Merge with NetBSD make, pick up + o lst.c: more asserts, + make args to Lst_Find match others. + o var.c: pass flags to VarAdd + o arch.c: use Buffer + o str.c: brk_string return size_t for nwords + o more unit tests + +2020-08-22 Simon J Gerraty + + * VERSION (_MAKE_VERSION): + Merge with NetBSD make, pick up + o var.c: support for read-only variables eg .SHELL + being the shell used to run scripts. + o lst.c: more simplification + o more documentation and style cleanup + o more unit tests + o ensure unit-test/Makefile is run by TEST_MAKE + o reduce duplication of header inclusion + +2020-08-21 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200821 + Merge with NetBSD make, pick up + o lst.c: revert invalid assertion - but document it + o dir.c: split Dir_Init into two functions + +2020-08-20 Simon J Gerraty + + * lst.c: needs inttypes.h on Linux + + * VERSION (_MAKE_VERSION): 20200820 + Merge with NetBSD make, pick up + o make.1: clarify some passages + o var.c: more cleanup, clarify comments + o make_malloc.c: remove unreachable code + o cond.c: make CondGetString easier to debug + o simplify list usage + o unit-tests: more + +2020-08-16 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200816 + Merge with NetBSD make, pick up + o refactor unit-tests to be more fine grained + not all tests moved yet + +2020-08-14 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200814 + Merge with NetBSD make, pick up + o more str_concat variants + o more enums for flags + o var.c: cleanup for higher warnings level + +2020-08-10 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200810 + Merge with NetBSD make, pick up + o more unit tests + o general comment and style cleanup + +2020-08-08 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200808 + Merge with NetBSD make, pick up + o enum.[ch]: streamline, enums for use in flags and debug output + o cond.c: cleanup + o var.c: reduce duplicate code for modifiers + debug logging for Var_Parse + more detailed debug output + o more unit tests + +2020-08-06 Simon J Gerraty + + * unit-tests/Makefile: -r for recursive and include Makefile.inc + so I can run tests in meta mode + supress extra noise if in meta mode + + * VERSION (_MAKE_VERSION): 20200806 + Merge with NetBSD make, pick up + o parse.c: remove VARE_WANTRES for LINT + we just want to check parsing (for now). + +2020-08-05 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200805 + Merge with NetBSD make, pick up + o make.1: Rework the description of dependence operators + +2020-08-03 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200803 + Merge with NetBSD make, pick up + o revert some C99 usage, for max portability + o unit-tests/lint + +2020-08-02 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200802 + Merge with NetBSD make, pick up + o more unit tests + +2020-08-01 Simon J Gerraty + + * Remove NetBSD specific plumbing from unit-tests/Makefile + + * VERSION (_MAKE_VERSION): 20200801 + Merge with NetBSD make, pick up + o make Var_Value return const + o size_t for buf sizes + o optimize some buffer operations - avoid strlen + +2020-07-31 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200731 + Merge with NetBSD make, pick up + o var.c: fix undefinded behavior for incomplete :t modifier + fixes unit-test/moderrs on Ubuntu + o parse.c: When parsing variable assignments other than := + if DEBUG(LINT) test substition of value, so we get a file and + line number in the resulting error. + o dir.c: fix parsing of nested braces in dependency lines + add unit-tests + +2020-07-30 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200730 + Merge with NetBSD make, pick up + o var.c: minor cleanup + o unit-tests: more tests to improve code coverage + +2020-07-28 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200728 + Merge with NetBSD make, pick up + o var.c: more optimizations + +2020-07-26 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200726 + Merge with NetBSD make, pick up + o collapse lsd.lib into lst.c - reduce code size and allow inlining + o lots of function comment updates + o var.c: more optimizations + o make return of Var_Parse const + +2020-07-20 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200720 + Merge with NetBSD make, pick up + o DEBUG_HASH report stats at end and tone down the noise + o var.c: each flag type gets its own prefix. + move SysV string matching to var.c + make ampersand in ${VAR:from=to&} an ordinary character + cleanup and simplify implementation of modifiers + o make.1: move documentation for assignment modifiers + +2020-07-18 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20200718 + Merge with NetBSD make, pick up + o DEBUG_HASH to see how well the hash tables are working + +2020-07-11 Simon J Gerraty + + * bsd.after-import.mk: make sure we update unit-tests/Makefile + 2020-07-10 Simon J Gerraty * configure.in: use AC_INCLUDES_DEFAULT rather than AC_HEADER_STDC Modified: head/contrib/bmake/FILES ============================================================================== --- head/contrib/bmake/FILES Sat Sep 5 19:03:34 2020 (r365365) +++ head/contrib/bmake/FILES Sat Sep 5 19:29:42 2020 (r365366) @@ -23,6 +23,8 @@ configure.in dir.c dir.h dirname.c +enum.c +enum.h filemon/filemon.h filemon/filemon_dev.c filemon/filemon_ktrace.c @@ -34,36 +36,8 @@ hash.h install-sh job.c job.h +lst.c lst.h -lst.lib/Makefile -lst.lib/lstAppend.c -lst.lib/lstAtEnd.c -lst.lib/lstAtFront.c -lst.lib/lstClose.c -lst.lib/lstConcat.c -lst.lib/lstDatum.c -lst.lib/lstDeQueue.c -lst.lib/lstDestroy.c -lst.lib/lstDupl.c -lst.lib/lstEnQueue.c -lst.lib/lstFind.c -lst.lib/lstFindFrom.c -lst.lib/lstFirst.c -lst.lib/lstForEach.c -lst.lib/lstForEachFrom.c -lst.lib/lstInit.c -lst.lib/lstInsert.c -lst.lib/lstInt.h -lst.lib/lstIsAtEnd.c -lst.lib/lstIsEmpty.c -lst.lib/lstLast.c -lst.lib/lstMember.c -lst.lib/lstNext.c -lst.lib/lstOpen.c -lst.lib/lstPrev.c -lst.lib/lstRemove.c -lst.lib/lstReplace.c -lst.lib/lstSucc.c machine.sh main.c make-bootstrap.sh.in @@ -88,7 +62,6 @@ ranlib.h realpath.c setenv.c sigcompat.c -sprite.h str.c stresep.c strlcpy.c @@ -100,22 +73,234 @@ trace.c trace.h unit-tests/Makefile unit-tests/Makefile.config.in +unit-tests/archive.exp +unit-tests/archive.mk +unit-tests/archive-suffix.exp +unit-tests/archive-suffix.mk +unit-tests/cmd-interrupt.exp +unit-tests/cmd-interrupt.mk +unit-tests/cmdline.exp +unit-tests/cmdline.mk unit-tests/comment.exp unit-tests/comment.mk +unit-tests/cond-cmp-numeric-eq.exp +unit-tests/cond-cmp-numeric-eq.mk +unit-tests/cond-cmp-numeric-ge.exp +unit-tests/cond-cmp-numeric-ge.mk +unit-tests/cond-cmp-numeric-gt.exp +unit-tests/cond-cmp-numeric-gt.mk +unit-tests/cond-cmp-numeric-le.exp +unit-tests/cond-cmp-numeric-le.mk +unit-tests/cond-cmp-numeric-lt.exp +unit-tests/cond-cmp-numeric-lt.mk +unit-tests/cond-cmp-numeric-ne.exp +unit-tests/cond-cmp-numeric-ne.mk +unit-tests/cond-cmp-numeric.exp +unit-tests/cond-cmp-numeric.mk +unit-tests/cond-cmp-string.exp +unit-tests/cond-cmp-string.mk +unit-tests/cond-func.exp +unit-tests/cond-func.mk +unit-tests/cond-func-commands.exp +unit-tests/cond-func-commands.mk +unit-tests/cond-func-defined.exp +unit-tests/cond-func-defined.mk +unit-tests/cond-func-empty.exp +unit-tests/cond-func-empty.mk +unit-tests/cond-func-exists.exp +unit-tests/cond-func-exists.mk +unit-tests/cond-func-make.exp +unit-tests/cond-func-make.mk +unit-tests/cond-func-target.exp +unit-tests/cond-func-target.mk +unit-tests/cond-late.exp +unit-tests/cond-late.mk +unit-tests/cond-op-and.exp +unit-tests/cond-op-and.mk +unit-tests/cond-op-not.exp +unit-tests/cond-op-not.mk +unit-tests/cond-op-or.exp +unit-tests/cond-op-or.mk +unit-tests/cond-op-parentheses.exp +unit-tests/cond-op-parentheses.mk +unit-tests/cond-op.exp +unit-tests/cond-op.mk +unit-tests/cond-short.exp +unit-tests/cond-short.mk +unit-tests/cond-token-number.exp +unit-tests/cond-token-number.mk +unit-tests/cond-token-plain.exp +unit-tests/cond-token-plain.mk +unit-tests/cond-token-string.exp +unit-tests/cond-token-string.mk +unit-tests/cond-token-var.exp +unit-tests/cond-token-var.mk unit-tests/cond1.exp unit-tests/cond1.mk unit-tests/cond2.exp unit-tests/cond2.mk -unit-tests/cond-late.mk -unit-tests/cond-late.exp -unit-tests/cond-short.mk -unit-tests/cond-short.exp +unit-tests/counter.exp +unit-tests/counter.mk +unit-tests/dep-colon.exp +unit-tests/dep-colon.mk +unit-tests/dep-double-colon.exp +unit-tests/dep-double-colon.mk +unit-tests/dep-exclam.exp +unit-tests/dep-exclam.mk +unit-tests/dep-none.exp +unit-tests/dep-none.mk +unit-tests/dep-var.exp +unit-tests/dep-var.mk +unit-tests/dep-wildcards.exp +unit-tests/dep-wildcards.mk +unit-tests/dep.exp +unit-tests/dep.mk +unit-tests/depsrc-exec.exp +unit-tests/depsrc-exec.mk +unit-tests/depsrc-ignore.exp +unit-tests/depsrc-ignore.mk +unit-tests/depsrc-made.exp +unit-tests/depsrc-made.mk +unit-tests/depsrc-make.exp +unit-tests/depsrc-make.mk +unit-tests/depsrc-meta.exp +unit-tests/depsrc-meta.mk +unit-tests/depsrc-nometa.exp +unit-tests/depsrc-nometa.mk +unit-tests/depsrc-nometa_cmp.exp +unit-tests/depsrc-nometa_cmp.mk +unit-tests/depsrc-nopath.exp +unit-tests/depsrc-nopath.mk +unit-tests/depsrc-notmain.exp +unit-tests/depsrc-notmain.mk +unit-tests/depsrc-optional.exp +unit-tests/depsrc-optional.mk +unit-tests/depsrc-phony.exp +unit-tests/depsrc-phony.mk +unit-tests/depsrc-precious.exp +unit-tests/depsrc-precious.mk +unit-tests/depsrc-recursive.exp +unit-tests/depsrc-recursive.mk +unit-tests/depsrc-silent.exp +unit-tests/depsrc-silent.mk +unit-tests/depsrc-use.exp +unit-tests/depsrc-use.mk +unit-tests/depsrc-usebefore.exp +unit-tests/depsrc-usebefore.mk +unit-tests/depsrc-usebefore-double-colon.exp +unit-tests/depsrc-usebefore-double-colon.mk +unit-tests/depsrc-wait.exp +unit-tests/depsrc-wait.mk +unit-tests/depsrc.exp +unit-tests/depsrc.mk +unit-tests/deptgt-begin.exp +unit-tests/deptgt-begin.mk +unit-tests/deptgt-default.exp +unit-tests/deptgt-default.mk +unit-tests/deptgt-delete_on_error.exp +unit-tests/deptgt-delete_on_error.mk +unit-tests/deptgt-end.exp +unit-tests/deptgt-end.mk +unit-tests/deptgt-error.exp +unit-tests/deptgt-error.mk +unit-tests/deptgt-ignore.exp +unit-tests/deptgt-ignore.mk +unit-tests/deptgt-interrupt.exp +unit-tests/deptgt-interrupt.mk +unit-tests/deptgt-main.exp +unit-tests/deptgt-main.mk +unit-tests/deptgt-makeflags.exp +unit-tests/deptgt-makeflags.mk +unit-tests/deptgt-no_parallel.exp +unit-tests/deptgt-no_parallel.mk +unit-tests/deptgt-nopath.exp +unit-tests/deptgt-nopath.mk +unit-tests/deptgt-notparallel.exp +unit-tests/deptgt-notparallel.mk +unit-tests/deptgt-objdir.exp +unit-tests/deptgt-objdir.mk +unit-tests/deptgt-order.exp +unit-tests/deptgt-order.mk +unit-tests/deptgt-path-suffix.exp +unit-tests/deptgt-path-suffix.mk +unit-tests/deptgt-path.exp +unit-tests/deptgt-path.mk +unit-tests/deptgt-phony.exp +unit-tests/deptgt-phony.mk +unit-tests/deptgt-precious.exp +unit-tests/deptgt-precious.mk +unit-tests/deptgt-shell.exp +unit-tests/deptgt-shell.mk +unit-tests/deptgt-silent.exp +unit-tests/deptgt-silent.mk +unit-tests/deptgt-stale.exp +unit-tests/deptgt-stale.mk +unit-tests/deptgt-suffixes.exp +unit-tests/deptgt-suffixes.mk +unit-tests/deptgt.exp +unit-tests/deptgt.mk +unit-tests/dir.exp +unit-tests/dir.mk +unit-tests/dir-expand-path.exp +unit-tests/dir-expand-path.mk +unit-tests/directive-elif.exp +unit-tests/directive-elif.mk +unit-tests/directive-elifdef.exp +unit-tests/directive-elifdef.mk +unit-tests/directive-elifmake.exp +unit-tests/directive-elifmake.mk +unit-tests/directive-elifndef.exp +unit-tests/directive-elifndef.mk +unit-tests/directive-elifnmake.exp +unit-tests/directive-elifnmake.mk +unit-tests/directive-else.exp +unit-tests/directive-else.mk +unit-tests/directive-endif.exp +unit-tests/directive-endif.mk +unit-tests/directive-error.exp +unit-tests/directive-error.mk +unit-tests/directive-export-env.exp +unit-tests/directive-export-env.mk +unit-tests/directive-export-literal.exp +unit-tests/directive-export-literal.mk +unit-tests/directive-export.exp +unit-tests/directive-export.mk +unit-tests/directive-for.exp +unit-tests/directive-for.mk +unit-tests/directive-for-generating-endif.exp +unit-tests/directive-for-generating-endif.mk +unit-tests/directive-if.exp +unit-tests/directive-if.mk +unit-tests/directive-ifdef.exp +unit-tests/directive-ifdef.mk +unit-tests/directive-ifmake.exp +unit-tests/directive-ifmake.mk +unit-tests/directive-ifndef.exp +unit-tests/directive-ifndef.mk +unit-tests/directive-ifnmake.exp +unit-tests/directive-ifnmake.mk +unit-tests/directive-info.exp +unit-tests/directive-info.mk +unit-tests/directive-undef.exp +unit-tests/directive-undef.mk +unit-tests/directive-unexport-env.exp +unit-tests/directive-unexport-env.mk +unit-tests/directive-unexport.exp +unit-tests/directive-unexport.mk +unit-tests/directive-warning.exp +unit-tests/directive-warning.mk +unit-tests/directive.exp +unit-tests/directive.mk +unit-tests/directives.exp +unit-tests/directives.mk unit-tests/dollar.exp unit-tests/dollar.mk unit-tests/doterror.exp unit-tests/doterror.mk unit-tests/dotwait.exp unit-tests/dotwait.mk +unit-tests/envfirst.exp +unit-tests/envfirst.mk unit-tests/error.exp unit-tests/error.mk unit-tests/escape.exp @@ -124,6 +309,8 @@ unit-tests/export-all.exp unit-tests/export-all.mk unit-tests/export-env.exp unit-tests/export-env.mk +unit-tests/export-variants.exp +unit-tests/export-variants.mk unit-tests/export.exp unit-tests/export.mk unit-tests/forloop.exp @@ -138,6 +325,10 @@ unit-tests/include-main.exp unit-tests/include-main.mk unit-tests/include-sub.mk unit-tests/include-subsub.mk +unit-tests/lint.exp +unit-tests/lint.mk +unit-tests/make-exported.exp +unit-tests/make-exported.mk unit-tests/misc.exp unit-tests/misc.mk unit-tests/moderrs.exp @@ -146,12 +337,62 @@ unit-tests/modmatch.exp unit-tests/modmatch.mk unit-tests/modmisc.exp unit-tests/modmisc.mk -unit-tests/modorder.exp -unit-tests/modorder.mk unit-tests/modts.exp unit-tests/modts.mk unit-tests/modword.exp unit-tests/modword.mk +unit-tests/opt-backwards.exp +unit-tests/opt-backwards.mk +unit-tests/opt-chdir.exp +unit-tests/opt-chdir.mk +unit-tests/opt-debug.exp +unit-tests/opt-debug.mk +unit-tests/opt-debug-g1.exp +unit-tests/opt-debug-g1.mk +unit-tests/opt-define.exp +unit-tests/opt-define.mk +unit-tests/opt-env.exp +unit-tests/opt-env.mk +unit-tests/opt-file.exp +unit-tests/opt-file.mk +unit-tests/opt-ignore.exp +unit-tests/opt-ignore.mk +unit-tests/opt-include-dir.exp +unit-tests/opt-include-dir.mk +unit-tests/opt-jobs-internal.exp +unit-tests/opt-jobs-internal.mk +unit-tests/opt-jobs.exp +unit-tests/opt-jobs.mk +unit-tests/opt-keep-going.exp +unit-tests/opt-keep-going.mk +unit-tests/opt-m-include-dir.exp +unit-tests/opt-m-include-dir.mk +unit-tests/opt-no-action-at-all.exp +unit-tests/opt-no-action-at-all.mk +unit-tests/opt-no-action.exp +unit-tests/opt-no-action.mk +unit-tests/opt-query.exp +unit-tests/opt-query.mk +unit-tests/opt-raw.exp +unit-tests/opt-raw.mk +unit-tests/opt-silent.exp +unit-tests/opt-silent.mk +unit-tests/opt-touch.exp +unit-tests/opt-touch.mk +unit-tests/opt-tracefile.exp +unit-tests/opt-tracefile.mk +unit-tests/opt-var-expanded.exp +unit-tests/opt-var-expanded.mk +unit-tests/opt-var-literal.exp +unit-tests/opt-var-literal.mk +unit-tests/opt-warnings-as-errors.exp +unit-tests/opt-warnings-as-errors.mk +unit-tests/opt-where-am-i.exp +unit-tests/opt-where-am-i.mk +unit-tests/opt-x-reduce-exported.exp +unit-tests/opt-x-reduce-exported.mk +unit-tests/opt.exp +unit-tests/opt.mk unit-tests/order.exp unit-tests/order.mk unit-tests/phony-end.exp @@ -162,6 +403,28 @@ unit-tests/posix1.exp unit-tests/posix1.mk unit-tests/qequals.exp unit-tests/qequals.mk +unit-tests/recursive.exp +unit-tests/recursive.mk +unit-tests/sh-dots.exp +unit-tests/sh-dots.mk +unit-tests/sh-jobs-error.exp +unit-tests/sh-jobs-error.mk +unit-tests/sh-jobs.exp +unit-tests/sh-jobs.mk +unit-tests/sh-leading-at.exp +unit-tests/sh-leading-at.mk +unit-tests/sh-leading-hyphen.exp +unit-tests/sh-leading-hyphen.mk +unit-tests/sh-leading-plus.exp +unit-tests/sh-leading-plus.mk +unit-tests/sh-meta-chars.exp +unit-tests/sh-meta-chars.mk +unit-tests/sh-multi-line.exp +unit-tests/sh-multi-line.mk +unit-tests/sh-single-line.exp +unit-tests/sh-single-line.mk +unit-tests/sh.exp +unit-tests/sh.mk unit-tests/suffixes.exp unit-tests/suffixes.mk unit-tests/sunshcmd.exp @@ -174,12 +437,204 @@ unit-tests/unexport-env.exp unit-tests/unexport-env.mk unit-tests/unexport.exp unit-tests/unexport.mk +unit-tests/use-inference.exp +unit-tests/use-inference.mk +unit-tests/var-class-cmdline.exp +unit-tests/var-class-cmdline.mk +unit-tests/var-class-env.exp +unit-tests/var-class-env.mk +unit-tests/var-class-global.exp +unit-tests/var-class-global.mk +unit-tests/var-class-local-legacy.exp +unit-tests/var-class-local-legacy.mk +unit-tests/var-class-local.exp +unit-tests/var-class-local.mk +unit-tests/var-class.exp +unit-tests/var-class.mk +unit-tests/var-op-append.exp +unit-tests/var-op-append.mk +unit-tests/var-op-assign.exp +unit-tests/var-op-assign.mk +unit-tests/var-op-default.exp +unit-tests/var-op-default.mk +unit-tests/var-op-expand.exp +unit-tests/var-op-expand.mk +unit-tests/var-op-shell.exp +unit-tests/var-op-shell.mk +unit-tests/var-op.exp +unit-tests/var-op.mk unit-tests/varcmd.exp unit-tests/varcmd.mk +unit-tests/vardebug.exp +unit-tests/vardebug.mk +unit-tests/varfind.exp +unit-tests/varfind.mk unit-tests/varmisc.exp unit-tests/varmisc.mk +unit-tests/varmod-assign.exp +unit-tests/varmod-assign.mk +unit-tests/varmod-defined.exp +unit-tests/varmod-defined.mk unit-tests/varmod-edge.exp unit-tests/varmod-edge.mk +unit-tests/varmod-exclam-shell.exp +unit-tests/varmod-exclam-shell.mk +unit-tests/varmod-extension.exp +unit-tests/varmod-extension.mk +unit-tests/varmod-gmtime.exp +unit-tests/varmod-gmtime.mk +unit-tests/varmod-hash.exp +unit-tests/varmod-hash.mk +unit-tests/varmod-head.exp +unit-tests/varmod-head.mk +unit-tests/varmod-ifelse.exp +unit-tests/varmod-ifelse.mk +unit-tests/varmod-l-name-to-value.exp +unit-tests/varmod-l-name-to-value.mk +unit-tests/varmod-localtime.exp +unit-tests/varmod-localtime.mk +unit-tests/varmod-loop.exp +unit-tests/varmod-loop.mk +unit-tests/varmod-match-escape.exp +unit-tests/varmod-match-escape.mk +unit-tests/varmod-match.exp +unit-tests/varmod-match.mk +unit-tests/varmod-no-match.exp +unit-tests/varmod-no-match.mk +unit-tests/varmod-order-reverse.exp +unit-tests/varmod-order-reverse.mk +unit-tests/varmod-order-shuffle.exp +unit-tests/varmod-order-shuffle.mk +unit-tests/varmod-order.exp +unit-tests/varmod-order.mk +unit-tests/varmod-path.exp +unit-tests/varmod-path.mk +unit-tests/varmod-quote-dollar.exp +unit-tests/varmod-quote-dollar.mk +unit-tests/varmod-quote.exp +unit-tests/varmod-quote.mk +unit-tests/varmod-range.exp +unit-tests/varmod-range.mk +unit-tests/varmod-remember.exp +unit-tests/varmod-remember.mk +unit-tests/varmod-root.exp +unit-tests/varmod-root.mk +unit-tests/varmod-select-words.exp +unit-tests/varmod-select-words.mk +unit-tests/varmod-shell.exp +unit-tests/varmod-shell.mk +unit-tests/varmod-subst-regex.exp +unit-tests/varmod-subst-regex.mk +unit-tests/varmod-subst.exp +unit-tests/varmod-subst.mk +unit-tests/varmod-sysv.exp +unit-tests/varmod-sysv.mk +unit-tests/varmod-tail.exp +unit-tests/varmod-tail.mk +unit-tests/varmod-to-abs.exp +unit-tests/varmod-to-abs.mk +unit-tests/varmod-to-lower.exp +unit-tests/varmod-to-lower.mk +unit-tests/varmod-to-many-words.exp +unit-tests/varmod-to-many-words.mk +unit-tests/varmod-to-one-word.exp +unit-tests/varmod-to-one-word.mk +unit-tests/varmod-to-separator.exp +unit-tests/varmod-to-separator.mk +unit-tests/varmod-to-upper.exp +unit-tests/varmod-to-upper.mk +unit-tests/varmod-undefined.exp +unit-tests/varmod-undefined.mk +unit-tests/varmod-unique.exp +unit-tests/varmod-unique.mk +unit-tests/varmod.exp +unit-tests/varmod.mk +unit-tests/varname-dollar.exp +unit-tests/varname-dollar.mk +unit-tests/varname-dot-alltargets.exp +unit-tests/varname-dot-alltargets.mk +unit-tests/varname-dot-curdir.exp +unit-tests/varname-dot-curdir.mk +unit-tests/varname-dot-includes.exp +unit-tests/varname-dot-includes.mk +unit-tests/varname-dot-includedfromdir.exp +unit-tests/varname-dot-includedfromdir.mk +unit-tests/varname-dot-includedfromfile.exp +unit-tests/varname-dot-includedfromfile.mk +unit-tests/varname-dot-libs.exp +unit-tests/varname-dot-libs.mk +unit-tests/varname-dot-make-dependfile.exp +unit-tests/varname-dot-make-dependfile.mk +unit-tests/varname-dot-make-expand_variables.exp +unit-tests/varname-dot-make-expand_variables.mk +unit-tests/varname-dot-make-exported.exp +unit-tests/varname-dot-make-exported.mk +unit-tests/varname-dot-make-jobs-prefix.exp +unit-tests/varname-dot-make-jobs-prefix.mk +unit-tests/varname-dot-make-jobs.exp +unit-tests/varname-dot-make-jobs.mk +unit-tests/varname-dot-make-level.exp +unit-tests/varname-dot-make-level.mk +unit-tests/varname-dot-make-makefile_preference.exp +unit-tests/varname-dot-make-makefile_preference.mk +unit-tests/varname-dot-make-makefiles.exp +unit-tests/varname-dot-make-makefiles.mk +unit-tests/varname-dot-make-meta-bailiwick.exp +unit-tests/varname-dot-make-meta-bailiwick.mk +unit-tests/varname-dot-make-meta-created.exp +unit-tests/varname-dot-make-meta-created.mk +unit-tests/varname-dot-make-meta-files.exp +unit-tests/varname-dot-make-meta-files.mk +unit-tests/varname-dot-make-meta-ignore_filter.exp +unit-tests/varname-dot-make-meta-ignore_filter.mk +unit-tests/varname-dot-make-meta-ignore_paths.exp +unit-tests/varname-dot-make-meta-ignore_paths.mk +unit-tests/varname-dot-make-meta-ignore_patterns.exp +unit-tests/varname-dot-make-meta-ignore_patterns.mk +unit-tests/varname-dot-make-meta-prefix.exp +unit-tests/varname-dot-make-meta-prefix.mk +unit-tests/varname-dot-make-mode.exp +unit-tests/varname-dot-make-mode.mk +unit-tests/varname-dot-make-path_filemon.exp +unit-tests/varname-dot-make-path_filemon.mk +unit-tests/varname-dot-make-pid.exp +unit-tests/varname-dot-make-pid.mk +unit-tests/varname-dot-make-ppid.exp +unit-tests/varname-dot-make-ppid.mk +unit-tests/varname-dot-make-save_dollars.exp +unit-tests/varname-dot-make-save_dollars.mk +unit-tests/varname-dot-makeoverrides.exp +unit-tests/varname-dot-makeoverrides.mk +unit-tests/varname-dot-newline.exp +unit-tests/varname-dot-newline.mk +unit-tests/varname-dot-objdir.exp +unit-tests/varname-dot-objdir.mk +unit-tests/varname-dot-parsedir.exp +unit-tests/varname-dot-parsedir.mk +unit-tests/varname-dot-parsefile.exp +unit-tests/varname-dot-parsefile.mk +unit-tests/varname-dot-path.exp +unit-tests/varname-dot-path.mk +unit-tests/varname-dot-shell.exp +unit-tests/varname-dot-shell.mk +unit-tests/varname-dot-targets.exp +unit-tests/varname-dot-targets.mk +unit-tests/varname-empty.exp +unit-tests/varname-empty.mk +unit-tests/varname-make.exp +unit-tests/varname-make.mk +unit-tests/varname-make_print_var_on_error.exp +unit-tests/varname-make_print_var_on_error.mk +unit-tests/varname-makeflags.exp +unit-tests/varname-makeflags.mk +unit-tests/varname-pwd.exp +unit-tests/varname-pwd.mk +unit-tests/varname-vpath.exp +unit-tests/varname-vpath.mk +unit-tests/varname.exp +unit-tests/varname.mk +unit-tests/varparse-dynamic.exp +unit-tests/varparse-dynamic.mk unit-tests/varquote.exp unit-tests/varquote.mk unit-tests/varshell.exp Modified: head/contrib/bmake/LICENSE ============================================================================== --- head/contrib/bmake/LICENSE Sat Sep 5 19:03:34 2020 (r365365) +++ head/contrib/bmake/LICENSE Sat Sep 5 19:29:42 2020 (r365366) @@ -0,0 +1,60 @@ +The individual files in this distribution are copyright their +original contributors or assignees. +Including: + + Copyright (c) 1993-2020, Simon J Gerraty + Copyright (c) 2020, Roland Illig + Copyright (c) 2009-2016, Juniper Networks, Inc. + Copyright (c) 2009, John Birrell. + Copyright (c) 1997-2020 The NetBSD Foundation, Inc. + Copyright (c) 1998 Todd C. Miller + Copyright (c) 1989 by Berkeley Softworks + Copyright (c) 1988, 1989, 1990, 1992, 1993 + The Regents of the University of California. + Copyright (c) 1988, 1989 by Adam de Boor + +With the exception of the GNU configure script, which states: + + # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + +The license for this distribution is considered to be: + + SPDX-License-Identifier: BSD-3-Clause + +example (from https://opensource.org/licenses/BSD-3-Clause): + + Copyright + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + Modified: head/contrib/bmake/Makefile ============================================================================== --- head/contrib/bmake/Makefile Sat Sep 5 19:03:34 2020 (r365365) +++ head/contrib/bmake/Makefile Sat Sep 5 19:29:42 2020 (r365366) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.107 2020/06/07 21:18:46 sjg Exp $ +# $Id: Makefile,v 1.112 2020/08/28 16:26:17 sjg Exp $ PROG= bmake @@ -8,9 +8,11 @@ SRCS= \ compat.c \ cond.c \ dir.c \ + enum.c \ for.c \ hash.c \ job.c \ + lst.c \ main.c \ make.c \ make_malloc.c \ @@ -25,36 +27,6 @@ SRCS= \ util.c \ var.c -# from lst.lib/ -SRCS+= \ - lstAppend.c \ - lstAtEnd.c \ - lstAtFront.c \ - lstClose.c \ - lstConcat.c \ - lstDatum.c \ - lstDeQueue.c \ - lstDestroy.c \ - lstDupl.c \ - lstEnQueue.c \ - lstFind.c \ - lstFindFrom.c \ - lstFirst.c \ - lstForEach.c \ - lstForEachFrom.c \ - lstInit.c \ - lstInsert.c \ - lstIsAtEnd.c \ - lstIsEmpty.c \ - lstLast.c \ - lstMember.c \ - lstNext.c \ - lstOpen.c \ - lstPrev.c \ - lstRemove.c \ - lstReplace.c \ - lstSucc.c - .-include "VERSION" .-include "Makefile.inc" @@ -97,7 +69,6 @@ COPTS.filemon_dev.c += -DHAVE_FILEMON_H -I${FILEMON_H: .endif # USE_FILEMON .PATH: ${srcdir} -.PATH: ${srcdir}/lst.lib .if make(obj) || make(clean) SUBDIR+= unit-tests @@ -109,7 +80,7 @@ SUBDIR+= unit-tests # list of OS's which are derrived from BSD4.4 BSD44_LIST= NetBSD FreeBSD OpenBSD DragonFly MirBSD Bitrig # we are... -OS!= uname -s +OS := ${.MAKE.OS:U${uname -s:L:sh}} # are we 4.4BSD ? isBSD44:=${BSD44_LIST:M${OS}} @@ -237,5 +208,8 @@ install-mk: # end-delete2 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-all@freebsd.org Sat Sep 5 20:22:03 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 08BF13D5515; Sat, 5 Sep 2020 20:22:03 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkQty6YVhz3bCY; Sat, 5 Sep 2020 20:22:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C59B522EF2; Sat, 5 Sep 2020 20:22:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085KM24E061993; Sat, 5 Sep 2020 20:22:02 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085KM26D061992; Sat, 5 Sep 2020 20:22:02 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009052022.085KM26D061992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 5 Sep 2020 20:22:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365367 - head/share/man/man9 X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/share/man/man9 X-SVN-Commit-Revision: 365367 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 20:22:03 -0000 Author: mjg Date: Sat Sep 5 20:22:02 2020 New Revision: 365367 URL: https://svnweb.freebsd.org/changeset/base/365367 Log: sx: fix up manpage after r363113 No date change as there is no new information. Submitted by: sigsys@gmail.com Differential Revision: https://reviews.freebsd.org/D26341 Modified: head/share/man/man9/sx.9 Modified: head/share/man/man9/sx.9 ============================================================================== --- head/share/man/man9/sx.9 Sat Sep 5 19:29:42 2020 (r365366) +++ head/share/man/man9/sx.9 Sat Sep 5 20:22:02 2020 (r365367) @@ -124,6 +124,7 @@ argument to specifies a set of optional flags to alter the behavior of .Fa sx . It contains one or more of the following flags: +.Bl -tag -width SX_NOWITNESS .It Dv SX_DUPOK Witness should not log messages about duplicate locks being acquired. .It Dv SX_NOWITNESS From owner-svn-src-all@freebsd.org Sat Sep 5 21:05:19 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E74B3D5E4A for ; Sat, 5 Sep 2020 21:05:19 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound2k.ore.mailhop.org (outbound2k.ore.mailhop.org [54.148.219.64]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkRrt4tz7z3chG for ; Sat, 5 Sep 2020 21:05:18 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1599339917; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=LiszwktVFzk19aiRlHtAhOKtTCHDwOPaJ2TYQv+8DhPWho1lerU4AjkctJW4CJszmShWUzgNuarJk KGNC6j/5dUTcw/y8ht9ZQXIB+bzBVFtk5WwU6aoqr7+Nne6mZ2l+BY6HZ4XFoGdEsybBb7MTdxUmfn FwmphT8ABZXPR1iikxycFXmtCcPkP07+kLrKz2s2gTgtwaXYgl+dMGAA6zxwwikA6ZQz1RUn5hBOpO wy7gMzlb9GInnOnnq9TsyZdovSaIJsCUyu4M7T8wnWZ2uMvjqJ3VSNGkPPo4H/ogzqgURfV9e70KX3 WEuqvAvrUTI1e9NGaHlNyoxDaVP/HpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:dkim-signature:from; bh=N4pgKqPxcreygm2jCQZHVNxTQrqA8bDwlFndwyrgpJo=; b=e+h/HpVJMYeD6am/z1wWgoEJotzGb+MoKPTkxacUekushCJP9CBVM9Qm5Zhwf5INp5msx8yKXFWpG LNq9rUkBsz8ZFUnnE4lgcr5Ij7V8j00uxC1HjAJma4mhDaslSPGOrFarIsbnQRAxNISiHo4eu/paPc A13gQ6AN4aysGtEQr+zRs5y3xPUcjJeRo/mZfjD/No9fQRJMa+uvSUyIkFl49LBOiy3HmcT7AdJ4ff FWLffVZ7unGmrQccQsyz9sJR+q68iSCTmWRx0TxPnHo4Nee18srYWmv6eNnq/jteBHYkbPs3u3d94f ptxYblEY8dOP6g4gWPuRue3iKGDmlDw== ARC-Authentication-Results: i=1; outbound4.ore.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:to:from:subject:message-id:from; bh=N4pgKqPxcreygm2jCQZHVNxTQrqA8bDwlFndwyrgpJo=; b=XCQ8FKDcidVMjLZ1rscKY8lwC0N1dqvDv/6NWt3H9RhALU6CNnXQfw6i+afzL7mXgNKs27nB2ZUKq xSoGj+X36EhGjID7V0GwZVfDFoUmFqFutJIh4bb4C1rRQ4+Vk+9kYQSkJjWiRXVYxBbwA/TOTsQ8Tf wM5t5AkWY+XM4fYMuZ1oiwpYPveI04iLW7eqivfsORk+AHuzuG6PE1H9k4BgyLgMGwl7Cb9RiBLkIf wxPVf0YCtIRkG2a6oCI6bLN9A/AE/Mfv0LdlZXIEeNbqn5xayKY6pRKq6r9onJCnDzqSTFgKTzpZ73 riucsojzu1XJxiCITG3y0XxlGA7awiA== X-MHO-RoutePath: aGlwcGll X-MHO-User: 7ead1ac3-efbb-11ea-9e11-df46ed8f892f X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 67.177.211.60 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (c-67-177-211-60.hsd1.co.comcast.net [67.177.211.60]) by outbound4.ore.mailhop.org (Halon) with ESMTPSA id 7ead1ac3-efbb-11ea-9e11-df46ed8f892f; Sat, 05 Sep 2020 21:05:16 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id 085L5EIK058678; Sat, 5 Sep 2020 15:05:14 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <6be43e6579fa94ab0f09b8b56e08ad7d94319757.camel@freebsd.org> Subject: Re: svn commit: r365366 - in head: contrib/bmake contrib/bmake/lst.lib contrib/bmake/mk contrib/bmake/mk/sys contrib/bmake/unit-tests usr.bin/bmake usr.bin/bmake/unit-tests From: Ian Lepore To: "Simon J. Gerraty" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Sat, 05 Sep 2020 15:05:14 -0600 In-Reply-To: <202009051929.085JTgl6027910@repo.freebsd.org> References: <202009051929.085JTgl6027910@repo.freebsd.org> Content-Type: text/plain; charset="ASCII" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4BkRrt4tz7z3chG X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:16509, ipnet:54.148.0.0/15, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 21:05:19 -0000 On Sat, 2020-09-05 at 19:29 +0000, Simon J. Gerraty wrote: > o new debug option -dl: LINT mode, does the equivalent of := for all > variable assignments so that file and line number are reported for > variable parse errors. Doesn't -dl already have a meaning ("loud" builds)? -- Ian From owner-svn-src-all@freebsd.org Sat Sep 5 21:27:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C058B3D6A42; Sat, 5 Sep 2020 21:27:01 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkSKx079Dz3fCR; Sat, 5 Sep 2020 21:27:00 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f175.google.com with SMTP id w8so9363618ilj.8; Sat, 05 Sep 2020 14:27:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=kUWMTdqUBBtouw+qawIqnyQsOj0vZEUskXNBh/MBe68=; b=o/urz8MkZevp3bO7NSdmAch6yZob46mRB2z7sVxxaLJbzx/9JGHdSmtYJcq1XBMIga YXcBlzApkwDaLUfk+jsbs3mZLwhyyUo54XhJHkzw22+P10IeU57NMroFzbmylcn/38pQ P32hMimg7219G/d9xS1Dbrwr6WtTHh5Acw5g9MXUz1qL+vK66fqk3BEX1VAa6CEe66Ou MrFu3dIi4BSPwi2dq5ExoBCoRcsyiDoprgIaJ+G3P65zyT4GUDoaIdb1lckqhsSScl/p CdvOGMjeONvNEAIYQfGvkxEPEtWuXYwsTFerA7FisBN5dFTE/lEjKVyMh15MWER9gfhH 6usA== X-Gm-Message-State: AOAM531hORm2dZbzU5YvstdDiQLehophP/XikWwCpH6ei2kV3x3ZFPDO 5UeUUn+qKpfV1hSYWBCSzVw+2MmyTLDTWkpAiww4hvOzNh8= X-Google-Smtp-Source: ABdhPJx5w5RuF400u7cF7z/X5nbDsebPHMTcBIgmWlNg4sKfKjiShdccg5UYUtUs2cTCxUXgxc4nThLhvl1j+GW0G/o= X-Received: by 2002:a92:9a0b:: with SMTP id t11mr12671024ili.98.1599341219352; Sat, 05 Sep 2020 14:26:59 -0700 (PDT) MIME-Version: 1.0 References: <202009012119.081LJERb018106@repo.freebsd.org> <95844C00-D10A-456D-AD29-DF572043074F@fh-muenster.de> <20200902020507.GA38274@FreeBSD.org> <20200902180626.GA88595@FreeBSD.org> <6124a908-25a5-e023-16da-7963ba229b7f@FreeBSD.org> <08636D5E-AA07-4AE7-B5AC-656B08CF564B@fh-muenster.de> <20200903024226.GA54078@FreeBSD.org> <60ea593f-8258-e30d-b897-f162168b44d3@cs.duke.edu> <20200905010510.GA26297@lonesome.com> In-Reply-To: From: Ed Maste Date: Sat, 5 Sep 2020 17:26:47 -0400 Message-ID: Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... To: Warner Losh Cc: Kevin Bowling , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4BkSKx079Dz3fCR X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.175 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.94 / 15.00]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; RCVD_TLS_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-0.93)[-0.926]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.991]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.175:from]; NEURAL_HAM_MEDIUM(-1.02)[-1.023]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.175:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 21:27:01 -0000 On Sat, 5 Sep 2020 at 16:41, Warner Losh wrote: > >> Fixed: >> - *_FOREACH now has a space before (, equivalent to for (;;) > > Except pretty much everywhere we don't have a space there... Why not? Why should TAILQ_FOREACH have a different style from a for loop? > broke all alignment of variables and comments that were done. > broke purposely outdented code in statistics function > broke all err() calls to wrap too much I had all of these under "indifferent" already, or are more examples of already covered cases (e.g. what seems to be string argument wrapping). > extra headers still included. This is probably not the job of a formatter though. >> - function argument wrapping (see write_glyph_buf) >> - leading indentation and args-per-line (print_font_info) > > An interesting experiment, but there's far more worse after than before. The rearranging of carefully aligned elements is an especially galling change for some people (myself included). I disagree this is far worse. If we fixed the wrapping on the second line of if/for conditions I'd say the benefit of letting tooling take care of the formatting outweighs the perhaps slightly less appealing formatting. From owner-svn-src-all@freebsd.org Sat Sep 5 22:28:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BB00D3D8659; Sat, 5 Sep 2020 22:28:31 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail.karels.net (mail.karels.net [216.160.39.52]) by mx1.freebsd.org (Postfix) with ESMTP id 4BkTht404Mz45Yd; Sat, 5 Sep 2020 22:28:30 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail.karels.net (localhost [127.0.0.1]) by mail.karels.net (8.15.2/8.15.2) with ESMTP id 085MSLh6023456; Sat, 5 Sep 2020 17:28:21 -0500 (CDT) (envelope-from mike@karels.net) Message-Id: <202009052228.085MSLh6023456@mail.karels.net> To: Ed Maste cc: Warner Losh , src-committers , svn-src-all , svn-src-head From: Mike Karels Reply-to: mike@karels.net Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... In-reply-to: Your message of Sat, 05 Sep 2020 17:26:47 -0400. MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <23454.1599344901.1@mail.karels.net> Content-Transfer-Encoding: quoted-printable Date: Sat, 05 Sep 2020 17:28:21 -0500 X-Rspamd-Queue-Id: 4BkTht404Mz45Yd X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mike@karels.net designates 216.160.39.52 as permitted sender) smtp.mailfrom=mike@karels.net X-Spamd-Result: default: False [-2.25 / 15.00]; HAS_REPLYTO(0.00)[mike@karels.net]; ARC_NA(0.00)[]; NEURAL_SPAM_SHORT(0.01)[0.011]; FREEFALL_USER(0.00)[mike]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:216.160.39.52]; NEURAL_HAM_LONG(-1.00)[-1.005]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_ADDR_EQ_FROM(0.00)[]; DMARC_NA(0.00)[karels.net]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_MEDIUM(-1.05)[-1.053]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:209, ipnet:216.160.36.0/22, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 22:28:31 -0000 > From: Ed Maste > Date: Sat, 5 Sep 2020 17:26:47 -0400 > Subject: Re: svn commit: r365071 - in head/sys: net net/altq net/route > net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu > netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph.= .. > On Sat, 5 Sep 2020 at 16:41, Warner Losh wrote: > > > >> Fixed: > >> - *_FOREACH now has a space before (, equivalent to for (;;) > > > > Except pretty much everywhere we don't have a space there... > Why not? Why should TAILQ_FOREACH have a different style from a for loop= ? Because it is a macro, maybe? And all the other invocations are done that way. > > broke all alignment of variables and comments that were done. > > broke purposely outdented code in statistics function > > broke all err() calls to wrap too much > I had all of these under "indifferent" already, or are more examples > of already covered cases (e.g. what seems to be string argument > wrapping). I don't consider those indifferent. > > extra headers still included. > This is probably not the job of a formatter though. > >> - function argument wrapping (see write_glyph_buf) > >> - leading indentation and args-per-line (print_font_info) > > > > An interesting experiment, but there's far more worse after than befor= e. The rearranging of carefully aligned elements is an especially galling = change for some people (myself included). > I disagree this is far worse. If we fixed the wrapping on the second > line of if/for conditions I'd say the benefit of letting tooling take > care of the formatting outweighs the perhaps slightly less appealing > formatting. I'm with Warner on this. I saw a lot to dislike in the changes, and very little actual improvement. If we were starting from scratch, I might be willing to accept the changes to have a formatter (albeit begrudingly), bu= t we are not starting from scratch. The churn would be horrible, and the benefit very little in comparison. Interesting experiment, but let's keep it just an experiment. Mike From owner-svn-src-all@freebsd.org Sat Sep 5 22:41:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EA5CF3D9125; Sat, 5 Sep 2020 22:41:31 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkTzv60tcz46fk; Sat, 5 Sep 2020 22:41:31 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B18F924C5C; Sat, 5 Sep 2020 22:41:31 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085MfVI8058902; Sat, 5 Sep 2020 22:41:31 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085MfV9b058901; Sat, 5 Sep 2020 22:41:31 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202009052241.085MfV9b058901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 5 Sep 2020 22:41:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365368 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 365368 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 22:41:32 -0000 Author: kib Date: Sat Sep 5 22:41:31 2020 New Revision: 365368 URL: https://svnweb.freebsd.org/changeset/base/365368 Log: rtld: do not process absent dynamic. If object has no dynamic phdr, do not try to dereference NULL. This means that we cannot process any relocation, and that there cannot be symbols defined, but it is up to static linker to produce meaningful objects. PR: 249121 Reported by: wsh@riski.sh Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sat Sep 5 20:22:02 2020 (r365367) +++ head/libexec/rtld-elf/rtld.c Sat Sep 5 22:41:31 2020 (r365368) @@ -1089,7 +1089,10 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_D *dyn_runpath = NULL; obj->bind_now = false; - for (dynp = obj->dynamic; dynp->d_tag != DT_NULL; dynp++) { + dynp = obj->dynamic; + if (dynp == NULL) + return; + for (; dynp->d_tag != DT_NULL; dynp++) { switch (dynp->d_tag) { case DT_REL: From owner-svn-src-all@freebsd.org Sat Sep 5 22:44:38 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DA2A23D913C; Sat, 5 Sep 2020 22:44:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkV3V5Vywz46h0; Sat, 5 Sep 2020 22:44:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A06ED249EB; Sat, 5 Sep 2020 22:44:38 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085Mic2f060760; Sat, 5 Sep 2020 22:44:38 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085Micsu060759; Sat, 5 Sep 2020 22:44:38 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202009052244.085Micsu060759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 5 Sep 2020 22:44:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365369 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 365369 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 22:44:38 -0000 Author: kib Date: Sat Sep 5 22:44:38 2020 New Revision: 365369 URL: https://svnweb.freebsd.org/changeset/base/365369 Log: rtld: do not refuse to relocate objects without dynamic symtabs. Such objects can still have valid relocations not requiring symbolic references. PR: 249121 Reported by: wsh@riski.sh Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sat Sep 5 22:41:31 2020 (r365368) +++ head/libexec/rtld-elf/rtld.c Sat Sep 5 22:44:38 2020 (r365369) @@ -3013,11 +3013,8 @@ relocate_object(Obj_Entry *obj, bool bind_now, Obj_Ent dbg("relocating \"%s\"", obj->path); if (obj->symtab == NULL || obj->strtab == NULL || - !(obj->valid_hash_sysv || obj->valid_hash_gnu)) { - _rtld_error("%s: Shared object has no run-time symbol table", - obj->path); - return (-1); - } + !(obj->valid_hash_sysv || obj->valid_hash_gnu)) + dbg("object %s has no run-time symbol table", obj->path); /* There are relocations to the write-protected text segment. */ if (obj->textrel && reloc_textrel_prot(obj, true) != 0) From owner-svn-src-all@freebsd.org Sat Sep 5 22:48:28 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 025A83D91CF; Sat, 5 Sep 2020 22:48:28 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkV7v6CGzz470B; Sat, 5 Sep 2020 22:48:27 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B46DC249EC; Sat, 5 Sep 2020 22:48:27 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085MmR3J060989; Sat, 5 Sep 2020 22:48:27 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085MmRPd060988; Sat, 5 Sep 2020 22:48:27 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202009052248.085MmRPd060988@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sat, 5 Sep 2020 22:48:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365370 - head/libexec/rtld-elf X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/libexec/rtld-elf X-SVN-Commit-Revision: 365370 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 22:48:28 -0000 Author: kib Date: Sat Sep 5 22:48:27 2020 New Revision: 365370 URL: https://svnweb.freebsd.org/changeset/base/365370 Log: Undo 'fix off by one' part of r365360. Noted by: emaste Sponsored by: The FreeBSD Foundation MFC after: 6 days Modified: head/libexec/rtld-elf/map_object.c Modified: head/libexec/rtld-elf/map_object.c ============================================================================== --- head/libexec/rtld-elf/map_object.c Sat Sep 5 22:44:38 2020 (r365369) +++ head/libexec/rtld-elf/map_object.c Sat Sep 5 22:48:27 2020 (r365370) @@ -49,7 +49,7 @@ int __getosreldate(void); static bool phdr_in_zero_page(const Elf_Ehdr *hdr) { - return (hdr->e_phoff + hdr->e_phnum * sizeof(Elf_Phdr) < + return (hdr->e_phoff + hdr->e_phnum * sizeof(Elf_Phdr) <= (size_t)PAGE_SIZE); } From owner-svn-src-all@freebsd.org Sat Sep 5 23:30:20 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E9743D9E05; Sat, 5 Sep 2020 23:30:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BkW4D2q6Tz49Tq; Sat, 5 Sep 2020 23:30:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FEB9258C7; Sat, 5 Sep 2020 23:30:20 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 085NUKoc085554; Sat, 5 Sep 2020 23:30:20 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 085NUIwH085545; Sat, 5 Sep 2020 23:30:18 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202009052330.085NUIwH085545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 5 Sep 2020 23:30:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365371 - in head: . contrib/jemalloc contrib/jemalloc/doc lib/libc/stdlib/jemalloc share/man/man5 share/mk tools/build/options X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in head: . contrib/jemalloc contrib/jemalloc/doc lib/libc/stdlib/jemalloc share/man/man5 share/mk tools/build/options X-SVN-Commit-Revision: 365371 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Sep 2020 23:30:20 -0000 Author: dim Date: Sat Sep 5 23:30:17 2020 New Revision: 365371 URL: https://svnweb.freebsd.org/changeset/base/365371 Log: Turn MALLOC_PRODUCTION into a regular src.conf(5) option For historical reasons, defining MALLOC_PRODUCTION in /etc/make.conf has been used to turn off potentially expensive debug checks and statistics gathering in the implementation of malloc(3). It seems more consistent to turn this into a regular src.conf(5) option, e.g. WITH_MALLOC_PRODUCTION / WITHOUT_MALLOC_PRODUCTION. This can then be toggled similar to any other source build option, and turned on or off by default for e.g. stable branches. Reviewed by: imp, #manpages MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D26337 Added: head/tools/build/options/WITHOUT_MALLOC_PRODUCTION (contents, props changed) head/tools/build/options/WITH_MALLOC_PRODUCTION (contents, props changed) Modified: head/UPDATING head/contrib/jemalloc/FREEBSD-diffs head/contrib/jemalloc/doc/jemalloc.3 head/lib/libc/stdlib/jemalloc/Makefile.inc head/share/man/man5/make.conf.5 head/share/man/man5/src.conf.5 head/share/mk/src.opts.mk Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Sep 5 22:48:27 2020 (r365370) +++ head/UPDATING Sat Sep 5 23:30:17 2020 (r365371) @@ -22,9 +22,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: debugging flags in userland, and various verbose features in the kernel. Many developers choose to disable these features on build machines to maximize performance. (To completely disable malloc - debugging, define MALLOC_PRODUCTION in /etc/make.conf, or to merely - disable the most expensive debugging functionality run - "ln -s 'abort:false,junk:false' /etc/malloc.conf".) + debugging, define WITH_MALLOC_PRODUCTION in /etc/src.conf and rebuild + world, or to merely disable the most expensive debugging functionality + at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 20200824: OpenZFS support has been integrated. Do not upgrade root pools until Modified: head/contrib/jemalloc/FREEBSD-diffs ============================================================================== --- head/contrib/jemalloc/FREEBSD-diffs Sat Sep 5 22:48:27 2020 (r365370) +++ head/contrib/jemalloc/FREEBSD-diffs Sat Sep 5 23:30:17 2020 (r365371) @@ -14,7 +14,7 @@ index 7fecda7c..d5ca5e86 100644 + . + Additionally, is enabled in development + versions of FreeBSD (controlled by the -+ MALLOC_PRODUCTION make variable). ++ MK_MALLOC_PRODUCTION make variable). + Modified: head/contrib/jemalloc/doc/jemalloc.3 ============================================================================== --- head/contrib/jemalloc/doc/jemalloc.3 Sat Sep 5 22:48:27 2020 (r365370) +++ head/contrib/jemalloc/doc/jemalloc.3 Sat Sep 5 23:30:17 2020 (r365371) @@ -43,7 +43,7 @@ The following configuration options are enabled in lib \fB\-\-with\-malloc\-conf=abort_conf:false\fR\&. Additionally, \fB\-\-enable\-debug\fR is enabled in development versions of FreeBSD (controlled by the -\fBMALLOC_PRODUCTION\fR +\fBMK_MALLOC_PRODUCTION\fR make variable)\&. .SH "SYNOPSIS" .sp Modified: head/lib/libc/stdlib/jemalloc/Makefile.inc ============================================================================== --- head/lib/libc/stdlib/jemalloc/Makefile.inc Sat Sep 5 22:48:27 2020 (r365370) +++ head/lib/libc/stdlib/jemalloc/Makefile.inc Sat Sep 5 23:30:17 2020 (r365371) @@ -45,6 +45,6 @@ MLINKS+= \ jemalloc.3 nallocx.3 \ jemalloc.3 malloc.conf.5 -.if defined(MALLOC_PRODUCTION) +.if ${MK_MALLOC_PRODUCTION} != "no" CFLAGS+= -DMALLOC_PRODUCTION .endif Modified: head/share/man/man5/make.conf.5 ============================================================================== --- head/share/man/man5/make.conf.5 Sat Sep 5 22:48:27 2020 (r365370) +++ head/share/man/man5/make.conf.5 Sat Sep 5 23:30:17 2020 (r365371) @@ -401,12 +401,6 @@ console driver to and allow access over FireWire(IEEE1394) using .Xr dconschat 8 . Currently, only i386 and amd64 are supported. -.It Va MALLOC_PRODUCTION -.Pq Vt bool -Set this to disable assertions and statistics gathering in -.Xr malloc 3 . -It also defaults the A and J runtime options to off. -Disabled by default on -CURRENT. .It Va MAN_ARCH .Pq Vt str Space-delimited list of one or more MACHINE and/or MACHINE_ARCH values Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Sat Sep 5 22:48:27 2020 (r365370) +++ head/share/man/man5/src.conf.5 Sat Sep 5 23:30:17 2020 (r365371) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd July 6, 2020 +.Dd September 5, 2020 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1104,6 +1104,11 @@ if executed as an unprivileged user. See .Xr tests 7 for more details. +.It Va WITH_MALLOC_PRODUCTION +Set to disable assertions and statistics gathering in +.Xr malloc 3 . +It also defaults the A and J runtime options to off. +Disabled by default on -CURRENT. .It Va WITHOUT_MAN Set to not build manual pages. When set, these options are also in effect: @@ -1278,12 +1283,12 @@ Enable building openldap support for kerberos. Set to not build LLVM's OpenMP runtime. .Pp This is a default setting on -arm/armv6, arm/armv7, arm64/aarch64, mips/mips, mips/mips64, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. +arm/armv6, arm/armv7, mips/mips, mips/mips64, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. .It Va WITH_OPENMP Set to build LLVM's OpenMP runtime. .Pp This is a default setting on -amd64/amd64, i386/i386 and powerpc/powerpc64. +amd64/amd64, arm64/aarch64, i386/i386 and powerpc/powerpc64. .It Va WITHOUT_OPENSSH Set to not build OpenSSH. .It Va WITHOUT_OPENSSL Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Sat Sep 5 22:48:27 2020 (r365370) +++ head/share/mk/src.opts.mk Sat Sep 5 23:30:17 2020 (r365371) @@ -213,6 +213,7 @@ __DEFAULT_NO_OPTIONS = \ LOADER_FORCE_LE \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ + MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ REPRODUCIBLE_BUILD \ Added: head/tools/build/options/WITHOUT_MALLOC_PRODUCTION ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_MALLOC_PRODUCTION Sat Sep 5 23:30:17 2020 (r365371) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to enable assertions and statistics gathering in +.Xr malloc 3 . +It also defaults the A and J runtime options to on. +Enabled by default on -CURRENT. Added: head/tools/build/options/WITH_MALLOC_PRODUCTION ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_MALLOC_PRODUCTION Sat Sep 5 23:30:17 2020 (r365371) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to disable assertions and statistics gathering in +.Xr malloc 3 . +It also defaults the A and J runtime options to off. +Disabled by default on -CURRENT.