'Big stick' energy bill passes upper house