* [RFC PATCH 0/3] M_CAN Framework rework
@ 2018-10-10 14:20 Dan Murphy
2018-10-10 14:20 ` [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code Dan Murphy
` (3 more replies)
0 siblings, 4 replies; 20+ messages in thread
From: Dan Murphy @ 2018-10-10 14:20 UTC (permalink / raw)
To: wg, mkl, davem; +Cc: linux-can, netdev, linux-kernel, Dan Murphy
All
This patch series creates a m_can core framework that devices can register
to. The m_can core manages the Bosch IP and CAN frames. Each device that
is registered is responsible for managing device specific functions.
This rewrite was suggested in a device driver submission for the TCAN4x5x
device
Reference upstream post:
https://lore.kernel.org/patchwork/patch/984163/
For instance the TCAN device is a SPI device that uses a specific data payload to
determine writes and reads. In addition the device has a reset input as well
as a wakeup pin. The register offset of the m_can registers differs and must
be set by the device attached to the core.
The m_can core will use iomapped writes and reads as the default mechanism for
writing and reading. The device driver can provide over rides for this.
This patch series is not complete as it does not handle the CAN interrupts
nor can perform a CAN write. If this patch series is deemed acceptable I will
finish debugging the driver and post a non RFC series.
Finally I did attempt to reduce the first patch with various git format patch
directives but none seemed to reduce the patch.
Dan
Dan Murphy (3):
can: m_can: Create m_can core to leverage common code
dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver
can: tcan4x5x: Add tcan4x5x driver to the kernel
.../devicetree/bindings/net/can/tcan4x5x.txt | 34 +
drivers/net/can/m_can/Kconfig | 18 +
drivers/net/can/m_can/Makefile | 4 +-
drivers/net/can/m_can/m_can.c | 1683 +----------------
.../net/can/m_can/{m_can.c => m_can_core.c} | 479 +++--
drivers/net/can/m_can/m_can_core.h | 100 +
drivers/net/can/m_can/tcan4x5x.c | 321 ++++
7 files changed, 722 insertions(+), 1917 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt
copy drivers/net/can/m_can/{m_can.c => m_can_core.c} (83%)
create mode 100644 drivers/net/can/m_can/m_can_core.h
create mode 100644 drivers/net/can/m_can/tcan4x5x.c
--
2.19.0
^ permalink raw reply [flat|nested] 20+ messages in thread* [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2018-10-10 14:20 [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy @ 2018-10-10 14:20 ` Dan Murphy 2018-10-27 14:19 ` Wolfgang Grandegger 2018-10-10 14:20 ` [RFC PATCH 2/3] dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver Dan Murphy ` (2 subsequent siblings) 3 siblings, 1 reply; 20+ messages in thread From: Dan Murphy @ 2018-10-10 14:20 UTC (permalink / raw) To: wg, mkl, davem; +Cc: linux-can, netdev, linux-kernel, Dan Murphy Create a common code base that can be leveraged by other devices that use the Bosch MCAN IP. The common code manages the MCAN IP as well as registering the CAN device. Signed-off-by: Dan Murphy <dmurphy@ti.com> --- drivers/net/can/m_can/Kconfig | 12 + drivers/net/can/m_can/Makefile | 3 +- drivers/net/can/m_can/m_can.c | 1683 +---------------- .../net/can/m_can/{m_can.c => m_can_core.c} | 479 +++-- drivers/net/can/m_can/m_can_core.h | 100 + 5 files changed, 360 insertions(+), 1917 deletions(-) copy drivers/net/can/m_can/{m_can.c => m_can_core.c} (83%) create mode 100644 drivers/net/can/m_can/m_can_core.h diff --git a/drivers/net/can/m_can/Kconfig b/drivers/net/can/m_can/Kconfig index 04f20dd39007..b1a9358b7660 100644 --- a/drivers/net/can/m_can/Kconfig +++ b/drivers/net/can/m_can/Kconfig @@ -1,5 +1,17 @@ config CAN_M_CAN + tristate "Bosch M_CAN support" + ---help--- + Say Y here if you want to support for Bosch M_CAN controller. + +config CAN_M_CAN_CORE + depends on CAN_M_CAN + tristate "Bosch M_CAN Core support" + ---help--- + Say Y here if you want to support for Bosch M_CAN controller. + +config CAN_M_CAN_PLATFORM depends on HAS_IOMEM + depends on CAN_M_CAN_CORE tristate "Bosch M_CAN devices" ---help--- Say Y here if you want to support for Bosch M_CAN controller. diff --git a/drivers/net/can/m_can/Makefile b/drivers/net/can/m_can/Makefile index 8bbd7f24f5be..e013d6f4c941 100644 --- a/drivers/net/can/m_can/Makefile +++ b/drivers/net/can/m_can/Makefile @@ -2,4 +2,5 @@ # Makefile for the Bosch M_CAN controller driver. # -obj-$(CONFIG_CAN_M_CAN) += m_can.o +obj-$(CONFIG_CAN_M_CAN_CORE) += m_can_core.o +obj-$(CONFIG_CAN_M_CAN_PLATFORM) += m_can.o diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 9b449400376b..079cb31d2da3 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -14,1590 +14,34 @@ */ #include <linux/clk.h> -#include <linux/delay.h> #include <linux/interrupt.h> #include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/netdevice.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> -#include <linux/iopoll.h> #include <linux/can/dev.h> #include <linux/pinctrl/consumer.h> -/* napi related */ -#define M_CAN_NAPI_WEIGHT 64 - -/* message ram configuration data length */ -#define MRAM_CFG_LEN 8 - -/* registers definition */ -enum m_can_reg { - M_CAN_CREL = 0x0, - M_CAN_ENDN = 0x4, - M_CAN_CUST = 0x8, - M_CAN_DBTP = 0xc, - M_CAN_TEST = 0x10, - M_CAN_RWD = 0x14, - M_CAN_CCCR = 0x18, - M_CAN_NBTP = 0x1c, - M_CAN_TSCC = 0x20, - M_CAN_TSCV = 0x24, - M_CAN_TOCC = 0x28, - M_CAN_TOCV = 0x2c, - M_CAN_ECR = 0x40, - M_CAN_PSR = 0x44, -/* TDCR Register only available for version >=3.1.x */ - M_CAN_TDCR = 0x48, - M_CAN_IR = 0x50, - M_CAN_IE = 0x54, - M_CAN_ILS = 0x58, - M_CAN_ILE = 0x5c, - M_CAN_GFC = 0x80, - M_CAN_SIDFC = 0x84, - M_CAN_XIDFC = 0x88, - M_CAN_XIDAM = 0x90, - M_CAN_HPMS = 0x94, - M_CAN_NDAT1 = 0x98, - M_CAN_NDAT2 = 0x9c, - M_CAN_RXF0C = 0xa0, - M_CAN_RXF0S = 0xa4, - M_CAN_RXF0A = 0xa8, - M_CAN_RXBC = 0xac, - M_CAN_RXF1C = 0xb0, - M_CAN_RXF1S = 0xb4, - M_CAN_RXF1A = 0xb8, - M_CAN_RXESC = 0xbc, - M_CAN_TXBC = 0xc0, - M_CAN_TXFQS = 0xc4, - M_CAN_TXESC = 0xc8, - M_CAN_TXBRP = 0xcc, - M_CAN_TXBAR = 0xd0, - M_CAN_TXBCR = 0xd4, - M_CAN_TXBTO = 0xd8, - M_CAN_TXBCF = 0xdc, - M_CAN_TXBTIE = 0xe0, - M_CAN_TXBCIE = 0xe4, - M_CAN_TXEFC = 0xf0, - M_CAN_TXEFS = 0xf4, - M_CAN_TXEFA = 0xf8, -}; - -/* m_can lec values */ -enum m_can_lec_type { - LEC_NO_ERROR = 0, - LEC_STUFF_ERROR, - LEC_FORM_ERROR, - LEC_ACK_ERROR, - LEC_BIT1_ERROR, - LEC_BIT0_ERROR, - LEC_CRC_ERROR, - LEC_UNUSED, -}; - -enum m_can_mram_cfg { - MRAM_SIDF = 0, - MRAM_XIDF, - MRAM_RXF0, - MRAM_RXF1, - MRAM_RXB, - MRAM_TXE, - MRAM_TXB, - MRAM_CFG_NUM, -}; - -/* Core Release Register (CREL) */ -#define CREL_REL_SHIFT 28 -#define CREL_REL_MASK (0xF << CREL_REL_SHIFT) -#define CREL_STEP_SHIFT 24 -#define CREL_STEP_MASK (0xF << CREL_STEP_SHIFT) -#define CREL_SUBSTEP_SHIFT 20 -#define CREL_SUBSTEP_MASK (0xF << CREL_SUBSTEP_SHIFT) - -/* Data Bit Timing & Prescaler Register (DBTP) */ -#define DBTP_TDC BIT(23) -#define DBTP_DBRP_SHIFT 16 -#define DBTP_DBRP_MASK (0x1f << DBTP_DBRP_SHIFT) -#define DBTP_DTSEG1_SHIFT 8 -#define DBTP_DTSEG1_MASK (0x1f << DBTP_DTSEG1_SHIFT) -#define DBTP_DTSEG2_SHIFT 4 -#define DBTP_DTSEG2_MASK (0xf << DBTP_DTSEG2_SHIFT) -#define DBTP_DSJW_SHIFT 0 -#define DBTP_DSJW_MASK (0xf << DBTP_DSJW_SHIFT) - -/* Transmitter Delay Compensation Register (TDCR) */ -#define TDCR_TDCO_SHIFT 8 -#define TDCR_TDCO_MASK (0x7F << TDCR_TDCO_SHIFT) -#define TDCR_TDCF_SHIFT 0 -#define TDCR_TDCF_MASK (0x7F << TDCR_TDCF_SHIFT) - -/* Test Register (TEST) */ -#define TEST_LBCK BIT(4) - -/* CC Control Register(CCCR) */ -#define CCCR_CMR_MASK 0x3 -#define CCCR_CMR_SHIFT 10 -#define CCCR_CMR_CANFD 0x1 -#define CCCR_CMR_CANFD_BRS 0x2 -#define CCCR_CMR_CAN 0x3 -#define CCCR_CME_MASK 0x3 -#define CCCR_CME_SHIFT 8 -#define CCCR_CME_CAN 0 -#define CCCR_CME_CANFD 0x1 -#define CCCR_CME_CANFD_BRS 0x2 -#define CCCR_TXP BIT(14) -#define CCCR_TEST BIT(7) -#define CCCR_MON BIT(5) -#define CCCR_CSR BIT(4) -#define CCCR_CSA BIT(3) -#define CCCR_ASM BIT(2) -#define CCCR_CCE BIT(1) -#define CCCR_INIT BIT(0) -#define CCCR_CANFD 0x10 -/* for version >=3.1.x */ -#define CCCR_EFBI BIT(13) -#define CCCR_PXHD BIT(12) -#define CCCR_BRSE BIT(9) -#define CCCR_FDOE BIT(8) -/* only for version >=3.2.x */ -#define CCCR_NISO BIT(15) - -/* Nominal Bit Timing & Prescaler Register (NBTP) */ -#define NBTP_NSJW_SHIFT 25 -#define NBTP_NSJW_MASK (0x7f << NBTP_NSJW_SHIFT) -#define NBTP_NBRP_SHIFT 16 -#define NBTP_NBRP_MASK (0x1ff << NBTP_NBRP_SHIFT) -#define NBTP_NTSEG1_SHIFT 8 -#define NBTP_NTSEG1_MASK (0xff << NBTP_NTSEG1_SHIFT) -#define NBTP_NTSEG2_SHIFT 0 -#define NBTP_NTSEG2_MASK (0x7f << NBTP_NTSEG2_SHIFT) - -/* Error Counter Register(ECR) */ -#define ECR_RP BIT(15) -#define ECR_REC_SHIFT 8 -#define ECR_REC_MASK (0x7f << ECR_REC_SHIFT) -#define ECR_TEC_SHIFT 0 -#define ECR_TEC_MASK 0xff - -/* Protocol Status Register(PSR) */ -#define PSR_BO BIT(7) -#define PSR_EW BIT(6) -#define PSR_EP BIT(5) -#define PSR_LEC_MASK 0x7 - -/* Interrupt Register(IR) */ -#define IR_ALL_INT 0xffffffff - -/* Renamed bits for versions > 3.1.x */ -#define IR_ARA BIT(29) -#define IR_PED BIT(28) -#define IR_PEA BIT(27) - -/* Bits for version 3.0.x */ -#define IR_STE BIT(31) -#define IR_FOE BIT(30) -#define IR_ACKE BIT(29) -#define IR_BE BIT(28) -#define IR_CRCE BIT(27) -#define IR_WDI BIT(26) -#define IR_BO BIT(25) -#define IR_EW BIT(24) -#define IR_EP BIT(23) -#define IR_ELO BIT(22) -#define IR_BEU BIT(21) -#define IR_BEC BIT(20) -#define IR_DRX BIT(19) -#define IR_TOO BIT(18) -#define IR_MRAF BIT(17) -#define IR_TSW BIT(16) -#define IR_TEFL BIT(15) -#define IR_TEFF BIT(14) -#define IR_TEFW BIT(13) -#define IR_TEFN BIT(12) -#define IR_TFE BIT(11) -#define IR_TCF BIT(10) -#define IR_TC BIT(9) -#define IR_HPM BIT(8) -#define IR_RF1L BIT(7) -#define IR_RF1F BIT(6) -#define IR_RF1W BIT(5) -#define IR_RF1N BIT(4) -#define IR_RF0L BIT(3) -#define IR_RF0F BIT(2) -#define IR_RF0W BIT(1) -#define IR_RF0N BIT(0) -#define IR_ERR_STATE (IR_BO | IR_EW | IR_EP) - -/* Interrupts for version 3.0.x */ -#define IR_ERR_LEC_30X (IR_STE | IR_FOE | IR_ACKE | IR_BE | IR_CRCE) -#define IR_ERR_BUS_30X (IR_ERR_LEC_30X | IR_WDI | IR_ELO | IR_BEU | \ - IR_BEC | IR_TOO | IR_MRAF | IR_TSW | IR_TEFL | \ - IR_RF1L | IR_RF0L) -#define IR_ERR_ALL_30X (IR_ERR_STATE | IR_ERR_BUS_30X) -/* Interrupts for version >= 3.1.x */ -#define IR_ERR_LEC_31X (IR_PED | IR_PEA) -#define IR_ERR_BUS_31X (IR_ERR_LEC_31X | IR_WDI | IR_ELO | IR_BEU | \ - IR_BEC | IR_TOO | IR_MRAF | IR_TSW | IR_TEFL | \ - IR_RF1L | IR_RF0L) -#define IR_ERR_ALL_31X (IR_ERR_STATE | IR_ERR_BUS_31X) - -/* Interrupt Line Select (ILS) */ -#define ILS_ALL_INT0 0x0 -#define ILS_ALL_INT1 0xFFFFFFFF - -/* Interrupt Line Enable (ILE) */ -#define ILE_EINT1 BIT(1) -#define ILE_EINT0 BIT(0) - -/* Rx FIFO 0/1 Configuration (RXF0C/RXF1C) */ -#define RXFC_FWM_SHIFT 24 -#define RXFC_FWM_MASK (0x7f << RXFC_FWM_SHIFT) -#define RXFC_FS_SHIFT 16 -#define RXFC_FS_MASK (0x7f << RXFC_FS_SHIFT) - -/* Rx FIFO 0/1 Status (RXF0S/RXF1S) */ -#define RXFS_RFL BIT(25) -#define RXFS_FF BIT(24) -#define RXFS_FPI_SHIFT 16 -#define RXFS_FPI_MASK 0x3f0000 -#define RXFS_FGI_SHIFT 8 -#define RXFS_FGI_MASK 0x3f00 -#define RXFS_FFL_MASK 0x7f - -/* Rx Buffer / FIFO Element Size Configuration (RXESC) */ -#define M_CAN_RXESC_8BYTES 0x0 -#define M_CAN_RXESC_64BYTES 0x777 - -/* Tx Buffer Configuration(TXBC) */ -#define TXBC_NDTB_SHIFT 16 -#define TXBC_NDTB_MASK (0x3f << TXBC_NDTB_SHIFT) -#define TXBC_TFQS_SHIFT 24 -#define TXBC_TFQS_MASK (0x3f << TXBC_TFQS_SHIFT) - -/* Tx FIFO/Queue Status (TXFQS) */ -#define TXFQS_TFQF BIT(21) -#define TXFQS_TFQPI_SHIFT 16 -#define TXFQS_TFQPI_MASK (0x1f << TXFQS_TFQPI_SHIFT) -#define TXFQS_TFGI_SHIFT 8 -#define TXFQS_TFGI_MASK (0x1f << TXFQS_TFGI_SHIFT) -#define TXFQS_TFFL_SHIFT 0 -#define TXFQS_TFFL_MASK (0x3f << TXFQS_TFFL_SHIFT) - -/* Tx Buffer Element Size Configuration(TXESC) */ -#define TXESC_TBDS_8BYTES 0x0 -#define TXESC_TBDS_64BYTES 0x7 - -/* Tx Event FIFO Configuration (TXEFC) */ -#define TXEFC_EFS_SHIFT 16 -#define TXEFC_EFS_MASK (0x3f << TXEFC_EFS_SHIFT) - -/* Tx Event FIFO Status (TXEFS) */ -#define TXEFS_TEFL BIT(25) -#define TXEFS_EFF BIT(24) -#define TXEFS_EFGI_SHIFT 8 -#define TXEFS_EFGI_MASK (0x1f << TXEFS_EFGI_SHIFT) -#define TXEFS_EFFL_SHIFT 0 -#define TXEFS_EFFL_MASK (0x3f << TXEFS_EFFL_SHIFT) - -/* Tx Event FIFO Acknowledge (TXEFA) */ -#define TXEFA_EFAI_SHIFT 0 -#define TXEFA_EFAI_MASK (0x1f << TXEFA_EFAI_SHIFT) - -/* Message RAM Configuration (in bytes) */ -#define SIDF_ELEMENT_SIZE 4 -#define XIDF_ELEMENT_SIZE 8 -#define RXF0_ELEMENT_SIZE 72 -#define RXF1_ELEMENT_SIZE 72 -#define RXB_ELEMENT_SIZE 72 -#define TXE_ELEMENT_SIZE 8 -#define TXB_ELEMENT_SIZE 72 - -/* Message RAM Elements */ -#define M_CAN_FIFO_ID 0x0 -#define M_CAN_FIFO_DLC 0x4 -#define M_CAN_FIFO_DATA(n) (0x8 + ((n) << 2)) - -/* Rx Buffer Element */ -/* R0 */ -#define RX_BUF_ESI BIT(31) -#define RX_BUF_XTD BIT(30) -#define RX_BUF_RTR BIT(29) -/* R1 */ -#define RX_BUF_ANMF BIT(31) -#define RX_BUF_FDF BIT(21) -#define RX_BUF_BRS BIT(20) - -/* Tx Buffer Element */ -/* T0 */ -#define TX_BUF_ESI BIT(31) -#define TX_BUF_XTD BIT(30) -#define TX_BUF_RTR BIT(29) -/* T1 */ -#define TX_BUF_EFC BIT(23) -#define TX_BUF_FDF BIT(21) -#define TX_BUF_BRS BIT(20) -#define TX_BUF_MM_SHIFT 24 -#define TX_BUF_MM_MASK (0xff << TX_BUF_MM_SHIFT) - -/* Tx event FIFO Element */ -/* E1 */ -#define TX_EVENT_MM_SHIFT TX_BUF_MM_SHIFT -#define TX_EVENT_MM_MASK (0xff << TX_EVENT_MM_SHIFT) - -/* address offset and element number for each FIFO/Buffer in the Message RAM */ -struct mram_cfg { - u16 off; - u8 num; -}; - -/* m_can private data structure */ -struct m_can_priv { - struct can_priv can; /* must be the first member */ - struct napi_struct napi; - struct net_device *dev; - struct device *device; - struct clk *hclk; - struct clk *cclk; - void __iomem *base; - u32 irqstatus; - int version; - - /* message ram configuration */ - void __iomem *mram_base; - struct mram_cfg mcfg[MRAM_CFG_NUM]; -}; - -static inline u32 m_can_read(const struct m_can_priv *priv, enum m_can_reg reg) -{ - return readl(priv->base + reg); -} - -static inline void m_can_write(const struct m_can_priv *priv, - enum m_can_reg reg, u32 val) -{ - writel(val, priv->base + reg); -} - -static inline u32 m_can_fifo_read(const struct m_can_priv *priv, - u32 fgi, unsigned int offset) -{ - return readl(priv->mram_base + priv->mcfg[MRAM_RXF0].off + - fgi * RXF0_ELEMENT_SIZE + offset); -} - -static inline void m_can_fifo_write(const struct m_can_priv *priv, - u32 fpi, unsigned int offset, u32 val) -{ - writel(val, priv->mram_base + priv->mcfg[MRAM_TXB].off + - fpi * TXB_ELEMENT_SIZE + offset); -} - -static inline u32 m_can_txe_fifo_read(const struct m_can_priv *priv, - u32 fgi, - u32 offset) { - return readl(priv->mram_base + priv->mcfg[MRAM_TXE].off + - fgi * TXE_ELEMENT_SIZE + offset); -} - -static inline bool m_can_tx_fifo_full(const struct m_can_priv *priv) -{ - return !!(m_can_read(priv, M_CAN_TXFQS) & TXFQS_TFQF); -} - -static inline void m_can_config_endisable(const struct m_can_priv *priv, - bool enable) -{ - u32 cccr = m_can_read(priv, M_CAN_CCCR); - u32 timeout = 10; - u32 val = 0; - - if (enable) { - /* enable m_can configuration */ - m_can_write(priv, M_CAN_CCCR, cccr | CCCR_INIT); - udelay(5); - /* CCCR.CCE can only be set/reset while CCCR.INIT = '1' */ - m_can_write(priv, M_CAN_CCCR, cccr | CCCR_INIT | CCCR_CCE); - } else { - m_can_write(priv, M_CAN_CCCR, cccr & ~(CCCR_INIT | CCCR_CCE)); - } - - /* there's a delay for module initialization */ - if (enable) - val = CCCR_INIT | CCCR_CCE; - - while ((m_can_read(priv, M_CAN_CCCR) & (CCCR_INIT | CCCR_CCE)) != val) { - if (timeout == 0) { - netdev_warn(priv->dev, "Failed to init module\n"); - return; - } - timeout--; - udelay(1); - } -} - -static inline void m_can_enable_all_interrupts(const struct m_can_priv *priv) -{ - /* Only interrupt line 0 is used in this driver */ - m_can_write(priv, M_CAN_ILE, ILE_EINT0); -} - -static inline void m_can_disable_all_interrupts(const struct m_can_priv *priv) -{ - m_can_write(priv, M_CAN_ILE, 0x0); -} - -static void m_can_read_fifo(struct net_device *dev, u32 rxfs) -{ - struct net_device_stats *stats = &dev->stats; - struct m_can_priv *priv = netdev_priv(dev); - struct canfd_frame *cf; - struct sk_buff *skb; - u32 id, fgi, dlc; - int i; - - /* calculate the fifo get index for where to read data */ - fgi = (rxfs & RXFS_FGI_MASK) >> RXFS_FGI_SHIFT; - dlc = m_can_fifo_read(priv, fgi, M_CAN_FIFO_DLC); - if (dlc & RX_BUF_FDF) - skb = alloc_canfd_skb(dev, &cf); - else - skb = alloc_can_skb(dev, (struct can_frame **)&cf); - if (!skb) { - stats->rx_dropped++; - return; - } - - if (dlc & RX_BUF_FDF) - cf->len = can_dlc2len((dlc >> 16) & 0x0F); - else - cf->len = get_can_dlc((dlc >> 16) & 0x0F); - - id = m_can_fifo_read(priv, fgi, M_CAN_FIFO_ID); - if (id & RX_BUF_XTD) - cf->can_id = (id & CAN_EFF_MASK) | CAN_EFF_FLAG; - else - cf->can_id = (id >> 18) & CAN_SFF_MASK; - - if (id & RX_BUF_ESI) { - cf->flags |= CANFD_ESI; - netdev_dbg(dev, "ESI Error\n"); - } - - if (!(dlc & RX_BUF_FDF) && (id & RX_BUF_RTR)) { - cf->can_id |= CAN_RTR_FLAG; - } else { - if (dlc & RX_BUF_BRS) - cf->flags |= CANFD_BRS; - - for (i = 0; i < cf->len; i += 4) - *(u32 *)(cf->data + i) = - m_can_fifo_read(priv, fgi, - M_CAN_FIFO_DATA(i / 4)); - } - - /* acknowledge rx fifo 0 */ - m_can_write(priv, M_CAN_RXF0A, fgi); - - stats->rx_packets++; - stats->rx_bytes += cf->len; - - netif_receive_skb(skb); -} - -static int m_can_do_rx_poll(struct net_device *dev, int quota) -{ - struct m_can_priv *priv = netdev_priv(dev); - u32 pkts = 0; - u32 rxfs; - - rxfs = m_can_read(priv, M_CAN_RXF0S); - if (!(rxfs & RXFS_FFL_MASK)) { - netdev_dbg(dev, "no messages in fifo0\n"); - return 0; - } - - while ((rxfs & RXFS_FFL_MASK) && (quota > 0)) { - if (rxfs & RXFS_RFL) - netdev_warn(dev, "Rx FIFO 0 Message Lost\n"); - - m_can_read_fifo(dev, rxfs); - - quota--; - pkts++; - rxfs = m_can_read(priv, M_CAN_RXF0S); - } - - if (pkts) - can_led_event(dev, CAN_LED_EVENT_RX); - - return pkts; -} - -static int m_can_handle_lost_msg(struct net_device *dev) -{ - struct net_device_stats *stats = &dev->stats; - struct sk_buff *skb; - struct can_frame *frame; - - netdev_err(dev, "msg lost in rxf0\n"); - - stats->rx_errors++; - stats->rx_over_errors++; - - skb = alloc_can_err_skb(dev, &frame); - if (unlikely(!skb)) - return 0; - - frame->can_id |= CAN_ERR_CRTL; - frame->data[1] = CAN_ERR_CRTL_RX_OVERFLOW; - - netif_receive_skb(skb); - - return 1; -} - -static int m_can_handle_lec_err(struct net_device *dev, - enum m_can_lec_type lec_type) -{ - struct m_can_priv *priv = netdev_priv(dev); - struct net_device_stats *stats = &dev->stats; - struct can_frame *cf; - struct sk_buff *skb; - - priv->can.can_stats.bus_error++; - stats->rx_errors++; - - /* propagate the error condition to the CAN stack */ - skb = alloc_can_err_skb(dev, &cf); - if (unlikely(!skb)) - return 0; - - /* check for 'last error code' which tells us the - * type of the last error to occur on the CAN bus - */ - cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR; - - switch (lec_type) { - case LEC_STUFF_ERROR: - netdev_dbg(dev, "stuff error\n"); - cf->data[2] |= CAN_ERR_PROT_STUFF; - break; - case LEC_FORM_ERROR: - netdev_dbg(dev, "form error\n"); - cf->data[2] |= CAN_ERR_PROT_FORM; - break; - case LEC_ACK_ERROR: - netdev_dbg(dev, "ack error\n"); - cf->data[3] = CAN_ERR_PROT_LOC_ACK; - break; - case LEC_BIT1_ERROR: - netdev_dbg(dev, "bit1 error\n"); - cf->data[2] |= CAN_ERR_PROT_BIT1; - break; - case LEC_BIT0_ERROR: - netdev_dbg(dev, "bit0 error\n"); - cf->data[2] |= CAN_ERR_PROT_BIT0; - break; - case LEC_CRC_ERROR: - netdev_dbg(dev, "CRC error\n"); - cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ; - break; - default: - break; - } - - stats->rx_packets++; - stats->rx_bytes += cf->can_dlc; - netif_receive_skb(skb); - - return 1; -} - -static int __m_can_get_berr_counter(const struct net_device *dev, - struct can_berr_counter *bec) -{ - struct m_can_priv *priv = netdev_priv(dev); - unsigned int ecr; - - ecr = m_can_read(priv, M_CAN_ECR); - bec->rxerr = (ecr & ECR_REC_MASK) >> ECR_REC_SHIFT; - bec->txerr = (ecr & ECR_TEC_MASK) >> ECR_TEC_SHIFT; - - return 0; -} - -static int m_can_clk_start(struct m_can_priv *priv) -{ - int err; - - err = pm_runtime_get_sync(priv->device); - if (err < 0) { - pm_runtime_put_noidle(priv->device); - return err; - } - - return 0; -} - -static void m_can_clk_stop(struct m_can_priv *priv) -{ - pm_runtime_put_sync(priv->device); -} - -static int m_can_get_berr_counter(const struct net_device *dev, - struct can_berr_counter *bec) -{ - struct m_can_priv *priv = netdev_priv(dev); - int err; - - err = m_can_clk_start(priv); - if (err) - return err; - - __m_can_get_berr_counter(dev, bec); - - m_can_clk_stop(priv); - - return 0; -} - -static int m_can_handle_state_change(struct net_device *dev, - enum can_state new_state) -{ - struct m_can_priv *priv = netdev_priv(dev); - struct net_device_stats *stats = &dev->stats; - struct can_frame *cf; - struct sk_buff *skb; - struct can_berr_counter bec; - unsigned int ecr; - - switch (new_state) { - case CAN_STATE_ERROR_ACTIVE: - /* error warning state */ - priv->can.can_stats.error_warning++; - priv->can.state = CAN_STATE_ERROR_WARNING; - break; - case CAN_STATE_ERROR_PASSIVE: - /* error passive state */ - priv->can.can_stats.error_passive++; - priv->can.state = CAN_STATE_ERROR_PASSIVE; - break; - case CAN_STATE_BUS_OFF: - /* bus-off state */ - priv->can.state = CAN_STATE_BUS_OFF; - m_can_disable_all_interrupts(priv); - priv->can.can_stats.bus_off++; - can_bus_off(dev); - break; - default: - break; - } - - /* propagate the error condition to the CAN stack */ - skb = alloc_can_err_skb(dev, &cf); - if (unlikely(!skb)) - return 0; - - __m_can_get_berr_counter(dev, &bec); - - switch (new_state) { - case CAN_STATE_ERROR_ACTIVE: - /* error warning state */ - cf->can_id |= CAN_ERR_CRTL; - cf->data[1] = (bec.txerr > bec.rxerr) ? - CAN_ERR_CRTL_TX_WARNING : - CAN_ERR_CRTL_RX_WARNING; - cf->data[6] = bec.txerr; - cf->data[7] = bec.rxerr; - break; - case CAN_STATE_ERROR_PASSIVE: - /* error passive state */ - cf->can_id |= CAN_ERR_CRTL; - ecr = m_can_read(priv, M_CAN_ECR); - if (ecr & ECR_RP) - cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE; - if (bec.txerr > 127) - cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE; - cf->data[6] = bec.txerr; - cf->data[7] = bec.rxerr; - break; - case CAN_STATE_BUS_OFF: - /* bus-off state */ - cf->can_id |= CAN_ERR_BUSOFF; - break; - default: - break; - } - - stats->rx_packets++; - stats->rx_bytes += cf->can_dlc; - netif_receive_skb(skb); - - return 1; -} - -static int m_can_handle_state_errors(struct net_device *dev, u32 psr) -{ - struct m_can_priv *priv = netdev_priv(dev); - int work_done = 0; - - if ((psr & PSR_EW) && - (priv->can.state != CAN_STATE_ERROR_WARNING)) { - netdev_dbg(dev, "entered error warning state\n"); - work_done += m_can_handle_state_change(dev, - CAN_STATE_ERROR_WARNING); - } - - if ((psr & PSR_EP) && - (priv->can.state != CAN_STATE_ERROR_PASSIVE)) { - netdev_dbg(dev, "entered error passive state\n"); - work_done += m_can_handle_state_change(dev, - CAN_STATE_ERROR_PASSIVE); - } - - if ((psr & PSR_BO) && - (priv->can.state != CAN_STATE_BUS_OFF)) { - netdev_dbg(dev, "entered error bus off state\n"); - work_done += m_can_handle_state_change(dev, - CAN_STATE_BUS_OFF); - } - - return work_done; -} - -static void m_can_handle_other_err(struct net_device *dev, u32 irqstatus) -{ - if (irqstatus & IR_WDI) - netdev_err(dev, "Message RAM Watchdog event due to missing READY\n"); - if (irqstatus & IR_ELO) - netdev_err(dev, "Error Logging Overflow\n"); - if (irqstatus & IR_BEU) - netdev_err(dev, "Bit Error Uncorrected\n"); - if (irqstatus & IR_BEC) - netdev_err(dev, "Bit Error Corrected\n"); - if (irqstatus & IR_TOO) - netdev_err(dev, "Timeout reached\n"); - if (irqstatus & IR_MRAF) - netdev_err(dev, "Message RAM access failure occurred\n"); -} - -static inline bool is_lec_err(u32 psr) -{ - psr &= LEC_UNUSED; - - return psr && (psr != LEC_UNUSED); -} - -static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus, - u32 psr) -{ - struct m_can_priv *priv = netdev_priv(dev); - int work_done = 0; - - if (irqstatus & IR_RF0L) - work_done += m_can_handle_lost_msg(dev); - - /* handle lec errors on the bus */ - if ((priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) && - is_lec_err(psr)) - work_done += m_can_handle_lec_err(dev, psr & LEC_UNUSED); - - /* other unproccessed error interrupts */ - m_can_handle_other_err(dev, irqstatus); - - return work_done; -} - -static int m_can_poll(struct napi_struct *napi, int quota) -{ - struct net_device *dev = napi->dev; - struct m_can_priv *priv = netdev_priv(dev); - int work_done = 0; - u32 irqstatus, psr; - - irqstatus = priv->irqstatus | m_can_read(priv, M_CAN_IR); - if (!irqstatus) - goto end; - - psr = m_can_read(priv, M_CAN_PSR); - if (irqstatus & IR_ERR_STATE) - work_done += m_can_handle_state_errors(dev, psr); - - if (irqstatus & IR_ERR_BUS_30X) - work_done += m_can_handle_bus_errors(dev, irqstatus, psr); - - if (irqstatus & IR_RF0N) - work_done += m_can_do_rx_poll(dev, (quota - work_done)); - - if (work_done < quota) { - napi_complete_done(napi, work_done); - m_can_enable_all_interrupts(priv); - } - -end: - return work_done; -} - -static void m_can_echo_tx_event(struct net_device *dev) -{ - u32 txe_count = 0; - u32 m_can_txefs; - u32 fgi = 0; - int i = 0; - unsigned int msg_mark; - - struct m_can_priv *priv = netdev_priv(dev); - struct net_device_stats *stats = &dev->stats; - - /* read tx event fifo status */ - m_can_txefs = m_can_read(priv, M_CAN_TXEFS); - - /* Get Tx Event fifo element count */ - txe_count = (m_can_txefs & TXEFS_EFFL_MASK) - >> TXEFS_EFFL_SHIFT; - - /* Get and process all sent elements */ - for (i = 0; i < txe_count; i++) { - /* retrieve get index */ - fgi = (m_can_read(priv, M_CAN_TXEFS) & TXEFS_EFGI_MASK) - >> TXEFS_EFGI_SHIFT; - - /* get message marker */ - msg_mark = (m_can_txe_fifo_read(priv, fgi, 4) & - TX_EVENT_MM_MASK) >> TX_EVENT_MM_SHIFT; - - /* ack txe element */ - m_can_write(priv, M_CAN_TXEFA, (TXEFA_EFAI_MASK & - (fgi << TXEFA_EFAI_SHIFT))); - - /* update stats */ - stats->tx_bytes += can_get_echo_skb(dev, msg_mark); - stats->tx_packets++; - } -} - -static irqreturn_t m_can_isr(int irq, void *dev_id) -{ - struct net_device *dev = (struct net_device *)dev_id; - struct m_can_priv *priv = netdev_priv(dev); - struct net_device_stats *stats = &dev->stats; - u32 ir; - - ir = m_can_read(priv, M_CAN_IR); - if (!ir) - return IRQ_NONE; - - /* ACK all irqs */ - if (ir & IR_ALL_INT) - m_can_write(priv, M_CAN_IR, ir); - - /* schedule NAPI in case of - * - rx IRQ - * - state change IRQ - * - bus error IRQ and bus error reporting - */ - if ((ir & IR_RF0N) || (ir & IR_ERR_ALL_30X)) { - priv->irqstatus = ir; - m_can_disable_all_interrupts(priv); - napi_schedule(&priv->napi); - } - - if (priv->version == 30) { - if (ir & IR_TC) { - /* Transmission Complete Interrupt*/ - stats->tx_bytes += can_get_echo_skb(dev, 0); - stats->tx_packets++; - can_led_event(dev, CAN_LED_EVENT_TX); - netif_wake_queue(dev); - } - } else { - if (ir & IR_TEFN) { - /* New TX FIFO Element arrived */ - m_can_echo_tx_event(dev); - can_led_event(dev, CAN_LED_EVENT_TX); - if (netif_queue_stopped(dev) && - !m_can_tx_fifo_full(priv)) - netif_wake_queue(dev); - } - } - - return IRQ_HANDLED; -} - -static const struct can_bittiming_const m_can_bittiming_const_30X = { - .name = KBUILD_MODNAME, - .tseg1_min = 2, /* Time segment 1 = prop_seg + phase_seg1 */ - .tseg1_max = 64, - .tseg2_min = 1, /* Time segment 2 = phase_seg2 */ - .tseg2_max = 16, - .sjw_max = 16, - .brp_min = 1, - .brp_max = 1024, - .brp_inc = 1, -}; - -static const struct can_bittiming_const m_can_data_bittiming_const_30X = { - .name = KBUILD_MODNAME, - .tseg1_min = 2, /* Time segment 1 = prop_seg + phase_seg1 */ - .tseg1_max = 16, - .tseg2_min = 1, /* Time segment 2 = phase_seg2 */ - .tseg2_max = 8, - .sjw_max = 4, - .brp_min = 1, - .brp_max = 32, - .brp_inc = 1, -}; - -static const struct can_bittiming_const m_can_bittiming_const_31X = { - .name = KBUILD_MODNAME, - .tseg1_min = 2, /* Time segment 1 = prop_seg + phase_seg1 */ - .tseg1_max = 256, - .tseg2_min = 1, /* Time segment 2 = phase_seg2 */ - .tseg2_max = 128, - .sjw_max = 128, - .brp_min = 1, - .brp_max = 512, - .brp_inc = 1, -}; - -static const struct can_bittiming_const m_can_data_bittiming_const_31X = { - .name = KBUILD_MODNAME, - .tseg1_min = 1, /* Time segment 1 = prop_seg + phase_seg1 */ - .tseg1_max = 32, - .tseg2_min = 1, /* Time segment 2 = phase_seg2 */ - .tseg2_max = 16, - .sjw_max = 16, - .brp_min = 1, - .brp_max = 32, - .brp_inc = 1, -}; - -static int m_can_set_bittiming(struct net_device *dev) -{ - struct m_can_priv *priv = netdev_priv(dev); - const struct can_bittiming *bt = &priv->can.bittiming; - const struct can_bittiming *dbt = &priv->can.data_bittiming; - u16 brp, sjw, tseg1, tseg2; - u32 reg_btp; - - brp = bt->brp - 1; - sjw = bt->sjw - 1; - tseg1 = bt->prop_seg + bt->phase_seg1 - 1; - tseg2 = bt->phase_seg2 - 1; - reg_btp = (brp << NBTP_NBRP_SHIFT) | (sjw << NBTP_NSJW_SHIFT) | - (tseg1 << NBTP_NTSEG1_SHIFT) | (tseg2 << NBTP_NTSEG2_SHIFT); - m_can_write(priv, M_CAN_NBTP, reg_btp); - - if (priv->can.ctrlmode & CAN_CTRLMODE_FD) { - reg_btp = 0; - brp = dbt->brp - 1; - sjw = dbt->sjw - 1; - tseg1 = dbt->prop_seg + dbt->phase_seg1 - 1; - tseg2 = dbt->phase_seg2 - 1; - - /* TDC is only needed for bitrates beyond 2.5 MBit/s. - * This is mentioned in the "Bit Time Requirements for CAN FD" - * paper presented at the International CAN Conference 2013 - */ - if (dbt->bitrate > 2500000) { - u32 tdco, ssp; - - /* Use the same value of secondary sampling point - * as the data sampling point - */ - ssp = dbt->sample_point; - - /* Equation based on Bosch's M_CAN User Manual's - * Transmitter Delay Compensation Section - */ - tdco = (priv->can.clock.freq / 1000) * - ssp / dbt->bitrate; - - /* Max valid TDCO value is 127 */ - if (tdco > 127) { - netdev_warn(dev, "TDCO value of %u is beyond maximum. Using maximum possible value\n", - tdco); - tdco = 127; - } - - reg_btp |= DBTP_TDC; - m_can_write(priv, M_CAN_TDCR, - tdco << TDCR_TDCO_SHIFT); - } - - reg_btp |= (brp << DBTP_DBRP_SHIFT) | - (sjw << DBTP_DSJW_SHIFT) | - (tseg1 << DBTP_DTSEG1_SHIFT) | - (tseg2 << DBTP_DTSEG2_SHIFT); - - m_can_write(priv, M_CAN_DBTP, reg_btp); - } - - return 0; -} - -/* Configure M_CAN chip: - * - set rx buffer/fifo element size - * - configure rx fifo - * - accept non-matching frame into fifo 0 - * - configure tx buffer - * - >= v3.1.x: TX FIFO is used - * - configure mode - * - setup bittiming - */ -static void m_can_chip_config(struct net_device *dev) -{ - struct m_can_priv *priv = netdev_priv(dev); - u32 cccr, test; - - m_can_config_endisable(priv, true); - - /* RX Buffer/FIFO Element Size 64 bytes data field */ - m_can_write(priv, M_CAN_RXESC, M_CAN_RXESC_64BYTES); - - /* Accept Non-matching Frames Into FIFO 0 */ - m_can_write(priv, M_CAN_GFC, 0x0); - - if (priv->version == 30) { - /* only support one Tx Buffer currently */ - m_can_write(priv, M_CAN_TXBC, (1 << TXBC_NDTB_SHIFT) | - priv->mcfg[MRAM_TXB].off); - } else { - /* TX FIFO is used for newer IP Core versions */ - m_can_write(priv, M_CAN_TXBC, - (priv->mcfg[MRAM_TXB].num << TXBC_TFQS_SHIFT) | - (priv->mcfg[MRAM_TXB].off)); - } - - /* support 64 bytes payload */ - m_can_write(priv, M_CAN_TXESC, TXESC_TBDS_64BYTES); - - /* TX Event FIFO */ - if (priv->version == 30) { - m_can_write(priv, M_CAN_TXEFC, (1 << TXEFC_EFS_SHIFT) | - priv->mcfg[MRAM_TXE].off); - } else { - /* Full TX Event FIFO is used */ - m_can_write(priv, M_CAN_TXEFC, - ((priv->mcfg[MRAM_TXE].num << TXEFC_EFS_SHIFT) - & TXEFC_EFS_MASK) | - priv->mcfg[MRAM_TXE].off); - } - - /* rx fifo configuration, blocking mode, fifo size 1 */ - m_can_write(priv, M_CAN_RXF0C, - (priv->mcfg[MRAM_RXF0].num << RXFC_FS_SHIFT) | - priv->mcfg[MRAM_RXF0].off); - - m_can_write(priv, M_CAN_RXF1C, - (priv->mcfg[MRAM_RXF1].num << RXFC_FS_SHIFT) | - priv->mcfg[MRAM_RXF1].off); - - cccr = m_can_read(priv, M_CAN_CCCR); - test = m_can_read(priv, M_CAN_TEST); - test &= ~TEST_LBCK; - if (priv->version == 30) { - /* Version 3.0.x */ - - cccr &= ~(CCCR_TEST | CCCR_MON | - (CCCR_CMR_MASK << CCCR_CMR_SHIFT) | - (CCCR_CME_MASK << CCCR_CME_SHIFT)); - - if (priv->can.ctrlmode & CAN_CTRLMODE_FD) - cccr |= CCCR_CME_CANFD_BRS << CCCR_CME_SHIFT; - - } else { - /* Version 3.1.x or 3.2.x */ - cccr &= ~(CCCR_TEST | CCCR_MON | CCCR_BRSE | CCCR_FDOE | - CCCR_NISO); - - /* Only 3.2.x has NISO Bit implemented */ - if (priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO) - cccr |= CCCR_NISO; - - if (priv->can.ctrlmode & CAN_CTRLMODE_FD) - cccr |= (CCCR_BRSE | CCCR_FDOE); - } - - /* Loopback Mode */ - if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK) { - cccr |= CCCR_TEST | CCCR_MON; - test |= TEST_LBCK; - } - - /* Enable Monitoring (all versions) */ - if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) - cccr |= CCCR_MON; - - /* Write config */ - m_can_write(priv, M_CAN_CCCR, cccr); - m_can_write(priv, M_CAN_TEST, test); - - /* Enable interrupts */ - m_can_write(priv, M_CAN_IR, IR_ALL_INT); - if (!(priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)) - if (priv->version == 30) - m_can_write(priv, M_CAN_IE, IR_ALL_INT & - ~(IR_ERR_LEC_30X)); - else - m_can_write(priv, M_CAN_IE, IR_ALL_INT & - ~(IR_ERR_LEC_31X)); - else - m_can_write(priv, M_CAN_IE, IR_ALL_INT); - - /* route all interrupts to INT0 */ - m_can_write(priv, M_CAN_ILS, ILS_ALL_INT0); - - /* set bittiming params */ - m_can_set_bittiming(dev); - - m_can_config_endisable(priv, false); -} - -static void m_can_start(struct net_device *dev) -{ - struct m_can_priv *priv = netdev_priv(dev); - - /* basic m_can configuration */ - m_can_chip_config(dev); - - priv->can.state = CAN_STATE_ERROR_ACTIVE; - - m_can_enable_all_interrupts(priv); -} - -static int m_can_set_mode(struct net_device *dev, enum can_mode mode) -{ - switch (mode) { - case CAN_MODE_START: - m_can_start(dev); - netif_wake_queue(dev); - break; - default: - return -EOPNOTSUPP; - } - - return 0; -} - -/* Checks core release number of M_CAN - * returns 0 if an unsupported device is detected - * else it returns the release and step coded as: - * return value = 10 * <release> + 1 * <step> - */ -static int m_can_check_core_release(void __iomem *m_can_base) -{ - u32 crel_reg; - u8 rel; - u8 step; - int res; - struct m_can_priv temp_priv = { - .base = m_can_base - }; - - /* Read Core Release Version and split into version number - * Example: Version 3.2.1 => rel = 3; step = 2; substep = 1; - */ - crel_reg = m_can_read(&temp_priv, M_CAN_CREL); - rel = (u8)((crel_reg & CREL_REL_MASK) >> CREL_REL_SHIFT); - step = (u8)((crel_reg & CREL_STEP_MASK) >> CREL_STEP_SHIFT); - - if (rel == 3) { - /* M_CAN v3.x.y: create return value */ - res = 30 + step; - } else { - /* Unsupported M_CAN version */ - res = 0; - } - - return res; -} - -/* Selectable Non ISO support only in version 3.2.x - * This function checks if the bit is writable. - */ -static bool m_can_niso_supported(const struct m_can_priv *priv) -{ - u32 cccr_reg, cccr_poll; - int niso_timeout; - - m_can_config_endisable(priv, true); - cccr_reg = m_can_read(priv, M_CAN_CCCR); - cccr_reg |= CCCR_NISO; - m_can_write(priv, M_CAN_CCCR, cccr_reg); - - niso_timeout = readl_poll_timeout((priv->base + M_CAN_CCCR), cccr_poll, - (cccr_poll == cccr_reg), 0, 10); - - /* Clear NISO */ - cccr_reg &= ~(CCCR_NISO); - m_can_write(priv, M_CAN_CCCR, cccr_reg); - - m_can_config_endisable(priv, false); - - /* return false if time out (-ETIMEDOUT), else return true */ - return !niso_timeout; -} - -static int m_can_dev_setup(struct platform_device *pdev, struct net_device *dev, - void __iomem *addr) -{ - struct m_can_priv *priv; - int m_can_version; - - m_can_version = m_can_check_core_release(addr); - /* return if unsupported version */ - if (!m_can_version) { - dev_err(&pdev->dev, "Unsupported version number: %2d", - m_can_version); - return -EINVAL; - } - - priv = netdev_priv(dev); - netif_napi_add(dev, &priv->napi, m_can_poll, M_CAN_NAPI_WEIGHT); - - /* Shared properties of all M_CAN versions */ - priv->version = m_can_version; - priv->dev = dev; - priv->base = addr; - priv->can.do_set_mode = m_can_set_mode; - priv->can.do_get_berr_counter = m_can_get_berr_counter; - - /* Set M_CAN supported operations */ - priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK | - CAN_CTRLMODE_LISTENONLY | - CAN_CTRLMODE_BERR_REPORTING | - CAN_CTRLMODE_FD; - - /* Set properties depending on M_CAN version */ - switch (priv->version) { - case 30: - /* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.0.x */ - can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO); - priv->can.bittiming_const = &m_can_bittiming_const_30X; - priv->can.data_bittiming_const = - &m_can_data_bittiming_const_30X; - break; - case 31: - /* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.1.x */ - can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO); - priv->can.bittiming_const = &m_can_bittiming_const_31X; - priv->can.data_bittiming_const = - &m_can_data_bittiming_const_31X; - break; - case 32: - priv->can.bittiming_const = &m_can_bittiming_const_31X; - priv->can.data_bittiming_const = - &m_can_data_bittiming_const_31X; - priv->can.ctrlmode_supported |= (m_can_niso_supported(priv) - ? CAN_CTRLMODE_FD_NON_ISO - : 0); - break; - default: - dev_err(&pdev->dev, "Unsupported version number: %2d", - priv->version); - return -EINVAL; - } - - return 0; -} - -static int m_can_open(struct net_device *dev) -{ - struct m_can_priv *priv = netdev_priv(dev); - int err; - - err = m_can_clk_start(priv); - if (err) - return err; - - /* open the can device */ - err = open_candev(dev); - if (err) { - netdev_err(dev, "failed to open can device\n"); - goto exit_disable_clks; - } - - /* register interrupt handler */ - err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name, - dev); - if (err < 0) { - netdev_err(dev, "failed to request interrupt\n"); - goto exit_irq_fail; - } - - /* start the m_can controller */ - m_can_start(dev); - - can_led_event(dev, CAN_LED_EVENT_OPEN); - napi_enable(&priv->napi); - netif_start_queue(dev); - - return 0; - -exit_irq_fail: - close_candev(dev); -exit_disable_clks: - m_can_clk_stop(priv); - return err; -} - -static void m_can_stop(struct net_device *dev) -{ - struct m_can_priv *priv = netdev_priv(dev); - - /* disable all interrupts */ - m_can_disable_all_interrupts(priv); - - /* set the state as STOPPED */ - priv->can.state = CAN_STATE_STOPPED; -} - -static int m_can_close(struct net_device *dev) -{ - struct m_can_priv *priv = netdev_priv(dev); - - netif_stop_queue(dev); - napi_disable(&priv->napi); - m_can_stop(dev); - m_can_clk_stop(priv); - free_irq(dev->irq, dev); - close_candev(dev); - can_led_event(dev, CAN_LED_EVENT_STOP); - - return 0; -} - -static int m_can_next_echo_skb_occupied(struct net_device *dev, int putidx) -{ - struct m_can_priv *priv = netdev_priv(dev); - /*get wrap around for loopback skb index */ - unsigned int wrap = priv->can.echo_skb_max; - int next_idx; - - /* calculate next index */ - next_idx = (++putidx >= wrap ? 0 : putidx); - - /* check if occupied */ - return !!priv->can.echo_skb[next_idx]; -} - -static netdev_tx_t m_can_start_xmit(struct sk_buff *skb, - struct net_device *dev) -{ - struct m_can_priv *priv = netdev_priv(dev); - struct canfd_frame *cf = (struct canfd_frame *)skb->data; - u32 id, cccr, fdflags; - int i; - int putidx; - - if (can_dropped_invalid_skb(dev, skb)) - return NETDEV_TX_OK; - - /* Generate ID field for TX buffer Element */ - /* Common to all supported M_CAN versions */ - if (cf->can_id & CAN_EFF_FLAG) { - id = cf->can_id & CAN_EFF_MASK; - id |= TX_BUF_XTD; - } else { - id = ((cf->can_id & CAN_SFF_MASK) << 18); - } - - if (cf->can_id & CAN_RTR_FLAG) - id |= TX_BUF_RTR; - - if (priv->version == 30) { - netif_stop_queue(dev); - - /* message ram configuration */ - m_can_fifo_write(priv, 0, M_CAN_FIFO_ID, id); - m_can_fifo_write(priv, 0, M_CAN_FIFO_DLC, - can_len2dlc(cf->len) << 16); - - for (i = 0; i < cf->len; i += 4) - m_can_fifo_write(priv, 0, - M_CAN_FIFO_DATA(i / 4), - *(u32 *)(cf->data + i)); - - can_put_echo_skb(skb, dev, 0); - - if (priv->can.ctrlmode & CAN_CTRLMODE_FD) { - cccr = m_can_read(priv, M_CAN_CCCR); - cccr &= ~(CCCR_CMR_MASK << CCCR_CMR_SHIFT); - if (can_is_canfd_skb(skb)) { - if (cf->flags & CANFD_BRS) - cccr |= CCCR_CMR_CANFD_BRS << - CCCR_CMR_SHIFT; - else - cccr |= CCCR_CMR_CANFD << - CCCR_CMR_SHIFT; - } else { - cccr |= CCCR_CMR_CAN << CCCR_CMR_SHIFT; - } - m_can_write(priv, M_CAN_CCCR, cccr); - } - m_can_write(priv, M_CAN_TXBTIE, 0x1); - m_can_write(priv, M_CAN_TXBAR, 0x1); - /* End of xmit function for version 3.0.x */ - } else { - /* Transmit routine for version >= v3.1.x */ - - /* Check if FIFO full */ - if (m_can_tx_fifo_full(priv)) { - /* This shouldn't happen */ - netif_stop_queue(dev); - netdev_warn(dev, - "TX queue active although FIFO is full."); - return NETDEV_TX_BUSY; - } - - /* get put index for frame */ - putidx = ((m_can_read(priv, M_CAN_TXFQS) & TXFQS_TFQPI_MASK) - >> TXFQS_TFQPI_SHIFT); - /* Write ID Field to FIFO Element */ - m_can_fifo_write(priv, putidx, M_CAN_FIFO_ID, id); - - /* get CAN FD configuration of frame */ - fdflags = 0; - if (can_is_canfd_skb(skb)) { - fdflags |= TX_BUF_FDF; - if (cf->flags & CANFD_BRS) - fdflags |= TX_BUF_BRS; - } - - /* Construct DLC Field. Also contains CAN-FD configuration - * use put index of fifo as message marker - * it is used in TX interrupt for - * sending the correct echo frame - */ - m_can_fifo_write(priv, putidx, M_CAN_FIFO_DLC, - ((putidx << TX_BUF_MM_SHIFT) & - TX_BUF_MM_MASK) | - (can_len2dlc(cf->len) << 16) | - fdflags | TX_BUF_EFC); - - for (i = 0; i < cf->len; i += 4) - m_can_fifo_write(priv, putidx, M_CAN_FIFO_DATA(i / 4), - *(u32 *)(cf->data + i)); - - /* Push loopback echo. - * Will be looped back on TX interrupt based on message marker - */ - can_put_echo_skb(skb, dev, putidx); - - /* Enable TX FIFO element to start transfer */ - m_can_write(priv, M_CAN_TXBAR, (1 << putidx)); - - /* stop network queue if fifo full */ - if (m_can_tx_fifo_full(priv) || - m_can_next_echo_skb_occupied(dev, putidx)) - netif_stop_queue(dev); - } - - return NETDEV_TX_OK; -} - -static const struct net_device_ops m_can_netdev_ops = { - .ndo_open = m_can_open, - .ndo_stop = m_can_close, - .ndo_start_xmit = m_can_start_xmit, - .ndo_change_mtu = can_change_mtu, -}; - -static int register_m_can_dev(struct net_device *dev) -{ - dev->flags |= IFF_ECHO; /* we support local echo */ - dev->netdev_ops = &m_can_netdev_ops; - - return register_candev(dev); -} - -static void m_can_init_ram(struct m_can_priv *priv) -{ - int end, i, start; - - /* initialize the entire Message RAM in use to avoid possible - * ECC/parity checksum errors when reading an uninitialized buffer - */ - start = priv->mcfg[MRAM_SIDF].off; - end = priv->mcfg[MRAM_TXB].off + - priv->mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE; - for (i = start; i < end; i += 4) - writel(0x0, priv->mram_base + i); -} - -static void m_can_of_parse_mram(struct m_can_priv *priv, - const u32 *mram_config_vals) -{ - priv->mcfg[MRAM_SIDF].off = mram_config_vals[0]; - priv->mcfg[MRAM_SIDF].num = mram_config_vals[1]; - priv->mcfg[MRAM_XIDF].off = priv->mcfg[MRAM_SIDF].off + - priv->mcfg[MRAM_SIDF].num * SIDF_ELEMENT_SIZE; - priv->mcfg[MRAM_XIDF].num = mram_config_vals[2]; - priv->mcfg[MRAM_RXF0].off = priv->mcfg[MRAM_XIDF].off + - priv->mcfg[MRAM_XIDF].num * XIDF_ELEMENT_SIZE; - priv->mcfg[MRAM_RXF0].num = mram_config_vals[3] & - (RXFC_FS_MASK >> RXFC_FS_SHIFT); - priv->mcfg[MRAM_RXF1].off = priv->mcfg[MRAM_RXF0].off + - priv->mcfg[MRAM_RXF0].num * RXF0_ELEMENT_SIZE; - priv->mcfg[MRAM_RXF1].num = mram_config_vals[4] & - (RXFC_FS_MASK >> RXFC_FS_SHIFT); - priv->mcfg[MRAM_RXB].off = priv->mcfg[MRAM_RXF1].off + - priv->mcfg[MRAM_RXF1].num * RXF1_ELEMENT_SIZE; - priv->mcfg[MRAM_RXB].num = mram_config_vals[5]; - priv->mcfg[MRAM_TXE].off = priv->mcfg[MRAM_RXB].off + - priv->mcfg[MRAM_RXB].num * RXB_ELEMENT_SIZE; - priv->mcfg[MRAM_TXE].num = mram_config_vals[6]; - priv->mcfg[MRAM_TXB].off = priv->mcfg[MRAM_TXE].off + - priv->mcfg[MRAM_TXE].num * TXE_ELEMENT_SIZE; - priv->mcfg[MRAM_TXB].num = mram_config_vals[7] & - (TXBC_NDTB_MASK >> TXBC_NDTB_SHIFT); - - dev_dbg(priv->device, - "mram_base %p sidf 0x%x %d xidf 0x%x %d rxf0 0x%x %d rxf1 0x%x %d rxb 0x%x %d txe 0x%x %d txb 0x%x %d\n", - priv->mram_base, - priv->mcfg[MRAM_SIDF].off, priv->mcfg[MRAM_SIDF].num, - priv->mcfg[MRAM_XIDF].off, priv->mcfg[MRAM_XIDF].num, - priv->mcfg[MRAM_RXF0].off, priv->mcfg[MRAM_RXF0].num, - priv->mcfg[MRAM_RXF1].off, priv->mcfg[MRAM_RXF1].num, - priv->mcfg[MRAM_RXB].off, priv->mcfg[MRAM_RXB].num, - priv->mcfg[MRAM_TXE].off, priv->mcfg[MRAM_TXE].num, - priv->mcfg[MRAM_TXB].off, priv->mcfg[MRAM_TXB].num); - - m_can_init_ram(priv); -} +#include "m_can_core.h" static int m_can_plat_probe(struct platform_device *pdev) { + struct m_can_classdev *mcan_class; struct net_device *dev; struct m_can_priv *priv; struct resource *res; void __iomem *addr; void __iomem *mram_addr; - struct clk *hclk, *cclk; - int irq, ret; - struct device_node *np; - u32 mram_config_vals[MRAM_CFG_LEN]; - u32 tx_fifo_size; - - np = pdev->dev.of_node; + int irq, ret = 0; - hclk = devm_clk_get(&pdev->dev, "hclk"); - cclk = devm_clk_get(&pdev->dev, "cclk"); - - if (IS_ERR(hclk) || IS_ERR(cclk)) { - dev_err(&pdev->dev, "no clock found\n"); - ret = -ENODEV; - goto failed_ret; - } + mcan_class = m_can_core_allocate_dev(&pdev->dev); + m_can_core_get_clocks(mcan_class); 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; @@ -1616,122 +60,35 @@ static int m_can_plat_probe(struct platform_device *pdev) goto failed_ret; } - /* get message ram configuration */ - ret = of_property_read_u32_array(np, "bosch,mram-cfg", - mram_config_vals, - sizeof(mram_config_vals) / 4); - if (ret) { - dev_err(&pdev->dev, "Could not get Message RAM configuration."); - goto failed_ret; - } - - /* Get TX FIFO size - * Defines the total amount of echo buffers for loopback - */ - tx_fifo_size = mram_config_vals[7]; - - /* allocate the m_can device */ - dev = alloc_candev(sizeof(*priv), tx_fifo_size); - if (!dev) { - ret = -ENOMEM; - goto failed_ret; - } - - priv = netdev_priv(dev); - dev->irq = irq; - priv->device = &pdev->dev; - priv->hclk = hclk; - priv->cclk = cclk; - priv->can.clock.freq = clk_get_rate(cclk); - priv->mram_base = mram_addr; - - platform_set_drvdata(pdev, dev); - SET_NETDEV_DEV(dev, &pdev->dev); - - /* Enable clocks. Necessary to read Core Release in order to determine - * M_CAN version - */ - pm_runtime_enable(&pdev->dev); - ret = m_can_clk_start(priv); - if (ret) - goto pm_runtime_fail; - - ret = m_can_dev_setup(pdev, dev, addr); - if (ret) - goto clk_disable; - - ret = register_m_can_dev(dev); - if (ret) { - dev_err(&pdev->dev, "registering %s failed (err=%d)\n", - KBUILD_MODNAME, ret); - goto clk_disable; - } + mcan_class->net->irq = irq; + mcan_class->pm_clock_support = 1; + mcan_class->mram_base = mram_addr; + mcan_class->can.clock.freq = clk_get_rate(mcan_class->cclk); + mcan_class->dev = &pdev->dev; - m_can_of_parse_mram(priv, mram_config_vals); + platform_set_drvdata(pdev, mcan_class->dev); - devm_can_led_init(dev); + m_can_init_ram(mcan_class); - of_can_transceiver(dev); + m_can_core_register(mcan_class); - dev_info(&pdev->dev, "%s device registered (irq=%d, version=%d)\n", - KBUILD_MODNAME, dev->irq, priv->version); - - /* Probe finished - * Stop clocks. They will be reactivated once the M_CAN device is opened - */ -clk_disable: - m_can_clk_stop(priv); -pm_runtime_fail: +failed_ret: +/* m_can_clk_stop(mcan_class);*/ if (ret) { pm_runtime_disable(&pdev->dev); - free_candev(dev); + free_candev(mcan_class->net); } -failed_ret: return ret; } static __maybe_unused int m_can_suspend(struct device *dev) { - struct net_device *ndev = dev_get_drvdata(dev); - struct m_can_priv *priv = netdev_priv(ndev); - - if (netif_running(ndev)) { - netif_stop_queue(ndev); - netif_device_detach(ndev); - m_can_stop(ndev); - m_can_clk_stop(priv); - } - - pinctrl_pm_select_sleep_state(dev); - - priv->can.state = CAN_STATE_SLEEPING; - - return 0; + return m_can_core_suspend(dev); } static __maybe_unused int m_can_resume(struct device *dev) { - struct net_device *ndev = dev_get_drvdata(dev); - struct m_can_priv *priv = netdev_priv(ndev); - - pinctrl_pm_select_default_state(dev); - - priv->can.state = CAN_STATE_ERROR_ACTIVE; - - if (netif_running(ndev)) { - int ret; - - ret = m_can_clk_start(priv); - if (ret) - return ret; - - m_can_init_ram(priv); - m_can_start(ndev); - netif_device_attach(ndev); - netif_start_queue(ndev); - } - - return 0; + return m_can_core_resume(dev); } static void unregister_m_can_dev(struct net_device *dev) @@ -1757,7 +114,7 @@ static int m_can_plat_remove(struct platform_device *pdev) static int __maybe_unused m_can_runtime_suspend(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); - struct m_can_priv *priv = netdev_priv(ndev); + struct m_can_classdev *priv = netdev_priv(ndev); clk_disable_unprepare(priv->cclk); clk_disable_unprepare(priv->hclk); @@ -1768,7 +125,7 @@ static int __maybe_unused m_can_runtime_suspend(struct device *dev) static int __maybe_unused m_can_runtime_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); - struct m_can_priv *priv = netdev_priv(ndev); + struct m_can_classdev *priv = netdev_priv(ndev); int err; err = clk_prepare_enable(priv->hclk); diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can_core.c similarity index 83% copy from drivers/net/can/m_can/m_can.c copy to drivers/net/can/m_can/m_can_core.c index 9b449400376b..5af5d259180e 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can_core.c @@ -28,6 +28,8 @@ #include <linux/can/dev.h> #include <linux/pinctrl/consumer.h> +#include "m_can_core.h" + /* napi related */ #define M_CAN_NAPI_WEIGHT 64 @@ -86,28 +88,6 @@ enum m_can_reg { M_CAN_TXEFA = 0xf8, }; -/* m_can lec values */ -enum m_can_lec_type { - LEC_NO_ERROR = 0, - LEC_STUFF_ERROR, - LEC_FORM_ERROR, - LEC_ACK_ERROR, - LEC_BIT1_ERROR, - LEC_BIT0_ERROR, - LEC_CRC_ERROR, - LEC_UNUSED, -}; - -enum m_can_mram_cfg { - MRAM_SIDF = 0, - MRAM_XIDF, - MRAM_RXF0, - MRAM_RXF1, - MRAM_RXB, - MRAM_TXE, - MRAM_TXB, - MRAM_CFG_NUM, -}; /* Core Release Register (CREL) */ #define CREL_REL_SHIFT 28 @@ -347,68 +327,100 @@ enum m_can_mram_cfg { #define TX_EVENT_MM_SHIFT TX_BUF_MM_SHIFT #define TX_EVENT_MM_MASK (0xff << TX_EVENT_MM_SHIFT) -/* address offset and element number for each FIFO/Buffer in the Message RAM */ -struct mram_cfg { - u16 off; - u8 num; -}; +static inline u32 m_can_read(const struct m_can_classdev *priv, enum m_can_reg reg) +{ + u32 ret; -/* m_can private data structure */ -struct m_can_priv { - struct can_priv can; /* must be the first member */ - struct napi_struct napi; - struct net_device *dev; - struct device *device; - struct clk *hclk; - struct clk *cclk; - void __iomem *base; - u32 irqstatus; - int version; - - /* message ram configuration */ - void __iomem *mram_base; - struct mram_cfg mcfg[MRAM_CFG_NUM]; -}; + if (priv->m_can_write) + ret = priv->m_can_read(priv, priv->reg_offset + reg); + else + ret = readl(priv->base + reg); -static inline u32 m_can_read(const struct m_can_priv *priv, enum m_can_reg reg) -{ - return readl(priv->base + reg); + return ret; } -static inline void m_can_write(const struct m_can_priv *priv, +static inline int m_can_write(const struct m_can_classdev *priv, enum m_can_reg reg, u32 val) { - writel(val, priv->base + reg); + int ret = 0; + + if (priv->m_can_write) + ret = priv->m_can_write(priv, priv->reg_offset + reg, val); + else + writel(val, priv->base + reg); + + return ret; } -static inline u32 m_can_fifo_read(const struct m_can_priv *priv, +static inline u32 m_can_fifo_read(const struct m_can_classdev *priv, u32 fgi, unsigned int offset) { - return readl(priv->mram_base + priv->mcfg[MRAM_RXF0].off + - fgi * RXF0_ELEMENT_SIZE + offset); + u32 addr_offset = priv->mcfg[MRAM_RXF0].off + fgi * RXF0_ELEMENT_SIZE + offset; + u32 read_fifo_addr; /* need to take into account iomem cases */ + u32 ret = 0; + + if (priv->mram_start) + read_fifo_addr = priv->mram_start + addr_offset; + else + read_fifo_addr = priv->mram_base + addr_offset; + + if (priv->m_can_fifo_read) + ret = priv->m_can_read(priv, read_fifo_addr); + else + ret = readl(read_fifo_addr); + + return ret; } -static inline void m_can_fifo_write(const struct m_can_priv *priv, +static inline void m_can_fifo_write(const struct m_can_classdev *priv, u32 fpi, unsigned int offset, u32 val) { - writel(val, priv->mram_base + priv->mcfg[MRAM_TXB].off + - fpi * TXB_ELEMENT_SIZE + offset); + u32 addr_offset = priv->mcfg[MRAM_TXB].off + fpi * TXB_ELEMENT_SIZE + offset; + u32 write_fifo_addr; + u32 ret; + + if (priv->mram_start) + write_fifo_addr = priv->mram_start + addr_offset; + else + write_fifo_addr = priv->mram_base + addr_offset; + + if (priv->m_can_write) + ret = priv->m_can_write(priv, write_fifo_addr, val); + else + writel(val, write_fifo_addr); + + return ret; } -static inline u32 m_can_txe_fifo_read(const struct m_can_priv *priv, +static inline u32 m_can_txe_fifo_read(const struct m_can_classdev *priv, u32 fgi, - u32 offset) { - return readl(priv->mram_base + priv->mcfg[MRAM_TXE].off + - fgi * TXE_ELEMENT_SIZE + offset); + u32 offset) +{ + u32 addr_offset = priv->mcfg[MRAM_TXE].off + fgi * TXE_ELEMENT_SIZE + offset; + u32 read_fifo_addr; + u32 ret = 0; + +printk("%s: Here\n", __func__); + if (priv->mram_start) + read_fifo_addr = priv->mram_start + addr_offset; + else + read_fifo_addr = priv->mram_base + addr_offset; + + if (priv->m_can_fifo_read) + ret = priv->m_can_read(priv, read_fifo_addr); + else + ret = readl(read_fifo_addr); + + return ret; } -static inline bool m_can_tx_fifo_full(const struct m_can_priv *priv) +static inline bool m_can_tx_fifo_full(const struct m_can_classdev *priv) { +printk("%s: Here\n", __func__); return !!(m_can_read(priv, M_CAN_TXFQS) & TXFQS_TFQF); } -static inline void m_can_config_endisable(const struct m_can_priv *priv, - bool enable) +void m_can_config_endisable(const struct m_can_classdev *priv, bool enable) { u32 cccr = m_can_read(priv, M_CAN_CCCR); u32 timeout = 10; @@ -430,7 +442,7 @@ static inline void m_can_config_endisable(const struct m_can_priv *priv, while ((m_can_read(priv, M_CAN_CCCR) & (CCCR_INIT | CCCR_CCE)) != val) { if (timeout == 0) { - netdev_warn(priv->dev, "Failed to init module\n"); + netdev_warn(priv->net, "Failed to init module\n"); return; } timeout--; @@ -438,13 +450,13 @@ static inline void m_can_config_endisable(const struct m_can_priv *priv, } } -static inline void m_can_enable_all_interrupts(const struct m_can_priv *priv) +static inline void m_can_enable_all_interrupts(const struct m_can_classdev *priv) { /* Only interrupt line 0 is used in this driver */ m_can_write(priv, M_CAN_ILE, ILE_EINT0); } -static inline void m_can_disable_all_interrupts(const struct m_can_priv *priv) +static inline void m_can_disable_all_interrupts(const struct m_can_classdev *priv) { m_can_write(priv, M_CAN_ILE, 0x0); } @@ -452,12 +464,12 @@ static inline void m_can_disable_all_interrupts(const struct m_can_priv *priv) static void m_can_read_fifo(struct net_device *dev, u32 rxfs) { struct net_device_stats *stats = &dev->stats; - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); struct canfd_frame *cf; struct sk_buff *skb; u32 id, fgi, dlc; int i; - +printk("%s: Here\n", __func__); /* calculate the fifo get index for where to read data */ fgi = (rxfs & RXFS_FGI_MASK) >> RXFS_FGI_SHIFT; dlc = m_can_fifo_read(priv, fgi, M_CAN_FIFO_DLC); @@ -509,10 +521,10 @@ static void m_can_read_fifo(struct net_device *dev, u32 rxfs) static int m_can_do_rx_poll(struct net_device *dev, int quota) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); u32 pkts = 0; u32 rxfs; - +printk("%s: Here\n", __func__); rxfs = m_can_read(priv, M_CAN_RXF0S); if (!(rxfs & RXFS_FFL_MASK)) { netdev_dbg(dev, "no messages in fifo0\n"); @@ -541,7 +553,7 @@ static int m_can_handle_lost_msg(struct net_device *dev) struct net_device_stats *stats = &dev->stats; struct sk_buff *skb; struct can_frame *frame; - +printk("%s: Here\n", __func__); netdev_err(dev, "msg lost in rxf0\n"); stats->rx_errors++; @@ -562,11 +574,11 @@ static int m_can_handle_lost_msg(struct net_device *dev) static int m_can_handle_lec_err(struct net_device *dev, enum m_can_lec_type lec_type) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); struct net_device_stats *stats = &dev->stats; struct can_frame *cf; struct sk_buff *skb; - +printk("%s: Here\n", __func__); priv->can.can_stats.bus_error++; stats->rx_errors++; @@ -619,7 +631,7 @@ static int m_can_handle_lec_err(struct net_device *dev, static int __m_can_get_berr_counter(const struct net_device *dev, struct can_berr_counter *bec) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); unsigned int ecr; ecr = m_can_read(priv, M_CAN_ECR); @@ -629,28 +641,32 @@ static int __m_can_get_berr_counter(const struct net_device *dev, return 0; } -static int m_can_clk_start(struct m_can_priv *priv) +static int m_can_clk_start(struct m_can_classdev *priv) { int err; - err = pm_runtime_get_sync(priv->device); + if (priv->pm_clock_support == 0) + return 0; + + err = pm_runtime_get_sync(priv->dev); if (err < 0) { - pm_runtime_put_noidle(priv->device); + pm_runtime_put_noidle(priv->dev); return err; } return 0; } -static void m_can_clk_stop(struct m_can_priv *priv) +static void m_can_clk_stop(struct m_can_classdev *priv) { - pm_runtime_put_sync(priv->device); + if (priv->pm_clock_support) + pm_runtime_put_sync(priv->dev); } static int m_can_get_berr_counter(const struct net_device *dev, struct can_berr_counter *bec) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); int err; err = m_can_clk_start(priv); @@ -667,7 +683,7 @@ static int m_can_get_berr_counter(const struct net_device *dev, static int m_can_handle_state_change(struct net_device *dev, enum can_state new_state) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); struct net_device_stats *stats = &dev->stats; struct can_frame *cf; struct sk_buff *skb; @@ -741,7 +757,7 @@ static int m_can_handle_state_change(struct net_device *dev, static int m_can_handle_state_errors(struct net_device *dev, u32 psr) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); int work_done = 0; if ((psr & PSR_EW) && @@ -794,7 +810,7 @@ static inline bool is_lec_err(u32 psr) static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus, u32 psr) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); int work_done = 0; if (irqstatus & IR_RF0L) @@ -814,7 +830,7 @@ static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus, static int m_can_poll(struct napi_struct *napi, int quota) { struct net_device *dev = napi->dev; - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); int work_done = 0; u32 irqstatus, psr; @@ -849,7 +865,7 @@ static void m_can_echo_tx_event(struct net_device *dev) int i = 0; unsigned int msg_mark; - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); struct net_device_stats *stats = &dev->stats; /* read tx event fifo status */ @@ -882,7 +898,7 @@ static void m_can_echo_tx_event(struct net_device *dev) static irqreturn_t m_can_isr(int irq, void *dev_id) { struct net_device *dev = (struct net_device *)dev_id; - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); struct net_device_stats *stats = &dev->stats; u32 ir; @@ -977,7 +993,7 @@ static const struct can_bittiming_const m_can_data_bittiming_const_31X = { static int m_can_set_bittiming(struct net_device *dev) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); const struct can_bittiming *bt = &priv->can.bittiming; const struct can_bittiming *dbt = &priv->can.data_bittiming; u16 brp, sjw, tseg1, tseg2; @@ -1050,7 +1066,7 @@ static int m_can_set_bittiming(struct net_device *dev) */ static void m_can_chip_config(struct net_device *dev) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); u32 cccr, test; m_can_config_endisable(priv, true); @@ -1150,17 +1166,17 @@ static void m_can_chip_config(struct net_device *dev) /* route all interrupts to INT0 */ m_can_write(priv, M_CAN_ILS, ILS_ALL_INT0); - +printk("%s: Bit timing\n", __func__); /* set bittiming params */ m_can_set_bittiming(dev); - +printk("%s: out\n", __func__); m_can_config_endisable(priv, false); } static void m_can_start(struct net_device *dev) { - struct m_can_priv *priv = netdev_priv(dev); - + struct m_can_classdev *priv = netdev_priv(dev); +printk("%s: Hear\n", __func__); /* basic m_can configuration */ m_can_chip_config(dev); @@ -1171,6 +1187,7 @@ static void m_can_start(struct net_device *dev) static int m_can_set_mode(struct net_device *dev, enum can_mode mode) { +printk("%s: Hear\n", __func__); switch (mode) { case CAN_MODE_START: m_can_start(dev); @@ -1188,20 +1205,17 @@ static int m_can_set_mode(struct net_device *dev, enum can_mode mode) * else it returns the release and step coded as: * return value = 10 * <release> + 1 * <step> */ -static int m_can_check_core_release(void __iomem *m_can_base) +static int m_can_check_core_release(struct m_can_classdev *priv) { u32 crel_reg; u8 rel; u8 step; int res; - struct m_can_priv temp_priv = { - .base = m_can_base - }; /* Read Core Release Version and split into version number * Example: Version 3.2.1 => rel = 3; step = 2; substep = 1; */ - crel_reg = m_can_read(&temp_priv, M_CAN_CREL); + crel_reg = m_can_read(priv, M_CAN_CREL); rel = (u8)((crel_reg & CREL_REL_MASK) >> CREL_REL_SHIFT); step = (u8)((crel_reg & CREL_STEP_MASK) >> CREL_STEP_SHIFT); @@ -1219,86 +1233,84 @@ static int m_can_check_core_release(void __iomem *m_can_base) /* Selectable Non ISO support only in version 3.2.x * This function checks if the bit is writable. */ -static bool m_can_niso_supported(const struct m_can_priv *priv) +static bool m_can_niso_supported(const struct m_can_classdev *priv) { u32 cccr_reg, cccr_poll; - int niso_timeout; + int niso_timeout = 0; m_can_config_endisable(priv, true); cccr_reg = m_can_read(priv, M_CAN_CCCR); cccr_reg |= CCCR_NISO; m_can_write(priv, M_CAN_CCCR, cccr_reg); - - niso_timeout = readl_poll_timeout((priv->base + M_CAN_CCCR), cccr_poll, - (cccr_poll == cccr_reg), 0, 10); +printk("%s: Fix readl poll timeout\n", __func__); +/* niso_timeout = readl_poll_timeout((priv->base + M_CAN_CCCR), cccr_poll, + (cccr_poll == cccr_reg), 0, 10);*/ /* Clear NISO */ cccr_reg &= ~(CCCR_NISO); m_can_write(priv, M_CAN_CCCR, cccr_reg); m_can_config_endisable(priv, false); - +printk("%s: out\n", __func__); /* return false if time out (-ETIMEDOUT), else return true */ return !niso_timeout; } -static int m_can_dev_setup(struct platform_device *pdev, struct net_device *dev, - void __iomem *addr) +static int m_can_dev_setup(struct net_device *dev) { - struct m_can_priv *priv; + struct m_can_classdev *m_can_dev; int m_can_version; - m_can_version = m_can_check_core_release(addr); + m_can_dev = netdev_priv(dev); + + m_can_version = m_can_check_core_release(m_can_dev); /* return if unsupported version */ if (!m_can_version) { - dev_err(&pdev->dev, "Unsupported version number: %2d", + dev_err(m_can_dev->dev, "Unsupported version number: %2d", m_can_version); return -EINVAL; } - priv = netdev_priv(dev); - netif_napi_add(dev, &priv->napi, m_can_poll, M_CAN_NAPI_WEIGHT); + netif_napi_add(dev, &m_can_dev->napi, m_can_poll, M_CAN_NAPI_WEIGHT); /* Shared properties of all M_CAN versions */ - priv->version = m_can_version; - priv->dev = dev; - priv->base = addr; - priv->can.do_set_mode = m_can_set_mode; - priv->can.do_get_berr_counter = m_can_get_berr_counter; + m_can_dev->version = m_can_version; + m_can_dev->can.do_set_mode = m_can_set_mode; + m_can_dev->can.do_get_berr_counter = m_can_get_berr_counter; /* Set M_CAN supported operations */ - priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK | + m_can_dev->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_BERR_REPORTING | CAN_CTRLMODE_FD; /* Set properties depending on M_CAN version */ - switch (priv->version) { + switch (m_can_dev->version) { case 30: /* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.0.x */ can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO); - priv->can.bittiming_const = &m_can_bittiming_const_30X; - priv->can.data_bittiming_const = + m_can_dev->can.bittiming_const = &m_can_bittiming_const_30X; + m_can_dev->can.data_bittiming_const = &m_can_data_bittiming_const_30X; break; case 31: /* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.1.x */ can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO); - priv->can.bittiming_const = &m_can_bittiming_const_31X; - priv->can.data_bittiming_const = + m_can_dev->can.bittiming_const = &m_can_bittiming_const_31X; + m_can_dev->can.data_bittiming_const = &m_can_data_bittiming_const_31X; break; case 32: - priv->can.bittiming_const = &m_can_bittiming_const_31X; - priv->can.data_bittiming_const = + m_can_dev->can.bittiming_const = &m_can_bittiming_const_31X; + m_can_dev->can.data_bittiming_const = &m_can_data_bittiming_const_31X; - priv->can.ctrlmode_supported |= (m_can_niso_supported(priv) + m_can_dev->can.ctrlmode_supported |= (m_can_niso_supported(m_can_dev) ? CAN_CTRLMODE_FD_NON_ISO : 0); break; default: - dev_err(&pdev->dev, "Unsupported version number: %2d", - priv->version); + dev_err(m_can_dev->dev, "Unsupported version number: %2d", + m_can_dev->version); return -EINVAL; } @@ -1307,7 +1319,7 @@ static int m_can_dev_setup(struct platform_device *pdev, struct net_device *dev, static int m_can_open(struct net_device *dev) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); int err; err = m_can_clk_start(priv); @@ -1347,7 +1359,7 @@ static int m_can_open(struct net_device *dev) static void m_can_stop(struct net_device *dev) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); /* disable all interrupts */ m_can_disable_all_interrupts(priv); @@ -1358,7 +1370,7 @@ static void m_can_stop(struct net_device *dev) static int m_can_close(struct net_device *dev) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); netif_stop_queue(dev); napi_disable(&priv->napi); @@ -1373,7 +1385,7 @@ static int m_can_close(struct net_device *dev) static int m_can_next_echo_skb_occupied(struct net_device *dev, int putidx) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); /*get wrap around for loopback skb index */ unsigned int wrap = priv->can.echo_skb_max; int next_idx; @@ -1388,7 +1400,7 @@ static int m_can_next_echo_skb_occupied(struct net_device *dev, int putidx) static netdev_tx_t m_can_start_xmit(struct sk_buff *skb, struct net_device *dev) { - struct m_can_priv *priv = netdev_priv(dev); + struct m_can_classdev *priv = netdev_priv(dev); struct canfd_frame *cf = (struct canfd_frame *)skb->data; u32 id, cccr, fdflags; int i; @@ -1515,21 +1527,7 @@ static int register_m_can_dev(struct net_device *dev) return register_candev(dev); } -static void m_can_init_ram(struct m_can_priv *priv) -{ - int end, i, start; - - /* initialize the entire Message RAM in use to avoid possible - * ECC/parity checksum errors when reading an uninitialized buffer - */ - start = priv->mcfg[MRAM_SIDF].off; - end = priv->mcfg[MRAM_TXB].off + - priv->mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE; - for (i = start; i < end; i += 4) - writel(0x0, priv->mram_base + i); -} - -static void m_can_of_parse_mram(struct m_can_priv *priv, +static void m_can_of_parse_mram(struct m_can_classdev *priv, const u32 *mram_config_vals) { priv->mcfg[MRAM_SIDF].off = mram_config_vals[0]; @@ -1556,7 +1554,7 @@ static void m_can_of_parse_mram(struct m_can_priv *priv, priv->mcfg[MRAM_TXB].num = mram_config_vals[7] & (TXBC_NDTB_MASK >> TXBC_NDTB_SHIFT); - dev_dbg(priv->device, + dev_dbg(priv->dev, "mram_base %p sidf 0x%x %d xidf 0x%x %d rxf0 0x%x %d rxf1 0x%x %d rxb 0x%x %d txe 0x%x %d txb 0x%x %d\n", priv->mram_base, priv->mcfg[MRAM_SIDF].off, priv->mcfg[MRAM_SIDF].num, @@ -1566,63 +1564,57 @@ static void m_can_of_parse_mram(struct m_can_priv *priv, priv->mcfg[MRAM_RXB].off, priv->mcfg[MRAM_RXB].num, priv->mcfg[MRAM_TXE].off, priv->mcfg[MRAM_TXE].num, priv->mcfg[MRAM_TXB].off, priv->mcfg[MRAM_TXB].num); - - m_can_init_ram(priv); } -static int m_can_plat_probe(struct platform_device *pdev) +void m_can_init_ram(struct m_can_classdev *priv) { - struct net_device *dev; - struct m_can_priv *priv; - struct resource *res; - void __iomem *addr; - void __iomem *mram_addr; - struct clk *hclk, *cclk; - int irq, ret; - struct device_node *np; - u32 mram_config_vals[MRAM_CFG_LEN]; - u32 tx_fifo_size; - - np = pdev->dev.of_node; + int end, i, start; - hclk = devm_clk_get(&pdev->dev, "hclk"); - cclk = devm_clk_get(&pdev->dev, "cclk"); + /* initialize the entire Message RAM in use to avoid possible + * ECC/parity checksum errors when reading an uninitialized buffer + */ + start = priv->mcfg[MRAM_SIDF].off; + end = priv->mcfg[MRAM_TXB].off + + priv->mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE; - if (IS_ERR(hclk) || IS_ERR(cclk)) { - dev_err(&pdev->dev, "no clock found\n"); - ret = -ENODEV; - goto failed_ret; + for (i = start; i < end; i += 4) { + if (priv->mram_start) + m_can_write(priv, priv->mram_start + i, 0x0); + else + writel(0x0, priv->mram_base + i); } +} - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "m_can"); - addr = devm_ioremap_resource(&pdev->dev, res); - irq = platform_get_irq_byname(pdev, "int0"); +int m_can_core_get_clocks(struct m_can_classdev *m_can_dev) +{ + int ret = 0; - if (IS_ERR(addr) || irq < 0) { - ret = -EINVAL; - goto failed_ret; - } + m_can_dev->hclk = devm_clk_get(m_can_dev->dev, "hclk"); + m_can_dev->cclk = devm_clk_get(m_can_dev->dev, "cclk"); - /* message ram could be shared */ - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram"); - if (!res) { + if (IS_ERR(m_can_dev->cclk)) { + dev_err(m_can_dev->dev, "no clock found\n"); ret = -ENODEV; - goto failed_ret; } - mram_addr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - if (!mram_addr) { - ret = -ENOMEM; - goto failed_ret; - } + return ret; +} + +struct m_can_classdev *m_can_core_allocate_dev(struct device *dev) +{ + struct m_can_classdev *class_dev = NULL; + u32 mram_config_vals[MRAM_CFG_LEN]; + struct net_device *net_dev; + u32 tx_fifo_size; + int ret; - /* get message ram configuration */ - ret = of_property_read_u32_array(np, "bosch,mram-cfg", - mram_config_vals, - sizeof(mram_config_vals) / 4); + ret = fwnode_property_read_u32_array(dev_fwnode(dev), + "bosch,mram-cfg", + mram_config_vals, + sizeof(mram_config_vals) / 4); if (ret) { - dev_err(&pdev->dev, "Could not get Message RAM configuration."); - goto failed_ret; + dev_err(dev, "Could not get Message RAM configuration."); + goto out; } /* Get TX FIFO size @@ -1631,69 +1623,76 @@ static int m_can_plat_probe(struct platform_device *pdev) tx_fifo_size = mram_config_vals[7]; /* allocate the m_can device */ - dev = alloc_candev(sizeof(*priv), tx_fifo_size); - if (!dev) { - ret = -ENOMEM; - goto failed_ret; + net_dev = alloc_candev(sizeof(*class_dev), tx_fifo_size); + if (!net_dev) { + dev_err(dev, "Failed to allocate CAN device"); + goto out; } - priv = netdev_priv(dev); - dev->irq = irq; - priv->device = &pdev->dev; - priv->hclk = hclk; - priv->cclk = cclk; - priv->can.clock.freq = clk_get_rate(cclk); - priv->mram_base = mram_addr; + class_dev = netdev_priv(net_dev); + if (!class_dev) { + dev_err(dev, "Failed to init netdev private"); + goto out; + } - platform_set_drvdata(pdev, dev); - SET_NETDEV_DEV(dev, &pdev->dev); + class_dev->net = net_dev; + class_dev->dev = dev; + SET_NETDEV_DEV(net_dev, dev); - /* Enable clocks. Necessary to read Core Release in order to determine - * M_CAN version - */ - pm_runtime_enable(&pdev->dev); - ret = m_can_clk_start(priv); - if (ret) - goto pm_runtime_fail; + m_can_of_parse_mram(class_dev, mram_config_vals); +out: + return class_dev; +} + +int m_can_core_register(struct m_can_classdev *m_can_dev) +{ + int ret; - ret = m_can_dev_setup(pdev, dev, addr); + if (m_can_dev->pm_clock_support) { + pm_runtime_enable(m_can_dev->dev); + ret = m_can_clk_start(m_can_dev); + if (ret) + goto pm_runtime_fail; + } + + ret = m_can_dev_setup(m_can_dev->net); if (ret) goto clk_disable; - ret = register_m_can_dev(dev); + ret = register_m_can_dev(m_can_dev->net); if (ret) { - dev_err(&pdev->dev, "registering %s failed (err=%d)\n", - KBUILD_MODNAME, ret); + dev_err(m_can_dev->dev, "registering %s failed (err=%d)\n", + m_can_dev->net->name, ret); goto clk_disable; } - m_can_of_parse_mram(priv, mram_config_vals); + devm_can_led_init(m_can_dev->net); - devm_can_led_init(dev); + of_can_transceiver(m_can_dev->net); - of_can_transceiver(dev); + dev_info(m_can_dev->dev, "%s device registered (irq=%d, version=%d)\n", + KBUILD_MODNAME, m_can_dev->net->irq, m_can_dev->version); - dev_info(&pdev->dev, "%s device registered (irq=%d, version=%d)\n", - KBUILD_MODNAME, dev->irq, priv->version); + m_can_set_bittiming(m_can_dev->net); /* Probe finished * Stop clocks. They will be reactivated once the M_CAN device is opened */ clk_disable: - m_can_clk_stop(priv); + m_can_clk_stop(m_can_dev); pm_runtime_fail: if (ret) { - pm_runtime_disable(&pdev->dev); - free_candev(dev); + pm_runtime_disable(m_can_dev->dev); + free_candev(m_can_dev->net); } -failed_ret: + return ret; } -static __maybe_unused int m_can_suspend(struct device *dev) +int m_can_core_suspend(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); - struct m_can_priv *priv = netdev_priv(ndev); + struct m_can_classdev *priv = netdev_priv(ndev); if (netif_running(ndev)) { netif_stop_queue(ndev); @@ -1709,10 +1708,10 @@ static __maybe_unused int m_can_suspend(struct device *dev) return 0; } -static __maybe_unused int m_can_resume(struct device *dev) +int m_can_core_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); - struct m_can_priv *priv = netdev_priv(ndev); + struct m_can_classdev *priv = netdev_priv(ndev); pinctrl_pm_select_default_state(dev); @@ -1747,8 +1746,6 @@ static int m_can_plat_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); - platform_set_drvdata(pdev, NULL); - free_candev(dev); return 0; @@ -1757,7 +1754,7 @@ static int m_can_plat_remove(struct platform_device *pdev) static int __maybe_unused m_can_runtime_suspend(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); - struct m_can_priv *priv = netdev_priv(ndev); + struct m_can_classdev *priv = netdev_priv(ndev); clk_disable_unprepare(priv->cclk); clk_disable_unprepare(priv->hclk); @@ -1768,7 +1765,7 @@ static int __maybe_unused m_can_runtime_suspend(struct device *dev) static int __maybe_unused m_can_runtime_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); - struct m_can_priv *priv = netdev_priv(ndev); + struct m_can_classdev *priv = netdev_priv(ndev); int err; err = clk_prepare_enable(priv->hclk); @@ -1782,30 +1779,6 @@ static int __maybe_unused m_can_runtime_resume(struct device *dev) return err; } -static const struct dev_pm_ops m_can_pmops = { - SET_RUNTIME_PM_OPS(m_can_runtime_suspend, - m_can_runtime_resume, NULL) - SET_SYSTEM_SLEEP_PM_OPS(m_can_suspend, m_can_resume) -}; - -static const struct of_device_id m_can_of_table[] = { - { .compatible = "bosch,m_can", .data = NULL }, - { /* sentinel */ }, -}; -MODULE_DEVICE_TABLE(of, m_can_of_table); - -static struct platform_driver m_can_plat_driver = { - .driver = { - .name = KBUILD_MODNAME, - .of_match_table = m_can_of_table, - .pm = &m_can_pmops, - }, - .probe = m_can_plat_probe, - .remove = m_can_plat_remove, -}; - -module_platform_driver(m_can_plat_driver); - MODULE_AUTHOR("Dong Aisheng <b29396@freescale.com>"); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("CAN bus driver for Bosch M_CAN controller"); diff --git a/drivers/net/can/m_can/m_can_core.h b/drivers/net/can/m_can/m_can_core.h new file mode 100644 index 000000000000..2a83aff323e9 --- /dev/null +++ b/drivers/net/can/m_can/m_can_core.h @@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + +#ifndef _CAN_M_CAN_CORE_H_ +#define _CAN_M_CAN_CORE_H_ + +#include <linux/can/core.h> +#include <linux/can/led.h> +#include <linux/completion.h> +#include <linux/device.h> +#include <linux/dma-mapping.h> +#include <linux/freezer.h> +#include <linux/slab.h> +#include <linux/uaccess.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/netdevice.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/pm_runtime.h> +#include <linux/iopoll.h> +#include <linux/can/dev.h> +#include <linux/pinctrl/consumer.h> + +/* m_can lec values */ +enum m_can_lec_type { + LEC_NO_ERROR = 0, + LEC_STUFF_ERROR, + LEC_FORM_ERROR, + LEC_ACK_ERROR, + LEC_BIT1_ERROR, + LEC_BIT0_ERROR, + LEC_CRC_ERROR, + LEC_UNUSED, +}; + +enum m_can_mram_cfg { + MRAM_SIDF = 0, + MRAM_XIDF, + MRAM_RXF0, + MRAM_RXF1, + MRAM_RXB, + MRAM_TXE, + MRAM_TXB, + MRAM_CFG_NUM, +}; + +/* address offset and element number for each FIFO/Buffer in the Message RAM */ +struct mram_cfg { + u16 off; + u8 num; +}; + +struct m_can_classdev { + struct can_priv can; + struct napi_struct napi; + struct net_device *net; + struct device *dev; + struct clk *hclk; + struct clk *cclk; + + void *device_data; + + int version; + int freq; + u32 irqstatus; + + u32 (*m_can_read) (const struct m_can_classdev *m_can_class, int reg); + int (*m_can_write) (const struct m_can_classdev *m_can_class, int reg, int val); + u32 (*m_can_fifo_read) (const struct m_can_classdev *m_can_class, int reg); + int (*m_can_fifo_write) (const struct m_can_classdev *m_can_class, int reg, int val); + u32 (*m_can_txe_fifo_read) (const struct m_can_classdev *m_can_class); + + /* Memory mapped ip */ + void __iomem *base; + void __iomem *mram_addr; + void __iomem *mram_base; + + /* Register based ip */ + int reg_offset; + int mram_start; + int pm_clock_support; + + struct mram_cfg mcfg[MRAM_CFG_NUM]; +}; + +struct m_can_classdev *m_can_core_allocate_dev(struct device *dev); +int m_can_core_register(struct m_can_classdev *m_can_dev); +int m_can_core_get_clocks(struct m_can_classdev *m_can_dev); +void m_can_init_ram(struct m_can_classdev *priv); +void m_can_config_endisable(const struct m_can_classdev *priv, bool enable); + +int m_can_core_suspend(struct device *dev); +int m_can_core_resume(struct device *dev); + +#endif /* _CAN_M_CAN_CORE_H_ */ -- 2.19.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2018-10-10 14:20 ` [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code Dan Murphy @ 2018-10-27 14:19 ` Wolfgang Grandegger 2018-10-31 20:15 ` Dan Murphy 0 siblings, 1 reply; 20+ messages in thread From: Wolfgang Grandegger @ 2018-10-27 14:19 UTC (permalink / raw) To: Dan Murphy, mkl, davem; +Cc: linux-can, netdev, linux-kernel Hello Dan, for the RFC, could you please just do the necessary changes to the existing code. We can discuss about better names, etc. later. For the review if the common code I quickly did: mv m_can.c m_can_platform.c mv m_can_core.c m_can.c The file names are similar to what we have for the C_CAN driver. s/classdev/priv/ variable name s/m_can_dev/priv/ Then your patch 1/3 looks as shown below. I'm going to comment on that one. The comments start with "***".... From 9966873dc261b2703e0545718222874ba1b88638 Mon Sep 17 00:00:00 2001 From: Dan Murphy <dmurphy@ti.com> Date: Wed, 10 Oct 2018 09:20:53 -0500 Subject: [PATCH] can: m_can: Create m_can core to leverage common code Create a common code base that can be leveraged by other devices that use the Bosch MCAN IP. The common code manages the MCAN IP as well as registering the CAN device. Signed-off-by: Dan Murphy <dmurphy@ti.com> --- drivers/net/can/m_can/Kconfig | 12 + drivers/net/can/m_can/Makefile | 3 +- drivers/net/can/m_can/m_can.c | 385 +++++++++++++++------------------ drivers/net/can/m_can/m_can_core.h | 100 +++++++++ drivers/net/can/m_can/m_can_platform.c | 168 ++++++++++++++ 5 files changed, 461 insertions(+), 207 deletions(-) create mode 100644 drivers/net/can/m_can/m_can_core.h create mode 100644 drivers/net/can/m_can/m_can_platform.c diff --git a/drivers/net/can/m_can/Kconfig b/drivers/net/can/m_can/Kconfig index 04f20dd..b1a9358 100644 --- a/drivers/net/can/m_can/Kconfig +++ b/drivers/net/can/m_can/Kconfig @@ -1,5 +1,17 @@ config CAN_M_CAN + tristate "Bosch M_CAN support" + ---help--- + Say Y here if you want to support for Bosch M_CAN controller. + +config CAN_M_CAN_CORE + depends on CAN_M_CAN + tristate "Bosch M_CAN Core support" + ---help--- + Say Y here if you want to support for Bosch M_CAN controller. + +config CAN_M_CAN_PLATFORM depends on HAS_IOMEM + depends on CAN_M_CAN_CORE tristate "Bosch M_CAN devices" ---help--- Say Y here if you want to support for Bosch M_CAN controller. diff --git a/drivers/net/can/m_can/Makefile b/drivers/net/can/m_can/Makefile index 8bbd7f2..e013d6f 100644 --- a/drivers/net/can/m_can/Makefile +++ b/drivers/net/can/m_can/Makefile @@ -2,4 +2,5 @@ # Makefile for the Bosch M_CAN controller driver. # -obj-$(CONFIG_CAN_M_CAN) += m_can.o +obj-$(CONFIG_CAN_M_CAN_CORE) += m_can_core.o +obj-$(CONFIG_CAN_M_CAN_PLATFORM) += m_can.o *** I haven't updated Kconfig and Makefile... it needs some adoptions anyway. diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 9b44940..4fb4269 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -28,6 +28,8 @@ #include <linux/can/dev.h> #include <linux/pinctrl/consumer.h> +#include "m_can_core.h" + /* napi related */ #define M_CAN_NAPI_WEIGHT 64 @@ -86,28 +88,6 @@ enum m_can_reg { M_CAN_TXEFA = 0xf8, }; -/* m_can lec values */ -enum m_can_lec_type { - LEC_NO_ERROR = 0, - LEC_STUFF_ERROR, - LEC_FORM_ERROR, - LEC_ACK_ERROR, - LEC_BIT1_ERROR, - LEC_BIT0_ERROR, - LEC_CRC_ERROR, - LEC_UNUSED, -}; - -enum m_can_mram_cfg { - MRAM_SIDF = 0, - MRAM_XIDF, - MRAM_RXF0, - MRAM_RXF1, - MRAM_RXB, - MRAM_TXE, - MRAM_TXB, - MRAM_CFG_NUM, -}; /* Core Release Register (CREL) */ #define CREL_REL_SHIFT 28 @@ -347,68 +327,100 @@ enum m_can_mram_cfg { #define TX_EVENT_MM_SHIFT TX_BUF_MM_SHIFT #define TX_EVENT_MM_MASK (0xff << TX_EVENT_MM_SHIFT) -/* address offset and element number for each FIFO/Buffer in the Message RAM */ -struct mram_cfg { - u16 off; - u8 num; -}; - -/* m_can private data structure */ -struct m_can_priv { - struct can_priv can; /* must be the first member */ - struct napi_struct napi; - struct net_device *dev; - struct device *device; - struct clk *hclk; - struct clk *cclk; - void __iomem *base; - u32 irqstatus; - int version; - - /* message ram configuration */ - void __iomem *mram_base; - struct mram_cfg mcfg[MRAM_CFG_NUM]; -}; - static inline u32 m_can_read(const struct m_can_priv *priv, enum m_can_reg reg) { - return readl(priv->base + reg); + u32 ret; + + if (priv->m_can_write) + ret = priv->m_can_read(priv, priv->reg_offset + reg); + else + ret = readl(priv->base + reg); *** Why not just return priv->m_can_read(priv, priv->reg_offset, reg); for both cases. Do we need "reg_offset" here or is it only needed in platform code? + + return ret; } -static inline void m_can_write(const struct m_can_priv *priv, +static inline int m_can_write(const struct m_can_priv *priv, enum m_can_reg reg, u32 val) { - writel(val, priv->base + reg); + int ret = 0; + + if (priv->m_can_write) + ret = priv->m_can_write(priv, priv->reg_offset + reg, val); + else + writel(val, priv->base + reg); *** Ditto. + + return ret; } static inline u32 m_can_fifo_read(const struct m_can_priv *priv, u32 fgi, unsigned int offset) { - return readl(priv->mram_base + priv->mcfg[MRAM_RXF0].off + - fgi * RXF0_ELEMENT_SIZE + offset); + u32 addr_offset = priv->mcfg[MRAM_RXF0].off + fgi * RXF0_ELEMENT_SIZE + offset; + u32 read_fifo_addr; /* need to take into account iomem cases */ + u32 ret = 0; + + if (priv->mram_start) + read_fifo_addr = priv->mram_start + addr_offset; + else + read_fifo_addr = priv->mram_base + addr_offset; *** Why do we need two platform-specific variables here? Couldn't it be hidden in platform-specific code? + if (priv->m_can_fifo_read) + ret = priv->m_can_read(priv, read_fifo_addr); *** Shouldn't that use "priv->m_can_fifo_read"? Looking to "tcan4x5x.c", the functions "m_can_read" and "m_can_fifo_read" are identical. + else + ret = readl(read_fifo_addr); + + return ret; } static inline void m_can_fifo_write(const struct m_can_priv *priv, u32 fpi, unsigned int offset, u32 val) { - writel(val, priv->mram_base + priv->mcfg[MRAM_TXB].off + - fpi * TXB_ELEMENT_SIZE + offset); + u32 addr_offset = priv->mcfg[MRAM_TXB].off + fpi * TXB_ELEMENT_SIZE + offset; + u32 write_fifo_addr; + u32 ret; + + if (priv->mram_start) + write_fifo_addr = priv->mram_start + addr_offset; + else + write_fifo_addr = priv->mram_base + addr_offset; + + if (priv->m_can_write) + ret = priv->m_can_write(priv, write_fifo_addr, val); + else + writel(val, write_fifo_addr); + + return ret; } static inline u32 m_can_txe_fifo_read(const struct m_can_priv *priv, u32 fgi, - u32 offset) { - return readl(priv->mram_base + priv->mcfg[MRAM_TXE].off + - fgi * TXE_ELEMENT_SIZE + offset); + u32 offset) +{ + u32 addr_offset = priv->mcfg[MRAM_TXE].off + fgi * TXE_ELEMENT_SIZE + offset; + u32 read_fifo_addr; + u32 ret = 0; + +printk("%s: Here\n", __func__); + if (priv->mram_start) + read_fifo_addr = priv->mram_start + addr_offset; + else + read_fifo_addr = priv->mram_base + addr_offset; + + if (priv->m_can_fifo_read) + ret = priv->m_can_read(priv, read_fifo_addr); + else + ret = readl(read_fifo_addr); + + return ret; } static inline bool m_can_tx_fifo_full(const struct m_can_priv *priv) { +printk("%s: Here\n", __func__); return !!(m_can_read(priv, M_CAN_TXFQS) & TXFQS_TFQF); } -static inline void m_can_config_endisable(const struct m_can_priv *priv, - bool enable) +void m_can_config_endisable(const struct m_can_priv *priv, bool enable) { u32 cccr = m_can_read(priv, M_CAN_CCCR); u32 timeout = 10; @@ -430,7 +442,7 @@ static inline void m_can_config_endisable(const struct m_can_priv *priv, while ((m_can_read(priv, M_CAN_CCCR) & (CCCR_INIT | CCCR_CCE)) != val) { if (timeout == 0) { - netdev_warn(priv->dev, "Failed to init module\n"); + netdev_warn(priv->net, "Failed to init module\n"); return; } timeout--; @@ -457,7 +469,7 @@ static void m_can_read_fifo(struct net_device *dev, u32 rxfs) struct sk_buff *skb; u32 id, fgi, dlc; int i; - +printk("%s: Here\n", __func__); /* calculate the fifo get index for where to read data */ fgi = (rxfs & RXFS_FGI_MASK) >> RXFS_FGI_SHIFT; dlc = m_can_fifo_read(priv, fgi, M_CAN_FIFO_DLC); @@ -512,7 +524,7 @@ static int m_can_do_rx_poll(struct net_device *dev, int quota) struct m_can_priv *priv = netdev_priv(dev); u32 pkts = 0; u32 rxfs; - +printk("%s: Here\n", __func__); rxfs = m_can_read(priv, M_CAN_RXF0S); if (!(rxfs & RXFS_FFL_MASK)) { netdev_dbg(dev, "no messages in fifo0\n"); @@ -541,7 +553,7 @@ static int m_can_handle_lost_msg(struct net_device *dev) struct net_device_stats *stats = &dev->stats; struct sk_buff *skb; struct can_frame *frame; - +printk("%s: Here\n", __func__); netdev_err(dev, "msg lost in rxf0\n"); stats->rx_errors++; @@ -566,7 +578,7 @@ static int m_can_handle_lec_err(struct net_device *dev, struct net_device_stats *stats = &dev->stats; struct can_frame *cf; struct sk_buff *skb; - +printk("%s: Here\n", __func__); priv->can.can_stats.bus_error++; stats->rx_errors++; @@ -633,9 +645,12 @@ static int m_can_clk_start(struct m_can_priv *priv) { int err; - err = pm_runtime_get_sync(priv->device); + if (priv->pm_clock_support == 0) + return 0; + + err = pm_runtime_get_sync(priv->dev); if (err < 0) { - pm_runtime_put_noidle(priv->device); + pm_runtime_put_noidle(priv->dev); return err; } @@ -644,7 +659,8 @@ static int m_can_clk_start(struct m_can_priv *priv) static void m_can_clk_stop(struct m_can_priv *priv) { - pm_runtime_put_sync(priv->device); + if (priv->pm_clock_support) + pm_runtime_put_sync(priv->dev); } static int m_can_get_berr_counter(const struct net_device *dev, @@ -1150,17 +1166,17 @@ static void m_can_chip_config(struct net_device *dev) /* route all interrupts to INT0 */ m_can_write(priv, M_CAN_ILS, ILS_ALL_INT0); - +printk("%s: Bit timing\n", __func__); /* set bittiming params */ m_can_set_bittiming(dev); - +printk("%s: out\n", __func__); m_can_config_endisable(priv, false); } static void m_can_start(struct net_device *dev) { struct m_can_priv *priv = netdev_priv(dev); - +printk("%s: Hear\n", __func__); /* basic m_can configuration */ m_can_chip_config(dev); @@ -1171,6 +1187,7 @@ static void m_can_start(struct net_device *dev) static int m_can_set_mode(struct net_device *dev, enum can_mode mode) { +printk("%s: Hear\n", __func__); switch (mode) { case CAN_MODE_START: m_can_start(dev); @@ -1188,20 +1205,17 @@ static int m_can_set_mode(struct net_device *dev, enum can_mode mode) * else it returns the release and step coded as: * return value = 10 * <release> + 1 * <step> */ -static int m_can_check_core_release(void __iomem *m_can_base) +static int m_can_check_core_release(struct m_can_priv *priv) { u32 crel_reg; u8 rel; u8 step; int res; - struct m_can_priv temp_priv = { - .base = m_can_base - }; /* Read Core Release Version and split into version number * Example: Version 3.2.1 => rel = 3; step = 2; substep = 1; */ - crel_reg = m_can_read(&temp_priv, M_CAN_CREL); + crel_reg = m_can_read(priv, M_CAN_CREL); rel = (u8)((crel_reg & CREL_REL_MASK) >> CREL_REL_SHIFT); step = (u8)((crel_reg & CREL_STEP_MASK) >> CREL_STEP_SHIFT); @@ -1222,47 +1236,45 @@ static int m_can_check_core_release(void __iomem *m_can_base) static bool m_can_niso_supported(const struct m_can_priv *priv) { u32 cccr_reg, cccr_poll; - int niso_timeout; + int niso_timeout = 0; m_can_config_endisable(priv, true); cccr_reg = m_can_read(priv, M_CAN_CCCR); cccr_reg |= CCCR_NISO; m_can_write(priv, M_CAN_CCCR, cccr_reg); - - niso_timeout = readl_poll_timeout((priv->base + M_CAN_CCCR), cccr_poll, - (cccr_poll == cccr_reg), 0, 10); +printk("%s: Fix readl poll timeout\n", __func__); +/* niso_timeout = readl_poll_timeout((priv->base + M_CAN_CCCR), cccr_poll, + (cccr_poll == cccr_reg), 0, 10);*/ /* Clear NISO */ cccr_reg &= ~(CCCR_NISO); m_can_write(priv, M_CAN_CCCR, cccr_reg); m_can_config_endisable(priv, false); - +printk("%s: out\n", __func__); /* return false if time out (-ETIMEDOUT), else return true */ return !niso_timeout; } -static int m_can_dev_setup(struct platform_device *pdev, struct net_device *dev, - void __iomem *addr) +static int m_can_dev_setup(struct net_device *dev) { struct m_can_priv *priv; int m_can_version; - m_can_version = m_can_check_core_release(addr); + priv = netdev_priv(dev); + + m_can_version = m_can_check_core_release(priv); /* return if unsupported version */ if (!m_can_version) { - dev_err(&pdev->dev, "Unsupported version number: %2d", + dev_err(priv->dev, "Unsupported version number: %2d", m_can_version); return -EINVAL; } - priv = netdev_priv(dev); netif_napi_add(dev, &priv->napi, m_can_poll, M_CAN_NAPI_WEIGHT); /* Shared properties of all M_CAN versions */ priv->version = m_can_version; - priv->dev = dev; - priv->base = addr; priv->can.do_set_mode = m_can_set_mode; priv->can.do_get_berr_counter = m_can_get_berr_counter; @@ -1297,7 +1309,7 @@ static int m_can_dev_setup(struct platform_device *pdev, struct net_device *dev, : 0); break; default: - dev_err(&pdev->dev, "Unsupported version number: %2d", + dev_err(priv->dev, "Unsupported version number: %2d", priv->version); return -EINVAL; } @@ -1515,20 +1527,6 @@ static int register_m_can_dev(struct net_device *dev) return register_candev(dev); } -static void m_can_init_ram(struct m_can_priv *priv) -{ - int end, i, start; - - /* initialize the entire Message RAM in use to avoid possible - * ECC/parity checksum errors when reading an uninitialized buffer - */ - start = priv->mcfg[MRAM_SIDF].off; - end = priv->mcfg[MRAM_TXB].off + - priv->mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE; - for (i = start; i < end; i += 4) - writel(0x0, priv->mram_base + i); -} - static void m_can_of_parse_mram(struct m_can_priv *priv, const u32 *mram_config_vals) { @@ -1556,7 +1554,7 @@ static void m_can_of_parse_mram(struct m_can_priv *priv, priv->mcfg[MRAM_TXB].num = mram_config_vals[7] & (TXBC_NDTB_MASK >> TXBC_NDTB_SHIFT); - dev_dbg(priv->device, + dev_dbg(priv->dev, "mram_base %p sidf 0x%x %d xidf 0x%x %d rxf0 0x%x %d rxf1 0x%x %d rxb 0x%x %d txe 0x%x %d txb 0x%x %d\n", priv->mram_base, priv->mcfg[MRAM_SIDF].off, priv->mcfg[MRAM_SIDF].num, @@ -1566,63 +1564,57 @@ static void m_can_of_parse_mram(struct m_can_priv *priv, priv->mcfg[MRAM_RXB].off, priv->mcfg[MRAM_RXB].num, priv->mcfg[MRAM_TXE].off, priv->mcfg[MRAM_TXE].num, priv->mcfg[MRAM_TXB].off, priv->mcfg[MRAM_TXB].num); - - m_can_init_ram(priv); } -static int m_can_plat_probe(struct platform_device *pdev) +void m_can_init_ram(struct m_can_priv *priv) { - struct net_device *dev; - struct m_can_priv *priv; - struct resource *res; - void __iomem *addr; - void __iomem *mram_addr; - struct clk *hclk, *cclk; - int irq, ret; - struct device_node *np; - u32 mram_config_vals[MRAM_CFG_LEN]; - u32 tx_fifo_size; - - np = pdev->dev.of_node; + int end, i, start; - hclk = devm_clk_get(&pdev->dev, "hclk"); - cclk = devm_clk_get(&pdev->dev, "cclk"); + /* initialize the entire Message RAM in use to avoid possible + * ECC/parity checksum errors when reading an uninitialized buffer + */ + start = priv->mcfg[MRAM_SIDF].off; + end = priv->mcfg[MRAM_TXB].off + + priv->mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE; - if (IS_ERR(hclk) || IS_ERR(cclk)) { - dev_err(&pdev->dev, "no clock found\n"); - ret = -ENODEV; - goto failed_ret; + for (i = start; i < end; i += 4) { + if (priv->mram_start) + m_can_write(priv, priv->mram_start + i, 0x0); + else + writel(0x0, priv->mram_base + i); *** See my comments above. } +} - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "m_can"); - addr = devm_ioremap_resource(&pdev->dev, res); - irq = platform_get_irq_byname(pdev, "int0"); +int m_can_core_get_clocks(struct m_can_priv *priv) +{ + int ret = 0; - if (IS_ERR(addr) || irq < 0) { - ret = -EINVAL; - goto failed_ret; - } + priv->hclk = devm_clk_get(priv->dev, "hclk"); + priv->cclk = devm_clk_get(priv->dev, "cclk"); - /* message ram could be shared */ - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram"); - if (!res) { + if (IS_ERR(priv->cclk)) { + dev_err(priv->dev, "no clock found\n"); ret = -ENODEV; - goto failed_ret; } - mram_addr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - if (!mram_addr) { - ret = -ENOMEM; - goto failed_ret; - } + return ret; +} - /* get message ram configuration */ - ret = of_property_read_u32_array(np, "bosch,mram-cfg", - mram_config_vals, - sizeof(mram_config_vals) / 4); +struct m_can_priv *m_can_core_allocate_dev(struct device *dev) +{ + struct m_can_priv *class_dev = NULL; + u32 mram_config_vals[MRAM_CFG_LEN]; + struct net_device *net_dev; + u32 tx_fifo_size; + int ret; + + ret = fwnode_property_read_u32_array(dev_fwnode(dev), + "bosch,mram-cfg", + mram_config_vals, + sizeof(mram_config_vals) / 4); if (ret) { - dev_err(&pdev->dev, "Could not get Message RAM configuration."); - goto failed_ret; + dev_err(dev, "Could not get Message RAM configuration."); + goto out; } /* Get TX FIFO size @@ -1631,50 +1623,57 @@ static int m_can_plat_probe(struct platform_device *pdev) tx_fifo_size = mram_config_vals[7]; /* allocate the m_can device */ - dev = alloc_candev(sizeof(*priv), tx_fifo_size); - if (!dev) { - ret = -ENOMEM; - goto failed_ret; + net_dev = alloc_candev(sizeof(*class_dev), tx_fifo_size); + if (!net_dev) { + dev_err(dev, "Failed to allocate CAN device"); + goto out; } - priv = netdev_priv(dev); - dev->irq = irq; - priv->device = &pdev->dev; - priv->hclk = hclk; - priv->cclk = cclk; - priv->can.clock.freq = clk_get_rate(cclk); - priv->mram_base = mram_addr; - - platform_set_drvdata(pdev, dev); - SET_NETDEV_DEV(dev, &pdev->dev); - - /* Enable clocks. Necessary to read Core Release in order to determine - * M_CAN version - */ - pm_runtime_enable(&pdev->dev); - ret = m_can_clk_start(priv); - if (ret) - goto pm_runtime_fail; + class_dev = netdev_priv(net_dev); + if (!class_dev) { + dev_err(dev, "Failed to init netdev private"); + goto out; + } + + class_dev->net = net_dev; + class_dev->dev = dev; + SET_NETDEV_DEV(net_dev, dev); + + m_can_of_parse_mram(class_dev, mram_config_vals); +out: + return class_dev; +} + +int m_can_core_register(struct m_can_priv *priv) +{ + int ret; - ret = m_can_dev_setup(pdev, dev, addr); + if (priv->pm_clock_support) { + pm_runtime_enable(priv->dev); + ret = m_can_clk_start(priv); + if (ret) + goto pm_runtime_fail; + } + + ret = priv_setup(priv->net); if (ret) goto clk_disable; - ret = register_m_can_dev(dev); + ret = register_priv(priv->net); if (ret) { - dev_err(&pdev->dev, "registering %s failed (err=%d)\n", - KBUILD_MODNAME, ret); + dev_err(priv->dev, "registering %s failed (err=%d)\n", + priv->net->name, ret); goto clk_disable; } - m_can_of_parse_mram(priv, mram_config_vals); + devm_can_led_init(priv->net); - devm_can_led_init(dev); + of_can_transceiver(priv->net); - of_can_transceiver(dev); + dev_info(priv->dev, "%s device registered (irq=%d, version=%d)\n", + KBUILD_MODNAME, priv->net->irq, priv->version); - dev_info(&pdev->dev, "%s device registered (irq=%d, version=%d)\n", - KBUILD_MODNAME, dev->irq, priv->version); + m_can_set_bittiming(priv->net); /* Probe finished * Stop clocks. They will be reactivated once the M_CAN device is opened @@ -1683,14 +1682,14 @@ static int m_can_plat_probe(struct platform_device *pdev) m_can_clk_stop(priv); pm_runtime_fail: if (ret) { - pm_runtime_disable(&pdev->dev); - free_candev(dev); + pm_runtime_disable(priv->dev); + free_candev(priv->net); } -failed_ret: + return ret; } -static __maybe_unused int m_can_suspend(struct device *dev) +int m_can_core_suspend(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct m_can_priv *priv = netdev_priv(ndev); @@ -1709,7 +1708,7 @@ static __maybe_unused int m_can_suspend(struct device *dev) return 0; } -static __maybe_unused int m_can_resume(struct device *dev) +int m_can_core_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct m_can_priv *priv = netdev_priv(ndev); @@ -1747,8 +1746,6 @@ static int m_can_plat_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); - platform_set_drvdata(pdev, NULL); - free_candev(dev); return 0; @@ -1782,30 +1779,6 @@ static int __maybe_unused m_can_runtime_resume(struct device *dev) return err; } -static const struct dev_pm_ops m_can_pmops = { - SET_RUNTIME_PM_OPS(m_can_runtime_suspend, - m_can_runtime_resume, NULL) - SET_SYSTEM_SLEEP_PM_OPS(m_can_suspend, m_can_resume) -}; - -static const struct of_device_id m_can_of_table[] = { - { .compatible = "bosch,m_can", .data = NULL }, - { /* sentinel */ }, -}; -MODULE_DEVICE_TABLE(of, m_can_of_table); - -static struct platform_driver m_can_plat_driver = { - .driver = { - .name = KBUILD_MODNAME, - .of_match_table = m_can_of_table, - .pm = &m_can_pmops, - }, - .probe = m_can_plat_probe, - .remove = m_can_plat_remove, -}; - -module_platform_driver(m_can_plat_driver); - MODULE_AUTHOR("Dong Aisheng <b29396@freescale.com>"); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("CAN bus driver for Bosch M_CAN controller"); *** I didn't review the rest of the patch for now. Looking to the generic code, you didn't really change the way the driver is accessing the registers. Also the interrupt handling and rx polling is as it was before. Does that work properly using the SPI interface of the TCAN4x5x? I was also thinking about optimized read/write functions handling more than 4 bytes of data, e.g. for the CAN payload data. That would speed-up SPI transfers, I think. But that could also be introduced later-on. Wolfgang. ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2018-10-27 14:19 ` Wolfgang Grandegger @ 2018-10-31 20:15 ` Dan Murphy 2018-11-03 10:45 ` Wolfgang Grandegger 0 siblings, 1 reply; 20+ messages in thread From: Dan Murphy @ 2018-10-31 20:15 UTC (permalink / raw) To: Wolfgang Grandegger, mkl, davem; +Cc: linux-can, netdev, linux-kernel Wolfgang Thanks for the review On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: > Hello Dan, > > for the RFC, could you please just do the necessary changes to the > existing code. We can discuss about better names, etc. later. For > the review if the common code I quickly did: > > mv m_can.c m_can_platform.c > mv m_can_core.c m_can.c > > The file names are similar to what we have for the C_CAN driver. > > s/classdev/priv/ > variable name s/m_can_dev/priv/ > > Then your patch 1/3 looks as shown below. I'm going to comment on that > one. The comments start with "***".... > So you would like me to align the names with the c_can driver? <snip> > > *** I didn't review the rest of the patch for now. > snipped the code to reply to the comment. > Looking to the generic code, you didn't really change the way > the driver is accessing the registers. Also the interrupt handling > and rx polling is as it was before. Does that work properly using > the SPI interface of the TCAN4x5x? I don't want to change any of that yet. Maybe my cover letter was not clear or did not go through. But the intention was just to break out the functionality to create a MCAN framework that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access the registers in the device. I don't want to do any functional changes at this time on the IP code itself until we have a framework. There should be no regression in the io mapped code. I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. For the original TCAN driver this was the way it was implemented. > > I was also thinking about optimized read/write functions handling > more than 4 bytes of data, e.g. for the CAN payload data. That > would speed-up SPI transfers, I think. But that could also be > introduced later-on. That would be the plan. > > Wolfgang. > > > > -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2018-10-31 20:15 ` Dan Murphy @ 2018-11-03 10:45 ` Wolfgang Grandegger 2018-11-09 15:14 ` Dan Murphy 2019-01-09 20:58 ` Dan Murphy 0 siblings, 2 replies; 20+ messages in thread From: Wolfgang Grandegger @ 2018-11-03 10:45 UTC (permalink / raw) To: Dan Murphy, mkl, davem; +Cc: linux-can, netdev, linux-kernel Hello Dan, Am 31.10.2018 um 21:15 schrieb Dan Murphy: > Wolfgang > > Thanks for the review > > On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: >> Hello Dan, >> >> for the RFC, could you please just do the necessary changes to the >> existing code. We can discuss about better names, etc. later. For >> the review if the common code I quickly did: >> >> mv m_can.c m_can_platform.c >> mv m_can_core.c m_can.c >> >> The file names are similar to what we have for the C_CAN driver. >> >> s/classdev/priv/ >> variable name s/m_can_dev/priv/ >> >> Then your patch 1/3 looks as shown below. I'm going to comment on that >> one. The comments start with "***".... >> > > So you would like me to align the names with the c_can driver? That would be the obvious choice. > <snip> >> >> *** I didn't review the rest of the patch for now. >> > > snipped the code to reply to the comment. > >> Looking to the generic code, you didn't really change the way >> the driver is accessing the registers. Also the interrupt handling >> and rx polling is as it was before. Does that work properly using >> the SPI interface of the TCAN4x5x? > > I don't want to change any of that yet. Maybe my cover letter was not clear > or did not go through. > > But the intention was just to break out the functionality to create a MCAN framework > that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access > the registers in the device. > > I don't want to do any functional changes at this time on the IP code itself until we have a framework. > There should be no regression in the io mapped code. > > I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. > For the original TCAN driver this was the way it was implemented. Do threaded interrupts with RX polling make sense? I think we need a common interface allowing to select hard-irqs+napi or threaded-irqs. Wolfgang. ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2018-11-03 10:45 ` Wolfgang Grandegger @ 2018-11-09 15:14 ` Dan Murphy 2019-01-09 20:58 ` Dan Murphy 1 sibling, 0 replies; 20+ messages in thread From: Dan Murphy @ 2018-11-09 15:14 UTC (permalink / raw) To: Wolfgang Grandegger, mkl, davem; +Cc: linux-can, netdev, linux-kernel Wolfgang On 11/03/2018 05:45 AM, Wolfgang Grandegger wrote: > Hello Dan, > > Am 31.10.2018 um 21:15 schrieb Dan Murphy: >> Wolfgang >> >> Thanks for the review >> >> On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: >>> Hello Dan, >>> >>> for the RFC, could you please just do the necessary changes to the >>> existing code. We can discuss about better names, etc. later. For >>> the review if the common code I quickly did: >>> >>> mv m_can.c m_can_platform.c >>> mv m_can_core.c m_can.c >>> >>> The file names are similar to what we have for the C_CAN driver. >>> >>> s/classdev/priv/ >>> variable name s/m_can_dev/priv/ >>> >>> Then your patch 1/3 looks as shown below. I'm going to comment on that >>> one. The comments start with "***".... >>> >> >> So you would like me to align the names with the c_can driver? > > That would be the obvious choice. >> <snip> >>> >>> *** I didn't review the rest of the patch for now. >>> >> >> snipped the code to reply to the comment. >> >>> Looking to the generic code, you didn't really change the way >>> the driver is accessing the registers. Also the interrupt handling >>> and rx polling is as it was before. Does that work properly using >>> the SPI interface of the TCAN4x5x? >> >> I don't want to change any of that yet. Maybe my cover letter was not clear >> or did not go through. >> >> But the intention was just to break out the functionality to create a MCAN framework >> that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access >> the registers in the device. >> >> I don't want to do any functional changes at this time on the IP code itself until we have a framework. >> There should be no regression in the io mapped code. >> >> I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. >> For the original TCAN driver this was the way it was implemented. > > Do threaded interrupts with RX polling make sense? I think we need a > common interface allowing to select hard-irqs+napi or threaded-irqs. > Sorry for the late reply I have been dealing with personal issues. I guess it would only make sense if the IRQ was edge trigger and not level. If the message is being processed and the interrupt is not cleared until later the device may produce another interrupt which may be missed by the processor for external devices. Or when coming out of suspend the edge may be missed. Otherwise if it was a level only then they do not make sense to support both and having to be able to select between the two would be good. Dan > Wolfgang. > -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2018-11-03 10:45 ` Wolfgang Grandegger 2018-11-09 15:14 ` Dan Murphy @ 2019-01-09 20:58 ` Dan Murphy 2019-01-10 7:44 ` Wolfgang Grandegger 1 sibling, 1 reply; 20+ messages in thread From: Dan Murphy @ 2019-01-09 20:58 UTC (permalink / raw) To: Wolfgang Grandegger, mkl, davem; +Cc: linux-can, netdev, linux-kernel Wolfgang On 11/3/18 5:45 AM, Wolfgang Grandegger wrote: > Hello Dan, > > Am 31.10.2018 um 21:15 schrieb Dan Murphy: >> Wolfgang >> >> Thanks for the review >> >> On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: >>> Hello Dan, >>> >>> for the RFC, could you please just do the necessary changes to the >>> existing code. We can discuss about better names, etc. later. For >>> the review if the common code I quickly did: >>> >>> mv m_can.c m_can_platform.c >>> mv m_can_core.c m_can.c >>> >>> The file names are similar to what we have for the C_CAN driver. >>> >>> s/classdev/priv/ >>> variable name s/m_can_dev/priv/ >>> >>> Then your patch 1/3 looks as shown below. I'm going to comment on that >>> one. The comments start with "***".... >>> >> >> So you would like me to align the names with the c_can driver? > > That would be the obvious choice. >> <snip> >>> >>> *** I didn't review the rest of the patch for now. >>> >> >> snipped the code to reply to the comment. >> >>> Looking to the generic code, you didn't really change the way >>> the driver is accessing the registers. Also the interrupt handling >>> and rx polling is as it was before. Does that work properly using >>> the SPI interface of the TCAN4x5x? >> >> I don't want to change any of that yet. Maybe my cover letter was not clear >> or did not go through. >> >> But the intention was just to break out the functionality to create a MCAN framework >> that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access >> the registers in the device. >> >> I don't want to do any functional changes at this time on the IP code itself until we have a framework. >> There should be no regression in the io mapped code. >> >> I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. >> For the original TCAN driver this was the way it was implemented. > > Do threaded interrupts with RX polling make sense? I think we need a > common interface allowing to select hard-irqs+napi or threaded-irqs. > I have been working on this code for about a month now and I am *not happy* with the amount of change that needs to be done to make the m_can a framework. I can tx/rx frames from another CAN device to the TCAN part but I have not even touched the iomapped code. The challenging part is that the m_can code that is currently available does not have to worry about atomic context because there is no peripheral waiting. Since the TCAN is a peripheral device we need to take into about the hard waits in IRQ context as well as the atomic context. Doing this creates many deltas in the base code that may break iomapped devices. I have had to add the thread_irqs and now I am in the midst of the issue you brought up with napi. I would have to schedule a queue for perp devices and leave the non-threaded iomapped irq. At this point I think it may be wise to leave the m_can code alone as it is working and stable and just work on the TCAN driver as a standalone driver. A framework would be nice but I think it would destablize the m_can driver which is embedded in many SoC's and we cannot possibly test everyone of them. What are your thoughts? Dan > Wolfgang. > -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2019-01-09 20:58 ` Dan Murphy @ 2019-01-10 7:44 ` Wolfgang Grandegger 2019-01-10 7:57 ` Rizvi, Mohammad Faiz Abbas 2019-01-10 12:53 ` Dan Murphy 0 siblings, 2 replies; 20+ messages in thread From: Wolfgang Grandegger @ 2019-01-10 7:44 UTC (permalink / raw) To: Dan Murphy, mkl, davem; +Cc: linux-can, netdev, linux-kernel Hello Dan, sorry for my late response on that topic... Am 09.01.19 um 21:58 schrieb Dan Murphy: > Wolfgang > > On 11/3/18 5:45 AM, Wolfgang Grandegger wrote: >> Hello Dan, >> >> Am 31.10.2018 um 21:15 schrieb Dan Murphy: >>> Wolfgang >>> >>> Thanks for the review >>> >>> On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: >>>> Hello Dan, >>>> >>>> for the RFC, could you please just do the necessary changes to the >>>> existing code. We can discuss about better names, etc. later. For >>>> the review if the common code I quickly did: >>>> >>>> mv m_can.c m_can_platform.c >>>> mv m_can_core.c m_can.c >>>> >>>> The file names are similar to what we have for the C_CAN driver. >>>> >>>> s/classdev/priv/ >>>> variable name s/m_can_dev/priv/ >>>> >>>> Then your patch 1/3 looks as shown below. I'm going to comment on that >>>> one. The comments start with "***".... >>>> >>> >>> So you would like me to align the names with the c_can driver? >> >> That would be the obvious choice. >>> <snip> >>>> >>>> *** I didn't review the rest of the patch for now. >>>> >>> >>> snipped the code to reply to the comment. >>> >>>> Looking to the generic code, you didn't really change the way >>>> the driver is accessing the registers. Also the interrupt handling >>>> and rx polling is as it was before. Does that work properly using >>>> the SPI interface of the TCAN4x5x? >>> >>> I don't want to change any of that yet. Maybe my cover letter was not clear >>> or did not go through. >>> >>> But the intention was just to break out the functionality to create a MCAN framework >>> that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access >>> the registers in the device. >>> >>> I don't want to do any functional changes at this time on the IP code itself until we have a framework. >>> There should be no regression in the io mapped code. >>> >>> I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. >>> For the original TCAN driver this was the way it was implemented. >> >> Do threaded interrupts with RX polling make sense? I think we need a >> common interface allowing to select hard-irqs+napi or threaded-irqs. >> > > I have been working on this code for about a month now and I am *not happy* with the amount of change that needs > to be done to make the m_can a framework. > > I can tx/rx frames from another CAN device to the TCAN part but I have not even touched the iomapped code. > > The challenging part is that the m_can code that is currently available does not have to worry about atomic context because > there is no peripheral waiting. Since the TCAN is a peripheral device we need to take into about the hard waits in IRQ context > as well as the atomic context. Doing this creates many deltas in the base code that may break iomapped devices. I have had to > add the thread_irqs and now I am in the midst of the issue you brought up with napi. I would have to schedule a queue for perp devices > and leave the non-threaded iomapped irq. > > At this point I think it may be wise to leave the m_can code alone as it is working and stable and just work on the TCAN driver as > a standalone driver. A framework would be nice but I think it would destablize the m_can driver which is embedded in many SoC's and > we cannot possibly test everyone of them. Unfortunately, I do not have m_can hardware at hand. > What are your thoughts? What we need is a common set of functions doing tx, rx, error and state handling. This will requires substantial changes to the existing io-mapped m_can driver, of course. I still believe it's worth the effort, but I agree that it's difficult for you to re-write and test the existing m_can driver. What about implementing such a set of common functions plus the SPI specific part for your TCAN device. What do you/others think? Wolfgang. ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2019-01-10 7:44 ` Wolfgang Grandegger @ 2019-01-10 7:57 ` Rizvi, Mohammad Faiz Abbas 2019-01-10 12:54 ` Dan Murphy 2019-01-10 12:53 ` Dan Murphy 1 sibling, 1 reply; 20+ messages in thread From: Rizvi, Mohammad Faiz Abbas @ 2019-01-10 7:57 UTC (permalink / raw) To: Wolfgang Grandegger, Dan Murphy, mkl, davem Cc: linux-can, netdev, linux-kernel Hi Dan, Wolfgang, On 1/10/2019 1:14 PM, Wolfgang Grandegger wrote: > Hello Dan, > > sorry for my late response on that topic... > > Am 09.01.19 um 21:58 schrieb Dan Murphy: >> Wolfgang >> >> On 11/3/18 5:45 AM, Wolfgang Grandegger wrote: >>> Hello Dan, >>> >>> Am 31.10.2018 um 21:15 schrieb Dan Murphy: >>>> Wolfgang >>>> >>>> Thanks for the review >>>> >>>> On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: >>>>> Hello Dan, >>>>> >>>>> for the RFC, could you please just do the necessary changes to the >>>>> existing code. We can discuss about better names, etc. later. For >>>>> the review if the common code I quickly did: >>>>> >>>>> mv m_can.c m_can_platform.c >>>>> mv m_can_core.c m_can.c >>>>> >>>>> The file names are similar to what we have for the C_CAN driver. >>>>> >>>>> s/classdev/priv/ >>>>> variable name s/m_can_dev/priv/ >>>>> >>>>> Then your patch 1/3 looks as shown below. I'm going to comment on that >>>>> one. The comments start with "***".... >>>>> >>>> >>>> So you would like me to align the names with the c_can driver? >>> >>> That would be the obvious choice. >>>> <snip> >>>>> >>>>> *** I didn't review the rest of the patch for now. >>>>> >>>> >>>> snipped the code to reply to the comment. >>>> >>>>> Looking to the generic code, you didn't really change the way >>>>> the driver is accessing the registers. Also the interrupt handling >>>>> and rx polling is as it was before. Does that work properly using >>>>> the SPI interface of the TCAN4x5x? >>>> >>>> I don't want to change any of that yet. Maybe my cover letter was not clear >>>> or did not go through. >>>> >>>> But the intention was just to break out the functionality to create a MCAN framework >>>> that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access >>>> the registers in the device. >>>> >>>> I don't want to do any functional changes at this time on the IP code itself until we have a framework. >>>> There should be no regression in the io mapped code. >>>> >>>> I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. >>>> For the original TCAN driver this was the way it was implemented. >>> >>> Do threaded interrupts with RX polling make sense? I think we need a >>> common interface allowing to select hard-irqs+napi or threaded-irqs. >>> >> >> I have been working on this code for about a month now and I am *not happy* with the amount of change that needs >> to be done to make the m_can a framework. >> >> I can tx/rx frames from another CAN device to the TCAN part but I have not even touched the iomapped code. >> >> The challenging part is that the m_can code that is currently available does not have to worry about atomic context because >> there is no peripheral waiting. Since the TCAN is a peripheral device we need to take into about the hard waits in IRQ context >> as well as the atomic context. Doing this creates many deltas in the base code that may break iomapped devices. I have had to >> add the thread_irqs and now I am in the midst of the issue you brought up with napi. I would have to schedule a queue for perp devices >> and leave the non-threaded iomapped irq. >> >> At this point I think it may be wise to leave the m_can code alone as it is working and stable and just work on the TCAN driver as >> a standalone driver. A framework would be nice but I think it would destablize the m_can driver which is embedded in many SoC's and >> we cannot possibly test everyone of them. > > Unfortunately, I do not have m_can hardware at hand. There are exactly 3 platforms in mainline that use the m_can driver. I can help Dan test it on a dra76x. I haven't had a chance to look at the changes in depth, but just testing for regressions on existing platforms shouldn't be too hard once we have it working on one. Thanks, Faiz > >> What are your thoughts? > > What we need is a common set of functions doing tx, rx, error and state > handling. This will requires substantial changes to the existing > io-mapped m_can driver, of course. I still believe it's worth the > effort, but I agree that it's difficult for you to re-write and test the > existing m_can driver. > > What about implementing such a set of common functions plus the SPI > specific part for your TCAN device. What do you/others think? > > Wolfgang. > ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2019-01-10 7:57 ` Rizvi, Mohammad Faiz Abbas @ 2019-01-10 12:54 ` Dan Murphy 0 siblings, 0 replies; 20+ messages in thread From: Dan Murphy @ 2019-01-10 12:54 UTC (permalink / raw) To: Rizvi, Mohammad Faiz Abbas, Wolfgang Grandegger, mkl, davem Cc: linux-can, netdev, linux-kernel Faiz On 1/10/19 1:57 AM, Rizvi, Mohammad Faiz Abbas wrote: > Hi Dan, Wolfgang, > > On 1/10/2019 1:14 PM, Wolfgang Grandegger wrote: >> Hello Dan, >> >> sorry for my late response on that topic... >> >> Am 09.01.19 um 21:58 schrieb Dan Murphy: >>> Wolfgang >>> >>> On 11/3/18 5:45 AM, Wolfgang Grandegger wrote: >>>> Hello Dan, >>>> >>>> Am 31.10.2018 um 21:15 schrieb Dan Murphy: >>>>> Wolfgang >>>>> >>>>> Thanks for the review >>>>> >>>>> On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: >>>>>> Hello Dan, >>>>>> >>>>>> for the RFC, could you please just do the necessary changes to the >>>>>> existing code. We can discuss about better names, etc. later. For >>>>>> the review if the common code I quickly did: >>>>>> >>>>>> mv m_can.c m_can_platform.c >>>>>> mv m_can_core.c m_can.c >>>>>> >>>>>> The file names are similar to what we have for the C_CAN driver. >>>>>> >>>>>> s/classdev/priv/ >>>>>> variable name s/m_can_dev/priv/ >>>>>> >>>>>> Then your patch 1/3 looks as shown below. I'm going to comment on that >>>>>> one. The comments start with "***".... >>>>>> >>>>> >>>>> So you would like me to align the names with the c_can driver? >>>> >>>> That would be the obvious choice. >>>>> <snip> >>>>>> >>>>>> *** I didn't review the rest of the patch for now. >>>>>> >>>>> >>>>> snipped the code to reply to the comment. >>>>> >>>>>> Looking to the generic code, you didn't really change the way >>>>>> the driver is accessing the registers. Also the interrupt handling >>>>>> and rx polling is as it was before. Does that work properly using >>>>>> the SPI interface of the TCAN4x5x? >>>>> >>>>> I don't want to change any of that yet. Maybe my cover letter was not clear >>>>> or did not go through. >>>>> >>>>> But the intention was just to break out the functionality to create a MCAN framework >>>>> that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access >>>>> the registers in the device. >>>>> >>>>> I don't want to do any functional changes at this time on the IP code itself until we have a framework. >>>>> There should be no regression in the io mapped code. >>>>> >>>>> I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. >>>>> For the original TCAN driver this was the way it was implemented. >>>> >>>> Do threaded interrupts with RX polling make sense? I think we need a >>>> common interface allowing to select hard-irqs+napi or threaded-irqs. >>>> >>> >>> I have been working on this code for about a month now and I am *not happy* with the amount of change that needs >>> to be done to make the m_can a framework. >>> >>> I can tx/rx frames from another CAN device to the TCAN part but I have not even touched the iomapped code. >>> >>> The challenging part is that the m_can code that is currently available does not have to worry about atomic context because >>> there is no peripheral waiting. Since the TCAN is a peripheral device we need to take into about the hard waits in IRQ context >>> as well as the atomic context. Doing this creates many deltas in the base code that may break iomapped devices. I have had to >>> add the thread_irqs and now I am in the midst of the issue you brought up with napi. I would have to schedule a queue for perp devices >>> and leave the non-threaded iomapped irq. >>> >>> At this point I think it may be wise to leave the m_can code alone as it is working and stable and just work on the TCAN driver as >>> a standalone driver. A framework would be nice but I think it would destablize the m_can driver which is embedded in many SoC's and >>> we cannot possibly test everyone of them. >> >> Unfortunately, I do not have m_can hardware at hand. > > There are exactly 3 platforms in mainline that use the m_can driver. I can help Dan test it on a dra76x. I haven't had a chance to look at the changes in depth, but just testing for regressions on existing platforms shouldn't be too hard once we have it working on one. > Thanks Faiz. Once I have the TCAN fully working I will post the branch to my repo. Dan > Thanks, > Faiz > >> >>> What are your thoughts? >> >> What we need is a common set of functions doing tx, rx, error and state >> handling. This will requires substantial changes to the existing >> io-mapped m_can driver, of course. I still believe it's worth the >> effort, but I agree that it's difficult for you to re-write and test the >> existing m_can driver. >> >> What about implementing such a set of common functions plus the SPI >> specific part for your TCAN device. What do you/others think? >> >> Wolfgang. >> -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2019-01-10 7:44 ` Wolfgang Grandegger 2019-01-10 7:57 ` Rizvi, Mohammad Faiz Abbas @ 2019-01-10 12:53 ` Dan Murphy 2019-01-11 8:27 ` Wolfgang Grandegger 1 sibling, 1 reply; 20+ messages in thread From: Dan Murphy @ 2019-01-10 12:53 UTC (permalink / raw) To: Wolfgang Grandegger, mkl, davem; +Cc: linux-can, netdev, linux-kernel Wolfgang On 1/10/19 1:44 AM, Wolfgang Grandegger wrote: > Hello Dan, > > sorry for my late response on that topic... > > Am 09.01.19 um 21:58 schrieb Dan Murphy: >> Wolfgang >> >> On 11/3/18 5:45 AM, Wolfgang Grandegger wrote: >>> Hello Dan, >>> >>> Am 31.10.2018 um 21:15 schrieb Dan Murphy: >>>> Wolfgang >>>> >>>> Thanks for the review >>>> >>>> On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: >>>>> Hello Dan, >>>>> >>>>> for the RFC, could you please just do the necessary changes to the >>>>> existing code. We can discuss about better names, etc. later. For >>>>> the review if the common code I quickly did: >>>>> >>>>> mv m_can.c m_can_platform.c >>>>> mv m_can_core.c m_can.c >>>>> >>>>> The file names are similar to what we have for the C_CAN driver. >>>>> >>>>> s/classdev/priv/ >>>>> variable name s/m_can_dev/priv/ >>>>> >>>>> Then your patch 1/3 looks as shown below. I'm going to comment on that >>>>> one. The comments start with "***".... >>>>> >>>> >>>> So you would like me to align the names with the c_can driver? >>> >>> That would be the obvious choice. >>>> <snip> >>>>> >>>>> *** I didn't review the rest of the patch for now. >>>>> >>>> >>>> snipped the code to reply to the comment. >>>> >>>>> Looking to the generic code, you didn't really change the way >>>>> the driver is accessing the registers. Also the interrupt handling >>>>> and rx polling is as it was before. Does that work properly using >>>>> the SPI interface of the TCAN4x5x? >>>> >>>> I don't want to change any of that yet. Maybe my cover letter was not clear >>>> or did not go through. >>>> >>>> But the intention was just to break out the functionality to create a MCAN framework >>>> that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access >>>> the registers in the device. >>>> >>>> I don't want to do any functional changes at this time on the IP code itself until we have a framework. >>>> There should be no regression in the io mapped code. >>>> >>>> I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. >>>> For the original TCAN driver this was the way it was implemented. >>> >>> Do threaded interrupts with RX polling make sense? I think we need a >>> common interface allowing to select hard-irqs+napi or threaded-irqs. >>> >> >> I have been working on this code for about a month now and I am *not happy* with the amount of change that needs >> to be done to make the m_can a framework. >> >> I can tx/rx frames from another CAN device to the TCAN part but I have not even touched the iomapped code. >> >> The challenging part is that the m_can code that is currently available does not have to worry about atomic context because >> there is no peripheral waiting. Since the TCAN is a peripheral device we need to take into about the hard waits in IRQ context >> as well as the atomic context. Doing this creates many deltas in the base code that may break iomapped devices. I have had to >> add the thread_irqs and now I am in the midst of the issue you brought up with napi. I would have to schedule a queue for perp devices >> and leave the non-threaded iomapped irq. >> >> At this point I think it may be wise to leave the m_can code alone as it is working and stable and just work on the TCAN driver as >> a standalone driver. A framework would be nice but I think it would destablize the m_can driver which is embedded in many SoC's and >> we cannot possibly test everyone of them. > > Unfortunately, I do not have m_can hardware at hand. > >> What are your thoughts? > > What we need is a common set of functions doing tx, rx, error and state > handling. This will requires substantial changes to the existing > io-mapped m_can driver, of course. I still believe it's worth the > effort, but I agree that it's difficult for you to re-write and test the > existing m_can driver. OK I will keep working on it. What you are describing is what I have done. I have abstracted the register reads and writes away and I am in the process of abstracting away the device specific initialization. > > What about implementing such a set of common functions plus the SPI > specific part for your TCAN device. What do you/others think? As stated above this is what I have. But the m_can driver was written for io-mapped that has no delays so we need to take into about peripheral wait time in IRQ and atomic context. This is where the issues are stemming from mainly in the atomic context. Dan > > Wolfgang. > -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2019-01-10 12:53 ` Dan Murphy @ 2019-01-11 8:27 ` Wolfgang Grandegger 2019-01-11 12:27 ` Dan Murphy 0 siblings, 1 reply; 20+ messages in thread From: Wolfgang Grandegger @ 2019-01-11 8:27 UTC (permalink / raw) To: Dan Murphy, mkl, davem; +Cc: linux-can, netdev, linux-kernel Hello Dan, Am 10.01.19 um 13:53 schrieb Dan Murphy: > Wolfgang > > On 1/10/19 1:44 AM, Wolfgang Grandegger wrote: >> Hello Dan, >> >> sorry for my late response on that topic... >> >> Am 09.01.19 um 21:58 schrieb Dan Murphy: >>> Wolfgang >>> >>> On 11/3/18 5:45 AM, Wolfgang Grandegger wrote: >>>> Hello Dan, >>>> >>>> Am 31.10.2018 um 21:15 schrieb Dan Murphy: >>>>> Wolfgang >>>>> >>>>> Thanks for the review >>>>> >>>>> On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: >>>>>> Hello Dan, >>>>>> >>>>>> for the RFC, could you please just do the necessary changes to the >>>>>> existing code. We can discuss about better names, etc. later. For >>>>>> the review if the common code I quickly did: >>>>>> >>>>>> mv m_can.c m_can_platform.c >>>>>> mv m_can_core.c m_can.c >>>>>> >>>>>> The file names are similar to what we have for the C_CAN driver. >>>>>> >>>>>> s/classdev/priv/ >>>>>> variable name s/m_can_dev/priv/ >>>>>> >>>>>> Then your patch 1/3 looks as shown below. I'm going to comment on that >>>>>> one. The comments start with "***".... >>>>>> >>>>> >>>>> So you would like me to align the names with the c_can driver? >>>> >>>> That would be the obvious choice. >>>>> <snip> >>>>>> >>>>>> *** I didn't review the rest of the patch for now. >>>>>> >>>>> >>>>> snipped the code to reply to the comment. >>>>> >>>>>> Looking to the generic code, you didn't really change the way >>>>>> the driver is accessing the registers. Also the interrupt handling >>>>>> and rx polling is as it was before. Does that work properly using >>>>>> the SPI interface of the TCAN4x5x? >>>>> >>>>> I don't want to change any of that yet. Maybe my cover letter was not clear >>>>> or did not go through. >>>>> >>>>> But the intention was just to break out the functionality to create a MCAN framework >>>>> that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access >>>>> the registers in the device. >>>>> >>>>> I don't want to do any functional changes at this time on the IP code itself until we have a framework. >>>>> There should be no regression in the io mapped code. >>>>> >>>>> I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. >>>>> For the original TCAN driver this was the way it was implemented. >>>> >>>> Do threaded interrupts with RX polling make sense? I think we need a >>>> common interface allowing to select hard-irqs+napi or threaded-irqs. >>>> >>> >>> I have been working on this code for about a month now and I am *not happy* with the amount of change that needs >>> to be done to make the m_can a framework. >>> >>> I can tx/rx frames from another CAN device to the TCAN part but I have not even touched the iomapped code. >>> >>> The challenging part is that the m_can code that is currently available does not have to worry about atomic context because >>> there is no peripheral waiting. Since the TCAN is a peripheral device we need to take into about the hard waits in IRQ context >>> as well as the atomic context. Doing this creates many deltas in the base code that may break iomapped devices. I have had to >>> add the thread_irqs and now I am in the midst of the issue you brought up with napi. I would have to schedule a queue for perp devices >>> and leave the non-threaded iomapped irq. >>> >>> At this point I think it may be wise to leave the m_can code alone as it is working and stable and just work on the TCAN driver as >>> a standalone driver. A framework would be nice but I think it would destablize the m_can driver which is embedded in many SoC's and >>> we cannot possibly test everyone of them. >> >> Unfortunately, I do not have m_can hardware at hand. >> >>> What are your thoughts? >> >> What we need is a common set of functions doing tx, rx, error and state >> handling. This will requires substantial changes to the existing >> io-mapped m_can driver, of course. I still believe it's worth the >> effort, but I agree that it's difficult for you to re-write and test the >> existing m_can driver. > > OK I will keep working on it. What you are describing is what I have done. > I have abstracted the register reads and writes away and I am in the process > of abstracting away the device specific initialization. Would be nice if you could show your current implementation... >> >> What about implementing such a set of common functions plus the SPI >> specific part for your TCAN device. What do you/others think? > > As stated above this is what I have. But the m_can driver was written for io-mapped that has no delays > so we need to take into about peripheral wait time in IRQ and atomic context. > > This is where the issues are stemming from mainly in the atomic context. ... to understand a bit better what you exactly mean. Or does the last patch you sent already highlight them. Wolfgang. ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code 2019-01-11 8:27 ` Wolfgang Grandegger @ 2019-01-11 12:27 ` Dan Murphy 0 siblings, 0 replies; 20+ messages in thread From: Dan Murphy @ 2019-01-11 12:27 UTC (permalink / raw) To: Wolfgang Grandegger, mkl, davem; +Cc: linux-can, netdev, linux-kernel Wolfgang On 1/11/19 2:27 AM, Wolfgang Grandegger wrote: > Hello Dan, > > Am 10.01.19 um 13:53 schrieb Dan Murphy: >> Wolfgang >> >> On 1/10/19 1:44 AM, Wolfgang Grandegger wrote: >>> Hello Dan, >>> >>> sorry for my late response on that topic... >>> >>> Am 09.01.19 um 21:58 schrieb Dan Murphy: >>>> Wolfgang >>>> >>>> On 11/3/18 5:45 AM, Wolfgang Grandegger wrote: >>>>> Hello Dan, >>>>> >>>>> Am 31.10.2018 um 21:15 schrieb Dan Murphy: >>>>>> Wolfgang >>>>>> >>>>>> Thanks for the review >>>>>> >>>>>> On 10/27/2018 09:19 AM, Wolfgang Grandegger wrote: >>>>>>> Hello Dan, >>>>>>> >>>>>>> for the RFC, could you please just do the necessary changes to the >>>>>>> existing code. We can discuss about better names, etc. later. For >>>>>>> the review if the common code I quickly did: >>>>>>> >>>>>>> mv m_can.c m_can_platform.c >>>>>>> mv m_can_core.c m_can.c >>>>>>> >>>>>>> The file names are similar to what we have for the C_CAN driver. >>>>>>> >>>>>>> s/classdev/priv/ >>>>>>> variable name s/m_can_dev/priv/ >>>>>>> >>>>>>> Then your patch 1/3 looks as shown below. I'm going to comment on that >>>>>>> one. The comments start with "***".... >>>>>>> >>>>>> >>>>>> So you would like me to align the names with the c_can driver? >>>>> >>>>> That would be the obvious choice. >>>>>> <snip> >>>>>>> >>>>>>> *** I didn't review the rest of the patch for now. >>>>>>> >>>>>> >>>>>> snipped the code to reply to the comment. >>>>>> >>>>>>> Looking to the generic code, you didn't really change the way >>>>>>> the driver is accessing the registers. Also the interrupt handling >>>>>>> and rx polling is as it was before. Does that work properly using >>>>>>> the SPI interface of the TCAN4x5x? >>>>>> >>>>>> I don't want to change any of that yet. Maybe my cover letter was not clear >>>>>> or did not go through. >>>>>> >>>>>> But the intention was just to break out the functionality to create a MCAN framework >>>>>> that can be used by devices that contain the Bosch MCAN core and provider their own protocal to access >>>>>> the registers in the device. >>>>>> >>>>>> I don't want to do any functional changes at this time on the IP code itself until we have a framework. >>>>>> There should be no regression in the io mapped code. >>>>>> >>>>>> I did comment on the interrupt handling and asked if a threaded work queue would affect CAN timing. >>>>>> For the original TCAN driver this was the way it was implemented. >>>>> >>>>> Do threaded interrupts with RX polling make sense? I think we need a >>>>> common interface allowing to select hard-irqs+napi or threaded-irqs. >>>>> >>>> >>>> I have been working on this code for about a month now and I am *not happy* with the amount of change that needs >>>> to be done to make the m_can a framework. >>>> >>>> I can tx/rx frames from another CAN device to the TCAN part but I have not even touched the iomapped code. >>>> >>>> The challenging part is that the m_can code that is currently available does not have to worry about atomic context because >>>> there is no peripheral waiting. Since the TCAN is a peripheral device we need to take into about the hard waits in IRQ context >>>> as well as the atomic context. Doing this creates many deltas in the base code that may break iomapped devices. I have had to >>>> add the thread_irqs and now I am in the midst of the issue you brought up with napi. I would have to schedule a queue for perp devices >>>> and leave the non-threaded iomapped irq. >>>> >>>> At this point I think it may be wise to leave the m_can code alone as it is working and stable and just work on the TCAN driver as >>>> a standalone driver. A framework would be nice but I think it would destablize the m_can driver which is embedded in many SoC's and >>>> we cannot possibly test everyone of them. >>> >>> Unfortunately, I do not have m_can hardware at hand. >>> >>>> What are your thoughts? >>> >>> What we need is a common set of functions doing tx, rx, error and state >>> handling. This will requires substantial changes to the existing >>> io-mapped m_can driver, of course. I still believe it's worth the >>> effort, but I agree that it's difficult for you to re-write and test the >>> existing m_can driver. >> >> OK I will keep working on it. What you are describing is what I have done. >> I have abstracted the register reads and writes away and I am in the process >> of abstracting away the device specific initialization. > > Would be nice if you could show your current implementation... > I did submit v2 with the current implementation but the code has changed a bit since then I clean up the code and post v3 today after I get the Rx working properly. >>> >>> What about implementing such a set of common functions plus the SPI >>> specific part for your TCAN device. What do you/others think? >> >> As stated above this is what I have. But the m_can driver was written for io-mapped that has no delays >> so we need to take into about peripheral wait time in IRQ and atomic context. >> >> This is where the issues are stemming from mainly in the atomic context. > > ... to understand a bit better what you exactly mean. Or does the last > patch you sent already highlight them. v3 will show the deltas Dan > > Wolfgang. > -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 20+ messages in thread
* [RFC PATCH 2/3] dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver 2018-10-10 14:20 [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy 2018-10-10 14:20 ` [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code Dan Murphy @ 2018-10-10 14:20 ` Dan Murphy 2018-10-10 14:20 ` [RFC PATCH 3/3] can: tcan4x5x: Add tcan4x5x driver to the kernel Dan Murphy 2018-10-17 20:21 ` [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy 3 siblings, 0 replies; 20+ messages in thread From: Dan Murphy @ 2018-10-10 14:20 UTC (permalink / raw) To: wg, mkl, davem; +Cc: linux-can, netdev, linux-kernel, Dan Murphy DT binding documentation for TI TCAN4x5x driver. Signed-off-by: Dan Murphy <dmurphy@ti.com> --- .../devicetree/bindings/net/can/tcan4x5x.txt | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt diff --git a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt new file mode 100644 index 000000000000..c742d0f10861 --- /dev/null +++ b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt @@ -0,0 +1,34 @@ +Texas Instruments TCAN4x5x CAN Controller +================================================ + +This file provides device node information for the TCAN4x5x interface contains. + +Required properties: + - compatible: "ti,tcan4x5x" + - reg: 0 + - #address-cells : 1 + - #size-cells : 0 + - spi-max-frequency: Maximum frequency of the SPI bus the chip can + operate at should be less than or equal to 18 MHz. + - data-ready-gpios: Interrupt GPIO for data and error reporting. + - wake-up-gpios: Wake up GPIO to wake up the TCAN device + +See Documentation/devicetree/bindings/net/can/m_can.txt for additional +required property details. + +Optional properties: + - reset-gpios: Hardwired output GPIO. If not defined then software + reset. + +Example: +tcan4x5x: tcan4x5x@0 { + compatible = "ti,tcan4x5x"; + reg = <0>; + #address-cells = <1>; + #size-cells = <1>; + clocks = <&tclkin_ck>; + spi-max-frequency = <10000000>; + data-ready-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; + wake-up-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; + }; -- 2.19.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC PATCH 3/3] can: tcan4x5x: Add tcan4x5x driver to the kernel 2018-10-10 14:20 [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy 2018-10-10 14:20 ` [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code Dan Murphy 2018-10-10 14:20 ` [RFC PATCH 2/3] dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver Dan Murphy @ 2018-10-10 14:20 ` Dan Murphy 2018-10-17 20:21 ` [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy 3 siblings, 0 replies; 20+ messages in thread From: Dan Murphy @ 2018-10-10 14:20 UTC (permalink / raw) To: wg, mkl, davem; +Cc: linux-can, netdev, linux-kernel, Dan Murphy Add the TCAN4x5x SPI CAN driver. This device uses the Bosch MCAN IP core along with a SPI interface map. Leverage the MCAN common core code to manage the MCAN IP. This device has a special method to indicate a write/read operation on the data payload. Signed-off-by: Dan Murphy <dmurphy@ti.com> --- drivers/net/can/m_can/Kconfig | 6 + drivers/net/can/m_can/Makefile | 1 + drivers/net/can/m_can/tcan4x5x.c | 321 +++++++++++++++++++++++++++++++ 3 files changed, 328 insertions(+) create mode 100644 drivers/net/can/m_can/tcan4x5x.c diff --git a/drivers/net/can/m_can/Kconfig b/drivers/net/can/m_can/Kconfig index b1a9358b7660..943e10e15f17 100644 --- a/drivers/net/can/m_can/Kconfig +++ b/drivers/net/can/m_can/Kconfig @@ -15,3 +15,9 @@ config CAN_M_CAN_PLATFORM tristate "Bosch M_CAN devices" ---help--- Say Y here if you want to support for Bosch M_CAN controller. + +config CAN_M_CAN_TCAN4X5X + depends on CAN_M_CAN_CORE + tristate "TCAN4X5X M_CAN device" + ---help--- + Say Y here if you want to support for TI M_CAN controller. diff --git a/drivers/net/can/m_can/Makefile b/drivers/net/can/m_can/Makefile index e013d6f4c941..6a9584908d10 100644 --- a/drivers/net/can/m_can/Makefile +++ b/drivers/net/can/m_can/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_CAN_M_CAN_CORE) += m_can_core.o obj-$(CONFIG_CAN_M_CAN_PLATFORM) += m_can.o +obj-$(CONFIG_CAN_M_CAN_TCAN4X5X) += tcan4x5x.o diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c new file mode 100644 index 000000000000..e43d591c696d --- /dev/null +++ b/drivers/net/can/m_can/tcan4x5x.c @@ -0,0 +1,321 @@ +// SPDX-License-Identifier: GPL-2.0 +// SPI to CAN driver for the Texas Instruments TCAN4x5x +// Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + +#include <linux/regmap.h> +#include <linux/spi/spi.h> + +#include <linux/regulator/consumer.h> +#include <linux/gpio/consumer.h> + +#include "m_can_core.h" + +#define DEVICE_NAME "tcan4x5x" +#define TCAN4X5X_EXT_CLK_DEF 40000000 + +#define TCAN4X5X_DEV_ID0 0x00 +#define TCAN4X5X_DEV_ID1 0x04 +#define TCAN4X5X_REV 0x08 +#define TCAN4X5X_STATUS 0x0C +#define TCAN4X5X_ERROR_STATUS 0x10 +#define TCAN4X5X_CONTROL 0x14 + +#define TCAN4X5X_CONFIG 0x800 +#define TCAN4X5X_TS_PRESCALE 0x804 +#define TCAN4X5X_TEST_REG 0x808 +#define TCAN4X5X_INT_FLAGS 0x820 +#define TCAN4X5X_MCAN_INT_REG 0x824 +#define TCAN4X5X_INT_EN 0x830 + +#define TCAN4X5X_MRAM_START 0x8000 + +#define TCAN4X5X_MAX_REGISTER 0x8fff + +#define TCAN4X5X_WRITE_CMD (0x61 << 24) +#define TCAN4X5X_READ_CMD (0x41 << 24) + +struct tcan4x5x_priv { + struct regmap *regmap; + struct spi_device *spi; + struct mutex tcan4x5x_lock; /* SPI device lock */ + + struct gpio_desc *reset_gpio; + struct gpio_desc *interrupt_gpio; + struct gpio_desc *wake_gpio; + struct regulator *power; +}; + +static int regmap_spi_gather_write(void *context, const void *reg, + size_t reg_len, const void *val, + size_t val_len) +{ + struct device *dev = context; + struct spi_device *spi = to_spi_device(dev); + u32 addr; + struct spi_message m; + struct spi_transfer t[2] = {{ .tx_buf = &addr, .len = 4, .cs_change = 0,}, + { .tx_buf = val, .len = val_len, },}; + + addr = TCAN4X5X_WRITE_CMD | (*((u16 *)reg) << 8) | val_len >> 2; + + spi_message_init(&m); + spi_message_add_tail(&t[0], &m); + spi_message_add_tail(&t[1], &m); + + return spi_sync(spi, &m); +} + +static int tcan4x5x_regmap_write(void *context, const void *data, size_t count) +{ + u16 *reg = (u16 *)(data); + const u32 *val = data + 2; + + return regmap_spi_gather_write(context, reg, 2, val, count - 2); +} + +static int regmap_spi_async_write(void *context, + const void *reg, size_t reg_len, + const void *val, size_t val_len, + struct regmap_async *a) +{ + return -ENOTSUPP; +} + +static struct regmap_async *regmap_spi_async_alloc(void) +{ + return NULL; +} + +static int tcan4x5x_regmap_read(void *context, + const void *reg, size_t reg_size, + void *val, size_t val_size) +{ + struct device *dev = context; + struct spi_device *spi = to_spi_device(dev); + + u32 addr = TCAN4X5X_READ_CMD | (*((u16 *)reg) << 8) | val_size >> 2; + + return spi_write_then_read(spi, &addr, 4, val, val_size); +} + +static struct regmap_bus tcan4x5x_bus = { + .write = tcan4x5x_regmap_write, + .gather_write = regmap_spi_gather_write, + .async_write = regmap_spi_async_write, + .async_alloc = regmap_spi_async_alloc, + .read = tcan4x5x_regmap_read, + .read_flag_mask = 0x00, + .reg_format_endian_default = REGMAP_ENDIAN_NATIVE, + .val_format_endian_default = REGMAP_ENDIAN_NATIVE, +}; + +u32 tcan4x5x_read_reg(const struct m_can_classdev *m_can_class, int reg) +{ + struct tcan4x5x_priv *priv = (struct tcan4x5x_priv *)m_can_class->device_data; + u32 val; + + regmap_read(priv->regmap, reg, &val); + + return val; +} + +u32 tcan4x5x_read_fifo(const struct m_can_classdev *m_can_class, int reg) +{ + struct tcan4x5x_priv *priv = (struct tcan4x5x_priv *)m_can_class->device_data; + u32 val; + + regmap_read(priv->regmap, reg, &val); + + return val; +} + +int tcan4x5x_write_reg(const struct m_can_classdev *m_can_class, int reg, int val) +{ + struct tcan4x5x_priv *priv = (struct tcan4x5x_priv *)m_can_class->device_data; + + return regmap_write(priv->regmap, reg, val); +} + +int tcan4x5x_write_fifo(const struct m_can_classdev *m_can_class, int reg, int val) +{ + struct tcan4x5x_priv *priv = (struct tcan4x5x_priv *)m_can_class->device_data; + + return regmap_write(priv->regmap, reg, val); +} + +static int tcan4x5x_power_enable(struct regulator *reg, int enable) +{ + if (IS_ERR_OR_NULL(reg)) + return 0; + + if (enable) + return regulator_enable(reg); + else + return regulator_disable(reg); +} + +static int tcan4x5x_init(struct m_can_classdev *class_dev) +{ + /* Zero out the MCAN buffers */ + m_can_init_ram(class_dev); + + return 0; +} + +static int tcan4x5x_parse_config(struct m_can_classdev *class_dev) +{ + struct tcan4x5x_priv *tcan4x5x = (struct tcan4x5x_priv *)class_dev->device_data; + + tcan4x5x->reset_gpio = devm_gpiod_get_optional(class_dev->dev, + "reset", GPIOD_OUT_LOW); + if (IS_ERR(tcan4x5x->reset_gpio)) + tcan4x5x->reset_gpio = NULL; + + tcan4x5x->wake_gpio = devm_gpiod_get_optional(class_dev->dev, + "wake-up", GPIOD_OUT_LOW); + if (IS_ERR(tcan4x5x->wake_gpio)) + tcan4x5x->wake_gpio = NULL; + + tcan4x5x->interrupt_gpio = devm_gpiod_get(class_dev->dev, + "data-ready", GPIOD_IN); + if (IS_ERR(tcan4x5x->interrupt_gpio)) { + dev_err(class_dev->dev, "data-ready gpio not defined\n"); + return -EINVAL; + } + + class_dev->net->irq = gpiod_to_irq(tcan4x5x->interrupt_gpio); + + tcan4x5x->power = devm_regulator_get_optional(class_dev->dev, + "vsup"); + if (PTR_ERR(tcan4x5x->power) == -EPROBE_DEFER) + return -EPROBE_DEFER; + + return 0; +} + +static const struct regmap_config tcan4x5x_regmap = { + .reg_bits = 16, + .val_bits = 32, + .cache_type = REGCACHE_NONE, + .max_register = TCAN4X5X_MAX_REGISTER, +}; + +static int tcan4x5x_can_probe(struct spi_device *spi) +{ + struct tcan4x5x_priv *priv; + struct m_can_classdev *mcan_class; + int freq, ret; + + mcan_class = m_can_core_allocate_dev(&spi->dev); + priv = devm_kzalloc(&spi->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + mcan_class->device_data = priv; + + m_can_core_get_clocks(mcan_class); + if (IS_ERR(mcan_class->cclk)) { + dev_err(&spi->dev, "no CAN clock source defined\n"); + freq = TCAN4X5X_EXT_CLK_DEF; + } else { + freq = clk_get_rate(mcan_class->cclk); + } + + /* Sanity check */ + if (freq < 20000000 || freq > TCAN4X5X_EXT_CLK_DEF) + return -ERANGE; + + mcan_class->reg_offset = 0x1000; + mcan_class->pm_clock_support = 0; + mcan_class->mram_start = TCAN4X5X_MRAM_START; + mcan_class->m_can_read = &tcan4x5x_read_reg; + mcan_class->m_can_write = &tcan4x5x_write_reg; + mcan_class->m_can_fifo_write = &tcan4x5x_write_fifo; + mcan_class->m_can_fifo_read = &tcan4x5x_read_fifo; + + mcan_class->can.clock.freq = freq; + + mcan_class->dev = &spi->dev; + spi_set_drvdata(spi, priv); + + ret = tcan4x5x_parse_config(mcan_class); + if (ret) + goto out_clk; + + /* Configure the SPI bus */ + spi->bits_per_word = 32; + ret = spi_setup(spi); + if (ret) + goto out_clk; + + priv->regmap = devm_regmap_init(&spi->dev, &tcan4x5x_bus, + &spi->dev, &tcan4x5x_regmap); + + tcan4x5x_init(mcan_class); + + m_can_core_register(mcan_class); + + mutex_init(&priv->tcan4x5x_lock); + + netdev_info(mcan_class->net, "TCAN4X5X successfully initialized.\n"); + return 0; + +out_clk: + if (!IS_ERR(mcan_class->cclk)) { + clk_disable_unprepare(mcan_class->cclk); + clk_disable_unprepare(mcan_class->hclk); + } + + free_candev(mcan_class->net); + dev_err(&spi->dev, "Probe failed, err=%d\n", -ret); + return ret; +} + +static int tcan4x5x_can_remove(struct spi_device *spi) +{ +#if 0 + struct tcan4x5x_priv *priv = spi_get_drvdata(spi); + struct net_device *net = mcan_class->net; + + unregister_candev(net); + + tcan4x5x_power_enable(priv->power, 0); + + if (!IS_ERR(mcan_class->cclk)) + clk_disable_unprepare(mcan_class->cclk); + + free_candev(net); +#endif + return 0; +} + +static const struct of_device_id tcan4x5x_of_match[] = { + { .compatible = "ti,tcan4x5x", }, + { } +}; +MODULE_DEVICE_TABLE(of, tcan4x5x_of_match); + +static const struct spi_device_id tcan4x5x_id_table[] = { + { + .name = "tcan4x5x", + .driver_data = 0, + }, + { } +}; +MODULE_DEVICE_TABLE(spi, tcan4x5x_id_table); + +static struct spi_driver tcan4x5x_can_driver = { + .driver = { + .name = DEVICE_NAME, + .of_match_table = tcan4x5x_of_match, + .pm = NULL, + }, + .id_table = tcan4x5x_id_table, + .probe = tcan4x5x_can_probe, + .remove = tcan4x5x_can_remove, +}; +module_spi_driver(tcan4x5x_can_driver); + +MODULE_AUTHOR("Dan Murphy <dmurphy@ti.com>"); +MODULE_DESCRIPTION("Texas Instruments TCAN4x5x CAN driver"); +MODULE_LICENSE("GPL v2"); -- 2.19.0 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 0/3] M_CAN Framework rework 2018-10-10 14:20 [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy ` (2 preceding siblings ...) 2018-10-10 14:20 ` [RFC PATCH 3/3] can: tcan4x5x: Add tcan4x5x driver to the kernel Dan Murphy @ 2018-10-17 20:21 ` Dan Murphy 2018-10-24 7:33 ` Faiz Abbas 2018-10-24 7:43 ` Wolfgang Grandegger 3 siblings, 2 replies; 20+ messages in thread From: Dan Murphy @ 2018-10-17 20:21 UTC (permalink / raw) To: wg, mkl, davem; +Cc: linux-can, netdev, linux-kernel Bump On 10/10/2018 09:20 AM, Dan Murphy wrote: > All > > This patch series creates a m_can core framework that devices can register > to. The m_can core manages the Bosch IP and CAN frames. Each device that > is registered is responsible for managing device specific functions. > > This rewrite was suggested in a device driver submission for the TCAN4x5x > device > Reference upstream post: > https://lore.kernel.org/patchwork/patch/984163/ > > For instance the TCAN device is a SPI device that uses a specific data payload to > determine writes and reads. In addition the device has a reset input as well > as a wakeup pin. The register offset of the m_can registers differs and must > be set by the device attached to the core. > > The m_can core will use iomapped writes and reads as the default mechanism for > writing and reading. The device driver can provide over rides for this. > > This patch series is not complete as it does not handle the CAN interrupts > nor can perform a CAN write. If this patch series is deemed acceptable I will > finish debugging the driver and post a non RFC series. > > Finally I did attempt to reduce the first patch with various git format patch > directives but none seemed to reduce the patch. > > Dan > > Dan Murphy (3): > can: m_can: Create m_can core to leverage common code > dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver > can: tcan4x5x: Add tcan4x5x driver to the kernel > > .../devicetree/bindings/net/can/tcan4x5x.txt | 34 + > drivers/net/can/m_can/Kconfig | 18 + > drivers/net/can/m_can/Makefile | 4 +- > drivers/net/can/m_can/m_can.c | 1683 +---------------- > .../net/can/m_can/{m_can.c => m_can_core.c} | 479 +++-- > drivers/net/can/m_can/m_can_core.h | 100 + > drivers/net/can/m_can/tcan4x5x.c | 321 ++++ > 7 files changed, 722 insertions(+), 1917 deletions(-) > create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt > copy drivers/net/can/m_can/{m_can.c => m_can_core.c} (83%) > create mode 100644 drivers/net/can/m_can/m_can_core.h > create mode 100644 drivers/net/can/m_can/tcan4x5x.c > -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 0/3] M_CAN Framework rework 2018-10-17 20:21 ` [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy @ 2018-10-24 7:33 ` Faiz Abbas 2018-10-24 11:39 ` Dan Murphy 2018-10-24 7:43 ` Wolfgang Grandegger 1 sibling, 1 reply; 20+ messages in thread From: Faiz Abbas @ 2018-10-24 7:33 UTC (permalink / raw) To: Dan Murphy, wg, mkl, davem; +Cc: linux-can, netdev, linux-kernel Hi Dan, On Thursday 18 October 2018 01:51 AM, Dan Murphy wrote: > Bump > > On 10/10/2018 09:20 AM, Dan Murphy wrote: >> All >> >> This patch series creates a m_can core framework that devices can register >> to. The m_can core manages the Bosch IP and CAN frames. Each device that >> is registered is responsible for managing device specific functions. >> >> This rewrite was suggested in a device driver submission for the TCAN4x5x >> device >> Reference upstream post: >> https://lore.kernel.org/patchwork/patch/984163/ >> >> For instance the TCAN device is a SPI device that uses a specific data payload to >> determine writes and reads. In addition the device has a reset input as well >> as a wakeup pin. The register offset of the m_can registers differs and must >> be set by the device attached to the core. >> >> The m_can core will use iomapped writes and reads as the default mechanism for >> writing and reading. The device driver can provide over rides for this. >> >> This patch series is not complete as it does not handle the CAN interrupts >> nor can perform a CAN write. If this patch series is deemed acceptable I will >> finish debugging the driver and post a non RFC series. >> >> Finally I did attempt to reduce the first patch with various git format patch >> directives but none seemed to reduce the patch. >> >> Dan >> >> Dan Murphy (3): >> can: m_can: Create m_can core to leverage common code >> dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver >> can: tcan4x5x: Add tcan4x5x driver to the kernel >> >> .../devicetree/bindings/net/can/tcan4x5x.txt | 34 + >> drivers/net/can/m_can/Kconfig | 18 + >> drivers/net/can/m_can/Makefile | 4 +- >> drivers/net/can/m_can/m_can.c | 1683 +---------------- >> .../net/can/m_can/{m_can.c => m_can_core.c} | 479 +++-- >> drivers/net/can/m_can/m_can_core.h | 100 + >> drivers/net/can/m_can/tcan4x5x.c | 321 ++++ >> 7 files changed, 722 insertions(+), 1917 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt >> copy drivers/net/can/m_can/{m_can.c => m_can_core.c} (83%) >> create mode 100644 drivers/net/can/m_can/m_can_core.h >> create mode 100644 drivers/net/can/m_can/tcan4x5x.c >> Patch 1/3 never arrived for me. Its not there on lkml either. https://lkml.org/lkml/2018/10/10/611 Can you resend the complete series? Thanks, Faiz ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 0/3] M_CAN Framework rework 2018-10-24 7:33 ` Faiz Abbas @ 2018-10-24 11:39 ` Dan Murphy 0 siblings, 0 replies; 20+ messages in thread From: Dan Murphy @ 2018-10-24 11:39 UTC (permalink / raw) To: Faiz Abbas, wg, mkl, davem; +Cc: linux-can, netdev, linux-kernel On 10/24/2018 02:33 AM, Faiz Abbas wrote: > Hi Dan, > > On Thursday 18 October 2018 01:51 AM, Dan Murphy wrote: >> Bump >> >> On 10/10/2018 09:20 AM, Dan Murphy wrote: >>> All >>> >>> This patch series creates a m_can core framework that devices can register >>> to. The m_can core manages the Bosch IP and CAN frames. Each device that >>> is registered is responsible for managing device specific functions. >>> >>> This rewrite was suggested in a device driver submission for the TCAN4x5x >>> device >>> Reference upstream post: >>> https://lore.kernel.org/patchwork/patch/984163/ >>> >>> For instance the TCAN device is a SPI device that uses a specific data payload to >>> determine writes and reads. In addition the device has a reset input as well >>> as a wakeup pin. The register offset of the m_can registers differs and must >>> be set by the device attached to the core. >>> >>> The m_can core will use iomapped writes and reads as the default mechanism for >>> writing and reading. The device driver can provide over rides for this. >>> >>> This patch series is not complete as it does not handle the CAN interrupts >>> nor can perform a CAN write. If this patch series is deemed acceptable I will >>> finish debugging the driver and post a non RFC series. >>> >>> Finally I did attempt to reduce the first patch with various git format patch >>> directives but none seemed to reduce the patch. >>> >>> Dan >>> >>> Dan Murphy (3): >>> can: m_can: Create m_can core to leverage common code >>> dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver >>> can: tcan4x5x: Add tcan4x5x driver to the kernel >>> >>> .../devicetree/bindings/net/can/tcan4x5x.txt | 34 + >>> drivers/net/can/m_can/Kconfig | 18 + >>> drivers/net/can/m_can/Makefile | 4 +- >>> drivers/net/can/m_can/m_can.c | 1683 +---------------- >>> .../net/can/m_can/{m_can.c => m_can_core.c} | 479 +++-- >>> drivers/net/can/m_can/m_can_core.h | 100 + >>> drivers/net/can/m_can/tcan4x5x.c | 321 ++++ >>> 7 files changed, 722 insertions(+), 1917 deletions(-) >>> create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt >>> copy drivers/net/can/m_can/{m_can.c => m_can_core.c} (83%) >>> create mode 100644 drivers/net/can/m_can/m_can_core.h >>> create mode 100644 drivers/net/can/m_can/tcan4x5x.c >>> > > Patch 1/3 never arrived for me. Its not there on lkml either. > https://lkml.org/lkml/2018/10/10/611 > LKML seems to have issue with 1/3. Here they were posted. Maybe the patch is to large but I received all 3 + the cover letter. https://lore.kernel.org/patchwork/patch/998019/ https://lore.kernel.org/patchwork/patch/998017/ https://lore.kernel.org/patchwork/patch/998020/ > Can you resend the complete series? > > Thanks, > Faiz > -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 0/3] M_CAN Framework rework 2018-10-17 20:21 ` [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy 2018-10-24 7:33 ` Faiz Abbas @ 2018-10-24 7:43 ` Wolfgang Grandegger 2018-10-24 11:36 ` Dan Murphy 1 sibling, 1 reply; 20+ messages in thread From: Wolfgang Grandegger @ 2018-10-24 7:43 UTC (permalink / raw) To: Dan Murphy, mkl, davem; +Cc: linux-can, netdev, linux-kernel Hallo Dan, I will have a closer look later this week. Unfortunately you already renamed file names and structs making the patch almost unreadable. More soon.. Thanks for you patience, Wolfgang. Am 17.10.2018 um 22:21 schrieb Dan Murphy: > Bump > > On 10/10/2018 09:20 AM, Dan Murphy wrote: >> All >> >> This patch series creates a m_can core framework that devices can register >> to. The m_can core manages the Bosch IP and CAN frames. Each device that >> is registered is responsible for managing device specific functions. >> >> This rewrite was suggested in a device driver submission for the TCAN4x5x >> device >> Reference upstream post: >> https://lore.kernel.org/patchwork/patch/984163/ >> >> For instance the TCAN device is a SPI device that uses a specific data payload to >> determine writes and reads. In addition the device has a reset input as well >> as a wakeup pin. The register offset of the m_can registers differs and must >> be set by the device attached to the core. >> >> The m_can core will use iomapped writes and reads as the default mechanism for >> writing and reading. The device driver can provide over rides for this. >> >> This patch series is not complete as it does not handle the CAN interrupts >> nor can perform a CAN write. If this patch series is deemed acceptable I will >> finish debugging the driver and post a non RFC series. >> >> Finally I did attempt to reduce the first patch with various git format patch >> directives but none seemed to reduce the patch. >> >> Dan >> >> Dan Murphy (3): >> can: m_can: Create m_can core to leverage common code >> dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver >> can: tcan4x5x: Add tcan4x5x driver to the kernel >> >> .../devicetree/bindings/net/can/tcan4x5x.txt | 34 + >> drivers/net/can/m_can/Kconfig | 18 + >> drivers/net/can/m_can/Makefile | 4 +- >> drivers/net/can/m_can/m_can.c | 1683 +---------------- >> .../net/can/m_can/{m_can.c => m_can_core.c} | 479 +++-- >> drivers/net/can/m_can/m_can_core.h | 100 + >> drivers/net/can/m_can/tcan4x5x.c | 321 ++++ >> 7 files changed, 722 insertions(+), 1917 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt >> copy drivers/net/can/m_can/{m_can.c => m_can_core.c} (83%) >> create mode 100644 drivers/net/can/m_can/m_can_core.h >> create mode 100644 drivers/net/can/m_can/tcan4x5x.c >> > > ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC PATCH 0/3] M_CAN Framework rework 2018-10-24 7:43 ` Wolfgang Grandegger @ 2018-10-24 11:36 ` Dan Murphy 0 siblings, 0 replies; 20+ messages in thread From: Dan Murphy @ 2018-10-24 11:36 UTC (permalink / raw) To: Wolfgang Grandegger, mkl, davem; +Cc: linux-can, netdev, linux-kernel Wolfgang On 10/24/2018 02:43 AM, Wolfgang Grandegger wrote: > Hallo Dan, > > I will have a closer look later this week. Unfortunately you already > renamed file names and structs making the patch almost unreadable. More > soon.. > I tried to format the patch to eliminate the massive change but format patch kept giving me the same result. It is a massive change regardless not sure how else to make is smaller. I guess this is why I opt'd to just create the dedicated TCAN driver. Dan > Thanks for you patience, > > Wolfgang. > > Am 17.10.2018 um 22:21 schrieb Dan Murphy: >> Bump >> >> On 10/10/2018 09:20 AM, Dan Murphy wrote: >>> All >>> >>> This patch series creates a m_can core framework that devices can register >>> to. The m_can core manages the Bosch IP and CAN frames. Each device that >>> is registered is responsible for managing device specific functions. >>> >>> This rewrite was suggested in a device driver submission for the TCAN4x5x >>> device >>> Reference upstream post: >>> https://lore.kernel.org/patchwork/patch/984163/ >>> >>> For instance the TCAN device is a SPI device that uses a specific data payload to >>> determine writes and reads. In addition the device has a reset input as well >>> as a wakeup pin. The register offset of the m_can registers differs and must >>> be set by the device attached to the core. >>> >>> The m_can core will use iomapped writes and reads as the default mechanism for >>> writing and reading. The device driver can provide over rides for this. >>> >>> This patch series is not complete as it does not handle the CAN interrupts >>> nor can perform a CAN write. If this patch series is deemed acceptable I will >>> finish debugging the driver and post a non RFC series. >>> >>> Finally I did attempt to reduce the first patch with various git format patch >>> directives but none seemed to reduce the patch. >>> >>> Dan >>> >>> Dan Murphy (3): >>> can: m_can: Create m_can core to leverage common code >>> dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver >>> can: tcan4x5x: Add tcan4x5x driver to the kernel >>> >>> .../devicetree/bindings/net/can/tcan4x5x.txt | 34 + >>> drivers/net/can/m_can/Kconfig | 18 + >>> drivers/net/can/m_can/Makefile | 4 +- >>> drivers/net/can/m_can/m_can.c | 1683 +---------------- >>> .../net/can/m_can/{m_can.c => m_can_core.c} | 479 +++-- >>> drivers/net/can/m_can/m_can_core.h | 100 + >>> drivers/net/can/m_can/tcan4x5x.c | 321 ++++ >>> 7 files changed, 722 insertions(+), 1917 deletions(-) >>> create mode 100644 Documentation/devicetree/bindings/net/can/tcan4x5x.txt >>> copy drivers/net/can/m_can/{m_can.c => m_can_core.c} (83%) >>> create mode 100644 drivers/net/can/m_can/m_can_core.h >>> create mode 100644 drivers/net/can/m_can/tcan4x5x.c >>> >> >> -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2019-01-11 12:27 UTC | newest] Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-10-10 14:20 [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy 2018-10-10 14:20 ` [RFC PATCH 1/3] can: m_can: Create m_can core to leverage common code Dan Murphy 2018-10-27 14:19 ` Wolfgang Grandegger 2018-10-31 20:15 ` Dan Murphy 2018-11-03 10:45 ` Wolfgang Grandegger 2018-11-09 15:14 ` Dan Murphy 2019-01-09 20:58 ` Dan Murphy 2019-01-10 7:44 ` Wolfgang Grandegger 2019-01-10 7:57 ` Rizvi, Mohammad Faiz Abbas 2019-01-10 12:54 ` Dan Murphy 2019-01-10 12:53 ` Dan Murphy 2019-01-11 8:27 ` Wolfgang Grandegger 2019-01-11 12:27 ` Dan Murphy 2018-10-10 14:20 ` [RFC PATCH 2/3] dt-bindings: can: tcan4x5x: Add DT bindings for TCAN4x5X driver Dan Murphy 2018-10-10 14:20 ` [RFC PATCH 3/3] can: tcan4x5x: Add tcan4x5x driver to the kernel Dan Murphy 2018-10-17 20:21 ` [RFC PATCH 0/3] M_CAN Framework rework Dan Murphy 2018-10-24 7:33 ` Faiz Abbas 2018-10-24 11:39 ` Dan Murphy 2018-10-24 7:43 ` Wolfgang Grandegger 2018-10-24 11:36 ` Dan Murphy
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).