kernel: bump 5.4 to 5.4.28
Changelog since 5.4.24 mentions CVE-2019-19769, CVE-2020-8648, CVE-2020-8649 and CVE-2020-8647. Removed upstreamed: generic: 507-v5.6-iio-chemical-sps30-fix-missing-triggered-buffer-depe.patch generic: 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch bcm27xx: 950-0435-ASoC-pcm512x-Fix-unbalanced-regulator-enable-call-in.patch ipq806x: 701-stmmac-fix-notifier-registration.patch lantiq: 002-pinctrl-falcon-fix-syntax-error.patch octeontx: 0002-net-thunderx-workaround-BGX-TX-Underflow-issue.patch Run tested: apu2, qemu-x86-64, apalis, a64-olinuxino, nbg6617 Build tested: sunxi/a53, imx6, x86/64, ipq40xx Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2] Signed-off-by: Petr Štetiar <ynezz@true.cz>master
parent
bf15557f8a
commit
5ecc0cfd6f
@ -1,44 +0,0 @@
|
|||||||
From 9a536b0cb8f83bd979fe274ef0197ece12a3ed09 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Matthias Reichl <hias@horus.com>
|
|
||||||
Date: Thu, 20 Feb 2020 21:29:56 +0100
|
|
||||||
Subject: [PATCH] ASoC: pcm512x: Fix unbalanced regulator enable call
|
|
||||||
in probe error path
|
|
||||||
|
|
||||||
commit ac0a68997935c4acb92eaae5ad8982e0bb432d56 upstream.
|
|
||||||
|
|
||||||
When we get a clock error during probe we have to call
|
|
||||||
regulator_bulk_disable before bailing out, otherwise we trigger
|
|
||||||
a warning in regulator_put.
|
|
||||||
|
|
||||||
Fix this by using "goto err" like in the error cases above.
|
|
||||||
|
|
||||||
Fixes: 5a3af1293194d ("ASoC: pcm512x: Add PCM512x driver")
|
|
||||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
|
||||||
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
||||||
Link: https://lore.kernel.org/r/20200220202956.29233-1-hias@horus.com
|
|
||||||
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
||||||
---
|
|
||||||
sound/soc/codecs/pcm512x.c | 8 +++++---
|
|
||||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
--- a/sound/soc/codecs/pcm512x.c
|
|
||||||
+++ b/sound/soc/codecs/pcm512x.c
|
|
||||||
@@ -1564,13 +1564,15 @@ int pcm512x_probe(struct device *dev, st
|
|
||||||
}
|
|
||||||
|
|
||||||
pcm512x->sclk = devm_clk_get(dev, NULL);
|
|
||||||
- if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER)
|
|
||||||
- return -EPROBE_DEFER;
|
|
||||||
+ if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER) {
|
|
||||||
+ ret = -EPROBE_DEFER;
|
|
||||||
+ goto err;
|
|
||||||
+ }
|
|
||||||
if (!IS_ERR(pcm512x->sclk)) {
|
|
||||||
ret = clk_prepare_enable(pcm512x->sclk);
|
|
||||||
if (ret != 0) {
|
|
||||||
dev_err(dev, "Failed to enable SCLK: %d\n", ret);
|
|
||||||
- return ret;
|
|
||||||
+ goto err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
|||||||
From 61338e27e2eef3bfcd3df5c39cec5b9dc10ba25c Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
|
|
||||||
Date: Sun, 23 Feb 2020 22:08:25 +0100
|
|
||||||
Subject: [PATCH] iio: chemical: sps30: fix missing triggered buffer dependency
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
SPS30 uses triggered buffer, but the dependency is not specified in the
|
|
||||||
Kconfig file. Fix this by selecting IIO_BUFFER and IIO_TRIGGERED_BUFFER
|
|
||||||
config symbols.
|
|
||||||
|
|
||||||
Cc: stable@vger.kernel.org
|
|
||||||
Fixes: 232e0f6ddeae ("iio: chemical: add support for Sensirion SPS30 sensor")
|
|
||||||
Signed-off-by: Petr Štetiar <ynezz@true.cz>
|
|
||||||
---
|
|
||||||
drivers/iio/chemical/Kconfig | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/iio/chemical/Kconfig
|
|
||||||
+++ b/drivers/iio/chemical/Kconfig
|
|
||||||
@@ -91,6 +91,8 @@ config SPS30
|
|
||||||
tristate "SPS30 particulate matter sensor"
|
|
||||||
depends on I2C
|
|
||||||
select CRC8
|
|
||||||
+ select IIO_BUFFER
|
|
||||||
+ select IIO_TRIGGERED_BUFFER
|
|
||||||
help
|
|
||||||
Say Y here to build support for the Sensirion SPS30 particulate
|
|
||||||
matter sensor.
|
|
@ -1,71 +0,0 @@
|
|||||||
From 82afdcd4ec3c8ca6551cbf7c43c09e2fd240487a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hangbin Liu <liuhangbin@gmail.com>
|
|
||||||
Date: Tue, 10 Mar 2020 15:27:37 +0800
|
|
||||||
Subject: [PATCH] ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Rafał found an issue that for non-Ethernet interface, if we down and up
|
|
||||||
frequently, the memory will be consumed slowly.
|
|
||||||
|
|
||||||
The reason is we add allnodes/allrouters addressed in multicast list in
|
|
||||||
ipv6_add_dev(). When link down, we call ipv6_mc_down(), store all multicast
|
|
||||||
addresses via mld_add_delrec(). But when link up, we don't call ipv6_mc_up()
|
|
||||||
for non-Ethernet interface to remove the addresses. This makes idev->mc_tomb
|
|
||||||
getting bigger and bigger. The call stack looks like:
|
|
||||||
|
|
||||||
addrconf_notify(NETDEV_REGISTER)
|
|
||||||
ipv6_add_dev
|
|
||||||
ipv6_dev_mc_inc(ff01::1)
|
|
||||||
ipv6_dev_mc_inc(ff02::1)
|
|
||||||
ipv6_dev_mc_inc(ff02::2)
|
|
||||||
|
|
||||||
addrconf_notify(NETDEV_UP)
|
|
||||||
addrconf_dev_config
|
|
||||||
/* Alas, we support only Ethernet autoconfiguration. */
|
|
||||||
return;
|
|
||||||
|
|
||||||
addrconf_notify(NETDEV_DOWN)
|
|
||||||
addrconf_ifdown
|
|
||||||
ipv6_mc_down
|
|
||||||
igmp6_group_dropped(ff02::2)
|
|
||||||
mld_add_delrec(ff02::2)
|
|
||||||
igmp6_group_dropped(ff02::1)
|
|
||||||
igmp6_group_dropped(ff01::1)
|
|
||||||
|
|
||||||
After investigating, I can't found a rule to disable multicast on
|
|
||||||
non-Ethernet interface. In RFC2460, the link could be Ethernet, PPP, ATM,
|
|
||||||
tunnels, etc. In IPv4, it doesn't check the dev type when calls ip_mc_up()
|
|
||||||
in inetdev_event(). Even for IPv6, we don't check the dev type and call
|
|
||||||
ipv6_add_dev(), ipv6_dev_mc_inc() after register device.
|
|
||||||
|
|
||||||
So I think it's OK to fix this memory consumer by calling ipv6_mc_up() for
|
|
||||||
non-Ethernet interface.
|
|
||||||
|
|
||||||
v2: Also check IFF_MULTICAST flag to make sure the interface supports
|
|
||||||
multicast
|
|
||||||
|
|
||||||
Reported-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Tested-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Fixes: 74235a25c673 ("[IPV6] addrconf: Fix IPv6 on tuntap tunnels")
|
|
||||||
Fixes: 1666d49e1d41 ("mld: do not remove mld souce list info when set link down")
|
|
||||||
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
net/ipv6/addrconf.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
--- a/net/ipv6/addrconf.c
|
|
||||||
+++ b/net/ipv6/addrconf.c
|
|
||||||
@@ -3345,6 +3345,10 @@ static void addrconf_dev_config(struct n
|
|
||||||
(dev->type != ARPHRD_NONE) &&
|
|
||||||
(dev->type != ARPHRD_RAWIP)) {
|
|
||||||
/* Alas, we support only Ethernet autoconfiguration. */
|
|
||||||
+ idev = __in6_dev_get(dev);
|
|
||||||
+ if (!IS_ERR_OR_NULL(idev) && dev->flags & IFF_UP &&
|
|
||||||
+ dev->flags & IFF_MULTICAST)
|
|
||||||
+ ipv6_mc_up(idev);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
@ -1,79 +0,0 @@
|
|||||||
From 474a31e13a4e9749fb3ee55794d69d0f17ee0998 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Aaro Koskinen <aaro.koskinen@nokia.com>
|
|
||||||
Date: Wed, 26 Feb 2020 18:49:01 +0200
|
|
||||||
Subject: net: stmmac: fix notifier registration
|
|
||||||
|
|
||||||
We cannot register the same netdev notifier multiple times when probing
|
|
||||||
stmmac devices. Register the notifier only once in module init, and also
|
|
||||||
make debugfs creation/deletion safe against simultaneous notifier call.
|
|
||||||
|
|
||||||
Fixes: 481a7d154cbb ("stmmac: debugfs entry name is not be changed when udev rename device name.")
|
|
||||||
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 13 ++++++++-----
|
|
||||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
(limited to 'drivers/net/ethernet/stmicro/stmmac')
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
||||||
@@ -4208,6 +4208,8 @@ static void stmmac_init_fs(struct net_de
|
|
||||||
{
|
|
||||||
struct stmmac_priv *priv = netdev_priv(dev);
|
|
||||||
|
|
||||||
+ rtnl_lock();
|
|
||||||
+
|
|
||||||
/* Create per netdev entries */
|
|
||||||
priv->dbgfs_dir = debugfs_create_dir(dev->name, stmmac_fs_dir);
|
|
||||||
|
|
||||||
@@ -4219,14 +4221,13 @@ static void stmmac_init_fs(struct net_de
|
|
||||||
debugfs_create_file("dma_cap", 0444, priv->dbgfs_dir, dev,
|
|
||||||
&stmmac_dma_cap_fops);
|
|
||||||
|
|
||||||
- register_netdevice_notifier(&stmmac_notifier);
|
|
||||||
+ rtnl_unlock();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void stmmac_exit_fs(struct net_device *dev)
|
|
||||||
{
|
|
||||||
struct stmmac_priv *priv = netdev_priv(dev);
|
|
||||||
|
|
||||||
- unregister_netdevice_notifier(&stmmac_notifier);
|
|
||||||
debugfs_remove_recursive(priv->dbgfs_dir);
|
|
||||||
}
|
|
||||||
#endif /* CONFIG_DEBUG_FS */
|
|
||||||
@@ -4728,14 +4729,14 @@ int stmmac_dvr_remove(struct device *dev
|
|
||||||
|
|
||||||
netdev_info(priv->dev, "%s: removing driver", __func__);
|
|
||||||
|
|
||||||
-#ifdef CONFIG_DEBUG_FS
|
|
||||||
- stmmac_exit_fs(ndev);
|
|
||||||
-#endif
|
|
||||||
stmmac_stop_all_dma(priv);
|
|
||||||
|
|
||||||
stmmac_mac_set(priv, priv->ioaddr, false);
|
|
||||||
netif_carrier_off(ndev);
|
|
||||||
unregister_netdev(ndev);
|
|
||||||
+#ifdef CONFIG_DEBUG_FS
|
|
||||||
+ stmmac_exit_fs(ndev);
|
|
||||||
+#endif
|
|
||||||
phylink_destroy(priv->phylink);
|
|
||||||
if (priv->plat->stmmac_rst)
|
|
||||||
reset_control_assert(priv->plat->stmmac_rst);
|
|
||||||
@@ -4955,6 +4956,7 @@ static int __init stmmac_init(void)
|
|
||||||
/* Create debugfs main directory if it doesn't exist yet */
|
|
||||||
if (!stmmac_fs_dir)
|
|
||||||
stmmac_fs_dir = debugfs_create_dir(STMMAC_RESOURCE_NAME, NULL);
|
|
||||||
+ register_netdevice_notifier(&stmmac_notifier);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
@@ -4963,6 +4965,7 @@ static int __init stmmac_init(void)
|
|
||||||
static void __exit stmmac_exit(void)
|
|
||||||
{
|
|
||||||
#ifdef CONFIG_DEBUG_FS
|
|
||||||
+ unregister_netdevice_notifier(&stmmac_notifier);
|
|
||||||
debugfs_remove_recursive(stmmac_fs_dir);
|
|
||||||
#endif
|
|
||||||
}
|
|
@ -1,25 +0,0 @@
|
|||||||
From d2fee0bb982195540e4fbe009996fcdbc26d163c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mathias Kresin <dev@kresin.me>
|
|
||||||
Date: Thu, 5 Mar 2020 08:17:27 +0100
|
|
||||||
Subject: [PATCH] pinctrl: falcon: fix syntax error
|
|
||||||
|
|
||||||
Add the missing semicolon after of_node_put to get the file compiled.
|
|
||||||
|
|
||||||
Fixes: f17d2f54d36d ("pinctrl: falcon: Add of_node_put() before return")
|
|
||||||
Cc: stable@vger.kernel.org # v5.4+
|
|
||||||
Signed-off-by: Mathias Kresin <dev@kresin.me>
|
|
||||||
---
|
|
||||||
drivers/pinctrl/pinctrl-falcon.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/drivers/pinctrl/pinctrl-falcon.c
|
|
||||||
+++ b/drivers/pinctrl/pinctrl-falcon.c
|
|
||||||
@@ -451,7 +451,7 @@ static int pinctrl_falcon_probe(struct p
|
|
||||||
falcon_info.clk[*bank] = clk_get(&ppdev->dev, NULL);
|
|
||||||
if (IS_ERR(falcon_info.clk[*bank])) {
|
|
||||||
dev_err(&ppdev->dev, "failed to get clock\n");
|
|
||||||
- of_node_put(np)
|
|
||||||
+ of_node_put(np);
|
|
||||||
return PTR_ERR(falcon_info.clk[*bank]);
|
|
||||||
}
|
|
||||||
falcon_info.membase[*bank] = devm_ioremap_resource(&pdev->dev,
|
|
@ -1,150 +0,0 @@
|
|||||||
From 585ddca487c827178cf697f8bc2e87346061d155 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tim Harvey <tharvey@gateworks.com>
|
|
||||||
Date: Wed, 19 Feb 2020 15:19:36 -0800
|
|
||||||
Subject: [PATCH 02/12] net: thunderx: workaround BGX TX Underflow issue
|
|
||||||
|
|
||||||
While it is not yet understood why a TX underflow can easily occur
|
|
||||||
for SGMII interfaces resulting in a TX wedge. It has been found that
|
|
||||||
disabling/re-enabling the LMAC resolves the issue.
|
|
||||||
|
|
||||||
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
|
|
||||||
Reviewed-by: Robert Jones <rjones@gateworks.com>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 62 +++++++++++++++++++++--
|
|
||||||
drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 9 ++++
|
|
||||||
2 files changed, 68 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
|
|
||||||
index 5f2db9c..ade414a 100644
|
|
||||||
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
|
|
||||||
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
|
|
||||||
@@ -413,10 +413,19 @@ void bgx_lmac_rx_tx_enable(int node, int bgx_idx, int lmacid, bool enable)
|
|
||||||
lmac = &bgx->lmac[lmacid];
|
|
||||||
|
|
||||||
cfg = bgx_reg_read(bgx, lmacid, BGX_CMRX_CFG);
|
|
||||||
- if (enable)
|
|
||||||
+ if (enable) {
|
|
||||||
cfg |= CMR_PKT_RX_EN | CMR_PKT_TX_EN;
|
|
||||||
- else
|
|
||||||
+
|
|
||||||
+ /* enable TX FIFO Underflow interrupt */
|
|
||||||
+ bgx_reg_modify(bgx, lmacid, BGX_GMP_GMI_TXX_INT_ENA_W1S,
|
|
||||||
+ GMI_TXX_INT_UNDFLW);
|
|
||||||
+ } else {
|
|
||||||
cfg &= ~(CMR_PKT_RX_EN | CMR_PKT_TX_EN);
|
|
||||||
+
|
|
||||||
+ /* Disable TX FIFO Underflow interrupt */
|
|
||||||
+ bgx_reg_modify(bgx, lmacid, BGX_GMP_GMI_TXX_INT_ENA_W1C,
|
|
||||||
+ GMI_TXX_INT_UNDFLW);
|
|
||||||
+ }
|
|
||||||
bgx_reg_write(bgx, lmacid, BGX_CMRX_CFG, cfg);
|
|
||||||
|
|
||||||
if (bgx->is_rgx)
|
|
||||||
@@ -1544,6 +1553,48 @@ static int bgx_init_phy(struct bgx *bgx)
|
|
||||||
return bgx_init_of_phy(bgx);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static irqreturn_t bgx_intr_handler(int irq, void *data)
|
|
||||||
+{
|
|
||||||
+ struct bgx *bgx = (struct bgx *)data;
|
|
||||||
+ u64 status, val;
|
|
||||||
+ int lmac;
|
|
||||||
+
|
|
||||||
+ for (lmac = 0; lmac < bgx->lmac_count; lmac++) {
|
|
||||||
+ status = bgx_reg_read(bgx, lmac, BGX_GMP_GMI_TXX_INT);
|
|
||||||
+ if (status & GMI_TXX_INT_UNDFLW) {
|
|
||||||
+ pci_err(bgx->pdev, "BGX%d lmac%d UNDFLW\n",
|
|
||||||
+ bgx->bgx_id, lmac);
|
|
||||||
+ val = bgx_reg_read(bgx, lmac, BGX_CMRX_CFG);
|
|
||||||
+ val &= ~CMR_EN;
|
|
||||||
+ bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val);
|
|
||||||
+ val |= CMR_EN;
|
|
||||||
+ bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val);
|
|
||||||
+ }
|
|
||||||
+ /* clear interrupts */
|
|
||||||
+ bgx_reg_write(bgx, lmac, BGX_GMP_GMI_TXX_INT, status);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return IRQ_HANDLED;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void bgx_register_intr(struct pci_dev *pdev)
|
|
||||||
+{
|
|
||||||
+ struct bgx *bgx = pci_get_drvdata(pdev);
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ ret = pci_alloc_irq_vectors(pdev, BGX_LMAC_VEC_OFFSET,
|
|
||||||
+ BGX_LMAC_VEC_OFFSET, PCI_IRQ_ALL_TYPES);
|
|
||||||
+ if (ret < 0) {
|
|
||||||
+ pci_err(pdev, "Req for #%d msix vectors failed\n",
|
|
||||||
+ BGX_LMAC_VEC_OFFSET);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+ ret = pci_request_irq(pdev, GMPX_GMI_TX_INT, bgx_intr_handler, NULL,
|
|
||||||
+ bgx, "BGX%d", bgx->bgx_id);
|
|
||||||
+ if (ret)
|
|
||||||
+ pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
@@ -1559,7 +1610,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
|
|
||||||
pci_set_drvdata(pdev, bgx);
|
|
||||||
|
|
||||||
- err = pci_enable_device(pdev);
|
|
||||||
+ err = pcim_enable_device(pdev);
|
|
||||||
if (err) {
|
|
||||||
dev_err(dev, "Failed to enable PCI device\n");
|
|
||||||
pci_set_drvdata(pdev, NULL);
|
|
||||||
@@ -1613,6 +1664,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
|
|
||||||
bgx_init_hw(bgx);
|
|
||||||
|
|
||||||
+ bgx_register_intr(pdev);
|
|
||||||
+
|
|
||||||
/* Enable all LMACs */
|
|
||||||
for (lmac = 0; lmac < bgx->lmac_count; lmac++) {
|
|
||||||
err = bgx_lmac_enable(bgx, lmac);
|
|
||||||
@@ -1629,6 +1682,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
||||||
|
|
||||||
err_enable:
|
|
||||||
bgx_vnic[bgx->bgx_id] = NULL;
|
|
||||||
+ pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);
|
|
||||||
err_release_regions:
|
|
||||||
pci_release_regions(pdev);
|
|
||||||
err_disable_device:
|
|
||||||
@@ -1646,6 +1700,8 @@ static void bgx_remove(struct pci_dev *pdev)
|
|
||||||
for (lmac = 0; lmac < bgx->lmac_count; lmac++)
|
|
||||||
bgx_lmac_disable(bgx, lmac);
|
|
||||||
|
|
||||||
+ pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);
|
|
||||||
+
|
|
||||||
bgx_vnic[bgx->bgx_id] = NULL;
|
|
||||||
pci_release_regions(pdev);
|
|
||||||
pci_disable_device(pdev);
|
|
||||||
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
|
|
||||||
index cbdd20b..ac0c89c 100644
|
|
||||||
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
|
|
||||||
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
|
|
||||||
@@ -183,6 +183,15 @@
|
|
||||||
#define BGX_GMP_GMI_TXX_BURST 0x38228
|
|
||||||
#define BGX_GMP_GMI_TXX_MIN_PKT 0x38240
|
|
||||||
#define BGX_GMP_GMI_TXX_SGMII_CTL 0x38300
|
|
||||||
+#define BGX_GMP_GMI_TXX_INT 0x38500
|
|
||||||
+#define BGX_GMP_GMI_TXX_INT_W1S 0x38508
|
|
||||||
+#define BGX_GMP_GMI_TXX_INT_ENA_W1C 0x38510
|
|
||||||
+#define BGX_GMP_GMI_TXX_INT_ENA_W1S 0x38518
|
|
||||||
+#define GMI_TXX_INT_PTP_LOST BIT_ULL(4)
|
|
||||||
+#define GMI_TXX_INT_LATE_COL BIT_ULL(3)
|
|
||||||
+#define GMI_TXX_INT_XSDEF BIT_ULL(2)
|
|
||||||
+#define GMI_TXX_INT_XSCOL BIT_ULL(1)
|
|
||||||
+#define GMI_TXX_INT_UNDFLW BIT_ULL(0)
|
|
||||||
|
|
||||||
#define BGX_MSIX_VEC_0_29_ADDR 0x400000 /* +(0..29) << 4 */
|
|
||||||
#define BGX_MSIX_VEC_0_29_CTL 0x400008
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
Loading…
Reference in New Issue