From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1YywkP-0004mw-4y for mharc-grub-devel@gnu.org; Sun, 31 May 2015 02:29:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YywkM-0004d6-63 for grub-devel@gnu.org; Sun, 31 May 2015 02:29:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YywkH-0000eL-67 for grub-devel@gnu.org; Sun, 31 May 2015 02:29:22 -0400 Received: from mail-lb0-x22a.google.com ([2a00:1450:4010:c04::22a]:34972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YywkG-0000e8-RK for grub-devel@gnu.org; Sun, 31 May 2015 02:29:17 -0400 Received: by lbbuc2 with SMTP id uc2so68248100lbb.2 for ; Sat, 30 May 2015 23:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type; bh=/OhbY1gSMNo3OkZcqISVn94RO+ilgUvdW0SQ11nA98Q=; b=uALZeIdLdX9BHkxfl4g6CBq9B38PPiNyOkknlpy91SLnrrSdYwmQiEl7jidOj2TOhn E4ABXilBkbbYkPQG3mO6X+OB9AYvcXSIsAHQboxuDUnZh748q/tg+MbXKWYR+UOkXlnA XPpIqNZ0DqaHO0Fn51gt5PGMCb8KNwkqb/HU3HV38r92Jwy3luZ7qrO3IHZmSnOvTHAy bjGpja4YN88dlwAMroepvrNGGIb4M61pEYQ+/mYo+3RdOyivhI4AOVH4F6SfiCBon5Xc wamk9lYs8HafTYxaVLN21FBRscPZAQxqFy89Z9pH9l8qwnyDO0y5x8Gv24nYXCvwh/I5 zT8w== X-Received: by 10.152.6.105 with SMTP id z9mr15120183laz.98.1433053756041; Sat, 30 May 2015 23:29:16 -0700 (PDT) Received: from opensuse.site (ppp91-76-14-38.pppoe.mtu-net.ru. [91.76.14.38]) by mx.google.com with ESMTPSA id gn6sm2999032lbc.28.2015.05.30.23.29.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 May 2015 23:29:15 -0700 (PDT) Date: Sun, 31 May 2015 09:29:14 +0300 From: Andrei Borzenkov To: Paul Menzel Subject: Re: [PATCH v2] disk/ahci.c: Add port number to port debug messages Message-ID: <20150531092914.2816abef@opensuse.site> In-Reply-To: <1432833132.3378.8.camel@users.sourceforge.net> References: <1432760717.17208.12.camel@users.sourceforge.net> <1432833132.3378.8.camel@users.sourceforge.net> X-Mailer: Claws Mail 3.11.0 (GTK+ 2.24.27; x86_64-suse-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/_qpS6m/cxJ2sInF6gaIer7z"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22a Cc: grub-devel@gnu.org X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2015 06:29:23 -0000 --Sig_/_qpS6m/cxJ2sInF6gaIer7z Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Applied =D0=92 Thu, 28 May 2015 19:12:12 +0200 Paul Menzel =D0=BF=D0=B8=D1=88=D0=B5=D1= =82: > Date: Wed, 27 May 2015 22:48:57 +0200 >=20 > 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(-) >=20 > 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 =3D adevs[i]->hba->port= s[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); > =20 > adevs[i]->command_list_chunk =3D grub_memalign_dma32 (1024, sizeof (str= uct 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 =3D ~0; > // adevs[i]->hba->ports[adevs[i]->port].fbs =3D 0; > =20 > - 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); > =20 > adevs[i]->rfis =3D grub_memalign_dma32 (4096,=20 > @@ -480,7 +480,7 @@ grub_ahci_pciinit (grub_pci_device_t dev, > for (i =3D 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 |=3D (1 << i); > =20 > @@ -488,7 +488,7 @@ grub_ahci_pciinit (grub_pci_device_t dev, > adevs[i]->hba->ports[adevs[i]->port].command |=3D GRUB_AHCI_HBA_PORT_CM= D_POWER_ON; > adevs[i]->hba->ports[adevs[i]->port].command |=3D 1 << 28; > =20 > - 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); > } > =20 > @@ -515,26 +515,26 @@ grub_ahci_pciinit (grub_pci_device_t dev, > for (i =3D 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); > =20 > adevs[i]->hba->ports[adevs[i]->port].command |=3D GRUB_AHCI_HBA_PORT_CM= D_POWER_ON; > adevs[i]->hba->ports[adevs[i]->port].command |=3D GRUB_AHCI_HBA_PORT_CM= D_SPIN_UP; > =20 > - 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); > =20 > adevs[i]->hba->ports[adevs[i]->port].sata_error =3D ~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); > =20 > - 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 -=20 > (char *) adevs[i]->hba), > adevs[i]->hba->ports[adevs[i]->port].task_file_data, > adevs[i]->hba->ports[adevs[i]->port].command); > =20 > - 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); > } > =20 > @@ -542,13 +542,13 @@ grub_ahci_pciinit (grub_pci_device_t dev, > for (i =3D 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 -=20 > (char *) adevs[i]->hba), > adevs[i]->hba->ports[adevs[i]->port].task_file_data, > adevs[i]->hba->ports[adevs[i]->port].command); > =20 > - 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); > =20 > adevs[i]->hba->ports[adevs[i]->port].command --Sig_/_qpS6m/cxJ2sInF6gaIer7z Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlVqqjoACgkQR6LMutpd94wPtACfcml3M3swZTw35QEMxYzlrKJw f20An2m1TzjrLVJ+QX5819Gws69LZlgK =8VSD -----END PGP SIGNATURE----- --Sig_/_qpS6m/cxJ2sInF6gaIer7z--