From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 2570B17744 for ; Thu, 15 Feb 2024 09:26:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707989215; cv=none; b=A6GR4TEjX7wluz8waNQ1MYP2PfGGA9Ew+tgv4gCDbNfZc45ku2Eo2uZPGMjVrsEwkiPq3CpdGh69+ORrlxr/BrdlZ3MQT08M4U6oBTSmEyDSe0ddjulz0IDGf8E+yMmWtOzmYPGY4v9lRS9tx33GXCDbpeyfZQrD599iENE2wNY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707989215; c=relaxed/simple; bh=ecamQUc576R0epdKqjkRQszTyH7lrl46ZIPoPGR3oZc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=iIBfo1IUfuWY1relptu67BGXtlJk4nNOBu02G7fhXR2b7Zdde8SaICafTMiLWEHJMk1aM87KY189AGIlUDQqrR9BZp9uy8ghs69MI3RNo4dL2bjushbO9R6OysVcuCuk84TFPuknEf6txThgI/piOsZ/+b64wZ9TfVgA1OeBbYQ= 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=hTzLhped; arc=none smtp.client-ip=209.85.208.46 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="hTzLhped" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-55f0b2c79cdso1041674a12.3 for ; Thu, 15 Feb 2024 01:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707989211; x=1708594011; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=w5KcKTaCQn4pBwWr+P+bPuhSGEvM0dqpC2FO7BYBz7I=; b=hTzLhpedxfvPm1+XZ+qDyo5GhvYoiebAWFD+PwrKQtJsfSGftXBPOBnvX9pvGMW744 FPRJNskhWd3BDdMXknCi2C+Q1tHJxlaJ9BfJlgE3XWsel5TtrNoz2N0fF1UGI4OEqPr2 dw2uBSwRhENB+FVhAfFEqIVYqo4H+KuTQskYqbBrpAiv7Pjq+DvREFsrYjaOvT4HoF70 bODEYujb55T0FvmXWOyynubpLOsMcfMxKjpG3LPOio1/Hzor/YPXSRaeCJuWI4CtXjYC zS6YF5yyoPKE+sVS9KUr+ktX8JD3mh0gJ2Feoi3a44j68xqE0FF79wCyqBLNt9dDdeD2 KpwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707989211; x=1708594011; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=w5KcKTaCQn4pBwWr+P+bPuhSGEvM0dqpC2FO7BYBz7I=; b=j5Js/nJstt+UAG+eLB75JCPPhnHcAvwutq12BtP4red2XDE9C68MgJsbmLmf77zh1G WUjS2f7OSVQbihw30NI2vS0UG6Sn9l418zFjgHL9D2Ofad7zag7DR62aWmVbIARtEwK2 otbzU1g35KHclGJU8KHItiZagjpZLycMs0aOjdwqDKMC91bponY1Qz9SJtmxlQw14KiP D+owa2kSpR6uwuURsInkNbA8mTdewkdq+Oo4gRemab7LoyYmtpfmr0RbXUAV58A18MIz mDnjk+NW9wC9KK/b10+omlmcq65UGXnbjKLb9D0m+lENXLfS/EALbKQH0lf8kwLLisf9 L+Ag== X-Forwarded-Encrypted: i=1; AJvYcCWX3KuhPS5oc/BoznbI84jkDBZh7VAqs9VUb10hEkl3wJ5mMxV8OqCGQ4LCjsotkETCu88JCvzbSi9LuCkd+jKaYxIDGizuvgsejGHz+g== X-Gm-Message-State: AOJu0Yy1uJLVISuuP1FA75EDhJEy/PZUjQYvLzid1iajRQmIUIVjUj5r FS5CB5deOJTh6zXxiJXFdbMeM7ignZ5s5f3dBJlfkJcvpTyxrrq9+eOGM4LmNMw= X-Google-Smtp-Source: AGHT+IEoMFpPFkQ98MpNIYsjxXySN2OmKZ5WeYtjXYVrEAtCkS8teqIlHftZm4rd0q8pEldzBbNu4g== X-Received: by 2002:a17:906:5f89:b0:a3d:5e44:83aa with SMTP id a9-20020a1709065f8900b00a3d5e4483aamr848262eju.20.1707989211294; Thu, 15 Feb 2024 01:26:51 -0800 (PST) Received: from linaro.org ([188.24.162.93]) by smtp.gmail.com with ESMTPSA id bq14-20020a170906d0ce00b00a3d2157e267sm360824ejb.11.2024.02.15.01.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 01:26:50 -0800 (PST) Date: Thu, 15 Feb 2024 11:26:49 +0200 From: Abel Vesa To: Konrad Dybcio Cc: Stephen Boyd , Matthias Brugger , Bjorn Andersson , Dmitry Baryshkov , Neil Armstrong , AngeloGioacchino Del Regno , Srini Kandagatla , Johan Hovold , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: Re: [PATCH RFC v3 3/4] spmi: pmic-arb: Make core resources acquiring a version operation Message-ID: References: <20240214-spmi-multi-master-support-v3-0-0bae0ef04faf@linaro.org> <20240214-spmi-multi-master-support-v3-3-0bae0ef04faf@linaro.org> <5e878fd9-8215-499d-ac1c-191cb5bfe798@linaro.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5e878fd9-8215-499d-ac1c-191cb5bfe798@linaro.org> On 24-02-14 22:44:55, Konrad Dybcio wrote: > On 14.02.2024 22:36, Abel Vesa wrote: > > On 24-02-14 22:18:33, Konrad Dybcio wrote: > >> On 14.02.2024 22:13, Abel Vesa wrote: > >>> Rather than setting up the core, obsrv and chnls in probe by using > >>> version specific conditionals, add a dedicated "get_core_resources" > >>> version specific op and move the acquiring in there. > >>> > >>> Signed-off-by: Abel Vesa > >>> --- > >>> drivers/spmi/spmi-pmic-arb.c | 111 ++++++++++++++++++++++++++++++------------- > >>> 1 file changed, 78 insertions(+), 33 deletions(-) > >>> > >>> diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c > >>> index 23939c0d225f..489556467a4c 100644 > >>> --- a/drivers/spmi/spmi-pmic-arb.c > >>> +++ b/drivers/spmi/spmi-pmic-arb.c > >>> @@ -203,6 +203,7 @@ struct spmi_pmic_arb { > >>> */ > >>> struct pmic_arb_ver_ops { > >>> const char *ver_str; > >>> + int (*get_core_resources)(struct platform_device *pdev, void __iomem *core); > >>> int (*init_apid)(struct spmi_pmic_arb *pmic_arb, int index); > >>> int (*ppid_to_apid)(struct spmi_pmic_arb *pmic_arb, u16 ppid); > >>> /* spmi commands (read_cmd, write_cmd, cmd) functionality */ > >>> @@ -956,6 +957,19 @@ static int pmic_arb_init_apid_min_max(struct spmi_pmic_arb *pmic_arb) > >>> return 0; > >>> } > >>> > >>> +static int pmic_arb_get_core_resources_v1(struct platform_device *pdev, > >>> + void __iomem *core) > >>> +{ > >>> + struct spmi_pmic_arb *pmic_arb = platform_get_drvdata(pdev); > >>> + > >>> + pmic_arb->wr_base = core; > >>> + pmic_arb->rd_base = core; > >>> + > >>> + pmic_arb->max_periphs = PMIC_ARB_MAX_PERIPHS; > >>> + > >>> + return 0; > >>> +} > >>> + > >>> static int pmic_arb_init_apid_v1(struct spmi_pmic_arb *pmic_arb, int index) > >>> { > >>> u32 *mapping_table; > >>> @@ -1063,6 +1077,41 @@ static u16 pmic_arb_find_apid(struct spmi_pmic_arb *pmic_arb, u16 ppid) > >>> return apid; > >>> } > >>> > >>> +static int pmic_arb_get_obsrvr_chnls_v2(struct platform_device *pdev) > >>> +{ > >>> + struct spmi_pmic_arb *pmic_arb = platform_get_drvdata(pdev); > >>> + struct device *dev = &pdev->dev; > >>> + struct resource *res; > >>> + > >>> + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, > >> > >> It's no longer indented to deep, no need to keep such aggressive wrapping > >> > > > > The pmic_arb_get_obsrvr_chnls_v2 is used by both: > > pmic_arb_get_core_resources_v2 > > pmic_arb_get_core_resources_v7 > > I meant line wrapping Oh, ok. Will do. > > > > >>> + "obsrvr"); > >>> + pmic_arb->rd_base = devm_ioremap(dev, res->start, > >>> + resource_size(res)); > >>> + if (IS_ERR(pmic_arb->rd_base)) > >>> + return PTR_ERR(pmic_arb->rd_base); > >>> + > >>> + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, > >>> + "chnls"); > >>> + pmic_arb->wr_base = devm_ioremap(dev, res->start, > >>> + resource_size(res)); > >>> + if (IS_ERR(pmic_arb->wr_base)) > >>> + return PTR_ERR(pmic_arb->wr_base); > >> > >> Could probably make it "devm_platform_get_and_ioremap_resource " > > > > The reason this needs to stay as is is because of reason explained by > > the following comment found in probe: > > > > /* > > * Please don't replace this with devm_platform_ioremap_resource() or > > * devm_ioremap_resource(). These both result in a call to > > * devm_request_mem_region() which prevents multiple mappings of this > > * register address range. SoCs with PMIC arbiter v7 may define two > > * arbiter devices, for the two physical SPMI interfaces, which share > > * some register address ranges (i.e. "core", "obsrvr", and "chnls"). > > * Ensure that both devices probe successfully by calling devm_ioremap() > > * which does not result in a devm_request_mem_region() call. > > */ > > > > Even though, AFAICT, there is no platform that adds a second node for > > the second bus, currently, in mainline, we should probably allow the > > "legacy" approach to still work. > > OK right, let's keep it. > > Konrad