Hi Pali, On Thu, Jan 19, 2023 at 10:05 AM Pali Rohár <p...@kernel.org> wrote: > > Hello! If I read the whole change correctly then all changes are done > under ifdef CONFIG_DDR4. So for existing (ddr3) boards this is noop. > > Reviewed-by: Pali Rohár <p...@kernel.org> > > The reaming part is the changes which you done on top of the Marvell > code to make it compile under u-boot (floating point, basic types). > Please either open a pull request to Marvell github with those changes > or send me diff/patch and I will do it. So doing resync again from > Marvell repo does not remove those your fixes.
Thanks for the review Palii. I will open a pull request and let you know so you can comment on it at Marvell repo. All the best, Tony > > On Wednesday 18 January 2023 19:03:04 Tony Dinh wrote: > > This syncs drivers/ddr/marvell/a38x/ with the master branch of repository > > https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell.git > > > > up to the commit "mv_ddr: a3700: Use the right size for memset to not > > overflow" > > d5acc10c287e40cc2feeb28710b92e45c93c702c > > > > This patch was created by following steps: > > > > 1. Replace all a38x files in U-Boot tree by files from upstream github > > Marvell mv-ddr-marvell repository. > > > > 2. Run following command to omit portions not relevant for a38x, > > ddr3, and ddr4: > > > > files=drivers/ddr/marvell/a38x/* > > unifdef -m -UMV_DDR -UMV_DDR_ATF -UCONFIG_APN806 \ > > -UCONFIG_MC_STATIC -UCONFIG_MC_STATIC_PRINT > > -UCONFIG_PHY_STATIC \ > > -UCONFIG_PHY_STATIC_PRINT -UCONFIG_CUSTOMER_BOARD_SUPPORT \ > > -UCONFIG_A3700 -UA3900 -UA80X0 -UA70X0 -DCONFIG_ARMADA_38X > > -UCONFIG_ARMADA_39X \ > > -UCONFIG_64BIT $files > > > > 3. Manually change license to SPDX-License-Identifier > > (upstream license in upstream github repository contains long license > > texts and U-Boot is using just SPDX-License-Identifier. > > > > After applying this patch, a38x, ddr3, and ddr4 code in upstream Marvell > > github > > repository and in U-Boot would be fully identical. So in future applying > > above steps could be used to sync code again. > > > > The only change in this patch are: > > 1. Some fixes with include files. > > 2. Some function return and basic type defines changes in > > mv_ddr_plat.c (to correct Marvell bug). > > 3. Remove of dead code in newly copied files (as a result of the > > filter script stripping out everything other than a38x, dd3, and > > ddr4). > > > > Reference: > > "ddr: marvell: a38x: Sync code with Marvell mv-ddr-marvell repository" > > > > https://source.denx.de/u-boot/u-boot/-/commit/107c3391b95bcc2ba09a876da4fa0c31b6c1e460 > > > > Signed-off-by: Tony Dinh <mibo...@gmail.com> > > --- > > > > Changes in v3: > > - Some function return and basic type defines changes in mv_ddr_plat.c > > (to fix Marvell repo code bugs). > > - Restore existing u-boot file. Existing u-boot files that become dead code > > will be > > removed in a future follow-up patch. > > - Update commit description with the latest filter script. > > - Fix indentation in commit description to be more readable. > > > > Changes in v2: > > - Modified the filter scrip to explicitly include ARMADA_38X code > > and exclude ARMADA_39X code; also remove 64BIT code. Reran it on > > drivers/ddr/marvell/a38x/ > > - Updated script > > files=drivers/ddr/marvell/a38x/* > > sed 's/#if defined(CONFIG_ARMADA_38X) || defined(CONFIG_ARMADA_39X)/#ifdef > > TRUE/' -i $files > > unifdef -m -UMV_DDR -UMV_DDR_ATF -UCONFIG_APN806 \ > > -UCONFIG_MC_STATIC -UCONFIG_MC_STATIC_PRINT > > -UCONFIG_PHY_STATIC \ > > -UCONFIG_PHY_STATIC_PRINT -UCONFIG_CUSTOMER_BOARD_SUPPORT \ > > -UCONFIG_A3700 -UA3900 -UA80X0 -UA70X0 -DCONFIG_ARMADA_38X > > -UCONFIG_ARMADA_39X \ > > -UCONFIG_64BIT $files > > - Remove more dead code files > > - Correct SPDX license header > > > > drivers/ddr/marvell/a38x/Makefile | 8 + > > drivers/ddr/marvell/a38x/ddr3_debug.c | 120 + > > drivers/ddr/marvell/a38x/ddr3_init.c | 25 + > > drivers/ddr/marvell/a38x/ddr3_init.h | 14 + > > drivers/ddr/marvell/a38x/ddr3_logging_def.h | 27 + > > drivers/ddr/marvell/a38x/ddr3_training.c | 131 + > > drivers/ddr/marvell/a38x/ddr3_training_bist.c | 12 + > > .../a38x/ddr3_training_centralization.c | 4 + > > drivers/ddr/marvell/a38x/ddr3_training_db.c | 212 ++ > > drivers/ddr/marvell/a38x/ddr3_training_ip.h | 17 + > > .../ddr/marvell/a38x/ddr3_training_ip_db.h | 61 + > > .../marvell/a38x/ddr3_training_ip_engine.c | 145 + > > .../ddr/marvell/a38x/ddr3_training_ip_flow.h | 5 + > > .../ddr/marvell/a38x/ddr3_training_leveling.c | 135 + > > drivers/ddr/marvell/a38x/mv_ddr4_mpr_pda_if.c | 674 +++++ > > drivers/ddr/marvell/a38x/mv_ddr4_mpr_pda_if.h | 59 + > > drivers/ddr/marvell/a38x/mv_ddr4_training.c | 565 ++++ > > drivers/ddr/marvell/a38x/mv_ddr4_training.h | 32 + > > .../a38x/mv_ddr4_training_calibration.c | 2336 +++++++++++++++++ > > .../a38x/mv_ddr4_training_calibration.h | 26 + > > .../ddr/marvell/a38x/mv_ddr4_training_db.c | 545 ++++ > > .../marvell/a38x/mv_ddr4_training_leveling.c | 441 ++++ > > .../marvell/a38x/mv_ddr4_training_leveling.h | 11 + > > drivers/ddr/marvell/a38x/mv_ddr_plat.c | 244 ++ > > drivers/ddr/marvell/a38x/mv_ddr_plat.h | 11 + > > drivers/ddr/marvell/a38x/mv_ddr_regs.h | 59 + > > drivers/ddr/marvell/a38x/mv_ddr_topology.h | 72 + > > 27 files changed, 5991 insertions(+) > > create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_mpr_pda_if.c > > create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_mpr_pda_if.h > > create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training.c > > create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training.h > > create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_calibration.c > > create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_calibration.h > > create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_db.c > > create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_leveling.c > > create mode 100644 drivers/ddr/marvell/a38x/mv_ddr4_training_leveling.h