From patchwork Mon Mar 10 15:09:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 25978 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 62B93206A6 for ; Mon, 10 Mar 2014 15:10:37 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id uy17sf15366052igb.2 for ; Mon, 10 Mar 2014 08:10:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=o7lY6ho4SbjS+ZAq3rAzGDRqqNntGQ2QBdnfAEs+7D4=; b=KWu/OCxbIqVnTZy7ydwlaUK/Kh2b7XxVz98kWc8VusVBP7E8YTyTbDBJkGYBY8ZDJk AqUglfH1zWqLr+mrbT69hFQrr0Fhm7TNEqly/2AuGT8CpbFzJ0d6QpBjqE/DPvUKO3xR 1nZFZy7lrKUz5a13RcRWfLxcim2u5fOiH4o341Uu/tbFtiezzkCLHX/j9loa4N8ubgNy Uj1SPxZsmrjZVlPzzwc6Q5OYYesBAktE2tHaaQS8gDkv+MoqVsZp3bhBDkW354x1hiWQ Nklq0es/hsN8MA7rq84hdLkCynDi/v3UHN+fp/XDBkxPwEpSVesANLEk9convaRZLw1p Srhg== X-Gm-Message-State: ALoCoQmjS+1icgIEqPHV5g5uB72yl0qUBr4stA0nUrujkmqRgUSzrlmGe/zCjjfnUtAf2ocwuhEd X-Received: by 10.182.112.231 with SMTP id it7mr13402829obb.22.1394464236597; Mon, 10 Mar 2014 08:10:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.25.212 with SMTP id 78ls2175014qgt.30.gmail; Mon, 10 Mar 2014 08:10:36 -0700 (PDT) X-Received: by 10.58.248.228 with SMTP id yp4mr630820vec.35.1394464236398; Mon, 10 Mar 2014 08:10:36 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id kp12si4806961veb.126.2014.03.10.08.10.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Mar 2014 08:10:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id jx11so7261313veb.31 for ; Mon, 10 Mar 2014 08:10:36 -0700 (PDT) X-Received: by 10.58.38.166 with SMTP id h6mr1953773vek.22.1394464236312; Mon, 10 Mar 2014 08:10:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp125629vck; Mon, 10 Mar 2014 08:10:35 -0700 (PDT) X-Received: by 10.140.109.72 with SMTP id k66mr39412569qgf.20.1394464234978; Mon, 10 Mar 2014 08:10:34 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s4si9582155qan.11.2014.03.10.08.10.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 10 Mar 2014 08:10:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:49287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WN1qc-0001Ef-F0 for patch@linaro.org; Mon, 10 Mar 2014 11:10:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WN1pa-0008KU-Ua for qemu-devel@nongnu.org; Mon, 10 Mar 2014 11:09:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WN1pa-0004Xd-0i for qemu-devel@nongnu.org; Mon, 10 Mar 2014 11:09:30 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:46617) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WN1pZ-0004XG-Pn for qemu-devel@nongnu.org; Mon, 10 Mar 2014 11:09:29 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WN1pQ-0002NC-Eg; Mon, 10 Mar 2014 15:09:20 +0000 From: Peter Maydell To: Anthony Liguori Date: Mon, 10 Mar 2014 15:09:17 +0000 Message-Id: <1394464160-9074-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394464160-9074-1-git-send-email-peter.maydell@linaro.org> References: <1394464160-9074-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno Subject: [Qemu-devel] [PULL 6/9] hw/arm/omap1.c: Avoid shifting left into sign bit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Add missing 'U' suffix to avoid shifting left into sign bit. Signed-off-by: Peter Maydell Message-id: 1392988008-15938-3-git-send-email-peter.maydell@linaro.org --- hw/arm/omap1.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 47511d2..b433748 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -809,22 +809,26 @@ static inline void omap_pin_funcmux1_update(struct omap_mpu_state_s *s, uint32_t diff, uint32_t value) { if (s->compat1509) { - if (diff & (1 << 31)) /* MCBSP3_CLK_HIZ_DI */ - omap_clk_onoff(omap_findclk(s, "mcbsp3.clkx"), - (value >> 31) & 1); - if (diff & (1 << 1)) /* CLK32K */ - omap_clk_onoff(omap_findclk(s, "clk32k_out"), - (~value >> 1) & 1); + if (diff & (1U << 31)) { + /* MCBSP3_CLK_HIZ_DI */ + omap_clk_onoff(omap_findclk(s, "mcbsp3.clkx"), (value >> 31) & 1); + } + if (diff & (1 << 1)) { + /* CLK32K */ + omap_clk_onoff(omap_findclk(s, "clk32k_out"), (~value >> 1) & 1); + } } } static inline void omap_pin_modconf1_update(struct omap_mpu_state_s *s, uint32_t diff, uint32_t value) { - if (diff & (1 << 31)) /* CONF_MOD_UART3_CLK_MODE_R */ - omap_clk_reparent(omap_findclk(s, "uart3_ck"), - omap_findclk(s, ((value >> 31) & 1) ? - "ck_48m" : "armper_ck")); + if (diff & (1U << 31)) { + /* CONF_MOD_UART3_CLK_MODE_R */ + omap_clk_reparent(omap_findclk(s, "uart3_ck"), + omap_findclk(s, ((value >> 31) & 1) ? + "ck_48m" : "armper_ck")); + } if (diff & (1 << 30)) /* CONF_MOD_UART2_CLK_MODE_R */ omap_clk_reparent(omap_findclk(s, "uart2_ck"), omap_findclk(s, ((value >> 30) & 1) ?