Commit fcb4bd93 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

This version tested with AHCI controller

parent 035f9e57

.project

+17 −17
Original line number Diff line number Diff line
@@ -52,87 +52,87 @@ 
		<link>

			<name>vivado_logs/VivadoBitstream.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoBitstream-20160229185157261.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoBitstream-20160304130042850.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoOpt.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoOpt-20160229185157261.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoOpt-20160304130042850.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoOptPhys.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoOptPhys-20160229185157261.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoOptPhys-20160304130042850.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoOptPower.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoOptPower-20160229185157261.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoOptPower-20160304130042850.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoPlace.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoPlace-20160229185157261.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoPlace-20160304130042850.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoRoute.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoRoute-20160229185157261.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoRoute-20160304130042850.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoSynthesis.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoSynthesis-20160229184939748.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoSynthesis-20160304125744608.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoTimimgSummaryReportImplemented.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoTimimgSummaryReportImplemented-20160229185157261.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoTimimgSummaryReportImplemented-20160304130042850.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoTimimgSummaryReportSynthesis.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoTimimgSummaryReportSynthesis-20160229184939748.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoTimimgSummaryReportSynthesis-20160304125744608.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoTimingReportImplemented.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoTimingReportImplemented-20160229185157261.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoTimingReportImplemented-20160304130042850.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoTimingReportSynthesis.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoTimingReportSynthesis-20160229184939748.log</location>

			<location>/home/andrey/git/x393_sata/vivado_logs/VivadoTimingReportSynthesis-20160304125744608.log</location>

		</link>

		<link>

			<name>vivado_state/x393_sata-opt-phys.dcp</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-opt-phys-20160229185157261.dcp</location>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-opt-phys-20160304130042850.dcp</location>

		</link>

		<link>

			<name>vivado_state/x393_sata-opt-power.dcp</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-opt-power-20160229185157261.dcp</location>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-opt-power-20160304130042850.dcp</location>

		</link>

		<link>

			<name>vivado_state/x393_sata-opt.dcp</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-opt-20160229185157261.dcp</location>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-opt-20160304130042850.dcp</location>

		</link>

		<link>

			<name>vivado_state/x393_sata-place.dcp</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-place-20160229185157261.dcp</location>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-place-20160304130042850.dcp</location>

		</link>

		<link>

			<name>vivado_state/x393_sata-route.dcp</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-route-20160229185157261.dcp</location>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-route-20160304130042850.dcp</location>

		</link>

		<link>

			<name>vivado_state/x393_sata-synth.dcp</name>

			<type>1</type>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-synth-20160229184939748.dcp</location>

			<location>/home/andrey/git/x393_sata/vivado_state/x393_sata-synth-20160304125744608.dcp</location>

		</link>

	</linkedResources>

</projectDescription>

ahci/ahci_fis_receive.v

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ localparam DATA_TYPE_ERR = 3; 
        if (reg_we_w)                         reg_data <=    hba_data_in;

        else if (update_err_sts_r)            reg_data <=    {16'b0,tf_err_sts};

        else if (update_sig_r)                reg_data <=    sig_r;

        else if (update_prdbc_r)              reg_data <=    {xfer_cntr_r[31:2],2'b0};

        else if (update_prdbc_r)              reg_data <=    {prdbc_r[31:2],2'b0}; // xfer_cntr_r[31:2],2'b0};



        if (store_sig[1])                     sig_r[31:8] <= hba_data_in[23:0];

        if (store_sig[3])                     sig_r[ 7:0] <= hba_data_in[ 7:0];

ahci/ahci_top.v

+2 −2
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ debug_dma_h2d 
    always @(posedge mclk) begin

        if    (fsnd_cfis_xmit)                          datascope_waddr_r <= DATASCOPE_CFIS_START; // start from command FIS

///        if    (mrst) datascope_waddr_r <= DATASCOPE_CFIS_START;

        else if (datascope_we) datascope_waddr_r <= datascope_waddr_r + 1;

        else if (datascope_we && !(&datascope_waddr_r)) datascope_waddr_r <= datascope_waddr_r + 1;

    end



`else

device/sata_device.v

+13 −0
Original line number Diff line number Diff line
@@ -850,6 +850,19 @@ task send_identify_data; // @SuppressThisWarning VEditor - Used in testbench 
    end

endtask



task send_incrementing_data; // @SuppressThisWarning VEditor - Used in testbench

    input integer id;

    input integer len;

    output integer status;

    integer i;

    begin

        transmit_data[0] = FIS_DATA;

        for (i=0;i<len;i=i+1) begin

            transmit_data[i+1] = i;

        end

        linkTransmitFIS(id, 129, 0, status);        

    end

endtask

generated/action_decoder.v

+1 −1
Original line number Diff line number Diff line 
/*******************************************************************************

 * Module: action_decoder

 * Date:2016-02-29  

 * Date:2016-03-03  

 * Author: auto-generated file, see ahci_fsm_sequence.py

 * Description: Decode sequencer code to 1-hot actions

 *******************************************************************************/