Fixed cache coherency
authorlekernel <sebastien.bourdeauducq@lekernel.net>
Mon, 21 Jun 2010 22:05:34 +0000 (00:05 +0200)
committerlekernel <sebastien.bourdeauducq@lekernel.net>
Mon, 21 Jun 2010 22:05:34 +0000 (00:05 +0200)
boards/milkymist-one/rtl/system.v
boards/milkymist-one/rtl/vga.v
software/libhpdmc/libhpdmc.S

index 5c2895d..2aa0ebf 100644 (file)
@@ -580,6 +580,11 @@ csrbrg csrbrg(
 //---------------------------------------------------------------------------
 // WISHBONE to FML bridge
 //---------------------------------------------------------------------------
+wire dcb_stb;
+wire [`SDRAM_DEPTH-1:0] dcb_adr;
+wire [63:0] dcb_dat;
+wire dcb_hit;
+
 fmlbrg #(
        .fml_depth(`SDRAM_DEPTH)
 ) fmlbrg (
@@ -602,7 +607,12 @@ fmlbrg #(
        .fml_ack(fml_brg_ack),
        .fml_sel(fml_brg_sel),
        .fml_di(fml_brg_dr),
-       .fml_do(fml_brg_dw)
+       .fml_do(fml_brg_dw),
+
+       .dcb_stb(dcb_stb),
+       .dcb_adr(dcb_adr),
+       .dcb_dat(dcb_dat),
+       .dcb_hit(dcb_hit)
 );
 
 //---------------------------------------------------------------------------
@@ -809,6 +819,11 @@ vga #(
        .fml_stb(fml_vga_stb),
        .fml_ack(fml_vga_ack),
        .fml_di(fml_vga_dr),
+
+       .dcb_stb(dcb_stb),
+       .dcb_adr(dcb_adr),
+       .dcb_dat(dcb_dat),
+       .dcb_hit(dcb_hit),
        
        .vga_psave_n(vga_psave_n),
        .vga_hsync_n(vga_hsync_n),
index 443bc28..ecddecf 100644 (file)
@@ -35,6 +35,12 @@ module vga #(
        output fml_stb,
        input fml_ack,
        input [63:0] fml_di,
+
+       /* Direct Cache Bus */
+       output dcb_stb,
+       output [fml_depth-1:0] dcb_adr,
+       input [63:0] dcb_dat,
+       input dcb_hit,
        
        /* VGA pads */
        output vga_psave_n,
@@ -126,6 +132,11 @@ vgafb #(
        .fml_stb(fml_stb),
        .fml_ack(fml_ack),
        .fml_di(fml_di),
+
+       .dcb_stb(dcb_stb),
+       .dcb_adr(dcb_adr),
+       .dcb_dat(dcb_dat),
+       .dcb_hit(dcb_hit),
        
        .vga_clk(vga_iclk),
        .vga_psave_n(vga_psave_n),
index 6cec1b9..42cf1bf 100644 (file)
@@ -264,7 +264,7 @@ mancal_loop:
        be      r1, r2, boot
        bi mancal_loop
 inc_input_delay:
-       mvu     r1, 63
+       mvu     r1, 29
        be      r25, r1, mancal_loop
        addi    r25, r25, 1
        mvhi    r1, hi(CSR_HPDMC_IODELAY)