d3e53912d2
pci_find_rom(), pci_intr_map(9), pci_enumerate_bus(), nor the match
predicate passed to pciide_compat_intr_establish() should ever modify
their pci_attach_args argument, so make their pci_attach_args arguments
const and deal with the fallout throughout the kernel.
For the most part, these changes add a 'const' where there was no
'const' before, however, some drivers and MD code used to modify
pci_attach_args. Now those drivers either copy their pci_attach_args
and modify the copy, or refrain from modifying pci_attach_args:
Xen: according to Manuel Bouyer, writing to pci_attach_args in
pci_intr_map() was a leftover from Xen 2. Probably a bug. I
stopped writing it. I have not tested this change.
siside(4): sis_hostbr_match() needlessly wrote to pci_attach_args.
Probably a bug. I use a temporary variable. I have not tested this
change.
slide(4): sl82c105_chip_map() overwrote the caller's pci_attach_args.
Probably a bug. Use a local pci_attach_args. I have not tested
this change.
viaide(4): via_sata_chip_map() and via_sata_chip_map_new() overwrote the
caller's pci_attach_args. Probably a bug. Make a local copy of the
caller's pci_attach_args and modify the copy. I have not tested
this change.
While I'm here, make pci_mapreg_submap() static.
With these changes in place, I have tested the compilation of these
kernels:
alpha GENERIC
amd64 GENERIC XEN3_DOM0
arc GENERIC
atari HADES MILAN-PCIIDE
bebox GENERIC
cats GENERIC
cobalt GENERIC
evbarm-eb NSLU2
evbarm-el ADI_BRH ARMADILLO9 CP3100 GEMINI GEMINI_MASTER GEMINI_SLAVE GUMSTIX
HDL_G IMX31LITE INTEGRATOR IQ31244 IQ80310 IQ80321 IXDP425 IXM1200
KUROBOX_PRO LUBBOCK MARVELL_NAS NAPPI SHEEVAPLUG SMDK2800 TEAMASA_NPWR
TEAMASA_NPWR_FC TS7200 TWINTAIL ZAO425
evbmips-el AP30 DBAU1500 DBAU1550 MALTA MERAKI MTX-1 OMSAL400 RB153 WGT624V3
evbmips64-el XLSATX
evbppc EV64260 MPC8536DS MPC8548CDS OPENBLOCKS200 OPENBLOCKS266
OPENBLOCKS266_OPT P2020RDB PMPPC RB800 WALNUT
hp700 GENERIC
i386 ALL XEN3_DOM0 XEN3_DOMU
ibmnws GENERIC
macppc GENERIC
mvmeppc GENERIC
netwinder GENERIC
ofppc GENERIC
prep GENERIC
sandpoint GENERIC
sgimips GENERIC32_IP2x
sparc GENERIC_SUN4U KRUPS
sparc64 GENERIC
As of Sun Apr 3 15:26:26 CDT 2011, I could not compile these kernels
with or without my patches in place:
### evbmips-el GDIUM
nbmake: nbmake: don't know how to make /home/dyoung/pristine-nbsd/src/sys/arch/mips/mips/softintr.c. Stop
### evbarm-el MPCSA_GENERIC
src/sys/arch/evbarm/conf/MPCSA_GENERIC:318: ds1672rtc*: unknown device `ds1672rtc'
### ia64 GENERIC
/tmp/genassym.28085/assym.c: In function 'f111':
/tmp/genassym.28085/assym.c:67: error: invalid application of 'sizeof' to incomplete type 'struct pcb'
/tmp/genassym.28085/assym.c:76: error: dereferencing pointer to incomplete type
### sgimips GENERIC32_IP3x
crmfb.o: In function `crmfb_attach':
crmfb.c:(.text+0x2304): undefined reference to `ddc_read_edid'
crmfb.c:(.text+0x2304): relocation truncated to fit: R_MIPS_26 against `ddc_read_edid'
crmfb.c:(.text+0x234c): undefined reference to `edid_parse'
crmfb.c:(.text+0x234c): relocation truncated to fit: R_MIPS_26 against `edid_parse'
crmfb.c:(.text+0x2354): undefined reference to `edid_print'
crmfb.c:(.text+0x2354): relocation truncated to fit: R_MIPS_26 against `edid_print'
95 lines
3.5 KiB
C
95 lines
3.5 KiB
C
/* $NetBSD: pci_machdep.h,v 1.8 2011/04/04 20:37:54 dyoung Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 1999 Matthew R. Green
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _SPARC_PCI_MACHDEP_H_
|
|
#define _SPARC_PCI_MACHDEP_H_
|
|
|
|
/*
|
|
* Machine-specific definitions for PCI autoconfiguration.
|
|
*/
|
|
|
|
/*
|
|
* Types provided to machine-independent PCI code
|
|
*/
|
|
typedef struct sparc_pci_chipset *pci_chipset_tag_t;
|
|
typedef u_int pci_intr_handle_t;
|
|
typedef uint64_t pcitag_t;
|
|
|
|
|
|
/*
|
|
* Forward declarations.
|
|
*/
|
|
struct pci_attach_args;
|
|
|
|
|
|
/*
|
|
* sparc-specific PCI structure and type definitions.
|
|
* NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
|
|
*/
|
|
struct sparc_pci_chipset {
|
|
void *cookie; /* msiiep_softc, but sssh! */
|
|
};
|
|
|
|
/*
|
|
* The MI PCI code expects pcitag_t to be a scalar type. But besides
|
|
* the bus/device/function we need to store the OFW node as well. We
|
|
* can squeeze them into a uint64_t with a little help from some
|
|
* macros. And while we are at it mangle bus/device/function into a
|
|
* form directly suitable for pci mode1 configuration address port.
|
|
*/
|
|
#define PCITAG_CREATE(n,b,d,f) \
|
|
(((uint64_t)(n)<<32)|0x80000000U|((b)<<16)|((d)<<11)|((f)<<8))
|
|
|
|
#define PCITAG_NODE(t) ((uint32_t)(((t)>>32)&0xffffffff))
|
|
#define PCITAG_OFFSET(t) ((uint32_t)((t)&0xffffffff))
|
|
#define PCITAG_BUS(t) ((PCITAG_OFFSET(t)>>16)&0xFF)
|
|
#define PCITAG_DEV(t) ((PCITAG_OFFSET(t)>>11)&0x1F)
|
|
#define PCITAG_FUN(t) ((PCITAG_OFFSET(t)>>8)&0x7)
|
|
|
|
|
|
/*
|
|
* Functions provided to machine-independent PCI code.
|
|
*/
|
|
void pci_attach_hook(struct device *, struct device *,
|
|
struct pcibus_attach_args *);
|
|
int pci_bus_maxdevs(pci_chipset_tag_t, int);
|
|
pcitag_t pci_make_tag(pci_chipset_tag_t, int, int, int);
|
|
void pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
|
|
int *, int *, int *);
|
|
pcireg_t pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
|
|
void pci_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
|
|
int pci_intr_map(const struct pci_attach_args *,
|
|
pci_intr_handle_t *);
|
|
const char *pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
|
|
const struct evcnt *pci_intr_evcnt(pci_chipset_tag_t, pci_intr_handle_t);
|
|
void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
|
|
int, int (*)(void *), void *);
|
|
void pci_intr_disestablish(pci_chipset_tag_t, void *);
|
|
|
|
#endif /* _SPARC_PCI_MACHDEP_H_ */
|