Skip to content

Commit 4edbd11

Browse files
Gayatri Kammelajwrdegoede
authored andcommitted
platform/x86/intel/vsec: Add intel_vsec_register
Add and export intel_vsec_register() to allow the registration of Intel extended capabilities from other drivers. Add check to look for memory conflicts before registering a new capability. Since the vsec provider may not be a PCI device, add a parent field to intel_vsec_platform_info() to allow specifying the parent device for device managed cleanup. Signed-off-by: Gayatri Kammela <gayatri.kammela@linux.intel.com> Signed-off-by: David E. Box <david.e.box@linux.intel.com> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Link: https://lore.kernel.org/r/20231129222132.2331261-8-david.e.box@linux.intel.com Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 parent 6dfc251 commit 4edbd11

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

drivers/platform/x86/intel/vsec.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,15 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
152152
struct intel_vsec_device __free(kfree) *intel_vsec_dev = NULL;
153153
struct resource __free(kfree) *res = NULL;
154154
struct resource *tmp;
155+
struct device *parent;
155156
unsigned long quirks = info->quirks;
156157
int i;
157158

159+
if (info->parent)
160+
parent = info->parent;
161+
else
162+
parent = &pdev->dev;
163+
158164
if (!intel_vsec_supported(header->id, info->caps))
159165
return -EINVAL;
160166

@@ -189,6 +195,12 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
189195
header->offset + i * (header->entry_size * sizeof(u32));
190196
tmp->end = tmp->start + (header->entry_size * sizeof(u32)) - 1;
191197
tmp->flags = IORESOURCE_MEM;
198+
199+
/* Check resource is not in use */
200+
if (!request_mem_region(tmp->start, resource_size(tmp), ""))
201+
return -EBUSY;
202+
203+
release_mem_region(tmp->start, resource_size(tmp));
192204
}
193205

194206
intel_vsec_dev->pcidev = pdev;
@@ -205,7 +217,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he
205217
* Pass the ownership of intel_vsec_dev and resource within it to
206218
* intel_vsec_add_aux()
207219
*/
208-
return intel_vsec_add_aux(pdev, &pdev->dev, no_free_ptr(intel_vsec_dev),
220+
return intel_vsec_add_aux(pdev, parent, no_free_ptr(intel_vsec_dev),
209221
intel_vsec_name(header->id));
210222
}
211223

@@ -323,6 +335,16 @@ static bool intel_vsec_walk_vsec(struct pci_dev *pdev,
323335
return have_devices;
324336
}
325337

338+
void intel_vsec_register(struct pci_dev *pdev,
339+
struct intel_vsec_platform_info *info)
340+
{
341+
if (!pdev || !info)
342+
return;
343+
344+
intel_vsec_walk_header(pdev, info);
345+
}
346+
EXPORT_SYMBOL_NS_GPL(intel_vsec_register, INTEL_VSEC);
347+
326348
static int intel_vsec_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
327349
{
328350
struct intel_vsec_platform_info *info;

drivers/platform/x86/intel/vsec.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ enum intel_vsec_quirks {
6969

7070
/* Platform specific data */
7171
struct intel_vsec_platform_info {
72+
struct device *parent;
7273
struct intel_vsec_header **headers;
7374
unsigned long caps;
7475
unsigned long quirks;
@@ -99,4 +100,7 @@ static inline struct intel_vsec_device *auxdev_to_ivdev(struct auxiliary_device
99100
{
100101
return container_of(auxdev, struct intel_vsec_device, auxdev);
101102
}
103+
104+
void intel_vsec_register(struct pci_dev *pdev,
105+
struct intel_vsec_platform_info *info);
102106
#endif

0 commit comments

Comments
 (0)