|
@@ -45,6 +45,8 @@ MODULE_DESCRIPTION("FUJITSU Extended Socket Network Device Driver");
|
|
|
MODULE_LICENSE("GPL");
|
|
|
MODULE_VERSION(DRV_VERSION);
|
|
|
|
|
|
+#define ACPI_MOTHERBOARD_RESOURCE_HID "PNP0C02"
|
|
|
+
|
|
|
static int fjes_request_irq(struct fjes_adapter *);
|
|
|
static void fjes_free_irq(struct fjes_adapter *);
|
|
|
|
|
@@ -78,7 +80,7 @@ static void fjes_rx_irq(struct fjes_adapter *, int);
|
|
|
static int fjes_poll(struct napi_struct *, int);
|
|
|
|
|
|
static const struct acpi_device_id fjes_acpi_ids[] = {
|
|
|
- {"PNP0C02", 0},
|
|
|
+ {ACPI_MOTHERBOARD_RESOURCE_HID, 0},
|
|
|
{"", 0},
|
|
|
};
|
|
|
MODULE_DEVICE_TABLE(acpi, fjes_acpi_ids);
|
|
@@ -115,18 +117,17 @@ static struct resource fjes_resource[] = {
|
|
|
},
|
|
|
};
|
|
|
|
|
|
-static int fjes_acpi_add(struct acpi_device *device)
|
|
|
+static bool is_extended_socket_device(struct acpi_device *device)
|
|
|
{
|
|
|
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL};
|
|
|
char str_buf[sizeof(FJES_ACPI_SYMBOL) + 1];
|
|
|
- struct platform_device *plat_dev;
|
|
|
union acpi_object *str;
|
|
|
acpi_status status;
|
|
|
int result;
|
|
|
|
|
|
status = acpi_evaluate_object(device->handle, "_STR", NULL, &buffer);
|
|
|
if (ACPI_FAILURE(status))
|
|
|
- return -ENODEV;
|
|
|
+ return false;
|
|
|
|
|
|
str = buffer.pointer;
|
|
|
result = utf16s_to_utf8s((wchar_t *)str->string.pointer,
|
|
@@ -136,10 +137,21 @@ static int fjes_acpi_add(struct acpi_device *device)
|
|
|
|
|
|
if (strncmp(FJES_ACPI_SYMBOL, str_buf, strlen(FJES_ACPI_SYMBOL)) != 0) {
|
|
|
kfree(buffer.pointer);
|
|
|
- return -ENODEV;
|
|
|
+ return false;
|
|
|
}
|
|
|
kfree(buffer.pointer);
|
|
|
|
|
|
+ return true;
|
|
|
+}
|
|
|
+
|
|
|
+static int fjes_acpi_add(struct acpi_device *device)
|
|
|
+{
|
|
|
+ struct platform_device *plat_dev;
|
|
|
+ acpi_status status;
|
|
|
+
|
|
|
+ if (!is_extended_socket_device(device))
|
|
|
+ return -ENODEV;
|
|
|
+
|
|
|
status = acpi_walk_resources(device->handle, METHOD_NAME__CRS,
|
|
|
fjes_get_acpi_resource, fjes_resource);
|
|
|
if (ACPI_FAILURE(status))
|
|
@@ -1473,11 +1485,41 @@ static void fjes_watch_unshare_task(struct work_struct *work)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+static acpi_status
|
|
|
+acpi_find_extended_socket_device(acpi_handle obj_handle, u32 level,
|
|
|
+ void *context, void **return_value)
|
|
|
+{
|
|
|
+ struct acpi_device *device;
|
|
|
+ bool *found = context;
|
|
|
+ int result;
|
|
|
+
|
|
|
+ result = acpi_bus_get_device(obj_handle, &device);
|
|
|
+ if (result)
|
|
|
+ return AE_OK;
|
|
|
+
|
|
|
+ if (strcmp(acpi_device_hid(device), ACPI_MOTHERBOARD_RESOURCE_HID))
|
|
|
+ return AE_OK;
|
|
|
+
|
|
|
+ if (!is_extended_socket_device(device))
|
|
|
+ return AE_OK;
|
|
|
+
|
|
|
+ *found = true;
|
|
|
+ return AE_CTRL_TERMINATE;
|
|
|
+}
|
|
|
+
|
|
|
/* fjes_init_module - Driver Registration Routine */
|
|
|
static int __init fjes_init_module(void)
|
|
|
{
|
|
|
+ bool found = false;
|
|
|
int result;
|
|
|
|
|
|
+ acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
|
|
|
+ acpi_find_extended_socket_device, NULL, &found,
|
|
|
+ NULL);
|
|
|
+
|
|
|
+ if (!found)
|
|
|
+ return -ENODEV;
|
|
|
+
|
|
|
pr_info("%s - version %s - %s\n",
|
|
|
fjes_driver_string, fjes_driver_version, fjes_copyright);
|
|
|
|