Commit 69d268b7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-3.15-20140424' of git://gitorious.org/linux-can/linux-can 



Marc Kleine-Budde says:

====================
this is a pull request for net/master, for the v3.15 release cycle, consisting
of 26 patches.

Thomas Gleixner contributes 21 patches for the c_can driver, which address
several shortcomings in the driver like hardware initialisation, concurrency,
message ordering and poor performance. Two patches Oliver Hartkopp, one adds a
missing lock to the sja1000_isa driver, the other one fixes the return value in
the generic bit time configuration function. And finally a patch by Alexander
Stein, that fixes the slcan driver to use the correct spinlock variant.

To make it 26 patches, Wolfgang Grandegger patch for the c_can_pci
driver, which enables the bus master only for MSI and a patch by
Wolfram Sang, which converts the 'instance' in the c_can driver to the
proper type.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2b24f192 367525c8

drivers/net/can/c_can/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ config CAN_C_CAN_PLATFORM 
	  SPEAr1310 and SPEAr320 evaluation boards & TI (www.ti.com)

	  boards like am335x, dm814x, dm813x and dm811x.



config CAN_C_CAN_STRICT_FRAME_ORDERING

	bool "Force a strict RX CAN frame order (may cause frame loss)"

	---help---

	  The RX split buffer prevents packet reordering but can cause packet

	  loss. Only enable this option when you accept to lose CAN frames

	  in favour of getting the received CAN frames in the correct order.



config CAN_C_CAN_PCI

	tristate "Generic PCI Bus based C_CAN/D_CAN driver"

	depends on PCI

drivers/net/can/c_can/c_can.c

+306 −354

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/can/c_can/c_can.h

+5 −18
Original line number Diff line number Diff line
@@ -22,14 +22,6 @@ 
#ifndef C_CAN_H

#define C_CAN_H



/*

 * IFx register masks:

 * allow easy operation on 16-bit registers when the

 * argument is 32-bit instead

 */

#define IFX_WRITE_LOW_16BIT(x)	((x) & 0xFFFF)

#define IFX_WRITE_HIGH_16BIT(x)	(((x) & 0xFFFF0000) >> 16)



/* message object split */

#define C_CAN_NO_OF_OBJECTS	32

#define C_CAN_MSG_OBJ_RX_NUM	16
@@ -45,8 +37,6 @@ 


#define C_CAN_MSG_OBJ_RX_SPLIT	9

#define C_CAN_MSG_RX_LOW_LAST	(C_CAN_MSG_OBJ_RX_SPLIT - 1)



#define C_CAN_NEXT_MSG_OBJ_MASK	(C_CAN_MSG_OBJ_TX_NUM - 1)

#define RECEIVE_OBJECT_BITS	0x0000ffff



enum reg {
@@ -183,23 +173,20 @@ struct c_can_priv { 
	struct napi_struct napi;

	struct net_device *dev;

	struct device *device;

	spinlock_t xmit_lock;

	int tx_object;

	int current_status;

	atomic_t tx_active;

	unsigned long tx_dir;

	int last_status;

	u16 (*read_reg) (struct c_can_priv *priv, enum reg index);

	void (*write_reg) (struct c_can_priv *priv, enum reg index, u16 val);

	void __iomem *base;

	const u16 *regs;

	unsigned long irq_flags; /* for request_irq() */

	unsigned int tx_next;

	unsigned int tx_echo;

	void *priv;		/* for board-specific data */

	u16 irqstatus;

	enum c_can_dev_id type;

	u32 __iomem *raminit_ctrlreg;

	unsigned int instance;

	int instance;

	void (*raminit) (const struct c_can_priv *priv, bool enable);

	u32 comm_rcv_high;

	u32 rxmasked;

	u32 dlc[C_CAN_MSG_OBJ_TX_NUM];

};

drivers/net/can/c_can/c_can_pci.c

+7 −2
Original line number Diff line number Diff line
@@ -84,8 +84,11 @@ static int c_can_pci_probe(struct pci_dev *pdev, 
		goto out_disable_device;

	}



	ret = pci_enable_msi(pdev);

	if (!ret) {

		dev_info(&pdev->dev, "MSI enabled\n");

		pci_set_master(pdev);

	pci_enable_msi(pdev);

	}



	addr = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));

	if (!addr) {
@@ -132,6 +135,8 @@ static int c_can_pci_probe(struct pci_dev *pdev, 
		goto out_free_c_can;

	}



	priv->type = c_can_pci_data->type;



	/* Configure access to registers */

	switch (c_can_pci_data->reg_align) {

	case C_CAN_REG_ALIGN_32:

drivers/net/can/c_can/c_can_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int c_can_plat_probe(struct platform_device *pdev) 


		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

		priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res);

		if (IS_ERR(priv->raminit_ctrlreg) || (int)priv->instance < 0)

		if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)

			dev_info(&pdev->dev, "control memory is not used for raminit\n");

		else

			priv->raminit = c_can_hw_raminit;

CRA Git | Maintained and supported by SUSTech CRA and CCSE