[PATCH phosphor-host-ipmid 0/3] simple cleanups

[PATCH phosphor-host-ipmid 0/3] simple cleanups

[OpenBMC Patches]

https://github.com/openbmc/phosphor-host-ipmid/pull/46

Chris Austen (1):
  fixing build break in my master

Jeremy Kerr (2):
  ipmid: Use updated dbus HostIpmi interface
  ipmid: Remove assumptions about host IPMI sender objects

 ipmid-api.h | 18 +++++++++---------
 ipmid.C     |  3 ---
 2 files changed, 9 insertions(+), 12 deletions(-)

-- 
2.6.3

[PATCH phosphor-host-ipmid 1/3] ipmid: Use updated dbus HostIpmi interface

[OpenBMC Patches]

From: Jeremy Kerr <jk@ozlabs.org>

With the updated HostIpmi dbus interface, netfns are not packed with
LUNs, and the CC is separate from the data.  This means we no longer
have to define NETFN_* as arbitrarily shifted, and we have the added
bonus of replying to messages where lun != 0.

We may want to separate the CC returned from the handlers in future too.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 ipmid-api.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ipmid-api.h b/ipmid-api.h
index 2d58961..f9c03dd 100644
--- a/ipmid-api.h
+++ b/ipmid-api.h
@@ -63,16 +63,16 @@ extern "C" void ipmi_register_callback(ipmi_netfn_t, ipmi_cmd_t,
 // Note: these are also shifted left to make room for the LUN.
 enum ipmi_net_fns
 {
-    NETFUN_CHASSIS   =   0x00,
-    NETFUN_BRIDGE    =   0x02,
-    NETFUN_SENSOR    =   0x04,
-    NETFUN_APP       =   0x06,
-    NETFUN_FIRMWARE  =   0x08,
-    NETFUN_STORAGE   =   0x0a,
-    NETFUN_TRANSPORT =   0x0c,
-    NETFUN_GRPEXT    =   0x2c,
-    NETFUN_NONE      =   0x30,
-    NETFUN_OEM       =   0x32
+    NETFUN_CHASSIS  =   0x00,
+    NETFUN_BRIDGE   =   0x02,
+    NETFUN_SENSOR   =   0x04,
+    NETFUN_APP      =   0x06,
+    NETFUN_FIRMWARE =   0x08,
+    NETFUN_STORAGE  =   0x0a,
+    NETFUN_TRANPORT =   0x0c,
+    NETFUN_GRPEXT   =   0x2c,
+    NETFUN_NONE     =   0x30,
+    NETFUN_OEM      =   0x32
 };
 
 // IPMI commands for net functions. Since this is to be used both by the ipmi
-- 
2.6.3

Re: [PATCH phosphor-host-ipmid 1/3] ipmid: Use updated dbus HostIpmi interface

[Patrick Williams]

[-- Attachment #1: Type: text/plain, Size: 2003 bytes --]

Chris,

Why does this patch exist with whitespace only changes?  Did something
go wrong in a rebase you did?

On Wed, Nov 25, 2015 at 02:20:22AM -0500, OpenBMC Patches wrote:
> From: Jeremy Kerr <jk@ozlabs.org>
> 
> With the updated HostIpmi dbus interface, netfns are not packed with
> LUNs, and the CC is separate from the data.  This means we no longer
> have to define NETFN_* as arbitrarily shifted, and we have the added
> bonus of replying to messages where lun != 0.
> 
> We may want to separate the CC returned from the handlers in future too.
> 
> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
> ---
>  ipmid-api.h | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/ipmid-api.h b/ipmid-api.h
> index 2d58961..f9c03dd 100644
> --- a/ipmid-api.h
> +++ b/ipmid-api.h
> @@ -63,16 +63,16 @@ extern "C" void ipmi_register_callback(ipmi_netfn_t, ipmi_cmd_t,
>  // Note: these are also shifted left to make room for the LUN.
>  enum ipmi_net_fns
>  {
> -    NETFUN_CHASSIS   =   0x00,
> -    NETFUN_BRIDGE    =   0x02,
> -    NETFUN_SENSOR    =   0x04,
> -    NETFUN_APP       =   0x06,
> -    NETFUN_FIRMWARE  =   0x08,
> -    NETFUN_STORAGE   =   0x0a,
> -    NETFUN_TRANSPORT =   0x0c,
> -    NETFUN_GRPEXT    =   0x2c,
> -    NETFUN_NONE      =   0x30,
> -    NETFUN_OEM       =   0x32
> +    NETFUN_CHASSIS  =   0x00,
> +    NETFUN_BRIDGE   =   0x02,
> +    NETFUN_SENSOR   =   0x04,
> +    NETFUN_APP      =   0x06,
> +    NETFUN_FIRMWARE =   0x08,
> +    NETFUN_STORAGE  =   0x0a,
> +    NETFUN_TRANPORT =   0x0c,
> +    NETFUN_GRPEXT   =   0x2c,
> +    NETFUN_NONE     =   0x30,
> +    NETFUN_OEM      =   0x32
>  };
>  
>  // IPMI commands for net functions. Since this is to be used both by the ipmi
> -- 
> 2.6.3
> 
> 
> _______________________________________________
> openbmc mailing list
> openbmc@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc

-- 
Patrick Williams

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH phosphor-host-ipmid 2/3] ipmid: Remove assumptions about host IPMI sender objects

[OpenBMC Patches]

From: Jeremy Kerr <jk@ozlabs.org>

Currently, the IPMI daemon will only receive messages from a specific
(arbitrary) object path that the debug daemon used.

Instead, we should be listening to any signal that matches our interface
(org.openbmc.HostIpmi.ReceivedMessage). When replying to the message,
we should be using the signal sender info to properly address the
reply method.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 ipmid.C | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ipmid.C b/ipmid.C
index 440705c..fe989e0 100644
--- a/ipmid.C
+++ b/ipmid.C
@@ -26,10 +26,7 @@ void print_usage(void) {
   fprintf(stderr, "    mask : 0xFF - Print all trace\n");
 }
 
-
-
 const char * DBUS_INTF = "org.openbmc.HostIpmi";
-
 const char * FILTER = "type='signal',interface='org.openbmc.HostIpmi',member='ReceivedMessage'";
 
 
-- 
2.6.3

[PATCH phosphor-host-ipmid 3/3] fixing build break in my master

[OpenBMC Patches]

From: Chris Austen <austenc@us.ibm.com>

---
 ipmid-api.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipmid-api.h b/ipmid-api.h
index f9c03dd..e957ee6 100644
--- a/ipmid-api.h
+++ b/ipmid-api.h
@@ -69,7 +69,7 @@ enum ipmi_net_fns
     NETFUN_APP      =   0x06,
     NETFUN_FIRMWARE =   0x08,
     NETFUN_STORAGE  =   0x0a,
-    NETFUN_TRANPORT =   0x0c,
+    NETFUN_TRANSPORT =   0x0c,
     NETFUN_GRPEXT   =   0x2c,
     NETFUN_NONE     =   0x30,
     NETFUN_OEM      =   0x32
-- 
2.6.3