Patched in Tegra support.

7 files changed, 60 insertions, 127 deletions

diff --git a/include/net/caif/caif_dev.h b/include/net/caif/caif_dev.h
index ef2dd9438bb..c011281d92c 100644
--- a/include/net/caif/caif_dev.h
+++ b/include/net/caif/caif_dev.h
@@ -9,7 +9,6 @@
 
 #include <net/caif/caif_layer.h>
 #include <net/caif/cfcnfg.h>
-#include <net/caif/caif_device.h>
 #include <linux/caif/caif_socket.h>
 #include <linux/if.h>
 #include <linux/net.h>
@@ -105,24 +104,4 @@ void caif_client_register_refcnt(struct cflayer *adapt_layer,
  */
 void caif_free_client(struct cflayer *adap_layer);
 
-/**
- * struct caif_enroll_dev - Enroll a net-device as a CAIF Link layer
- * @dev:                Network device to enroll.
- * @caifdev:            Configuration information from CAIF Link Layer
- * @link_support:       Link layer support layer
- * @head_room:          Head room needed by link support layer
- * @layer:              Lowest layer in CAIF stack
- * @rcv_fun:            Receive function for CAIF stack.
- *
- * This function enroll a CAIF link layer into CAIF Stack and
- * expects the interface to be able to handle CAIF payload.
- * The link_support layer is used to add any Link Layer specific
- * framing.
- */
-void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,
-                        struct cflayer *link_support, int head_room,
-                        struct cflayer **layer, int (**rcv_func)(
-                                struct sk_buff *, struct net_device *,
-                                struct packet_type *, struct net_device *));
-
 #endif /* CAIF_DEV_H_ */
diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
index bcb9cc3ce98..c5dedd87b4c 100644
--- a/include/net/caif/caif_hsi.h
+++ b/include/net/caif/caif_hsi.h
@@ -52,9 +52,8 @@ struct cfhsi_desc {
 /*
  * Maximum bytes transferred in one transfer.
  */
-#define CFHSI_MAX_CAIF_FRAME_SZ 4096
-
-#define CFHSI_MAX_PAYLOAD_SZ (CFHSI_MAX_PKTS * CFHSI_MAX_CAIF_FRAME_SZ)
+/* TODO: 4096 is temporary... */
+#define CFHSI_MAX_PAYLOAD_SZ (CFHSI_MAX_PKTS * 4096)
 
 /* Size of the complete HSI TX buffer. */
 #define CFHSI_BUF_SZ_TX (CFHSI_DESC_SZ + CFHSI_MAX_PAYLOAD_SZ)
@@ -76,69 +75,38 @@ struct cfhsi_desc {
 #define CFHSI_WAKE_UP_ACK                       1
 #define CFHSI_WAKE_DOWN_ACK                     2
 #define CFHSI_AWAKE                             3
-#define CFHSI_WAKELOCK_HELD                     4
-#define CFHSI_SHUTDOWN                          5
-#define CFHSI_FLUSH_FIFO                        6
+#define CFHSI_PENDING_RX                        4
+#define CFHSI_SHUTDOWN                          6
+#define CFHSI_FLUSH_FIFO                        7
 
 #ifndef CFHSI_INACTIVITY_TOUT
 #define CFHSI_INACTIVITY_TOUT                   (1 * HZ)
 #endif /* CFHSI_INACTIVITY_TOUT */
 
-#ifndef CFHSI_WAKE_TOUT
-#define CFHSI_WAKE_TOUT                 (3 * HZ)
-#endif /* CFHSI_WAKE_TOUT */
+#ifndef CFHSI_WAKEUP_TOUT
+#define CFHSI_WAKEUP_TOUT                       (3 * HZ)
+#endif /* CFHSI_WAKEUP_TOUT */
 
-#ifndef CFHSI_MAX_RX_RETRIES
-#define CFHSI_MAX_RX_RETRIES            (10 * HZ)
-#endif
 
 /* Structure implemented by the CAIF HSI driver. */
-struct cfhsi_cb_ops {
-        void (*tx_done_cb) (struct cfhsi_cb_ops *drv);
-        void (*rx_done_cb) (struct cfhsi_cb_ops *drv);
-        void (*wake_up_cb) (struct cfhsi_cb_ops *drv);
-        void (*wake_down_cb) (struct cfhsi_cb_ops *drv);
+struct cfhsi_drv {
+        void (*tx_done_cb) (struct cfhsi_drv *drv);
+        void (*rx_done_cb) (struct cfhsi_drv *drv);
+        void (*wake_up_cb) (struct cfhsi_drv *drv);
+        void (*wake_down_cb) (struct cfhsi_drv *drv);
 };
 
 /* Structure implemented by HSI device. */
-struct cfhsi_ops {
-        int (*cfhsi_up) (struct cfhsi_ops *dev);
-        int (*cfhsi_down) (struct cfhsi_ops *dev);
-        int (*cfhsi_tx) (u8 *ptr, int len, struct cfhsi_ops *dev);
-        int (*cfhsi_rx) (u8 *ptr, int len, struct cfhsi_ops *dev);
-        int (*cfhsi_wake_up) (struct cfhsi_ops *dev);
-        int (*cfhsi_wake_down) (struct cfhsi_ops *dev);
-        int (*cfhsi_get_peer_wake) (struct cfhsi_ops *dev, bool *status);
-        int (*cfhsi_fifo_occupancy) (struct cfhsi_ops *dev, size_t *occupancy);
-        int (*cfhsi_rx_cancel)(struct cfhsi_ops *dev);
-        struct cfhsi_cb_ops *cb_ops;
-};
-
-/* Structure holds status of received CAIF frames processing */
-struct cfhsi_rx_state {
-        int state;
-        int nfrms;
-        int pld_len;
-        int retries;
-        bool piggy_desc;
-};
-
-/* Priority mapping */
-enum {
-        CFHSI_PRIO_CTL = 0,
-        CFHSI_PRIO_VI,
-        CFHSI_PRIO_VO,
-        CFHSI_PRIO_BEBK,
-        CFHSI_PRIO_LAST,
-};
-
-struct cfhsi_config {
-        u32 inactivity_timeout;
-        u32 aggregation_timeout;
-        u32 head_align;
-        u32 tail_align;
-        u32 q_high_mark;
-        u32 q_low_mark;
+struct cfhsi_dev {
+        int (*cfhsi_up) (struct cfhsi_dev *dev);
+        int (*cfhsi_down) (struct cfhsi_dev *dev);
+        int (*cfhsi_tx) (u8 *ptr, int len, struct cfhsi_dev *dev);
+        int (*cfhsi_rx) (u8 *ptr, int len, struct cfhsi_dev *dev);
+        int (*cfhsi_wake_up) (struct cfhsi_dev *dev);
+        int (*cfhsi_wake_down) (struct cfhsi_dev *dev);
+        int (*cfhsi_fifo_occupancy)(struct cfhsi_dev *dev, size_t *occupancy);
+        int (*cfhsi_rx_cancel)(struct cfhsi_dev *dev);
+        struct cfhsi_drv *drv;
 };
 
 /* Structure implemented by CAIF HSI drivers. */
@@ -146,56 +114,32 @@ struct cfhsi {
         struct caif_dev_common cfdev;
         struct net_device *ndev;
         struct platform_device *pdev;
-        struct sk_buff_head qhead[CFHSI_PRIO_LAST];
-        struct cfhsi_cb_ops cb_ops;
-        struct cfhsi_ops *ops;
+        struct sk_buff_head qhead;
+        struct cfhsi_drv drv;
+        struct cfhsi_dev *dev;
         int tx_state;
-        struct cfhsi_rx_state rx_state;
-        struct cfhsi_config cfg;
+        int rx_state;
         int rx_len;
         u8 *rx_ptr;
         u8 *tx_buf;
         u8 *rx_buf;
-        u8 *rx_flip_buf;
         spinlock_t lock;
         int flow_off_sent;
+        u32 q_low_mark;
+        u32 q_high_mark;
         struct list_head list;
         struct work_struct wake_up_work;
         struct work_struct wake_down_work;
-        struct work_struct out_of_sync_work;
+        struct work_struct rx_done_work;
+        struct work_struct tx_done_work;
         struct workqueue_struct *wq;
         wait_queue_head_t wake_up_wait;
         wait_queue_head_t wake_down_wait;
         wait_queue_head_t flush_fifo_wait;
-        struct timer_list inactivity_timer;
-        struct timer_list rx_slowpath_timer;
-
-        /* TX aggregation */
-        int aggregation_len;
-        struct timer_list aggregation_timer;
-
+        struct timer_list timer;
         unsigned long bits;
 };
-extern struct platform_driver cfhsi_driver;
 
-/**
- * enum ifla_caif_hsi - CAIF HSI NetlinkRT parameters.
- * @IFLA_CAIF_HSI_INACTIVITY_TOUT: Inactivity timeout before
- *                      taking the HSI wakeline down, in milliseconds.
- * When using RT Netlink to create, destroy or configure a CAIF HSI interface,
- * enum ifla_caif_hsi is used to specify the configuration attributes.
- */
-enum ifla_caif_hsi {
-        __IFLA_CAIF_HSI_UNSPEC,
-        __IFLA_CAIF_HSI_INACTIVITY_TOUT,
-        __IFLA_CAIF_HSI_AGGREGATION_TOUT,
-        __IFLA_CAIF_HSI_HEAD_ALIGN,
-        __IFLA_CAIF_HSI_TAIL_ALIGN,
-        __IFLA_CAIF_HSI_QHIGH_WATERMARK,
-        __IFLA_CAIF_HSI_QLOW_WATERMARK,
-        __IFLA_CAIF_HSI_MAX
-};
-
-extern struct cfhsi_ops *cfhsi_get_ops(void);
+extern struct platform_driver cfhsi_driver;
 
 #endif          /* CAIF_HSI_H_ */
diff --git a/include/net/caif/caif_layer.h b/include/net/caif/caif_layer.h
index 0f3a39125f9..35bc7883cf9 100644
--- a/include/net/caif/caif_layer.h
+++ b/include/net/caif/caif_layer.h
@@ -121,7 +121,9 @@ enum caif_direction {
  * @transmit:   Packet transmit funciton.
  * @ctrlcmd:    Used for control signalling upwards in the stack.
  * @modemcmd:   Used for control signaling downwards in the stack.
+ * @prio:       Priority of this layer.
  * @id:         The identity of this layer
+ * @type:       The type of this layer
  * @name:       Name of the layer.
  *
  *  This structure defines the layered structure in CAIF.
@@ -228,7 +230,9 @@ struct cflayer {
          */
         int (*modemcmd) (struct cflayer *layr, enum caif_modemcmd ctrl);
 
+        unsigned short prio;
         unsigned int id;
+        unsigned int type;
         char name[CAIF_LAYER_NAME_SZ];
 };
 
diff --git a/include/net/caif/caif_spi.h b/include/net/caif/caif_spi.h
index aa6a485b054..87c3d11b8e5 100644
--- a/include/net/caif/caif_spi.h
+++ b/include/net/caif/caif_spi.h
@@ -55,8 +55,8 @@
 struct cfspi_xfer {
         u16 tx_dma_len;
         u16 rx_dma_len;
-        void *va_tx[2];
-        dma_addr_t pa_tx[2];
+        void *va_tx;
+        dma_addr_t pa_tx;
         void *va_rx;
         dma_addr_t pa_rx;
 };
diff --git a/include/net/caif/cfcnfg.h b/include/net/caif/cfcnfg.h
index 90b4ff8bad8..3e93a4a4b67 100644
--- a/include/net/caif/cfcnfg.h
+++ b/include/net/caif/cfcnfg.h
@@ -14,6 +14,18 @@
 struct cfcnfg;
 
 /**
+ * enum cfcnfg_phy_type -  Types of physical layers defined in CAIF Stack
+ *
+ * @CFPHYTYPE_FRAG:     Fragmented frames physical interface.
+ * @CFPHYTYPE_CAIF:     Generic CAIF physical interface
+ */
+enum cfcnfg_phy_type {
+        CFPHYTYPE_FRAG = 1,
+        CFPHYTYPE_CAIF,
+        CFPHYTYPE_MAX
+};
+
+/**
  * enum cfcnfg_phy_preference - Physical preference HW Abstraction
  *
  * @CFPHYPREF_UNSPECIFIED:      Default physical interface
@@ -54,20 +66,21 @@ void cfcnfg_remove(struct cfcnfg *cfg);
  * cfcnfg_add_phy_layer() - Adds a physical layer to the CAIF stack.
  * @cnfg:       Pointer to a CAIF configuration object, created by
  *              cfcnfg_create().
+ * @phy_type:   Specifies the type of physical interface, e.g.
+ *                      CFPHYTYPE_FRAG.
  * @dev:        Pointer to link layer device
  * @phy_layer:  Specify the physical layer. The transmit function
  *              MUST be set in the structure.
  * @pref:       The phy (link layer) preference.
- * @link_support: Protocol implementation for link layer specific protocol.
  * @fcs:        Specify if checksum is used in CAIF Framing Layer.
- * @head_room:  Head space needed by link specific protocol.
+ * @stx:        Specify if Start Of Frame eXtention is used.
  */
+
 void
-cfcnfg_add_phy_layer(struct cfcnfg *cnfg,
+cfcnfg_add_phy_layer(struct cfcnfg *cnfg, enum cfcnfg_phy_type phy_type,
                      struct net_device *dev, struct cflayer *phy_layer,
                      enum cfcnfg_phy_preference pref,
-                     struct cflayer *link_support,
-                     bool fcs, int head_room);
+                     bool fcs, bool stx);
 
 /**
  * cfcnfg_del_phy_layer - Deletes an phy layer from the CAIF stack.
diff --git a/include/net/caif/cfpkt.h b/include/net/caif/cfpkt.h
index 83a89ba3005..6bd200a4754 100644
--- a/include/net/caif/cfpkt.h
+++ b/include/net/caif/cfpkt.h
@@ -188,18 +188,11 @@ struct cfpkt *cfpkt_fromnative(enum caif_direction dir, void *nativepkt);
  */
 void *cfpkt_tonative(struct cfpkt *pkt);
 
+
 /*
  * Returns packet information for a packet.
  * pkt Packet to get info from;
  * @return Packet information
  */
 struct caif_payload_info *cfpkt_info(struct cfpkt *pkt);
-
-/** cfpkt_set_prio - set priority for a CAIF packet.
- *
- * @pkt: The CAIF packet to be adjusted.
- * @prio: one of TC_PRIO_ constants.
- */
-void cfpkt_set_prio(struct cfpkt *pkt, int prio);
-
 #endif                          /* CFPKT_H_ */
diff --git a/include/net/caif/cfserl.h b/include/net/caif/cfserl.h
index f121299a342..b8374321b36 100644
--- a/include/net/caif/cfserl.h
+++ b/include/net/caif/cfserl.h
@@ -8,5 +8,5 @@
 #define CFSERL_H_
 #include <net/caif/caif_layer.h>
 
-struct cflayer *cfserl_create(int instance, bool use_stx);
-#endif
+struct cflayer *cfserl_create(int type, int instance, bool use_stx);
+#endif                          /* CFSERL_H_ */