Author: kaktus
Date: Mon Feb 24 10:45:22 2020
New Revision: 358284
URL: https://svnweb.freebsd.org/changeset/base/358284

Log:
  Mark more nodes as CTLFLAG_MPSAFE or CTLFLAG_NEEDGIANT (13 of many)
  
  r357614 added CTLFLAG_NEEDGIANT to make it easier to find nodes that are
  still not MPSAFE (or already are but aren’t properly marked).
  Use it in preparation for a general review of all nodes.
  
  This is non-functional change that adds annotations to SYSCTL_NODE and
  SYSCTL_PROC nodes using one of the soon-to-be-required flags.
  
  Approved by:  kib (mentor, blanket)
  Differential Revision:        https://reviews.freebsd.org/D23635

Modified:
  head/sys/arm/allwinner/aw_sid.c
  head/sys/arm/allwinner/aw_thermal.c
  head/sys/arm/allwinner/aw_ts.c
  head/sys/arm/allwinner/axp209.c
  head/sys/arm/allwinner/axp81x.c
  head/sys/arm/allwinner/if_emac.c
  head/sys/arm64/rockchip/rk_tsadc.c

Modified: head/sys/arm/allwinner/aw_sid.c
==============================================================================
--- head/sys/arm/allwinner/aw_sid.c     Mon Feb 24 10:42:56 2020        
(r358283)
+++ head/sys/arm/allwinner/aw_sid.c     Mon Feb 24 10:45:22 2020        
(r358284)
@@ -278,7 +278,7 @@ aw_sid_attach(device_t dev)
                SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
                    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
                    OID_AUTO, sc->sid_conf->efuses[i].name,
-                   CTLTYPE_STRING | CTLFLAG_RD,
+                   CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
                    dev, sc->sid_conf->efuses[i].id, aw_sid_sysctl,
                    "A", sc->sid_conf->efuses[i].desc);
        }

Modified: head/sys/arm/allwinner/aw_thermal.c
==============================================================================
--- head/sys/arm/allwinner/aw_thermal.c Mon Feb 24 10:42:56 2020        
(r358283)
+++ head/sys/arm/allwinner/aw_thermal.c Mon Feb 24 10:45:22 2020        
(r358284)
@@ -676,7 +676,7 @@ aw_thermal_attach(device_t dev)
                SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
                    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
                    OID_AUTO, sc->conf->sensors[i].name,
-                   CTLTYPE_INT | CTLFLAG_RD,
+                   CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
                    sc, i, aw_thermal_sysctl, "IK0",
                    sc->conf->sensors[i].desc);
 

Modified: head/sys/arm/allwinner/aw_ts.c
==============================================================================
--- head/sys/arm/allwinner/aw_ts.c      Mon Feb 24 10:42:56 2020        
(r358283)
+++ head/sys/arm/allwinner/aw_ts.c      Mon Feb 24 10:45:22 2020        
(r358284)
@@ -204,7 +204,8 @@ aw_ts_attach(device_t dev)
        /* Add sysctl */
        SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
            SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
-           OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD,
+           OID_AUTO, "temperature",
+           CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
            &sc->temp_data, 0, sysctl_handle_int,
            "IK3", "CPU Temperature");
 

Modified: head/sys/arm/allwinner/axp209.c
==============================================================================
--- head/sys/arm/allwinner/axp209.c     Mon Feb 24 10:42:56 2020        
(r358283)
+++ head/sys/arm/allwinner/axp209.c     Mon Feb 24 10:45:22 2020        
(r358284)
@@ -1268,7 +1268,7 @@ axp2xx_start(void *pdev)
                SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
                    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
                    OID_AUTO, sc->sensors[i].name,
-                   CTLTYPE_INT | CTLFLAG_RD,
+                   CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
                    dev, sc->sensors[i].id, axp2xx_sysctl,
                    sc->sensors[i].format,
                    sc->sensors[i].desc);

Modified: head/sys/arm/allwinner/axp81x.c
==============================================================================
--- head/sys/arm/allwinner/axp81x.c     Mon Feb 24 10:42:56 2020        
(r358283)
+++ head/sys/arm/allwinner/axp81x.c     Mon Feb 24 10:45:22 2020        
(r358284)
@@ -1538,7 +1538,7 @@ axp8xx_attach(device_t dev)
                SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
                    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
                    OID_AUTO, sc->sensors[i].name,
-                   CTLTYPE_INT | CTLFLAG_RD,
+                   CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
                    dev, sc->sensors[i].id, axp8xx_sysctl,
                    sc->sensors[i].format,
                    sc->sensors[i].desc);
@@ -1546,7 +1546,7 @@ axp8xx_attach(device_t dev)
        SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
            SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
            OID_AUTO, "batchargecurrentstep",
-           CTLTYPE_INT | CTLFLAG_RW,
+           CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
            dev, 0, axp8xx_sysctl_chargecurrent,
            "I", "Battery Charging Current Step, "
            "0: 200mA, 1: 400mA, 2: 600mA, 3: 800mA, "

Modified: head/sys/arm/allwinner/if_emac.c
==============================================================================
--- head/sys/arm/allwinner/if_emac.c    Mon Feb 24 10:42:56 2020        
(r358283)
+++ head/sys/arm/allwinner/if_emac.c    Mon Feb 24 10:45:22 2020        
(r358284)
@@ -923,7 +923,8 @@ emac_attach(device_t dev)
        /* Create device sysctl node. */
        SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
            SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
-           OID_AUTO, "process_limit", CTLTYPE_INT | CTLFLAG_RW,
+           OID_AUTO, "process_limit",
+           CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT,
            &sc->emac_rx_process_limit, 0, sysctl_hw_emac_proc_limit, "I",
            "max number of Rx events to process");
 

Modified: head/sys/arm64/rockchip/rk_tsadc.c
==============================================================================
--- head/sys/arm64/rockchip/rk_tsadc.c  Mon Feb 24 10:42:56 2020        
(r358283)
+++ head/sys/arm64/rockchip/rk_tsadc.c  Mon Feb 24 10:45:22 2020        
(r358284)
@@ -558,7 +558,7 @@ tsadc_init_sysctl(struct tsadc_softc *sc)
        /* create node for hw.temp */
        oid = SYSCTL_ADD_NODE(&tsadc_sysctl_ctx,
            SYSCTL_STATIC_CHILDREN(_hw), OID_AUTO, "temperature",
-           CTLFLAG_RD, NULL, "");
+           CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "");
        if (oid == NULL)
                return (ENXIO);
 
@@ -566,7 +566,7 @@ tsadc_init_sysctl(struct tsadc_softc *sc)
        for (i = sc->conf->ntsensors  - 1; i >= 0; i--) {
                tmp = SYSCTL_ADD_PROC(&tsadc_sysctl_ctx,
                    SYSCTL_CHILDREN(oid), OID_AUTO, sc->conf->tsensors[i].name,
-                   CTLTYPE_INT | CTLFLAG_RD, sc, i,
+                   CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, sc, i,
                    tsadc_sysctl_temperature, "IK", "SoC Temperature");
                if (tmp == NULL)
                        return (ENXIO);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to