[PATCH 1/2] roms/u-boot: Bump ppce500 u-boot to v2021.07 to add eTSEC support

[PATCH 1/2] roms/u-boot: Bump ppce500 u-boot to v2021.07 to add eTSEC support

[Bin Meng]

Update the QEMU shipped u-boot.e500 image built from U-Boot mainline
v2021.07 release, which added eTSEC support to the QEMU ppce500 target,
via the following U-Boot series:

  http://patchwork.ozlabs.org/project/uboot/list/?series=233875&state=*

The cross-compilation toolchain used to build the U-Boot image is:
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/10.1.0/x86_64-gcc-10.1.0-nolibc-powerpc-linux.tar.xz

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

Please pull the full contents (the u-boot.e500 binary) from
https://github.com/lbmeng/qemu, branch qemu-ppc.

 pc-bios/u-boot.e500 | Bin 406920 -> 421720 bytes
 roms/u-boot         |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc-bios/u-boot.e500 b/pc-bios/u-boot.e500
index d2e29f81d6..8e635c8a5c 100644
Binary files a/pc-bios/u-boot.e500 and b/pc-bios/u-boot.e500 differ
diff --git a/roms/u-boot b/roms/u-boot
index b46dd116ce..840658b093 160000
--- a/roms/u-boot
+++ b/roms/u-boot
@@ -1 +1 @@
-Subproject commit b46dd116ce03e235f2a7d4843c6278e1da44b5e1
+Subproject commit 840658b093976390e9537724f802281c9c8439f5
-- 
2.25.1

[PATCH 2/2] docs/system: ppc: Update ppce500 documentation with eTSEC support

[Bin Meng]

This adds eTSEC support to the PowerPC `ppce500` machine documentation.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 docs/system/ppc/ppce500.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/system/ppc/ppce500.rst b/docs/system/ppc/ppce500.rst
index 7a815c1881..afc58f60f5 100644
--- a/docs/system/ppc/ppce500.rst
+++ b/docs/system/ppc/ppce500.rst
@@ -19,6 +19,7 @@ The ``ppce500`` machine supports the following devices:
 * Power-off functionality via one GPIO pin
 * 1 Freescale MPC8xxx PCI host controller
 * VirtIO devices via PCI bus
+* 1 Freescale Enhanced Triple Speed Ethernet controller (eTSEC)
 
 Hardware configuration information
 ----------------------------------
@@ -121,7 +122,7 @@ To boot the 32-bit Linux kernel:
 Running U-Boot
 --------------
 
-U-Boot mainline v2021.04 release is tested at the time of writing. To build a
+U-Boot mainline v2021.07 release is tested at the time of writing. To build a
 U-Boot mainline bootloader that can be booted by the ``ppce500`` machine, use
 the qemu-ppce500_defconfig with similar commands as described above for Linux:
 
@@ -154,3 +155,10 @@ interface at PCI address 0.1.0, but we can switch that to an e1000 NIC by:
                     -display none -serial stdio \
                     -bios u-boot \
                     -nic tap,ifname=tap0,script=no,downscript=no,model=e1000
+
+The QEMU ``ppce500`` machine can also dynamically instantiate an eTSEC device
+if “-device eTSEC” is given to QEMU:
+
+.. code-block:: bash
+
+  -netdev tap,ifname=tap0,script=no,downscript=no,id=net0 -device eTSEC,netdev=net0
-- 
2.25.1

Re: [PATCH 2/2] docs/system: ppc: Update ppce500 documentation with eTSEC support

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 2035 bytes --]

On Tue, Jul 06, 2021 at 12:31:24PM +0800, Bin Meng wrote:
> This adds eTSEC support to the PowerPC `ppce500` machine documentation.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Applied to ppc-for-6.1, thanks.

> ---
> 
>  docs/system/ppc/ppce500.rst | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/docs/system/ppc/ppce500.rst b/docs/system/ppc/ppce500.rst
> index 7a815c1881..afc58f60f5 100644
> --- a/docs/system/ppc/ppce500.rst
> +++ b/docs/system/ppc/ppce500.rst
> @@ -19,6 +19,7 @@ The ``ppce500`` machine supports the following devices:
>  * Power-off functionality via one GPIO pin
>  * 1 Freescale MPC8xxx PCI host controller
>  * VirtIO devices via PCI bus
> +* 1 Freescale Enhanced Triple Speed Ethernet controller (eTSEC)
>  
>  Hardware configuration information
>  ----------------------------------
> @@ -121,7 +122,7 @@ To boot the 32-bit Linux kernel:
>  Running U-Boot
>  --------------
>  
> -U-Boot mainline v2021.04 release is tested at the time of writing. To build a
> +U-Boot mainline v2021.07 release is tested at the time of writing. To build a
>  U-Boot mainline bootloader that can be booted by the ``ppce500`` machine, use
>  the qemu-ppce500_defconfig with similar commands as described above for Linux:
>  
> @@ -154,3 +155,10 @@ interface at PCI address 0.1.0, but we can switch that to an e1000 NIC by:
>                      -display none -serial stdio \
>                      -bios u-boot \
>                      -nic tap,ifname=tap0,script=no,downscript=no,model=e1000
> +
> +The QEMU ``ppce500`` machine can also dynamically instantiate an eTSEC device
> +if “-device eTSEC” is given to QEMU:
> +
> +.. code-block:: bash
> +
> +  -netdev tap,ifname=tap0,script=no,downscript=no,id=net0 -device eTSEC,netdev=net0

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/2] docs/system: ppc: Update ppce500 documentation with eTSEC support

[Bin Meng]

Hi David,

On Thu, Jul 8, 2021 at 9:08 AM David Gibson <david@gibson.dropbear.id.au> wrote:
>
> On Tue, Jul 06, 2021 at 12:31:24PM +0800, Bin Meng wrote:
> > This adds eTSEC support to the PowerPC `ppce500` machine documentation.
> >
> > Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>
> Applied to ppc-for-6.1, thanks.

Thanks!

Are both 2 patches applied, or only this one?

Regards,
Bin

Re: [PATCH 2/2] docs/system: ppc: Update ppce500 documentation with eTSEC support

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

On Thu, Jul 08, 2021 at 09:22:48AM +0800, Bin Meng wrote:
> Hi David,
> 
> On Thu, Jul 8, 2021 at 9:08 AM David Gibson <david@gibson.dropbear.id.au> wrote:
> >
> > On Tue, Jul 06, 2021 at 12:31:24PM +0800, Bin Meng wrote:
> > > This adds eTSEC support to the PowerPC `ppce500` machine documentation.
> > >
> > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> >
> > Applied to ppc-for-6.1, thanks.
> 
> Thanks!
> 
> Are both 2 patches applied, or only this one?

Both, sorry I wasn't clear.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/2] roms/u-boot: Bump ppce500 u-boot to v2021.07 to add eTSEC support

[Philippe Mathieu-Daudé]

Hi Bin,

On 7/6/21 6:31 AM, Bin Meng wrote:
> Update the QEMU shipped u-boot.e500 image built from U-Boot mainline
> v2021.07 release, which added eTSEC support to the QEMU ppce500 target,
> via the following U-Boot series:
> 
>   http://patchwork.ozlabs.org/project/uboot/list/?series=233875&state=*
> 
> The cross-compilation toolchain used to build the U-Boot image is:
> https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/10.1.0/x86_64-gcc-10.1.0-nolibc-powerpc-linux.tar.xz

Ideally the process to update a firmware blob is (*):

- Add a CI job (as you did for .gitlab-ci.d/opensbi.yml)
- Commit the submodule new hash including "git shortlog current..new"
  in description
- Run the CI, download the almost-reproducible blob
- Test the blob locally
- Amend to the previous commit the CI blob

Since soft freeze is in 1 week, you might won't have enough time
to add a CI job, so this current patch is acceptable, but please
include the "git shortlog current..new" output.

Regards,

Phil.

(*) Yes we should document this somewhere. Wiki or docs?

> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
> 
> Please pull the full contents (the u-boot.e500 binary) from
> https://github.com/lbmeng/qemu, branch qemu-ppc.
> 
>  pc-bios/u-boot.e500 | Bin 406920 -> 421720 bytes
>  roms/u-boot         |   2 +-
>  2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/pc-bios/u-boot.e500 b/pc-bios/u-boot.e500
> index d2e29f81d6..8e635c8a5c 100644
> Binary files a/pc-bios/u-boot.e500 and b/pc-bios/u-boot.e500 differ
> diff --git a/roms/u-boot b/roms/u-boot
> index b46dd116ce..840658b093 160000
> --- a/roms/u-boot
> +++ b/roms/u-boot
> @@ -1 +1 @@
> -Subproject commit b46dd116ce03e235f2a7d4843c6278e1da44b5e1
> +Subproject commit 840658b093976390e9537724f802281c9c8439f5
> 

Re: [PATCH 1/2] roms/u-boot: Bump ppce500 u-boot to v2021.07 to add eTSEC support

[Bin Meng]

Hi Philippe,

On Tue, Jul 6, 2021 at 3:41 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Hi Bin,
>
> On 7/6/21 6:31 AM, Bin Meng wrote:
> > Update the QEMU shipped u-boot.e500 image built from U-Boot mainline
> > v2021.07 release, which added eTSEC support to the QEMU ppce500 target,
> > via the following U-Boot series:
> >
> >   http://patchwork.ozlabs.org/project/uboot/list/?series=233875&state=*
> >
> > The cross-compilation toolchain used to build the U-Boot image is:
> > https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/10.1.0/x86_64-gcc-10.1.0-nolibc-powerpc-linux.tar.xz
>
> Ideally the process to update a firmware blob is (*):
>
> - Add a CI job (as you did for .gitlab-ci.d/opensbi.yml)
> - Commit the submodule new hash including "git shortlog current..new"
>   in description
> - Run the CI, download the almost-reproducible blob
> - Test the blob locally
> - Amend to the previous commit the CI blob

Thanks for the guideline!

>
> Since soft freeze is in 1 week, you might won't have enough time
> to add a CI job, so this current patch is acceptable, but please
> include the "git shortlog current..new" output.

I did consider including the shotlogs here, just like what I did for
OpenSBI update. But I am afraid it is a toooo long list because unlike
OpenSBI U-Boot is a very active community. Hence I chose not to
mention it in the commit message.

>
> Regards,
>
> Phil.
>
> (*) Yes we should document this somewhere. Wiki or docs?

Either should be okay. If we put in the docs, we should probably
collect some other development processes (e.g.: submitting patches)
and put there, like what is done in the Linux kernel.

Regards,
Bin