Commit 54ceb9ec authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller

amd-xgbe: IRQ names require allocated memory

When requesting an irq, the name passed in must be (part of) allocated
memory. The irq name was a local variable and resulted in random
characters when listing /proc/interrupts. Add a character field to the
xgbe_channel structure to hold the irq name and use that.
Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cdfe2c7
...@@ -1285,7 +1285,6 @@ static int xgbe_open(struct net_device *netdev) ...@@ -1285,7 +1285,6 @@ static int xgbe_open(struct net_device *netdev)
struct xgbe_hw_if *hw_if = &pdata->hw_if; struct xgbe_hw_if *hw_if = &pdata->hw_if;
struct xgbe_desc_if *desc_if = &pdata->desc_if; struct xgbe_desc_if *desc_if = &pdata->desc_if;
struct xgbe_channel *channel = NULL; struct xgbe_channel *channel = NULL;
char dma_irq_name[IFNAMSIZ + 32];
unsigned int i = 0; unsigned int i = 0;
int ret; int ret;
...@@ -1341,13 +1340,14 @@ static int xgbe_open(struct net_device *netdev) ...@@ -1341,13 +1340,14 @@ static int xgbe_open(struct net_device *netdev)
if (pdata->per_channel_irq) { if (pdata->per_channel_irq) {
channel = pdata->channel; channel = pdata->channel;
for (i = 0; i < pdata->channel_count; i++, channel++) { for (i = 0; i < pdata->channel_count; i++, channel++) {
snprintf(dma_irq_name, sizeof(dma_irq_name) - 1, snprintf(channel->dma_irq_name,
sizeof(channel->dma_irq_name) - 1,
"%s-TxRx-%u", netdev_name(netdev), "%s-TxRx-%u", netdev_name(netdev),
channel->queue_index); channel->queue_index);
ret = devm_request_irq(pdata->dev, channel->dma_irq, ret = devm_request_irq(pdata->dev, channel->dma_irq,
xgbe_dma_isr, 0, dma_irq_name, xgbe_dma_isr, 0,
channel); channel->dma_irq_name, channel);
if (ret) { if (ret) {
netdev_alert(netdev, netdev_alert(netdev,
"error requesting irq %d\n", "error requesting irq %d\n",
......
...@@ -400,6 +400,7 @@ struct xgbe_channel { ...@@ -400,6 +400,7 @@ struct xgbe_channel {
/* Per channel interrupt irq number */ /* Per channel interrupt irq number */
int dma_irq; int dma_irq;
char dma_irq_name[IFNAMSIZ + 32];
/* Netdev related settings */ /* Netdev related settings */
struct napi_struct napi; struct napi_struct napi;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment