svn commit: r280393 - in head/sys/dev: ahci ata ata/chipsets mvs siis
Alexander Motin
mav at FreeBSD.org
Mon Mar 23 19:48:06 UTC 2015
Author: mav
Date: Mon Mar 23 19:47:52 2015
New Revision: 280393
URL: https://svnweb.freebsd.org/changeset/base/280393
Log:
Reduce priority of ATA/SATA drivers.
Legacy ata(4) -> BUS_PROBE_LOW_PRIORITY; more functional ahci(4), siis(4),
mvs(4) -> BUS_PROBE_DEFAULT; BUS_PROBE_VENDOR leave for vendor drivers.
MFC after: 2 weeks
Modified:
head/sys/dev/ahci/ahci.c
head/sys/dev/ahci/ahci_pci.c
head/sys/dev/ahci/ahciem.c
head/sys/dev/ata/ata-all.c
head/sys/dev/ata/chipsets/ata-acard.c
head/sys/dev/ata/chipsets/ata-acerlabs.c
head/sys/dev/ata/chipsets/ata-adaptec.c
head/sys/dev/ata/chipsets/ata-amd.c
head/sys/dev/ata/chipsets/ata-ati.c
head/sys/dev/ata/chipsets/ata-cenatek.c
head/sys/dev/ata/chipsets/ata-cypress.c
head/sys/dev/ata/chipsets/ata-cyrix.c
head/sys/dev/ata/chipsets/ata-fsl.c
head/sys/dev/ata/chipsets/ata-highpoint.c
head/sys/dev/ata/chipsets/ata-intel.c
head/sys/dev/ata/chipsets/ata-ite.c
head/sys/dev/ata/chipsets/ata-jmicron.c
head/sys/dev/ata/chipsets/ata-marvell.c
head/sys/dev/ata/chipsets/ata-micron.c
head/sys/dev/ata/chipsets/ata-national.c
head/sys/dev/ata/chipsets/ata-netcell.c
head/sys/dev/ata/chipsets/ata-nvidia.c
head/sys/dev/ata/chipsets/ata-promise.c
head/sys/dev/ata/chipsets/ata-serverworks.c
head/sys/dev/ata/chipsets/ata-siliconimage.c
head/sys/dev/ata/chipsets/ata-sis.c
head/sys/dev/ata/chipsets/ata-via.c
head/sys/dev/mvs/mvs.c
head/sys/dev/mvs/mvs_pci.c
head/sys/dev/mvs/mvs_soc.c
head/sys/dev/siis/siis.c
Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ahci/ahci.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -638,7 +638,7 @@ ahci_ch_probe(device_t dev)
{
device_set_desc_copy(dev, "AHCI channel");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
Modified: head/sys/dev/ahci/ahci_pci.c
==============================================================================
--- head/sys/dev/ahci/ahci_pci.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ahci/ahci_pci.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -340,13 +340,13 @@ ahci_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
ahci_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
if (!valid)
return (ENXIO);
device_set_desc_copy(dev, "AHCI SATA controller");
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
static int
@@ -366,11 +366,11 @@ ahci_ata_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
ahci_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
device_set_desc_copy(dev, "AHCI SATA controller");
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
static int
Modified: head/sys/dev/ahci/ahciem.c
==============================================================================
--- head/sys/dev/ahci/ahciem.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ahci/ahciem.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -65,7 +65,7 @@ ahci_em_probe(device_t dev)
{
device_set_desc_copy(dev, "AHCI enclosure management bridge");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
Modified: head/sys/dev/ata/ata-all.c
==============================================================================
--- head/sys/dev/ata/ata-all.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/ata-all.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -91,7 +91,7 @@ FEATURE(ata_cam, "ATA devices are access
int
ata_probe(device_t dev)
{
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
int
Modified: head/sys/dev/ata/chipsets/ata-acard.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-acard.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-acard.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -83,7 +83,7 @@ ata_acard_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_acard_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-acerlabs.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-acerlabs.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-acerlabs.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -96,7 +96,7 @@ ata_ali_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_ali_chipinit;
ctlr->chipdeinit = ata_ali_chipdeinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-adaptec.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-adaptec.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-adaptec.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -75,7 +75,7 @@ ata_adaptec_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_marvell_edma_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
ATA_DECLARE_DRIVER(ata_adaptec);
Modified: head/sys/dev/ata/chipsets/ata-amd.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-amd.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-amd.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -82,7 +82,7 @@ ata_amd_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_amd_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-ati.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-ati.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-ati.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -123,7 +123,7 @@ ata_ati_probe(device_t dev)
ctlr->chipinit = ata_ati_chipinit;
break;
}
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-cenatek.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-cenatek.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-cenatek.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -63,7 +63,7 @@ ata_cenatek_probe(device_t dev)
ctlr->chipinit = ata_generic_chipinit;
device_set_desc(dev, "Cenatek Rocket Drive controller");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
ATA_DECLARE_DRIVER(ata_cenatek);
Modified: head/sys/dev/ata/chipsets/ata-cypress.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-cypress.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-cypress.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -75,7 +75,7 @@ ata_cypress_probe(device_t dev)
pci_get_subclass(dev) == PCIS_STORAGE_IDE) {
device_set_desc(dev, "Cypress 82C693 ATA controller");
ctlr->chipinit = ata_cypress_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return ENXIO;
}
Modified: head/sys/dev/ata/chipsets/ata-cyrix.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-cyrix.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-cyrix.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -66,7 +66,7 @@ ata_cyrix_probe(device_t dev)
if (pci_get_devid(dev) == ATA_CYRIX_5530) {
device_set_desc(dev, "Cyrix 5530 ATA33 controller");
ctlr->chipinit = ata_cyrix_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return ENXIO;
}
Modified: head/sys/dev/ata/chipsets/ata-fsl.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-fsl.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-fsl.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -79,7 +79,7 @@ imx_ata_probe(device_t dev)
ctrl = device_get_softc(dev);
device_set_desc(dev, "Freescale Integrated PATA Controller");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static void
Modified: head/sys/dev/ata/chipsets/ata-highpoint.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-highpoint.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-highpoint.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -103,7 +103,7 @@ ata_highpoint_probe(device_t dev)
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_highpoint_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-intel.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-intel.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-intel.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -264,7 +264,7 @@ ata_intel_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_intel_chipinit;
ctlr->chipdeinit = ata_intel_chipdeinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-ite.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-ite.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-ite.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -77,7 +77,7 @@ ata_ite_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_ite_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-jmicron.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-jmicron.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-jmicron.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -86,7 +86,7 @@ ata_jmicron_probe(device_t dev)
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_jmicron_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-marvell.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-marvell.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-marvell.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -139,7 +139,7 @@ ata_marvell_probe(device_t dev)
ctlr->chipinit = ata_marvell_dummy_chipinit;
break;
}
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-micron.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-micron.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-micron.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -63,7 +63,7 @@ ata_micron_probe(device_t dev)
device_set_desc(dev,
"RZ 100? ATA controller !WARNING! data loss/corruption risk");
ctlr->chipinit = ata_generic_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return (ENXIO);
}
Modified: head/sys/dev/ata/chipsets/ata-national.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-national.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-national.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -67,7 +67,7 @@ ata_national_probe(device_t dev)
if (pci_get_devid(dev) == ATA_SC1100) {
device_set_desc(dev, "National Geode SC1100 ATA33 controller");
ctlr->chipinit = ata_national_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return ENXIO;
}
Modified: head/sys/dev/ata/chipsets/ata-netcell.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-netcell.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-netcell.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -66,7 +66,7 @@ ata_netcell_probe(device_t dev)
if (pci_get_devid(dev) == ATA_NETCELL_SR) {
device_set_desc(dev, "Netcell SyncRAID SR3000/5000 RAID Controller");
ctlr->chipinit = ata_netcell_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return ENXIO;
}
Modified: head/sys/dev/ata/chipsets/ata-nvidia.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-nvidia.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-nvidia.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -187,7 +187,7 @@ ata_nvidia_probe(device_t dev)
ctlr->chipinit = ata_ahci_chipinit;
else
ctlr->chipinit = ata_nvidia_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-promise.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-promise.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-promise.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -209,7 +209,7 @@ ata_promise_probe(device_t dev)
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_promise_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-serverworks.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-serverworks.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-serverworks.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -96,7 +96,7 @@ ata_serverworks_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_serverworks_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-siliconimage.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-siliconimage.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-siliconimage.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -113,7 +113,7 @@ ata_sii_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_sii_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
int
Modified: head/sys/dev/ata/chipsets/ata-sis.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-sis.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-sis.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -154,7 +154,7 @@ ata_sis_probe(device_t dev)
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_sis_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/ata/chipsets/ata-via.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-via.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/ata/chipsets/ata-via.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -141,7 +141,7 @@ ata_via_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_via_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
Modified: head/sys/dev/mvs/mvs.c
==============================================================================
--- head/sys/dev/mvs/mvs.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/mvs/mvs.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -107,7 +107,7 @@ mvs_ch_probe(device_t dev)
{
device_set_desc_copy(dev, "Marvell SATA channel");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
Modified: head/sys/dev/mvs/mvs_pci.c
==============================================================================
--- head/sys/dev/mvs/mvs_pci.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/mvs/mvs_pci.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -88,7 +88,7 @@ mvs_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s SATA controller",
mvs_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
return (ENXIO);
Modified: head/sys/dev/mvs/mvs_soc.c
==============================================================================
--- head/sys/dev/mvs/mvs_soc.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/mvs/mvs_soc.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -91,7 +91,7 @@ mvs_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s SATA controller",
mvs_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
return (ENXIO);
Modified: head/sys/dev/siis/siis.c
==============================================================================
--- head/sys/dev/siis/siis.c Mon Mar 23 19:44:18 2015 (r280392)
+++ head/sys/dev/siis/siis.c Mon Mar 23 19:47:52 2015 (r280393)
@@ -129,7 +129,7 @@ siis_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s SATA controller",
siis_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
return (ENXIO);
@@ -451,7 +451,7 @@ siis_ch_probe(device_t dev)
{
device_set_desc_copy(dev, "SIIS channel");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
More information about the svn-src-all
mailing list