mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
d14aa19904
Refreshed all patches. Altered patches: - 816-pcie-support-layerscape.patch Fixes: - CVE-2019-15030 Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
50 lines
1.3 KiB
Diff
50 lines
1.3 KiB
Diff
--- a/arch/mips/ath79/common.c
|
|
+++ b/arch/mips/ath79/common.c
|
|
@@ -49,6 +49,8 @@ void ath79_ddr_ctrl_init(void)
|
|
if (soc_is_ar913x() || soc_is_ar724x() || soc_is_ar933x()) {
|
|
ath79_ddr_wb_flush_base = ath79_ddr_base + 0x7c;
|
|
ath79_ddr_pci_win_base = 0;
|
|
+ } else if (soc_is_qca953x() || soc_is_qca955x()) {
|
|
+ ath79_ddr_wb_flush_base = ath79_ddr_base + 0x9c;
|
|
} else {
|
|
ath79_ddr_wb_flush_base = ath79_ddr_base + 0x9c;
|
|
ath79_ddr_pci_win_base = ath79_ddr_base + 0x7c;
|
|
--- a/arch/mips/ath79/irq.c
|
|
+++ b/arch/mips/ath79/irq.c
|
|
@@ -105,12 +105,12 @@ static void qca955x_ip2_irq_dispatch(str
|
|
}
|
|
|
|
if (status & QCA955X_EXT_INT_PCIE_RC1_ALL) {
|
|
- /* TODO: flush DDR? */
|
|
+ ath79_ddr_wb_flush(3);
|
|
generic_handle_irq(ATH79_IP2_IRQ(0));
|
|
}
|
|
|
|
if (status & QCA955X_EXT_INT_WMAC_ALL) {
|
|
- /* TODO: flush DDR? */
|
|
+ ath79_ddr_wb_flush(4);
|
|
generic_handle_irq(ATH79_IP2_IRQ(1));
|
|
}
|
|
}
|
|
@@ -130,17 +130,17 @@ static void qca955x_ip3_irq_dispatch(str
|
|
}
|
|
|
|
if (status & QCA955X_EXT_INT_USB1) {
|
|
- /* TODO: flush DDR? */
|
|
+ ath79_ddr_wb_flush(2);
|
|
generic_handle_irq(ATH79_IP3_IRQ(0));
|
|
}
|
|
|
|
if (status & QCA955X_EXT_INT_USB2) {
|
|
- /* TODO: flush DDR? */
|
|
+ ath79_ddr_wb_flush(2);
|
|
generic_handle_irq(ATH79_IP3_IRQ(1));
|
|
}
|
|
|
|
if (status & QCA955X_EXT_INT_PCIE_RC2_ALL) {
|
|
- /* TODO: flush DDR? */
|
|
+ ath79_ddr_wb_flush(3);
|
|
generic_handle_irq(ATH79_IP3_IRQ(2));
|
|
}
|
|
}
|