| Message ID | 20180813070620.34514-1-yinbo.zhu@nxp.com |
|---|---|
| State | Superseded |
| Delegated to: | York Sun |
| Headers | show |
| Series | [U-Boot,v6,1/8] dm: mmc: use block layer in mmc driver | expand |
First of all, your subject is wrong. You are not making any change to dm or mmc. On 08/13/2018 12:09 AM, Yinbo Zhu wrote: > At present the MMC subsystem maintains its own list > of MMC devices. This cannot work with driver model > when CONFIG_BLK is enabled, use blk_dread to > replace previous mmc read interface, > use mmc_get_blk_desc to get the mmc device property > > Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> > --- > Change in v6: > remove block layer in mmc_legacy. > > arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 5 ++--- You didn't replace all. If you compiled all targets, you would see errors on secure boot targets. Please fix and test _ALL_ targets before sending another version. York
-----Original Message----- From: York Sun Sent: 2018年8月15日 22:58 To: Yinbo Zhu <yinbo.zhu@nxp.com>; Y.b. Lu <yangbo.lu@nxp.com>; u-boot@lists.denx.de Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Andy Tang <andy.tang@nxp.com>; Peng Ma <peng.ma@nxp.com> Subject: Re: [PATCH v6 1/8] dm: mmc: use block layer in mmc driver First of all, your subject is wrong. You are not making any change to dm or mmc. On 08/13/2018 12:09 AM, Yinbo Zhu wrote: > At present the MMC subsystem maintains its own list of MMC devices. > This cannot work with driver model when CONFIG_BLK is enabled, use > blk_dread to replace previous mmc read interface, use mmc_get_blk_desc > to get the mmc device property > > Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> > --- > Change in v6: > remove block layer in mmc_legacy. > > arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 5 ++--- >You didn't replace all. If you compiled all targets, you would see errors on secure boot targets. Please fix >and test _ALL_ targets before sending another version. >York Hi York, I had tested all targets, for 1088 sd secure boot, upstream code has a original issue, need upstream to cover it other targets that I had tested okay, I will send it to upstream as v7 version. Thanks, Best Regards, Yinbo Zhu.
Hi York, My v8 version patch could you give me some advice? Some sata patch need rely on it to upstream, so if no other issue, could you help me merge it to upstream code Thanks Best Regards, Yinbo Zhu -----Original Message----- From: Yinbo Zhu Sent: 2018年8月23日 11:10 To: York Sun <york.sun@nxp.com>; Y.b. Lu <yangbo.lu@nxp.com>; u-boot@lists.denx.de Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Andy Tang <andy.tang@nxp.com>; Peng Ma <peng.ma@nxp.com> Subject: RE: [PATCH v6 1/8] dm: mmc: use block layer in mmc driver -----Original Message----- From: York Sun Sent: 2018年8月15日 22:58 To: Yinbo Zhu <yinbo.zhu@nxp.com>; Y.b. Lu <yangbo.lu@nxp.com>; u-boot@lists.denx.de Cc: Xiaobo Xie <xiaobo.xie@nxp.com>; Andy Tang <andy.tang@nxp.com>; Peng Ma <peng.ma@nxp.com> Subject: Re: [PATCH v6 1/8] dm: mmc: use block layer in mmc driver First of all, your subject is wrong. You are not making any change to dm or mmc. On 08/13/2018 12:09 AM, Yinbo Zhu wrote: > At present the MMC subsystem maintains its own list of MMC devices. > This cannot work with driver model when CONFIG_BLK is enabled, use > blk_dread to replace previous mmc read interface, use mmc_get_blk_desc > to get the mmc device property > > Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> > --- > Change in v6: > remove block layer in mmc_legacy. > > arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 5 ++--- >You didn't replace all. If you compiled all targets, you would see >errors on secure boot targets. Please fix >and test _ALL_ targets before sending another version. >York >Hi York, >I had tested all targets, for 1088 sd secure boot, upstream code has a original issue, need upstream to >cover it other targets that I had tested okay, I will send it to upstream as v7 version. >Thanks, >Best Regards, >Yinbo Zhu.
Cannot merge at this moment. It has to wait for next merge window. York York
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c index a31c4d9..95875d3 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c @@ -99,7 +99,7 @@ int ppa_init(void) cnt = DIV_ROUND_UP(fdt_header_len, 512); debug("%s: MMC read PPA FIT header: dev # %u, block # %u, count %u\n", __func__, dev, blk, cnt); - ret = mmc->block_dev.block_read(&mmc->block_dev, blk, cnt, fitp); + ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, fitp); if (ret != cnt) { free(fitp); printf("MMC/SD read of PPA FIT header at offset 0x%x failed\n", @@ -149,8 +149,7 @@ int ppa_init(void) cnt = DIV_ROUND_UP(fw_length, 512); debug("%s: MMC read PPA FIT image: dev # %u, block # %u, count %u\n", __func__, dev, blk, cnt); - ret = mmc->block_dev.block_read(&mmc->block_dev, - blk, cnt, ppa_fit_addr); + ret = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, ppa_fit_addr); if (ret != cnt) { free(ppa_fit_addr); printf("MMC/SD read of PPA FIT header at offset 0x%x failed\n", diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 3327073..c5cf188 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -402,7 +402,7 @@ int fm_init_common(int index, struct ccsr_fman *reg) printf("\nMMC read: dev # %u, block # %u, count %u ...\n", dev, blk, cnt); mmc_init(mmc); - (void)mmc->block_dev.block_read(&mmc->block_dev, blk, cnt, + (void)blk_dread(mmc_get_blk_desc(mmc), blk, cnt, addr); } #elif defined(CONFIG_SYS_QE_FMAN_FW_IN_REMOTE) diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 7654df8..7010bbc 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -218,7 +218,7 @@ void u_qe_init(void) printf("\nMMC read: dev # %u, block # %u, count %u ...\n", dev, blk, cnt); mmc_init(mmc); - (void)mmc->block_dev.block_read(&mmc->block_dev, blk, cnt, + (void)blk_dread(mmc_get_blk_desc(mmc), blk, cnt, addr); } #endif
At present the MMC subsystem maintains its own list of MMC devices. This cannot work with driver model when CONFIG_BLK is enabled, use blk_dread to replace previous mmc read interface, use mmc_get_blk_desc to get the mmc device property Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com> --- Change in v6: remove block layer in mmc_legacy. arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 5 ++--- drivers/net/fm/fm.c | 2 +- drivers/qe/qe.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)