6062d85892
Fixes: - CVE-2020-10757 The "mtd: rawnand: Pass a nand_chip object to nand_release()" commit was backported which needed some adaptations to other code. Run tested: ath79 Build tested: ath79 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
24 lines
891 B
Diff
24 lines
891 B
Diff
--- a/drivers/pci/probe.c
|
|
+++ b/drivers/pci/probe.c
|
|
@@ -2655,7 +2655,8 @@ static void pcie_write_mrrs(struct pci_d
|
|
* In the "safe" case, do not configure the MRRS. There appear to be
|
|
* issues with setting MRRS to 0 on a number of devices.
|
|
*/
|
|
- if (pcie_bus_config != PCIE_BUS_PERFORMANCE)
|
|
+ if (pcie_bus_config != PCIE_BUS_PERFORMANCE &&
|
|
+ pcie_bus_config != PCIE_BUS_PEER2PEER)
|
|
return;
|
|
|
|
/*
|
|
--- a/include/linux/pci.h
|
|
+++ b/include/linux/pci.h
|
|
@@ -868,7 +868,7 @@ enum pcie_bus_config_types {
|
|
PCIE_BUS_DEFAULT, /* Ensure MPS matches upstream bridge */
|
|
PCIE_BUS_SAFE, /* Use largest MPS boot-time devices support */
|
|
PCIE_BUS_PERFORMANCE, /* Use MPS and MRRS for best performance */
|
|
- PCIE_BUS_PEER2PEER, /* Set MPS = 128 for all devices */
|
|
+ PCIE_BUS_PEER2PEER, /* set MPS and MRSS to 128 for all devices */
|
|
};
|
|
|
|
extern enum pcie_bus_config_types pcie_bus_config;
|