Skip to content
This repository was archived by the owner on Mar 9, 2026. It is now read-only.

Drop unused support for block aperture, fixing build with kernel 5.18 #194

Merged
nolanhergert merged 1 commit into from
Dec 5, 2023
Merged

Drop unused support for block aperture, fixing build with kernel 5.18 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions src/os/linux/lnx_system.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,61 +315,6 @@ int os_get_os_type()
return OS_TYPE_LINUX;
}

int get_supported_block_sizes(struct nvm_driver_capabilities *p_capabilities)
{
int rc = NVM_SUCCESS;
int found = 0;
struct ndctl_ctx *ctx;

p_capabilities->num_block_sizes = 0;

if ((rc = ndctl_new(&ctx)) >= 0)
{
struct ndctl_bus *bus;
ndctl_bus_foreach(ctx, bus)
{
struct ndctl_region *region;
ndctl_region_foreach(bus, region)
{
int nstype = ndctl_region_get_nstype(region);
if (ndctl_region_is_enabled(region) &&
(nstype == ND_DEVICE_NAMESPACE_BLK))
{
struct ndctl_namespace *namespace;
ndctl_namespace_foreach(region, namespace)
{
p_capabilities->num_block_sizes =
ndctl_namespace_get_num_sector_sizes(namespace);

for (int i = 0; i < p_capabilities->num_block_sizes; i++)
{
p_capabilities->block_sizes[i] =
ndctl_namespace_get_supported_sector_size(namespace, i);
}
found = 1;
break;
}
}
if (found)
{
break;
}
}
if (found)
{
break;
}
}
ndctl_unref(ctx);
}
else
{
rc = linux_err_to_nvm_lib_err(rc);
}

return rc;
}

int os_get_driver_capabilities(struct nvm_driver_capabilities *p_capabilities)
{
p_capabilities->features.get_platform_capabilities = 1;
Expand Down Expand Up @@ -399,7 +344,6 @@ int os_get_driver_capabilities(struct nvm_driver_capabilities *p_capabilities)
p_capabilities->features.app_direct_mode = 1;

p_capabilities->min_namespace_size = ndctl_min_namespace_size();
get_supported_block_sizes(p_capabilities);
p_capabilities->namespace_memory_page_allocation_capable = 1;
return 0;
}
Expand Down
2 changes: 0 additions & 2 deletions src/os/os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ struct driver_feature_flags

struct nvm_driver_capabilities
{
unsigned int block_sizes[MAX_NUMBER_OF_BLOCK_SIZES]; // in bytes
unsigned int num_block_sizes;
unsigned long long min_namespace_size; // in bytes
unsigned int namespace_memory_page_allocation_capable;
struct driver_feature_flags features;
Expand Down
2 changes: 0 additions & 2 deletions src/os/win/win_system.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,8 +830,6 @@ int os_get_driver_capabilities(struct nvm_driver_capabilities *p_capabilities)
memset(p_capabilities, 0, sizeof(struct nvm_driver_capabilities));

p_capabilities->min_namespace_size = BYTES_PER_GIB;
p_capabilities->num_block_sizes = 1;
p_capabilities->block_sizes[0] = 1;

p_capabilities->namespace_memory_page_allocation_capable = 0;
p_capabilities->features.get_platform_capabilities = 1;
Expand Down