-----Original Message-----
From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org> On Behalf Of Pavel Machek via
lists.cip-project.org
Sent: 22 June 2021 13:47
To: Chris Paterson <Chris.Paterson2@renesas.com>
Cc: cip-dev@lists.cip-project.org; Pavel Machek <pavel@denx.de>; nobuhiro1.iwamatsu@toshiba.co.jp
Subject: Re: [cip-dev] Patches that need porting from 4.19 to 5.10-cip tree

Hi!

Here is the list of patches that are in 4.19-cip but not yet in
5.10... according to my scripting.

Prabhakar has reviewed your list and has submitted all of the relevant patches in his "Renesas RZ/G2

sync patches from 4.19-cip to 5.10-cip" series [0].

Thanks a lot for doing this (and sorry for all the false positives from the script).

I went through the list for entries where existing commit was not identified, and this is the result:

It looks there's a very little work to do: we need to pull 5.10.18 into our tree and there are 4
patches marked as "not required" we need to somehow deal with.

Given that we have them in 4.19 (and they add hardware support and are not really invasive), could I
ask for their 5.10 ports? That should be least surprising. (If they are not required in 4.19 there, we
we could drop them from there, too.)

,,,23,140 49753c6e27ed35223cdab939c34ff1d85f200765 mmc: renesas_sdhi_internal_dmac: Add r8a774e1
support,Not required

wrt above patch the way of handling the dmac differs between 4.19-cip and 5.10-cip. This was changed in commit [1] and is already part of 5.10-cip as result we don’t need this patch in 5.10-cip.

,,,103,827 641132722015595793f56fe31765636ddf7a6999 arm64: Add Renesas R8A774C0 support,Not required
,,,104,828 b6ddebb2cc793ef2fda081fd2ef2439c158caac4 arm64: Add Renesas R8A774A1 support,Not required

wrt above two patches, config symbols for the above two SoC's are already present in 5.10-cip, they are present in different locations compared to 4.19-cip and 5.10-cip. This was changed in commit [2] hence we don’t require the above two patches in 5.10-cip

,,,107,831 76b8e853948bfaff083afb3dd985eb19f3aab30b dt-bindings: arm: Fix RZ/G2E part number,Not
required

Binding doc has been converted to yaml file in 5.10-cip. This has been changed in commit [3] and is already part of 5.10-cip with corrected part number for RZ/G2E SoC.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/drivers/mmc/host/renesas_sdhi_internal_dmac.c?h=linux-5.10.y-cip&id=a0fb3fc8af01436df45cc501c41f280025c1dfe8
[2] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/drivers/soc/renesas/Kconfig?h=linux-5.10.y-cip&id=fa43948f6736b74c5840ec0b028d3662caf0f558
[3] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/Documentation/devicetree/bindings/arm/renesas.yaml?h=linux-5.10.y-cip&id=12749350567c819d8a35a405743313bd869c95c0

Cheers,
Prabhakar

Best regards,
Pavel


* Patches that need porting from 4.19-cip (second pass)

** We don't need to do anything, as problem is already solved in 5.10 in different way

,,,31,632 37c7e76a75a0d5906d792628e4747607a963ba24 arm64: dts: renesas: r8a774c0: sort subnodes of the
soc node,Already sorted in 5.10

** We don't need to do anything, patch is already in 5.10

(script did not recognize upstream tag)

,,,91,"815 7caccda8939c381fc316f450daa9307d227a4a67 ARM: dts: socfpga: Rename
socfpga_cyclone5_de0_{sockit, nano_soc}",Don’t care
,,,30,627 0ccb93953810660266f7095e0541c6db19920642 staging: m57621-mmc: delete driver from the
tree.,Don’t care

** We don't need to do anything, patch is already in 5.10-stable

,,,119,843 fc1e3f5d1d7f77be91f85d7d4ce94ebfe3d8d284 kvm: check tlbs_dirty directly,Don’t care in
5.10.7
,,,120,844 2c68bb33dad9f3cab171bb64e1766bc5a7e9b7e8 scsi: qla2xxx: Fix crash during driver load on big
endian machines,Don’t care in 5.10.4

** Patch series is already in 5.10.18, we need to pull it to -cip

,,,121,845 98f16e171e2849dba76e2e0346e914452c030dc5 xen-blkback: fix error handling in
xen_blkbk_map(),Don’t care
upstream: 871997bc9e423f05c7da7c9178e62dde5df2a7f8
,,,122,"846 f84c00fbd27b043fa42a56eaaa14e293877bc69b xen-scsiback: don't ""handle"" error by
BUG()",Don’t care
upstream: 7c77474b2d22176d2bfb592ec74e0f2cb71352c9
,,,123,"847 717faa776ca2163119239ea58bb78c4d732d8a4f xen-netback: don't ""handle"" error by
BUG()",Don’t care commit 3194a1746e8aabe86075fd3c5e7cf1f4632d7f16 upstream.
,,,124,"848 a01b49a9bf91a723f541139c063c1ff681ac536a xen-blkback: don't ""handle"" error by
BUG()",Don’t care commit 5a264285ed1cd32e26d9de4f3c8c6855e467fd63 upstream.
,,,125,849 271a3984f73c485f4c1b796a61cc5bd3994a0463 xen/arm: don't ignore return errors from
set_phys_to_machine,Don’t care commit 36bf1dfb8b266e089afa9b7b984217f17027bf35 upstream.
,,,126,850 e07f06f6bbeed5bf47fed79ac6a57ec62b33304a Xen/gntdev: correct error checking in
gntdev_map_grant_pages(),Don’t care commit ebee0eab08594b2bd5db716288a4f1ae5936e9bc upstream.

** Investigate:

,,,23,140 49753c6e27ed35223cdab939c34ff1d85f200765 mmc: renesas_sdhi_internal_dmac: Add r8a774e1
support,Not required
,,,103,827 641132722015595793f56fe31765636ddf7a6999 arm64: Add Renesas R8A774C0 support,Not required
,,,104,828 b6ddebb2cc793ef2fda081fd2ef2439c158caac4 arm64: Add Renesas R8A774A1 support,Not required
,,,107,831 76b8e853948bfaff083afb3dd985eb19f3aab30b dt-bindings: arm: Fix RZ/G2E part number,Not
required

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany