| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAG3jFyuJkUNzQge=m_7yzew4a2_5LQqCQhHU8myQqhta7cH8cw@mail.gmail.com>
Date: Mon, 31 May 2021 18:07:09 +0200
From: Robert Foss <robert.foss@...aro.org>
To: Jonathan Marek <jonathan@...ek.ca>
Cc: MSM <linux-arm-msm@...r.kernel.org>,
Andrey Konovalov <andrey.konovalov@...aro.org>,
Todor Tomov <todor.too@...il.com>,
Andy Gross <agross@...nel.org>,
Bjorn Andersson <bjorn.andersson@...aro.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
"open list:QUALCOMM CAMERA SUBSYSTEM DRIVER"
<linux-media@...r.kernel.org>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 16/17] media: camss: add support for SM8250 camss
On Tue, 11 May 2021 at 20:08, Jonathan Marek <jonathan@...ek.ca> wrote:
>
> The Titan 480 camss found on SM8250 has 6 CSIPHY and 4 VFE/CSID.
>
> CSID is compatible with the Titan 170 CSID, but the Titan 480 CSID are
> inside the VFE region (between the "top" and "bus" registers), so a
> workaround is added to avoid ioremap failure.
>
> Signed-off-by: Jonathan Marek <jonathan@...ek.ca>
> ---
> .../media/platform/qcom/camss/camss-csid.c | 22 +-
> .../media/platform/qcom/camss/camss-csiphy.c | 8 +-
> drivers/media/platform/qcom/camss/camss-vfe.c | 9 +-
> .../media/platform/qcom/camss/camss-video.c | 3 +-
> drivers/media/platform/qcom/camss/camss.c | 196 ++++++++++++++++--
> drivers/media/platform/qcom/camss/camss.h | 1 +
> 6 files changed, 217 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
> index 528674dea06c..5ba603549a4f 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid.c
> @@ -560,7 +560,8 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
> } else if (camss->version == CAMSS_8x96 ||
> camss->version == CAMSS_660) {
> csid->ops = &csid_ops_4_7;
> - } else if (camss->version == CAMSS_845) {
> + } else if (camss->version == CAMSS_845 ||
> + camss->version == CAMSS_8250) {
> csid->ops = &csid_ops_170;
csid_ops_170 should probably be renamed csid_ops_gen2 for clarity.
> } else {
> return -EINVAL;
> @@ -569,10 +570,21 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
>
> /* Memory */
>
> - r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);
> - csid->base = devm_ioremap_resource(dev, r);
> - if (IS_ERR(csid->base))
> - return PTR_ERR(csid->base);
> + if (camss->version == CAMSS_8250) {
> + /* for titan 480, CSID registers are inside the VFE region,
> + * between the VFE "top" and "bus" registers. this requires
> + * VFE to be initialized before CSID
> + */
> + if (id >= 2) /* VFE/CSID lite */
> + csid->base = camss->vfe[id].base + 0x200;
> + else
> + csid->base = camss->vfe[id].base + 0x1200;
Could these 0x200 & 0x1200 be replaced with defines?
> + } else {
> + r = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[0]);
> + csid->base = devm_ioremap_resource(dev, r);
> + if (IS_ERR(csid->base))
> + return PTR_ERR(csid->base);
> + }
>
> /* Interrupt */
>
> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
> index f82f1e2aa688..1d10c816acf5 100644
> --- a/drivers/media/platform/qcom/camss/camss-csiphy.c
> +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
> @@ -582,7 +582,8 @@ int msm_csiphy_subdev_init(struct camss *camss,
> csiphy->ops = &csiphy_ops_3ph_1_0;
> csiphy->formats = csiphy_formats_8x96;
> csiphy->nformats = ARRAY_SIZE(csiphy_formats_8x96);
> - } else if (camss->version == CAMSS_845) {
> + } else if (camss->version == CAMSS_845 ||
> + camss->version == CAMSS_8250) {
> csiphy->ops = &csiphy_ops_3ph_1_0;
> csiphy->formats = csiphy_formats_sdm845;
> csiphy->nformats = ARRAY_SIZE(csiphy_formats_sdm845);
> @@ -679,7 +680,10 @@ int msm_csiphy_subdev_init(struct camss *camss,
>
> if (!strcmp(clock->name, "csiphy0_timer") ||
> !strcmp(clock->name, "csiphy1_timer") ||
> - !strcmp(clock->name, "csiphy2_timer"))
> + !strcmp(clock->name, "csiphy2_timer") ||
> + !strcmp(clock->name, "csiphy3_timer") ||
> + !strcmp(clock->name, "csiphy4_timer") ||
> + !strcmp(clock->name, "csiphy5_timer"))
> csiphy->rate_set[i] = true;
>
> if (camss->version == CAMSS_660 &&
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> index e7ab2c175ac9..d543048c10a8 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -220,7 +220,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> }
> else if (vfe->camss->version == CAMSS_8x96 ||
> vfe->camss->version == CAMSS_660 ||
> - vfe->camss->version == CAMSS_845)
> + vfe->camss->version == CAMSS_845 ||
> + vfe->camss->version == CAMSS_8250)
> switch (sink_code) {
> case MEDIA_BUS_FMT_YUYV8_2X8:
> {
> @@ -1294,6 +1295,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> case CAMSS_845:
> vfe->ops = &vfe_ops_170;
> break;
> + case CAMSS_8250:
> + vfe->ops = &vfe_ops_480;
> + break;
> default:
> return -EINVAL;
> }
> @@ -1405,7 +1409,8 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> l->formats = formats_rdi_8x96;
> l->nformats = ARRAY_SIZE(formats_rdi_8x96);
> }
> - } else if (camss->version == CAMSS_845) {
> + } else if (camss->version == CAMSS_845 ||
> + camss->version == CAMSS_8250) {
> l->formats = formats_rdi_845;
> l->nformats = ARRAY_SIZE(formats_rdi_845);
> } else {
> diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
> index 54e77d30d452..5dc1ddbe6d65 100644
> --- a/drivers/media/platform/qcom/camss/camss-video.c
> +++ b/drivers/media/platform/qcom/camss/camss-video.c
> @@ -1011,7 +1011,8 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
> video->formats = formats_rdi_8x96;
> video->nformats = ARRAY_SIZE(formats_rdi_8x96);
> }
> - } else if (video->camss->version == CAMSS_845) {
> + } else if (video->camss->version == CAMSS_845 ||
> + video->camss->version == CAMSS_8250) {
> video->formats = formats_rdi_845;
> video->nformats = ARRAY_SIZE(formats_rdi_845);
> } else {
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index c08d6d6f6f90..463850725f37 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -662,6 +662,162 @@ static const struct resources vfe_res_845[] = {
> }
> };
>
> +static const struct resources csiphy_res_8250[] = {
> + /* CSIPHY0 */
> + {
> + .regulator = { NULL },
> + .clock = { "csiphy0", "csiphy0_timer" },
> + .clock_rate = { { 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy0" },
> + .interrupt = { "csiphy0" }
> + },
> + /* CSIPHY1 */
> + {
> + .regulator = { NULL },
> + .clock = { "csiphy1", "csiphy1_timer" },
> + .clock_rate = { { 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy1" },
> + .interrupt = { "csiphy1" }
> + },
> + /* CSIPHY2 */
> + {
> + .regulator = { NULL },
> + .clock = { "csiphy2", "csiphy2_timer" },
> + .clock_rate = { { 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy2" },
> + .interrupt = { "csiphy2" }
> + },
> + /* CSIPHY3 */
> + {
> + .regulator = { NULL },
> + .clock = { "csiphy3", "csiphy3_timer" },
> + .clock_rate = { { 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy3" },
> + .interrupt = { "csiphy3" }
> + },
> + /* CSIPHY4 */
> + {
> + .regulator = { NULL },
> + .clock = { "csiphy4", "csiphy4_timer" },
> + .clock_rate = { { 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy4" },
> + .interrupt = { "csiphy4" }
> + },
> + /* CSIPHY5 */
> + {
> + .regulator = { NULL },
> + .clock = { "csiphy5", "csiphy5_timer" },
> + .clock_rate = { { 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy5" },
> + .interrupt = { "csiphy5" }
> + }
> +};
> +
> +static const struct resources csid_res_8250[] = {
> + /* CSID0 */
> + {
> + .regulator = { NULL },
> + .clock = { "vfe0_csid", "vfe0_cphy_rx", "vfe0", "vfe0_areg", "vfe0_ahb" },
> + .clock_rate = { { 400000000 },
> + { 400000000 },
> + { 350000000, 475000000, 576000000, 720000000 },
> + { 100000000, 200000000, 300000000, 400000000 },
> + { 0 } },
> + .reg = { "csid0" },
> + .interrupt = { "csid0" }
> + },
> + /* CSID1 */
> + {
> + .regulator = { NULL },
> + .clock = { "vfe1_csid", "vfe1_cphy_rx", "vfe1", "vfe1_areg", "vfe1_ahb" },
> + .clock_rate = { { 400000000 },
> + { 400000000 },
> + { 350000000, 475000000, 576000000, 720000000 },
> + { 100000000, 200000000, 300000000, 400000000 },
> + { 0 } },
> + .reg = { "csid1" },
> + .interrupt = { "csid1" }
> + },
> + /* CSID2 */
> + {
> + .regulator = { NULL },
> + .clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" },
> + .clock_rate = { { 400000000 },
> + { 400000000 },
> + { 400000000, 480000000 },
> + { 0 } },
> + .reg = { "csid2" },
> + .interrupt = { "csid2" }
> + },
> + /* CSID3 */
> + {
> + .regulator = { NULL },
> + .clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" },
> + .clock_rate = { { 400000000 },
> + { 400000000 },
> + { 400000000, 480000000 },
> + { 0 } },
> + .reg = { "csid3" },
> + .interrupt = { "csid3" }
> + }
> +};
> +
> +static const struct resources vfe_res_8250[] = {
> + /* VFE0 */
> + {
> + .regulator = { NULL },
> + .clock = { "vfe0_ahb", "vfe0_areg", "vfe0", "vfe0_axi", "cam_hf_axi" },
> + .clock_rate = { { 0 },
> + { 100000000, 200000000, 300000000, 400000000 },
> + { 350000000, 475000000, 576000000, 720000000 },
> + { 0 },
> + { 0 } },
> + .reg = { "vfe0" },
> + .interrupt = { "vfe0" }
> + },
> + /* VFE1 */
> + {
> + .regulator = { NULL },
> + .clock = { "vfe1_ahb", "vfe1_areg", "vfe1", "vfe1_axi", "cam_hf_axi" },
> + .clock_rate = { { 0 },
> + { 100000000, 200000000, 300000000, 400000000 },
> + { 350000000, 475000000, 576000000, 720000000 },
> + { 0 },
> + { 0 } },
> + .reg = { "vfe1" },
> + .interrupt = { "vfe1" }
> + },
> + /* VFE2 (lite) */
> + {
> + .regulator = { NULL },
> + .clock = { "vfe_lite_ahb", "vfe_lite_axi", "vfe_lite", "cam_hf_axi" },
> + .clock_rate = { { 0 },
> + { 0 },
> + { 400000000, 480000000 },
> + { 0 } },
> + .reg = { "vfe_lite0" },
> + .interrupt = { "vfe_lite0" }
> + },
> +
> + /* VFE3 (lite) */
> + {
> + .regulator = { NULL },
> + .clock = { "vfe_lite_ahb", "vfe_lite_axi", "vfe_lite", "cam_hf_axi" },
> + .clock_rate = { { 0 },
> + { 0 },
> + { 400000000, 480000000 },
> + { 0 } },
> + .reg = { "vfe_lite1" },
> + .interrupt = { "vfe_lite1" }
> + },
> +};
> +
> /*
> * camss_add_clock_margin - Add margin to clock frequency rate
> * @rate: Clock frequency rate
> @@ -945,6 +1101,12 @@ static int camss_init_subdevices(struct camss *camss)
> /* Titan VFEs don't have an ISPIF */
> ispif_res = NULL;
> vfe_res = vfe_res_845;
> + } else if (camss->version == CAMSS_8250) {
> + csiphy_res = csiphy_res_8250;
> + csid_res = csid_res_8250;
> + /* Titan VFEs don't have an ISPIF */
> + ispif_res = NULL;
> + vfe_res = vfe_res_8250;
> } else {
> return -EINVAL;
> }
> @@ -960,6 +1122,17 @@ static int camss_init_subdevices(struct camss *camss)
> }
> }
>
> + /* note: SM8250 requires VFE to be initialized before CSID */
> + for (i = 0; i < camss->vfe_num; i++) {
> + ret = msm_vfe_subdev_init(camss, &camss->vfe[i],
> + &vfe_res[i], i);
> + if (ret < 0) {
> + dev_err(camss->dev,
> + "Fail to init vfe%d sub-device: %d\n", i, ret);
> + return ret;
> + }
> + }
> +
> for (i = 0; i < camss->csid_num; i++) {
> ret = msm_csid_subdev_init(camss, &camss->csid[i],
> &csid_res[i], i);
> @@ -978,16 +1151,6 @@ static int camss_init_subdevices(struct camss *camss)
> return ret;
> }
>
> - for (i = 0; i < camss->vfe_num; i++) {
> - ret = msm_vfe_subdev_init(camss, &camss->vfe[i],
> - &vfe_res[i], i);
> - if (ret < 0) {
> - dev_err(camss->dev,
> - "Fail to init vfe%d sub-device: %d\n", i, ret);
> - return ret;
> - }
> - }
> -
> return 0;
> }
>
> @@ -1250,7 +1413,8 @@ static int camss_configure_pd(struct camss *camss)
> if (camss->version == CAMSS_8x96 ||
> camss->version == CAMSS_660)
> nbr_pm_domains = PM_DOMAIN_GEN1_COUNT;
> - else if (camss->version == CAMSS_845)
> + else if (camss->version == CAMSS_845 ||
> + camss->version == CAMSS_8250)
> nbr_pm_domains = PM_DOMAIN_GEN2_COUNT;
>
> for (i = 0; i < nbr_pm_domains; i++) {
> @@ -1326,6 +1490,12 @@ static int camss_probe(struct platform_device *pdev)
> camss->csiphy_num = 4;
> camss->csid_num = 3;
> camss->vfe_num = 3;
> + } else if (of_device_is_compatible(dev->of_node,
> + "qcom,sm8250-camss")) {
> + camss->version = CAMSS_8250;
> + camss->csiphy_num = 6;
> + camss->csid_num = 4;
> + camss->vfe_num = 4;
> } else {
> ret = -EINVAL;
> goto err_free;
> @@ -1457,7 +1627,8 @@ void camss_delete(struct camss *camss)
> if (camss->version == CAMSS_8x96 ||
> camss->version == CAMSS_660)
> nbr_pm_domains = PM_DOMAIN_GEN1_COUNT;
> - else if (camss->version == CAMSS_845)
> + else if (camss->version == CAMSS_845 ||
> + camss->version == CAMSS_8250)
> nbr_pm_domains = PM_DOMAIN_GEN2_COUNT;
>
> for (i = 0; i < nbr_pm_domains; i++) {
> @@ -1493,6 +1664,7 @@ static const struct of_device_id camss_dt_match[] = {
> { .compatible = "qcom,msm8996-camss" },
> { .compatible = "qcom,sdm660-camss" },
> { .compatible = "qcom,sdm845-camss" },
> + { .compatible = "qcom,sm8250-camss" },
> { }
> };
>
> diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
> index dc8b4154f92b..377e2474a485 100644
> --- a/drivers/media/platform/qcom/camss/camss.h
> +++ b/drivers/media/platform/qcom/camss/camss.h
> @@ -69,6 +69,7 @@ enum camss_version {
> CAMSS_8x96,
> CAMSS_660,
> CAMSS_845,
> + CAMSS_8250,
> };
>
> struct camss {
With the above issues fixed, feel free to add my r-b.
Reviewed-by: Robert Foss <robert.foss@...aro.org>
Powered by blists - more mailing lists