diff options
author | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 01:16:48 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 13:11:56 +0000 |
commit | 786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch) | |
tree | 926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/layerscape/patches-5.4/812-pcie-0010-PCI-mobiveil-Make-mobiveil_host_init-can-be-used-to-.patch | |
parent | 9470160c350d15f765c33d6c1db15d6c4709a64c (diff) | |
download | upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.gz upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.bz2 upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.zip |
kernel: delete Linux 5.4 config and patches
As the upcoming release will be based on Linux 5.10 only, remove all
kernel configuration as well as patches for Linux 5.4.
There were no targets still actively using Linux 5.4.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606)
Diffstat (limited to 'target/linux/layerscape/patches-5.4/812-pcie-0010-PCI-mobiveil-Make-mobiveil_host_init-can-be-used-to-.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/812-pcie-0010-PCI-mobiveil-Make-mobiveil_host_init-can-be-used-to-.patch | 152 |
1 files changed, 0 insertions, 152 deletions
diff --git a/target/linux/layerscape/patches-5.4/812-pcie-0010-PCI-mobiveil-Make-mobiveil_host_init-can-be-used-to-.patch b/target/linux/layerscape/patches-5.4/812-pcie-0010-PCI-mobiveil-Make-mobiveil_host_init-can-be-used-to-.patch deleted file mode 100644 index e38eca5b8f..0000000000 --- a/target/linux/layerscape/patches-5.4/812-pcie-0010-PCI-mobiveil-Make-mobiveil_host_init-can-be-used-to-.patch +++ /dev/null @@ -1,152 +0,0 @@ -From d4bb5e0d43909758046c527d883405f556de85fa Mon Sep 17 00:00:00 2001 -From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> -Date: Tue, 25 Jun 2019 09:09:14 +0000 -Subject: [PATCH] PCI: mobiveil: Make mobiveil_host_init() can be used to - re-init host - -Make the mobiveil_host_init() function can be used to re-init -host controller's PAB and GPEX CSR register block, as NXP -integrated Mobiveil IP has to reset and then re-init the PAB -and GPEX CSR registers upon hot-reset. - -Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> -Reviewed-by: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in> ---- - .../pci/controller/mobiveil/pcie-mobiveil-host.c | 43 +++++++++++----------- - drivers/pci/controller/mobiveil/pcie-mobiveil.h | 3 +- - 2 files changed, 24 insertions(+), 22 deletions(-) - ---- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c -+++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c -@@ -215,16 +215,21 @@ static void mobiveil_pcie_enable_msi(str - writel_relaxed(1, pcie->apb_csr_base + MSI_ENABLE_OFFSET); - } - --static int mobiveil_host_init(struct mobiveil_pcie *pcie) -+int mobiveil_host_init(struct mobiveil_pcie *pcie, bool reinit) - { - u32 value, pab_ctrl, type; - struct resource_entry *win; - -- /* setup bus numbers */ -- value = csr_readl(pcie, PCI_PRIMARY_BUS); -- value &= 0xff000000; -- value |= 0x00ff0100; -- csr_writel(pcie, value, PCI_PRIMARY_BUS); -+ pcie->ib_wins_configured = 0; -+ pcie->ob_wins_configured = 0; -+ -+ if (!reinit) { -+ /* setup bus numbers */ -+ value = csr_readl(pcie, PCI_PRIMARY_BUS); -+ value &= 0xff000000; -+ value |= 0x00ff0100; -+ csr_writel(pcie, value, PCI_PRIMARY_BUS); -+ } - - /* - * program Bus Master Enable Bit in Command Register in PAB Config -@@ -270,7 +275,7 @@ static int mobiveil_host_init(struct mob - program_ib_windows(pcie, WIN_NUM_0, 0, 0, MEM_WINDOW_TYPE, IB_WIN_SIZE); - - /* Get the I/O and memory ranges from DT */ -- resource_list_for_each_entry(win, &pcie->resources) { -+ resource_list_for_each_entry(win, pcie->resources) { - if (resource_type(win->res) == IORESOURCE_MEM) { - type = MEM_WINDOW_TYPE; - } else if (resource_type(win->res) == IORESOURCE_IO) { -@@ -541,8 +546,6 @@ int mobiveil_pcie_host_probe(struct mobi - resource_size_t iobase; - int ret; - -- INIT_LIST_HEAD(&pcie->resources); -- - ret = mobiveil_pcie_parse_dt(pcie); - if (ret) { - dev_err(dev, "Parsing DT failed, ret: %x\n", ret); -@@ -551,34 +554,35 @@ int mobiveil_pcie_host_probe(struct mobi - - /* parse the host bridge base addresses from the device tree file */ - ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, -- &pcie->resources, &iobase); -+ &bridge->windows, &iobase); - if (ret) { - dev_err(dev, "Getting bridge resources failed\n"); - return ret; - } - -+ pcie->resources = &bridge->windows; -+ - /* - * configure all inbound and outbound windows and prepare the RC for - * config access - */ -- ret = mobiveil_host_init(pcie); -+ ret = mobiveil_host_init(pcie, false); - if (ret) { - dev_err(dev, "Failed to initialize host\n"); -- goto error; -+ return ret; - } - - ret = mobiveil_pcie_interrupt_init(pcie); - if (ret) { - dev_err(dev, "Interrupt init failed\n"); -- goto error; -+ return ret; - } - -- ret = devm_request_pci_bus_resources(dev, &pcie->resources); -+ ret = devm_request_pci_bus_resources(dev, pcie->resources); - if (ret) -- goto error; -+ return ret; - - /* Initialize bridge */ -- list_splice_init(&pcie->resources, &bridge->windows); - bridge->dev.parent = dev; - bridge->sysdata = pcie; - bridge->busnr = pcie->rp.root_bus_nr; -@@ -589,13 +593,13 @@ int mobiveil_pcie_host_probe(struct mobi - ret = mobiveil_bringup_link(pcie); - if (ret) { - dev_info(dev, "link bring-up failed\n"); -- goto error; -+ return ret; - } - - /* setup the kernel resources for the newly added PCIe root bus */ - ret = pci_scan_root_bus_bridge(bridge); - if (ret) -- goto error; -+ return ret; - - bus = bridge->bus; - -@@ -605,7 +609,4 @@ int mobiveil_pcie_host_probe(struct mobi - pci_bus_add_devices(bus); - - return 0; --error: -- pci_free_resource_list(&pcie->resources); -- return ret; - } ---- a/drivers/pci/controller/mobiveil/pcie-mobiveil.h -+++ b/drivers/pci/controller/mobiveil/pcie-mobiveil.h -@@ -153,7 +153,7 @@ struct mobiveil_pab_ops { - - struct mobiveil_pcie { - struct platform_device *pdev; -- struct list_head resources; -+ struct list_head *resources; - void __iomem *csr_axi_slave_base; /* PAB registers base */ - phys_addr_t pcie_reg_base; /* Physical PCIe Controller Base */ - void __iomem *apb_csr_base; /* MSI register base */ -@@ -167,6 +167,7 @@ struct mobiveil_pcie { - }; - - int mobiveil_pcie_host_probe(struct mobiveil_pcie *pcie); -+int mobiveil_host_init(struct mobiveil_pcie *pcie, bool reinit); - bool mobiveil_pcie_link_up(struct mobiveil_pcie *pcie); - int mobiveil_bringup_link(struct mobiveil_pcie *pcie); - void program_ob_windows(struct mobiveil_pcie *pcie, int win_num, u64 cpu_addr, |