From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: -mm merge plans for 2.6.20 Date: Wed, 6 Dec 2006 11:26:03 -0800 Message-ID: <20061206112603.a893e5d5.randy.dunlap@oracle.com> References: <20061204204024.2401148d.akpm@osdl.org> <4574FC0A.8090607@garzik.org> <20061204214114.433485fc.akpm@osdl.org> <1165432780.21881.20.camel@linux-qmhe.site> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from agminet01.oracle.com ([141.146.126.228]:30355 "EHLO agminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937337AbWLFTZl (ORCPT ); Wed, 6 Dec 2006 14:25:41 -0500 In-Reply-To: <1165432780.21881.20.camel@linux-qmhe.site> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: conke.hu@gmail.com Cc: Andrew Morton , Jeff Garzik , linux-kernel@vger.kernel.org, "linux-ide@vger.kernel.org" , Alan Cox On Thu, 07 Dec 2006 03:19:40 +0800 Conke Hu wrote: > On Mon, 2006-12-04 at 21:41 -0800, Andrew Morton wrote: > > On Mon, 04 Dec 2006 23:56:42 -0500 > > Jeff Garzik wrote: > > > > > Andrew Morton wrote: > > > > via-pata-controller-xfer-fixes.patch > > > > via-pata-controller-xfer-fixes-fix.patch > > > > > > Tejun's 3d3cca37559e3ab2b574eda11ed5207ccdb8980a has been ack'd by the > > > reporter as fixing things, so these two shouldn't be needed. > > > > OK thanks, I dropped it. > > > > > > > > > libata_resume_fix.patch > > > > > > I thought this was resolved long ago? Are there still open reports that > > > this solves, where upstream doesn't work? > > > > Heck, I don't know. > > > > > > > > > ahci-ati-sb600-sata-support-for-various-modes.patch > > > > > > With the PCI quirk, I thought ATI was finally sorted? > > > > Was it? I don't know that either. > > > > I'll drop these too. > > - > > Hi Jeff, Andrew > The following patch is ATI's final solution. It was ACKed by Alan. > Jeff, you're the maintainer of libata, but this patch is based on > pci/quirks.c, so I don't know who will apply this patch? You or somebody > else? > Andrew, could you please drop ATI's previous patch and add this one > in next -mm patch? The previous patch I sent > (ahci-ati-sb600-sata-support-for-various-modes.patch) is not as good as > this one :) > > > Best regards, > Conke @AMD/ATI > > > [------------------PATCH------------------] > > --- linux-2.6.19-rc6-git4/drivers/pci/quirks.c.orig 2006-11-23 > 19:45:49.000000000 +0800 > +++ linux-2.6.19-rc6-git4/drivers/pci/quirks.c 2006-11-23 > 19:34:23.000000000 +0800 > @@ -795,6 +795,25 @@ static void __init quirk_mediagx_master( > } > } > DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CYRIX, > PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master ); > + > +#if defined(CONFIG_SATA_AHCI) || defined(CONFIG_SATA_AHCI_MODULE) > +static void __devinit quirk_sb600_sata(struct pci_dev *pdev) > +{ > + /* set sb600 sata to ahci mode */ > + if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) { > + u8 tmp; > + > + pci_read_config_byte(pdev, 0x40, &tmp); > + pci_write_config_byte(pdev, 0x40, tmp|1); > + pci_write_config_byte(pdev, 0x9, 1); > + pci_write_config_byte(pdev, 0xa, 6); > + pci_write_config_byte(pdev, 0x40, tmp); > + > + pdev->class = 0x010601; > + } > +} > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, > PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_sb600_sata); > +#endif > > /* > * As per PCI spec, ignore base address registers 0-3 of the IDE > controllers Can you use fewer magic numbers, please? At least some of those are already #defined in include/linux/pci_regs.h. --- ~Randy