On Thu, Aug 1, 2019 at 5:28 PM Tomer Tayar <tta...@habana.ai> wrote:
>
> Add a meaningful name to the general PSOC application status register
> which better describes its usage in keeping the HW state.
>
> Signed-off-by: Tomer Tayar <tta...@habana.ai>
> ---
> drivers/misc/habanalabs/goya/goya.c | 4 ++--
> drivers/misc/habanalabs/include/goya/goya_reg_map.h | 2 ++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/misc/habanalabs/goya/goya.c
> b/drivers/misc/habanalabs/goya/goya.c
> index 9699e7d4903e..6acda363983f 100644
> --- a/drivers/misc/habanalabs/goya/goya.c
> +++ b/drivers/misc/habanalabs/goya/goya.c
> @@ -2468,7 +2468,7 @@ static int goya_hw_init(struct hl_device *hdev)
> * we need to reset the chip before doing H/W init. This register is
> * cleared by the H/W upon H/W reset
> */
> - WREG32(mmPSOC_GLOBAL_CONF_APP_STATUS, HL_DEVICE_HW_STATE_DIRTY);
> + WREG32(mmHW_STATE, HL_DEVICE_HW_STATE_DIRTY);
>
> rc = goya_init_cpu(hdev, GOYA_CPU_TIMEOUT_USEC);
> if (rc) {
> @@ -5023,7 +5023,7 @@ static int goya_get_eeprom_data(struct hl_device *hdev,
> void *data,
>
> static enum hl_device_hw_state goya_get_hw_state(struct hl_device *hdev)
> {
> - return RREG32(mmPSOC_GLOBAL_CONF_APP_STATUS);
> + return RREG32(mmHW_STATE);
> }
>
> static const struct hl_asic_funcs goya_funcs = {
> diff --git a/drivers/misc/habanalabs/include/goya/goya_reg_map.h
> b/drivers/misc/habanalabs/include/goya/goya_reg_map.h
> index 554034f47317..cd89723c7f61 100644
> --- a/drivers/misc/habanalabs/include/goya/goya_reg_map.h
> +++ b/drivers/misc/habanalabs/include/goya/goya_reg_map.h
> @@ -29,4 +29,6 @@
> #define mmUBOOT_OFFSET mmPSOC_GLOBAL_CONF_SCRATCHPAD_30
> #define mmBTL_ID mmPSOC_GLOBAL_CONF_SCRATCHPAD_31
>
> +#define mmHW_STATE mmPSOC_GLOBAL_CONF_APP_STATUS
> +
> #endif /* GOYA_REG_MAP_H_ */
> --
> 2.17.1
>
The two patches are:
Reviewed-by: Oded Gabbay <oded.gab...@gmail.com>
Applied to -next.
Thanks,
Oded
