KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
-LINUX_VERSION-5.4 = .79
+LINUX_VERSION-5.4 = .80
-LINUX_KERNEL_HASH-5.4.79 = a59091fb08ff66a344a7842b7c891f36cef609eed1d2944edf475cca8d91ce25
+LINUX_KERNEL_HASH-5.4.80 = 49da425c1f3c530fd3ff31d85a0461f6b6dc6e459f7faf3eee23e49a98ce64c7
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
dev_info(sdev->dev,
"could not find PHY at %i, use fixed one\n",
bp->phy_addr);
-@@ -2480,6 +2548,7 @@ static void b44_remove_one(struct ssb_de
+@@ -2481,6 +2549,7 @@ static void b44_remove_one(struct ssb_de
unregister_netdev(dev);
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
b44_unregister_phy_one(bp);
+++ /dev/null
-From df8d85d8c69d6837817e54dcb73c84a8b5a13877 Mon Sep 17 00:00:00 2001
-From: Filip Moc <dev@moc6.cz>
-Date: Tue, 17 Nov 2020 18:36:31 +0100
-Subject: net: usb: qmi_wwan: Set DTR quirk for MR400
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-LTE module MR400 embedded in TL-MR6400 v4 requires DTR to be set.
-
-Signed-off-by: Filip Moc <dev@moc6.cz>
-Acked-by: Bjørn Mork <bjorn@mork.no>
-Link: https://lore.kernel.org/r/20201117173631.GA550981@moc6.cz
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
----
- drivers/net/usb/qmi_wwan.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/usb/qmi_wwan.c
-+++ b/drivers/net/usb/qmi_wwan.c
-@@ -1092,7 +1092,7 @@ static const struct usb_device_id produc
- {QMI_FIXED_INTF(0x05c6, 0x9011, 4)},
- {QMI_FIXED_INTF(0x05c6, 0x9021, 1)},
- {QMI_FIXED_INTF(0x05c6, 0x9022, 2)},
-- {QMI_FIXED_INTF(0x05c6, 0x9025, 4)}, /* Alcatel-sbell ASB TL131 TDD LTE (China Mobile) */
-+ {QMI_QUIRK_SET_DTR(0x05c6, 0x9025, 4)}, /* Alcatel-sbell ASB TL131 TDD LTE (China Mobile) */
- {QMI_FIXED_INTF(0x05c6, 0x9026, 3)},
- {QMI_FIXED_INTF(0x05c6, 0x902e, 5)},
- {QMI_FIXED_INTF(0x05c6, 0x9031, 5)},
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -6861,7 +6861,7 @@ static void __ref alloc_node_mem_map(str
+@@ -6883,7 +6883,7 @@ static void __ref alloc_node_mem_map(str
mem_map = NODE_DATA(0)->node_mem_map;
#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
#include <linux/uaccess.h>
#include "br_private.h"
-@@ -375,6 +379,28 @@ static const struct ethtool_ops br_ethto
+@@ -376,6 +380,28 @@ static const struct ethtool_ops br_ethto
.get_link = ethtool_op_get_link,
};
static const struct net_device_ops br_netdev_ops = {
.ndo_open = br_dev_open,
.ndo_stop = br_dev_stop,
-@@ -403,6 +429,9 @@ static const struct net_device_ops br_ne
+@@ -404,6 +430,9 @@ static const struct net_device_ops br_ne
.ndo_bridge_setlink = br_setlink,
.ndo_bridge_dellink = br_dellink,
.ndo_features_check = passthru_features_check,
ret = devm_request_irq(&pdev->dev, irq, mxs_saif_irq, 0,
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
-@@ -565,8 +565,11 @@ int asoc_qcom_lpass_platform_register(st
+@@ -568,8 +568,11 @@ int asoc_qcom_lpass_platform_register(st
int ret;
drvdata->lpaif_irq = platform_get_irq_byname(pdev, "lpass-irq-lpaif");
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -783,16 +783,23 @@ static inline struct flexcan_priv *rx_of
+@@ -785,16 +785,23 @@ static inline struct flexcan_priv *rx_of
return container_of(offload, struct flexcan_priv, offload);
}
mb = flexcan_get_mb(priv, n);
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
-@@ -806,7 +813,7 @@ static unsigned int flexcan_mailbox_read
+@@ -808,7 +815,7 @@ static unsigned int flexcan_mailbox_read
code = reg_ctrl & FLEXCAN_MB_CODE_MASK;
if ((code != FLEXCAN_MB_CODE_RX_FULL) &&
(code != FLEXCAN_MB_CODE_RX_OVERRUN))
if (code == FLEXCAN_MB_CODE_RX_OVERRUN) {
/* This MB was overrun, we lost data */
-@@ -816,11 +823,17 @@ static unsigned int flexcan_mailbox_read
+@@ -818,11 +825,17 @@ static unsigned int flexcan_mailbox_read
} else {
reg_iflag1 = priv->read(®s->iflag1);
if (!(reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_AVAILABLE))
/* increase timstamp to full 32 bit */
*timestamp = reg_ctrl << 16;
-@@ -839,7 +852,7 @@ static unsigned int flexcan_mailbox_read
+@@ -841,7 +854,7 @@ static unsigned int flexcan_mailbox_read
*(__be32 *)(cf->data + i) = data;
}
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
/* Clear IRQ */
if (n < 32)
-@@ -856,7 +869,7 @@ static unsigned int flexcan_mailbox_read
+@@ -858,7 +871,7 @@ static unsigned int flexcan_mailbox_read
*/
priv->read(®s->timer);
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -1569,7 +1569,6 @@ static int flexcan_probe(struct platform
+@@ -1573,7 +1573,6 @@ static int flexcan_probe(struct platform
struct net_device *dev;
struct flexcan_priv *priv;
struct regulator *reg_xceiver;
struct clk *clk_ipg = NULL, *clk_per = NULL;
struct flexcan_regs __iomem *regs;
int err, irq;
-@@ -1604,12 +1603,11 @@ static int flexcan_probe(struct platform
+@@ -1608,12 +1607,11 @@ static int flexcan_probe(struct platform
clock_freq = clk_get_rate(clk_per);
}
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -743,8 +743,6 @@ static void flexcan_irq_state(struct net
+@@ -745,8 +745,6 @@ static void flexcan_irq_state(struct net
u32 timestamp;
int err;
flt = reg_esr & FLEXCAN_ESR_FLT_CONF_MASK;
if (likely(flt == FLEXCAN_ESR_FLT_CONF_ACTIVE)) {
tx_state = unlikely(reg_esr & FLEXCAN_ESR_TX_WRN) ?
-@@ -764,6 +762,8 @@ static void flexcan_irq_state(struct net
+@@ -766,6 +764,8 @@ static void flexcan_irq_state(struct net
if (likely(new_state == priv->can.state))
return;
#define FLEXCAN_IFLAG_RX_FIFO_OVERFLOW BIT(7)
#define FLEXCAN_IFLAG_RX_FIFO_WARN BIT(6)
#define FLEXCAN_IFLAG_RX_FIFO_AVAILABLE BIT(5)
-@@ -879,7 +879,7 @@ static inline u64 flexcan_read_reg_iflag
+@@ -881,7 +881,7 @@ static inline u64 flexcan_read_reg_iflag
u32 iflag1, iflag2;
iflag2 = priv->read(®s->iflag2) & priv->reg_imask2_default &
iflag1 = priv->read(®s->iflag1) & priv->reg_imask1_default;
return (u64)iflag2 << 32 | iflag1;
-@@ -929,7 +929,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -931,7 +931,7 @@ static irqreturn_t flexcan_irq(int irq,
reg_iflag2 = priv->read(®s->iflag2);
/* transmission complete interrupt */
u32 reg_ctrl = priv->read(&priv->tx_mb->can_ctrl);
handled = IRQ_HANDLED;
-@@ -941,7 +941,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -943,7 +943,7 @@ static irqreturn_t flexcan_irq(int irq,
/* after sending a RTR frame MB is in RX mode */
priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
&priv->tx_mb->can_ctrl);
netif_wake_queue(dev);
}
-@@ -1320,7 +1320,7 @@ static int flexcan_open(struct net_devic
+@@ -1321,7 +1321,7 @@ static int flexcan_open(struct net_devic
priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
priv->reg_imask1_default = 0;
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -897,13 +897,13 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -899,13 +899,13 @@ static irqreturn_t flexcan_irq(int irq,
/* reception interrupt */
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
struct clk *clk_ipg;
struct clk *clk_per;
-@@ -878,9 +878,9 @@ static inline u64 flexcan_read_reg_iflag
+@@ -880,9 +880,9 @@ static inline u64 flexcan_read_reg_iflag
struct flexcan_regs __iomem *regs = priv->regs;
u32 iflag1, iflag2;
return (u64)iflag2 << 32 | iflag1;
}
-@@ -1227,8 +1227,8 @@ static int flexcan_chip_start(struct net
+@@ -1225,8 +1225,8 @@ static int flexcan_chip_start(struct net
/* enable interrupts atomically */
disable_irq(dev->irq);
priv->write(priv->reg_ctrl_default, ®s->ctrl);
enable_irq(dev->irq);
/* print chip status */
-@@ -1319,8 +1319,8 @@ static int flexcan_open(struct net_devic
+@@ -1320,8 +1320,8 @@ static int flexcan_open(struct net_devic
priv->tx_mb_idx = priv->mb_count - 1;
priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
priv->offload.mailbox_read = flexcan_mailbox_read;
-@@ -1332,12 +1332,12 @@ static int flexcan_open(struct net_devic
+@@ -1333,12 +1333,12 @@ static int flexcan_open(struct net_devic
imask = GENMASK_ULL(priv->offload.mb_last,
priv->offload.mb_first);
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -878,8 +878,7 @@ static inline u64 flexcan_read_reg_iflag
+@@ -880,8 +880,7 @@ static inline u64 flexcan_read_reg_iflag
struct flexcan_regs __iomem *regs = priv->regs;
u32 iflag1, iflag2;
iflag1 = priv->read(®s->iflag1) & priv->rx_mask1;
return (u64)iflag2 << 32 | iflag1;
-@@ -1228,7 +1227,7 @@ static int flexcan_chip_start(struct net
+@@ -1226,7 +1225,7 @@ static int flexcan_chip_start(struct net
disable_irq(dev->irq);
priv->write(priv->reg_ctrl_default, ®s->ctrl);
priv->write(priv->rx_mask1, ®s->imask1);
enable_irq(dev->irq);
/* print chip status */
-@@ -1319,9 +1318,6 @@ static int flexcan_open(struct net_devic
+@@ -1320,9 +1319,6 @@ static int flexcan_open(struct net_devic
priv->tx_mb_idx = priv->mb_count - 1;
priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
priv->offload.mailbox_read = flexcan_mailbox_read;
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
-@@ -1332,12 +1328,12 @@ static int flexcan_open(struct net_devic
+@@ -1333,12 +1329,12 @@ static int flexcan_open(struct net_devic
imask = GENMASK_ULL(priv->offload.mb_last,
priv->offload.mb_first);
struct clk *clk_ipg;
struct clk *clk_per;
-@@ -872,16 +872,15 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -874,16 +874,15 @@ static struct sk_buff *flexcan_mailbox_r
return skb;
}
}
static irqreturn_t flexcan_irq(int irq, void *dev_id)
-@@ -1052,6 +1051,7 @@ static int flexcan_chip_start(struct net
+@@ -1054,6 +1053,7 @@ static int flexcan_chip_start(struct net
struct flexcan_priv *priv = netdev_priv(dev);
struct flexcan_regs __iomem *regs = priv->regs;
u32 reg_mcr, reg_ctrl, reg_ctrl2, reg_mecr;
int err, i;
struct flexcan_mb __iomem *mb;
-@@ -1226,8 +1226,9 @@ static int flexcan_chip_start(struct net
+@@ -1224,8 +1224,9 @@ static int flexcan_chip_start(struct net
/* enable interrupts atomically */
disable_irq(dev->irq);
priv->write(priv->reg_ctrl_default, ®s->ctrl);
enable_irq(dev->irq);
/* print chip status */
-@@ -1321,19 +1322,14 @@ static int flexcan_open(struct net_devic
+@@ -1322,19 +1323,14 @@ static int flexcan_open(struct net_devic
priv->offload.mailbox_read = flexcan_mailbox_read;
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
u32 reg_ctrl_default;
struct clk *clk_ipg;
-@@ -890,7 +890,8 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -892,7 +892,8 @@ static irqreturn_t flexcan_irq(int irq,
struct flexcan_priv *priv = netdev_priv(dev);
struct flexcan_regs __iomem *regs = priv->regs;
irqreturn_t handled = IRQ_NONE;
enum can_state last_state = priv->can.state;
/* reception interrupt */
-@@ -924,10 +925,10 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -926,10 +927,10 @@ static irqreturn_t flexcan_irq(int irq,
}
}
u32 reg_ctrl = priv->read(&priv->tx_mb->can_ctrl);
handled = IRQ_HANDLED;
-@@ -939,7 +940,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -941,7 +942,7 @@ static irqreturn_t flexcan_irq(int irq,
/* after sending a RTR frame MB is in RX mode */
priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
&priv->tx_mb->can_ctrl);
netif_wake_queue(dev);
}
-@@ -1226,7 +1227,7 @@ static int flexcan_chip_start(struct net
+@@ -1224,7 +1225,7 @@ static int flexcan_chip_start(struct net
/* enable interrupts atomically */
disable_irq(dev->irq);
priv->write(priv->reg_ctrl_default, ®s->ctrl);
priv->write(upper_32_bits(reg_imask), ®s->imask2);
priv->write(lower_32_bits(reg_imask), ®s->imask1);
enable_irq(dev->irq);
-@@ -1318,6 +1319,7 @@ static int flexcan_open(struct net_devic
+@@ -1319,6 +1320,7 @@ static int flexcan_open(struct net_devic
flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_FIFO);
priv->tx_mb_idx = priv->mb_count - 1;
priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -778,6 +778,23 @@ static void flexcan_irq_state(struct net
+@@ -780,6 +780,23 @@ static void flexcan_irq_state(struct net
dev->stats.rx_fifo_errors++;
}
static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
{
return container_of(offload, struct flexcan_priv, offload);
-@@ -872,17 +889,6 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -874,17 +891,6 @@ static struct sk_buff *flexcan_mailbox_r
return skb;
}
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -790,11 +790,24 @@ static inline u64 flexcan_read64_mask(st
+@@ -792,11 +792,24 @@ static inline u64 flexcan_read64_mask(st
return reg & mask;
}
static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
{
return container_of(offload, struct flexcan_priv, offload);
-@@ -931,7 +944,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -933,7 +946,7 @@ static irqreturn_t flexcan_irq(int irq,
}
}
/* transmission complete interrupt */
if (reg_iflag_tx & priv->tx_mask) {
-@@ -946,7 +959,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -948,7 +961,7 @@ static irqreturn_t flexcan_irq(int irq,
/* after sending a RTR frame MB is in RX mode */
priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
&priv->tx_mb->can_ctrl);
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -883,15 +883,10 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -885,15 +885,10 @@ static struct sk_buff *flexcan_mailbox_r
}
mark_as_read:
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -627,10 +627,10 @@ static int flexcan_get_berr_counter(cons
+@@ -629,10 +629,10 @@ static int flexcan_get_berr_counter(cons
static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
const struct flexcan_priv *priv = netdev_priv(dev);
int i;
if (can_dropped_invalid_skb(dev, skb))
-@@ -638,18 +638,18 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -640,18 +640,18 @@ static netdev_tx_t flexcan_start_xmit(st
netif_stop_queue(dev);
priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
}
-@@ -821,7 +821,7 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -823,7 +823,7 @@ static struct sk_buff *flexcan_mailbox_r
struct flexcan_regs __iomem *regs = priv->regs;
struct flexcan_mb __iomem *mb;
struct sk_buff *skb;
u32 reg_ctrl, reg_id, reg_iflag1;
int i;
-@@ -858,8 +858,8 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -860,8 +860,8 @@ static struct sk_buff *flexcan_mailbox_r
reg_ctrl = priv->read(&mb->can_ctrl);
}
skb = ERR_PTR(-ENOMEM);
goto mark_as_read;
}
-@@ -869,17 +869,17 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -871,17 +871,17 @@ static struct sk_buff *flexcan_mailbox_r
reg_id = priv->read(&mb->can_id);
if (reg_ctrl & FLEXCAN_MB_CNT_IDE)
/* FlexCAN module is essentially modelled as a little-endian IP in most
* SoCs, i.e the registers as well as the message buffer areas are
* implemented in a little-endian fashion.
-@@ -630,7 +684,7 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -632,7 +686,7 @@ static netdev_tx_t flexcan_start_xmit(st
struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
u32 can_id;
u32 data;
int i;
if (can_dropped_invalid_skb(dev, skb))
-@@ -648,6 +702,9 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -650,6 +704,9 @@ static netdev_tx_t flexcan_start_xmit(st
if (cfd->can_id & CAN_RTR_FLAG)
ctrl |= FLEXCAN_MB_CNT_RTR;
for (i = 0; i < cfd->len; i += sizeof(u32)) {
data = be32_to_cpup((__be32 *)&cfd->data[i]);
priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
-@@ -858,7 +915,10 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -860,7 +917,10 @@ static struct sk_buff *flexcan_mailbox_r
reg_ctrl = priv->read(&mb->can_ctrl);
}
if (unlikely(!skb)) {
skb = ERR_PTR(-ENOMEM);
goto mark_as_read;
-@@ -873,9 +933,17 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -875,9 +935,17 @@ static struct sk_buff *flexcan_mailbox_r
else
cfd->can_id = (reg_id >> 18) & CAN_SFF_MASK;
for (i = 0; i < cfd->len; i += sizeof(u32)) {
__be32 data = cpu_to_be32(priv->read(&mb->data[i / sizeof(u32)]));
-@@ -1020,27 +1088,14 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -1022,27 +1090,14 @@ static irqreturn_t flexcan_irq(int irq,
static void flexcan_set_bittiming(struct net_device *dev)
{
if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK)
reg |= FLEXCAN_CTRL_LPB;
if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
-@@ -1051,9 +1106,102 @@ static void flexcan_set_bittiming(struct
+@@ -1053,9 +1108,102 @@ static void flexcan_set_bittiming(struct
netdev_dbg(dev, "writing ctrl=0x%08x\n", reg);
priv->write(reg, ®s->ctrl);
}
/* flexcan_chip_start
-@@ -1065,7 +1213,7 @@ static int flexcan_chip_start(struct net
+@@ -1067,7 +1215,7 @@ static int flexcan_chip_start(struct net
{
struct flexcan_priv *priv = netdev_priv(dev);
struct flexcan_regs __iomem *regs = priv->regs;
u64 reg_imask;
int err, i;
struct flexcan_mb __iomem *mb;
-@@ -1162,6 +1310,26 @@ static int flexcan_chip_start(struct net
+@@ -1164,6 +1312,26 @@ static int flexcan_chip_start(struct net
netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
priv->write(reg_ctrl, ®s->ctrl);
if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
reg_ctrl2 = priv->read(®s->ctrl2);
reg_ctrl2 |= FLEXCAN_CTRL2_EACEN | FLEXCAN_CTRL2_RRS;
-@@ -1309,6 +1477,12 @@ static int flexcan_open(struct net_devic
+@@ -1304,6 +1472,12 @@ static int flexcan_open(struct net_devic
struct flexcan_priv *priv = netdev_priv(dev);
int err;
+ }
+
err = pm_runtime_get_sync(priv->dev);
- if (err < 0)
- return err;
-@@ -1321,7 +1495,10 @@ static int flexcan_open(struct net_devic
+ if (err < 0) {
+ pm_runtime_put_noidle(priv->dev);
+@@ -1322,7 +1496,10 @@ static int flexcan_open(struct net_devic
if (err)
- goto out_close;
+ goto out_transceiver_disable;
- priv->mb_size = sizeof(struct flexcan_mb) + CAN_MAX_DLEN;
+ if (priv->can.ctrlmode & CAN_CTRLMODE_FD)
priv->mb_count = (sizeof(priv->regs->mb[0]) / priv->mb_size) +
(sizeof(priv->regs->mb[1]) / priv->mb_size);
-@@ -1666,6 +1843,18 @@ static int flexcan_probe(struct platform
+@@ -1670,6 +1847,18 @@ static int flexcan_probe(struct platform
priv->devtype_data = devtype_data;
priv->reg_xceiver = reg_xceiver;
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -702,9 +702,13 @@ static netdev_tx_t flexcan_start_xmit(st
+@@ -704,9 +704,13 @@ static netdev_tx_t flexcan_start_xmit(st
if (cfd->can_id & CAN_RTR_FLAG)
ctrl |= FLEXCAN_MB_CNT_RTR;
for (i = 0; i < cfd->len; i += sizeof(u32)) {
data = be32_to_cpup((__be32 *)&cfd->data[i]);
priv->write(data, &priv->tx_mb->data[i / sizeof(u32)]);
-@@ -935,6 +939,9 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -937,6 +941,9 @@ static struct sk_buff *flexcan_mailbox_r
if (reg_ctrl & FLEXCAN_MB_CNT_EDL) {
cfd->len = can_dlc2len(get_canfd_dlc((reg_ctrl >> 16) & 0xf));
/* FLEXCAN memory error control register (MECR) bits */
#define FLEXCAN_MECR_ECRWRDIS BIT(31)
-@@ -1322,6 +1323,7 @@ static int flexcan_chip_start(struct net
+@@ -1324,6 +1325,7 @@ static int flexcan_chip_start(struct net
reg_fdctrl = priv->read(®s->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;
reg_fdctrl &= ~(FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3));
reg_mcr = priv->read(®s->mcr) & ~FLEXCAN_MCR_FDEN;
/* support BRS when set CAN FD mode
* 64 bytes payload per MB and 7 MBs per RAM block by default
-@@ -1331,10 +1333,14 @@ static int flexcan_chip_start(struct net
+@@ -1333,10 +1335,14 @@ static int flexcan_chip_start(struct net
reg_fdctrl |= FLEXCAN_FDCTRL_FDRATE;
reg_fdctrl |= FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3);
reg_mcr |= FLEXCAN_MCR_FDEN;
}
if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
-@@ -1852,7 +1858,7 @@ static int flexcan_probe(struct platform
+@@ -1856,7 +1862,7 @@ static int flexcan_probe(struct platform
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_TIMESTAMP_SUPPORT_FD) {
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
/* FLEXCAN FD Bit Timing register (FDCBT) bits */
#define FLEXCAN_FDCBT_FPRESDIV(x) (((x) & 0x3ff) << 20)
-@@ -1100,7 +1103,7 @@ static void flexcan_set_bittiming(struct
+@@ -1102,7 +1105,7 @@ static void flexcan_set_bittiming(struct
struct can_bittiming *bt = &priv->can.bittiming;
struct can_bittiming *dbt = &priv->can.data_bittiming;
struct flexcan_regs __iomem *regs = priv->regs;
reg = priv->read(®s->ctrl);
reg &= ~(FLEXCAN_CTRL_LPB | FLEXCAN_CTRL_SMP | FLEXCAN_CTRL_LOM);
-@@ -1172,6 +1175,19 @@ static void flexcan_set_bittiming(struct
+@@ -1174,6 +1177,19 @@ static void flexcan_set_bittiming(struct
FLEXCAN_FDCBT_FPROPSEG(dbt->prop_seg);
priv->write(reg_fdcbt, ®s->fdcbt);
if (bt->brp != dbt->brp)
netdev_warn(dev, "Warning!! data brp = %d and brp = %d don't match.\n"
"flexcan may not work. consider using different bitrate or data bitrate\n",
-@@ -1321,6 +1337,7 @@ static int flexcan_chip_start(struct net
+@@ -1323,6 +1339,7 @@ static int flexcan_chip_start(struct net
/* FDCTRL */
if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
reg_fdctrl = priv->read(®s->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;
static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |
-@@ -1759,6 +1766,7 @@ out_put_node:
+@@ -1763,6 +1770,7 @@ out_put_node:
}
static const struct of_device_id flexcan_of_match[] = {
static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {
.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
-@@ -1775,6 +1782,7 @@ static const struct of_device_id flexcan
+@@ -1779,6 +1786,7 @@ static const struct of_device_id flexcan
{ .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
{ .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
{ .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
#include <linux/regmap.h>
#define DRV_NAME "flexcan"
-@@ -1955,9 +1956,7 @@ static int __maybe_unused flexcan_suspen
+@@ -1959,9 +1960,7 @@ static int __maybe_unused flexcan_suspen
if (err)
return err;
} else {
}
netif_stop_queue(dev);
netif_device_detach(dev);
-@@ -1983,7 +1982,9 @@ static int __maybe_unused flexcan_resume
+@@ -1987,7 +1986,9 @@ static int __maybe_unused flexcan_resume
if (err)
return err;
} else {
/* FLEXCAN Bit Timing register (CBT) bits */
#define FLEXCAN_CBT_BTF BIT(31)
-@@ -1054,6 +1053,12 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -1056,6 +1055,12 @@ static irqreturn_t flexcan_irq(int irq,
reg_esr = priv->read(®s->esr);
reg_mcr = priv->read(®s->mcr);
-@@ -1766,11 +1810,6 @@ static int flexcan_setup_stop_mode(struc
+@@ -1770,11 +1814,6 @@ static int flexcan_setup_stop_mode(struc
gpr_np->full_name, priv->stm.req_gpr, priv->stm.req_bit,
priv->stm.ack_gpr, priv->stm.ack_bit);
return 0;
out_put_node:
-@@ -1778,6 +1817,30 @@ out_put_node:
+@@ -1782,6 +1821,30 @@ out_put_node:
return ret;
}
static const struct of_device_id flexcan_of_match[] = {
{ .compatible = "fsl,imx8qm-flexcan", .data = &fsl_imx8qm_devtype_data, },
{ .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
-@@ -1920,9 +1983,19 @@ static int flexcan_probe(struct platform
+@@ -1924,9 +1987,19 @@ static int flexcan_probe(struct platform
devm_can_led_init(dev);
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) {
static const struct can_bittiming_const flexcan_bittiming_const = {
.name = DRV_NAME,
.tseg1_min = 4,
-@@ -1852,6 +1857,8 @@ static const struct of_device_id flexcan
+@@ -1856,6 +1861,8 @@ static const struct of_device_id flexcan
{ .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
{ .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
{ .compatible = "fsl,lx2160ar1-flexcan", .data = &fsl_lx2160a_r1_devtype_data, },
struct ethtool_eee *p = &priv->dev->ports[port].eee;
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
-@@ -1517,7 +1517,9 @@ static void gswip_phylink_mac_link_down(
+@@ -1518,7 +1518,9 @@ static void gswip_phylink_mac_link_down(
static void gswip_phylink_mac_link_up(struct dsa_switch *ds, int port,
unsigned int mode,
phy_interface_t interface,
projects / openwrt / openwrt.git / commitdiff