Only one device-tree overlay (lan966x_evb_lan9662_nic.dtbo) is handled
and this overlay is directly referenced in lan966x_pci_load_overlay().
This avoid to use the code for an other board.
In order to be more generic and to allow support for other boards (PCI
Vendor/Device IDs), introduce the lan966x_pci_info structure and attach
it to PCI Vendor/Device IDs handled by the driver.
This structure contains information related to the PCI board such as
information related to the dtbo describing the board we have to load.
Signed-off-by: Herve Codina <herve.codina@xxxxxxxxxxx>
Reviewed-by: Andrew Lunn <andrew@xxxxxxx>
---
drivers/misc/lan966x_pci.c | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/drivers/misc/lan966x_pci.c b/drivers/misc/lan966x_pci.c
index e60ab662b8f3..5fa6af531a53 100644
--- a/drivers/misc/lan966x_pci.c
+++ b/drivers/misc/lan966x_pci.c
@@ -18,10 +18,6 @@
#include <linux/pci_ids.h>
#include <linux/slab.h>
-/* Embedded dtbo symbols created by cmd_wrap_S_dtb in scripts/Makefile.lib */
-extern char __dtbo_lan966x_evb_lan9662_nic_begin[];
-extern char __dtbo_lan966x_evb_lan9662_nic_end[];
-
struct pci_dev_intr_ctrl {
struct pci_dev *pci_dev;
struct irq_domain *irq_domain;
@@ -118,17 +114,23 @@ static int devm_pci_dev_create_intr_ctrl(struct pci_dev *pdev)
return devm_add_action_or_reset(&pdev->dev, devm_pci_dev_remove_intr_ctrl, intr_ctrl);
}
+struct lan966x_pci_info {
+ void *dtbo_begin;
+ void *dtbo_end;
+};
+
struct lan966x_pci {
struct device *dev;
int ovcs_id;
+ const struct lan966x_pci_info *info;
};
static int lan966x_pci_load_overlay(struct lan966x_pci *data)
{
- u32 dtbo_size = __dtbo_lan966x_evb_lan9662_nic_end - __dtbo_lan966x_evb_lan9662_nic_begin;
- void *dtbo_start = __dtbo_lan966x_evb_lan9662_nic_begin;
+ const struct lan966x_pci_info *info = data->info;
- return of_overlay_fdt_apply(dtbo_start, dtbo_size, &data->ovcs_id, dev_of_node(data->dev));
+ return of_overlay_fdt_apply(info->dtbo_begin, info->dtbo_end - info->dtbo_begin,
+ &data->ovcs_id, dev_of_node(data->dev));
}
static void lan966x_pci_unload_overlay(struct lan966x_pci *data)
@@ -169,6 +171,9 @@ static int lan966x_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
pci_set_drvdata(pdev, data);
data->dev = dev;
+ data->info = (const struct lan966x_pci_info *)id->driver_data;
+ if (!data->info)
+ return -EINVAL;
ret = lan966x_pci_load_overlay(data);
if (ret)
@@ -196,8 +201,17 @@ static void lan966x_pci_remove(struct pci_dev *pdev)
lan966x_pci_unload_overlay(data);
}
+/* Embedded dtbo symbols created by cmd_wrap_S_dtb in scripts/Makefile.lib */
+extern char __dtbo_lan966x_evb_lan9662_nic_begin[];
+extern char __dtbo_lan966x_evb_lan9662_nic_end[];
+
+static struct lan966x_pci_info evb_lan9662_nic_info = {
+ .dtbo_begin = __dtbo_lan966x_evb_lan9662_nic_begin,
+ .dtbo_end = __dtbo_lan966x_evb_lan9662_nic_end,
+};
+
static struct pci_device_id lan966x_pci_ids[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_LAN9662) },
+ { PCI_DEVICE_DATA(EFAR, LAN9662, &evb_lan9662_nic_info) },
{ }
};
MODULE_DEVICE_TABLE(pci, lan966x_pci_ids);
--
2.49.0
