From nobody Thu Apr 25 06:14:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) client-ip=209.85.221.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1605889177; cv=none; d=zohomail.com; s=zohoarc; b=LTsUUdXDxIzvuIdecviMuNKs5kYm1a/tE17ekT8RIJuKl6BFyjCMiy0kl7H5LWKPwdbVlRhqEUnQ3qmZO31lszCHMeHreqobD+VvBPYkEQy5nYbXBlcqvWzt+dFktJ2DbuKH+mTeBHz559XE6PaSdW6pqkSI8gWzfXIez9aD4oY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605889177; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=6h63TJEE3VuOKTgE2tz+nb1wD/cQ4WmCS4pSnpNEH5Q=; b=bPakzZ+l7tBE2gD2sHLvfAoArmsRMUcd/5i9kWtzZMMMKKwedxdfvHZyuHwQgZ4CqyMxQFV2cVGodLQwmdED84soFC7+quBzLhnw4MhmrTZRzP/lFzIrbnC0ZZE+3KD15pjkPD3Xl3TjNPz1nMFMV6Ur7eFjyDXkYDnF4bCQ03c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.zohomail.com with SMTPS id 1605889177572138.1484205823225; Fri, 20 Nov 2020 08:19:37 -0800 (PST) Received: by mail-wr1-f66.google.com with SMTP id c17so10550807wrc.11 for ; Fri, 20 Nov 2020 08:19:36 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id w10sm5714691wra.34.2020.11.20.08.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 08:19:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6h63TJEE3VuOKTgE2tz+nb1wD/cQ4WmCS4pSnpNEH5Q=; b=uH27zsQ/tgY+ASSTzOKiIvCMiP69AztE6PcZsUD3N7btzdzEzbWiFdlxcOA9hnbR1I xSCBqyo3DocYrSQJSYESL+hkXcuyjooqzmzIBFDRGxDqHspUN3I2b9iXY46wy1xwpbbG iTY0w3xcx02AtrLMZHgqLJ24OCRgvJ78fKTqeHfGt99w79lDSCutWebqhBJP5uGOI/P9 wEio52JKIY0StRQAzAf5DeDJ/uKlTW14jjvl69Be4UjINPZ7amuIHfyYiNx2USG5rB51 A4p+Bq0MIbb3aqxvCwthdQ6lMBkgTlEnibhN6xEPV8x69IjyClpj4UZ3ff4Xx7KjN7mH RWNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=6h63TJEE3VuOKTgE2tz+nb1wD/cQ4WmCS4pSnpNEH5Q=; b=sbqH0zRCo/1NhkbQ9EZBHUZTiZUU2gUuvkkYwSbk8hYyeJpU0ut2xykUHoGXpuOvzk AwMEgiwzDNcTK0K8Zu8eYGkO3pgnQpVFpELyJsFThDtSGuJ6s2jXUykEco0+bLBjE/dJ 5UaAK1fsjTxu4pxrnLuFzTs/iMJlM4N6gadCWLr+wAy8wb9My9x91ypnt1dkKR/x0g+H 87tLnkIHXgBAeWzgP5R3P/6bAlf25LITHhyApDeIFiPHitgAKHgedt0CXhU+y2q/qub7 aOrvvKPdp43K41WUVurHw/W842ghxqT0b2ZoiQgqj19DlYggXXlwvdQKK9mTgvLaCgDO Z94Q== X-Gm-Message-State: AOAM533rZUIY9PFYGRrmK9gDxbxOnE7CT9agk+nF8Fb8wFHpgZnL2Tbe fdCWmShY8MN9zFvehkCzaR4= X-Google-Smtp-Source: ABdhPJyapvxIGHOl7HYgX0RMfCiHbdQsFtm+zr7rNb2jjrmWRnd5iFum5LvybSWwD/nBy4trkWlunQ== X-Received: by 2002:adf:916e:: with SMTP id j101mr10401256wrj.55.1605889175700; Fri, 20 Nov 2020 08:19:35 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Jonathan D . Belanger" , Bug 1904331 <1904331@bugs.launchpad.net> Subject: [PATCH-for-5.2?] hw/char/serial: Clean up unnecessary code Date: Fri, 20 Nov 2020 17:19:33 +0100 Message-Id: <20201120161933.2514089-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Since commit 5ec3a23e6c8 ("serial: convert PIO to new memory api read/write") we don't need to worry about accesses bigger than 8-bit. Use the extract()/deposit() functions to access the correct part of the 16-bit 'divider' register. Reported-by: Jonathan D. Belanger Buglink: https://bugs.launchpad.net/qemu/+bug/1904331 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Bug 1904331 <1904331@bugs.launchpad.net> --- hw/char/serial.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 97f71879ff2..62c627f486f 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -24,6 +24,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/bitops.h" #include "hw/char/serial.h" #include "hw/irq.h" #include "migration/vmstate.h" @@ -338,11 +339,7 @@ static void serial_ioport_write(void *opaque, hwaddr a= ddr, uint64_t val, default: case 0: if (s->lcr & UART_LCR_DLAB) { - if (size =3D=3D 1) { - s->divider =3D (s->divider & 0xff00) | val; - } else { - s->divider =3D val; - } + s->divider =3D deposit32(s->divider, 8 * addr, 8, val); serial_update_parameters(s); } else { s->thr =3D (uint8_t) val; @@ -364,7 +361,7 @@ static void serial_ioport_write(void *opaque, hwaddr ad= dr, uint64_t val, break; case 1: if (s->lcr & UART_LCR_DLAB) { - s->divider =3D (s->divider & 0x00ff) | (val << 8); + s->divider =3D deposit32(s->divider, 8 * addr, 8, val); serial_update_parameters(s); } else { uint8_t changed =3D (s->ier ^ val) & 0x0f; @@ -478,7 +475,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr= addr, unsigned size) default: case 0: if (s->lcr & UART_LCR_DLAB) { - ret =3D s->divider & 0xff; + ret =3D extract16(s->divider, 8 * addr, 8); } else { if(s->fcr & UART_FCR_FE) { ret =3D fifo8_is_empty(&s->recv_fifo) ? @@ -502,7 +499,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr= addr, unsigned size) break; case 1: if (s->lcr & UART_LCR_DLAB) { - ret =3D (s->divider >> 8) & 0xff; + ret =3D extract16(s->divider, 8 * addr, 8); } else { ret =3D s->ier; } --=20 2.26.2