Applied В Thu, 28 May 2015 19:12:12 +0200 Paul Menzel <paulepan...@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
pgpAScNlwnqNn.pgp
Description: OpenPGP digital signature
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
