From: Shannon Nelson <shannon.nelson@amd.com>
To: <netdev@vger.kernel.org>, <davem@davemloft.net>,
<kuba@kernel.org>, <edumazet@google.com>, <pabeni@redhat.com>,
<andrew+netdev@lunn.ch>, <jacob.e.keller@intel.com>
Cc: <brett.creeley@amd.com>, Shannon Nelson <shannon.nelson@amd.com>
Subject: [PATCH net-next 1/5] ionic: add asic codes to firmware interface file
Date: Tue, 10 Dec 2024 10:30:41 -0800 [thread overview]
Message-ID: <20241210183045.67878-2-shannon.nelson@amd.com> (raw)
In-Reply-To: <20241210183045.67878-1-shannon.nelson@amd.com>
Now that the firmware has learned how to properly report
the asic type id, add the values to our interface file.
The sharp-eyed reviewers will catch that the CAPRI value
changed here from 0 to 1. This comes with the FW actually
defining it correctly. This is safe for us to change as
nothing actually uses that value yet.
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
---
drivers/net/ethernet/pensando/ionic/ionic.h | 2 --
drivers/net/ethernet/pensando/ionic/ionic_if.h | 6 +++++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h
index 1c61390677f7..0639bf56bd3a 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic.h
@@ -18,8 +18,6 @@ struct ionic_lif;
#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF 0x1002
#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF 0x1003
-#define IONIC_ASIC_TYPE_ELBA 2
-
#define DEVCMD_TIMEOUT 5
#define IONIC_ADMINQ_TIME_SLICE msecs_to_jiffies(100)
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_if.h b/drivers/net/ethernet/pensando/ionic/ionic_if.h
index 9c85c0706c6e..6ea190f1a706 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_if.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic_if.h
@@ -3209,7 +3209,11 @@ union ionic_adminq_comp {
#define IONIC_BAR0_INTR_CTRL_OFFSET 0x2000
#define IONIC_DEV_CMD_DONE 0x00000001
-#define IONIC_ASIC_TYPE_CAPRI 0
+#define IONIC_ASIC_TYPE_NONE 0
+#define IONIC_ASIC_TYPE_CAPRI 1
+#define IONIC_ASIC_TYPE_ELBA 2
+#define IONIC_ASIC_TYPE_GIGLIO 3
+#define IONIC_ASIC_TYPE_SALINA 4
/**
* struct ionic_doorbell - Doorbell register layout
--
2.17.1
next prev parent reply other threads:[~2024-12-10 18:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-10 18:30 [PATCH net-next 0/5] ionic: minor code updates Shannon Nelson
2024-12-10 18:30 ` Shannon Nelson [this message]
2024-12-10 22:44 ` [PATCH net-next 1/5] ionic: add asic codes to firmware interface file Jacob Keller
2024-12-11 3:36 ` Kalesh Anakkur Purayil
2024-12-10 18:30 ` [PATCH net-next 2/5] ionic: Use VLAN_ETH_HLEN when possible Shannon Nelson
2024-12-10 22:45 ` Jacob Keller
2024-12-11 3:32 ` Kalesh Anakkur Purayil
2024-12-10 18:30 ` [PATCH net-next 3/5] ionic: Translate IONIC_RC_ENOSUPP to EOPNOTSUPP Shannon Nelson
2024-12-10 22:45 ` Jacob Keller
2024-12-11 3:31 ` Kalesh Anakkur Purayil
2024-12-10 18:30 ` [PATCH net-next 4/5] ionic: add speed defines for 200G and 400G Shannon Nelson
2024-12-10 22:53 ` Jacob Keller
2024-12-10 23:21 ` Nelson, Shannon
2024-12-10 18:30 ` [PATCH net-next 5/5] ionic: add support for QSFP_PLUS_CMIS Shannon Nelson
2024-12-10 22:53 ` Jacob Keller
2024-12-11 3:30 ` Kalesh Anakkur Purayil
2024-12-11 10:12 ` Ido Schimmel
2024-12-11 17:15 ` Nelson, Shannon
2024-12-12 11:20 ` [PATCH net-next 0/5] ionic: minor code updates patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241210183045.67878-2-shannon.nelson@amd.com \
--to=shannon.nelson@amd.com \
--cc=andrew+netdev@lunn.ch \
--cc=brett.creeley@amd.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jacob.e.keller@intel.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.