@@ -34,11 +34,13 @@ static int pdsc_process_notifyq(struct pdsc_qcq *qcq)
case PDS_EVENT_LINK_CHANGE:
dev_info(pdsc->dev, "NotifyQ LINK_CHANGE ecode %d eid %lld\n",
ecode, eid);
+ pdsc_auxbus_publish(pdsc, PDSC_ALL_CLIENT_IDS, comp);
break;
case PDS_EVENT_RESET:
dev_info(pdsc->dev, "NotifyQ RESET ecode %d eid %lld\n",
ecode, eid);
+ pdsc_auxbus_publish(pdsc, PDSC_ALL_CLIENT_IDS, comp);
break;
case PDS_EVENT_XCVR:
@@ -46,6 +48,21 @@ static int pdsc_process_notifyq(struct pdsc_qcq *qcq)
ecode, eid);
break;
+ case PDS_EVENT_CLIENT:
+ {
+ struct pds_core_client_event *ce;
+ union pds_core_notifyq_comp *cc;
+ u16 client_id;
+
+ ce = (struct pds_core_client_event *)comp;
+ cc = (union pds_core_notifyq_comp *)&ce->client_event;
+ client_id = le16_to_cpu(ce->client_id);
+ dev_info(pdsc->dev, "NotifyQ CLIENT %d ecode %d eid %lld cc->ecode %d\n",
+ client_id, ecode, eid, le16_to_cpu(cc->ecode));
+ pdsc_auxbus_publish(pdsc, client_id, cc);
+ break;
+ }
+
default:
dev_info(pdsc->dev, "NotifyQ ecode %d eid %lld\n",
ecode, eid);
@@ -205,6 +205,46 @@ static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *pdsc,
return NULL;
}
+static int pdsc_core_match(struct device *dev, const void *data)
+{
+ struct pds_auxiliary_dev *curr_padev;
+ struct pdsc *curr_pdsc;
+ const struct pdsc *pdsc;
+
+ /* Match the core device searching for its clients */
+ curr_padev = container_of(dev, struct pds_auxiliary_dev, aux_dev.dev);
+ curr_pdsc = (struct pdsc *)dev_get_drvdata(curr_padev->aux_dev.dev.parent);
+ pdsc = data;
+
+ if (curr_pdsc == pdsc)
+ return 1;
+
+ return 0;
+}
+
+int pdsc_auxbus_publish(struct pdsc *pdsc, u16 client_id,
+ union pds_core_notifyq_comp *event)
+{
+ struct pds_auxiliary_dev *padev;
+ struct auxiliary_device *aux_dev;
+
+ /* Search aux bus for this core's devices */
+ aux_dev = auxiliary_find_device(NULL, pdsc, pdsc_core_match);
+ while (aux_dev) {
+ padev = container_of(aux_dev, struct pds_auxiliary_dev, aux_dev);
+ if ((padev->client_id == client_id ||
+ client_id == PDSC_ALL_CLIENT_IDS) &&
+ padev->event_handler)
+ padev->event_handler(padev, event);
+ put_device(&aux_dev->dev);
+
+ aux_dev = auxiliary_find_device(&aux_dev->dev,
+ pdsc, pdsc_core_match);
+ }
+
+ return 0;
+}
+
int pdsc_auxbus_dev_add_vf(struct pdsc *pdsc, int vf_id)
{
struct pds_auxiliary_dev *padev;
@@ -520,6 +520,11 @@ void pdsc_stop(struct pdsc *pdsc)
static void pdsc_fw_down(struct pdsc *pdsc)
{
+ union pds_core_notifyq_comp reset_event = {
+ .reset.ecode = cpu_to_le16(PDS_EVENT_RESET),
+ .reset.state = 0,
+ };
+
mutex_lock(&pdsc->config_lock);
if (test_and_set_bit(PDSC_S_FW_DEAD, &pdsc->state)) {
@@ -528,6 +533,9 @@ static void pdsc_fw_down(struct pdsc *pdsc)
return;
}
+ /* Notify clients of fw_down */
+ pdsc_auxbus_publish(pdsc, PDSC_ALL_CLIENT_IDS, &reset_event);
+
pdsc_mask_interrupts(pdsc);
pdsc_teardown(pdsc, PDSC_TEARDOWN_RECOVERY);
@@ -536,6 +544,10 @@ static void pdsc_fw_down(struct pdsc *pdsc)
static void pdsc_fw_up(struct pdsc *pdsc)
{
+ union pds_core_notifyq_comp reset_event = {
+ .reset.ecode = cpu_to_le16(PDS_EVENT_RESET),
+ .reset.state = 1,
+ };
int err;
mutex_lock(&pdsc->config_lock);
@@ -556,6 +568,9 @@ static void pdsc_fw_up(struct pdsc *pdsc)
mutex_unlock(&pdsc->config_lock);
+ /* Notify clients of fw_up */
+ pdsc_auxbus_publish(pdsc, PDSC_ALL_CLIENT_IDS, &reset_event);
+
return;
err_out:
@@ -303,6 +303,9 @@ int pdsc_start(struct pdsc *pdsc);
void pdsc_stop(struct pdsc *pdsc);
void pdsc_health_thread(struct work_struct *work);
+#define PDSC_ALL_CLIENT_IDS 0xffff
+int pdsc_auxbus_publish(struct pdsc *pdsc, u16 client_id,
+ union pds_core_notifyq_comp *event);
int pdsc_auxbus_dev_add_vf(struct pdsc *pdsc, int vf_id);
int pdsc_auxbus_dev_del_vf(struct pdsc *pdsc, int vf_id);
When the Core device gets an event from the device, or notices the device FW to be up or down, it needs to send those events on to the clients that have an event handler. Add the code to pass along the events to either the specific client or to all the clients. Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> --- drivers/net/ethernet/amd/pds_core/adminq.c | 17 +++++++++ drivers/net/ethernet/amd/pds_core/auxbus.c | 40 ++++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/core.c | 15 ++++++++ drivers/net/ethernet/amd/pds_core/core.h | 3 ++ 4 files changed, 75 insertions(+)