[PATCH] arm64: dts: Add a virtio disk to the RTSM motherboard

[PATCH] arm64: dts: Add a virtio disk to the RTSM motherboard

[Mark Brown]

From: Mark Hambleton <mahamble@broadcom.com>

Describe the virtio device so we can mount disk images in the simulator.

Signed-off-by: Mark Hambleton <mahamble@broadcom.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
 arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
index b45e5f39f577..b3460961038f 100644
--- a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
@@ -183,6 +183,12 @@
 				clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
 				clock-names = "clcdclk", "apb_pclk";
 			};
+
+			virtio_block at 0130000 {
+				compatible = "virtio,mmio";
+				reg = <0x130000 0x1000>;
+				interrupts = <0x2a>;
+			};
 		};
 
 		v2m_fixed_3v3: fixedregulator at 0 {
-- 
1.8.4.4

[PATCH] arm64: dts: Add a virtio disk to the RTSM motherboard

[Will Deacon]

On Mon, Dec 02, 2013 at 04:24:35PM +0000, Mark Brown wrote:
> From: Mark Hambleton <mahamble@broadcom.com>
> 
> Describe the virtio device so we can mount disk images in the simulator.
> 
> Signed-off-by: Mark Hambleton <mahamble@broadcom.com>
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
>  arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
> index b45e5f39f577..b3460961038f 100644
> --- a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
> @@ -183,6 +183,12 @@
>  				clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
>  				clock-names = "clcdclk", "apb_pclk";
>  			};
> +
> +			virtio_block at 0130000 {
> +				compatible = "virtio,mmio";
> +				reg = <0x130000 0x1000>;

4k? That seems pretty big to me...

> +				interrupts = <0x2a>;

Any reason this is in hex?

Will

[PATCH] arm64: dts: Add a virtio disk to the RTSM motherboard

[Mark Brown]

On Tue, Dec 03, 2013 at 11:42:18AM +0000, Will Deacon wrote:
> On Mon, Dec 02, 2013 at 04:24:35PM +0000, Mark Brown wrote:

> > +			virtio_block at 0130000 {
> > +				compatible = "virtio,mmio";
> > +				reg = <0x130000 0x1000>;

> 4k? That seems pretty big to me...

Yeah, it looks like a page size to me though it does also seem like the
sort of nice round number devices tend to offer.  The binding document
is depressingly silent on the topic of the size of the region but the
only existing in tree user (the ARMv8 foundation model DTS) also picks
the same number.

> > +				interrupts = <0x2a>;

> Any reason this is in hex?

That's what it was in Mark's original patch, easy enough to update.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131203/8335c3c2/attachment-0001.sig>

[PATCH] arm64: dts: Add a virtio disk to the RTSM motherboard

[Mark Hambleton]

Will, 

This patch comes from the ATF: https://github.com/ARM-software/arm-trusted-firmware/blob/master/fdts/rtsm_ve-motherboard.dtsi

I suspect Achin Gupta has the answers to the questions...

Mark

-----Original Message-----
From: Will Deacon [mailto:will.deacon at arm.com] 
Sent: 03 December 2013 11:42
To: Mark Brown
Cc: Catalin Marinas; linaro-kernel at lists.linaro.org; Mark Hambleton; linux-arm-kernel at lists.infradead.org; Mark Brown; mark.rutland at arm.com
Subject: Re: [PATCH] arm64: dts: Add a virtio disk to the RTSM motherboard

On Mon, Dec 02, 2013 at 04:24:35PM +0000, Mark Brown wrote:
> From: Mark Hambleton <mahamble@broadcom.com>
> 
> Describe the virtio device so we can mount disk images in the simulator.
> 
> Signed-off-by: Mark Hambleton <mahamble@broadcom.com>
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
>  arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
> index b45e5f39f577..b3460961038f 100644
> --- a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
> @@ -183,6 +183,12 @@
>  				clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
>  				clock-names = "clcdclk", "apb_pclk";
>  			};
> +
> +			virtio_block at 0130000 {
> +				compatible = "virtio,mmio";
> +				reg = <0x130000 0x1000>;

4k? That seems pretty big to me...

> +				interrupts = <0x2a>;

Any reason this is in hex?

Will

[PATCH] arm64: dts: Add a virtio disk to the RTSM motherboard

[Mark Brown]

From: Mark Hambleton <mahamble@broadcom.com>

Describe the virtio device so we can mount disk images in the simulator.

Signed-off-by: Mark Hambleton <mahamble@broadcom.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---
 arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
index b45e5f39f577..4ccd96552b70 100644
--- a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
@@ -183,6 +183,12 @@
 				clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
 				clock-names = "clcdclk", "apb_pclk";
 			};
+
+			virtio_block at 0130000 {
+				compatible = "virtio,mmio";
+				reg = <0x130000 0x1000>;
+				interrupts = <42>;
+			};
 		};
 
 		v2m_fixed_3v3: fixedregulator at 0 {
-- 
1.8.5

[PATCH] arm64: dts: Add a virtio disk to the RTSM motherboard

[Will Deacon]

On Tue, Dec 03, 2013 at 07:24:03PM +0000, Mark Brown wrote:
> From: Mark Hambleton <mahamble@broadcom.com>
> 
> Describe the virtio device so we can mount disk images in the simulator.
> 
> Signed-off-by: Mark Hambleton <mahamble@broadcom.com>
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
>  arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
> index b45e5f39f577..4ccd96552b70 100644
> --- a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
> +++ b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
> @@ -183,6 +183,12 @@
>  				clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
>  				clock-names = "clcdclk", "apb_pclk";
>  			};
> +
> +			virtio_block at 0130000 {
> +				compatible = "virtio,mmio";
> +				reg = <0x130000 0x1000>;

Can we make this 0x200 for the size? That's what kvmtool uses and, from the
virtio-mmio spec, config data from offset 0x100+ is driver-specific. A quick
look at the virtio block driver suggests we only use 31 bytes of that at the
moment, so 4k is really OTT (and doesn't match the page size for 64K page
systems anyway).

With that change:

  Acked-by: Will Deacon <will.deacon@arm.com>

Cheers,

Will

[PATCH] arm64: dts: Add a virtio disk to the RTSM motherboard

[Mark Brown]

On Tue, Dec 03, 2013 at 07:41:43PM +0000, Will Deacon wrote:
> On Tue, Dec 03, 2013 at 07:24:03PM +0000, Mark Brown wrote:

> > +			virtio_block at 0130000 {
> > +				compatible = "virtio,mmio";
> > +				reg = <0x130000 0x1000>;

> Can we make this 0x200 for the size? That's what kvmtool uses and, from the
> virtio-mmio spec, config data from offset 0x100+ is driver-specific. A quick
> look at the virtio block driver suggests we only use 31 bytes of that at the
> moment, so 4k is really OTT (and doesn't match the page size for 64K page
> systems anyway).

Sure, I'll send a patch to make this change for the foundation model
too.

> With that change:

>   Acked-by: Will Deacon <will.deacon@arm.com>

Thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131203/b2479a04/attachment-0001.sig>