]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: sparx5: enable FDMA on lan969x
authorDaniel Machon <daniel.machon@microchip.com>
Mon, 13 Jan 2025 19:36:05 +0000 (20:36 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 15 Jan 2025 22:13:32 +0000 (14:13 -0800)
In a previous series, we made sure that FDMA was not initialized and
started on lan969x. Now that we are going to support it, undo that
change. In addition, make sure the chip ID check is only applicable on
Sparx5, as this is a check that is only relevant on this platform.

Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Link: https://patch.msgid.link/20250113-sparx5-lan969x-switch-driver-5-v2-1-c468f02fd623@microchip.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/microchip/sparx5/sparx5_main.c

index e68277c38adc315bc4d8c9e2417b9a7c317590af..340fedd1d897b576d5d7c60b48fb2ea0143f3d9a 100644 (file)
@@ -784,8 +784,9 @@ static int sparx5_start(struct sparx5 *sparx5)
 
        /* Start Frame DMA with fallback to register based INJ/XTR */
        err = -ENXIO;
-       if (sparx5->fdma_irq >= 0 && is_sparx5(sparx5)) {
-               if (GCB_CHIP_ID_REV_ID_GET(sparx5->chip_id) > 0)
+       if (sparx5->fdma_irq >= 0) {
+               if (GCB_CHIP_ID_REV_ID_GET(sparx5->chip_id) > 0 ||
+                   !is_sparx5(sparx5))
                        err = devm_request_irq(sparx5->dev,
                                               sparx5->fdma_irq,
                                               sparx5_fdma_handler,