* [PATCH 1/6] can: c_can: remove unused code
2021-02-24 22:52 [PATCH 0/6] can: c_can: add support to 64 messages objects Dario Binacchi
@ 2021-02-24 22:52 ` Dario Binacchi
2021-02-24 22:52 ` [PATCH 2/6] can: c_can: fix indentation Dario Binacchi
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Dario Binacchi @ 2021-02-24 22:52 UTC (permalink / raw)
To: linux-kernel
Cc: Dario Binacchi, David S. Miller, Jakub Kicinski,
Marc Kleine-Budde, Oliver Hartkopp, Vincent Mailhol,
Wolfgang Grandegger, YueHaibing, Zhang Qilong, linux-can, netdev
Commit 9d23a9818cb1 ("can: c_can: Remove unused inline function") left
behind C_CAN_MSG_OBJ_TX_LAST constant.
Commit fa39b54ccf28 ("can: c_can: Get rid of pointless interrupts") left
behind C_CAN_MSG_RX_LOW_LAST and C_CAN_MSG_OBJ_RX_SPLIT constants.
The removed code also made a comment useless and misleading.
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
drivers/net/can/c_can/c_can.c | 3 +--
drivers/net/can/c_can/c_can.h | 4 ----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index ef474bae47a1..a962ceefd44a 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -848,8 +848,7 @@ static inline u32 c_can_get_pending(struct c_can_priv *priv)
* c_can core saves a received CAN message into the first free message
* object it finds free (starting with the lowest). Bits NEWDAT and
* INTPND are set for this message object indicating that a new message
- * has arrived. To work-around this issue, we keep two groups of message
- * objects whose partitioning is defined by C_CAN_MSG_OBJ_RX_SPLIT.
+ * has arrived.
*
* We clear the newdat bit right away.
*
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index 92213d3d96eb..90d3d2e7a086 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -32,11 +32,7 @@
C_CAN_MSG_OBJ_RX_NUM - 1)
#define C_CAN_MSG_OBJ_TX_FIRST (C_CAN_MSG_OBJ_RX_LAST + 1)
-#define C_CAN_MSG_OBJ_TX_LAST (C_CAN_MSG_OBJ_TX_FIRST + \
- C_CAN_MSG_OBJ_TX_NUM - 1)
-#define C_CAN_MSG_OBJ_RX_SPLIT 9
-#define C_CAN_MSG_RX_LOW_LAST (C_CAN_MSG_OBJ_RX_SPLIT - 1)
#define RECEIVE_OBJECT_BITS 0x0000ffff
enum reg {
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/6] can: c_can: fix indentation
2021-02-24 22:52 [PATCH 0/6] can: c_can: add support to 64 messages objects Dario Binacchi
2021-02-24 22:52 ` [PATCH 1/6] can: c_can: remove unused code Dario Binacchi
@ 2021-02-24 22:52 ` Dario Binacchi
2021-02-24 22:52 ` [PATCH 3/6] can: c_can: fix control interface used by c_can_do_tx Dario Binacchi
` (3 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Dario Binacchi @ 2021-02-24 22:52 UTC (permalink / raw)
To: linux-kernel
Cc: Dario Binacchi, David S. Miller, Jakub Kicinski,
Marc Kleine-Budde, Oliver Hartkopp, Vincent Mailhol,
Wolfgang Grandegger, YueHaibing, Zhang Qilong, linux-can, netdev
Commit 524369e2391f ("can: c_can: remove obsolete STRICT_FRAME_ORDERING Kconfig option")
left behind wrong indentation, fix it.
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
drivers/net/can/c_can/c_can.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index a962ceefd44a..dbcc1c1c92d6 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -786,7 +786,7 @@ static u32 c_can_adjust_pending(u32 pend)
static inline void c_can_rx_object_get(struct net_device *dev,
struct c_can_priv *priv, u32 obj)
{
- c_can_object_get(dev, IF_RX, obj, priv->comm_rcv_high);
+ c_can_object_get(dev, IF_RX, obj, priv->comm_rcv_high);
}
static inline void c_can_rx_finalize(struct net_device *dev,
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/6] can: c_can: fix control interface used by c_can_do_tx
2021-02-24 22:52 [PATCH 0/6] can: c_can: add support to 64 messages objects Dario Binacchi
2021-02-24 22:52 ` [PATCH 1/6] can: c_can: remove unused code Dario Binacchi
2021-02-24 22:52 ` [PATCH 2/6] can: c_can: fix indentation Dario Binacchi
@ 2021-02-24 22:52 ` Dario Binacchi
2021-02-24 22:52 ` [PATCH 4/6] can: c_can: use 32-bit write to set arbitration register Dario Binacchi
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Dario Binacchi @ 2021-02-24 22:52 UTC (permalink / raw)
To: linux-kernel
Cc: Dario Binacchi, David S. Miller, Jakub Kicinski,
Marc Kleine-Budde, Oliver Hartkopp, Vincent Mailhol,
Wolfgang Grandegger, YueHaibing, Zhang Qilong, linux-can, netdev
According to commit 640916db2bf7 ("can: c_can: Make it SMP safe") let RX use
IF1 (i.e. IF_RX) and TX use IF2 (i.e. IF_TX).
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
drivers/net/can/c_can/c_can.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index dbcc1c1c92d6..69526c3a671c 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -732,7 +732,7 @@ static void c_can_do_tx(struct net_device *dev)
idx--;
pend &= ~(1 << idx);
obj = idx + C_CAN_MSG_OBJ_TX_FIRST;
- c_can_inval_tx_object(dev, IF_RX, obj);
+ c_can_inval_tx_object(dev, IF_TX, obj);
can_get_echo_skb(dev, idx, NULL);
bytes += priv->dlc[idx];
pkts++;
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/6] can: c_can: use 32-bit write to set arbitration register
2021-02-24 22:52 [PATCH 0/6] can: c_can: add support to 64 messages objects Dario Binacchi
` (2 preceding siblings ...)
2021-02-24 22:52 ` [PATCH 3/6] can: c_can: fix control interface used by c_can_do_tx Dario Binacchi
@ 2021-02-24 22:52 ` Dario Binacchi
2021-02-24 22:52 ` [PATCH 5/6] can: c_can: prepare to up the message objects number Dario Binacchi
2021-02-24 22:52 ` [PATCH 6/6] can: c_can: add support to 64 messages objects Dario Binacchi
5 siblings, 0 replies; 12+ messages in thread
From: Dario Binacchi @ 2021-02-24 22:52 UTC (permalink / raw)
To: linux-kernel
Cc: Dario Binacchi, David S. Miller, Jakub Kicinski,
Marc Kleine-Budde, Oliver Hartkopp, Vincent Mailhol,
Wolfgang Grandegger, YueHaibing, Zhang Qilong, linux-can, netdev
The arbitration register is already set up with 32-bit writes in the
other parts of the code except for this point.
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
drivers/net/can/c_can/c_can.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 69526c3a671c..7081cfaf62e2 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -297,8 +297,7 @@ static void c_can_inval_msg_object(struct net_device *dev, int iface, int obj)
{
struct c_can_priv *priv = netdev_priv(dev);
- priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface), 0);
- priv->write_reg(priv, C_CAN_IFACE(ARB2_REG, iface), 0);
+ priv->write_reg32(priv, C_CAN_IFACE(ARB1_REG, iface), 0);
c_can_inval_tx_object(dev, iface, obj);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/6] can: c_can: prepare to up the message objects number
2021-02-24 22:52 [PATCH 0/6] can: c_can: add support to 64 messages objects Dario Binacchi
` (3 preceding siblings ...)
2021-02-24 22:52 ` [PATCH 4/6] can: c_can: use 32-bit write to set arbitration register Dario Binacchi
@ 2021-02-24 22:52 ` Dario Binacchi
2021-02-25 7:14 ` kernel test robot
2021-02-25 7:23 ` Marc Kleine-Budde
2021-02-24 22:52 ` [PATCH 6/6] can: c_can: add support to 64 messages objects Dario Binacchi
5 siblings, 2 replies; 12+ messages in thread
From: Dario Binacchi @ 2021-02-24 22:52 UTC (permalink / raw)
To: linux-kernel
Cc: Dario Binacchi, David S. Miller, Jakub Kicinski,
Marc Kleine-Budde, Oliver Hartkopp, Vincent Mailhol,
Wolfgang Grandegger, YueHaibing, Zhang Qilong, linux-can, netdev
As pointed by commit c0a9f4d396c9 ("can: c_can: Reduce register access")
the "driver casts the 16 message objects in stone, which is completely
braindead as contemporary hardware has up to 128 message objects".
The patch prepares the module to extend the number of message objects
beyond the 32 currently managed. This was achieved by transforming the
constants used to manage RX/TX messages into variables without changing
the driver policy.
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
drivers/net/can/c_can/c_can.c | 56 +++++++++++++++++---------
drivers/net/can/c_can/c_can.h | 23 +++++------
drivers/net/can/c_can/c_can_platform.c | 2 +-
3 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 7081cfaf62e2..772b26685fea 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -173,9 +173,6 @@
/* Wait for ~1 sec for INIT bit */
#define INIT_WAIT_MS 1000
-/* napi related */
-#define C_CAN_NAPI_WEIGHT C_CAN_MSG_OBJ_RX_NUM
-
/* c_can lec values */
enum c_can_lec_type {
LEC_NO_ERROR = 0,
@@ -325,7 +322,7 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface,
* first, i.e. clear the MSGVAL flag in the arbiter.
*/
if (rtr != (bool)test_bit(idx, &priv->tx_dir)) {
- u32 obj = idx + C_CAN_MSG_OBJ_TX_FIRST;
+ u32 obj = idx + priv->msg_obj_tx_first;
c_can_inval_msg_object(dev, iface, obj);
change_bit(idx, &priv->tx_dir);
@@ -463,10 +460,10 @@ static netdev_tx_t c_can_start_xmit(struct sk_buff *skb,
* prioritized. The lowest buffer number wins.
*/
idx = fls(atomic_read(&priv->tx_active));
- obj = idx + C_CAN_MSG_OBJ_TX_FIRST;
+ obj = idx + priv->msg_obj_tx_first;
/* If this is the last buffer, stop the xmit queue */
- if (idx == C_CAN_MSG_OBJ_TX_NUM - 1)
+ if (idx == priv->msg_obj_tx_num - 1)
netif_stop_queue(dev);
/*
* Store the message in the interface so we can call
@@ -549,17 +546,18 @@ static int c_can_set_bittiming(struct net_device *dev)
*/
static void c_can_configure_msg_objects(struct net_device *dev)
{
+ struct c_can_priv *priv = netdev_priv(dev);
int i;
/* first invalidate all message objects */
- for (i = C_CAN_MSG_OBJ_RX_FIRST; i <= C_CAN_NO_OF_OBJECTS; i++)
+ for (i = priv->msg_obj_rx_first; i <= priv->msg_obj_num; i++)
c_can_inval_msg_object(dev, IF_RX, i);
/* setup receive message objects */
- for (i = C_CAN_MSG_OBJ_RX_FIRST; i < C_CAN_MSG_OBJ_RX_LAST; i++)
+ for (i = priv->msg_obj_rx_first; i < priv->msg_obj_rx_last; i++)
c_can_setup_receive_object(dev, IF_RX, i, 0, 0, IF_MCONT_RCV);
- c_can_setup_receive_object(dev, IF_RX, C_CAN_MSG_OBJ_RX_LAST, 0, 0,
+ c_can_setup_receive_object(dev, IF_RX, priv->msg_obj_rx_last, 0, 0,
IF_MCONT_RCV_EOB);
}
@@ -730,7 +728,7 @@ static void c_can_do_tx(struct net_device *dev)
while ((idx = ffs(pend))) {
idx--;
pend &= ~(1 << idx);
- obj = idx + C_CAN_MSG_OBJ_TX_FIRST;
+ obj = idx + priv->msg_obj_tx_first;
c_can_inval_tx_object(dev, IF_TX, obj);
can_get_echo_skb(dev, idx, NULL);
bytes += priv->dlc[idx];
@@ -740,7 +738,7 @@ static void c_can_do_tx(struct net_device *dev)
/* Clear the bits in the tx_active mask */
atomic_sub(clr, &priv->tx_active);
- if (clr & (1 << (C_CAN_MSG_OBJ_TX_NUM - 1)))
+ if (clr & (1 << (priv->msg_obj_tx_num - 1)))
netif_wake_queue(dev);
if (pkts) {
@@ -755,11 +753,11 @@ static void c_can_do_tx(struct net_device *dev)
* raced with the hardware or failed to readout all upper
* objects in the last run due to quota limit.
*/
-static u32 c_can_adjust_pending(u32 pend)
+static u32 c_can_adjust_pending(u32 pend, u32 rx_mask)
{
u32 weight, lasts;
- if (pend == RECEIVE_OBJECT_BITS)
+ if (pend == rx_mask)
return pend;
/*
@@ -862,8 +860,7 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)
* It is faster to read only one 16bit register. This is only possible
* for a maximum number of 16 objects.
*/
- BUILD_BUG_ON_MSG(C_CAN_MSG_OBJ_RX_LAST > 16,
- "Implementation does not support more message objects than 16");
+ WARN_ON(priv->msg_obj_rx_last > 16);
while (quota > 0) {
if (!pend) {
@@ -874,7 +871,8 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)
* If the pending field has a gap, handle the
* bits above the gap first.
*/
- toread = c_can_adjust_pending(pend);
+ toread = c_can_adjust_pending(pend,
+ priv->msg_obj_rx_mask);
} else {
toread = pend;
}
@@ -1205,17 +1203,36 @@ static int c_can_close(struct net_device *dev)
return 0;
}
-struct net_device *alloc_c_can_dev(void)
+struct net_device *alloc_c_can_dev(int msg_obj_num)
{
struct net_device *dev;
struct c_can_priv *priv;
+ int msg_obj_tx_num = msg_obj_num / 2;
- dev = alloc_candev(sizeof(struct c_can_priv), C_CAN_MSG_OBJ_TX_NUM);
+ dev = alloc_candev(sizeof(struct c_can_priv), msg_obj_tx_num);
if (!dev)
return NULL;
priv = netdev_priv(dev);
- netif_napi_add(dev, &priv->napi, c_can_poll, C_CAN_NAPI_WEIGHT);
+ priv->msg_obj_num = msg_obj_num;
+ priv->msg_obj_rx_num = msg_obj_num - msg_obj_tx_num;
+ priv->msg_obj_rx_first = 1;
+ priv->msg_obj_rx_last =
+ priv->msg_obj_rx_first + priv->msg_obj_rx_num - 1;
+ priv->msg_obj_rx_mask = ((u64)1 << priv->msg_obj_rx_num) - 1;
+
+ priv->msg_obj_tx_num = msg_obj_tx_num;
+ priv->msg_obj_tx_first = priv->msg_obj_rx_last + 1;
+ priv->msg_obj_tx_last =
+ priv->msg_obj_tx_first + priv->msg_obj_tx_num - 1;
+
+ priv->dlc = kcalloc(msg_obj_tx_num, sizeof(*priv->dlc), GFP_KERNEL);
+ if (!priv->dlc) {
+ free_candev(dev);
+ return NULL;
+ }
+
+ netif_napi_add(dev, &priv->napi, c_can_poll, priv->msg_obj_rx_num);
priv->dev = dev;
priv->can.bittiming_const = &c_can_bittiming_const;
@@ -1320,6 +1337,7 @@ void free_c_can_dev(struct net_device *dev)
struct c_can_priv *priv = netdev_priv(dev);
netif_napi_del(&priv->napi);
+ kfree(priv->dlc);
free_candev(dev);
}
EXPORT_SYMBOL_GPL(free_c_can_dev);
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index 90d3d2e7a086..1dbe777320f5 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -22,18 +22,7 @@
#ifndef C_CAN_H
#define C_CAN_H
-/* message object split */
#define C_CAN_NO_OF_OBJECTS 32
-#define C_CAN_MSG_OBJ_RX_NUM 16
-#define C_CAN_MSG_OBJ_TX_NUM 16
-
-#define C_CAN_MSG_OBJ_RX_FIRST 1
-#define C_CAN_MSG_OBJ_RX_LAST (C_CAN_MSG_OBJ_RX_FIRST + \
- C_CAN_MSG_OBJ_RX_NUM - 1)
-
-#define C_CAN_MSG_OBJ_TX_FIRST (C_CAN_MSG_OBJ_RX_LAST + 1)
-
-#define RECEIVE_OBJECT_BITS 0x0000ffff
enum reg {
C_CAN_CTRL_REG = 0,
@@ -193,6 +182,14 @@ struct c_can_priv {
struct napi_struct napi;
struct net_device *dev;
struct device *device;
+ int msg_obj_num;
+ int msg_obj_rx_num;
+ int msg_obj_tx_num;
+ int msg_obj_rx_first;
+ int msg_obj_rx_last;
+ int msg_obj_tx_first;
+ int msg_obj_tx_last;
+ u32 msg_obj_rx_mask;
atomic_t tx_active;
atomic_t sie_pending;
unsigned long tx_dir;
@@ -209,10 +206,10 @@ struct c_can_priv {
void (*raminit) (const struct c_can_priv *priv, bool enable);
u32 comm_rcv_high;
u32 rxmasked;
- u32 dlc[C_CAN_MSG_OBJ_TX_NUM];
+ u32 *dlc;
};
-struct net_device *alloc_c_can_dev(void);
+struct net_device *alloc_c_can_dev(int msg_obj_num);
void free_c_can_dev(struct net_device *dev);
int register_c_can_dev(struct net_device *dev);
void unregister_c_can_dev(struct net_device *dev);
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 05f425ceb53a..a5b9b1a93702 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -293,7 +293,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
}
/* allocate the c_can device */
- dev = alloc_c_can_dev();
+ dev = alloc_c_can_dev(C_CAN_NO_OF_OBJECTS);
if (!dev) {
ret = -ENOMEM;
goto exit;
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 5/6] can: c_can: prepare to up the message objects number
2021-02-24 22:52 ` [PATCH 5/6] can: c_can: prepare to up the message objects number Dario Binacchi
@ 2021-02-25 7:14 ` kernel test robot
2021-02-25 7:23 ` Marc Kleine-Budde
1 sibling, 0 replies; 12+ messages in thread
From: kernel test robot @ 2021-02-25 7:14 UTC (permalink / raw)
To: Dario Binacchi, linux-kernel
Cc: kbuild-all, clang-built-linux, Dario Binacchi, Jakub Kicinski,
Marc Kleine-Budde, Oliver Hartkopp, Vincent Mailhol,
Wolfgang Grandegger, YueHaibing, Zhang Qilong, linux-can
[-- Attachment #1: Type: text/plain, Size: 11571 bytes --]
Hi Dario,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on mkl-can-next/testing]
[also build test ERROR on linux/master net-next/master net/master linus/master next-20210225]
[cannot apply to sparc-next/master v5.11]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Dario-Binacchi/can-c_can-add-support-to-64-messages-objects/20210225-070042
base: https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git testing
config: x86_64-randconfig-a006-20210225 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project a921aaf789912d981cbb2036bdc91ad7289e1523)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/9bbfc6bc12c1d9a2445413bf6e710302f012c1ae
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Dario-Binacchi/can-c_can-add-support-to-64-messages-objects/20210225-070042
git checkout 9bbfc6bc12c1d9a2445413bf6e710302f012c1ae
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/net/can/c_can/c_can_pci.c:152:24: error: too few arguments to function call, single argument 'msg_obj_num' was not specified
dev = alloc_c_can_dev();
~~~~~~~~~~~~~~~ ^
drivers/net/can/c_can/c_can.h:212:20: note: 'alloc_c_can_dev' declared here
struct net_device *alloc_c_can_dev(int msg_obj_num);
^
1 error generated.
vim +/msg_obj_num +152 drivers/net/can/c_can/c_can_pci.c
abcd7f750a7e97 Alexander Stein 2014-04-07 113
3c8ac0f2ad53a9 Bill Pemberton 2012-12-03 114 static int c_can_pci_probe(struct pci_dev *pdev,
5b92da0443c258 Federico Vaga 2012-06-14 115 const struct pci_device_id *ent)
5b92da0443c258 Federico Vaga 2012-06-14 116 {
5b92da0443c258 Federico Vaga 2012-06-14 117 struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
5b92da0443c258 Federico Vaga 2012-06-14 118 struct c_can_priv *priv;
5b92da0443c258 Federico Vaga 2012-06-14 119 struct net_device *dev;
5b92da0443c258 Federico Vaga 2012-06-14 120 void __iomem *addr;
5b92da0443c258 Federico Vaga 2012-06-14 121 int ret;
5b92da0443c258 Federico Vaga 2012-06-14 122
5b92da0443c258 Federico Vaga 2012-06-14 123 ret = pci_enable_device(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 124 if (ret) {
5b92da0443c258 Federico Vaga 2012-06-14 125 dev_err(&pdev->dev, "pci_enable_device FAILED\n");
5b92da0443c258 Federico Vaga 2012-06-14 126 goto out;
5b92da0443c258 Federico Vaga 2012-06-14 127 }
5b92da0443c258 Federico Vaga 2012-06-14 128
5b92da0443c258 Federico Vaga 2012-06-14 129 ret = pci_request_regions(pdev, KBUILD_MODNAME);
5b92da0443c258 Federico Vaga 2012-06-14 130 if (ret) {
5b92da0443c258 Federico Vaga 2012-06-14 131 dev_err(&pdev->dev, "pci_request_regions FAILED\n");
5b92da0443c258 Federico Vaga 2012-06-14 132 goto out_disable_device;
5b92da0443c258 Federico Vaga 2012-06-14 133 }
5b92da0443c258 Federico Vaga 2012-06-14 134
78c181bc8a75d3 Wolfgang Grandegger 2014-04-03 135 ret = pci_enable_msi(pdev);
78c181bc8a75d3 Wolfgang Grandegger 2014-04-03 136 if (!ret) {
78c181bc8a75d3 Wolfgang Grandegger 2014-04-03 137 dev_info(&pdev->dev, "MSI enabled\n");
5b92da0443c258 Federico Vaga 2012-06-14 138 pci_set_master(pdev);
78c181bc8a75d3 Wolfgang Grandegger 2014-04-03 139 }
5b92da0443c258 Federico Vaga 2012-06-14 140
abcd7f750a7e97 Alexander Stein 2014-04-07 141 addr = pci_iomap(pdev, c_can_pci_data->bar,
abcd7f750a7e97 Alexander Stein 2014-04-07 142 pci_resource_len(pdev, c_can_pci_data->bar));
5b92da0443c258 Federico Vaga 2012-06-14 143 if (!addr) {
5b92da0443c258 Federico Vaga 2012-06-14 144 dev_err(&pdev->dev,
5b92da0443c258 Federico Vaga 2012-06-14 145 "device has no PCI memory resources, "
5b92da0443c258 Federico Vaga 2012-06-14 146 "failing adapter\n");
5b92da0443c258 Federico Vaga 2012-06-14 147 ret = -ENOMEM;
5b92da0443c258 Federico Vaga 2012-06-14 148 goto out_release_regions;
5b92da0443c258 Federico Vaga 2012-06-14 149 }
5b92da0443c258 Federico Vaga 2012-06-14 150
5b92da0443c258 Federico Vaga 2012-06-14 151 /* allocate the c_can device */
5b92da0443c258 Federico Vaga 2012-06-14 @152 dev = alloc_c_can_dev();
5b92da0443c258 Federico Vaga 2012-06-14 153 if (!dev) {
5b92da0443c258 Federico Vaga 2012-06-14 154 ret = -ENOMEM;
5b92da0443c258 Federico Vaga 2012-06-14 155 goto out_iounmap;
5b92da0443c258 Federico Vaga 2012-06-14 156 }
5b92da0443c258 Federico Vaga 2012-06-14 157
5b92da0443c258 Federico Vaga 2012-06-14 158 priv = netdev_priv(dev);
5b92da0443c258 Federico Vaga 2012-06-14 159 pci_set_drvdata(pdev, dev);
5b92da0443c258 Federico Vaga 2012-06-14 160 SET_NETDEV_DEV(dev, &pdev->dev);
5b92da0443c258 Federico Vaga 2012-06-14 161
5b92da0443c258 Federico Vaga 2012-06-14 162 dev->irq = pdev->irq;
5b92da0443c258 Federico Vaga 2012-06-14 163 priv->base = addr;
c97c52be78b846 Einar Jón 2016-08-12 164 priv->device = &pdev->dev;
5b92da0443c258 Federico Vaga 2012-06-14 165
5b92da0443c258 Federico Vaga 2012-06-14 166 if (!c_can_pci_data->freq) {
1aa2d1daf067c8 Marc Kleine-Budde 2012-06-20 167 dev_err(&pdev->dev, "no clock frequency defined\n");
5b92da0443c258 Federico Vaga 2012-06-14 168 ret = -ENODEV;
5b92da0443c258 Federico Vaga 2012-06-14 169 goto out_free_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 170 } else {
5b92da0443c258 Federico Vaga 2012-06-14 171 priv->can.clock.freq = c_can_pci_data->freq;
5b92da0443c258 Federico Vaga 2012-06-14 172 }
5b92da0443c258 Federico Vaga 2012-06-14 173
5b92da0443c258 Federico Vaga 2012-06-14 174 /* Configure CAN type */
5b92da0443c258 Federico Vaga 2012-06-14 175 switch (c_can_pci_data->type) {
f27b1db95d047d AnilKumar Ch 2012-08-02 176 case BOSCH_C_CAN:
5b92da0443c258 Federico Vaga 2012-06-14 177 priv->regs = reg_map_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 178 break;
f27b1db95d047d AnilKumar Ch 2012-08-02 179 case BOSCH_D_CAN:
5b92da0443c258 Federico Vaga 2012-06-14 180 priv->regs = reg_map_d_can;
5b92da0443c258 Federico Vaga 2012-06-14 181 break;
5b92da0443c258 Federico Vaga 2012-06-14 182 default:
5b92da0443c258 Federico Vaga 2012-06-14 183 ret = -EINVAL;
1aa2d1daf067c8 Marc Kleine-Budde 2012-06-20 184 goto out_free_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 185 }
5b92da0443c258 Federico Vaga 2012-06-14 186
129eef2184218f Thomas Gleixner 2014-04-11 187 priv->type = c_can_pci_data->type;
129eef2184218f Thomas Gleixner 2014-04-11 188
5b92da0443c258 Federico Vaga 2012-06-14 189 /* Configure access to registers */
5b92da0443c258 Federico Vaga 2012-06-14 190 switch (c_can_pci_data->reg_align) {
5b92da0443c258 Federico Vaga 2012-06-14 191 case C_CAN_REG_ALIGN_32:
5b92da0443c258 Federico Vaga 2012-06-14 192 priv->read_reg = c_can_pci_read_reg_aligned_to_32bit;
5b92da0443c258 Federico Vaga 2012-06-14 193 priv->write_reg = c_can_pci_write_reg_aligned_to_32bit;
5b92da0443c258 Federico Vaga 2012-06-14 194 break;
5b92da0443c258 Federico Vaga 2012-06-14 195 case C_CAN_REG_ALIGN_16:
5b92da0443c258 Federico Vaga 2012-06-14 196 priv->read_reg = c_can_pci_read_reg_aligned_to_16bit;
5b92da0443c258 Federico Vaga 2012-06-14 197 priv->write_reg = c_can_pci_write_reg_aligned_to_16bit;
5b92da0443c258 Federico Vaga 2012-06-14 198 break;
abcd7f750a7e97 Alexander Stein 2014-04-07 199 case C_CAN_REG_32:
abcd7f750a7e97 Alexander Stein 2014-04-07 200 priv->read_reg = c_can_pci_read_reg_32bit;
abcd7f750a7e97 Alexander Stein 2014-04-07 201 priv->write_reg = c_can_pci_write_reg_32bit;
abcd7f750a7e97 Alexander Stein 2014-04-07 202 break;
5b92da0443c258 Federico Vaga 2012-06-14 203 default:
5b92da0443c258 Federico Vaga 2012-06-14 204 ret = -EINVAL;
1aa2d1daf067c8 Marc Kleine-Budde 2012-06-20 205 goto out_free_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 206 }
ccbc5357db3098 Pavel Machek 2014-05-06 207 priv->read_reg32 = c_can_pci_read_reg32;
ccbc5357db3098 Pavel Machek 2014-05-06 208 priv->write_reg32 = c_can_pci_write_reg32;
5b92da0443c258 Federico Vaga 2012-06-14 209
abcd7f750a7e97 Alexander Stein 2014-04-07 210 priv->raminit = c_can_pci_data->init;
abcd7f750a7e97 Alexander Stein 2014-04-07 211
5b92da0443c258 Federico Vaga 2012-06-14 212 ret = register_c_can_dev(dev);
5b92da0443c258 Federico Vaga 2012-06-14 213 if (ret) {
5b92da0443c258 Federico Vaga 2012-06-14 214 dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
5b92da0443c258 Federico Vaga 2012-06-14 215 KBUILD_MODNAME, ret);
1aa2d1daf067c8 Marc Kleine-Budde 2012-06-20 216 goto out_free_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 217 }
5b92da0443c258 Federico Vaga 2012-06-14 218
5b92da0443c258 Federico Vaga 2012-06-14 219 dev_dbg(&pdev->dev, "%s device registered (regs=%p, irq=%d)\n",
5b92da0443c258 Federico Vaga 2012-06-14 220 KBUILD_MODNAME, priv->regs, dev->irq);
5b92da0443c258 Federico Vaga 2012-06-14 221
5b92da0443c258 Federico Vaga 2012-06-14 222 return 0;
5b92da0443c258 Federico Vaga 2012-06-14 223
5b92da0443c258 Federico Vaga 2012-06-14 224 out_free_c_can:
5b92da0443c258 Federico Vaga 2012-06-14 225 free_c_can_dev(dev);
5b92da0443c258 Federico Vaga 2012-06-14 226 out_iounmap:
5b92da0443c258 Federico Vaga 2012-06-14 227 pci_iounmap(pdev, addr);
5b92da0443c258 Federico Vaga 2012-06-14 228 out_release_regions:
5b92da0443c258 Federico Vaga 2012-06-14 229 pci_disable_msi(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 230 pci_clear_master(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 231 pci_release_regions(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 232 out_disable_device:
5b92da0443c258 Federico Vaga 2012-06-14 233 pci_disable_device(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 234 out:
5b92da0443c258 Federico Vaga 2012-06-14 235 return ret;
5b92da0443c258 Federico Vaga 2012-06-14 236 }
5b92da0443c258 Federico Vaga 2012-06-14 237
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 34284 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 5/6] can: c_can: prepare to up the message objects number
@ 2021-02-25 7:14 ` kernel test robot
0 siblings, 0 replies; 12+ messages in thread
From: kernel test robot @ 2021-02-25 7:14 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 11746 bytes --]
Hi Dario,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on mkl-can-next/testing]
[also build test ERROR on linux/master net-next/master net/master linus/master next-20210225]
[cannot apply to sparc-next/master v5.11]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Dario-Binacchi/can-c_can-add-support-to-64-messages-objects/20210225-070042
base: https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git testing
config: x86_64-randconfig-a006-20210225 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project a921aaf789912d981cbb2036bdc91ad7289e1523)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/9bbfc6bc12c1d9a2445413bf6e710302f012c1ae
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Dario-Binacchi/can-c_can-add-support-to-64-messages-objects/20210225-070042
git checkout 9bbfc6bc12c1d9a2445413bf6e710302f012c1ae
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/net/can/c_can/c_can_pci.c:152:24: error: too few arguments to function call, single argument 'msg_obj_num' was not specified
dev = alloc_c_can_dev();
~~~~~~~~~~~~~~~ ^
drivers/net/can/c_can/c_can.h:212:20: note: 'alloc_c_can_dev' declared here
struct net_device *alloc_c_can_dev(int msg_obj_num);
^
1 error generated.
vim +/msg_obj_num +152 drivers/net/can/c_can/c_can_pci.c
abcd7f750a7e97 Alexander Stein 2014-04-07 113
3c8ac0f2ad53a9 Bill Pemberton 2012-12-03 114 static int c_can_pci_probe(struct pci_dev *pdev,
5b92da0443c258 Federico Vaga 2012-06-14 115 const struct pci_device_id *ent)
5b92da0443c258 Federico Vaga 2012-06-14 116 {
5b92da0443c258 Federico Vaga 2012-06-14 117 struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
5b92da0443c258 Federico Vaga 2012-06-14 118 struct c_can_priv *priv;
5b92da0443c258 Federico Vaga 2012-06-14 119 struct net_device *dev;
5b92da0443c258 Federico Vaga 2012-06-14 120 void __iomem *addr;
5b92da0443c258 Federico Vaga 2012-06-14 121 int ret;
5b92da0443c258 Federico Vaga 2012-06-14 122
5b92da0443c258 Federico Vaga 2012-06-14 123 ret = pci_enable_device(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 124 if (ret) {
5b92da0443c258 Federico Vaga 2012-06-14 125 dev_err(&pdev->dev, "pci_enable_device FAILED\n");
5b92da0443c258 Federico Vaga 2012-06-14 126 goto out;
5b92da0443c258 Federico Vaga 2012-06-14 127 }
5b92da0443c258 Federico Vaga 2012-06-14 128
5b92da0443c258 Federico Vaga 2012-06-14 129 ret = pci_request_regions(pdev, KBUILD_MODNAME);
5b92da0443c258 Federico Vaga 2012-06-14 130 if (ret) {
5b92da0443c258 Federico Vaga 2012-06-14 131 dev_err(&pdev->dev, "pci_request_regions FAILED\n");
5b92da0443c258 Federico Vaga 2012-06-14 132 goto out_disable_device;
5b92da0443c258 Federico Vaga 2012-06-14 133 }
5b92da0443c258 Federico Vaga 2012-06-14 134
78c181bc8a75d3 Wolfgang Grandegger 2014-04-03 135 ret = pci_enable_msi(pdev);
78c181bc8a75d3 Wolfgang Grandegger 2014-04-03 136 if (!ret) {
78c181bc8a75d3 Wolfgang Grandegger 2014-04-03 137 dev_info(&pdev->dev, "MSI enabled\n");
5b92da0443c258 Federico Vaga 2012-06-14 138 pci_set_master(pdev);
78c181bc8a75d3 Wolfgang Grandegger 2014-04-03 139 }
5b92da0443c258 Federico Vaga 2012-06-14 140
abcd7f750a7e97 Alexander Stein 2014-04-07 141 addr = pci_iomap(pdev, c_can_pci_data->bar,
abcd7f750a7e97 Alexander Stein 2014-04-07 142 pci_resource_len(pdev, c_can_pci_data->bar));
5b92da0443c258 Federico Vaga 2012-06-14 143 if (!addr) {
5b92da0443c258 Federico Vaga 2012-06-14 144 dev_err(&pdev->dev,
5b92da0443c258 Federico Vaga 2012-06-14 145 "device has no PCI memory resources, "
5b92da0443c258 Federico Vaga 2012-06-14 146 "failing adapter\n");
5b92da0443c258 Federico Vaga 2012-06-14 147 ret = -ENOMEM;
5b92da0443c258 Federico Vaga 2012-06-14 148 goto out_release_regions;
5b92da0443c258 Federico Vaga 2012-06-14 149 }
5b92da0443c258 Federico Vaga 2012-06-14 150
5b92da0443c258 Federico Vaga 2012-06-14 151 /* allocate the c_can device */
5b92da0443c258 Federico Vaga 2012-06-14 @152 dev = alloc_c_can_dev();
5b92da0443c258 Federico Vaga 2012-06-14 153 if (!dev) {
5b92da0443c258 Federico Vaga 2012-06-14 154 ret = -ENOMEM;
5b92da0443c258 Federico Vaga 2012-06-14 155 goto out_iounmap;
5b92da0443c258 Federico Vaga 2012-06-14 156 }
5b92da0443c258 Federico Vaga 2012-06-14 157
5b92da0443c258 Federico Vaga 2012-06-14 158 priv = netdev_priv(dev);
5b92da0443c258 Federico Vaga 2012-06-14 159 pci_set_drvdata(pdev, dev);
5b92da0443c258 Federico Vaga 2012-06-14 160 SET_NETDEV_DEV(dev, &pdev->dev);
5b92da0443c258 Federico Vaga 2012-06-14 161
5b92da0443c258 Federico Vaga 2012-06-14 162 dev->irq = pdev->irq;
5b92da0443c258 Federico Vaga 2012-06-14 163 priv->base = addr;
c97c52be78b846 Einar Jón 2016-08-12 164 priv->device = &pdev->dev;
5b92da0443c258 Federico Vaga 2012-06-14 165
5b92da0443c258 Federico Vaga 2012-06-14 166 if (!c_can_pci_data->freq) {
1aa2d1daf067c8 Marc Kleine-Budde 2012-06-20 167 dev_err(&pdev->dev, "no clock frequency defined\n");
5b92da0443c258 Federico Vaga 2012-06-14 168 ret = -ENODEV;
5b92da0443c258 Federico Vaga 2012-06-14 169 goto out_free_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 170 } else {
5b92da0443c258 Federico Vaga 2012-06-14 171 priv->can.clock.freq = c_can_pci_data->freq;
5b92da0443c258 Federico Vaga 2012-06-14 172 }
5b92da0443c258 Federico Vaga 2012-06-14 173
5b92da0443c258 Federico Vaga 2012-06-14 174 /* Configure CAN type */
5b92da0443c258 Federico Vaga 2012-06-14 175 switch (c_can_pci_data->type) {
f27b1db95d047d AnilKumar Ch 2012-08-02 176 case BOSCH_C_CAN:
5b92da0443c258 Federico Vaga 2012-06-14 177 priv->regs = reg_map_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 178 break;
f27b1db95d047d AnilKumar Ch 2012-08-02 179 case BOSCH_D_CAN:
5b92da0443c258 Federico Vaga 2012-06-14 180 priv->regs = reg_map_d_can;
5b92da0443c258 Federico Vaga 2012-06-14 181 break;
5b92da0443c258 Federico Vaga 2012-06-14 182 default:
5b92da0443c258 Federico Vaga 2012-06-14 183 ret = -EINVAL;
1aa2d1daf067c8 Marc Kleine-Budde 2012-06-20 184 goto out_free_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 185 }
5b92da0443c258 Federico Vaga 2012-06-14 186
129eef2184218f Thomas Gleixner 2014-04-11 187 priv->type = c_can_pci_data->type;
129eef2184218f Thomas Gleixner 2014-04-11 188
5b92da0443c258 Federico Vaga 2012-06-14 189 /* Configure access to registers */
5b92da0443c258 Federico Vaga 2012-06-14 190 switch (c_can_pci_data->reg_align) {
5b92da0443c258 Federico Vaga 2012-06-14 191 case C_CAN_REG_ALIGN_32:
5b92da0443c258 Federico Vaga 2012-06-14 192 priv->read_reg = c_can_pci_read_reg_aligned_to_32bit;
5b92da0443c258 Federico Vaga 2012-06-14 193 priv->write_reg = c_can_pci_write_reg_aligned_to_32bit;
5b92da0443c258 Federico Vaga 2012-06-14 194 break;
5b92da0443c258 Federico Vaga 2012-06-14 195 case C_CAN_REG_ALIGN_16:
5b92da0443c258 Federico Vaga 2012-06-14 196 priv->read_reg = c_can_pci_read_reg_aligned_to_16bit;
5b92da0443c258 Federico Vaga 2012-06-14 197 priv->write_reg = c_can_pci_write_reg_aligned_to_16bit;
5b92da0443c258 Federico Vaga 2012-06-14 198 break;
abcd7f750a7e97 Alexander Stein 2014-04-07 199 case C_CAN_REG_32:
abcd7f750a7e97 Alexander Stein 2014-04-07 200 priv->read_reg = c_can_pci_read_reg_32bit;
abcd7f750a7e97 Alexander Stein 2014-04-07 201 priv->write_reg = c_can_pci_write_reg_32bit;
abcd7f750a7e97 Alexander Stein 2014-04-07 202 break;
5b92da0443c258 Federico Vaga 2012-06-14 203 default:
5b92da0443c258 Federico Vaga 2012-06-14 204 ret = -EINVAL;
1aa2d1daf067c8 Marc Kleine-Budde 2012-06-20 205 goto out_free_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 206 }
ccbc5357db3098 Pavel Machek 2014-05-06 207 priv->read_reg32 = c_can_pci_read_reg32;
ccbc5357db3098 Pavel Machek 2014-05-06 208 priv->write_reg32 = c_can_pci_write_reg32;
5b92da0443c258 Federico Vaga 2012-06-14 209
abcd7f750a7e97 Alexander Stein 2014-04-07 210 priv->raminit = c_can_pci_data->init;
abcd7f750a7e97 Alexander Stein 2014-04-07 211
5b92da0443c258 Federico Vaga 2012-06-14 212 ret = register_c_can_dev(dev);
5b92da0443c258 Federico Vaga 2012-06-14 213 if (ret) {
5b92da0443c258 Federico Vaga 2012-06-14 214 dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
5b92da0443c258 Federico Vaga 2012-06-14 215 KBUILD_MODNAME, ret);
1aa2d1daf067c8 Marc Kleine-Budde 2012-06-20 216 goto out_free_c_can;
5b92da0443c258 Federico Vaga 2012-06-14 217 }
5b92da0443c258 Federico Vaga 2012-06-14 218
5b92da0443c258 Federico Vaga 2012-06-14 219 dev_dbg(&pdev->dev, "%s device registered (regs=%p, irq=%d)\n",
5b92da0443c258 Federico Vaga 2012-06-14 220 KBUILD_MODNAME, priv->regs, dev->irq);
5b92da0443c258 Federico Vaga 2012-06-14 221
5b92da0443c258 Federico Vaga 2012-06-14 222 return 0;
5b92da0443c258 Federico Vaga 2012-06-14 223
5b92da0443c258 Federico Vaga 2012-06-14 224 out_free_c_can:
5b92da0443c258 Federico Vaga 2012-06-14 225 free_c_can_dev(dev);
5b92da0443c258 Federico Vaga 2012-06-14 226 out_iounmap:
5b92da0443c258 Federico Vaga 2012-06-14 227 pci_iounmap(pdev, addr);
5b92da0443c258 Federico Vaga 2012-06-14 228 out_release_regions:
5b92da0443c258 Federico Vaga 2012-06-14 229 pci_disable_msi(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 230 pci_clear_master(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 231 pci_release_regions(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 232 out_disable_device:
5b92da0443c258 Federico Vaga 2012-06-14 233 pci_disable_device(pdev);
5b92da0443c258 Federico Vaga 2012-06-14 234 out:
5b92da0443c258 Federico Vaga 2012-06-14 235 return ret;
5b92da0443c258 Federico Vaga 2012-06-14 236 }
5b92da0443c258 Federico Vaga 2012-06-14 237
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 34284 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 5/6] can: c_can: prepare to up the message objects number
2021-02-25 7:14 ` kernel test robot
@ 2021-02-25 9:25 ` Marc Kleine-Budde
-1 siblings, 0 replies; 12+ messages in thread
From: Marc Kleine-Budde @ 2021-02-25 9:25 UTC (permalink / raw)
To: kernel test robot
Cc: Dario Binacchi, linux-kernel, kbuild-all, clang-built-linux,
Jakub Kicinski, Oliver Hartkopp, Vincent Mailhol,
Wolfgang Grandegger, YueHaibing, Zhang Qilong, linux-can,
Alexander Stein, Federico Vaga
[-- Attachment #1: Type: text/plain, Size: 2761 bytes --]
On 25.02.2021 15:14:43, kernel test robot wrote:
> Hi Dario,
>
> Thank you for the patch! Yet something to improve:
>
> [auto build test ERROR on mkl-can-next/testing]
> [also build test ERROR on linux/master net-next/master net/master linus/master next-20210225]
> [cannot apply to sparc-next/master v5.11]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch]
>
> url: https://github.com/0day-ci/linux/commits/Dario-Binacchi/can-c_can-add-support-to-64-messages-objects/20210225-070042
> base: https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git testing
> config: x86_64-randconfig-a006-20210225 (attached as .config)
> compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project a921aaf789912d981cbb2036bdc91ad7289e1523)
> reproduce (this is a W=1 build):
> wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> # install x86_64 cross compiling tool for clang build
> # apt-get install binutils-x86-64-linux-gnu
> # https://github.com/0day-ci/linux/commit/9bbfc6bc12c1d9a2445413bf6e710302f012c1ae
> git remote add linux-review https://github.com/0day-ci/linux
> git fetch --no-tags linux-review Dario-Binacchi/can-c_can-add-support-to-64-messages-objects/20210225-070042
> git checkout 9bbfc6bc12c1d9a2445413bf6e710302f012c1ae
> # save the attached .config to linux build tree
> COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
>
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp@intel.com>
>
> All errors (new ones prefixed by >>):
>
> >> drivers/net/can/c_can/c_can_pci.c:152:24: error: too few arguments to function call, single argument 'msg_obj_num' was not specified
> dev = alloc_c_can_dev();
> ~~~~~~~~~~~~~~~ ^
> drivers/net/can/c_can/c_can.h:212:20: note: 'alloc_c_can_dev' declared here
> struct net_device *alloc_c_can_dev(int msg_obj_num);
> ^
> 1 error generated.
For now you can use 16, which means no change. I've added Alexander
and Federico to Cc, they added the intel pch and st micro support, maybe
they can help and add the correct size.
regards,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 5/6] can: c_can: prepare to up the message objects number
@ 2021-02-25 9:25 ` Marc Kleine-Budde
0 siblings, 0 replies; 12+ messages in thread
From: Marc Kleine-Budde @ 2021-02-25 9:25 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2761 bytes --]
On 25.02.2021 15:14:43, kernel test robot wrote:
> Hi Dario,
>
> Thank you for the patch! Yet something to improve:
>
> [auto build test ERROR on mkl-can-next/testing]
> [also build test ERROR on linux/master net-next/master net/master linus/master next-20210225]
> [cannot apply to sparc-next/master v5.11]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch]
>
> url: https://github.com/0day-ci/linux/commits/Dario-Binacchi/can-c_can-add-support-to-64-messages-objects/20210225-070042
> base: https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git testing
> config: x86_64-randconfig-a006-20210225 (attached as .config)
> compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project a921aaf789912d981cbb2036bdc91ad7289e1523)
> reproduce (this is a W=1 build):
> wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> # install x86_64 cross compiling tool for clang build
> # apt-get install binutils-x86-64-linux-gnu
> # https://github.com/0day-ci/linux/commit/9bbfc6bc12c1d9a2445413bf6e710302f012c1ae
> git remote add linux-review https://github.com/0day-ci/linux
> git fetch --no-tags linux-review Dario-Binacchi/can-c_can-add-support-to-64-messages-objects/20210225-070042
> git checkout 9bbfc6bc12c1d9a2445413bf6e710302f012c1ae
> # save the attached .config to linux build tree
> COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
>
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp@intel.com>
>
> All errors (new ones prefixed by >>):
>
> >> drivers/net/can/c_can/c_can_pci.c:152:24: error: too few arguments to function call, single argument 'msg_obj_num' was not specified
> dev = alloc_c_can_dev();
> ~~~~~~~~~~~~~~~ ^
> drivers/net/can/c_can/c_can.h:212:20: note: 'alloc_c_can_dev' declared here
> struct net_device *alloc_c_can_dev(int msg_obj_num);
> ^
> 1 error generated.
For now you can use 16, which means no change. I've added Alexander
and Federico to Cc, they added the intel pch and st micro support, maybe
they can help and add the correct size.
regards,
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 5/6] can: c_can: prepare to up the message objects number
2021-02-24 22:52 ` [PATCH 5/6] can: c_can: prepare to up the message objects number Dario Binacchi
2021-02-25 7:14 ` kernel test robot
@ 2021-02-25 7:23 ` Marc Kleine-Budde
1 sibling, 0 replies; 12+ messages in thread
From: Marc Kleine-Budde @ 2021-02-25 7:23 UTC (permalink / raw)
To: Dario Binacchi
Cc: linux-kernel, David S. Miller, Jakub Kicinski, Oliver Hartkopp,
Vincent Mailhol, Wolfgang Grandegger, YueHaibing, Zhang Qilong,
linux-can, netdev
[-- Attachment #1: Type: text/plain, Size: 1663 bytes --]
Hey Dario,
just a quick note...
On 24.02.2021 23:52:45, Dario Binacchi wrote:
> -struct net_device *alloc_c_can_dev(void)
> +struct net_device *alloc_c_can_dev(int msg_obj_num)
> {
> struct net_device *dev;
> struct c_can_priv *priv;
> + int msg_obj_tx_num = msg_obj_num / 2;
>
> - dev = alloc_candev(sizeof(struct c_can_priv), C_CAN_MSG_OBJ_TX_NUM);
> + dev = alloc_candev(sizeof(struct c_can_priv), msg_obj_tx_num);
> if (!dev)
> return NULL;
>
> priv = netdev_priv(dev);
> - netif_napi_add(dev, &priv->napi, c_can_poll, C_CAN_NAPI_WEIGHT);
> + priv->msg_obj_num = msg_obj_num;
> + priv->msg_obj_rx_num = msg_obj_num - msg_obj_tx_num;
> + priv->msg_obj_rx_first = 1;
> + priv->msg_obj_rx_last =
> + priv->msg_obj_rx_first + priv->msg_obj_rx_num - 1;
> + priv->msg_obj_rx_mask = ((u64)1 << priv->msg_obj_rx_num) - 1;
> +
> + priv->msg_obj_tx_num = msg_obj_tx_num;
> + priv->msg_obj_tx_first = priv->msg_obj_rx_last + 1;
> + priv->msg_obj_tx_last =
> + priv->msg_obj_tx_first + priv->msg_obj_tx_num - 1;
> +
> + priv->dlc = kcalloc(msg_obj_tx_num, sizeof(*priv->dlc), GFP_KERNEL);
You can pass a larger size to alloc_candev() so that it includes the mem
you allocate here.
> + if (!priv->dlc) {
> + free_candev(dev);
> + return NULL;
> + }
> +
> + netif_napi_add(dev, &priv->napi, c_can_poll, priv->msg_obj_rx_num);
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 6/6] can: c_can: add support to 64 messages objects
2021-02-24 22:52 [PATCH 0/6] can: c_can: add support to 64 messages objects Dario Binacchi
` (4 preceding siblings ...)
2021-02-24 22:52 ` [PATCH 5/6] can: c_can: prepare to up the message objects number Dario Binacchi
@ 2021-02-24 22:52 ` Dario Binacchi
5 siblings, 0 replies; 12+ messages in thread
From: Dario Binacchi @ 2021-02-24 22:52 UTC (permalink / raw)
To: linux-kernel
Cc: Dario Binacchi, David S. Miller, Jakub Kicinski,
Marc Kleine-Budde, Oliver Hartkopp, Vincent Mailhol,
Wolfgang Grandegger, YueHaibing, Zhang Qilong, linux-can, netdev
D_CAN controller supports 16, 32, 64 or 128 messages objects, comparing
to 32 on C_CAN.
AM335x/AM437x Sitara processors and DRA7 SOC all instantiate a D_CAN
controller with 64 message objects, as described in the "DCAN features"
subsection of the CAN chapter of their technical reference manuals.
The driver policy has been kept unchanged, and as in the previous
version, the first half of the message objects is used for reception and
the second for transmission.
The I/O load is increased only in the case of 64 message objects,
keeping it unchanged in the case of 32. Two 32-bit read accesses are in
fact required, which however remained at 16-bit for configurations with
32 message objects.
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
drivers/net/can/c_can/c_can.c | 19 +++++++++++--------
drivers/net/can/c_can/c_can.h | 5 +++--
drivers/net/can/c_can/c_can_platform.c | 6 +++++-
3 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 772b26685fea..3429eab5ac7d 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -723,8 +723,12 @@ static void c_can_do_tx(struct net_device *dev)
struct net_device_stats *stats = &dev->stats;
u32 idx, obj, pkts = 0, bytes = 0, pend, clr;
- clr = pend = priv->read_reg(priv, C_CAN_INTPND2_REG);
+ if (priv->msg_obj_tx_last > 32)
+ pend = priv->read_reg32(priv, C_CAN_INTPND3_REG);
+ else
+ pend = priv->read_reg(priv, C_CAN_INTPND2_REG);
+ clr = pend;
while ((idx = ffs(pend))) {
idx--;
pend &= ~(1 << idx);
@@ -834,7 +838,12 @@ static int c_can_read_objects(struct net_device *dev, struct c_can_priv *priv,
static inline u32 c_can_get_pending(struct c_can_priv *priv)
{
- u32 pend = priv->read_reg(priv, C_CAN_NEWDAT1_REG);
+ u32 pend;
+
+ if (priv->msg_obj_rx_last > 16)
+ pend = priv->read_reg32(priv, C_CAN_NEWDAT1_REG);
+ else
+ pend = priv->read_reg(priv, C_CAN_NEWDAT1_REG);
return pend;
}
@@ -856,12 +865,6 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)
struct c_can_priv *priv = netdev_priv(dev);
u32 pkts = 0, pend = 0, toread, n;
- /*
- * It is faster to read only one 16bit register. This is only possible
- * for a maximum number of 16 objects.
- */
- WARN_ON(priv->msg_obj_rx_last > 16);
-
while (quota > 0) {
if (!pend) {
pend = c_can_get_pending(priv);
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index 1dbe777320f5..7cf92a576d4a 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -22,8 +22,6 @@
#ifndef C_CAN_H
#define C_CAN_H
-#define C_CAN_NO_OF_OBJECTS 32
-
enum reg {
C_CAN_CTRL_REG = 0,
C_CAN_CTRL_EX_REG,
@@ -61,6 +59,7 @@ enum reg {
C_CAN_NEWDAT2_REG,
C_CAN_INTPND1_REG,
C_CAN_INTPND2_REG,
+ C_CAN_INTPND3_REG,
C_CAN_MSGVAL1_REG,
C_CAN_MSGVAL2_REG,
C_CAN_FUNCTION_REG,
@@ -122,6 +121,7 @@ static const u16 __maybe_unused reg_map_d_can[] = {
[C_CAN_NEWDAT2_REG] = 0x9E,
[C_CAN_INTPND1_REG] = 0xB0,
[C_CAN_INTPND2_REG] = 0xB2,
+ [C_CAN_INTPND3_REG] = 0xB4,
[C_CAN_MSGVAL1_REG] = 0xC4,
[C_CAN_MSGVAL2_REG] = 0xC6,
[C_CAN_IF1_COMREQ_REG] = 0x100,
@@ -161,6 +161,7 @@ struct raminit_bits {
struct c_can_driver_data {
enum c_can_dev_id id;
+ int msg_obj_num;
/* RAMINIT register description. Optional. */
const struct raminit_bits *raminit_bits; /* Array of START/DONE bit positions */
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index a5b9b1a93702..87a145b67a2f 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -192,10 +192,12 @@ static void c_can_hw_raminit(const struct c_can_priv *priv, bool enable)
static const struct c_can_driver_data c_can_drvdata = {
.id = BOSCH_C_CAN,
+ .msg_obj_num = 32,
};
static const struct c_can_driver_data d_can_drvdata = {
.id = BOSCH_D_CAN,
+ .msg_obj_num = 32,
};
static const struct raminit_bits dra7_raminit_bits[] = {
@@ -205,6 +207,7 @@ static const struct raminit_bits dra7_raminit_bits[] = {
static const struct c_can_driver_data dra7_dcan_drvdata = {
.id = BOSCH_D_CAN,
+ .msg_obj_num = 64,
.raminit_num = ARRAY_SIZE(dra7_raminit_bits),
.raminit_bits = dra7_raminit_bits,
.raminit_pulse = true,
@@ -217,6 +220,7 @@ static const struct raminit_bits am3352_raminit_bits[] = {
static const struct c_can_driver_data am3352_dcan_drvdata = {
.id = BOSCH_D_CAN,
+ .msg_obj_num = 64,
.raminit_num = ARRAY_SIZE(am3352_raminit_bits),
.raminit_bits = am3352_raminit_bits,
};
@@ -293,7 +297,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
}
/* allocate the c_can device */
- dev = alloc_c_can_dev(C_CAN_NO_OF_OBJECTS);
+ dev = alloc_c_can_dev(drvdata->msg_obj_num);
if (!dev) {
ret = -ENOMEM;
goto exit;
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread