mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 04:38:03 +00:00
powerpc fixes for 6.12 #2
- Fix build error in vdso32 when building 64-bit with COMPAT=y and -Os. - Fix build error in pseries EEH when CONFIG_DEBUG_FS is not set. Thanks to: Christophe Leroy, Narayana Murty N, Christian Zigotzky, Ritesh Harjani. -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRjvi15rv0TSTaE+SIF0oADX8seIQUCZvPfwQAKCRAF0oADX8se IeqKAPkBZJBXheDywa0aZ1hIKfwB2mWeAMgZLb1AhWeAGpJMBAEA9LtZbM4KhQHG r2JCuHtV7rDyTG04+97V/K4M2iQSsgg= =cygk -----END PGP SIGNATURE----- Merge tag 'powerpc-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux Pull powerpc fixes from Michael Ellerman: - Fix build error in vdso32 when building 64-bit with COMPAT=y and -Os - Fix build error in pseries EEH when CONFIG_DEBUG_FS is not set Thanks to Christophe Leroy, Narayana Murty N, Christian Zigotzky, and Ritesh Harjani. * tag 'powerpc-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/pseries/eeh: move pseries_eeh_err_inject() outside CONFIG_DEBUG_FS block powerpc/vdso32: Fix use of crtsavres for PPC64
This commit is contained in:
Linus Torvalds
commit
4ffc458083
@ -1574,6 +1574,104 @@ static int proc_eeh_show(struct seq_file *m, void *v)
|
||||
}
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
static int eeh_break_device(struct pci_dev *pdev)
|
||||
{
|
||||
struct resource *bar = NULL;
|
||||
void __iomem *mapped;
|
||||
u16 old, bit;
|
||||
int i, pos;
|
||||
|
||||
/* Do we have an MMIO BAR to disable? */
|
||||
for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
|
||||
struct resource *r = &pdev->resource[i];
|
||||
|
||||
if (!r->flags || !r->start)
|
||||
continue;
|
||||
if (r->flags & IORESOURCE_IO)
|
||||
continue;
|
||||
if (r->flags & IORESOURCE_UNSET)
|
||||
continue;
|
||||
|
||||
bar = r;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!bar) {
|
||||
pci_err(pdev, "Unable to find Memory BAR to cause EEH with\n");
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
pci_err(pdev, "Going to break: %pR\n", bar);
|
||||
|
||||
if (pdev->is_virtfn) {
|
||||
#ifndef CONFIG_PCI_IOV
|
||||
return -ENXIO;
|
||||
#else
|
||||
/*
|
||||
* VFs don't have a per-function COMMAND register, so the best
|
||||
* we can do is clear the Memory Space Enable bit in the PF's
|
||||
* SRIOV control reg.
|
||||
*
|
||||
* Unfortunately, this requires that we have a PF (i.e doesn't
|
||||
* work for a passed-through VF) and it has the potential side
|
||||
* effect of also causing an EEH on every other VF under the
|
||||
* PF. Oh well.
|
||||
*/
|
||||
pdev = pdev->physfn;
|
||||
if (!pdev)
|
||||
return -ENXIO; /* passed through VFs have no PF */
|
||||
|
||||
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);
|
||||
pos += PCI_SRIOV_CTRL;
|
||||
bit = PCI_SRIOV_CTRL_MSE;
|
||||
#endif /* !CONFIG_PCI_IOV */
|
||||
} else {
|
||||
bit = PCI_COMMAND_MEMORY;
|
||||
pos = PCI_COMMAND;
|
||||
}
|
||||
|
||||
/*
|
||||
* Process here is:
|
||||
*
|
||||
* 1. Disable Memory space.
|
||||
*
|
||||
* 2. Perform an MMIO to the device. This should result in an error
|
||||
* (CA / UR) being raised by the device which results in an EEH
|
||||
* PE freeze. Using the in_8() accessor skips the eeh detection hook
|
||||
* so the freeze hook so the EEH Detection machinery won't be
|
||||
* triggered here. This is to match the usual behaviour of EEH
|
||||
* where the HW will asynchronously freeze a PE and it's up to
|
||||
* the kernel to notice and deal with it.
|
||||
*
|
||||
* 3. Turn Memory space back on. This is more important for VFs
|
||||
* since recovery will probably fail if we don't. For normal
|
||||
* the COMMAND register is reset as a part of re-initialising
|
||||
* the device.
|
||||
*
|
||||
* Breaking stuff is the point so who cares if it's racy ;)
|
||||
*/
|
||||
pci_read_config_word(pdev, pos, &old);
|
||||
|
||||
mapped = ioremap(bar->start, PAGE_SIZE);
|
||||
if (!mapped) {
|
||||
pci_err(pdev, "Unable to map MMIO BAR %pR\n", bar);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
pci_write_config_word(pdev, pos, old & ~bit);
|
||||
in_8(mapped);
|
||||
pci_write_config_word(pdev, pos, old);
|
||||
|
||||
iounmap(mapped);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int eeh_pe_inject_mmio_error(struct pci_dev *pdev)
|
||||
{
|
||||
return eeh_break_device(pdev);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
|
||||
|
||||
@ -1725,99 +1823,6 @@ static const struct file_operations eeh_dev_check_fops = {
|
||||
.read = eeh_debugfs_dev_usage,
|
||||
};
|
||||
|
||||
static int eeh_debugfs_break_device(struct pci_dev *pdev)
|
||||
{
|
||||
struct resource *bar = NULL;
|
||||
void __iomem *mapped;
|
||||
u16 old, bit;
|
||||
int i, pos;
|
||||
|
||||
/* Do we have an MMIO BAR to disable? */
|
||||
for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
|
||||
struct resource *r = &pdev->resource[i];
|
||||
|
||||
if (!r->flags || !r->start)
|
||||
continue;
|
||||
if (r->flags & IORESOURCE_IO)
|
||||
continue;
|
||||
if (r->flags & IORESOURCE_UNSET)
|
||||
continue;
|
||||
|
||||
bar = r;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!bar) {
|
||||
pci_err(pdev, "Unable to find Memory BAR to cause EEH with\n");
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
pci_err(pdev, "Going to break: %pR\n", bar);
|
||||
|
||||
if (pdev->is_virtfn) {
|
||||
#ifndef CONFIG_PCI_IOV
|
||||
return -ENXIO;
|
||||
#else
|
||||
/*
|
||||
* VFs don't have a per-function COMMAND register, so the best
|
||||
* we can do is clear the Memory Space Enable bit in the PF's
|
||||
* SRIOV control reg.
|
||||
*
|
||||
* Unfortunately, this requires that we have a PF (i.e doesn't
|
||||
* work for a passed-through VF) and it has the potential side
|
||||
* effect of also causing an EEH on every other VF under the
|
||||
* PF. Oh well.
|
||||
*/
|
||||
pdev = pdev->physfn;
|
||||
if (!pdev)
|
||||
return -ENXIO; /* passed through VFs have no PF */
|
||||
|
||||
pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);
|
||||
pos += PCI_SRIOV_CTRL;
|
||||
bit = PCI_SRIOV_CTRL_MSE;
|
||||
#endif /* !CONFIG_PCI_IOV */
|
||||
} else {
|
||||
bit = PCI_COMMAND_MEMORY;
|
||||
pos = PCI_COMMAND;
|
||||
}
|
||||
|
||||
/*
|
||||
* Process here is:
|
||||
*
|
||||
* 1. Disable Memory space.
|
||||
*
|
||||
* 2. Perform an MMIO to the device. This should result in an error
|
||||
* (CA / UR) being raised by the device which results in an EEH
|
||||
* PE freeze. Using the in_8() accessor skips the eeh detection hook
|
||||
* so the freeze hook so the EEH Detection machinery won't be
|
||||
* triggered here. This is to match the usual behaviour of EEH
|
||||
* where the HW will asynchronously freeze a PE and it's up to
|
||||
* the kernel to notice and deal with it.
|
||||
*
|
||||
* 3. Turn Memory space back on. This is more important for VFs
|
||||
* since recovery will probably fail if we don't. For normal
|
||||
* the COMMAND register is reset as a part of re-initialising
|
||||
* the device.
|
||||
*
|
||||
* Breaking stuff is the point so who cares if it's racy ;)
|
||||
*/
|
||||
pci_read_config_word(pdev, pos, &old);
|
||||
|
||||
mapped = ioremap(bar->start, PAGE_SIZE);
|
||||
if (!mapped) {
|
||||
pci_err(pdev, "Unable to map MMIO BAR %pR\n", bar);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
pci_write_config_word(pdev, pos, old & ~bit);
|
||||
in_8(mapped);
|
||||
pci_write_config_word(pdev, pos, old);
|
||||
|
||||
iounmap(mapped);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t eeh_dev_break_write(struct file *filp,
|
||||
const char __user *user_buf,
|
||||
size_t count, loff_t *ppos)
|
||||
@ -1829,7 +1834,7 @@ static ssize_t eeh_dev_break_write(struct file *filp,
|
||||
if (IS_ERR(pdev))
|
||||
return PTR_ERR(pdev);
|
||||
|
||||
ret = eeh_debugfs_break_device(pdev);
|
||||
ret = eeh_break_device(pdev);
|
||||
pci_dev_put(pdev);
|
||||
|
||||
if (ret < 0)
|
||||
@ -1844,11 +1849,6 @@ static const struct file_operations eeh_dev_break_fops = {
|
||||
.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,
|
||||
const char __user *user_buf,
|
||||
size_t count, loff_t *ppos)
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
|
||||
.section ".text"
|
||||
|
||||
#ifndef CONFIG_PPC64
|
||||
#ifndef __powerpc64__
|
||||
|
||||
/* Routines for saving integer registers, called by the compiler. */
|
||||
/* Called with r11 pointing to the stack header word of the caller of the */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user