Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6929da44 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] hpt37x: Two important bug fixes 



The HPT37x driver very carefully handles DMA completions and the needed
fixups are done on pci registers 0x50 and 0x52.  This is unfortunate
because the actual registers are 0x50 and 0x54.  Fixing this offset cures
the second channel problems reported.

Secondly there are some problems with the HPT370 and certain ATA drives.
The filter code however only filters ATAPI devices due to a reversed type
check.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 516e72cb

drivers/ata/pata_hpt37x.c

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/libata.h>



#define DRV_NAME	"pata_hpt37x"

#define DRV_VERSION	"0.5.1"

#define DRV_VERSION	"0.5.2"



struct hpt_clock {

	u8	xfer_speed;
@@ -416,7 +416,7 @@ static const char *bad_ata100_5[] = { 


static unsigned long hpt370_filter(const struct ata_port *ap, struct ata_device *adev, unsigned long mask)

{

	if (adev->class != ATA_DEV_ATA) {

	if (adev->class == ATA_DEV_ATA) {

		if (hpt_dma_blacklisted(adev, "UDMA", bad_ata33))

			mask &= ~ATA_MASK_UDMA;

		if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
@@ -749,7 +749,7 @@ static void hpt37x_bmdma_stop(struct ata_queued_cmd *qc) 
{

	struct ata_port *ap = qc->ap;

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	int mscreg = 0x50 + 2 * ap->port_no;

	int mscreg = 0x50 + 4 * ap->port_no;

	u8 bwsr_stat, msc_stat;



	pci_read_config_byte(pdev, 0x6A, &bwsr_stat);