mirror of https://gitee.com/openkylin/linux.git
Merge branch 'remotes/lorenzo/pci/hv'
- Fix hv timing issue that causes kdump failures (Wei Hu) - Make some hv functions static (Wei Yongjun) * remotes/lorenzo/pci/hv: PCI: hv: Make some functions static PCI: hv: Fix a timing issue which causes kdump to fail occasionally
This commit is contained in:
Bjorn Helgaas
commit
98f5c57a4e
|
|
@ -938,8 +938,9 @@ static void hv_pci_read_config_compl(void *context, struct pci_response *resp,
|
|||
*
|
||||
* Return: 0 on success, -errno on failure
|
||||
*/
|
||||
int hv_read_config_block(struct pci_dev *pdev, void *buf, unsigned int len,
|
||||
unsigned int block_id, unsigned int *bytes_returned)
|
||||
static int hv_read_config_block(struct pci_dev *pdev, void *buf,
|
||||
unsigned int len, unsigned int block_id,
|
||||
unsigned int *bytes_returned)
|
||||
{
|
||||
struct hv_pcibus_device *hbus =
|
||||
container_of(pdev->bus->sysdata, struct hv_pcibus_device,
|
||||
|
|
@ -1018,8 +1019,8 @@ static void hv_pci_write_config_compl(void *context, struct pci_response *resp,
|
|||
*
|
||||
* Return: 0 on success, -errno on failure
|
||||
*/
|
||||
int hv_write_config_block(struct pci_dev *pdev, void *buf, unsigned int len,
|
||||
unsigned int block_id)
|
||||
static int hv_write_config_block(struct pci_dev *pdev, void *buf,
|
||||
unsigned int len, unsigned int block_id)
|
||||
{
|
||||
struct hv_pcibus_device *hbus =
|
||||
container_of(pdev->bus->sysdata, struct hv_pcibus_device,
|
||||
|
|
@ -1087,9 +1088,9 @@ int hv_write_config_block(struct pci_dev *pdev, void *buf, unsigned int len,
|
|||
*
|
||||
* Return: 0 on success, -errno on failure
|
||||
*/
|
||||
int hv_register_block_invalidate(struct pci_dev *pdev, void *context,
|
||||
void (*block_invalidate)(void *context,
|
||||
u64 block_mask))
|
||||
static int hv_register_block_invalidate(struct pci_dev *pdev, void *context,
|
||||
void (*block_invalidate)(void *context,
|
||||
u64 block_mask))
|
||||
{
|
||||
struct hv_pcibus_device *hbus =
|
||||
container_of(pdev->bus->sysdata, struct hv_pcibus_device,
|
||||
|
|
@ -2759,10 +2760,8 @@ static int hv_pci_enter_d0(struct hv_device *hdev)
|
|||
struct pci_bus_d0_entry *d0_entry;
|
||||
struct hv_pci_compl comp_pkt;
|
||||
struct pci_packet *pkt;
|
||||
bool retry = true;
|
||||
int ret;
|
||||
|
||||
enter_d0_retry:
|
||||
/*
|
||||
* Tell the host that the bus is ready to use, and moved into the
|
||||
* powered-on state. This includes telling the host which region
|
||||
|
|
@ -2789,38 +2788,6 @@ static int hv_pci_enter_d0(struct hv_device *hdev)
|
|||
if (ret)
|
||||
goto exit;
|
||||
|
||||
/*
|
||||
* In certain case (Kdump) the pci device of interest was
|
||||
* not cleanly shut down and resource is still held on host
|
||||
* side, the host could return invalid device status.
|
||||
* We need to explicitly request host to release the resource
|
||||
* and try to enter D0 again.
|
||||
*/
|
||||
if (comp_pkt.completion_status < 0 && retry) {
|
||||
retry = false;
|
||||
|
||||
dev_err(&hdev->device, "Retrying D0 Entry\n");
|
||||
|
||||
/*
|
||||
* Hv_pci_bus_exit() calls hv_send_resource_released()
|
||||
* to free up resources of its child devices.
|
||||
* In the kdump kernel we need to set the
|
||||
* wslot_res_allocated to 255 so it scans all child
|
||||
* devices to release resources allocated in the
|
||||
* normal kernel before panic happened.
|
||||
*/
|
||||
hbus->wslot_res_allocated = 255;
|
||||
|
||||
ret = hv_pci_bus_exit(hdev, true);
|
||||
|
||||
if (ret == 0) {
|
||||
kfree(pkt);
|
||||
goto enter_d0_retry;
|
||||
}
|
||||
dev_err(&hdev->device,
|
||||
"Retrying D0 failed with ret %d\n", ret);
|
||||
}
|
||||
|
||||
if (comp_pkt.completion_status < 0) {
|
||||
dev_err(&hdev->device,
|
||||
"PCI Pass-through VSP failed D0 Entry with status %x\n",
|
||||
|
|
@ -3058,6 +3025,7 @@ static int hv_pci_probe(struct hv_device *hdev,
|
|||
struct hv_pcibus_device *hbus;
|
||||
u16 dom_req, dom;
|
||||
char *name;
|
||||
bool enter_d0_retry = true;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
|
|
@ -3178,11 +3146,47 @@ static int hv_pci_probe(struct hv_device *hdev,
|
|||
if (ret)
|
||||
goto free_fwnode;
|
||||
|
||||
retry:
|
||||
ret = hv_pci_query_relations(hdev);
|
||||
if (ret)
|
||||
goto free_irq_domain;
|
||||
|
||||
ret = hv_pci_enter_d0(hdev);
|
||||
/*
|
||||
* In certain case (Kdump) the pci device of interest was
|
||||
* not cleanly shut down and resource is still held on host
|
||||
* side, the host could return invalid device status.
|
||||
* We need to explicitly request host to release the resource
|
||||
* and try to enter D0 again.
|
||||
* Since the hv_pci_bus_exit() call releases structures
|
||||
* of all its child devices, we need to start the retry from
|
||||
* hv_pci_query_relations() call, requesting host to send
|
||||
* the synchronous child device relations message before this
|
||||
* information is needed in hv_send_resources_allocated()
|
||||
* call later.
|
||||
*/
|
||||
if (ret == -EPROTO && enter_d0_retry) {
|
||||
enter_d0_retry = false;
|
||||
|
||||
dev_err(&hdev->device, "Retrying D0 Entry\n");
|
||||
|
||||
/*
|
||||
* Hv_pci_bus_exit() calls hv_send_resources_released()
|
||||
* to free up resources of its child devices.
|
||||
* In the kdump kernel we need to set the
|
||||
* wslot_res_allocated to 255 so it scans all child
|
||||
* devices to release resources allocated in the
|
||||
* normal kernel before panic happened.
|
||||
*/
|
||||
hbus->wslot_res_allocated = 255;
|
||||
ret = hv_pci_bus_exit(hdev, true);
|
||||
|
||||
if (ret == 0)
|
||||
goto retry;
|
||||
|
||||
dev_err(&hdev->device,
|
||||
"Retrying D0 failed with ret %d\n", ret);
|
||||
}
|
||||
if (ret)
|
||||
goto free_irq_domain;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue