Changeset 8cee705 in mainline

Timestamp:

2006-10-19T22:58:53Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

deb14fb

Parents:

f0450658

Message:

sparc64 work.

• Improve panic screen on data_access_exception by dumping contents of DSFSR and DSFAR.
• Change the FHC enable interrupt code to only set the IMAP_V bit.

Location:

kernel/arch/sparc64

Files:

• include/mm/tlb.h (modified) (1 diff)
• src/drivers/fhc.c (modified) (3 diffs)
• src/drivers/pci.c (modified) (1 diff)
• src/mm/tlb.c (modified) (2 diffs)
• src/trap/exception.c (modified) (2 diffs)

kernel/arch/sparc64/include/mm/tlb.h

@@ -430 +430 @@
 extern void dtlb_insert_mapping(uintptr_t page, uintptr_t frame, int pagesize, bool locked, bool cacheable);
 
+extern void dump_sfsr_and_sfar(void);
+
 #endif /* !def __ASM__ */
 

kernel/arch/sparc64/src/drivers/fhc.c

@@ -41 +41 @@
 
 #include <arch/drivers/fhc.h>
+#include <arch/trap/interrupt.h>
 #include <arch/mm/page.h>
 #include <mm/slab.h>
@@ -46 +47 @@
 #include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/kbd/z8530.h>
 
 fhc_t *central_fhc = NULL;
@@ -95 +95 @@
         switch (inr) {
         case FHC_UART_INR:
-                fhc->uart_imap[FHC_UART_ICLR] = 0x0;
-                fhc->uart_imap[FHC_UART_IMAP] = 0x80000000;
+                fhc->uart_imap[FHC_UART_IMAP] |= IMAP_V_MASK;
                 break;
         default:

kernel/arch/sparc64/src/drivers/pci.c

@@ -98 +98 @@
 void pci_sabre_enable_interrupt(pci_t *pci, int inr)
 {
-        pci->reg[PCI_SABRE_ICLR_BASE + (inr & INO_MASK)] = 0;
         pci->reg[PCI_SABRE_IMAP_BASE + (inr & INO_MASK)] |= IMAP_V_MASK;
 }

kernel/arch/sparc64/src/mm/tlb.c

@@ -75 +75 @@
          */
         tlb_invalidate_all();
+
+        /*
+         * Clear both SFSRs.
+         */
+        dtlb_sfsr_write(0);
+        itlb_sfsr_write(0);
 }
 
@@ -354 +360 @@
 }
 
+void dump_sfsr_and_sfar(void)
+{
+        tlb_sfsr_reg_t sfsr;
+        uintptr_t sfar;
+
+        sfsr.value = dtlb_sfsr_read();
+        sfar = dtlb_sfar_read();
+        
+        printf("DTLB SFSR: asi=%#x, ft=%#x, e=%d, ct=%d, pr=%d, w=%d, ow=%d, fv=%d\n",
+                sfsr.asi, sfsr.ft, sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv);
+        printf("DTLB SFAR: address=%p\n", sfar);
+        
+        dtlb_sfsr_write(0);
+}
+
 /** Invalidate all unlocked ITLB and DTLB entries. */
 void tlb_invalidate_all(void)

kernel/arch/sparc64/src/trap/exception.c

@@ -35 +35 @@
 
 #include <arch/trap/exception.h>
+#include <arch/mm/tlb.h>
 #include <arch/interrupt.h>
 #include <interrupt.h>
@@ -157 +158 @@
         fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
         dump_istate(istate);
+        dump_sfsr_and_sfar();
         panic("%s\n", __FUNCTION__);
 }