Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2c65448 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

e1000e: Move pm_qos_req to e1000e adapter 



e1000e is the only driver requiring pm_qos_req, instead of causing
every device to waste up to 240 bytes. Allocate it for the specific
driver.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf890138

drivers/net/ethernet/intel/e1000e/e1000.h

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ struct e1000_adapter { 
	struct timecounter tc;

	struct ptp_clock *ptp_clock;

	struct ptp_clock_info ptp_clock_info;

	struct pm_qos_request pm_qos_req;



	u16 eee_advert;

};

drivers/net/ethernet/intel/e1000e/netdev.c

+4 −4
Original line number Diff line number Diff line
@@ -3297,9 +3297,9 @@ static void e1000_configure_rx(struct e1000_adapter *adapter) 
			ew32(RXDCTL(0), rxdctl | 0x3);

		}



		pm_qos_update_request(&adapter->netdev->pm_qos_req, lat);

		pm_qos_update_request(&adapter->pm_qos_req, lat);

	} else {

		pm_qos_update_request(&adapter->netdev->pm_qos_req,

		pm_qos_update_request(&adapter->pm_qos_req,

				      PM_QOS_DEFAULT_VALUE);

	}
@@ -4403,7 +4403,7 @@ static int e1000_open(struct net_device *netdev) 
		e1000_update_mng_vlan(adapter);



	/* DMA latency requirement to workaround jumbo issue */

	pm_qos_add_request(&adapter->netdev->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,

	pm_qos_add_request(&adapter->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,

			   PM_QOS_DEFAULT_VALUE);



	/* before we allocate an interrupt, we must be ready to handle it.
@@ -4514,7 +4514,7 @@ static int e1000_close(struct net_device *netdev) 
	    !test_bit(__E1000_TESTING, &adapter->state))

		e1000e_release_hw_control(adapter);



	pm_qos_remove_request(&adapter->netdev->pm_qos_req);

	pm_qos_remove_request(&adapter->pm_qos_req);



	pm_runtime_put_sync(&pdev->dev);

include/linux/netdevice.h

+0 −1
Original line number Diff line number Diff line
@@ -1751,7 +1751,6 @@ struct net_device { 
#endif

	struct phy_device *phydev;

	struct lock_class_key *qdisc_tx_busylock;

	struct pm_qos_request	pm_qos_req;

};

#define to_net_dev(d) container_of(d, struct net_device, dev)