* [PATCH net-next 0/2] stmmac: intel: minor clean-up
@ 2021-06-11 13:16 Wong Vee Khee
2021-06-11 13:16 ` [PATCH net-next 1/2] stmmac: intel: move definitions to dwmac-intel header file Wong Vee Khee
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Wong Vee Khee @ 2021-06-11 13:16 UTC (permalink / raw)
To: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin
Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel
This patch series include two minor-cleanup patches:
1. Move all the hardcoded DEFINEs to dwmac-intel header file.
2. Fix the wrong kernel-doc on the intel_eth_pci_remove() function.
Since the changes are minor, only basic sanity tests are done on a
Intel TigerLake with Marvell88E2110 PHY:-
- Link is up and able to perform ping.
- phc2sys and ptp4l are running without errors.
Wong Vee Khee (2):
stmmac: intel: move definitions to dwmac-intel header file
stmmac: intel: fix wrong kernel-doc
.../net/ethernet/stmicro/stmmac/dwmac-intel.c | 18 +-----------------
.../net/ethernet/stmicro/stmmac/dwmac-intel.h | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 17 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH net-next 1/2] stmmac: intel: move definitions to dwmac-intel header file
2021-06-11 13:16 [PATCH net-next 0/2] stmmac: intel: minor clean-up Wong Vee Khee
@ 2021-06-11 13:16 ` Wong Vee Khee
2021-06-11 13:16 ` [PATCH net-next 2/2] stmmac: intel: fix wrong kernel-doc Wong Vee Khee
2021-06-12 20:20 ` [PATCH net-next 0/2] stmmac: intel: minor clean-up patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Wong Vee Khee @ 2021-06-11 13:16 UTC (permalink / raw)
To: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin
Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel
Currently some of the dwmac-intel definitions are in the header file,
while some are in the driver source file. Cleaning this by moving all
the definitions to the header file.
Signed-off-by: Wong Vee Khee <vee.khee.wong@linux.intel.com>
---
.../net/ethernet/stmicro/stmmac/dwmac-intel.c | 16 ----------------
.../net/ethernet/stmicro/stmmac/dwmac-intel.h | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index 6a9a19b0844c..a38e47e6d470 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -10,22 +10,6 @@
#include "stmmac.h"
#include "stmmac_ptp.h"
-#define INTEL_MGBE_ADHOC_ADDR 0x15
-#define INTEL_MGBE_XPCS_ADDR 0x16
-
-/* Selection for PTP Clock Freq belongs to PSE & PCH GbE */
-#define PSE_PTP_CLK_FREQ_MASK (GMAC_GPO0 | GMAC_GPO3)
-#define PSE_PTP_CLK_FREQ_19_2MHZ (GMAC_GPO0)
-#define PSE_PTP_CLK_FREQ_200MHZ (GMAC_GPO0 | GMAC_GPO3)
-#define PSE_PTP_CLK_FREQ_256MHZ (0)
-#define PCH_PTP_CLK_FREQ_MASK (GMAC_GPO0)
-#define PCH_PTP_CLK_FREQ_19_2MHZ (GMAC_GPO0)
-#define PCH_PTP_CLK_FREQ_200MHZ (0)
-
-/* Cross-timestamping defines */
-#define ART_CPUID_LEAF 0x15
-#define EHL_PSE_ART_MHZ 19200000
-
struct intel_priv_data {
int mdio_adhoc_addr; /* mdio address for serdes & etc */
unsigned long crossts_adj;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h
index 20d14e588044..0a37987478c1 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h
@@ -34,4 +34,20 @@
#define SERDES_RATE_PCIE_SHIFT 8
#define SERDES_PCLK_SHIFT 12
+#define INTEL_MGBE_ADHOC_ADDR 0x15
+#define INTEL_MGBE_XPCS_ADDR 0x16
+
+/* Cross-timestamping defines */
+#define ART_CPUID_LEAF 0x15
+#define EHL_PSE_ART_MHZ 19200000
+
+/* Selection for PTP Clock Freq belongs to PSE & PCH GbE */
+#define PSE_PTP_CLK_FREQ_MASK (GMAC_GPO0 | GMAC_GPO3)
+#define PSE_PTP_CLK_FREQ_19_2MHZ (GMAC_GPO0)
+#define PSE_PTP_CLK_FREQ_200MHZ (GMAC_GPO0 | GMAC_GPO3)
+#define PSE_PTP_CLK_FREQ_256MHZ (0)
+#define PCH_PTP_CLK_FREQ_MASK (GMAC_GPO0)
+#define PCH_PTP_CLK_FREQ_19_2MHZ (GMAC_GPO0)
+#define PCH_PTP_CLK_FREQ_200MHZ (0)
+
#endif /* __DWMAC_INTEL_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH net-next 2/2] stmmac: intel: fix wrong kernel-doc
2021-06-11 13:16 [PATCH net-next 0/2] stmmac: intel: minor clean-up Wong Vee Khee
2021-06-11 13:16 ` [PATCH net-next 1/2] stmmac: intel: move definitions to dwmac-intel header file Wong Vee Khee
@ 2021-06-11 13:16 ` Wong Vee Khee
2021-06-12 20:20 ` [PATCH net-next 0/2] stmmac: intel: minor clean-up patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Wong Vee Khee @ 2021-06-11 13:16 UTC (permalink / raw)
To: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin
Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel
Kernel-doc for intel_eth_pci_remove is incorrect, pdev datatype is
struct pci_dev. Changed it to the 'pci device pointer'.
Signed-off-by: Wong Vee Khee <vee.khee.wong@linux.intel.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index a38e47e6d470..e0a7d2b17921 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -1087,7 +1087,7 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,
/**
* intel_eth_pci_remove
*
- * @pdev: platform device pointer
+ * @pdev: pci device pointer
* Description: this function calls the main to free the net resources
* and releases the PCI resources.
*/
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 0/2] stmmac: intel: minor clean-up
2021-06-11 13:16 [PATCH net-next 0/2] stmmac: intel: minor clean-up Wong Vee Khee
2021-06-11 13:16 ` [PATCH net-next 1/2] stmmac: intel: move definitions to dwmac-intel header file Wong Vee Khee
2021-06-11 13:16 ` [PATCH net-next 2/2] stmmac: intel: fix wrong kernel-doc Wong Vee Khee
@ 2021-06-12 20:20 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-12 20:20 UTC (permalink / raw)
To: Wong Vee Khee
Cc: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba,
mcoquelin.stm32, netdev, linux-stm32, linux-arm-kernel,
linux-kernel
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Fri, 11 Jun 2021 21:16:07 +0800 you wrote:
> This patch series include two minor-cleanup patches:
>
> 1. Move all the hardcoded DEFINEs to dwmac-intel header file.
> 2. Fix the wrong kernel-doc on the intel_eth_pci_remove() function.
>
> Since the changes are minor, only basic sanity tests are done on a
> Intel TigerLake with Marvell88E2110 PHY:-
>
> [...]
Here is the summary with links:
- [net-next,1/2] stmmac: intel: move definitions to dwmac-intel header file
https://git.kernel.org/netdev/net-next/c/fb9349c4163e
- [net-next,2/2] stmmac: intel: fix wrong kernel-doc
https://git.kernel.org/netdev/net-next/c/3c3ea630e87c
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] 4+ messages in thread
end of thread, other threads:[~2021-06-12 20:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-11 13:16 [PATCH net-next 0/2] stmmac: intel: minor clean-up Wong Vee Khee
2021-06-11 13:16 ` [PATCH net-next 1/2] stmmac: intel: move definitions to dwmac-intel header file Wong Vee Khee
2021-06-11 13:16 ` [PATCH net-next 2/2] stmmac: intel: fix wrong kernel-doc Wong Vee Khee
2021-06-12 20:20 ` [PATCH net-next 0/2] stmmac: intel: minor clean-up patchwork-bot+netdevbpf
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).