Skip to content

Commit ce260cb

Browse files
jfrakerkuba-moo
authored andcommitted
gve: Remove obsolete checks that rely on page size.
These checks are safe to remove as they are no longer enforced by the backend. Retaining them would require updating them to work differently with page sizes larger than 4k. Signed-off-by: Jordan Kimbrough <jrkim@google.com> Signed-off-by: John Fraker <jfraker@google.com> Reviewed-by: Willem de Bruijn <willemb@google.com> Link: https://lore.kernel.org/r/20231128002648.320892-4-jfraker@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 8ae980d commit ce260cb

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

drivers/net/ethernet/google/gve/gve_adminq.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -727,18 +727,7 @@ static int gve_set_desc_cnt(struct gve_priv *priv,
727727
struct gve_device_descriptor *descriptor)
728728
{
729729
priv->tx_desc_cnt = be16_to_cpu(descriptor->tx_queue_entries);
730-
if (priv->tx_desc_cnt * sizeof(priv->tx->desc[0]) < PAGE_SIZE) {
731-
dev_err(&priv->pdev->dev, "Tx desc count %d too low\n",
732-
priv->tx_desc_cnt);
733-
return -EINVAL;
734-
}
735730
priv->rx_desc_cnt = be16_to_cpu(descriptor->rx_queue_entries);
736-
if (priv->rx_desc_cnt * sizeof(priv->rx->desc.desc_ring[0])
737-
< PAGE_SIZE) {
738-
dev_err(&priv->pdev->dev, "Rx desc count %d too low\n",
739-
priv->rx_desc_cnt);
740-
return -EINVAL;
741-
}
742731
return 0;
743732
}
744733

drivers/net/ethernet/google/gve/gve_rx.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ static int gve_rx_alloc_ring(struct gve_priv *priv, int idx)
211211
{
212212
struct gve_rx_ring *rx = &priv->rx[idx];
213213
struct device *hdev = &priv->pdev->dev;
214-
u32 slots, npages;
215214
int filled_pages;
216215
size_t bytes;
216+
u32 slots;
217217
int err;
218218

219219
netif_dbg(priv, drv, priv->dev, "allocating rx ring\n");
@@ -270,12 +270,6 @@ static int gve_rx_alloc_ring(struct gve_priv *priv, int idx)
270270

271271
/* alloc rx desc ring */
272272
bytes = sizeof(struct gve_rx_desc) * priv->rx_desc_cnt;
273-
npages = bytes / PAGE_SIZE;
274-
if (npages * PAGE_SIZE != bytes) {
275-
err = -EIO;
276-
goto abort_with_q_resources;
277-
}
278-
279273
rx->desc.desc_ring = dma_alloc_coherent(hdev, bytes, &rx->desc.bus,
280274
GFP_KERNEL);
281275
if (!rx->desc.desc_ring) {

0 commit comments

Comments
 (0)