summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Shtylyov <s.shtylyov@omp.ru>2022-02-19 23:04:29 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-03-08 19:01:56 +0100
commit0b79c5dd7bb56da0c57f8272d1746f8594b4fdac (patch)
tree7f7252f4ce46851f71f4a2d7272a9083c9d57be3
parent70959fa1a003cb7c6ed2fd0e0f887125d08b8bf6 (diff)
downloadlinux-0b79c5dd7bb56da0c57f8272d1746f8594b4fdac.tar.gz
linux-0b79c5dd7bb56da0c57f8272d1746f8594b4fdac.tar.bz2
linux-0b79c5dd7bb56da0c57f8272d1746f8594b4fdac.zip
ata: pata_hpt37x: fix PCI clock detection
[ Upstream commit 5f6b0f2d037c8864f20ff15311c695f65eb09db5 ] The f_CNT register (at the PCI config. address 0x78) is 16-bit, not 8-bit! The bug was there from the very start... :-( Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> Fixes: 669a5db411d8 ("[libata] Add a bunch of PATA drivers.") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/ata/pata_hpt37x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 821fc1f2324c..44cc02afaa8b 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -964,14 +964,14 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
if ((freq >> 12) != 0xABCDE) {
int i;
- u8 sr;
+ u16 sr;
u32 total = 0;
pr_warn("BIOS has not set timing clocks\n");
/* This is the process the HPT371 BIOS is reported to use */
for (i = 0; i < 128; i++) {
- pci_read_config_byte(dev, 0x78, &sr);
+ pci_read_config_word(dev, 0x78, &sr);
total += sr & 0x1FF;
udelay(15);
}