From: AceVest Date: Thu, 8 May 2014 15:36:46 +0000 (+0800) Subject: some modifies in the setup_pci X-Git-Tag: 0.3.0~64 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/already%20found%20%2A/doxygen-warnings.log?a=commitdiff_plain;h=08ac9d551d81dd8096aa8de6d2bc9509051f6e51;p=kernel.git some modifies in the setup_pci --- diff --git a/include/pci.h b/include/pci.h index 7a1c121..2a30dd1 100644 --- a/include/pci.h +++ b/include/pci.h @@ -14,8 +14,9 @@ *-------------------------------------------------------------------------- */ -#ifndef _PCI_H -#define _PCI_H +#pragma once + +#include #define PCI_ADDR 0xCF8 // CONFIG_ADDRESS #define PCI_DATA 0xCFC // CONFIG_DATA @@ -28,21 +29,21 @@ * +---------------------------+---------------------------+ 04H * | Status | Command | * +-----------------------------------------+-------------+ 08H - * | Class Code | Revision | + * | Class Code | Subclass | Prog IF | Revision | * +-------------+-------------+-------------+-------------+ 0CH * | BIST | Header Type |LatencyTimer |CacheLineSize| * +-------------+-------------+-------------+-------------+ 10H - * | Base Address Register 1 | + * | Base Address Register 0 | * +-------------------------------------------------------+ 14H - * | Base Address Register 2 | + * | Base Address Register 1 | * +-------------------------------------------------------+ 18H - * | Base Address Register 3 | + * | Base Address Register 2 | * +-------------------------------------------------------+ 1CH - * | Base Address Register 4 | + * | Base Address Register 3 | * +-------------------------------------------------------+ 20H - * | Base Address Register 5 | + * | Base Address Register 4 | * +-------------------------------------------------------+ 24H - * | Base Address Register 6 | + * | Base Address Register 5 | * +-------------------------------------------------------+ 28H * | CardBus CIS Pointer | * +---------------------------+---------------------------+ 2CH @@ -51,32 +52,80 @@ * | Expansion ROM Base Address | * +-----------------------------------------+-------------+ 34H * |/////////////////////////////////////////|Capabilities | + * |/////////////////////////////////////////|Pointer | * +-----------------------------------------+-------------+ 38H * |///////////////////////////////////////////////////////| * +-------------+------------+-------------+--------------+ 3CH - * | Max_Lat | Min_Gnt |Interrupt PIN|Interrupt Line| + * | Max Latency | Min Grant |Interrupt PIN|Interrupt Line| * +-------------+------------+-------------+--------------+ 40H */ +extern list_head_t pci_devs; + +typedef struct pci_device +{ + list_head_t list; + unsigned long vendor; + unsigned long device; + unsigned long command; + unsigned long status; + unsigned long revision; + unsigned long classcode; + unsigned long hdr_type; + unsigned long bar0, bar1, bar2, bar3, bar4, bar5; + unsigned long sub_system_id; + unsigned long system_id; + unsigned long intr_line; + unsigned long intr_pin; + + unsigned long primary_bus_nr; /* only for pci bridge */ +} __attribute__((packed)) pci_device_t; + + +#if 0 +typedef union pci_device +{ + u32_t regs[16]; + struct { + u16_t vendor, device; + u16_t command, status; + u32_t revision : 8, classcode : 24; + u8_t cache_line_size, latency_timer, header_type, bist; + u32_t bar0; + u32_t bar1; + u32_t bar2; + u32_t bar3; + u32_t bar4; + u32_t bar5; + u32_t card_bus_csi_pointer; + u16_t sub_system_id, system_id; + u32_t expansion_rom_base_address; + u64_t capabilities_pointer : 8, reserved : 56; + u8_t intr_line, intr_pin, min_grant, max_latency; + }; +} __attribute__((packed)) pci_device_t; +#endif #define PCI_VENDORID 0x00 #define PCI_DEVICEID 0x02 -#define PCI_COMMAND 0x04 -#define PCI_STATUS 0x06 +#define PCI_COMMAND 0x04 +#define PCI_STATUS 0x06 #define PCI_REVISION 0x08 -#define PCI_CLASSPROG 0x09 -#define PCI_CLASSDEVICE 0x10 -#define PCI_HDRTYPE 0x0E - #define PCI_HDRTYPE_MASK 0x7F - #define PCI_HDRTYPE_NORMAL 0x00 - #define PCI_HDRTYPE_BRIDGE 0x01 - #define PCI_HDRTYPE_CARDBUS 0x02 +#define PCI_PROGIF 0x09 +#define PCI_CLASSCODE 0x0A +#define PCI_HDRTYPE 0x0E + #define PCI_HDRTYPE_MASK 0x7F + #define PCI_HDRTYPE_NORMAL 0x00 + #define PCI_HDRTYPE_BRIDGE 0x01 /* PCI-to-PCI Bridge */ + #define PCI_HDRTYPE_CARDBUS 0x02 /* CardBus Bridge */ +#define PCI_PRIMARY_BUS_NUMBER 0x18 +#define PCI_SECONDARY_BUS_NUMBER 0x19 #define PCI_INTRLINE 0x3C -#define PCI_INTRPIN 0x3D -#define PCI_MINGNT 0x3E -#define PCI_MAXLAT 0x3F - +#define PCI_INTRPIN 0x3D +#define PCI_MINGNT 0x3E +#define PCI_MAXLAT 0x3F +// PCI Command Register #define PCI_CMD(bus, dev, devfn, reg) \ (0x80000000 | (dev << 11) | (devfn << 8) | (reg & 0xFC)) @@ -86,69 +135,92 @@ /* PCI IDS */ // Display -#define PCI_BASE_CLASS_DISPLAY 0x03 -#define PCI_CLASS_DISPLAY_VGA 0x0300 +#define PCI_BASE_CLASS_DISPLAY 0x03 +#define PCI_CLASS_DISPLAY_VGA 0x0300 // Bridge -#define PCI_BASE_CLASS_BRIDGE 0x06 -#define PCI_CLASS_BRIDGE_HOST 0x0600 +#define PCI_BASE_CLASS_BRIDGE 0x06 +#define PCI_CLASS_BRIDGE_HOST 0x0600 #define PCI_CLASS_BRIDGE_ISA 0x0601 #define PCI_CLASS_BRIDGE_PCI 0x0604 #define PCI_CLASS_BRIDGE_CARDBUS 0x0607 /* Vendors*/ -#define PCI_VENDORID_COMPAQ 0x0E11 -#define PCI_VENDORID_INTEL 0x8086 -#define PCI_VENDORID_ATI 0x1002 -#define PCI_VENDORID_IBM 0x1014 -#define PCI_VENDORID_AMD 0x1022 -#define PCI_VENDORID_HP 0x103C -#define PCI_VENDORID_SONY 0x104D -#define PCI_VENDORID_MOTOROLA 0x1057 -#define PCI_VENDORID_APPLE 0x106B -#define PCI_VENDORID_SUN 0x108E -#define PCI_VENDORID_NVIDIA 0x10DE -#define PCI_VENDORID_REALTEK 0x10EC +#define PCI_VENDORID_COMPAQ 0x0E11 +#define PCI_VENDORID_INTEL 0x8086 +#define PCI_VENDORID_ATI 0x1002 +#define PCI_VENDORID_IBM 0x1014 +#define PCI_VENDORID_AMD 0x1022 +#define PCI_VENDORID_HP 0x103C +#define PCI_VENDORID_SONY 0x104D +#define PCI_VENDORID_MOTOROLA 0x1057 +#define PCI_VENDORID_APPLE 0x106B +#define PCI_VENDORID_SUN 0x108E +#define PCI_VENDORID_NVIDIA 0x10DE +#define PCI_VENDORID_REALTEK 0x10EC // PCI Bridge -// TODO /* * 31 16 15 0 * +---------------------------+---------------------------+ 00H * | Device ID | Vendor ID | * +---------------------------+---------------------------+ 04H * | Status | Command | - * +-----------------------------------------+-------------+ 08H - * | Class Code | Revision | + * +-------------+---------------------------+-------------+ 08H + * | Class Code | Subclass | Prog IF | Revision | * +-------------+-------------+-------------+-------------+ 0CH * | BIST | Header Type |LatencyTimer |CacheLineSize| * +-------------+-------------+-------------+-------------+ 10H - * | Base Address Register 1 | + * | Base Address Register 0 | * +-------------------------------------------------------+ 14H - * | Base Address Register 2 | - * +-------------------------------------------------------+ 18H - * | Base Address Register 3 | - * +-------------------------------------------------------+ 1CH - * | Base Address Register 4 | - * +-------------------------------------------------------+ 20H - * | Base Address Register 5 | - * +-------------------------------------------------------+ 24H - * | Base Address Register 6 | - * +-------------------------------------------------------+ 28H - * | CardBus CIS Pointer | + * | Base Address Register 1 | + * +-------------+-------------+-------------+-------------+ 18H + * |Secondary | Subordinate |Secondary |PCI | + * |Latency | Bus |Bus |Bus | + * |Timer | Number |Number |Number | + * +---------------------------+-------------+-------------+ 1CH + * | Secondary Status | IO Limit | IO Base | + * +---------------------------+-------------+-------------+ 20H + * | Memory Limit | Memory Base | + * +---------------------------+---------------------------+ 24H + * | Prefetchable Memory Limit | Prefetchable Memory Base | + * +---------------------------+---------------------------+ 28H + * | Prefetchable Base Upper 32bit | * +---------------------------+---------------------------+ 2CH - * | System ID | Subsystem ID | + * | Prefetchable Limit Upper 32bit | * +---------------------------+---------------------------+ 30H - * | Expansion ROM Base Address | + * | IO Limit Upper 16bit | IO Base Upper 16bit | * +-----------------------------------------+-------------+ 34H * |/////////////////////////////////////////|Capabilities | + * |/////////////////////////////////////////|Pointer | * +-----------------------------------------+-------------+ 38H - * |///////////////////////////////////////////////////////| + * | Expansion ROM Base Address | * +-------------+------------+-------------+--------------+ 3CH - * | Max_Lat | Min_Gnt |Interrupt PIN|Interrupt Line| + * | Bridge Control |Interrupt PIN|Interrupt Line| * +-------------+------------+-------------+--------------+ 40H */ - - -#endif //_PCI_H +#if 0 +typedef union pci_bridge +{ + u32_t regs[16]; + struct { + u16_t vendor, device; + u16_t command, status; + u8_t revision, prog_if, subclass, classcode; + u8_t cache_line_size, latency_timer, header_type, bist; + u32_t bar0; + u32_t bar1; + u8_t primary_bus_nr, secondary_bus_nr, subordinate_bus_nr, secondary_latency_timer; + u32_t io_base: 8, io_limit : 8, secondary_status : 16; + u16_t memory_base, memory_limit; + u16_t prefetchable_memory_base, prefetchable_memory_limit; + u32_t prefetchable_base_upper; + u32_t prefetchable_limit_upper; + u16_t io_base_upper, io_limit_upper; + u32_t capabilities_pointer : 8, reserved : 24; + u32_t expansion_rom_base_address; + u32_t intr_lin : 8, intr_pin : 8, bridge_control : 16; + }; +} __attribute__((packed)) pci_bridge_t; +#endif diff --git a/include/task.h b/include/task.h index f16cb61..d1b8cae 100644 --- a/include/task.h +++ b/include/task.h @@ -41,7 +41,6 @@ typedef union task_union { unsigned long preempt_cnt; - pt_regs_t regs; unsigned long esp0; /* kernel stack */ diff --git a/include/types.h b/include/types.h index 8d5fc30..769a273 100644 --- a/include/types.h +++ b/include/types.h @@ -28,8 +28,20 @@ typedef signed long long s64; typedef unsigned char u8; typedef unsigned short u16; typedef unsigned long u32; +typedef unsigned long u32; typedef unsigned long long u64; +typedef signed char s8_t; +typedef signed short s16_t; +typedef signed long s32_t; +typedef signed long long s64_t; + +typedef unsigned char u8_t; +typedef unsigned short u16_t; +typedef unsigned long u32_t; +typedef unsigned long u32_t; +typedef unsigned long long u64_t; + typedef unsigned long pid_t; typedef unsigned long mode_t; diff --git a/pci/setuppci.c b/pci/setuppci.c index ec5dee7..1248f00 100644 --- a/pci/setuppci.c +++ b/pci/setuppci.c @@ -19,8 +19,7 @@ #include #include -void ScanPCIBus(int bus); -int ProbePCIBus(); +LIST_HEAD(pci_devs); static int pci_read_config_byte(int cmd) { @@ -41,115 +40,133 @@ static int pci_read_config_long(int cmd) } -void setup_pci() -{ - if(!ProbePCIBus()) - return ; - - ScanPCIBus(0); -} - -void ScanPCIBus(int bus) +void scan_pci_bus(int bus) { u8 dev, devfn; u32 cmd; - u32 retval; - printk("Scanning PCI Bus.\n"); + u32 v; + printk("scanning PCI bus %d\n", bus); for(dev=0; dev<32; dev++) + { for(devfn =0; devfn<8; devfn++) { cmd = PCI_CMD(bus, dev, devfn, PCI_VENDORID); - retval = pci_read_config_word(cmd); - if(retval == 0xFFFF) + v = pci_read_config_word(cmd); + if(v == 0xFFFF) continue; - //Vendor - printk("%x ", retval); - //Device + pci_device_t *pci = kmalloc(sizeof(pci_device_t), 0); + if(0 == pci) + { + printk("no space to alloc for pci_device_t\n"); + continue; + } + + pci->vendor = v; + cmd = PCI_CMD(bus, dev, devfn, PCI_DEVICEID); - retval = pci_read_config_word(cmd); - printk("%x ", retval); + pci->device = pci_read_config_word(cmd); - // Class Device - cmd = PCI_CMD(bus, dev, devfn, PCI_CLASSPROG); - retval = pci_read_config_byte(cmd); - printk("%x ", retval); - - cmd = PCI_CMD(bus, dev, devfn, PCI_CLASSDEVICE); - retval = pci_read_config_word(cmd); - printk("%x ", retval); - + cmd = PCI_CMD(bus, dev, devfn, PCI_REVISION); + pci->revision = pci_read_config_byte(cmd); - //Interrupt Line + cmd = PCI_CMD(bus, dev, devfn, PCI_CLASSCODE); + pci->classcode = pci_read_config_word(cmd); + cmd = PCI_CMD(bus, dev, devfn, PCI_INTRLINE); - retval = pci_read_config_byte(cmd); - printk("%x ", retval); + pci->intr_line = pci_read_config_byte(cmd); - //Interrupt Pin cmd = PCI_CMD(bus, dev, devfn, PCI_INTRPIN); - retval = pci_read_config_byte(cmd); - printk("%x ", retval); + pci->intr_pin = pci_read_config_byte(cmd); cmd = PCI_CMD(bus, dev, devfn, PCI_HDRTYPE); - retval = pci_read_config_byte(cmd); - printk("%x ", retval); - retval &= PCI_HDRTYPE_MASK; - printk("%x", retval); - - switch(retval) + pci->hdr_type = pci_read_config_byte(cmd); + pci->hdr_type &= PCI_HDRTYPE_MASK; + + if(pci->hdr_type == PCI_HDRTYPE_BRIDGE) { - case PCI_HDRTYPE_NORMAL: - printk("Normal Device\n"); - break; - case PCI_HDRTYPE_BRIDGE: - printk("Aha PCI-PCI Bridge\n"); - break; - case PCI_HDRTYPE_CARDBUS: - printk("Wow PCI-CardBus\n"); - break; - default: - printk("Not Support!\n"); - break; + cmd = PCI_CMD(bus, dev, devfn, PCI_PRIMARY_BUS_NUMBER); + pci->primary_bus_nr = pci_read_config_byte(cmd); + scan_pci_bus(pci->primary_bus_nr); } + + list_add(&pci->list, &pci_devs); } + } } -int ProbePCIBus() +void dump_pci_dev() { - int retval; + list_head_t *p; + list_for_each(p, &pci_devs) + { + pci_device_t *pci = list_entry(p, pci_device_t, list); + printk("Vendor %x Device %x Class %x Revision %x IntrLine %d ", pci->vendor, pci->device, pci->classcode, pci->revision, pci->intr_line); + switch(pci->hdr_type) + { + case PCI_HDRTYPE_NORMAL: + printk("Normal Device\n"); + break; + case PCI_HDRTYPE_BRIDGE: + printk("Aha PCI-PCI Bridge\n"); + break; + case PCI_HDRTYPE_CARDBUS: + printk("Wow PCI-CardBus\n"); + break; + default: + printk("Not Support!\n"); + break; + } + } +} + +int probe_pci_bus() +{ + int v; int cmd; int dev,devfn; - char errmsg[]="Can not find PCI bus on your computer"; // Check if The IO Address was Used... cmd = PCI_CMD(0,0,0,0); - retval = pci_read_config_long(cmd); - if( retval == 0xFFFFFFFF || retval == 0x00000000 - || retval == 0x0000FFFF || retval == 0xFFFF0000) - { - printk("%s\n",errmsg); - return 0; - } + v = pci_read_config_long(cmd); + + if( v == 0xFFFFFFFF || v == 0x00000000 || v == 0x0000FFFF || v == 0xFFFF0000) + goto err; // Maybe it's just an ISA Device // So We Must Check if It is PCI... for(dev=0; dev<32; dev++) + { for(devfn=0; devfn<8; devfn++) { - cmd = PCI_CMD(0, dev, devfn, PCI_CLASSDEVICE); - retval = pci_read_config_word(cmd); - if(retval == PCI_CLASS_BRIDGE_HOST - || retval == PCI_CLASS_DISPLAY_VGA) + cmd = PCI_CMD(0, dev, devfn, PCI_CLASSCODE); + v = pci_read_config_word(cmd); + + if(v == PCI_CLASS_BRIDGE_HOST || v == PCI_CLASS_DISPLAY_VGA) return 1; + cmd = PCI_CMD(0, dev, devfn, PCI_VENDORID); - retval = pci_read_config_word(cmd); - if(retval == PCI_VENDORID_INTEL - || retval == PCI_VENDORID_COMPAQ) + v = pci_read_config_word(cmd); + + if(v == PCI_VENDORID_INTEL || v == PCI_VENDORID_COMPAQ) return 1; } + } +err: + printk("Can not find PCI bus on your computer\n"); - printk("%s\n",errmsg); return 0; } + +void setup_pci() +{ + if(!probe_pci_bus()) + return ; + + scan_pci_bus(0); + + dump_pci_dev(); +} +