bhnd(4): Add devinfo allocation and child addition methods, modeled on pci_if.

[landonf]

Summary

This allows bhnd(4) to manage per-device state (such as per-core
pmu/clock refcounting) on behalf of subclass driver instances.

Depends on D6897

Test Plan

• Test for successful bhnd(4) device attach/detach on a siba(4) and bcma(4) device.

[landonf]

Fix arc-generated diff.

[adrian]

I'm fine with this. ask re@ ;p

head/sys/dev/bhnd/bcma/bcma_subr.c

STAILQ_FOREACH(map, &port->sp_maps, m_link) {
                                     port->sp_num, map->m_region_num,
                                     (unsigned long long) map->m_base,
                                     (unsigned long long) end);
                         }
                 }
         }
 }
 
+
 /**
- * Allocate and initialize new device info structure, assuming ownership
- * of the provided core configuration.
+ * Allocate and return a new empty device info structure.
  * 
  * @param bus The requesting bus device.
- * @param corecfg Device core configuration.
+ * 
+ * @retval NULL if allocation failed.
  */
 struct bcma_devinfo *
-bcma_alloc_dinfo(device_t bus, struct bcma_corecfg *corecfg)
+bcma_alloc_dinfo(device_t bus)
 {
         struct bcma_devinfo *dinfo;
         
-        dinfo = malloc(sizeof(struct bcma_devinfo), M_BHND, M_NOWAIT);
+        dinfo = malloc(sizeof(struct bcma_devinfo), M_BHND, M_NOWAIT|M_ZERO);
         if (dinfo == NULL)
-                return NULL;
+                return (NULL);
 
-        dinfo->corecfg = corecfg;
+        dinfo->corecfg = NULL;
         dinfo->res_agent = NULL;
         dinfo->rid_agent = -1;
 
         resource_list_init(&dinfo->resources);
 
+        return (dinfo);
+}
+
+/**
+ * Initialize a device info structure previously allocated via
+ * bcma_alloc_dinfo, assuming ownership of the provided core
+ * configuration.
+ * 
+ * @param bus The requesting bus device.
+ * @param dinfo The device info instance.
+ * @param corecfg Device core configuration; ownership of this value
+ * will be assumed by @p dinfo.
+ * 
+ * @retval 0 success
+ * @retval non-zero initialization failed.
+ */
+int
+bcma_init_dinfo(device_t bus, struct bcma_devinfo *dinfo,
+    struct bcma_corecfg *corecfg)
+{
+        KASSERT(dinfo->corecfg == NULL, ("dinfo previously initialized"));
+
+        /* Save core configuration value */
+        dinfo->corecfg = corecfg;
+
         /* The device ports must always be initialized first to ensure that
          * rid 0 maps to the first device port */
         bcma_dinfo_init_resource_info(bus, dinfo, &corecfg->dev_ports);
 
         bcma_dinfo_init_resource_info(bus, dinfo, &corecfg->bridge_ports);
         bcma_dinfo_init_resource_info(bus, dinfo, &corecfg->wrapper_ports);
 
-        return dinfo;
+        return (0);
 }
 
 /**
  * Deallocate the given device info structure and any associated resources.
  * 
  * @param bus The requesting bus device.
  * @param dinfo Device info to be deallocated.
  */
 void
 bcma_free_dinfo(device_t bus, struct bcma_devinfo *dinfo)
 {
-        bcma_free_corecfg(dinfo->corecfg);
         resource_list_free(&dinfo->resources);
+
+        if (dinfo->corecfg != NULL)
+                bcma_free_corecfg(dinfo->corecfg);
 
         /* Release agent resource, if any */
         if (dinfo->res_agent != NULL) {
                 bhnd_release_resource(bus, SYS_RES_MEMORY, dinfo->rid_agent,
                     dinfo->res_agent);
         }
 
         free(dinfo, M_BHND);

head/sys/dev/bhnd/bcma/bcmavar.h

 int                      bcma_detach(device_t dev);
 
 int                      bcma_add_children(device_t bus,
                              struct resource *erom_res, bus_size_t erom_offset);
 
 struct bcma_sport_list        *bcma_corecfg_get_port_list(struct bcma_corecfg *cfg,
                              bhnd_port_type type);
 
-struct bcma_devinfo        *bcma_alloc_dinfo(device_t bus,
+struct bcma_devinfo        *bcma_alloc_dinfo(device_t bus);
+int                      bcma_init_dinfo(device_t bus,
+                             struct bcma_devinfo *dinfo,
                              struct bcma_corecfg *corecfg);
 void                     bcma_free_dinfo(device_t bus,
                              struct bcma_devinfo *dinfo);
 
 struct bcma_corecfg        *bcma_alloc_corecfg(u_int core_index, int core_unit,
                              uint16_t vendor, uint16_t device, uint8_t hwrev);
 void                         bcma_free_corecfg(struct bcma_corecfg *corecfg);
 
struct bcma_corecfg {
         u_long                num_wrapper_ports;        /**< number of wrapper slave port descriptors. */        
         struct bcma_sport_list        wrapper_ports;        /**< wrapper port descriptors */        
 };
 
 /**
  * BCMA per-device info
  */
 struct bcma_devinfo {
-        struct resource_list        resources;        /**< Slave port memory regions. */
+        struct bhnd_devinfo         bhnd_dinfo;        /**< superclass device info. */
+
+        struct resource_list         resources;        /**< Slave port memory regions. */
         struct bcma_corecfg        *corecfg;        /**< IP core/block config */
 
         struct bhnd_resource        *res_agent;        /**< Agent (wrapper) resource, or NULL. Not
                                                   *  all bcma(4) cores have or require an agent. */
         int                      rid_agent;     /**< Agent resource ID, or -1 */
 };
 
 
 /** BMCA per-instance state */
 struct bcma_softc {
         struct bhnd_softc        bhnd_sc;        /**< bhnd state */
         device_t                hostb_dev;      /**< host bridge core, or NULL */
 };
 
-#endif /* _BCMA_BCMAVAR_H_ */
+#endif /* _BCMA_BCMAVAR_H_ */