On Wed, Aug 6, 2008 at 1:34 PM, Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> wrote: > Hello. > > Borislav Petkov wrote: >> >> From: Borislav Petkov <petkovbb@xxxxxxxxx> >> Date: Sun, 3 Aug 2008 18:46:35 +0200 >> Subject: [PATCH] ide-generic: handle probing of legacy io-ports v4 >> >> Avoid probing the io-ports in case an IDE PCI controller is present and it >> uses >> the legacy iobases. If we still want to enforce the probing, we do >> >> ide_generic.probe_mask=0x3f >> >> on the kernel command line. The iobase checking code is adapted from >> drivers/ata/pata_legacy.c after converting hex pci ids into their >> corresponding >> macros in <linux/pci_ids.h>. >> >> CC: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> >> Signed-off-by: Borislav Petkov <petkovbb@xxxxxxxxx> >> > > Acked-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> > >> diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c >> index 8fe8b5b..efce159 100644 >> --- a/drivers/ide/ide-generic.c >> +++ b/drivers/ide/ide-generic.c >> > > [...] >> >> @@ -100,19 +101,69 @@ static const u16 legacy_bases[] = { 0x1f0, 0x170, >> 0x1e8, 0x168, 0x1e0, 0x160 }; >> static const int legacy_irqs[] = { 14, 15, 11, 10, 8, 12 }; >> #endif >> +static void ide_generic_check_pci_legacy_iobases(int *primary, int >> *secondary) >> +{ >> + struct pci_dev *p = NULL; >> + u16 val; >> + >> + for_each_pci_dev(p) { >> + int r; >> + >> + for (r = 0; r < 6; r++) { >> + if (pci_resource_start(p, r) == 0x1f0) >> + *primary = 1; >> + if (pci_resource_start(p, r) == 0x170) >> + *secondary = 1; >> + } >> > > Would have been probably enough to test only BAR0/2, don't you think? I assume you're referring to the legacy ioports fixup in drivers/pci/probe.c:pci_setup_device(). Yes, there's no need to go all the way to BAR5 since those are guaranteed unused in compatibility mode, so actually the loop should go till 4. Bart, can you please change that when applying? -- Regards/Gruß, Boris -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html