From: Dan Williams <dcbw@redhat.com>
To: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH kernel 2.6.32-rc5] pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card
Date: Wed, 21 Oct 2009 12:18:06 -0700 [thread overview]
Message-ID: <1256152686.8469.34.camel@localhost.localdomain> (raw)
In-Reply-To: <20091018103920.ca9217ee.ken_kawasaki@spring.nifty.jp>
On Sun, 2009-10-18 at 10:39 +0900, Ken Kawasaki wrote:
> pcnet_cs,serial_cs:
>
> add cis of PreMax ethernet pcmcia card,
> and some Sierra Wireless serial card(AC555, AC7xx, AC8xx).
Random question: are CIS files copyrightable? What exactly do they
contain, just updates to the the CIS data on the card itself that the
manufacturer forgot to burn before shipping the card?
Also, I've got a Sierra AC860 here that reports as "prod_id(2):
"AC860"", and has the same manf_id (0x0192) and card_id (0x710) as the
AC850.
manf_id: 0x0192 card_id: 0x0710
function: 6 (network)
prod_id(1): "Sierra Wireless" (0xd85f6206)
prod_id(2): "AC860" (0x698f93db)
prod_id(3): "3G Network Adapter" (0xab3c6f47)
prod_id(4): "R1" (0xd9533fec)
It currently requests the 7xx CIS file because there isn't a specific
check for it in the driver and it uses the default 7xx manfid/prodid,
should I submit something like:
+ PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC860", 0xd85f6206, 0x698f93db, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC860 3G Network Adapter R1 */
?
Dan
> use PROD_ID for AC7xx, because MANF_ID of AC7xx and AC8xx are the same.
>
>
> Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
>
> ---
>
> drivers/net/pcmcia/pcnet_cs.c | 2 +-
> drivers/serial/serial_cs.c | 8 ++++----
> firmware/Makefile | 6 ++++--
> firmware/WHENCE | 4 ++++
> firmware/cis/PE-200.cis.ihex | 9 +++++++++
> firmware/cis/SW_555_SER.cis.ihex | 12 ++++++++++++
> firmware/cis/SW_7xx_SER.cis.ihex | 13 +++++++++++++
> firmware/cis/SW_8xx_SER.cis.ihex | 13 +++++++++++++
> 8 files changed, 60 insertions(+), 7 deletions(-)
>
> diff -urpN linux-2.6.32-rc5.orig/drivers/net/pcmcia/pcnet_cs.c linux-2.6.32-rc5/drivers/net/pcmcia/pcnet_cs.c
> --- linux-2.6.32-rc5.orig/drivers/net/pcmcia/pcnet_cs.c 2009-10-17 15:53:44.000000000 +0900
> +++ linux-2.6.32-rc5/drivers/net/pcmcia/pcnet_cs.c 2009-10-17 16:07:12.000000000 +0900
> @@ -1760,7 +1760,7 @@ static struct pcmcia_device_id pcnet_ids
> PCMCIA_DEVICE_CIS_MANF_CARD(0xc00f, 0x0002, "cis/LA-PCM.cis"),
> PCMCIA_DEVICE_CIS_PROD_ID12("KTI", "PE520 PLUS", 0xad180345, 0x9d58d392, "PE520.cis"),
> PCMCIA_DEVICE_CIS_PROD_ID12("NDC", "Ethernet", 0x01c43ae1, 0x00b2e941, "cis/NE2K.cis"),
> - PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "PE-200.cis"),
> + PCMCIA_DEVICE_CIS_PROD_ID12("PMX ", "PE-200", 0x34f3f1c8, 0x10b59f8c, "cis/PE-200.cis"),
> PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "cis/tamarack.cis"),
> PCMCIA_DEVICE_PROD_ID12("Ethernet", "CF Size PC Card", 0x00b2e941, 0x43ac239b),
> PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0",
> diff -urpN linux-2.6.32-rc5.orig/drivers/serial/serial_cs.c linux-2.6.32-rc5/drivers/serial/serial_cs.c
> --- linux-2.6.32-rc5.orig/drivers/serial/serial_cs.c 2009-10-17 15:53:45.000000000 +0900
> +++ linux-2.6.32-rc5/drivers/serial/serial_cs.c 2009-10-17 16:02:50.000000000 +0900
> @@ -879,10 +879,10 @@ static struct pcmcia_device_id serial_id
> PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0175, 0x0000, "cis/DP83903.cis"),
> PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x0035, "cis/3CXEM556.cis"),
> PCMCIA_MFC_DEVICE_CIS_MANF_CARD(1, 0x0101, 0x003d, "cis/3CXEM556.cis"),
> - PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "SW_8xx_SER.cis"), /* Sierra Wireless AC850 3G Network Adapter R1 */
> - PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0x0710, "SW_7xx_SER.cis"), /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */
> - PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
> - PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
> + PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC850", 0xd85f6206, 0x42a2c018, "cis/SW_8xx_SER.cis"), /* Sierra Wireless AC850 3G Network Adapter R1 */
> + PCMCIA_DEVICE_CIS_PROD_ID12("Sierra Wireless", "AC710/AC750", 0xd85f6206, 0x761b11e0, "cis/SW_7xx_SER.cis"), /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */
> + PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "cis/SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
> + PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "cis/SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
> PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"),
> PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "cis/COMpad2.cis"),
> PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "cis/COMpad4.cis"),
> diff -urpN linux-2.6.32-rc5.orig/firmware/cis/PE-200.cis.ihex linux-2.6.32-rc5/firmware/cis/PE-200.cis.ihex
> --- linux-2.6.32-rc5.orig/firmware/cis/PE-200.cis.ihex 1970-01-01 09:00:00.000000000 +0900
> +++ linux-2.6.32-rc5/firmware/cis/PE-200.cis.ihex 2009-10-17 16:13:21.000000000 +0900
> @@ -0,0 +1,9 @@
> +:1000000001030000FF151E0401504D582020200060
> +:1000100050452D3230300045544845524E4554002D
> +:1000200052303100FF210206031A050101000101CF
> +:100030001B0EC181190155E051000F100F30FFFF59
> +:040040001400FF00A9
> +:00000001FF
> +#
> +# Replacement CIS for PE-200 ethernet card
> +#
> diff -urpN linux-2.6.32-rc5.orig/firmware/cis/SW_555_SER.cis.ihex linux-2.6.32-rc5/firmware/cis/SW_555_SER.cis.ihex
> --- linux-2.6.32-rc5.orig/firmware/cis/SW_555_SER.cis.ihex 1970-01-01 09:00:00.000000000 +0900
> +++ linux-2.6.32-rc5/firmware/cis/SW_555_SER.cis.ihex 2009-10-17 16:12:47.000000000 +0900
> @@ -0,0 +1,12 @@
> +:100000000101FF17034100FF20043F0110072102F7
> +:100010000200152A070053696572726120576972E0
> +:10002000656C657373004169724361726420353594
> +:1000300035004135353500526576203100FF1A050F
> +:1000400001030007731B0BE00118A360F8030730DE
> +:10005000BC3F1B08A10108A360F802071B08A2010E
> +:1000600008A360E803071B08A30108A360E80207D0
> +:0A0070001B04A40108231400FF0084
> +:00000001FF
> +#
> +# Replacement CIS for AC555 provided by Sierra Wireless
> +#
> diff -urpN linux-2.6.32-rc5.orig/firmware/cis/SW_7xx_SER.cis.ihex linux-2.6.32-rc5/firmware/cis/SW_7xx_SER.cis.ihex
> --- linux-2.6.32-rc5.orig/firmware/cis/SW_7xx_SER.cis.ihex 1970-01-01 09:00:00.000000000 +0900
> +++ linux-2.6.32-rc5/firmware/cis/SW_7xx_SER.cis.ihex 2009-10-17 16:12:47.000000000 +0900
> @@ -0,0 +1,13 @@
> +:100000000101FF17034100FF2004920110072102A4
> +:1000100002001537070053696572726120576972D3
> +:10002000656C6573730041433731302F4143373579
> +:10003000300047505253204E6574776F726B2041E9
> +:1000400064617074657200523100FF1A050103008B
> +:1000500007731B10E00119784D555D25A360F80367
> +:100060000730BC861B08A10108A360F802071B0823
> +:10007000A20108A360E803071B08A30108A360E826
> +:0C00800002071B04A40108231400FF0069
> +:00000001FF
> +#
> +# Replacement CIS for AC7xx provided by Sierra Wireless
> +#
> diff -urpN linux-2.6.32-rc5.orig/firmware/cis/SW_8xx_SER.cis.ihex linux-2.6.32-rc5/firmware/cis/SW_8xx_SER.cis.ihex
> --- linux-2.6.32-rc5.orig/firmware/cis/SW_8xx_SER.cis.ihex 1970-01-01 09:00:00.000000000 +0900
> +++ linux-2.6.32-rc5/firmware/cis/SW_8xx_SER.cis.ihex 2009-10-17 16:12:47.000000000 +0900
> @@ -0,0 +1,13 @@
> +:100000000101FF17034100FF2004920110072102A4
> +:100010000200152F070053696572726120576972DB
> +:10002000656C657373004143383530003347204EAB
> +:100030006574776F726B20416461707465720052F1
> +:100040003100FF1A0501030007731B10E001197846
> +:100050004D555D25A360F8480730BC861B08A101FB
> +:1000600008A360F847071B08A20108A360E8480737
> +:100070001B08A30108A360E847071B04A401082389
> +:040080001400FF0069
> +:00000001FF
> +#
> +# Replacement CIS for AC8xx provided by Sierra Wireless
> +#
> diff -urpN linux-2.6.32-rc5.orig/firmware/Makefile linux-2.6.32-rc5/firmware/Makefile
> --- linux-2.6.32-rc5.orig/firmware/Makefile 2009-10-17 15:53:52.000000000 +0900
> +++ linux-2.6.32-rc5/firmware/Makefile 2009-10-17 16:12:21.000000000 +0900
> @@ -69,11 +69,13 @@ fw-shipped-$(CONFIG_E100) += e100/d101m_
> fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
> fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
> cis/DP83903.cis cis/NE2K.cis \
> - cis/tamarack.cis
> + cis/tamarack.cis cis/PE-200.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/COMpad2.cis cis/COMpad4.cis \
> + cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
> + cis/SW_8xx_SER.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
> diff -urpN linux-2.6.32-rc5.orig/firmware/WHENCE linux-2.6.32-rc5/firmware/WHENCE
> --- linux-2.6.32-rc5.orig/firmware/WHENCE 2009-10-17 15:53:52.000000000 +0900
> +++ linux-2.6.32-rc5/firmware/WHENCE 2009-10-17 16:12:04.000000000 +0900
> @@ -600,6 +600,7 @@ File: cis/LA-PCM.cis
> cis/DP83903.cis
> cis/NE2K.cis
> cis/tamarack.cis
> + cis/PE-200.cis
>
> Licence: GPL
>
> @@ -633,6 +634,9 @@ 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
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2009-10-21 19:18 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-05 0:49 [PATCH] axnet_cs: fix phy_id detection for bogus Asix chip Ken Kawasaki
2009-04-07 0:42 ` David Miller
2009-04-18 23:44 ` [PATCH] pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM Ken Kawasaki
2009-04-26 7:29 ` [PATCH] 3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card Ken Kawasaki
2009-04-26 13:33 ` Ben Hutchings
2009-04-27 12:48 ` Ken Kawasaki
2009-09-12 22:22 ` [PATCH] pcnet_cs: add cis of Linksys " Ken Kawasaki
2009-09-21 4:10 ` [PATCH kernel 2.6.31-git9] 3c574_cs: spin_lock the set_multicast_list function Ken Kawasaki
2009-09-13 8:22 ` [PATCH kernel 2.6.31] pcnet_cs: add cis of Linksys multifunction pcmcia card Ken Kawasaki
2009-09-15 9:42 ` David Miller
2009-10-03 22:32 ` [PATCH kernel 2.6.32-rc1] pcnet_cs: add cis of National Semicondoctor's " Ken Kawasaki
2009-10-05 7:40 ` David Miller
2009-10-11 12:12 ` [PATCH kernel 2.6.32-rc3] 3c574_cs: spin_lock the set_multicast_list function Ken Kawasaki
2009-10-13 7:33 ` David Miller
2009-10-18 1:39 ` [PATCH kernel 2.6.32-rc5] pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card Ken Kawasaki
2009-10-21 19:18 ` Dan Williams [this message]
2009-10-22 11:10 ` Ken Kawasaki
2009-10-24 20:33 ` Ben Hutchings
2009-10-30 5:51 ` David Miller
2009-12-21 11:58 ` [PATCH kernel 2.6.33-rc1] pcnet_cs: add cis of KTI PE520 pcmcia network card Ken Kawasaki
2009-12-23 2:50 ` Ben Hutchings
2009-12-23 8:05 ` Ken Kawasaki
2010-01-04 5:42 ` David Miller
2009-12-23 8:10 ` [PATCH kernel 2.6.33-rc1 updated] " Ken Kawasaki
2009-12-29 1:17 ` [PATCH kernel 2.6.33-rc2] axnet_cs: remove unnecessary spin_unlock_irqrestore Ken Kawasaki
2010-01-04 5:52 ` David Miller
2010-01-04 11:34 ` [PATCH kernel 2.6.33-rc1 v3] pcnet_cs: add cis of KTI PE520 pcmcia network card Ken Kawasaki
2010-01-07 4:38 ` David Miller
2010-01-22 21:56 ` [PATCH kernel 2.6.33-rc5] fmvj18x_cs: add new id (Panasonic lan & modem card) Ken Kawasaki
2010-02-27 23:34 ` [PATCH kernel 2.6.33] axnet_cs: add new id Ken Kawasaki
2010-02-28 9:03 ` David Miller
2010-03-27 20:55 ` [PATCH kernel 2.6.34-rc2] pcnet_cs: " Ken Kawasaki
2010-03-27 23:56 ` David Miller
2010-04-03 21:14 ` [PATCH kernel 2.6.34-rc3] smc91c92_cs: fix the problem of "Unable to find hardware address" Ken Kawasaki
2010-04-03 22:07 ` David Miller
2010-04-10 22:50 ` [PATCH kernel 2.6.34-rc3-git9] smc91c92_cs: define multicast_table as unsigned char Ken Kawasaki
2010-04-13 10:09 ` David Miller
2010-04-24 20:37 ` [PATCH kernel 2.6.34-rc5] smc91c92_cs: spin_unlock_irqrestore before calling smc_interrupt() Ken Kawasaki
2010-04-27 21:47 ` David Miller
2010-06-12 10:17 ` [PATCH kernel 2.6.35-rc2] pcnet_cs: add new id (TOSHIBA Modem/LAN Card) Ken Kawasaki
2010-06-17 1:11 ` David Miller
2010-06-20 1:24 ` [PATCH kernel 2.6.35-rc3] smc91c92_cs: fix the problem that lan & modem does not work simultaneously Ken Kawasaki
2010-06-26 4:32 ` David Miller
2010-07-06 11:22 ` [PATCH kernel 2.6.35-rc3-git7] axnet_cs: local_irq_save before calling ei_irq_wrapper Ken Kawasaki
2010-07-07 21:51 ` David Miller
2010-07-10 11:18 ` [PATCH kernel 2.6.35-rc3-git7] axnet_cs: use spin_lock_irqsave in ax_interrupt Ken Kawasaki
2010-07-11 2:46 ` Ben Hutchings
2010-07-11 2:49 ` David Miller
2010-07-11 3:12 ` Ben Hutchings
2010-07-13 3:08 ` David Miller
2010-08-28 22:45 ` [PATCH kernel 2.6.36-rc2] pcnet_cs: add new_id Ken Kawasaki
2010-08-28 23:07 ` David Miller
2010-10-29 22:17 ` [PATCH kernel 2.6.36-git10] " Ken Kawasaki
2010-10-30 23:49 ` David Miller
2010-11-06 15:11 ` [PATCH kernel 2.6.37-rc1] axnet_cs: fix resume problem for some Ax88790 chip Ken Kawasaki
2010-11-12 22:01 ` David Miller
2010-11-13 23:42 ` [PATCH kernel 2.6.37-rc1]ipg.c: remove id [SUNDANCE, 0x1021] Ken Kawasaki
2010-11-18 18:45 ` David Miller
2010-12-13 12:27 ` [PATCH kernel 2.6.37-rc5] axnet_cs: move id (0x1bf, 0x2328) to axnet_cs Ken Kawasaki
2010-12-16 20:39 ` David Miller
2011-01-11 11:55 ` [PATCH kernel 2.6.37] pcnet_cs: add new_id Ken Kawasaki
2011-01-11 22:04 ` David Miller
2011-01-30 21:16 ` [PATCH kernel 2.6.38rc2-git7] axnet_cs: reduce delay time at ei_rx_overrun Ken Kawasaki
2011-02-01 4:53 ` David Miller
2011-02-20 15:07 ` [PATCH kernel 2.6.38-rc5] fmvj18x_cs: add new id Ken Kawasaki
2011-02-28 20:06 ` David Miller
2011-06-04 23:20 ` [PATCH kernel 3.0-rc1] smc91c92_cs: set smc->base to NULL before iounmap Ken Kawasaki
2011-06-05 21:38 ` David Miller
2011-06-07 12:01 ` Ken Kawasaki
2009-12-13 0:44 ` [PATCH kernel 2.6.32-git7] 3c574_cs: disable irq before calling el3_interrupt Ken Kawasaki
2009-12-14 3:48 ` David Miller
2010-03-06 22:02 ` [PATCH kernel 2.6.33-git11] lib8390: use spin_lock_irqsave for locking Ken Kawasaki
2010-05-03 10:43 ` [PATCH kernel 2.6.34-rc5] lib8390: to be SMP safe Ken Kawasaki
2010-05-06 20:47 ` Ken Kawasaki
2009-04-27 12:50 ` [PATCH] 3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card Ken Kawasaki
2009-05-02 2:22 ` David Miller
2009-06-28 0:09 ` [PATCH] pcnet_cs: add new id (RIOS System PC CARD3 ETHERNET) Ken Kawasaki
2009-06-30 14:19 ` [PATCH] pcnet_cs: add new id David Miller
2009-07-05 8:34 ` Ken Kawasaki
2009-07-05 0:17 ` Ken Kawasaki
2009-07-06 2:02 ` David Miller
2009-07-05 0:19 ` [PATCH] pcnet_cs: add odd location support for write_asic function Ken Kawasaki
2009-07-08 12:09 ` Ken Kawasaki
2009-07-08 17:38 ` David Miller
2009-07-11 0:02 ` Ken Kawasaki
2009-07-11 3:26 ` David Miller
2009-07-11 22:15 ` Ken Kawasaki
2009-07-19 23:08 ` [PATCH] 3c589_cs: re-initialize the multicast in the tc589_reset Ken Kawasaki
2009-07-20 15:29 ` David Miller
2009-07-22 12:23 ` Ken Kawasaki
2009-10-25 2:10 [PATCH kernel 2.6.32-rc5] pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card Ken Kawasaki
2009-10-25 2:13 ` Ben Hutchings
2010-03-05 0:02 ` Ben Hutchings
2010-03-05 11:21 ` Ken Kawasaki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1256152686.8469.34.camel@localhost.localdomain \
--to=dcbw@redhat.com \
--cc=ken_kawasaki@spring.nifty.jp \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.