From patchwork Wed Jul 6 16:21:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Habets X-Patchwork-Id: 12908276 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18317C43334 for ; Wed, 6 Jul 2022 16:21:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233806AbiGFQV2 (ORCPT ); Wed, 6 Jul 2022 12:21:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232523AbiGFQV1 (ORCPT ); Wed, 6 Jul 2022 12:21:27 -0400 Received: from mint-fitpc2.mph.net (unknown [81.168.73.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1B075193E6 for ; Wed, 6 Jul 2022 09:21:21 -0700 (PDT) Received: from palantir17.mph.net (unknown [192.168.0.4]) by mint-fitpc2.mph.net (Postfix) with ESMTP id 4F0E632092A; Wed, 6 Jul 2022 17:21:20 +0100 (BST) Received: from localhost ([::1] helo=palantir17.mph.net) by palantir17.mph.net with esmtp (Exim 4.95) (envelope-from ) id 1o97m5-0001iR-5f; Wed, 06 Jul 2022 17:21:13 +0100 Subject: [PATCH net-next 1/2] sfc: Add EF100 BAR config support From: Martin Habets To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com Cc: netdev@vger.kernel.org, ecree.xilinx@gmail.com Date: Wed, 06 Jul 2022 17:21:13 +0100 Message-ID: <165712447305.6549.5015491740374054340.stgit@palantir17.mph.net> In-Reply-To: <165712441387.6549.4915238154843073311.stgit@palantir17.mph.net> References: <165712441387.6549.4915238154843073311.stgit@palantir17.mph.net> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Provide a "bar_config" file in the sysfs directory of the PCI device. This can be used to switch the PCI BAR layout to/from vDPA mode. Signed-off-by: Martin Habets --- drivers/net/ethernet/sfc/ef100_nic.c | 45 ++++++++++++++++++++++++++++++++++ drivers/net/ethernet/sfc/ef100_nic.h | 6 +++++ 2 files changed, 51 insertions(+) diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c index f89e695cf8ac..218db3cb31eb 100644 --- a/drivers/net/ethernet/sfc/ef100_nic.c +++ b/drivers/net/ethernet/sfc/ef100_nic.c @@ -704,6 +704,49 @@ static unsigned int efx_ef100_recycle_ring_size(const struct efx_nic *efx) return 10 * EFX_RECYCLE_RING_SIZE_10G; } +/* BAR configuration */ +static ssize_t bar_config_show(struct device *dev, + struct device_attribute *attr, char *buf_out) +{ + struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev)); + struct ef100_nic_data *nic_data = efx->nic_data; + + switch (nic_data->bar_config) { + case EF100_BAR_CONFIG_EF100: + sprintf(buf_out, "EF100\n"); + break; + case EF100_BAR_CONFIG_VDPA: + sprintf(buf_out, "vDPA\n"); + break; + default: /* this should not happen */ + WARN_ON_ONCE(1); + return 0; + } + + return strlen(buf_out); +} + +static ssize_t bar_config_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev)); + struct ef100_nic_data *nic_data = efx->nic_data; + enum ef100_bar_config new_config; + + if (!strncasecmp(buf, "ef100", min_t(size_t, count, 5))) + new_config = EF100_BAR_CONFIG_EF100; + else if (!strncasecmp(buf, "vdpa", min_t(size_t, count, 4))) + new_config = EF100_BAR_CONFIG_VDPA; + else + return -EIO; + + nic_data->bar_config = new_config; + return count; +} + +static DEVICE_ATTR_RW(bar_config); + static int compare_versions(const char *a, const char *b) { int a_major, a_minor, a_point, a_patch; @@ -1039,6 +1082,7 @@ static int ef100_probe_main(struct efx_nic *efx) goto fail; } + device_create_file(&efx->pci_dev->dev, &dev_attr_bar_config); return 0; fail: return rc; @@ -1072,6 +1116,7 @@ void ef100_remove(struct efx_nic *efx) { struct ef100_nic_data *nic_data = efx->nic_data; + device_remove_file(&efx->pci_dev->dev, &dev_attr_bar_config); efx_mcdi_detach(efx); efx_mcdi_fini(efx); if (nic_data) diff --git a/drivers/net/ethernet/sfc/ef100_nic.h b/drivers/net/ethernet/sfc/ef100_nic.h index 744dbbdb4adc..64b82cae6b54 100644 --- a/drivers/net/ethernet/sfc/ef100_nic.h +++ b/drivers/net/ethernet/sfc/ef100_nic.h @@ -61,6 +61,11 @@ enum { EF100_STAT_COUNT }; +enum ef100_bar_config { + EF100_BAR_CONFIG_EF100, + EF100_BAR_CONFIG_VDPA, +}; + struct ef100_nic_data { struct efx_nic *efx; struct efx_buffer mcdi_buf; @@ -70,6 +75,7 @@ struct ef100_nic_data { unsigned int pf_index; u16 warm_boot_count; u8 port_id[ETH_ALEN]; + enum ef100_bar_config bar_config; DECLARE_BITMAP(evq_phases, EFX_MAX_CHANNELS); u64 stats[EF100_STAT_COUNT]; u16 tso_max_hdr_len; From patchwork Wed Jul 6 16:21:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Habets X-Patchwork-Id: 12908277 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78AD0C43334 for ; Wed, 6 Jul 2022 16:21:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233342AbiGFQVf (ORCPT ); Wed, 6 Jul 2022 12:21:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232523AbiGFQVe (ORCPT ); Wed, 6 Jul 2022 12:21:34 -0400 Received: from mint-fitpc2.mph.net (unknown [81.168.73.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id F134413D1E for ; Wed, 6 Jul 2022 09:21:30 -0700 (PDT) Received: from palantir17.mph.net (unknown [192.168.0.4]) by mint-fitpc2.mph.net (Postfix) with ESMTP id 4DFA63201DA; Wed, 6 Jul 2022 17:21:30 +0100 (BST) Received: from localhost ([::1] helo=palantir17.mph.net) by palantir17.mph.net with esmtp (Exim 4.95) (envelope-from ) id 1o97mH-0001ie-Im; Wed, 06 Jul 2022 17:21:25 +0100 Subject: [PATCH net-next 2/2] sfc: Implement change of BAR configuration From: Martin Habets To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com Cc: netdev@vger.kernel.org, ecree.xilinx@gmail.com Date: Wed, 06 Jul 2022 17:21:25 +0100 Message-ID: <165712448547.6549.16558323295042569801.stgit@palantir17.mph.net> In-Reply-To: <165712441387.6549.4915238154843073311.stgit@palantir17.mph.net> References: <165712441387.6549.4915238154843073311.stgit@palantir17.mph.net> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Placeholders are added for vDPA. These will be assigned with a later patch. Signed-off-by: Martin Habets --- drivers/net/ethernet/sfc/ef100_nic.c | 39 ++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c index 218db3cb31eb..ce4b7b4e705e 100644 --- a/drivers/net/ethernet/sfc/ef100_nic.c +++ b/drivers/net/ethernet/sfc/ef100_nic.c @@ -704,7 +704,25 @@ static unsigned int efx_ef100_recycle_ring_size(const struct efx_nic *efx) return 10 * EFX_RECYCLE_RING_SIZE_10G; } -/* BAR configuration */ +/* BAR configuration. + * To change BAR configuration we tear down the current configuration (which + * leaves the hardware in the PROBED state), and then initialise the new + * BAR state. + */ +static struct { + int (*init)(struct efx_probe_data *probe_data); + void (*fini)(struct efx_probe_data *probe_data); +} bar_config_std[] = { + [EF100_BAR_CONFIG_EF100] = { + .init = ef100_probe_netdev, + .fini = ef100_remove_netdev + }, + [EF100_BAR_CONFIG_VDPA] = { + .init = NULL, /* TODO: assign these */ + .fini = NULL + }, +}; + static ssize_t bar_config_show(struct device *dev, struct device_attribute *attr, char *buf_out) { @@ -732,7 +750,9 @@ static ssize_t bar_config_store(struct device *dev, { struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev)); struct ef100_nic_data *nic_data = efx->nic_data; - enum ef100_bar_config new_config; + enum ef100_bar_config new_config, old_config; + struct efx_probe_data *probe_data; + int rc; if (!strncasecmp(buf, "ef100", min_t(size_t, count, 5))) new_config = EF100_BAR_CONFIG_EF100; @@ -741,7 +761,22 @@ static ssize_t bar_config_store(struct device *dev, else return -EIO; + old_config = nic_data->bar_config; + if (new_config == old_config) + return count; + + probe_data = container_of(efx, struct efx_probe_data, efx); + if (bar_config_std[old_config].fini) + bar_config_std[old_config].fini(probe_data); + nic_data->bar_config = new_config; + if (bar_config_std[new_config].init) { + rc = bar_config_std[new_config].init(probe_data); + if (rc) + return rc; + } + + pci_info(efx->pci_dev, "BAR configuration changed to %s", buf); return count; }