[PATCH] disk/ahci.c: Add port number to port debug messages

[Paul Menzel]

Date: Wed, 27 May 2015 22:48:57 +0200

Currently, some AHCI debug messages cannot be mapped to the port they
belong to as the port number is missing from the output. So prepend
these debug messages with `port: n`.
---
 grub-core/disk/ahci.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
index 7f75724..2994562 100644
--- a/grub-core/disk/ahci.c
+++ b/grub-core/disk/ahci.c
@@ -355,7 +355,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,
     if (adevs[i])
       {
        adevs[i]->hba->ports[adevs[i]->port].sata_error = 
adevs[i]->hba->ports[adevs[i]->port].sata_error;
-       grub_dprintf ("ahci", "err: %x\n",
+       grub_dprintf ("ahci", "port: %d, err: %x\n", adevs[i]->port,
                      adevs[i]->hba->ports[adevs[i]->port].sata_error);
 
        adevs[i]->command_list_chunk = grub_memalign_dma32 (1024, sizeof 
(struct grub_ahci_cmd_head) * 32);
@@ -480,7 +480,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,
   for (i = 0; i < nports; i++)
     if (adevs[i])
       {
-       grub_dprintf ("ahci", "err: %x\n",
+       grub_dprintf ("ahci", "port: %d, err: %x\n", adevs[i]->port,
                      adevs[i]->hba->ports[adevs[i]->port].sata_error);
        fr_running |= (1 << i);
 
@@ -488,7 +488,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,
        adevs[i]->hba->ports[adevs[i]->port].command |= 
GRUB_AHCI_HBA_PORT_CMD_POWER_ON;
        adevs[i]->hba->ports[adevs[i]->port].command |= 1 << 28;
 
-       grub_dprintf ("ahci", "err: %x\n",
+       grub_dprintf ("ahci", "port: %d, err: %x\n", adevs[i]->port,
                      adevs[i]->hba->ports[adevs[i]->port].sata_error);
       }
 
@@ -515,26 +515,26 @@ grub_ahci_pciinit (grub_pci_device_t dev,
   for (i = 0; i < nports; i++)
     if (adevs[i])
       {
-       grub_dprintf ("ahci", "err: %x\n",
+       grub_dprintf ("ahci", "port %d, err: %x\n", adevs[i]->port,
                      adevs[i]->hba->ports[adevs[i]->port].sata_error);
 
        adevs[i]->hba->ports[adevs[i]->port].command |= 
GRUB_AHCI_HBA_PORT_CMD_POWER_ON;
        adevs[i]->hba->ports[adevs[i]->port].command |= 
GRUB_AHCI_HBA_PORT_CMD_SPIN_UP;
 
-       grub_dprintf ("ahci", "err: %x\n",
+       grub_dprintf ("ahci", "port %d, err: %x\n", adevs[i]->port,
                      adevs[i]->hba->ports[adevs[i]->port].sata_error);
 
        adevs[i]->hba->ports[adevs[i]->port].sata_error = ~0;
-       grub_dprintf ("ahci", "err: %x\n",
+       grub_dprintf ("ahci", "port %d, err: %x\n", adevs[i]->port,
                      adevs[i]->hba->ports[adevs[i]->port].sata_error);
 
-       grub_dprintf ("ahci", "offset: %x, tfd:%x, CMD: %x\n",
+       grub_dprintf ("ahci", "port %d, offset: %x, tfd:%x, CMD: %x\n", 
adevs[i]->port,
                      (int) ((char *) 
&adevs[i]->hba->ports[adevs[i]->port].task_file_data - 
                             (char *) adevs[i]->hba),
                      adevs[i]->hba->ports[adevs[i]->port].task_file_data,
                      adevs[i]->hba->ports[adevs[i]->port].command);
 
-       grub_dprintf ("ahci", "err: %x\n",
+       grub_dprintf ("ahci", "port %d, err: %x\n", adevs[i]->port,
                      adevs[i]->hba->ports[adevs[i]->port].sata_error);
       }
 
@@ -542,7 +542,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,
   for (i = 0; i < nports; i++)
     if (adevs[i])
       {
-       grub_dprintf ("ahci", "offset: %x, tfd:%x, CMD: %x\n",
+       grub_dprintf ("ahci", "port %d, offset: %x, tfd:%x, CMD: %x\n", 
adevs[i]->port,
                      (int) ((char *) 
&adevs[i]->hba->ports[adevs[i]->port].task_file_data - 
                             (char *) adevs[i]->hba),
                      adevs[i]->hba->ports[adevs[i]->port].task_file_data,
-- 
2.1.4

signature.asc
Description: This is a digitally signed message part