qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: rockchip_decompress: update the decompress driver 

1.add DECOM_AXI_STAT to test decompress whether is in idle
2.correct the misc_decompress_is_complete return value

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I904d9909ade709fb479893325dd6c0b3d47d5908
This commit is contained in:
Jason Zhu 2020-06-12 19:52:52 +08:00
parent 859836bc0c
commit 809af6ba3d
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/misc/misc_decompress.c
View File

@ -70,7 +70,10 @@ int misc_decompress_stop(struct udevice *dev)
return misc_ioctl(dev, IOCTL_REQ_STOP, NULL);
}
int misc_decompress_is_complete(struct udevice *dev)
bool misc_decompress_is_complete(struct udevice *dev)
{
return misc_ioctl(dev, IOCTL_REQ_POLL, NULL);
if (misc_ioctl(dev, IOCTL_REQ_POLL, NULL))
return false;
else
return true;
}

15
drivers/misc/rockchip_decompress.c
View File

@ -64,6 +64,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define DECOM_GZIP_MODE BIT(4)
#define DECOM_ZLIB_MODE BIT(5)
#define DECOM_DEFLATE_MODE BIT(0)
#define DECOM_AXI_IDLE BIT(4)
#define DECOM_LZ4_MODE 0
#define DECOM_ENABLE 0x1
@ -81,6 +82,7 @@ DECLARE_GLOBAL_DATA_PTR;
struct rockchip_decom_priv {
void __iomem *base;
unsigned long soft_reset_base;
bool idle_check_once;
bool done;
};
@ -118,6 +120,7 @@ static int rockchip_decom_start(struct udevice *dev, void *buf)
writel(DECOM_INT_MASK, priv->base + DECOM_IEN);
writel(DECOM_ENABLE, priv->base + DECOM_ENR);
priv->idle_check_once = true;
return 0;
}
@ -141,13 +144,14 @@ static int rockchip_decom_stop(struct udevice *dev)
static int rockchip_decom_done_poll(struct udevice *dev)
{
struct rockchip_decom_priv *priv = dev_get_priv(dev);
int decom_status;
decom_status = readl(priv->base + DECOM_STAT);
if (decom_status & DECOM_COMPLETE)
return 0;
/*
* Test the decom is idle first time.
*/
if (!priv->idle_check_once)
return !(readl(priv->base + DECOM_AXI_STAT) & DECOM_AXI_IDLE);
return -EINVAL;
return !(readl(priv->base + DECOM_STAT) & DECOM_COMPLETE);
}
static int rockchip_decom_capability(u32 *buf)
@ -175,6 +179,7 @@ static int rockchip_decom_ioctl(struct udevice *dev, unsigned long request,
break;
case IOCTL_REQ_CAPABILITY:
ret = rockchip_decom_capability(buf);
break;
}
return ret;

2
include/misc.h
View File

@ -157,6 +157,6 @@ struct udevice *misc_decompress_get_device(u32 capability);
int misc_decompress_start(struct udevice *dev, unsigned long src,
unsigned long dst, unsigned long size);
int misc_decompress_stop(struct udevice *dev);
int misc_decompress_is_complete(struct udevice *dev);
bool misc_decompress_is_complete(struct udevice *dev);
#endif /* _MISC_H_ */