From patchwork Wed May 25 03:23:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyrone Ting X-Patchwork-Id: 576128 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2D7EC433FE for ; Wed, 25 May 2022 03:24:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239740AbiEYDYW (ORCPT ); Tue, 24 May 2022 23:24:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239372AbiEYDYV (ORCPT ); Tue, 24 May 2022 23:24:21 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A53C6644C4; Tue, 24 May 2022 20:24:20 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id z25so5404493pfr.1; Tue, 24 May 2022 20:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wHBp9QnqH/tjk3SXwINVbP3RweD3cBoDf4EfzPLLtdI=; b=fNBFiUKlpKIxyGJZvI0uX+HBUBj+QfngKb8DmXACjcba45H7uzizIr8jCBbXk6HpJv EkwruyuWEGhCyE5vmZ6GJChN8dJcmhKDzAB7QUuwyeznTcMp+AUaCAEH3F1VvGJglyrW 2KT0+/XWKurwchH5Vc9GOPMo6zNmhOTRHs8/+kmEVJGtbNfFRGujZMI6EJrKrafrb7x1 h09jkoXzq53WMBZjc0nhspW2x3HteiOZEZ3x2kXjpQzxTwvhOU3qi9EAAH2sP3mjC07N 9fzH/GFkL1aGOCP+V1S/4D2IK3DHj7pEj6WrloC42k9BdE+3kbel7kTAfhbzTukEOeGu 94wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wHBp9QnqH/tjk3SXwINVbP3RweD3cBoDf4EfzPLLtdI=; b=glxIR09BEZkuEMHZetsoEhQZS5SYkHhPeDZepDdcL5o8BfTA/Acu9paIiKmLvNex6u FcWjcq5rU/rCmfNWO+jKRrJl0YAFeof434uMZBCNXUp4g5fb6MFeDtRAYpWV6MrT5TBr pe9NUk55Yw5GAixknfItL0ioleMMxitsaIGLxSZGL40wg/HXUqQigWYLChkZLZ94QUhY W8zUHDL+/cchy4kK2Q3u8fRUqK1iVWG/iauW7OtbnJcbN9EK3lcgn2gjHLpPb7S9ZLJU KYQjVna+2VwrX/yFPVuZPA5+0dNh6Fs/wO4B0HX5ujf4WPOID9gPw2y3fc/q3zgE2c6w uJxg== X-Gm-Message-State: AOAM531zf9Tt5cqxm2QIkXD+R2Wv00Zr3YzO8gIf/YDwXMfu49tefDHv cqOhfLc5awgDtw0PEv1q+A== X-Google-Smtp-Source: ABdhPJxa8vJIr5qyiq99KNOmQoXdVeta0mlKAEHonS3Wg0JV3UGwIJ2FjdIKoBhvdIqTXlSP8WhU2w== X-Received: by 2002:a63:2117:0:b0:3c2:85f9:1b6f with SMTP id h23-20020a632117000000b003c285f91b6fmr26742199pgh.66.1653449060045; Tue, 24 May 2022 20:24:20 -0700 (PDT) Received: from localhost (220-133-130-217.hinet-ip.hinet.net. [220.133.130.217]) by smtp.gmail.com with ESMTPSA id gx3-20020a17090b124300b001df6ccdf3f6sm461772pjb.47.2022.05.24.20.24.19 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 May 2022 20:24:19 -0700 (PDT) From: Tyrone Ting To: avifishman70@gmail.com, tmaimon77@gmail.com, tali.perry1@gmail.com, venture@google.com, yuenn@google.com, benjaminfair@google.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, wsa@kernel.org, andriy.shevchenko@linux.intel.com, jarkko.nikula@linux.intel.com, semen.protsenko@linaro.org, jie.deng@intel.com, jsd@semihalf.com, sven@svenpeter.dev, lukas.bulwahn@gmail.com, olof@lixom.net, arnd@arndb.de, warp5tw@gmail.com, tali.perry@nuvoton.com, Avi.Fishman@nuvoton.com, tomer.maimon@nuvoton.com, KWLIU@nuvoton.com, JJLIU0@nuvoton.com, kfting@nuvoton.com Cc: openbmc@lists.ozlabs.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/5] i2c: npcm: Remove own slave addresses 2:10 Date: Wed, 25 May 2022 11:23:38 +0800 Message-Id: <20220525032341.3182-3-warp5tw@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220525032341.3182-1-warp5tw@gmail.com> References: <20220525032341.3182-1-warp5tw@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Tali Perry NPCM can support up to 10 own slave addresses. In practice, only one address is actually being used. In order to access addresses 2 and above, need to switch register banks. The switch needs spinlock. To avoid using spinlock for this useless feature removed support of SA >= 2. Also fix returned slave event enum. Remove some comment since the bank selection is not required. The bank selection is not required since the supported slave addresses are reduced. Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver") Signed-off-by: Tali Perry Signed-off-by: Tyrone Ting --- drivers/i2c/busses/i2c-npcm7xx.c | 41 +++++++++++++------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index 5960ccde6574..b5cc83e51029 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -123,11 +123,11 @@ enum i2c_addr { * Since the addr regs are sprinkled all over the address space, * use this array to get the address or each register. */ -#define I2C_NUM_OWN_ADDR 10 +#define I2C_NUM_OWN_ADDR 2 +#define I2C_NUM_OWN_ADDR_SUPPORTED 2 + static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = { - NPCM_I2CADDR1, NPCM_I2CADDR2, NPCM_I2CADDR3, NPCM_I2CADDR4, - NPCM_I2CADDR5, NPCM_I2CADDR6, NPCM_I2CADDR7, NPCM_I2CADDR8, - NPCM_I2CADDR9, NPCM_I2CADDR10, + NPCM_I2CADDR1, NPCM_I2CADDR2, }; #endif @@ -392,14 +392,10 @@ static void npcm_i2c_disable(struct npcm_i2c *bus) #if IS_ENABLED(CONFIG_I2C_SLAVE) int i; - /* select bank 0 for I2C addresses */ - npcm_i2c_select_bank(bus, I2C_BANK_0); - /* Slave addresses removal */ - for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR; i++) + for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR_SUPPORTED; i++) iowrite8(0, bus->reg + npcm_i2caddr[i]); - npcm_i2c_select_bank(bus, I2C_BANK_1); #endif /* Disable module */ i2cctl2 = ioread8(bus->reg + NPCM_I2CCTL2); @@ -604,8 +600,7 @@ static int npcm_i2c_slave_enable(struct npcm_i2c *bus, enum i2c_addr addr_type, i2cctl1 &= ~NPCM_I2CCTL1_GCMEN; iowrite8(i2cctl1, bus->reg + NPCM_I2CCTL1); return 0; - } - if (addr_type == I2C_ARP_ADDR) { + } else if (addr_type == I2C_ARP_ADDR) { i2cctl3 = ioread8(bus->reg + NPCM_I2CCTL3); if (enable) i2cctl3 |= I2CCTL3_ARPMEN; @@ -614,16 +609,16 @@ static int npcm_i2c_slave_enable(struct npcm_i2c *bus, enum i2c_addr addr_type, iowrite8(i2cctl3, bus->reg + NPCM_I2CCTL3); return 0; } + if (addr_type > I2C_SLAVE_ADDR2 && addr_type <= I2C_SLAVE_ADDR10) + dev_err(bus->dev, "try to enable more than 2 SA not supported\n"); + if (addr_type >= I2C_ARP_ADDR) return -EFAULT; - /* select bank 0 for address 3 to 10 */ - if (addr_type > I2C_SLAVE_ADDR2) - npcm_i2c_select_bank(bus, I2C_BANK_0); + /* Set and enable the address */ iowrite8(sa_reg, bus->reg + npcm_i2caddr[addr_type]); npcm_i2c_slave_int_enable(bus, enable); - if (addr_type > I2C_SLAVE_ADDR2) - npcm_i2c_select_bank(bus, I2C_BANK_1); + return 0; } #endif @@ -846,15 +841,11 @@ static u8 npcm_i2c_get_slave_addr(struct npcm_i2c *bus, enum i2c_addr addr_type) { u8 slave_add; - /* select bank 0 for address 3 to 10 */ - if (addr_type > I2C_SLAVE_ADDR2) - npcm_i2c_select_bank(bus, I2C_BANK_0); + if (addr_type > I2C_SLAVE_ADDR2 && addr_type <= I2C_SLAVE_ADDR10) + dev_err(bus->dev, "get slave: try to use more than 2 SA not supported\n"); slave_add = ioread8(bus->reg + npcm_i2caddr[(int)addr_type]); - if (addr_type > I2C_SLAVE_ADDR2) - npcm_i2c_select_bank(bus, I2C_BANK_1); - return slave_add; } @@ -864,12 +855,12 @@ static int npcm_i2c_remove_slave_addr(struct npcm_i2c *bus, u8 slave_add) /* Set the enable bit */ slave_add |= 0x80; - npcm_i2c_select_bank(bus, I2C_BANK_0); - for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR; i++) { + + for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR_SUPPORTED; i++) { if (ioread8(bus->reg + npcm_i2caddr[i]) == slave_add) iowrite8(0, bus->reg + npcm_i2caddr[i]); } - npcm_i2c_select_bank(bus, I2C_BANK_1); + return 0; } From patchwork Wed May 25 03:23:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyrone Ting X-Patchwork-Id: 576127 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 159F9C433F5 for ; Wed, 25 May 2022 03:24:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243527AbiEYDYm (ORCPT ); Tue, 24 May 2022 23:24:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242864AbiEYDYh (ORCPT ); Tue, 24 May 2022 23:24:37 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A87471DA8; Tue, 24 May 2022 20:24:26 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id y1so2081462pfr.6; Tue, 24 May 2022 20:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NK0b08wKodTidGQbJ6ZwixKVSwwf1GDBnVR4pQHKSOM=; b=ZNb5OBFWkdlzavtDQbaXzKhfGhiojpEdFaXBJ6LVM1bMxooZmZvyTqSPrYrb0Qh+TH IDAH0t7FUlbcHYve9GhLhOTHqQaXlgJhgQwrk2zjoxrzC4IHqrXfVio77Vrpuj9wvJPL UNk3RMKhCfpfzQaTmsD469ozLhT4hYQznyVuHTk/CsZxSm1magE2nOKBf8uIlDbkBvoD KeWNsW4PRHIhd4RRMfyF4LeCEmgtM4QBex6amk/Ax41Z9+Fpsqz2Fq2DIgwxzXKW44Mk GU8YrvCexQ0z2tvGC/gAkku8MJTDlHzHeoq+0SGLQQLDRHUac5eK0SfDmetwBmrdQc62 muQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NK0b08wKodTidGQbJ6ZwixKVSwwf1GDBnVR4pQHKSOM=; b=nXYNJM9/28cioPiI+OT4yeubHkHtWlrqaxqCql0LZmaoTpHOpNY5c50mHNueoF5BxR VGH2D/Qlk563QxUvMtYh5m83oI4WC7PzTpLbebHIvf2D95x4uLFvz7HVlnSlbNK2wSNd nFaw2wkX+oiuK12I+E5jBCvvELNa8O5VNhmRo5scpL29XxaQhzmy2pcIS4mF7QtkGedO RDt77bwnP8v+KZWm2sOYqSLpMlFzr6w7OF9EOUVhLXiSVO7ZlBTevYkWd8K9dMnFfPNX /UjOBNkpx13inuXuFvd7lCVaBpdldRbSqDiLzkxZE2qVZKDA7kqMFhPTfiCQgNipG66s Q3Qw== X-Gm-Message-State: AOAM531wT6rkhqSGOXjbasUSG4wQX/WEOwdd58GJugjk87EVH/q64Ofo yM/grI4qXCYJ5clKI2Iicw== X-Google-Smtp-Source: ABdhPJxV22rPnTpeEJI47XYFMMdxEpkOc4Zu6BY3qj12o/0OYPLWPEsrUzcR9a7YgCbueyIKAHz/Lg== X-Received: by 2002:aa7:9819:0:b0:518:4654:cf68 with SMTP id e25-20020aa79819000000b005184654cf68mr28288713pfl.28.1653449065644; Tue, 24 May 2022 20:24:25 -0700 (PDT) Received: from localhost (220-133-130-217.hinet-ip.hinet.net. [220.133.130.217]) by smtp.gmail.com with ESMTPSA id c2-20020a170902848200b00161996b9a66sm7969391plo.233.2022.05.24.20.24.25 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 May 2022 20:24:25 -0700 (PDT) From: Tyrone Ting To: avifishman70@gmail.com, tmaimon77@gmail.com, tali.perry1@gmail.com, venture@google.com, yuenn@google.com, benjaminfair@google.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, wsa@kernel.org, andriy.shevchenko@linux.intel.com, jarkko.nikula@linux.intel.com, semen.protsenko@linaro.org, jie.deng@intel.com, jsd@semihalf.com, sven@svenpeter.dev, lukas.bulwahn@gmail.com, olof@lixom.net, arnd@arndb.de, warp5tw@gmail.com, tali.perry@nuvoton.com, Avi.Fishman@nuvoton.com, tomer.maimon@nuvoton.com, KWLIU@nuvoton.com, JJLIU0@nuvoton.com, kfting@nuvoton.com Cc: openbmc@lists.ozlabs.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 5/5] i2c: npcm: Capitalize the one-line comment Date: Wed, 25 May 2022 11:23:41 +0800 Message-Id: <20220525032341.3182-6-warp5tw@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220525032341.3182-1-warp5tw@gmail.com> References: <20220525032341.3182-1-warp5tw@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Tyrone Ting Make the one-line comments capital in the driver to get the comment style consistent. Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver") Signed-off-by: Tyrone Ting --- drivers/i2c/busses/i2c-npcm7xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index 86fd942ea648..7d863edc14e4 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -680,7 +680,7 @@ static void npcm_i2c_reset(struct npcm_i2c *bus) } #endif - /* clear status bits for spurious interrupts */ + /* Clear status bits for spurious interrupts */ npcm_i2c_clear_master_status(bus); bus->state = I2C_IDLE; @@ -1252,7 +1252,7 @@ static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus) } /* SDAST */ /* - * if irq is not one of the above, make sure EOB is disabled and all + * If irq is not one of the above, make sure EOB is disabled and all * status bits are cleared. */ if (ret == IRQ_NONE) { @@ -1506,7 +1506,7 @@ static void npcm_i2c_irq_handle_nack(struct npcm_i2c *bus) npcm_i2c_clear_master_status(bus); readx_poll_timeout_atomic(ioread8, bus->reg + NPCM_I2CCST, val, !(val & NPCM_I2CCST_BUSY), 10, 200); - /* verify no status bits are still set after bus is released */ + /* Verify no status bits are still set after bus is released */ npcm_i2c_clear_master_status(bus); } bus->state = I2C_IDLE; @@ -1974,7 +1974,7 @@ static int npcm_i2c_init_module(struct npcm_i2c *bus, enum i2c_mode mode, npcm_i2c_reset(bus); - /* check HW is OK: SDA and SCL should be high at this point. */ + /* Check HW is OK: SDA and SCL should be high at this point. */ if ((npcm_i2c_get_SDA(&bus->adap) == 0) || (npcm_i2c_get_SCL(&bus->adap) == 0)) { dev_err(bus->dev, "I2C%d init fail: lines are low\n", bus->num); dev_err(bus->dev, "SDA=%d SCL=%d\n", npcm_i2c_get_SDA(&bus->adap), @@ -2034,7 +2034,7 @@ static irqreturn_t npcm_i2c_bus_irq(int irq, void *dev_id) return IRQ_HANDLED; } #endif - /* clear status bits for spurious interrupts */ + /* Clear status bits for spurious interrupts */ npcm_i2c_clear_master_status(bus); return IRQ_HANDLED; @@ -2216,7 +2216,7 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, (bus->data->rxf_ctl_last_pec & ioread8(bus->reg + NPCM_I2CRXF_CTL))) npcm_i2c_reset(bus); - /* after any xfer, successful or not, stall and EOB must be disabled */ + /* After any xfer, successful or not, stall and EOB must be disabled */ npcm_i2c_stall_after_start(bus, false); npcm_i2c_eob_int(bus, false);