2010-08-18 09:54:56

by Cong Wang

[permalink] [raw]
Subject: [RFC Patch] netxen: remove firmware exports


netxen_nic driver can store firmwares on flash, and get them porperly and
dynamically, so the firmwares may not appear in /lib/firmware/. However, netxen_nic
still exports these firmwares via modinfo, this makes our script which parses
modinfo output fail.

Probably netxen_nic has other way to export these firmwares, but not like other
modules in a stardand way. I think we can just remove these exports, but
I am not sure.

Signed-off-by: WANG Cong <[email protected]>
Cc: Amit Kumar Salecha <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Dhananjay Phadke <[email protected]>
Cc: Narender Kumar <[email protected]>

---
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index fd86e18..e8443af 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -41,10 +41,6 @@
MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Converged Ethernet Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);
-MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_UNIFIED_ROMIMAGE_NAME);

char netxen_nic_driver_name[] = "netxen_nic";
static char netxen_nic_driver_string[] = "QLogic/NetXen Network Driver v"


2010-08-18 11:04:49

by Amit Salecha

[permalink] [raw]
Subject: RE: [RFC Patch] netxen: remove firmware exports

If problem is firmware files are not present in /lib/firmware.
Then we can work with David Woodhouse and make these firmware available in /lib/firmware.

-----Original Message-----
From: Amerigo Wang [mailto:[email protected]]
Sent: Wednesday, August 18, 2010 3:25 PM
To: [email protected]
Cc: Dhananjay Phadke; Amit Salecha; Narender Kumar; [email protected]; David S. Miller; Amerigo Wang
Subject: [RFC Patch] netxen: remove firmware exports


netxen_nic driver can store firmwares on flash, and get them porperly and
dynamically, so the firmwares may not appear in /lib/firmware/. However, netxen_nic
still exports these firmwares via modinfo, this makes our script which parses
modinfo output fail.

Probably netxen_nic has other way to export these firmwares, but not like other
modules in a stardand way. I think we can just remove these exports, but
I am not sure.

Signed-off-by: WANG Cong <[email protected]>
Cc: Amit Kumar Salecha <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Dhananjay Phadke <[email protected]>
Cc: Narender Kumar <[email protected]>

---
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index fd86e18..e8443af 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -41,10 +41,6 @@
MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Converged Ethernet Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);
-MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_UNIFIED_ROMIMAGE_NAME);

char netxen_nic_driver_name[] = "netxen_nic";
static char netxen_nic_driver_string[] = "QLogic/NetXen Network Driver v"

2010-08-18 13:14:55

by Cong Wang

[permalink] [raw]
Subject: Re: [RFC Patch] netxen: remove firmware exports

On 08/18/10 19:04, Amit Salecha wrote:
> If problem is firmware files are not present in /lib/firmware.
> Then we can work with David Woodhouse and make these firmware available in /lib/firmware.
>

Oh, I thought we did this intentionally.
That would be nice then, please go ahead.

Thanks!

--
The opposite of love is not hate, it's indifference.
- Elie Wiesel

2010-08-18 13:19:54

by Amit Salecha

[permalink] [raw]
Subject: RE: [RFC Patch] netxen: remove firmware exports

> Then we can work with David Woodhouse and make these firmware available in /lib/firmware
>
Actually I was not updated, NX_UNIFIED_ROMIMAGE_NAME (phanfw.bin) is already submitted and its present in linux-firmware.git.

I will get back to you on NX_P2_MN_ROMIMAGE_NAME, NX_P3_CT_ROMIMAGE_NAME and NX_P3_MN_ROMIMAGE_NAME.
Whether this will be submitted ?

-----Original Message-----
From: Cong Wang [mailto:[email protected]]
Sent: Wednesday, August 18, 2010 6:49 PM
To: Amit Salecha
Cc: [email protected]; Dhananjay Phadke; Narender Kumar; [email protected]; David S. Miller; Ameen Rahman
Subject: Re: [RFC Patch] netxen: remove firmware exports

On 08/18/10 19:04, Amit Salecha wrote:
> If problem is firmware files are not present in /lib/firmware.
> Then we can work with David Woodhouse and make these firmware available in /lib/firmware.
>

Oh, I thought we did this intentionally.
That would be nice then, please go ahead.

Thanks!

--
The opposite of love is not hate, it's indifference.
- Elie Wiesel

2010-08-18 13:36:02

by Cong Wang

[permalink] [raw]
Subject: Re: [RFC Patch] netxen: remove firmware exports

On 08/18/10 21:19, Amit Salecha wrote:
>> Then we can work with David Woodhouse and make these firmware available in /lib/firmware
>>
> Actually I was not updated, NX_UNIFIED_ROMIMAGE_NAME (phanfw.bin) is already submitted and its present in linux-firmware.git.
>

Good.

> I will get back to you on NX_P2_MN_ROMIMAGE_NAME, NX_P3_CT_ROMIMAGE_NAME and NX_P3_MN_ROMIMAGE_NAME.
> Whether this will be submitted ?
>

Ok, thanks a lot!


--
The opposite of love is not hate, it's indifference.
- Elie Wiesel

2010-08-19 09:13:03

by Amit Salecha

[permalink] [raw]
Subject: RE: [RFC Patch] netxen: remove firmware exports

> netxen_nic driver can store firmwares on flash, and get them porperly and
> dynamically, so the firmwares may not appear in /lib/firmware/. However, netxen_nic
> still exports these firmwares via modinfo, this makes our script which parses
> modinfo output fail.

NX_UNIFIED_ROMIMAGE_NAME(phanfw.bin) is already submitted and we won't submit any other fw files.

> -MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME);
> -MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME);
> -MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME);

It's not compulsory to submit firmware files which are exported (MODULE_FIRMWARE).
I am leaving this upto David to decide about this patch.

-Amit

-----Original Message-----
From: Amerigo Wang [mailto:[email protected]]
Sent: Wednesday, August 18, 2010 3:25 PM
To: [email protected]
Cc: Dhananjay Phadke; Amit Salecha; Narender Kumar; [email protected]; David S. Miller; Amerigo Wang
Subject: [RFC Patch] netxen: remove firmware exports


netxen_nic driver can store firmwares on flash, and get them porperly and
dynamically, so the firmwares may not appear in /lib/firmware/. However, netxen_nic
still exports these firmwares via modinfo, this makes our script which parses
modinfo output fail.

Probably netxen_nic has other way to export these firmwares, but not like other
modules in a stardand way. I think we can just remove these exports, but
I am not sure.

Signed-off-by: WANG Cong <[email protected]>
Cc: Amit Kumar Salecha <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Dhananjay Phadke <[email protected]>
Cc: Narender Kumar <[email protected]>

---
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index fd86e18..e8443af 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -41,10 +41,6 @@
MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Converged Ethernet Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);
-MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_UNIFIED_ROMIMAGE_NAME);

char netxen_nic_driver_name[] = "netxen_nic";
static char netxen_nic_driver_string[] = "QLogic/NetXen Network Driver v"

2010-08-20 08:48:05

by Cong Wang

[permalink] [raw]
Subject: Re: [RFC Patch] netxen: remove firmware exports

On 08/19/10 17:12, Amit Salecha wrote:
>> netxen_nic driver can store firmwares on flash, and get them porperly and
>> dynamically, so the firmwares may not appear in /lib/firmware/. However, netxen_nic
>> still exports these firmwares via modinfo, this makes our script which parses
>> modinfo output fail.
>
> NX_UNIFIED_ROMIMAGE_NAME(phanfw.bin) is already submitted and we won't submit any other fw files.
>
>> -MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME);
>> -MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME);
>> -MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME);
>
> It's not compulsory to submit firmware files which are exported (MODULE_FIRMWARE).
> I am leaving this upto David to decide about this patch.
>

Okay. David, do you want me to submit an updated patch?

Thanks!

--
The opposite of love is not hate, it's indifference.
- Elie Wiesel

2010-08-20 08:54:06

by Amit Salecha

[permalink] [raw]
Subject: RE: [RFC Patch] netxen: remove firmware exports

> Okay. David, do you want me to submit an updated patch?

You have to submit updated patch.

-Amit

> -----Original Message-----
> From: Cong Wang [mailto:[email protected]]
> Sent: Friday, August 20, 2010 2:22 PM
> To: Amit Salecha
> Cc: [email protected]; David S. Miller; Dhananjay Phadke;
> Narender Kumar; [email protected]
> Subject: Re: [RFC Patch] netxen: remove firmware exports
>
> On 08/19/10 17:12, Amit Salecha wrote:
> >> netxen_nic driver can store firmwares on flash, and get them
> porperly and
> >> dynamically, so the firmwares may not appear in /lib/firmware/.
> However, netxen_nic
> >> still exports these firmwares via modinfo, this makes our script
> which parses
> >> modinfo output fail.
> >
> > NX_UNIFIED_ROMIMAGE_NAME(phanfw.bin) is already submitted and we
> won't submit any other fw files.
> >
> >> -MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME);
> >> -MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME);
> >> -MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME);
> >
> > It's not compulsory to submit firmware files which are exported
> (MODULE_FIRMWARE).
> > I am leaving this upto David to decide about this patch.
> >
>
> Okay. David, do you want me to submit an updated patch?
>
> Thanks!
>
> --
> The opposite of love is not hate, it's indifference.
> - Elie Wiesel

2010-08-20 09:00:49

by Cong Wang

[permalink] [raw]
Subject: Re: [RFC Patch] netxen: remove firmware exports

On 08/19/10 17:12, Amit Salecha wrote:
> NX_UNIFIED_ROMIMAGE_NAME(phanfw.bin) is already submitted and we won't submit any other fw files.

Based on above, remove the rest firmware exports.

Thanks!

--
Signed-off-by: WANG Cong <[email protected]>


Attachments:
drivers-net-netxen-remove-firmwares.diff (586.00 B)