From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 D466E3F9E6 for ; Mon, 12 Feb 2024 17:08:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707757729; cv=none; b=DDlsqCAZUAd0x9geaJpo/URZkWOMnIBA1u2QRjr0M7DfteZVK2QAxdCSoLi2KCeEQjLJs2Hx7BdjoToeiHAMs+CEYfKVjhEC26Yn3DLLdXo/+V7D0XwO90piZuL+/YXnnodhPLvhukNQ7GwmVxPDD8aDJlScqTPii1rBQ+SvACc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707757729; c=relaxed/simple; bh=Fh8/2jj0GBE79WmWffyC78eDeGeEjtX/hWIzcDnDkdA=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=Q8TucYJV8HL/BMVebJy8+tERgbTm449Ja573FshIxu8Jic1Hbb1zyw8RcN5U2/2s4HV5eB+f/oP4nKcT5oN2yRo9MVPBCtktNGvoPa3JGjVenTcusDs/EB7jbuigM5SJZugxVlHeeptTlvPn3Xlow9bcACC6HoWGWVJ3w0K5gYA= 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=TR9ztQc6; arc=none smtp.client-ip=209.85.128.50 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="TR9ztQc6" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-410d57a533dso8533435e9.0 for ; Mon, 12 Feb 2024 09:08:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707757726; x=1708362526; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :references:cc:to:content-language:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=K0iuLXGNjpFke4Q7i+u3Xwr+sJ1jAJKm4/0FM4ijjUo=; b=TR9ztQc6QhyX9LKqqFgXR14+Lema+WtuJ+4WMguIxnD7cYzHCnA2Oe4y3pdcByIVKp YDvVADRXeKZ7cLqempwFDXFcyLtSr2HVbDWHObqoPlWlgpfvOlmFv+nFu/Q8/92qSBui YeUtDj9Kor65lZVrxIwyECuy4otaaU+bcCo9HZBTfKuOjE6J8J5aZYeCYbQl0BnaOZf1 IbIx0uSkpPZELMbBZyL9ewfKCBQ3zOUQAUUoZb7rnZHLZdV4EiYWMQmcGprqe7/Zm+jz HG+atOfasr2L0q4fzQ52/KnPVbBLQlS9+71jsSuhCBcppBdxKhnICBzgpxrjRnktJPr0 DD3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707757726; x=1708362526; h=content-transfer-encoding:in-reply-to:organization:autocrypt :references:cc:to:content-language:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=K0iuLXGNjpFke4Q7i+u3Xwr+sJ1jAJKm4/0FM4ijjUo=; b=mYcW6Nvqk1QrGImrHq4xgcQ/eO0ppPPkuTl8UzdLQqah1kywwBkZgiJPxUeQOmPrUv 4oiFCl0rfhllnCFDWKBJIY0ifyY13gAaY88MmQIu2+0p3g0v6FqpcpTPbR13dRRk1SM9 HoJKtjXaQOt0DnOoRfwoWFVNwqlC05COmXVQbpTW9M+PSHgysmlspwnw2B5M4QYgB43t 8u2rGHKSRWq6XrHMmnAu2LE+wDBfRTjkrMAFFVKkFBz7JxRUXZoqeZJgtsZNPSu6czQU CqHIroSxmLqVCVu5jewo9AexrhN6x6f6350C+IKZGKtD1n9BWErnrC/XLqskHr/rtInN cp4w== X-Gm-Message-State: AOJu0YznvkW/mwE9g3ElsopTRks7ZbHUwl8Y6VAetkwtj6jhiLTZ9L4Y /QguYpDI+Ik5ZeMNMwwL/NGZNexGkmvGea+Gqjw9ogNvjZolFbK8Nqfdg+8xkBs= X-Google-Smtp-Source: AGHT+IGy69D6aQBM/bkYPnISNw5ksoPp43llgNMxSd8DN5Wb3xtt9O4vPE7vD+2iGEH1bgsPA01Lvw== X-Received: by 2002:a05:600c:1547:b0:410:c25d:38fe with SMTP id f7-20020a05600c154700b00410c25d38femr2996359wmg.28.1707757726064; Mon, 12 Feb 2024 09:08:46 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVeEALurTnullkTQeCej3c6aywgLg8EIb4V+oERO4gytOKg+Jcdptt7tvwhN09zOpebRuL49Z6kh/I4sccBVL0lrOIwC7+VDNXiT8jzs406ORK5uQbAUPnbh8vRnnFpmVT/siYNGsLE+ru4Vbx/Or1ckFEV0UcF6VcZzr8sR5adLWXIxl/edvb1o+op/oztn8BMEDwvpJg36it/mqLdIym7cxmgU8PT0Dclv5g0OK7xvdIOW3ukra8xmAAj5FVq/HPoUHLIbLvj3HKH61RihzshKj34t0NfAmwxy5XisJjAiG9QI35/RkW0ozin2i3hJykAU/e4HPsHenQo17vtws2DWGggU5BbUjnS4DTU5dHn3aS4GrKitXZMcxGPnAfDFI52atxfae7CL+5r+T/Ur0oReh/tTyPqCUA4JTpQ7G411WaNnueWUKsuMRig9aofEefsi9al7B/DJ3CgOCpGNBKU28/HOWFj8+vldOsqdwcurSWsDhDdGHvuzRGRQrjSofyMJCCupm2eUmiLgmK/+gNvIg1pKVIFKqaDr88o0OkJnHJesNz7f2vrBucP4YboBjSj6lsSH/E/OizqlCYGswzjDC1l8NpRn1je Received: from ?IPV6:2a01:e0a:982:cbb0:fcee:f026:296d:135f? ([2a01:e0a:982:cbb0:fcee:f026:296d:135f]) by smtp.gmail.com with ESMTPSA id l13-20020a1c790d000000b00411ac52b54esm320997wme.46.2024.02.12.09.08.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Feb 2024 09:08:45 -0800 (PST) Message-ID: <233ca2ec-ba1d-403f-b1d6-ba1b2c856e7f@linaro.org> Date: Mon, 12 Feb 2024 18:08:44 +0100 Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: neil.armstrong@linaro.org Reply-To: neil.armstrong@linaro.org Subject: Re: [PATCH v4 02/20] drviers: crypto: meson: add platform data Content-Language: en-US, fr To: Alexey Romanov , clabbe@baylibre.com, herbert@gondor.apana.org.au, davem@davemloft.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, khilman@baylibre.com, jbrunet@baylibre.com, martin.blumenstingl@googlemail.com, vadim.fedorenko@linux.dev Cc: linux-crypto@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@salutedevices.com References: <20240212135108.549755-1-avromanov@salutedevices.com> <20240212135108.549755-3-avromanov@salutedevices.com> Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro Developer Services In-Reply-To: <20240212135108.549755-3-avromanov@salutedevices.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/02/2024 14:50, Alexey Romanov wrote: > To support other Amlogic SoC's we have to > use platform data: descriptors and status registers > offsets are individual for each SoC series. > > Signed-off-by: Alexey Romanov > --- > drivers/crypto/amlogic/amlogic-gxl-cipher.c | 2 +- > drivers/crypto/amlogic/amlogic-gxl-core.c | 32 +++++++++++++++------ > drivers/crypto/amlogic/amlogic-gxl.h | 11 +++++++ > 3 files changed, 36 insertions(+), 9 deletions(-) > > diff --git a/drivers/crypto/amlogic/amlogic-gxl-cipher.c b/drivers/crypto/amlogic/amlogic-gxl-cipher.c > index b19032f92415..7eff3ae7356f 100644 > --- a/drivers/crypto/amlogic/amlogic-gxl-cipher.c > +++ b/drivers/crypto/amlogic/amlogic-gxl-cipher.c > @@ -225,7 +225,7 @@ static int meson_cipher(struct skcipher_request *areq) > > reinit_completion(&mc->chanlist[flow].complete); > mc->chanlist[flow].status = 0; > - writel(mc->chanlist[flow].t_phy | 2, mc->base + (flow << 2)); > + writel(mc->chanlist[flow].t_phy | 2, mc->base + ((mc->pdata->descs_reg + flow) << 2)); > wait_for_completion_interruptible_timeout(&mc->chanlist[flow].complete, > msecs_to_jiffies(500)); > if (mc->chanlist[flow].status == 0) { > diff --git a/drivers/crypto/amlogic/amlogic-gxl-core.c b/drivers/crypto/amlogic/amlogic-gxl-core.c > index 35ec64df5b3a..4d1b1d5b7a54 100644 > --- a/drivers/crypto/amlogic/amlogic-gxl-core.c > +++ b/drivers/crypto/amlogic/amlogic-gxl-core.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include > > #include "amlogic-gxl.h" > @@ -30,9 +31,10 @@ static irqreturn_t meson_irq_handler(int irq, void *data) > > for (flow = 0; flow < mc->flow_cnt; flow++) { > if (mc->chanlist[flow].irq == irq) { > - p = readl(mc->base + ((0x04 + flow) << 2)); > + p = readl(mc->base + ((mc->pdata->status_reg + flow) << 2)); > if (p) { > - writel_relaxed(0xF, mc->base + ((0x4 + flow) << 2)); > + writel_relaxed(0xF, mc->base + > + ((mc->pdata->status_reg + flow) << 2)); > mc->chanlist[flow].status = 1; > complete(&mc->chanlist[flow].complete); > return IRQ_HANDLED; > @@ -245,15 +247,35 @@ static void meson_unregister_algs(struct meson_dev *mc) > } > } > > +static const struct meson_pdata meson_gxl_pdata = { > + .descs_reg = 0x0, > + .status_reg = 0x4, > +}; > + > +static const struct of_device_id meson_crypto_of_match_table[] = { > + { > + .compatible = "amlogic,gxl-crypto", > + .data = &meson_gxl_pdata, > + }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, meson_crypto_of_match_table); > + > static int meson_crypto_probe(struct platform_device *pdev) > { > + const struct of_device_id *match; > struct meson_dev *mc; > int err; > > + match = of_match_device(meson_crypto_of_match_table, &pdev->dev); > + if (!match) > + return -EINVAL; > + > mc = devm_kzalloc(&pdev->dev, sizeof(*mc), GFP_KERNEL); > if (!mc) > return -ENOMEM; > > + mc->pdata = match->data; > mc->dev = &pdev->dev; > platform_set_drvdata(pdev, mc); > > @@ -319,12 +341,6 @@ static void meson_crypto_remove(struct platform_device *pdev) > clk_disable_unprepare(mc->busclk); > } > > -static const struct of_device_id meson_crypto_of_match_table[] = { > - { .compatible = "amlogic,gxl-crypto", }, > - {} > -}; > -MODULE_DEVICE_TABLE(of, meson_crypto_of_match_table); > - Please leave the struct at this place, and use of_device_get_match_data() instead. > static struct platform_driver meson_crypto_driver = { > .probe = meson_crypto_probe, > .remove_new = meson_crypto_remove, > diff --git a/drivers/crypto/amlogic/amlogic-gxl.h b/drivers/crypto/amlogic/amlogic-gxl.h > index 79177cfa8b88..9ad75da214ff 100644 > --- a/drivers/crypto/amlogic/amlogic-gxl.h > +++ b/drivers/crypto/amlogic/amlogic-gxl.h > @@ -78,6 +78,16 @@ struct meson_flow { > #endif > }; > > +/* > + * struct meson_pdata - SoC series dependent data. > + * @reg_descs: offset to descriptors register > + * @reg_status: offset to status register > + */ > +struct meson_pdata { > + u32 descs_reg; > + u32 status_reg; > +}; > + > /* > * struct meson_dev - main container for all this driver information > * @base: base address of amlogic-crypto > @@ -93,6 +103,7 @@ struct meson_dev { > void __iomem *base; > struct clk *busclk; > struct device *dev; > + const struct meson_pdata *pdata; > struct meson_flow *chanlist; > atomic_t flow; > int flow_cnt;