Marc Kleine-Budde says: ==================== pull-request: can-next 2019-09-04 j1939 this is a pull request for net-next/master consisting of 21 patches. the first 12 patches are by me and target the CAN core infrastructure. They clean up the names of variables , structs and struct members, convert can_rx_register() to use max() instead of open coding it and remove unneeded code from the can_pernet_exit() callback. The next three patches are also by me and they introduce and make use of the CAN midlayer private structure. It is used to hold protocol specific per device data structures. The next patch is by Oleksij Rempel, switches the &net->can.rcvlists_lock from a spin_lock() to a spin_lock_bh(), so that it can be used from NAPI (soft IRQ) context. The next 4 patches are by Kurt Van Dijck, he first updates his email address via mailmap and then extends sockaddr_can to include j1939 members. The final patch is the collective effort of many entities (The j1939 authors: Oliver Hartkopp, Bastian Stender, Elenita Hinds, kbuild test robot, Kurt Van Dijck, Maxime Jayat, Robin van der Gracht, Oleksij Rempel, Marc Kleine-Budde). It adds support of SAE J1939 protocol to the CAN networking stack. SAE J1939 is the vehicle bus recommended practice used for communication and diagnostics among vehicle components. Originating in the car and heavy-duty truck industry in the United States, it is now widely used in other parts of the world. P.S.: This pull request doesn't invalidate my last pull request: "pull-request: can-next 2019-09-03". ====================
Showing the changes to include/linux (2 of 28 files). Show all
Unified · Split
| @@ -0,0 +1,68 @@ | |||
| 1 | /* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ | ||
| 2 | /* Copyright (c) 2002-2007 Volkswagen Group Electronic Research | ||
| 3 | * Copyright (c) 2017 Pengutronix, Marc Kleine-Budde <kernel@pengutronix.de> | ||
| 4 | * | ||
| 5 | * All rights reserved. | ||
| 6 | * | ||
| 7 | * Redistribution and use in source and binary forms, with or without | ||
| 8 | * modification, are permitted provided that the following conditions | ||
| 9 | * are met: | ||
| 10 | * 1. Redistributions of source code must retain the above copyright | ||
| 11 | * notice, this list of conditions and the following disclaimer. | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in the | ||
| 14 | * documentation and/or other materials provided with the distribution. | ||
| 15 | * 3. Neither the name of Volkswagen nor the names of its contributors | ||
| 16 | * may be used to endorse or promote products derived from this software | ||
| 17 | * without specific prior written permission. | ||
| 18 | * | ||
| 19 | * Alternatively, provided that this notice is retained in full, this | ||
| 20 | * software may be distributed under the terms of the GNU General | ||
| 21 | * Public License ("GPL") version 2, in which case the provisions of the | ||
| 22 | * GPL apply INSTEAD OF those given above. | ||
| 23 | * | ||
| 24 | * The provided data structures and external interfaces from this code | ||
| 25 | * are not restricted to be used by modules with a GPL compatible license. | ||
| 26 | * | ||
| 27 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| 28 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| 29 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| 30 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| 31 | * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 32 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| 33 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| 34 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| 35 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 36 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| 37 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH | ||
| 38 | * DAMAGE. | ||
| 39 | * | ||
| 40 | */ | ||
| 41 | |||
| 42 | #ifndef CAN_ML_H | ||
| 43 | #define CAN_ML_H | ||
| 44 | |||
| 45 | #include <linux/can.h> | ||
| 46 | #include <linux/list.h> | ||
| 47 | |||
| 48 | #define CAN_SFF_RCV_ARRAY_SZ (1 << CAN_SFF_ID_BITS) | ||
| 49 | #define CAN_EFF_RCV_HASH_BITS 10 | ||
| 50 | #define CAN_EFF_RCV_ARRAY_SZ (1 << CAN_EFF_RCV_HASH_BITS) | ||
| 51 | |||
| 52 | enum { RX_ERR, RX_ALL, RX_FIL, RX_INV, RX_MAX }; | ||
| 53 | |||
| 54 | struct can_dev_rcv_lists { | ||
| 55 | struct hlist_head rx[RX_MAX]; | ||
| 56 | struct hlist_head rx_sff[CAN_SFF_RCV_ARRAY_SZ]; | ||
| 57 | struct hlist_head rx_eff[CAN_EFF_RCV_ARRAY_SZ]; | ||
| 58 | int entries; | ||
| 59 | }; | ||
| 60 | |||
| 61 | struct can_ml_priv { | ||
| 62 | struct can_dev_rcv_lists dev_rcv_lists; | ||
| 63 | #ifdef CAN_J1939 | ||
| 64 | struct j1939_priv *j1939_priv; | ||
| 65 | #endif | ||
| 66 | }; | ||
| 67 | |||
| 68 | #endif /* CAN_ML_H */ | ||
| @@ -41,6 +41,14 @@ struct can_proto { · 40 unmodified lines | |||
| 41 | struct proto *prot; | 41 | struct proto *prot; |
| 42 | }; | 42 | }; |
| 43 | 43 | ||
| 44 | /* required_size | ||
| 45 | * macro to find the minimum size of a struct | ||
| 46 | * that includes a requested member | ||
| 47 | */ | ||
| 48 | #define CAN_REQUIRED_SIZE(struct_type, member) \ | ||
| 49 | (offsetof(typeof(struct_type), member) + \ | ||
| 50 | sizeof(((typeof(struct_type) *)(NULL))->member)) | ||
| 51 | |||
| 44 | /* function prototypes for the CAN networklayer core (af_can.c) */ | 52 | /* function prototypes for the CAN networklayer core (af_can.c) */ |
| 45 | 53 | ||
| 46 | extern int can_proto_register(const struct can_proto *cp); | 54 | extern int can_proto_register(const struct can_proto *cp); |