Author: marius
Date: Wed Jan 18 23:23:46 2017
New Revision: 312398
URL: https://svnweb.freebsd.org/changeset/base/312398
Log:
MFC: r296135
Replace several bus_alloc_resource() calls with bus_alloc_resource_any()
Most of these are BARs, and we allocate them in their entirety. The one
outlier in this is amdsbwd(4), which calls bus_set_resource() prior.
Modified:
stable/10/sys/dev/amdsbwd/amdsbwd.c
stable/10/sys/dev/arcmsr/arcmsr.c
stable/10/sys/dev/hpt27xx/hpt27xx_os_bsd.c
stable/10/sys/dev/hptmv/entry.c
stable/10/sys/dev/hptnr/hptnr_os_bsd.c
stable/10/sys/dev/hptrr/hptrr_os_bsd.c
stable/10/sys/dev/sdhci/sdhci_pci.c
stable/10/sys/dev/sound/pci/als4000.c
stable/10/sys/dev/sound/pci/cs4281.c
stable/10/sys/dev/sound/pci/vibes.c
stable/10/sys/dev/tws/tws.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/amdsbwd/amdsbwd.c
==============================================================================
--- stable/10/sys/dev/amdsbwd/amdsbwd.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/amdsbwd/amdsbwd.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -416,8 +416,8 @@ amdsbwd_probe(device_t dev)
return (ENXIO);
}
rid = 0;
- res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0ul, ~0ul,
- AMDSB_PMIO_WIDTH, RF_ACTIVE | RF_SHAREABLE);
+ res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE | RF_SHAREABLE);
if (res == NULL) {
device_printf(dev, "bus_alloc_resource for IO failed\n");
return (ENXIO);
Modified: stable/10/sys/dev/arcmsr/arcmsr.c
==============================================================================
--- stable/10/sys/dev/arcmsr/arcmsr.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/arcmsr/arcmsr.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -4143,7 +4143,7 @@ static u_int32_t arcmsr_initialize(devic
u_int32_t rid0 = PCIR_BAR(0);
vm_offset_t mem_base0;
- acb->sys_res_arcmsr[0] =
bus_alloc_resource(dev,SYS_RES_MEMORY, &rid0, 0ul, ~0ul, 0x1000, RF_ACTIVE);
+ acb->sys_res_arcmsr[0] =
bus_alloc_resource_any(dev,SYS_RES_MEMORY, &rid0, RF_ACTIVE);
if(acb->sys_res_arcmsr[0] == NULL) {
arcmsr_free_resource(acb);
printf("arcmsr%d: bus_alloc_resource
failure!\n", device_get_unit(dev));
@@ -4177,11 +4177,11 @@ static u_int32_t arcmsr_initialize(devic
size = sizeof(struct HBB_DOORBELL);
for(i=0; i < 2; i++) {
if(i == 0) {
- acb->sys_res_arcmsr[i] =
bus_alloc_resource(dev,SYS_RES_MEMORY, &rid[i],
-
0ul, ~0ul, size, RF_ACTIVE);
+ acb->sys_res_arcmsr[i] =
bus_alloc_resource_any(dev,SYS_RES_MEMORY, &rid[i],
+
RF_ACTIVE);
} else {
- acb->sys_res_arcmsr[i] =
bus_alloc_resource(dev, SYS_RES_MEMORY, &rid[i],
-
0ul, ~0ul, sizeof(struct HBB_RWBUFFER), RF_ACTIVE);
+ acb->sys_res_arcmsr[i] =
bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid[i],
+
RF_ACTIVE);
}
if(acb->sys_res_arcmsr[i] == NULL) {
arcmsr_free_resource(acb);
@@ -4224,7 +4224,7 @@ static u_int32_t arcmsr_initialize(devic
u_int32_t rid0 = PCIR_BAR(1);
vm_offset_t mem_base0;
- acb->sys_res_arcmsr[0] =
bus_alloc_resource(dev,SYS_RES_MEMORY, &rid0, 0ul, ~0ul, sizeof(struct
HBC_MessageUnit), RF_ACTIVE);
+ acb->sys_res_arcmsr[0] =
bus_alloc_resource_any(dev,SYS_RES_MEMORY, &rid0, RF_ACTIVE);
if(acb->sys_res_arcmsr[0] == NULL) {
arcmsr_free_resource(acb);
printf("arcmsr%d: bus_alloc_resource
failure!\n", device_get_unit(dev));
@@ -4251,7 +4251,7 @@ static u_int32_t arcmsr_initialize(devic
u_int32_t rid0 = PCIR_BAR(0);
vm_offset_t mem_base0;
- acb->sys_res_arcmsr[0] =
bus_alloc_resource(dev,SYS_RES_MEMORY, &rid0, 0ul, ~0ul, sizeof(struct
HBD_MessageUnit), RF_ACTIVE);
+ acb->sys_res_arcmsr[0] =
bus_alloc_resource_any(dev,SYS_RES_MEMORY, &rid0, RF_ACTIVE);
if(acb->sys_res_arcmsr[0] == NULL) {
arcmsr_free_resource(acb);
printf("arcmsr%d: bus_alloc_resource
failure!\n", device_get_unit(dev));
Modified: stable/10/sys/dev/hpt27xx/hpt27xx_os_bsd.c
==============================================================================
--- stable/10/sys/dev/hpt27xx/hpt27xx_os_bsd.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/hpt27xx/hpt27xx_os_bsd.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -120,13 +120,13 @@ void *os_map_pci_bar(
if (base & 1) {
hba->pcibar[index].type = SYS_RES_IOPORT;
- hba->pcibar[index].res = bus_alloc_resource(hba->pcidev,
- hba->pcibar[index].type, &hba->pcibar[index].rid, 0,
~0, length, RF_ACTIVE);
+ hba->pcibar[index].res = bus_alloc_resource_any(hba->pcidev,
+ hba->pcibar[index].type, &hba->pcibar[index].rid,
RF_ACTIVE);
hba->pcibar[index].base = (void *)(unsigned long)(base & ~0x1);
} else {
hba->pcibar[index].type = SYS_RES_MEMORY;
- hba->pcibar[index].res = bus_alloc_resource(hba->pcidev,
- hba->pcibar[index].type, &hba->pcibar[index].rid, 0,
~0, length, RF_ACTIVE);
+ hba->pcibar[index].res = bus_alloc_resource_any(hba->pcidev,
+ hba->pcibar[index].type, &hba->pcibar[index].rid,
RF_ACTIVE);
hba->pcibar[index].base = (char
*)rman_get_virtual(hba->pcibar[index].res) + offset;
}
Modified: stable/10/sys/dev/hptmv/entry.c
==============================================================================
--- stable/10/sys/dev/hptmv/entry.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/hptmv/entry.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -1356,8 +1356,8 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
/* also map EPROM address */
rid = 0x10;
- if (!(pAdapter->mem_res = bus_alloc_resource(pAdapter->hpt_dev,
SYS_RES_MEMORY, &rid,
- 0, ~0, MV_SATA_PCI_BAR0_SPACE_SIZE+0x40000, RF_ACTIVE))
+ if (!(pAdapter->mem_res = bus_alloc_resource_any(pAdapter->hpt_dev,
+ SYS_RES_MEMORY, &rid, RF_ACTIVE))
||
!(pMvSataAdapter->adapterIoBaseAddress =
rman_get_virtual(pAdapter->mem_res)))
{
Modified: stable/10/sys/dev/hptnr/hptnr_os_bsd.c
==============================================================================
--- stable/10/sys/dev/hptnr/hptnr_os_bsd.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/hptnr/hptnr_os_bsd.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -106,13 +106,13 @@ void *os_map_pci_bar(
if (base & 1) {
hba->pcibar[index].type = SYS_RES_IOPORT;
- hba->pcibar[index].res = bus_alloc_resource(hba->pcidev,
- hba->pcibar[index].type, &hba->pcibar[index].rid, 0,
~0, length, RF_ACTIVE);
+ hba->pcibar[index].res = bus_alloc_resource_any(hba->pcidev,
+ hba->pcibar[index].type, &hba->pcibar[index].rid,
RF_ACTIVE);
hba->pcibar[index].base = (void *)(unsigned long)(base & ~0x1);
} else {
hba->pcibar[index].type = SYS_RES_MEMORY;
- hba->pcibar[index].res = bus_alloc_resource(hba->pcidev,
- hba->pcibar[index].type, &hba->pcibar[index].rid, 0,
~0, length, RF_ACTIVE);
+ hba->pcibar[index].res = bus_alloc_resource_any(hba->pcidev,
+ hba->pcibar[index].type, &hba->pcibar[index].rid,
RF_ACTIVE);
hba->pcibar[index].base = (char
*)rman_get_virtual(hba->pcibar[index].res) + offset;
}
Modified: stable/10/sys/dev/hptrr/hptrr_os_bsd.c
==============================================================================
--- stable/10/sys/dev/hptrr/hptrr_os_bsd.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/hptrr/hptrr_os_bsd.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -98,8 +98,8 @@ void *os_map_pci_bar(
else
hba->pcibar[index].type = SYS_RES_MEMORY;
- hba->pcibar[index].res = bus_alloc_resource(hba->pcidev,
- hba->pcibar[index].type, &hba->pcibar[index].rid, 0, ~0,
length, RF_ACTIVE);
+ hba->pcibar[index].res = bus_alloc_resource_any(hba->pcidev,
+ hba->pcibar[index].type, &hba->pcibar[index].rid, RF_ACTIVE);
hba->pcibar[index].base = (char
*)rman_get_virtual(hba->pcibar[index].res) + offset;
return hba->pcibar[index].base;
Modified: stable/10/sys/dev/sdhci/sdhci_pci.c
==============================================================================
--- stable/10/sys/dev/sdhci/sdhci_pci.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/sdhci/sdhci_pci.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -331,8 +331,8 @@ sdhci_pci_attach(device_t dev)
/* Allocate memory. */
rid = PCIR_BAR(bar + i);
- sc->mem_res[i] = bus_alloc_resource(dev, SYS_RES_MEMORY,
- &rid, 0ul, ~0ul, 0x100, RF_ACTIVE);
+ sc->mem_res[i] = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+ &rid, RF_ACTIVE);
if (sc->mem_res[i] == NULL) {
device_printf(dev, "Can't allocate memory for slot
%d\n", i);
continue;
Modified: stable/10/sys/dev/sound/pci/als4000.c
==============================================================================
--- stable/10/sys/dev/sound/pci/als4000.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/sound/pci/als4000.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -760,8 +760,8 @@ static int
als_resource_grab(device_t dev, struct sc_info *sc)
{
sc->regid = PCIR_BAR(0);
- sc->reg = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->regid, 0, ~0,
- ALS_CONFIG_SPACE_BYTES, RF_ACTIVE);
+ sc->reg = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &sc->regid,
+ RF_ACTIVE);
if (sc->reg == 0) {
device_printf(dev, "unable to allocate register space\n");
goto bad;
Modified: stable/10/sys/dev/sound/pci/cs4281.c
==============================================================================
--- stable/10/sys/dev/sound/pci/cs4281.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/sound/pci/cs4281.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -790,12 +790,11 @@ cs4281_pci_attach(device_t dev)
sc->regid = PCIR_BAR(0);
sc->regtype = SYS_RES_MEMORY;
- sc->reg = bus_alloc_resource(dev, sc->regtype, &sc->regid,
- 0, ~0, CS4281PCI_BA0_SIZE, RF_ACTIVE);
+ sc->reg = bus_alloc_resource_any(dev, sc->regtype, &sc->regid, RF_ACTIVE);
if (!sc->reg) {
sc->regtype = SYS_RES_IOPORT;
- sc->reg = bus_alloc_resource(dev, sc->regtype, &sc->regid,
- 0, ~0, CS4281PCI_BA0_SIZE, RF_ACTIVE);
+ sc->reg = bus_alloc_resource_any(dev, sc->regtype, &sc->regid,
+ RF_ACTIVE);
if (!sc->reg) {
device_printf(dev, "unable to allocate register space\n");
goto bad;
@@ -805,8 +804,8 @@ cs4281_pci_attach(device_t dev)
sc->sh = rman_get_bushandle(sc->reg);
sc->memid = PCIR_BAR(1);
- sc->mem = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->memid, 0,
- ~0, CS4281PCI_BA1_SIZE, RF_ACTIVE);
+ sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->memid,
+ RF_ACTIVE);
if (sc->mem == NULL) {
device_printf(dev, "unable to allocate fifo space\n");
goto bad;
Modified: stable/10/sys/dev/sound/pci/vibes.c
==============================================================================
--- stable/10/sys/dev/sound/pci/vibes.c Wed Jan 18 22:40:22 2017
(r312397)
+++ stable/10/sys/dev/sound/pci/vibes.c Wed Jan 18 23:23:46 2017
(r312398)
@@ -739,9 +739,8 @@ sv_attach(device_t dev) {
#endif
sc->enh_rid = SV_PCI_ENHANCED;
sc->enh_type = SYS_RES_IOPORT;
- sc->enh_reg = bus_alloc_resource(dev, sc->enh_type,
- &sc->enh_rid, 0, ~0,
- SV_PCI_ENHANCED_SIZE, RF_ACTIVE);
+ sc->enh_reg = bus_alloc_resource_any(dev, sc->enh_type,
+ &sc->enh_rid, RF_ACTIVE);
if (sc->enh_reg == NULL) {
device_printf(dev, "sv_attach: cannot allocate enh\n");
return ENXIO;
@@ -832,9 +831,8 @@ sv_attach(device_t dev) {
/* Cache resource short-cuts for dma_a */
sc->dmaa_rid = SV_PCI_DMAA;
sc->dmaa_type = SYS_RES_IOPORT;
- sc->dmaa_reg = bus_alloc_resource(dev, sc->dmaa_type,
- &sc->dmaa_rid, 0, ~0,
- SV_PCI_ENHANCED_SIZE, RF_ACTIVE);
+ sc->dmaa_reg = bus_alloc_resource_any(dev, sc->dmaa_type,
+ &sc->dmaa_rid, RF_ACTIVE);
if (sc->dmaa_reg == NULL) {
device_printf(dev, "sv_attach: cannot allocate dmaa\n");
goto fail;
@@ -851,9 +849,8 @@ sv_attach(device_t dev) {
/* Cache resource short-cuts for dma_c */
sc->dmac_rid = SV_PCI_DMAC;
sc->dmac_type = SYS_RES_IOPORT;
- sc->dmac_reg = bus_alloc_resource(dev, sc->dmac_type,
- &sc->dmac_rid, 0, ~0,
- SV_PCI_ENHANCED_SIZE, RF_ACTIVE);
+ sc->dmac_reg = bus_alloc_resource_any(dev, sc->dmac_type,
+ &sc->dmac_rid, RF_ACTIVE);
if (sc->dmac_reg == NULL) {
device_printf(dev, "sv_attach: cannot allocate dmac\n");
goto fail;
Modified: stable/10/sys/dev/tws/tws.c
==============================================================================
--- stable/10/sys/dev/tws/tws.c Wed Jan 18 22:40:22 2017 (r312397)
+++ stable/10/sys/dev/tws/tws.c Wed Jan 18 23:23:46 2017 (r312398)
@@ -257,8 +257,8 @@ tws_attach(device_t dev)
#ifndef TWS_PULL_MODE_ENABLE
/* Allocate bus space for inbound mfa */
sc->mfa_res_id = TWS_PCI_BAR2; /* BAR2 offset */
- if ((sc->mfa_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
- &(sc->mfa_res_id), 0, ~0, 0x100000, RF_ACTIVE))
+ if ((sc->mfa_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+ &(sc->mfa_res_id), RF_ACTIVE))
== NULL) {
tws_log(sc, ALLOC_MEMORY_RES);
goto attach_fail_2;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
