powerpc/pseries/eeh: Fix pseries_eeh_err_inject
VFIO_EEH_PE_INJECT_ERR ioctl is currently failing on pseries due to missing implementation of err_inject eeh_ops for pseries. This patch implements pseries_eeh_err_inject in eeh_ops/pseries eeh_ops. Implements support for injecting MMIO load/store error for testing from user space. The check on PCI error type (bus type) code is moved to platform code, since the eeh_pe_inject_err can be allowed to more error types depending on platform requirement. Removal of the check for 'type' in eeh_pe_inject_err() doesn't impact PowerNV as pnv_eeh_err_inject() already has an equivalent check in place. Signed-off-by: Narayana Murty N <nnmlinux@linux.ibm.com> Reviewed-by: Vaibhav Jain <vaibhav@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20240909140220.529333-1-nnmlinux@linux.ibm.com
This commit is contained in:
parent
8c9c01ce69
commit
b0e2b828df
3 changed files with 44 additions and 5 deletions
|
@ -308,6 +308,7 @@ int eeh_pe_reset(struct eeh_pe *pe, int option, bool include_passed);
|
||||||
int eeh_pe_configure(struct eeh_pe *pe);
|
int eeh_pe_configure(struct eeh_pe *pe);
|
||||||
int eeh_pe_inject_err(struct eeh_pe *pe, int type, int func,
|
int eeh_pe_inject_err(struct eeh_pe *pe, int type, int func,
|
||||||
unsigned long addr, unsigned long mask);
|
unsigned long addr, unsigned long mask);
|
||||||
|
int eeh_pe_inject_mmio_error(struct pci_dev *pdev);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EEH_POSSIBLE_ERROR() -- test for possible MMIO failure.
|
* EEH_POSSIBLE_ERROR() -- test for possible MMIO failure.
|
||||||
|
|
|
@ -1537,10 +1537,6 @@ int eeh_pe_inject_err(struct eeh_pe *pe, int type, int func,
|
||||||
if (!eeh_ops || !eeh_ops->err_inject)
|
if (!eeh_ops || !eeh_ops->err_inject)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
||||||
/* Check on PCI error type */
|
|
||||||
if (type != EEH_ERR_TYPE_32 && type != EEH_ERR_TYPE_64)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
/* Check on PCI error function */
|
/* Check on PCI error function */
|
||||||
if (func < EEH_ERR_FUNC_MIN || func > EEH_ERR_FUNC_MAX)
|
if (func < EEH_ERR_FUNC_MIN || func > EEH_ERR_FUNC_MAX)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -1848,6 +1844,11 @@ static const struct file_operations eeh_dev_break_fops = {
|
||||||
.read = eeh_debugfs_dev_usage,
|
.read = eeh_debugfs_dev_usage,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
int eeh_pe_inject_mmio_error(struct pci_dev *pdev)
|
||||||
|
{
|
||||||
|
return eeh_debugfs_break_device(pdev);
|
||||||
|
}
|
||||||
|
|
||||||
static ssize_t eeh_dev_can_recover(struct file *filp,
|
static ssize_t eeh_dev_can_recover(struct file *filp,
|
||||||
const char __user *user_buf,
|
const char __user *user_buf,
|
||||||
size_t count, loff_t *ppos)
|
size_t count, loff_t *ppos)
|
||||||
|
|
|
@ -784,6 +784,43 @@ static int pseries_notify_resume(struct eeh_dev *edev)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* pseries_eeh_err_inject - Inject specified error to the indicated PE
|
||||||
|
* @pe: the indicated PE
|
||||||
|
* @type: error type
|
||||||
|
* @func: specific error type
|
||||||
|
* @addr: address
|
||||||
|
* @mask: address mask
|
||||||
|
* The routine is called to inject specified error, which is
|
||||||
|
* determined by @type and @func, to the indicated PE
|
||||||
|
*/
|
||||||
|
static int pseries_eeh_err_inject(struct eeh_pe *pe, int type, int func,
|
||||||
|
unsigned long addr, unsigned long mask)
|
||||||
|
{
|
||||||
|
struct eeh_dev *pdev;
|
||||||
|
|
||||||
|
/* Check on PCI error type */
|
||||||
|
if (type != EEH_ERR_TYPE_32 && type != EEH_ERR_TYPE_64)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
switch (func) {
|
||||||
|
case EEH_ERR_FUNC_LD_MEM_ADDR:
|
||||||
|
case EEH_ERR_FUNC_LD_MEM_DATA:
|
||||||
|
case EEH_ERR_FUNC_ST_MEM_ADDR:
|
||||||
|
case EEH_ERR_FUNC_ST_MEM_DATA:
|
||||||
|
/* injects a MMIO error for all pdev's belonging to PE */
|
||||||
|
pci_lock_rescan_remove();
|
||||||
|
list_for_each_entry(pdev, &pe->edevs, entry)
|
||||||
|
eeh_pe_inject_mmio_error(pdev->pdev);
|
||||||
|
pci_unlock_rescan_remove();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return -ERANGE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static struct eeh_ops pseries_eeh_ops = {
|
static struct eeh_ops pseries_eeh_ops = {
|
||||||
.name = "pseries",
|
.name = "pseries",
|
||||||
.probe = pseries_eeh_probe,
|
.probe = pseries_eeh_probe,
|
||||||
|
@ -792,7 +829,7 @@ static struct eeh_ops pseries_eeh_ops = {
|
||||||
.reset = pseries_eeh_reset,
|
.reset = pseries_eeh_reset,
|
||||||
.get_log = pseries_eeh_get_log,
|
.get_log = pseries_eeh_get_log,
|
||||||
.configure_bridge = pseries_eeh_configure_bridge,
|
.configure_bridge = pseries_eeh_configure_bridge,
|
||||||
.err_inject = NULL,
|
.err_inject = pseries_eeh_err_inject,
|
||||||
.read_config = pseries_eeh_read_config,
|
.read_config = pseries_eeh_read_config,
|
||||||
.write_config = pseries_eeh_write_config,
|
.write_config = pseries_eeh_write_config,
|
||||||
.next_error = NULL,
|
.next_error = NULL,
|
||||||
|
|
Loading…
Add table
Reference in a new issue