Merge branch 'tracing/urgent' into tracing/core

Merge reason: Pick up fixes and move base from -rc1 to -rc5.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 77 insertions, 0 deletions

diff --git a/drivers/scsi/bfa/include/cna/cee/bfa_cee.h b/drivers/scsi/bfa/include/cna/cee/bfa_cee.h
new file mode 100644
index 000000000000..77f297f68046
--- /dev/null
+++ b/drivers/scsi/bfa/include/cna/cee/bfa_cee.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2005-2009 Brocade Communications Systems, Inc.
+ * All rights reserved
+ * www.brocade.com
+ *
+ * Linux driver for Brocade Fibre Channel Host Bus Adapter.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License (GPL) Version 2 as
+ * published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef __BFA_CEE_H__
+#define __BFA_CEE_H__
+
+#include <defs/bfa_defs_cee.h>
+#include <bfa_ioc.h>
+#include <cs/bfa_trc.h>
+#include <cs/bfa_log.h>
+
+typedef void (*bfa_cee_get_attr_cbfn_t) (void *dev, bfa_status_t status);
+typedef void (*bfa_cee_get_stats_cbfn_t) (void *dev, bfa_status_t status);
+typedef void (*bfa_cee_reset_stats_cbfn_t) (void *dev, bfa_status_t status);
+typedef void (*bfa_cee_hbfail_cbfn_t) (void *dev, bfa_status_t status);
+
+struct bfa_cee_cbfn_s {
+        bfa_cee_get_attr_cbfn_t    get_attr_cbfn;
+        void *get_attr_cbarg;
+        bfa_cee_get_stats_cbfn_t   get_stats_cbfn;
+        void *get_stats_cbarg;
+        bfa_cee_reset_stats_cbfn_t reset_stats_cbfn;
+        void *reset_stats_cbarg;
+};
+
+struct bfa_cee_s {
+        void *dev;
+        bfa_boolean_t get_attr_pending;
+        bfa_boolean_t get_stats_pending;
+        bfa_boolean_t reset_stats_pending;
+        bfa_status_t get_attr_status;
+        bfa_status_t get_stats_status;
+        bfa_status_t reset_stats_status;
+        struct bfa_cee_cbfn_s cbfn;
+        struct bfa_ioc_hbfail_notify_s hbfail;
+        struct bfa_trc_mod_s *trcmod;
+        struct bfa_log_mod_s *logmod;
+        struct bfa_cee_attr_s *attr;
+        struct bfa_cee_stats_s *stats;
+        struct bfa_dma_s attr_dma;
+        struct bfa_dma_s stats_dma;
+        struct bfa_ioc_s *ioc;
+        struct bfa_mbox_cmd_s get_cfg_mb;
+        struct bfa_mbox_cmd_s get_stats_mb;
+        struct bfa_mbox_cmd_s reset_stats_mb;
+};
+
+u32 bfa_cee_meminfo(void);
+void bfa_cee_mem_claim(struct bfa_cee_s *cee, u8 *dma_kva,
+                         u64 dma_pa);
+void bfa_cee_attach(struct bfa_cee_s *cee, struct bfa_ioc_s *ioc, void *dev,
+                        struct bfa_trc_mod_s *trcmod,
+                        struct bfa_log_mod_s *logmod);
+void bfa_cee_detach(struct bfa_cee_s *cee);
+bfa_status_t bfa_cee_get_attr(struct bfa_cee_s *cee,
+                         struct bfa_cee_attr_s *attr,
+                        bfa_cee_get_attr_cbfn_t cbfn, void *cbarg);
+bfa_status_t bfa_cee_get_stats(struct bfa_cee_s *cee,
+                        struct bfa_cee_stats_s *stats,
+                        bfa_cee_get_stats_cbfn_t cbfn, void *cbarg);
+bfa_status_t bfa_cee_reset_stats(struct bfa_cee_s *cee,
+                        bfa_cee_reset_stats_cbfn_t cbfn, void *cbarg);
+#endif /* __BFA_CEE_H__ */