hptw: factored HPTWRead

This commit is contained in:
David Harris 2021-07-17 11:25:59 -04:00
parent 1bbc932bfd
commit e3b26b7b23

View File

@ -211,28 +211,20 @@ module pagetablewalker
// State transition logic // State transition logic
always_comb begin always_comb begin
//HPTWRead = 1'b0; å case (WalkerState)
case (WalkerState)
IDLE: if (AnyTLBMissM & SvMode == `SV32) NextWalkerState = LEVEL1_SET_ADRE; IDLE: if (AnyTLBMissM & SvMode == `SV32) NextWalkerState = LEVEL1_SET_ADRE;
else NextWalkerState = IDLE; else NextWalkerState = IDLE;
LEVEL1_SET_ADRE: NextWalkerState = LEVEL1_WDV; LEVEL1_SET_ADRE: NextWalkerState = LEVEL1_WDV;
LEVEL1_WDV: begin LEVEL1_WDV: if (HPTWStall) NextWalkerState = LEVEL1_WDV;
//HPTWRead = 1'b1;
if (HPTWStall) NextWalkerState = LEVEL1_WDV;
else NextWalkerState = LEVEL1; else NextWalkerState = LEVEL1;
end
LEVEL1: begin LEVEL1: begin
if (ValidPTE && LeafPTE && ~(MegapageMisaligned | ADPageFault)) NextWalkerState = LEAF; if (ValidPTE && LeafPTE && ~(MegapageMisaligned | ADPageFault)) NextWalkerState = LEAF;
else if (ValidPTE && ~LeafPTE) begin else if (ValidPTE && ~LeafPTE) begin
NextWalkerState = LEVEL0_SET_ADRE; NextWalkerState = LEVEL0_SET_ADRE;
//HPTWRead = 1'b1; // *** seems this shouldn't be asserted here
end else NextWalkerState = FAULT; end else NextWalkerState = FAULT;
end end
LEVEL0_SET_ADRE: NextWalkerState = LEVEL0_WDV; LEVEL0_SET_ADRE: NextWalkerState = LEVEL0_WDV;
LEVEL0_WDV: begin LEVEL0_WDV: if (HPTWStall) NextWalkerState = LEVEL0_WDV;
//HPTWRead = 1'b1;
if (HPTWStall) NextWalkerState = LEVEL0_WDV;
else NextWalkerState = LEVEL0; else NextWalkerState = LEVEL0;
end end
LEVEL0: if (ValidPTE & LeafPTE & ~ADPageFault) NextWalkerState = LEAF; LEVEL0: if (ValidPTE & LeafPTE & ~ADPageFault) NextWalkerState = LEAF;
@ -261,47 +253,34 @@ module pagetablewalker
assign MegapageMisaligned = |(CurrentPPN[8:0]); assign MegapageMisaligned = |(CurrentPPN[8:0]);
always_comb begin always_comb begin
//HPTWRead = 1'b0;
case (WalkerState) case (WalkerState)
IDLE: if (AnyTLBMissM) NextWalkerState = (SvMode == `SV48) ? LEVEL3_SET_ADRE : LEVEL2_SET_ADRE; IDLE: if (AnyTLBMissM) NextWalkerState = (SvMode == `SV48) ? LEVEL3_SET_ADRE : LEVEL2_SET_ADRE;
else NextWalkerState = IDLE; else NextWalkerState = IDLE;
LEVEL3_SET_ADRE: NextWalkerState = LEVEL3_WDV; LEVEL3_SET_ADRE: NextWalkerState = LEVEL3_WDV;
LEVEL3_WDV: begin LEVEL3_WDV: if (HPTWStall) NextWalkerState = LEVEL3_WDV;
//HPTWRead = 1'b1;
if (HPTWStall) NextWalkerState = LEVEL3_WDV;
else NextWalkerState = LEVEL3; else NextWalkerState = LEVEL3;
end
LEVEL3: LEVEL3:
if (ValidPTE && LeafPTE && ~(TerapageMisaligned || ADPageFault)) NextWalkerState = LEAF; if (ValidPTE && LeafPTE && ~(TerapageMisaligned || ADPageFault)) NextWalkerState = LEAF;
else if (ValidPTE && ~LeafPTE) NextWalkerState = LEVEL2_SET_ADRE; else if (ValidPTE && ~LeafPTE) NextWalkerState = LEVEL2_SET_ADRE;
else NextWalkerState = FAULT; else NextWalkerState = FAULT;
LEVEL2_SET_ADRE: NextWalkerState = LEVEL2_WDV; LEVEL2_SET_ADRE: NextWalkerState = LEVEL2_WDV;
LEVEL2_WDV: begin LEVEL2_WDV: if (HPTWStall) NextWalkerState = LEVEL2_WDV;
//HPTWRead = 1'b1;
if (HPTWStall) NextWalkerState = LEVEL2_WDV;
else NextWalkerState = LEVEL2; else NextWalkerState = LEVEL2;
end
LEVEL2: LEVEL2:
if (ValidPTE && LeafPTE && ~(GigapageMisaligned || ADPageFault)) NextWalkerState = LEAF; if (ValidPTE && LeafPTE && ~(GigapageMisaligned || ADPageFault)) NextWalkerState = LEAF;
else if (ValidPTE && ~LeafPTE) NextWalkerState = LEVEL1_SET_ADRE; else if (ValidPTE && ~LeafPTE) NextWalkerState = LEVEL1_SET_ADRE;
else NextWalkerState = FAULT; else NextWalkerState = FAULT;
LEVEL1_SET_ADRE: NextWalkerState = LEVEL1_WDV; LEVEL1_SET_ADRE: NextWalkerState = LEVEL1_WDV;
LEVEL1_WDV: begin LEVEL1_WDV: if (HPTWStall) NextWalkerState = LEVEL1_WDV;
//HPTWRead = 1'b1;
if (HPTWStall) NextWalkerState = LEVEL1_WDV;
else NextWalkerState = LEVEL1; else NextWalkerState = LEVEL1;
end
LEVEL1: LEVEL1:
if (ValidPTE && LeafPTE && ~(MegapageMisaligned || ADPageFault)) NextWalkerState = LEAF; if (ValidPTE && LeafPTE && ~(MegapageMisaligned || ADPageFault)) NextWalkerState = LEAF;
else if (ValidPTE && ~LeafPTE) NextWalkerState = LEVEL0_SET_ADRE; else if (ValidPTE && ~LeafPTE) NextWalkerState = LEVEL0_SET_ADRE;
else NextWalkerState = FAULT; else NextWalkerState = FAULT;
LEVEL0_SET_ADRE: NextWalkerState = LEVEL0_WDV; LEVEL0_SET_ADRE: NextWalkerState = LEVEL0_WDV;
LEVEL0_WDV: begin LEVEL0_WDV:
//HPTWRead = 1'b1;
if (HPTWStall) NextWalkerState = LEVEL0_WDV; if (HPTWStall) NextWalkerState = LEVEL0_WDV;
else NextWalkerState = LEVEL0; else NextWalkerState = LEVEL0;
end
LEVEL0: LEVEL0:
if (ValidPTE && LeafPTE && ~ADPageFault) NextWalkerState = LEAF; if (ValidPTE && LeafPTE && ~ADPageFault) NextWalkerState = LEAF;
else NextWalkerState = FAULT; else NextWalkerState = FAULT;