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 X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0ADB9C2B9F8 for ; Tue, 25 May 2021 17:36:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DADDA61378 for ; Tue, 25 May 2021 17:36:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232748AbhEYRhc (ORCPT ); Tue, 25 May 2021 13:37:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232508AbhEYRhb (ORCPT ); Tue, 25 May 2021 13:37:31 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8A67C061574 for ; Tue, 25 May 2021 10:36:00 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id a2so47271887lfc.9 for ; Tue, 25 May 2021 10:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Mp7udtTenG44NH/QCDQTjrCW5TxEnGG1zm25F5s/Mkc=; b=NUa6XVtpvp4ZD37FJIrtCt/4viHX5kXUAVaox/Noop5X1mKA3a0HHoGPmdpmxjTn6/ Xrq0KmtSCWkoPm9WQxaYx8U02WvEzKoRy7B0dRIv9qn7z0rjauojw8zcPXK55Iix21ia Fc5FgUBbevhofL14IsQED284iWRdqG9sZcrW6mj9YCVL/mwcRqZ2JhcEcVHW08yP6CFd hTzMLHI6QIxybi5Rt0/jIt5eX1jlg4vKjfwk6Sfj3aC3LqcbUPEwmxZqWwNLhfAjDGtt KzII28vCyIxGchruBFaFVy+aTTLUYTJHRqZlqAABFG5SPoRqqYi50qXBrCdaZ7eF5pxd AHJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Mp7udtTenG44NH/QCDQTjrCW5TxEnGG1zm25F5s/Mkc=; b=clmOatALa6GlXH11L9ze1leCXES6H79IpgQJayEWyqNHquu5Hs2Ce2swCw7lXqVna1 W/D8+ID4C3xSUmGlL1YdOC14l1ywUUCAyujz/s32EmBfjQw/ax7m7j4c/gc4xlBLUadB XbsOStIW/xvcWddQpSZr3KtOnVa76qEfIibWhaFOVOsWdysUne34oeXBFwQpV6zcYjsR bray7Zhfdd+4eqqnudi6WNpLoaGmkbIIeK6bqZzTeDdtWDFtXWXh09RPR6ts2CGn6qix KsQclfdQLZQgmfL7FLxIbSg8hsF6/uz4UinjaY0TyOuwWHzBBkyVV5+hQjjKzXDd0d6/ SyYQ== X-Gm-Message-State: AOAM532QZAqpJSUoHtDtNY5eX0CvLcF5kps1R3NPoka9iasl8nxRAVRD GZqIho5bMMrLer4fYcaccGFwSSpV1/NcLw== X-Google-Smtp-Source: ABdhPJxUZoxftFBuGOSezXPUY74cZMDR2Fz9AHFYsTJ9Ld+DD5mRvqjvVTsOjWljyr9Zto5lzE/5kA== X-Received: by 2002:a05:6512:31c6:: with SMTP id j6mr14801514lfe.129.1621964159064; Tue, 25 May 2021 10:35:59 -0700 (PDT) Received: from [192.168.88.254] ([85.249.41.56]) by smtp.gmail.com with ESMTPSA id 6sm1794842lfz.189.2021.05.25.10.35.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 May 2021 10:35:58 -0700 (PDT) Subject: Re: [PATCH 03/17] media: camss: csiphy-3ph: add support for SM8250 CSI DPHY From: Andrey Konovalov To: Jonathan Marek , linux-arm-msm@vger.kernel.org Cc: robert.foss@linaro.org, Todor Tomov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , "open list:QUALCOMM CAMERA SUBSYSTEM DRIVER" , open list References: <20210511180728.23781-1-jonathan@marek.ca> <20210511180728.23781-4-jonathan@marek.ca> Message-ID: <4b50f855-e791-b445-f7b8-bc7b783bdc00@linaro.org> Date: Tue, 25 May 2021 20:35:57 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hi Jonathan, Couple more minor issues. On 25.05.2021 20:19, Andrey Konovalov wrote: > Hi Jonathan, > > Thank you for the patchset! > > On 11.05.2021 21:07, Jonathan Marek wrote: >> Add support for CSIPHY (2PH/DPHY mode) found on SM8250 hardware. >> >> Signed-off-by: Jonathan Marek >> --- >>   .../qcom/camss/camss-csiphy-3ph-1-0.c         | 144 +++++++++++++++++- >>   1 file changed, 137 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c >> index 783b65295d20..61947576ddfb 100644 >> --- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c >> +++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c >> @@ -62,6 +62,7 @@ struct csiphy_reg_t { >>       u32 csiphy_param_type; >>   }; >> +/* GEN2 1.0 2PH */ >>   static const struct >>   csiphy_reg_t lane_regs_sdm845[5][14] = { >>       { >> @@ -146,6 +147,121 @@ csiphy_reg_t lane_regs_sdm845[5][14] = { >>       }, >>   }; >> +/* GEN2 1.2.1 2PH */ >> +static const struct >> +csiphy_reg_t lane_regs_sm8250[5][20] = { >> +    { >> +        {0x0030, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0900, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0908, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0904, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0904, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0004, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x002C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0034, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0010, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x001C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x003C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0008, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, >> +        {0x0000, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x000c, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0024, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +    }, >> +    { >> +        {0x0730, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0C80, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0C88, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0C84, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0C84, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0704, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x072C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0734, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0710, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x071C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x073C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0708, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, >> +        {0x0700, 0x80, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x070c, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0714, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0728, 0x04, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0724, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +    }, >> +    { >> +        {0x0230, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0A00, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0A08, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0A04, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0A04, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0204, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x022C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0234, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0210, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x021C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x023C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0208, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, >> +        {0x0200, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x020c, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0214, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0228, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0224, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +    }, >> +    { >> +        {0x0430, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0B00, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0B08, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0B04, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0B04, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0404, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x042C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0434, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0410, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x041C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x043C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0408, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, >> +        {0x0400, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x040c, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0414, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0428, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0424, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +    }, >> +    { >> +        {0x0630, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0C00, 0x05, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0C08, 0x10, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0C04, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0C04, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0604, 0x0C, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x062C, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0634, 0x07, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0610, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x061C, 0x08, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x063C, 0xB8, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0608, 0x10, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, >> +        {0x0600, 0x8D, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x060c, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0614, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0628, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0624, 0x00, 0x00, CSIPHY_DNP_PARAMS}, >> +        {0x0800, 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +        {0x0884, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS}, >> +    }, >> +}; >> + >>   static void csiphy_hw_version_read(struct csiphy_device *csiphy, >>                      struct device *dev) >>   { >> @@ -298,13 +414,23 @@ static void csiphy_gen1_config_lanes(struct csiphy_device *csiphy, >>   static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy, >>                        u8 settle_cnt) >>   { >> -    int i, l; >> -    u32 val; >> +    const struct csiphy_reg_t *r; >> +    int i, l, array_size; >> +    u32 val, lane_enable; lane_enable is not used in this patch ("warning: unused variable ‘lane_enable’"). >> + >> +    switch (csiphy->camss->version) { This switch statement doesn't have the "default:" clause which leads to several warnings of "enumeration value ‘CAMSS_8x16’ not handled in switch" kind. Thanks, Andrey >> +    case CAMSS_845: >> +        r = &lane_regs_sdm845[0][0]; >> +        array_size = ARRAY_SIZE(lane_regs_sdm845[0]); >> +        break; >> +    case CAMSS_8250: > > CAMSS_8250 is only introduced in "[PATCH 16_17] media: camss: add support for SM8250 camss", > and this breaks bisecting. > > Thanks, > Andrey > >> +        r = &lane_regs_sm8250[0][0]; >> +        array_size = ARRAY_SIZE(lane_regs_sm8250[0]); >> +        break; >> +    } >>       for (l = 0; l < 5; l++) { >> -        for (i = 0; i < 14; i++) { >> -            const struct csiphy_reg_t *r = &lane_regs_sdm845[l][i]; >> - >> +        for (i = 0; i < array_size; i++, r++) { >>               switch (r->csiphy_param_type) { >>               case CSIPHY_SETTLE_CNT_LOWER_BYTE: >>                   val = settle_cnt & 0xff; >> @@ -331,7 +457,10 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy, >>       settle_cnt = csiphy_settle_cnt_calc(link_freq, csiphy->timer_clk_rate); >> -    val = BIT(c->clk.pos); >> +    if (csiphy->camss->version == CAMSS_8250) >> +        val = BIT(7); >> +    else >> +        val = BIT(c->clk.pos); >>       for (i = 0; i < c->num_data; i++) >>           val |= BIT(c->data[i].pos * 2); >> @@ -349,7 +478,8 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy, >>       if (csiphy->camss->version == CAMSS_8x16 || >>           csiphy->camss->version == CAMSS_8x96) >>           csiphy_gen1_config_lanes(csiphy, cfg, settle_cnt); >> -    else if (csiphy->camss->version == CAMSS_845) >> +    else if (csiphy->camss->version == CAMSS_845 || >> +         csiphy->camss->version == CAMSS_8250) >>           csiphy_gen2_config_lanes(csiphy, settle_cnt); >>       /* IRQ_MASK registers - disable all interrupts */ >>