From patchwork Fri Mar 1 23:05:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 777105 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp1603692wrn; Fri, 1 Mar 2024 15:16:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV8uctYeEi8AL68IGC3N5py/XJedAwAOAPLMfnbORXOuTHd6f0Q91KudAYiBP7gCo6xzR59Ll+0Ag4plUBbD7HW X-Google-Smtp-Source: AGHT+IELZ7NYq6gGQTYMjOROJGgs+UsSvz8mFX25q8G3vToQNNYwkdAkk5GE75AnYZXQiWspIqaG X-Received: by 2002:a05:620a:120f:b0:788:10e2:1290 with SMTP id u15-20020a05620a120f00b0078810e21290mr1878431qkj.39.1709334982315; Fri, 01 Mar 2024 15:16:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709334982; cv=none; d=google.com; s=arc-20160816; b=ib8Awxif0I4m1I1pM4vcqgcuQlR7V6T7wN77Xl998qzk6rTxH62Vf6ru+/tfmqAY8z sOtrAjsiPh5aHOV3eHcCj4WztRCpRymCKFCQTwjlDwE5VV2B2EZcwW8Q2ttNqcLZuv0o zfiYMhkOEWiIsLq4NgxLpoXT0BLssStyUR2QvtevB5MD6HFMZHmMnqU7Iepthx313O6+ B9NFYj+QvPZROzZtI29xK0eeyHa+nDqpd6I7woFnbPlvn5e6ap7Z19518ihqtm/5TB2b 2m0LYkDCuzHPSgHeCImv9bVOfoZdMXs6lsOnUOO0WQBmVjaftNZ9yk0zaCIt5xwil6An /FIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9UuugcteI3wsnFXZ+gvu7oCS1Hb/WPFzjY9R5VsQ974=; fh=H/IsS+LNYM6dBDHt5BZPsM5V9tnyjdUlJ92VVuTs62g=; b=VESGrhk+D0xrGxeTODUvmdHUWa04bY/SOJRovRUW8XU8XHDZ3L6ns9bG3q2CVr3WMQ xOgoWCGnvo9BqEX+X9iVzVkQnyQbKKwjorBKgbDBxN976xCW/93SXWSGw9AmERPGlZ9t T/2zvKIkY1Rds9LfHrErcJy9GgTZbhfv7O1Wk+ASbBW6nJhf/IzoasnrF6vLzaEebWFh 1hOXCiOa4wVwUyzdNC5cYjiYAMf40+NWuNq9QKW5ZURFC9Gf5jLUtog8vf0O2BIFQLqS clvblKgzCh+9pff04pYo1MpVhUe0nO0by65jxuRBFBzyZFB40+MkduIGBILiko+bJa1l uUUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CiU8qvJb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id qr7-20020a05620a390700b0078802681feasi4205007qkn.5.2024.03.01.15.16.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Mar 2024 15:16:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CiU8qvJb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgByE-0005cP-8d; Fri, 01 Mar 2024 18:07:14 -0500 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 1rgBy7-0005M1-EZ for qemu-devel@nongnu.org; Fri, 01 Mar 2024 18:07:07 -0500 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rgBy6-0004Jz-0Q for qemu-devel@nongnu.org; Fri, 01 Mar 2024 18:07:07 -0500 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-5d3912c9a83so1882158a12.3 for ; Fri, 01 Mar 2024 15:07:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709334425; x=1709939225; darn=nongnu.org; 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=9UuugcteI3wsnFXZ+gvu7oCS1Hb/WPFzjY9R5VsQ974=; b=CiU8qvJbFF+CGuGEAAlV5cAr1aXwRDF1pFKlM2HmJTsfaz8FULHY9n69PycVwjM2RE Hr2aYQXqr1cOdIseZMXnNYuwFY7Qb/MrPHnYYAdJAVX/u+PvxyMBq31bqoPvgDjj5W77 wEEMHFvrON9bGoSX3Uj1Sp+vzkWD38sDLvwVputAKmuX7MmZ0kIDe58LliZHeSwpVgSk c1vkAJqrcgELpghkAbYarxk17sUQzAw6eT8watYQIdlXnxNDVZ98zH9eQw/ZW967OvXh tXV70t5XobiGlVdoBDGGnKo5vhkJcKGxrQTsQjEq8oKQvJJ8tHnrx4JucvwAlRLoT6wl QYvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709334425; x=1709939225; 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=9UuugcteI3wsnFXZ+gvu7oCS1Hb/WPFzjY9R5VsQ974=; b=ONWXxyYu0zo33oTkp91lYrP4CK+et+N7Ev+1zr5F3WSFx1Jh8saJmhDx7ZVVas7KVo CtMP3NwzmAmRKfGpk3smItAF5cnmuK1VroLd5MYhjOW0Hh+0Elrwpi4/z+PUQuCAiqSJ x/hwaVn0DW6kOk6hPVYKeowOxMOn1dYBinrkHVha+l+trtsFJpJ/x0AH5qlPP8//v6QA bjQnnMoU2LShcYc5dcyf1NZ/T1UYkOKCJgYUMpIsQMOnkJbh5+IRNkzH0Cn8GV8W67XY 0RKg+zzyuOHKe3G/IcjHi6YzyrvejFsucvfpVA7UVHXifvKsVg/voVhOZjpQHdO0FoJS cL5w== X-Gm-Message-State: AOJu0YwIketahH40SQiKW0xdmxUMl+lnLJjxRIWR1RYAJtqoXyMApX0K YL0nu3E4gjfMHemPYcKy0VK/Y23x14mVYOnoIbQYlBC/idgFwVXGW9V1kDd/GMMm/NUFwXRdLwI 9 X-Received: by 2002:a17:903:986:b0:1dc:b01e:f75d with SMTP id mb6-20020a170903098600b001dcb01ef75dmr3755834plb.10.1709334424775; Fri, 01 Mar 2024 15:07:04 -0800 (PST) Received: from stoup.. (098-147-055-211.res.spectrum.com. [98.147.55.211]) by smtp.gmail.com with ESMTPSA id lc11-20020a170902fa8b00b001dc668e145asm3988580plb.200.2024.03.01.15.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 15:07:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ilya Leoshkevich , Helge Deller Subject: [PATCH 30/60] hw/tpm: Remove HOST_PAGE_ALIGN from tpm_ppi_init Date: Fri, 1 Mar 2024 13:05:49 -1000 Message-Id: <20240301230619.661008-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301230619.661008-1-richard.henderson@linaro.org> References: <20240301230619.661008-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52a.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This removes a hidden use of qemu_host_page_size, hoisting two uses of qemu_real_host_page_size to a local variable. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Ilya Leoshkevich Acked-by: Helge Deller --- hw/tpm/tpm_ppi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c index 7f74e26ec6..f27ed6c35e 100644 --- a/hw/tpm/tpm_ppi.c +++ b/hw/tpm/tpm_ppi.c @@ -47,8 +47,10 @@ void tpm_ppi_reset(TPMPPI *tpmppi) void tpm_ppi_init(TPMPPI *tpmppi, MemoryRegion *m, hwaddr addr, Object *obj) { - tpmppi->buf = qemu_memalign(qemu_real_host_page_size(), - HOST_PAGE_ALIGN(TPM_PPI_ADDR_SIZE)); + size_t host_page_size = qemu_real_host_page_size(); + + tpmppi->buf = qemu_memalign(host_page_size, + ROUND_UP(TPM_PPI_ADDR_SIZE, host_page_size)); memory_region_init_ram_device_ptr(&tpmppi->ram, obj, "tpm-ppi", TPM_PPI_ADDR_SIZE, tpmppi->buf); vmstate_register_ram(&tpmppi->ram, DEVICE(obj));