From patchwork Fri Sep 27 21:45:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1990420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=AiQIJV9i; dkim-atps=neutral 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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) 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 4XFkZ805mdz1xtG for ; Sat, 28 Sep 2024 07:46:40 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suImf-00045x-9s; Fri, 27 Sep 2024 17:45:53 -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 1suImd-0003xd-Bs for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:45:51 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suImb-0003uF-Gv for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:45:50 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-42cd74c0d16so23948485e9.1 for ; Fri, 27 Sep 2024 14:45:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727473541; x=1728078341; 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=Tq/WU8YFou4tlFTr5oZ2aHrtwQxQNFO3jd7/jY9s2dw=; b=AiQIJV9iswhWv7xNmxJS/55KZIHsUX5nPKpfD/KMi4F0ZJ3i7o/rPNbMJ4I5xqdTXA uB0/mdPLgGX6AeRJVYyWYyQwYGJ86GdgNC24ADTMRP9WZb5bv461SmTPKkffVFHe/Iqo og/yq26oBoj+tHinuEl877OkTbFUd3vMQuiXE1a/Rhdz8blfMr+YyCwRDJbbyNTZs31r hQbQnBvm5e/eIkbX75cy2pMPm2QqF1FM0yxCc11Gf4+gipP4cOwf2ABj5mTQgjSEfsVR pSuxHE1T2Q78yb4VRvxKXPBF1y/ghDVDaXkyp4umbqCLDYgngYHql8g5RVCcRdyUWApT JJ2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727473541; x=1728078341; 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=Tq/WU8YFou4tlFTr5oZ2aHrtwQxQNFO3jd7/jY9s2dw=; b=FcejZdbK1mrDxNUcj8aAhMVLnvKcEoDfUp5PV1Nuny2+SdfRompFO9DQI9RULCblWq t0yDNn9eLIe7qwV2b6KNr/kpJSd1mtig65g57VyTqVsVZI0HXqbirYf5XtCcLmZ1qBcK Ex5PMyoxahKTy0iy1NNsjRmCmwa7puZRj6QQphB6TOBkPQl8YlIqclJz7VL3o1OSz532 APOImwd1e634zIyywOIEUV6ZftFy9WCfUVaNjyftQKA+QxVOy3OZdSabW1je/29CeW4d rYDvP5tntJQs7M3ngDEExZr+MkZoocEnBD2fUbSH8KtGchrwn1zTxxjoaGYTK3qS8dqa CLDg== X-Forwarded-Encrypted: i=1; AJvYcCXdQXb+ao8QgrYhjjw9gq0GO8xmfiYfppW8GvKlSA9I20QnlmXHz4be29M/F62oxcRJpUQ18pYRDg==@nongnu.org X-Gm-Message-State: AOJu0YxbuIkJ/SrqgxKVuGq6r3kOKEBUpiIfVg7UnM/ncJSiLCUaz0in X7MRnLFbP2l02yLIzvwyTtex1LC3p7NbrreGv7saXm7RvdPw2xX/+6Jg4fQDZ6s= X-Google-Smtp-Source: AGHT+IGGJC8+9f2DLcXYz7UNT52MIcCJvmAtXpq0ltLtc2B0EdD1vwXm4xFrnfWyN4YA2qQjOpTVdg== X-Received: by 2002:a05:600c:4f86:b0:42c:bae0:f066 with SMTP id 5b1f17b1804b1-42f58434768mr30930125e9.13.1727473541180; Fri, 27 Sep 2024 14:45:41 -0700 (PDT) Received: from localhost.localdomain ([176.187.217.136]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e96a36292sm84637645e9.32.2024.09.27.14.45.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 27 Sep 2024 14:45:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Nicholas Piggin , David Gibson , qemu-ppc@nongnu.org, Alexey Kardashevskiy , Harsh Prateek Bora , Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/4] hw/ppc/spapr_nvdimm: Simplify LD/ST API uses Date: Fri, 27 Sep 2024 23:45:28 +0200 Message-ID: <20240927214531.20242-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240927214531.20242-1-philmd@linaro.org> References: <20240927214531.20242-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org ldn/stn methods handle the access size, no need for the switch case. Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/spapr_nvdimm.c | 47 ++++--------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c index 7d2dfe5e3d..5af0b13370 100644 --- a/hw/ppc/spapr_nvdimm.c +++ b/hw/ppc/spapr_nvdimm.c @@ -250,7 +250,6 @@ static target_ulong h_scm_read_metadata(PowerPCCPU *cpu, SpaprDrc *drc = spapr_drc_by_index(drc_index); NVDIMMDevice *nvdimm; NVDIMMClass *ddc; - uint64_t data = 0; uint8_t buf[8] = { 0 }; if (!drc || !drc->dev || @@ -272,24 +271,7 @@ static target_ulong h_scm_read_metadata(PowerPCCPU *cpu, ddc = NVDIMM_GET_CLASS(nvdimm); ddc->read_label_data(nvdimm, buf, len, offset); - switch (len) { - case 1: - data = ldub_p(buf); - break; - case 2: - data = lduw_be_p(buf); - break; - case 4: - data = ldl_be_p(buf); - break; - case 8: - data = ldq_be_p(buf); - break; - default: - g_assert_not_reached(); - } - - args[0] = data; + args[0] = ldn_be_p(buf, len); return H_SUCCESS; } @@ -325,31 +307,10 @@ static target_ulong h_scm_write_metadata(PowerPCCPU *cpu, return H_P2; } - switch (len) { - case 1: - if (data & 0xffffffffffffff00) { - return H_P2; - } - stb_p(buf, data); - break; - case 2: - if (data & 0xffffffffffff0000) { - return H_P2; - } - stw_be_p(buf, data); - break; - case 4: - if (data & 0xffffffff00000000) { - return H_P2; - } - stl_be_p(buf, data); - break; - case 8: - stq_be_p(buf, data); - break; - default: - g_assert_not_reached(); + if (len < 8 && extract64(data, 8 * len, 64 - 8 * len)) { + return H_P2; } + stn_be_p(buf, data, len); ddc = NVDIMM_GET_CLASS(nvdimm); ddc->write_label_data(nvdimm, buf, len, offset); From patchwork Fri Sep 27 21:45:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1990416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=kckBDP6G; dkim-atps=neutral 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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) 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 4XFkYs69Dbz1xtG for ; Sat, 28 Sep 2024 07:46:25 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suImh-0004GG-Qi; Fri, 27 Sep 2024 17:45:55 -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 1suIme-00041s-DZ for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:45:52 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suImc-0003uh-7Q for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:45:51 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-42cb6f3a5bcso30890795e9.2 for ; Fri, 27 Sep 2024 14:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727473548; x=1728078348; 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=22wtNkwk6lzPh2EtQj85F8jLpnswm9ZtwKSArURcwyA=; b=kckBDP6Gj8mRwxqqub8ykpcyjo9SSY8HO2InTJsE555j0cClfcPJckjrJ24KZ98AQU 83o24sXLCICkhf3uykxlhbqGTcCXJMGtBmiySu0cHK928bCb9axT4eG2HFLZ0+WsEbQJ FTTz41TczOF11z9UYtlDAOp9gej0nucMJOMlvF40BFbrTBRJVk97TXykdNgLcc/edTKY rm2546QzsSmRueIjv6n/uYy2XoXWdleXrjm3CzXvMlbx7R78ujFnRAF+GRQ0OuTkj6FY Cs35ndeETsiI2jQlqMTEYrE3gpKxfvz3akxBfvJPZYgJ1PtjwBXD61T+C14sQ6Waq+nv RJ3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727473548; x=1728078348; 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=22wtNkwk6lzPh2EtQj85F8jLpnswm9ZtwKSArURcwyA=; b=hyKK1s2gQbAGwOyTv/JbiFAhrlUv/Abu1FJ+mQKNJLmv8zB++QoaE9vMBZU1rXIFjo d1NkRSObTm1IHWT+oFt8/Apx6BiQHUxILxb2F2H+nA9VXniN0F08JTJXX6hM0e5BfMhJ 53eYWuSxpx4DGkZUDJ5sUEK1f4kMPYF5GJApM4uvVWiV1fBcGNPft29ik+Nh+GunTT5T GUogmd1Rjaop9AAkAI7oD/z26iJK13bVEri/xQbTGtKV1oGfMUztoPOC7xEU7c5S27s1 FcpP1IK1TKtm6lnYuPY0yab0Y7D4rh1rPQydiT36+VH0HcoyWy0VMd6yNMecCsX03BXI EjaQ== X-Forwarded-Encrypted: i=1; AJvYcCXGeHVnJRh8m0tcHFHpmlLXj7Aj8pdyNsvcnzDCTSoURFCGNrgZtsBZRxbxeFGbxbozl8swp2fd2w==@nongnu.org X-Gm-Message-State: AOJu0YwJZh39aiqKxxZiLZmXaBxapXxpvNcb0itj/NYSXgr0r4zW1hcB CGPVSvD///ZpmaO7iRjdE6YziprDy6r68wx8szuS0RuDVAgNVlXYUhqObMw4owg= X-Google-Smtp-Source: AGHT+IGpYOfRFumm9XZdJwLyZz8guaI/2hF7CixvTFkmE+6dfS5poM0464o5AoPoz4/J6RPtwL0Z+Q== X-Received: by 2002:a05:600c:1d1e:b0:42b:ac3d:3abc with SMTP id 5b1f17b1804b1-42f584976b0mr42968425e9.24.1727473548533; Fri, 27 Sep 2024 14:45:48 -0700 (PDT) Received: from localhost.localdomain ([176.187.217.136]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd564ce91sm3460609f8f.2.2024.09.27.14.45.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 27 Sep 2024 14:45:47 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Nicholas Piggin , David Gibson , qemu-ppc@nongnu.org, Alexey Kardashevskiy , Harsh Prateek Bora , Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] hw/ppc/spapr_vof: Simplify LD/ST API uses Date: Fri, 27 Sep 2024 23:45:29 +0200 Message-ID: <20240927214531.20242-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240927214531.20242-1-philmd@linaro.org> References: <20240927214531.20242-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Directly call ldn_be_p once instead of ldl_be_p / ldq_be_p. Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/spapr_vof.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/hw/ppc/spapr_vof.c b/hw/ppc/spapr_vof.c index c02eaacfed..d238a44d88 100644 --- a/hw/ppc/spapr_vof.c +++ b/hw/ppc/spapr_vof.c @@ -136,26 +136,17 @@ bool spapr_vof_setprop(MachineState *ms, const char *path, const char *propname, vof->bootargs = g_strndup(val, vallen); return true; } - if (strcmp(propname, "linux,initrd-start") == 0) { - if (vallen == sizeof(uint32_t)) { - spapr->initrd_base = ldl_be_p(val); - return true; + switch (vallen) { + case 4: + case 8: + if (strcmp(propname, "linux,initrd-start") == 0) { + spapr->initrd_base = ldn_be_p(val, vallen); } - if (vallen == sizeof(uint64_t)) { - spapr->initrd_base = ldq_be_p(val); - return true; - } - return false; - } - if (strcmp(propname, "linux,initrd-end") == 0) { - if (vallen == sizeof(uint32_t)) { - spapr->initrd_size = ldl_be_p(val) - spapr->initrd_base; - return true; - } - if (vallen == sizeof(uint64_t)) { - spapr->initrd_size = ldq_be_p(val) - spapr->initrd_base; - return true; + if (strcmp(propname, "linux,initrd-end") == 0) { + spapr->initrd_size = ldn_be_p(val, vallen); } + return true; + default: return false; } } From patchwork Fri Sep 27 21:45:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1990419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=K4SJx18e; dkim-atps=neutral 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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) 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 4XFkZ457vZz1xtG for ; Sat, 28 Sep 2024 07:46:36 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suIml-0004TK-57; Fri, 27 Sep 2024 17:45:59 -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 1suImk-0004OK-7G for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:45:58 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suImi-0003vz-Fb for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:45:57 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-42cbb08a1a5so23862385e9.3 for ; Fri, 27 Sep 2024 14:45:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727473555; x=1728078355; 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=Fbocd4kmjbgTZkW00sKJRg9Q/JlRfFmMDabLRJXpjXw=; b=K4SJx18e3KP8qa1ATO9TlXGNmoSyGlFxcD0ybXAGMZvYR2Gyu3aHwbpKbhyMWk3IhW 4B67Rvbkb6W1K+xEF7eeSDIemCPvbqe2la+YW3DeZwIahQTkTGQ8SFl7Ajnsi3aE6LQY NkEFgQlAlOTvyUB0qaKb+riX4olt2uMfmWMCTbXyU+l2VD1A+FKjqJkAALOjmoE0mriA wHKUDtN+dbgyy2b6NqUFzWY9eeOBf99E1ej368gnNeJp1x3Z3+arROwwVcebgsfHuUVO eF5fbpxx53K1B0sNc6aQvbfun5gg6Mdgku0VpFUW6QinR4dp4LyfbhZbfUYI8YH8NMaR gryw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727473555; x=1728078355; 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=Fbocd4kmjbgTZkW00sKJRg9Q/JlRfFmMDabLRJXpjXw=; b=kqRRBE4itz1OXSZUY/6wyQClWCybTZsuFgvvN+OWF0DnO3EgRihd2/f0Oa2MH5jjcB lreFZW4k9kCUH9yt4EUPhyYP0Vz8K/hwVZu1PXg4EzwD6+O3rAmCtnniJ3KuSjPxEomM NC19TV26QWPGQwGyb5rEW+DrtJcluKJeHEyaQZMImE6zULYkFYDTqD/ZkNM73yjcQlQF uDBYm6tMf7UmEolbSH74DwrrGP0LwjPre8lDIs8N5FSF9kSkyh9rOQzW9+biOhQ0W+VK E4olV76vGlkKYzLKecFMZL9OgGT+NxN8TAbgbHang2RYR6eqZ1VGTrGcsXyIsZI+wszb PC5w== X-Forwarded-Encrypted: i=1; AJvYcCWoAQhh1rYS6V0ZRqy+WCjg3VTG4Qkh9CIQwjn1uw/k86NWePpUkFkGlAX+1iCQmKMtgmAh2tA9LQ==@nongnu.org X-Gm-Message-State: AOJu0Yxk+/X4fA36uocwOFyfmbZFFxofh0SaHo0KvdLQALu01kd2tBOS 6+v51C/+kfQhu/8GnnedbtdReQohc6ZJwW//sRfRXK1SYF5uMGx4W8bcY8EBSbg= X-Google-Smtp-Source: AGHT+IEbJWrZPp/+ZGCMU0ft1/0/FCAkzhRKqmgKFLU4Vqi++7MsZCs4bsrNHIWVsCOhD8zi4cIVJQ== X-Received: by 2002:a05:600c:45ce:b0:42c:df54:1908 with SMTP id 5b1f17b1804b1-42f5844ba2bmr35683315e9.18.1727473554875; Fri, 27 Sep 2024 14:45:54 -0700 (PDT) Received: from localhost.localdomain ([176.187.217.136]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e96a52308sm84020965e9.43.2024.09.27.14.45.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 27 Sep 2024 14:45:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Nicholas Piggin , David Gibson , qemu-ppc@nongnu.org, Alexey Kardashevskiy , Harsh Prateek Bora , Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/4] hw/ppc/vof: Simplify LD/ST API uses Date: Fri, 27 Sep 2024 23:45:30 +0200 Message-ID: <20240927214531.20242-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240927214531.20242-1-philmd@linaro.org> References: <20240927214531.20242-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Directly call ldn_be_p once instead of be32_to_cpu / ldq_be_p. Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/vof.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c index b5b6514d79..fb152efbe0 100644 --- a/hw/ppc/vof.c +++ b/hw/ppc/vof.c @@ -645,11 +645,7 @@ static void vof_dt_memory_available(void *fdt, GArray *claimed, uint64_t base) mem0_reg = fdt_getprop(fdt, offset, "reg", &proplen); g_assert(mem0_reg && proplen == sizeof(uint32_t) * (ac + sc)); - if (sc == 2) { - mem0_end = ldq_be_p(mem0_reg + sizeof(uint32_t) * ac); - } else { - mem0_end = be32_to_cpu(*(uint32_t *)(mem0_reg + sizeof(uint32_t) * ac)); - } + mem0_end = ldn_be_p(mem0_reg + sizeof(uint32_t) * ac, 4 * sc); g_array_sort(claimed, of_claimed_compare_func); vof_claimed_dump(claimed); From patchwork Fri Sep 27 21:45:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1990425 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=NiCuqekY; dkim-atps=neutral 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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) 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 4XFkZx5WBxz1xtP for ; Sat, 28 Sep 2024 07:47:21 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suImr-0004oa-IN; Fri, 27 Sep 2024 17:46:05 -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 1suImq-0004mo-6m for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:46:04 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suImo-0003wm-KJ for qemu-ppc@nongnu.org; Fri, 27 Sep 2024 17:46:03 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-37cc60c9838so1510299f8f.1 for ; Fri, 27 Sep 2024 14:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727473561; x=1728078361; 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=e1vHxexCTLbdRB8r0KvJgoIHaBve1hvZ62MNg9aoNm0=; b=NiCuqekYQvacC/zN+941Yi6PEy/hLXyBY7AG4dS3FtRi8PXf2cI+Zx2j6l3PDD5YQv kq+UgfRubfUT2i2mRi1hmcnIKb0wKcRKrjUJPbRgwdf/+1JmBoHs7k898U/KTOKoH4Io fjzS75vVlUMd7Aa8vkmD4vEc0qMzv8AcKoXX91L73Bsr7aoNPGOhbsBwOM4M/+9u5G+N gs9RoMiRTAZnv8mbdsIoH+MnU8CWU5WIQdtYVBui47x0XTi/Z93v7Rp7QGC35VQfPkRL 10BZ/aqLqaKjSIWZcMz3UHy/+7fyaFZQHWmUoQo+G5O+jzOBK3rWMGMOIccts1jcm5LU FKHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727473561; x=1728078361; 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=e1vHxexCTLbdRB8r0KvJgoIHaBve1hvZ62MNg9aoNm0=; b=iUiULU7ljKwPb93Ut5tKusrplrUO5fhID6vQYvf1uIMIdtjvrGQ4VcaxH2PvoVP65Y zfssHDULQ9SKbpweiZ7RXOZR1FRHs2PbKLqFvOhOfdU5y8ELtIaPse/LnByjcAQbUJ7d V7JjSFWnbOoY5Pde+jjhql1jsuwUuQ+Ny4iRd0ALw8Xw1RPFX45EAtTmbergQi5bABiP j3EFD9FEP1sZyu7bwO0Um1cvgaq5yzm49b+fs88fpHr2lJNoNW6WzLaPiixawQBB1Xkc c6TF9PsfeGV3M8YCfsJtyrHQJPQ4HOw6bqaf9pzEqleJoKgcdjyeRUtZkJvRJ8wNE/ZH tCFA== X-Forwarded-Encrypted: i=1; AJvYcCUz88mihlfe3F4QbH9i+zCTcDaGVK4CmL5W6oqvbwBP/ejJ34mo7ZmLB5WK+a940KemBGyrgOC9kg==@nongnu.org X-Gm-Message-State: AOJu0YwkMBFEGHshxczRlX5hJAddaVsDo0PFN2Niw/XbEjfzLsdsqOQC O6soH0XzOo1fniStLAhrZmr5wMOqunurZVlhWltksd7ScBm4b0mNyL/j8yKqRyY= X-Google-Smtp-Source: AGHT+IFE1tGVpbwj+SZ3EdB+7yU6IoGhvZLxv1moKmf/C9kyFjiXutvmrPG4Fe3YjdY6hgN1+W9tow== X-Received: by 2002:a5d:500f:0:b0:374:ba78:9013 with SMTP id ffacd0b85a97d-37cd568e21cmr2908343f8f.9.1727473561121; Fri, 27 Sep 2024 14:46:01 -0700 (PDT) Received: from localhost.localdomain ([176.187.217.136]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd574282esm3373982f8f.104.2024.09.27.14.45.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 27 Sep 2024 14:46:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Nicholas Piggin , David Gibson , qemu-ppc@nongnu.org, Alexey Kardashevskiy , Harsh Prateek Bora , Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/4] net/l2tpv3: Simplify LD/ST API uses Date: Fri, 27 Sep 2024 23:45:31 +0200 Message-ID: <20240927214531.20242-5-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240927214531.20242-1-philmd@linaro.org> References: <20240927214531.20242-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Directly call ldn_be_p once instead of ldl_be_p / ldq_be_p. Signed-off-by: Philippe Mathieu-Daudé --- net/l2tpv3.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/l2tpv3.c b/net/l2tpv3.c index b5547cb917..7a0d5dcfe9 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -318,11 +318,7 @@ static int l2tpv3_verify_header(NetL2TPV3State *s, uint8_t *buf) */ if (s->cookie) { - if (s->cookie_is_64) { - cookie = ldq_be_p(buf + s->cookie_offset); - } else { - cookie = ldl_be_p(buf + s->cookie_offset) & 0xffffffffULL; - } + cookie = ldn_be_p(buf + s->cookie_offset, s->cookie_is_64 ? 8 : 4); if (cookie != s->rx_cookie) { if (!s->header_mismatch) { error_report("unknown cookie id");