From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3F5EC77B6E for ; Wed, 12 Apr 2023 17:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230445AbjDLRPI (ORCPT ); Wed, 12 Apr 2023 13:15:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbjDLRPH (ORCPT ); Wed, 12 Apr 2023 13:15:07 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EB18526E for ; Wed, 12 Apr 2023 10:14:48 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id m18so12031589plx.5 for ; Wed, 12 Apr 2023 10:14:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681319677; 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=O5AV7vfK/2nwKp0eVshwydhumuKVDn6U4uxG7E7tKMo=; b=onAFA2dtpR1yA26nKlvTU+cGm5CAmVoVKOg2j5MyJBdEBXEbn5T6EsN78Mt7rK1aVR qPEfbnFNUGoOFd3ljdpnEH+u3Krsy4M7vbcK0XZtM84O6YquQ8yhavldrwuRDLdaH2la GrmW1SW9hWp9pI7F0s8Nh+vDR4sSJBO4a7EPQrX9re67No2HD2DcddCUioILebe6S9JW //bB6cNcb9f9wiHH1mh1uFcYUUNFWWQsfR6xpLyxGouGYo4UAn7pKcch8afXDwQQBeX3 0BQojcWxFsJcQ8JHAKsIf0BUvHvbVFlDUbMmf/Pd8PXICOhf2F9oVRFmY9c3awZWzFqn DB8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681319677; 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=O5AV7vfK/2nwKp0eVshwydhumuKVDn6U4uxG7E7tKMo=; b=Hg9OJ2N/jZ9hcN3Cc2d1C/hhDAOXF6bnZi7pUrTs3UbEC2H+XIWXbyaZi1XAxeyHGJ 39h7vEQoi30jhuWGnlXdBBlI+vsy4FrBEHsUO2sM89MSmKhPPGM5uloxURSiUr5SoPHd 8GY8+OMyVOvOEv6LsZW/Qg5OUYJR2u4PkolsKrNn8httL3yl6WZ15m29gz2Mx5nyI4Id b+0iAjn/fFzcz88uF8SQ3MegpZH0TxtsXD7aLJGo0fVquspKuh7u5pPaSs2Mg5Ce1zAo 8CF1N/1Y+seboP1JvvwmJlbCHb3otHz12S1Mci9EU36k/jksTDT/MppGoqjNY3AiBget luNA== X-Gm-Message-State: AAQBX9eMLYzKs3vFX7tUjZKa+aTRQUx7+LGJIOVAa/nxasaw8LQgtCBV sUEL8FcYGq6lby71iC6WFB8KPw== X-Google-Smtp-Source: AKy350Y6z/wOIUG6uyTQ/FSrzhRtpYxYONNMgWFGAY9qjQkaKe/SkIXQ5Q16F4XUaZal8QsKuVGbEQ== X-Received: by 2002:a17:902:ced1:b0:19c:be03:d1ba with SMTP id d17-20020a170902ced100b0019cbe03d1bamr25995343plg.6.1681319677069; Wed, 12 Apr 2023 10:14:37 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:1cd7:1135:5e45:5f77]) by smtp.gmail.com with ESMTPSA id jk2-20020a170903330200b001a63a1aed29sm6561362plb.303.2023.04.12.10.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 10:14:36 -0700 (PDT) Date: Wed, 12 Apr 2023 11:14:34 -0600 From: Mathieu Poirier To: MD Danish Anwar Cc: "Andrew F. Davis" , Suman Anna , Roger Quadros , Vignesh Raghavendra , Tero Kristo , Bjorn Andersson , Santosh Shilimkar , Nishanth Menon , linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, srk@ti.com, devicetree@vger.kernel.org, netdev@vger.kernel.org Subject: Re: [PATCH v8 3/4] soc: ti: pruss: Add pruss_cfg_read()/update(), pruss_cfg_get_gpmux()/set_gpmux() APIs Message-ID: <20230412171434.GE86761@p14s> References: <20230412103012.1754161-1-danishanwar@ti.com> <20230412103012.1754161-4-danishanwar@ti.com> <20230412170654.GC86761@p14s> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230412170654.GC86761@p14s> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Wed, Apr 12, 2023 at 11:06:54AM -0600, Mathieu Poirier wrote: > On Wed, Apr 12, 2023 at 04:00:11PM +0530, MD Danish Anwar wrote: > > From: Suman Anna > > > > Add two new generic API pruss_cfg_read() and pruss_cfg_update() to > > the PRUSS platform driver to read and program respectively a register > > within the PRUSS CFG sub-module represented by a syscon driver. These > > APIs are internal to PRUSS driver. > > > > Add two new helper functions pruss_cfg_get_gpmux() & pruss_cfg_set_gpmux() > > to get and set the GP MUX mode for programming the PRUSS internal wrapper > > mux functionality as needed by usecases. > > > > Various useful registers and macros for certain register bit-fields and > > their values have also been added. > > > > Signed-off-by: Suman Anna > > Co-developed-by: Grzegorz Jaszczyk > > Signed-off-by: Grzegorz Jaszczyk > > Signed-off-by: Puranjay Mohan > > Reviewed-by: Roger Quadros > > Reviewed-by: Tony Lindgren > > Reviewed-by: Simon Horman > > Signed-off-by: MD Danish Anwar > > --- > > drivers/soc/ti/pruss.c | 45 ++++++++++++++++++ > > drivers/soc/ti/pruss.h | 88 ++++++++++++++++++++++++++++++++++++ > > include/linux/pruss_driver.h | 32 +++++++++++++ > > 3 files changed, 165 insertions(+) > > create mode 100644 drivers/soc/ti/pruss.h > > > > diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c > > index 8ada3758b31a..34d513816a9d 100644 > > --- a/drivers/soc/ti/pruss.c > > +++ b/drivers/soc/ti/pruss.c > > @@ -21,6 +21,7 @@ > > #include > > #include > > #include > > +#include "pruss.h" > > > > /** > > * struct pruss_private_data - PRUSS driver private data > > @@ -168,6 +169,50 @@ int pruss_release_mem_region(struct pruss *pruss, > > } > > EXPORT_SYMBOL_GPL(pruss_release_mem_region); > > > > +/** > > + * pruss_cfg_get_gpmux() - get the current GPMUX value for a PRU device > > + * @pruss: pruss instance > > + * @pru_id: PRU identifier (0-1) > > + * @mux: pointer to store the current mux value into > > + * > > + * Return: 0 on success, or an error code otherwise > > + */ > > +int pruss_cfg_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux) > > +{ > > + int ret = 0; > > Variable initialization is not needed. > > > + u32 val; > > + > > + if (pru_id < 0 || pru_id >= PRUSS_NUM_PRUS || !mux) > > If @pru_id is an enum, how can it be smaller than 0? > > > + return -EINVAL; > > + > > + ret = pruss_cfg_read(pruss, PRUSS_CFG_GPCFG(pru_id), &val); > > + if (!ret) > > + *mux = (u8)((val & PRUSS_GPCFG_PRU_MUX_SEL_MASK) >> > > + PRUSS_GPCFG_PRU_MUX_SEL_SHIFT); > > + return ret; > > +} > > +EXPORT_SYMBOL_GPL(pruss_cfg_get_gpmux); > > + > > +/** > > + * pruss_cfg_set_gpmux() - set the GPMUX value for a PRU device > > + * @pruss: pruss instance > > + * @pru_id: PRU identifier (0-1) > > + * @mux: new mux value for PRU > > + * > > + * Return: 0 on success, or an error code otherwise > > + */ > > +int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux) > > +{ > > + if (mux >= PRUSS_GP_MUX_SEL_MAX || > > + pru_id < 0 || pru_id >= PRUSS_NUM_PRUS) > > Same > > > + return -EINVAL; > > + > > + return pruss_cfg_update(pruss, PRUSS_CFG_GPCFG(pru_id), > > + PRUSS_GPCFG_PRU_MUX_SEL_MASK, > > + (u32)mux << PRUSS_GPCFG_PRU_MUX_SEL_SHIFT); > > +} > > +EXPORT_SYMBOL_GPL(pruss_cfg_set_gpmux); > > + > > static void pruss_of_free_clk_provider(void *data) > > { > > struct device_node *clk_mux_np = data; > > diff --git a/drivers/soc/ti/pruss.h b/drivers/soc/ti/pruss.h > > new file mode 100644 > > index 000000000000..6c55987e0e55 > > --- /dev/null > > +++ b/drivers/soc/ti/pruss.h > > @@ -0,0 +1,88 @@ > > +/* SPDX-License-Identifier: GPL-2.0-only */ > > +/* > > + * PRU-ICSS Subsystem user interfaces > > + * > > + * Copyright (C) 2015-2023 Texas Instruments Incorporated - http://www.ti.com > > + * MD Danish Anwar > > + */ > > + > > +#ifndef _SOC_TI_PRUSS_H_ > > +#define _SOC_TI_PRUSS_H_ > > + > > +#include > > +#include > > + > > +/* > > + * PRU_ICSS_CFG registers > > + * SYSCFG, ISRP, ISP, IESP, IECP, SCRP applicable on AMxxxx devices only > > + */ > > +#define PRUSS_CFG_REVID 0x00 > > +#define PRUSS_CFG_SYSCFG 0x04 > > +#define PRUSS_CFG_GPCFG(x) (0x08 + (x) * 4) > > +#define PRUSS_CFG_CGR 0x10 > > +#define PRUSS_CFG_ISRP 0x14 > > +#define PRUSS_CFG_ISP 0x18 > > +#define PRUSS_CFG_IESP 0x1C > > +#define PRUSS_CFG_IECP 0x20 > > +#define PRUSS_CFG_SCRP 0x24 > > +#define PRUSS_CFG_PMAO 0x28 > > +#define PRUSS_CFG_MII_RT 0x2C > > +#define PRUSS_CFG_IEPCLK 0x30 > > +#define PRUSS_CFG_SPP 0x34 > > +#define PRUSS_CFG_PIN_MX 0x40 > > + > > +/* PRUSS_GPCFG register bits */ > > +#define PRUSS_GPCFG_PRU_GPI_MODE_MASK GENMASK(1, 0) > > +#define PRUSS_GPCFG_PRU_GPI_MODE_SHIFT 0 > > + > > +#define PRUSS_GPCFG_PRU_MUX_SEL_SHIFT 26 > > +#define PRUSS_GPCFG_PRU_MUX_SEL_MASK GENMASK(29, 26) > > + > > +/* PRUSS_MII_RT register bits */ > > +#define PRUSS_MII_RT_EVENT_EN BIT(0) > > + > > +/* PRUSS_SPP register bits */ > > +#define PRUSS_SPP_XFER_SHIFT_EN BIT(1) > > +#define PRUSS_SPP_PRU1_PAD_HP_EN BIT(0) > > +#define PRUSS_SPP_RTU_XFR_SHIFT_EN BIT(3) > > + > > +/** > > + * pruss_cfg_read() - read a PRUSS CFG sub-module register > > + * @pruss: the pruss instance handle > > + * @reg: register offset within the CFG sub-module > > + * @val: pointer to return the value in > > + * > > + * Reads a given register within the PRUSS CFG sub-module and > > + * returns it through the passed-in @val pointer > > + * > > + * Return: 0 on success, or an error code otherwise > > + */ > > +static int pruss_cfg_read(struct pruss *pruss, unsigned int reg, unsigned int *val) > > +{ > > + if (IS_ERR_OR_NULL(pruss)) > > + return -EINVAL; > > + > > + return regmap_read(pruss->cfg_regmap, reg, val); > > +} > > + > > +/** > > + * pruss_cfg_update() - configure a PRUSS CFG sub-module register > > + * @pruss: the pruss instance handle > > + * @reg: register offset within the CFG sub-module > > + * @mask: bit mask to use for programming the @val > > + * @val: value to write > > + * > > + * Programs a given register within the PRUSS CFG sub-module > > + * > > + * Return: 0 on success, or an error code otherwise > > + */ > > +static int pruss_cfg_update(struct pruss *pruss, unsigned int reg, > > + unsigned int mask, unsigned int val) > > +{ > > + if (IS_ERR_OR_NULL(pruss)) > > + return -EINVAL; > > + > > + return regmap_update_bits(pruss->cfg_regmap, reg, mask, val); > > +} > > + > > +#endif /* _SOC_TI_PRUSS_H_ */ > > diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h > > index c8f2e53b911b..c70e08c90165 100644 > > --- a/include/linux/pruss_driver.h > > +++ b/include/linux/pruss_driver.h > > @@ -14,6 +14,24 @@ > > #include > > #include > > > > +/* > > + * enum pruss_gp_mux_sel - PRUSS GPI/O Mux modes for the > > + * PRUSS_GPCFG0/1 registers > > + * > > + * NOTE: The below defines are the most common values, but there > > + * are some exceptions like on 66AK2G, where the RESERVED and MII2 > > + * values are interchanged. Also, this bit-field does not exist on > > + * AM335x SoCs > > + */ > > +enum pruss_gp_mux_sel { > > + PRUSS_GP_MUX_SEL_GP = 0, > > Initialization not needed > With the above: Acked-by: Mathieu Poirier > > + PRUSS_GP_MUX_SEL_ENDAT, > > + PRUSS_GP_MUX_SEL_RESERVED, > > + PRUSS_GP_MUX_SEL_SD, > > + PRUSS_GP_MUX_SEL_MII2, > > + PRUSS_GP_MUX_SEL_MAX, > > +}; > > + > > /* > > * enum pruss_mem - PRUSS memory range identifiers > > */ > > @@ -66,6 +84,8 @@ int pruss_request_mem_region(struct pruss *pruss, enum pruss_mem mem_id, > > struct pruss_mem_region *region); > > int pruss_release_mem_region(struct pruss *pruss, > > struct pruss_mem_region *region); > > +int pruss_cfg_get_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 *mux); > > +int pruss_cfg_set_gpmux(struct pruss *pruss, enum pruss_pru_id pru_id, u8 mux); > > > > #else > > > > @@ -89,6 +109,18 @@ static inline int pruss_release_mem_region(struct pruss *pruss, > > return -EOPNOTSUPP; > > } > > > > +static inline int pruss_cfg_get_gpmux(struct pruss *pruss, > > + enum pruss_pru_id pru_id, u8 *mux) > > +{ > > + return ERR_PTR(-EOPNOTSUPP); > > +} > > + > > +static inline int pruss_cfg_set_gpmux(struct pruss *pruss, > > + enum pruss_pru_id pru_id, u8 mux) > > +{ > > + return ERR_PTR(-EOPNOTSUPP); > > +} > > + > > #endif /* CONFIG_TI_PRUSS */ > > > > #endif /* _PRUSS_DRIVER_H_ */ > > -- > > 2.34.1 > >