Patch "PCI: layerscape: Fix MSG TLP drop setting" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
PCI: layerscape: Fix MSG TLP drop setting
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pci-layerscape-fix-msg-tlp-drop-setting.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
1195c103f6c98d9ff381cac3a8760d4f8a133627Mon Sep 17 00:00:00 2001
From: Minghuan Lian <[email protected]>
Date: Mon, 29 Feb 2016 17:24:15 -0600
Subject: PCI: layerscape: Fix MSG TLP drop setting
From: Minghuan Lian <[email protected]>
commit 1195c103f6c98d9ff381cac3a8760d4f8a133627 upstream.
Some kinds of Layerscape PCIe controllers will forward the received message TLPs to system application address space, which could corrupt system memory or lead to a system hang. Enable MSG_DROP to fix this issue.
--- drivers/pci/host/pci-layerscape.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/pci/host/pci-layerscape.c +13 -8
@@ -77,6 +77,16 @@ static void ls_pcie_fix_class(struct ls_iowrite16 (PCI_CLASS_BRIDGE_PCI , pcie->dbi +PCI_CLASS_DEVICE ); } +/* Drop MSG TLP except for Vendor MSG */ +static void ls_pcie_drop_msg_tlp (struct ls_pcie *pcie) +{ +u32 val; + + val =ioread32 (pcie->dbi +PCIE_STRFMR1 ); + val &=0xDFFFFFFF ; +iowrite32 (val, pcie->dbi +PCIE_STRFMR1 ); +} +static int ls1021_pcie_link_up (struct pcie_port *pp) {u32 state;
@@ -97,7 +107,7 @@ static int ls1021_pcie_link_up(struct pcstatic void ls1021_pcie_host_init (struct pcie_port *pp) {struct ls_pcie *pcie =to_ls_pcie (pp); -u32 val, index[2 ]; +u32 index[2 ]; pcie->scfg =syscon_regmap_lookup_by_phandle (pp->dev->of_node,"fsl,pcie-scfg" );
@@ -116,13 +126,7 @@ static void ls1021_pcie_host_init(structdw_pcie_setup_rc (pp); -/* -* LS1021A Workaround for internal TKT228622 -* to fix the INTx hang issue -*/ - val =ioread32 (pcie->dbi +PCIE_STRFMR1 ); - val &=0xffff ; -iowrite32 (val, pcie->dbi +PCIE_STRFMR1 ); +ls_pcie_drop_msg_tlp (pcie); }static int ls_pcie_link_up (struct pcie_port *pp)
@@ -147,6 +151,7 @@ static void ls_pcie_host_init(struct pciiowrite32 (1 , pcie->dbi +PCIE_DBI_RO_WR_EN );ls_pcie_fix_class (pcie);ls_pcie_clear_multifunction (pcie); +ls_pcie_drop_msg_tlp (pcie);iowrite32 (0 , pcie->dbi +PCIE_DBI_RO_WR_EN ); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/pci-layerscape-fix-msg-tlp-drop-setting.patch