PCI/ACPI: Use dev_printk(), acpi_handle_print(), pr_xxx() when possible
Use dev_printk(), acpi_handle_print(), and pr_xxx() to print messages in pci_root.c. [bhelgaas: fold in dev_printk() changes, use dev_printk() in handle_root_bridge_insertion()] Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Len Brown <lenb@kernel.org>
This commit is contained in:
parent
bbebed6423
commit
6dc7d22c67
|
@ -388,7 +388,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
|
||||||
status = acpi_evaluate_integer(handle, METHOD_NAME__SEG, NULL,
|
status = acpi_evaluate_integer(handle, METHOD_NAME__SEG, NULL,
|
||||||
&segment);
|
&segment);
|
||||||
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
|
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
|
||||||
printk(KERN_ERR PREFIX "can't evaluate _SEG\n");
|
dev_err(&device->dev, "can't evaluate _SEG\n");
|
||||||
result = -ENODEV;
|
result = -ENODEV;
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
@ -404,8 +404,8 @@ static int acpi_pci_root_add(struct acpi_device *device,
|
||||||
* can do is assume [_BBN-0xFF] or [0-0xFF].
|
* can do is assume [_BBN-0xFF] or [0-0xFF].
|
||||||
*/
|
*/
|
||||||
root->secondary.end = 0xFF;
|
root->secondary.end = 0xFF;
|
||||||
printk(KERN_WARNING FW_BUG PREFIX
|
dev_warn(&device->dev,
|
||||||
"no secondary bus range in _CRS\n");
|
FW_BUG "no secondary bus range in _CRS\n");
|
||||||
status = acpi_evaluate_integer(handle, METHOD_NAME__BBN,
|
status = acpi_evaluate_integer(handle, METHOD_NAME__BBN,
|
||||||
NULL, &bus);
|
NULL, &bus);
|
||||||
if (ACPI_SUCCESS(status))
|
if (ACPI_SUCCESS(status))
|
||||||
|
@ -413,7 +413,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
|
||||||
else if (status == AE_NOT_FOUND)
|
else if (status == AE_NOT_FOUND)
|
||||||
root->secondary.start = 0;
|
root->secondary.start = 0;
|
||||||
else {
|
else {
|
||||||
printk(KERN_ERR PREFIX "can't evaluate _BBN\n");
|
dev_err(&device->dev, "can't evaluate _BBN\n");
|
||||||
result = -ENODEV;
|
result = -ENODEV;
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
@ -425,7 +425,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
|
||||||
strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
|
strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
|
||||||
device->driver_data = root;
|
device->driver_data = root;
|
||||||
|
|
||||||
printk(KERN_INFO PREFIX "%s [%s] (domain %04x %pR)\n",
|
pr_info(PREFIX "%s [%s] (domain %04x %pR)\n",
|
||||||
acpi_device_name(device), acpi_device_bid(device),
|
acpi_device_name(device), acpi_device_bid(device),
|
||||||
root->segment, &root->secondary);
|
root->segment, &root->secondary);
|
||||||
|
|
||||||
|
@ -451,9 +451,9 @@ static int acpi_pci_root_add(struct acpi_device *device,
|
||||||
*/
|
*/
|
||||||
root->bus = pci_acpi_scan_root(root);
|
root->bus = pci_acpi_scan_root(root);
|
||||||
if (!root->bus) {
|
if (!root->bus) {
|
||||||
printk(KERN_ERR PREFIX
|
dev_err(&device->dev,
|
||||||
"Bus %04x:%02x not present in PCI namespace\n",
|
"Bus %04x:%02x not present in PCI namespace\n",
|
||||||
root->segment, (unsigned int)root->secondary.start);
|
root->segment, (unsigned int)root->secondary.start);
|
||||||
result = -ENODEV;
|
result = -ENODEV;
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
@ -511,8 +511,8 @@ static int acpi_pci_root_add(struct acpi_device *device,
|
||||||
"ACPI _OSC request failed (%s), "
|
"ACPI _OSC request failed (%s), "
|
||||||
"returned control mask: 0x%02x\n",
|
"returned control mask: 0x%02x\n",
|
||||||
acpi_format_exception(status), flags);
|
acpi_format_exception(status), flags);
|
||||||
pr_info("ACPI _OSC control for PCIe not granted, "
|
dev_info(&device->dev,
|
||||||
"disabling ASPM\n");
|
"ACPI _OSC control for PCIe not granted, disabling ASPM\n");
|
||||||
pcie_no_aspm();
|
pcie_no_aspm();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -571,12 +571,13 @@ static void handle_root_bridge_insertion(acpi_handle handle)
|
||||||
struct acpi_device *device;
|
struct acpi_device *device;
|
||||||
|
|
||||||
if (!acpi_bus_get_device(handle, &device)) {
|
if (!acpi_bus_get_device(handle, &device)) {
|
||||||
printk(KERN_DEBUG "acpi device exists...\n");
|
dev_printk(KERN_DEBUG, &device->dev,
|
||||||
|
"acpi device already exists; ignoring notify\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (acpi_bus_scan(handle))
|
if (acpi_bus_scan(handle))
|
||||||
printk(KERN_ERR "cannot add bridge to acpi list\n");
|
acpi_handle_err(handle, "cannot add bridge to acpi list\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handle_root_bridge_removal(struct acpi_device *device)
|
static void handle_root_bridge_removal(struct acpi_device *device)
|
||||||
|
@ -605,7 +606,6 @@ static void handle_root_bridge_removal(struct acpi_device *device)
|
||||||
static void _handle_hotplug_event_root(struct work_struct *work)
|
static void _handle_hotplug_event_root(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct acpi_pci_root *root;
|
struct acpi_pci_root *root;
|
||||||
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER };
|
|
||||||
struct acpi_hp_work *hp_work;
|
struct acpi_hp_work *hp_work;
|
||||||
acpi_handle handle;
|
acpi_handle handle;
|
||||||
u32 type;
|
u32 type;
|
||||||
|
@ -617,13 +617,12 @@ static void _handle_hotplug_event_root(struct work_struct *work)
|
||||||
acpi_scan_lock_acquire();
|
acpi_scan_lock_acquire();
|
||||||
|
|
||||||
root = acpi_pci_find_root(handle);
|
root = acpi_pci_find_root(handle);
|
||||||
acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
|
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case ACPI_NOTIFY_BUS_CHECK:
|
case ACPI_NOTIFY_BUS_CHECK:
|
||||||
/* bus enumerate */
|
/* bus enumerate */
|
||||||
printk(KERN_DEBUG "%s: Bus check notify on %s\n", __func__,
|
acpi_handle_printk(KERN_DEBUG, handle,
|
||||||
(char *)buffer.pointer);
|
"Bus check notify on %s\n", __func__);
|
||||||
if (!root)
|
if (!root)
|
||||||
handle_root_bridge_insertion(handle);
|
handle_root_bridge_insertion(handle);
|
||||||
|
|
||||||
|
@ -631,28 +630,28 @@ static void _handle_hotplug_event_root(struct work_struct *work)
|
||||||
|
|
||||||
case ACPI_NOTIFY_DEVICE_CHECK:
|
case ACPI_NOTIFY_DEVICE_CHECK:
|
||||||
/* device check */
|
/* device check */
|
||||||
printk(KERN_DEBUG "%s: Device check notify on %s\n", __func__,
|
acpi_handle_printk(KERN_DEBUG, handle,
|
||||||
(char *)buffer.pointer);
|
"Device check notify on %s\n", __func__);
|
||||||
if (!root)
|
if (!root)
|
||||||
handle_root_bridge_insertion(handle);
|
handle_root_bridge_insertion(handle);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ACPI_NOTIFY_EJECT_REQUEST:
|
case ACPI_NOTIFY_EJECT_REQUEST:
|
||||||
/* request device eject */
|
/* request device eject */
|
||||||
printk(KERN_DEBUG "%s: Device eject notify on %s\n", __func__,
|
acpi_handle_printk(KERN_DEBUG, handle,
|
||||||
(char *)buffer.pointer);
|
"Device eject notify on %s\n", __func__);
|
||||||
if (root)
|
if (root)
|
||||||
handle_root_bridge_removal(root->device);
|
handle_root_bridge_removal(root->device);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
printk(KERN_WARNING "notify_handler: unknown event type 0x%x for %s\n",
|
acpi_handle_warn(handle,
|
||||||
type, (char *)buffer.pointer);
|
"notify_handler: unknown event type 0x%x\n",
|
||||||
|
type);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
acpi_scan_lock_release();
|
acpi_scan_lock_release();
|
||||||
kfree(hp_work); /* allocated in handle_hotplug_event_bridge */
|
kfree(hp_work); /* allocated in handle_hotplug_event_bridge */
|
||||||
kfree(buffer.pointer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handle_hotplug_event_root(acpi_handle handle, u32 type,
|
static void handle_hotplug_event_root(acpi_handle handle, u32 type,
|
||||||
|
@ -666,9 +665,6 @@ static acpi_status __init
|
||||||
find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
|
find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
|
||||||
{
|
{
|
||||||
acpi_status status;
|
acpi_status status;
|
||||||
char objname[64];
|
|
||||||
struct acpi_buffer buffer = { .length = sizeof(objname),
|
|
||||||
.pointer = objname };
|
|
||||||
int *count = (int *)context;
|
int *count = (int *)context;
|
||||||
|
|
||||||
if (!acpi_is_root_bridge(handle))
|
if (!acpi_is_root_bridge(handle))
|
||||||
|
@ -676,16 +672,15 @@ find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
|
||||||
|
|
||||||
(*count)++;
|
(*count)++;
|
||||||
|
|
||||||
acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
|
|
||||||
|
|
||||||
status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
|
status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
|
||||||
handle_hotplug_event_root, NULL);
|
handle_hotplug_event_root, NULL);
|
||||||
if (ACPI_FAILURE(status))
|
if (ACPI_FAILURE(status))
|
||||||
printk(KERN_DEBUG "acpi root: %s notify handler is not installed, exit status: %u\n",
|
acpi_handle_printk(KERN_DEBUG, handle,
|
||||||
objname, (unsigned int)status);
|
"notify handler is not installed, exit status: %u\n",
|
||||||
|
(unsigned int)status);
|
||||||
else
|
else
|
||||||
printk(KERN_DEBUG "acpi root: %s notify handler is installed\n",
|
acpi_handle_printk(KERN_DEBUG, handle,
|
||||||
objname);
|
"notify handler is installed\n");
|
||||||
|
|
||||||
return AE_OK;
|
return AE_OK;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue