Skip to contentSkip to conversation

firmware: Correct attribution of Sierra Wireless CIS files

PATCH In review Ben Hutchings 2 participants 5 messages Mar 5, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 firmware: Correct attribution of Sierra Wireless CIS files

These files have nothing to do with the pcmcia-cs project and are distributed without any clear licence.

---
The only source I can find for these files is
<http://www.sierrawireless.com/resources/faq/PC_Card/AirCard555/Aircard_Linux.tar> linked from <https://sierrawireless.custhelp.com/app/answers/detail/a_id/179/kw/linux>.

David Hinds who ran the pcmcia-cs project disclaims any knowledge of these files.

Ben.

 firmware/WHENCE |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
firmware/WHENCE +12 -3
index e8e550f..839a790 100644
@@ -635,9 +635,6 @@ File: cis/MT5634ZLX.cis
       cis/RS-COM-2P.cis
       cis/COMpad2.cis
       cis/COMpad4.cis
-      cis/SW_555_SER.cis
-      cis/SW_7xx_SER.cis
-      cis/SW_8xx_SER.cis
 
 Licence: GPL
 
@@ -645,6 +642,18 @@ Originally developed by the pcmcia-cs project
 
 --------------------------------------------------------------------------
 
+Driver: SERIAL_8250_CS - Serial PCMCIA adapter
+
+File: cis/SW_555_SER.cis
+File: cis/SW_7xx_SER.cis
+File: cis/SW_8xx_SER.cis
+
+Licence: Unknown
+
+Distributed by Sierra Wireless
+
+--------------------------------------------------------------------------
+
 Driver: PCMCIA_SMC91C92 - SMC 91Cxx PCMCIA
 
 File: ositech/Xilinx7OD.bin
Signature · 1 line
1.6.6.2
#1 lore raw
Quoted 5 lines

The only source I can find for these files is
<http://www.sierrawireless.com/resources/faq/PC_Card/AirCard555/Aircard_Linux.tar> linked from <https://sierrawireless.custhelp.com/app/answers/detail/a_id/179/kw/linux>.

SierraWireless provides the CIS by GPL (see URL below).

http://sierrawireless.custhelp.com/app/answers/detail/a_id/203/related/1/sno/0

Yes. The files below are not developed by the pcmcia-cs project but provided by SierraWireless.

firmware/WHENCE Originally developed by the pcmcia-cs project · line 649

Quoted 3 lines
firmware/WHENCE +3 -0
+File: cis/SW_555_SER.cis
+File: cis/SW_7xx_SER.cis
+File: cis/SW_8xx_SER.cis

Ken

#2 lore raw
Quoted 8 lines · Ken Kawasaki
Quoted 4 lines

The only source I can find for these files is
<http://www.sierrawireless.com/resources/faq/PC_Card/AirCard555/Aircard_Linux.tar> linked from <https://sierrawireless.custhelp.com/app/answers/detail/a_id/179/kw/linux>.

SierraWireless provides the CIS by GPL (see URL below).

http://sierrawireless.custhelp.com/app/answers/detail/a_id/203/related/1/sno/0

The text 'GNU General Public License' links to GPL version *3*, and would also have done so in 2008 when that page was apparently first published.

Quoted 2 lines

Yes. The files below are not developed by the pcmcia-cs project but provided by SierraWireless.

So, assuming that these files are copyrightable, your patch to add them violated the conditions of the licence on at least three grounds:

1. The Linux source tree does not include a copy of the GPL version 3
2. These files are identified as licenced under 'GPL' which in the context of Linux implies version 2
3. The copyright holder is not identified correctly

To avoid confusing people, I do not think we should add a copy of GPLv3 to the tree. I will therefore submit a patch to remove these files. I will submit a separate patch for linux-firmware to fix copyright information there.

Ben.

Signature · 3 lines
Ben Hutchings
Q.  Which is the greater problem in the world today, ignorance or apathy?
A.  I don't know and I couldn't care less.
#3 lore raw

PATCH v2 1/2 firmware: Remove Sierra Wireless CIS files

Contrary to the text in WHENCE, these files have nothing to do with the pcmcia-cs project and are distributed by Sierra Wireless under GPLv3. Rather than confusing people by adding the text of the GPLv3, remove them. They will still be available from the linux-firmware repository.

---
 firmware/Makefile                |    4 +---
 firmware/WHENCE                  |    3 ---
 firmware/cis/SW_555_SER.cis.ihex |   12 ------------
 firmware/cis/SW_7xx_SER.cis.ihex |   13 -------------
 firmware/cis/SW_8xx_SER.cis.ihex |   13 -------------
 5 files changed, 1 insertions(+), 44 deletions(-)
 delete mode 100644 firmware/cis/SW_555_SER.cis.ihex
 delete mode 100644 firmware/cis/SW_7xx_SER.cis.ihex
 delete mode 100644 firmware/cis/SW_8xx_SER.cis.ihex
firmware/Makefile +1 -3
index 8af0fc7..87952aa 100644
@@ -74,9 +74,7 @@ fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
 fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
 fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
 fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
-				       cis/COMpad2.cis cis/COMpad4.cis \
-				       cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
-				       cis/SW_8xx_SER.cis
+				       cis/COMpad2.cis cis/COMpad4.cis
 fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
 fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
 				      advansys/3550.bin advansys/38C0800.bin
firmware/WHENCE +0 -3
index e8e550f..fbee146 100644
@@ -635,9 +635,6 @@ File: cis/MT5634ZLX.cis
       cis/RS-COM-2P.cis
       cis/COMpad2.cis
       cis/COMpad4.cis
-      cis/SW_555_SER.cis
-      cis/SW_7xx_SER.cis
-      cis/SW_8xx_SER.cis
 
 Licence: GPL
 
firmware/cis/SW_555_SER.cis.ihex deleted +0 -12
deleted file mode 100644
index 9b9348a..0000000
@@ -1,12 +0,0 @@
-:100000000101FF17034100FF20043F0110072102F7
-:100010000200152A070053696572726120576972E0
-:10002000656C657373004169724361726420353594
-:1000300035004135353500526576203100FF1A050F
-:1000400001030007731B0BE00118A360F8030730DE
-:10005000BC3F1B08A10108A360F802071B08A2010E
-:1000600008A360E803071B08A30108A360E80207D0
-:0A0070001B04A40108231400FF0084
-:00000001FF
-#
-# Replacement CIS for AC555 provided by Sierra Wireless
-#
firmware/cis/SW_7xx_SER.cis.ihex deleted +0 -13
deleted file mode 100644
index 11e44ad..0000000
@@ -1,13 +0,0 @@
-:100000000101FF17034100FF2004920110072102A4
-:1000100002001537070053696572726120576972D3
-:10002000656C6573730041433731302F4143373579
-:10003000300047505253204E6574776F726B2041E9
-:1000400064617074657200523100FF1A050103008B
-:1000500007731B10E00119784D555D25A360F80367
-:100060000730BC861B08A10108A360F802071B0823
-:10007000A20108A360E803071B08A30108A360E826
-:0C00800002071B04A40108231400FF0069
-:00000001FF
-#
-# Replacement CIS for AC7xx provided by Sierra Wireless
-#
firmware/cis/SW_8xx_SER.cis.ihex deleted +0 -13
deleted file mode 100644
index bbcfe63..0000000
@@ -1,13 +0,0 @@
-:100000000101FF17034100FF2004920110072102A4
-:100010000200152F070053696572726120576972DB
-:10002000656C657373004143383530003347204EAB
-:100030006574776F726B20416461707465720052F1
-:100040003100FF1A0501030007731B10E001197846
-:100050004D555D25A360F8480730BC861B08A101FB
-:1000600008A360F847071B08A20108A360E8480737
-:100070001B08A30108A360E847071B04A401082389
-:040080001400FF0069
-:00000001FF
-#
-# Replacement CIS for AC8xx provided by Sierra Wireless
-#
Signature · 1 line
1.6.6.2
#4 lore raw

PATCH v2 2/2 firmware: Add source and copyright notice for CIS files from pcmcia-cs

In reply to Ben Hutchings
---
 firmware/WHENCE                |   25 +++++++++++++++++++---
 firmware/cis/src/3CCFEM556.cis |   22 ++++++++++++++++++++
 firmware/cis/src/3CXEM556.cis  |   22 ++++++++++++++++++++
 firmware/cis/src/COMpad2.cis   |   20 ++++++++++++++++++
 firmware/cis/src/COMpad4.cis   |   14 ++++++++++++
 firmware/cis/src/DP83903.cis   |   24 +++++++++++++++++++++
 firmware/cis/src/LA-PCM.cis    |   44 ++++++++++++++++++++++++++++++++++++++++
 firmware/cis/src/MT5634ZLX.cis |   18 ++++++++++++++++
 firmware/cis/src/NE2K.cis      |   10 +++++++++
 firmware/cis/src/PCMLM28.cis   |   37 +++++++++++++++++++++++++++++++++
 firmware/cis/src/PE-200.cis    |   11 ++++++++++
 firmware/cis/src/PE520.cis     |   11 ++++++++++
 firmware/cis/src/RS-COM-2P.cis |   14 ++++++++++++
 firmware/cis/src/tamarack.cis  |   17 +++++++++++++++
 14 files changed, 285 insertions(+), 4 deletions(-)
 create mode 100644 firmware/cis/src/3CCFEM556.cis
 create mode 100644 firmware/cis/src/3CXEM556.cis
 create mode 100644 firmware/cis/src/COMpad2.cis
 create mode 100644 firmware/cis/src/COMpad4.cis
 create mode 100644 firmware/cis/src/DP83903.cis
 create mode 100644 firmware/cis/src/LA-PCM.cis
 create mode 100644 firmware/cis/src/MT5634ZLX.cis
 create mode 100644 firmware/cis/src/NE2K.cis
 create mode 100644 firmware/cis/src/PCMLM28.cis
 create mode 100644 firmware/cis/src/PE-200.cis
 create mode 100644 firmware/cis/src/PE520.cis
 create mode 100644 firmware/cis/src/RS-COM-2P.cis
 create mode 100644 firmware/cis/src/tamarack.cis
firmware/WHENCE +21 -4
index fbee146..0cb459a 100644
@@ -602,30 +602,42 @@ File: cis/LA-PCM.cis
       cis/tamarack.cis
       cis/PE-200.cis
       cis/PE520.cis
+Source: cis/src/LA-PCM.cis
+Source: cis/src/PCMLM28.cis
+Source: cis/src/DP83903.cis
+Source: cis/src/NE2K.cis
+Source: cis/src/tamarack.cis
+Source: cis/src/PE-200.cis
+Source: cis/src/PE520.cis
 
-Licence: GPL
+Licence: Dual GPLv2/MPL
 
 Originally developed by the pcmcia-cs project
+Copyright (C) 1998, 1999, 2000 David A. Hinds
 
 --------------------------------------------------------------------------
 
 Driver: PCMCIA_3C589 - 3Com PCMCIA adapter
 
 File: cis/3CXEM556.cis
+Source: cis/src/3CXEM556.cis
 
-Licence: GPL
+Licence: Dual GPLv2/MPL
 
 Originally developed by the pcmcia-cs project
+Copyright (C) 1998, 1999, 2000 David A. Hinds
 
 --------------------------------------------------------------------------
 
 Driver: PCMCIA_3C574 - 3Com PCMCIA adapter
 
 File: cis/3CCFEM556.cis
+Source: cis/src/3CCFEM556.cis
 
-Licence: GPL
+Licence: Dual GPLv2/MPL
 
 Originally developed by the pcmcia-cs project
+Copyright (C) 1998, 1999, 2000 David A. Hinds
 
 --------------------------------------------------------------------------
 
@@ -635,10 +647,15 @@ File: cis/MT5634ZLX.cis
       cis/RS-COM-2P.cis
       cis/COMpad2.cis
       cis/COMpad4.cis
+Source: cis/src/MT5634ZLX.cis
+Source: cis/src/RS-COM-2P.cis
+Source: cis/src/COMpad2.cis
+Source: cis/src/COMpad4.cis
 
-Licence: GPL
+Licence: Dual GPLv2/MPL
 
 Originally developed by the pcmcia-cs project
+Copyright (C) 1998, 1999, 2000 David A. Hinds
 
 --------------------------------------------------------------------------
 
firmware/cis/src/3CCFEM556.cis new file +22 -0
new file mode 100644
index 0000000..be627d0
@@ -0,0 +1,22 @@
+#
+# This card is MFC-compliant, but identifies itself as single function
+#
+vers_1 5.0, "3Com", "Megahertz 3CCFEM556", "LAN + 56k Modem"
+manfid 0x0101, 0x0556
+funcid 0
+
+mfc {
+  funcid network_adapter
+  config base 0x1000 mask 0x267 last_index 0x07
+  cftable_entry 0x07
+    Vcc Vnom 5V
+    irq mask 0xffff [level]
+    io  0x0000-0x000f [8bit] [16bit]
+}, {
+  funcid serial_port
+  config base 0x1100 mask 0x277 last_index 0x27
+  cftable_entry 0x27
+    Vcc Vnom 5V
+    irq mask 0xffff [level]
+    io  0x0000-0x0007 [8bit]
+}
firmware/cis/src/3CXEM556.cis new file +22 -0
new file mode 100644
index 0000000..819f08f
@@ -0,0 +1,22 @@
+#
+# This card is MFC-compliant, but identifies itself as single function
+#
+vers_1 5.0, "3Com", "Megahertz 3CXEM556", "LAN + 56k Modem"
+manfid 0x0101, 0x0035
+funcid 0
+
+mfc {
+  funcid network_adapter
+  config base 0x0800 mask 0x63 last_index 0x07
+  cftable_entry 0x07
+    Vcc Vnom 5V
+    irq mask 0xffff [level]
+    io  0x0000-0x000f [8bit] [16bit]
+}, {
+  funcid serial_port
+  config base 0x900 mask 0x63 last_index 0x27
+  cftable_entry 0x27
+    Vcc Vnom 5V
+    irq mask 0xffff [level]
+    io  0x0000-0x0007 [8bit]
+}
firmware/cis/src/COMpad2.cis new file +20 -0
new file mode 100644
index 0000000..bfc2374
@@ -0,0 +1,20 @@
+#
+# Replacement CIS for Advantech COMpad-32/85
+#
+dev_info
+  NULL 0ns, 512b
+vers_1 4.1, "ADVANTECH", "COMpad-32/85", "1.0"
+funcid serial_port [post]
+config base 0x0100 mask 0x0003 last_index 0x05
+cftable_entry 0x01 [default]
+  [mwait]
+  io 0x02e8-0x02ef, 0x03e8-0x03ef [lines=10] [8bit] [range]
+  irq mask 0x9eb8 [level]
+cftable_entry 0x02
+  io 0x0330-0x033f [lines=10] [8bit] [range]
+cftable_entry 0x03
+  io 0x0340-0x034f [lines=10] [8bit] [range]
+cftable_entry 0x04
+  io 0x0350-0x035f [lines=10] [8bit] [range]
+cftable_entry 0x05
+  io 0x0360-0x036f [lines=10] [8bit] [range]
firmware/cis/src/COMpad4.cis new file +14 -0
new file mode 100644
index 0000000..325991c
@@ -0,0 +1,14 @@
+#
+# Replacement CIS for Advantech COMpad-32/85B-4
+#
+dev_info
+  NULL 0ns, 512b
+vers_1 4.1, "ADVANTECH", "COMpad-32/85B-4"
+funcid serial_port [post]
+config base 0x0100 mask 0x0001 last_index 0x02
+cftable_entry 0x01 [default]
+  [mwait]
+  io 0x0240-0x025f [lines=10] [8bit] [range]
+  irq mask 0x9eb8 [level]
+cftable_entry 0x02
+  io 0x0340-0x035f [lines=10] [8bit] [range]
firmware/cis/src/DP83903.cis new file +24 -0
new file mode 100644
index 0000000..ce86f45
@@ -0,0 +1,24 @@
+#
+# This CIS is for cards based on the National Semiconductor
+# DP83903 Multiple Function Interface Chip
+#
+vers_1 4.1, "Multifunction Card", "", "", "NSC MF LAN/Modem"
+manfid 0x0175, 0x0000
+funcid 0
+
+mfc {
+  funcid network_adapter
+  config base 0x1020 mask 0x277 last_index 0x17
+  cftable_entry 0x17
+    Vcc Vnom 5V
+    irq mask 0xffff [level]
+    io  0x0000-0x001f [8bit] [16bit]
+    memory 0x0000-0x3fff @ 0x0000
+}, {
+  funcid serial_port
+  config base 0x1040 mask 0x0277 last_index 0x07
+  cftable_entry 0x07
+    Vcc Vnom 5V
+    irq mask 0xffff [level]
+    io  0x0000-0x0007 [8bit]
+}
firmware/cis/src/LA-PCM.cis new file +44 -0

44 lines not on this page · raw message

firmware/cis/src/MT5634ZLX.cis new file +18 -0
new file mode 100644
index 0000000..52249b3
@@ -0,0 +1,18 @@
+#
+# Replacement CIS for Multitech MT5634ZLX modems
+#
+dev_info no_info
+vers_1 4.1, "MultiTech", "PCMCIA 56K DataFax"
+manfid 0x0200, 0x0001
+funcid serial_port
+config base 0xff80 mask 0x0067 last_index 0x27
+cftable_entry 0x0f [default]
+  [rdybsy] [audio] [pwrdown]
+  Vcc Vnom 5V Vpp1 Vnom 5V Vpp2 Vnom 5V
+  io 0x03f8-0x03ff [lines=10] [8bit]
+cftable_entry 0x17
+  io 0x02f8-0x02ff [lines=10] [8bit]
+cftable_entry 0x1f
+  io 0x03e8-0x03ef [lines=10] [8bit]
+cftable_entry 0x27
+  io 0x02e8-0x02ef [lines=10] [8bit]
firmware/cis/src/NE2K.cis new file +10 -0
new file mode 100644
index 0000000..d1d47f3
@@ -0,0 +1,10 @@
+#
+# Replacement CIS for various busted NE2000-compatible cards
+#
+vers_1 4.1, "PCMCIA", "Ethernet"
+funcid network_adapter
+config base 0x03f8 mask 0x03 last_index 0x20
+cftable_entry 0x20 [default]
+  Vcc Vnom 5V
+  irq mask 0xffff [level]
+  io 0x0000-0x001f [8bit] [16bit]
firmware/cis/src/PCMLM28.cis new file +37 -0
new file mode 100644
index 0000000..39c6d16
@@ -0,0 +1,37 @@
+#
+# The on-card CIS says it is MFC-compliant, but it is not
+#
+vers_1 4.1, "LINKSYS", "PCMLM28"
+manfid 0x0143, 0xc0ab
+funcid 0
+config base 0x03f8 mask 0x03 last_index 0x2f
+
+cftable_entry 0x24 [default]
+  Vcc Vnom 5V
+  irq mask 0xffff [level]
+  io 0x0300-0x031f, 0x02f8-0x02ff [8bit] [16bit]
+
+cftable_entry 0x25
+  io 0x0320-0x033f, 0x02f8-0x02ff [8bit] [16bit]
+cftable_entry 0x26
+  io 0x0340-0x035f, 0x02f8-0x02ff [8bit] [16bit]
+cftable_entry 0x27
+  io 0x0360-0x037f, 0x02f8-0x02ff [8bit] [16bit]
+
+cftable_entry 0x28
+  io 0x0300-0x031f, 0x03e8-0x03ef [8bit] [16bit]
+cftable_entry 0x29
+  io 0x0320-0x033f, 0x03e8-0x03ef [8bit] [16bit]
+cftable_entry 0x2a
+  io 0x0340-0x035f, 0x03e8-0x03ef [8bit] [16bit]
+cftable_entry 0x2b
+  io 0x0360-0x037f, 0x03e8-0x03ef [8bit] [16bit]
+
+cftable_entry 0x2c
+  io 0x0300-0x031f, 0x02e8-0x02ef [8bit] [16bit]
+cftable_entry 0x2d
+  io 0x0320-0x033f, 0x02e8-0x02ef [8bit] [16bit]
+cftable_entry 0x2e
+  io 0x0340-0x035f, 0x02e8-0x02ef [8bit] [16bit]
+cftable_entry 0x2f
+  io 0x0360-0x037f, 0x02e8-0x02ef [8bit] [16bit]
firmware/cis/src/PE-200.cis new file +11 -0
new file mode 100644
index 0000000..7db7494
@@ -0,0 +1,11 @@
+#
+# Replacement CIS for PE-200 ethernet card
+#
+vers_1 4.1, "PMX   ", "PE-200", "ETHERNET", "R01"
+funcid network_adapter [post] [rom]
+config base 0x0100 mask 0x0001 last_index 0x01
+cftable_entry 0x1 [default]
+  [mwait]
+  Vcc Vnom 5V
+  irq mask 0xffff [level]
+  io 0x0000-0x000f, 0x0010-0x001f [8bit] [16bit]
firmware/cis/src/PE520.cis new file +11 -0
new file mode 100644
index 0000000..fb411ab
@@ -0,0 +1,11 @@
+#
+# Replacement CIS for LanPro EP-4000A ethernet card
+#
+vers_1 4.1, "KTI", "PE520 PLUS", "PCMCIA Ethernet"
+manfid 0x0161, 0x0010
+funcid network_adapter
+config base 0x0fd0 mask 0x0b last_index 0x01
+cftable_entry 0x01 [default]
+  Vcc Vnom 5V
+  irq mask 0xffff [level]
+  io 0x0000-0x001f [8bit] [16bit]
firmware/cis/src/RS-COM-2P.cis new file +14 -0
new file mode 100644
index 0000000..2e385cb
@@ -0,0 +1,14 @@
+#
+# Replacement CIS for dual-serial-port IO card
+#
+vers_1 4.1, "PCMCIA", "RS-COM 2P"
+funcid serial_port [post]
+config base 0x0100 mask 0x0001 last_index 0x03
+cftable_entry 0x01 [default]
+  [mwait]
+  io 0x03e8-0x03ef, 0x02e8-0x02ef [lines=10] [8bit] [range]
+  irq mask 0x9eb8 [level]
+cftable_entry 0x02
+  io 0x0250-0x0257, 0x0258-0x025f [lines=10] [8bit] [range]
+cftable_entry 0x03
+  io 0x0260-0x0267, 0x0268-0x026f [lines=10] [8bit] [range]
firmware/cis/src/tamarack.cis new file +17 -0
new file mode 100644
index 0000000..8802694
@@ -0,0 +1,17 @@
+#
+# Replacement CIS for Surecom, Tamarack NE2000 cards
+#
+dev_info
+  fn_specific 100ns, 512b
+attr_dev_info
+  EEPROM 250ns, 512b
+vers_1 4.1, "TAMARACK", "Ethernet", "A", "004743118001"
+funcid network_adapter
+config base 0x03f8 mask 0x0003 last_index 0x20
+cftable_entry 0x20 [default]
+  [mwait]
+  Vcc Vnom 5V Vmin 4500mV Vmax 5500mV Istatic 100mA
+    Iavg 170mA Ipeak 200mA
+  timing wait 15us
+  io 0x0000-0x000f, 0x0010-0x001f [lines=5] [8bit] [16bit]
+  irq mask 0xffff [level]
Signature · 1 line
1.6.6.2