Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Sean Anderson <sean.anderson@seco.com>
To:     linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Cc:     Andrew Lunn <andrew@lunn.ch>, Rob Herring <robh+dt@kernel.org>,
        Shawn Guo <shawnguo@kernel.org>, linux-kernel@vger.kernel.org,
        Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Li Yang <leoyang.li@nxp.com>, Michael Walle <michael@walle.cc>,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH v2 8/9] nvmem: sfp: Use regmap
Date:   Fri, 22 Apr 2022 10:51:46 -0400
Message-Id: <20220422145147.2210587-9-sean.anderson@seco.com>
In-Reply-To: <20220422145147.2210587-1-sean.anderson@seco.com>
References: <20220422145147.2210587-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rnzRGXSrelwaj7Um4Sx469+RQisGfuabEU1hC0ArzPolzg7B6vw5G7hHRt6z?=
 =?us-ascii?Q?16sIKCEABb9k8DJOIj7OZOLEqP06KMdU/U2QeO+hFimRoB/9cqqg3RMYYEl6?=
 =?us-ascii?Q?kuFuFbvND60Nd024XgN7Zn9H/arh9U9Ptc/ZpjBnJdhg8A77f6V7CrHX2KxW?=
 =?us-ascii?Q?h9BiYaj+PwWpHDz+ZhVlwOVyjPF9X5ML5dMEALjzvEEA5i7I25IwBMVrldRu?=
 =?us-ascii?Q?n/CqYgIUePgukr6nL/bLHiARznwXxsO7n2cnsKMybkWW2Y4yA+PYEkGy5Pp3?=
 =?us-ascii?Q?ZavwBM31NZHG/J4jZj5ylPLuUOIkD0Iht+2Z6V5RIomADva/eOI96OxKjXjz?=
 =?us-ascii?Q?qKbJk9mf7mwg+/5L1Lh+nmmDB6qROccRj9tbesxvt4y2+V3860bFktus6x76?=
 =?us-ascii?Q?DDyVf/wFmlDkfJnrG6NDVcZKs6KbgFwevQRoFGC7PK1W1jHYMu7zPXTxs9R+?=
 =?us-ascii?Q?RqZCmcaWO42193p5vumFBJTqjcctOKCsGnvk3bE+604rgPrJfnm22g9AR/nD?=
 =?us-ascii?Q?oPTPczYA5KG99DbyNgf8v6DdUzK7rok3PcVTg2SOM2eMH2OmQbrsalVTXdgk?=
 =?us-ascii?Q?fidju57wYd57+UeK8iO42hMMYiLEDPZ98XZr/Pji4MvGyZkYjvhX1oaf99Ye?=
 =?us-ascii?Q?7N+3OHNEaHBoCrqHdQxUV6rfur7FGl28IYGfknAnQ+gXasoR8wLFCAYVV/d8?=
 =?us-ascii?Q?vITjVfgxvMdEsxJU0nPCto1rIxpTUipYA1u5AR29X3E1J/CLQWg8bXs79dBB?=
 =?us-ascii?Q?o4oJzdmW1c2Cn62NKL24w//RVeMFd0IIlT5U0kRbisM8mIajvOmO8H/Fme1U?=
 =?us-ascii?Q?dskIzNeCV1tg9s2xGf/UB12HQFfdruksLKKRqM5vS5uZ9ifNTkIWyZa6fu/v?=
 =?us-ascii?Q?SErSjYxN33mJ7l3iDnQ5JUrnDc9MYmfMpzxiNN2XkjxoA31gYY8R1WbTEZA/?=
 =?us-ascii?Q?fwGDrvGMTqbgFB2nXfmKZBRjFDQT8DXCCE5tThRFH+8BWUgyl/IG9FuzgsIE?=
 =?us-ascii?Q?4xoLeKa5Tb8X4FlnmmRxGUQUeS5wmPVF3RcsvTIA6IXjx0oearz9F2zD3y1F?=
 =?us-ascii?Q?+1zdysBdYPMfpAovXYV1tehZPHRIbUyEDg94O18pabN/bppyrFLktGOGo80h?=
 =?us-ascii?Q?0mDqBRZUD3/9NO4mpOyYMWhvfr4YKd3YsqwXyPpJ1ll5qKzXGGP0Q1VAL0Og?=
 =?us-ascii?Q?+/5Jv1VG+vF8jAat0poON0aSB1mik1j6FtKj16176MGXgLGCqwB1tXyemp4S?=
 =?us-ascii?Q?Mgnyg6Olo2469E5IC3jnxzW7Vtau/S7LkdzPuTNoQYzaK4rdVw54oERdXyRO?=
 =?us-ascii?Q?ccf0GsTFjNxGwcCdK+Jz8GO53aSeEFTqrp+XPDbsCXn8U9j/gIL59yldOvkp?=
 =?us-ascii?Q?TXpGoD4RQall8qxc0XtoRVmsXxBhjJ6cydCgE21hTR6a7XtIvGEiIADnyE/K?=
 =?us-ascii?Q?803552hV88YIAzDjCbI3B3rIrigfUMu9ggg6HSMMrF0j6kVli0YfA12OyRXC?=
 =?us-ascii?Q?9CqVCM7XoImDhHX9vWrnRVgEYXlWQlnnc3R3+YyA7knedK9m+CxMTPm4BNZG?=
 =?us-ascii?Q?dhSGWa1Zll7xC3d2R/GPez0PLRaqyIQw1NkWZkafDffyRDGrGRMvwOnUcgzR?=
 =?us-ascii?Q?RYqenZniVVSGfzruqme23wlJtFMAvb8vArdS3NJwu5cpMMzbqYeSFmDwSE4t?=
 =?us-ascii?Q?hv5bObARE5e504MMuv3m85LDmBGhDPYbm6jI2z0DxNAH4y2Zt/mcCPxiAnQd?=
 =?us-ascii?Q?e/4LHLabqPyACMXpHhIiSbOqHFxw1lU=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 51b3def5-9feb-4e03-016f-08da246fae8e
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 14:52:11.6108
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0YqTdBehaY5c3aSNUCNYv1PD0wTLbd+CGAF1/h7VKe4L9BfH/TToZb/1tQZMu+eU3xnQ5eoTORRM4c9IsJVXkg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR03MB5213
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=no
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This converts the SFP driver to use regmap. This will allow easily
supporting devices with different endians. We disallow byte-level
access, as regmap_bulk_read doesn't support it (and it's unclear what
the correct result would be when we have an endianness difference).

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

Changes in v2:
- New

 drivers/nvmem/Kconfig          |  1 +
 drivers/nvmem/layerscape-sfp.c | 30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig
index 555aa77a574d..403ed5257592 100644
--- a/drivers/nvmem/Kconfig
+++ b/drivers/nvmem/Kconfig
@@ -304,6 +304,7 @@ config NVMEM_LAYERSCAPE_SFP
 	tristate "Layerscape SFP (Security Fuse Processor) support"
 	depends on ARCH_LAYERSCAPE || COMPILE_TEST
 	depends on HAS_IOMEM
+	select REGMAP_MMIO
 	help
 	  This driver provides support to read the eFuses on Freescale
 	  Layerscape SoC's. For example, the vendor provides a per part
diff --git a/drivers/nvmem/layerscape-sfp.c b/drivers/nvmem/layerscape-sfp.c
index e591c1511e33..59083f048921 100644
--- a/drivers/nvmem/layerscape-sfp.c
+++ b/drivers/nvmem/layerscape-sfp.c
@@ -13,15 +13,17 @@
 #include <linux/nvmem-provider.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
+#include <linux/regmap.h>
 
 #define LAYERSCAPE_SFP_OTP_OFFSET	0x0200
 
 struct layerscape_sfp_priv {
-	void __iomem *base;
+	struct regmap *regmap;
 };
 
 struct layerscape_sfp_data {
 	int size;
+	enum regmap_endian endian;
 };
 
 static int layerscape_sfp_read(void *context, unsigned int offset, void *val,
@@ -29,15 +31,16 @@ static int layerscape_sfp_read(void *context, unsigned int offset, void *val,
 {
 	struct layerscape_sfp_priv *priv = context;
 
-	memcpy_fromio(val, priv->base + LAYERSCAPE_SFP_OTP_OFFSET + offset,
-		      bytes);
-
-	return 0;
+	return regmap_bulk_read(priv->regmap,
+				LAYERSCAPE_SFP_OTP_OFFSET + offset, val,
+				bytes / 4);
 }
 
 static struct nvmem_config layerscape_sfp_nvmem_config = {
 	.name = "fsl-sfp",
 	.reg_read = layerscape_sfp_read,
+	.word_size = 4,
+	.stride = 4,
 };
 
 static int layerscape_sfp_probe(struct platform_device *pdev)
@@ -45,16 +48,26 @@ static int layerscape_sfp_probe(struct platform_device *pdev)
 	const struct layerscape_sfp_data *data;
 	struct layerscape_sfp_priv *priv;
 	struct nvmem_device *nvmem;
+	struct regmap_config config = { 0 };
+	void __iomem *base;
 
 	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;
 
-	priv->base = devm_platform_ioremap_resource(pdev, 0);
-	if (IS_ERR(priv->base))
-		return PTR_ERR(priv->base);
+	base = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
 
 	data = device_get_match_data(&pdev->dev);
+	config.reg_bits = 32;
+	config.reg_stride = 4;
+	config.val_bits = 32;
+	config.val_format_endian = data->endian;
+	config.max_register = LAYERSCAPE_SFP_OTP_OFFSET + data->size - 4;
+	priv->regmap = devm_regmap_init_mmio(&pdev->dev, base, &config);
+	if (IS_ERR(priv->regmap))
+		return PTR_ERR(priv->regmap);
 
 	layerscape_sfp_nvmem_config.size = data->size;
 	layerscape_sfp_nvmem_config.dev = &pdev->dev;
@@ -67,6 +80,7 @@ static int layerscape_sfp_probe(struct platform_device *pdev)
 
 static const struct layerscape_sfp_data ls1028a_data = {
 	.size = 0x88,
+	.endian = REGMAP_ENDIAN_LITTLE,
 };
 
 static const struct of_device_id layerscape_sfp_dt_ids[] = {
-- 
2.35.1.1320.gc452695387.dirty