Commit 91f5bce7 authored by Dexuan Cui's avatar Dexuan Cui Committed by Greg Kroah-Hartman

PCI: hv: Fix wslot_to_devfn() to fix warnings on device removal

commit 60e2e2fb upstream.

The devfn of 00:02.0 is 0x10.  devfn_to_wslot(0x10) == 0x2, and
wslot_to_devfn(0x2) should be 0x10, while it's 0x2 in the current code.

Due to this, hv_eject_device_work() -> pci_get_domain_bus_and_slot()
returns NULL and pci_stop_and_remove_bus_device() is not called.

Later when the real device driver's .remove() is invoked by
hv_pci_remove() -> pci_stop_root_bus(), some warnings can be noticed
because the VM has lost the access to the underlying device at that
time.
Signed-off-by: default avatarJake Oshins <jakeo@microsoft.com>
Signed-off-by: default avatarDexuan Cui <decui@microsoft.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
CC: K. Y. Srinivasan <kys@microsoft.com>
CC: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1306371f
...@@ -130,7 +130,8 @@ union pci_version { ...@@ -130,7 +130,8 @@ union pci_version {
*/ */
union win_slot_encoding { union win_slot_encoding {
struct { struct {
u32 func:8; u32 dev:5;
u32 func:3;
u32 reserved:24; u32 reserved:24;
} bits; } bits;
u32 slot; u32 slot;
...@@ -485,7 +486,8 @@ static u32 devfn_to_wslot(int devfn) ...@@ -485,7 +486,8 @@ static u32 devfn_to_wslot(int devfn)
union win_slot_encoding wslot; union win_slot_encoding wslot;
wslot.slot = 0; wslot.slot = 0;
wslot.bits.func = PCI_SLOT(devfn) | (PCI_FUNC(devfn) << 5); wslot.bits.dev = PCI_SLOT(devfn);
wslot.bits.func = PCI_FUNC(devfn);
return wslot.slot; return wslot.slot;
} }
...@@ -503,7 +505,7 @@ static int wslot_to_devfn(u32 wslot) ...@@ -503,7 +505,7 @@ static int wslot_to_devfn(u32 wslot)
union win_slot_encoding slot_no; union win_slot_encoding slot_no;
slot_no.slot = wslot; slot_no.slot = wslot;
return PCI_DEVFN(0, slot_no.bits.func); return PCI_DEVFN(slot_no.bits.dev, slot_no.bits.func);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment