pull-request: can-next 2019-10-07
mbox series

Message ID 2ffa00e7-d447-9216-587d-30396a47ca64@pengutronix.de
State Changes Requested
Delegated to: David Miller
Headers show
Series
  • pull-request: can-next 2019-10-07
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.5-20191007

Message

Marc Kleine-Budde Oct. 7, 2019, 2:38 p.m. UTC
Hello David,

this is a pull request for net-next/master consisting of 12 patches.

The first patch is by Andy Shevchenko for the mcp251x driver and removes
the legacy platform data from all in-tree users and the driver.

The next two patches target the peak_canfd driver, the first one is by
me and fixes several checkpatch warnings, the second one is by Stephane
Grosjean and adds hardware timestamps to the rx skbs.

Followed by two patches for the xilinx_can driver. Again the first is by
me and fixes checkpatch warnings, the second one is by Anssi Hannula and
avoids non-requested bus error frames, which improves performance.

Pankaj Sharma's patch for the m_can driver adds support for the one shot
mode.

YueHaibing provides a patch for the grcan driver to use
devm_platform_ioremap_resource() to simplify code.

Joakim Zhang provides a similar patch for the flexcan driver.

The last 4 patches are by me and target the rx-offload infrastructure.
The first 3 fix checkpatch warnings, the last one removes a no-op
function.

regards,
Marc

---

The following changes since commit 056ddc38e94105a7ee982ca06cc19448fc927f6f:

  Merge branch 'stmmac-next' (2019-10-06 18:46:31 +0200)

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.5-20191007

for you to fetch changes up to f6008d6897270b492ec1b0a21814f9a99a113b17:

  can: rx-offload: can_rx_offload_reset(): remove no-op function (2019-10-07 16:34:39 +0200)

----------------------------------------------------------------
linux-can-next-for-5.5-20191007

----------------------------------------------------------------
Andy Shevchenko (1):
      can: mcp251x: Get rid of legacy platform data

Anssi Hannula (1):
      can: xilinx_can: avoid non-requested bus error frames

Joakim Zhang (1):
      can: flexcan: use devm_platform_ioremap_resource() to simplify code

Marc Kleine-Budde (6):
      can: peak_canfd: fix checkpatch warnings
      can: xilinx_can: fix checkpatch warnings
      can: rx-offload: fix long lines
      can: rx-offload: can_rx_offload_compare(): fix typo
      can: rx-offload: can_rx_offload_irq_offload_timestamp(): don't use assignment in if condition
      can: rx-offload: can_rx_offload_reset(): remove no-op function

Pankaj Sharma (1):
      can: m_can: add support for one shot mode

Stephane Grosjean (1):
      can: peak_canfd: provide hw timestamps in rx skbs

YueHaibing (1):
      can: grcan: use devm_platform_ioremap_resource() to simplify code

 arch/arm/mach-pxa/icontrol.c                  |  9 +--
 arch/arm/mach-pxa/zeus.c                      |  9 +--
 drivers/net/can/flexcan.c                     |  4 +-
 drivers/net/can/grcan.c                       |  4 +-
 drivers/net/can/m_can/m_can.c                 | 12 +++-
 drivers/net/can/peak_canfd/peak_canfd.c       | 25 +++++--
 drivers/net/can/peak_canfd/peak_canfd_user.h  |  3 +-
 drivers/net/can/peak_canfd/peak_pciefd_main.c |  6 +-
 drivers/net/can/rx-offload.c                  | 55 ++++++++-------
 drivers/net/can/spi/mcp251x.c                 |  9 ++-
 drivers/net/can/xilinx_can.c                  | 98 ++++++++++++++-------------
 include/linux/can/platform/mcp251x.h          | 22 ------
 include/linux/can/rx-offload.h                |  1 -
 13 files changed, 131 insertions(+), 126 deletions(-)
 delete mode 100644 include/linux/can/platform/mcp251x.h

Comments

Jakub Kicinski Oct. 8, 2019, 7:09 p.m. UTC | #1
On Mon, 7 Oct 2019 16:38:14 +0200, Marc Kleine-Budde wrote:
> Hello David,
> 
> this is a pull request for net-next/master consisting of 12 patches.
> 
> The first patch is by Andy Shevchenko for the mcp251x driver and removes
> the legacy platform data from all in-tree users and the driver.
> 
> The next two patches target the peak_canfd driver, the first one is by
> me and fixes several checkpatch warnings, the second one is by Stephane
> Grosjean and adds hardware timestamps to the rx skbs.
> 
> Followed by two patches for the xilinx_can driver. Again the first is by
> me and fixes checkpatch warnings, the second one is by Anssi Hannula and
> avoids non-requested bus error frames, which improves performance.
> 
> Pankaj Sharma's patch for the m_can driver adds support for the one shot
> mode.
> 
> YueHaibing provides a patch for the grcan driver to use
> devm_platform_ioremap_resource() to simplify code.
> 
> Joakim Zhang provides a similar patch for the flexcan driver.
> 
> The last 4 patches are by me and target the rx-offload infrastructure.
> The first 3 fix checkpatch warnings, the last one removes a no-op
> function.

Hi Marc,

I think the correction should have been s/Substract/Subtract/,
sorry for the nit pick.

Would you be able to fix that up or do you prefer to do a follow up?

commit 8e7f9a874626a1aec191b34c2b983f76275d0448
Author: Marc Kleine-Budde <mkl@pengutronix.de>
Date:   Mon Oct 7 10:00:25 2019 +0200

    can: rx-offload: can_rx_offload_compare(): fix typo
    
    This patch fixes a typo found by checkpatch.
    
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/rx-offload.c b/drivers/net/can/rx-offload.c
index 0daa8c7fe83b..8db07587ce3c 100644
--- a/drivers/net/can/rx-offload.c
+++ b/drivers/net/can/rx-offload.c
@@ -109,7 +109,7 @@ static int can_rx_offload_compare(struct sk_buff *a, struct sk_buff *b)
        cb_a = can_rx_offload_get_cb(a);
        cb_b = can_rx_offload_get_cb(b);
 
-       /* Substract two u32 and return result as int, to keep
+       /* Substact two u32 and return result as int, to keep
         * difference steady around the u32 overflow.
         */
        return cb_b->timestamp - cb_a->timestamp;
Marc Kleine-Budde Oct. 9, 2019, 7:33 a.m. UTC | #2
Hello David,

On 10/7/19 4:38 PM, Marc Kleine-Budde wrote:
> this is a pull request for net-next/master consisting of 12 patches.

Please don't merge this pull request, it has several shortcomings :(

>   git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-5.5-20191007

I've deleted the tag, so that merging fails, if you try before reading
this mail.

Looking for a brown paper bag,
Marc
Marc Kleine-Budde Oct. 9, 2019, 7:40 a.m. UTC | #3
On 10/8/19 9:09 PM, Jakub Kicinski wrote:
> On Mon, 7 Oct 2019 16:38:14 +0200, Marc Kleine-Budde wrote:
>> Hello David,
>>
>> this is a pull request for net-next/master consisting of 12 patches.
>>
>> The first patch is by Andy Shevchenko for the mcp251x driver and removes
>> the legacy platform data from all in-tree users and the driver.
>>
>> The next two patches target the peak_canfd driver, the first one is by
>> me and fixes several checkpatch warnings, the second one is by Stephane
>> Grosjean and adds hardware timestamps to the rx skbs.
>>
>> Followed by two patches for the xilinx_can driver. Again the first is by
>> me and fixes checkpatch warnings, the second one is by Anssi Hannula and
>> avoids non-requested bus error frames, which improves performance.
>>
>> Pankaj Sharma's patch for the m_can driver adds support for the one shot
>> mode.
>>
>> YueHaibing provides a patch for the grcan driver to use
>> devm_platform_ioremap_resource() to simplify code.
>>
>> Joakim Zhang provides a similar patch for the flexcan driver.
>>
>> The last 4 patches are by me and target the rx-offload infrastructure.
>> The first 3 fix checkpatch warnings, the last one removes a no-op
>> function.
> 
> Hi Marc,
> 
> I think the correction should have been s/Substract/Subtract/,
> sorry for the nit pick.

Thanks for noticing that. checkpatch wasn't complaining about my new
typo though :)

> Would you be able to fix that up or do you prefer to do a follow up?

As another patch from the pull request is broken, I've asked David to
not merge it. I've squashed your fix into the original patch.

Thanks,
Marc