Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761799AbbBJC2J (ORCPT ); Mon, 9 Feb 2015 21:28:09 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:42123 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761722AbbBJC2G (ORCPT ); Mon, 9 Feb 2015 21:28:06 -0500 From: Stewart Smith To: mpe@ellerman.id.au, benh@kernel.crashing.org Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Stewart Smith Subject: [PATCH 08/18] powerpc/powernv: Move OpalSysparamPerm,OpalMessageType in opal.h to match firmware Date: Tue, 10 Feb 2015 13:26:50 +1100 Message-Id: <1423535220-6322-9-git-send-email-stewart@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1423535220-6322-1-git-send-email-stewart@linux.vnet.ibm.com> References: <1423535220-6322-1-git-send-email-stewart@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15021002-0017-0000-0000-0000089A1B2A Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2093 Lines: 74 For whatever strange reason, these two structures were in different locations in opal.h in firmware and opal.h in Linux. Move them around to match firmware so that the diff is less. Signed-off-by: Stewart Smith --- arch/powerpc/include/asm/opal.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h index 31b9656..3786c6b 100644 --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h @@ -279,17 +279,6 @@ enum OpalPendingState { OPAL_EVENT_MSG_PENDING = 0x800, }; -enum OpalMessageType { - OPAL_MSG_ASYNC_COMP = 0, /* params[0] = token, params[1] = rc, - * additional params function-specific - */ - OPAL_MSG_MEM_ERR, - OPAL_MSG_EPOW, - OPAL_MSG_SHUTDOWN, - OPAL_MSG_HMI_EVT, - OPAL_MSG_TYPE_MAX, -}; - enum OpalThreadStatus { OPAL_THREAD_INACTIVE = 0x0, OPAL_THREAD_STARTED = 0x1, @@ -389,11 +378,15 @@ enum OpalLPCAddressType { OPAL_LPC_FW = 2, }; -/* System parameter permission */ -enum OpalSysparamPerm { - OPAL_SYSPARAM_READ = 0x1, - OPAL_SYSPARAM_WRITE = 0x2, - OPAL_SYSPARAM_RW = (OPAL_SYSPARAM_READ | OPAL_SYSPARAM_WRITE), +enum OpalMessageType { + OPAL_MSG_ASYNC_COMP = 0, /* params[0] = token, params[1] = rc, + * additional params function-specific + */ + OPAL_MSG_MEM_ERR, + OPAL_MSG_EPOW, + OPAL_MSG_SHUTDOWN, + OPAL_MSG_HMI_EVT, + OPAL_MSG_TYPE_MAX, }; struct opal_msg { @@ -402,6 +395,13 @@ struct opal_msg { __be64 params[8]; }; +/* System parameter permission */ +enum OpalSysparamPerm { + OPAL_SYSPARAM_READ = 0x1, + OPAL_SYSPARAM_WRITE = 0x2, + OPAL_SYSPARAM_RW = (OPAL_SYSPARAM_READ | OPAL_SYSPARAM_WRITE), +}; + enum { OPAL_IPMI_MSG_FORMAT_VERSION_1 = 1, }; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/