diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/trans.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/trans.c | 152 |
1 files changed, 151 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index a90292c79342..153c3dd88921 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c | |||
@@ -1774,6 +1774,144 @@ static u32 iwl_trans_pcie_get_cmdlen(struct iwl_tfd *tfd) | |||
1774 | return cmdlen; | 1774 | return cmdlen; |
1775 | } | 1775 | } |
1776 | 1776 | ||
1777 | static const struct { | ||
1778 | u32 start, end; | ||
1779 | } iwl_prph_dump_addr[] = { | ||
1780 | { .start = 0x00a00000, .end = 0x00a00000 }, | ||
1781 | { .start = 0x00a0000c, .end = 0x00a00024 }, | ||
1782 | { .start = 0x00a0002c, .end = 0x00a0003c }, | ||
1783 | { .start = 0x00a00410, .end = 0x00a00418 }, | ||
1784 | { .start = 0x00a00420, .end = 0x00a00420 }, | ||
1785 | { .start = 0x00a00428, .end = 0x00a00428 }, | ||
1786 | { .start = 0x00a00430, .end = 0x00a0043c }, | ||
1787 | { .start = 0x00a00444, .end = 0x00a00444 }, | ||
1788 | { .start = 0x00a004c0, .end = 0x00a004cc }, | ||
1789 | { .start = 0x00a004d8, .end = 0x00a004d8 }, | ||
1790 | { .start = 0x00a004e0, .end = 0x00a004f0 }, | ||
1791 | { .start = 0x00a00840, .end = 0x00a00840 }, | ||
1792 | { .start = 0x00a00850, .end = 0x00a00858 }, | ||
1793 | { .start = 0x00a01004, .end = 0x00a01008 }, | ||
1794 | { .start = 0x00a01010, .end = 0x00a01010 }, | ||
1795 | { .start = 0x00a01018, .end = 0x00a01018 }, | ||
1796 | { .start = 0x00a01024, .end = 0x00a01024 }, | ||
1797 | { .start = 0x00a0102c, .end = 0x00a01034 }, | ||
1798 | { .start = 0x00a0103c, .end = 0x00a01040 }, | ||
1799 | { .start = 0x00a01048, .end = 0x00a01094 }, | ||
1800 | { .start = 0x00a01c00, .end = 0x00a01c20 }, | ||
1801 | { .start = 0x00a01c58, .end = 0x00a01c58 }, | ||
1802 | { .start = 0x00a01c7c, .end = 0x00a01c7c }, | ||
1803 | { .start = 0x00a01c28, .end = 0x00a01c54 }, | ||
1804 | { .start = 0x00a01c5c, .end = 0x00a01c5c }, | ||
1805 | { .start = 0x00a01c84, .end = 0x00a01c84 }, | ||
1806 | { .start = 0x00a01ce0, .end = 0x00a01d0c }, | ||
1807 | { .start = 0x00a01d18, .end = 0x00a01d20 }, | ||
1808 | { .start = 0x00a01d2c, .end = 0x00a01d30 }, | ||
1809 | { .start = 0x00a01d40, .end = 0x00a01d5c }, | ||
1810 | { .start = 0x00a01d80, .end = 0x00a01d80 }, | ||
1811 | { .start = 0x00a01d98, .end = 0x00a01d98 }, | ||
1812 | { .start = 0x00a01dc0, .end = 0x00a01dfc }, | ||
1813 | { .start = 0x00a01e00, .end = 0x00a01e2c }, | ||
1814 | { .start = 0x00a01e40, .end = 0x00a01e60 }, | ||
1815 | { .start = 0x00a01e84, .end = 0x00a01e90 }, | ||
1816 | { .start = 0x00a01e9c, .end = 0x00a01ec4 }, | ||
1817 | { .start = 0x00a01ed0, .end = 0x00a01ed0 }, | ||
1818 | { .start = 0x00a01f00, .end = 0x00a01f14 }, | ||
1819 | { .start = 0x00a01f44, .end = 0x00a01f58 }, | ||
1820 | { .start = 0x00a01f80, .end = 0x00a01fa8 }, | ||
1821 | { .start = 0x00a01fb0, .end = 0x00a01fbc }, | ||
1822 | { .start = 0x00a01ff8, .end = 0x00a01ffc }, | ||
1823 | { .start = 0x00a02000, .end = 0x00a02048 }, | ||
1824 | { .start = 0x00a02068, .end = 0x00a020f0 }, | ||
1825 | { .start = 0x00a02100, .end = 0x00a02118 }, | ||
1826 | { .start = 0x00a02140, .end = 0x00a0214c }, | ||
1827 | { .start = 0x00a02168, .end = 0x00a0218c }, | ||
1828 | { .start = 0x00a021c0, .end = 0x00a021c0 }, | ||
1829 | { .start = 0x00a02400, .end = 0x00a02410 }, | ||
1830 | { .start = 0x00a02418, .end = 0x00a02420 }, | ||
1831 | { .start = 0x00a02428, .end = 0x00a0242c }, | ||
1832 | { .start = 0x00a02434, .end = 0x00a02434 }, | ||
1833 | { .start = 0x00a02440, .end = 0x00a02460 }, | ||
1834 | { .start = 0x00a02468, .end = 0x00a024b0 }, | ||
1835 | { .start = 0x00a024c8, .end = 0x00a024cc }, | ||
1836 | { .start = 0x00a02500, .end = 0x00a02504 }, | ||
1837 | { .start = 0x00a0250c, .end = 0x00a02510 }, | ||
1838 | { .start = 0x00a02540, .end = 0x00a02554 }, | ||
1839 | { .start = 0x00a02580, .end = 0x00a025f4 }, | ||
1840 | { .start = 0x00a02600, .end = 0x00a0260c }, | ||
1841 | { .start = 0x00a02648, .end = 0x00a02650 }, | ||
1842 | { .start = 0x00a02680, .end = 0x00a02680 }, | ||
1843 | { .start = 0x00a026c0, .end = 0x00a026d0 }, | ||
1844 | { .start = 0x00a02700, .end = 0x00a0270c }, | ||
1845 | { .start = 0x00a02804, .end = 0x00a02804 }, | ||
1846 | { .start = 0x00a02818, .end = 0x00a0281c }, | ||
1847 | { .start = 0x00a02c00, .end = 0x00a02db4 }, | ||
1848 | { .start = 0x00a02df4, .end = 0x00a02fb0 }, | ||
1849 | { .start = 0x00a03000, .end = 0x00a03014 }, | ||
1850 | { .start = 0x00a0301c, .end = 0x00a0302c }, | ||
1851 | { .start = 0x00a03034, .end = 0x00a03038 }, | ||
1852 | { .start = 0x00a03040, .end = 0x00a03048 }, | ||
1853 | { .start = 0x00a03060, .end = 0x00a03068 }, | ||
1854 | { .start = 0x00a03070, .end = 0x00a03074 }, | ||
1855 | { .start = 0x00a0307c, .end = 0x00a0307c }, | ||
1856 | { .start = 0x00a03080, .end = 0x00a03084 }, | ||
1857 | { .start = 0x00a0308c, .end = 0x00a03090 }, | ||
1858 | { .start = 0x00a03098, .end = 0x00a03098 }, | ||
1859 | { .start = 0x00a030a0, .end = 0x00a030a0 }, | ||
1860 | { .start = 0x00a030a8, .end = 0x00a030b4 }, | ||
1861 | { .start = 0x00a030bc, .end = 0x00a030bc }, | ||
1862 | { .start = 0x00a030c0, .end = 0x00a0312c }, | ||
1863 | { .start = 0x00a03c00, .end = 0x00a03c5c }, | ||
1864 | { .start = 0x00a04400, .end = 0x00a04454 }, | ||
1865 | { .start = 0x00a04460, .end = 0x00a04474 }, | ||
1866 | { .start = 0x00a044c0, .end = 0x00a044ec }, | ||
1867 | { .start = 0x00a04500, .end = 0x00a04504 }, | ||
1868 | { .start = 0x00a04510, .end = 0x00a04538 }, | ||
1869 | { .start = 0x00a04540, .end = 0x00a04548 }, | ||
1870 | { .start = 0x00a04560, .end = 0x00a0457c }, | ||
1871 | { .start = 0x00a04590, .end = 0x00a04598 }, | ||
1872 | { .start = 0x00a045c0, .end = 0x00a045f4 }, | ||
1873 | }; | ||
1874 | |||
1875 | static u32 iwl_trans_pcie_dump_prph(struct iwl_trans *trans, | ||
1876 | struct iwl_fw_error_dump_data **data) | ||
1877 | { | ||
1878 | struct iwl_fw_error_dump_prph *prph; | ||
1879 | unsigned long flags; | ||
1880 | u32 prph_len = 0, i; | ||
1881 | |||
1882 | if (!iwl_trans_grab_nic_access(trans, false, &flags)) | ||
1883 | return 0; | ||
1884 | |||
1885 | for (i = 0; i < ARRAY_SIZE(iwl_prph_dump_addr); i++) { | ||
1886 | /* The range includes both boundaries */ | ||
1887 | int num_bytes_in_chunk = iwl_prph_dump_addr[i].end - | ||
1888 | iwl_prph_dump_addr[i].start + 4; | ||
1889 | int reg; | ||
1890 | __le32 *val; | ||
1891 | |||
1892 | prph_len += sizeof(*data) + sizeof(*prph) + | ||
1893 | num_bytes_in_chunk; | ||
1894 | |||
1895 | (*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_PRPH); | ||
1896 | (*data)->len = cpu_to_le32(sizeof(*prph) + | ||
1897 | num_bytes_in_chunk); | ||
1898 | prph = (void *)(*data)->data; | ||
1899 | prph->prph_start = cpu_to_le32(iwl_prph_dump_addr[i].start); | ||
1900 | val = (void *)prph->data; | ||
1901 | |||
1902 | for (reg = iwl_prph_dump_addr[i].start; | ||
1903 | reg <= iwl_prph_dump_addr[i].end; | ||
1904 | reg += 4) | ||
1905 | *val++ = cpu_to_le32(iwl_trans_pcie_read_prph(trans, | ||
1906 | reg)); | ||
1907 | *data = iwl_fw_error_next_data(*data); | ||
1908 | } | ||
1909 | |||
1910 | iwl_trans_release_nic_access(trans, &flags); | ||
1911 | |||
1912 | return prph_len; | ||
1913 | } | ||
1914 | |||
1777 | static | 1915 | static |
1778 | struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans) | 1916 | struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans) |
1779 | { | 1917 | { |
@@ -1788,6 +1926,15 @@ struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans) | |||
1788 | len = sizeof(*dump_data) + sizeof(*data) + | 1926 | len = sizeof(*dump_data) + sizeof(*data) + |
1789 | cmdq->q.n_window * (sizeof(*txcmd) + TFD_MAX_PAYLOAD_SIZE); | 1927 | cmdq->q.n_window * (sizeof(*txcmd) + TFD_MAX_PAYLOAD_SIZE); |
1790 | 1928 | ||
1929 | for (i = 0; i < ARRAY_SIZE(iwl_prph_dump_addr); i++) { | ||
1930 | /* The range includes both boundaries */ | ||
1931 | int num_bytes_in_chunk = iwl_prph_dump_addr[i].end - | ||
1932 | iwl_prph_dump_addr[i].start + 4; | ||
1933 | |||
1934 | len += sizeof(*data) + sizeof(struct iwl_fw_error_dump_prph) + | ||
1935 | num_bytes_in_chunk; | ||
1936 | } | ||
1937 | |||
1791 | if (trans_pcie->fw_mon_page) | 1938 | if (trans_pcie->fw_mon_page) |
1792 | len += sizeof(*data) + sizeof(struct iwl_fw_error_dump_fw_mon) + | 1939 | len += sizeof(*data) + sizeof(struct iwl_fw_error_dump_fw_mon) + |
1793 | trans_pcie->fw_mon_size; | 1940 | trans_pcie->fw_mon_size; |
@@ -1823,11 +1970,14 @@ struct iwl_trans_dump_data *iwl_trans_pcie_dump_data(struct iwl_trans *trans) | |||
1823 | 1970 | ||
1824 | data->len = cpu_to_le32(len); | 1971 | data->len = cpu_to_le32(len); |
1825 | len += sizeof(*data); | 1972 | len += sizeof(*data); |
1973 | data = iwl_fw_error_next_data(data); | ||
1974 | |||
1975 | len += iwl_trans_pcie_dump_prph(trans, &data); | ||
1976 | /* data is already pointing to the next section */ | ||
1826 | 1977 | ||
1827 | if (trans_pcie->fw_mon_page) { | 1978 | if (trans_pcie->fw_mon_page) { |
1828 | struct iwl_fw_error_dump_fw_mon *fw_mon_data; | 1979 | struct iwl_fw_error_dump_fw_mon *fw_mon_data; |
1829 | 1980 | ||
1830 | data = iwl_fw_error_next_data(data); | ||
1831 | data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_FW_MONITOR); | 1981 | data->type = cpu_to_le32(IWL_FW_ERROR_DUMP_FW_MONITOR); |
1832 | data->len = cpu_to_le32(trans_pcie->fw_mon_size + | 1982 | data->len = cpu_to_le32(trans_pcie->fw_mon_size + |
1833 | sizeof(*fw_mon_data)); | 1983 | sizeof(*fw_mon_data)); |