Commit 76c66ddf authored by Jimmy Assarsson's avatar Jimmy Assarsson Committed by Marc Kleine-Budde
Browse files

can: kvaser_pciefd: Remove handler for unused KVASER_PCIEFD_PACK_TYPE_EFRAME_ACK 



The Kvaser KCAN controller got a feature to send error frames on request.
The packet KVASER_PCIEFD_PACK_TYPE_EFRAME_ACK signals that the requested
error frame was transmitted.
Since this feature is not supported by the driver, drop the handler and add
KVASER_PCIEFD_PACK_TYPE_EFRAME_ACK to the list of unexpected packet types.

Fixes: 26ad340e ("can: kvaser_pciefd: Add driver for Kvaser PCIEcan devices")
Signed-off-by: default avatarJimmy Assarsson <extja@kvaser.com>
Reviewed-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/all/20230529134248.752036-3-extja@kvaser.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 7c921556

drivers/net/can/kvaser_pciefd.c

+1 −38
Original line number Diff line number Diff line
@@ -1472,40 +1472,6 @@ static int kvaser_pciefd_handle_status_packet(struct kvaser_pciefd *pcie, 
	return 0;

}



static int kvaser_pciefd_handle_eack_packet(struct kvaser_pciefd *pcie,

					    struct kvaser_pciefd_rx_packet *p)

{

	struct kvaser_pciefd_can *can;

	u8 ch_id = (p->header[1] >> KVASER_PCIEFD_PACKET_CHID_SHIFT) & 0x7;



	if (ch_id >= pcie->nr_channels)

		return -EIO;



	can = pcie->can[ch_id];



	/* If this is the last flushed packet, send end of flush */

	if (p->header[0] & KVASER_PCIEFD_APACKET_FLU) {

		u8 count = ioread32(can->reg_base +

				    KVASER_PCIEFD_KCAN_TX_NPACKETS_REG) & 0xff;



		if (count == 0)

			iowrite32(KVASER_PCIEFD_KCAN_CTRL_EFLUSH,

				  can->reg_base + KVASER_PCIEFD_KCAN_CTRL_REG);

	} else {

		int echo_idx = p->header[0] & KVASER_PCIEFD_PACKET_SEQ_MSK;

		int dlc = can_get_echo_skb(can->can.dev, echo_idx, NULL);

		struct net_device_stats *stats = &can->can.dev->stats;



		stats->tx_bytes += dlc;

		stats->tx_packets++;



		if (netif_queue_stopped(can->can.dev))

			netif_wake_queue(can->can.dev);

	}



	return 0;

}



static void kvaser_pciefd_handle_nack_packet(struct kvaser_pciefd_can *can,

					     struct kvaser_pciefd_rx_packet *p)

{
@@ -1644,16 +1610,13 @@ static int kvaser_pciefd_read_packet(struct kvaser_pciefd *pcie, int *start_pos, 
		ret = kvaser_pciefd_handle_error_packet(pcie, p);

		break;



	case KVASER_PCIEFD_PACK_TYPE_EFRAME_ACK:

		ret = kvaser_pciefd_handle_eack_packet(pcie, p);

		break;



	case KVASER_PCIEFD_PACK_TYPE_EFLUSH_ACK:

		ret = kvaser_pciefd_handle_eflush_packet(pcie, p);

		break;



	case KVASER_PCIEFD_PACK_TYPE_ACK_DATA:

	case KVASER_PCIEFD_PACK_TYPE_BUS_LOAD:

	case KVASER_PCIEFD_PACK_TYPE_EFRAME_ACK:

	case KVASER_PCIEFD_PACK_TYPE_TXRQ:

		dev_info(&pcie->pci->dev,

			 "Received unexpected packet type 0x%08X\n", type);