Author: hselasky
Date: Fri Oct 31 18:18:04 2014
New Revision: 273912
URL: https://svnweb.freebsd.org/changeset/base/273912
Log:
MFC r228478, r263710, r273377, r273378, r273423, r273455 and r273899:
- Reimplement CTASSERT() using _Static_assert().
- De-vnet hash sizes and hash masks.
- Fix multiple issues related to arguments passed to SYSCTL macros.
Sponsored by: Mellanox Technologies
Modified:
stable/9/sys/amd64/amd64/fpu.c
stable/9/sys/arm/arm/busdma_machdep.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
stable/9/sys/cddl/dev/dtrace/dtrace_sysctl.c
stable/9/sys/compat/ndis/kern_ndis.c
stable/9/sys/dev/acpi_support/acpi_asus.c
stable/9/sys/dev/acpi_support/acpi_hp.c
stable/9/sys/dev/acpi_support/acpi_ibm.c
stable/9/sys/dev/acpi_support/acpi_sony.c
stable/9/sys/dev/bxe/bxe.c
stable/9/sys/dev/cxgb/cxgb_sge.c
stable/9/sys/dev/cxgbe/t4_main.c
stable/9/sys/dev/e1000/if_em.c
stable/9/sys/dev/e1000/if_igb.c
stable/9/sys/dev/e1000/if_lem.c
stable/9/sys/dev/hatm/if_hatm.c
stable/9/sys/dev/ixgbe/ixgbe.c
stable/9/sys/dev/ixgbe/ixv.c
stable/9/sys/dev/mpr/mpr.c
stable/9/sys/dev/mps/mps.c
stable/9/sys/dev/mrsas/mrsas.c
stable/9/sys/dev/mrsas/mrsas.h
stable/9/sys/dev/mxge/if_mxge.c
stable/9/sys/dev/oce/oce_sysctl.c
stable/9/sys/dev/qlxgbe/ql_os.c
stable/9/sys/dev/rt/if_rt.c
stable/9/sys/dev/sound/pci/hda/hdaa.c
stable/9/sys/dev/vxge/vxge.c
stable/9/sys/dev/xen/netfront/netfront.c
stable/9/sys/fs/devfs/devfs_devs.c
stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c
stable/9/sys/geom/geom_kern.c
stable/9/sys/kern/kern_cpuset.c
stable/9/sys/kern/kern_mib.c
stable/9/sys/kern/kern_synch.c
stable/9/sys/kern/subr_devstat.c
stable/9/sys/kern/subr_kdb.c
stable/9/sys/kern/subr_uio.c
stable/9/sys/kern/vfs_cache.c
stable/9/sys/mips/mips/busdma_machdep.c
stable/9/sys/net/if_lagg.c
stable/9/sys/net80211/ieee80211_ht.c
stable/9/sys/net80211/ieee80211_hwmp.c
stable/9/sys/net80211/ieee80211_mesh.c
stable/9/sys/net80211/ieee80211_superg.c
stable/9/sys/netgraph/bluetooth/common/ng_bluetooth.c
stable/9/sys/netgraph/ng_base.c
stable/9/sys/netgraph/ng_socket.c
stable/9/sys/netinet/cc/cc_chd.c
stable/9/sys/netinet/tcp_reass.c
stable/9/sys/netipsec/ipsec.h
stable/9/sys/netipx/ipx_proto.c
stable/9/sys/ofed/drivers/net/mlx4/mlx4_en.h
stable/9/sys/powerpc/powermac/fcu.c
stable/9/sys/powerpc/powermac/smu.c
stable/9/sys/powerpc/powerpc/busdma_machdep.c
stable/9/sys/powerpc/powerpc/cpu.c
stable/9/sys/sys/sysctl.h
stable/9/sys/sys/systm.h
stable/9/sys/vm/memguard.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/forth/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/i386/gptboot/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/dev/run/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/isp/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
stable/9/sys/dev/puc/ (props changed)
stable/9/sys/dev/usb/wlan/if_run.c (props changed)
stable/9/sys/dev/usb/wlan/if_runreg.h (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/modules/ (props changed)
stable/9/sys/modules/ixgbe/ (props changed)
stable/9/sys/modules/svr4/ (props changed)
stable/9/sys/net/ (props changed)
stable/9/sys/netpfil/ (props changed)
stable/9/sys/sys/ (props changed)
Modified: stable/9/sys/amd64/amd64/fpu.c
==============================================================================
--- stable/9/sys/amd64/amd64/fpu.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/amd64/amd64/fpu.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -130,7 +130,7 @@ CTASSERT(sizeof(struct pcb) % XSAVE_AREA
static void fpu_clean_state(void);
SYSCTL_INT(_hw, HW_FLOATINGPT, floatingpoint, CTLFLAG_RD,
- NULL, 1, "Floating point instructions executed in hardware");
+ SYSCTL_NULL_INT_PTR, 1, "Floating point instructions executed in
hardware");
int use_xsave; /* non-static for cpu_switch.S */
uint64_t xsave_mask; /* the same */
Modified: stable/9/sys/arm/arm/busdma_machdep.c
==============================================================================
--- stable/9/sys/arm/arm/busdma_machdep.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/arm/arm/busdma_machdep.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -1352,9 +1352,9 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
"lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
- SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+ SYSCTL_ADD_ULONG(busdma_sysctl_tree(bz),
SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
- "alignment", CTLFLAG_RD, &bz->alignment, 0, "");
+ "alignment", CTLFLAG_RD, &bz->alignment, "");
return (0);
}
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Fri Oct
31 17:43:21 2014 (r273911)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Fri Oct
31 18:18:04 2014 (r273912)
@@ -67,8 +67,8 @@
#include "zfs_comutil.h"
/* Used by fstat(1). */
-SYSCTL_INT(_debug_sizeof, OID_AUTO, znode, CTLFLAG_RD, 0, sizeof(znode_t),
- "sizeof(znode_t)");
+SYSCTL_INT(_debug_sizeof, OID_AUTO, znode, CTLFLAG_RD,
+ SYSCTL_NULL_INT_PTR, sizeof(znode_t), "sizeof(znode_t)");
/*
* Define ZNODE_STATS to turn on statistic gathering. By default, it is only
Modified: stable/9/sys/cddl/dev/dtrace/dtrace_sysctl.c
==============================================================================
--- stable/9/sys/cddl/dev/dtrace/dtrace_sysctl.c Fri Oct 31 17:43:21
2014 (r273911)
+++ stable/9/sys/cddl/dev/dtrace/dtrace_sysctl.c Fri Oct 31 18:18:04
2014 (r273912)
@@ -84,10 +84,10 @@ SYSCTL_PROC(_debug_dtrace, OID_AUTO, pro
SYSCTL_NODE(_kern, OID_AUTO, dtrace, CTLFLAG_RD, 0, "DTrace parameters");
-SYSCTL_LONG(_kern_dtrace, OID_AUTO, dof_maxsize, CTLFLAG_RW,
+SYSCTL_QUAD(_kern_dtrace, OID_AUTO, dof_maxsize, CTLFLAG_RW,
&dtrace_dof_maxsize, 0, "largest allowed DOF table");
-SYSCTL_LONG(_kern_dtrace, OID_AUTO, helper_actions_max, CTLFLAG_RW,
+SYSCTL_QUAD(_kern_dtrace, OID_AUTO, helper_actions_max, CTLFLAG_RW,
&dtrace_helper_actions_max, 0, "maximum number of allowed helper actions");
SYSCTL_INT(_kern_dtrace, OID_AUTO, memstr_max, CTLFLAG_RW, &dtrace_memstr_max,
Modified: stable/9/sys/compat/ndis/kern_ndis.c
==============================================================================
--- stable/9/sys/compat/ndis/kern_ndis.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/compat/ndis/kern_ndis.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
#include <dev/if_ndis/if_ndisvar.h>
#define NDIS_DUMMY_PATH "\\\\some\\bogus\\path"
+#define NDIS_FLAG_RDONLY 1
static void ndis_status_func(ndis_handle, ndis_status, void *, uint32_t);
static void ndis_statusdone_func(ndis_handle);
@@ -325,48 +326,48 @@ ndis_create_sysctls(arg)
* We qualify as the latter.
*/
ndis_add_sysctl(sc, "Environment",
- "Windows environment", "1", CTLFLAG_RD);
+ "Windows environment", "1", NDIS_FLAG_RDONLY);
/* NDIS version should be 5.1. */
ndis_add_sysctl(sc, "NdisVersion",
- "NDIS API Version", "0x00050001", CTLFLAG_RD);
+ "NDIS API Version", "0x00050001", NDIS_FLAG_RDONLY);
/*
* Some miniport drivers rely on the existence of the SlotNumber,
* NetCfgInstanceId and DriverDesc keys.
*/
- ndis_add_sysctl(sc, "SlotNumber", "Slot Numer", "01", CTLFLAG_RD);
+ ndis_add_sysctl(sc, "SlotNumber", "Slot Numer", "01", NDIS_FLAG_RDONLY);
ndis_add_sysctl(sc, "NetCfgInstanceId", "NetCfgInstanceId",
- "{12345678-1234-5678-CAFE0-123456789ABC}", CTLFLAG_RD);
+ "{12345678-1234-5678-CAFE0-123456789ABC}", NDIS_FLAG_RDONLY);
ndis_add_sysctl(sc, "DriverDesc", "Driver Description",
- "NDIS Network Adapter", CTLFLAG_RD);
+ "NDIS Network Adapter", NDIS_FLAG_RDONLY);
/* Bus type (PCI, PCMCIA, etc...) */
sprintf(buf, "%d", (int)sc->ndis_iftype);
- ndis_add_sysctl(sc, "BusType", "Bus Type", buf, CTLFLAG_RD);
+ ndis_add_sysctl(sc, "BusType", "Bus Type", buf, NDIS_FLAG_RDONLY);
if (sc->ndis_res_io != NULL) {
sprintf(buf, "0x%lx", rman_get_start(sc->ndis_res_io));
ndis_add_sysctl(sc, "IOBaseAddress",
- "Base I/O Address", buf, CTLFLAG_RD);
+ "Base I/O Address", buf, NDIS_FLAG_RDONLY);
}
if (sc->ndis_irq != NULL) {
sprintf(buf, "%lu", rman_get_start(sc->ndis_irq));
ndis_add_sysctl(sc, "InterruptNumber",
- "Interrupt Number", buf, CTLFLAG_RD);
+ "Interrupt Number", buf, NDIS_FLAG_RDONLY);
}
return (0);
}
int
-ndis_add_sysctl(arg, key, desc, val, flag)
+ndis_add_sysctl(arg, key, desc, val, flag_rdonly)
void *arg;
char *key;
char *desc;
char *val;
- int flag;
+ int flag_rdonly;
{
struct ndis_softc *sc;
struct ndis_cfglist *cfg;
@@ -391,13 +392,21 @@ ndis_add_sysctl(arg, key, desc, val, fla
TAILQ_INSERT_TAIL(&sc->ndis_cfglist_head, cfg, link);
- cfg->ndis_oid =
- SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev),
- SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)),
- OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag,
- cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val),
- cfg->ndis_cfg.nc_cfgdesc);
-
+ if (flag_rdonly != 0) {
+ cfg->ndis_oid =
+ SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev),
+ SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)),
+ OID_AUTO, cfg->ndis_cfg.nc_cfgkey, CTLFLAG_RD,
+ cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val),
+ cfg->ndis_cfg.nc_cfgdesc);
+ } else {
+ cfg->ndis_oid =
+ SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev),
+ SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)),
+ OID_AUTO, cfg->ndis_cfg.nc_cfgkey, CTLFLAG_RW,
+ cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val),
+ cfg->ndis_cfg.nc_cfgdesc);
+ }
return (0);
}
Modified: stable/9/sys/dev/acpi_support/acpi_asus.c
==============================================================================
--- stable/9/sys/dev/acpi_support/acpi_asus.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/acpi_support/acpi_asus.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -465,43 +465,39 @@ static struct {
char *name;
char *description;
int method;
- int flags;
+ int flag_anybody;
} acpi_asus_sysctls[] = {
{
.name = "lcd_backlight",
.method = ACPI_ASUS_METHOD_LCD,
.description = "state of the lcd backlight",
- .flags = CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY
+ .flag_anybody = 1
},
{
.name = "lcd_brightness",
.method = ACPI_ASUS_METHOD_BRN,
.description = "brightness of the lcd panel",
- .flags = CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY
+ .flag_anybody = 1
},
{
.name = "video_output",
.method = ACPI_ASUS_METHOD_DISP,
.description = "display output state",
- .flags = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "camera",
.method = ACPI_ASUS_METHOD_CAMERA,
.description = "internal camera state",
- .flags = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "cardreader",
.method = ACPI_ASUS_METHOD_CARDRD,
.description = "internal card reader state",
- .flags = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "wlan",
.method = ACPI_ASUS_METHOD_WLAN,
.description = "wireless lan state",
- .flags = CTLTYPE_INT | CTLFLAG_RW
},
{ .name = NULL }
@@ -741,12 +737,21 @@ acpi_asus_attach(device_t dev)
if (!acpi_asus_sysctl_init(sc, acpi_asus_sysctls[i].method))
continue;
- SYSCTL_ADD_PROC(&sc->sysctl_ctx,
- SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
- acpi_asus_sysctls[i].name,
- acpi_asus_sysctls[i].flags,
- sc, i, acpi_asus_sysctl, "I",
- acpi_asus_sysctls[i].description);
+ if (acpi_asus_sysctls[i].flag_anybody != 0) {
+ SYSCTL_ADD_PROC(&sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
+ acpi_asus_sysctls[i].name,
+ CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY,
+ sc, i, acpi_asus_sysctl, "I",
+ acpi_asus_sysctls[i].description);
+ } else {
+ SYSCTL_ADD_PROC(&sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
+ acpi_asus_sysctls[i].name,
+ CTLTYPE_INT | CTLFLAG_RW,
+ sc, i, acpi_asus_sysctl, "I",
+ acpi_asus_sysctls[i].description);
+ }
}
/* Attach leds */
Modified: stable/9/sys/dev/acpi_support/acpi_hp.c
==============================================================================
--- stable/9/sys/dev/acpi_support/acpi_hp.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/acpi_support/acpi_hp.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -152,135 +152,123 @@ static struct {
char *name;
int method;
char *description;
- int access;
+ int flag_rdonly;
} acpi_hp_sysctls[] = {
{
.name = "wlan_enabled",
.method = ACPI_HP_METHOD_WLAN_ENABLED,
.description = "Enable/Disable WLAN (WiFi)",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "wlan_radio",
.method = ACPI_HP_METHOD_WLAN_RADIO,
.description = "WLAN radio status",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "wlan_on_air",
.method = ACPI_HP_METHOD_WLAN_ON_AIR,
.description = "WLAN radio ready to use (enabled and radio)",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "wlan_enable_if_radio_on",
.method = ACPI_HP_METHOD_WLAN_ENABLE_IF_RADIO_ON,
.description = "Enable WLAN if radio is turned on",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "wlan_disable_if_radio_off",
.method = ACPI_HP_METHOD_WLAN_DISABLE_IF_RADIO_OFF,
.description = "Disable WLAN if radio is turned off",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "bt_enabled",
.method = ACPI_HP_METHOD_BLUETOOTH_ENABLED,
.description = "Enable/Disable Bluetooth",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "bt_radio",
.method = ACPI_HP_METHOD_BLUETOOTH_RADIO,
.description = "Bluetooth radio status",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "bt_on_air",
.method = ACPI_HP_METHOD_BLUETOOTH_ON_AIR,
.description = "Bluetooth radio ready to use"
" (enabled and radio)",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "bt_enable_if_radio_on",
.method = ACPI_HP_METHOD_BLUETOOTH_ENABLE_IF_RADIO_ON,
.description = "Enable bluetooth if radio is turned on",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "bt_disable_if_radio_off",
.method = ACPI_HP_METHOD_BLUETOOTH_DISABLE_IF_RADIO_OFF,
.description = "Disable bluetooth if radio is turned off",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "wwan_enabled",
.method = ACPI_HP_METHOD_WWAN_ENABLED,
.description = "Enable/Disable WWAN (UMTS)",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "wwan_radio",
.method = ACPI_HP_METHOD_WWAN_RADIO,
.description = "WWAN radio status",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "wwan_on_air",
.method = ACPI_HP_METHOD_WWAN_ON_AIR,
.description = "WWAN radio ready to use (enabled and radio)",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "wwan_enable_if_radio_on",
.method = ACPI_HP_METHOD_WWAN_ENABLE_IF_RADIO_ON,
.description = "Enable WWAN if radio is turned on",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "wwan_disable_if_radio_off",
.method = ACPI_HP_METHOD_WWAN_DISABLE_IF_RADIO_OFF,
.description = "Disable WWAN if radio is turned off",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "als_enabled",
.method = ACPI_HP_METHOD_ALS,
.description = "Enable/Disable ALS (Ambient light sensor)",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "display",
.method = ACPI_HP_METHOD_DISPLAY,
.description = "Display status",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "hdd_temperature",
.method = ACPI_HP_METHOD_HDDTEMP,
.description = "HDD temperature",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "is_docked",
.method = ACPI_HP_METHOD_DOCK,
.description = "Docking station status",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "cmi_detail",
.method = ACPI_HP_METHOD_CMI_DETAIL,
.description = "Details shown in CMI output "
"(cat /dev/hpcmi)",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "verbose",
.method = ACPI_HP_METHOD_VERBOSE,
.description = "Verbosity level",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{ NULL, 0, NULL, 0 }
@@ -559,11 +547,19 @@ acpi_hp_attach(device_t dev)
sc->was_wwan_on_air = arg;
}
- SYSCTL_ADD_PROC(sc->sysctl_ctx,
- SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
- acpi_hp_sysctls[i].name, acpi_hp_sysctls[i].access,
- sc, i, acpi_hp_sysctl, "I",
- acpi_hp_sysctls[i].description);
+ if (acpi_hp_sysctls[i].flag_rdonly != 0) {
+ SYSCTL_ADD_PROC(sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
+ acpi_hp_sysctls[i].name, CTLTYPE_INT | CTLFLAG_RD,
+ sc, i, acpi_hp_sysctl, "I",
+ acpi_hp_sysctls[i].description);
+ } else {
+ SYSCTL_ADD_PROC(sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
+ acpi_hp_sysctls[i].name, CTLTYPE_INT | CTLFLAG_RW,
+ sc, i, acpi_hp_sysctl, "I",
+ acpi_hp_sysctls[i].description);
+ }
}
ACPI_SERIAL_END(hp);
Modified: stable/9/sys/dev/acpi_support/acpi_ibm.c
==============================================================================
--- stable/9/sys/dev/acpi_support/acpi_ibm.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/acpi_support/acpi_ibm.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -192,79 +192,70 @@ static struct {
char *name;
int method;
char *description;
- int access;
+ int flag_rdonly;
} acpi_ibm_sysctls[] = {
{
.name = "events",
.method = ACPI_IBM_METHOD_EVENTS,
.description = "ACPI events enable",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "eventmask",
.method = ACPI_IBM_METHOD_EVENTMASK,
.description = "ACPI eventmask",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "hotkey",
.method = ACPI_IBM_METHOD_HOTKEY,
.description = "Key Status",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "lcd_brightness",
.method = ACPI_IBM_METHOD_BRIGHTNESS,
.description = "LCD Brightness",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "volume",
.method = ACPI_IBM_METHOD_VOLUME,
.description = "Volume",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "mute",
.method = ACPI_IBM_METHOD_MUTE,
.description = "Mute",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "thinklight",
.method = ACPI_IBM_METHOD_THINKLIGHT,
.description = "Thinklight enable",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "bluetooth",
.method = ACPI_IBM_METHOD_BLUETOOTH,
.description = "Bluetooth enable",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "wlan",
.method = ACPI_IBM_METHOD_WLAN,
.description = "WLAN enable",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "fan_speed",
.method = ACPI_IBM_METHOD_FANSPEED,
.description = "Fan speed",
- .access = CTLTYPE_INT | CTLFLAG_RD
+ .flag_rdonly = 1
},
{
.name = "fan_level",
.method = ACPI_IBM_METHOD_FANLEVEL,
.description = "Fan level",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{
.name = "fan",
.method = ACPI_IBM_METHOD_FANSTATUS,
.description = "Fan enable",
- .access = CTLTYPE_INT | CTLFLAG_RW
},
{ NULL, 0, NULL, 0 }
@@ -415,11 +406,19 @@ acpi_ibm_attach(device_t dev)
if (!acpi_ibm_sysctl_init(sc, acpi_ibm_sysctls[i].method))
continue;
- SYSCTL_ADD_PROC(sc->sysctl_ctx,
- SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
- acpi_ibm_sysctls[i].name, acpi_ibm_sysctls[i].access,
- sc, i, acpi_ibm_sysctl, "I",
- acpi_ibm_sysctls[i].description);
+ if (acpi_ibm_sysctls[i].flag_rdonly != 0) {
+ SYSCTL_ADD_PROC(sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
+ acpi_ibm_sysctls[i].name, CTLTYPE_INT | CTLFLAG_RD,
+ sc, i, acpi_ibm_sysctl, "I",
+ acpi_ibm_sysctls[i].description);
+ } else {
+ SYSCTL_ADD_PROC(sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
+ acpi_ibm_sysctls[i].name, CTLTYPE_INT | CTLFLAG_RW,
+ sc, i, acpi_ibm_sysctl, "I",
+ acpi_ibm_sysctls[i].description);
+ }
}
/* Hook up thermal node */
@@ -483,15 +482,10 @@ acpi_ibm_resume(device_t dev)
for (int i = 0; acpi_ibm_sysctls[i].name != NULL; i++) {
int val;
- if ((acpi_ibm_sysctls[i].access & CTLFLAG_RD) == 0) {
- continue;
- }
-
val = acpi_ibm_sysctl_get(sc, i);
- if ((acpi_ibm_sysctls[i].access & CTLFLAG_WR) == 0) {
+ if (acpi_ibm_sysctls[i].flag_rdonly != 0)
continue;
- }
acpi_ibm_sysctl_set(sc, i, val);
}
Modified: stable/9/sys/dev/acpi_support/acpi_sony.c
==============================================================================
--- stable/9/sys/dev/acpi_support/acpi_sony.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/acpi_support/acpi_sony.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -132,13 +132,22 @@ acpi_sony_attach(device_t dev)
sc = device_get_softc(dev);
acpi_GetInteger(acpi_get_handle(dev), ACPI_SONY_GET_PID, &sc->pid);
device_printf(dev, "PID %x\n", sc->pid);
- for (i = 0 ; acpi_sony_oids[i].nodename != NULL; i++){
- SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
- SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
- i, acpi_sony_oids[i].nodename , CTLTYPE_INT |
- ((acpi_sony_oids[i].setmethod)? CTLFLAG_RW: CTLFLAG_RD),
- dev, i, sysctl_acpi_sony_gen_handler, "I",
- acpi_sony_oids[i].comment);
+ for (i = 0 ; acpi_sony_oids[i].nodename != NULL; i++) {
+ if (acpi_sony_oids[i].setmethod != NULL) {
+ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+ i, acpi_sony_oids[i].nodename ,
+ CTLTYPE_INT | CTLFLAG_RW,
+ dev, i, sysctl_acpi_sony_gen_handler, "I",
+ acpi_sony_oids[i].comment);
+ } else {
+ SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
+ SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+ i, acpi_sony_oids[i].nodename ,
+ CTLTYPE_INT | CTLFLAG_RD,
+ dev, i, sysctl_acpi_sony_gen_handler, "I",
+ acpi_sony_oids[i].comment);
+ }
}
return (0);
}
Modified: stable/9/sys/dev/bxe/bxe.c
==============================================================================
--- stable/9/sys/dev/bxe/bxe.c Fri Oct 31 17:43:21 2014 (r273911)
+++ stable/9/sys/dev/bxe/bxe.c Fri Oct 31 18:18:04 2014 (r273912)
@@ -16229,7 +16229,7 @@ bxe_add_sysctls(struct bxe_softc *sc)
"version");
SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "bc_version",
- CTLFLAG_RD, &sc->devinfo.bc_ver_str, 0,
+ CTLFLAG_RD, sc->devinfo.bc_ver_str, 0,
"bootcode version");
snprintf(sc->fw_ver_str, sizeof(sc->fw_ver_str), "%d.%d.%d.%d",
@@ -16238,7 +16238,7 @@ bxe_add_sysctls(struct bxe_softc *sc)
BCM_5710_FW_REVISION_VERSION,
BCM_5710_FW_ENGINEERING_VERSION);
SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "fw_version",
- CTLFLAG_RD, &sc->fw_ver_str, 0,
+ CTLFLAG_RD, sc->fw_ver_str, 0,
"firmware version");
snprintf(sc->mf_mode_str, sizeof(sc->mf_mode_str), "%s",
@@ -16248,7 +16248,7 @@ bxe_add_sysctls(struct bxe_softc *sc)
(sc->devinfo.mf_info.mf_mode == MULTI_FUNCTION_AFEX) ? "MF-AFEX" :
"Unknown"));
SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "mf_mode",
- CTLFLAG_RD, &sc->mf_mode_str, 0,
+ CTLFLAG_RD, sc->mf_mode_str, 0,
"multifunction mode");
SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "mf_vnics",
@@ -16256,7 +16256,7 @@ bxe_add_sysctls(struct bxe_softc *sc)
"multifunction vnics per port");
SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "mac_addr",
- CTLFLAG_RD, &sc->mac_addr_str, 0,
+ CTLFLAG_RD, sc->mac_addr_str, 0,
"mac address");
snprintf(sc->pci_link_str, sizeof(sc->pci_link_str), "%s x%d",
@@ -16266,12 +16266,12 @@ bxe_add_sysctls(struct bxe_softc *sc)
"???GT/s"),
sc->devinfo.pcie_link_width);
SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "pci_link",
- CTLFLAG_RD, &sc->pci_link_str, 0,
+ CTLFLAG_RD, sc->pci_link_str, 0,
"pci link status");
sc->debug = bxe_debug;
- SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "debug",
- CTLFLAG_RW, &sc->debug, 0,
+ SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "debug",
+ CTLFLAG_RW, &sc->debug,
"debug logging mode");
sc->rx_budget = bxe_rx_budget;
Modified: stable/9/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- stable/9/sys/dev/cxgb/cxgb_sge.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/cxgb/cxgb_sge.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -3371,7 +3371,7 @@ t3_add_attach_sysctls(adapter_t *sc)
/* random information */
SYSCTL_ADD_STRING(ctx, children, OID_AUTO,
"firmware_version",
- CTLFLAG_RD, &sc->fw_version,
+ CTLFLAG_RD, sc->fw_version,
0, "firmware version");
SYSCTL_ADD_UINT(ctx, children, OID_AUTO,
"hw_revision",
@@ -3379,7 +3379,7 @@ t3_add_attach_sysctls(adapter_t *sc)
0, "chip model");
SYSCTL_ADD_STRING(ctx, children, OID_AUTO,
"port_types",
- CTLFLAG_RD, &sc->port_types,
+ CTLFLAG_RD, sc->port_types,
0, "type of ports");
SYSCTL_ADD_INT(ctx, children, OID_AUTO,
"enable_debug",
@@ -3510,7 +3510,7 @@ t3_add_configured_sysctls(adapter_t *sc)
SYSCTL_ADD_UINT(ctx, rspqpoidlist, OID_AUTO, "starved",
CTLFLAG_RD, &qs->rspq.starved,
0, "#times starved");
- SYSCTL_ADD_ULONG(ctx, rspqpoidlist, OID_AUTO,
"phys_addr",
+ SYSCTL_ADD_UAUTO(ctx, rspqpoidlist, OID_AUTO,
"phys_addr",
CTLFLAG_RD, &qs->rspq.phys_addr,
"physical_address_of the queue");
SYSCTL_ADD_UINT(ctx, rspqpoidlist, OID_AUTO,
"dump_start",
@@ -3546,7 +3546,7 @@ t3_add_configured_sysctls(adapter_t *sc)
SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "in_use",
CTLFLAG_RD, &txq->in_use,
0, "#tunneled packet slots in use");
- SYSCTL_ADD_ULONG(ctx, txqpoidlist, OID_AUTO, "frees",
+ SYSCTL_ADD_UQUAD(ctx, txqpoidlist, OID_AUTO, "frees",
CTLFLAG_RD, &txq->txq_frees,
"#tunneled packets freed");
SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "skipped",
@@ -3561,7 +3561,7 @@ t3_add_configured_sysctls(adapter_t *sc)
SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO,
"stopped_flags",
CTLFLAG_RD, &qs->txq_stopped,
0, "tx queues stopped");
- SYSCTL_ADD_ULONG(ctx, txqpoidlist, OID_AUTO,
"phys_addr",
+ SYSCTL_ADD_UAUTO(ctx, txqpoidlist, OID_AUTO,
"phys_addr",
CTLFLAG_RD, &txq->phys_addr,
"physical_address_of the queue");
SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "qgen",
Modified: stable/9/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/9/sys/dev/cxgbe/t4_main.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/cxgbe/t4_main.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -4237,10 +4237,10 @@ t4_sysctls(struct adapter *sc)
NULL, chip_rev(sc), "chip hardware revision");
SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "firmware_version",
- CTLFLAG_RD, &sc->fw_version, 0, "firmware version");
+ CTLFLAG_RD, sc->fw_version, 0, "firmware version");
SYSCTL_ADD_STRING(ctx, children, OID_AUTO, "cf",
- CTLFLAG_RD, &sc->cfg_file, 0, "configuration file");
+ CTLFLAG_RD, sc->cfg_file, 0, "configuration file");
SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "cfcsum", CTLFLAG_RD, NULL,
sc->cfcsum, "config file checksum");
Modified: stable/9/sys/dev/e1000/if_em.c
==============================================================================
--- stable/9/sys/dev/e1000/if_em.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/e1000/if_em.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -5680,7 +5680,7 @@ em_set_sysctl_value(struct adapter *adap
*limit = value;
SYSCTL_ADD_INT(device_get_sysctl_ctx(adapter->dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(adapter->dev)),
- OID_AUTO, name, CTLTYPE_INT|CTLFLAG_RW, limit, value, description);
+ OID_AUTO, name, CTLFLAG_RW, limit, value, description);
}
Modified: stable/9/sys/dev/e1000/if_igb.c
==============================================================================
--- stable/9/sys/dev/e1000/if_igb.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/e1000/if_igb.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -5590,8 +5590,8 @@ igb_add_hw_stats(struct adapter *adapter
char namebuf[QUEUE_NAME_LEN];
/* Driver Statistics */
- SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "link_irq",
- CTLFLAG_RD, &adapter->link_irq, 0,
+ SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "link_irq",
+ CTLFLAG_RD, &adapter->link_irq,
"Link MSIX IRQ Handled");
SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "dropped",
CTLFLAG_RD, &adapter->dropped_pkts,
@@ -5640,17 +5640,17 @@ igb_add_hw_stats(struct adapter *adapter
queue_list = SYSCTL_CHILDREN(queue_node);
SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "interrupt_rate",
- CTLFLAG_RD, &adapter->queues[i],
+ CTLTYPE_UINT | CTLFLAG_RD, &adapter->queues[i],
sizeof(&adapter->queues[i]),
igb_sysctl_interrupt_rate_handler,
"IU", "Interrupt Rate");
SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_head",
- CTLFLAG_RD, adapter, E1000_TDH(txr->me),
+ CTLTYPE_UINT | CTLFLAG_RD, adapter,
E1000_TDH(txr->me),
igb_sysctl_reg_handler, "IU",
"Transmit Descriptor Head");
SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_tail",
- CTLFLAG_RD, adapter, E1000_TDT(txr->me),
+ CTLTYPE_UINT | CTLFLAG_RD, adapter,
E1000_TDT(txr->me),
igb_sysctl_reg_handler, "IU",
"Transmit Descriptor Tail");
SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "no_desc_avail",
@@ -5661,11 +5661,11 @@ igb_add_hw_stats(struct adapter *adapter
"Queue Packets Transmitted");
SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_head",
- CTLFLAG_RD, adapter, E1000_RDH(rxr->me),
+ CTLTYPE_UINT | CTLFLAG_RD, adapter,
E1000_RDH(rxr->me),
igb_sysctl_reg_handler, "IU",
"Receive Descriptor Head");
SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_tail",
- CTLFLAG_RD, adapter, E1000_RDT(rxr->me),
+ CTLTYPE_UINT | CTLFLAG_RD, adapter,
E1000_RDT(rxr->me),
igb_sysctl_reg_handler, "IU",
"Receive Descriptor Tail");
SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "rx_packets",
@@ -6015,7 +6015,7 @@ igb_set_sysctl_value(struct adapter *ada
*limit = value;
SYSCTL_ADD_INT(device_get_sysctl_ctx(adapter->dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(adapter->dev)),
- OID_AUTO, name, CTLTYPE_INT|CTLFLAG_RW, limit, value, description);
+ OID_AUTO, name, CTLFLAG_RW, limit, value, description);
}
/*
Modified: stable/9/sys/dev/e1000/if_lem.c
==============================================================================
--- stable/9/sys/dev/e1000/if_lem.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/e1000/if_lem.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -4648,7 +4648,7 @@ lem_set_flow_cntrl(struct adapter *adapt
*limit = value;
SYSCTL_ADD_INT(device_get_sysctl_ctx(adapter->dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(adapter->dev)),
- OID_AUTO, name, CTLTYPE_INT|CTLFLAG_RW, limit, value, description);
+ OID_AUTO, name, CTLFLAG_RW, limit, value, description);
}
static void
@@ -4658,5 +4658,5 @@ lem_add_rx_process_limit(struct adapter
*limit = value;
SYSCTL_ADD_INT(device_get_sysctl_ctx(adapter->dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(adapter->dev)),
- OID_AUTO, name, CTLTYPE_INT|CTLFLAG_RW, limit, value, description);
+ OID_AUTO, name, CTLFLAG_RW, limit, value, description);
}
Modified: stable/9/sys/dev/hatm/if_hatm.c
==============================================================================
--- stable/9/sys/dev/hatm/if_hatm.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/hatm/if_hatm.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -1311,9 +1311,17 @@ kenv_getuint(struct hatm_softc *sc, cons
*ptr = def;
- if (SYSCTL_ADD_UINT(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree),
- OID_AUTO, var, rw ? CTLFLAG_RW : CTLFLAG_RD, ptr, 0, "") == NULL)
- return (ENOMEM);
+ if (rw != 0) {
+ if (SYSCTL_ADD_UINT(&sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, var,
+ CTLFLAG_RW, ptr, 0, "") == NULL)
+ return (ENOMEM);
+ } else {
+ if (SYSCTL_ADD_UINT(&sc->sysctl_ctx,
+ SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, var,
+ CTLFLAG_RD, ptr, 0, "") == NULL)
+ return (ENOMEM);
+ }
snprintf(full, sizeof(full), "hw.%s.%s",
device_get_nameunit(sc->dev), var);
Modified: stable/9/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- stable/9/sys/dev/ixgbe/ixgbe.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/ixgbe/ixgbe.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -462,7 +462,7 @@ ixgbe_attach(device_t dev)
SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
- OID_AUTO, "enable_aim", CTLTYPE_INT|CTLFLAG_RW,
+ OID_AUTO, "enable_aim", CTLFLAG_RW,
&ixgbe_enable_aim, 1, "Interrupt Moderation");
/*
Modified: stable/9/sys/dev/ixgbe/ixv.c
==============================================================================
--- stable/9/sys/dev/ixgbe/ixv.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/ixgbe/ixv.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -322,7 +322,7 @@ ixv_attach(device_t dev)
SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
- OID_AUTO, "enable_aim", CTLTYPE_INT|CTLFLAG_RW,
+ OID_AUTO, "enable_aim", CTLFLAG_RW,
&ixv_enable_aim, 1, "Interrupt Moderation");
/* Set up the timer callout */
@@ -4002,6 +4002,6 @@ ixv_add_rx_process_limit(struct adapter
*limit = value;
SYSCTL_ADD_INT(device_get_sysctl_ctx(adapter->dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(adapter->dev)),
- OID_AUTO, name, CTLTYPE_INT|CTLFLAG_RW, limit, value, description);
+ OID_AUTO, name, CTLFLAG_RW, limit, value, description);
}
Modified: stable/9/sys/dev/mpr/mpr.c
==============================================================================
--- stable/9/sys/dev/mpr/mpr.c Fri Oct 31 17:43:21 2014 (r273911)
+++ stable/9/sys/dev/mpr/mpr.c Fri Oct 31 18:18:04 2014 (r273912)
@@ -1447,7 +1447,7 @@ mpr_setup_sysctl(struct mpr_softc *sc)
"Disable the use of MSI interrupts");
SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
- OID_AUTO, "firmware_version", CTLFLAG_RW, &sc->fw_version,
+ OID_AUTO, "firmware_version", CTLFLAG_RW, sc->fw_version,
strlen(sc->fw_version), "firmware version");
SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
Modified: stable/9/sys/dev/mps/mps.c
==============================================================================
--- stable/9/sys/dev/mps/mps.c Fri Oct 31 17:43:21 2014 (r273911)
+++ stable/9/sys/dev/mps/mps.c Fri Oct 31 18:18:04 2014 (r273912)
@@ -1416,7 +1416,7 @@ mps_setup_sysctl(struct mps_softc *sc)
"Disable the use of MSI interrupts");
SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
- OID_AUTO, "firmware_version", CTLFLAG_RW, &sc->fw_version,
+ OID_AUTO, "firmware_version", CTLFLAG_RW, sc->fw_version,
strlen(sc->fw_version), "firmware version");
SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
Modified: stable/9/sys/dev/mrsas/mrsas.c
==============================================================================
--- stable/9/sys/dev/mrsas/mrsas.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/mrsas/mrsas.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -393,7 +393,7 @@ mrsas_setup_sysctl(struct mrsas_softc *s
SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
OID_AUTO, "fw_outstanding", CTLFLAG_RD,
- &sc->fw_outstanding, 0, "FW outstanding commands");
+ &sc->fw_outstanding.val_rdonly, 0, "FW outstanding commands");
SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
OID_AUTO, "io_cmds_highwater", CTLFLAG_RD,
Modified: stable/9/sys/dev/mrsas/mrsas.h
==============================================================================
--- stable/9/sys/dev/mrsas/mrsas.h Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/mrsas/mrsas.h Fri Oct 31 18:18:04 2014
(r273912)
@@ -529,8 +529,9 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UN
} MPI2_REPLY_DESCRIPTORS_UNION, MPI2_POINTER PTR_MPI2_REPLY_DESCRIPTORS_UNION,
Mpi2ReplyDescriptorsUnion_t, MPI2_POINTER pMpi2ReplyDescriptorsUnion_t;
-typedef struct {
+typedef union {
volatile unsigned int val;
+ unsigned int val_rdonly;
} atomic_t;
#define atomic_read(v) atomic_load_acq_int(&(v)->val)
@@ -2406,7 +2407,7 @@ struct mrsas_softc {
void *ctlr_info_mem; // get ctlr info cmd virtual addr
bus_addr_t ctlr_info_phys_addr; //get ctlr info cmd physical addr
u_int32_t max_sectors_per_req;
- u_int8_t disableOnlineCtrlReset;
+ u_int32_t disableOnlineCtrlReset;
atomic_t fw_outstanding;
u_int32_t mrsas_debug;
u_int32_t mrsas_io_timeout;
Modified: stable/9/sys/dev/mxge/if_mxge.c
==============================================================================
--- stable/9/sys/dev/mxge/if_mxge.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/mxge/if_mxge.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -1466,15 +1466,15 @@ mxge_add_sysctls(mxge_softc_t *sc)
/* random information */
SYSCTL_ADD_STRING(ctx, children, OID_AUTO,
"firmware_version",
- CTLFLAG_RD, &sc->fw_version,
+ CTLFLAG_RD, sc->fw_version,
0, "firmware version");
SYSCTL_ADD_STRING(ctx, children, OID_AUTO,
"serial_number",
- CTLFLAG_RD, &sc->serial_number_string,
+ CTLFLAG_RD, sc->serial_number_string,
0, "serial number");
SYSCTL_ADD_STRING(ctx, children, OID_AUTO,
"product_code",
- CTLFLAG_RD, &sc->product_code_string,
+ CTLFLAG_RD, sc->product_code_string,
0, "product_code");
SYSCTL_ADD_INT(ctx, children, OID_AUTO,
"pcie_link_width",
Modified: stable/9/sys/dev/oce/oce_sysctl.c
==============================================================================
--- stable/9/sys/dev/oce/oce_sysctl.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/oce/oce_sysctl.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -84,21 +84,21 @@ oce_add_sysctls(POCE_SOFTC sc)
SYSCTL_ADD_STRING(ctx, child,
OID_AUTO, "component_revision",
- CTLTYPE_INT | CTLFLAG_RD,
- &component_revision,
+ CTLFLAG_RD,
+ component_revision,
sizeof(component_revision),
"EMULEX One-Connect device driver revision");
SYSCTL_ADD_STRING(ctx, child,
OID_AUTO, "firmware_version",
- CTLTYPE_INT | CTLFLAG_RD,
- &sc->fw_version,
+ CTLFLAG_RD,
+ sc->fw_version,
sizeof(sc->fw_version),
"EMULEX One-Connect Firmware Version");
SYSCTL_ADD_INT(ctx, child,
OID_AUTO, "max_rsp_handled",
- CTLTYPE_INT | CTLFLAG_RW,
+ CTLFLAG_RW,
&oce_max_rsp_handled,
sizeof(oce_max_rsp_handled),
"Maximum receive frames handled per interupt");
@@ -957,11 +957,11 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC s
SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "total_rxcp_errs",
CTLFLAG_RD, &stats->rx.t_rxcp_errs, 0,
"Total Receive completion errors");
- SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "pause_frames",
- CTLFLAG_RD, &stats->u0.xe201.rx_pause_frames, 0,
+ SYSCTL_ADD_UQUAD(ctx, rx_stat_list, OID_AUTO, "pause_frames",
+ CTLFLAG_RD, &stats->u0.xe201.rx_pause_frames,
"Pause Frames");
- SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "control_frames",
- CTLFLAG_RD, &stats->u0.xe201.rx_control_frames, 0,
+ SYSCTL_ADD_UQUAD(ctx, rx_stat_list, OID_AUTO, "control_frames",
+ CTLFLAG_RD, &stats->u0.xe201.rx_control_frames,
"Control Frames");
for (i = 0; i < sc->nrqs; i++) {
@@ -1001,11 +1001,11 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC s
NULL, "Receive Error Stats");
rx_stat_list = SYSCTL_CHILDREN(rx_stats_node);
- SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "crc_errs",
- CTLFLAG_RD, &stats->u0.xe201.rx_crc_errors, 0,
+ SYSCTL_ADD_UQUAD(ctx, rx_stat_list, OID_AUTO, "crc_errs",
+ CTLFLAG_RD, &stats->u0.xe201.rx_crc_errors,
"CRC Errors");
- SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "alignment_errors",
- CTLFLAG_RD, &stats->u0.xe201.rx_alignment_errors, 0,
+ SYSCTL_ADD_UQUAD(ctx, rx_stat_list, OID_AUTO, "alignment_errors",
+ CTLFLAG_RD, &stats->u0.xe201.rx_alignment_errors,
"RX Alignmnet Errors");
SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "in_range_errors",
CTLFLAG_RD, &stats->u0.xe201.rx_in_range_errors, 0,
@@ -1013,8 +1013,8 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC s
SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "out_range_errors",
CTLFLAG_RD, &stats->u0.xe201.rx_out_of_range_errors, 0,
"Out Range Errors");
- SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "frame_too_long",
- CTLFLAG_RD, &stats->u0.xe201.rx_frames_too_long, 0,
+ SYSCTL_ADD_UQUAD(ctx, rx_stat_list, OID_AUTO, "frame_too_long",
+ CTLFLAG_RD, &stats->u0.xe201.rx_frames_too_long,
"Frame Too Long");
SYSCTL_ADD_UINT(ctx, rx_stat_list, OID_AUTO, "address_match_errors",
CTLFLAG_RD, &stats->u0.xe201.rx_address_match_errors, 0,
@@ -1077,11 +1077,11 @@ oce_add_stats_sysctls_xe201(POCE_SOFTC s
"total_ipv6_ext_hdr_tx_drop",
CTLFLAG_RD, &stats->tx.t_ipv6_ext_hdr_tx_drop, 0,
"Total Transmit IPV6 Drops");
- SYSCTL_ADD_UINT(ctx, tx_stat_list, OID_AUTO, "pauseframes",
- CTLFLAG_RD, &stats->u0.xe201.tx_pause_frames, 0,
+ SYSCTL_ADD_UQUAD(ctx, tx_stat_list, OID_AUTO, "pauseframes",
+ CTLFLAG_RD, &stats->u0.xe201.tx_pause_frames,
"Pause Frames");
- SYSCTL_ADD_UINT(ctx, tx_stat_list, OID_AUTO, "controlframes",
- CTLFLAG_RD, &stats->u0.xe201.tx_control_frames, 0,
+ SYSCTL_ADD_UQUAD(ctx, tx_stat_list, OID_AUTO, "controlframes",
+ CTLFLAG_RD, &stats->u0.xe201.tx_control_frames,
"Tx Control Frames");
for (i = 0; i < sc->nwqs; i++) {
Modified: stable/9/sys/dev/qlxgbe/ql_os.c
==============================================================================
--- stable/9/sys/dev/qlxgbe/ql_os.c Fri Oct 31 17:43:21 2014
(r273911)
+++ stable/9/sys/dev/qlxgbe/ql_os.c Fri Oct 31 18:18:04 2014
(r273912)
@@ -160,7 +160,7 @@ qla_add_sysctls(qla_host_t *ha)
SYSCTL_ADD_STRING(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
OID_AUTO, "fw_version", CTLFLAG_RD,
- &ha->fw_ver_str, 0, "firmware version");
+ ha->fw_ver_str, 0, "firmware version");
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
Modified: stable/9/sys/dev/rt/if_rt.c
==============================================================================
--- stable/9/sys/dev/rt/if_rt.c Fri Oct 31 17:43:21 2014 (r273911)
+++ stable/9/sys/dev/rt/if_rt.c Fri Oct 31 18:18:04 2014 (r273912)
@@ -2344,45 +2344,45 @@ rt_sysctl_attach(struct rt_softc *sc)
stats = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
"stats", CTLFLAG_RD, 0, "statistic");
- SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
- "interrupts", CTLFLAG_RD, &sc->interrupts, 0,
+ SYSCTL_ADD_ULONG(ctx, SYSCTL_CHILDREN(stats), OID_AUTO,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
