d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problem with zero valued map registers followed by valid map entries.

Browse Source 
The previous code just ignored the invalid map register, but this gave
surprising results because of the way pci_map_port() associated the map
register offset supplied with a map entry in the map array.
This commit is contained in:
se 1999-01-19 23:29:20 +00:00
parent 1b9be3b5a8
commit 2142e794d7
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/pci/pci.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pci.c,v 1.91 1998/11/09 08:08:06 peter Exp $
* $Id: pci.c,v 1.92 1999/01/12 01:44:42 eivind Exp $
*
*/
@ -190,6 +190,7 @@ pci_readmaps(pcicfgregs *cfg, int maxmaps)
testval = pci_cfgread(cfg, reg, 4);
pci_cfgwrite(cfg, reg, base, 4);
map[j].reg = reg;
map[j].base = pci_mapbase(base);
map[j].type = pci_maptype(base);
map[j].ln2size = pci_mapsize(testval);

4
sys/dev/pci/pcivar.h
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pcivar.h,v 1.23 1998/12/14 05:47:29 dillon Exp $
* $Id: pcivar.h,v 1.24 1999/01/13 04:59:19 bde Exp $
*
*/
@ -66,7 +66,7 @@ typedef struct {
#define PCI_MAPPORT 0x04 /* port map */
u_int8_t ln2size;
u_int8_t ln2range;
/* u_int8_t dummy;*/
u_int8_t reg; /* offset of map register in config space */
} pcimap;
/* config header information common to all header types */

3
sys/pci/pci.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pci.c,v 1.91 1998/11/09 08:08:06 peter Exp $
* $Id: pci.c,v 1.92 1999/01/12 01:44:42 eivind Exp $
*
*/
@ -190,6 +190,7 @@ pci_readmaps(pcicfgregs *cfg, int maxmaps)
testval = pci_cfgread(cfg, reg, 4);
pci_cfgwrite(cfg, reg, base, 4);
map[j].reg = reg;
map[j].base = pci_mapbase(base);
map[j].type = pci_maptype(base);
map[j].ln2size = pci_mapsize(testval);

19
sys/pci/pci_compat.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pci_compat.c,v 1.18 1999/01/13 04:59:19 bde Exp $
* $Id: pci_compat.c,v 1.19 1999/01/14 06:22:10 jdp Exp $
*
*/
@ -59,13 +59,16 @@
static int
pci_mapno(pcicfgregs *cfg, int reg)
{
int map = -1;
if ((reg & 0x03) == 0) {
map = (reg -0x10) / 4;
if (map < 0 || map >= cfg->nummaps)
map = -1;
}
return (map);
int i, nummaps;
pcimap *map;
nummaps = cfg->nummaps;
map = cfg->map;
for (i = 0; i < nummaps; i++)
if (map[i].reg == reg)
return (i);
return (-1);
}
static int

4
sys/pci/pcivar.h
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pcivar.h,v 1.23 1998/12/14 05:47:29 dillon Exp $
* $Id: pcivar.h,v 1.24 1999/01/13 04:59:19 bde Exp $
*
*/
@ -66,7 +66,7 @@ typedef struct {
#define PCI_MAPPORT 0x04 /* port map */
u_int8_t ln2size;
u_int8_t ln2range;
/* u_int8_t dummy;*/
u_int8_t reg; /* offset of map register in config space */
} pcimap;
/* config header information common to all header types */