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: 831029 Delivered-To: patch@linaro.org Received: by 2002:a5d:66c8:0:b0:367:895a:4699 with SMTP id k8csp968817wrw; Fri, 27 Sep 2024 14:46:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU0yFtf/3Cv8l5mApmJ+ZkvHKegAhH7OjbsLr55ykQuCIy3uImvHRuW/rJlYZYA78sGqw8Tow==@linaro.org X-Google-Smtp-Source: AGHT+IFi3M0WIsMwTcHDAsnPKRXTTxuT/7UdBsltoYN7HeMNDULpuPTTpmCeZZVHdtHjDA8o75ZS X-Received: by 2002:a05:6214:3d8a:b0:6c3:508a:fec6 with SMTP id 6a1803df08f44-6cb3b5e8dd7mr87001816d6.17.1727473590023; Fri, 27 Sep 2024 14:46:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727473590; cv=none; d=google.com; s=arc-20240605; b=dXST2NV2wMw7Mwif0vwSE2r2/M5NUPNCwVMgA+MewN12OC8MuuwmjVKBW189F/Blf/ 5a58HWtVbIwiUOkcvffF4oUM2EE/PnsjOJjFXIPYSIRuNfKnCVnVrtli22zJsw6ccquK rNGLg9/i6EmhVTuTsPlhH0+blm2jBwmiKWZfaYQyEN53aYyqkzG6Xs+3VUioKJAVii80 IX/PsVnUhdnS1TsngxMZYz8LmRg0wyMf/M/j8g360lDVnn6Gf9PuhU9/SSAp+5Afeegr 6BUn/y1QW7/DY9FUl82F4MPxqzFVRD2jjVrF1atus/pMLtjVwlKUNXnFSOAI0vGlLBuO riKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Tq/WU8YFou4tlFTr5oZ2aHrtwQxQNFO3jd7/jY9s2dw=; fh=g3QeHlbvb1KMMNFLUbXIUYUDrJCyu1ADbrLKZLJdjPs=; b=jicRfuxFU1JQNa5Q/3Psr43CjoaeuIOQD59V6kLRy/0+Bu9ochhpLfFEUe0M+1szGx 0v3G7AiiNgpAU8/c+QBLxFo/2OANhKQ7Uv68V8QMwBTBha8faXomHDWliWVbCNaJdGrh ZqfZ/FFMM+Jc7ufJqm+z5Rv56oWDAOQeYbzPEwC5S5cvSyqcOtTVZILG97MKNSjgQPzB 3Oi+lc59n1jgWVzS2VmPSPGU+RFTLp4fSWbZVDWiNI8ib4ESsRyzUSYcN9wOsd9w1S6e OEXxwhzc1MoQRBWvFbnetgYgAWlOQWVjd50sMyj9mq9qX0DbHTmC79qBFpjccd3Y9SE3 RZeg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AiQIJV9i; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6cb3b6c80ddsi31801966d6.559.2024.09.27.14.46.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Sep 2024 14:46:30 -0700 (PDT) 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=AiQIJV9i; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suIme-00043F-Rl; Fri, 27 Sep 2024 17:45:52 -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-0003xY-BC for qemu-devel@nongnu.org; Fri, 27 Sep 2024 17:45:51 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suImb-0003uL-H3 for qemu-devel@nongnu.org; Fri, 27 Sep 2024 17:45:50 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-42cd74c0d16so23948515e9.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=kI/fx4Xw6YgmDZTFJhEZ2wU04uLs4jvSGpqEI2820EpvKsVAGUfKdg8PbWLZJRTfD8 byUqMcAoYR2dEMLkupt7gTJFLJyuli/10xxMe+xaydjSWxJVtpcFUBeKsFUd1fpj9BrN RUNjXbmX0qJ3ipQFSpBUIF6/NW4ozekcxTrT4wTk1Ve5ZseppO4eTfgih9Jrt3n+xvd8 Fe3SCDCpBRSXVuAvfv17I8NBw9pGFMnVRBoWmKey2JWTFWq74SpgQJG3aT+quzF7Bgrh wITZbRyvFwj5AjJ5yqoD9JYqGppr/oZyjVrypLFJUJFjIYegZfoOP6sQm18g34TL2rqj yYQA== X-Gm-Message-State: AOJu0YyNMvnlWMJ+p1Y7TfIAfgaogje0ZutvxaHeen+Vi7COggnDckYt zeqELAnRdeBkzbsVMlJe+k/e0KjRYwVQK3PM2j4lYn76EDktvnNVFkXE7q2F5L0uHZLIH4azItc + 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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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-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 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);