From: Albert Lee <albertcc@tw.ibm.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: albertl@mail.com, Tejun Heo <htejun@gmail.com>,
alan@lxorguk.ukuu.org.uk, axboe@suse.de, forrest.zhao@intel.com,
efalk@google.com, linux-ide@vger.kernel.org,
Doug Maxey <dwm@maxeymade.com>
Subject: Re: [PATCH] libata: merge irq-pio
Date: Fri, 26 May 2006 16:14:24 +0800 [thread overview]
Message-ID: <4476B8E0.2090408@tw.ibm.com> (raw)
In-Reply-To: <44736C03.8050104@pobox.com>
Jeff Garzik wrote:
> Albert Lee wrote:
>
>>> diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
>>> index 9646c39..0372be7 100644
>>> --- a/drivers/scsi/sata_vsc.c
>>> +++ b/drivers/scsi/sata_vsc.c
>>> @@ -221,14 +221,21 @@ static irqreturn_t vsc_sata_interrupt (i
>>>
>>> ap = host_set->ports[i];
>>>
>>> - if (ap && !(ap->flags &
>>> - (ATA_FLAG_DISABLED|ATA_FLAG_NOINTR))) {
>>> + if (is_vsc_sata_int_err(i, int_status)) {
>>> + u32 err_status;
>>> + printk(KERN_DEBUG "%s: ignoring interrupt(s)\n",
>>> __FUNCTION__);
>>> + err_status = ap ? vsc_sata_scr_read(ap, SCR_ERROR) : 0;
>>> + vsc_sata_scr_write(ap, SCR_ERROR, err_status);
>>> + handled++;
>>> + }
>>> +
>>> + if (ap && !(ap->flags & ATA_FLAG_DISABLED)) {
>>> struct ata_queued_cmd *qc;
>>>
>>
>>
>> The if(is_vsc_sata_int_err(i, int_status)) { } block is not irq-pio
>> related.
>> Maybe it is from somewhere else?
>
>
> It is from the merge I did with upstream, which conflicted in this area.
> Is it not correct somehow, or just unexpected?
>
Just unexpected. The merge looks ok.
--
albert
next prev parent reply other threads:[~2006-05-26 8:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-11 13:33 [PATCHSET 04/11] merge irq-pio Tejun Heo
2006-05-11 13:33 ` [PATCH] libata: fix irq-pio merge Tejun Heo
2006-05-11 13:33 ` [PATCH] libata: merge irq-pio Tejun Heo
2006-05-23 10:05 ` Albert Lee
2006-05-23 10:12 ` [PATCH 1/1] libata: minor fix for irq-pio merge Albert Lee
2006-05-23 20:09 ` [PATCH] libata: merge irq-pio Jeff Garzik
2006-05-26 8:14 ` Albert Lee [this message]
2006-05-27 0:53 ` Tejun Heo
2006-05-13 22:11 ` [PATCHSET 04/11] " Jeff Garzik
2006-05-16 10:00 ` Albert Lee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4476B8E0.2090408@tw.ibm.com \
--to=albertcc@tw.ibm.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=albertl@mail.com \
--cc=axboe@suse.de \
--cc=dwm@maxeymade.com \
--cc=efalk@google.com \
--cc=forrest.zhao@intel.com \
--cc=htejun@gmail.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).