diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-17 13:40:04 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-18 11:41:38 +0200 |
| commit | c26420b9145759ca99aceef0510ab8b725867c7e (patch) | |
| tree | 25cfab1c162e844b4349695a8ff660e2004229e8 /target/linux/layerscape | |
| parent | 1d1dca45eafac27daa3ec292235399c0090e846e (diff) | |
| download | upstream-c26420b9145759ca99aceef0510ab8b725867c7e.tar.gz upstream-c26420b9145759ca99aceef0510ab8b725867c7e.tar.bz2 upstream-c26420b9145759ca99aceef0510ab8b725867c7e.zip | |
kernel: bump 4.14 to 4.14.126
Refreshed all patches.
Altered patches:
- 816-pcie-support-layerscape.patch
This patch also restores the initial implementation
of the ath79 perfcount IRQ issue. (78ee6b1a40b5)
It was wrongfully backported upstream initially and got reverted now.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/layerscape')
| -rw-r--r-- | target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch index 1085368f18..45141a32dc 100644 --- a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch @@ -620,7 +620,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> int id; char name[20]; enum pci_barno bar; -@@ -476,11 +656,14 @@ static int pci_endpoint_test_probe(struc +@@ -476,12 +656,15 @@ static int pci_endpoint_test_probe(struc test->alignment = 0; test->pdev = pdev; @@ -630,13 +630,14 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> data = (struct pci_endpoint_test_data *)ent->driver_data; if (data) { test_reg_bar = data->test_reg_bar; + test->test_reg_bar = test_reg_bar; test->alignment = data->alignment; - no_msi = data->no_msi; + irq_type = data->irq_type; } init_completion(&test->irq_raised); -@@ -500,35 +683,21 @@ static int pci_endpoint_test_probe(struc +@@ -501,35 +684,21 @@ static int pci_endpoint_test_probe(struc pci_set_master(pdev); @@ -683,7 +684,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> } test->base = test->bar[test_reg_bar]; -@@ -544,24 +713,31 @@ static int pci_endpoint_test_probe(struc +@@ -545,24 +714,31 @@ static int pci_endpoint_test_probe(struc id = ida_simple_get(&pci_endpoint_test_ida, 0, 0, GFP_KERNEL); if (id < 0) { err = id; @@ -719,7 +720,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> err_ida_remove: ida_simple_remove(&pci_endpoint_test_ida, id); -@@ -570,9 +746,10 @@ err_iounmap: +@@ -571,9 +747,10 @@ err_iounmap: if (test->bar[bar]) pci_iounmap(pdev, test->bar[bar]); } @@ -732,7 +733,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> pci_release_regions(pdev); err_disable_pdev: -@@ -594,12 +771,16 @@ static void pci_endpoint_test_remove(str +@@ -595,12 +772,16 @@ static void pci_endpoint_test_remove(str return; misc_deregister(&test->miscdev); @@ -750,7 +751,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> pci_release_regions(pdev); pci_disable_device(pdev); } -@@ -607,6 +788,7 @@ static void pci_endpoint_test_remove(str +@@ -608,6 +789,7 @@ static void pci_endpoint_test_remove(str static const struct pci_device_id pci_endpoint_test_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_DRA74x) }, { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_DRA72x) }, @@ -3227,7 +3228,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> pcie->breg_base = devm_ioremap_resource(dev, res); --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c -@@ -576,15 +576,8 @@ static int xilinx_pcie_parse_dt(struct x +@@ -584,15 +584,8 @@ static int xilinx_pcie_parse_dt(struct x struct device *dev = port->dev; struct device_node *node = dev->of_node; struct resource regs; |