Remove references to old watchdog object

Enabling the Watchdog was moved to systemd unit and hence
doing so from here needs to be removed.

Currently, Host Power on target launches phosphor watchdog in
Disabled state.  However, there was an inadvertent change that
removed the unit that was enabling Watchdog during power on.

It was getting enabled a little later as part of host sending
SET_WATCHDOG command. However, deferring Enable until then will
result in very early Host hangs going undetected and a fix will be
put to address that.

Fixes openbmc/openbmc#1822

Change-Id: I290d84ecc991c258f5fb925b5c073922e2e1868b
Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>

1 files changed, 0 insertions, 50 deletions

diff --git a/op-hostctl/control_host_obj.c b/op-hostctl/control_host_obj.c
index 6108467..0de6ddb 100644
--- a/op-hostctl/control_host_obj.c
+++ b/op-hostctl/control_host_obj.c
@@ -89,7 +89,6 @@ on_boot(ControlHost *host,
 	int rc = GPIO_OK;
 	GDBusProxy *proxy;
 	GError *error = NULL;
-	GVariant *result = NULL;
 	GDBusConnection *connection =
 		g_dbus_object_manager_server_get_connection(manager);
 
@@ -189,57 +188,8 @@ on_boot(ControlHost *host,
 		gpio_close(&optionals[i]);
 	}
 
-	// Start watchdog with 30s timeout per the OpenPower Host IPMI Spec.
-	// Once the host starts booting, it'll reset and refresh the timer.
-	error = NULL;
-	// TODO Use the object mapper to lookup the bus name when this is
-	// refactored to use sdbus.
-	proxy = g_dbus_proxy_new_sync(connection,
-		G_DBUS_PROXY_FLAGS_NONE,
-		NULL, /* GDBusInterfaceInfo* */
-		"org.openbmc.watchdog.Host", /* name */
-		"/org/openbmc/watchdog/host0", /* object path */
-		"org.openbmc.Watchdog", /* interface name */
-		NULL, /* GCancellable */
-		&error);
-	g_assert_no_error(error);
-	if(error)
-		goto exit;
-
-	// Set watchdog timer to 30s
-	error = NULL;
-	result = g_dbus_proxy_call_sync(proxy,
-		"set",
-		g_variant_new("(i)", 30000),
-		G_DBUS_CALL_FLAGS_NONE,
-		-1,
-		NULL,
-		&error);
-	g_assert_no_error(error);
-	if (error)
-		goto exit;
-	if (result)
-		g_variant_unref(result);
-
-	// Start watchdog timer
-	error = NULL;
-	result = g_dbus_proxy_call_sync(proxy,
-		"start",
-		NULL,
-		G_DBUS_CALL_FLAGS_NONE,
-		-1,
-		NULL,
-		&error);
-	g_assert_no_error(error);
-	if (error)
-		goto exit;
-
 	control_host_emit_booted(host);
 
-exit:
-	if (result)
-		g_variant_unref(result);
-
 	return TRUE;
 }