Unverified Commit 0feedcaa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-driver-soc-for-v6.5' of... 

Merge tag 'ti-driver-soc-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/drivers

TI SoC driver updates for v6.5

* pruss: Add helper functions for ethernet client driver usage, add compile-testing, fixup function pointer casts
* smartreflex: Cosmetic optimization for using devm_ioremap_resource
* wkup_m3_ipc: Fix error checking around debugfs_create_dir

* tag 'ti-driver-soc-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  wkup_m3_ipc.c: Fix error checking for debugfs_create_dir
  soc: ti: pruss: Add helper functions to set GPI mode, MII_RT_event and XFR
  soc: ti: pruss: Add pruss_cfg_read()/update(), pruss_cfg_get_gpmux()/set_gpmux() APIs
  soc: ti: pruss: Add pruss_{request,release}_mem_region() API
  soc: ti: pruss: Add pruss_get()/put() API
  soc: ti: pruss: Allow compile-testing
  soc: ti: pruss: Avoid cast to incompatible function type
  soc: ti: smartreflex: Use devm_platform_ioremap_resource()

Link: https://lore.kernel.org/r/20230615164134.6sd5hudyadq3fvk4@garage


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 37d1fc51 b11403c9

drivers/remoteproc/pru_rproc.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -81,21 +81,6 @@ enum pru_iomem { 
	PRU_IOMEM_MAX,

	PRU_IOMEM_MAX,

};

};





/**

 * enum pru_type - PRU core type identifier

 *

 * @PRU_TYPE_PRU: Programmable Real-time Unit

 * @PRU_TYPE_RTU: Auxiliary Programmable Real-Time Unit

 * @PRU_TYPE_TX_PRU: Transmit Programmable Real-Time Unit

 * @PRU_TYPE_MAX: just keep this one at the end

 */

enum pru_type {

	PRU_TYPE_PRU = 0,

	PRU_TYPE_RTU,

	PRU_TYPE_TX_PRU,

	PRU_TYPE_MAX,

};



/**

/**

 * struct pru_private_data - device data for a PRU core

 * struct pru_private_data - device data for a PRU core

 * @type: type of the PRU core (PRU, RTU, Tx_PRU)

 * @type: type of the PRU core (PRU, RTU, Tx_PRU)

drivers/soc/ti/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ config TI_K3_SOCINFO 




config TI_PRUSS

config TI_PRUSS

	tristate "TI PRU-ICSS Subsystem Platform drivers"

	tristate "TI PRU-ICSS Subsystem Platform drivers"

	depends on SOC_AM33XX || SOC_AM43XX || SOC_DRA7XX || ARCH_KEYSTONE || ARCH_K3

	depends on SOC_AM33XX || SOC_AM43XX || SOC_DRA7XX || ARCH_KEYSTONE || ARCH_K3 || COMPILE_TEST

	select MFD_SYSCON

	select MFD_SYSCON

	help

	help

	  TI PRU-ICSS Subsystem platform specific support.

	  TI PRU-ICSS Subsystem platform specific support.

drivers/soc/ti/pruss.c

+261 −2
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * Author(s):

 * Author(s):

 *	Suman Anna <s-anna@ti.com>

 *	Suman Anna <s-anna@ti.com>

 *	Andrew F. Davis <afd@ti.com>

 *	Andrew F. Davis <afd@ti.com>

 *	Tero Kristo <t-kristo@ti.com>

 */

 */





#include <linux/clk-provider.h>

#include <linux/clk-provider.h>
@@ -18,7 +19,9 @@ 
#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/pruss_driver.h>

#include <linux/pruss_driver.h>

#include <linux/regmap.h>

#include <linux/regmap.h>

#include <linux/remoteproc.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include "pruss.h"





/**

/**

 * struct pruss_private_data - PRUSS driver private data

 * struct pruss_private_data - PRUSS driver private data
@@ -30,6 +33,257 @@ struct pruss_private_data { 
	bool has_core_mux_clock;

	bool has_core_mux_clock;

};

};





/**

 * pruss_get() - get the pruss for a given PRU remoteproc

 * @rproc: remoteproc handle of a PRU instance

 *

 * Finds the parent pruss device for a PRU given the @rproc handle of the

 * PRU remote processor. This function increments the pruss device's refcount,

 * so always use pruss_put() to decrement it back once pruss isn't needed

 * anymore.

 *

 * This API doesn't check if @rproc is valid or not. It is expected the caller

 * will have done a pru_rproc_get() on @rproc, before calling this API to make

 * sure that @rproc is valid.

 *

 * Return: pruss handle on success, and an ERR_PTR on failure using one

 * of the following error values

 *    -EINVAL if invalid parameter

 *    -ENODEV if PRU device or PRUSS device is not found

 */

struct pruss *pruss_get(struct rproc *rproc)

{

	struct pruss *pruss;

	struct device *dev;

	struct platform_device *ppdev;



	if (IS_ERR_OR_NULL(rproc))

		return ERR_PTR(-EINVAL);



	dev = &rproc->dev;



	/* make sure it is PRU rproc */

	if (!dev->parent || !is_pru_rproc(dev->parent))

		return ERR_PTR(-ENODEV);



	ppdev = to_platform_device(dev->parent->parent);

	pruss = platform_get_drvdata(ppdev);

	if (!pruss)

		return ERR_PTR(-ENODEV);



	get_device(pruss->dev);



	return pruss;

}

EXPORT_SYMBOL_GPL(pruss_get);



/**

 * pruss_put() - decrement pruss device's usecount

 * @pruss: pruss handle

 *

 * Complimentary function for pruss_get(). Needs to be called

 * after the PRUSS is used, and only if the pruss_get() succeeds.

 */

void pruss_put(struct pruss *pruss)

{

	if (IS_ERR_OR_NULL(pruss))

		return;



	put_device(pruss->dev);

}

EXPORT_SYMBOL_GPL(pruss_put);



/**

 * pruss_request_mem_region() - request a memory resource

 * @pruss: the pruss instance

 * @mem_id: the memory resource id

 * @region: pointer to memory region structure to be filled in

 *

 * This function allows a client driver to request a memory resource,

 * and if successful, will let the client driver own the particular

 * memory region until released using the pruss_release_mem_region()

 * API.

 *

 * Return: 0 if requested memory region is available (in such case pointer to

 * memory region is returned via @region), an error otherwise

 */

int pruss_request_mem_region(struct pruss *pruss, enum pruss_mem mem_id,

			     struct pruss_mem_region *region)

{

	if (!pruss || !region || mem_id >= PRUSS_MEM_MAX)

		return -EINVAL;



	mutex_lock(&pruss->lock);



	if (pruss->mem_in_use[mem_id]) {

		mutex_unlock(&pruss->lock);

		return -EBUSY;

	}



	*region = pruss->mem_regions[mem_id];

	pruss->mem_in_use[mem_id] = region;



	mutex_unlock(&pruss->lock);



	return 0;

}

EXPORT_SYMBOL_GPL(pruss_request_mem_region);



/**

 * pruss_release_mem_region() - release a memory resource

 * @pruss: the pruss instance

 * @region: the memory region to release

 *

 * This function is the complimentary function to

 * pruss_request_mem_region(), and allows the client drivers to

 * release back a memory resource.

 *

 * Return: 0 on success, an error code otherwise

 */

int pruss_release_mem_region(struct pruss *pruss,

			     struct pruss_mem_region *region)

{

	int id;



	if (!pruss || !region)

		return -EINVAL;



	mutex_lock(&pruss->lock);



	/* find out the memory region being released */

	for (id = 0; id < PRUSS_MEM_MAX; id++) {

		if (pruss->mem_in_use[id] == region)

			break;

	}



	if (id == PRUSS_MEM_MAX) {

		mutex_unlock(&pruss->lock);

		return -EINVAL;

	}



	pruss->mem_in_use[id] = NULL;



	mutex_unlock(&pruss->lock);



	return 0;

}

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;

	u32 val;



	if (pru_id >= PRUSS_NUM_PRUS || !mux)

		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 >= PRUSS_NUM_PRUS)

		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);



/**

 * pruss_cfg_gpimode() - set the GPI mode of the PRU

 * @pruss: the pruss instance handle

 * @pru_id: id of the PRU core within the PRUSS

 * @mode: GPI mode to set

 *

 * Sets the GPI mode for a given PRU by programming the

 * corresponding PRUSS_CFG_GPCFGx register

 *

 * Return: 0 on success, or an error code otherwise

 */

int pruss_cfg_gpimode(struct pruss *pruss, enum pruss_pru_id pru_id,

		      enum pruss_gpi_mode mode)

{

	if (pru_id >= PRUSS_NUM_PRUS || mode >= PRUSS_GPI_MODE_MAX)

		return -EINVAL;



	return pruss_cfg_update(pruss, PRUSS_CFG_GPCFG(pru_id),

				PRUSS_GPCFG_PRU_GPI_MODE_MASK,

				mode << PRUSS_GPCFG_PRU_GPI_MODE_SHIFT);

}

EXPORT_SYMBOL_GPL(pruss_cfg_gpimode);



/**

 * pruss_cfg_miirt_enable() - Enable/disable MII RT Events

 * @pruss: the pruss instance

 * @enable: enable/disable

 *

 * Enable/disable the MII RT Events for the PRUSS.

 *

 * Return: 0 on success, or an error code otherwise

 */

int pruss_cfg_miirt_enable(struct pruss *pruss, bool enable)

{

	u32 set = enable ? PRUSS_MII_RT_EVENT_EN : 0;



	return pruss_cfg_update(pruss, PRUSS_CFG_MII_RT,

				PRUSS_MII_RT_EVENT_EN, set);

}

EXPORT_SYMBOL_GPL(pruss_cfg_miirt_enable);



/**

 * pruss_cfg_xfr_enable() - Enable/disable XIN XOUT shift functionality

 * @pruss: the pruss instance

 * @pru_type: PRU core type identifier

 * @enable: enable/disable

 *

 * Return: 0 on success, or an error code otherwise

 */

int pruss_cfg_xfr_enable(struct pruss *pruss, enum pru_type pru_type,

			 bool enable)

{

	u32 mask, set;



	switch (pru_type) {

	case PRU_TYPE_PRU:

		mask = PRUSS_SPP_XFER_SHIFT_EN;

		break;

	case PRU_TYPE_RTU:

		mask = PRUSS_SPP_RTU_XFR_SHIFT_EN;

		break;

	default:

		return -EINVAL;

	}



	set = enable ? mask : 0;



	return pruss_cfg_update(pruss, PRUSS_CFG_SPP, mask, set);

}

EXPORT_SYMBOL_GPL(pruss_cfg_xfr_enable);



static void pruss_of_free_clk_provider(void *data)

static void pruss_of_free_clk_provider(void *data)

{

{

	struct device_node *clk_mux_np = data;

	struct device_node *clk_mux_np = data;
@@ -38,6 +292,11 @@ static void pruss_of_free_clk_provider(void *data) 
	of_node_put(clk_mux_np);

	of_node_put(clk_mux_np);

}

}





static void pruss_clk_unregister_mux(void *data)

{

	clk_unregister_mux(data);

}



static int pruss_clk_mux_setup(struct pruss *pruss, struct clk *clk_mux,

static int pruss_clk_mux_setup(struct pruss *pruss, struct clk *clk_mux,

			       char *mux_name, struct device_node *clks_np)

			       char *mux_name, struct device_node *clks_np)

{

{
@@ -93,8 +352,7 @@ static int pruss_clk_mux_setup(struct pruss *pruss, struct clk *clk_mux, 
		goto put_clk_mux_np;

		goto put_clk_mux_np;

	}

	}





	ret = devm_add_action_or_reset(dev, (void(*)(void *))clk_unregister_mux,

	ret = devm_add_action_or_reset(dev, pruss_clk_unregister_mux, clk_mux);

				       clk_mux);

	if (ret) {

	if (ret) {

		dev_err(dev, "failed to add clkmux unregister action %d", ret);

		dev_err(dev, "failed to add clkmux unregister action %d", ret);

		goto put_clk_mux_np;

		goto put_clk_mux_np;
@@ -232,6 +490,7 @@ static int pruss_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;





	pruss->dev = dev;

	pruss->dev = dev;

	mutex_init(&pruss->lock);





	child = of_get_child_by_name(np, "memories");

	child = of_get_child_by_name(np, "memories");

	if (!child) {

	if (!child) {

drivers/soc/ti/pruss.h

0 → 100644
+88 −0
Original line number Original line Diff line number Diff line 
/* 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 <danishanwar@ti.com>

 */



#ifndef _SOC_TI_PRUSS_H_

#define _SOC_TI_PRUSS_H_



#include <linux/bits.h>

#include <linux/regmap.h>



/*

 * 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_ */

drivers/soc/ti/smartreflex.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -815,7 +815,6 @@ static int omap_sr_probe(struct platform_device *pdev) 
{

{

	struct omap_sr *sr_info;

	struct omap_sr *sr_info;

	struct omap_sr_data *pdata = pdev->dev.platform_data;

	struct omap_sr_data *pdata = pdev->dev.platform_data;

	struct resource *mem;

	struct dentry *nvalue_dir;

	struct dentry *nvalue_dir;

	int i, ret = 0;

	int i, ret = 0;
@@ -835,8 +834,7 @@ static int omap_sr_probe(struct platform_device *pdev) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	sr_info->base = devm_platform_ioremap_resource(pdev, 0);

	sr_info->base = devm_ioremap_resource(&pdev->dev, mem);

	if (IS_ERR(sr_info->base))

	if (IS_ERR(sr_info->base))

		return PTR_ERR(sr_info->base);

		return PTR_ERR(sr_info->base);