Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Date:   Mon, 20 Nov 2023 11:55:21 +0200 (EET)
From:   =?ISO-8859-15?Q?Ilpo_J=E4rvinen?= <ilpo.jarvinen@linux.intel.com>
To:     =?ISO-8859-15?Q?Th=E9o_Lebrun?= <theo.lebrun@bootlin.com>
cc:     Russell King <linux@armlinux.org.uk>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jiri Slaby <jirislaby@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        linux-serial <linux-serial@vger.kernel.org>,
        Linus Walleij <linus.walleij@linaro.org>,
        =?ISO-8859-15?Q?Gr=E9gory_Clement?= <gregory.clement@bootlin.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
        Vladimir Kondratiev <vladimir.kondratiev@mobileye.com>,
        Tawfik Bayouk <tawfik.bayouk@mobileye.com>
Subject: Re: [PATCH v3 6/6] tty: serial: amba-pl011: factor QDF2400 SoC
 erratum 44 out of probe
In-Reply-To: <20231120-mbly-uart-v3-6-07ae35979f1f@bootlin.com>
Message-ID: <5c10e247-3fe-7455-a13-fde4c3cb0b4@linux.intel.com>
References: <20231120-mbly-uart-v3-0-07ae35979f1f@bootlin.com> <20231120-mbly-uart-v3-6-07ae35979f1f@bootlin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="8323329-557729899-1700474126=:2032"
Precedence: bulk

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--8323329-557729899-1700474126=:2032
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8BIT

On Mon, 20 Nov 2023, Théo Lebrun wrote:

> On this platform, different vendor data is used. That requires a
> compile-time check as we access (1) a global boolean & (2) our local
> vendor data. Both symbols are accessible only when
> CONFIG_ACPI_SPCR_TABLE is enabled.
> 
> Factor the vendor data overriding to a separate function that is empty
> when CONFIG_ACPI_SPCR_TABLE is not defined.
> 
> Suggested-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
> ---
>  drivers/tty/serial/amba-pl011.c | 25 ++++++++++++++++++-------
>  1 file changed, 18 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
> index 4185d6fd243b..e08a32eb0ed1 100644
> --- a/drivers/tty/serial/amba-pl011.c
> +++ b/drivers/tty/serial/amba-pl011.c
> @@ -2874,6 +2874,22 @@ static int pl011_resume(struct device *dev)
>  
>  static SIMPLE_DEV_PM_OPS(pl011_dev_pm_ops, pl011_suspend, pl011_resume);
>  
> +#ifdef CONFIG_ACPI_SPCR_TABLE
> +static void qpdf2400_erratum44_workaround(struct device *dev,
> +					  struct uart_amba_port *uap)
> +{
> +	if (qdf2400_e44_present)

This should be !qdf2400_e44_present.

-- 
 i.


> +		return;
> +
> +	dev_info(dev, "working around QDF2400 SoC erratum 44\n");
> +	uap->vendor = &vendor_qdt_qdf2400_e44;
> +}
> +#else
> +static void qpdf2400_erratum44_workaround(struct device *dev,
> +					  struct uart_amba_port *uap)
> +{ /* empty */ }
> +#endif
> +
>  static int sbsa_uart_probe(struct platform_device *pdev)
>  {
>  	struct uart_amba_port *uap;
> @@ -2909,13 +2925,8 @@ static int sbsa_uart_probe(struct platform_device *pdev)
>  		return ret;
>  	uap->port.irq	= ret;
>  
> -#ifdef CONFIG_ACPI_SPCR_TABLE
> -	if (qdf2400_e44_present) {
> -		dev_info(&pdev->dev, "working around QDF2400 SoC erratum 44\n");
> -		uap->vendor = &vendor_qdt_qdf2400_e44;
> -	} else
> -#endif
> -		uap->vendor = &vendor_sbsa;
> +	uap->vendor = &vendor_sbsa;
> +	qpdf2400_erratum44_workaround(&pdev->dev, uap);
>  
>  	uap->reg_offset	= uap->vendor->reg_offset;
>  	uap->fifosize	= 32;
> 
> 
--8323329-557729899-1700474126=:2032--