ethdrivers,imx6: Add NIC_CONFIG_NO_CLOCK_SYS flag

Add NIC_CONFIG_NO_CLOCK_SYS flag which prevents the ethernet driver from
trying to initialize a clock_sys driver (which requires CCM hardware
resources) during initialization.  This flag should be used when the
clocks are setup independently from the driver.

Signed-off-by: Kent McLeod <kent@kry10.com>

Author: kent-mcleod

libethdrivers/plat_include/imx6/ethdrivers/plat/eth_plat.h

@@ -10,14 +10,14 @@
 #include <ethdrivers/imx6.h>
 #include <utils/attribute.h>
 #include <ethdrivers/raw.h>
-#include "../src/plat/imx6/enet.h"
 
 struct enet *get_enet_from_driver(struct eth_driver *driver);
 
 enum {
     NIC_CONFIG_FORCE_MAC        = 1u << 0, /**< Use MAC from config (if not 0) */
     NIC_CONFIG_PROMISCUOUS_MODE = 1u << 1, /**< Enable promiscuous mode */
     NIC_CONFIG_DROP_FRAME_CRC   = 1u << 2, /**< Drop ethernet frame CRC */
+    NIC_CONFIG_NO_CLOCK_SYS     = 1u << 3, /**< Don't use clock_sys interface */
 } nic_config_flags_t;
 
 typedef int (*sync_func_t)(void);

libethdrivers/src/plat/imx6/enet.c

@@ -529,7 +529,7 @@ void enet_crc_strip_disable(struct enet *enet)
     regs->rcr &= ~RCR_CRCSTRIP;
 }
 
-struct enet *enet_init(void *mapped_peripheral, uintptr_t tx_phys,
+struct enet *enet_init(const nic_config_t *nic_config, void *mapped_peripheral, uintptr_t tx_phys,
                        uintptr_t rx_phys, size_t rx_bufsize, uint64_t mac,
                        ps_io_ops_t *io_ops)
 {
@@ -552,11 +552,13 @@ struct enet *enet_init(void *mapped_peripheral, uintptr_t tx_phys,
 
 #if defined(CONFIG_PLAT_IMX6)
 
-    /* Set the ethernet clock frequency */
-    clock_sys_t *clk_sys = malloc(sizeof(clock_sys_t));
-    clock_sys_init(io_ops, clk_sys);
-    enet_clk_ptr = clk_get_clock(clk_sys, CLK_ENET);
-    clk_set_freq(enet_clk_ptr, ENET_FREQ);
+    if (!(nic_config && (nic_config->flags & NIC_CONFIG_NO_CLOCK_SYS))) {
+        /* Set the ethernet clock frequency */
+        clock_sys_t *clk_sys = malloc(sizeof(clock_sys_t));
+        clock_sys_init(io_ops, clk_sys);
+        enet_clk_ptr = clk_get_clock(clk_sys, CLK_ENET);
+        clk_set_freq(enet_clk_ptr, ENET_FREQ);
+    }
 
 #elif defined(CONFIG_PLAT_IMX8MQ_EVK)
 
@@ -592,10 +594,12 @@ struct enet *enet_init(void *mapped_peripheral, uintptr_t tx_phys,
 
 #endif
 
-    /* Set the MDIO clock frequency */
-    mdc_clk.priv = (void *)regs;
-    clk_register_child(enet_clk_ptr, &mdc_clk);
-    clk_set_freq(&mdc_clk, MDC_FREQ);
+    if (!(nic_config && (nic_config->flags & NIC_CONFIG_NO_CLOCK_SYS))) {
+        /* Set the MDIO clock frequency */
+        mdc_clk.priv = (void *)regs;
+        clk_register_child(enet_clk_ptr, &mdc_clk);
+        clk_set_freq(&mdc_clk, MDC_FREQ);
+    }
 
     /* Clear out MIB */
     enet_clear_mib(enet);

libethdrivers/src/plat/imx6/enet.h

@@ -9,6 +9,7 @@
 
 #include <stdint.h>
 #include <platsupport/io.h>
+#include <ethdrivers/plat/eth_plat.h>
 
 #define NETIRQ_BABR     (1UL << 30) /* Babbling Receive Error          */
 #define NETIRQ_BABT     (1UL << 29) /* Babbling Transmit Error         */
@@ -30,6 +31,7 @@
 struct enet;
 
 struct enet *enet_init(
+    const nic_config_t *nic_config,
     void *mapped_peripheral,
     uintptr_t tx_phys,
     uintptr_t rx_phys,

libethdrivers/src/plat/imx6/imx6.c

@@ -705,6 +705,7 @@ static int init_device(struct eth_driver *driver, const nic_config_t *nic_config
 
     /* Initialise the RGMII interface, clears and masks all interrupts */
     dev->enet = enet_init(
+                    nic_config,
                     mapped_peripheral,
                     dev->tx.phys,
                     dev->rx.phys,