linux-kernel - Re: [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller nodes

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 05 May 2014 23:20:28 +0100
From:	Adam Baker <linux@...er-net.org.uk>
To:	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
CC:	Mark Rutland <mark.rutland@....com>, Andrew Lunn <andrew@...n.ch>,
	Russell King <linux@....linux.org.uk>,
	Jason Cooper <jason@...edaemon.net>,
	Pawel Moll <pawel.moll@....com>,
	Ian Campbell <ijc+devicetree@...lion.org.uk>,
	linux-kernel@...r.kernel.org, devicetree@...r.kernel.org,
	Rob Herring <robh+dt@...nel.org>,
	Kumar Gala <galak@...eaurora.org>,
	Gregory Clement <gregory.clement@...e-electrons.com>,
	Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>,
	linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH 01/15] ARM: dts: kirkwood: fix mislocated pcie-controller
 nodes

On 30/04/14 13:56, Sebastian Hesselbarth wrote:
> Commit 54397d85349f
>   ("ARM: kirkwood: Relocate PCIe device tree nodes")
>
> moved the pcie-controller nodes for the Kirkwood SoCs to the mbus
> bus node. For some reason, two boards were not properly converted
> and have their pci-controller nodes still in the ocp bus node.
>
> As the corresponding SoC pcie-controller does not exist anymore,
> it is likely that pcie is broken on those boards since above commit.
> Fix it by moving the pcie related nodes to the correct location.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>


I've tried this patch on NSA320, as expected it doesn't make any 
observable difference as there is nothing connected to the PCIe bus 
(hence not really worth a tested by). It matters more on the NSA310 as 
that uses PCIe for Ethernet.

Regards

Adam Baker

> ---
> Cc: Rob Herring <robh+dt@...nel.org>
> Cc: Pawel Moll <pawel.moll@....com>
> Cc: Mark Rutland <mark.rutland@....com>
> Cc: Ian Campbell <ijc+devicetree@...lion.org.uk>
> Cc: Kumar Gala <galak@...eaurora.org>
> Cc: Russell King <linux@....linux.org.uk>
> Cc: Jason Cooper <jason@...edaemon.net>
> Cc: Andrew Lunn <andrew@...n.ch>
> Cc: Gregory Clement <gregory.clement@...e-electrons.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
> Cc: devicetree@...r.kernel.org
> Cc: linux-arm-kernel@...ts.infradead.org
> Cc: linux-kernel@...r.kernel.org
> ---
>   arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 18 ++++++++++--------
>   arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi  | 18 ++++++++++--------
>   2 files changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> index 2cb0dc529165..4bf358c28be2 100644
> --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
> @@ -30,6 +30,16 @@
>   		bootargs = "console=ttyS0,115200n8 earlyprintk";
>   	};
>
> +	mbus {
> +		pcie-controller {
> +			status = "okay";
> +
> +			pcie@1,0 {
> +				status = "okay";
> +			};
> +		};
> +        };
> +
>   	ocp@...00000 {
>   		pinctrl@...00 {
>   			pmx_usb_led: pmx-usb-led {
> @@ -73,14 +83,6 @@
>   		ehci@...00 {
>   			status = "okay";
>   		};
> -
> -		pcie-controller {
> -			status = "okay";
> -
> -			pcie@1,0 {
> -				status = "okay";
> -			};
> -		};
>   	};
>
>   	gpio-leds {
> diff --git a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
> index 843b8b561e5e..b88810df7ca2 100644
> --- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
> @@ -4,6 +4,16 @@
>   / {
>   	model = "ZyXEL NSA310";
>
> +	mbus {
> +		pcie-controller {
> +			status = "okay";
> +
> +			pcie@1,0 {
> +				status = "okay";
> +			};
> +		};
> +	};
> +
>   	ocp@...00000 {
>   		pinctrl: pinctrl@...00 {
>
> @@ -51,14 +61,6 @@
>   			status = "okay";
>   			nr-ports = <2>;
>   		};
> -
> -		pcie-controller {
> -			status = "okay";
> -
> -			pcie@1,0 {
> -				status = "okay";
> -			};
> -		};
>   	};
>
>   	gpio_poweroff {
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/