carl9170 firmware: per-vif tx sequence counter
[carl9170fw.git] / tools / src / fwinfo.c
index 1e64c5ba5fe633a5794f8a62773b0ba7e2714c59..c54ff81e80f98916c27ee5ba9e2ce8f3910ea306 100644 (file)
@@ -41,8 +41,21 @@ struct feature_list {
 #define CHECK_FOR_FEATURE_FUNC(feature_enum, _func)                    \
        { .id = feature_enum, .name = #feature_enum, .func = _func }
 
+static void show_miniboot_info(const struct carl9170fw_desc_head *head,
+                              struct carlfw *fw __unused)
+{
+       const struct carl9170fw_otus_desc *otus = (const void *) head;
+
+       fprintf(stdout, "\t\t\tminiboot size: %d Bytes\n", otus->miniboot_size);
+}
+
 static const struct feature_list known_otus_features_v1[] = {
        CHECK_FOR_FEATURE(CARL9170FW_DUMMY_FEATURE),
+       CHECK_FOR_FEATURE_FUNC(CARL9170FW_MINIBOOT, show_miniboot_info),
+       CHECK_FOR_FEATURE(CARL9170FW_USB_INIT_FIRMWARE),
+       CHECK_FOR_FEATURE(CARL9170FW_USB_RESP_EP2),
+       CHECK_FOR_FEATURE(CARL9170FW_USB_DOWN_STREAM),
+       CHECK_FOR_FEATURE(CARL9170FW_USB_UP_STREAM),
        CHECK_FOR_FEATURE(CARL9170FW_UNUSABLE),
        CHECK_FOR_FEATURE(CARL9170FW_COMMAND_PHY),
        CHECK_FOR_FEATURE(CARL9170FW_COMMAND_CAM),
@@ -50,6 +63,8 @@ static const struct feature_list known_otus_features_v1[] = {
        CHECK_FOR_FEATURE(CARL9170FW_HANDLE_BACK_REQ),
        CHECK_FOR_FEATURE(CARL9170FW_GPIO_INTERRUPT),
        CHECK_FOR_FEATURE(CARL9170FW_PSM),
+       CHECK_FOR_FEATURE(CARL9170FW_RX_FILTER),
+       CHECK_FOR_FEATURE(CARL9170FW_WOL),
 };
 
 static void check_feature_list(const struct carl9170fw_desc_head *head,
@@ -77,56 +92,24 @@ static void show_otus_desc(const struct carl9170fw_desc_head *head,
 
        BUILD_BUG_ON(ARRAY_SIZE(known_otus_features_v1) != __CARL9170FW_FEATURE_NUM);
 
+       fprintf(stdout, "\tFirmware upload pointer: 0x%x\n",
+               otus->fw_address);
        fprintf(stdout, "\tBeacon Address: %x, (reserved:%d Bytes)\n",
                le32_to_cpu(otus->bcn_addr), le16_to_cpu(otus->bcn_len));
-       fprintf(stdout, "\tFirmware API Version: %d\n", otus->api_ver);
-       fprintf(stdout, "\tSupported Firmware Interfaces: %d\n", otus->vif_num);
-
-       fprintf(stdout, "\tSupported Features: (raw:%.08x)\n",
-               le32_to_cpu(otus->fw_feature_set));
-
-       check_feature_list(head, otus->fw_feature_set, known_otus_features_v1,
-                          ARRAY_SIZE(known_otus_features_v1), fw);
-}
-
-static void show_miniboot_info(const struct carl9170fw_desc_head *head,
-                              struct carlfw *fw __unused)
-{
-       const struct carl9170fw_usb_desc *usb = (const void *) head;
-
-       fprintf(stdout, "\t\t\tminiboot size: %d Bytes\n", usb->miniboot_size);
-}
-
-static const struct feature_list known_usb_features_v1[] = {
-       CHECK_FOR_FEATURE(CARL9170FW_USB_DUMMY_FEATURE),
-       CHECK_FOR_FEATURE_FUNC(CARL9170FW_USB_MINIBOOT, show_miniboot_info),
-       CHECK_FOR_FEATURE(CARL9170FW_USB_INIT_FIRMWARE),
-       CHECK_FOR_FEATURE(CARL9170FW_USB_RESP_EP2),
-       CHECK_FOR_FEATURE(CARL9170FW_USB_DOWN_STREAM),
-       CHECK_FOR_FEATURE(CARL9170FW_USB_UP_STREAM),
-       CHECK_FOR_FEATURE(CARL9170FW_USB_WATCHDOG),
-};
-
-static void show_usb_desc(const struct carl9170fw_desc_head *head,
-                         struct carlfw *fw __unused)
-{
-       const struct carl9170fw_usb_desc *usb = (const void *) head;
-
-       BUILD_BUG_ON(ARRAY_SIZE(known_usb_features_v1) != __CARL9170FW_USB_FEATURE_NUM);
-
        fprintf(stdout, "\tTX DMA chunk size:%d Bytes, TX DMA chunks:%d\n",
-               usb->tx_frag_len, usb->tx_descs);
+               otus->tx_frag_len, otus->tx_descs);
        fprintf(stdout, "\t=> %d Bytes are reserved for the TX queues\n",
-               usb->tx_frag_len * usb->tx_descs);
+               otus->tx_frag_len * otus->tx_descs);
+       fprintf(stdout, "\tCommand response buffers:%d\n", otus->cmd_bufs);
        fprintf(stdout, "\tMax. RX stream block size:%d Bytes\n",
-               usb->rx_max_frame_len);
-       fprintf(stdout, "\tFirmware upload pointer: 0x%x\n",
-               usb->fw_address);
+               otus->rx_max_frame_len);
+       fprintf(stdout, "\tSupported Firmware Interfaces: %d\n", otus->vif_num);
+       fprintf(stdout, "\tFirmware API Version: %d\n", otus->api_ver);
        fprintf(stdout, "\tSupported Features: (raw:%.08x)\n",
-               le32_to_cpu(usb->usb_feature_set));
+               le32_to_cpu(otus->feature_set));
 
-       check_feature_list(head, usb->usb_feature_set, known_usb_features_v1,
-                          ARRAY_SIZE(known_usb_features_v1), fw);
+       check_feature_list(head, otus->feature_set, known_otus_features_v1,
+                          ARRAY_SIZE(known_otus_features_v1), fw);
 }
 
 static void show_motd_desc(const struct carl9170fw_desc_head *head,
@@ -168,16 +151,27 @@ static void show_dbg_desc(const struct carl9170fw_desc_head *head,
 {
        const struct carl9170fw_dbg_desc *dbg = (const void *) head;
 
+#define DBG_ADDR(_name, _reg) do {                                     \
+       unsigned int __tmp = le32_to_cpu(dbg->_reg);                    \
+       if (__tmp)                                                      \
+               fprintf(stdout, "\t\t" _name " = 0x%.8x\n", __tmp);     \
+       } while (0);
+
        fprintf(stdout, "\tFirmware Debug Registers/Counters\n");
-       fprintf(stdout, "\t\tbogoclock    = 0x%.8x\n",
-               le32_to_cpu(dbg->bogoclock_addr));
-       fprintf(stdout, "\t\tcounter      = 0x%.8x\n",
-               le32_to_cpu(dbg->counter_addr));
-       fprintf(stdout, "\t\trx total     = 0x%.8x\n",
-               le32_to_cpu(dbg->rx_total_addr));
-       fprintf(stdout, "\t\trx overrun   = 0x%.8x\n",
-               le32_to_cpu(dbg->rx_overrun_addr));
-       /* Nothing interesting here */
+       DBG_ADDR("bogoclock    ", bogoclock_addr);
+       DBG_ADDR("counter      ", counter_addr);
+       DBG_ADDR("rx total     ", rx_total_addr);
+       DBG_ADDR("rx overrun   ", rx_overrun_addr);
+       DBG_ADDR("rx filer     ", rx_filter);
+}
+
+static void show_txsq_desc(const struct carl9170fw_desc_head *head,
+                           struct carlfw *fw __unused)
+{
+       const struct carl9170fw_txsq_desc *txsq = (const void *) head;
+
+       fprintf(stdout, "\t\ttx-seq table addr: 0x%x\n",
+               le32_to_cpu(txsq->seq_table_addr));
 }
 
 static void show_chk_desc(const struct carl9170fw_desc_head *head,
@@ -215,7 +209,7 @@ static const struct {
        uint16_t size;
 } known_magics[] = {
        ADD_HANDLER(OTUS, show_otus_desc),
-       ADD_HANDLER(USB, show_usb_desc),
+       ADD_HANDLER(TXSQ, show_txsq_desc),
        ADD_HANDLER(MOTD, show_motd_desc),
        ADD_HANDLER(DBG, show_dbg_desc),
        ADD_HANDLER(FIX, show_fix_desc),
@@ -264,14 +258,15 @@ int main(int argc, char *args[])
 
        fw = carlfw_load(args[1]);
        if (IS_ERR_OR_NULL(fw)) {
+               err = PTR_ERR(fw);
                fprintf(stderr, "Failed to open firmware \"%s\" (%d).\n",
-                       args[1], (int)PTR_ERR(fw));
+                       args[1], err);
                goto out;
        }
 
        carlfw_get_fw(fw, &len);
        fprintf(stdout, "General Firmware Statistics:\n");
-       fprintf(stdout, "\tFirmware file size: %u Bytes\n", len);
+       fprintf(stdout, "\tFirmware file size: %u Bytes\n", (unsigned int)len);
        fprintf(stdout, "\t%d Descriptors in %d Bytes\n",
                carlfw_get_descs_num(fw), carlfw_get_descs_size(fw));