Changes in uspace/drv/block/ahci/ahci.c [f9b2cb4c:acdb5bac] in mainline

File:

• uspace/drv/block/ahci/ahci.c (modified) (30 diffs)

uspace/drv/block/ahci/ahci.c

@@ -37 +37 @@
 #include <ddf/log.h>
 #include <device/hw_res_parsed.h>
-#include <pci_dev_iface.h>
-#include <irc.h>
+#include <device/pci.h>
+#include <sysinfo.h>
+#include <ipc/irc.h>
+#include <ns.h>
 #include <ahci_iface.h>
 #include "ahci.h"
@@ -109 +111 @@
         }
 
-static int get_sata_device_name(ddf_fun_t *, size_t, char *);
-static int get_num_blocks(ddf_fun_t *, uint64_t *);
-static int get_block_size(ddf_fun_t *, size_t *);
-static int read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
-static int write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
+static int ahci_get_sata_device_name(ddf_fun_t *, size_t, char *);
+static int ahci_get_num_blocks(ddf_fun_t *, uint64_t *);
+static int ahci_get_block_size(ddf_fun_t *, size_t *);
+static int ahci_read_blocks(ddf_fun_t *, uint64_t, size_t, void *);
+static int ahci_write_blocks(ddf_fun_t *, uint64_t, size_t, void *);
 
 static int ahci_identify_device(sata_dev_t *);
 static int ahci_set_highest_ultra_dma_mode(sata_dev_t *);
-static int ahci_rb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
-static int ahci_wb_fpdma(sata_dev_t *, uintptr_t, uint64_t);
+static int ahci_rb_fpdma(sata_dev_t *, void *, uint64_t);
+static int ahci_wb_fpdma(sata_dev_t *, void *, uint64_t);
 
 static void ahci_sata_devices_create(ahci_dev_t *, ddf_dev_t *);
@@ -127 +129 @@
 
 static void ahci_get_model_name(uint16_t *, char *);
+static int ahci_enable_interrupt(int);
 
 static fibril_mutex_t sata_devices_count_lock;
@@ -136 +139 @@
 
 static ahci_iface_t ahci_interface = {
-        .get_sata_device_name = &get_sata_device_name,
-        .get_num_blocks = &get_num_blocks,
-        .get_block_size = &get_block_size,
-        .read_blocks = &read_blocks,
-        .write_blocks = &write_blocks
+        .get_sata_device_name = &ahci_get_sata_device_name,
+        .get_num_blocks = &ahci_get_num_blocks,
+        .get_block_size = &ahci_get_block_size,
+        .read_blocks = &ahci_read_blocks,
+        .write_blocks = &ahci_write_blocks
 };
 
@@ -177 +180 @@
  *
  */
-static int get_sata_device_name(ddf_fun_t *fun,
+static int ahci_get_sata_device_name(ddf_fun_t *fun,
     size_t sata_dev_name_length, char *sata_dev_name)
 {
@@ -193 +196 @@
  *
  */
-static int get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
+static int ahci_get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks)
 {
         sata_dev_t *sata = fun_sata_dev(fun);
@@ -208 +211 @@
  *
  */
-static int get_block_size(ddf_fun_t *fun, size_t *block_size)
+static int ahci_get_block_size(ddf_fun_t *fun, size_t *block_size)
 {
         sata_dev_t *sata = fun_sata_dev(fun);
@@ -225 +228 @@
  *
  */
-static int read_blocks(ddf_fun_t *fun, uint64_t blocknum,
+static int ahci_read_blocks(ddf_fun_t *fun, uint64_t blocknum,
     size_t count, void *buf)
 {
         sata_dev_t *sata = fun_sata_dev(fun);
         
-        uintptr_t phys;
-        void *ibuf = AS_AREA_ANY;
-        int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
-            AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf);
+        void *phys;
+        void *ibuf;
+        int rc = dmamem_map_anonymous(sata->block_size, AS_AREA_READ | AS_AREA_WRITE,
+            0, &phys, (void **) &ibuf);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Cannot allocate read buffer.");
@@ -268 +271 @@
  *
  */
-static int write_blocks(ddf_fun_t *fun, uint64_t blocknum,
+static int ahci_write_blocks(ddf_fun_t *fun, uint64_t blocknum,
     size_t count, void *buf)
 {
         sata_dev_t *sata = fun_sata_dev(fun);
         
-        uintptr_t phys;
-        void *ibuf = AS_AREA_ANY;
-        int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB,
-            AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf);
+        void *phys;
+        void *ibuf;
+        int rc = dmamem_map_anonymous(sata->block_size, AS_AREA_READ | AS_AREA_WRITE,
+            0, &phys, (void **) &ibuf);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Cannot allocate write buffer.");
@@ -333 +336 @@
  *
  */
-static void ahci_identify_device_cmd(sata_dev_t *sata, uintptr_t phys)
+static void ahci_identify_device_cmd(sata_dev_t *sata, void *phys)
 {
         volatile sata_std_command_frame_t *cmd =
@@ -378 +381 @@
  *
  */
-static void ahci_identify_packet_device_cmd(sata_dev_t *sata, uintptr_t phys)
+static void ahci_identify_packet_device_cmd(sata_dev_t *sata, void *phys)
 {
         volatile sata_std_command_frame_t *cmd =
@@ -432 +435 @@
         }
         
-        uintptr_t phys;
-        sata_identify_data_t *idata = AS_AREA_ANY;
+        void *phys;
+        sata_identify_data_t *idata;
         int rc = dmamem_map_anonymous(SATA_IDENTIFY_DEVICE_BUFFER_LENGTH,
-            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
-            (void *) &idata);
+            AS_AREA_READ | AS_AREA_WRITE, 0, &phys, (void **) &idata);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Cannot allocate buffer to identify device.");
@@ -559 +561 @@
  *
  */
-static void ahci_set_mode_cmd(sata_dev_t *sata, uintptr_t phys, uint8_t mode)
+static void ahci_set_mode_cmd(sata_dev_t *sata, void* phys, uint8_t mode)
 {
         volatile sata_std_command_frame_t *cmd =
@@ -565 +567 @@
         
         cmd->fis_type = SATA_CMD_FIS_TYPE;
-        cmd->c = SATA_CMD_FIS_COMMAND_INDICATOR;
+        cmd->c = SATA_CMD_FIS_COMMAND_INDICATOR; 
         cmd->command = 0xef;
         cmd->features = 0x03;
@@ -626 +628 @@
         }
         
-        uintptr_t phys;
-        sata_identify_data_t *idata = AS_AREA_ANY;
+        void *phys;
+        sata_identify_data_t *idata;
         int rc = dmamem_map_anonymous(SATA_SET_FEATURE_BUFFER_LENGTH,
-            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
-            (void *) &idata);
+            AS_AREA_READ | AS_AREA_WRITE, 0, &phys, (void **) &idata);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Cannot allocate buffer for device set mode.");
@@ -676 +677 @@
  *
  */
-static void ahci_rb_fpdma_cmd(sata_dev_t *sata, uintptr_t phys,
-    uint64_t blocknum)
+static void ahci_rb_fpdma_cmd(sata_dev_t *sata, void *phys, uint64_t blocknum)
 {
         volatile sata_ncq_command_frame_t *cmd =
@@ -734 +734 @@
  *
  */
-static int ahci_rb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
+static int ahci_rb_fpdma(sata_dev_t *sata, void *phys, uint64_t blocknum)
 {
         if (sata->is_invalid_device) {
@@ -763 +763 @@
  *
  */
-static void ahci_wb_fpdma_cmd(sata_dev_t *sata, uintptr_t phys,
-    uint64_t blocknum)
+static void ahci_wb_fpdma_cmd(sata_dev_t *sata, void *phys, uint64_t blocknum)
 {
         volatile sata_ncq_command_frame_t *cmd =
@@ -822 +821 @@
  *
  */
-static int ahci_wb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum)
+static int ahci_wb_fpdma(sata_dev_t *sata, void *phys, uint64_t blocknum)
 {
         if (sata->is_invalid_device) {
@@ -890 +889 @@
 /** AHCI interrupt handler.
  *
+ * @param dev   DDF device structure.
  * @param iid   The IPC call id.
  * @param icall The IPC call structure.
- * @param dev   DDF device structure.
- *
- */
-static void ahci_interrupt(ipc_callid_t iid, ipc_call_t *icall, ddf_dev_t *dev)
+ *
+ */
+static void ahci_interrupt(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *icall)
 {
         ahci_dev_t *ahci = dev_ahci_dev(dev);
@@ -934 +933 @@
 {
         size_t size = 4096;
-        uintptr_t phys = 0;
-        void *virt_fb = AS_AREA_ANY;
-        void *virt_cmd = AS_AREA_ANY;
-        void *virt_table = AS_AREA_ANY;
+        void *phys = NULL;
+        void *virt_fb = NULL;
+        void *virt_cmd = NULL;
+        void *virt_table = NULL;
         ddf_fun_t *fun;
         
@@ -950 +949 @@
         
         /* Allocate and init retfis structure. */
-        int rc = dmamem_map_anonymous(size, DMAMEM_4GiB,
-            AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &virt_fb);
+        int rc = dmamem_map_anonymous(size, AS_AREA_READ | AS_AREA_WRITE, 0,
+            &phys, &virt_fb);
         if (rc != EOK)
                 goto error_retfis;
@@ -960 +959 @@
         
         /* Allocate and init command header structure. */
-        rc = dmamem_map_anonymous(size, DMAMEM_4GiB,
-            AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &virt_cmd);
+        rc = dmamem_map_anonymous(size, AS_AREA_READ | AS_AREA_WRITE, 0,
+            &phys, &virt_cmd);
         if (rc != EOK)
                 goto error_cmd;
@@ -971 +970 @@
         
         /* Allocate and init command table structure. */
-        rc = dmamem_map_anonymous(size, DMAMEM_4GiB,
-            AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &virt_table);
+        rc = dmamem_map_anonymous(size, AS_AREA_READ | AS_AREA_WRITE, 0,
+            &phys, &virt_table);
         if (rc != EOK)
                 goto error_table;
@@ -1140 +1139 @@
         
         /* Connect to parent device */
-        ahci->parent_sess = ddf_dev_parent_sess_create(dev);
+        ahci->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
         if (ahci->parent_sess == NULL)
                 return NULL;
@@ -1152 +1151 @@
         
         /* Map AHCI registers. */
-        ahci->memregs = AS_AREA_ANY;
-        
-        physmem_map(RNGABS(hw_res_parsed.mem_ranges.ranges[0]),
+        ahci->memregs = NULL;
+        
+        physmem_map((void *) (size_t) (hw_res_parsed.mem_ranges.ranges[0].address),
             AHCI_MEMREGS_PAGES_COUNT, AS_AREA_READ | AS_AREA_WRITE,
-            (void *) &ahci->memregs);
+            (void **) &ahci->memregs);
         if (ahci->memregs == NULL)
                 goto error_map_registers;
         
         /* Register interrupt handler */
-        ahci_ranges[0].base = RNGABS(hw_res_parsed.mem_ranges.ranges[0]);
+        ahci_ranges[0].base = (size_t) hw_res_parsed.mem_ranges.ranges[0].address;
         ahci_ranges[0].size = sizeof(ahci_memregs_t);
         
@@ -1168 +1167 @@
                 
                 ahci_cmds[base].addr =
-                    ((uint32_t *) RNGABSPTR(hw_res_parsed.mem_ranges.ranges[0])) +
+                    ((uint32_t *) (size_t) hw_res_parsed.mem_ranges.ranges[0].address) +
                     AHCI_PORTS_REGISTERS_OFFSET + port * AHCI_PORT_REGISTERS_SIZE +
                     AHCI_PORT_IS_REGISTER_OFFSET;
@@ -1174 +1173 @@
                 
                 ahci_cmds[base + 3].addr =
-                    ((uint32_t *) RNGABSPTR(hw_res_parsed.mem_ranges.ranges[0])) +
+                    ((uint32_t *) (size_t) hw_res_parsed.mem_ranges.ranges[0].address) +
                     AHCI_GHC_IS_REGISTER_OFFSET;
                 ahci_cmds[base + 4].addr = ahci_cmds[base + 3].addr;
@@ -1192 +1191 @@
         }
         
-        rc = irc_enable_interrupt(hw_res_parsed.irqs.irqs[0]);
+        rc = ahci_enable_interrupt(hw_res_parsed.irqs.irqs[0]);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed enable interupt.");
@@ -1312 +1311 @@
 }
 
+/** Enable interrupt using SERVICE_IRC.
+ *
+ * @param irq Requested irq number.
+ *
+ * @return EOK if succeed, error code otherwise.
+ *
+ */
+static int ahci_enable_interrupt(int irq)
+{
+        async_sess_t *irc_sess = NULL;
+        irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE, SERVICE_IRC, 0, 0);
+        if (!irc_sess)
+                return EINTR;
+        
+        async_exch_t *exch = async_exchange_begin(irc_sess);
+        const int rc = async_req_1_0(exch, IRC_ENABLE_INTERRUPT, irq);
+        async_exchange_end(exch);
+        
+        async_hangup(irc_sess);
+        return rc;
+}
+
 /*----------------------------------------------------------------------------*/
 /*-- AHCI Main routine -------------------------------------------------------*/