fbnic: Gate AXI read/write enabling on FW mailbox

In order to prevent the device from throwing spurious writes and/or reads
at us we need to gate the AXI fabric interface to the PCIe until such time
as we know the FW is in a known good state.

To accomplish this we use the mailbox as a mechanism for us to recognize
that the FW has acknowledged our presence and is no longer sending any
stale message data to us.

We start in fbnic_mbx_init by calling fbnic_mbx_reset_desc_ring function,
disabling the DMA in both directions, and then invalidating all the
descriptors in each ring.

We then poll the mailbox in fbnic_mbx_poll_tx_ready and when the interrupt
is set by the FW we pick it up and mark the mailboxes as ready, while also
enabling the DMA.

Once we have completed all the transactions and need to shut down we call
into fbnic_mbx_clean which will in turn call fbnic_mbx_reset_desc_ring for
each ring and shut down the DMA and once again invalidate the descriptors.

Fixes: 3646153161f1 ("eth: fbnic: Add register init to set PCIe/Ethernet device config")
Fixes: da3cde08209e ("eth: fbnic: Add FW communication mechanism")
Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/174654718623.499179.7445197308109347982.stgit@ahduyck-xeon-server.home.arpa
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_csr.h b/drivers/net/ethernet/meta/fbnic/fbnic_csr.h
index 3b12a0ab59065e76e41f69038a9f09b66620d90d..51bee8072420b7b3b0d914f25eb761fc01826bb6 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_csr.h
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_csr.h
@@ -796,8 +796,10 @@ enum {
 /* PUL User Registers */
 #define FBNIC_CSR_START_PUL_USER       0x31000 /* CSR section delimiter */
 #define FBNIC_PUL_OB_TLP_HDR_AW_CFG    0x3103d         /* 0xc40f4 */
+#define FBNIC_PUL_OB_TLP_HDR_AW_CFG_FLUSH      CSR_BIT(19)
 #define FBNIC_PUL_OB_TLP_HDR_AW_CFG_BME                CSR_BIT(18)
 #define FBNIC_PUL_OB_TLP_HDR_AR_CFG    0x3103e         /* 0xc40f8 */
+#define FBNIC_PUL_OB_TLP_HDR_AR_CFG_FLUSH      CSR_BIT(19)
 #define FBNIC_PUL_OB_TLP_HDR_AR_CFG_BME                CSR_BIT(18)
 #define FBNIC_PUL_USER_OB_RD_TLP_CNT_31_0 \
                                        0x3106e         /* 0xc41b8 */

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
index c4956f0a741e8bbf48c3a35ee872f25df0e6e57f..f4749bfd840c52cf134020c4a3c5073288d83343 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
@@ -51,10 +51,26 @@ static u64 __fbnic_mbx_rd_desc(struct fbnic_dev *fbd, int mbx_idx, int desc_idx)
        return desc;
 }
 
-static void fbnic_mbx_init_desc_ring(struct fbnic_dev *fbd, int mbx_idx)
+static void fbnic_mbx_reset_desc_ring(struct fbnic_dev *fbd, int mbx_idx)
 {
        int desc_idx;
 
+       /* Disable DMA transactions from the device,
+        * and flush any transactions triggered during cleaning
+        */
+       switch (mbx_idx) {
+       case FBNIC_IPC_MBX_RX_IDX:
+               wr32(fbd, FBNIC_PUL_OB_TLP_HDR_AW_CFG,
+                    FBNIC_PUL_OB_TLP_HDR_AW_CFG_FLUSH);
+               break;
+       case FBNIC_IPC_MBX_TX_IDX:
+               wr32(fbd, FBNIC_PUL_OB_TLP_HDR_AR_CFG,
+                    FBNIC_PUL_OB_TLP_HDR_AR_CFG_FLUSH);
+               break;
+       }
+
+       wrfl(fbd);
+
        /* Initialize first descriptor to all 0s. Doing this gives us a
         * solid stop for the firmware to hit when it is done looping
         * through the ring.
@@ -90,7 +106,7 @@ void fbnic_mbx_init(struct fbnic_dev *fbd)
        wr32(fbd, FBNIC_INTR_CLEAR(0), 1u << FBNIC_FW_MSIX_ENTRY);
 
        for (i = 0; i < FBNIC_IPC_MBX_INDICES; i++)
-               fbnic_mbx_init_desc_ring(fbd, i);
+               fbnic_mbx_reset_desc_ring(fbd, i);
 }
 
 static int fbnic_mbx_map_msg(struct fbnic_dev *fbd, int mbx_idx,
@@ -155,7 +171,7 @@ static void fbnic_mbx_clean_desc_ring(struct fbnic_dev *fbd, int mbx_idx)
 {
        int i;
 
-       fbnic_mbx_init_desc_ring(fbd, mbx_idx);
+       fbnic_mbx_reset_desc_ring(fbd, mbx_idx);
 
        for (i = FBNIC_IPC_MBX_DESC_LEN; i--;)
                fbnic_mbx_unmap_and_free_msg(fbd, mbx_idx, i);
@@ -354,7 +370,7 @@ static int fbnic_fw_xmit_cap_msg(struct fbnic_dev *fbd)
        return (err == -EOPNOTSUPP) ? 0 : err;
 }
 
-static void fbnic_mbx_postinit_desc_ring(struct fbnic_dev *fbd, int mbx_idx)
+static void fbnic_mbx_init_desc_ring(struct fbnic_dev *fbd, int mbx_idx)
 {
        struct fbnic_fw_mbx *mbx = &fbd->mbx[mbx_idx];
 
@@ -366,10 +382,18 @@ static void fbnic_mbx_postinit_desc_ring(struct fbnic_dev *fbd, int mbx_idx)
 
        switch (mbx_idx) {
        case FBNIC_IPC_MBX_RX_IDX:
+               /* Enable DMA writes from the device */
+               wr32(fbd, FBNIC_PUL_OB_TLP_HDR_AW_CFG,
+                    FBNIC_PUL_OB_TLP_HDR_AW_CFG_BME);
+
                /* Make sure we have a page for the FW to write to */
                fbnic_mbx_alloc_rx_msgs(fbd);
                break;
        case FBNIC_IPC_MBX_TX_IDX:
+               /* Enable DMA reads from the device */
+               wr32(fbd, FBNIC_PUL_OB_TLP_HDR_AR_CFG,
+                    FBNIC_PUL_OB_TLP_HDR_AR_CFG_BME);
+
                /* Force version to 1 if we successfully requested an update
                 * from the firmware. This should be overwritten once we get
                 * the actual version from the firmware in the capabilities
@@ -386,7 +410,7 @@ static void fbnic_mbx_postinit(struct fbnic_dev *fbd)
 {
        int i;
 
-       /* We only need to do this on the first interrupt following init.
+       /* We only need to do this on the first interrupt following reset.
         * this primes the mailbox so that we will have cleared all the
         * skip descriptors.
         */
@@ -396,7 +420,7 @@ static void fbnic_mbx_postinit(struct fbnic_dev *fbd)
        wr32(fbd, FBNIC_INTR_CLEAR(0), 1u << FBNIC_FW_MSIX_ENTRY);
 
        for (i = 0; i < FBNIC_IPC_MBX_INDICES; i++)
-               fbnic_mbx_postinit_desc_ring(fbd, i);
+               fbnic_mbx_init_desc_ring(fbd, i);
 }
 
 /**
@@ -894,7 +918,7 @@ int fbnic_mbx_poll_tx_ready(struct fbnic_dev *fbd)
                 * avoid the mailbox getting stuck closed if the interrupt
                 * is reset.
                 */
-               fbnic_mbx_init_desc_ring(fbd, FBNIC_IPC_MBX_TX_IDX);
+               fbnic_mbx_reset_desc_ring(fbd, FBNIC_IPC_MBX_TX_IDX);
 
                msleep(200);
 

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
index 14291401f4632174db46540c352d48f9dba6aa07..dde4a37116e20e99864bad48d29f5b17846653bc 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
@@ -79,12 +79,6 @@ static void fbnic_mac_init_axi(struct fbnic_dev *fbd)
        fbnic_init_readrq(fbd, FBNIC_QM_RNI_RBP_CTL, cls, readrq);
        fbnic_init_mps(fbd, FBNIC_QM_RNI_RDE_CTL, cls, mps);
        fbnic_init_mps(fbd, FBNIC_QM_RNI_RCM_CTL, cls, mps);
-
-       /* Enable XALI AR/AW outbound */
-       wr32(fbd, FBNIC_PUL_OB_TLP_HDR_AW_CFG,
-            FBNIC_PUL_OB_TLP_HDR_AW_CFG_BME);
-       wr32(fbd, FBNIC_PUL_OB_TLP_HDR_AR_CFG,
-            FBNIC_PUL_OB_TLP_HDR_AR_CFG_BME);
 }
 
 static void fbnic_mac_init_qm(struct fbnic_dev *fbd)