* [RFC]: can 2020-10-19: m_can/tcan4x5x
@ 2020-10-19 15:42 Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 01/12] can: m_can: remove double clearing of clock stop request bit Marc Kleine-Budde
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy
this is a RFC series of all m_can/tcan4x5x patches, I have collected for my
next pull request to net/master.
Please test and comment.
regards,
Marc
^ permalink raw reply [flat|nested] 13+ messages in thread
* [net-rfc 01/12] can: m_can: remove double clearing of clock stop request bit
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 02/12] can: m_can: m_can_handle_state_change(): fix state change Marc Kleine-Budde
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can
Cc: kernel, Dan Murphy, Sean Nyekjaer, Sriram Dash, Marc Kleine-Budde
From: Sean Nyekjaer <sean@geanix.com>
The CSR bit is already cleared when arriving here so remove this section of
duplicate code.
The registers set in m_can_config_endisable() is set to same exact values as
before this patch.
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
Acked-by: Sriram Dash <sriram.dash@samsung.com>
Acked-by: Dan Murphy <dmurphy@ti.com>
Link: https://lore.kernel.org/r/20191211063227.84259-1-sean@geanix.com
Fixes: f524f829b75a ("can: m_can: Create a m_can platform framework")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/m_can.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 02c5795b7393..4edc6f6e5165 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -380,10 +380,6 @@ void m_can_config_endisable(struct m_can_classdev *cdev, bool enable)
cccr &= ~CCCR_CSR;
if (enable) {
- /* Clear the Clock stop request if it was set */
- if (cccr & CCCR_CSR)
- cccr &= ~CCCR_CSR;
-
/* enable m_can configuration */
m_can_write(cdev, M_CAN_CCCR, cccr | CCCR_INIT);
udelay(5);
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 02/12] can: m_can: m_can_handle_state_change(): fix state change
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 01/12] can: m_can: remove double clearing of clock stop request bit Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 03/12] can: tcan4x5x: replace depends on REGMAP_SPI with depends on SPI Marc Kleine-Budde
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Wu Bo, Marc Kleine-Budde
From: Wu Bo <wubo.oduw@gmail.com>
m_can_handle_state_change() is called with the new_state as an argument.
In the switch statements for CAN_STATE_ERROR_ACTIVE, the comment and the
following code indicate that a CAN_STATE_ERROR_WARNING is handled.
This patch fixes this problem by changing the case to CAN_STATE_ERROR_WARNING.
Signed-off-by: Wu Bo <wubo.oduw@gmail.com>
Link: http://lore.kernel.org/r/20200129022330.21248-2-wubo.oduw@gmail.com
Cc: Dan Murphy <dmurphy@ti.com>
Fixes: e0d1f4816f2a ("can: m_can: add Bosch M_CAN controller support")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/m_can.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 4edc6f6e5165..1b72e6fffb31 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -661,7 +661,7 @@ static int m_can_handle_state_change(struct net_device *dev,
unsigned int ecr;
switch (new_state) {
- case CAN_STATE_ERROR_ACTIVE:
+ case CAN_STATE_ERROR_WARNING:
/* error warning state */
cdev->can.can_stats.error_warning++;
cdev->can.state = CAN_STATE_ERROR_WARNING;
@@ -690,7 +690,7 @@ static int m_can_handle_state_change(struct net_device *dev,
__m_can_get_berr_counter(dev, &bec);
switch (new_state) {
- case CAN_STATE_ERROR_ACTIVE:
+ case CAN_STATE_ERROR_WARNING:
/* error warning state */
cf->can_id |= CAN_ERR_CRTL;
cf->data[1] = (bec.txerr > bec.rxerr) ?
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 03/12] can: tcan4x5x: replace depends on REGMAP_SPI with depends on SPI
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 01/12] can: m_can: remove double clearing of clock stop request bit Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 02/12] can: m_can: m_can_handle_state_change(): fix state change Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 04/12] can: tcan4x5x: tcan4x5x_clear_interrupts(): remove redundant return statement Marc Kleine-Budde
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Enric Balletbo i Serra, Marc Kleine-Budde
From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
regmap is a library function that gets selected by drivers that need it. No
driver modules should depend on it. Instead depends on SPI and select
REGMAP_SPI. Depending on REGMAP_SPI makes this driver only build if another
driver already selected REGMAP_SPI, as the symbol can't be selected through the
menu kernel configuration.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Link: http://lore.kernel.org/r/20200413141013.506613-1-enric.balletbo@collabora.com
Reviewed-by: Dan Murphy <dmurphy@ti.com>
Fixes: 5443c226ba91 ("can: tcan4x5x: Add tcan4x5x driver to the kernel")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/m_can/Kconfig b/drivers/net/can/m_can/Kconfig
index 48be627c85c2..5f9f8192dd0b 100644
--- a/drivers/net/can/m_can/Kconfig
+++ b/drivers/net/can/m_can/Kconfig
@@ -16,7 +16,8 @@ config CAN_M_CAN_PLATFORM
config CAN_M_CAN_TCAN4X5X
depends on CAN_M_CAN
- depends on REGMAP_SPI
+ depends on SPI
+ select REGMAP_SPI
tristate "TCAN4X5X M_CAN device"
help
Say Y here if you want support for Texas Instruments TCAN4x5x
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 04/12] can: tcan4x5x: tcan4x5x_clear_interrupts(): remove redundant return statement
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
` (2 preceding siblings ...)
2020-10-19 15:42 ` [net-rfc 03/12] can: tcan4x5x: replace depends on REGMAP_SPI with depends on SPI Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 05/12] can: tcan4x5x: Rename parse_config() function Marc Kleine-Budde
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can
Cc: kernel, Dan Murphy, Sean Nyekjaer, Daniels Umanovskis, Marc Kleine-Budde
From: Sean Nyekjaer <sean@geanix.com>
This patch removes a redundant return at the end of
tcan4x5x_clear_interrupts().
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
Link: http://lore.kernel.org/r/20191211141635.322577-1-sean@geanix.com
Reported-by: Daniels Umanovskis <daniels@umanovskis.se>
Acked-by: Dan Murphy <dmurphy@ti.com>
Fixes: 5443c226ba91 ("can: tcan4x5x: Add tcan4x5x driver to the kernel")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/tcan4x5x.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c
index eacd428e07e9..76e5fd10d356 100644
--- a/drivers/net/can/m_can/tcan4x5x.c
+++ b/drivers/net/can/m_can/tcan4x5x.c
@@ -328,12 +328,8 @@ static int tcan4x5x_clear_interrupts(struct m_can_classdev *cdev)
if (ret)
return ret;
- ret = tcan4x5x_write_tcan_reg(cdev, TCAN4X5X_ERROR_STATUS,
- TCAN4X5X_CLEAR_ALL_INT);
- if (ret)
- return ret;
-
- return ret;
+ return tcan4x5x_write_tcan_reg(cdev, TCAN4X5X_ERROR_STATUS,
+ TCAN4X5X_CLEAR_ALL_INT);
}
static int tcan4x5x_init(struct m_can_classdev *cdev)
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 05/12] can: tcan4x5x: Rename parse_config() function
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
` (3 preceding siblings ...)
2020-10-19 15:42 ` [net-rfc 04/12] can: tcan4x5x: tcan4x5x_clear_interrupts(): remove redundant return statement Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 06/12] can: tcan4x5x: tcan4x5x_can_probe(): add missing error checking for devm_regmap_init() Marc Kleine-Budde
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Marc Kleine-Budde
From: Dan Murphy <dmurphy@ti.com>
Rename the tcan4x5x_parse_config() function to tcan4x5x_get_gpios() since the
function retrieves the gpio configurations from the firmware.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: http://lore.kernel.org/r/20200226140358.30017-1-dmurphy@ti.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/tcan4x5x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c
index 76e5fd10d356..e29da7fe442e 100644
--- a/drivers/net/can/m_can/tcan4x5x.c
+++ b/drivers/net/can/m_can/tcan4x5x.c
@@ -375,7 +375,7 @@ static int tcan4x5x_disable_state(struct m_can_classdev *cdev)
TCAN4X5X_DISABLE_INH_MSK, 0x01);
}
-static int tcan4x5x_parse_config(struct m_can_classdev *cdev)
+static int tcan4x5x_get_gpios(struct m_can_classdev *cdev)
{
struct tcan4x5x_priv *tcan4x5x = cdev->device_data;
int ret;
@@ -488,7 +488,7 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
if (ret)
goto out_clk;
- ret = tcan4x5x_parse_config(mcan_class);
+ ret = tcan4x5x_get_gpios(mcan_class);
if (ret)
goto out_power;
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 06/12] can: tcan4x5x: tcan4x5x_can_probe(): add missing error checking for devm_regmap_init()
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
` (4 preceding siblings ...)
2020-10-19 15:42 ` [net-rfc 05/12] can: tcan4x5x: Rename parse_config() function Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 07/12] can: m_can: m_can_class_free_dev(): introduce new function Marc Kleine-Budde
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Marc Kleine-Budde
This patch adds the missing error checking when initializing the regmap
interface fails.
Fixes: 5443c226ba91 ("can: tcan4x5x: Add tcan4x5x driver to the kernel")
Cc: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/tcan4x5x.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c
index e29da7fe442e..b163e126aa76 100644
--- a/drivers/net/can/m_can/tcan4x5x.c
+++ b/drivers/net/can/m_can/tcan4x5x.c
@@ -483,6 +483,10 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
priv->regmap = devm_regmap_init(&spi->dev, &tcan4x5x_bus,
&spi->dev, &tcan4x5x_regmap);
+ if (IS_ERR(priv->regmap)) {
+ ret = PTR_ERR(priv->regmap);
+ goto out_clk;
+ }
ret = tcan4x5x_power_enable(priv->power, 1);
if (ret)
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 07/12] can: m_can: m_can_class_free_dev(): introduce new function
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
` (5 preceding siblings ...)
2020-10-19 15:42 ` [net-rfc 06/12] can: tcan4x5x: tcan4x5x_can_probe(): add missing error checking for devm_regmap_init() Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 08/12] can: m_can: Fix freeing of can device from peripherials Marc Kleine-Budde
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Marc Kleine-Budde
From: Dan Murphy <dmurphy@ti.com>
This patch creates a common function that peripherials can call to free the
netdev device when failures occur.
Fixes: d42f4e1d06d9 ("can: m_can: Create a m_can platform framework")
Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: http://lore.kernel.org/r/20200227183829.21854-2-dmurphy@ti.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/m_can.c | 6 ++++++
drivers/net/can/m_can/m_can.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 1b72e6fffb31..418f90fc9af5 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1808,6 +1808,12 @@ struct m_can_classdev *m_can_class_allocate_dev(struct device *dev)
}
EXPORT_SYMBOL_GPL(m_can_class_allocate_dev);
+void m_can_class_free_dev(struct net_device *net)
+{
+ free_candev(net);
+}
+EXPORT_SYMBOL_GPL(m_can_class_free_dev);
+
int m_can_class_register(struct m_can_classdev *m_can_dev)
{
int ret;
diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h
index 49f42b50627a..b2699a7c9997 100644
--- a/drivers/net/can/m_can/m_can.h
+++ b/drivers/net/can/m_can/m_can.h
@@ -99,6 +99,7 @@ struct m_can_classdev {
};
struct m_can_classdev *m_can_class_allocate_dev(struct device *dev);
+void m_can_class_free_dev(struct net_device *net);
int m_can_class_register(struct m_can_classdev *cdev);
void m_can_class_unregister(struct m_can_classdev *cdev);
int m_can_class_get_clocks(struct m_can_classdev *cdev);
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 08/12] can: m_can: Fix freeing of can device from peripherials
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
` (6 preceding siblings ...)
2020-10-19 15:42 ` [net-rfc 07/12] can: m_can: m_can_class_free_dev(): introduce new function Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 09/12] can: m_can: tcan4x5x: tcan4x5x_can_remove(): fix order of deregistration Marc Kleine-Budde
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Marc Kleine-Budde
From: Dan Murphy <dmurphy@ti.com>
Fix leaking netdev device from peripherial devices. The call to allocate the
netdev device is made from and managed by the peripherial.
Fixes: d42f4e1d06d9 ("can: m_can: Create a m_can platform framework")
Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: http://lore.kernel.org/r/20200227183829.21854-2-dmurphy@ti.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/m_can.c | 3 ---
drivers/net/can/m_can/m_can_platform.c | 23 +++++++++++++++--------
drivers/net/can/m_can/tcan4x5x.c | 26 ++++++++++++++++++--------
3 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 418f90fc9af5..90ee636dd382 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1852,7 +1852,6 @@ int m_can_class_register(struct m_can_classdev *m_can_dev)
if (ret) {
if (m_can_dev->pm_clock_support)
pm_runtime_disable(m_can_dev->dev);
- free_candev(m_can_dev->net);
}
return ret;
@@ -1910,8 +1909,6 @@ void m_can_class_unregister(struct m_can_classdev *m_can_dev)
unregister_candev(m_can_dev->net);
m_can_clk_stop(m_can_dev);
-
- free_candev(m_can_dev->net);
}
EXPORT_SYMBOL_GPL(m_can_class_unregister);
diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c
index e6d0cb9ee02f..161cb9be018c 100644
--- a/drivers/net/can/m_can/m_can_platform.c
+++ b/drivers/net/can/m_can/m_can_platform.c
@@ -67,32 +67,36 @@ static int m_can_plat_probe(struct platform_device *pdev)
return -ENOMEM;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
- if (!priv)
- return -ENOMEM;
+ if (!priv) {
+ ret = -ENOMEM;
+ goto probe_fail;
+ }
mcan_class->device_data = priv;
- m_can_class_get_clocks(mcan_class);
+ ret = m_can_class_get_clocks(mcan_class);
+ if (ret)
+ goto probe_fail;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "m_can");
addr = devm_ioremap_resource(&pdev->dev, res);
irq = platform_get_irq_byname(pdev, "int0");
if (IS_ERR(addr) || irq < 0) {
ret = -EINVAL;
- goto failed_ret;
+ goto probe_fail;
}
/* message ram could be shared */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram");
if (!res) {
ret = -ENODEV;
- goto failed_ret;
+ goto probe_fail;
}
mram_addr = devm_ioremap(&pdev->dev, res->start, resource_size(res));
if (!mram_addr) {
ret = -ENOMEM;
- goto failed_ret;
+ goto probe_fail;
}
priv->base = addr;
@@ -111,9 +115,10 @@ static int m_can_plat_probe(struct platform_device *pdev)
m_can_init_ram(mcan_class);
- ret = m_can_class_register(mcan_class);
+ return m_can_class_register(mcan_class);
-failed_ret:
+probe_fail:
+ m_can_class_free_dev(mcan_class->net);
return ret;
}
@@ -134,6 +139,8 @@ static int m_can_plat_remove(struct platform_device *pdev)
m_can_class_unregister(mcan_class);
+ m_can_class_free_dev(mcan_class->net);
+
platform_set_drvdata(pdev, NULL);
return 0;
diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c
index b163e126aa76..2fcbcd1b89b7 100644
--- a/drivers/net/can/m_can/tcan4x5x.c
+++ b/drivers/net/can/m_can/tcan4x5x.c
@@ -436,14 +436,18 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
return -ENOMEM;
priv = devm_kzalloc(&spi->dev, sizeof(*priv), GFP_KERNEL);
- if (!priv)
- return -ENOMEM;
+ if (!priv) {
+ ret = -ENOMEM;
+ goto out_m_can_class_free_dev;
+ }
priv->power = devm_regulator_get_optional(&spi->dev, "vsup");
- if (PTR_ERR(priv->power) == -EPROBE_DEFER)
- return -EPROBE_DEFER;
- else
+ if (PTR_ERR(priv->power) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ goto out_m_can_class_free_dev;
+ } else {
priv->power = NULL;
+ }
mcan_class->device_data = priv;
@@ -456,8 +460,10 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
}
/* Sanity check */
- if (freq < 20000000 || freq > TCAN4X5X_EXT_CLK_DEF)
- return -ERANGE;
+ if (freq < 20000000 || freq > TCAN4X5X_EXT_CLK_DEF) {
+ ret = -ERANGE;
+ goto out_m_can_class_free_dev;
+ }
priv->reg_offset = TCAN4X5X_MCAN_OFFSET;
priv->mram_start = TCAN4X5X_MRAM_START;
@@ -514,8 +520,10 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
clk_disable_unprepare(mcan_class->cclk);
clk_disable_unprepare(mcan_class->hclk);
}
-
+ out_m_can_class_free_dev:
+ m_can_class_free_dev(mcan_class->net);
dev_err(&spi->dev, "Probe failed, err=%d\n", ret);
+
return ret;
}
@@ -527,6 +535,8 @@ static int tcan4x5x_can_remove(struct spi_device *spi)
m_can_class_unregister(priv->mcan_dev);
+ m_can_class_free_dev(priv->mcan_dev->net);
+
return 0;
}
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 09/12] can: m_can: tcan4x5x: tcan4x5x_can_remove(): fix order of deregistration
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
` (7 preceding siblings ...)
2020-10-19 15:42 ` [net-rfc 08/12] can: m_can: Fix freeing of can device from peripherials Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 10/12] can: tcan4x5x: Move clock init to TCAN driver Marc Kleine-Budde
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Marc Kleine-Budde
Change the order in tcan4x5x_can_remove() to be the exact inverse of
tcan4x5x_can_probe(). First m_can_class_unregister(), then power down the
device.
Fixes: 5443c226ba91 ("can: tcan4x5x: Add tcan4x5x driver to the kernel")
Cc: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/tcan4x5x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c
index 2fcbcd1b89b7..a2144bbcd486 100644
--- a/drivers/net/can/m_can/tcan4x5x.c
+++ b/drivers/net/can/m_can/tcan4x5x.c
@@ -531,10 +531,10 @@ static int tcan4x5x_can_remove(struct spi_device *spi)
{
struct tcan4x5x_priv *priv = spi_get_drvdata(spi);
- tcan4x5x_power_enable(priv->power, 0);
-
m_can_class_unregister(priv->mcan_dev);
+ tcan4x5x_power_enable(priv->power, 0);
+
m_can_class_free_dev(priv->mcan_dev->net);
return 0;
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 10/12] can: tcan4x5x: Move clock init to TCAN driver
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
` (8 preceding siblings ...)
2020-10-19 15:42 ` [net-rfc 09/12] can: m_can: tcan4x5x: tcan4x5x_can_remove(): fix order of deregistration Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 11/12] can: m_can_platform: Move clock discovery and init to platform Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 12/12] can: m_can: Remove unused clock function from the framework Marc Kleine-Budde
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Marc Kleine-Budde
From: Dan Murphy <dmurphy@ti.com>
Move the clock discovery and initialization from the m_can framework to the
registrar. This allows for registrars to have unique clock initialization.
The TCAN device only needs the CAN clock reference.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: http://lore.kernel.org/r/20200131183433.11041-2-dmurphy@ti.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/tcan4x5x.c | 64 +++++++++++++++++++++++++-------
1 file changed, 51 insertions(+), 13 deletions(-)
diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c
index a2144bbcd486..a75ba0a6afc8 100644
--- a/drivers/net/can/m_can/tcan4x5x.c
+++ b/drivers/net/can/m_can/tcan4x5x.c
@@ -124,6 +124,8 @@ struct tcan4x5x_priv {
struct gpio_desc *device_state_gpio;
struct regulator *power;
+ struct clk *cclk;
+
/* Register based ip */
int mram_start;
int reg_offset;
@@ -429,7 +431,8 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
{
struct tcan4x5x_priv *priv;
struct m_can_classdev *mcan_class;
- int freq, ret;
+ u32 freq;
+ int ret;
mcan_class = m_can_class_allocate_dev(&spi->dev);
if (!mcan_class)
@@ -451,16 +454,21 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
mcan_class->device_data = priv;
- m_can_class_get_clocks(mcan_class);
- if (IS_ERR(mcan_class->cclk)) {
+ priv->cclk = devm_clk_get_optional(&spi->dev, "cclk");
+ if (IS_ERR(priv->cclk)) {
+ return PTR_ERR(priv->cclk);
+ } else if (!priv->cclk) {
dev_err(&spi->dev, "no CAN clock source defined\n");
freq = TCAN4X5X_EXT_CLK_DEF;
} else {
- freq = clk_get_rate(mcan_class->cclk);
+ freq = clk_get_rate(priv->cclk);
}
/* Sanity check */
if (freq < 20000000 || freq > TCAN4X5X_EXT_CLK_DEF) {
+ dev_err(&spi->dev,
+ "Oscillator frequency (%u Hz) is too low or high.\n",
+ freq);
ret = -ERANGE;
goto out_m_can_class_free_dev;
}
@@ -485,18 +493,18 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
spi->bits_per_word = 32;
ret = spi_setup(spi);
if (ret)
- goto out_clk;
+ goto out_m_can_class_free_dev;
priv->regmap = devm_regmap_init(&spi->dev, &tcan4x5x_bus,
&spi->dev, &tcan4x5x_regmap);
if (IS_ERR(priv->regmap)) {
ret = PTR_ERR(priv->regmap);
- goto out_clk;
+ goto out_m_can_class_free_dev;
}
ret = tcan4x5x_power_enable(priv->power, 1);
if (ret)
- goto out_clk;
+ goto out_m_can_class_free_dev;
ret = tcan4x5x_get_gpios(mcan_class);
if (ret)
@@ -515,11 +523,6 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
out_power:
tcan4x5x_power_enable(priv->power, 0);
-out_clk:
- if (!IS_ERR(mcan_class->cclk)) {
- clk_disable_unprepare(mcan_class->cclk);
- clk_disable_unprepare(mcan_class->hclk);
- }
out_m_can_class_free_dev:
m_can_class_free_dev(mcan_class->net);
dev_err(&spi->dev, "Probe failed, err=%d\n", ret);
@@ -540,6 +543,41 @@ static int tcan4x5x_can_remove(struct spi_device *spi)
return 0;
}
+static int __maybe_unused tcan4x5x_runtime_suspend(struct device *dev)
+{
+ struct net_device *ndev = dev_get_drvdata(dev);
+ struct m_can_classdev *mcan_class = netdev_priv(ndev);
+ struct tcan4x5x_priv *priv = mcan_class->device_data;
+ int err;
+
+ err = m_can_class_suspend(dev);
+ if (err)
+ return err;
+
+ clk_disable_unprepare(priv->cclk);
+
+ return 0;
+}
+
+static int __maybe_unused tcan4x5x_runtime_resume(struct device *dev)
+{
+ struct net_device *ndev = dev_get_drvdata(dev);
+ struct m_can_classdev *mcan_class = netdev_priv(ndev);
+ struct tcan4x5x_priv *priv = mcan_class->device_data;
+ int err;
+
+ err = clk_prepare_enable(priv->cclk);
+ if (err)
+ return err;
+
+ return m_can_class_resume(dev);
+}
+
+static const struct dev_pm_ops tcan4x5x_pmops = {
+ SET_RUNTIME_PM_OPS(tcan4x5x_runtime_suspend,
+ tcan4x5x_runtime_resume, NULL)
+};
+
static const struct of_device_id tcan4x5x_of_match[] = {
{ .compatible = "ti,tcan4x5x", },
{ }
@@ -559,7 +597,7 @@ static struct spi_driver tcan4x5x_can_driver = {
.driver = {
.name = DEVICE_NAME,
.of_match_table = tcan4x5x_of_match,
- .pm = NULL,
+ .pm = &tcan4x5x_pmops,
},
.id_table = tcan4x5x_id_table,
.probe = tcan4x5x_can_probe,
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 11/12] can: m_can_platform: Move clock discovery and init to platform
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
` (9 preceding siblings ...)
2020-10-19 15:42 ` [net-rfc 10/12] can: tcan4x5x: Move clock init to TCAN driver Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 12/12] can: m_can: Remove unused clock function from the framework Marc Kleine-Budde
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Marc Kleine-Budde
From: Dan Murphy <dmurphy@ti.com>
Move the clock discovery and init to the platform driver as the platform driver
needs an additional clock to the CAN clock to be initilialized and managed.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: http://lore.kernel.org/r/20200131183433.11041-3-dmurphy@ti.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/m_can_platform.c | 35 ++++++++++++++++++++------
1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c
index 161cb9be018c..b5b7b77909d3 100644
--- a/drivers/net/can/m_can/m_can_platform.c
+++ b/drivers/net/can/m_can/m_can_platform.c
@@ -12,6 +12,9 @@
struct m_can_plat_priv {
void __iomem *base;
void __iomem *mram_base;
+
+ struct clk *hclk;
+ struct clk *cclk;
};
static u32 iomap_read_reg(struct m_can_classdev *cdev, int reg)
@@ -53,6 +56,22 @@ static struct m_can_ops m_can_plat_ops = {
.read_fifo = iomap_read_fifo,
};
+static int m_can_plat_get_clocks(struct m_can_plat_priv *priv,
+ struct m_can_classdev *mcan_class)
+{
+ int ret = 0;
+
+ priv->hclk = devm_clk_get(mcan_class->dev, "hclk");
+
+ priv->cclk = devm_clk_get(mcan_class->dev, "cclk");
+ if (IS_ERR(priv->cclk)) {
+ dev_err(mcan_class->dev, "no clock found\n");
+ ret = -ENODEV;
+ }
+
+ return ret;
+}
+
static int m_can_plat_probe(struct platform_device *pdev)
{
struct m_can_classdev *mcan_class;
@@ -74,7 +93,7 @@ static int m_can_plat_probe(struct platform_device *pdev)
mcan_class->device_data = priv;
- ret = m_can_class_get_clocks(mcan_class);
+ ret = m_can_plat_get_clocks(priv, mcan_class);
if (ret)
goto probe_fail;
@@ -104,7 +123,7 @@ static int m_can_plat_probe(struct platform_device *pdev)
mcan_class->net->irq = irq;
mcan_class->pm_clock_support = 1;
- mcan_class->can.clock.freq = clk_get_rate(mcan_class->cclk);
+ mcan_class->can.clock.freq = clk_get_rate(priv->cclk);
mcan_class->dev = &pdev->dev;
mcan_class->ops = &m_can_plat_ops;
@@ -150,9 +169,10 @@ static int __maybe_unused m_can_runtime_suspend(struct device *dev)
{
struct net_device *ndev = dev_get_drvdata(dev);
struct m_can_classdev *mcan_class = netdev_priv(ndev);
+ struct m_can_plat_priv *priv = mcan_class->device_data;
- clk_disable_unprepare(mcan_class->cclk);
- clk_disable_unprepare(mcan_class->hclk);
+ clk_disable_unprepare(priv->cclk);
+ clk_disable_unprepare(priv->hclk);
return 0;
}
@@ -161,15 +181,16 @@ static int __maybe_unused m_can_runtime_resume(struct device *dev)
{
struct net_device *ndev = dev_get_drvdata(dev);
struct m_can_classdev *mcan_class = netdev_priv(ndev);
+ struct m_can_plat_priv *priv = mcan_class->device_data;
int err;
- err = clk_prepare_enable(mcan_class->hclk);
+ err = clk_prepare_enable(priv->hclk);
if (err)
return err;
- err = clk_prepare_enable(mcan_class->cclk);
+ err = clk_prepare_enable(priv->cclk);
if (err)
- clk_disable_unprepare(mcan_class->hclk);
+ clk_disable_unprepare(priv->hclk);
return err;
}
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [net-rfc 12/12] can: m_can: Remove unused clock function from the framework
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
` (10 preceding siblings ...)
2020-10-19 15:42 ` [net-rfc 11/12] can: m_can_platform: Move clock discovery and init to platform Marc Kleine-Budde
@ 2020-10-19 15:42 ` Marc Kleine-Budde
11 siblings, 0 replies; 13+ messages in thread
From: Marc Kleine-Budde @ 2020-10-19 15:42 UTC (permalink / raw)
To: linux-can; +Cc: kernel, Dan Murphy, Marc Kleine-Budde
From: Dan Murphy <dmurphy@ti.com>
Remove the unused clock function from the framework as the clock discovery,
initilaization and management are all within the registrars code.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Link: http://lore.kernel.org/r/20200131183433.11041-4-dmurphy@ti.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/m_can.c | 16 ----------------
drivers/net/can/m_can/m_can.h | 3 ---
2 files changed, 19 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 90ee636dd382..e1d8d1c8ab7d 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1747,22 +1747,6 @@ void m_can_init_ram(struct m_can_classdev *cdev)
}
EXPORT_SYMBOL_GPL(m_can_init_ram);
-int m_can_class_get_clocks(struct m_can_classdev *m_can_dev)
-{
- int ret = 0;
-
- m_can_dev->hclk = devm_clk_get(m_can_dev->dev, "hclk");
- m_can_dev->cclk = devm_clk_get(m_can_dev->dev, "cclk");
-
- if (IS_ERR(m_can_dev->cclk)) {
- dev_err(m_can_dev->dev, "no clock found\n");
- ret = -ENODEV;
- }
-
- return ret;
-}
-EXPORT_SYMBOL_GPL(m_can_class_get_clocks);
-
struct m_can_classdev *m_can_class_allocate_dev(struct device *dev)
{
struct m_can_classdev *class_dev = NULL;
diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h
index b2699a7c9997..03e97872675d 100644
--- a/drivers/net/can/m_can/m_can.h
+++ b/drivers/net/can/m_can/m_can.h
@@ -74,8 +74,6 @@ struct m_can_classdev {
struct napi_struct napi;
struct net_device *net;
struct device *dev;
- struct clk *hclk;
- struct clk *cclk;
struct workqueue_struct *tx_wq;
struct work_struct tx_work;
@@ -102,7 +100,6 @@ struct m_can_classdev *m_can_class_allocate_dev(struct device *dev);
void m_can_class_free_dev(struct net_device *net);
int m_can_class_register(struct m_can_classdev *cdev);
void m_can_class_unregister(struct m_can_classdev *cdev);
-int m_can_class_get_clocks(struct m_can_classdev *cdev);
void m_can_init_ram(struct m_can_classdev *priv);
void m_can_config_endisable(struct m_can_classdev *priv, bool enable);
--
2.28.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2020-10-19 15:42 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-19 15:42 [RFC]: can 2020-10-19: m_can/tcan4x5x Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 01/12] can: m_can: remove double clearing of clock stop request bit Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 02/12] can: m_can: m_can_handle_state_change(): fix state change Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 03/12] can: tcan4x5x: replace depends on REGMAP_SPI with depends on SPI Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 04/12] can: tcan4x5x: tcan4x5x_clear_interrupts(): remove redundant return statement Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 05/12] can: tcan4x5x: Rename parse_config() function Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 06/12] can: tcan4x5x: tcan4x5x_can_probe(): add missing error checking for devm_regmap_init() Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 07/12] can: m_can: m_can_class_free_dev(): introduce new function Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 08/12] can: m_can: Fix freeing of can device from peripherials Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 09/12] can: m_can: tcan4x5x: tcan4x5x_can_remove(): fix order of deregistration Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 10/12] can: tcan4x5x: Move clock init to TCAN driver Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 11/12] can: m_can_platform: Move clock discovery and init to platform Marc Kleine-Budde
2020-10-19 15:42 ` [net-rfc 12/12] can: m_can: Remove unused clock function from the framework Marc Kleine-Budde
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).