rework on CPU OC and UC

Signed-off-by: Willi Ye <williye97@gmail.com>
2.1

Signed-off-by: Willi Ye <williye97@gmail.com>