Browse Source

x86, mrst: Some drivers need to known when an SCU is available

Add a notifier so that drivers can hook into SCU availability in order to
take actions post initialisation when/if the SCU becomes available.

In the ideal world we wouldn't need this and we could avoid any init
dependancies of this form, but in practice we can't do it for some cases.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Alan Cox 13 years ago
parent
commit
42c2544b2d
2 changed files with 29 additions and 0 deletions
  1. 22 0
      arch/x86/include/asm/intel_scu_ipc.h
  2. 7 0
      arch/x86/platform/mrst/mrst.c

+ 22 - 0
arch/x86/include/asm/intel_scu_ipc.h

@@ -1,6 +1,8 @@
 #ifndef _ASM_X86_INTEL_SCU_IPC_H_
 #ifndef _ASM_X86_INTEL_SCU_IPC_H_
 #define  _ASM_X86_INTEL_SCU_IPC_H_
 #define  _ASM_X86_INTEL_SCU_IPC_H_
 
 
+#include <linux/notifier.h>
+
 #define IPCMSG_VRTC	0xFA	 /* Set vRTC device */
 #define IPCMSG_VRTC	0xFA	 /* Set vRTC device */
 
 
 /* Command id associated with message IPCMSG_VRTC */
 /* Command id associated with message IPCMSG_VRTC */
@@ -44,4 +46,24 @@ int intel_scu_ipc_i2c_cntrl(u32 addr, u32 *data);
 /* Update FW version */
 /* Update FW version */
 int intel_scu_ipc_fw_update(u8 *buffer, u32 length);
 int intel_scu_ipc_fw_update(u8 *buffer, u32 length);
 
 
+extern struct blocking_notifier_head intel_scu_notifier;
+
+static inline void intel_scu_notifier_add(struct notifier_block *nb)
+{
+	blocking_notifier_chain_register(&intel_scu_notifier, nb);
+}
+
+static inline void intel_scu_notifier_remove(struct notifier_block *nb)
+{
+	blocking_notifier_chain_unregister(&intel_scu_notifier, nb);
+}
+
+static inline int intel_scu_notifier_post(unsigned long v, void *p)
+{
+	return blocking_notifier_call_chain(&intel_scu_notifier, v, p);
+}
+
+#define		SCU_AVAILABLE		1
+#define		SCU_DOWN		2
+
 #endif
 #endif

+ 7 - 0
arch/x86/platform/mrst/mrst.c

@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/module.h>
+#include <linux/notifier.h>
 
 
 #include <asm/setup.h>
 #include <asm/setup.h>
 #include <asm/mpspec_def.h>
 #include <asm/mpspec_def.h>
@@ -555,6 +556,9 @@ static void __init intel_scu_i2c_device_register(int bus,
 	i2c_devs[i2c_next_dev++] = new_dev;
 	i2c_devs[i2c_next_dev++] = new_dev;
 }
 }
 
 
+BLOCKING_NOTIFIER_HEAD(intel_scu_notifier);
+EXPORT_SYMBOL_GPL(intel_scu_notifier);
+
 /* Called by IPC driver */
 /* Called by IPC driver */
 void intel_scu_devices_create(void)
 void intel_scu_devices_create(void)
 {
 {
@@ -579,6 +583,7 @@ void intel_scu_devices_create(void)
 		} else
 		} else
 			i2c_register_board_info(i2c_bus[i], i2c_devs[i], 1);
 			i2c_register_board_info(i2c_bus[i], i2c_devs[i], 1);
 	}
 	}
+	intel_scu_notifier_post(SCU_AVAILABLE, 0L);
 }
 }
 EXPORT_SYMBOL_GPL(intel_scu_devices_create);
 EXPORT_SYMBOL_GPL(intel_scu_devices_create);
 
 
@@ -587,6 +592,8 @@ void intel_scu_devices_destroy(void)
 {
 {
 	int i;
 	int i;
 
 
+	intel_scu_notifier_post(SCU_DOWN, 0L);
+
 	for (i = 0; i < ipc_next_dev; i++)
 	for (i = 0; i < ipc_next_dev; i++)
 		platform_device_del(ipc_devs[i]);
 		platform_device_del(ipc_devs[i]);
 }
 }