* [PATCH] disk/ahci.c: Add port number to port debug messages
@ 2015-05-27 21:05 Paul Menzel
2015-05-28 17:12 ` [PATCH v2] " Paul Menzel
0 siblings, 1 reply; 3+ messages in thread
From: Paul Menzel @ 2015-05-27 21:05 UTC (permalink / raw)
To: grub-devel
[-- Attachment #1: Type: text/plain, Size: 3500 bytes --]
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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] disk/ahci.c: Add port number to port debug messages
2015-05-27 21:05 [PATCH] disk/ahci.c: Add port number to port debug messages Paul Menzel
@ 2015-05-28 17:12 ` Paul Menzel
2015-05-31 6:29 ` Andrei Borzenkov
0 siblings, 1 reply; 3+ messages in thread
From: Paul Menzel @ 2015-05-28 17:12 UTC (permalink / raw)
To: grub-devel
[-- Attachment #1: Type: text/plain, Size: 4150 bytes --]
Date: Wed, 27 May 2015 22:48:57 +0200
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 7f75724..a764008 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.1.4
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] disk/ahci.c: Add port number to port debug messages
2015-05-28 17:12 ` [PATCH v2] " Paul Menzel
@ 2015-05-31 6:29 ` Andrei Borzenkov
0 siblings, 0 replies; 3+ messages in thread
From: Andrei Borzenkov @ 2015-05-31 6:29 UTC (permalink / raw)
To: Paul Menzel; +Cc: grub-devel
[-- Attachment #1: Type: text/plain, Size: 4444 bytes --]
Applied
В Thu, 28 May 2015 19:12:12 +0200
Paul Menzel <paulepanter@users.sourceforge.net> пишет:
> Date: Wed, 27 May 2015 22:48:57 +0200
>
> 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 7f75724..a764008 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-31 6:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-27 21:05 [PATCH] disk/ahci.c: Add port number to port debug messages Paul Menzel
2015-05-28 17:12 ` [PATCH v2] " Paul Menzel
2015-05-31 6:29 ` Andrei Borzenkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).