Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6-omap-h63xx.git] / drivers / net / cxgb3 / cxgb3_offload.c

diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index 265aa8a15afaed2eb5a61177917d07cd6649b476..620d80be6aacb1d3806d3f42f786c9f5b52bc6a3 100644 (file)
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -153,6 +153,18 @@ void cxgb3_remove_clients(struct t3cdev *tdev)
        mutex_unlock(&cxgb3_db_lock);
 }
 
+void cxgb3_err_notify(struct t3cdev *tdev, u32 status, u32 error)
+{
+       struct cxgb3_client *client;
+
+       mutex_lock(&cxgb3_db_lock);
+       list_for_each_entry(client, &client_list, client_list) {
+               if (client->err_handler)
+                       client->err_handler(tdev, status, error);
+       }
+       mutex_unlock(&cxgb3_db_lock);
+}
+
 static struct net_device *get_iff_from_mac(struct adapter *adapter,
                                           const unsigned char *mac,
                                           unsigned int vlan)
@@ -182,7 +194,9 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
 static int cxgb_ulp_iscsi_ctl(struct adapter *adapter, unsigned int req,
                              void *data)
 {
+       int i;
        int ret = 0;
+       unsigned int val = 0;
        struct ulp_iscsi_info *uiip = data;
 
        switch (req) {
@@ -191,32 +205,55 @@ static int cxgb_ulp_iscsi_ctl(struct adapter *adapter, unsigned int req,
                uiip->llimit = t3_read_reg(adapter, A_ULPRX_ISCSI_LLIMIT);
                uiip->ulimit = t3_read_reg(adapter, A_ULPRX_ISCSI_ULIMIT);
                uiip->tagmask = t3_read_reg(adapter, A_ULPRX_ISCSI_TAGMASK);
+
+               val = t3_read_reg(adapter, A_ULPRX_ISCSI_PSZ);
+               for (i = 0; i < 4; i++, val >>= 8)
+                       uiip->pgsz_factor[i] = val & 0xFF;
+
+               val = t3_read_reg(adapter, A_TP_PARA_REG7);
+               uiip->max_txsz =
+               uiip->max_rxsz = min((val >> S_PMMAXXFERLEN0)&M_PMMAXXFERLEN0,
+                                    (val >> S_PMMAXXFERLEN1)&M_PMMAXXFERLEN1);
                /*
                 * On tx, the iscsi pdu has to be <= tx page size and has to
                 * fit into the Tx PM FIFO.
                 */
-               uiip->max_txsz = min(adapter->params.tp.tx_pg_size,
-                                    t3_read_reg(adapter, A_PM1_TX_CFG) >> 17);
-               /* on rx, the iscsi pdu has to be < rx page size and the
-                  whole pdu + cpl headers has to fit into one sge buffer */
-               uiip->max_rxsz = min_t(unsigned int,
-                                      adapter->params.tp.rx_pg_size,
-                                      (adapter->sge.qs[0].fl[1].buf_size -
-                                       sizeof(struct cpl_rx_data) * 2 -
-                                       sizeof(struct cpl_rx_data_ddp)));
+               val = min(adapter->params.tp.tx_pg_size,
+                         t3_read_reg(adapter, A_PM1_TX_CFG) >> 17);
+               uiip->max_txsz = min(val, uiip->max_txsz);
+
+               /* set MaxRxData to 16224 */
+               val = t3_read_reg(adapter, A_TP_PARA_REG2);
+               if ((val >> S_MAXRXDATA) != 0x3f60) {
+                       val &= (M_RXCOALESCESIZE << S_RXCOALESCESIZE);
+                       val |= V_MAXRXDATA(0x3f60);
+                       printk(KERN_INFO
+                               "%s, iscsi set MaxRxData to 16224 (0x%x).\n",
+                               adapter->name, val);
+                       t3_write_reg(adapter, A_TP_PARA_REG2, val);
+               }
+
+               /*
+                * on rx, the iscsi pdu has to be < rx page size and the
+                * the max rx data length programmed in TP
+                */
+               val = min(adapter->params.tp.rx_pg_size,
+                         ((t3_read_reg(adapter, A_TP_PARA_REG2)) >>
+                               S_MAXRXDATA) & M_MAXRXDATA);
+               uiip->max_rxsz = min(val, uiip->max_rxsz);
                break;
        case ULP_ISCSI_SET_PARAMS:
                t3_write_reg(adapter, A_ULPRX_ISCSI_TAGMASK, uiip->tagmask);
-               /* set MaxRxData and MaxCoalesceSize to 16224 */
-               t3_write_reg(adapter, A_TP_PARA_REG2, 0x3f603f60);
                /* program the ddp page sizes */
-               {
-                       int i;
-                       unsigned int val = 0;
-                       for (i = 0; i < 4; i++)
-                               val |= (uiip->pgsz_factor[i] & 0xF) << (8 * i);
-                       if (val)
-                               t3_write_reg(adapter, A_ULPRX_ISCSI_PSZ, val);
+               for (i = 0; i < 4; i++)
+                       val |= (uiip->pgsz_factor[i] & 0xF) << (8 * i);
+               if (val && (val != t3_read_reg(adapter, A_ULPRX_ISCSI_PSZ))) {
+                       printk(KERN_INFO
+                               "%s, setting iscsi pgsz 0x%x, %u,%u,%u,%u.\n",
+                               adapter->name, val, uiip->pgsz_factor[0],
+                               uiip->pgsz_factor[1], uiip->pgsz_factor[2],
+                               uiip->pgsz_factor[3]);
+                       t3_write_reg(adapter, A_ULPRX_ISCSI_PSZ, val);
                }
                break;
        default:
@@ -407,6 +444,21 @@ static int cxgb_offload_ctl(struct t3cdev *tdev, unsigned int req, void *data)
                rx_page_info->page_size = tp->rx_pg_size;
                rx_page_info->num = tp->rx_num_pgs;
                break;
+       case GET_ISCSI_IPV4ADDR: {
+               struct iscsi_ipv4addr *p = data;
+               struct port_info *pi = netdev_priv(p->dev);
+               p->ipv4addr = pi->iscsi_ipv4addr;
+               break;
+       }
+       case GET_EMBEDDED_INFO: {
+               struct ch_embedded_info *e = data;
+
+               spin_lock(&adapter->stats_lock);
+               t3_get_fw_version(adapter, &e->fw_vers);
+               t3_get_tp_version(adapter, &e->tp_vers);
+               spin_unlock(&adapter->stats_lock);
+               break;
+       }
        default:
                return -EOPNOTSUPP;
        }