| Message ID | 165712447305.6549.5015491740374054340.stgit@palantir17.mph.net (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | sfc: Add EF100 BAR config support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 81 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On Wed, Jul 06, 2022 at 05:21:13PM +0100, Martin Habets wrote: > 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. You probably should also Cc: the PCI maintainers. Andrew
On Wed, 6 Jul 2022 19:25:01 +0200 Andrew Lunn wrote: > On Wed, Jul 06, 2022 at 05:21:13PM +0100, Martin Habets wrote: > > 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. > > You probably should also Cc: the PCI maintainers. And virtio people, just in case.
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;
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 <habetsm.xilinx@gmail.com> --- drivers/net/ethernet/sfc/ef100_nic.c | 45 ++++++++++++++++++++++++++++++++++ drivers/net/ethernet/sfc/ef100_nic.h | 6 +++++ 2 files changed, 51 insertions(+)