Effects of upstream roughness on turbulent flow over a forward-facing step