Message ID | 20190822074739.8846-1-takahiro.akashi@linaro.org |
---|---|
State | Accepted |
Commit | 5bac9c5307642400abc61a7f9ba76ac06a77fcf8 |
Delegated to: | Simon Glass |
Headers | show |
Series | [U-Boot] cmd: host: fix seg fault at "host info" | expand |
On Thu, Aug 22, 2019 at 3:45 PM AKASHI Takahiro <takahiro.akashi@linaro.org> wrote: > > With the patch below applied, host_block_dev structure was switched > to be placed in platdata rather than priv. The command "host info" > must be aligned with this change. Otherwise, we will see "Segmentation > Fault." > > Fixes: 8f994c860d91 ("sandbox: blk: Switch to use platdata_auto_alloc_size for the driver data") > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > --- > cmd/host.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
On 8/22/19 9:47 AM, AKASHI Takahiro wrote: > With the patch below applied, host_block_dev structure was switched > to be placed in platdata rather than priv. The command "host info" > must be aligned with this change. Otherwise, we will see "Segmentation > Fault." > > Fixes: 8f994c860d91 ("sandbox: blk: Switch to use platdata_auto_alloc_size for the driver data") > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > cmd/host.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/cmd/host.c b/cmd/host.c > index f7d3eae5b1ad..98c4d2a099e9 100644 > --- a/cmd/host.c > +++ b/cmd/host.c > @@ -89,7 +89,7 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc, > struct host_block_dev *host_dev; > > #ifdef CONFIG_BLK > - host_dev = dev_get_priv(blk_dev->bdev); > + host_dev = dev_get_platdata(blk_dev->bdev); > #else > host_dev = blk_dev->priv; > #endif >
Ping, This patch has not been merged yet. -Takahiro Akashi On Thu, Aug 22, 2019 at 04:47:39PM +0900, AKASHI Takahiro wrote: > With the patch below applied, host_block_dev structure was switched > to be placed in platdata rather than priv. The command "host info" > must be aligned with this change. Otherwise, we will see "Segmentation > Fault." > > Fixes: 8f994c860d91 ("sandbox: blk: Switch to use platdata_auto_alloc_size for the driver data") > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > --- > cmd/host.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/cmd/host.c b/cmd/host.c > index f7d3eae5b1ad..98c4d2a099e9 100644 > --- a/cmd/host.c > +++ b/cmd/host.c > @@ -89,7 +89,7 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc, > struct host_block_dev *host_dev; > > #ifdef CONFIG_BLK > - host_dev = dev_get_priv(blk_dev->bdev); > + host_dev = dev_get_platdata(blk_dev->bdev); > #else > host_dev = blk_dev->priv; > #endif > -- > 2.21.0 >
+Tom On Thu, Oct 3, 2019 at 2:00 PM AKASHI Takahiro <takahiro.akashi@linaro.org> wrote: > > Ping, > > This patch has not been merged yet. > Simon is on vacation. Tom, could you please take this patch directly? This needs to be in v2019.10. Regards, Bin
On Thu, Aug 22, 2019 at 04:47:39PM +0900, AKASHI Takahiro wrote: > With the patch below applied, host_block_dev structure was switched > to be placed in platdata rather than priv. The command "host info" > must be aligned with this change. Otherwise, we will see "Segmentation > Fault." > > Fixes: 8f994c860d91 ("sandbox: blk: Switch to use platdata_auto_alloc_size for the driver data") > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> > Tested-by: Bin Meng <bmeng.cn@gmail.com> > Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Applied to u-boot/master, thanks!
diff --git a/cmd/host.c b/cmd/host.c index f7d3eae5b1ad..98c4d2a099e9 100644 --- a/cmd/host.c +++ b/cmd/host.c @@ -89,7 +89,7 @@ static int do_host_info(cmd_tbl_t *cmdtp, int flag, int argc, struct host_block_dev *host_dev; #ifdef CONFIG_BLK - host_dev = dev_get_priv(blk_dev->bdev); + host_dev = dev_get_platdata(blk_dev->bdev); #else host_dev = blk_dev->priv; #endif
With the patch below applied, host_block_dev structure was switched to be placed in platdata rather than priv. The command "host info" must be aligned with this change. Otherwise, we will see "Segmentation Fault." Fixes: 8f994c860d91 ("sandbox: blk: Switch to use platdata_auto_alloc_size for the driver data") Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> --- cmd/host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)