* pull-request: can 2017-04-04
@ 2017-04-04 15:59 Marc Kleine-Budde
2017-04-04 15:59 ` [PATCH 1/2] can: ifi: use correct register to read rx status Marc Kleine-Budde
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Marc Kleine-Budde @ 2017-04-04 15:59 UTC (permalink / raw)
To: netdev; +Cc: davem, linux-can, kernel
Hello David,
this is a pull request of two patches for net/master.
The first patch by Markus Marb fixes a register read access in the ifi driver.
The second patch by Geert Uytterhoeven for the rcar driver remove the printing
of a kernel virtual address.
regards,
Marc
---
The following changes since commit 0b9aefea860063bb39e36bd7fe6c7087fed0ba87:
tcp: minimize false-positives on TCP/GRO check (2017-04-03 18:43:41 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
for you to fetch changes up to ca257b9e2d807ab6cb2678ecc7b74aaf4651f597:
can: rcar_can: Do not print virtual addresses (2017-04-04 17:49:59 +0200)
----------------------------------------------------------------
Geert Uytterhoeven (1):
can: rcar_can: Do not print virtual addresses
Markus Marb (1):
can: ifi: use correct register to read rx status
drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +-
drivers/net/can/rcar/rcar_can.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] can: ifi: use correct register to read rx status
2017-04-04 15:59 pull-request: can 2017-04-04 Marc Kleine-Budde
@ 2017-04-04 15:59 ` Marc Kleine-Budde
2017-04-04 15:59 ` [PATCH 2/2] can: rcar_can: Do not print virtual addresses Marc Kleine-Budde
2017-04-05 17:37 ` David Miller
2 siblings, 0 replies; 8+ messages in thread
From: Marc Kleine-Budde @ 2017-04-04 15:59 UTC (permalink / raw)
To: netdev
Cc: davem, linux-can, kernel, Markus Marb, linux-stable, Marc Kleine-Budde
From: Markus Marb <markus@marb.org>
The incorrect offset was used when trying to read the RXSTCMD register.
Signed-off-by: Markus Marb <markus@marb.org>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c
index 138f5ae75c0b..4d1fe8d95042 100644
--- a/drivers/net/can/ifi_canfd/ifi_canfd.c
+++ b/drivers/net/can/ifi_canfd/ifi_canfd.c
@@ -557,7 +557,7 @@ static int ifi_canfd_poll(struct napi_struct *napi, int quota)
int work_done = 0;
u32 stcmd = readl(priv->base + IFI_CANFD_STCMD);
- u32 rxstcmd = readl(priv->base + IFI_CANFD_STCMD);
+ u32 rxstcmd = readl(priv->base + IFI_CANFD_RXSTCMD);
u32 errctr = readl(priv->base + IFI_CANFD_ERROR_CTR);
/* Handle bus state changes */
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] can: rcar_can: Do not print virtual addresses
2017-04-04 15:59 pull-request: can 2017-04-04 Marc Kleine-Budde
2017-04-04 15:59 ` [PATCH 1/2] can: ifi: use correct register to read rx status Marc Kleine-Budde
@ 2017-04-04 15:59 ` Marc Kleine-Budde
2017-04-05 17:37 ` David Miller
2 siblings, 0 replies; 8+ messages in thread
From: Marc Kleine-Budde @ 2017-04-04 15:59 UTC (permalink / raw)
To: netdev; +Cc: davem, linux-can, kernel, Geert Uytterhoeven, Marc Kleine-Budde
From: Geert Uytterhoeven <geert+renesas@glider.be>
During probe, the rcar_can driver prints:
rcar_can e6e80000.can: device registered (regs @ e08bc000, IRQ76)
The "regs" value is a virtual address, exposing internal information,
hence stop printing it. The (useful) physical address is already
printed as part of the device name.
Fixes: fd1159318e55e901 ("can: add Renesas R-Car CAN driver")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/rcar/rcar_can.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index caed4e6960f8..11662f479e76 100644
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -826,8 +826,7 @@ static int rcar_can_probe(struct platform_device *pdev)
devm_can_led_init(ndev);
- dev_info(&pdev->dev, "device registered (regs @ %p, IRQ%d)\n",
- priv->regs, ndev->irq);
+ dev_info(&pdev->dev, "device registered (IRQ%d)\n", ndev->irq);
return 0;
fail_candev:
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: pull-request: can 2017-04-04
2017-04-04 15:59 pull-request: can 2017-04-04 Marc Kleine-Budde
@ 2017-04-05 17:37 ` David Miller
2017-04-04 15:59 ` [PATCH 2/2] can: rcar_can: Do not print virtual addresses Marc Kleine-Budde
2017-04-05 17:37 ` David Miller
2 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-04-05 17:37 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 4 Apr 2017 17:59:47 +0200
> this is a pull request of two patches for net/master.
...
> The following changes since commit 0b9aefea860063bb39e36bd7fe6c7087fed0ba87:
>
> tcp: minimize false-positives on TCP/GRO check (2017-04-03 18:43:41 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
Pulling this doesn't give me anything:
[davem@kkuri net]$ git pull --no-ff git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
From git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
* branch HEAD -> FETCH_HEAD
Already up-to-date.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: pull-request: can 2017-04-04
@ 2017-04-05 17:37 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-04-05 17:37 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue, 4 Apr 2017 17:59:47 +0200
> this is a pull request of two patches for net/master.
...
> The following changes since commit 0b9aefea860063bb39e36bd7fe6c7087fed0ba87:
>
> tcp: minimize false-positives on TCP/GRO check (2017-04-03 18:43:41 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
Pulling this doesn't give me anything:
[davem@kkuri net]$ git pull --no-ff git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
>From git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
* branch HEAD -> FETCH_HEAD
Already up-to-date.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: pull-request: can 2017-04-04
2017-04-05 17:37 ` David Miller
(?)
@ 2017-04-05 17:56 ` Uwe Kleine-König
-1 siblings, 0 replies; 8+ messages in thread
From: Uwe Kleine-König @ 2017-04-05 17:56 UTC (permalink / raw)
To: David Miller; +Cc: mkl, netdev, kernel, linux-can
On Wed, Apr 05, 2017 at 10:37:34AM -0700, David Miller wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> Date: Tue, 4 Apr 2017 17:59:47 +0200
>
> > this is a pull request of two patches for net/master.
> ...
> > The following changes since commit 0b9aefea860063bb39e36bd7fe6c7087fed0ba87:
> >
> > tcp: minimize false-positives on TCP/GRO check (2017-04-03 18:43:41 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
>
> Pulling this doesn't give me anything:
>
> [davem@kkuri net]$ git pull --no-ff git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
> From git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
> * branch HEAD -> FETCH_HEAD
> Already up-to-date.
There is a tag linux-can-fixes-for-4.12-20170404 that contains the
commit id Marc mentioned. (Found using
git ls-remote git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git | grep ca257b9e2
.)
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: pull-request: can 2017-04-04
2017-04-05 17:37 ` David Miller
(?)
(?)
@ 2017-04-07 9:00 ` Marc Kleine-Budde
2017-04-08 16:24 ` pull-request: can 2017-04-04,Re: " David Miller
-1 siblings, 1 reply; 8+ messages in thread
From: Marc Kleine-Budde @ 2017-04-07 9:00 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-can, kernel
[-- Attachment #1.1: Type: text/plain, Size: 2061 bytes --]
On 04/05/2017 07:37 PM, David Miller wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> Date: Tue, 4 Apr 2017 17:59:47 +0200
>
>> this is a pull request of two patches for net/master.
> ...
>> The following changes since commit 0b9aefea860063bb39e36bd7fe6c7087fed0ba87:
>>
>> tcp: minimize false-positives on TCP/GRO check (2017-04-03 18:43:41 -0700)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
>
> Pulling this doesn't give me anything:
>
> [davem@kkuri net]$ git pull --no-ff git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
> From git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
> * branch HEAD -> FETCH_HEAD
> Already up-to-date.
Sorry. The "tag" some git lost, here it is:
---
The following changes since commit 0b9aefea860063bb39e36bd7fe6c7087fed0ba87:
tcp: minimize false-positives on TCP/GRO check (2017-04-03 18:43:41 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-4.12-20170404
for you to fetch changes up to ca257b9e2d807ab6cb2678ecc7b74aaf4651f597:
can: rcar_can: Do not print virtual addresses (2017-04-04 17:49:59 +0200)
----------------------------------------------------------------
linux-can-fixes-for-4.12-20170404
----------------------------------------------------------------
Geert Uytterhoeven (1):
can: rcar_can: Do not print virtual addresses
Markus Marb (1):
can: ifi: use correct register to read rx status
drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +-
drivers/net/can/rcar/rcar_can.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
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] 8+ messages in thread* Re: pull-request: can 2017-04-04,Re: pull-request: can 2017-04-04
2017-04-07 9:00 ` Marc Kleine-Budde
@ 2017-04-08 16:24 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-04-08 16:24 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 7 Apr 2017 11:00:20 +0200
> Sorry. The "tag" some git lost, here it is:
...
> git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-4.12-20170404
Thanks, and pulled, but you probably meant to name this linux-can-fixes-for-4.11-something...
not 4.12-something...
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-04-08 16:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-04 15:59 pull-request: can 2017-04-04 Marc Kleine-Budde
2017-04-04 15:59 ` [PATCH 1/2] can: ifi: use correct register to read rx status Marc Kleine-Budde
2017-04-04 15:59 ` [PATCH 2/2] can: rcar_can: Do not print virtual addresses Marc Kleine-Budde
2017-04-05 17:37 ` pull-request: can 2017-04-04 David Miller
2017-04-05 17:37 ` David Miller
2017-04-05 17:56 ` Uwe Kleine-König
2017-04-07 9:00 ` Marc Kleine-Budde
2017-04-08 16:24 ` pull-request: can 2017-04-04,Re: " David Miller
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.