[net-next,23/28] siena: Make MTD support specific for Siena

Message ID	165063971588.27138.2375274797489140212.stgit@palantir17.mph.net (mailing list archive)
State	Superseded
Delegated to:	Netdev Maintainers
Headers	show Return-Path: <netdev-owner@kernel.org> Subject: [PATCH net-next 23/28] siena: Make MTD support specific for Siena From: Martin Habets <habetsm.xilinx@gmail.com> To: kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net Cc: netdev@vger.kernel.org, ecree.xilinx@gmail.com Date: Fri, 22 Apr 2022 16:01:55 +0100 Message-ID: <165063971588.27138.2375274797489140212.stgit@palantir17.mph.net> In-Reply-To: <165063937837.27138.6911229584057659609.stgit@palantir17.mph.net> References: <165063937837.27138.6911229584057659609.stgit@palantir17.mph.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk
Series	: Move Siena into a separate subdirectory \| expand [linx-net,00/28] : Move Siena into a separate subdirectory [net-next,01/28] sfc: Disable Siena support [net-next,02/28] sfc: Move Siena specific files [net-next,03/28] sfc: Copy shared files needed for Siena [net-next,04/28] sfc: Remove build references to missing functionality [net-next,05/28] sfc/siena: Rename functions in efx_common.h to avoid conflicts with sfc [net-next,06/28] sfc/siena: Rename functions in efx.h to avoid conflicts with sfc [net-next,07/28] sfc/siena: Rename functions in efx_channels.h to avoid conflicts with sfc [net-next,08/28] sfc/siena: Update nic.h to avoid conflicts with sfc [net-next,09/28] sfc/siena: Remove unused functions in tx.h to avoid conflicts with sfc [net-next,10/28] sfc/siena: Rename functions in rx_common.h to avoid conflicts with sfc [net-next,11/28] sfc/siena: Rename functions in tx_common.h to avoid conflicts with sfc [net-next,12/28] sfc/siena: Rename functions in selftest.h to avoid conflicts with sfc [net-next,13/28] sfc/siena: Rename functions in ethtool_common.h to avoid conflicts with sfc [net-next,14/28] sfc/siena: Rename functions in ptp.h to avoid conflicts with sfc [net-next,15/28] sfc/siena: Rename functions in mcdi.h to avoid conflicts with sfc [net-next,16/28] sfc/siena: Rename functions in mcdi_port.h to avoid conflicts with sfc [net-next,17/28] sfc/siena: Rename functions in mcdi_port_common.h to avoid conflicts with sfc [net-next,18/28] sfc/siena: Rename loopback_mode in net_driver.h to avoid a conflict with sfc [net-next,19/28] sfc/siena: Rename functions in nic_common.h to avoid conflicts with sfc [net-next,20/28] sfc/siena: Inline functions in sriov.h to avoid conflicts with sfc [net-next,21/28] sfc: Add a basic Siena module [net-next,22/28] siena: Make the (un)load message more specific [net-next,23/28] siena: Make MTD support specific for Siena [net-next,24/28] siena: Make SRIOV support specific for Siena [net-next,25/28] siena: Make HWMON support specific for Siena [net-next,26/28] sfc/siena: Make MCDI logging support specific for Siena [net-next,27/28] sfc/siena: Make PTP and reset support specific for Siena [net-next,28/28] sfc/siena: Reinstate SRIOV init/fini function calls

diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig index 98db551ba2b7..79b8ccaeee01 100644 --- a/drivers/net/ethernet/sfc/Kconfig +++ b/drivers/net/ethernet/sfc/Kconfig @@ -32,7 +32,7 @@ config SFC To compile this driver as a module, choose M here. The module will be called sfc. config SFC_MTD - bool "Solarflare SFC9000/SFC9100-family MTD support" + bool "Solarflare SFC9100-family MTD support" depends on SFC && MTD && !(SFC=y && MTD=m) default y help diff --git a/drivers/net/ethernet/sfc/siena/Kconfig b/drivers/net/ethernet/sfc/siena/Kconfig index 3d52aee50d5a..805b902f903d 100644 --- a/drivers/net/ethernet/sfc/siena/Kconfig +++ b/drivers/net/ethernet/sfc/siena/Kconfig @@ -10,3 +10,11 @@ config SFC_SIENA To compile this driver as a module, choose M here. The module will be called sfc-siena. +config SFC_SIENA_MTD + bool "Solarflare SFC9000-family MTD support" + depends on SFC_SIENA && MTD && !(SFC_SIENA=y && MTD=m) + default y + help + This exposes the on-board flash and/or EEPROM as MTD devices + (e.g. /dev/mtd1). This is required to update the firmware or + the boot configuration under Linux. diff --git a/drivers/net/ethernet/sfc/siena/Makefile b/drivers/net/ethernet/sfc/siena/Makefile index 74cb8b7d281e..3729095a51d9 100644 --- a/drivers/net/ethernet/sfc/siena/Makefile +++ b/drivers/net/ethernet/sfc/siena/Makefile @@ -5,7 +5,7 @@ sfc-siena-y += farch.o siena.o \ selftest.o ethtool.o ethtool_common.o ptp.o \ mcdi.o mcdi_port.o mcdi_port_common.o \ mcdi_mon.o -sfc-siena-$(CONFIG_SFC_MTD) += mtd.o -sfc-siena-$(CONFIG_SFC_SRIOV) += siena_sriov.o +sfc-siena-$(CONFIG_SFC_SIENA_MTD) += mtd.o +sfc-siena-$(CONFIG_SFC_SRIOV) += siena_sriov.o obj-$(CONFIG_SFC_SIENA) += sfc-siena.o diff --git a/drivers/net/ethernet/sfc/siena/efx.h b/drivers/net/ethernet/sfc/siena/efx.h index f91f3c94a275..1d9755e59d75 100644 --- a/drivers/net/ethernet/sfc/siena/efx.h +++ b/drivers/net/ethernet/sfc/siena/efx.h @@ -162,7 +162,7 @@ void efx_siena_get_irq_moderation(struct efx_nic *efx, unsigned int *tx_usecs, void efx_siena_update_sw_stats(struct efx_nic *efx, u64 *stats); /* MTD */ -#ifdef CONFIG_SFC_MTD +#ifdef CONFIG_SFC_SIENA_MTD int efx_siena_mtd_add(struct efx_nic *efx, struct efx_mtd_partition *parts, size_t n_parts, size_t sizeof_part); static inline int efx_mtd_probe(struct efx_nic *efx) diff --git a/drivers/net/ethernet/sfc/siena/efx_common.c b/drivers/net/ethernet/sfc/siena/efx_common.c index b44a7114e319..7c400fd590f5 100644 --- a/drivers/net/ethernet/sfc/siena/efx_common.c +++ b/drivers/net/ethernet/sfc/siena/efx_common.c @@ -997,7 +997,7 @@ int efx_siena_init_struct(struct efx_nic *efx, INIT_LIST_HEAD(&efx->node); INIT_LIST_HEAD(&efx->secondary_list); spin_lock_init(&efx->biu_lock); -#ifdef CONFIG_SFC_MTD +#ifdef CONFIG_SFC_SIENA_MTD INIT_LIST_HEAD(&efx->mtd_list); #endif INIT_WORK(&efx->reset_work, efx_reset_work); diff --git a/drivers/net/ethernet/sfc/siena/mcdi.c b/drivers/net/ethernet/sfc/siena/mcdi.c index eb13aa59fe50..b767e29cfe92 100644 --- a/drivers/net/ethernet/sfc/siena/mcdi.c +++ b/drivers/net/ethernet/sfc/siena/mcdi.c @@ -2014,7 +2014,7 @@ int efx_siena_mcdi_wol_filter_reset(struct efx_nic *efx) return rc; } -#ifdef CONFIG_SFC_MTD +#ifdef CONFIG_SFC_SIENA_MTD #define EFX_MCDI_NVRAM_LEN_MAX 128 @@ -2256,4 +2256,4 @@ void efx_siena_mcdi_mtd_rename(struct efx_mtd_partition *part) efx->name, part->type_name, mcdi_part->fw_subtype); } -#endif /* CONFIG_SFC_MTD */ +#endif /* CONFIG_SFC_SIENA_MTD */ diff --git a/drivers/net/ethernet/sfc/siena/mcdi.h b/drivers/net/ethernet/sfc/siena/mcdi.h index dcebdbf956ce..64990f398e67 100644 --- a/drivers/net/ethernet/sfc/siena/mcdi.h +++ b/drivers/net/ethernet/sfc/siena/mcdi.h @@ -373,7 +373,7 @@ static inline int efx_siena_mcdi_mon_probe(struct efx_nic *efx) { return 0; } static inline void efx_siena_mcdi_mon_remove(struct efx_nic *efx) {} #endif -#ifdef CONFIG_SFC_MTD +#ifdef CONFIG_SFC_SIENA_MTD int efx_siena_mcdi_mtd_read(struct mtd_info *mtd, loff_t start, size_t len, size_t *retlen, u8 *buffer); int efx_siena_mcdi_mtd_erase(struct mtd_info *mtd, loff_t start, size_t len); diff --git a/drivers/net/ethernet/sfc/siena/net_driver.h b/drivers/net/ethernet/sfc/siena/net_driver.h index 7e0659be4348..6af172fb0b10 100644 --- a/drivers/net/ethernet/sfc/siena/net_driver.h +++ b/drivers/net/ethernet/sfc/siena/net_driver.h @@ -1031,7 +1031,7 @@ struct efx_nic { unsigned irq_level; struct delayed_work selftest_work; -#ifdef CONFIG_SFC_MTD +#ifdef CONFIG_SFC_SIENA_MTD struct list_head mtd_list; #endif @@ -1411,7 +1411,7 @@ struct efx_nic_type { bool (*filter_rfs_expire_one)(struct efx_nic *efx, u32 flow_id, unsigned int index); #endif -#ifdef CONFIG_SFC_MTD +#ifdef CONFIG_SFC_SIENA_MTD int (*mtd_probe)(struct efx_nic *efx); void (*mtd_rename)(struct efx_mtd_partition *part); int (*mtd_read)(struct mtd_info *mtd, loff_t start, size_t len, diff --git a/drivers/net/ethernet/sfc/siena/siena.c b/drivers/net/ethernet/sfc/siena/siena.c index 741313aff1d1..9fe8ffc3a8d3 100644 --- a/drivers/net/ethernet/sfc/siena/siena.c +++ b/drivers/net/ethernet/sfc/siena/siena.c @@ -830,7 +830,7 @@ static int siena_mcdi_poll_reboot(struct efx_nic *efx) ************************************************************************** */ -#ifdef CONFIG_SFC_MTD +#ifdef CONFIG_SFC_SIENA_MTD struct siena_nvram_type_info { int port; @@ -954,7 +954,7 @@ static int siena_mtd_probe(struct efx_nic *efx) return rc; } -#endif /* CONFIG_SFC_MTD */ +#endif /* CONFIG_SFC_SIENA_MTD */ static unsigned int siena_check_caps(const struct efx_nic *efx, u8 flag, u32 offset) @@ -1058,7 +1058,7 @@ const struct efx_nic_type siena_a0_nic_type = { #ifdef CONFIG_RFS_ACCEL .filter_rfs_expire_one = efx_farch_filter_rfs_expire_one, #endif -#ifdef CONFIG_SFC_MTD +#ifdef CONFIG_SFC_SIENA_MTD .mtd_probe = siena_mtd_probe, .mtd_rename = efx_siena_mcdi_mtd_rename, .mtd_read = efx_siena_mcdi_mtd_read,

[net-next,23/28] siena: Make MTD support specific for Siena

Commit Message

Patch