Commit 383a6753 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/net/fsl_etsec/etsec.c: Switch to transaction-based ptimer API 



Switch the fsl_etsec code away from bottom-half based ptimers to
the new transaction-based ptimer API.  This just requires adding
begin/commit calls around the various places that modify the ptimer
state, and using the new ptimer_init() function to create the timer.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-id: 20191017132122.4402-2-peter.maydell@linaro.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent e979972a

hw/net/fsl_etsec/etsec.c

+5 −4
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "etsec.h"

#include "registers.h"

#include "qemu/log.h"

#include "qemu/main-loop.h"

#include "qemu/module.h"



/* #define HEX_DUMP */
@@ -195,9 +194,11 @@ static void write_dmactrl(eTSEC *etsec, 


    if (!(value & DMACTRL_WOP)) {

        /* Start polling */

        ptimer_transaction_begin(etsec->ptimer);

        ptimer_stop(etsec->ptimer);

        ptimer_set_count(etsec->ptimer, 1);

        ptimer_run(etsec->ptimer, 1);

        ptimer_transaction_commit(etsec->ptimer);

    }

}
@@ -391,10 +392,10 @@ static void etsec_realize(DeviceState *dev, Error **errp) 
                              object_get_typename(OBJECT(dev)), dev->id, etsec);

    qemu_format_nic_info_str(qemu_get_queue(etsec->nic), etsec->conf.macaddr.a);





    etsec->bh     = qemu_bh_new(etsec_timer_hit, etsec);

    etsec->ptimer = ptimer_init_with_bh(etsec->bh, PTIMER_POLICY_DEFAULT);

    etsec->ptimer = ptimer_init(etsec_timer_hit, etsec, PTIMER_POLICY_DEFAULT);

    ptimer_transaction_begin(etsec->ptimer);

    ptimer_set_freq(etsec->ptimer, 100);

    ptimer_transaction_commit(etsec->ptimer);

}



static void etsec_instance_init(Object *obj)

hw/net/fsl_etsec/etsec.h

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ typedef struct eTSEC { 
    uint16_t phy_control;



    /* Polling */

    QEMUBH *bh;

    struct ptimer_state *ptimer;



    /* Whether we should flush the rx queue when buffer becomes available. */