[net,v2] net: pch_gbe: Allow build on MIPS_GENERIC kernel

Message ID 20230607055953.34110-1-jiaxun.yang@flygoat.com
State New
Headers
Series [net,v2] net: pch_gbe: Allow build on MIPS_GENERIC kernel |

Commit Message

Jiaxun Yang June 7, 2023, 5:59 a.m. UTC
  MIPS Boston board, which is using MIPS_GENERIC kernel is using
EG20T PCH and thus need this driver.

Dependency of PCH_GBE, PTP_1588_CLOCK_PCH is also fixed for
MIPS_GENERIC.

Note that CONFIG_PCH_GBE is selected in arch/mips/configs/generic/
board-boston.config for a while, some how it's never wired up
in Kconfig.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
v2: Add PTP_1588_CLOCK_PCH dependency.

Netdev maintainers, is it possible to squeeze this tiny patch into
fixes tree?
---
 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 2 +-
 drivers/ptp/Kconfig                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
  

Comments

Jakub Kicinski June 7, 2023, 8:41 p.m. UTC | #1
On Wed,  7 Jun 2023 13:59:53 +0800 Jiaxun Yang wrote:
> v2: Add PTP_1588_CLOCK_PCH dependency.
> 
> Netdev maintainers, is it possible to squeeze this tiny patch into
> fixes tree?

Hm.. probably a little late for that. The first version didn't build,
feels too risky. We don't want to break the build of Linus's tree at
rc6/rc7. The merge window is two weeks out, is that really too long
of a wait?
  
Jiaxun Yang June 8, 2023, 4:44 a.m. UTC | #2
> 2023年6月8日 04:41,Jakub Kicinski <kuba@kernel.org> 写道:
> 
> On Wed,  7 Jun 2023 13:59:53 +0800 Jiaxun Yang wrote:
>> v2: Add PTP_1588_CLOCK_PCH dependency.
>> 
>> Netdev maintainers, is it possible to squeeze this tiny patch into
>> fixes tree?
> 
> Hm.. probably a little late for that. The first version didn't build,
> feels too risky. We don't want to break the build of Linus's tree at
> rc6/rc7. The merge window is two weeks out, is that really too long
> of a wait?

Ah if that’s the case waiting until next merge window is fine for me.

Thanks
Jiaxun
  
Simon Horman June 8, 2023, 12:08 p.m. UTC | #3
On Wed, Jun 07, 2023 at 01:59:53PM +0800, Jiaxun Yang wrote:
> MIPS Boston board, which is using MIPS_GENERIC kernel is using
> EG20T PCH and thus need this driver.
> 
> Dependency of PCH_GBE, PTP_1588_CLOCK_PCH is also fixed for
> MIPS_GENERIC.
> 
> Note that CONFIG_PCH_GBE is selected in arch/mips/configs/generic/
> board-boston.config for a while, some how it's never wired up
> in Kconfig.
> 
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
> v2: Add PTP_1588_CLOCK_PCH dependency.
> 
> Netdev maintainers, is it possible to squeeze this tiny patch into
> fixes tree?

That question aside, this looks good to me.

Reviewed-by: Simon Horman <simon.horman@corigine.com>
  
patchwork-bot+netdevbpf@kernel.org June 9, 2023, 2:30 a.m. UTC | #4
Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed,  7 Jun 2023 13:59:53 +0800 you wrote:
> MIPS Boston board, which is using MIPS_GENERIC kernel is using
> EG20T PCH and thus need this driver.
> 
> Dependency of PCH_GBE, PTP_1588_CLOCK_PCH is also fixed for
> MIPS_GENERIC.
> 
> Note that CONFIG_PCH_GBE is selected in arch/mips/configs/generic/
> board-boston.config for a while, some how it's never wired up
> in Kconfig.
> 
> [...]

Here is the summary with links:
  - [net,v2] net: pch_gbe: Allow build on MIPS_GENERIC kernel
    https://git.kernel.org/netdev/net-next/c/c8cc2ae229ff

You are awesome, thank you!
  

Patch

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
index 4e18b64dceb9..9651cc714ef2 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
@@ -5,7 +5,7 @@ 
 
 config PCH_GBE
 	tristate "OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE"
-	depends on PCI && (X86_32 || COMPILE_TEST)
+	depends on PCI && (MIPS_GENERIC || X86_32 || COMPILE_TEST)
 	depends on PTP_1588_CLOCK
 	select MII
 	select PTP_1588_CLOCK_PCH
diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index b00201d81313..32dff1b4f891 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -102,7 +102,7 @@  config PTP_1588_CLOCK_INES
 
 config PTP_1588_CLOCK_PCH
 	tristate "Intel PCH EG20T as PTP clock"
-	depends on X86_32 || COMPILE_TEST
+	depends on MIPS_GENERIC || X86_32 || COMPILE_TEST
 	depends on HAS_IOMEM && PCI
 	depends on NET
 	depends on PTP_1588_CLOCK