* [Intel-wired-lan] [PATCH iwl-next v1 1/2] ice: add additional E830 device ids
@ 2024-03-26 16:36 Paul Greenwalt
2024-03-26 16:36 ` [Intel-wired-lan] [PATCH iwl-next v1 2/2] ice: update E830 device ids and comments Paul Greenwalt
0 siblings, 1 reply; 5+ messages in thread
From: Paul Greenwalt @ 2024-03-26 16:36 UTC (permalink / raw)
To: intel-wired-lan; +Cc: Wojciech Drewek, Paul Greenwalt
Add support for additional E830 device ids which are supported by the
driver:
- 0x12D5: Intel(R) Ethernet Controller E830-C for backplane
- 0x12D8: Intel(R) Ethernet Controller E830-C for QSFP
- 0x12DA: Intel(R) Ethernet Controller E830-C for SFP
- 0x12DC: Intel(R) Ethernet Controller E830-XXV for backplane
- 0x12DD: Intel(R) Ethernet Controller E830-XXV for QSFP
- 0x12DE: Intel(R) Ethernet Controller E830-XXV for SFP
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
---
drivers/net/ethernet/intel/ice/ice_common.c | 6 ++++++
drivers/net/ethernet/intel/ice/ice_devids.h | 12 ++++++++++++
drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++++
3 files changed, 24 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index f4ac3c30b124..acfae3cd5b6c 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -164,6 +164,12 @@ static int ice_set_mac_type(struct ice_hw *hw)
case ICE_DEV_ID_E830_QSFP56:
case ICE_DEV_ID_E830_SFP:
case ICE_DEV_ID_E830_SFP_DD:
+ case ICE_DEV_ID_E830C_BACKPLANE:
+ case ICE_DEV_ID_E830_XXV_BACKPLANE:
+ case ICE_DEV_ID_E830C_QSFP:
+ case ICE_DEV_ID_E830_XXV_QSFP:
+ case ICE_DEV_ID_E830C_SFP:
+ case ICE_DEV_ID_E830_XXV_SFP:
hw->mac_type = ICE_MAC_E830;
break;
default:
diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h
index 9dfae9bce758..c37b2b450b02 100644
--- a/drivers/net/ethernet/intel/ice/ice_devids.h
+++ b/drivers/net/ethernet/intel/ice/ice_devids.h
@@ -24,6 +24,18 @@
#define ICE_DEV_ID_E830_SFP 0x12D3
/* Intel(R) Ethernet Controller E830-C for SFP-DD */
#define ICE_DEV_ID_E830_SFP_DD 0x12D4
+/* Intel(R) Ethernet Controller E830-C for backplane */
+#define ICE_DEV_ID_E830C_BACKPLANE 0x12D5
+/* Intel(R) Ethernet Controller E830-C for QSFP */
+#define ICE_DEV_ID_E830C_QSFP 0x12D8
+/* Intel(R) Ethernet Controller E830-C for SFP */
+#define ICE_DEV_ID_E830C_SFP 0x12DA
+/* Intel(R) Ethernet Controller E830-XXV for backplane */
+#define ICE_DEV_ID_E830_XXV_BACKPLANE 0x12DC
+/* Intel(R) Ethernet Controller E830-XXV for QSFP */
+#define ICE_DEV_ID_E830_XXV_QSFP 0x12DD
+/* Intel(R) Ethernet Controller E830-XXV for SFP */
+#define ICE_DEV_ID_E830_XXV_SFP 0x12DE
/* Intel(R) Ethernet Controller E810-C for backplane */
#define ICE_DEV_ID_E810C_BACKPLANE 0x1591
/* Intel(R) Ethernet Controller E810-C for QSFP */
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 3dea0d4c767c..2f198bf3d8b1 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5695,6 +5695,12 @@ static const struct pci_device_id ice_pci_tbl[] = {
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_QSFP56) },
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_SFP) },
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_SFP_DD) },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_BACKPLANE), },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_XXV_BACKPLANE), },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_QSFP), },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_XXV_QSFP), },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_SFP), },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_XXV_SFP), },
/* required last entry */
{}
};
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Intel-wired-lan] [PATCH iwl-next v1 2/2] ice: update E830 device ids and comments
2024-03-26 16:36 [Intel-wired-lan] [PATCH iwl-next v1 1/2] ice: add additional E830 device ids Paul Greenwalt
@ 2024-03-26 16:36 ` Paul Greenwalt
2024-03-28 21:16 ` Tony Nguyen
0 siblings, 1 reply; 5+ messages in thread
From: Paul Greenwalt @ 2024-03-26 16:36 UTC (permalink / raw)
To: intel-wired-lan; +Cc: Wojciech Drewek, Paul Greenwalt
Update existing E830 device ids and comments to align with new naming 'C'
for 100G and 'CC' for 200G.
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
---
drivers/net/ethernet/intel/ice/ice_common.c | 8 ++++----
drivers/net/ethernet/intel/ice/ice_devids.h | 16 ++++++++--------
drivers/net/ethernet/intel/ice/ice_main.c | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index acfae3cd5b6c..199049e08a78 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -160,10 +160,10 @@ static int ice_set_mac_type(struct ice_hw *hw)
case ICE_DEV_ID_E825C_SGMII:
hw->mac_type = ICE_MAC_GENERIC_3K_E825;
break;
- case ICE_DEV_ID_E830_BACKPLANE:
- case ICE_DEV_ID_E830_QSFP56:
- case ICE_DEV_ID_E830_SFP:
- case ICE_DEV_ID_E830_SFP_DD:
+ case ICE_DEV_ID_E830CC_BACKPLANE:
+ case ICE_DEV_ID_E830CC_QSFP56:
+ case ICE_DEV_ID_E830CC_SFP:
+ case ICE_DEV_ID_E830CC_SFP_DD:
case ICE_DEV_ID_E830C_BACKPLANE:
case ICE_DEV_ID_E830_XXV_BACKPLANE:
case ICE_DEV_ID_E830C_QSFP:
diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h
index c37b2b450b02..9a1bc434f167 100644
--- a/drivers/net/ethernet/intel/ice/ice_devids.h
+++ b/drivers/net/ethernet/intel/ice/ice_devids.h
@@ -16,14 +16,14 @@
#define ICE_DEV_ID_E823L_1GBE 0x124F
/* Intel(R) Ethernet Connection E823-L for QSFP */
#define ICE_DEV_ID_E823L_QSFP 0x151D
-/* Intel(R) Ethernet Controller E830-C for backplane */
-#define ICE_DEV_ID_E830_BACKPLANE 0x12D1
-/* Intel(R) Ethernet Controller E830-C for QSFP */
-#define ICE_DEV_ID_E830_QSFP56 0x12D2
-/* Intel(R) Ethernet Controller E830-C for SFP */
-#define ICE_DEV_ID_E830_SFP 0x12D3
-/* Intel(R) Ethernet Controller E830-C for SFP-DD */
-#define ICE_DEV_ID_E830_SFP_DD 0x12D4
+/* Intel(R) Ethernet Controller E830-CC for backplane */
+#define ICE_DEV_ID_E830CC_BACKPLANE 0x12D1
+/* Intel(R) Ethernet Controller E830-CC for QSFP */
+#define ICE_DEV_ID_E830CC_QSFP56 0x12D2
+/* Intel(R) Ethernet Controller E830-CC for SFP */
+#define ICE_DEV_ID_E830CC_SFP 0x12D3
+/* Intel(R) Ethernet Controller E830-CC for SFP-DD */
+#define ICE_DEV_ID_E83CC0_SFP_DD 0x12D4
/* Intel(R) Ethernet Controller E830-C for backplane */
#define ICE_DEV_ID_E830C_BACKPLANE 0x12D5
/* Intel(R) Ethernet Controller E830-C for QSFP */
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 2f198bf3d8b1..3c76c3ffe7a4 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -5691,10 +5691,10 @@ static const struct pci_device_id ice_pci_tbl[] = {
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_QSFP), },
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_SFP), },
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E825C_SGMII), },
- { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_BACKPLANE) },
- { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_QSFP56) },
- { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_SFP) },
- { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_SFP_DD) },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_BACKPLANE) },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_QSFP56) },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_SFP) },
+ { PCI_VDEVICE(INTEL, ICE_DEV_ID_E830CC_SFP_DD) },
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_BACKPLANE), },
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830_XXV_BACKPLANE), },
{ PCI_VDEVICE(INTEL, ICE_DEV_ID_E830C_QSFP), },
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Intel-wired-lan] [PATCH iwl-next v1 2/2] ice: update E830 device ids and comments
2024-03-26 16:36 ` [Intel-wired-lan] [PATCH iwl-next v1 2/2] ice: update E830 device ids and comments Paul Greenwalt
@ 2024-03-28 21:16 ` Tony Nguyen
2024-03-28 21:37 ` Rustad, Mark D
0 siblings, 1 reply; 5+ messages in thread
From: Tony Nguyen @ 2024-03-28 21:16 UTC (permalink / raw)
To: Paul Greenwalt, intel-wired-lan; +Cc: Wojciech Drewek
On 3/26/2024 9:36 AM, Paul Greenwalt wrote:
> Update existing E830 device ids and comments to align with new naming 'C'
> for 100G and 'CC' for 200G.
>
> Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
> Signed-off-by: Paul Greenwalt <paul.greenwalt@intel.com>
> ---
...
> diff --git a/drivers/net/ethernet/intel/ice/ice_devids.h b/drivers/net/ethernet/intel/ice/ice_devids.h
> index c37b2b450b02..9a1bc434f167 100644
> --- a/drivers/net/ethernet/intel/ice/ice_devids.h
> +++ b/drivers/net/ethernet/intel/ice/ice_devids.h
> @@ -16,14 +16,14 @@
> #define ICE_DEV_ID_E823L_1GBE 0x124F
> /* Intel(R) Ethernet Connection E823-L for QSFP */
> #define ICE_DEV_ID_E823L_QSFP 0x151D
> -/* Intel(R) Ethernet Controller E830-C for backplane */
> -#define ICE_DEV_ID_E830_BACKPLANE 0x12D1
> -/* Intel(R) Ethernet Controller E830-C for QSFP */
> -#define ICE_DEV_ID_E830_QSFP56 0x12D2
> -/* Intel(R) Ethernet Controller E830-C for SFP */
> -#define ICE_DEV_ID_E830_SFP 0x12D3
> -/* Intel(R) Ethernet Controller E830-C for SFP-DD */
> -#define ICE_DEV_ID_E830_SFP_DD 0x12D4
> +/* Intel(R) Ethernet Controller E830-CC for backplane */
> +#define ICE_DEV_ID_E830CC_BACKPLANE 0x12D1
> +/* Intel(R) Ethernet Controller E830-CC for QSFP */
> +#define ICE_DEV_ID_E830CC_QSFP56 0x12D2
> +/* Intel(R) Ethernet Controller E830-CC for SFP */
> +#define ICE_DEV_ID_E830CC_SFP 0x12D3
> +/* Intel(R) Ethernet Controller E830-CC for SFP-DD */
> +#define ICE_DEV_ID_E83CC0_SFP_DD 0x12D4
This doesn't compile; there's a stray '0' here.
../drivers/net/ethernet/intel/ice/ice_common.c:166:14: error:
‘ICE_DEV_ID_E830CC_SFP_DD’ undeclared (first use in this function); did
you mean ‘ICE_DEV_ID_E83CC0_SFP_DD’?
166 | case ICE_DEV_ID_E830CC_SFP_DD:
| ^~~~~~~~~~~~~~~~~~~~~~~~
| ICE_DEV_ID_E83CC0_SFP_DD
...
> /* Intel(R) Ethernet Controller E830-C for backplane */
> #define ICE_DEV_ID_E830C_BACKPLANE 0x12D5
> /* Intel(R) Ethernet Controller E830-C for QSFP */
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-wired-lan] [PATCH iwl-next v1 2/2] ice: update E830 device ids and comments
2024-03-28 21:16 ` Tony Nguyen
@ 2024-03-28 21:37 ` Rustad, Mark D
2024-03-28 21:41 ` Tony Nguyen
0 siblings, 1 reply; 5+ messages in thread
From: Rustad, Mark D @ 2024-03-28 21:37 UTC (permalink / raw)
To: Nguyen, Anthony L; +Cc: Drewek, Wojciech, intel-wired-lan, Greenwalt, Paul
> On Mar 28, 2024, at 2:16 PM, Tony Nguyen <anthony.l.nguyen@intel.com> wrote:
>
>> +/* Intel(R) Ethernet Controller E830-CC for SFP-DD */
>> +#define ICE_DEV_ID_E83CC0_SFP_DD 0x12D4
>
> This doesn't compile; there's a stray '0' here.
Not stray, just mispositioned in the definition above.
> ../drivers/net/ethernet/intel/ice/ice_common.c:166:14: error: ‘ICE_DEV_ID_E830CC_SFP_DD’ undeclared (first use in this function); did you mean ‘ICE_DEV_ID_E83CC0_SFP_DD’?
> 166 | case ICE_DEV_ID_E830CC_SFP_DD:
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> | ICE_DEV_ID_E83CC0_SFP_DD
>
> ...
--
Mark Rustad (he/him), Ethernet Products Group, Intel Corporation
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-wired-lan] [PATCH iwl-next v1 2/2] ice: update E830 device ids and comments
2024-03-28 21:37 ` Rustad, Mark D
@ 2024-03-28 21:41 ` Tony Nguyen
0 siblings, 0 replies; 5+ messages in thread
From: Tony Nguyen @ 2024-03-28 21:41 UTC (permalink / raw)
To: Rustad, Mark D; +Cc: Drewek, Wojciech, intel-wired-lan, Greenwalt, Paul
On 3/28/2024 2:37 PM, Rustad, Mark D wrote:
>> On Mar 28, 2024, at 2:16 PM, Tony Nguyen <anthony.l.nguyen@intel.com> wrote:
>>
>>> +/* Intel(R) Ethernet Controller E830-CC for SFP-DD */
>>> +#define ICE_DEV_ID_E83CC0_SFP_DD 0x12D4
>>
>> This doesn't compile; there's a stray '0' here.
>
> Not stray, just mispositioned in the definition above.
Missed the missing 0. Yea, mispositioned. Thanks Mark :)
>
>> ../drivers/net/ethernet/intel/ice/ice_common.c:166:14: error: ‘ICE_DEV_ID_E830CC_SFP_DD’ undeclared (first use in this function); did you mean ‘ICE_DEV_ID_E83CC0_SFP_DD’?
>> 166 | case ICE_DEV_ID_E830CC_SFP_DD:
>> | ^~~~~~~~~~~~~~~~~~~~~~~~
>> | ICE_DEV_ID_E83CC0_SFP_DD
>>
>> ...
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-28 21:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-26 16:36 [Intel-wired-lan] [PATCH iwl-next v1 1/2] ice: add additional E830 device ids Paul Greenwalt
2024-03-26 16:36 ` [Intel-wired-lan] [PATCH iwl-next v1 2/2] ice: update E830 device ids and comments Paul Greenwalt
2024-03-28 21:16 ` Tony Nguyen
2024-03-28 21:37 ` Rustad, Mark D
2024-03-28 21:41 ` Tony Nguyen
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.