Skip to content

Commit 0a5f853

Browse files
shinas-marvelldavem330
authored andcommitted
octeon_ep: get max rx packet length from firmware
Max receive packet length can vary across SoCs, so this needs to be queried from respective firmware and filled by driver. A control net get mtu api should be implemented to do the same. Signed-off-by: Shinas Rasheed <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e40f4c4 commit 0a5f853

File tree

4 files changed

+37
-3
lines changed

4 files changed

+37
-3
lines changed

drivers/net/ethernet/marvell/octeon_ep/octep_config.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545

4646
/* Minimum MTU supported by Octeon network interface */
4747
#define OCTEP_MIN_MTU ETH_MIN_MTU
48-
/* Maximum MTU supported by Octeon interface*/
49-
#define OCTEP_MAX_MTU (10000 - (ETH_HLEN + ETH_FCS_LEN))
5048
/* Default MTU */
5149
#define OCTEP_DEFAULT_MTU 1500
5250

drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,24 @@ int octep_ctrl_net_set_mac_addr(struct octep_device *oct, int vfid, u8 *addr,
198198
return octep_send_mbox_req(oct, &d, wait_for_response);
199199
}
200200

201+
int octep_ctrl_net_get_mtu(struct octep_device *oct, int vfid)
202+
{
203+
struct octep_ctrl_net_wait_data d = {};
204+
struct octep_ctrl_net_h2f_req *req;
205+
int err;
206+
207+
req = &d.data.req;
208+
init_send_req(&d.msg, req, mtu_sz, vfid);
209+
req->hdr.s.cmd = OCTEP_CTRL_NET_H2F_CMD_MTU;
210+
req->mtu.cmd = OCTEP_CTRL_NET_CMD_GET;
211+
212+
err = octep_send_mbox_req(oct, &d, true);
213+
if (err < 0)
214+
return err;
215+
216+
return d.data.resp.mtu.val;
217+
}
218+
201219
int octep_ctrl_net_set_mtu(struct octep_device *oct, int vfid, int mtu,
202220
bool wait_for_response)
203221
{

drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,16 @@ int octep_ctrl_net_get_mac_addr(struct octep_device *oct, int vfid, u8 *addr);
287287
int octep_ctrl_net_set_mac_addr(struct octep_device *oct, int vfid, u8 *addr,
288288
bool wait_for_response);
289289

290+
/**
291+
* octep_ctrl_net_get_mtu() - Get max MTU from firmware.
292+
*
293+
* @oct: non-null pointer to struct octep_device.
294+
* @vfid: Index of virtual function.
295+
*
296+
* return value: mtu on success, -errno on failure.
297+
*/
298+
int octep_ctrl_net_get_mtu(struct octep_device *oct, int vfid);
299+
290300
/**
291301
* octep_ctrl_net_set_mtu() - Set mtu in firmware.
292302
*

drivers/net/ethernet/marvell/octeon_ep/octep_main.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,7 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
13071307
{
13081308
struct octep_device *octep_dev = NULL;
13091309
struct net_device *netdev;
1310+
int max_rx_pktlen;
13101311
int err;
13111312

13121313
err = pci_enable_device(pdev);
@@ -1377,8 +1378,15 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
13771378

13781379
netdev->hw_features = NETIF_F_SG;
13791380
netdev->features |= netdev->hw_features;
1381+
1382+
max_rx_pktlen = octep_ctrl_net_get_mtu(octep_dev, OCTEP_CTRL_NET_INVALID_VFID);
1383+
if (max_rx_pktlen < 0) {
1384+
dev_err(&octep_dev->pdev->dev,
1385+
"Failed to get max receive packet size; err = %d\n", max_rx_pktlen);
1386+
goto register_dev_err;
1387+
}
13801388
netdev->min_mtu = OCTEP_MIN_MTU;
1381-
netdev->max_mtu = OCTEP_MAX_MTU;
1389+
netdev->max_mtu = max_rx_pktlen - (ETH_HLEN + ETH_FCS_LEN);
13821390
netdev->mtu = OCTEP_DEFAULT_MTU;
13831391

13841392
err = octep_ctrl_net_get_mac_addr(octep_dev, OCTEP_CTRL_NET_INVALID_VFID,

0 commit comments

Comments
 (0)