Author: jcrouse Date: 2008-04-11 00:50:44 +0200 (Fri, 11 Apr 2008) New Revision: 3231
Added: trunk/payloads/libpayload/drivers/pci.c trunk/payloads/libpayload/include/arch/msr.h trunk/payloads/libpayload/include/pci.h Modified: trunk/payloads/libpayload/drivers/Makefile.inc trunk/payloads/libpayload/i386/timer.c trunk/payloads/libpayload/include/libpayload.h Log: libpayload: Support functions for Geode
The Geode video driver will require a number of support functions, including udelay(), PCI bus walking and MSRs. This adds those functions in preparation for the actual code.
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Uwe Hermann uwe@hermann-uwe.de
Modified: trunk/payloads/libpayload/drivers/Makefile.inc =================================================================== --- trunk/payloads/libpayload/drivers/Makefile.inc 2008-04-10 22:49:02 UTC (rev 3230) +++ trunk/payloads/libpayload/drivers/Makefile.inc 2008-04-10 22:50:44 UTC (rev 3231) @@ -27,6 +27,7 @@ ## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ## SUCH DAMAGE. ## +TARGETS-y += drivers/pci.o
TARGETS-$(CONFIG_SERIAL_CONSOLE) += drivers/serial.o TARGETS-$(CONFIG_PC_KEYBOARD) += drivers/keyboard.o
Added: trunk/payloads/libpayload/drivers/pci.c =================================================================== --- trunk/payloads/libpayload/drivers/pci.c (rev 0) +++ trunk/payloads/libpayload/drivers/pci.c 2008-04-10 22:50:44 UTC (rev 3231) @@ -0,0 +1,92 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * 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. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. + */ + +#include <libpayload.h> +#include <pci.h> + +static int find_on_bus(int bus, unsigned short vid, unsigned short did, + pcidev_t * dev) +{ + int devfn; + unsigned int val; + unsigned char hdr; + + for (devfn = 0; devfn < 0x100; devfn++) { + pci_read_dword(bus, devfn, REG_VENDOR_ID, &val); + + if (val == 0xffffffff || val == 0x00000000 || + val == 0x0000ffff || val == 0xffff0000) + continue; + + if (val == ((did << 16) | vid)) { + *dev = PCIDEV(bus, devfn); + return 1; + } + + pci_read_byte(bus, devfn, REG_HEADER_TYPE, &hdr); + + hdr &= 0x7F; + + if (hdr == HEADER_TYPE_BRIDGE || hdr == HEADER_TYPE_CARDBUS) { + unsigned int busses; + pci_read_dword(bus, devfn, REG_PRIMARY_BUS, &busses); + if (find_on_bus((busses >> 8) & 0xFF, vid, did, dev)) + return 1; + } + } + + return 0; +} + +void pci_read_dword(unsigned int bus, unsigned int devfn, + unsigned int reg, unsigned int *val) +{ + outl(PCI_ADDR(bus, devfn, reg), 0xCF8); + *val = inl(0xCFC); +} + +void pci_read_byte(unsigned int bus, unsigned int devfn, + unsigned int reg, unsigned char *val) +{ + outl(PCI_ADDR(bus, devfn, reg), 0xCF8); + *val = inb(0xCFC + (reg & 3)); +} + +int pci_find_device(unsigned short vid, unsigned short did, pcidev_t * dev) +{ + return find_on_bus(0, vid, did, dev); +} + +unsigned int pci_read_resource(pcidev_t dev, int bar) +{ + unsigned int val; + pci_read_dword(PCIDEV_BUS(dev), PCIDEV_DEVFN(dev), 0x10 + (bar * 4), + &val); + return val; +}
Modified: trunk/payloads/libpayload/i386/timer.c =================================================================== --- trunk/payloads/libpayload/i386/timer.c 2008-04-10 22:49:02 UTC (rev 3230) +++ trunk/payloads/libpayload/i386/timer.c 2008-04-10 22:50:44 UTC (rev 3231) @@ -77,6 +77,11 @@ _delay(n * cpu_khz / 1000000); }
+void udelay(unsigned int n) +{ + _delay(n * cpu_khz / 1000); +} + void mdelay(unsigned int m) { _delay(m * cpu_khz);
Added: trunk/payloads/libpayload/include/arch/msr.h =================================================================== --- trunk/payloads/libpayload/include/arch/msr.h (rev 0) +++ trunk/payloads/libpayload/include/arch/msr.h 2008-04-10 22:50:44 UTC (rev 3231) @@ -0,0 +1,58 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * 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. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 _ARCH_MSR_H_ +#define _ARCH_MSR_H_ + +static inline unsigned long long _rdmsr(unsigned int msr) +{ + unsigned long long val; + asm volatile("rdmsr" : "=A" (val) : "c" (msr)); + return val; +} + +static inline void _wrmsr(unsigned int msr, unsigned long long val) +{ + asm volatile("wrmsr" : : "c" (msr), "A"(val)); +} + +#define rdmsr(_m, _l, _h) \ + do { \ + unsigned long long _v = _rdmsr((_m)); \ + (_l) = (unsigned int) _v; \ + (_h) = (unsigned int) ((_v >> 32) & 0xFFFFFFFF); \ + } while(0) + +static inline void wrmsr(unsigned int msr, unsigned int lo, unsigned int hi) +{ + unsigned long long val = (((unsigned long long) hi) << 32) | lo; + _wrmsr(msr, val); +} + +#endif
Modified: trunk/payloads/libpayload/include/libpayload.h =================================================================== --- trunk/payloads/libpayload/include/libpayload.h 2008-04-10 22:49:02 UTC (rev 3230) +++ trunk/payloads/libpayload/include/libpayload.h 2008-04-10 22:50:44 UTC (rev 3231) @@ -170,6 +170,7 @@ /* Timer functions - defined by each architecture. */ unsigned int get_cpu_speed(void); void ndelay(unsigned int n); +void udelay(unsigned int n); void mdelay(unsigned int n); void delay(unsigned int n);
Added: trunk/payloads/libpayload/include/pci.h =================================================================== --- trunk/payloads/libpayload/include/pci.h (rev 0) +++ trunk/payloads/libpayload/include/pci.h 2008-04-10 22:50:44 UTC (rev 3231) @@ -0,0 +1,61 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * + * 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. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 _PCI_H_ +#define _PCI_H_ + +typedef unsigned short pcidev_t; + +#define REG_VENDOR_ID 0x00 +#define REG_DEVICE_ID 0x04 +#define REG_HEADER_TYPE 0x0E +#define REG_PRIMARY_BUS 0x18 + +#define HEADER_TYPE_NORMAL 0 +#define HEADER_TYPE_BRIDGE 1 +#define HEADER_TYPE_CARDBUS 2 + +#define PCIDEV(_b, _d) ((((_b) & 0xFF) << 8) | ((_d) & 0xFF)) + +#define PCIDEV_BUS(_d) (((_d) >> 8) & 0xFF) +#define PCIDEV_DEVFN(_d) ((_d) & 0xFF) + +#define PCI_ADDR(_bus, _dev, _reg) \ +(0x80000000 | (_bus << 16) | (_dev << 8) | (_reg & ~3)) + +void pci_read_dword(unsigned int bus, unsigned int devfn, + unsigned int reg, unsigned int *val); + +void pci_read_byte(unsigned int bus, unsigned int devfn, + unsigned int reg, unsigned char *val); + +int pci_find_device(unsigned short vid, unsigned short did, pcidev_t *dev); +unsigned int pci_read_resource(pcidev_t dev, int bar); + +#endif
-
svn＠coreboot.org