5 files changed, 182 insertions, 16 deletions

diff --git a/include/net/caif/caif_dev.h b/include/net/caif/caif_dev.h
index 318ab9478a44..6da573c75d54 100644
--- a/include/net/caif/caif_dev.h
+++ b/include/net/caif/caif_dev.h
@@ -50,6 +50,9 @@ struct caif_connect_request {
  * @client_layer:       User implementation of client layer. This layer
  *                      MUST have receive and control callback functions
  *                      implemented.
+ * @ifindex:            Link layer interface index used for this connection.
+ * @headroom:           Head room needed by CAIF protocol.
+ * @tailroom:           Tail room needed by CAIF protocol.
  *
  * This function connects a CAIF channel. The Client must implement
  * the struct cflayer. This layer represents the Client layer and holds
@@ -59,8 +62,9 @@ struct caif_connect_request {
  * E.g. CAIF Socket will call this function for each socket it connects
  * and have one client_layer instance for each socket.
  */
-int caif_connect_client(struct caif_connect_request *config,
-                           struct cflayer *client_layer);
+int caif_connect_client(struct caif_connect_request *conn_req,
+                        struct cflayer *client_layer, int *ifindex,
+                        int *headroom, int *tailroom);
 
 /**
  * caif_disconnect_client - Disconnects a client from the CAIF stack.
diff --git a/include/net/caif/caif_layer.h b/include/net/caif/caif_layer.h
index 25c472f0e5b8..c8b07a904e78 100644
--- a/include/net/caif/caif_layer.h
+++ b/include/net/caif/caif_layer.h
@@ -15,14 +15,8 @@ struct cfpktq;
 struct caif_payload_info;
 struct caif_packet_funcs;
 
-#define CAIF_MAX_FRAMESIZE 4096
-#define CAIF_MAX_PAYLOAD_SIZE (4096 - 64)
-#define CAIF_NEEDED_HEADROOM (10)
-#define CAIF_NEEDED_TAILROOM (2)
 
 #define CAIF_LAYER_NAME_SZ 16
-#define CAIF_SUCCESS    1
-#define CAIF_FAILURE    0
 
 /**
  * caif_assert() - Assert function for CAIF.
diff --git a/include/net/caif/caif_spi.h b/include/net/caif/caif_spi.h
new file mode 100644
index 000000000000..ce4570dff020
--- /dev/null
+++ b/include/net/caif/caif_spi.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) ST-Ericsson AB 2010
+ * Author:      Daniel Martensson / Daniel.Martensson@stericsson.com
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#ifndef CAIF_SPI_H_
+#define CAIF_SPI_H_
+
+#include <net/caif/caif_device.h>
+
+#define SPI_CMD_WR                      0x00
+#define SPI_CMD_RD                      0x01
+#define SPI_CMD_EOT                     0x02
+#define SPI_CMD_IND                     0x04
+
+#define SPI_DMA_BUF_LEN                 8192
+
+#define WL_SZ                           2       /* 16 bits. */
+#define SPI_CMD_SZ                      4       /* 32 bits. */
+#define SPI_IND_SZ                      4       /* 32 bits. */
+
+#define SPI_XFER                        0
+#define SPI_SS_ON                       1
+#define SPI_SS_OFF                      2
+#define SPI_TERMINATE                   3
+
+/* Minimum time between different levels is 50 microseconds. */
+#define MIN_TRANSITION_TIME_USEC        50
+
+/* Defines for calculating duration of SPI transfers for a particular
+ * number of bytes.
+ */
+#define SPI_MASTER_CLK_MHZ              13
+#define SPI_XFER_TIME_USEC(bytes, clk) (((bytes) * 8) / clk)
+
+/* Normally this should be aligned on the modem in order to benefit from full
+ * duplex transfers. However a size of 8188 provokes errors when running with
+ * the modem. These errors occur when packet sizes approaches 4 kB of data.
+ */
+#define CAIF_MAX_SPI_FRAME 4092
+
+/* Maximum number of uplink CAIF frames that can reside in the same SPI frame.
+ * This number should correspond with the modem setting. The application side
+ * CAIF accepts any number of embedded downlink CAIF frames.
+ */
+#define CAIF_MAX_SPI_PKTS 9
+
+/* Decides if SPI buffers should be prefilled with 0xFF pattern for easier
+ * debugging. Both TX and RX buffers will be filled before the transfer.
+ */
+#define CFSPI_DBG_PREFILL               0
+
+/* Structure describing a SPI transfer. */
+struct cfspi_xfer {
+        u16 tx_dma_len;
+        u16 rx_dma_len;
+        void *va_tx;
+        dma_addr_t pa_tx;
+        void *va_rx;
+        dma_addr_t pa_rx;
+};
+
+/* Structure implemented by the SPI interface. */
+struct cfspi_ifc {
+        void (*ss_cb) (bool assert, struct cfspi_ifc *ifc);
+        void (*xfer_done_cb) (struct cfspi_ifc *ifc);
+        void *priv;
+};
+
+/* Structure implemented by SPI clients. */
+struct cfspi_dev {
+        int (*init_xfer) (struct cfspi_xfer *xfer, struct cfspi_dev *dev);
+        void (*sig_xfer) (bool xfer, struct cfspi_dev *dev);
+        struct cfspi_ifc *ifc;
+        char *name;
+        u32 clk_mhz;
+        void *priv;
+};
+
+/* Enumeration describing the CAIF SPI state. */
+enum cfspi_state {
+        CFSPI_STATE_WAITING = 0,
+        CFSPI_STATE_AWAKE,
+        CFSPI_STATE_FETCH_PKT,
+        CFSPI_STATE_GET_NEXT,
+        CFSPI_STATE_INIT_XFER,
+        CFSPI_STATE_WAIT_ACTIVE,
+        CFSPI_STATE_SIG_ACTIVE,
+        CFSPI_STATE_WAIT_XFER_DONE,
+        CFSPI_STATE_XFER_DONE,
+        CFSPI_STATE_WAIT_INACTIVE,
+        CFSPI_STATE_SIG_INACTIVE,
+        CFSPI_STATE_DELIVER_PKT,
+        CFSPI_STATE_MAX,
+};
+
+/* Structure implemented by SPI physical interfaces. */
+struct cfspi {
+        struct caif_dev_common cfdev;
+        struct net_device *ndev;
+        struct platform_device *pdev;
+        struct sk_buff_head qhead;
+        struct sk_buff_head chead;
+        u16 cmd;
+        u16 tx_cpck_len;
+        u16 tx_npck_len;
+        u16 rx_cpck_len;
+        u16 rx_npck_len;
+        struct cfspi_ifc ifc;
+        struct cfspi_xfer xfer;
+        struct cfspi_dev *dev;
+        unsigned long state;
+        struct work_struct work;
+        struct workqueue_struct *wq;
+        struct list_head list;
+        int    flow_off_sent;
+        u32 qd_low_mark;
+        u32 qd_high_mark;
+        struct completion comp;
+        wait_queue_head_t wait;
+        spinlock_t lock;
+        bool flow_stop;
+#ifdef CONFIG_DEBUG_FS
+        enum cfspi_state dbg_state;
+        u16 pcmd;
+        u16 tx_ppck_len;
+        u16 rx_ppck_len;
+        struct dentry *dbgfs_dir;
+        struct dentry *dbgfs_state;
+        struct dentry *dbgfs_frame;
+#endif                          /* CONFIG_DEBUG_FS */
+};
+
+extern int spi_frm_align;
+extern int spi_up_head_align;
+extern int spi_up_tail_align;
+extern int spi_down_head_align;
+extern int spi_down_tail_align;
+extern struct platform_driver cfspi_spi_driver;
+
+void cfspi_dbg_state(struct cfspi *cfspi, int state);
+int cfspi_xmitfrm(struct cfspi *cfspi, u8 *buf, size_t len);
+int cfspi_xmitlen(struct cfspi *cfspi);
+int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len);
+int cfspi_spi_remove(struct platform_device *pdev);
+int cfspi_spi_probe(struct platform_device *pdev);
+int cfspi_xmitfrm(struct cfspi *cfspi, u8 *buf, size_t len);
+int cfspi_xmitlen(struct cfspi *cfspi);
+int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len);
+void cfspi_xfer(struct work_struct *work);
+
+#endif                          /* CAIF_SPI_H_ */
diff --git a/include/net/caif/cfcnfg.h b/include/net/caif/cfcnfg.h
index 9fc2fc20b884..bd646faffa47 100644
--- a/include/net/caif/cfcnfg.h
+++ b/include/net/caif/cfcnfg.h
@@ -7,6 +7,7 @@
 #ifndef CFCNFG_H_
 #define CFCNFG_H_
 #include <linux/spinlock.h>
+#include <linux/netdevice.h>
 #include <net/caif/caif_layer.h>
 #include <net/caif/cfctrl.h>
 
@@ -73,8 +74,8 @@ void cfcnfg_remove(struct cfcnfg *cfg);
 
 void
 cfcnfg_add_phy_layer(struct cfcnfg *cnfg, enum cfcnfg_phy_type phy_type,
-                     void *dev, struct cflayer *phy_layer, u16 *phyid,
-                     enum cfcnfg_phy_preference pref,
+                     struct net_device *dev, struct cflayer *phy_layer,
+                     u16 *phyid, enum cfcnfg_phy_preference pref,
                      bool fcs, bool stx);
 
 /**
@@ -114,11 +115,18 @@ void cfcnfg_release_adap_layer(struct cflayer *adap_layer);
  * @param:              Link setup parameters.
  * @adap_layer:         Specify the adaptation layer; the receive and
  *                      flow-control functions MUST be set in the structure.
- *
+ * @ifindex:            Link layer interface index used for this connection.
+ * @proto_head:         Protocol head-space needed by CAIF protocol,
+ *                      excluding link layer.
+ * @proto_tail:         Protocol tail-space needed by CAIF protocol,
+ *                      excluding link layer.
  */
 int cfcnfg_add_adaptation_layer(struct cfcnfg *cnfg,
                             struct cfctrl_link_param *param,
-                            struct cflayer *adap_layer);
+                            struct cflayer *adap_layer,
+                            int *ifindex,
+                            int *proto_head,
+                            int *proto_tail);
 
 /**
  * cfcnfg_get_phyid() - Get physical ID, given type.
diff --git a/include/net/caif/cfsrvl.h b/include/net/caif/cfsrvl.h
index 2dc9eb193ecf..b1fa87ee0992 100644
--- a/include/net/caif/cfsrvl.h
+++ b/include/net/caif/cfsrvl.h
@@ -16,6 +16,8 @@ struct cfsrvl {
         bool open;
         bool phy_flow_on;
         bool modem_flow_on;
+        bool supports_flowctrl;
+        void (*release)(struct kref *);
         struct dev_info dev_info;
         struct kref ref;
 };
@@ -25,13 +27,15 @@ struct cflayer *cfvei_create(u8 linkid, struct dev_info *dev_info);
 struct cflayer *cfdgml_create(u8 linkid, struct dev_info *dev_info);
 struct cflayer *cfutill_create(u8 linkid, struct dev_info *dev_info);
 struct cflayer *cfvidl_create(u8 linkid, struct dev_info *dev_info);
-struct cflayer *cfrfml_create(u8 linkid, struct dev_info *dev_info);
+struct cflayer *cfrfml_create(u8 linkid, struct dev_info *dev_info,
+                                int mtu_size);
 struct cflayer *cfdbgl_create(u8 linkid, struct dev_info *dev_info);
 bool cfsrvl_phyid_match(struct cflayer *layer, int phyid);
 void cfservl_destroy(struct cflayer *layer);
 void cfsrvl_init(struct cfsrvl *service,
-                 u8 channel_id,
-                 struct dev_info *dev_info);
+                        u8 channel_id,
+                        struct dev_info *dev_info,
+                        bool supports_flowctrl);
 bool cfsrvl_ready(struct cfsrvl *service, int *err);
 u8 cfsrvl_getphyid(struct cflayer *layer);
 
@@ -50,7 +54,10 @@ static inline void cfsrvl_put(struct cflayer *layr)
         if (layr == NULL)
                 return;
         s = container_of(layr, struct cfsrvl, layer);
-        kref_put(&s->ref, cfsrvl_release);
+
+        WARN_ON(!s->release);
+        if (s->release)
+                kref_put(&s->ref, s->release);
 }
 
 #endif                          /* CFSRVL_H_ */