net: aquantia: allow rx checksum offload configuration

logost · davem330 · commit bbb67a44baf9 · 2018-11-09T15:38:10.000-08:00
RX Checksum offloads could not be configured and ignored netdev features
flag for checksumming.

Signed-off-by: Igor Russkikh &lt;igor.russkikh@aquantia.com&gt;
Signed-off-by: Dmitry Bogdanov &lt;dmitry.bogdanov@aquantia.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
@@ -204,6 +204,9 @@ struct aq_hw_ops {
 
 	int (*hw_get_fw_version)(struct aq_hw_s *self, u32 *fw_version);
 
+	int (*hw_set_offload)(struct aq_hw_s *self,
+			      struct aq_nic_cfg_s *aq_nic_cfg);
+
 	int (*hw_set_fc)(struct aq_hw_s *self, u32 fc, u32 tc);
 };
 
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
@@ -99,8 +99,11 @@ static int aq_ndev_set_features(struct net_device *ndev,
 	struct aq_nic_s *aq_nic = netdev_priv(ndev);
 	struct aq_nic_cfg_s *aq_cfg = aq_nic_get_cfg(aq_nic);
 	bool is_lro = false;
+	int err = 0;
+
+	aq_cfg->features = features;
 
-	if (aq_cfg->hw_features & NETIF_F_LRO) {
+	if (aq_cfg->aq_hw_caps->hw_features & NETIF_F_LRO) {
 		is_lro = features & NETIF_F_LRO;
 
 		if (aq_cfg->is_lro != is_lro) {
@@ -112,8 +115,11 @@ static int aq_ndev_set_features(struct net_device *ndev,
 			}
 		}
 	}
+	if ((aq_nic->ndev->features ^ features) & NETIF_F_RXCSUM)
+		err = aq_nic->aq_hw_ops->hw_set_offload(aq_nic->aq_hw,
+							aq_cfg);
 
-	return 0;
+	return err;
 }
 
 static int aq_ndev_set_mac_address(struct net_device *ndev, void *addr)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -118,7 +118,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self)
 	}
 
 	cfg->link_speed_msk &= cfg->aq_hw_caps->link_speed_msk;
-	cfg->hw_features = cfg->aq_hw_caps->hw_features;
+	cfg->features = cfg->aq_hw_caps->hw_features;
 }
 
 static int aq_nic_update_link_status(struct aq_nic_s *self)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
@@ -23,7 +23,7 @@ struct aq_vec_s;
 
 struct aq_nic_cfg_s {
 	const struct aq_hw_caps_s *aq_hw_caps;
-	u64 hw_features;
+	u64 features;
 	u32 rxds;		/* rx ring size, descriptors # */
 	u32 txds;		/* tx ring size, descriptors # */
 	u32 vecs;		/* vecs==allocated irqs */
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -234,8 +234,10 @@ static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,
 	hw_atl_tpo_tcp_udp_crc_offload_en_set(self, 1);
 
 	/* RX checksums offloads*/
-	hw_atl_rpo_ipv4header_crc_offload_en_set(self, 1);
-	hw_atl_rpo_tcp_udp_crc_offload_en_set(self, 1);
+	hw_atl_rpo_ipv4header_crc_offload_en_set(self, !!(aq_nic_cfg->features &
+						 NETIF_F_RXCSUM));
+	hw_atl_rpo_tcp_udp_crc_offload_en_set(self, !!(aq_nic_cfg->features &
+					      NETIF_F_RXCSUM));
 
 	/* LSO offloads*/
 	hw_atl_tdm_large_send_offload_en_set(self, 0xFFFFFFFFU);
@@ -974,5 +976,6 @@ const struct aq_hw_ops hw_atl_ops_b0 = {
 	.hw_get_regs                 = hw_atl_utils_hw_get_regs,
 	.hw_get_hw_stats             = hw_atl_utils_get_hw_stats,
 	.hw_get_fw_version           = hw_atl_utils_get_fw_version,
+	.hw_set_offload              = hw_atl_b0_hw_offload_set,
 	.hw_set_fc                   = hw_atl_b0_set_fc,
 };

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,11 @@ static int aq_ndev_set_features(struct net_device *ndev,`
`99`	`99`	`struct aq_nic_s *aq_nic = netdev_priv(ndev);`
`100`	`100`	`struct aq_nic_cfg_s *aq_cfg = aq_nic_get_cfg(aq_nic);`
`101`	`101`	`bool is_lro = false;`
	`102`	`+ int err = 0;`
	`103`	`+`
	`104`	`+ aq_cfg->features = features;`
`102`	`105`
`103`		`- if (aq_cfg->hw_features & NETIF_F_LRO) {`
	`106`	`+ if (aq_cfg->aq_hw_caps->hw_features & NETIF_F_LRO) {`
`104`	`107`	`is_lro = features & NETIF_F_LRO;`
`105`	`108`
`106`	`109`	`if (aq_cfg->is_lro != is_lro) {`
`@@ -112,8 +115,11 @@ static int aq_ndev_set_features(struct net_device *ndev,`
`112`	`115`	`}`
`113`	`116`	`}`
`114`	`117`	`}`
	`118`	`+ if ((aq_nic->ndev->features ^ features) & NETIF_F_RXCSUM)`
	`119`	`+ err = aq_nic->aq_hw_ops->hw_set_offload(aq_nic->aq_hw,`
	`120`	`+ aq_cfg);`
`115`	`121`
`116`		`- return 0;`
	`122`	`+ return err;`
`117`	`123`	`}`
`118`	`124`
`119`	`125`	`static int aq_ndev_set_mac_address(struct net_device ndev, void addr)`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`cfg->link_speed_msk &= cfg->aq_hw_caps->link_speed_msk;`
`121`		`- cfg->hw_features = cfg->aq_hw_caps->hw_features;`
	`121`	`+ cfg->features = cfg->aq_hw_caps->hw_features;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`static int aq_nic_update_link_status(struct aq_nic_s *self)`