From patchwork Wed Jul 26 13:24:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Kambalin X-Patchwork-Id: 1813181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=fB7yZqU5; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R9wxb5lLwz1yZv for ; Thu, 27 Jul 2023 00:18:59 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOeWr-00034S-F1; Wed, 26 Jul 2023 09:26:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOeWR-0002l5-5h; Wed, 26 Jul 2023 09:25:48 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qOeWN-0003HR-PE; Wed, 26 Jul 2023 09:25:46 -0400 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4fb7373dd35so1271287e87.1; Wed, 26 Jul 2023 06:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690377941; x=1690982741; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Aee+lmibDpQFSluNXgAgE97DdICTwdT5+ItKwRVLqq4=; b=fB7yZqU5aPAIvQCASB2+nQG65yQMoqTvMj9e4uGmIGkJuOtF1Dz5H011kKB9YRLEXN Me+TD8Yk6eRIHyl00kTcm46EcGh8Zjs6szQ0/XqgSpif2XHi0WtmCLzFMQcW0xrjm1Py 46pRHmFNBmyLkvRqczmjyr1RLh78R9yZjDOJY1j3T6TXlsnNIkZGQfgI66wSzpOgTFGL FCoPYuLQKs8BT9/K5MjTN6Qx6jW9B2nuVaIrynOqNzacFXFsWpE8S71sT/XMpR8K58pl aLMkb/Z9xECKiQJ2EL38HRn2z0lKlaAMqYDJuBImu8fhbw/u/kwpmSmmLPvHlVSo1AW3 oxIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690377941; x=1690982741; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Aee+lmibDpQFSluNXgAgE97DdICTwdT5+ItKwRVLqq4=; b=Fk6qzRYv3U9hGB4HuBRe/9bXcIPwrjtPIxhWQg76SWhwWHzqo6zIRZ/D42EjWrMOCo Q4TJYg7n1pVY6WJnoemtH56Ra3zwRnaJos6Xr1XCwAPh58Mqxy5qRjenmPseNbTOIy4t uLAlzj+qoVHJQQ2FbpdQhi91oVSyaqTCFtD9BttiGOKosNyu8Jt4z5bRbJKFqpXyOahu Hd6Uxmh+bjnACV8/SJ6bAlutFXaYY/hxDGZnFEPGb/l1LoW7I4Wv9D/DWxZmMc1eFrbY wX02vlO3YZnpDz/GYiDo2YeutMi36FvkwzmTsTgtXEqLYgr7X2XkOtc60ADGH/Ts/0JK 6TkQ== X-Gm-Message-State: ABy/qLZ612vrbtLMByCUcuGfPVAKfIYWo1h840p2M1kmOJK+jYlqzjls M1yWiaQ3cpyWIWpsLh/fZ8gUN3M3Saw= X-Google-Smtp-Source: APBJJlGc6S0DOu+Z2acxOap/sHfg2H2gnnxkPTTLsT5+UB8+ZDcUEm4WevTpBxkiLwcLhkXb6uugyw== X-Received: by 2002:a05:6512:3b8b:b0:4f8:6b98:f4dd with SMTP id g11-20020a0565123b8b00b004f86b98f4ddmr2038134lfv.32.1690377941209; Wed, 26 Jul 2023 06:25:41 -0700 (PDT) Received: from sergevik-thinkpad.localdomain ([213.197.136.186]) by smtp.gmail.com with ESMTPSA id j22-20020a19f516000000b004fe0c3d8bb4sm565079lfb.84.2023.07.26.06.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 06:25:40 -0700 (PDT) From: Sergey Kambalin X-Google-Original-From: Sergey Kambalin To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, Sergey Kambalin Subject: [PATCH 19/44] Add RNG200 timer Date: Wed, 26 Jul 2023 16:24:47 +0300 Message-Id: <20230726132512.149618-20-sergey.kambalin@auriga.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230726132512.149618-1-sergey.kambalin@auriga.com> References: <20230726132512.149618-1-sergey.kambalin@auriga.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=serg.oker@gmail.com; helo=mail-lf1-x131.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Sergey Kambalin --- hw/arm/bcm2838_peripherals.c | 14 ++++ hw/arm/raspi4b.c | 1 - hw/misc/bcm2838_rng200.c | 105 ++++++++++++++++++++++++--- include/hw/arm/bcm2838_peripherals.h | 2 + 4 files changed, 111 insertions(+), 11 deletions(-) diff --git a/hw/arm/bcm2838_peripherals.c b/hw/arm/bcm2838_peripherals.c index 41b321b254..df97953bbe 100644 --- a/hw/arm/bcm2838_peripherals.c +++ b/hw/arm/bcm2838_peripherals.c @@ -34,6 +34,9 @@ static void bcm2838_peripherals_init(Object *obj) bc->peri_low_size); sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->peri_low_mr); + /* Random Number Generator */ + object_initialize_child(obj, "rng200", &s->rng200, TYPE_BCM2838_RNG200); + /* PCIe Host Bridge */ object_initialize_child(obj, "pcie-host", &s->pcie_host, TYPE_BCM2838_PCIE_HOST); @@ -84,6 +87,17 @@ static void bcm2838_peripherals_realize(DeviceState *dev, Error **errp) BCM2838_VC_PERI_LOW_BASE, &s->peri_low_mr_alias, 1); + /* Random Number Generator */ + if (!sysbus_realize(SYS_BUS_DEVICE(&s->rng200), errp)) { + return; + } + memory_region_add_subregion( + &s_base->peri_mr, RNG_OFFSET, + sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->rng200), 0)); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->rng200), 0, + qdev_get_gpio_in_named(DEVICE(&s_base->ic), BCM2835_IC_GPU_IRQ, + INTERRUPT_RNG)); + /* Extended Mass Media Controller 2 */ object_property_set_uint(OBJECT(&s->emmc2), "sd-spec-version", 3, &error_abort); diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 115359e451..82b6b48d3c 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -66,7 +66,6 @@ static void raspi4_modify_dtb(const struct arm_boot_info *info, void *fdt) /* Temporary disable following devices until they are implemented*/ const char *to_be_removed_from_dt_as_wa[] = { - "brcm,bcm2711-rng200", "brcm,bcm2711-thermal", "brcm,bcm2711-genet-v5", }; diff --git a/hw/misc/bcm2838_rng200.c b/hw/misc/bcm2838_rng200.c index bfc40658e2..face1e9579 100644 --- a/hw/misc/bcm2838_rng200.c +++ b/hw/misc/bcm2838_rng200.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qom/object_interfaces.h" #include "qapi/error.h" #include "hw/qdev-properties.h" #include "hw/misc/bcm2838_rng200.h" @@ -35,6 +36,15 @@ static void bcm2838_rng200_update_irq(BCM2838Rng200State *state) & state->rng_int_status.value)); } +static void bcm2838_rng200_update_rbg_period(void *opaque, ClockEvent event) +{ + BCM2838Rng200State *s = (BCM2838Rng200State *)opaque; + + ptimer_transaction_begin(s->ptimer); + ptimer_set_period_from_clock(s->ptimer, s->clock, s->rng_fifo_cap * 8); + ptimer_transaction_commit(s->ptimer); +} + static void bcm2838_rng200_update_fifo(void *opaque, const void *buf, size_t size) { @@ -62,10 +72,11 @@ static void bcm2838_rng200_update_fifo(void *opaque, const void *buf, if ((num == 0) && (num_bits > 0)) { num = 1; } - if (num > 0) { + if (!state->use_timer || (num > 0)) { fifo8_push_all(fifo, buf, num); - if (fifo8_num_used(fifo) > state->rng_fifo_count.thld) { + if (!state->use_timer + || (fifo8_num_used(fifo) > state->rng_fifo_count.thld)) { state->rng_int_status.total_bits_count_irq = 1; } } @@ -82,10 +93,14 @@ static void bcm2838_rng200_fill_fifo(BCM2838Rng200State *state) bcm2838_rng200_update_fifo, state); } -/* state is temporary unused */ -static void bcm2838_rng200_disable_rbg(BCM2838Rng200State *state - __attribute__((unused))) +static void bcm2838_rng200_disable_rbg(BCM2838Rng200State *state) { + if (state->use_timer) { + ptimer_transaction_begin(state->ptimer); + ptimer_stop(state->ptimer); + ptimer_transaction_commit(state->ptimer); + } + trace_bcm2838_rng200_disable_rbg(); } @@ -93,11 +108,38 @@ static void bcm2838_rng200_enable_rbg(BCM2838Rng200State *state) { state->rng_total_bit_count = RNG_WARM_UP_PERIOD_ELAPSED; - bcm2838_rng200_fill_fifo(state); + if (state->use_timer) { + uint32_t div = state->rng_ctrl.div + 1; + + ptimer_transaction_begin(state->ptimer); + ptimer_set_limit(state->ptimer, div, 1); + ptimer_set_count(state->ptimer, div); + ptimer_run(state->ptimer, 0); + ptimer_transaction_commit(state->ptimer); + } else { + bcm2838_rng200_fill_fifo(state); + } trace_bcm2838_rng200_enable_rbg(); } +static void bcm2838_rng200_ptimer_cb(void *arg) +{ + BCM2838Rng200State *state = (BCM2838Rng200State *)arg; + Fifo8 *fifo = &state->fifo; + size_t size = fifo8_num_free(fifo); + + assert(state->rng_ctrl.rbg_enable); + + if (size > 0) { + rng_backend_request_entropy(state->rng, size, + bcm2838_rng200_update_fifo, state); + } else { + ptimer_stop(state->ptimer); + trace_bcm2838_rng200_fifo_full(); + } +} + static void bcm2838_rng200_rng_reset(BCM2838Rng200State *state) { state->rng_ctrl.value = 0; @@ -129,6 +171,12 @@ static uint32_t bcm2838_rng200_read_fifo_data(BCM2838Rng200State *state) buf = fifo8_pop_buf(fifo, max, &num); if ((buf != NULL) && (num > 0)) { memcpy(&ret, buf, num); + + if (state->rng_ctrl.rbg_enable && state->use_timer) { + ptimer_transaction_begin(state->ptimer); + ptimer_run(state->ptimer, 0); + ptimer_transaction_commit(state->ptimer); + } } } else { qemu_log_mask( @@ -138,7 +186,10 @@ static uint32_t bcm2838_rng200_read_fifo_data(BCM2838Rng200State *state) } state->rng_fifo_count.count = fifo8_num_used(fifo) >> 2; - bcm2838_rng200_fill_fifo(state); + + if (!state->use_timer) { + bcm2838_rng200_fill_fifo(state); + } return ret; } @@ -237,7 +288,11 @@ static void bcm2838_rng200_write(void *opaque, hwaddr offset, break; case RNG_TOTAL_BIT_COUNT_THRESHOLD_OFFSET: s->rng_bit_count_threshold = value; - s->rng_total_bit_count = value + 1; + if (s->use_timer) { + s->rng_total_bit_count = 0; + } else { + s->rng_total_bit_count = value + 1; + } break; default: qemu_log_mask( @@ -253,15 +308,39 @@ static const MemoryRegionOps bcm2838_rng200_ops = { .read = bcm2838_rng200_read, .write = bcm2838_rng200_write, .endianness = DEVICE_NATIVE_ENDIAN, + .impl = { + .max_access_size = 4, + .min_access_size = 4, + }, + .valid = { + .max_access_size = 4, + .min_access_size = 4 + }, }; static void bcm2838_rng200_realize(DeviceState *dev, Error **errp) { BCM2838Rng200State *s = BCM2838_RNG200(dev); + if (s->use_timer) { + s->ptimer = ptimer_init(bcm2838_rng200_ptimer_cb, s, + BCM2838_RNG200_PTIMER_POLICY); + if (s->ptimer == NULL) { + error_setg(&error_fatal, "Failed to init RBG timer"); + return; + } + } + if (s->rng == NULL) { Object *default_backend = object_new(TYPE_RNG_BUILTIN); + if (!user_creatable_complete(USER_CREATABLE(default_backend), + errp)) { + object_unref(default_backend); + error_setg(errp, "Failed to create user creatable RNG backend"); + return; + } + object_property_add_child(OBJECT(dev), "default-backend", default_backend); object_unref(default_backend); @@ -270,6 +349,12 @@ static void bcm2838_rng200_realize(DeviceState *dev, Error **errp) errp); } + if (s->use_timer && !clock_has_source(s->clock)) { + ptimer_transaction_begin(s->ptimer); + ptimer_set_period(s->ptimer, s->rbg_period * s->rng_fifo_cap * 8); + ptimer_transaction_commit(s->ptimer); + } + fifo8_create(&s->fifo, s->rng_fifo_cap); sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); } @@ -280,7 +365,7 @@ static void bcm2838_rng200_init(Object *obj) SysBusDevice *sbd = SYS_BUS_DEVICE(obj); s->clock = qdev_init_clock_in(DEVICE(s), "rbg-clock", - NULL, s, + bcm2838_rng200_update_rbg_period, s, ClockPreUpdate); if (s->clock == NULL) { error_setg(&error_fatal, "Failed to init RBG clock"); @@ -305,7 +390,7 @@ static Property bcm2838_rng200_properties[] = { DEFINE_PROP_UINT32("rng-fifo-cap", BCM2838Rng200State, rng_fifo_cap, 128), DEFINE_PROP_LINK("rng", BCM2838Rng200State, rng, TYPE_RNG_BACKEND, RngBackend *), - DEFINE_PROP_BOOL("use-timer", BCM2838Rng200State, use_timer, false), + DEFINE_PROP_BOOL("use-timer", BCM2838Rng200State, use_timer, true), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/arm/bcm2838_peripherals.h b/include/hw/arm/bcm2838_peripherals.h index d3e3449b2b..d52617f3bd 100644 --- a/include/hw/arm/bcm2838_peripherals.h +++ b/include/hw/arm/bcm2838_peripherals.h @@ -10,6 +10,7 @@ #define BCM2838_PERIPHERALS_H #include "hw/arm/bcm2835_peripherals.h" +#include "hw/misc/bcm2838_rng200.h" #include "hw/arm/bcm2838_pcie.h" #include "hw/sd/sdhci.h" #include "hw/gpio/bcm2838_gpio.h" @@ -67,6 +68,7 @@ struct BCM2838PeripheralState { MemoryRegion mphi_mr_alias; MemoryRegion pcie_mmio_alias; + BCM2838Rng200State rng200; SDHCIState emmc2; BCM2838PcieHostState pcie_host; BCM2838GpioState gpio;