From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4278DC433B4 for ; Fri, 9 Apr 2021 07:03:29 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E6676100C for ; Fri, 9 Apr 2021 07:03:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E6676100C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bewilderbeest.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Y1kfg8Rg0ODPekeblsGioykj22faU1x+podHhfr0so8=; b=Nj2daLiqwx+FJ/qAlmVQhGFil 7oIebZy5wQ1nyXfD6hxXFQ2coe7EqbG9h0d5odXd+wgZToo5i7dEQGC44rTWxP2whZMlq7w3lc2NV mBaYYLdXUDycpfAZWwK/SpDD2apJIyfirRj2+0ctGY0/yWkSDCAF9mhHWyAo2rpbUq6efXJaDk9wm UHNwqYCZoVH1YU+LWU1VBbsGEsM9fRt6qeqSlYb6SHzqqFPIlUMy/whdCIH6LHRhjZCLLuKDyVJes waPC07qs78DsJA0u1QelWoIfuBVvSyr9L9cGEd3KaHiTx3RxRScUbKTnCbqxWaAW6MCKXwaNu3df0 brbhwcS8g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lUl98-00AMro-G1; Fri, 09 Apr 2021 07:01:38 +0000 Received: from thorn.bewilderbeest.net ([71.19.156.171]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lUl8e-00AMlr-AI for linux-arm-kernel@lists.infradead.org; Fri, 09 Apr 2021 07:01:10 +0000 Received: from hatter.bewilderbeest.net (unknown [IPv6:2600:6c44:7f:ba20::7c6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: zev) by thorn.bewilderbeest.net (Postfix) with ESMTPSA id 240CB86; Fri, 9 Apr 2021 00:01:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bewilderbeest.net; s=thorn; t=1617951666; bh=+JLpB4B4pZBi2h8DfTURJ08nGqgdO/pYNV0sF8isNXA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CidT4DYvw7ZKpQkK8gdGXnDdEJXCD9goWMGofn7kROmWmdqG5EWltzowMmaLMHNGU 6M7G/SO7aMkIYPy7bEV3EaXiUUNr3sIQU3g/L8T8wnqwdiGHfBq5p8sFg0zAprzD90 FGNpAD/S63WbHASqkhrS6RDPjVQU9ap1qxx8FeqA= Date: Fri, 9 Apr 2021 02:01:04 -0500 From: Zev Weiss To: Andrew Jeffery Cc: Joel Stanley , openbmc@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org Subject: Re: [PATCH v5 2/4] drivers/tty/serial/8250: refactor sirq and lpc address setting code Message-ID: References: <20210408011637.5361-1-zev@bewilderbeest.net> <20210408011637.5361-3-zev@bewilderbeest.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210409_080108_715119_256BE227 X-CRM114-Status: GOOD ( 18.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Apr 09, 2021 at 12:06:16AM CDT, Andrew Jeffery wrote: > > >On Thu, 8 Apr 2021, at 10:46, Zev Weiss wrote: >> This splits dedicated aspeed_vuart_set_{sirq,lpc_address}() functions >> out of the sysfs store functions in preparation for adding DT >> properties that will be poking the same registers. While we're at it, >> these functions now provide some basic bounds-checking on their >> arguments. >> >> Signed-off-by: Zev Weiss >> --- >> drivers/tty/serial/8250/8250_aspeed_vuart.c | 51 ++++++++++++++------- >> 1 file changed, 35 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/tty/serial/8250/8250_aspeed_vuart.c >> b/drivers/tty/serial/8250/8250_aspeed_vuart.c >> index c33e02cbde93..8433f8dbb186 100644 >> --- a/drivers/tty/serial/8250/8250_aspeed_vuart.c >> +++ b/drivers/tty/serial/8250/8250_aspeed_vuart.c >> @@ -72,22 +72,31 @@ static ssize_t lpc_address_show(struct device *dev, >> return snprintf(buf, PAGE_SIZE - 1, "0x%x\n", addr); >> } >> >> +static int aspeed_vuart_set_lpc_address(struct aspeed_vuart *vuart, u32 addr) >> +{ >> + if (addr > U16_MAX) >> + return -EINVAL; >> + >> + writeb(addr >> 8, vuart->regs + ASPEED_VUART_ADDRH); >> + writeb(addr >> 0, vuart->regs + ASPEED_VUART_ADDRL); >> + >> + return 0; >> +} >> + >> static ssize_t lpc_address_store(struct device *dev, >> struct device_attribute *attr, >> const char *buf, size_t count) >> { >> struct aspeed_vuart *vuart = dev_get_drvdata(dev); >> - unsigned long val; >> + u32 val; >> int err; >> >> - err = kstrtoul(buf, 0, &val); >> + err = kstrtou32(buf, 0, &val); >> if (err) >> return err; >> >> - writeb(val >> 8, vuart->regs + ASPEED_VUART_ADDRH); >> - writeb(val >> 0, vuart->regs + ASPEED_VUART_ADDRL); >> - >> - return count; >> + err = aspeed_vuart_set_lpc_address(vuart, val); >> + return err ? : count; >> } >> >> static DEVICE_ATTR_RW(lpc_address); >> @@ -105,27 +114,37 @@ static ssize_t sirq_show(struct device *dev, >> return snprintf(buf, PAGE_SIZE - 1, "%u\n", reg); >> } >> >> +static int aspeed_vuart_set_sirq(struct aspeed_vuart *vuart, u32 sirq) >> +{ >> + u8 reg; >> + >> + if (sirq > (ASPEED_VUART_GCRB_HOST_SIRQ_MASK >> ASPEED_VUART_GCRB_HOST_SIRQ_SHIFT)) >> + return -EINVAL; >> + >> + sirq <<= ASPEED_VUART_GCRB_HOST_SIRQ_SHIFT; >> + sirq &= ASPEED_VUART_GCRB_HOST_SIRQ_MASK; > >This might be less verbose if we reordered things a little: > >``` >sirq <<= ASPEED_VUART_GCRB_HOST_SIRQ_SHIFT; >if (sirq & ASPEED_VUART_GCRB_HOST_SIRQ_MASK) > return -EINVAL; >sirq &= ASPEED_VUART_GCRB_HOST_SIRQ_MASK; >``` Hmm, that (or something similar, perhaps with a '~' on the mask in the if condition?) does seem like it'd be a nice improvement, though I suppose it'd also mean we'd fail to reject some way-out-of-range sirq values (e.g. if it had its MSB set) -- so I think I'll leave it as is, just in the name of thoroughness/paranoia? > >But otherwise it looks okay, so > >Reviewed-by: Andrew Jeffery > Thanks. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel