From patchwork Wed Jan 13 21:13:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 12018429 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28076C433E0 for ; Thu, 14 Jan 2021 02:18:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DBDA423359 for ; Thu, 14 Jan 2021 02:18:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727721AbhANCSH (ORCPT ); Wed, 13 Jan 2021 21:18:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728793AbhAMVNl (ORCPT ); Wed, 13 Jan 2021 16:13:41 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 210D6C061786 for ; Wed, 13 Jan 2021 13:14:18 -0800 (PST) Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=bjornoya.blackshift.org) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kznT6-0001Q1-M9 for netdev@vger.kernel.org; Wed, 13 Jan 2021 22:14:16 +0100 Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 6ED115C3013 for ; Wed, 13 Jan 2021 21:14:13 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id C955F5C2FF9; Wed, 13 Jan 2021 21:14:11 +0000 (UTC) Received: from blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id b3163a16; Wed, 13 Jan 2021 21:14:11 +0000 (UTC) From: Marc Kleine-Budde To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org, kernel@pengutronix.de Subject: pull-request: can-next 2021-01-13 Date: Wed, 13 Jan 2021 22:13:53 +0100 Message-Id: <20210113211410.917108-1-mkl@pengutronix.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hello Jakub, hello David, this is a pull request of 17 patches for net-next/master. The first two patches update the MAINTAINERS file, Lukas Bulwahn's patch fixes the files entry for the tcan4x5x driver, which was broken by me in net-next. A patch by me adds the a missing header file to the CAN Networking Layer. The next 5 patches are by me and split the the CAN driver related infrastructure code into more files in a separate subdir. The next two patches by me clean up the CAN length related code. This is followed by 6 patches by Vincent Mailhol and me, they add helper code for for CAN frame length calculation neede for BQL support. A patch by Vincent Mailhol adds software TX timestamp support. The last patch is by me, targets the tcan4x5x driver, and removes the unneeded __packed attribute from the struct tcan4x5x_map_buf. regards, Marc --- The following changes since commit f50e2f9f791647aa4e5b19d0064f5cabf630bf6e: hci: llc_shdlc: style: Simplify bool comparison (2021-01-12 20:18:30 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.12-20210113 for you to fetch changes up to b42e45a913f2ae76807e656a1c053808d7d34352: can: tcan4x5x: remove __packed attribute from struct tcan4x5x_map_buf (2021-01-13 21:48:28 +0100) ---------------------------------------------------------------- linux-can-next-for-5.12-20210113 ---------------------------------------------------------------- Lukas Bulwahn (1): MAINTAINERS: adjust entry to tcan4x5x file split Marc Kleine-Budde (13): MAINTAINERS: CAN network layer: add missing header file can-ml.h can: dev: move driver related infrastructure into separate subdir can: dev: move bittiming related code into seperate file can: dev: move length related code into seperate file can: dev: move skb related into seperate file can: dev: move netlink related code into seperate file can: length: convert to kernel coding style can: length: can_fd_len2dlc(): simplify length calculcation can: length: canfd_sanitize_len(): add function to sanitize CAN-FD data length can: dev: extend struct can_skb_priv to hold CAN frame length can: dev: can_get_echo_skb(): extend to return can frame length can: dev: can_rx_offload_get_echo_skb(): extend to return can frame length can: tcan4x5x: remove __packed attribute from struct tcan4x5x_map_buf Vincent Mailhol (3): can: length: can_skb_get_frame_len(): introduce function to get data length of frame in data link layer can: dev: can_put_echo_skb(): extend to handle frame_len can: dev: can_put_echo_skb(): add software tx timestamps MAINTAINERS | 5 +- drivers/net/can/Makefile | 7 +- drivers/net/can/at91_can.c | 4 +- drivers/net/can/c_can/c_can.c | 4 +- drivers/net/can/cc770/cc770.c | 4 +- drivers/net/can/dev.c | 1338 --------------------- drivers/net/can/dev/Makefile | 11 + drivers/net/can/dev/bittiming.c | 261 ++++ drivers/net/can/dev/dev.c | 467 +++++++ drivers/net/can/dev/length.c | 90 ++ drivers/net/can/dev/netlink.c | 379 ++++++ drivers/net/can/{ => dev}/rx-offload.c | 5 +- drivers/net/can/dev/skb.c | 231 ++++ drivers/net/can/flexcan.c | 7 +- drivers/net/can/grcan.c | 4 +- drivers/net/can/ifi_canfd/ifi_canfd.c | 4 +- drivers/net/can/kvaser_pciefd.c | 6 +- drivers/net/can/m_can/m_can.c | 8 +- drivers/net/can/m_can/tcan4x5x.h | 2 +- drivers/net/can/mscan/mscan.c | 4 +- drivers/net/can/pch_can.c | 4 +- drivers/net/can/peak_canfd/peak_canfd.c | 4 +- drivers/net/can/rcar/rcar_can.c | 4 +- drivers/net/can/rcar/rcar_canfd.c | 4 +- drivers/net/can/sja1000/sja1000.c | 4 +- drivers/net/can/softing/softing_main.c | 4 +- drivers/net/can/spi/hi311x.c | 4 +- drivers/net/can/spi/mcp251x.c | 4 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +- drivers/net/can/sun4i_can.c | 4 +- drivers/net/can/ti_hecc.c | 4 +- drivers/net/can/usb/ems_usb.c | 4 +- drivers/net/can/usb/esd_usb2.c | 4 +- drivers/net/can/usb/gs_usb.c | 4 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 2 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 2 +- drivers/net/can/usb/mcba_usb.c | 4 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 +- drivers/net/can/usb/ucan.c | 4 +- drivers/net/can/usb/usb_8dev.c | 4 +- drivers/net/can/xilinx_can.c | 6 +- include/linux/can/bittiming.h | 44 + include/linux/can/dev.h | 135 +-- include/linux/can/length.h | 174 +++ include/linux/can/rx-offload.h | 3 +- include/linux/can/skb.h | 80 ++ 47 files changed, 1819 insertions(+), 1542 deletions(-) delete mode 100644 drivers/net/can/dev.c create mode 100644 drivers/net/can/dev/Makefile create mode 100644 drivers/net/can/dev/bittiming.c create mode 100644 drivers/net/can/dev/dev.c create mode 100644 drivers/net/can/dev/length.c create mode 100644 drivers/net/can/dev/netlink.c rename drivers/net/can/{ => dev}/rx-offload.c (98%) create mode 100644 drivers/net/can/dev/skb.c create mode 100644 include/linux/can/bittiming.h create mode 100644 include/linux/can/length.h