| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20161017191626.GC18903@localhost>
Date: Mon, 17 Oct 2016 14:16:26 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: David Singleton <davsingl@...co.com>
Cc: Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>, x86@...nel.org,
Bjorn Helgaas <bhelgaas@...gle.com>,
Arnd Bergmann <arnd@...db.de>, Steve Shih <sshih@...co.com>,
xe-kernel@...ernal.cisco.com, linux-kernel@...r.kernel.org,
linux-pci@...r.kernel.org, linux-arch@...r.kernel.org,
Po Liu <po.liu@....com>
Subject: Re: [PATCH] pcie: aer: aerdrv: PCIe AER workaround and handling for
ASR1K platforms.
[+cc Po]
Hi Steve & David,
On Mon, Oct 17, 2016 at 09:51:06AM -0700, David Singleton wrote:
> From: Steve Shih <sshih@...co.com>
>
> ASR1K FPGAs and ASICs are configured to raise SERR/PERR through PCIe AER.
> When an error is raised, it is detected at the root complex, but it is not
> detected by the AER driver. If the root complex bridge control register is
> configured to forward secondary bus errors to the primary bus (which is not
> the case by default), then the aerdrv.c:aer_irq() is invoked, but the id read
> from the PCI_ERR_ROOT_COR_SRC register is 0. When aer_isr_one_error()
> processes the work posted by aer_irq(), it subsequently complains that
> "aer_isr_one_err->can't find device of ID0000".
>
> Modifications need to be made such that PCIe AER are propagated through the
> root complex detected by the AER driver and delivered to the ASR1K PCI error
> handler.
>
> In additions, MCH5100 and 3500/5500 JF send broadcast EOI to subordinate
> devices. However, the Cisco FPGAs and ASICs don't handle the vendor (Intel)
> specific messages properly and rases Uncorrectable and Unsupported Request
> errors. Thus, need to disable EOI Broadcast.
>
> This change is needed to support 1RU, FP40, Kingpin, FP80, and FP160.
Can you help me understand this? I'm having trouble connecting the
changelog to the patch. The patch adds a pci_aer_set_callbacks()
interface, but no users of it. It also adds a pci_fixup_aer_enable
fixup phase, but it is also unused.
The changelog mentions a change to the root complex bridge control
register, but I don't see that in the patch. It also mentions a
broadcast EOI change, which also doesn't appear in the patch.
We have another platform where AER doesn't work with the existing
Linux driver; see [1]. It'd be nice if it turned out that the same
sort of change would help both that system and your Cisco platforms.
I'm familiar with the normal PCI Bridge Control Register. But I don't
know what the "root complex bridge control register" is. Can you
point me to a section of the spec? Since you mention forwarding
secondary bus errors to the primary bus, maybe you mean a Root Port
bridge control register?
Is this a case of the hardware not quite conforming to the spec, or is
it a case of spec-compliant hardware where Linux is just missing
support for this particular case?
I'm going to resist adding a new fixup phase, especially one as
special-purpose as this one appears to be. Without seeing the way you
want to actually use it, it's hard to tell, but likely one of the
existing fixup phases would be enough.
Bjorn
[1] http://lkml.kernel.org/r/1475226697-7709-3-git-send-email-po.liu@nxp.com
> Cc: xe-kernel@...ernal.cisco.com
> Signed-off-by: Steve Shih <sshih@...co.com>
> Signed-off-by: David Singleton <davsingl@...co.com>
> ---
> arch/x86/Kconfig | 9 +++++++++
> arch/x86/platform/Makefile | 1 +
> drivers/pci/pcie/aer/aerdrv.c | 13 +++++++++++++
> drivers/pci/pcie/aer/aerdrv.h | 5 +++++
> drivers/pci/quirks.c | 7 +++++++
> include/asm-generic/vmlinux.lds.h | 3 +++
> include/linux/pci.h | 5 +++++
> 7 files changed, 43 insertions(+)
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index bada636..11bdcb2 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -449,6 +449,15 @@ config X86_EXTENDED_PLATFORM
> endif
> # This is an alphabetically sorted list of 64 bit extended platforms
> # Please maintain the alphabetic order if and when there are additions
> +
> +config X86_ASR1K
> + bool "Cisco ASR1K"
> + depends on X86_64
> + depends on X86_EXTENDED_PLATFORM
> + ---help---
> + This option is needed in order to support Cisco ASR1K platforms.
> + If you don't have one of these, you should say N here.
> +
> config X86_NUMACHIP
> bool "Numascale NumaChip"
> depends on X86_64
> diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
> index 3c3c19e..cbae8c2 100644
> --- a/arch/x86/platform/Makefile
> +++ b/arch/x86/platform/Makefile
> @@ -1,5 +1,6 @@
> # Platform specific code goes here
> obj-y += atom/
> +obj-$(X86_ASR1K) += asr1k/
> obj-y += ce4100/
> obj-y += efi/
> obj-y += geode/
> diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
> index 139150b..836e0cb 100644
> --- a/drivers/pci/pcie/aer/aerdrv.c
> +++ b/drivers/pci/pcie/aer/aerdrv.c
> @@ -62,6 +62,8 @@ static struct pcie_port_service_driver aerdriver = {
> .reset_link = aer_root_reset,
> };
>
> +static struct pci_aer_callbacks callbacks;
> +
> static int pcie_aer_disable;
>
> void pci_no_aer(void)
> @@ -74,6 +76,11 @@ bool pci_aer_available(void)
> return !pcie_aer_disable && pci_msi_enabled();
> }
>
> +void pci_aer_set_callbacks(struct pci_aer_callbacks *cb)
> +{
> + memcpy(&callbacks, cb, sizeof(*cb));
> +}
> +
> static int set_device_error_reporting(struct pci_dev *dev, void *data)
> {
> bool enable = *((bool *)data);
> @@ -149,6 +156,8 @@ static void aer_enable_rootport(struct aer_rpc *rpc)
> pci_read_config_dword(pdev, aer_pos + PCI_ERR_ROOT_COMMAND, ®32);
> reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;
> pci_write_config_dword(pdev, aer_pos + PCI_ERR_ROOT_COMMAND, reg32);
> +
> + pci_fixup_device(pci_fixup_aer_enable, pdev);
> }
>
> /**
> @@ -212,6 +221,10 @@ irqreturn_t aer_irq(int irq, void *context)
>
> /* Read error source and clear error status */
> pci_read_config_dword(pdev->port, pos + PCI_ERR_ROOT_ERR_SRC, &id);
> +
> + if (callbacks.error_source)
> + callbacks.error_source(pdev->port, &id);
> +
> pci_write_config_dword(pdev->port, pos + PCI_ERR_ROOT_STATUS, status);
>
> /* Store error source for later DPC handler */
> diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
> index d51e4a5..79ac642 100644
> --- a/drivers/pci/pcie/aer/aerdrv.h
> +++ b/drivers/pci/pcie/aer/aerdrv.h
> @@ -80,6 +80,10 @@ struct aer_broadcast_data {
> enum pci_ers_result result;
> };
>
> +struct pci_aer_callbacks {
> + int (*error_source)(struct pci_dev *dev, unsigned int *id);
> +};
> +
> static inline pci_ers_result_t merge_result(enum pci_ers_result orig,
> enum pci_ers_result new)
> {
> @@ -110,6 +114,7 @@ void aer_isr(struct work_struct *work);
> void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);
> void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info);
> irqreturn_t aer_irq(int irq, void *context);
> +void pci_aer_set_callbacks(struct pci_aer_callbacks *cb);
>
> #ifdef CONFIG_ACPI_APEI
> int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index c232729..63b33ff 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -3397,6 +3397,8 @@ extern struct pci_fixup __start_pci_fixups_suspend[];
> extern struct pci_fixup __end_pci_fixups_suspend[];
> extern struct pci_fixup __start_pci_fixups_suspend_late[];
> extern struct pci_fixup __end_pci_fixups_suspend_late[];
> +extern struct pci_fixup __start_pci_fixups_aer_enable[];
> +extern struct pci_fixup __end_pci_fixups_aer_enable[];
>
> static bool pci_apply_fixup_final_quirks;
>
> @@ -3447,6 +3449,11 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
> end = __end_pci_fixups_suspend_late;
> break;
>
> + case pci_fixup_aer_enable:
> + start = __start_pci_fixups_aer_enable;
> + end = __end_pci_fixups_aer_enable;
> + break;
> +
> default:
> /* stupid compiler warning, you would think with an enum... */
> return;
> diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
> index 3e42bcd..4155e8c 100644
> --- a/include/asm-generic/vmlinux.lds.h
> +++ b/include/asm-generic/vmlinux.lds.h
> @@ -306,6 +306,9 @@
> VMLINUX_SYMBOL(__start_pci_fixups_suspend_late) = .; \
> *(.pci_fixup_suspend_late) \
> VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .; \
> + VMLINUX_SYMBOL(__start_pci_fixups_aer_enable) = .; \
> + *(.pci_fixup_aer_enable) \
> + VMLINUX_SYMBOL(__end_pci_fixups_aer_enable) = .; \
> } \
> \
> /* Built-in firmware blobs */ \
> diff --git a/include/linux/pci.h b/include/linux/pci.h
> index 0e49f70..9a9119c 100644
> --- a/include/linux/pci.h
> +++ b/include/linux/pci.h
> @@ -1689,6 +1689,7 @@ enum pci_fixup_pass {
> pci_fixup_suspend, /* pci_device_suspend() */
> pci_fixup_resume_early, /* pci_device_resume_early() */
> pci_fixup_suspend_late, /* pci_device_suspend_late() */
> + pci_fixup_aer_enable, /* pci_device_aer_enable() */
> };
>
> /* Anonymous variables would be nice... */
> @@ -1763,6 +1764,10 @@ enum pci_fixup_pass {
> DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend_late, \
> suspend_late##hook, vendor, device, \
> PCI_ANY_ID, 0, hook)
> +#define DECLARE_PCI_FIXUP_AER_ENABLE(vendor, device, hook) \
> + DECLARE_PCI_FIXUP_SECTION(.pci_fixup_aer_enable, \
> + aer_enable##vendor##device##hook, vendor, device, \
> + PCI_ANY_ID, 0, hook)
>
> #ifdef CONFIG_PCI_QUIRKS
> void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);
> --
> 2.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists