From patchwork Thu Jan 29 00:17:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 434240 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 52D6A1402B0 for ; Thu, 29 Jan 2015 11:18:11 +1100 (AEDT) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id 42BDA1A0BE9 for ; Thu, 29 Jan 2015 11:18:11 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pa0-x231.google.com (mail-pa0-x231.google.com [IPv6:2607:f8b0:400e:c03::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 143471A0B87 for ; Thu, 29 Jan 2015 11:18:05 +1100 (AEDT) Received: by mail-pa0-f49.google.com with SMTP id fa1so31478699pad.8 for ; Wed, 28 Jan 2015 16:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jms.id.au; s=google; h=from:to:subject:date:message-id; bh=02pazF66l7+YFrO864+ZAmwXYdOF9y3Yk0X2d5jSAo8=; b=Bhb3C7TWVcjmDPyVBN22V/DMoVhHjfnMrRb5X5UQF0qVszpzb21zy0DtIPMmhotUJO SowiGFltI3Xy/sDZP0HENwvM6OPV2smVujX7MLT7GO6RlKnR3VwGxsP9L8ppiy0aC8vc VjF1KsAT+1QbyEBm1I6YpbPXEA02u8hm8ZsIE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=02pazF66l7+YFrO864+ZAmwXYdOF9y3Yk0X2d5jSAo8=; b=OHckHHgLttrXq9jkqEpzsB+pQ86qRsdEHamWjwM/vaHie9b3Ryp9r3SoBWwMnsy+Zk d0b/ajjyRfT28urSJRV2pfmnkapTSlzHm0PN7WG6fQlsjddz1oggYIMWe3yPh4HXvvai +OXpnJ2EZCp3Rj6Hqwa9QCh26CelIFEFOz3Gx3Bc1yfXjJYNe4yJ/KsjUA9jWUitNdBR X4UxKLu87h4zP83exSDZ6jENrzXE0t9FvJ9iG6q176R+jo+QsF0MYv0d5P2gS1CJzuLf qS9uTEJw3jXpzoczDvBDnJcmThq2C9idM5KEWsDrvuw762Ov+Vml6+oPv7hEQBTAYqiN M+xA== X-Gm-Message-State: ALoCoQmUpbeV6jq8d0fPBBH0ZN0f5gU0If6BUSBGwcwb9ASjjS4Kk4jEBvXXjgDiAuxrgDr8olyc X-Received: by 10.68.134.101 with SMTP id pj5mr10136632pbb.42.1422490683504; Wed, 28 Jan 2015 16:18:03 -0800 (PST) Received: from icarus.au.ibm.com (ppp14-2-0-207.lns21.adl2.internode.on.net. [14.2.0.207]) by mx.google.com with ESMTPSA id n2sm5900560pdo.0.2015.01.28.16.18.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Jan 2015 16:18:02 -0800 (PST) From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Thu, 29 Jan 2015 10:47:52 +1030 Message-Id: <1422490672-4035-1-git-send-email-joel@jms.id.au> X-Mailer: git-send-email 2.1.4 Subject: [Skiboot] [PATCH] Revert "platforms/astbmc: Temporary reboot workaround" X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" This reverts commit 7185393df6d7d806811b827fabce1d8ad3e05fff. Now that we have the correct behaviour in the BMC, we can go back to sending the correct ipmi command for rebooting the machine. Signed-off-by: Joel Stanley --- platforms/astbmc/common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index 993ac4c..f9c988d 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -76,9 +76,7 @@ int64_t astbmc_ipmi_power_down(uint64_t request) int64_t astbmc_ipmi_reboot(void) { - /* TODO: we should send a IPMI_CHASSIS_HARD_RESET, but the BMC - * doesn't respond to this command yet */ - return ipmi_chassis_control(IPMI_CHASSIS_PWR_CYCLE); + return ipmi_chassis_control(IPMI_CHASSIS_HARD_RESET); } static void astbmc_fixup_dt_system_id(void)