8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
104 lines
4.2 KiB
Diff
104 lines
4.2 KiB
Diff
From ca59c24bd0e2a90db764065e24829775aa2b363c Mon Sep 17 00:00:00 2001
|
|
From: Paul Menzel <paulepanter@users.sourceforge.net>
|
|
Date: Wed, 27 May 2015 22:48:57 +0200
|
|
Subject: [PATCH 423/506] disk/ahci.c: Add port number to port debug messages
|
|
|
|
Currently, some messages cannot be mapped to the port they belong to as
|
|
the port number is missing from the output. So add `port: n` to the
|
|
debug messages.
|
|
---
|
|
grub-core/disk/ahci.c | 22 +++++++++++-----------
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
|
|
index 4e8619c..da5fead 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);
|
|
@@ -440,7 +440,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,
|
|
adevs[i]->hba->ports[adevs[i]->port].intstatus = ~0;
|
|
// adevs[i]->hba->ports[adevs[i]->port].fbs = 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);
|
|
|
|
adevs[i]->rfis = grub_memalign_dma32 (4096,
|
|
@@ -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,13 +542,13 @@ 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,
|
|
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);
|
|
|
|
adevs[i]->hba->ports[adevs[i]->port].command
|
|
--
|
|
2.4.3
|
|
|