can: c_can: support 64 message objects for D_CAN
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 can: c_can: support 64 message objects for D_CAN
D_CAN supports up to 128 message objects, comparing to 32 on C_CAN. However, some CPUs with D_CAN controller have their own limits:
TI AM335x Sitara CPU, for example, supports max of 64 message objects.
This patch extends max D_CAN message objects up to 64.
--- drivers/net/can/c_can/Kconfig | 12 ++++++++++++ drivers/net/can/c_can/c_can.c | 42 ++++++++++++++++++++++-------------------- drivers/net/can/c_can/c_can.h | 20 ++++++++++++++++---- 3 files changed, 50 insertions(+), 24 deletions(-)
drivers/net/can/c_can/Kconfig +12 -0
@@ -20,4 +20,16 @@ config CAN_C_CAN_PCI ---help--- This driver adds support for the C_CAN/D_CAN chips connected to the PCI bus. + +config CAN_C_CAN_DCAN_64_MSG_OBJECTS + bool "Use 64 message objects for D_CAN" + default n + ---help--- + D_CAN supports up to 128 message objects, comparing to 32 on + C_CAN. However, some CPUs with D_CAN controller have their + own limits: TI AM335x Sitara CPU, for example, supports max + of 64 message objects. + Enabling this option extends max D_CAN message objects up to + 64. + endif
drivers/net/can/c_can/c_can.c +22 -20
72 lines not on this page · raw message
drivers/net/can/c_can/c_can.h +16 -4
@@ -23,9 +23,15 @@#define C_CAN_H /* message object split */ + +#ifdef CONFIG_CAN_C_CAN_DCAN_64_MSG_OBJECTS +#define C_CAN_NO_OF_OBJECTS 64 +#else #define C_CAN_NO_OF_OBJECTS 32 -#define C_CAN_MSG_OBJ_RX_NUM 16 -#define C_CAN_MSG_OBJ_TX_NUM 16 +#endif + +#define C_CAN_MSG_OBJ_TX_NUM (C_CAN_NO_OF_OBJECTS >> 1) +#define C_CAN_MSG_OBJ_RX_NUM (C_CAN_NO_OF_OBJECTS - C_CAN_MSG_OBJ_TX_NUM)#define C_CAN_MSG_OBJ_RX_FIRST 1#define C_CAN_MSG_OBJ_RX_LAST (C_CAN_MSG_OBJ_RX_FIRST + \
@@ -35,9 +41,11 @@#define C_CAN_MSG_OBJ_TX_LAST (C_CAN_MSG_OBJ_TX_FIRST + \ C_CAN_MSG_OBJ_TX_NUM - 1) -#define C_CAN_MSG_OBJ_RX_SPLIT 9 -#define C_CAN_MSG_RX_LOW_LAST (C_CAN_MSG_OBJ_RX_SPLIT - 1) +#ifdef CONFIG_CAN_C_CAN_DCAN_64_MSG_OBJECTS +#define RECEIVE_OBJECT_BITS 0xffffffff +#else #define RECEIVE_OBJECT_BITS 0x0000ffff +#endif enum reg {C_CAN_CTRL_REG =0 ,
@@ -76,6 +84,8 @@ enum reg {C_CAN_NEWDAT2_REG ,C_CAN_INTPND1_REG ,C_CAN_INTPND2_REG , +C_CAN_INTPND3_REG , +C_CAN_INTPND4_REG ,C_CAN_MSGVAL1_REG ,C_CAN_MSGVAL2_REG , C_CAN_FUNCTION_REG,
@@ -137,6 +147,8 @@ static const u16 reg_map_d_can[] = { [C_CAN_NEWDAT2_REG] = 0x9E, [C_CAN_INTPND1_REG] = 0xB0, [C_CAN_INTPND2_REG] = 0xB2, + [C_CAN_INTPND3_REG] = 0xB4, + [C_CAN_INTPND4_REG] = 0xB6, [C_CAN_MSGVAL1_REG] = 0xC4, [C_CAN_MSGVAL2_REG] = 0xC6, [C_CAN_IF1_COMREQ_REG] = 0x100,
Signature · 1 line
2.11.0
Marc Kleine-Budde
maintainerQuoted 5 lines · Andrejs Cainikovs
D_CANsupports up to 128 message objects, comparing to 32 onC_CAN. However, some CPUs withD_CANcontroller have their own limits:
TI AM335x Sitara CPU, for example, supports max of 64 message objects.This patch extends max
D_CANmessage objects up to 64.
Please don't make this a kconfig option.
According to you description this is a HW feature, so please add the max number of messe objects to "struct c_can_driver_data" and adjust the drvdata accordingly.
Quoted 8 lines
static const struct of_device_id c_can_of_table[] = {
{ .compatible = "bosch,c_can", .data = &c_can_drvdata },
{ .compatible = "bosch,d_can", .data = &d_can_drvdata },
{ .compatible = "ti,dra7-d_can", .data = &dra7_dcan_drvdata },
{ .compatible = "ti,am3352-d_can", .data = &am3352_dcan_drvdata },
{ .compatible = "ti,am4372-d_can", .data = &am3352_dcan_drvdata },
{ /* sentinel */ },
};You probably have to pass it via "struct c_can_priv" so that it's available in the c_can.c
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Hi Andrejs, Marc,
Quoted 23 lines · Marc Kleine-Budde
Quoted 5 lines · Andrejs Cainikovs
D_CANsupports up to 128 message objects, comparing to 32 onC_CAN. However, some CPUs withD_CANcontroller have their own limits:
TI AM335x Sitara CPU, for example, supports max of 64 message objects.This patch extends max
D_CANmessage objects up to 64.Please don't make this a kconfig option.
According to you description this is a HW feature, so please add the max number of messe objects to "struct
c_can_driver_data" and adjust the drvdata accordingly.Quoted 8 lines
static const struct of_device_id c_can_of_table[] = { { .compatible = "bosch,c_can", .data = &c_can_drvdata }, { .compatible = "bosch,d_can", .data = &d_can_drvdata }, { .compatible = "ti,dra7-d_can", .data = &dra7_dcan_drvdata }, { .compatible = "ti,am3352-d_can", .data = &am3352_dcan_drvdata }, { .compatible = "ti,am4372-d_can", .data = &am3352_dcan_drvdata }, { /* sentinel */ }, };
Quoted 3 lines
You probably have to pass it via "struct
c_can_priv" so that it's available in thec_can.c
I came here to make the same suggestion :-)
Andrejs, do you think you could respin this patch? Or perhaps I can find some time to do that myself, if that's OK with you.
Thanks,
Ezequiel
Marc Kleine-Budde
maintainerOn 1/13/21 7:49 PM, Ezequiel Garcia wrote:
[...]
Quoted 8 lines
Quoted 3 lines
You probably have to pass it via "struct
c_can_priv" so that it's available in thec_can.cI came here to make the same suggestion :-)
Andrejs, do you think you could respin this patch? Or perhaps I can find some time to do that myself, if that's OK with you.
Take the patches as is and improve them.
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 2/2 can: c_can: configurable amount of D_CAN RX objects
In reply to a message not in the archiveMake number of D_CAN RX message objects configurable. This will allow having bigger (or smaller) RX buffer instead of 50/50 split for RX/TX.
--- drivers/net/can/c_can/Kconfig | 8 ++++++ drivers/net/can/c_can/c_can.c | 64 +++++++++++++++++++++++++++++-------------- drivers/net/can/c_can/c_can.h | 16 +++++------ 3 files changed, 58 insertions(+), 30 deletions(-)
drivers/net/can/c_can/Kconfig +8 -0
@@ -32,4 +32,12 @@ config CAN_C_CAN_DCAN_64_MSG_OBJECTS Enabling this option extends max D_CAN message objects up to 64. +config CAN_C_CAN_DCAN_RX_MSG_OBJECTS + int "Specify amount of D_CAN RX message objects" + depends on CAN_C_CAN_DCAN_64_MSG_OBJECTS + default 32 + ---help--- + Use specific number of message objects for RX, instead of + 50/50 split between RX/TX. + endif
drivers/net/can/c_can/c_can.c +43 -21
123 lines not on this page · raw message
drivers/net/can/c_can/c_can.h +7 -9
@@ -26,12 +26,12 @@#ifdef CONFIG_CAN_C_CAN_DCAN_64_MSG_OBJECTS #define C_CAN_NO_OF_OBJECTS 64 +#define C_CAN_MSG_OBJ_RX_NUM CONFIG_CAN_C_CAN_DCAN_RX_MSG_OBJECTS#else #define C_CAN_NO_OF_OBJECTS 32 +#define C_CAN_MSG_OBJ_RX_NUM 16#endif - -#define C_CAN_MSG_OBJ_TX_NUM (C_CAN_NO_OF_OBJECTS >> 1) -#define C_CAN_MSG_OBJ_RX_NUM (C_CAN_NO_OF_OBJECTS - C_CAN_MSG_OBJ_TX_NUM) +#define C_CAN_MSG_OBJ_TX_NUM (C_CAN_NO_OF_OBJECTS - C_CAN_MSG_OBJ_RX_NUM)#define C_CAN_MSG_OBJ_RX_FIRST 1#define C_CAN_MSG_OBJ_RX_LAST (C_CAN_MSG_OBJ_RX_FIRST + \
@@ -41,12 +41,6 @@#define C_CAN_MSG_OBJ_TX_LAST (C_CAN_MSG_OBJ_TX_FIRST + \ C_CAN_MSG_OBJ_TX_NUM - 1) -#ifdef CONFIG_CAN_C_CAN_DCAN_64_MSG_OBJECTS -#define RECEIVE_OBJECT_BITS 0xffffffff -#else -#define RECEIVE_OBJECT_BITS 0x0000ffff -#endif -enum reg {C_CAN_CTRL_REG =0 ,C_CAN_CTRL_EX_REG ,
@@ -82,6 +76,8 @@ enum reg {C_CAN_TXRQST2_REG ,C_CAN_NEWDAT1_REG ,C_CAN_NEWDAT2_REG , +C_CAN_NEWDAT3_REG , +C_CAN_NEWDAT4_REG ,C_CAN_INTPND1_REG ,C_CAN_INTPND2_REG , C_CAN_INTPND3_REG,
@@ -145,6 +141,8 @@ static const u16 reg_map_d_can[] = { [C_CAN_TXRQST2_REG] = 0x8A, [C_CAN_NEWDAT1_REG] = 0x9C, [C_CAN_NEWDAT2_REG] = 0x9E, + [C_CAN_NEWDAT3_REG] = 0xA0, + [C_CAN_NEWDAT4_REG] = 0xA2, [C_CAN_INTPND1_REG] = 0xB0, [C_CAN_INTPND2_REG] = 0xB2, [C_CAN_INTPND3_REG] = 0xB4,
Signature · 1 line
2.11.0