* [PATCH 0/4] net: driver fixes from arm randconfig builds
@ 2015-01-28 14:15 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2015-01-28 14:15 UTC (permalink / raw)
To: linux-arm-kernel
These four patches are fallout from test builds on ARM. I have a
few more of them in my backlog but have not yet confirmed them
to still be valid.
The first three patches are about incomplete dependencies on
old drivers. One could backport them to the beginning of time
in theory, but there is little value since nobody would run into
these problems.
The final patch is one I had submitted before together with the
respective pcmcia patch but forgot to follow up on that. It's
still a valid but relatively theoretical bug, because the previous
behavior of the driver was just as broken as what we have in
mainline.
Please apply,
Arnd
Arnd Bergmann (4):
net: cs89x0: always build platform code if !HAS_IOPORT_MAP
net: wan: add missing virt_to_bus dependencies
net: lance,ni64: don't build for ARM
net: am2150: fix nmclan_cs.c shared interrupt handling
drivers/net/ethernet/amd/Kconfig | 4 ++--
drivers/net/ethernet/amd/nmclan_cs.c | 2 ++
drivers/net/ethernet/cirrus/Kconfig | 3 ++-
drivers/net/wan/Kconfig | 6 +++---
4 files changed, 9 insertions(+), 6 deletions(-)
--
2.1.0.rc2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/4] net: cs89x0: always build platform code if !HAS_IOPORT_MAP
2015-01-28 14:15 ` Arnd Bergmann
@ 2015-01-28 14:15 ` Arnd Bergmann
-1 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2015-01-28 14:15 UTC (permalink / raw)
To: netdev
Cc: Arnd Bergmann, linux-pcmcia, jeffrey.t.kirsher, kas, davem,
linux-arm-kernel
The cs89x0 driver can either be built as an ISA driver or a platform
driver, the choice is controlled by the CS89x0_PLATFORM Kconfig
symbol. Building the ISA driver on a system that does not have
a way to map I/O ports fails with this error:
drivers/built-in.o: In function `cs89x0_ioport_probe.constprop.1':
:(.init.text+0x4794): undefined reference to `ioport_map'
:(.init.text+0x4830): undefined reference to `ioport_unmap'
This changes the Kconfig logic to take that option away and
always force building the platform variant of this driver if
CONFIG_HAS_IOPORT_MAP is not set. This is the only correct
choice in this case, and it avoids the build error.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/ethernet/cirrus/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
index 7403dff8f14a..905ac5f5d9a6 100644
--- a/drivers/net/ethernet/cirrus/Kconfig
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -32,7 +32,8 @@ config CS89x0
will be called cs89x0.
config CS89x0_PLATFORM
- bool "CS89x0 platform driver support"
+ bool "CS89x0 platform driver support" if HAS_IOPORT_MAP
+ default !HAS_IOPORT_MAP
depends on CS89x0
help
Say Y to compile the cs89x0 driver as a platform driver. This
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/4] net: cs89x0: always build platform code if !HAS_IOPORT_MAP
@ 2015-01-28 14:15 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2015-01-28 14:15 UTC (permalink / raw)
To: linux-arm-kernel
The cs89x0 driver can either be built as an ISA driver or a platform
driver, the choice is controlled by the CS89x0_PLATFORM Kconfig
symbol. Building the ISA driver on a system that does not have
a way to map I/O ports fails with this error:
drivers/built-in.o: In function `cs89x0_ioport_probe.constprop.1':
:(.init.text+0x4794): undefined reference to `ioport_map'
:(.init.text+0x4830): undefined reference to `ioport_unmap'
This changes the Kconfig logic to take that option away and
always force building the platform variant of this driver if
CONFIG_HAS_IOPORT_MAP is not set. This is the only correct
choice in this case, and it avoids the build error.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/ethernet/cirrus/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
index 7403dff8f14a..905ac5f5d9a6 100644
--- a/drivers/net/ethernet/cirrus/Kconfig
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -32,7 +32,8 @@ config CS89x0
will be called cs89x0.
config CS89x0_PLATFORM
- bool "CS89x0 platform driver support"
+ bool "CS89x0 platform driver support" if HAS_IOPORT_MAP
+ default !HAS_IOPORT_MAP
depends on CS89x0
help
Say Y to compile the cs89x0 driver as a platform driver. This
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/4] net: wan: add missing virt_to_bus dependencies
2015-01-28 14:15 ` Arnd Bergmann
@ 2015-01-28 14:15 ` Arnd Bergmann
-1 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2015-01-28 14:15 UTC (permalink / raw)
To: netdev
Cc: Arnd Bergmann, linux-pcmcia, jeffrey.t.kirsher, kas, davem,
linux-arm-kernel
The cosa driver is rather outdated and does not get built on most
platforms because it requires the ISA_DMA_API symbol. However
there are some ARM platforms that have ISA_DMA_API but no virt_to_bus,
and they get this build error when enabling the ltpc driver.
drivers/net/wan/cosa.c: In function 'tx_interrupt':
drivers/net/wan/cosa.c:1768:3: error: implicit declaration of function 'virt_to_bus'
unsigned long addr = virt_to_bus(cosa->txbuf);
^
The same problem exists for the Hostess SV-11 and Sealevel Systems 4021
drivers.
This adds another dependency in Kconfig to avoid that configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/wan/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 94e234975c61..a2fdd15f285a 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -25,7 +25,7 @@ if WAN
# There is no way to detect a comtrol sv11 - force it modular for now.
config HOSTESS_SV11
tristate "Comtrol Hostess SV-11 support"
- depends on ISA && m && ISA_DMA_API && INET && HDLC
+ depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
help
Driver for Comtrol Hostess SV-11 network card which
operates on low speed synchronous serial links at up to
@@ -37,7 +37,7 @@ config HOSTESS_SV11
# The COSA/SRP driver has not been tested as non-modular yet.
config COSA
tristate "COSA/SRP sync serial boards support"
- depends on ISA && m && ISA_DMA_API && HDLC
+ depends on ISA && m && ISA_DMA_API && HDLC && VIRT_TO_BUS
---help---
Driver for COSA and SRP synchronous serial boards.
@@ -87,7 +87,7 @@ config LANMEDIA
# There is no way to detect a Sealevel board. Force it modular
config SEALEVEL_4021
tristate "Sealevel Systems 4021 support"
- depends on ISA && m && ISA_DMA_API && INET && HDLC
+ depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
help
This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/4] net: wan: add missing virt_to_bus dependencies
@ 2015-01-28 14:15 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2015-01-28 14:15 UTC (permalink / raw)
To: linux-arm-kernel
The cosa driver is rather outdated and does not get built on most
platforms because it requires the ISA_DMA_API symbol. However
there are some ARM platforms that have ISA_DMA_API but no virt_to_bus,
and they get this build error when enabling the ltpc driver.
drivers/net/wan/cosa.c: In function 'tx_interrupt':
drivers/net/wan/cosa.c:1768:3: error: implicit declaration of function 'virt_to_bus'
unsigned long addr = virt_to_bus(cosa->txbuf);
^
The same problem exists for the Hostess SV-11 and Sealevel Systems 4021
drivers.
This adds another dependency in Kconfig to avoid that configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/wan/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 94e234975c61..a2fdd15f285a 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -25,7 +25,7 @@ if WAN
# There is no way to detect a comtrol sv11 - force it modular for now.
config HOSTESS_SV11
tristate "Comtrol Hostess SV-11 support"
- depends on ISA && m && ISA_DMA_API && INET && HDLC
+ depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
help
Driver for Comtrol Hostess SV-11 network card which
operates on low speed synchronous serial links at up to
@@ -37,7 +37,7 @@ config HOSTESS_SV11
# The COSA/SRP driver has not been tested as non-modular yet.
config COSA
tristate "COSA/SRP sync serial boards support"
- depends on ISA && m && ISA_DMA_API && HDLC
+ depends on ISA && m && ISA_DMA_API && HDLC && VIRT_TO_BUS
---help---
Driver for COSA and SRP synchronous serial boards.
@@ -87,7 +87,7 @@ config LANMEDIA
# There is no way to detect a Sealevel board. Force it modular
config SEALEVEL_4021
tristate "Sealevel Systems 4021 support"
- depends on ISA && m && ISA_DMA_API && INET && HDLC
+ depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
help
This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/4] net: wan: add missing virt_to_bus dependencies
2015-01-28 14:15 ` Arnd Bergmann
@ 2015-01-28 16:19 ` Jan Kasprzak
-1 siblings, 0 replies; 14+ messages in thread
From: Jan Kasprzak @ 2015-01-28 16:19 UTC (permalink / raw)
To: Arnd Bergmann
Cc: netdev, linux-pcmcia, davem, linux-arm-kernel, jeffrey.t.kirsher
Arnd Bergmann wrote:
: The cosa driver is rather outdated and does not get built on most
: platforms because it requires the ISA_DMA_API symbol. However
: there are some ARM platforms that have ISA_DMA_API but no virt_to_bus,
: and they get this build error when enabling the ltpc driver.
:
: drivers/net/wan/cosa.c: In function 'tx_interrupt':
: drivers/net/wan/cosa.c:1768:3: error: implicit declaration of function 'virt_to_bus'
: unsigned long addr = virt_to_bus(cosa->txbuf);
: ^
:
: The same problem exists for the Hostess SV-11 and Sealevel Systems 4021
: drivers.
Hello,
as for COSA, it is OK. Although I would like to know whether there still is
at least one COSA card in use somewhere :-)
Acked-By: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Thanks,
-Yenya
:
: This adds another dependency in Kconfig to avoid that configuration.
:
: Signed-off-by: Arnd Bergmann <arnd@arndb.de>
: ---
: drivers/net/wan/Kconfig | 6 +++---
: 1 file changed, 3 insertions(+), 3 deletions(-)
:
: diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
: index 94e234975c61..a2fdd15f285a 100644
: --- a/drivers/net/wan/Kconfig
: +++ b/drivers/net/wan/Kconfig
: @@ -25,7 +25,7 @@ if WAN
: # There is no way to detect a comtrol sv11 - force it modular for now.
: config HOSTESS_SV11
: tristate "Comtrol Hostess SV-11 support"
: - depends on ISA && m && ISA_DMA_API && INET && HDLC
: + depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
: help
: Driver for Comtrol Hostess SV-11 network card which
: operates on low speed synchronous serial links at up to
: @@ -37,7 +37,7 @@ config HOSTESS_SV11
: # The COSA/SRP driver has not been tested as non-modular yet.
: config COSA
: tristate "COSA/SRP sync serial boards support"
: - depends on ISA && m && ISA_DMA_API && HDLC
: + depends on ISA && m && ISA_DMA_API && HDLC && VIRT_TO_BUS
: ---help---
: Driver for COSA and SRP synchronous serial boards.
:
: @@ -87,7 +87,7 @@ config LANMEDIA
: # There is no way to detect a Sealevel board. Force it modular
: config SEALEVEL_4021
: tristate "Sealevel Systems 4021 support"
: - depends on ISA && m && ISA_DMA_API && INET && HDLC
: + depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
: help
: This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.
:
: --
: 2.1.0.rc2
--
| Jan "Yenya" Kasprzak <kas at {fi.muni.cz - work | yenya.net - private}> |
| New GPG 4096R/A45477D5 -- see http://www.fi.muni.cz/~kas/pgp-rollover.txt |
| http://www.fi.muni.cz/~kas/ Journal: http://www.fi.muni.cz/~kas/blog/ |
||| "New and improved" is only really improved if it also takes backwards |||
||| compatibility into account, rather than saying "now everybody must do |||
||| things the new and improved - and different - way" --Linus Torvalds |||
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 2/4] net: wan: add missing virt_to_bus dependencies
@ 2015-01-28 16:19 ` Jan Kasprzak
0 siblings, 0 replies; 14+ messages in thread
From: Jan Kasprzak @ 2015-01-28 16:19 UTC (permalink / raw)
To: linux-arm-kernel
Arnd Bergmann wrote:
: The cosa driver is rather outdated and does not get built on most
: platforms because it requires the ISA_DMA_API symbol. However
: there are some ARM platforms that have ISA_DMA_API but no virt_to_bus,
: and they get this build error when enabling the ltpc driver.
:
: drivers/net/wan/cosa.c: In function 'tx_interrupt':
: drivers/net/wan/cosa.c:1768:3: error: implicit declaration of function 'virt_to_bus'
: unsigned long addr = virt_to_bus(cosa->txbuf);
: ^
:
: The same problem exists for the Hostess SV-11 and Sealevel Systems 4021
: drivers.
Hello,
as for COSA, it is OK. Although I would like to know whether there still is
at least one COSA card in use somewhere :-)
Acked-By: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Thanks,
-Yenya
:
: This adds another dependency in Kconfig to avoid that configuration.
:
: Signed-off-by: Arnd Bergmann <arnd@arndb.de>
: ---
: drivers/net/wan/Kconfig | 6 +++---
: 1 file changed, 3 insertions(+), 3 deletions(-)
:
: diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
: index 94e234975c61..a2fdd15f285a 100644
: --- a/drivers/net/wan/Kconfig
: +++ b/drivers/net/wan/Kconfig
: @@ -25,7 +25,7 @@ if WAN
: # There is no way to detect a comtrol sv11 - force it modular for now.
: config HOSTESS_SV11
: tristate "Comtrol Hostess SV-11 support"
: - depends on ISA && m && ISA_DMA_API && INET && HDLC
: + depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
: help
: Driver for Comtrol Hostess SV-11 network card which
: operates on low speed synchronous serial links at up to
: @@ -37,7 +37,7 @@ config HOSTESS_SV11
: # The COSA/SRP driver has not been tested as non-modular yet.
: config COSA
: tristate "COSA/SRP sync serial boards support"
: - depends on ISA && m && ISA_DMA_API && HDLC
: + depends on ISA && m && ISA_DMA_API && HDLC && VIRT_TO_BUS
: ---help---
: Driver for COSA and SRP synchronous serial boards.
:
: @@ -87,7 +87,7 @@ config LANMEDIA
: # There is no way to detect a Sealevel board. Force it modular
: config SEALEVEL_4021
: tristate "Sealevel Systems 4021 support"
: - depends on ISA && m && ISA_DMA_API && INET && HDLC
: + depends on ISA && m && ISA_DMA_API && INET && HDLC && VIRT_TO_BUS
: help
: This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.
:
: --
: 2.1.0.rc2
--
| Jan "Yenya" Kasprzak <kas@{fi.muni.cz - work | yenya.net - private}> |
| New GPG 4096R/A45477D5 -- see http://www.fi.muni.cz/~kas/pgp-rollover.txt |
| http://www.fi.muni.cz/~kas/ Journal: http://www.fi.muni.cz/~kas/blog/ |
||| "New and improved" is only really improved if it also takes backwards |||
||| compatibility into account, rather than saying "now everybody must do |||
||| things the new and improved - and different - way" --Linus Torvalds |||
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/4] net: lance,ni64: don't build for ARM
2015-01-28 14:15 ` Arnd Bergmann
@ 2015-01-28 14:15 ` Arnd Bergmann
-1 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2015-01-28 14:15 UTC (permalink / raw)
To: netdev
Cc: Arnd Bergmann, linux-pcmcia, jeffrey.t.kirsher, kas, davem,
linux-arm-kernel
The ni65 and lance ethernet drivers manually program the ISA DMA
controller that is only available on x86 PCs and a few compatible
systems. Trying to build it on ARM results in this error:
ni65.c: In function 'ni65_probe1':
ni65.c:496:62: error: 'DMA1_STAT_REG' undeclared (first use in this function)
((inb(DMA1_STAT_REG) >> 4) & 0x0f)
^
ni65.c:496:62: note: each undeclared identifier is reported only once for each function it appears in
ni65.c:497:63: error: 'DMA2_STAT_REG' undeclared (first use in this function)
| (inb(DMA2_STAT_REG) & 0xf0);
The DMA1_STAT_REG and DMA2_STAT_REG registers are only defined for
alpha, mips, parisc, powerpc and x86, although it is not clear
which subarchitectures actually have them at the correct location.
This patch for now just disables it for ARM, to avoid randconfig
build errors. We could also decide to limit it to the set of
architectures on which it does compile, but that might look more
deliberate than guessing based on where the drivers build.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/ethernet/amd/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index 5d3b5202327c..c638c85f3954 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -45,7 +45,7 @@ config AMD8111_ETH
config LANCE
tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
- depends on ISA && ISA_DMA_API
+ depends on ISA && ISA_DMA_API && !ARM
---help---
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
@@ -142,7 +142,7 @@ config PCMCIA_NMCLAN
config NI65
tristate "NI6510 support"
- depends on ISA && ISA_DMA_API
+ depends on ISA && ISA_DMA_API && !ARM
---help---
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 3/4] net: lance,ni64: don't build for ARM
@ 2015-01-28 14:15 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2015-01-28 14:15 UTC (permalink / raw)
To: linux-arm-kernel
The ni65 and lance ethernet drivers manually program the ISA DMA
controller that is only available on x86 PCs and a few compatible
systems. Trying to build it on ARM results in this error:
ni65.c: In function 'ni65_probe1':
ni65.c:496:62: error: 'DMA1_STAT_REG' undeclared (first use in this function)
((inb(DMA1_STAT_REG) >> 4) & 0x0f)
^
ni65.c:496:62: note: each undeclared identifier is reported only once for each function it appears in
ni65.c:497:63: error: 'DMA2_STAT_REG' undeclared (first use in this function)
| (inb(DMA2_STAT_REG) & 0xf0);
The DMA1_STAT_REG and DMA2_STAT_REG registers are only defined for
alpha, mips, parisc, powerpc and x86, although it is not clear
which subarchitectures actually have them at the correct location.
This patch for now just disables it for ARM, to avoid randconfig
build errors. We could also decide to limit it to the set of
architectures on which it does compile, but that might look more
deliberate than guessing based on where the drivers build.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/ethernet/amd/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index 5d3b5202327c..c638c85f3954 100644
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -45,7 +45,7 @@ config AMD8111_ETH
config LANCE
tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
- depends on ISA && ISA_DMA_API
+ depends on ISA && ISA_DMA_API && !ARM
---help---
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
@@ -142,7 +142,7 @@ config PCMCIA_NMCLAN
config NI65
tristate "NI6510 support"
- depends on ISA && ISA_DMA_API
+ depends on ISA && ISA_DMA_API && !ARM
---help---
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 4/4] net: am2150: fix nmclan_cs.c shared interrupt handling
2015-01-28 14:15 ` Arnd Bergmann
@ 2015-01-28 14:15 ` Arnd Bergmann
-1 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2015-01-28 14:15 UTC (permalink / raw)
To: netdev
Cc: Arnd Bergmann, linux-pcmcia, jeffrey.t.kirsher, kas, davem,
linux-arm-kernel
A recent patch tried to work around a valid warning for the use of a
deprecated interface by blindly changing from the old
pcmcia_request_exclusive_irq() interface to pcmcia_request_irq().
This driver has an interrupt handler that is not currently aware
of shared interrupts, but can be easily converted to be.
At the moment, the driver reads the interrupt status register
repeatedly until it contains only zeroes in the interesting bits,
and handles each bit individually.
This patch adds the missing part of returning IRQ_NONE in case none
of the bits are set to start with, so we can move on to the next
interrupt source.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 5f5316fcd08ef7 ("am2150: Update nmclan_cs.c to use update PCMCIA API")
---
drivers/net/ethernet/amd/nmclan_cs.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index 5b22764ba88d..27245efe9f50 100644
--- a/drivers/net/ethernet/amd/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c
@@ -952,6 +952,8 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
do {
/* WARNING: MACE_IR is a READ/CLEAR port! */
status = inb(ioaddr + AM2150_MACE_BASE + MACE_IR);
+ if (!(status & ~MACE_IMR_DEFAULT) && IntrCnt == MACE_MAX_IR_ITERATIONS)
+ return IRQ_NONE;
pr_debug("mace_interrupt: irq 0x%X status 0x%X.\n", irq, status);
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 4/4] net: am2150: fix nmclan_cs.c shared interrupt handling
@ 2015-01-28 14:15 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2015-01-28 14:15 UTC (permalink / raw)
To: linux-arm-kernel
A recent patch tried to work around a valid warning for the use of a
deprecated interface by blindly changing from the old
pcmcia_request_exclusive_irq() interface to pcmcia_request_irq().
This driver has an interrupt handler that is not currently aware
of shared interrupts, but can be easily converted to be.
At the moment, the driver reads the interrupt status register
repeatedly until it contains only zeroes in the interesting bits,
and handles each bit individually.
This patch adds the missing part of returning IRQ_NONE in case none
of the bits are set to start with, so we can move on to the next
interrupt source.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 5f5316fcd08ef7 ("am2150: Update nmclan_cs.c to use update PCMCIA API")
---
drivers/net/ethernet/amd/nmclan_cs.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index 5b22764ba88d..27245efe9f50 100644
--- a/drivers/net/ethernet/amd/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c
@@ -952,6 +952,8 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
do {
/* WARNING: MACE_IR is a READ/CLEAR port! */
status = inb(ioaddr + AM2150_MACE_BASE + MACE_IR);
+ if (!(status & ~MACE_IMR_DEFAULT) && IntrCnt == MACE_MAX_IR_ITERATIONS)
+ return IRQ_NONE;
pr_debug("mace_interrupt: irq 0x%X status 0x%X.\n", irq, status);
--
2.1.0.rc2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 0/4] net: driver fixes from arm randconfig builds
2015-01-28 14:15 ` Arnd Bergmann
@ 2015-01-29 23:08 ` David Miller
-1 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2015-01-29 23:08 UTC (permalink / raw)
To: arnd; +Cc: netdev, linux-arm-kernel, linux-pcmcia, kas, jeffrey.t.kirsher
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 28 Jan 2015 15:15:00 +0100
> These four patches are fallout from test builds on ARM. I have a
> few more of them in my backlog but have not yet confirmed them
> to still be valid.
>
> The first three patches are about incomplete dependencies on
> old drivers. One could backport them to the beginning of time
> in theory, but there is little value since nobody would run into
> these problems.
>
> The final patch is one I had submitted before together with the
> respective pcmcia patch but forgot to follow up on that. It's
> still a valid but relatively theoretical bug, because the previous
> behavior of the driver was just as broken as what we have in
> mainline.
Series applied, thanks Arnd.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/4] net: driver fixes from arm randconfig builds
@ 2015-01-29 23:08 ` David Miller
0 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2015-01-29 23:08 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 28 Jan 2015 15:15:00 +0100
> These four patches are fallout from test builds on ARM. I have a
> few more of them in my backlog but have not yet confirmed them
> to still be valid.
>
> The first three patches are about incomplete dependencies on
> old drivers. One could backport them to the beginning of time
> in theory, but there is little value since nobody would run into
> these problems.
>
> The final patch is one I had submitted before together with the
> respective pcmcia patch but forgot to follow up on that. It's
> still a valid but relatively theoretical bug, because the previous
> behavior of the driver was just as broken as what we have in
> mainline.
Series applied, thanks Arnd.
^ permalink raw reply [flat|nested] 14+ messages in thread