Date: Mon, 6 Apr 2015 08:23:07 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r281140 - in stable/10/sys/dev: ahci ata ata/chipsets mvs siis Message-ID: <201504060823.t368N7Zf082734@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Apr 6 08:23:06 2015 New Revision: 281140 URL: https://svnweb.freebsd.org/changeset/base/281140 Log: MFC r280393: 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. Modified: stable/10/sys/dev/ahci/ahci.c stable/10/sys/dev/ahci/ahci_pci.c stable/10/sys/dev/ahci/ahciem.c stable/10/sys/dev/ata/ata-all.c stable/10/sys/dev/ata/chipsets/ata-acard.c stable/10/sys/dev/ata/chipsets/ata-acerlabs.c stable/10/sys/dev/ata/chipsets/ata-adaptec.c stable/10/sys/dev/ata/chipsets/ata-amd.c stable/10/sys/dev/ata/chipsets/ata-ati.c stable/10/sys/dev/ata/chipsets/ata-cenatek.c stable/10/sys/dev/ata/chipsets/ata-cypress.c stable/10/sys/dev/ata/chipsets/ata-cyrix.c stable/10/sys/dev/ata/chipsets/ata-fsl.c stable/10/sys/dev/ata/chipsets/ata-highpoint.c stable/10/sys/dev/ata/chipsets/ata-intel.c stable/10/sys/dev/ata/chipsets/ata-ite.c stable/10/sys/dev/ata/chipsets/ata-jmicron.c stable/10/sys/dev/ata/chipsets/ata-marvell.c stable/10/sys/dev/ata/chipsets/ata-micron.c stable/10/sys/dev/ata/chipsets/ata-national.c stable/10/sys/dev/ata/chipsets/ata-netcell.c stable/10/sys/dev/ata/chipsets/ata-nvidia.c stable/10/sys/dev/ata/chipsets/ata-promise.c stable/10/sys/dev/ata/chipsets/ata-serverworks.c stable/10/sys/dev/ata/chipsets/ata-siliconimage.c stable/10/sys/dev/ata/chipsets/ata-sis.c stable/10/sys/dev/ata/chipsets/ata-via.c stable/10/sys/dev/mvs/mvs.c stable/10/sys/dev/mvs/mvs_pci.c stable/10/sys/dev/mvs/mvs_soc.c stable/10/sys/dev/siis/siis.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/ahci/ahci.c ============================================================================== --- stable/10/sys/dev/ahci/ahci.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ahci/ahci.c Mon Apr 6 08:23:06 2015 (r281140) @@ -610,7 +610,7 @@ ahci_ch_probe(device_t dev) { device_set_desc_copy(dev, "AHCI channel"); - return (0); + return (BUS_PROBE_DEFAULT); } static int Modified: stable/10/sys/dev/ahci/ahci_pci.c ============================================================================== --- stable/10/sys/dev/ahci/ahci_pci.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ahci/ahci_pci.c Mon Apr 6 08:23:06 2015 (r281140) @@ -339,13 +339,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 @@ -365,11 +365,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: stable/10/sys/dev/ahci/ahciem.c ============================================================================== --- stable/10/sys/dev/ahci/ahciem.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ahci/ahciem.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/ata-all.c ============================================================================== --- stable/10/sys/dev/ata/ata-all.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/ata-all.c Mon Apr 6 08:23:06 2015 (r281140) @@ -92,7 +92,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: stable/10/sys/dev/ata/chipsets/ata-acard.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-acard.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-acard.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-acerlabs.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-acerlabs.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-acerlabs.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-adaptec.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-adaptec.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-adaptec.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-amd.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-amd.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-amd.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-ati.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-ati.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-ati.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-cenatek.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-cenatek.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-cenatek.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-cypress.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-cypress.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-cypress.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-cyrix.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-cyrix.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-cyrix.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-fsl.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-fsl.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-fsl.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-highpoint.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-highpoint.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-highpoint.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-intel.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-intel.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-intel.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-ite.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-ite.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-ite.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-jmicron.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-jmicron.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-jmicron.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-marvell.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-marvell.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-marvell.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-micron.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-micron.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-micron.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-national.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-national.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-national.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-netcell.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-netcell.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-netcell.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-nvidia.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-nvidia.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-nvidia.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-promise.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-promise.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-promise.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-serverworks.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-serverworks.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-serverworks.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-siliconimage.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-siliconimage.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-siliconimage.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-sis.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-sis.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-sis.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/ata/chipsets/ata-via.c ============================================================================== --- stable/10/sys/dev/ata/chipsets/ata-via.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/ata/chipsets/ata-via.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/mvs/mvs.c ============================================================================== --- stable/10/sys/dev/mvs/mvs.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/mvs/mvs.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/mvs/mvs_pci.c ============================================================================== --- stable/10/sys/dev/mvs/mvs_pci.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/mvs/mvs_pci.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/mvs/mvs_soc.c ============================================================================== --- stable/10/sys/dev/mvs/mvs_soc.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/mvs/mvs_soc.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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: stable/10/sys/dev/siis/siis.c ============================================================================== --- stable/10/sys/dev/siis/siis.c Mon Apr 6 07:42:05 2015 (r281139) +++ stable/10/sys/dev/siis/siis.c Mon Apr 6 08:23:06 2015 (r281140) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504060823.t368N7Zf082734>