From: Borislav Petkov Subject: Re: Optiarc DVD RW AD-5200A audio playing Date: Sat, 16 Feb 2008 17:43:02 +0100 Message-ID: <20080216164302.GP13446@gollum.tnic> References: <47B5EDB7.5050709@canonical.com> <20080216090532.GK13446@gollum.tnic> <200802161624.02768.bzolnier@gmail.com> Reply-To: petkovbb@gmail.com Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from fk-out-0910.google.com ([209.85.128.185]:43687 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754285AbYBPQne (ORCPT ); Sat, 16 Feb 2008 11:43:34 -0500 Received: by fk-out-0910.google.com with SMTP id z23so1120534fkz.5 for ; Sat, 16 Feb 2008 08:43:33 -0800 (PST) Content-Disposition: inline In-Reply-To: <200802161624.02768.bzolnier@gmail.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Bartlomiej Zolnierkiewicz Cc: Stefan Bader , linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, Jens Axboe On Sat, Feb 16, 2008 at 04:24:01PM +0100, Bartlomiej Zolnierkiewicz wro= te: >=20 > Hi, >=20 > On Saturday 16 February 2008, Borislav Petkov wrote: > > On Fri, Feb 15, 2008 at 02:53:27PM -0500, Stefan Bader wrote: > > > Hello Borislav, > > >=20 > > > I worked on a problem with an DVD driver (model=3DOptiarc DVD RW = AD-5200A) > > > which obviously has the same problem as some Matshita drives. The > > > following patch was reported to enabled audio playing on this dri= ve. > > > Would this approach be suitable for upstream or are there other > > > solutions to this problem? > > >=20 > > > Regards, > > > Stefan > > >=20 > > > --- a/drivers/ide/ide-cd.c > > > +++ b/drivers/ide/ide-cd.c > > > @@ -2988,7 +2988,8 @@ int ide_cdrom_probe_capabilities (ide_drive= _t *drive) > > > if (strcmp(drive->id->model, "MATSHITADVD-ROM SR-8187") =3D=3D = 0 || > > > strcmp(drive->id->model, "MATSHITADVD-ROM SR-8186") =3D=3D = 0 || > > > strcmp(drive->id->model, "MATSHITADVD-ROM SR-8176") =3D=3D = 0 || > > > - strcmp(drive->id->model, "MATSHITADVD-ROM SR-8174") =3D=3D = 0) > > > + strcmp(drive->id->model, "MATSHITADVD-ROM SR-8174") =3D=3D = 0 || > > > + strcmp(drive->id->model, "Optiarc DVD RW AD-5200A") =3D=3D = 0) > > > CDROM_CONFIG_FLAGS(drive)->audio_play =3D 1; > > >=20 > > > #if ! STANDARD_ATAPI > >=20 > > Hi Stefan, > >=20 > > just to make sure that the audioplay bit is not set in the capabili= ties page, > > can you please try the following patch applied against 2.6.25-rc2 a= nd send me > > the output. Thanks! > >=20 > > @Bart: by the way, this cdi->mask thingy is kinda unintuitive doing= double > > negation to check whether a feature is supported or not. Yeah, this= comes from > > "above," i.e. uniform cdrom layer. But still, shouldn't we use a cd= i->caps_flags > > or something similar instead, which mirrors the caps page bits sett= ing? >=20 > It seems so (at least having negative flags is very unintuitive) but = they > might be some reason for this ugliness, Jens? >=20 > [ Please also remember that since cdrom layer is _uniform_ it may be = not > possible and/or desirable to have 1-1 mapping between caps page bit= s > and the future cdi->caps_flags. ] >=20 > > commit 435f0f4496a1b32af2d542f43b2370a890fe2f83 > > Author: Borislav Petkov > > Date: Sat Feb 16 09:56:36 2008 +0100 > >=20 > > ide-cd: Enable audio play quirk for Optiarc DVD RW AD-5200A dri= ve > > =20 > > Reported-by: Stefan Bader > > Signed-off-by: Borislav Petkov > >=20 > > diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c > > index f77db6b..2c9d06e 100644 > > --- a/drivers/ide/ide-cd.c > > +++ b/drivers/ide/ide-cd.c > > @@ -1750,6 +1750,10 @@ int ide_cdrom_probe_capabilities (ide_drive_= t *drive) > > cdi->mask &=3D ~(CDC_DVD_RAM | CDC_RAM); > > if (buf[8 + 3] & 0x10) > > cdi->mask &=3D ~CDC_DVD_R; > > + if (!(buf[8 + 4] & 0x01)) { >=20 > Hmm, shouldn't there be '&& (cd->cd_flags & IDE_CD_FLAG_PLAY_AUDIO_OK= )' > to prevent false positives? I wanted to see whether the caps page reports the audioplay bit off... >=20 > > + printk(KERN_INFO "ide-cd: audio play not advertised in caps page= ," >=20 > Would be nice to also printk() the device name. =2E.. but printing the device model is actually a good idea and this wi= ll rule out false positives, so Stefan, please drop the previous patch and test the= updated one below. Thanks. commit 6cc44b0ce5c9270b15d456eb9ffa91b855e4e0d0 Author: Borislav Petkov Date: Sat Feb 16 09:56:36 2008 +0100 ide-cd: Enable audio play quirk for Optiarc DVD RW AD-5200A drive =20 Reported-by: Stefan Bader Signed-off-by: Borislav Petkov diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index f77db6b..4c9984f 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1750,6 +1750,11 @@ int ide_cdrom_probe_capabilities (ide_drive_t *d= rive) cdi->mask &=3D ~(CDC_DVD_RAM | CDC_RAM); if (buf[8 + 3] & 0x10) cdi->mask &=3D ~CDC_DVD_R; + if (!(buf[8 + 4] & 0x01)) { + printk(KERN_INFO "ide-cd: audio play not advertised in caps " + "page for drive model [%s], enabling quirk.\n", + drive->id->model); + } if ((buf[8 + 4] & 0x01) || (cd->cd_flags & IDE_CD_FLAG_PLAY_AUDIO_OK)= ) cdi->mask &=3D ~CDC_PLAY_AUDIO; =20 @@ -1929,6 +1934,7 @@ static const struct cd_list_entry ide_cd_quirks_l= ist[] =3D { { "MATSHITADVD-ROM SR-8186", NULL, IDE_CD_FLAG_PLAY_AUDIO_OK }, { "MATSHITADVD-ROM SR-8176", NULL, IDE_CD_FLAG_PLAY_AUDIO_OK }, { "MATSHITADVD-ROM SR-8174", NULL, IDE_CD_FLAG_PLAY_AUDIO_OK }, + { "Optiarc DVD RW AD-5200A", NULL, IDE_CD_FLAG_PLAY_AUDIO_OK }= , { NULL, NULL, 0 } }; =20 --=20 Regards/Gru=DF, Boris.