github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

crypto: qat - use pci logging variants for PCI-specific messages

Browse Source 
Replace dev_err(&pdev->dev, ...), dev_info(&pdev->dev, ...) and
dev_dbg(&pdev->dev, ...) with pci_err(), pci_info() and pci_dbg()
where the log message relates to a PCI subsystem operation such as
device enable, BAR mapping, PCI region requests, PCI state
save/restore, and SR-IOV management.

Messages about driver-level logic (NUMA topology, device matching,
accelerator units, capabilities, configuration, DMA) are intentionally
left as dev_err() even when a struct pci_dev pointer is in scope,
since those concern the device or driver rather than the PCI bus.

No functional change.

Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Ahsan Atta <ahsan.atta@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Ahsan Atta 2026-05-20 13:51:50 +01:00 committed by Herbert Xu
parent 5c6f845e77
commit 90fe909ed6
10 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/crypto/intel/qat/qat_420xx/adf_drv.c
View File

@ -101,7 +101,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Enable PCI device */
ret = pcim_enable_device(pdev);
if (ret) {
dev_err(&pdev->dev, "Can't enable PCI device.\n");
pci_err(pdev, "Can't enable PCI device.\n");
goto out_err;
}
@ -131,7 +131,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ret = pcim_request_all_regions(pdev, pci_name(pdev));
if (ret) {
dev_err(&pdev->dev, "Failed to request PCI regions.\n");
pci_err(pdev, "Failed to request PCI regions.\n");
goto out_err;
}
@ -140,14 +140,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bar = &accel_pci_dev->pci_bars[i++];
bar->virt_addr = pcim_iomap(pdev, bar_nr, 0);
if (!bar->virt_addr) {
dev_err(&pdev->dev, "Failed to ioremap PCI region.\n");
pci_err(pdev, "Failed to ioremap PCI region.\n");
ret = -ENOMEM;
goto out_err;
}
}
if (pci_save_state(pdev)) {
dev_err(&pdev->dev, "Failed to save pci state.\n");
pci_err(pdev, "Failed to save pci state.\n");
ret = -ENOMEM;
goto out_err;
}

8
drivers/crypto/intel/qat/qat_4xxx/adf_drv.c
View File

@ -103,7 +103,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Enable PCI device */
ret = pcim_enable_device(pdev);
if (ret) {
dev_err(&pdev->dev, "Can't enable PCI device.\n");
pci_err(pdev, "Can't enable PCI device.\n");
goto out_err;
}
@ -133,7 +133,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ret = pcim_request_all_regions(pdev, pci_name(pdev));
if (ret) {
dev_err(&pdev->dev, "Failed to request PCI regions.\n");
pci_err(pdev, "Failed to request PCI regions.\n");
goto out_err;
}
@ -142,14 +142,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bar = &accel_pci_dev->pci_bars[i++];
bar->virt_addr = pcim_iomap(pdev, bar_nr, 0);
if (!bar->virt_addr) {
dev_err(&pdev->dev, "Failed to ioremap PCI region.\n");
pci_err(pdev, "Failed to ioremap PCI region.\n");
ret = -ENOMEM;
goto out_err;
}
}
if (pci_save_state(pdev)) {
dev_err(&pdev->dev, "Failed to save pci state.\n");
pci_err(pdev, "Failed to save pci state.\n");
ret = -ENOMEM;
goto out_err;
}

4
drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c
View File

@ -162,14 +162,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bar->size = pci_resource_len(pdev, bar_nr);
bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
if (!bar->virt_addr) {
dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
ret = -EFAULT;
goto out_err_free_reg;
}
}
if (pci_save_state(pdev)) {
dev_err(&pdev->dev, "Failed to save pci state\n");
pci_err(pdev, "Failed to save pci state\n");
ret = -ENOMEM;
goto out_err_free_reg;
}

2
drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c
View File

@ -158,7 +158,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bar->size = pci_resource_len(pdev, bar_nr);
bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
if (!bar->virt_addr) {
dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
ret = -EFAULT;
goto out_err_free_reg;
}

4
drivers/crypto/intel/qat/qat_c62x/adf_drv.c
View File

@ -162,14 +162,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bar->size = pci_resource_len(pdev, bar_nr);
bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
if (!bar->virt_addr) {
dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
ret = -EFAULT;
goto out_err_free_reg;
}
}
if (pci_save_state(pdev)) {
dev_err(&pdev->dev, "Failed to save pci state\n");
pci_err(pdev, "Failed to save pci state\n");
ret = -ENOMEM;
goto out_err_free_reg;
}

2
drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c
View File

@ -158,7 +158,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bar->size = pci_resource_len(pdev, bar_nr);
bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
if (!bar->virt_addr) {
dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
ret = -EFAULT;
goto out_err_free_reg;
}

21
drivers/crypto/intel/qat/qat_common/adf_aer.c
View File

@ -22,7 +22,7 @@ static pci_ers_result_t reset_prepare(struct pci_dev *pdev)
struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev);
if (!accel_dev) {
dev_err(&pdev->dev, "Can't find acceleration device\n");
pci_err(pdev, "Can't find acceleration device\n");
return PCI_ERS_RESULT_DISCONNECT;
}
@ -46,7 +46,7 @@ static pci_ers_result_t reset_done(struct pci_dev *pdev)
int res;
if (!accel_dev) {
dev_err(&pdev->dev, "Can't find acceleration device\n");
pci_err(pdev, "Can't find acceleration device\n");
return PCI_ERS_RESULT_DISCONNECT;
}
@ -64,7 +64,7 @@ static pci_ers_result_t reset_done(struct pci_dev *pdev)
clear_bit(ADF_STATUS_RESTARTING, &accel_dev->status);
reset_complete:
dev_info(&pdev->dev, "Device reset completed successfully\n");
pci_info(pdev, "Device reset completed successfully\n");
return PCI_ERS_RESULT_RECOVERED;
}
@ -74,14 +74,14 @@ static pci_ers_result_t adf_error_detected(struct pci_dev *pdev,
{
struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev);
dev_info(&pdev->dev, "Acceleration driver hardware error detected.\n");
pci_info(pdev, "Acceleration driver hardware error detected.\n");
if (!accel_dev) {
dev_err(&pdev->dev, "Can't find acceleration device\n");
pci_err(pdev, "Can't find acceleration device\n");
return PCI_ERS_RESULT_DISCONNECT;
}
if (state == pci_channel_io_perm_failure) {
dev_err(&pdev->dev, "Can't recover from device error\n");
pci_err(pdev, "Can't recover from device error\n");
return PCI_ERS_RESULT_DISCONNECT;
}
@ -116,10 +116,9 @@ void adf_reset_sbr(struct adf_accel_dev *accel_dev)
parent = pdev;
if (!pci_wait_for_pending_transaction(pdev))
dev_info(&GET_DEV(accel_dev),
"Transaction still in progress. Proceeding\n");
pci_info(pdev, "Transaction still in progress. Proceeding\n");
dev_info(&GET_DEV(accel_dev), "Secondary bus reset\n");
pci_info(pdev, "Secondary bus reset\n");
pci_read_config_word(parent, PCI_BRIDGE_CONTROL, &bridge_ctl);
bridge_ctl |= PCI_BRIDGE_CTL_BUS_RESET;
@ -247,8 +246,8 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev)
static void adf_resume(struct pci_dev *pdev)
{
dev_info(&pdev->dev, "Acceleration driver reset completed\n");
dev_info(&pdev->dev, "Device is up and running\n");
pci_info(pdev, "Acceleration driver reset completed\n");
pci_info(pdev, "Device is up and running\n");
}
static void adf_reset_prepare(struct pci_dev *pdev)

2
drivers/crypto/intel/qat/qat_common/adf_sriov.c
View File

@ -240,7 +240,7 @@ void adf_reenable_sriov(struct adf_accel_dev *accel_dev)
if (adf_add_sriov_configuration(accel_dev))
return;
dev_dbg(&pdev->dev, "Re-enabling SRIOV\n");
pci_dbg(pdev, "Re-enabling SRIOV\n");
adf_enable_sriov(accel_dev);
}

4
drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c
View File

@ -162,14 +162,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bar->size = pci_resource_len(pdev, bar_nr);
bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
if (!bar->virt_addr) {
dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
ret = -EFAULT;
goto out_err_free_reg;
}
}
if (pci_save_state(pdev)) {
dev_err(&pdev->dev, "Failed to save pci state\n");
pci_err(pdev, "Failed to save pci state\n");
ret = -ENOMEM;
goto out_err_free_reg;
}

2
drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c
View File

@ -158,7 +158,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bar->size = pci_resource_len(pdev, bar_nr);
bar->virt_addr = pci_iomap(accel_pci_dev->pci_dev, bar_nr, 0);
if (!bar->virt_addr) {
dev_err(&pdev->dev, "Failed to map BAR %d\n", bar_nr);
pci_err(pdev, "Failed to map BAR %d\n", bar_nr);
ret = -EFAULT;
goto out_err_free_reg;
}