D5070.id12689.diff
No OneTemporary
Actions

Size

15 KB

Referenced Files

None

Subscribers

None

D5070.id12689.diff
View Options

	Index: sys/conf/files.arm64
	===================================================================
	--- sys/conf/files.arm64
	+++ sys/conf/files.arm64
	@@ -71,6 +71,7 @@
	dev/uart/uart_cpu_fdt.c optional uart fdt
	dev/uart/uart_dev_pl011.c optional uart pl011
	dev/usb/controller/dwc_otg_hisi.c optional dwcotg soc_hisi_hi6220
	+dev/vnic/mrml_bridge.c optional vnic
	dev/vnic/nic_main.c optional vnic pci
	dev/vnic/nicvf_main.c optional vnic pci pci_iov
	dev/vnic/nicvf_queues.c optional vnic pci pci_iov
	Index: sys/dev/vnic/mrml_bridge.c
	===================================================================
	--- /dev/null
	+++ sys/dev/vnic/mrml_bridge.c
	@@ -0,0 +1,284 @@
	+/*
	+ * Copyright (C) 2016 Cavium Inc.
	+ * All rights reserved.
	+ *
	+ * Developed by 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.
	+ */
	+#include "opt_platform.h"
	+
	+#include <sys/cdefs.h>
	+__FBSDID("$FreeBSD$");
	+
	+#include <sys/param.h>
	+#include <sys/systm.h>
	+#include <sys/bus.h>
	+#include <sys/kernel.h>
	+#include <sys/module.h>
	+#include <sys/resource.h>
	+#include <sys/rman.h>
	+#include <sys/socket.h>
	+#include <sys/queue.h>
	+
	+#include <dev/ofw/ofw_bus.h>
	+#include <dev/ofw/ofw_bus_subr.h>
	+#include <dev/fdt/simplebus.h>
	+
	+#include <machine/bus.h>
	+#include <machine/resource.h>
	+
	+static MALLOC_DEFINE(M_MRMLB, "MRML bridge", "Cavium MRML bridge");
	+
	+struct mrmlbus_softc {
	+ struct simplebus_softc simplebus_sc;
	+};
	+
	+static device_probe_t mrmlb_fdt_probe;
	+static device_attach_t mrmlb_fdt_attach;
	+
	+static struct resource * mrmlb_ofw_bus_alloc_res(device_t, device_t, int, int *,
	+ u_long, u_long, u_long, u_int);
	+
	+static const struct ofw_bus_devinfo * mrmlb_ofw_get_devinfo(device_t, device_t);
	+
	+static device_method_t mrmlbus_fdt_methods[] = {
	+ /* Device interface */
	+ DEVMETHOD(device_probe, mrmlb_fdt_probe),
	+ DEVMETHOD(device_attach, mrmlb_fdt_attach),
	+
	+ /* Bus interface */
	+ DEVMETHOD(bus_alloc_resource, mrmlb_ofw_bus_alloc_res),
	+ DEVMETHOD(bus_release_resource, bus_generic_release_resource),
	+ DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
	+
	+ /* ofw_bus interface */
	+ DEVMETHOD(ofw_bus_get_devinfo, mrmlb_ofw_get_devinfo),
	+ DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat),
	+ DEVMETHOD(ofw_bus_get_model, ofw_bus_gen_get_model),
	+ DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name),
	+ DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
	+ DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
	+
	+ DEVMETHOD_END
	+};
	+
	+DEFINE_CLASS_0(mrmlbus, mrmlbus_fdt_driver, mrmlbus_fdt_methods,
	+ sizeof(struct mrmlbus_softc));
	+
	+static devclass_t mrmlbus_fdt_devclass;
	+
	+EARLY_DRIVER_MODULE(mrmlbus, pcib, mrmlbus_fdt_driver, mrmlbus_fdt_devclass, 0, 0,
	+ BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
	+
	+static int mrmlb_ofw_fill_ranges(phandle_t, struct simplebus_softc *);
	+static int mrmlb_ofw_bus_attach(device_t);
	+
	+static int
	+mrmlb_fdt_probe(device_t dev)
	+{
	+
	+ if (!ofw_bus_status_okay(dev))
	+ return (ENXIO);
	+
	+ if (!ofw_bus_is_compatible(dev, "cavium,thunder-8890-mrml-bridge"))
	+ return (ENXIO);
	+
	+ device_set_desc(dev, "Cavium ThunderX MRML bridge");
	+ return (BUS_PROBE_SPECIFIC);
	+}
	+
	+static int
	+mrmlb_fdt_attach(device_t dev)
	+{
	+ int err;
	+
	+ err = mrmlb_ofw_bus_attach(dev);
	+ if (err != 0)
	+ return (err);
	+
	+ return (bus_generic_attach(dev));
	+}
	+
	+/* OFW bus interface */
	+struct mrmlb_ofw_devinfo {
	+ struct ofw_bus_devinfo di_dinfo;
	+ struct resource_list di_rl;
	+};
	+
	+static const struct ofw_bus_devinfo *
	+mrmlb_ofw_get_devinfo(device_t bus __unused, device_t child)
	+{
	+ struct mrmlb_ofw_devinfo *di;
	+
	+ di = device_get_ivars(child);
	+ return (&di->di_dinfo);
	+}
	+
	+static struct resource *
	+mrmlb_ofw_bus_alloc_res(device_t bus, device_t child, int type, int *rid,
	+ u_long start, u_long end, u_long count, u_int flags)
	+{
	+ struct simplebus_softc *sc;
	+ struct mrmlb_ofw_devinfo *di;
	+ struct resource_list_entry *rle;
	+ int i;
	+
	+ if ((start == 0UL) && (end == ~0UL)) {
	+ if ((di = device_get_ivars(child)) == NULL)
	+ return (NULL);
	+ if (type == SYS_RES_IOPORT)
	+ type = SYS_RES_MEMORY;
	+
	+ /* Find defaults for this rid */
	+ rle = resource_list_find(&di->di_rl, type, *rid);
	+ if (rle == NULL)
	+ return (NULL);
	+
	+ start = rle->start;
	+ end = rle->end;
	+ count = rle->count;
	+ }
	+
	+ sc = (struct simplebus_softc *)device_get_softc(bus);
	+
	+ if (type == SYS_RES_MEMORY) {
	+ /* Remap through ranges property */
	+ for (i = 0; i < sc->nranges; i++) {
	+ if (start >= sc->ranges[i].bus && end <
	+ sc->ranges[i].bus + sc->ranges[i].size) {
	+ start -= sc->ranges[i].bus;
	+ start += sc->ranges[i].host;
	+ end -= sc->ranges[i].bus;
	+ end += sc->ranges[i].host;
	+ break;
	+ }
	+ }
	+
	+ if (i == sc->nranges && sc->nranges != 0) {
	+ device_printf(bus, "Could not map resource "
	+ "%#lx-%#lx\n", start, end);
	+ return (NULL);
	+ }
	+ }
	+
	+ return (bus_generic_alloc_resource(bus, child, type, rid, start, end,
	+ count, flags));
	+}
	+
	+/* Helper functions */
	+
	+static int
	+mrmlb_ofw_fill_ranges(phandle_t node, struct simplebus_softc *sc)
	+{
	+ int host_address_cells;
	+ cell_t *base_ranges;
	+ ssize_t nbase_ranges;
	+ int err;
	+ int i, j, k;
	+
	+ err = OF_searchencprop(OF_parent(node), "#address-cells",
	+ &host_address_cells, sizeof(host_address_cells));
	+ if (err <= 0)
	+ return (-1);
	+
	+ nbase_ranges = OF_getproplen(node, "ranges");
	+ if (nbase_ranges < 0)
	+ return (-1);
	+ sc->nranges = nbase_ranges / sizeof(cell_t) /
	+ (sc->acells + host_address_cells + sc->scells);
	+ if (sc->nranges == 0)
	+ return (0);
	+
	+ sc->ranges = malloc(sc->nranges * sizeof(sc->ranges[0]),
	+ M_MRMLB, M_WAITOK);
	+ base_ranges = malloc(nbase_ranges, M_MRMLB, M_WAITOK);
	+ OF_getencprop(node, "ranges", base_ranges, nbase_ranges);
	+
	+ for (i = 0, j = 0; i < sc->nranges; i++) {
	+ sc->ranges[i].bus = 0;
	+ for (k = 0; k < sc->acells; k++) {
	+ sc->ranges[i].bus <<= 32;
	+ sc->ranges[i].bus \|= base_ranges[j++];
	+ }
	+ sc->ranges[i].host = 0;
	+ for (k = 0; k < host_address_cells; k++) {
	+ sc->ranges[i].host <<= 32;
	+ sc->ranges[i].host \|= base_ranges[j++];
	+ }
	+ sc->ranges[i].size = 0;
	+ for (k = 0; k < sc->scells; k++) {
	+ sc->ranges[i].size <<= 32;
	+ sc->ranges[i].size \|= base_ranges[j++];
	+ }
	+ }
	+
	+ free(base_ranges, M_MRMLB);
	+ return (sc->nranges);
	+}
	+
	+static int
	+mrmlb_ofw_bus_attach(device_t dev)
	+{
	+ struct simplebus_softc *sc;
	+ struct mrmlb_ofw_devinfo *di;
	+ device_t child;
	+ phandle_t parent, node;
	+
	+ parent = ofw_bus_get_node(dev);
	+ simplebus_init(dev, parent);
	+
	+ sc = (struct simplebus_softc *)device_get_softc(dev);
	+
	+ if (mrmlb_ofw_fill_ranges(parent, sc) < 0) {
	+ device_printf(dev, "could not get ranges\n");
	+ return (ENXIO);
	+ }
	+ /* 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_MRMLB, M_WAITOK \| M_ZERO);
	+ if (ofw_bus_gen_setup_devinfo(&di->di_dinfo, node) != 0) {
	+ free(di, M_MRMLB);
	+ continue;
	+ }
	+
	+ /* Initialize and populate resource list. */
	+ resource_list_init(&di->di_rl);
	+ ofw_bus_reg_to_rl(dev, node, sc->acells, sc->scells,
	+ &di->di_rl);
	+ ofw_bus_intr_to_rl(dev, node, &di->di_rl, NULL);
	+
	+ /* Add newbus device for this FDT node */
	+ child = device_add_child(dev, NULL, -1);
	+ if (child == NULL) {
	+ resource_list_free(&di->di_rl);
	+ ofw_bus_gen_destroy_devinfo(&di->di_dinfo);
	+ free(di, M_MRMLB);
	+ continue;
	+ }
	+
	+ device_set_ivars(child, di);
	+ }
	+
	+ return (0);
	+}
	Index: sys/dev/vnic/thunder_mdio_fdt.c
	===================================================================
	--- sys/dev/vnic/thunder_mdio_fdt.c
	+++ sys/dev/vnic/thunder_mdio_fdt.c
	@@ -38,6 +38,10 @@

	#include <dev/ofw/ofw_bus.h>
	#include <dev/ofw/ofw_bus_subr.h>
	+#include <dev/fdt/simplebus.h>
	+
	+#include <machine/bus.h>
	+#include <machine/resource.h>

	#include "thunder_mdio_var.h"

	@@ -60,17 +64,26 @@

	EARLY_DRIVER_MODULE(thunder_mdio, ofwbus, thunder_mdio_fdt_driver,
	thunder_mdio_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
	+EARLY_DRIVER_MODULE(thunder_mdio, mdionexus, thunder_mdio_fdt_driver,
	+ thunder_mdio_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
	+
	+static struct ofw_compat_data mdio_compat_data[] = {
	+ {"cavium,octeon-3860-mdio", true},
	+ {"cavium,thunder-8890-mdio", true},
	+ {NULL, false}
	+};

	static int
	thunder_mdio_fdt_probe(device_t dev)
	{

	- if (ofw_bus_is_compatible(dev, "cavium,octeon-3860-mdio")) {
	- device_set_desc(dev, THUNDER_MDIO_DEVSTR);
	- return (BUS_PROBE_DEFAULT);
	- }
	+ if (!ofw_bus_status_okay(dev))
	+ return (ENXIO);
	+ if (!ofw_bus_search_compatible(dev, mdio_compat_data)->ocd_data)
	+ return (ENXIO);

	- return (ENXIO);
	+ device_set_desc(dev, THUNDER_MDIO_DEVSTR);
	+ return (BUS_PROBE_DEFAULT);
	}

	static int
	@@ -93,3 +106,184 @@

	return (0);
	}
	+
	+struct mdionexus_softc {
	+ struct simplebus_softc simplebus_sc;
	+};
	+
	+static device_probe_t mdionexus_fdt_probe;
	+static device_attach_t mdionexus_fdt_attach;
	+
	+static const struct ofw_bus_devinfo * mdionexus_ofw_get_devinfo(device_t,
	+ device_t);
	+
	+static device_method_t mdionexus_fdt_methods[] = {
	+ /* Device interface */
	+ DEVMETHOD(device_probe, mdionexus_fdt_probe),
	+ DEVMETHOD(device_attach, mdionexus_fdt_attach),
	+
	+ /* Bus interface */
	+ DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource),
	+ DEVMETHOD(bus_release_resource, bus_generic_release_resource),
	+ DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
	+
	+ /* ofw_bus interface */
	+ DEVMETHOD(ofw_bus_get_devinfo, mdionexus_ofw_get_devinfo),
	+ DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat),
	+ DEVMETHOD(ofw_bus_get_model, ofw_bus_gen_get_model),
	+ DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name),
	+ DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
	+ DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
	+
	+ DEVMETHOD_END
	+};
	+
	+DEFINE_CLASS_0(mdionexus, mdionexus_fdt_driver, mdionexus_fdt_methods,
	+ sizeof(struct mdionexus_softc));
	+
	+static devclass_t mdionexus_fdt_devclass;
	+
	+EARLY_DRIVER_MODULE(mdionexus, mrmlbus, mdionexus_fdt_driver,
	+ mdionexus_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
	+
	+static int mdionexus_ofw_fill_ranges(phandle_t, struct simplebus_softc *);
	+static int mdionexus_ofw_bus_attach(device_t);
	+
	+static int
	+mdionexus_fdt_probe(device_t dev)
	+{
	+
	+ if (!ofw_bus_status_okay(dev))
	+ return (ENXIO);
	+
	+ if (!ofw_bus_is_compatible(dev, "cavium,thunder-8890-mdio-nexus"))
	+ return (ENXIO);
	+
	+ device_set_desc(dev, "Cavium ThunderX MDIO nexus");
	+ return (BUS_PROBE_SPECIFIC);
	+}
	+
	+static int
	+mdionexus_fdt_attach(device_t dev)
	+{
	+ int err;
	+
	+ err = mdionexus_ofw_bus_attach(dev);
	+ if (err != 0)
	+ return (err);
	+
	+ return (bus_generic_attach(dev));
	+}
	+
	+/* OFW bus interface */
	+struct mdionexus_ofw_devinfo {
	+ struct ofw_bus_devinfo di_dinfo;
	+ struct resource_list di_rl;
	+};
	+
	+static const struct ofw_bus_devinfo *
	+mdionexus_ofw_get_devinfo(device_t bus __unused, device_t child)
	+{
	+ struct mdionexus_ofw_devinfo *di;
	+
	+ di = device_get_ivars(child);
	+ return (&di->di_dinfo);
	+}
	+
	+/* Helper functions */
	+
	+static int
	+mdionexus_ofw_fill_ranges(phandle_t node, struct simplebus_softc *sc)
	+{
	+ int host_address_cells;
	+ cell_t *base_ranges;
	+ ssize_t nbase_ranges;
	+ int err;
	+ int i, j, k;
	+
	+ err = OF_searchencprop(OF_parent(node), "#address-cells",
	+ &host_address_cells, sizeof(host_address_cells));
	+ if (err <= 0)
	+ return (-1);
	+
	+ nbase_ranges = OF_getproplen(node, "ranges");
	+ if (nbase_ranges < 0)
	+ return (-1);
	+ sc->nranges = nbase_ranges / sizeof(cell_t) /
	+ (sc->acells + host_address_cells + sc->scells);
	+ if (sc->nranges == 0)
	+ return (0);
	+
	+ sc->ranges = malloc(sc->nranges * sizeof(sc->ranges[0]),
	+ M_THUNDER_MDIO, M_WAITOK);
	+ base_ranges = malloc(nbase_ranges, M_THUNDER_MDIO, M_WAITOK);
	+ OF_getencprop(node, "ranges", base_ranges, nbase_ranges);
	+
	+ for (i = 0, j = 0; i < sc->nranges; i++) {
	+ sc->ranges[i].bus = 0;
	+ for (k = 0; k < sc->acells; k++) {
	+ sc->ranges[i].bus <<= 32;
	+ sc->ranges[i].bus \|= base_ranges[j++];
	+ }
	+ sc->ranges[i].host = 0;
	+ for (k = 0; k < host_address_cells; k++) {
	+ sc->ranges[i].host <<= 32;
	+ sc->ranges[i].host \|= base_ranges[j++];
	+ }
	+ sc->ranges[i].size = 0;
	+ for (k = 0; k < sc->scells; k++) {
	+ sc->ranges[i].size <<= 32;
	+ sc->ranges[i].size \|= base_ranges[j++];
	+ }
	+ }
	+
	+ free(base_ranges, M_THUNDER_MDIO);
	+ return (sc->nranges);
	+}
	+
	+static int
	+mdionexus_ofw_bus_attach(device_t dev)
	+{
	+ struct simplebus_softc *sc;
	+ struct mdionexus_ofw_devinfo *di;
	+ device_t child;
	+ phandle_t parent, node;
	+
	+ parent = ofw_bus_get_node(dev);
	+ simplebus_init(dev, parent);
	+
	+ sc = (struct simplebus_softc *)device_get_softc(dev);
	+
	+ if (mdionexus_ofw_fill_ranges(parent, sc) < 0) {
	+ device_printf(dev, "could not get ranges\n");
	+ return (ENXIO);
	+ }
	+ /* 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_THUNDER_MDIO, M_WAITOK \| M_ZERO);
	+ if (ofw_bus_gen_setup_devinfo(&di->di_dinfo, node) != 0) {
	+ free(di, M_THUNDER_MDIO);
	+ continue;
	+ }
	+
	+ /* Initialize and populate resource list. */
	+ resource_list_init(&di->di_rl);
	+ ofw_bus_reg_to_rl(dev, node, sc->acells, sc->scells,
	+ &di->di_rl);
	+ ofw_bus_intr_to_rl(dev, node, &di->di_rl, NULL);
	+
	+ /* Add newbus device for this FDT node */
	+ child = device_add_child(dev, NULL, -1);
	+ if (child == NULL) {
	+ resource_list_free(&di->di_rl);
	+ ofw_bus_gen_destroy_devinfo(&di->di_dinfo);
	+ free(di, M_THUNDER_MDIO);
	+ continue;
	+ }
	+
	+ device_set_ivars(child, di);
	+ }
	+
	+ return (0);
	+}
	Index: sys/dev/vnic/thunder_mdio_var.h
	===================================================================
	--- sys/dev/vnic/thunder_mdio_var.h
	+++ sys/dev/vnic/thunder_mdio_var.h
	@@ -34,6 +34,7 @@
	#define __THUNDER_MDIO_VAR_H__

	#define THUNDER_MDIO_DEVSTR "Cavium ThunderX SMI/MDIO driver"
	+MALLOC_DECLARE(M_THUNDER_MDIO);
	DECLARE_CLASS(thunder_mdio_driver);

	enum thunder_mdio_mode {

File Metadata

Mime Type: text/plain
Expires: Tue, Apr 28, 4:36 PM (6 h, 59 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 32292087
Default Alt Text: D5070.id12689.diff (15 KB)

D5070.id12689.diffNo OneTemporaryActions

D5070.id12689.diffView Options

File Metadata

Event Timeline

D5070.id12689.diff
No OneTemporary
Actions

D5070.id12689.diff
View Options