sw: add some more obviously missing mutex guards

... to methods added in 76c549eb01dcb7b5bf28a271ce00e386f3d388ba

Change-Id: I32101ec882420babb394af6db5cd56d1035acf4a