* [PATCH net-next 0/2] netxen_nic: Minor enhancement
@ 2013-09-27 5:42 Shahed Shaikh
2013-09-27 5:42 ` [PATCH net-next 1/2] netxen_nic: Print ULA information Shahed Shaikh
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Shahed Shaikh @ 2013-09-27 5:42 UTC (permalink / raw)
To: davem; +Cc: netdev, Dept-HSGLinuxNICDev, Shahed Shaikh
From: Shahed Shaikh <shahed.shaikh@qlogic.com>
This patch series contains following changes
* Log a message about ULA adapter type.
* Update the driver version to 4.0.82.
Please apply to net-next.
Thanks,
Shahed
Shahed Shaikh (2):
netxen_nic: Print ULA information
netxen_nic: Update version to 4.0.82
drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 4 +-
.../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 1 +
.../net/ethernet/qlogic/netxen/netxen_nic_main.c | 28 ++++++++++++++++++++
3 files changed, 31 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH net-next 1/2] netxen_nic: Print ULA information
2013-09-27 5:42 [PATCH net-next 0/2] netxen_nic: Minor enhancement Shahed Shaikh
@ 2013-09-27 5:42 ` Shahed Shaikh
2013-09-27 5:42 ` [PATCH net-next 2/2] netxen_nic: Update version to 4.0.82 Shahed Shaikh
2013-09-27 17:31 ` [PATCH net-next 0/2] netxen_nic: Minor enhancement David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Shahed Shaikh @ 2013-09-27 5:42 UTC (permalink / raw)
To: davem; +Cc: netdev, Dept-HSGLinuxNICDev, Shahed Shaikh
From: Shahed Shaikh <shahed.shaikh@qlogic.com>
This patch reads CAMRAM(0x178) where FW writes a key for ULA and non-ULA
adapter and based on the key, driver logs the message.
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
---
.../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 1 +
.../net/ethernet/qlogic/netxen/netxen_nic_main.c | 28 ++++++++++++++++++++
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
index 32c7906..0c64c82 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
@@ -958,6 +958,7 @@ enum {
#define NETXEN_PEG_HALT_STATUS2 (NETXEN_CAM_RAM(0xac))
#define NX_CRB_DEV_REF_COUNT (NETXEN_CAM_RAM(0x138))
#define NX_CRB_DEV_STATE (NETXEN_CAM_RAM(0x140))
+#define NETXEN_ULA_KEY (NETXEN_CAM_RAM(0x178))
/* MiniDIMM related macros */
#define NETXEN_DIMM_CAPABILITY (NETXEN_CAM_RAM(0x258))
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index cbd75f9..5ec21c5 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -1415,6 +1415,32 @@ netxen_setup_netdev(struct netxen_adapter *adapter,
return 0;
}
+#define NETXEN_ULA_ADAPTER_KEY (0xdaddad01)
+#define NETXEN_NON_ULA_ADAPTER_KEY (0xdaddad00)
+
+static void netxen_read_ula_info(struct netxen_adapter *adapter)
+{
+ u32 temp;
+
+ /* Print ULA info only once for an adapter */
+ if (adapter->portnum != 0)
+ return;
+
+ temp = NXRD32(adapter, NETXEN_ULA_KEY);
+ switch (temp) {
+ case NETXEN_ULA_ADAPTER_KEY:
+ dev_info(&adapter->pdev->dev, "ULA adapter");
+ break;
+ case NETXEN_NON_ULA_ADAPTER_KEY:
+ dev_info(&adapter->pdev->dev, "non ULA adapter");
+ break;
+ default:
+ break;
+ }
+
+ return;
+}
+
#ifdef CONFIG_PCIEAER
static void netxen_mask_aer_correctable(struct netxen_adapter *adapter)
{
@@ -1561,6 +1587,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_out_disable_msi;
}
+ netxen_read_ula_info(adapter);
+
err = netxen_setup_netdev(adapter, netdev);
if (err)
goto err_out_disable_msi;
--
1.5.6
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH net-next 2/2] netxen_nic: Update version to 4.0.82
2013-09-27 5:42 [PATCH net-next 0/2] netxen_nic: Minor enhancement Shahed Shaikh
2013-09-27 5:42 ` [PATCH net-next 1/2] netxen_nic: Print ULA information Shahed Shaikh
@ 2013-09-27 5:42 ` Shahed Shaikh
2013-09-27 17:31 ` [PATCH net-next 0/2] netxen_nic: Minor enhancement David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Shahed Shaikh @ 2013-09-27 5:42 UTC (permalink / raw)
To: davem; +Cc: netdev, Dept-HSGLinuxNICDev, Shahed Shaikh
From: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
---
drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
index e8eff3e..9adcdbb 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic.h
@@ -53,8 +53,8 @@
#define _NETXEN_NIC_LINUX_MAJOR 4
#define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 81
-#define NETXEN_NIC_LINUX_VERSIONID "4.0.81"
+#define _NETXEN_NIC_LINUX_SUBVERSION 82
+#define NETXEN_NIC_LINUX_VERSIONID "4.0.82"
#define NETXEN_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c))
#define _major(v) (((v) >> 24) & 0xff)
--
1.5.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 0/2] netxen_nic: Minor enhancement
2013-09-27 5:42 [PATCH net-next 0/2] netxen_nic: Minor enhancement Shahed Shaikh
2013-09-27 5:42 ` [PATCH net-next 1/2] netxen_nic: Print ULA information Shahed Shaikh
2013-09-27 5:42 ` [PATCH net-next 2/2] netxen_nic: Update version to 4.0.82 Shahed Shaikh
@ 2013-09-27 17:31 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-09-27 17:31 UTC (permalink / raw)
To: shahed.shaikh; +Cc: netdev, Dept-HSGLinuxNICDev
From: Shahed Shaikh <shahed.shaikh@qlogic.com>
Date: Fri, 27 Sep 2013 01:42:25 -0400
> From: Shahed Shaikh <shahed.shaikh@qlogic.com>
>
> This patch series contains following changes
> * Log a message about ULA adapter type.
> * Update the driver version to 4.0.82.
All applied, thank you.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-09-27 17:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-27 5:42 [PATCH net-next 0/2] netxen_nic: Minor enhancement Shahed Shaikh
2013-09-27 5:42 ` [PATCH net-next 1/2] netxen_nic: Print ULA information Shahed Shaikh
2013-09-27 5:42 ` [PATCH net-next 2/2] netxen_nic: Update version to 4.0.82 Shahed Shaikh
2013-09-27 17:31 ` [PATCH net-next 0/2] netxen_nic: Minor enhancement David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).