drivers: i2c: thunderx: Marvell thunderx i2c changes
Subsystems (2)
v2 cover drivers: i2c: thunderx: Marvell thunderx i2c changes
These patches includes the following changes:
- Handling clock divisor logic for Octeon SoC family using subsytem ID
- Support for high speed mode
Changes since V1:
* Fixed the build issue "incomplete definition of type 'struct pci_dev'"
Piyush Malgujar (2):
drivers: i2c: thunderx: octeontx2 clock divisor logic changes
drivers: i2c: thunderx: Add support for High speed mode
drivers/i2c/busses/i2c-octeon-core.c | 84 +++++++++++++++++------- drivers/i2c/busses/i2c-octeon-core.h | 18 +++++ drivers/i2c/busses/i2c-thunderx-pcidrv.c | 7 ++ 3 files changed, 85 insertions(+), 24 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 drivers: i2c: thunderx: octeontx2 clock divisor logic changes
Handle changes to clock divisor logic for OcteonTX2 SoC family using subsystem ID and using default reference clock source as 100MHz.
--- drivers/i2c/busses/i2c-octeon-core.c | 24 +++++++++++++++++++++--- drivers/i2c/busses/i2c-octeon-core.h | 15 +++++++++++++++ drivers/i2c/busses/i2c-thunderx-pcidrv.c | 6 ++++++ 3 files changed, 42 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-octeon-core.c +21 -3
@@ -17,6 +17,7 @@#include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/pci.h> #include "i2c-octeon-core.h"
@@ -658,7 +659,16 @@ int octeon_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)void octeon_i2c_set_clock (struct octeon_i2c *i2c) {int tclk, thp_base, inc, thp_idx, mdiv_idx, ndiv_idx, foscl, diff; -int thp =0x18 , mdiv =2 , ndiv =0 , delta_hz =1000000 ; +/* starting value on search for lowest diff */ +const int huge_delta =1000000 ; +/* +* Find divisors to produce target frequency, start with large delta +* to cover wider range of divisors, note thp = TCLK half period. +*/ +int thp =0x18 , mdiv =2 , ndiv =0 , delta_hz = huge_delta; + +if (octeon_i2c_is_otx2 (to_pci_dev (i2c->dev))) + thp =0x3 ;for (ndiv_idx =0 ; ndiv_idx <8 && delta_hz !=0 ; ndiv_idx++) {/*
@@ -672,17 +682,25 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c)*/ tclk = i2c->twsi_freq * (mdiv_idx +1 ) *10 ; tclk *= (1 << ndiv_idx); - thp_base = (i2c->sys_freq / (tclk *2 )) -1 ; +if (octeon_i2c_is_otx2 (to_pci_dev (i2c->dev))) + thp_base = (i2c->sys_freq / tclk) -2 ; +else + thp_base = (i2c->sys_freq / (tclk *2 )) -1 ;for (inc =0 ; inc <=1 ; inc++) { thp_idx = thp_base + inc;if (thp_idx <5 || thp_idx >0xff )continue ; - foscl = i2c->sys_freq / (2 * (thp_idx +1 )); +if (octeon_i2c_is_otx2 (to_pci_dev (i2c->dev))) + foscl = i2c->sys_freq / (thp_idx +2 ); +else + foscl = i2c->sys_freq / + (2 * (thp_idx +1 )); foscl = foscl / (1 << ndiv_idx); foscl = foscl / (mdiv_idx +1 ) /10 ; diff =abs (foscl - i2c->twsi_freq); +/* Use it if smaller diff from target */ if (diff < delta_hz) { delta_hz = diff; thp = thp_idx;
drivers/i2c/busses/i2c-octeon-core.h +15 -0
@@ -7,6 +7,7 @@#include <linux/i2c-smbus.h> #include <linux/io.h> #include <linux/kernel.h> +#include <linux/pci.h> /* Controller command patterns */ #define SW_TWSI_V BIT_ULL(63)/* Valid bit */
@@ -211,6 +212,20 @@ static inline void octeon_i2c_write_int(struct octeon_i2c *i2c, u64 data)octeon_i2c_writeq_flush (data, i2c->twsi_base +TWSI_INT (i2c)); } +#define PCI_SUBSYS_DEVID_9XXX 0xB +/** +* octeon_i2c_is_otx2 - check for chip ID +* @pdev: PCI dev structure +* +* Returns TRUE if OcteonTX2, FALSE otherwise. +*/ +static inline bool octeon_i2c_is_otx2 (struct pci_dev *pdev) +{ +u32 chip_id = (pdev->subsystem_device >>12 ) &0xF ; + +return (chip_id ==PCI_SUBSYS_DEVID_9XXX ); +} +/* Prototypes */ irqreturn_t octeon_i2c_isr (int irq,void *dev_id);int octeon_i2c_xfer (struct i2c_adapter *adap,struct i2c_msg *msgs,int num);
drivers/i2c/busses/i2c-thunderx-pcidrv.c +6 -0
@@ -205,6 +205,12 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,if (ret) goto error; +/* +* For OcteonTX2 chips, set reference frequency to 100MHz +* as refclk_src in TWSI_MODE register defaults to 100MHz. +*/ +if (octeon_i2c_is_otx2 (pdev)) + i2c->sys_freq =100000000 ;octeon_i2c_set_clock (i2c); i2c->adap = thunderx_i2c_ops;
Signature · 1 line
2.17.1
PATCH v2 2/2 drivers: i2c: thunderx: Add support for High speed mode
In reply to Piyush MalgujarSupport High speed mode clock setup for OcteonTX2 platforms.
--- drivers/i2c/busses/i2c-octeon-core.c | 64 +++++++++++++++--------- drivers/i2c/busses/i2c-octeon-core.h | 3 ++ drivers/i2c/busses/i2c-thunderx-pcidrv.c | 3 +- 3 files changed, 46 insertions(+), 24 deletions(-)
drivers/i2c/busses/i2c-octeon-core.c +41 -23
@@ -608,25 +608,27 @@ int octeon_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)struct octeon_i2c *i2c =i2c_get_adapdata (adap);int i, ret =0 ; -if (num ==1 ) { -if (msgs[0 ].len >0 && msgs[0 ].len <=8 ) { -if (msgs[0 ].flags &I2C_M_RD ) - ret =octeon_i2c_hlc_read (i2c, msgs); -else - ret =octeon_i2c_hlc_write (i2c, msgs); - goto out; - } - }else if (num ==2 ) { -if ((msgs[0 ].flags &I2C_M_RD ) ==0 && - (msgs[1 ].flags &I2C_M_RECV_LEN ) ==0 && - msgs[0 ].len >0 && msgs[0 ].len <=2 && - msgs[1 ].len >0 && msgs[1 ].len <=8 && - msgs[0 ].addr == msgs[1 ].addr) { -if (msgs[1 ].flags &I2C_M_RD ) - ret =octeon_i2c_hlc_comp_read (i2c, msgs); -else - ret =octeon_i2c_hlc_comp_write (i2c, msgs); - goto out; +if (IS_LS_FREQ (i2c->twsi_freq)) { +if (num ==1 ) { +if (msgs[0 ].len >0 && msgs[0 ].len <=8 ) { +if (msgs[0 ].flags &I2C_M_RD ) + ret =octeon_i2c_hlc_read (i2c, msgs); +else + ret =octeon_i2c_hlc_write (i2c, msgs); + goto out; + } + }else if (num ==2 ) { +if ((msgs[0 ].flags &I2C_M_RD ) ==0 && + (msgs[1 ].flags &I2C_M_RECV_LEN ) ==0 && + msgs[0 ].len >0 && msgs[0 ].len <=2 && + msgs[1 ].len >0 && msgs[1 ].len <=8 && + msgs[0 ].addr == msgs[1 ].addr) { +if (msgs[1 ].flags &I2C_M_RD ) + ret =octeon_i2c_hlc_comp_read (i2c, msgs); +else + ret =octeon_i2c_hlc_comp_write (i2c, msgs); + goto out; + } } }
@@ -665,10 +667,13 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c)* Find divisors to produce target frequency, start with large delta * to cover wider range of divisors, note thp = TCLK half period. */ -int thp =0x18 , mdiv =2 , ndiv =0 , delta_hz = huge_delta; +int ds =10 , thp =0x18 , mdiv =2 , ndiv =0 , delta_hz = huge_delta; -if (octeon_i2c_is_otx2 (to_pci_dev (i2c->dev))) +if (octeon_i2c_is_otx2 (to_pci_dev (i2c->dev))) { thp =0x3 ; +if (!IS_LS_FREQ (i2c->twsi_freq)) + ds =15 ; + }for (ndiv_idx =0 ; ndiv_idx <8 && delta_hz !=0 ; ndiv_idx++) {/*
@@ -680,7 +685,7 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c)* For given ndiv and mdiv values check the * two closest thp values. */ - tclk = i2c->twsi_freq * (mdiv_idx +1 ) *10 ; + tclk = i2c->twsi_freq * (mdiv_idx +1 ) * ds; tclk *= (1 << ndiv_idx);if (octeon_i2c_is_otx2 (to_pci_dev (i2c->dev))) thp_base = (i2c->sys_freq / tclk) -2 ;
@@ -698,7 +703,9 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c) foscl = i2c->sys_freq / (2 * (thp_idx +1 )); foscl = foscl / (1 << ndiv_idx); - foscl = foscl / (mdiv_idx +1 ) /10 ; + foscl = foscl / (mdiv_idx +1 ) / ds; +if (foscl > i2c->twsi_freq) +continue ; diff =abs (foscl - i2c->twsi_freq);/* Use it if smaller diff from target */ if (diff < delta_hz) {
@@ -712,6 +719,17 @@ void octeon_i2c_set_clock(struct octeon_i2c *i2c) }octeon_i2c_reg_write (i2c,SW_TWSI_OP_TWSI_CLK , thp);octeon_i2c_reg_write (i2c,SW_TWSI_EOP_TWSI_CLKCTL , (mdiv <<3 ) | ndiv); +if (octeon_i2c_is_otx2 (to_pci_dev (i2c->dev))) { +u64 mode; + + mode =__raw_readq (i2c->twsi_base +MODE (i2c)); +/* Set REFCLK_SRC and HS_MODE in TWSX_MODE register */ +if (!IS_LS_FREQ (i2c->twsi_freq)) + mode |=BIT (4 ) |BIT (0 ); +else + mode &= ~(BIT (4 ) |BIT (0 )); +octeon_i2c_writeq_flush (mode, i2c->twsi_base +MODE (i2c)); + } }int octeon_i2c_init_lowlevel (struct octeon_i2c *i2c)
drivers/i2c/busses/i2c-octeon-core.h +3 -0
@@ -93,11 +93,13 @@ struct octeon_i2c_reg_offset {unsigned int sw_twsi;unsigned int twsi_int;unsigned int sw_twsi_ext; +unsigned int mode; };#define SW_TWSI (x) (x->roff.sw_twsi)#define TWSI_INT (x) (x->roff.twsi_int)#define SW_TWSI_EXT (x) (x->roff.sw_twsi_ext) +#define MODE (x) (x->roff.mode)struct octeon_i2c {wait_queue_head_t queue;
@@ -212,6 +214,7 @@ static inline void octeon_i2c_write_int(struct octeon_i2c *i2c, u64 data)octeon_i2c_writeq_flush (data, i2c->twsi_base +TWSI_INT (i2c)); } +#define IS_LS_FREQ (twsi_freq) ((twsi_freq) <= 400000)#define PCI_SUBSYS_DEVID_9XXX 0xB/** * octeon_i2c_is_otx2 - check for chip ID
drivers/i2c/busses/i2c-thunderx-pcidrv.c +2 -1
@@ -165,6 +165,7 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, i2c->roff.sw_twsi =0x1000 ; i2c->roff.twsi_int =0x1010 ; i2c->roff.sw_twsi_ext =0x1018 ; + i2c->roff.mode =0x1038 ; i2c->dev = dev;pci_set_drvdata (pdev, i2c);
@@ -209,7 +210,7 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,* For OcteonTX2 chips, set reference frequency to 100MHz * as refclk_src in TWSI_MODE register defaults to 100MHz. */ -if (octeon_i2c_is_otx2 (pdev)) +if (octeon_i2c_is_otx2 (pdev) &&IS_LS_FREQ (i2c->twsi_freq)) i2c->sys_freq =100000000 ;octeon_i2c_set_clock (i2c);
Signature · 1 line
2.17.1