kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

liquidio: fix crash in presence of zeroed-out base address regs

Browse source 
Fix crash in linux PF driver when BARs have been cleared/de-programmed;
fail early init (prior to mapping BARs) if the BAR0 or
BAR1 registers are zero.

This situation can arise when the PF is added to a VM (PCI pass-through),
then a PF FLR is issued (in the VM).  After this occurs, the BAR registers
will be zero. If we attempt to load the PF driver in the host
(after VM has been shutdown), the host can reset.

Signed-off-by: Rick Farrington <ricardo.farrington@cavium.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rick Farrington 2017-08-30 16:19:53 -07:00 committed by David S. Miller
parent 12bdc5e1e5
commit acfb98b996
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
View file

@ -1305,6 +1305,26 @@ static int cn23xx_sriov_config(struct octeon_device *oct)
int setup_cn23xx_octeon_pf_device(struct octeon_device *oct)
{
u32 data32;
u64 BAR0, BAR1;
pci_read_config_dword(oct->pci_dev, PCI_BASE_ADDRESS_0, &data32);
BAR0 = (u64)(data32 & ~0xf);
pci_read_config_dword(oct->pci_dev, PCI_BASE_ADDRESS_1, &data32);
BAR0 |= ((u64)data32 << 32);
pci_read_config_dword(oct->pci_dev, PCI_BASE_ADDRESS_2, &data32);
BAR1 = (u64)(data32 & ~0xf);
pci_read_config_dword(oct->pci_dev, PCI_BASE_ADDRESS_3, &data32);
BAR1 |= ((u64)data32 << 32);
if (!BAR0 || !BAR1) {
if (!BAR0)
dev_err(&oct->pci_dev->dev, "device BAR0 unassigned\n");
if (!BAR1)
dev_err(&oct->pci_dev->dev, "device BAR1 unassigned\n");
return 1;
}
if (octeon_map_pci_barx(oct, 0, 0))
return 1;