cxgb4: collect TP dump
authorRahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Fri, 13 Oct 2017 13:18:18 +0000 (18:48 +0530)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Oct 2017 01:35:14 +0000 (18:35 -0700)
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h
drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h
drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
drivers/net/ethernet/chelsio/cxgb4/t4_regs.h

index 2b717e700bbc51bc3c49b3bc161287439d212c88..a7446fd09366e905cd6e1c9144426f22657b10c1 100644 (file)
@@ -32,4 +32,76 @@ struct cudbg_mbox_log {
        u32 hi[MBOX_LEN / 8];
        u32 lo[MBOX_LEN / 8];
 };
+
+struct ireg_field {
+       u32 ireg_addr;
+       u32 ireg_data;
+       u32 ireg_local_offset;
+       u32 ireg_offset_range;
+};
+
+struct ireg_buf {
+       struct ireg_field tp_pio;
+       u32 outbuf[32];
+};
+
+#define IREG_NUM_ELEM 4
+
+static const u32 t6_tp_pio_array[][IREG_NUM_ELEM] = {
+       {0x7e40, 0x7e44, 0x020, 28}, /* t6_tp_pio_regs_20_to_3b */
+       {0x7e40, 0x7e44, 0x040, 10}, /* t6_tp_pio_regs_40_to_49 */
+       {0x7e40, 0x7e44, 0x050, 10}, /* t6_tp_pio_regs_50_to_59 */
+       {0x7e40, 0x7e44, 0x060, 14}, /* t6_tp_pio_regs_60_to_6d */
+       {0x7e40, 0x7e44, 0x06F, 1}, /* t6_tp_pio_regs_6f */
+       {0x7e40, 0x7e44, 0x070, 6}, /* t6_tp_pio_regs_70_to_75 */
+       {0x7e40, 0x7e44, 0x130, 18}, /* t6_tp_pio_regs_130_to_141 */
+       {0x7e40, 0x7e44, 0x145, 19}, /* t6_tp_pio_regs_145_to_157 */
+       {0x7e40, 0x7e44, 0x160, 1}, /* t6_tp_pio_regs_160 */
+       {0x7e40, 0x7e44, 0x230, 25}, /* t6_tp_pio_regs_230_to_248 */
+       {0x7e40, 0x7e44, 0x24a, 3}, /* t6_tp_pio_regs_24c */
+       {0x7e40, 0x7e44, 0x8C0, 1} /* t6_tp_pio_regs_8c0 */
+};
+
+static const u32 t5_tp_pio_array[][IREG_NUM_ELEM] = {
+       {0x7e40, 0x7e44, 0x020, 28}, /* t5_tp_pio_regs_20_to_3b */
+       {0x7e40, 0x7e44, 0x040, 19}, /* t5_tp_pio_regs_40_to_52 */
+       {0x7e40, 0x7e44, 0x054, 2}, /* t5_tp_pio_regs_54_to_55 */
+       {0x7e40, 0x7e44, 0x060, 13}, /* t5_tp_pio_regs_60_to_6c */
+       {0x7e40, 0x7e44, 0x06F, 1}, /* t5_tp_pio_regs_6f */
+       {0x7e40, 0x7e44, 0x120, 4}, /* t5_tp_pio_regs_120_to_123 */
+       {0x7e40, 0x7e44, 0x12b, 2}, /* t5_tp_pio_regs_12b_to_12c */
+       {0x7e40, 0x7e44, 0x12f, 21}, /* t5_tp_pio_regs_12f_to_143 */
+       {0x7e40, 0x7e44, 0x145, 19}, /* t5_tp_pio_regs_145_to_157 */
+       {0x7e40, 0x7e44, 0x230, 25}, /* t5_tp_pio_regs_230_to_248 */
+       {0x7e40, 0x7e44, 0x8C0, 1} /* t5_tp_pio_regs_8c0 */
+};
+
+static const u32 t6_tp_tm_pio_array[][IREG_NUM_ELEM] = {
+       {0x7e18, 0x7e1c, 0x0, 12}
+};
+
+static const u32 t5_tp_tm_pio_array[][IREG_NUM_ELEM] = {
+       {0x7e18, 0x7e1c, 0x0, 12}
+};
+
+static const u32 t6_tp_mib_index_array[6][IREG_NUM_ELEM] = {
+       {0x7e50, 0x7e54, 0x0, 13},
+       {0x7e50, 0x7e54, 0x10, 6},
+       {0x7e50, 0x7e54, 0x18, 21},
+       {0x7e50, 0x7e54, 0x30, 32},
+       {0x7e50, 0x7e54, 0x50, 22},
+       {0x7e50, 0x7e54, 0x68, 12}
+};
+
+static const u32 t5_tp_mib_index_array[9][IREG_NUM_ELEM] = {
+       {0x7e50, 0x7e54, 0x0, 13},
+       {0x7e50, 0x7e54, 0x10, 6},
+       {0x7e50, 0x7e54, 0x18, 8},
+       {0x7e50, 0x7e54, 0x20, 13},
+       {0x7e50, 0x7e54, 0x30, 16},
+       {0x7e50, 0x7e54, 0x40, 16},
+       {0x7e50, 0x7e54, 0x50, 16},
+       {0x7e50, 0x7e54, 0x60, 6},
+       {0x7e50, 0x7e54, 0x68, 4}
+};
 #endif /* __CUDBG_ENTITY_H__ */
index 0a37d9b6cd325ed97aca1e53bd651fdffd753892..53ea447c910382a0f13d3be5ee27d76e58dec9c3 100644 (file)
@@ -31,6 +31,7 @@ enum cudbg_dbg_entity_type {
        CUDBG_DEV_LOG = 2,
        CUDBG_EDC0 = 18,
        CUDBG_EDC1 = 19,
+       CUDBG_TP_INDIRECT = 36,
        CUDBG_MBOX_LOG = 66,
        CUDBG_MAX_ENTITY = 70,
 };
index 960635e37a9dce14c201d12540d95d5892ec35d5..6efa1de3723c022524639c2d351d5b53693272a6 100644 (file)
@@ -253,6 +253,120 @@ int cudbg_collect_edc1_meminfo(struct cudbg_init *pdbg_init,
                                        MEM_EDC1);
 }
 
+int cudbg_collect_tp_indirect(struct cudbg_init *pdbg_init,
+                             struct cudbg_buffer *dbg_buff,
+                             struct cudbg_error *cudbg_err)
+{
+       struct adapter *padap = pdbg_init->adap;
+       struct cudbg_buffer temp_buff = { 0 };
+       struct ireg_buf *ch_tp_pio;
+       int i, rc, n = 0;
+       u32 size;
+
+       if (is_t5(padap->params.chip))
+               n = sizeof(t5_tp_pio_array) +
+                   sizeof(t5_tp_tm_pio_array) +
+                   sizeof(t5_tp_mib_index_array);
+       else
+               n = sizeof(t6_tp_pio_array) +
+                   sizeof(t6_tp_tm_pio_array) +
+                   sizeof(t6_tp_mib_index_array);
+
+       n = n / (IREG_NUM_ELEM * sizeof(u32));
+       size = sizeof(struct ireg_buf) * n;
+       rc = cudbg_get_buff(dbg_buff, size, &temp_buff);
+       if (rc)
+               return rc;
+
+       ch_tp_pio = (struct ireg_buf *)temp_buff.data;
+
+       /* TP_PIO */
+       if (is_t5(padap->params.chip))
+               n = sizeof(t5_tp_pio_array) / (IREG_NUM_ELEM * sizeof(u32));
+       else if (is_t6(padap->params.chip))
+               n = sizeof(t6_tp_pio_array) / (IREG_NUM_ELEM * sizeof(u32));
+
+       for (i = 0; i < n; i++) {
+               struct ireg_field *tp_pio = &ch_tp_pio->tp_pio;
+               u32 *buff = ch_tp_pio->outbuf;
+
+               if (is_t5(padap->params.chip)) {
+                       tp_pio->ireg_addr = t5_tp_pio_array[i][0];
+                       tp_pio->ireg_data = t5_tp_pio_array[i][1];
+                       tp_pio->ireg_local_offset = t5_tp_pio_array[i][2];
+                       tp_pio->ireg_offset_range = t5_tp_pio_array[i][3];
+               } else if (is_t6(padap->params.chip)) {
+                       tp_pio->ireg_addr = t6_tp_pio_array[i][0];
+                       tp_pio->ireg_data = t6_tp_pio_array[i][1];
+                       tp_pio->ireg_local_offset = t6_tp_pio_array[i][2];
+                       tp_pio->ireg_offset_range = t6_tp_pio_array[i][3];
+               }
+               t4_tp_pio_read(padap, buff, tp_pio->ireg_offset_range,
+                              tp_pio->ireg_local_offset, true);
+               ch_tp_pio++;
+       }
+
+       /* TP_TM_PIO */
+       if (is_t5(padap->params.chip))
+               n = sizeof(t5_tp_tm_pio_array) / (IREG_NUM_ELEM * sizeof(u32));
+       else if (is_t6(padap->params.chip))
+               n = sizeof(t6_tp_tm_pio_array) / (IREG_NUM_ELEM * sizeof(u32));
+
+       for (i = 0; i < n; i++) {
+               struct ireg_field *tp_pio = &ch_tp_pio->tp_pio;
+               u32 *buff = ch_tp_pio->outbuf;
+
+               if (is_t5(padap->params.chip)) {
+                       tp_pio->ireg_addr = t5_tp_tm_pio_array[i][0];
+                       tp_pio->ireg_data = t5_tp_tm_pio_array[i][1];
+                       tp_pio->ireg_local_offset = t5_tp_tm_pio_array[i][2];
+                       tp_pio->ireg_offset_range = t5_tp_tm_pio_array[i][3];
+               } else if (is_t6(padap->params.chip)) {
+                       tp_pio->ireg_addr = t6_tp_tm_pio_array[i][0];
+                       tp_pio->ireg_data = t6_tp_tm_pio_array[i][1];
+                       tp_pio->ireg_local_offset = t6_tp_tm_pio_array[i][2];
+                       tp_pio->ireg_offset_range = t6_tp_tm_pio_array[i][3];
+               }
+               t4_tp_tm_pio_read(padap, buff, tp_pio->ireg_offset_range,
+                                 tp_pio->ireg_local_offset, true);
+               ch_tp_pio++;
+       }
+
+       /* TP_MIB_INDEX */
+       if (is_t5(padap->params.chip))
+               n = sizeof(t5_tp_mib_index_array) /
+                   (IREG_NUM_ELEM * sizeof(u32));
+       else if (is_t6(padap->params.chip))
+               n = sizeof(t6_tp_mib_index_array) /
+                   (IREG_NUM_ELEM * sizeof(u32));
+
+       for (i = 0; i < n ; i++) {
+               struct ireg_field *tp_pio = &ch_tp_pio->tp_pio;
+               u32 *buff = ch_tp_pio->outbuf;
+
+               if (is_t5(padap->params.chip)) {
+                       tp_pio->ireg_addr = t5_tp_mib_index_array[i][0];
+                       tp_pio->ireg_data = t5_tp_mib_index_array[i][1];
+                       tp_pio->ireg_local_offset =
+                               t5_tp_mib_index_array[i][2];
+                       tp_pio->ireg_offset_range =
+                               t5_tp_mib_index_array[i][3];
+               } else if (is_t6(padap->params.chip)) {
+                       tp_pio->ireg_addr = t6_tp_mib_index_array[i][0];
+                       tp_pio->ireg_data = t6_tp_mib_index_array[i][1];
+                       tp_pio->ireg_local_offset =
+                               t6_tp_mib_index_array[i][2];
+                       tp_pio->ireg_offset_range =
+                               t6_tp_mib_index_array[i][3];
+               }
+               t4_tp_mib_read(padap, buff, tp_pio->ireg_offset_range,
+                              tp_pio->ireg_local_offset, true);
+               ch_tp_pio++;
+       }
+       cudbg_write_and_release_buff(&temp_buff, dbg_buff);
+       return rc;
+}
+
 int cudbg_collect_mbox_log(struct cudbg_init *pdbg_init,
                           struct cudbg_buffer *dbg_buff,
                           struct cudbg_error *cudbg_err)
index 690591b36d4ca2ee1ebd42c5a058db67dae268ed..7a927ec71a5f939adab690cbc4853541f8a221e1 100644 (file)
@@ -30,6 +30,9 @@ int cudbg_collect_edc0_meminfo(struct cudbg_init *pdbg_init,
 int cudbg_collect_edc1_meminfo(struct cudbg_init *pdbg_init,
                               struct cudbg_buffer *dbg_buff,
                               struct cudbg_error *cudbg_err);
+int cudbg_collect_tp_indirect(struct cudbg_init *pdbg_init,
+                             struct cudbg_buffer *dbg_buff,
+                             struct cudbg_error *cudbg_err);
 int cudbg_collect_mbox_log(struct cudbg_init *pdbg_init,
                           struct cudbg_buffer *dbg_buff,
                           struct cudbg_error *cudbg_err);
index d4032e373927ac06b64a68e5ada742f8e02a5551..4eaca05ebd3a9c8ccb656d5212de6c9542c352c0 100644 (file)
@@ -1634,6 +1634,8 @@ int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
                      unsigned int naddr, u8 *addr);
 void t4_tp_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
                    u32 start_index, bool sleep_ok);
+void t4_tp_tm_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
+                      u32 start_index, bool sleep_ok);
 void t4_tp_mib_read(struct adapter *adap, u32 *buff, u32 nregs,
                    u32 start_index, bool sleep_ok);
 
index f8c4f4199ce60f4117bc03bf420413f28a6004cb..7dfee6adc51e4452deaba5c38f4d5dac9f2883f6 100644 (file)
@@ -29,11 +29,12 @@ static const struct cxgb4_collect_entity cxgb4_collect_hw_dump[] = {
        { CUDBG_MBOX_LOG, cudbg_collect_mbox_log },
        { CUDBG_DEV_LOG, cudbg_collect_fw_devlog },
        { CUDBG_REG_DUMP, cudbg_collect_reg_dump },
+       { CUDBG_TP_INDIRECT, cudbg_collect_tp_indirect },
 };
 
 static u32 cxgb4_get_entity_length(struct adapter *adap, u32 entity)
 {
-       u32 value, len = 0;
+       u32 value, n = 0, len = 0;
 
        switch (entity) {
        case CUDBG_REG_DUMP:
@@ -68,6 +69,24 @@ static u32 cxgb4_get_entity_length(struct adapter *adap, u32 entity)
                }
                len = cudbg_mbytes_to_bytes(len);
                break;
+       case CUDBG_TP_INDIRECT:
+               switch (CHELSIO_CHIP_VERSION(adap->params.chip)) {
+               case CHELSIO_T5:
+                       n = sizeof(t5_tp_pio_array) +
+                           sizeof(t5_tp_tm_pio_array) +
+                           sizeof(t5_tp_mib_index_array);
+                       break;
+               case CHELSIO_T6:
+                       n = sizeof(t6_tp_pio_array) +
+                           sizeof(t6_tp_tm_pio_array) +
+                           sizeof(t6_tp_mib_index_array);
+                       break;
+               default:
+                       break;
+               }
+               n = n / (IREG_NUM_ELEM * sizeof(u32));
+               len = sizeof(struct ireg_buf) * n;
+               break;
        case CUDBG_MBOX_LOG:
                len = sizeof(struct cudbg_mbox_log) * adap->mbox_log->size;
                break;
index 0f12bf507d569e3777115b1dfe2602714f995675..8fa40f9e75c4359a56907c6631b78ffba09cd340 100644 (file)
@@ -5118,6 +5118,9 @@ static void t4_tp_indirect_rw(struct adapter *adap, u32 reg_addr, u32 reg_data,
        case TP_PIO_ADDR_A:
                cmd = FW_LDST_ADDRSPC_TP_PIO;
                break;
+       case TP_TM_PIO_ADDR_A:
+               cmd = FW_LDST_ADDRSPC_TP_TM_PIO;
+               break;
        case TP_MIB_INDEX_A:
                cmd = FW_LDST_ADDRSPC_TP_MIB;
                break;
@@ -5175,6 +5178,23 @@ static void t4_tp_pio_write(struct adapter *adap, u32 *buff, u32 nregs,
                          start_index, 0, sleep_ok);
 }
 
+/**
+ * t4_tp_tm_pio_read - Read TP TM PIO registers
+ * @adap: the adapter
+ * @buff: where the indirect register values are written
+ * @nregs: how many indirect registers to read
+ * @start_index: index of first indirect register to read
+ * @sleep_ok: if true we may sleep while awaiting command completion
+ *
+ * Read TP TM PIO Registers
+ **/
+void t4_tp_tm_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
+                      u32 start_index, bool sleep_ok)
+{
+       t4_tp_indirect_rw(adap, TP_TM_PIO_ADDR_A, TP_TM_PIO_DATA_A, buff,
+                         nregs, start_index, 1, sleep_ok);
+}
+
 /**
  * t4_tp_mib_read - Read TP MIB registers
  * @adap: the adapter
index dac90837842bf1b20e93f8d0810dada4e5c34292..82614e078f505cd1d4fb853301182e5135eb6701 100644 (file)
 #define LKPTBLQUEUE0_M    0x3ffU
 #define LKPTBLQUEUE0_G(x) (((x) >> LKPTBLQUEUE0_S) & LKPTBLQUEUE0_M)
 
+#define TP_TM_PIO_ADDR_A 0x7e18
+#define TP_TM_PIO_DATA_A 0x7e1c
 #define TP_PIO_ADDR_A  0x7e40
 #define TP_PIO_DATA_A  0x7e44
 #define TP_MIB_INDEX_A 0x7e50