All of lore.kernel.org
 help / color / mirror / Atom feed
* pull-request: can-next 2019-10-07
@ 2019-10-07 14:38 Marc Kleine-Budde
  2019-10-08 19:09 ` Jakub Kicinski
  2019-10-09  7:33 ` Marc Kleine-Budde
  0 siblings, 2 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2019-10-07 14:38 UTC (permalink / raw)
  To: netdev
  Cc: davem, kernel, linux-can, Oliver Hartkopp, Bastian Stender,
	Elenita Hinds, Kurt Van Dijck, Maxime Jayat,
	Robin van der Gracht, Oleksij Rempel, David Jander


[-- Attachment #1.1: Type: text/plain, Size: 3810 bytes --]

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

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |-
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |
















[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pull-request: can-next 2019-10-07
  2019-10-07 14:38 pull-request: can-next 2019-10-07 Marc Kleine-Budde
@ 2019-10-08 19:09 ` Jakub Kicinski
  2019-10-09  7:40   ` Marc Kleine-Budde
  2019-10-09  7:33 ` Marc Kleine-Budde
  1 sibling, 1 reply; 5+ messages in thread
From: Jakub Kicinski @ 2019-10-08 19:09 UTC (permalink / raw)
  To: Marc Kleine-Budde
  Cc: netdev, davem, kernel, linux-can, Oliver Hartkopp,
	Bastian Stender, Elenita Hinds, Kurt Van Dijck, Maxime Jayat,
	Robin van der Gracht, Oleksij Rempel, David Jander

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;

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pull-request: can-next 2019-10-07
  2019-10-07 14:38 pull-request: can-next 2019-10-07 Marc Kleine-Budde
  2019-10-08 19:09 ` Jakub Kicinski
@ 2019-10-09  7:33 ` Marc Kleine-Budde
  1 sibling, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2019-10-09  7:33 UTC (permalink / raw)
  To: netdev
  Cc: davem, kernel, linux-can, Oliver Hartkopp, Bastian Stender,
	Elenita Hinds, Kurt Van Dijck, Maxime Jayat,
	Robin van der Gracht, Oleksij Rempel, David Jander


[-- Attachment #1.1: Type: text/plain, Size: 722 bytes --]

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

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: pull-request: can-next 2019-10-07
  2019-10-08 19:09 ` Jakub Kicinski
@ 2019-10-09  7:40   ` Marc Kleine-Budde
  0 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2019-10-09  7:40 UTC (permalink / raw)
  To: Jakub Kicinski
  Cc: netdev, davem, kernel, linux-can, Oliver Hartkopp,
	Bastian Stender, Elenita Hinds, Kurt Van Dijck, Maxime Jayat,
	Robin van der Gracht, Oleksij Rempel, David Jander


[-- Attachment #1.1: Type: text/plain, Size: 1939 bytes --]

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

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* pull-request: can-next 2019-10-07
@ 2019-11-12 15:57 Marc Kleine-Budde
  0 siblings, 0 replies; 5+ messages in thread
From: Marc Kleine-Budde @ 2019-11-12 15:57 UTC (permalink / raw)
  To: netdev
  Cc: davem, kernel, linux-can, Oliver Hartkopp, Bastian Stender,
	Elenita Hinds, Kurt Van Dijck, Maxime Jayat,
	Robin van der Gracht, Oleksij Rempel, David Jander


[-- Attachment #1.1: Type: text/plain, Size: 6513 bytes --]

Hello David,

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

The first patch is by Gustavo A. R. Silva and removes unused code in the
generic CAN infrastructure.

The next three patches target the mcp251x driver. The one by Andy
Shevchenko removes the legacy platform data support from the driver. The
other two are by Timo Schlüßler and reset the device only when needed,
to prevent glitches on the output when GPIO support is added.

I'm contributing two patches fixing checkpatch warnings in the
c_can_platform and peak_canfd driver.

Stephane Grosjean's patch for the peak_canfd driver adds hw timestamps
support in rx skbs.

The next three patches target the xilinx_can driver. One patch by me to
fix checkpatch warnings, one patch by Anssi Hannula to avoid non
requested bus error frames, and a patch by YueHaibing that switches the
driver to devm_platform_ioremap_resource().

Pankaj Sharma contributes two patches for the m_can driver, the first
one adds support for one shot mode, the other support for handling
arbitration errors.

Followed by four patches by YueHaibing, switching the grcan, ifi, rcar,
and sun4i drivers to devm_platform_ioremap_resource()

I'm contributing cleanup patches for the rx-offload helper, while Joakim
Zhang's patch prepares the rx-offload helper for CAN-FD support. The rx
offload users flexcan and ti_hecc are converted accordingly.

The remaining twelve patches target the flexcan driver. First Joakim
Zhang switches the driver to devm_platform_ioremap_resource(). The
remaining eleven patch are by me and clean up the abstract the access of
the iflag1 and iflag2 register both for RX and TX mailboxes. This is a
preparation for the upcoming CAN-FD support.

regards,
Marc

---

The following changes since commit 228200179213bfc9b4d6097e1c26de30bd18c1e6:

  Support LAN743x PTP periodic output on any GPIO (2019-11-11 12:46:56 -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.5-20191111

for you to fetch changes up to b9468ad8ff65e6dcfeb69cab15deecafdb883643:

  can: flexcan: flexcan_mailbox_read() make use of flexcan_write64() to mark the mailbox as read (2019-11-11 21:58:12 +0100)

----------------------------------------------------------------
linux-can-next-for-5.5-20191111

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

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

Gustavo A. R. Silva (1):
      can: dev: can_restart(): remove unused code

Joakim Zhang (2):
      can: rx-offload: Prepare for CAN FD support
      can: flexcan: use devm_platform_ioremap_resource() to simplify code

Marc Kleine-Budde (17):
      can: c_can: c_can_plaform: fix checkpatch warnings
      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
      can: flexcan: flexcan_irq_state(): only read timestamp if needed
      can: flexcan: rename macro FLEXCAN_IFLAG_MB() -> FLEXCAN_IFLAG2_MB()
      can: flexcan: flexcan_irq(): rename variable reg_iflag -> reg_iflag_rx
      can: flexcan: rename struct flexcan_priv::reg_imask{1,2}_default to rx_mask{1,2}
      can: flexcan: remove TX mailbox bit from struct flexcan_priv::rx_mask{1,2}
      can: flexcan: convert struct flexcan_priv::rx_mask{1,2} to rx_mask
      can: flexcan: introduce struct flexcan_priv::tx_mask and make use of it
      can: flexcan: flexcan_read_reg_iflag_rx(): optimize reading
      can: flexcan: flexcan_irq(): add support for TX mailbox in iflag1
      can: flexcan: flexcan_mailbox_read() make use of flexcan_write64() to mark the mailbox as read

Pankaj Sharma (2):
      can: m_can: add support for one shot mode
      can: m_can: add support for handling arbitration error

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

Timo Schlüßler (2):
      can: mcp251x: add mcp251x_write_2regs() and make use of it
      can: mcp251x: only reset hardware as required

YueHaibing (5):
      can: xilinx_can: use devm_platform_ioremap_resource() to simplify code
      can: grcan: use devm_platform_ioremap_resource() to simplify code
      can: ifi: use devm_platform_ioremap_resource() to simplify code
      can: rcar: use devm_platform_ioremap_resource() to simplify code
      can: sun4i: 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/c_can/c_can_platform.c        |  21 +++--
 drivers/net/can/dev.c                         |   5 +-
 drivers/net/can/flexcan.c                     | 131 +++++++++++++++-----------
 drivers/net/can/grcan.c                       |   4 +-
 drivers/net/can/ifi_canfd/ifi_canfd.c         |   4 +-
 drivers/net/can/m_can/m_can.c                 |  54 ++++++++++-
 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/rcar/rcar_can.c               |   4 +-
 drivers/net/can/rcar/rcar_canfd.c             |   4 +-
 drivers/net/can/rx-offload.c                  | 122 +++++++++---------------
 drivers/net/can/spi/mcp251x.c                 |  75 ++++++++++++---
 drivers/net/can/sun4i_can.c                   |   4 +-
 drivers/net/can/ti_hecc.c                     |  26 +++--
 drivers/net/can/xilinx_can.c                  | 102 ++++++++++----------
 include/linux/can/platform/mcp251x.h          |  22 -----
 include/linux/can/rx-offload.h                |   7 +-
 20 files changed, 360 insertions(+), 277 deletions(-)
 delete mode 100644 include/linux/can/platform/mcp251x.h

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |-
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


















[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-11-12 15:57 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-07 14:38 pull-request: can-next 2019-10-07 Marc Kleine-Budde
2019-10-08 19:09 ` Jakub Kicinski
2019-10-09  7:40   ` Marc Kleine-Budde
2019-10-09  7:33 ` Marc Kleine-Budde
2019-11-12 15:57 Marc Kleine-Budde

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.