Re: [E1000-devel][PATCH]PM_QOS-to-use-handle-based-requests-network-update 3/5

[mark gross]

will do.

--mgross


On Tue, Dec 01, 2009 at 03:58:26PM -0800, Allan, Bruce W wrote:
> Thanks for doing this, but I have to NAK the e1000e changes as-is.  Please resubmit against net-next-2.6 as there is already a commit in that tree which conflicts with this patch.
> 
> >-----Original Message-----
> >From: mark gross [mailto:mgross@xxxxxxxxxxxxxxx]
> >Sent: Tuesday, December 01, 2009 1:33 PM
> >To: linux-pm
> >Cc: e1000-devel@xxxxxxxxxxxxxxxxxxxxx; lkml
> >Subject: [E1000-devel] [PATCH]PM_QOS-to-use-handle-based-requests-network-
> >update 3/5
> >
> >update to Ethernet driver dependencies on pm_qos WRT api change to use
> >handles instead of name strings.
> >
> >--mgross
> >
> >Signed-off-by: mark gross <mgross@xxxxxxxxxxxxxxx>
> >
> >
> >>From a72be3a717e474632cbb4281c5f3a433dfa2b0f8 Mon Sep 17 00:00:00 2001
> >From: mark gross <mgross@mgross-hp8510w.(none)>
> >Date: Tue, 1 Dec 2009 12:59:52 -0800
> >Subject: [PATCH 3/5] PM_QOS to use handle based requests network update
> >
> >---
> > drivers/net/e1000e/netdev.c |   13 ++++++-------
> > drivers/net/igbvf/netdev.c  |    5 +++--
> > 2 files changed, 9 insertions(+), 9 deletions(-)
> >
> >diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
> >index fad8f9e..755c884 100644
> >--- a/drivers/net/e1000e/netdev.c
> >+++ b/drivers/net/e1000e/netdev.c
> >@@ -51,6 +51,7 @@
> > #define DRV_VERSION "1.0.2-k2"
> > char e1000e_driver_name[] = "e1000e";
> > const char e1000e_driver_version[] = DRV_VERSION;
> >+struct pm_qos_request_list *e1000e_driver_pm_qos_req;
> >
> > static const struct e1000_info *e1000_info_tbl[] = {
> > 	[board_82571]		= &e1000_82571_info,
> >@@ -2516,11 +2517,9 @@ static void e1000_configure_rx(struct e1000_adapter
> >*adapter)
> > 		 * With jumbo frames and early-receive enabled, excessive
> > 		 * C4->C2 latencies result in dropped transactions.
> > 		 */
> >-		pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY,
> >-					  e1000e_driver_name, 55);
> >+		pm_qos_update_request(e1000e_driver_pm_qos_req, 55);
> > 	} else {
> >-		pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY,
> >-					  e1000e_driver_name,
> >+		pm_qos_update_request(e1000e_driver_pm_qos_req,
> > 					  PM_QOS_DEFAULT_VALUE);
> > 	}
> >
> >@@ -5417,8 +5416,8 @@ static int __init e1000_init_module(void)
> > 	printk(KERN_INFO "%s: Copyright (c) 1999-2008 Intel Corporation.\n",
> > 	       e1000e_driver_name);
> > 	ret = pci_register_driver(&e1000_driver);
> >-	pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, e1000e_driver_name,
> >-			       PM_QOS_DEFAULT_VALUE);
> >+	e1000e_driver_pm_qos_req = pm_qos_add_request(
> >+			PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE);
> >
> > 	return ret;
> > }
> >@@ -5433,7 +5432,7 @@ module_init(e1000_init_module);
> > static void __exit e1000_exit_module(void)
> > {
> > 	pci_unregister_driver(&e1000_driver);
> >-	pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
> >e1000e_driver_name);
> >+	pm_qos_remove_request(e1000e_driver_pm_qos_req);
> > }
> > module_exit(e1000_exit_module);
> >
> >diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
> >index 91024a3..0ba48d1 100644
> >--- a/drivers/net/igbvf/netdev.c
> >+++ b/drivers/net/igbvf/netdev.c
> >@@ -47,6 +47,7 @@
> > #define DRV_VERSION "1.0.0-k0"
> > char igbvf_driver_name[] = "igbvf";
> > const char igbvf_driver_version[] = DRV_VERSION;
> >+struct pm_qos_request_list *igbvf_driver_pm_qos_req;
> > static const char igbvf_driver_string[] =
> > 				"Intel(R) Virtual Function Network Driver";
> > static const char igbvf_copyright[] = "Copyright (c) 2009 Intel
> >Corporation.";
> >@@ -2881,7 +2882,7 @@ static int __init igbvf_init_module(void)
> > 	printk(KERN_INFO "%s\n", igbvf_copyright);
> >
> > 	ret = pci_register_driver(&igbvf_driver);
> >-	pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, igbvf_driver_name,
> >+	igbvf_driver_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
> > 	                       PM_QOS_DEFAULT_VALUE);
> >
> > 	return ret;
> >@@ -2897,7 +2898,7 @@ module_init(igbvf_init_module);
> > static void __exit igbvf_exit_module(void)
> > {
> > 	pci_unregister_driver(&igbvf_driver);
> >-	pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY,
> >igbvf_driver_name);
> >+	pm_qos_remove_request(igbvf_driver_pm_qos_req);
> > }
> > module_exit(igbvf_exit_module);
> >
> >--
> >1.6.3.3
> >
> >
> >--------------------------------------------------------------------------
> >----
> >Join us December 9, 2009 for the Red Hat Virtual Experience,
> >a free event focused on virtualization and cloud computing.
> >Attend in-depth sessions from your desk. Your couch. Anywhere.
> >http://p.sf.net/sfu/redhat-sfdev2dev
> >_______________________________________________
> >E1000-devel mailing list
> >E1000-devel@xxxxxxxxxxxxxxxxxxxxx
> >https://lists.sourceforge.net/lists/listinfo/e1000-devel
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/