| Message ID | 20220603102848.17907-5-mailhol.vincent@wanadoo.fr (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | can: refactoring of can-dev module and of Kbuild | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Series ignored based on subject, async |
On 03.06.2022 19:28:45, Vincent Mailhol wrote: > Only a few drivers rely on the CAN rx offload framework (as of the > writing of this patch, only three: flexcan, ti_hecc and > mcp251xfd). Give the option to the user to deselect this features > during compilation. > > The drivers relying on CAN rx offload are in different sub > folders. All of these drivers get tagged with "select CAN_RX_OFFLOAD" > so that the option is automatically enabled whenever one of those > driver is chosen. > > Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> > --- > drivers/net/can/Kconfig | 16 ++++++++++++++++ > drivers/net/can/dev/Makefile | 2 ++ > drivers/net/can/spi/mcp251xfd/Kconfig | 1 + > 3 files changed, 19 insertions(+) > > diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig > index 8f3b97aea638..1f1d81da1c8c 100644 > --- a/drivers/net/can/Kconfig > +++ b/drivers/net/can/Kconfig > @@ -102,6 +102,20 @@ config CAN_CALC_BITTIMING > > If unsure, say Y. > > +config CAN_RX_OFFLOAD > + bool "CAN RX offload" > + default y > + help > + Framework to offload the controller's RX FIFO during one > + interrupt. The CAN frames of the FIFO are read and put into a skb > + queue during that interrupt and transmitted afterwards in a NAPI > + context. > + > + The additional features selected by this option will be added to the > + can-dev module. > + > + If unsure, say Y. > + > config CAN_AT91 > tristate "Atmel AT91 onchip CAN controller" > depends on (ARCH_AT91 || COMPILE_TEST) && HAS_IOMEM > @@ -113,6 +127,7 @@ config CAN_FLEXCAN > tristate "Support for Freescale FLEXCAN based chips" > depends on OF || COLDFIRE || COMPILE_TEST > depends on HAS_IOMEM > + select CAN_RX_OFFLOAD > help > Say Y here if you want to support for Freescale FlexCAN. > > @@ -162,6 +177,7 @@ config CAN_SUN4I > config CAN_TI_HECC > depends on ARM > tristate "TI High End CAN Controller" > + select CAN_RX_OFFLOAD > help > Driver for TI HECC (High End CAN Controller) module found on many > TI devices. The device specifications are available from www.ti.com > diff --git a/drivers/net/can/dev/Makefile b/drivers/net/can/dev/Makefile > index b8a55b1d90cd..5081d8a3be57 100644 > --- a/drivers/net/can/dev/Makefile > +++ b/drivers/net/can/dev/Makefile > @@ -11,3 +11,5 @@ can-dev-$(CONFIG_CAN_NETLINK) += netlink.o > can-dev-$(CONFIG_CAN_NETLINK) += rx-offload.o ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Do you want to remove this? > > can-dev-$(CONFIG_CAN_CALC_BITTIMING) += calc_bittiming.o > + > +can-dev-$(CONFIG_CAN_RX_OFFLOAD) += rx-offload.o > diff --git a/drivers/net/can/spi/mcp251xfd/Kconfig b/drivers/net/can/spi/mcp251xfd/Kconfig > index dd0fc0a54be1..877e4356010d 100644 > --- a/drivers/net/can/spi/mcp251xfd/Kconfig > +++ b/drivers/net/can/spi/mcp251xfd/Kconfig > @@ -2,6 +2,7 @@ > > config CAN_MCP251XFD > tristate "Microchip MCP251xFD SPI CAN controllers" > + select CAN_RX_OFFLOAD > select REGMAP > select WANT_DEV_COREDUMP > help I remember I've given you a list of drivers needing RX offload, I probably missed the m_can driver. Feel free to squash this patch: --- a/drivers/net/can/dev/Makefile +++ b/drivers/net/can/dev/Makefile @@ -8,7 +8,6 @@ can-dev-$(CONFIG_CAN_NETLINK) += bittiming.o can-dev-$(CONFIG_CAN_NETLINK) += dev.o can-dev-$(CONFIG_CAN_NETLINK) += length.o can-dev-$(CONFIG_CAN_NETLINK) += netlink.o -can-dev-$(CONFIG_CAN_NETLINK) += rx-offload.o can-dev-$(CONFIG_CAN_CALC_BITTIMING) += calc_bittiming.o diff --git a/drivers/net/can/m_can/Kconfig b/drivers/net/can/m_can/Kconfig index 45ad1b3f0cd0..fc2afab36279 100644 --- a/drivers/net/can/m_can/Kconfig +++ b/drivers/net/can/m_can/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig CAN_M_CAN tristate "Bosch M_CAN support" + select CAN_RX_OFFLOAD help Say Y here if you want support for Bosch M_CAN controller framework. This is common support for devices that embed the Bosch M_CAN IP. Marc
On Sat. 4 June 2022 at 20:22, Marc Kleine-Budde <mkl@pengutronix.de> wrote: > On 03.06.2022 19:28:45, Vincent Mailhol wrote: > > Only a few drivers rely on the CAN rx offload framework (as of the > > writing of this patch, only three: flexcan, ti_hecc and > > mcp251xfd). Give the option to the user to deselect this features > > during compilation. > > > > The drivers relying on CAN rx offload are in different sub > > folders. All of these drivers get tagged with "select CAN_RX_OFFLOAD" > > so that the option is automatically enabled whenever one of those > > driver is chosen. > > > > Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> > > --- > > drivers/net/can/Kconfig | 16 ++++++++++++++++ > > drivers/net/can/dev/Makefile | 2 ++ > > drivers/net/can/spi/mcp251xfd/Kconfig | 1 + > > 3 files changed, 19 insertions(+) > > > > diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig > > index 8f3b97aea638..1f1d81da1c8c 100644 > > --- a/drivers/net/can/Kconfig > > +++ b/drivers/net/can/Kconfig > > @@ -102,6 +102,20 @@ config CAN_CALC_BITTIMING > > > > If unsure, say Y. > > > > +config CAN_RX_OFFLOAD > > + bool "CAN RX offload" > > + default y > > + help > > + Framework to offload the controller's RX FIFO during one > > + interrupt. The CAN frames of the FIFO are read and put into a skb > > + queue during that interrupt and transmitted afterwards in a NAPI > > + context. > > + > > + The additional features selected by this option will be added to the > > + can-dev module. > > + > > + If unsure, say Y. > > + > > config CAN_AT91 > > tristate "Atmel AT91 onchip CAN controller" > > depends on (ARCH_AT91 || COMPILE_TEST) && HAS_IOMEM > > @@ -113,6 +127,7 @@ config CAN_FLEXCAN > > tristate "Support for Freescale FLEXCAN based chips" > > depends on OF || COLDFIRE || COMPILE_TEST > > depends on HAS_IOMEM > > + select CAN_RX_OFFLOAD > > help > > Say Y here if you want to support for Freescale FlexCAN. > > > > @@ -162,6 +177,7 @@ config CAN_SUN4I > > config CAN_TI_HECC > > depends on ARM > > tristate "TI High End CAN Controller" > > + select CAN_RX_OFFLOAD > > help > > Driver for TI HECC (High End CAN Controller) module found on many > > TI devices. The device specifications are available from www.ti.com > > diff --git a/drivers/net/can/dev/Makefile b/drivers/net/can/dev/Makefile > > index b8a55b1d90cd..5081d8a3be57 100644 > > --- a/drivers/net/can/dev/Makefile > > +++ b/drivers/net/can/dev/Makefile > > @@ -11,3 +11,5 @@ can-dev-$(CONFIG_CAN_NETLINK) += netlink.o > > can-dev-$(CONFIG_CAN_NETLINK) += rx-offload.o > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > Do you want to remove this? Absolutely. As you probably guessed, this is just a leftover. > > > > can-dev-$(CONFIG_CAN_CALC_BITTIMING) += calc_bittiming.o > > + > > +can-dev-$(CONFIG_CAN_RX_OFFLOAD) += rx-offload.o > > diff --git a/drivers/net/can/spi/mcp251xfd/Kconfig b/drivers/net/can/spi/mcp251xfd/Kconfig > > index dd0fc0a54be1..877e4356010d 100644 > > --- a/drivers/net/can/spi/mcp251xfd/Kconfig > > +++ b/drivers/net/can/spi/mcp251xfd/Kconfig > > @@ -2,6 +2,7 @@ > > > > config CAN_MCP251XFD > > tristate "Microchip MCP251xFD SPI CAN controllers" > > + select CAN_RX_OFFLOAD > > select REGMAP > > select WANT_DEV_COREDUMP > > help > > I remember I've given you a list of drivers needing RX offload, I > probably missed the m_can driver. Feel free to squash this patch: Added it to v5. This went through the cracks when testing. Thanks for catching this! > --- a/drivers/net/can/dev/Makefile > +++ b/drivers/net/can/dev/Makefile > @@ -8,7 +8,6 @@ can-dev-$(CONFIG_CAN_NETLINK) += bittiming.o > can-dev-$(CONFIG_CAN_NETLINK) += dev.o > can-dev-$(CONFIG_CAN_NETLINK) += length.o > can-dev-$(CONFIG_CAN_NETLINK) += netlink.o > -can-dev-$(CONFIG_CAN_NETLINK) += rx-offload.o > > can-dev-$(CONFIG_CAN_CALC_BITTIMING) += calc_bittiming.o > > diff --git a/drivers/net/can/m_can/Kconfig b/drivers/net/can/m_can/Kconfig > index 45ad1b3f0cd0..fc2afab36279 100644 > --- a/drivers/net/can/m_can/Kconfig > +++ b/drivers/net/can/m_can/Kconfig > @@ -1,6 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0-only > menuconfig CAN_M_CAN > tristate "Bosch M_CAN support" > + select CAN_RX_OFFLOAD > help > Say Y here if you want support for Bosch M_CAN controller framework. > This is common support for devices that embed the Bosch M_CAN IP. > > Marc > > -- > Pengutronix e.K. | Marc Kleine-Budde | > Embedded Linux | https://www.pengutronix.de | > Vertretung West/Dortmund | Phone: +49-231-2826-924 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index 8f3b97aea638..1f1d81da1c8c 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig @@ -102,6 +102,20 @@ config CAN_CALC_BITTIMING If unsure, say Y. +config CAN_RX_OFFLOAD + bool "CAN RX offload" + default y + help + Framework to offload the controller's RX FIFO during one + interrupt. The CAN frames of the FIFO are read and put into a skb + queue during that interrupt and transmitted afterwards in a NAPI + context. + + The additional features selected by this option will be added to the + can-dev module. + + If unsure, say Y. + config CAN_AT91 tristate "Atmel AT91 onchip CAN controller" depends on (ARCH_AT91 || COMPILE_TEST) && HAS_IOMEM @@ -113,6 +127,7 @@ config CAN_FLEXCAN tristate "Support for Freescale FLEXCAN based chips" depends on OF || COLDFIRE || COMPILE_TEST depends on HAS_IOMEM + select CAN_RX_OFFLOAD help Say Y here if you want to support for Freescale FlexCAN. @@ -162,6 +177,7 @@ config CAN_SUN4I config CAN_TI_HECC depends on ARM tristate "TI High End CAN Controller" + select CAN_RX_OFFLOAD help Driver for TI HECC (High End CAN Controller) module found on many TI devices. The device specifications are available from www.ti.com diff --git a/drivers/net/can/dev/Makefile b/drivers/net/can/dev/Makefile index b8a55b1d90cd..5081d8a3be57 100644 --- a/drivers/net/can/dev/Makefile +++ b/drivers/net/can/dev/Makefile @@ -11,3 +11,5 @@ can-dev-$(CONFIG_CAN_NETLINK) += netlink.o can-dev-$(CONFIG_CAN_NETLINK) += rx-offload.o can-dev-$(CONFIG_CAN_CALC_BITTIMING) += calc_bittiming.o + +can-dev-$(CONFIG_CAN_RX_OFFLOAD) += rx-offload.o diff --git a/drivers/net/can/spi/mcp251xfd/Kconfig b/drivers/net/can/spi/mcp251xfd/Kconfig index dd0fc0a54be1..877e4356010d 100644 --- a/drivers/net/can/spi/mcp251xfd/Kconfig +++ b/drivers/net/can/spi/mcp251xfd/Kconfig @@ -2,6 +2,7 @@ config CAN_MCP251XFD tristate "Microchip MCP251xFD SPI CAN controllers" + select CAN_RX_OFFLOAD select REGMAP select WANT_DEV_COREDUMP help
Only a few drivers rely on the CAN rx offload framework (as of the writing of this patch, only three: flexcan, ti_hecc and mcp251xfd). Give the option to the user to deselect this features during compilation. The drivers relying on CAN rx offload are in different sub folders. All of these drivers get tagged with "select CAN_RX_OFFLOAD" so that the option is automatically enabled whenever one of those driver is chosen. Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr> --- drivers/net/can/Kconfig | 16 ++++++++++++++++ drivers/net/can/dev/Makefile | 2 ++ drivers/net/can/spi/mcp251xfd/Kconfig | 1 + 3 files changed, 19 insertions(+)