mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
linux-can-next-for-6.3-20230217
-----BEGIN PGP SIGNATURE----- iQFHBAABCgAxFiEEDs2BvajyNKlf9TJQvlAcSiqKBOgFAmPvPaoTHG1rbEBwZW5n dXRyb25peC5kZQAKCRC+UBxKKooE6AVYB/9E7c1PRrjsG2MO035QqzYxag5RCn6x m6gPPkp4DURYO7/LbCDYyTC7ZwXV5Le4fZgpgOPk3SYWo5WU72CR4SfA8so1pM9/ M4eFuJ1FB81HHYZ8sndBU3jhTYj1jo3Px/sV4UCNhFcc0GWpzWzLeIQHA9uP8LDW ZRelEeptLEPiEfMEQqQzAt1EDEzN+pWm0DmgC0DSxJTH82BW3BzZqjRzh2GL0p3t sIFH+8rwl1R6CLEvIf9tnk4wZhzR5/8fuuVArOkDh8no5lFI4LeBmmA8fuUgHA3v IgVdibS115qxh/B8vozghgtsRMLcJFUY71VeKdW+QXi7XS0xzEmgwh59 =T7os -----END PGP SIGNATURE----- Merge tag 'linux-can-next-for-6.3-20230217' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next Marc Kleine-Budde says: ==================== pull-request: can-next 2023-02-17 - fixed this is a pull request of 4 patches for net-next/master. The first patch is by Yang Li and converts the ctucanfd driver to devm_platform_ioremap_resource(). The last 3 patches are by Frank Jungclaus, target the esd_usb driver and contains preparations for the upcoming support of the esd CAN-USB/3 hardware. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
f6aa90a7a9
2 changed files with 41 additions and 33 deletions
|
@ -47,7 +47,6 @@ static void ctucan_platform_set_drvdata(struct device *dev,
|
|||
*/
|
||||
static int ctucan_platform_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct resource *res; /* IO mem resources */
|
||||
struct device *dev = &pdev->dev;
|
||||
void __iomem *addr;
|
||||
int ret;
|
||||
|
@ -55,8 +54,7 @@ static int ctucan_platform_probe(struct platform_device *pdev)
|
|||
int irq;
|
||||
|
||||
/* Get the virtual base address for the device */
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
addr = devm_ioremap_resource(dev, res);
|
||||
addr = devm_platform_ioremap_resource(pdev, 0);
|
||||
if (IS_ERR(addr)) {
|
||||
ret = PTR_ERR(addr);
|
||||
goto err;
|
||||
|
|
|
@ -127,7 +127,15 @@ struct rx_msg {
|
|||
u8 dlc;
|
||||
__le32 ts;
|
||||
__le32 id; /* upper 3 bits contain flags */
|
||||
union {
|
||||
u8 data[8];
|
||||
struct {
|
||||
u8 status; /* CAN Controller Status */
|
||||
u8 ecc; /* Error Capture Register */
|
||||
u8 rec; /* RX Error Counter */
|
||||
u8 tec; /* TX Error Counter */
|
||||
} ev_can_err_ext; /* For ESD_EV_CAN_ERROR_EXT */
|
||||
};
|
||||
};
|
||||
|
||||
struct tx_msg {
|
||||
|
@ -229,51 +237,52 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
|
|||
u32 id = le32_to_cpu(msg->msg.rx.id) & ESD_IDMASK;
|
||||
|
||||
if (id == ESD_EV_CAN_ERROR_EXT) {
|
||||
u8 state = msg->msg.rx.data[0];
|
||||
u8 ecc = msg->msg.rx.data[1];
|
||||
u8 rxerr = msg->msg.rx.data[2];
|
||||
u8 txerr = msg->msg.rx.data[3];
|
||||
u8 state = msg->msg.rx.ev_can_err_ext.status;
|
||||
u8 ecc = msg->msg.rx.ev_can_err_ext.ecc;
|
||||
u8 rxerr = msg->msg.rx.ev_can_err_ext.rec;
|
||||
u8 txerr = msg->msg.rx.ev_can_err_ext.tec;
|
||||
|
||||
netdev_dbg(priv->netdev,
|
||||
"CAN_ERR_EV_EXT: dlc=%#02x state=%02x ecc=%02x rec=%02x tec=%02x\n",
|
||||
msg->msg.rx.dlc, state, ecc, rxerr, txerr);
|
||||
|
||||
skb = alloc_can_err_skb(priv->netdev, &cf);
|
||||
if (skb == NULL) {
|
||||
stats->rx_dropped++;
|
||||
return;
|
||||
}
|
||||
|
||||
if (state != priv->old_state) {
|
||||
enum can_state tx_state, rx_state;
|
||||
enum can_state new_state = CAN_STATE_ERROR_ACTIVE;
|
||||
|
||||
priv->old_state = state;
|
||||
|
||||
switch (state & ESD_BUSSTATE_MASK) {
|
||||
case ESD_BUSSTATE_BUSOFF:
|
||||
priv->can.state = CAN_STATE_BUS_OFF;
|
||||
cf->can_id |= CAN_ERR_BUSOFF;
|
||||
priv->can.can_stats.bus_off++;
|
||||
new_state = CAN_STATE_BUS_OFF;
|
||||
can_bus_off(priv->netdev);
|
||||
break;
|
||||
case ESD_BUSSTATE_WARN:
|
||||
priv->can.state = CAN_STATE_ERROR_WARNING;
|
||||
priv->can.can_stats.error_warning++;
|
||||
new_state = CAN_STATE_ERROR_WARNING;
|
||||
break;
|
||||
case ESD_BUSSTATE_ERRPASSIVE:
|
||||
priv->can.state = CAN_STATE_ERROR_PASSIVE;
|
||||
priv->can.can_stats.error_passive++;
|
||||
new_state = CAN_STATE_ERROR_PASSIVE;
|
||||
break;
|
||||
default:
|
||||
priv->can.state = CAN_STATE_ERROR_ACTIVE;
|
||||
new_state = CAN_STATE_ERROR_ACTIVE;
|
||||
txerr = 0;
|
||||
rxerr = 0;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
|
||||
if (new_state != priv->can.state) {
|
||||
tx_state = (txerr >= rxerr) ? new_state : 0;
|
||||
rx_state = (txerr <= rxerr) ? new_state : 0;
|
||||
can_change_state(priv->netdev, cf,
|
||||
tx_state, rx_state);
|
||||
}
|
||||
} else if (skb) {
|
||||
priv->can.can_stats.bus_error++;
|
||||
stats->rx_errors++;
|
||||
|
||||
cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR |
|
||||
CAN_ERR_CNT;
|
||||
cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
|
||||
|
||||
switch (ecc & SJA1000_ECC_MASK) {
|
||||
case SJA1000_ECC_BIT:
|
||||
|
@ -286,7 +295,6 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
|
|||
cf->data[2] |= CAN_ERR_PROT_STUFF;
|
||||
break;
|
||||
default:
|
||||
cf->data[3] = ecc & SJA1000_ECC_SEG;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -294,20 +302,22 @@ static void esd_usb_rx_event(struct esd_usb_net_priv *priv,
|
|||
if (!(ecc & SJA1000_ECC_DIR))
|
||||
cf->data[2] |= CAN_ERR_PROT_TX;
|
||||
|
||||
if (priv->can.state == CAN_STATE_ERROR_WARNING ||
|
||||
priv->can.state == CAN_STATE_ERROR_PASSIVE) {
|
||||
cf->data[1] = (txerr > rxerr) ?
|
||||
CAN_ERR_CRTL_TX_PASSIVE :
|
||||
CAN_ERR_CRTL_RX_PASSIVE;
|
||||
}
|
||||
cf->data[6] = txerr;
|
||||
cf->data[7] = rxerr;
|
||||
/* Bit stream position in CAN frame as the error was detected */
|
||||
cf->data[3] = ecc & SJA1000_ECC_SEG;
|
||||
}
|
||||
|
||||
priv->bec.txerr = txerr;
|
||||
priv->bec.rxerr = rxerr;
|
||||
|
||||
if (skb) {
|
||||
cf->can_id |= CAN_ERR_CNT;
|
||||
cf->data[6] = txerr;
|
||||
cf->data[7] = rxerr;
|
||||
|
||||
netif_rx(skb);
|
||||
} else {
|
||||
stats->rx_dropped++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue