Changeset 3a5909f in mainline for uspace/srv/drivers/pciintel/pci.c

Timestamp:

2010-04-09T11:46:56Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3843ecb

Parents:

d1fc8f0

Message:

pci bus enumeration - bars and ints

File:

• uspace/srv/drivers/pciintel/pci.c (modified) (12 diffs)

uspace/srv/drivers/pciintel/pci.c

@@ -55 +55 @@
 
 #include "pci.h"
-#include "pci_regs.h"
 
 #define NAME "pciintel"
@@ -181 +180 @@
 void pci_conf_write_8(device_t *dev, int reg, uint8_t val) 
 {
-        pci_conf_write(dev, reg, (uint8_t *)&val, 4);   
+        pci_conf_write(dev, reg, (uint8_t *)&val, 1);   
 }
 
 void pci_conf_write_16(device_t *dev, int reg, uint16_t val) 
 {
-        pci_conf_write(dev, reg, (uint8_t *)&val, 4);   
+        pci_conf_write(dev, reg, (uint8_t *)&val, 2);   
 }
 
@@ -208 +207 @@
 }
 
-
-static size_t range_size_form_mask(uint32_t mask)
-{
-        // TODO
-        return 0;
-}
+void pci_add_range(device_t *dev, uint64_t range_addr, size_t range_size, bool io)
+{
+        pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;
+        hw_resource_list_t *hw_res_list = &dev_data->hw_resources;
+        hw_resource_t *hw_resources =  hw_res_list->resources;
+        size_t count = hw_res_list->count;      
+        
+        assert(NULL != hw_resources);
+        assert(count < PCI_MAX_HW_RES);
+        
+        if (io) {
+                hw_resources[count].type = IO_RANGE;
+                hw_resources[count].res.io_range.address = range_addr;
+                hw_resources[count].res.io_range.size = range_size;     
+                hw_resources[count].res.io_range.endianness = LITTLE_ENDIAN;    
+        } else {
+                hw_resources[count].type = MEM_RANGE;
+                hw_resources[count].res.mem_range.address = range_addr;
+                hw_resources[count].res.mem_range.size = range_size;    
+                hw_resources[count].res.mem_range.endianness = LITTLE_ENDIAN;
+        }
+        
+        hw_res_list->count++;   
+}
+
 
 /** Read the base address register (BAR) of the device 
@@ -223 +241 @@
  * @return the addr the address of the BAR which should be read next.
  */
-static int pci_read_bar(device_t *dev, int addr) 
+int pci_read_bar(device_t *dev, int addr) 
 {       
         // value of the BAR
@@ -237 +255 @@
         uint64_t range_addr;
         
-        
+        // get the value of the BAR
         val = pci_conf_read_32(dev, addr);
         
@@ -263 +281 @@
         // restore the original value
         pci_conf_write_32(dev, addr, val);
-        
-        range_size = range_size_form_mask(mask);
+        val = pci_conf_read_32(dev, addr);      
+        
+        range_size = pci_bar_mask_to_size(mask);
         
         if (w64) {
@@ -272 +291 @@
         }       
         if (0 != range_addr) {
-                printf(NAME ": device address = %x\n", range_addr);     
-        }
-        
-        // TODO add to the HW resource list
+                printf(NAME ": device %s : ", dev->name);
+                printf("address = %x", range_addr);             
+                printf(", size = %x\n", range_size);
+        }
+        
+        pci_add_range(dev, range_addr, range_size, io);
         
         if (w64) {
@@ -283 +304 @@
 }
 
-/** Read the base address registers (BARs) of the device 
- *  and adds the addresses to its hw resource list.
- * 
- * @param dev the pci device.
- */
-static void pci_read_bars(device_t *dev)
-{
-        // position of the BAR in the PCI configuration address space of the device
-        int addr = PCI_BASE_ADDR_0;
-        
-        while (addr <= PCI_BASE_ADDR_5) {
-                addr = pci_read_bar(dev, addr); 
+void pci_add_interrupt(device_t *dev, int irq)
+{
+        pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;
+        hw_resource_list_t *hw_res_list = &dev_data->hw_resources;
+        hw_resource_t *hw_resources =  hw_res_list->resources;
+        size_t count = hw_res_list->count;      
+        
+        assert(NULL != hw_resources);
+        assert(count < PCI_MAX_HW_RES);
+        
+        hw_resources[count].type = INTERRUPT;
+        hw_resources[count].res.interrupt.irq = irq;
+        
+        hw_res_list->count++;           
+        
+        
+        printf(NAME ": device %s uses irq %x.\n", dev->name, irq);
+}
+
+void pci_read_interrupt(device_t *dev)
+{
+        uint8_t irq = pci_conf_read_8(dev, PCI_BRIDGE_INT_LINE);
+        if (0xff != irq) {
+                pci_add_interrupt(dev, irq);
         }       
 }
@@ -321 +354 @@
                         dev_data->vendor_id = pci_conf_read_16(dev, PCI_VENDOR_ID);
                         dev_data->device_id = pci_conf_read_16(dev, PCI_DEVICE_ID);
-                        if (dev_data->vendor_id == 0xFFFF) { // device is not present, go on scanning the bus
+                        if (dev_data->vendor_id == 0xffff) { // device is not present, go on scanning the bus
                                 if (fnum == 0) {
                                         break;
@@ -334 +367 @@
                         header_type = header_type & 0x7F; // clear the multifunction bit
                         
-                        // TODO initialize device - interfaces, hw resources
+                        create_pci_dev_name(dev);
+                        
+                        pci_alloc_resource_list(dev);
                         pci_read_bars(dev);
-                        
-                        create_pci_dev_name(dev);
+                        pci_read_interrupt(dev);
+                        
+                        // TODO initialize device interfaces                    
+                        
                         printf(NAME ": adding new child device %s.\n", dev->name);
                         
                         create_pci_match_ids(dev);
                         
-                        if (!child_device_register(dev, parent)) {
+                        if (!child_device_register(dev, parent)) {                              
+                                pci_clean_resource_list(dev);                           
                                 clean_match_ids(&dev->match_ids);
                                 free((char *)dev->name);
@@ -366 +404 @@
         }
         
-        if (dev_data->vendor_id == 0xFFFF) {
+        if (dev_data->vendor_id == 0xffff) {
                 delete_device(dev);
                 delete_pci_dev_data(dev_data);  // free the auxiliary device structure
-        }       
-        
+        }               
 }
 
@@ -397 +434 @@
                 ipc_hangup(dev->parent_phone);
                 return false;           
-        }
-        
-        
-        printf(NAME ": conf_addr = %x.\n", hw_resources.resources[0].res.reg.address);  
+        }       
+        
+        printf(NAME ": conf_addr = %x.\n", hw_resources.resources[0].res.io_range.address);     
         
         assert(hw_resources.count > 0);
-        assert(hw_resources.resources[0].type == REGISTER);
-        assert(hw_resources.resources[0].res.reg.size == 8);
-        
-        bus_data->conf_io_addr = (uint32_t)hw_resources.resources[0].res.reg.address;
+        assert(hw_resources.resources[0].type == IO_RANGE);
+        assert(hw_resources.resources[0].res.io_range.size == 8);
+        
+        bus_data->conf_io_addr = (uint32_t)hw_resources.resources[0].res.io_range.address;
         
         if (pio_enable((void *)bus_data->conf_io_addr, 8, &bus_data->conf_addr_port)) {