mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-14 19:23:53 +02:00
cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
27 lines
956 B
Diff
27 lines
956 B
Diff
From 74de99b0e1df634949c45df1c370d458e6a3c98a Mon Sep 17 00:00:00 2001
|
|
From: Jan Kiszka <jan.kiszka@siemens.com>
|
|
Date: Sun, 1 Jan 2017 15:54:55 +0100
|
|
Subject: [PATCH] ivshmem-net: Fix stuck state machine during setup
|
|
|
|
If the remote side is already in INIT state (or even higher) and has a
|
|
cached rstate of RESET, we won't make progress when signaling RESET
|
|
again because the remote side won't send a state update. Fix this by
|
|
enforcing a local check after probe completion.
|
|
|
|
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
|
|
(cherry picked from commit fceed9d0ab2486589c57c0793fbfbca4832442b9)
|
|
---
|
|
drivers/net/ivshmem-net.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/net/ivshmem-net.c
|
|
+++ b/drivers/net/ivshmem-net.c
|
|
@@ -911,6 +911,7 @@ static int ivshm_net_probe(struct pci_de
|
|
writel(IVSHMEM_INTX_ENABLE, &in->ivshm_regs->intxctrl);
|
|
|
|
writel(IVSHM_NET_STATE_RESET, &in->ivshm_regs->lstate);
|
|
+ ivshm_net_check_state(ndev);
|
|
|
|
return 0;
|
|
|