From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C431C636CC for ; Mon, 13 Feb 2023 11:41:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230258AbjBMLl5 (ORCPT ); Mon, 13 Feb 2023 06:41:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229612AbjBMLlw (ORCPT ); Mon, 13 Feb 2023 06:41:52 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED0BA6593 for ; Mon, 13 Feb 2023 03:41:50 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id n10so4174484ejc.4 for ; Mon, 13 Feb 2023 03:41:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=HZjWtnpB+JR+MBocStwqEBme5hqHBhxurVGq44aOfNU=; b=HUi+3gFrBgXnIlrzbwph68gdhbwXu6lrIkJLQ9MVScN8jvOSxUUga79QOD3rljCI2I uZFzVrMdcuxFPAGnsqGB6BLCTaXlvmCYEPx6ImMVEx3btDN+4dMKHWkEOAz5kgCTXDXC Ctc0QD5VADaGPTp2JWsjMb1SUd+xWoFWJ+rPANZlTdU0M4a+EXP+Xx2xtO+lym6O0q6B 7xHAcnB4a2kutPGoNt6ztTOrl3HKxNHBRNAbHxfUT1WOv+Ku6hnHLsM2+Ak6MeahEfAa kQ62X4q6GzUL19PawJ+4xOCbF2MmPkIMEjyssdFvnQLDi1PqAO/Bhl9ZTLMlYMPH0xsZ gs8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HZjWtnpB+JR+MBocStwqEBme5hqHBhxurVGq44aOfNU=; b=I+eOFpK+XoDBVJxgO11ZLczZx+uUp8sr0duJhwWafsEnKYghwmPhPjxiHXunY9G5oN lI5AfwbTJmtRttm+Xkxm4u/Jn5I30uEaSofsM1fnXKX0EsrZwV1nc7HyfGGHvrTPC3Bj tzxm/AmnglX9fJ8NdaCY2PZMB9i16xbYPf8J7HkApHTUuf/1dZ5eA0tF3TTX11njPahR E994y07SFrZ+yuhK/RUFLNSvqp50o2hQgxIAWLoZpsobj00kLU934JOl475diNTNkguq PYB76sEAzJ5ZqCHKSqjbC5PcD+8MQQm6hUEyLhROZpMb5bJ08bEdfw7bVodIUgNiUW8v eL8Q== X-Gm-Message-State: AO0yUKWwaDYlX1wSPW634vLVlAHfG2xfao4Hognfakr0yE81lf9MzHXb B952pjOuDVpuJfqf6rcNtkrUog== X-Google-Smtp-Source: AK7set/JqR/EfdbOheMSXdE38Cii6+oDKYoEq3Y1vVZ8k68sBLrU6cxvBi6+mpfvkdvmOn0H88kN3g== X-Received: by 2002:a17:906:5a91:b0:8af:2bb3:80d7 with SMTP id l17-20020a1709065a9100b008af2bb380d7mr14223671ejq.31.1676288509552; Mon, 13 Feb 2023 03:41:49 -0800 (PST) Received: from ?IPV6:2001:14ba:a085:4d00::8a5? (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id z20-20020a1709060ad400b0084d494b24dcsm6637284ejf.161.2023.02.13.03.41.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Feb 2023 03:41:48 -0800 (PST) Message-ID: <2da7da44-0700-2403-058a-10a011d097d9@linaro.org> Date: Mon, 13 Feb 2023 13:41:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [PATCH 03/10] drm/msm/dsi: Zero-terminate msm_dsi_config::io_start Content-Language: en-GB To: Konrad Dybcio , linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Rob Clark , Abhinav Kumar , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Loic Poulain , Neil Armstrong , Vinod Koul , Vladimir Lypak , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20230211115110.1462920-1-konrad.dybcio@linaro.org> <20230211115110.1462920-4-konrad.dybcio@linaro.org> <71b63ae5-1b2c-b0a9-913c-99b657133f0f@linaro.org> <8dfd429b-a77e-af58-c778-9c157844e494@linaro.org> From: Dmitry Baryshkov In-Reply-To: <8dfd429b-a77e-af58-c778-9c157844e494@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 13/02/2023 11:18, Konrad Dybcio wrote: > > > On 11.02.2023 14:19, Dmitry Baryshkov wrote: >> On 11/02/2023 13:51, Konrad Dybcio wrote: >>> In preparation for supporting multiple sets of possible base registers, >>> Zero-terminate the array that contains them to remove the need of >>> specifying num_dsi for each set. >>> >>> Signed-off-by: Konrad Dybcio >>> --- >>>   drivers/gpu/drm/msm/dsi/dsi_cfg.c  | 39 ++++++++++-------------------- >>>   drivers/gpu/drm/msm/dsi/dsi_cfg.h  |  4 +-- >>>   drivers/gpu/drm/msm/dsi/dsi_host.c |  2 +- >>>   3 files changed, 16 insertions(+), 29 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c >>> index 068d45b3a8f0..5f62c563bd1c 100644 >>> --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c >>> +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c >>> @@ -22,9 +22,8 @@ static const struct msm_dsi_config apq8064_dsi_cfg = { >>>       .bus_clk_names = dsi_v2_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_v2_bus_clk_names), >>>       .io_start = { >>> -        { 0x4700000, 0x5800000 }, >>> +        { 0x4700000, 0x5800000, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const char * const dsi_6g_bus_clk_names[] = { >>> @@ -44,9 +43,8 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = { >>>       .bus_clk_names = dsi_6g_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), >>>       .io_start = { >>> -        { 0xfd922800, 0xfd922b00 }, >>> +        { 0xfd922800, 0xfd922b00, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const char * const dsi_8916_bus_clk_names[] = { >>> @@ -65,9 +63,8 @@ static const struct msm_dsi_config msm8916_dsi_cfg = { >>>       .bus_clk_names = dsi_8916_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names), >>>       .io_start = { >>> -        { 0x1a98000 }, >>> +        { 0x1a98000, 0 }, >>>       }, >>> -    .num_dsi = 1, >>>   }; >>>     static const char * const dsi_8976_bus_clk_names[] = { >>> @@ -86,9 +83,8 @@ static const struct msm_dsi_config msm8976_dsi_cfg = { >>>       .bus_clk_names = dsi_8976_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names), >>>       .io_start = { >>> -        { 0x1a94000, 0x1a96000 }, >>> +        { 0x1a94000, 0x1a96000, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const struct regulator_bulk_data msm8994_dsi_regulators[] = { >>> @@ -107,9 +103,8 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { >>>       .bus_clk_names = dsi_6g_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), >>>       .io_start = { >>> -        { 0xfd998000, 0xfd9a0000 }, >>> +        { 0xfd998000, 0xfd9a0000, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const char * const dsi_8996_bus_clk_names[] = { >>> @@ -129,9 +124,8 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { >>>       .bus_clk_names = dsi_8996_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), >>>       .io_start = { >>> -        { 0x994000, 0x996000 }, >>> +        { 0x994000, 0x996000, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const char * const dsi_msm8998_bus_clk_names[] = { >>> @@ -150,9 +144,8 @@ static const struct msm_dsi_config msm8998_dsi_cfg = { >>>       .bus_clk_names = dsi_msm8998_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_msm8998_bus_clk_names), >>>       .io_start = { >>> -        { 0xc994000, 0xc996000 }, >>> +        { 0xc994000, 0xc996000, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const char * const dsi_sdm660_bus_clk_names[] = { >>> @@ -170,9 +163,8 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { >>>       .bus_clk_names = dsi_sdm660_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_sdm660_bus_clk_names), >>>       .io_start = { >>> -        { 0xc994000, 0xc996000 }, >>> +        { 0xc994000, 0xc996000, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const char * const dsi_sdm845_bus_clk_names[] = { >>> @@ -194,9 +186,8 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { >>>       .bus_clk_names = dsi_sdm845_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), >>>       .io_start = { >>> -        { 0xae94000, 0xae96000 }, >>> +        { 0xae94000, 0xae96000, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const struct regulator_bulk_data sm8550_dsi_regulators[] = { >>> @@ -210,9 +201,8 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { >>>       .bus_clk_names = dsi_sdm845_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), >>>       .io_start = { >>> -        { 0xae94000, 0xae96000 }, >>> +        { 0xae94000, 0xae96000, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const struct regulator_bulk_data sc7180_dsi_regulators[] = { >>> @@ -226,9 +216,8 @@ static const struct msm_dsi_config sc7180_dsi_cfg = { >>>       .bus_clk_names = dsi_sc7180_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names), >>>       .io_start = { >>> -        { 0xae94000 }, >>> +        { 0xae94000, 0 }, >>>       }, >>> -    .num_dsi = 1, >>>   }; >>>     static const char * const dsi_sc7280_bus_clk_names[] = { >>> @@ -246,9 +235,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { >>>       .bus_clk_names = dsi_sc7280_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), >>>       .io_start = { >>> -        { 0xae94000, 0xae96000 }, >>> +        { 0xae94000, 0xae96000, 0 }, >>>       }, >>> -    .num_dsi = 2, >>>   }; >>>     static const char * const dsi_qcm2290_bus_clk_names[] = { >>> @@ -266,9 +254,8 @@ static const struct msm_dsi_config qcm2290_dsi_cfg = { >>>       .bus_clk_names = dsi_qcm2290_bus_clk_names, >>>       .num_bus_clks = ARRAY_SIZE(dsi_qcm2290_bus_clk_names), >>>       .io_start = { >>> -        { 0x5e94000 }, >>> +        { 0x5e94000, 0 }, >>>       }, >>> -    .num_dsi = 1, >>>   }; >>>     static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = { >>> diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h >>> index df9f09876ccb..03493cc6b772 100644 >>> --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h >>> +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h >>> @@ -41,8 +41,8 @@ struct msm_dsi_config { >>>       int num_regulators; >>>       const char * const *bus_clk_names; >>>       const int num_bus_clks; >>> -    const resource_size_t io_start[VARIANTS_MAX][DSI_MAX]; >>> -    const int num_dsi; >>> +    /* Allow + 1 entry for the zero-terminator */ >>> +    const resource_size_t io_start[VARIANTS_MAX][DSI_MAX + 1]; >>>   }; >>>     struct msm_dsi_host_cfg_ops { >>> diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c >>> index 22ba8726b0ea..f5092b4d0757 100644 >>> --- a/drivers/gpu/drm/msm/dsi/dsi_host.c >>> +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c >>> @@ -1868,7 +1868,7 @@ static int dsi_host_get_id(struct msm_dsi_host *msm_host) >>>       if (!res) >>>           return -EINVAL; >>>   -    for (i = 0; i < cfg->num_dsi; i++) { >>> +    for (i = 0; cfg->io_start[0][i]; i++) { >>>           if (cfg->io_start[0][i] == res->start) >>>               return i; >>>       } >> >> I think we have the easier way to do this: always loop towards DSI_MAX. Empty cells will contain the value of 0 which can not match against valid starting address. > Yep, your approach will save us NUM_ENTRIES*sizeof(u64) memory! As for me it not about saving memory, but rather about the driver logic. Compare: - We have two possible DSI hosts, one which is ocassionally absent thus the address is 0 vs - We have a zero-terminated list of 2+1 entries for not more than two DSI hosts. > >> >> Also please shift this patch to the first place, it will be logical to add VARIANT_MAX after removing num_dsi. > Ack. > > Konrad >> -- With best wishes Dmitry