Rename pmap_is_write() to pmap_l3_writable().

[markj]

Summary

This is consistent with pmap_l3_valid(), for instance. Fix style bugs
along the way. No functional change intended.

Test Plan

Booted under QEMU and spike.

[jhb]

sys/riscv/riscv/pmap.c

360

If we support superpages eventually then we might not want l3 in this name? That might be true for pmap_l3_valid as well? (Or will we only use this function on leaf PTEs?)

[markj]

sys/riscv/riscv/pmap.c

360

I was wondering about that too, as I'm starting to work on superpage support. We'll probably eventually have a use for an is_writable predicate for superpage mappings (ditto for the other predicates below). One wrinkle, though, is that we use distinct types (pd_entry_t vs. pt_entry_t). I'm not sure if that indicates that we should instead use a macro or just test bits inline. I lean somewhat towards the latter, since the flag names are pretty clear.

[jhb]

sys/riscv/riscv/pmap.c

360

I think it is also probably readable to just test bits inline. What does amd64 do? That's probably the best pmap to be copying from.

[markj]

sys/riscv/riscv/pmap.c

360

amd64 is hamstrung by the fact that the bit definitions vary depending on the pmap type, so it's more or less forced to look up the definition once and then use inline tests.

I'll think about it a bit more, but I'm inclined to just get rid of these predicates and inline everything. I'll upload the diff here once that's done.

[markj]

• Get rid of the (inconsistently used) predicates and just use inline tests.

sys/riscv/riscv/pmap.c

 STATIC int sysctl_set_queue_rxthtime(SYSCTL_HANDLER_ARGS);
 STATIC void sysctl_mvneta_init(struct mvneta_softc *);
 
 /* MIB */
 STATIC void mvneta_clear_mib(struct mvneta_softc *);
 STATIC void mvneta_update_mib(struct mvneta_softc *);
 
 /* Switch */
+STATIC boolean_t mvneta_find_ethernet_prop_switch(phandle_t, phandle_t);
 STATIC boolean_t mvneta_has_switch(device_t);
 
 #define mvneta_sc_lock(sc) mtx_lock(&sc->mtx)
 #define mvneta_sc_unlock(sc) mtx_unlock(&sc->mtx)
 
 STATIC struct mtx mii_mutex;
 STATIC int mii_init = 0;
 
 /* Device */
 STATIC int mvneta_detach(device_t);
 /* MII */
#endif
         addr[2] = (mac_h & 0x0000ff00) >> 8;
         addr[3] = (mac_h & 0x000000ff);
         addr[4] = (mac_l & 0x0000ff00) >> 8;
         addr[5] = (mac_l & 0x000000ff);
         return (0);
 }
 
 STATIC boolean_t
-mvneta_has_switch(device_t self)
+mvneta_find_ethernet_prop_switch(phandle_t ethernet, phandle_t node)
 {
-        phandle_t node, switch_node, switch_eth, switch_eth_handle;
+        boolean_t ret;
+        phandle_t child, switch_eth_handle, switch_eth;
 
-        node = ofw_bus_get_node(self);
-        switch_node =
-            ofw_bus_find_compatible(OF_finddevice("/"), "marvell,dsa");
-        switch_eth = 0;
+        for (child = OF_child(node); child != 0; child = OF_peer(child)) {
+                if (OF_getencprop(child, "ethernet", (void*)&switch_eth_handle,
+                    sizeof(switch_eth_handle)) > 0) {
+                        if (switch_eth_handle > 0) {
+                                switch_eth = OF_node_from_xref(
+                                    switch_eth_handle);
 
-        OF_getencprop(switch_node, "dsa,ethernet",
-            (void*)&switch_eth_handle, sizeof(switch_eth_handle));
+                                if (switch_eth == ethernet)
+                                        return (true);
+                        }
+                }
 
-        if (switch_eth_handle > 0)
-                switch_eth = OF_node_from_xref(switch_eth_handle);
+                ret = mvneta_find_ethernet_prop_switch(ethernet, child);
+                if (ret != 0)
+                        return (ret);
+        }
 
-        /* Return true if dsa,ethernet cell points to us */
-        return (node == switch_eth);
+        return (false);
 }
 
+STATIC boolean_t
+mvneta_has_switch(device_t self)
+{
+        phandle_t node;
+
+        node = ofw_bus_get_node(self);
+        return mvneta_find_ethernet_prop_switch(node, OF_finddevice("/"));
+}
+
 STATIC int
 mvneta_dma_create(struct mvneta_softc *sc)
 {
         size_t maxsize, maxsegsz;
         size_t q;
         int error;
 
         /*
if ((sc->phy_addr != MII_PHY_ANY) && (!sc->use_inband_status)) {
                 else
                         ifm_target |= IFM_HDX;
 
                 ifmedia_add(&sc->mvneta_ifmedia, ifm_target, 0, NULL);
                 ifmedia_set(&sc->mvneta_ifmedia, ifm_target);
                 if_link_state_change(sc->ifp, LINK_STATE_UP);
 
                 if (mvneta_has_switch(self)) {
+                        if (bootverbose)
+                                device_printf(self, "This device is attached to a switch\n");
                         child = device_add_child(sc->dev, "mdio", -1);
                         if (child == NULL) {
                                 ether_ifdetach(sc->ifp);
                                 mvneta_detach(self);
                                 return (ENXIO);
                         }
                         bus_generic_attach(sc->dev);
                         bus_generic_attach(child);
+                } else if (bootverbose) {
+                        device_printf(self, "This device is not attached to a switch\n");
                 }
 
                 /* Configure MAC media */
                 mvneta_update_media(sc, ifm_target);
         }
 
         sysctl_mvneta_init(sc);