octeontx2-pf: macsec: Get MACSEC capability flag from AF

The presence of MACSEC block is currently figured out based
on the running silicon variant. This may not be correct all
the times since the MACSEC block can be fused out. Hence get
the macsec info from AF via mailbox.

Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/1747894548-4657-1-git-send-email-sbhatta@marvell.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
index 84cd029a85aab7e47afe46ad98daa7c0c9bed56c..6f572589f1e5c16214846f019093d8d4099ac7c8 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
@@ -2055,6 +2055,43 @@ int otx2_handle_ntuple_tc_features(struct net_device *netdev, netdev_features_t
 }
 EXPORT_SYMBOL(otx2_handle_ntuple_tc_features);
 
+int otx2_set_hw_capabilities(struct otx2_nic *pfvf)
+{
+       struct mbox *mbox = &pfvf->mbox;
+       struct otx2_hw *hw = &pfvf->hw;
+       struct get_hw_cap_rsp *rsp;
+       struct msg_req *req;
+       int ret = -ENOMEM;
+
+       mutex_lock(&mbox->lock);
+
+       req = otx2_mbox_alloc_msg_get_hw_cap(mbox);
+       if (!req)
+               goto fail;
+
+       ret = otx2_sync_mbox_msg(mbox);
+       if (ret)
+               goto fail;
+
+       rsp = (struct get_hw_cap_rsp *)otx2_mbox_get_rsp(&pfvf->mbox.mbox,
+                                                        0, &req->hdr);
+       if (IS_ERR(rsp)) {
+               ret = -EINVAL;
+               goto fail;
+       }
+
+       if (rsp->hw_caps & HW_CAP_MACSEC)
+               __set_bit(CN10K_HW_MACSEC, &hw->cap_flag);
+
+       mutex_unlock(&mbox->lock);
+
+       return 0;
+fail:
+       dev_err(pfvf->dev, "Cannot get MACSEC capability from AF\n");
+       mutex_unlock(&mbox->lock);
+       return ret;
+}
+
 #define M(_name, _id, _fn_name, _req_type, _rsp_type)                  \
 int __weak                                                             \
 otx2_mbox_up_handler_ ## _fn_name(struct otx2_nic *pfvf,               \

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
index 6a38f91bbf5e094fcace59b96e0ba4945bdb142f..ca0e6ab12cebebf31ed08c21f3391cf1acc0fb9a 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
@@ -632,9 +632,6 @@ static inline void otx2_setup_dev_hw_settings(struct otx2_nic *pfvf)
                __set_bit(CN10K_PTP_ONESTEP, &hw->cap_flag);
                __set_bit(QOS_CIR_PIR_SUPPORT, &hw->cap_flag);
        }
-
-       if (is_dev_cn10kb(pfvf->pdev))
-               __set_bit(CN10K_HW_MACSEC, &hw->cap_flag);
 }
 
 /* Register read/write APIs */
@@ -1046,6 +1043,7 @@ void otx2_disable_napi(struct otx2_nic *pf);
 irqreturn_t otx2_cq_intr_handler(int irq, void *cq_irq);
 int otx2_rq_init(struct otx2_nic *pfvf, u16 qidx, u16 lpb_aura);
 int otx2_cq_init(struct otx2_nic *pfvf, u16 qidx);
+int otx2_set_hw_capabilities(struct otx2_nic *pfvf);
 
 /* RSS configuration APIs*/
 int otx2_rss_init(struct otx2_nic *pfvf);

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index d79b4b30176d9da04eaae08559bcd2776025d9d4..db7c466fdc39ee4c71b7ad6c13c8dd6b6eba9124 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -3144,6 +3144,8 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (err)
                goto err_ptp_destroy;
 
+       otx2_set_hw_capabilities(pf);
+
        err = cn10k_mcs_init(pf);
        if (err)
                goto err_del_mcam_entries;