uarch v2 L2 cache fixes

- Logic to select read way (fill vs. hit) was reversed
- In write stage, only merge with store data if the request is a store
- l2w_write_en should only be asserted if the request packet is valid