Ignore:
Timestamp:
2010-07-12T10:53:30Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd11d3e
Parents:
c40e6ef (diff), bee2d4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/sparc64/include/mm/sun4u/tlb.h

    rc40e6ef rbd48f4c  
    100100#include <arch/barrier.h>
    101101#include <typedefs.h>
     102#include <trace.h>
    102103#include <arch/register.h>
    103104#include <arch/cpu.h>
     
    242243 * Determine the number of entries in the DMMU's small TLB.
    243244 */
    244 static inline uint16_t tlb_dsmall_size(void)
     245NO_TRACE static inline uint16_t tlb_dsmall_size(void)
    245246{
    246247        return 16;
     
    250251 * Determine the number of entries in each DMMU's big TLB.
    251252 */
    252 static inline uint16_t tlb_dbig_size(void)
     253NO_TRACE static inline uint16_t tlb_dbig_size(void)
    253254{
    254255        return 512;
     
    258259 * Determine the number of entries in the IMMU's small TLB.
    259260 */
    260 static inline uint16_t tlb_ismall_size(void)
     261NO_TRACE static inline uint16_t tlb_ismall_size(void)
    261262{
    262263        return 16;
     
    266267 * Determine the number of entries in the IMMU's big TLB.
    267268 */
    268 static inline uint16_t tlb_ibig_size(void)
     269NO_TRACE static inline uint16_t tlb_ibig_size(void)
    269270{
    270271        if (((ver_reg_t) ver_read()).impl == IMPL_ULTRASPARCIV_PLUS)
     
    280281 * @return              Current value of Primary Context Register.
    281282 */
    282 static inline uint64_t mmu_primary_context_read(void)
     283NO_TRACE static inline uint64_t mmu_primary_context_read(void)
    283284{
    284285        return asi_u64_read(ASI_DMMU, VA_PRIMARY_CONTEXT_REG);
     
    289290 * @param v             New value of Primary Context Register.
    290291 */
    291 static inline void mmu_primary_context_write(uint64_t v)
     292NO_TRACE static inline void mmu_primary_context_write(uint64_t v)
    292293{
    293294        asi_u64_write(ASI_DMMU, VA_PRIMARY_CONTEXT_REG, v);
     
    299300 * @return              Current value of Secondary Context Register.
    300301 */
    301 static inline uint64_t mmu_secondary_context_read(void)
     302NO_TRACE static inline uint64_t mmu_secondary_context_read(void)
    302303{
    303304        return asi_u64_read(ASI_DMMU, VA_SECONDARY_CONTEXT_REG);
     
    308309 * @param v             New value of Primary Context Register.
    309310 */
    310 static inline void mmu_secondary_context_write(uint64_t v)
     311NO_TRACE static inline void mmu_secondary_context_write(uint64_t v)
    311312{
    312313        asi_u64_write(ASI_DMMU, VA_SECONDARY_CONTEXT_REG, v);
     
    323324 *                      Register.
    324325 */
    325 static inline uint64_t itlb_data_access_read(size_t entry)
     326NO_TRACE static inline uint64_t itlb_data_access_read(size_t entry)
    326327{
    327328        itlb_data_access_addr_t reg;
     
    337338 * @param value         Value to be written.
    338339 */
    339 static inline void itlb_data_access_write(size_t entry, uint64_t value)
     340NO_TRACE static inline void itlb_data_access_write(size_t entry, uint64_t value)
    340341{
    341342        itlb_data_access_addr_t reg;
     
    354355 *                      Register.
    355356 */
    356 static inline uint64_t dtlb_data_access_read(size_t entry)
     357NO_TRACE static inline uint64_t dtlb_data_access_read(size_t entry)
    357358{
    358359        dtlb_data_access_addr_t reg;
     
    368369 * @param value         Value to be written.
    369370 */
    370 static inline void dtlb_data_access_write(size_t entry, uint64_t value)
     371NO_TRACE static inline void dtlb_data_access_write(size_t entry, uint64_t value)
    371372{
    372373        dtlb_data_access_addr_t reg;
     
    384385 * @return              Current value of specified IMMU TLB Tag Read Register.
    385386 */
    386 static inline uint64_t itlb_tag_read_read(size_t entry)
     387NO_TRACE static inline uint64_t itlb_tag_read_read(size_t entry)
    387388{
    388389        itlb_tag_read_addr_t tag;
     
    399400 * @return              Current value of specified DMMU TLB Tag Read Register.
    400401 */
    401 static inline uint64_t dtlb_tag_read_read(size_t entry)
     402NO_TRACE static inline uint64_t dtlb_tag_read_read(size_t entry)
    402403{
    403404        dtlb_tag_read_addr_t tag;
     
    419420 *                      Register.
    420421 */
    421 static inline uint64_t itlb_data_access_read(int tlb, size_t entry)
     422NO_TRACE static inline uint64_t itlb_data_access_read(int tlb, size_t entry)
    422423{
    423424        itlb_data_access_addr_t reg;
     
    434435 * @param value         Value to be written.
    435436 */
    436 static inline void itlb_data_access_write(int tlb, size_t entry,
     437NO_TRACE static inline void itlb_data_access_write(int tlb, size_t entry,
    437438        uint64_t value)
    438439{
     
    454455 *                      Register.
    455456 */
    456 static inline uint64_t dtlb_data_access_read(int tlb, size_t entry)
     457NO_TRACE static inline uint64_t dtlb_data_access_read(int tlb, size_t entry)
    457458{
    458459        dtlb_data_access_addr_t reg;
     
    470471 * @param value         Value to be written.
    471472 */
    472 static inline void dtlb_data_access_write(int tlb, size_t entry,
     473NO_TRACE static inline void dtlb_data_access_write(int tlb, size_t entry,
    473474        uint64_t value)
    474475{
     
    489490 * @return              Current value of specified IMMU TLB Tag Read Register.
    490491 */
    491 static inline uint64_t itlb_tag_read_read(int tlb, size_t entry)
     492NO_TRACE static inline uint64_t itlb_tag_read_read(int tlb, size_t entry)
    492493{
    493494        itlb_tag_read_addr_t tag;
     
    506507 * @return              Current value of specified DMMU TLB Tag Read Register.
    507508 */
    508 static inline uint64_t dtlb_tag_read_read(int tlb, size_t entry)
     509NO_TRACE static inline uint64_t dtlb_tag_read_read(int tlb, size_t entry)
    509510{
    510511        dtlb_tag_read_addr_t tag;
     
    523524 * @param v             Value to be written.
    524525 */
    525 static inline void itlb_tag_access_write(uint64_t v)
     526NO_TRACE static inline void itlb_tag_access_write(uint64_t v)
    526527{
    527528        asi_u64_write(ASI_IMMU, VA_IMMU_TAG_ACCESS, v);
     
    533534 * @return              Current value of IMMU TLB Tag Access Register.
    534535 */
    535 static inline uint64_t itlb_tag_access_read(void)
     536NO_TRACE static inline uint64_t itlb_tag_access_read(void)
    536537{
    537538        return asi_u64_read(ASI_IMMU, VA_IMMU_TAG_ACCESS);
     
    542543 * @param v             Value to be written.
    543544 */
    544 static inline void dtlb_tag_access_write(uint64_t v)
     545NO_TRACE static inline void dtlb_tag_access_write(uint64_t v)
    545546{
    546547        asi_u64_write(ASI_DMMU, VA_DMMU_TAG_ACCESS, v);
     
    552553 * @return              Current value of DMMU TLB Tag Access Register.
    553554 */
    554 static inline uint64_t dtlb_tag_access_read(void)
     555NO_TRACE static inline uint64_t dtlb_tag_access_read(void)
    555556{
    556557        return asi_u64_read(ASI_DMMU, VA_DMMU_TAG_ACCESS);
     
    562563 * @param v             Value to be written.
    563564 */
    564 static inline void itlb_data_in_write(uint64_t v)
     565NO_TRACE static inline void itlb_data_in_write(uint64_t v)
    565566{
    566567        asi_u64_write(ASI_ITLB_DATA_IN_REG, 0, v);
     
    572573 * @param v             Value to be written.
    573574 */
    574 static inline void dtlb_data_in_write(uint64_t v)
     575NO_TRACE static inline void dtlb_data_in_write(uint64_t v)
    575576{
    576577        asi_u64_write(ASI_DTLB_DATA_IN_REG, 0, v);
     
    582583 * @return              Current content of I-SFSR register.
    583584 */
    584 static inline uint64_t itlb_sfsr_read(void)
     585NO_TRACE static inline uint64_t itlb_sfsr_read(void)
    585586{
    586587        return asi_u64_read(ASI_IMMU, VA_IMMU_SFSR);
     
    591592 * @param v             New value of I-SFSR register.
    592593 */
    593 static inline void itlb_sfsr_write(uint64_t v)
     594NO_TRACE static inline void itlb_sfsr_write(uint64_t v)
    594595{
    595596        asi_u64_write(ASI_IMMU, VA_IMMU_SFSR, v);
     
    601602 * @return              Current content of D-SFSR register.
    602603 */
    603 static inline uint64_t dtlb_sfsr_read(void)
     604NO_TRACE static inline uint64_t dtlb_sfsr_read(void)
    604605{
    605606        return asi_u64_read(ASI_DMMU, VA_DMMU_SFSR);
     
    610611 * @param v             New value of D-SFSR register.
    611612 */
    612 static inline void dtlb_sfsr_write(uint64_t v)
     613NO_TRACE static inline void dtlb_sfsr_write(uint64_t v)
    613614{
    614615        asi_u64_write(ASI_DMMU, VA_DMMU_SFSR, v);
     
    620621 * @return              Current content of D-SFAR register.
    621622 */
    622 static inline uint64_t dtlb_sfar_read(void)
     623NO_TRACE static inline uint64_t dtlb_sfar_read(void)
    623624{
    624625        return asi_u64_read(ASI_DMMU, VA_DMMU_SFAR);
     
    633634 * @param page          Address which is on the page to be demapped.
    634635 */
    635 static inline void itlb_demap(int type, int context_encoding, uintptr_t page)
     636NO_TRACE static inline void itlb_demap(int type, int context_encoding, uintptr_t page)
    636637{
    637638        tlb_demap_addr_t da;
     
    659660 * @param page          Address which is on the page to be demapped.
    660661 */
    661 static inline void dtlb_demap(int type, int context_encoding, uintptr_t page)
     662NO_TRACE static inline void dtlb_demap(int type, int context_encoding, uintptr_t page)
    662663{
    663664        tlb_demap_addr_t da;
Note: See TracChangeset for help on using the changeset viewer.