aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-3.10/0048-PCI-mvebu-Check-valid-base-address-before-port-setup.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-02-11 02:07:38 +0000
committerLuka Perkov <luka@openwrt.org>2014-02-11 02:07:38 +0000
commita8c10d8f903682fb3dde82084665a9a72216b02e (patch)
treec62a7fd987aaeef721141f541c4477b8427e22ea /target/linux/mvebu/patches-3.10/0048-PCI-mvebu-Check-valid-base-address-before-port-setup.patch
parente84b7226b0a6713c4edbb8aab562413766eb64d0 (diff)
downloadmaster-187ad058-a8c10d8f903682fb3dde82084665a9a72216b02e.tar.gz
master-187ad058-a8c10d8f903682fb3dde82084665a9a72216b02e.tar.bz2
master-187ad058-a8c10d8f903682fb3dde82084665a9a72216b02e.zip
mvebu: backport mainline patches from kernel 3.11
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.10, and Linux v3.11. This work mainly covers: * Enabling USB storage, and PCI to mvebu_defconfig. * Add support for NOR flash. * Some PCI device tree related updates, and bus parsing. * Adding Armada XP & 370 PCI driver, and update some clock gating specifics. * Introduce Marvell EBU Device Bus driver. * Enaling USB in the armada*.dts. * Enabling, and updating the mvebu-mbus. * Some SATA and Ethernet related fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0048-PCI-mvebu-Check-valid-base-address-before-port-setup.patch')
-rw-r--r--target/linux/mvebu/patches-3.10/0048-PCI-mvebu-Check-valid-base-address-before-port-setup.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0048-PCI-mvebu-Check-valid-base-address-before-port-setup.patch b/target/linux/mvebu/patches-3.10/0048-PCI-mvebu-Check-valid-base-address-before-port-setup.patch
new file mode 100644
index 0000000000..c9022bbc77
--- /dev/null
+++ b/target/linux/mvebu/patches-3.10/0048-PCI-mvebu-Check-valid-base-address-before-port-setup.patch
@@ -0,0 +1,29 @@
+From 3dc077a80c71050e198e7884707ece042443fe3c Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Tue, 23 Jul 2013 07:36:00 -0300
+Subject: [PATCH 048/203] PCI: mvebu: Check valid base address before port
+ setup
+
+This driver does not fail to probe when it cannot obtain
+a port base address. Therefore, add a check for NULL base address
+before setting up the port, which prevents a kernel panic in such
+cases.
+
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Tested-by: Andrew Lunn <andrew@lunn.ch>
+Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+---
+ drivers/pci/host/pci-mvebu.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/pci/host/pci-mvebu.c
++++ b/drivers/pci/host/pci-mvebu.c
+@@ -637,6 +637,8 @@ static int __init mvebu_pcie_setup(int n
+
+ for (i = 0; i < pcie->nports; i++) {
+ struct mvebu_pcie_port *port = &pcie->ports[i];
++ if (!port->base)
++ continue;
+ mvebu_pcie_setup_hw(port);
+ }
+