Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 26 Oct 2015 02:21:32 +0000 (UTC)
From:      "Conrad E. Meyer" <cem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r289980 - head/sys/dev/ioat
Message-ID:  <201510260221.t9Q2LWq1082791@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: cem
Date: Mon Oct 26 02:21:32 2015
New Revision: 289980
URL: https://svnweb.freebsd.org/changeset/base/289980

Log:
  ioat: Expose more softc members in sysctls
  
  Kill some unused softc variables while we're here.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/dev/ioat/ioat.c
  head/sys/dev/ioat/ioat_internal.h

Modified: head/sys/dev/ioat/ioat.c
==============================================================================
--- head/sys/dev/ioat/ioat.c	Mon Oct 26 02:21:19 2015	(r289979)
+++ head/sys/dev/ioat/ioat.c	Mon Oct 26 02:21:32 2015	(r289980)
@@ -381,7 +381,6 @@ ioat3_attach(device_t device)
 	ioat->is_completion_pending = FALSE;
 	ioat->is_reset_pending = FALSE;
 	ioat->is_channel_running = FALSE;
-	ioat->is_waiting_for_ack = FALSE;
 
 	bus_dma_tag_create(bus_get_dma_tag(ioat->device), sizeof(uint64_t), 0x0,
 	    BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
@@ -1129,6 +1128,11 @@ ioat_setup_sysctl(device_t device)
 	tree = device_get_sysctl_tree(device);
 	par = SYSCTL_CHILDREN(tree);
 
+	SYSCTL_ADD_INT(ctx, par, OID_AUTO, "version", CTLFLAG_RD,
+	    &ioat->version, 0, "HW version (0xMM form)");
+	SYSCTL_ADD_UINT(ctx, par, OID_AUTO, "max_xfer_size", CTLFLAG_RD,
+	    &ioat->max_xfer_size, 0, "HW maximum transfer size");
+
 	SYSCTL_ADD_UINT(ctx, par, OID_AUTO, "ring_size_order", CTLFLAG_RD,
 	    &ioat->ring_size_order, 0, "HW descriptor ring size order");
 	SYSCTL_ADD_UINT(ctx, par, OID_AUTO, "head", CTLFLAG_RD, &ioat->head, 0,
@@ -1136,6 +1140,18 @@ ioat_setup_sysctl(device_t device)
 	SYSCTL_ADD_UINT(ctx, par, OID_AUTO, "tail", CTLFLAG_RD, &ioat->tail, 0,
 	    "HW descriptor tail pointer index");
 
+	SYSCTL_ADD_UQUAD(ctx, par, OID_AUTO, "last_completion", CTLFLAG_RD,
+	    ioat->comp_update, "HW addr of last completion");
+
+	SYSCTL_ADD_INT(ctx, par, OID_AUTO, "is_resize_pending", CTLFLAG_RD,
+	    &ioat->is_resize_pending, 0, "resize pending");
+	SYSCTL_ADD_INT(ctx, par, OID_AUTO, "is_completion_pending", CTLFLAG_RD,
+	    &ioat->is_completion_pending, 0, "completion pending");
+	SYSCTL_ADD_INT(ctx, par, OID_AUTO, "is_reset_pending", CTLFLAG_RD,
+	    &ioat->is_reset_pending, 0, "reset pending");
+	SYSCTL_ADD_INT(ctx, par, OID_AUTO, "is_channel_running", CTLFLAG_RD,
+	    &ioat->is_channel_running, 0, "channel running");
+
 	SYSCTL_ADD_PROC(ctx, par, OID_AUTO, "force_hw_reset",
 	    CTLTYPE_INT | CTLFLAG_RW, ioat, 0, sysctl_handle_reset, "I",
 	    "Set to non-zero to reset the hardware");

Modified: head/sys/dev/ioat/ioat_internal.h
==============================================================================
--- head/sys/dev/ioat/ioat_internal.h	Mon Oct 26 02:21:19 2015	(r289979)
+++ head/sys/dev/ioat/ioat_internal.h	Mon Oct 26 02:21:32 2015	(r289980)
@@ -333,7 +333,6 @@ struct ioat_softc {
 	int			version;
 
 	struct mtx		submit_lock;
-	int			num_interrupts;
 	device_t		device;
 	bus_space_tag_t		pci_bus_tag;
 	bus_space_handle_t	pci_bus_handle;
@@ -359,12 +358,9 @@ struct ioat_softc {
 	boolean_t		is_completion_pending;
 	boolean_t		is_reset_pending;
 	boolean_t		is_channel_running;
-	boolean_t		is_waiting_for_ack;
 
-	uint32_t		xfercap_log;
 	uint32_t		head;
 	uint32_t		tail;
-	uint16_t		reserved;
 	uint32_t		ring_size_order;
 	bus_addr_t		last_seen;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510260221.t9Q2LWq1082791>