From c9ae111a20be4c9555128cced8edded660d133df Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Tue, 11 Feb 2014 02:07:44 +0000 Subject: mvebu: backport mainline patches from kernel 3.13 This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13. This work mainly covers: * Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family, and the Armada family. * timer initialization update, and access function for the Armada family. * Generic IRQ handling backporting. * Some bug fixes. Signed-off-by: Seif Mazareeb CC: Luka Perkov SVN-Revision: 39566 --- ...ncrement-nports-only-for-registered-ports.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 target/linux/mvebu/patches-3.10/0201-PCI-mvebu-increment-nports-only-for-registered-ports.patch (limited to 'target/linux/mvebu/patches-3.10/0201-PCI-mvebu-increment-nports-only-for-registered-ports.patch') diff --git a/target/linux/mvebu/patches-3.10/0201-PCI-mvebu-increment-nports-only-for-registered-ports.patch b/target/linux/mvebu/patches-3.10/0201-PCI-mvebu-increment-nports-only-for-registered-ports.patch new file mode 100644 index 0000000000..810fbe19e7 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0201-PCI-mvebu-increment-nports-only-for-registered-ports.patch @@ -0,0 +1,47 @@ +From e619fe9eb65d8064739f16eca2015145ac920f13 Mon Sep 17 00:00:00 2001 +From: Sebastian Hesselbarth +Date: Tue, 13 Aug 2013 14:25:21 +0200 +Subject: [PATCH 201/203] PCI: mvebu: increment nports only for registered + ports + +The number of ports is probed by counting the number of available child nodes. +Later on, the registration of a port can fail and cause a mismatch between +the ->nports counter and registered ports. This patch modifies the counting +strategy, to make ->nports represent the number of registered ports instead +of the number of available childs. + +Signed-off-by: Sebastian Hesselbarth +Signed-off-by: Jason Cooper +--- + drivers/pci/host/pci-mvebu.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/pci/host/pci-mvebu.c ++++ b/drivers/pci/host/pci-mvebu.c +@@ -841,13 +841,14 @@ static int __init mvebu_pcie_probe(struc + return ret; + } + ++ i = 0; + for_each_child_of_node(pdev->dev.of_node, child) { + if (!of_device_is_available(child)) + continue; +- pcie->nports++; ++ i++; + } + +- pcie->ports = devm_kzalloc(&pdev->dev, pcie->nports * ++ pcie->ports = devm_kzalloc(&pdev->dev, i * + sizeof(struct mvebu_pcie_port), + GFP_KERNEL); + if (!pcie->ports) +@@ -934,8 +935,8 @@ static int __init mvebu_pcie_probe(struc + i++; + } + ++ pcie->nports = i; + mvebu_pcie_msi_enable(pcie); +- + mvebu_pcie_enable(pcie); + + return 0; -- cgit v1.2.3