I have submitted an updated patch.
1. Reduced the width to 32 to be safer
2. Sorry about not scaling the count down, missed it while preparing patch.
3. According to Pci Firmware Spec 3.0, section 5.1.2 Expansion Rom Image length is in units of 512 bytes, so I understand that we dont need to handle the tail