* [PATCH net-next 1/8] igc: Remove unused _I_PHY_ID define
2021-12-21 18:01 [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 Tony Nguyen
@ 2021-12-21 18:01 ` Tony Nguyen
2021-12-21 18:01 ` [PATCH net-next 2/8] igc: Remove unused phy type Tony Nguyen
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Tony Nguyen @ 2021-12-21 18:01 UTC (permalink / raw)
To: davem, kuba; +Cc: Sasha Neftin, netdev, anthony.l.nguyen, Nechama Kraus
From: Sasha Neftin <sasha.neftin@intel.com>
_I_PHY_ID not in use. Clean up the code accordingly,
and get rid of the unused define
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Nechama Kraus <nechamax.kraus@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_defines.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h
index c7fe61509d5b..8b9b7ec20da7 100644
--- a/drivers/net/ethernet/intel/igc/igc_defines.h
+++ b/drivers/net/ethernet/intel/igc/igc_defines.h
@@ -605,9 +605,6 @@
#define PHY_1000T_CTRL 0x09 /* 1000Base-T Control Reg */
#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
-/* Bit definitions for valid PHY IDs. I = Integrated E = External */
-#define I225_I_PHY_ID 0x67C9DC00
-
/* MDI Control */
#define IGC_MDIC_DATA_MASK 0x0000FFFF
#define IGC_MDIC_REG_MASK 0x001F0000
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next 2/8] igc: Remove unused phy type
2021-12-21 18:01 [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 Tony Nguyen
2021-12-21 18:01 ` [PATCH net-next 1/8] igc: Remove unused _I_PHY_ID define Tony Nguyen
@ 2021-12-21 18:01 ` Tony Nguyen
2021-12-21 18:01 ` [PATCH net-next 3/8] igc: Remove obsolete nvm type Tony Nguyen
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Tony Nguyen @ 2021-12-21 18:01 UTC (permalink / raw)
To: davem, kuba
Cc: Sasha Neftin, netdev, anthony.l.nguyen, Paul Menzel,
Nechama Kraus
From: Sasha Neftin <sasha.neftin@intel.com>
_phy_none type not in use. Clean up the code accordingly,
and get rid of the unused enum line
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Tested-by: Nechama Kraus <nechamax.kraus@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_hw.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_hw.h b/drivers/net/ethernet/intel/igc/igc_hw.h
index 587db7483f25..76832e55cbbb 100644
--- a/drivers/net/ethernet/intel/igc/igc_hw.h
+++ b/drivers/net/ethernet/intel/igc/igc_hw.h
@@ -55,7 +55,6 @@ enum igc_mac_type {
enum igc_phy_type {
igc_phy_unknown = 0,
- igc_phy_none,
igc_phy_i225,
};
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next 3/8] igc: Remove obsolete nvm type
2021-12-21 18:01 [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 Tony Nguyen
2021-12-21 18:01 ` [PATCH net-next 1/8] igc: Remove unused _I_PHY_ID define Tony Nguyen
2021-12-21 18:01 ` [PATCH net-next 2/8] igc: Remove unused phy type Tony Nguyen
@ 2021-12-21 18:01 ` Tony Nguyen
2021-12-21 18:01 ` [PATCH net-next 4/8] igc: Remove obsolete mask Tony Nguyen
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Tony Nguyen @ 2021-12-21 18:01 UTC (permalink / raw)
To: davem, kuba; +Cc: Sasha Neftin, netdev, anthony.l.nguyen, Nechama Kraus
From: Sasha Neftin <sasha.neftin@intel.com>
i225 devices use only spi nvm type. This patch comes to tidy up
obsolete nvm types.
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Nechama Kraus <nechamax.kraus@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_hw.h | 2 --
drivers/net/ethernet/intel/igc/igc_i225.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_hw.h b/drivers/net/ethernet/intel/igc/igc_hw.h
index 76832e55cbbb..b1e72ec5f131 100644
--- a/drivers/net/ethernet/intel/igc/igc_hw.h
+++ b/drivers/net/ethernet/intel/igc/igc_hw.h
@@ -67,8 +67,6 @@ enum igc_media_type {
enum igc_nvm_type {
igc_nvm_unknown = 0,
igc_nvm_eeprom_spi,
- igc_nvm_flash_hw,
- igc_nvm_invm,
};
struct igc_info {
diff --git a/drivers/net/ethernet/intel/igc/igc_i225.c b/drivers/net/ethernet/intel/igc/igc_i225.c
index b6807e16eea9..66ea566488d1 100644
--- a/drivers/net/ethernet/intel/igc/igc_i225.c
+++ b/drivers/net/ethernet/intel/igc/igc_i225.c
@@ -473,13 +473,11 @@ s32 igc_init_nvm_params_i225(struct igc_hw *hw)
/* NVM Function Pointers */
if (igc_get_flash_presence_i225(hw)) {
- hw->nvm.type = igc_nvm_flash_hw;
nvm->ops.read = igc_read_nvm_srrd_i225;
nvm->ops.write = igc_write_nvm_srwr_i225;
nvm->ops.validate = igc_validate_nvm_checksum_i225;
nvm->ops.update = igc_update_nvm_checksum_i225;
} else {
- hw->nvm.type = igc_nvm_invm;
nvm->ops.read = igc_read_nvm_eerd;
nvm->ops.write = NULL;
nvm->ops.validate = NULL;
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next 4/8] igc: Remove obsolete mask
2021-12-21 18:01 [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 Tony Nguyen
` (2 preceding siblings ...)
2021-12-21 18:01 ` [PATCH net-next 3/8] igc: Remove obsolete nvm type Tony Nguyen
@ 2021-12-21 18:01 ` Tony Nguyen
2021-12-21 18:01 ` [PATCH net-next 5/8] igc: Remove obsolete define Tony Nguyen
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Tony Nguyen @ 2021-12-21 18:01 UTC (permalink / raw)
To: davem, kuba; +Cc: Sasha Neftin, netdev, anthony.l.nguyen, Nechama Kraus
From: Sasha Neftin <sasha.neftin@intel.com>
'IGC_CTRL_EXT_LINK_MODE_MASK' not in use. This patch comes to tidy up
obsolete define.
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Nechama Kraus <nechamax.kraus@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_defines.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h
index 8b9b7ec20da7..bf2c31d1549c 100644
--- a/drivers/net/ethernet/intel/igc/igc_defines.h
+++ b/drivers/net/ethernet/intel/igc/igc_defines.h
@@ -85,9 +85,6 @@
#define IGC_WUFC_EXT_FILTER_MASK GENMASK(31, 8)
-/* Physical Func Reset Done Indication */
-#define IGC_CTRL_EXT_LINK_MODE_MASK 0x00C00000
-
/* Loop limit on how long we wait for auto-negotiation to complete */
#define COPPER_LINK_UP_LIMIT 10
#define PHY_AUTO_NEG_LIMIT 45
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next 5/8] igc: Remove obsolete define
2021-12-21 18:01 [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 Tony Nguyen
` (3 preceding siblings ...)
2021-12-21 18:01 ` [PATCH net-next 4/8] igc: Remove obsolete mask Tony Nguyen
@ 2021-12-21 18:01 ` Tony Nguyen
2021-12-21 18:01 ` [PATCH net-next 6/8] igb: remove never changed variable `ret_val' Tony Nguyen
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Tony Nguyen @ 2021-12-21 18:01 UTC (permalink / raw)
To: davem, kuba; +Cc: Sasha Neftin, netdev, anthony.l.nguyen
From: Sasha Neftin <sasha.neftin@intel.com>
'MII_CR_FULL_DUPLEX' define not in use. This patch comes to tidy up
obsolete define.
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_defines.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h
index bf2c31d1549c..5c66b97c0cfa 100644
--- a/drivers/net/ethernet/intel/igc/igc_defines.h
+++ b/drivers/net/ethernet/intel/igc/igc_defines.h
@@ -581,7 +581,6 @@
#define IGC_GEN_POLL_TIMEOUT 1920
/* PHY Control Register */
-#define MII_CR_FULL_DUPLEX 0x0100 /* FDX =1, half duplex =0 */
#define MII_CR_RESTART_AUTO_NEG 0x0200 /* Restart auto negotiation */
#define MII_CR_POWER_DOWN 0x0800 /* Power down */
#define MII_CR_AUTO_NEG_EN 0x1000 /* Auto Neg Enable */
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next 6/8] igb: remove never changed variable `ret_val'
2021-12-21 18:01 [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 Tony Nguyen
` (4 preceding siblings ...)
2021-12-21 18:01 ` [PATCH net-next 5/8] igc: Remove obsolete define Tony Nguyen
@ 2021-12-21 18:01 ` Tony Nguyen
2021-12-21 18:01 ` [PATCH net-next 7/8] igbvf: Refactor trace Tony Nguyen
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Tony Nguyen @ 2021-12-21 18:01 UTC (permalink / raw)
To: davem, kuba; +Cc: Jason Wang, netdev, anthony.l.nguyen, Gurucharan G
From: Jason Wang <wangborong@cdjrlc.com>
The variable used for return status in `igb_write_xmdio_reg' function
is never changed and this function is just need return 0. Thus, the
`ret_val' can be removed and return 0 at the end of the
`igb_write_xmdio_reg' function.
Signed-off-by: Jason Wang <wangborong@cdjrlc.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igb/e1000_i210.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c
index 9265901455cd..b9b9d35494d2 100644
--- a/drivers/net/ethernet/intel/igb/e1000_i210.c
+++ b/drivers/net/ethernet/intel/igb/e1000_i210.c
@@ -792,7 +792,6 @@ s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data)
**/
s32 igb_init_nvm_params_i210(struct e1000_hw *hw)
{
- s32 ret_val = 0;
struct e1000_nvm_info *nvm = &hw->nvm;
nvm->ops.acquire = igb_acquire_nvm_i210;
@@ -813,7 +812,7 @@ s32 igb_init_nvm_params_i210(struct e1000_hw *hw)
nvm->ops.validate = NULL;
nvm->ops.update = NULL;
}
- return ret_val;
+ return 0;
}
/**
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next 7/8] igbvf: Refactor trace
2021-12-21 18:01 [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 Tony Nguyen
` (5 preceding siblings ...)
2021-12-21 18:01 ` [PATCH net-next 6/8] igb: remove never changed variable `ret_val' Tony Nguyen
@ 2021-12-21 18:01 ` Tony Nguyen
2021-12-21 18:02 ` [PATCH net-next 8/8] fm10k: Fix syntax errors in comments Tony Nguyen
2021-12-22 1:30 ` [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 patchwork-bot+netdevbpf
8 siblings, 0 replies; 10+ messages in thread
From: Tony Nguyen @ 2021-12-21 18:01 UTC (permalink / raw)
To: davem, kuba; +Cc: Karen Sornek, netdev, anthony.l.nguyen, Tony Brelinski
From: Karen Sornek <karen.sornek@intel.com>
Refactoring "PF still resetting" message, because previous version looked
like a bug - it informed about changes that worked as designed but might
confuse users. Changes requested to make message more user-friendly.
Signed-off-by: Karen Sornek <karen.sornek@intel.com>
Tested-by: Tony Brelinski <tony.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igbvf/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 4d988da68394..b78407289741 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1520,7 +1520,7 @@ static void igbvf_reset(struct igbvf_adapter *adapter)
/* Allow time for pending master requests to run */
if (mac->ops.reset_hw(hw))
- dev_warn(&adapter->pdev->dev, "PF still resetting\n");
+ dev_info(&adapter->pdev->dev, "PF still resetting\n");
mac->ops.init_hw(hw);
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next 8/8] fm10k: Fix syntax errors in comments
2021-12-21 18:01 [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 Tony Nguyen
` (6 preceding siblings ...)
2021-12-21 18:01 ` [PATCH net-next 7/8] igbvf: Refactor trace Tony Nguyen
@ 2021-12-21 18:02 ` Tony Nguyen
2021-12-22 1:30 ` [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 patchwork-bot+netdevbpf
8 siblings, 0 replies; 10+ messages in thread
From: Tony Nguyen @ 2021-12-21 18:02 UTC (permalink / raw)
To: davem, kuba; +Cc: Xiang wangx, netdev, anthony.l.nguyen
From: Xiang wangx <wangxiang@cdjrlc.com>
Delete the redundant word 'by'.
Signed-off-by: Xiang wangx <wangxiang@cdjrlc.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c
index 21eff0895a7a..f6d56867f857 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c
@@ -143,7 +143,7 @@ s32 fm10k_tlv_attr_put_mac_vlan(u32 *msg, u16 attr_id,
* @vlan: location of buffer to store VLAN
*
* This function pulls the MAC address back out of the attribute and will
- * place it in the array pointed by by mac_addr. It will return success
+ * place it in the array pointed by mac_addr. It will return success
* if provided with a valid pointers.
**/
s32 fm10k_tlv_attr_get_mac_vlan(u32 *attr, u8 *mac_addr, u16 *vlan)
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21
2021-12-21 18:01 [PATCH net-next 0/8][pull request] 1GbE Intel Wired LAN Driver Updates 2021-12-21 Tony Nguyen
` (7 preceding siblings ...)
2021-12-21 18:02 ` [PATCH net-next 8/8] fm10k: Fix syntax errors in comments Tony Nguyen
@ 2021-12-22 1:30 ` patchwork-bot+netdevbpf
8 siblings, 0 replies; 10+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-12-22 1:30 UTC (permalink / raw)
To: Tony Nguyen; +Cc: davem, kuba, netdev
Hello:
This series was applied to netdev/net-next.git (master)
by Tony Nguyen <anthony.l.nguyen@intel.com>:
On Tue, 21 Dec 2021 10:01:52 -0800 you wrote:
> This series contains updates to igc, igb, igbvf, and fm10k drivers.
>
> Sasha removes unused defines and enum values from igc driver.
>
> Jason Wang removes a variable whose value never changes and, instead,
> returns the value directly for igb.
>
> [...]
Here is the summary with links:
- [net-next,1/8] igc: Remove unused _I_PHY_ID define
https://git.kernel.org/netdev/net-next/c/7a34cda1ee8a
- [net-next,2/8] igc: Remove unused phy type
https://git.kernel.org/netdev/net-next/c/8e153faf5827
- [net-next,3/8] igc: Remove obsolete nvm type
https://git.kernel.org/netdev/net-next/c/2a8807a76589
- [net-next,4/8] igc: Remove obsolete mask
https://git.kernel.org/netdev/net-next/c/d2a66dd3fdd6
- [net-next,5/8] igc: Remove obsolete define
https://git.kernel.org/netdev/net-next/c/b8773a66f651
- [net-next,6/8] igb: remove never changed variable `ret_val'
https://git.kernel.org/netdev/net-next/c/890781af31a0
- [net-next,7/8] igbvf: Refactor trace
https://git.kernel.org/netdev/net-next/c/630f6edc4851
- [net-next,8/8] fm10k: Fix syntax errors in comments
https://git.kernel.org/netdev/net-next/c/37cf276df101
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 10+ messages in thread