But this only catches a physical block size < 512 for NVMe, not any other block device.
Please fix it for the general case in blk_queue_physical_block_size().
We actually call that later and would probably be better to check here..
We had a series for that a short while ago that got lost.