diff options
Diffstat (limited to 'arch/sparc64')
| -rw-r--r-- | arch/sparc64/kernel/entry.S | 554 | ||||
| -rw-r--r-- | arch/sparc64/kernel/time.c | 32 | ||||
| -rw-r--r-- | arch/sparc64/mm/init.c | 41 |
3 files changed, 567 insertions, 60 deletions
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S index f8cc3c0731c7..8f10dda0f5c0 100644 --- a/arch/sparc64/kernel/entry.S +++ b/arch/sparc64/kernel/entry.S | |||
| @@ -1725,96 +1725,142 @@ real_hard_smp_processor_id: | |||
| 1725 | * returns %o0: sysino | 1725 | * returns %o0: sysino |
| 1726 | */ | 1726 | */ |
| 1727 | .globl sun4v_devino_to_sysino | 1727 | .globl sun4v_devino_to_sysino |
| 1728 | .type sun4v_devino_to_sysino,#function | ||
| 1728 | sun4v_devino_to_sysino: | 1729 | sun4v_devino_to_sysino: |
| 1729 | mov HV_FAST_INTR_DEVINO2SYSINO, %o5 | 1730 | mov HV_FAST_INTR_DEVINO2SYSINO, %o5 |
| 1730 | ta HV_FAST_TRAP | 1731 | ta HV_FAST_TRAP |
| 1731 | retl | 1732 | retl |
| 1732 | mov %o1, %o0 | 1733 | mov %o1, %o0 |
| 1734 | .size sun4v_devino_to_sysino, .-sun4v_devino_to_sysino | ||
| 1733 | 1735 | ||
| 1734 | /* %o0: sysino | 1736 | /* %o0: sysino |
| 1735 | * | 1737 | * |
| 1736 | * returns %o0: intr_enabled (HV_INTR_{DISABLED,ENABLED}) | 1738 | * returns %o0: intr_enabled (HV_INTR_{DISABLED,ENABLED}) |
| 1737 | */ | 1739 | */ |
| 1738 | .globl sun4v_intr_getenabled | 1740 | .globl sun4v_intr_getenabled |
| 1741 | .type sun4v_intr_getenabled,#function | ||
| 1739 | sun4v_intr_getenabled: | 1742 | sun4v_intr_getenabled: |
| 1740 | mov HV_FAST_INTR_GETENABLED, %o5 | 1743 | mov HV_FAST_INTR_GETENABLED, %o5 |
| 1741 | ta HV_FAST_TRAP | 1744 | ta HV_FAST_TRAP |
| 1742 | retl | 1745 | retl |
| 1743 | mov %o1, %o0 | 1746 | mov %o1, %o0 |
| 1747 | .size sun4v_intr_getenabled, .-sun4v_intr_getenabled | ||
| 1744 | 1748 | ||
| 1745 | /* %o0: sysino | 1749 | /* %o0: sysino |
| 1746 | * %o1: intr_enabled (HV_INTR_{DISABLED,ENABLED}) | 1750 | * %o1: intr_enabled (HV_INTR_{DISABLED,ENABLED}) |
| 1747 | */ | 1751 | */ |
| 1748 | .globl sun4v_intr_setenabled | 1752 | .globl sun4v_intr_setenabled |
| 1753 | .type sun4v_intr_setenabled,#function | ||
| 1749 | sun4v_intr_setenabled: | 1754 | sun4v_intr_setenabled: |
| 1750 | mov HV_FAST_INTR_SETENABLED, %o5 | 1755 | mov HV_FAST_INTR_SETENABLED, %o5 |
| 1751 | ta HV_FAST_TRAP | 1756 | ta HV_FAST_TRAP |
| 1752 | retl | 1757 | retl |
| 1753 | nop | 1758 | nop |
| 1759 | .size sun4v_intr_setenabled, .-sun4v_intr_setenabled | ||
| 1754 | 1760 | ||
| 1755 | /* %o0: sysino | 1761 | /* %o0: sysino |
| 1756 | * | 1762 | * |
| 1757 | * returns %o0: intr_state (HV_INTR_STATE_*) | 1763 | * returns %o0: intr_state (HV_INTR_STATE_*) |
| 1758 | */ | 1764 | */ |
| 1759 | .globl sun4v_intr_getstate | 1765 | .globl sun4v_intr_getstate |
| 1766 | .type sun4v_intr_getstate,#function | ||
| 1760 | sun4v_intr_getstate: | 1767 | sun4v_intr_getstate: |
| 1761 | mov HV_FAST_INTR_GETSTATE, %o5 | 1768 | mov HV_FAST_INTR_GETSTATE, %o5 |
| 1762 | ta HV_FAST_TRAP | 1769 | ta HV_FAST_TRAP |
| 1763 | retl | 1770 | retl |
| 1764 | mov %o1, %o0 | 1771 | mov %o1, %o0 |
| 1772 | .size sun4v_intr_getstate, .-sun4v_intr_getstate | ||
| 1765 | 1773 | ||
| 1766 | /* %o0: sysino | 1774 | /* %o0: sysino |
| 1767 | * %o1: intr_state (HV_INTR_STATE_*) | 1775 | * %o1: intr_state (HV_INTR_STATE_*) |
| 1768 | */ | 1776 | */ |
| 1769 | .globl sun4v_intr_setstate | 1777 | .globl sun4v_intr_setstate |
| 1778 | .type sun4v_intr_setstate,#function | ||
| 1770 | sun4v_intr_setstate: | 1779 | sun4v_intr_setstate: |
| 1771 | mov HV_FAST_INTR_SETSTATE, %o5 | 1780 | mov HV_FAST_INTR_SETSTATE, %o5 |
| 1772 | ta HV_FAST_TRAP | 1781 | ta HV_FAST_TRAP |
| 1773 | retl | 1782 | retl |
| 1774 | nop | 1783 | nop |
| 1784 | .size sun4v_intr_setstate, .-sun4v_intr_setstate | ||
| 1775 | 1785 | ||
| 1776 | /* %o0: sysino | 1786 | /* %o0: sysino |
| 1777 | * | 1787 | * |
| 1778 | * returns %o0: cpuid | 1788 | * returns %o0: cpuid |
| 1779 | */ | 1789 | */ |
| 1780 | .globl sun4v_intr_gettarget | 1790 | .globl sun4v_intr_gettarget |
| 1791 | .type sun4v_intr_gettarget,#function | ||
| 1781 | sun4v_intr_gettarget: | 1792 | sun4v_intr_gettarget: |
| 1782 | mov HV_FAST_INTR_GETTARGET, %o5 | 1793 | mov HV_FAST_INTR_GETTARGET, %o5 |
| 1783 | ta HV_FAST_TRAP | 1794 | ta HV_FAST_TRAP |
| 1784 | retl | 1795 | retl |
| 1785 | mov %o1, %o0 | 1796 | mov %o1, %o0 |
| 1797 | .size sun4v_intr_gettarget, .-sun4v_intr_gettarget | ||
| 1786 | 1798 | ||
| 1787 | /* %o0: sysino | 1799 | /* %o0: sysino |
| 1788 | * %o1: cpuid | 1800 | * %o1: cpuid |
| 1789 | */ | 1801 | */ |
| 1790 | .globl sun4v_intr_settarget | 1802 | .globl sun4v_intr_settarget |
| 1803 | .type sun4v_intr_settarget,#function | ||
| 1791 | sun4v_intr_settarget: | 1804 | sun4v_intr_settarget: |
| 1792 | mov HV_FAST_INTR_SETTARGET, %o5 | 1805 | mov HV_FAST_INTR_SETTARGET, %o5 |
| 1793 | ta HV_FAST_TRAP | 1806 | ta HV_FAST_TRAP |
| 1794 | retl | 1807 | retl |
| 1795 | nop | 1808 | nop |
| 1809 | .size sun4v_intr_settarget, .-sun4v_intr_settarget | ||
| 1796 | 1810 | ||
| 1797 | /* %o0: type | 1811 | /* %o0: cpuid |
| 1798 | * %o1: queue paddr | 1812 | * %o1: pc |
| 1799 | * %o2: num queue entries | 1813 | * %o2: rtba |
| 1814 | * %o3: arg0 | ||
| 1800 | * | 1815 | * |
| 1801 | * returns %o0: status | 1816 | * returns %o0: status |
| 1802 | */ | 1817 | */ |
| 1803 | .globl sun4v_cpu_qconf | 1818 | .globl sun4v_cpu_start |
| 1804 | sun4v_cpu_qconf: | 1819 | .type sun4v_cpu_start,#function |
| 1805 | mov HV_FAST_CPU_QCONF, %o5 | 1820 | sun4v_cpu_start: |
| 1821 | mov HV_FAST_CPU_START, %o5 | ||
| 1806 | ta HV_FAST_TRAP | 1822 | ta HV_FAST_TRAP |
| 1807 | retl | 1823 | retl |
| 1808 | nop | 1824 | nop |
| 1825 | .size sun4v_cpu_start, .-sun4v_cpu_start | ||
| 1809 | 1826 | ||
| 1810 | /* returns %o0: status | 1827 | /* %o0: cpuid |
| 1828 | * | ||
| 1829 | * returns %o0: status | ||
| 1811 | */ | 1830 | */ |
| 1831 | .globl sun4v_cpu_stop | ||
| 1832 | .type sun4v_cpu_stop,#function | ||
| 1833 | sun4v_cpu_stop: | ||
| 1834 | mov HV_FAST_CPU_STOP, %o5 | ||
| 1835 | ta HV_FAST_TRAP | ||
| 1836 | retl | ||
| 1837 | nop | ||
| 1838 | .size sun4v_cpu_stop, .-sun4v_cpu_stop | ||
| 1839 | |||
| 1840 | /* returns %o0: status */ | ||
| 1812 | .globl sun4v_cpu_yield | 1841 | .globl sun4v_cpu_yield |
| 1842 | .type sun4v_cpu_yield, #function | ||
| 1813 | sun4v_cpu_yield: | 1843 | sun4v_cpu_yield: |
| 1814 | mov HV_FAST_CPU_YIELD, %o5 | 1844 | mov HV_FAST_CPU_YIELD, %o5 |
| 1815 | ta HV_FAST_TRAP | 1845 | ta HV_FAST_TRAP |
| 1816 | retl | 1846 | retl |
| 1817 | nop | 1847 | nop |
| 1848 | .size sun4v_cpu_yield, .-sun4v_cpu_yield | ||
| 1849 | |||
| 1850 | /* %o0: type | ||
| 1851 | * %o1: queue paddr | ||
| 1852 | * %o2: num queue entries | ||
| 1853 | * | ||
| 1854 | * returns %o0: status | ||
| 1855 | */ | ||
| 1856 | .globl sun4v_cpu_qconf | ||
| 1857 | .type sun4v_cpu_qconf,#function | ||
| 1858 | sun4v_cpu_qconf: | ||
| 1859 | mov HV_FAST_CPU_QCONF, %o5 | ||
| 1860 | ta HV_FAST_TRAP | ||
| 1861 | retl | ||
| 1862 | nop | ||
| 1863 | .size sun4v_cpu_qconf, .-sun4v_cpu_qconf | ||
| 1818 | 1864 | ||
| 1819 | /* %o0: num cpus in cpu list | 1865 | /* %o0: num cpus in cpu list |
| 1820 | * %o1: cpu list paddr | 1866 | * %o1: cpu list paddr |
| @@ -1823,11 +1869,13 @@ sun4v_cpu_yield: | |||
| 1823 | * returns %o0: status | 1869 | * returns %o0: status |
| 1824 | */ | 1870 | */ |
| 1825 | .globl sun4v_cpu_mondo_send | 1871 | .globl sun4v_cpu_mondo_send |
| 1872 | .type sun4v_cpu_mondo_send,#function | ||
| 1826 | sun4v_cpu_mondo_send: | 1873 | sun4v_cpu_mondo_send: |
| 1827 | mov HV_FAST_CPU_MONDO_SEND, %o5 | 1874 | mov HV_FAST_CPU_MONDO_SEND, %o5 |
| 1828 | ta HV_FAST_TRAP | 1875 | ta HV_FAST_TRAP |
| 1829 | retl | 1876 | retl |
| 1830 | nop | 1877 | nop |
| 1878 | .size sun4v_cpu_mondo_send, .-sun4v_cpu_mondo_send | ||
| 1831 | 1879 | ||
| 1832 | /* %o0: CPU ID | 1880 | /* %o0: CPU ID |
| 1833 | * | 1881 | * |
| @@ -1835,6 +1883,7 @@ sun4v_cpu_mondo_send: | |||
| 1835 | * %o0: cpu state as HV_CPU_STATE_* | 1883 | * %o0: cpu state as HV_CPU_STATE_* |
| 1836 | */ | 1884 | */ |
| 1837 | .globl sun4v_cpu_state | 1885 | .globl sun4v_cpu_state |
| 1886 | .type sun4v_cpu_state,#function | ||
| 1838 | sun4v_cpu_state: | 1887 | sun4v_cpu_state: |
| 1839 | mov HV_FAST_CPU_STATE, %o5 | 1888 | mov HV_FAST_CPU_STATE, %o5 |
| 1840 | ta HV_FAST_TRAP | 1889 | ta HV_FAST_TRAP |
| @@ -1843,6 +1892,37 @@ sun4v_cpu_state: | |||
| 1843 | mov %o1, %o0 | 1892 | mov %o1, %o0 |
| 1844 | 1: retl | 1893 | 1: retl |
| 1845 | nop | 1894 | nop |
| 1895 | .size sun4v_cpu_state, .-sun4v_cpu_state | ||
| 1896 | |||
| 1897 | /* %o0: virtual address | ||
| 1898 | * %o1: must be zero | ||
| 1899 | * %o2: TTE | ||
| 1900 | * %o3: HV_MMU_* flags | ||
| 1901 | * | ||
| 1902 | * returns %o0: status | ||
| 1903 | */ | ||
| 1904 | .globl sun4v_mmu_map_perm_addr | ||
| 1905 | .type sun4v_mmu_map_perm_addr,#function | ||
| 1906 | sun4v_mmu_map_perm_addr: | ||
| 1907 | mov HV_FAST_MMU_MAP_PERM_ADDR, %o5 | ||
| 1908 | ta HV_FAST_TRAP | ||
| 1909 | retl | ||
| 1910 | nop | ||
| 1911 | .size sun4v_mmu_map_perm_addr, .-sun4v_mmu_map_perm_addr | ||
| 1912 | |||
| 1913 | /* %o0: number of TSB descriptions | ||
| 1914 | * %o1: TSB descriptions real address | ||
| 1915 | * | ||
| 1916 | * returns %o0: status | ||
| 1917 | */ | ||
| 1918 | .globl sun4v_mmu_tsb_ctx0 | ||
| 1919 | .type sun4v_mmu_tsb_ctx0,#function | ||
| 1920 | sun4v_mmu_tsb_ctx0: | ||
| 1921 | mov HV_FAST_MMU_TSB_CTX0, %o5 | ||
| 1922 | ta HV_FAST_TRAP | ||
| 1923 | retl | ||
| 1924 | nop | ||
| 1925 | .size sun4v_mmu_tsb_ctx0, .-sun4v_mmu_tsb_ctx0 | ||
| 1846 | 1926 | ||
| 1847 | /* %o0: API group number | 1927 | /* %o0: API group number |
| 1848 | * %o1: pointer to unsigned long major number storage | 1928 | * %o1: pointer to unsigned long major number storage |
| @@ -1851,6 +1931,7 @@ sun4v_cpu_state: | |||
| 1851 | * returns %o0: status | 1931 | * returns %o0: status |
| 1852 | */ | 1932 | */ |
| 1853 | .globl sun4v_get_version | 1933 | .globl sun4v_get_version |
| 1934 | .type sun4v_get_version,#function | ||
| 1854 | sun4v_get_version: | 1935 | sun4v_get_version: |
| 1855 | mov HV_CORE_GET_VER, %o5 | 1936 | mov HV_CORE_GET_VER, %o5 |
| 1856 | mov %o1, %o3 | 1937 | mov %o1, %o3 |
| @@ -1859,6 +1940,7 @@ sun4v_get_version: | |||
| 1859 | stx %o1, [%o3] | 1940 | stx %o1, [%o3] |
| 1860 | retl | 1941 | retl |
| 1861 | stx %o2, [%o4] | 1942 | stx %o2, [%o4] |
| 1943 | .size sun4v_get_version, .-sun4v_get_version | ||
| 1862 | 1944 | ||
| 1863 | /* %o0: API group number | 1945 | /* %o0: API group number |
| 1864 | * %o1: desired major number | 1946 | * %o1: desired major number |
| @@ -1868,18 +1950,49 @@ sun4v_get_version: | |||
| 1868 | * returns %o0: status | 1950 | * returns %o0: status |
| 1869 | */ | 1951 | */ |
| 1870 | .globl sun4v_set_version | 1952 | .globl sun4v_set_version |
| 1953 | .type sun4v_set_version,#function | ||
| 1871 | sun4v_set_version: | 1954 | sun4v_set_version: |
| 1872 | mov HV_CORE_SET_VER, %o5 | 1955 | mov HV_CORE_SET_VER, %o5 |
| 1873 | mov %o3, %o4 | 1956 | mov %o3, %o4 |
| 1874 | ta HV_CORE_TRAP | 1957 | ta HV_CORE_TRAP |
| 1875 | retl | 1958 | retl |
| 1876 | stx %o1, [%o4] | 1959 | stx %o1, [%o4] |
| 1960 | .size sun4v_set_version, .-sun4v_set_version | ||
| 1961 | |||
| 1962 | /* %o0: pointer to unsigned long time | ||
| 1963 | * | ||
| 1964 | * returns %o0: status | ||
| 1965 | */ | ||
| 1966 | .globl sun4v_tod_get | ||
| 1967 | .type sun4v_tod_get,#function | ||
| 1968 | sun4v_tod_get: | ||
| 1969 | mov %o0, %o4 | ||
| 1970 | mov HV_FAST_TOD_GET, %o5 | ||
| 1971 | ta HV_FAST_TRAP | ||
| 1972 | stx %o1, [%o4] | ||
| 1973 | retl | ||
| 1974 | nop | ||
| 1975 | .size sun4v_tod_get, .-sun4v_tod_get | ||
| 1976 | |||
| 1977 | /* %o0: time | ||
| 1978 | * | ||
| 1979 | * returns %o0: status | ||
| 1980 | */ | ||
| 1981 | .globl sun4v_tod_set | ||
| 1982 | .type sun4v_tod_set,#function | ||
| 1983 | sun4v_tod_set: | ||
| 1984 | mov HV_FAST_TOD_SET, %o5 | ||
| 1985 | ta HV_FAST_TRAP | ||
| 1986 | retl | ||
| 1987 | nop | ||
| 1988 | .size sun4v_tod_set, .-sun4v_tod_set | ||
| 1877 | 1989 | ||
| 1878 | /* %o0: pointer to unsigned long status | 1990 | /* %o0: pointer to unsigned long status |
| 1879 | * | 1991 | * |
| 1880 | * returns %o0: signed character | 1992 | * returns %o0: signed character |
| 1881 | */ | 1993 | */ |
| 1882 | .globl sun4v_con_getchar | 1994 | .globl sun4v_con_getchar |
| 1995 | .type sun4v_con_getchar,#function | ||
| 1883 | sun4v_con_getchar: | 1996 | sun4v_con_getchar: |
| 1884 | mov %o0, %o4 | 1997 | mov %o0, %o4 |
| 1885 | mov HV_FAST_CONS_GETCHAR, %o5 | 1998 | mov HV_FAST_CONS_GETCHAR, %o5 |
| @@ -1889,17 +2002,20 @@ sun4v_con_getchar: | |||
| 1889 | stx %o0, [%o4] | 2002 | stx %o0, [%o4] |
| 1890 | retl | 2003 | retl |
| 1891 | sra %o1, 0, %o0 | 2004 | sra %o1, 0, %o0 |
| 2005 | .size sun4v_con_getchar, .-sun4v_con_getchar | ||
| 1892 | 2006 | ||
| 1893 | /* %o0: signed long character | 2007 | /* %o0: signed long character |
| 1894 | * | 2008 | * |
| 1895 | * returns %o0: status | 2009 | * returns %o0: status |
| 1896 | */ | 2010 | */ |
| 1897 | .globl sun4v_con_putchar | 2011 | .globl sun4v_con_putchar |
| 2012 | .type sun4v_con_putchar,#function | ||
| 1898 | sun4v_con_putchar: | 2013 | sun4v_con_putchar: |
| 1899 | mov HV_FAST_CONS_PUTCHAR, %o5 | 2014 | mov HV_FAST_CONS_PUTCHAR, %o5 |
| 1900 | ta HV_FAST_TRAP | 2015 | ta HV_FAST_TRAP |
| 1901 | retl | 2016 | retl |
| 1902 | sra %o0, 0, %o0 | 2017 | sra %o0, 0, %o0 |
| 2018 | .size sun4v_con_putchar, .-sun4v_con_putchar | ||
| 1903 | 2019 | ||
| 1904 | /* %o0: buffer real address | 2020 | /* %o0: buffer real address |
| 1905 | * %o1: buffer size | 2021 | * %o1: buffer size |
| @@ -1908,6 +2024,7 @@ sun4v_con_putchar: | |||
| 1908 | * returns %o0: status | 2024 | * returns %o0: status |
| 1909 | */ | 2025 | */ |
| 1910 | .globl sun4v_con_read | 2026 | .globl sun4v_con_read |
| 2027 | .type sun4v_con_read,#function | ||
| 1911 | sun4v_con_read: | 2028 | sun4v_con_read: |
| 1912 | mov %o2, %o4 | 2029 | mov %o2, %o4 |
| 1913 | mov HV_FAST_CONS_READ, %o5 | 2030 | mov HV_FAST_CONS_READ, %o5 |
| @@ -1922,6 +2039,7 @@ sun4v_con_read: | |||
| 1922 | stx %o1, [%o4] | 2039 | stx %o1, [%o4] |
| 1923 | 1: retl | 2040 | 1: retl |
| 1924 | nop | 2041 | nop |
| 2042 | .size sun4v_con_read, .-sun4v_con_read | ||
| 1925 | 2043 | ||
| 1926 | /* %o0: buffer real address | 2044 | /* %o0: buffer real address |
| 1927 | * %o1: buffer size | 2045 | * %o1: buffer size |
| @@ -1930,6 +2048,7 @@ sun4v_con_read: | |||
| 1930 | * returns %o0: status | 2048 | * returns %o0: status |
| 1931 | */ | 2049 | */ |
| 1932 | .globl sun4v_con_write | 2050 | .globl sun4v_con_write |
| 2051 | .type sun4v_con_write,#function | ||
| 1933 | sun4v_con_write: | 2052 | sun4v_con_write: |
| 1934 | mov %o2, %o4 | 2053 | mov %o2, %o4 |
| 1935 | mov HV_FAST_CONS_WRITE, %o5 | 2054 | mov HV_FAST_CONS_WRITE, %o5 |
| @@ -1937,6 +2056,7 @@ sun4v_con_write: | |||
| 1937 | stx %o1, [%o4] | 2056 | stx %o1, [%o4] |
| 1938 | retl | 2057 | retl |
| 1939 | nop | 2058 | nop |
| 2059 | .size sun4v_con_write, .-sun4v_con_write | ||
| 1940 | 2060 | ||
| 1941 | /* %o0: soft state | 2061 | /* %o0: soft state |
| 1942 | * %o1: address of description string | 2062 | * %o1: address of description string |
| @@ -1944,13 +2064,35 @@ sun4v_con_write: | |||
| 1944 | * returns %o0: status | 2064 | * returns %o0: status |
| 1945 | */ | 2065 | */ |
| 1946 | .globl sun4v_mach_set_soft_state | 2066 | .globl sun4v_mach_set_soft_state |
| 2067 | .type sun4v_mach_set_soft_state,#function | ||
| 1947 | sun4v_mach_set_soft_state: | 2068 | sun4v_mach_set_soft_state: |
| 1948 | mov HV_FAST_MACH_SET_SOFT_STATE, %o5 | 2069 | mov HV_FAST_MACH_SET_SOFT_STATE, %o5 |
| 1949 | ta HV_FAST_TRAP | 2070 | ta HV_FAST_TRAP |
| 1950 | retl | 2071 | retl |
| 1951 | nop | 2072 | nop |
| 2073 | .size sun4v_mach_set_soft_state, .-sun4v_mach_set_soft_state | ||
| 1952 | 2074 | ||
| 2075 | /* %o0: exit code | ||
| 2076 | * | ||
| 2077 | * Does not return. | ||
| 2078 | */ | ||
| 2079 | .globl sun4v_mach_exit | ||
| 2080 | .type sun4v_mach_exit,#function | ||
| 2081 | sun4v_mach_exit: | ||
| 2082 | mov HV_FAST_MACH_EXIT, %o5 | ||
| 2083 | ta HV_FAST_TRAP | ||
| 2084 | retl | ||
| 2085 | nop | ||
| 2086 | .size sun4v_mach_exit, .-sun4v_mach_exit | ||
| 2087 | |||
| 2088 | /* %o0: buffer real address | ||
| 2089 | * %o1: buffer length | ||
| 2090 | * %o2: pointer to unsigned long real_buf_len | ||
| 2091 | * | ||
| 2092 | * returns %o0: status | ||
| 2093 | */ | ||
| 1953 | .globl sun4v_mach_desc | 2094 | .globl sun4v_mach_desc |
| 2095 | .type sun4v_mach_desc,#function | ||
| 1954 | sun4v_mach_desc: | 2096 | sun4v_mach_desc: |
| 1955 | mov %o2, %o4 | 2097 | mov %o2, %o4 |
| 1956 | mov HV_FAST_MACH_DESC, %o5 | 2098 | mov HV_FAST_MACH_DESC, %o5 |
| @@ -1958,3 +2100,401 @@ sun4v_mach_desc: | |||
| 1958 | stx %o1, [%o4] | 2100 | stx %o1, [%o4] |
| 1959 | retl | 2101 | retl |
| 1960 | nop | 2102 | nop |
| 2103 | .size sun4v_mach_desc, .-sun4v_mach_desc | ||
| 2104 | |||
| 2105 | /* %o0: new timeout in milliseconds | ||
| 2106 | * %o1: pointer to unsigned long orig_timeout | ||
| 2107 | * | ||
| 2108 | * returns %o0: status | ||
| 2109 | */ | ||
| 2110 | .globl sun4v_mach_set_watchdog | ||
| 2111 | .type sun4v_mach_set_watchdog,#function | ||
| 2112 | sun4v_mach_set_watchdog: | ||
| 2113 | mov %o1, %o4 | ||
| 2114 | mov HV_FAST_MACH_SET_WATCHDOG, %o5 | ||
| 2115 | ta HV_FAST_TRAP | ||
| 2116 | stx %o1, [%o4] | ||
| 2117 | retl | ||
| 2118 | nop | ||
| 2119 | .size sun4v_mach_set_watchdog, .-sun4v_mach_set_watchdog | ||
| 2120 | |||
| 2121 | /* No inputs and does not return. */ | ||
| 2122 | .globl sun4v_mach_sir | ||
| 2123 | .type sun4v_mach_sir,#function | ||
| 2124 | sun4v_mach_sir: | ||
| 2125 | mov %o1, %o4 | ||
| 2126 | mov HV_FAST_MACH_SIR, %o5 | ||
| 2127 | ta HV_FAST_TRAP | ||
| 2128 | stx %o1, [%o4] | ||
| 2129 | retl | ||
| 2130 | nop | ||
| 2131 | .size sun4v_mach_sir, .-sun4v_mach_sir | ||
| 2132 | |||
| 2133 | /* %o0: channel | ||
| 2134 | * %o1: ra | ||
| 2135 | * %o2: num_entries | ||
| 2136 | * | ||
| 2137 | * returns %o0: status | ||
| 2138 | */ | ||
| 2139 | .globl sun4v_ldc_tx_qconf | ||
| 2140 | .type sun4v_ldc_tx_qconf,#function | ||
| 2141 | sun4v_ldc_tx_qconf: | ||
| 2142 | mov HV_FAST_LDC_TX_QCONF, %o5 | ||
| 2143 | ta HV_FAST_TRAP | ||
| 2144 | retl | ||
| 2145 | nop | ||
| 2146 | .size sun4v_ldc_tx_qconf, .-sun4v_ldc_tx_qconf | ||
| 2147 | |||
| 2148 | /* %o0: channel | ||
| 2149 | * %o1: pointer to unsigned long ra | ||
| 2150 | * %o2: pointer to unsigned long num_entries | ||
| 2151 | * | ||
| 2152 | * returns %o0: status | ||
| 2153 | */ | ||
| 2154 | .globl sun4v_ldc_tx_qinfo | ||
| 2155 | .type sun4v_ldc_tx_qinfo,#function | ||
| 2156 | sun4v_ldc_tx_qinfo: | ||
| 2157 | mov %o1, %g1 | ||
| 2158 | mov %o2, %g2 | ||
| 2159 | mov HV_FAST_LDC_TX_QINFO, %o5 | ||
| 2160 | ta HV_FAST_TRAP | ||
| 2161 | stx %o1, [%g1] | ||
| 2162 | stx %o2, [%g2] | ||
| 2163 | retl | ||
| 2164 | nop | ||
| 2165 | .size sun4v_ldc_tx_qinfo, .-sun4v_ldc_tx_qinfo | ||
| 2166 | |||
| 2167 | /* %o0: channel | ||
| 2168 | * %o1: pointer to unsigned long head_off | ||
| 2169 | * %o2: pointer to unsigned long tail_off | ||
| 2170 | * %o2: pointer to unsigned long chan_state | ||
| 2171 | * | ||
| 2172 | * returns %o0: status | ||
| 2173 | */ | ||
| 2174 | .globl sun4v_ldc_tx_get_state | ||
| 2175 | .type sun4v_ldc_tx_get_state,#function | ||
| 2176 | sun4v_ldc_tx_get_state: | ||
| 2177 | mov %o1, %g1 | ||
| 2178 | mov %o2, %g2 | ||
| 2179 | mov %o3, %g3 | ||
| 2180 | mov HV_FAST_LDC_TX_GET_STATE, %o5 | ||
| 2181 | ta HV_FAST_TRAP | ||
| 2182 | stx %o1, [%g1] | ||
| 2183 | stx %o2, [%g2] | ||
| 2184 | stx %o3, [%g3] | ||
| 2185 | retl | ||
| 2186 | nop | ||
| 2187 | .size sun4v_ldc_tx_get_state, .-sun4v_ldc_tx_get_state | ||
| 2188 | |||
| 2189 | /* %o0: channel | ||
| 2190 | * %o1: tail_off | ||
| 2191 | * | ||
| 2192 | * returns %o0: status | ||
| 2193 | */ | ||
| 2194 | .globl sun4v_ldc_tx_set_qtail | ||
| 2195 | .type sun4v_ldc_tx_set_qtail,#function | ||
| 2196 | sun4v_ldc_tx_set_qtail: | ||
| 2197 | mov HV_FAST_LDC_TX_SET_QTAIL, %o5 | ||
| 2198 | ta HV_FAST_TRAP | ||
| 2199 | retl | ||
| 2200 | nop | ||
| 2201 | .size sun4v_ldc_tx_set_qtail, .-sun4v_ldc_tx_set_qtail | ||
| 2202 | |||
| 2203 | /* %o0: channel | ||
| 2204 | * %o1: ra | ||
| 2205 | * %o2: num_entries | ||
| 2206 | * | ||
| 2207 | * returns %o0: status | ||
| 2208 | */ | ||
| 2209 | .globl sun4v_ldc_rx_qconf | ||
| 2210 | .type sun4v_ldc_rx_qconf,#function | ||
| 2211 | sun4v_ldc_rx_qconf: | ||
| 2212 | mov HV_FAST_LDC_RX_QCONF, %o5 | ||
| 2213 | ta HV_FAST_TRAP | ||
| 2214 | retl | ||
| 2215 | nop | ||
| 2216 | .size sun4v_ldc_rx_qconf, .-sun4v_ldc_rx_qconf | ||
| 2217 | |||
| 2218 | /* %o0: channel | ||
| 2219 | * %o1: pointer to unsigned long ra | ||
| 2220 | * %o2: pointer to unsigned long num_entries | ||
| 2221 | * | ||
| 2222 | * returns %o0: status | ||
| 2223 | */ | ||
| 2224 | .globl sun4v_ldc_rx_qinfo | ||
| 2225 | .type sun4v_ldc_rx_qinfo,#function | ||
| 2226 | sun4v_ldc_rx_qinfo: | ||
| 2227 | mov %o1, %g1 | ||
| 2228 | mov %o2, %g2 | ||
| 2229 | mov HV_FAST_LDC_RX_QINFO, %o5 | ||
| 2230 | ta HV_FAST_TRAP | ||
| 2231 | stx %o1, [%g1] | ||
| 2232 | stx %o2, [%g2] | ||
| 2233 | retl | ||
| 2234 | nop | ||
| 2235 | .size sun4v_ldc_rx_qinfo, .-sun4v_ldc_rx_qinfo | ||
| 2236 | |||
| 2237 | /* %o0: channel | ||
| 2238 | * %o1: pointer to unsigned long head_off | ||
| 2239 | * %o2: pointer to unsigned long tail_off | ||
| 2240 | * %o2: pointer to unsigned long chan_state | ||
| 2241 | * | ||
| 2242 | * returns %o0: status | ||
| 2243 | */ | ||
| 2244 | .globl sun4v_ldc_rx_get_state | ||
| 2245 | .type sun4v_ldc_rx_get_state,#function | ||
| 2246 | sun4v_ldc_rx_get_state: | ||
| 2247 | mov %o1, %g1 | ||
| 2248 | mov %o2, %g2 | ||
| 2249 | mov %o3, %g3 | ||
| 2250 | mov HV_FAST_LDC_RX_GET_STATE, %o5 | ||
| 2251 | ta HV_FAST_TRAP | ||
| 2252 | stx %o1, [%g1] | ||
| 2253 | stx %o2, [%g2] | ||
| 2254 | stx %o3, [%g3] | ||
| 2255 | retl | ||
| 2256 | nop | ||
| 2257 | .size sun4v_ldc_rx_get_state, .-sun4v_ldc_rx_get_state | ||
| 2258 | |||
| 2259 | /* %o0: channel | ||
| 2260 | * %o1: head_off | ||
| 2261 | * | ||
| 2262 | * returns %o0: status | ||
| 2263 | */ | ||
| 2264 | .globl sun4v_ldc_rx_set_qhead | ||
| 2265 | .type sun4v_ldc_rx_set_qhead,#function | ||
| 2266 | sun4v_ldc_rx_set_qhead: | ||
| 2267 | mov HV_FAST_LDC_RX_SET_QHEAD, %o5 | ||
| 2268 | ta HV_FAST_TRAP | ||
| 2269 | retl | ||
| 2270 | nop | ||
| 2271 | .size sun4v_ldc_rx_set_qhead, .-sun4v_ldc_rx_set_qhead | ||
| 2272 | |||
| 2273 | /* %o0: channel | ||
| 2274 | * %o1: ra | ||
| 2275 | * %o2: num_entries | ||
| 2276 | * | ||
| 2277 | * returns %o0: status | ||
| 2278 | */ | ||
| 2279 | .globl sun4v_ldc_set_map_table | ||
| 2280 | .type sun4v_ldc_set_map_table,#function | ||
| 2281 | sun4v_ldc_set_map_table: | ||
| 2282 | mov HV_FAST_LDC_SET_MAP_TABLE, %o5 | ||
| 2283 | ta HV_FAST_TRAP | ||
| 2284 | retl | ||
| 2285 | nop | ||
| 2286 | .size sun4v_ldc_set_map_table, .-sun4v_ldc_set_map_table | ||
| 2287 | |||
| 2288 | /* %o0: channel | ||
| 2289 | * %o1: pointer to unsigned long ra | ||
| 2290 | * %o2: pointer to unsigned long num_entries | ||
| 2291 | * | ||
| 2292 | * returns %o0: status | ||
| 2293 | */ | ||
| 2294 | .globl sun4v_ldc_get_map_table | ||
| 2295 | .type sun4v_ldc_get_map_table,#function | ||
| 2296 | sun4v_ldc_get_map_table: | ||
| 2297 | mov %o1, %g1 | ||
| 2298 | mov %o2, %g2 | ||
| 2299 | mov HV_FAST_LDC_GET_MAP_TABLE, %o5 | ||
| 2300 | ta HV_FAST_TRAP | ||
| 2301 | stx %o1, [%g1] | ||
| 2302 | stx %o2, [%g2] | ||
| 2303 | retl | ||
| 2304 | nop | ||
| 2305 | .size sun4v_ldc_get_map_table, .-sun4v_ldc_get_map_table | ||
| 2306 | |||
| 2307 | /* %o0: channel | ||
| 2308 | * %o1: dir_code | ||
| 2309 | * %o2: tgt_raddr | ||
| 2310 | * %o3: lcl_raddr | ||
| 2311 | * %o4: len | ||
| 2312 | * %o5: pointer to unsigned long actual_len | ||
| 2313 | * | ||
| 2314 | * returns %o0: status | ||
| 2315 | */ | ||
| 2316 | .globl sun4v_ldc_copy | ||
| 2317 | .type sun4v_ldc_copy,#function | ||
| 2318 | sun4v_ldc_copy: | ||
| 2319 | mov %o5, %g1 | ||
| 2320 | mov HV_FAST_LDC_COPY, %o5 | ||
| 2321 | ta HV_FAST_TRAP | ||
| 2322 | stx %o1, [%g1] | ||
| 2323 | retl | ||
| 2324 | nop | ||
| 2325 | .size sun4v_ldc_copy, .-sun4v_ldc_copy | ||
| 2326 | |||
| 2327 | /* %o0: channel | ||
| 2328 | * %o1: cookie | ||
| 2329 | * %o2: pointer to unsigned long ra | ||
| 2330 | * %o3: pointer to unsigned long perm | ||
| 2331 | * | ||
| 2332 | * returns %o0: status | ||
| 2333 | */ | ||
| 2334 | .globl sun4v_ldc_mapin | ||
| 2335 | .type sun4v_ldc_mapin,#function | ||
| 2336 | sun4v_ldc_mapin: | ||
| 2337 | mov %o2, %g1 | ||
| 2338 | mov %o3, %g2 | ||
| 2339 | mov HV_FAST_LDC_MAPIN, %o5 | ||
| 2340 | ta HV_FAST_TRAP | ||
| 2341 | stx %o1, [%g1] | ||
| 2342 | stx %o2, [%g2] | ||
| 2343 | retl | ||
| 2344 | nop | ||
| 2345 | .size sun4v_ldc_mapin, .-sun4v_ldc_mapin | ||
| 2346 | |||
| 2347 | /* %o0: ra | ||
| 2348 | * | ||
| 2349 | * returns %o0: status | ||
| 2350 | */ | ||
| 2351 | .globl sun4v_ldc_unmap | ||
| 2352 | .type sun4v_ldc_unmap,#function | ||
| 2353 | sun4v_ldc_unmap: | ||
| 2354 | mov HV_FAST_LDC_UNMAP, %o5 | ||
| 2355 | ta HV_FAST_TRAP | ||
| 2356 | retl | ||
| 2357 | nop | ||
| 2358 | .size sun4v_ldc_unmap, .-sun4v_ldc_unmap | ||
| 2359 | |||
| 2360 | /* %o0: cookie | ||
| 2361 | * %o1: mte_cookie | ||
| 2362 | * | ||
| 2363 | * returns %o0: status | ||
| 2364 | */ | ||
| 2365 | .globl sun4v_ldc_revoke | ||
| 2366 | .type sun4v_ldc_revoke,#function | ||
| 2367 | sun4v_ldc_revoke: | ||
| 2368 | mov HV_FAST_LDC_REVOKE, %o5 | ||
| 2369 | ta HV_FAST_TRAP | ||
| 2370 | retl | ||
| 2371 | nop | ||
| 2372 | .size sun4v_ldc_revoke, .-sun4v_ldc_revoke | ||
| 2373 | |||
| 2374 | /* %o0: device handle | ||
| 2375 | * %o1: device INO | ||
| 2376 | * %o2: pointer to unsigned long cookie | ||
| 2377 | * | ||
| 2378 | * returns %o0: status | ||
| 2379 | */ | ||
| 2380 | .globl sun4v_vintr_get_cookie | ||
| 2381 | .type sun4v_vintr_get_cookie,#function | ||
| 2382 | sun4v_vintr_get_cookie: | ||
| 2383 | mov %o2, %g1 | ||
| 2384 | mov HV_FAST_VINTR_GET_COOKIE, %o5 | ||
| 2385 | ta HV_FAST_TRAP | ||
| 2386 | stx %o1, [%g1] | ||
| 2387 | retl | ||
| 2388 | nop | ||
| 2389 | .size sun4v_vintr_get_cookie, .-sun4v_vintr_get_cookie | ||
| 2390 | |||
| 2391 | /* %o0: device handle | ||
| 2392 | * %o1: device INO | ||
| 2393 | * %o2: cookie | ||
| 2394 | * | ||
| 2395 | * returns %o0: status | ||
| 2396 | */ | ||
| 2397 | .globl sun4v_vintr_set_cookie | ||
| 2398 | .type sun4v_vintr_set_cookie,#function | ||
| 2399 | sun4v_vintr_set_cookie: | ||
| 2400 | mov HV_FAST_VINTR_SET_COOKIE, %o5 | ||
| 2401 | ta HV_FAST_TRAP | ||
| 2402 | retl | ||
| 2403 | nop | ||
| 2404 | .size sun4v_vintr_set_cookie, .-sun4v_vintr_set_cookie | ||
| 2405 | |||
| 2406 | /* %o0: device handle | ||
| 2407 | * %o1: device INO | ||
| 2408 | * %o2: pointer to unsigned long valid_state | ||
| 2409 | * | ||
| 2410 | * returns %o0: status | ||
| 2411 | */ | ||
| 2412 | .globl sun4v_vintr_get_valid | ||
| 2413 | .type sun4v_vintr_get_valid,#function | ||
| 2414 | sun4v_vintr_get_valid: | ||
| 2415 | mov %o2, %g1 | ||
| 2416 | mov HV_FAST_VINTR_GET_VALID, %o5 | ||
| 2417 | ta HV_FAST_TRAP | ||
| 2418 | stx %o1, [%g1] | ||
| 2419 | retl | ||
| 2420 | nop | ||
| 2421 | .size sun4v_vintr_get_valid, .-sun4v_vintr_get_valid | ||
| 2422 | |||
| 2423 | /* %o0: device handle | ||
| 2424 | * %o1: device INO | ||
| 2425 | * %o2: valid_state | ||
| 2426 | * | ||
| 2427 | * returns %o0: status | ||
| 2428 | */ | ||
| 2429 | .globl sun4v_vintr_set_valid | ||
| 2430 | .type sun4v_vintr_set_valid,#function | ||
| 2431 | sun4v_vintr_set_valid: | ||
| 2432 | mov HV_FAST_VINTR_SET_VALID, %o5 | ||
| 2433 | ta HV_FAST_TRAP | ||
| 2434 | retl | ||
| 2435 | nop | ||
| 2436 | .size sun4v_vintr_set_valid, .-sun4v_vintr_set_valid | ||
| 2437 | |||
| 2438 | /* %o0: device handle | ||
| 2439 | * %o1: device INO | ||
| 2440 | * %o2: pointer to unsigned long state | ||
| 2441 | * | ||
| 2442 | * returns %o0: status | ||
| 2443 | */ | ||
| 2444 | .globl sun4v_vintr_get_state | ||
| 2445 | .type sun4v_vintr_get_state,#function | ||
| 2446 | sun4v_vintr_get_state: | ||
| 2447 | mov %o2, %g1 | ||
| 2448 | mov HV_FAST_VINTR_GET_STATE, %o5 | ||
| 2449 | ta HV_FAST_TRAP | ||
| 2450 | stx %o1, [%g1] | ||
| 2451 | retl | ||
| 2452 | nop | ||
| 2453 | .size sun4v_vintr_get_state, .-sun4v_vintr_get_state | ||
| 2454 | |||
| 2455 | /* %o0: device handle | ||
| 2456 | * %o1: device INO | ||
| 2457 | * %o2: state | ||
| 2458 | * | ||
| 2459 | * returns %o0: status | ||
| 2460 | */ | ||
| 2461 | .globl sun4v_vintr_set_state | ||
| 2462 | .type sun4v_vintr_set_state,#function | ||
| 2463 | sun4v_vintr_set_state: | ||
| 2464 | mov HV_FAST_VINTR_SET_STATE, %o5 | ||
| 2465 | ta HV_FAST_TRAP | ||
| 2466 | retl | ||
| 2467 | nop | ||
| 2468 | .size sun4v_vintr_set_state, .-sun4v_vintr_set_state | ||
| 2469 | |||
| 2470 | /* %o0: device handle | ||
| 2471 | * %o1: device INO | ||
| 2472 | * %o2: pointer to unsigned long cpuid | ||
| 2473 | * | ||
| 2474 | * returns %o0: status | ||
| 2475 | */ | ||
| 2476 | .globl sun4v_vintr_get_target | ||
| 2477 | .type sun4v_vintr_get_target,#function | ||
| 2478 | sun4v_vintr_get_target: | ||
| 2479 | mov %o2, %g1 | ||
| 2480 | mov HV_FAST_VINTR_GET_TARGET, %o5 | ||
| 2481 | ta HV_FAST_TRAP | ||
| 2482 | stx %o1, [%g1] | ||
| 2483 | retl | ||
| 2484 | nop | ||
| 2485 | .size sun4v_vintr_get_target, .-sun4v_vintr_get_target | ||
| 2486 | |||
| 2487 | /* %o0: device handle | ||
| 2488 | * %o1: device INO | ||
| 2489 | * %o2: cpuid | ||
| 2490 | * | ||
| 2491 | * returns %o0: status | ||
| 2492 | */ | ||
| 2493 | .globl sun4v_vintr_set_target | ||
| 2494 | .type sun4v_vintr_set_target,#function | ||
| 2495 | sun4v_vintr_set_target: | ||
| 2496 | mov HV_FAST_VINTR_SET_TARGET, %o5 | ||
| 2497 | ta HV_FAST_TRAP | ||
| 2498 | retl | ||
| 2499 | nop | ||
| 2500 | .size sun4v_vintr_set_target, .-sun4v_vintr_set_target | ||
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index f2e73e613748..a31a0439244f 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c | |||
| @@ -680,22 +680,14 @@ static int starfire_set_time(u32 val) | |||
| 680 | 680 | ||
| 681 | static u32 hypervisor_get_time(void) | 681 | static u32 hypervisor_get_time(void) |
| 682 | { | 682 | { |
| 683 | register unsigned long func asm("%o5"); | 683 | unsigned long ret, time; |
| 684 | register unsigned long arg0 asm("%o0"); | ||
| 685 | register unsigned long arg1 asm("%o1"); | ||
| 686 | int retries = 10000; | 684 | int retries = 10000; |
| 687 | 685 | ||
| 688 | retry: | 686 | retry: |
| 689 | func = HV_FAST_TOD_GET; | 687 | ret = sun4v_tod_get(&time); |
| 690 | arg0 = 0; | 688 | if (ret == HV_EOK) |
| 691 | arg1 = 0; | 689 | return time; |
| 692 | __asm__ __volatile__("ta %6" | 690 | if (ret == HV_EWOULDBLOCK) { |
| 693 | : "=&r" (func), "=&r" (arg0), "=&r" (arg1) | ||
| 694 | : "0" (func), "1" (arg0), "2" (arg1), | ||
| 695 | "i" (HV_FAST_TRAP)); | ||
| 696 | if (arg0 == HV_EOK) | ||
| 697 | return arg1; | ||
| 698 | if (arg0 == HV_EWOULDBLOCK) { | ||
| 699 | if (--retries > 0) { | 691 | if (--retries > 0) { |
| 700 | udelay(100); | 692 | udelay(100); |
| 701 | goto retry; | 693 | goto retry; |
| @@ -709,20 +701,14 @@ retry: | |||
| 709 | 701 | ||
| 710 | static int hypervisor_set_time(u32 secs) | 702 | static int hypervisor_set_time(u32 secs) |
| 711 | { | 703 | { |
| 712 | register unsigned long func asm("%o5"); | 704 | unsigned long ret; |
| 713 | register unsigned long arg0 asm("%o0"); | ||
| 714 | int retries = 10000; | 705 | int retries = 10000; |
| 715 | 706 | ||
| 716 | retry: | 707 | retry: |
| 717 | func = HV_FAST_TOD_SET; | 708 | ret = sun4v_tod_set(secs); |
| 718 | arg0 = secs; | 709 | if (ret == HV_EOK) |
| 719 | __asm__ __volatile__("ta %4" | ||
| 720 | : "=&r" (func), "=&r" (arg0) | ||
| 721 | : "0" (func), "1" (arg0), | ||
| 722 | "i" (HV_FAST_TRAP)); | ||
| 723 | if (arg0 == HV_EOK) | ||
| 724 | return 0; | 710 | return 0; |
| 725 | if (arg0 == HV_EWOULDBLOCK) { | 711 | if (ret == HV_EWOULDBLOCK) { |
| 726 | if (--retries > 0) { | 712 | if (--retries > 0) { |
| 727 | udelay(100); | 713 | udelay(100); |
| 728 | goto retry; | 714 | goto retry; |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 97af4311f787..3010227fe243 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -558,26 +558,11 @@ static void __init hypervisor_tlb_lock(unsigned long vaddr, | |||
| 558 | unsigned long pte, | 558 | unsigned long pte, |
| 559 | unsigned long mmu) | 559 | unsigned long mmu) |
| 560 | { | 560 | { |
| 561 | register unsigned long func asm("%o5"); | 561 | unsigned long ret = sun4v_mmu_map_perm_addr(vaddr, 0, pte, mmu); |
| 562 | register unsigned long arg0 asm("%o0"); | 562 | |
| 563 | register unsigned long arg1 asm("%o1"); | 563 | if (ret != 0) { |
| 564 | register unsigned long arg2 asm("%o2"); | ||
| 565 | register unsigned long arg3 asm("%o3"); | ||
| 566 | |||
| 567 | func = HV_FAST_MMU_MAP_PERM_ADDR; | ||
| 568 | arg0 = vaddr; | ||
| 569 | arg1 = 0; | ||
| 570 | arg2 = pte; | ||
| 571 | arg3 = mmu; | ||
| 572 | __asm__ __volatile__("ta 0x80" | ||
| 573 | : "=&r" (func), "=&r" (arg0), | ||
| 574 | "=&r" (arg1), "=&r" (arg2), | ||
| 575 | "=&r" (arg3) | ||
| 576 | : "0" (func), "1" (arg0), "2" (arg1), | ||
| 577 | "3" (arg2), "4" (arg3)); | ||
| 578 | if (arg0 != 0) { | ||
| 579 | prom_printf("hypervisor_tlb_lock[%lx:%lx:%lx:%lx]: " | 564 | prom_printf("hypervisor_tlb_lock[%lx:%lx:%lx:%lx]: " |
| 580 | "errors with %lx\n", vaddr, 0, pte, mmu, arg0); | 565 | "errors with %lx\n", vaddr, 0, pte, mmu, ret); |
| 581 | prom_halt(); | 566 | prom_halt(); |
| 582 | } | 567 | } |
| 583 | } | 568 | } |
| @@ -1314,20 +1299,16 @@ static void __init sun4v_ktsb_init(void) | |||
| 1314 | 1299 | ||
| 1315 | void __cpuinit sun4v_ktsb_register(void) | 1300 | void __cpuinit sun4v_ktsb_register(void) |
| 1316 | { | 1301 | { |
| 1317 | register unsigned long func asm("%o5"); | 1302 | unsigned long pa, ret; |
| 1318 | register unsigned long arg0 asm("%o0"); | ||
| 1319 | register unsigned long arg1 asm("%o1"); | ||
| 1320 | unsigned long pa; | ||
| 1321 | 1303 | ||
| 1322 | pa = kern_base + ((unsigned long)&ktsb_descr[0] - KERNBASE); | 1304 | pa = kern_base + ((unsigned long)&ktsb_descr[0] - KERNBASE); |
| 1323 | 1305 | ||
| 1324 | func = HV_FAST_MMU_TSB_CTX0; | 1306 | ret = sun4v_mmu_tsb_ctx0(NUM_KTSB_DESCR, pa); |
| 1325 | arg0 = NUM_KTSB_DESCR; | 1307 | if (ret != 0) { |
| 1326 | arg1 = pa; | 1308 | prom_printf("hypervisor_mmu_tsb_ctx0[%lx]: " |
| 1327 | __asm__ __volatile__("ta %6" | 1309 | "errors with %lx\n", pa, ret); |
| 1328 | : "=&r" (func), "=&r" (arg0), "=&r" (arg1) | 1310 | prom_halt(); |
| 1329 | : "0" (func), "1" (arg0), "2" (arg1), | 1311 | } |
| 1330 | "i" (HV_FAST_TRAP)); | ||
| 1331 | } | 1312 | } |
| 1332 | 1313 | ||
| 1333 | /* paging_init() sets up the page tables */ | 1314 | /* paging_init() sets up the page tables */ |
