diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 01:34:26 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 21:12:42 +0200 |
commit | 6062d858929df927e244280ec4864b35a217d6d1 (patch) | |
tree | 6ff4342b85f5b4953b16f9561176d2ea0f1b4fa2 /target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch | |
parent | ce958dd88a7e74cd7aa7c345c97c79556bc2d926 (diff) | |
download | upstream-6062d858929df927e244280ec4864b35a217d6d1.tar.gz upstream-6062d858929df927e244280ec4864b35a217d6d1.tar.bz2 upstream-6062d858929df927e244280ec4864b35a217d6d1.zip |
kernel: Update kernel 4.19 to version 4.19.131
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>
Diffstat (limited to 'target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch')
-rw-r--r-- | target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch b/target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch index d4c4ea7738..f350564977 100644 --- a/target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch +++ b/target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch @@ -28,7 +28,7 @@ #include <linux/of_address.h> #include <linux/of_pci.h> #include <linux/of_platform.h> -@@ -162,6 +163,7 @@ struct mtk_pcie_soc { +@@ -167,6 +168,7 @@ struct mtk_pcie_soc { * @phy: pointer to PHY control block * @lane: lane count * @slot: port slot @@ -36,7 +36,7 @@ * @irq_domain: legacy INTx IRQ domain * @inner_domain: inner IRQ domain * @msi_domain: MSI IRQ domain -@@ -182,6 +184,7 @@ struct mtk_pcie_port { +@@ -187,6 +189,7 @@ struct mtk_pcie_port { struct phy *phy; u32 lane; u32 slot; @@ -44,7 +44,7 @@ struct irq_domain *irq_domain; struct irq_domain *inner_domain; struct irq_domain *msi_domain; -@@ -225,10 +228,8 @@ static void mtk_pcie_subsys_powerdown(st +@@ -230,10 +233,8 @@ static void mtk_pcie_subsys_powerdown(st clk_disable_unprepare(pcie->free_ck); @@ -57,7 +57,7 @@ } static void mtk_pcie_port_free(struct mtk_pcie_port *port) -@@ -532,6 +533,27 @@ static void mtk_pcie_enable_msi(struct m +@@ -537,6 +538,27 @@ static void mtk_pcie_enable_msi(struct m writel(val, port->base + PCIE_INT_MASK); } @@ -85,7 +85,7 @@ static int mtk_pcie_intx_map(struct irq_domain *domain, unsigned int irq, irq_hw_number_t hwirq) { -@@ -561,6 +583,7 @@ static int mtk_pcie_init_irq_domain(stru +@@ -566,6 +588,7 @@ static int mtk_pcie_init_irq_domain(stru port->irq_domain = irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX, &intx_domain_ops, port); @@ -93,7 +93,7 @@ if (!port->irq_domain) { dev_err(dev, "failed to get INTx IRQ domain\n"); return -ENODEV; -@@ -622,7 +645,7 @@ static int mtk_pcie_setup_irq(struct mtk +@@ -627,7 +650,7 @@ static int mtk_pcie_setup_irq(struct mtk struct mtk_pcie *pcie = port->pcie; struct device *dev = pcie->dev; struct platform_device *pdev = to_platform_device(dev); @@ -102,7 +102,7 @@ err = mtk_pcie_init_irq_domain(port, node); if (err) { -@@ -630,8 +653,9 @@ static int mtk_pcie_setup_irq(struct mtk +@@ -635,8 +658,9 @@ static int mtk_pcie_setup_irq(struct mtk return err; } @@ -114,7 +114,7 @@ return 0; } -@@ -904,49 +928,29 @@ static int mtk_pcie_parse_port(struct mt +@@ -912,49 +936,29 @@ static int mtk_pcie_parse_port(struct mt /* sys_ck might be divided into the following parts in some chips */ snprintf(name, sizeof(name), "ahb_ck%d", slot); @@ -179,7 +179,7 @@ snprintf(name, sizeof(name), "pcie-rst%d", slot); port->reset = devm_reset_control_get_optional_exclusive(dev, name); -@@ -999,10 +1003,8 @@ static int mtk_pcie_subsys_powerup(struc +@@ -1007,10 +1011,8 @@ static int mtk_pcie_subsys_powerup(struc pcie->free_ck = NULL; } @@ -192,7 +192,7 @@ /* enable top level clock */ err = clk_prepare_enable(pcie->free_ck); -@@ -1014,10 +1016,8 @@ static int mtk_pcie_subsys_powerup(struc +@@ -1022,10 +1024,8 @@ static int mtk_pcie_subsys_powerup(struc return 0; err_free_ck: @@ -205,7 +205,7 @@ return err; } -@@ -1122,36 +1122,6 @@ static int mtk_pcie_request_resources(st +@@ -1130,36 +1130,6 @@ static int mtk_pcie_request_resources(st return err; err = devm_pci_remap_iospace(dev, &pcie->pio, pcie->io.start); @@ -242,7 +242,7 @@ return 0; } -@@ -1182,7 +1152,14 @@ static int mtk_pcie_probe(struct platfor +@@ -1190,7 +1160,14 @@ static int mtk_pcie_probe(struct platfor if (err) goto put_resources; @@ -258,7 +258,7 @@ if (err) goto put_resources; -@@ -1195,6 +1172,80 @@ put_resources: +@@ -1203,6 +1180,80 @@ put_resources: return err; } @@ -339,7 +339,7 @@ static const struct mtk_pcie_soc mtk_pcie_soc_v1 = { .ops = &mtk_pcie_ops, .startup = mtk_pcie_startup_port, -@@ -1223,10 +1274,13 @@ static const struct of_device_id mtk_pci +@@ -1241,10 +1292,13 @@ static const struct of_device_id mtk_pci static struct platform_driver mtk_pcie_driver = { .probe = mtk_pcie_probe, |