From: Tyrone Ting <warp5tw@gmail.com> 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@canonical.com, yangyicong@hisilicon.com, semen.protsenko@linaro.org, wsa@kernel.org, jie.deng@intel.com, sven@svenpeter.dev, bence98@sch.bme.hu, lukas.bulwahn@gmail.com, arnd@arndb.de, olof@lixom.net, andriy.shevchenko@linux.intel.com, 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 v3 10/11] i2c: npcm: Remove own slave addresses 2:10 Date: Thu, 3 Mar 2022 16:31:40 +0800 [thread overview] Message-ID: <20220303083141.8742-11-warp5tw@gmail.com> (raw) In-Reply-To: <20220303083141.8742-1-warp5tw@gmail.com> From: Tali Perry <tali.perry1@gmail.com> 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 <tali.perry1@gmail.com> Signed-off-by: Tyrone Ting <kfting@nuvoton.com> --- drivers/i2c/busses/i2c-npcm7xx.c | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index 73cef76127c9..5c0bbc134f9d 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -124,6 +124,8 @@ enum i2c_addr { * use this array to get the address or each register. */ #define I2C_NUM_OWN_ADDR 10 +#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, @@ -392,14 +394,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 +602,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 +611,18 @@ 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 then 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 +845,13 @@ 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 then 2 slave addresses 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 +861,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; } @@ -924,11 +921,15 @@ static int npcm_i2c_slave_get_wr_buf(struct npcm_i2c *bus) for (i = 0; i < I2C_HW_FIFO_SIZE; i++) { if (bus->slv_wr_size >= I2C_HW_FIFO_SIZE) break; - i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value); + if (bus->state == I2C_SLAVE_MATCH) { + i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value); + bus->state = I2C_OPER_STARTED; + } else { + i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value); + } ind = (bus->slv_wr_ind + bus->slv_wr_size) % I2C_HW_FIFO_SIZE; bus->slv_wr_buf[ind] = value; bus->slv_wr_size++; - i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value); } return I2C_HW_FIFO_SIZE - ret; } @@ -976,7 +977,6 @@ static void npcm_i2c_slave_xmit(struct npcm_i2c *bus, u16 nwrite, if (nwrite == 0) return; - bus->state = I2C_OPER_STARTED; bus->operation = I2C_WRITE_OPER; /* get the next buffer */ -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Tyrone Ting <warp5tw@gmail.com> 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@canonical.com, yangyicong@hisilicon.com, semen.protsenko@linaro.org, wsa@kernel.org, jie.deng@intel.com, sven@svenpeter.dev, bence98@sch.bme.hu, lukas.bulwahn@gmail.com, arnd@arndb.de, olof@lixom.net, andriy.shevchenko@linux.intel.com, 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: devicetree@vger.kernel.org, openbmc@lists.ozlabs.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 10/11] i2c: npcm: Remove own slave addresses 2:10 Date: Thu, 3 Mar 2022 16:31:40 +0800 [thread overview] Message-ID: <20220303083141.8742-11-warp5tw@gmail.com> (raw) In-Reply-To: <20220303083141.8742-1-warp5tw@gmail.com> From: Tali Perry <tali.perry1@gmail.com> 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 <tali.perry1@gmail.com> Signed-off-by: Tyrone Ting <kfting@nuvoton.com> --- drivers/i2c/busses/i2c-npcm7xx.c | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index 73cef76127c9..5c0bbc134f9d 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -124,6 +124,8 @@ enum i2c_addr { * use this array to get the address or each register. */ #define I2C_NUM_OWN_ADDR 10 +#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, @@ -392,14 +394,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 +602,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 +611,18 @@ 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 then 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 +845,13 @@ 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 then 2 slave addresses 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 +861,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; } @@ -924,11 +921,15 @@ static int npcm_i2c_slave_get_wr_buf(struct npcm_i2c *bus) for (i = 0; i < I2C_HW_FIFO_SIZE; i++) { if (bus->slv_wr_size >= I2C_HW_FIFO_SIZE) break; - i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value); + if (bus->state == I2C_SLAVE_MATCH) { + i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value); + bus->state = I2C_OPER_STARTED; + } else { + i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value); + } ind = (bus->slv_wr_ind + bus->slv_wr_size) % I2C_HW_FIFO_SIZE; bus->slv_wr_buf[ind] = value; bus->slv_wr_size++; - i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value); } return I2C_HW_FIFO_SIZE - ret; } @@ -976,7 +977,6 @@ static void npcm_i2c_slave_xmit(struct npcm_i2c *bus, u16 nwrite, if (nwrite == 0) return; - bus->state = I2C_OPER_STARTED; bus->operation = I2C_WRITE_OPER; /* get the next buffer */ -- 2.17.1
next prev parent reply other threads:[~2022-03-03 8:32 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-03 8:31 [PATCH v3 00/11] i2c: npcm: Bug fixes timeout, spurious interrupts Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 8:31 ` [PATCH v3 01/11] arm: dts: add new property for NPCM i2c module Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-18 20:28 ` Wolfram Sang 2022-03-18 20:28 ` Wolfram Sang 2022-03-20 9:34 ` Tyrone Ting 2022-03-20 9:42 ` Wolfram Sang 2022-03-20 9:42 ` Wolfram Sang 2022-03-03 8:31 ` [PATCH v3 02/11] dt-bindings: i2c: npcm: support NPCM845 Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 10:37 ` Krzysztof Kozlowski 2022-03-03 10:37 ` Krzysztof Kozlowski 2022-03-04 13:30 ` Tyrone Ting 2022-03-04 13:30 ` Tyrone Ting 2022-03-03 8:31 ` [PATCH v3 03/11] i2c: npcm: Fix client address calculation Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 10:30 ` Andy Shevchenko 2022-03-03 10:30 ` Andy Shevchenko 2022-03-04 13:39 ` Tyrone Ting 2022-03-04 13:39 ` Tyrone Ting 2022-03-03 8:31 ` [PATCH v3 04/11] i2c: npcm: Change the way of getting GCR regmap Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 10:38 ` Krzysztof Kozlowski 2022-03-03 10:38 ` Krzysztof Kozlowski 2022-03-04 13:32 ` Tyrone Ting 2022-03-04 13:32 ` Tyrone Ting 2022-03-03 8:31 ` [PATCH v3 05/11] i2c: npcm: Remove unused variable clk_regmap Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 8:31 ` [PATCH v3 06/11] i2c: npcm: Fix timeout calculation Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 8:31 ` [PATCH v3 07/11] i2c: npcm: Add tx complete counter Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 8:31 ` [PATCH v3 08/11] i2c: npcm: Correct register access width Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 10:33 ` Andy Shevchenko 2022-03-03 10:33 ` Andy Shevchenko 2022-03-03 12:54 ` Tali Perry 2022-03-03 12:54 ` Tali Perry 2022-03-03 14:15 ` Andy Shevchenko 2022-03-03 14:15 ` Andy Shevchenko 2022-03-04 20:42 ` Jonathan Neuschäfer 2022-03-04 20:42 ` Jonathan Neuschäfer 2022-03-22 17:18 ` Avi Fishman 2022-03-22 17:18 ` Avi Fishman 2022-03-22 17:51 ` Jonathan Neuschäfer 2022-03-22 17:51 ` Jonathan Neuschäfer 2022-03-03 8:31 ` [PATCH v3 09/11] i2c: npcm: Handle spurious interrupts Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 10:36 ` Andy Shevchenko 2022-03-03 10:36 ` Andy Shevchenko 2022-03-03 12:48 ` Tali Perry 2022-03-03 12:48 ` Tali Perry 2022-03-03 14:13 ` Andy Shevchenko 2022-03-03 14:13 ` Andy Shevchenko 2022-04-04 17:03 ` Avi Fishman 2022-04-04 17:03 ` Avi Fishman 2022-04-05 7:13 ` Andy Shevchenko 2022-04-05 7:13 ` Andy Shevchenko 2022-04-10 7:33 ` Avi Fishman 2022-04-10 7:33 ` Avi Fishman 2022-03-03 8:31 ` Tyrone Ting [this message] 2022-03-03 8:31 ` [PATCH v3 10/11] i2c: npcm: Remove own slave addresses 2:10 Tyrone Ting 2022-03-03 8:31 ` [PATCH v3 11/11] i2c: npcm: Support NPCM845 Tyrone Ting 2022-03-03 8:31 ` Tyrone Ting 2022-03-03 10:43 ` Andy Shevchenko 2022-03-03 10:43 ` Andy Shevchenko 2022-03-03 12:35 ` Tali Perry 2022-03-03 12:35 ` Tali Perry 2022-03-03 14:10 ` Andy Shevchenko 2022-03-03 14:10 ` Andy Shevchenko 2022-03-06 13:33 ` Tomer Maimon 2022-03-07 9:43 ` Andy Shevchenko 2022-03-07 9:43 ` Andy Shevchenko 2022-03-07 19:47 ` Tomer Maimon 2022-03-03 10:26 ` [PATCH v3 00/11] i2c: npcm: Bug fixes timeout, spurious interrupts Andy Shevchenko 2022-03-03 10:26 ` Andy Shevchenko 2022-03-03 13:03 ` Tali Perry 2022-03-03 13:03 ` Tali Perry
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220303083141.8742-11-warp5tw@gmail.com \ --to=warp5tw@gmail.com \ --cc=Avi.Fishman@nuvoton.com \ --cc=JJLIU0@nuvoton.com \ --cc=KWLIU@nuvoton.com \ --cc=andriy.shevchenko@linux.intel.com \ --cc=arnd@arndb.de \ --cc=avifishman70@gmail.com \ --cc=bence98@sch.bme.hu \ --cc=benjaminfair@google.com \ --cc=devicetree@vger.kernel.org \ --cc=jie.deng@intel.com \ --cc=kfting@nuvoton.com \ --cc=krzysztof.kozlowski@canonical.com \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lukas.bulwahn@gmail.com \ --cc=olof@lixom.net \ --cc=openbmc@lists.ozlabs.org \ --cc=robh+dt@kernel.org \ --cc=semen.protsenko@linaro.org \ --cc=sven@svenpeter.dev \ --cc=tali.perry1@gmail.com \ --cc=tali.perry@nuvoton.com \ --cc=tmaimon77@gmail.com \ --cc=tomer.maimon@nuvoton.com \ --cc=venture@google.com \ --cc=wsa@kernel.org \ --cc=yangyicong@hisilicon.com \ --cc=yuenn@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.