Add AM57xx Support to PRUSS driver
v2 cover Add AM57xx Support to PRUSS driver
Hi,
This patch adds support for AM57xx SOC compatibility in the PRUSS driver which is a prerequisite for ICSSM Ethernet driver.
I will submit the patch series of ICSSM Ethernet driver for AM57xx subsequently in a separate thread after the merge of this patch.
History:
V2:
Rebase to linux_next and ti-drivers-soc-next
V1:
https://lore.kernel.org/all/[email protected]/
Thanks & Best Regards,
Basharath
Roger Quadros (1):
soc: ti: PRUSS OCP configuration
drivers/soc/ti/pruss.c | 77 +++++++++++++++++++++++++++++++++++- include/linux/pruss_driver.h | 6 +++ 2 files changed, 82 insertions(+), 1 deletion(-)
Signature · 1 line
2.34.1
PATCH v2 1/1 soc: ti: PRUSS OCP configuration
From: Roger Quadros <[email protected]>
Updates OCP master port configuration to enable memory access outside of the PRU-ICSS subsystem.
This set of changes configures PRUSS_SYSCFG.STANDBY_INIT bit either to enable or disable the OCP master ports (applicable only on SoCs using OCP interconnect like the OMAP family).
--- drivers/soc/ti/pruss.c | 77 +++++++++++++++++++++++++++++++++++- include/linux/pruss_driver.h | 6 +++ 2 files changed, 82 insertions(+), 1 deletion(-)
drivers/soc/ti/pruss.c +76 -1
@@ -25,14 +25,19 @@#include <linux/slab.h> #include "pruss.h" +#define SYSCFG_STANDBY_INIT BIT(4) +#define SYSCFG_SUB_MWAIT_READY BIT(5) +/** * struct pruss_private_data - PRUSS driver private data * @has_no_sharedram: flag to indicate the absence of PRUSS Shared Data RAM * @has_core_mux_clock: flag to indicate the presence of PRUSS core clock +* @has_ocp_syscfg: flag to indicate if OCP SYSCFG is present */ struct pruss_private_data {bool has_no_sharedram;bool has_core_mux_clock; +bool has_ocp_syscfg; };/**
@@ -286,6 +291,72 @@ int pruss_cfg_xfr_enable(struct pruss *pruss, enum pru_type pru_type, }EXPORT_SYMBOL_GPL (pruss_cfg_xfr_enable); +/** +* pruss_cfg_ocp_master_ports() - configure PRUSS OCP master ports +* @pruss: the pruss instance handle +* @enable: set to true for enabling or false for disabling the OCP master ports +* +* This function programs the PRUSS_SYSCFG.STANDBY_INIT bit either to enable or +* disable the OCP master ports (applicable only on SoCs using OCP interconnect +* like the OMAP family). Clearing the bit achieves dual functionalities - one +* is to deassert the MStandby signal to the device PRCM, and the other is to +* enable OCP master ports to allow accesses outside of the PRU-ICSS. The +* function has to wait for the PRCM to acknowledge through the monitoring of +* the PRUSS_SYSCFG.SUB_MWAIT bit when enabling master ports. Setting the bit +* disables the master access, and also signals the PRCM that the PRUSS is ready +* for Standby. +* +* Return: 0 on success, or an error code otherwise. ETIMEDOUT is returned +* when the ready-state fails. +*/ +int pruss_cfg_ocp_master_ports (struct pruss *pruss,bool enable) +{ +const struct pruss_private_data *data; +u32 syscfg_val, i; +int ret; + +if (IS_ERR_OR_NULL (pruss)) +return -EINVAL ; + + data =of_device_get_match_data (pruss->dev); + +/* nothing to do on non OMAP-SoCs */ +if (!data || !data->has_ocp_syscfg) +return 0 ; + +/* assert the MStandby signal during disable path */ +if (!enable) +return pruss_cfg_update (pruss,PRUSS_CFG_SYSCFG , +SYSCFG_STANDBY_INIT , +SYSCFG_STANDBY_INIT ); + +/* enable the OCP master ports and disable MStandby */ + ret =pruss_cfg_update (pruss,PRUSS_CFG_SYSCFG ,SYSCFG_STANDBY_INIT ,0 ); +if (ret) +return ret; + +/* wait till we are ready for transactions - delay is arbitrary */ +for (i =0 ; i <10 ; i++) { + ret =pruss_cfg_read (pruss,PRUSS_CFG_SYSCFG , &syscfg_val); +if (ret) + goto disable; + +if (!(syscfg_val &SYSCFG_SUB_MWAIT_READY )) +return 0 ; + +udelay (5 ); + } + +dev_err (pruss->dev,"timeout waiting for SUB_MWAIT_READY\n" ); + ret = -ETIMEDOUT ; + +disable: +pruss_cfg_update (pruss,PRUSS_CFG_SYSCFG ,SYSCFG_STANDBY_INIT , +SYSCFG_STANDBY_INIT ); +return ret; +} +EXPORT_SYMBOL_GPL (pruss_cfg_ocp_master_ports); +static void pruss_of_free_clk_provider (void *data) {struct device_node *clk_mux_np = data;
@@ -570,6 +641,10 @@ static const struct pruss_private_data am437x_pruss0_data = { .has_no_sharedram = true, }; +static const struct pruss_private_data am57xx_data = { + .has_ocp_syscfg = true, +}; +static const struct pruss_private_data am65x_j721e_pruss_data = { .has_core_mux_clock = true, };
@@ -578,7 +653,7 @@ static const struct of_device_id pruss_of_match[] = { { .compatible = "ti,am3356-pruss" }, { .compatible = "ti,am4376-pruss0", .data = &am437x_pruss0_data, }, { .compatible = "ti,am4376-pruss1", .data = &am437x_pruss1_data, }, - { .compatible = "ti,am5728-pruss" }, + { .compatible = "ti,am5728-pruss", .data = &am57xx_data, }, { .compatible = "ti,k2g-pruss" }, { .compatible = "ti,am654-icssg", .data = &am65x_j721e_pruss_data, }, { .compatible = "ti,j721e-icssg", .data = &am65x_j721e_pruss_data, },
include/linux/pruss_driver.h +6 -0
@@ -118,6 +118,7 @@ int pruss_cfg_gpimode(struct pruss *pruss, enum pruss_pru_id pru_id,int pruss_cfg_miirt_enable (struct pruss *pruss,bool enable);int pruss_cfg_xfr_enable (struct pruss *pruss,enum pru_type pru_type,bool enable); +int pruss_cfg_ocp_master_ports (struct pruss *pruss,bool enable);#else
@@ -172,6 +173,11 @@ static inline int pruss_cfg_xfr_enable(struct pruss *pruss,return -EOPNOTSUPP ; } +static int pruss_cfg_ocp_master_ports (struct pruss *pruss,bool enable) +{ +return -EOPNOTSUPP ; +} +#endif /* CONFIG_TI_PRUSS */ #endif /* _PRUSS_DRIVER_H_ */
Signature · 1 line
2.34.1
Nishanth Menon
maintainerRe: [PATCH v2 1/1] soc: ti: PRUSS OCP configuration
Quoted 5 lines · Basharath Hussain Khaja
From: Roger Quadros <[email protected]>
Updates OCP master port configuration to enable memory access outside of the PRU-ICSS subsystem.
Quoted 8 lines
This set of changes configures PRUSS_SYSCFG.STANDBY_INIT bit either to enable or disable the OCP master ports (applicable only on SoCs using OCP interconnect like the OMAP family).
Signed-off-by Roger Quadros <[email protected]>Signed-off-by Andrew F. Davis <[email protected]>Signed-off-by Parvathi Pudi <[email protected]>Signed-off-by Basharath Hussain Khaja <[email protected]>
On the verge of applying this patch, looking deeper, I noticed drivers/bus/ti-sysc.c managing the sysc controls. infact, I wonder if b2745d92bb015cc4454d4195c4ce6e2852db397e ("bus: ti-sysc: Add support for PRUSS SYSC type") could be merged with this?
Could you say why drivers/bus/ti-sysc.c would'nt be the right solution?
Ccying Kevin if he has any ideas about this.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Re: [PATCH v2 1/1] soc: ti: PRUSS OCP configuration
Hi Nishanth,
Quoted 21 lines · Basharath Hussain Khaja
Quoted 5 lines
From: Roger Quadros <[email protected]>
Updates OCP master port configuration to enable memory access outside of the PRU-ICSS subsystem.
Quoted 8 lines
This set of changes configures PRUSS_SYSCFG.STANDBY_INIT bit either to enable or disable the OCP master ports (applicable only on SoCs using OCP interconnect like the OMAP family).
Signed-off-by Roger Quadros <[email protected]>Signed-off-by Andrew F. Davis <[email protected]>Signed-off-by Parvathi Pudi <[email protected]>Signed-off-by Basharath Hussain Khaja <[email protected]>On the verge of applying this patch, looking deeper, I noticed
drivers/bus/ti-sysc.cmanaging the sysc controls. infact, I wonder ifb2745d92bb015cc4454d4195c4ce6e2852db397e("bus: ti-sysc: Add support for PRUSS SYSC type") could be merged with this?
Quoted 4 lines
Could you say why
drivers/bus/ti-sysc.cwould'nt be the right solution?Ccying Kevin if he has any ideas about this.
Thank you for the feedback.
We will analyze ti-sysc and revert back with an update shortly.
Thanks and Regards,
Parvathi.
Re: [PATCH v2 1/1] soc: ti: PRUSS OCP configuration
Hi Nishanth,
Quoted 21 lines
Quoted 21 lines · Basharath Hussain Khaja
Quoted 5 lines
From: Roger Quadros <[email protected]>
Updates OCP master port configuration to enable memory access outside of the PRU-ICSS subsystem.
Quoted 8 lines
This set of changes configures PRUSS_SYSCFG.STANDBY_INIT bit either to enable or disable the OCP master ports (applicable only on SoCs using OCP interconnect like the OMAP family).
Signed-off-by Roger Quadros <[email protected]>Signed-off-by Andrew F. Davis <[email protected]>Signed-off-by Parvathi Pudi <[email protected]>Signed-off-by Basharath Hussain Khaja <[email protected]>On the verge of applying this patch, looking deeper, I noticed
drivers/bus/ti-sysc.cmanaging the sysc controls. infact, I wonder ifb2745d92bb015cc4454d4195c4ce6e2852db397e("bus: ti-sysc: Add support for PRUSS SYSC type") could be merged with this?
Quoted 9 lines
Quoted 4 lines
Could you say why
drivers/bus/ti-sysc.cwould'nt be the right solution?Ccying Kevin if he has any ideas about this.
Thank you for the feedback.
We will analyze ti-sysc and revert back with an update shortly.
We've reviewed the code and decided to bypass the SOC patch posted here. Instead, we have implemented the required changes in the "drivers/bus/ti-sysc.c" file to enable OCMC access to the PRU-ICSS and verified the Ethernet functionality over PRUETH on AM335x, AM437x and AM57x platforms.
This patch will be abandoned and a new patch will be posted with "drivers/bus/ti-sysc.c" changes shortly.
Thanks and Regards,
Parvathi.
Nishanth Menon
maintainerRe: [PATCH v2 1/1] soc: ti: PRUSS OCP configuration
Quoted 33 lines · Parvathi Pudi
Hi Nishanth,
Quoted 21 lines
Quoted 21 lines · Basharath Hussain Khaja
Quoted 5 lines
From: Roger Quadros <[email protected]>
Updates OCP master port configuration to enable memory access outside of the PRU-ICSS subsystem.
Quoted 8 lines
This set of changes configures PRUSS_SYSCFG.STANDBY_INIT bit either to enable or disable the OCP master ports (applicable only on SoCs using OCP interconnect like the OMAP family).
Signed-off-by Roger Quadros <[email protected]>Signed-off-by Andrew F. Davis <[email protected]>Signed-off-by Parvathi Pudi <[email protected]>Signed-off-by Basharath Hussain Khaja <[email protected]>On the verge of applying this patch, looking deeper, I noticed
drivers/bus/ti-sysc.cmanaging the sysc controls. infact, I wonder ifb2745d92bb015cc4454d4195c4ce6e2852db397e("bus: ti-sysc: Add support for PRUSS SYSC type") could be merged with this?Quoted 9 lines
Quoted 4 lines
Could you say why
drivers/bus/ti-sysc.cwould'nt be the right solution?Ccying Kevin if he has any ideas about this.
Thank you for the feedback.
We will analyze ti-sysc and revert back with an update shortly.
Quoted 7 lines
We've reviewed the code and decided to bypass the SOC patch posted here. Instead, we have implemented the required changes in the "
drivers/bus/ti-sysc.c" file to enable OCMC access to the PRU-ICSS and verified the Ethernet functionality over PRUETH on AM335x, AM437x and AM57x platforms.This patch will be abandoned and a new patch will be posted with "
drivers/bus/ti-sysc.c" changes shortly.
Thank you for your patience and taking in feedback.
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D