From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95D5D634 for ; Mon, 19 Aug 2024 00:01:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724025674; cv=none; b=rujZPsldGcdeq0AHproIkz/Lm9NBpccu4rxXj9mDyCS2Eq+zCnhAiepi8zxFz1bJhyZ1gcQ5RDgCKKUGI2arDqGUdh4BLjPBSqIXSHYyTA1IkjeVx3NQywCbwUiIFXwiL+anDtSGclKE++kxh6x3H5JLb3nPxLZpLR6XDiWO7WU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724025674; c=relaxed/simple; bh=6hYpg0m5Rt67g7Mxzu2ElLnjjv6XNz+ikayF+thPaug=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=LsFgh9B6VpV5XJANCORjIDUo+FA/fsLcHRcwXvehzrEBZOvTUDEiNfnv01Qx/dpDFSeQWb27uX+8WZcnNABdSQwOngUSIo34vGKT0h0hmZ7mQ0yBqgVpKHJ1n7i6BUvU8FSD+IFL5116Ny7a59R3LmigrqXcnh4bu8SXJ4rcW/k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=xQa+KlO1; arc=none smtp.client-ip=209.85.208.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="xQa+KlO1" Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2ef2c2dfaf9so7620141fa.1 for ; Sun, 18 Aug 2024 17:01:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724025671; x=1724630471; darn=vger.kernel.org; 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=BYOLFiuwIeABlNgpCgPMEdlJrY/ffM3olbhyHsVZ574=; b=xQa+KlO1JetyXBB2uHz+pGrTwu6y07n3Ix+kUKNV9FG8gayQzC7Fk8CDC4M87imz+B amkij1vOuTgmQlPEJeGHtGETavOXtH71qh363OmVr7ykfYFsFfggFqZsWhpJCOtOQtlo gXP3u59enZppPNF62UBoob2CFm6+SdcxiD8X3Hvdldl1kA0+JFXeAbXDXM2Zf2mZjSR5 JjoBcTOt2VxpOjuCv96PVrXyC9fBksg1OS/K/ObwyY2PSsckl2hgae02MRgDro5dDy7S XvF6qTT9KWeFZXdTiLsxHLRlydPdyN1JMY5I0JQLhNpXQaU1GEMnBt5tR2o4ETQ9Wj41 pWgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724025671; x=1724630471; 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=BYOLFiuwIeABlNgpCgPMEdlJrY/ffM3olbhyHsVZ574=; b=GIL2+81e7wfjsJwcUclE/RsqffKtlqqLA8kDu6cY+SH+K0gtWTpRRgcUmcg6tNJKrr nnmeSwx56clJ+oJXxwtCCBnalwSWuXNRHwjBINUoVugS5acifA+AHJwOiIw3Xuv912gm CERWKcBpP22xxErTRA4JXLdxe1yOtdO6Q1hZl9ujEzM7kaerd/8Cry8rzPO6no8Pf/8n RdvAnf1ric/HV2mYXT26bC0ZYq9W9onjnjgL7sngmZNo1yVO4BconpgeAiphQGt6X4uH cl6LFvc+0v6kp1H3W8BnZylWUsZPzY/8ZKdB7aUbI04ErQAhyiMCd8CpF+E40250KUVE AsZg== X-Forwarded-Encrypted: i=1; AJvYcCXAnq5JX+uKD+a2iYrPwo/ApIGmZbdqd2kw+vGNJed7eiG0Ftv/52fWR9kAS6eBqq2jmJ6QOBOZSaqSNw==@vger.kernel.org X-Gm-Message-State: AOJu0Yyrja79Cbc0aY9Rubtsee6CGwSELCKGA+1BpPsCtFjmqPaP4deG 5y/xdsu+8G+mjWSzgRaXbricC7jYL/gCFhkhP7WDXogvkkdsYXUHlfTfUGprk+RoR6GjIrtulJq z X-Google-Smtp-Source: AGHT+IFhCmHG6qv7yNoduE8Vmk9V9zmO0z2IBMuw/McbuDAD0EmCQtvNUBmXvNzXpFO744+oecAeYQ== X-Received: by 2002:a05:6512:1081:b0:530:e0fd:4a92 with SMTP id 2adb3069b0e04-5331c618ffemr3586968e87.0.1724025670471; Sun, 18 Aug 2024 17:01:10 -0700 (PDT) Received: from [192.168.1.4] (88-112-131-206.elisa-laajakaista.fi. [88.112.131.206]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5330d424c63sm1318158e87.259.2024.08.18.17.01.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 18 Aug 2024 17:01:09 -0700 (PDT) Message-ID: Date: Mon, 19 Aug 2024 03:01:08 +0300 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 05/13] media: qcom: camss: csiphy-3ph: Move CSIPHY variables to data field inside csiphy struct Content-Language: en-US To: Depeng Shao , rfoss@kernel.org, todor.too@gmail.com, bryan.odonoghue@linaro.org, mchehab@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@quicinc.com References: <20240812144131.369378-1-quic_depengs@quicinc.com> <20240812144131.369378-6-quic_depengs@quicinc.com> From: Vladimir Zapolskiy In-Reply-To: <20240812144131.369378-6-quic_depengs@quicinc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/12/24 17:41, Depeng Shao wrote: > From: Bryan O'Donoghue > > A .data field in the csiphy device structure allows us to extend out the > register layout of the three phase capable CSIPHY layer. > > Move the existing lane configuration structure to an encapsulating > structure -> struct csiphy_device_regs which is derived from the .data > field populated at PHY init time, as opposed to calculated at lane > configuration. > > Signed-off-by: Bryan O'Donoghue > Signed-off-by: Depeng Shao > Reviewed-by: Vladimir Zapolskiy > --- > .../qcom/camss/camss-csiphy-3ph-1-0.c | 55 ++++++++++++------- > .../media/platform/qcom/camss/camss-csiphy.h | 1 + > 2 files changed, 36 insertions(+), 20 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 b60c32a195df..93782ebfe0ea 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 > @@ -63,6 +63,11 @@ struct csiphy_lane_regs { > u32 csiphy_param_type; > }; > > +struct csiphy_device_regs { > + const struct csiphy_lane_regs *lane_regs; > + int lane_array_size; > +}; > + > /* GEN2 1.0 2PH */ > static const struct > csiphy_lane_regs lane_regs_sdm845[] = { > @@ -470,28 +475,11 @@ static void csiphy_gen1_config_lanes(struct csiphy_device *csiphy, > static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy, > u8 settle_cnt) > { > - const struct csiphy_lane_regs *r; > - int i, array_size; > + struct csiphy_device_regs *csiphy_regs = csiphy->data; > + const struct csiphy_lane_regs *r = csiphy_regs->lane_regs; > + int i, array_size = csiphy_regs->lane_array_size; > u32 val; > > - switch (csiphy->camss->res->version) { > - case CAMSS_845: > - r = &lane_regs_sdm845[0]; > - array_size = ARRAY_SIZE(lane_regs_sdm845); > - break; > - case CAMSS_8250: > - r = &lane_regs_sm8250[0]; > - array_size = ARRAY_SIZE(lane_regs_sm8250); > - break; > - case CAMSS_8280XP: > - r = &lane_regs_sc8280xp[0]; > - array_size = ARRAY_SIZE(lane_regs_sc8280xp); > - break; > - default: > - WARN(1, "unknown cspi version\n"); > - return; > - } > - > for (i = 0; i < array_size; i++, r++) { > switch (r->csiphy_param_type) { > case CSIPHY_SETTLE_CNT_LOWER_BYTE: > @@ -583,6 +571,33 @@ static void csiphy_lanes_disable(struct csiphy_device *csiphy, > > static int csiphy_init(struct csiphy_device *csiphy) > { > + struct device *dev = csiphy->camss->dev; > + struct csiphy_device_regs *regs; > + > + regs = devm_kmalloc(dev, sizeof(*regs), GFP_KERNEL); > + if (!regs) > + return -ENOMEM; > + > + csiphy->data = regs; > + > + switch (csiphy->camss->res->version) { > + case CAMSS_845: > + regs->lane_regs = &lane_regs_sdm845[0]; > + regs->lane_array_size = ARRAY_SIZE(lane_regs_sdm845); > + break; > + case CAMSS_8250: > + regs->lane_regs = &lane_regs_sm8250[0]; > + regs->lane_array_size = ARRAY_SIZE(lane_regs_sm8250); > + break; > + case CAMSS_8280XP: > + regs->lane_regs = &lane_regs_sc8280xp[0]; > + regs->lane_array_size = ARRAY_SIZE(lane_regs_sc8280xp); > + break; > + default: > + WARN(1, "unknown csiphy version\n"); > + return -ENODEV; > + } > + > return 0; > } > > diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h > index bdf9a9c8bacc..cac1f800b7d8 100644 > --- a/drivers/media/platform/qcom/camss/camss-csiphy.h > +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h > @@ -95,6 +95,7 @@ struct csiphy_device { > struct csiphy_config cfg; > struct v4l2_mbus_framefmt fmt[MSM_CSIPHY_PADS_NUM]; > const struct csiphy_subdev_resources *res; > + void *data; I would suggest to make the type/name above explicit: struct csiphy_device_regs *regs; > }; > > struct camss_subdev_resources; -- Best wishes, Vladimir