Skip to content

Commit

Permalink
ptp: ocp: vectorize the sma accessor functions
Browse files Browse the repository at this point in the history 
Move the SMA get and set functions into an operations vector for
different boards.

Create inline wrappers for the accessor functions.

Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
  • Loading branch information
@jlemon @intel-lab-lkp
jlemon authored and intel-lab-lkp committed May 5, 2022
1 parent 17f12ef commit 9bcda14
Showing 1 changed file with 112 additions and 87 deletions.
199 changes: 112 additions & 87 deletions drivers/ptp/ptp_ocp.c
View file
Expand Up @@ -331,7 +331,7 @@ struct ptp_ocp {
u64 fw_cap;
struct ptp_ocp_signal signal[4];
struct ptp_ocp_sma_connector sma[4];
u8 sma_tbl;
const struct ocp_sma_op *sma_op;
};

#define OCP_REQ_TIMESTAMP BIT(0)
Expand Down Expand Up @@ -362,6 +362,7 @@ static int ptp_ocp_signal_enable(void *priv, u32 req, bool enable);
static int ptp_ocp_sma_store(struct ptp_ocp *bp, const char *buf, int sma_nr);

static const struct ocp_attr_group fb_timecard_groups[];
static const struct ocp_sma_op ocp_fb_sma_op;

struct ptp_ocp_eeprom_map {
u16 off;
Expand Down Expand Up @@ -710,10 +711,31 @@ static const struct ocp_selector ptp_ocp_sma_out[] = {
{ }
};

static const struct ocp_selector *ocp_sma_tbl[][2] = {
{ ptp_ocp_sma_in, ptp_ocp_sma_out },
struct ocp_sma_op {
const struct ocp_selector *tbl[2];
u32 (*get)(struct ptp_ocp *bp, int sma_nr);
int (*set_inputs)(struct ptp_ocp *bp, int sma_nr, u32 val);
int (*set_output)(struct ptp_ocp *bp, int sma_nr, u32 val);
};

static inline u32
ptp_ocp_sma_get(struct ptp_ocp *bp, int sma_nr)
{
return bp->sma_op->get(bp, sma_nr);
}

static inline int
ptp_ocp_sma_set_inputs(struct ptp_ocp *bp, int sma_nr, u32 val)
{
return bp->sma_op->set_inputs(bp, sma_nr, val);
}

static inline int
ptp_ocp_sma_set_output(struct ptp_ocp *bp, int sma_nr, u32 val)
{
return bp->sma_op->set_output(bp, sma_nr, val);
}

static const char *
ptp_ocp_select_name_from_val(const struct ocp_selector *tbl, int val)
{
Expand Down Expand Up @@ -1950,6 +1972,7 @@ ptp_ocp_fb_board_init(struct ptp_ocp *bp, struct ocp_resource *r)
bp->eeprom_map = fb_eeprom_map;
bp->fw_version = ioread32(&bp->image->version);
bp->attr_tbl = fb_timecard_groups;
bp->sma_op = &ocp_fb_sma_op;

ptp_ocp_fb_set_version(bp);

Expand Down Expand Up @@ -2054,13 +2077,82 @@ __handle_signal_inputs(struct ptp_ocp *bp, u32 val)
ptp_ocp_dcf_in(bp, val & 0x00200020);
}

/*
* ANT0 == gps (in)
* ANT1 == sma1 (in)
* ANT2 == sma2 (in)
* ANT3 == sma3 (out)
* ANT4 == sma4 (out)
*/
static u32
ptp_ocp_sma_fb_get(struct ptp_ocp *bp, int sma_nr)
{
u32 __iomem *gpio;
u32 shift;

if (bp->sma[sma_nr - 1].fixed_fcn)
return (sma_nr - 1) & 1;

if (bp->sma[sma_nr - 1].mode == SMA_MODE_IN)
gpio = sma_nr > 2 ? &bp->sma_map2->gpio1 : &bp->sma_map1->gpio1;
else
gpio = sma_nr > 2 ? &bp->sma_map1->gpio2 : &bp->sma_map2->gpio2;
shift = sma_nr & 1 ? 0 : 16;

return (ioread32(gpio) >> shift) & 0xffff;
}

static int
ptp_ocp_sma_fb_set_output(struct ptp_ocp *bp, int sma_nr, u32 val)
{
u32 reg, mask, shift;
unsigned long flags;
u32 __iomem *gpio;

gpio = sma_nr > 2 ? &bp->sma_map1->gpio2 : &bp->sma_map2->gpio2;
shift = sma_nr & 1 ? 0 : 16;

mask = 0xffff << (16 - shift);

spin_lock_irqsave(&bp->lock, flags);

reg = ioread32(gpio);
reg = (reg & mask) | (val << shift);

__handle_signal_outputs(bp, reg);

iowrite32(reg, gpio);

spin_unlock_irqrestore(&bp->lock, flags);

return 0;
}

static int
ptp_ocp_sma_fb_set_inputs(struct ptp_ocp *bp, int sma_nr, u32 val)
{
u32 reg, mask, shift;
unsigned long flags;
u32 __iomem *gpio;

gpio = sma_nr > 2 ? &bp->sma_map2->gpio1 : &bp->sma_map1->gpio1;
shift = sma_nr & 1 ? 0 : 16;

mask = 0xffff << (16 - shift);

spin_lock_irqsave(&bp->lock, flags);

reg = ioread32(gpio);
reg = (reg & mask) | (val << shift);

__handle_signal_inputs(bp, reg);

iowrite32(reg, gpio);

spin_unlock_irqrestore(&bp->lock, flags);

return 0;
}

static const struct ocp_sma_op ocp_fb_sma_op = {
.tbl = { ptp_ocp_sma_in, ptp_ocp_sma_out },
.get = ptp_ocp_sma_fb_get,
.set_inputs = ptp_ocp_sma_fb_set_inputs,
.set_output = ptp_ocp_sma_fb_set_output,
};

static ssize_t
ptp_ocp_show_output(const struct ocp_selector *tbl, u32 val, char *buf,
Expand Down Expand Up @@ -2141,24 +2233,6 @@ sma_parse_inputs(const struct ocp_selector * const tbl[], const char *buf,
return ret;
}

static u32
ptp_ocp_sma_get(struct ptp_ocp *bp, int sma_nr, enum ptp_ocp_sma_mode mode)
{
u32 __iomem *gpio;
u32 shift;

if (bp->sma[sma_nr - 1].fixed_fcn)
return (sma_nr - 1) & 1;

if (mode == SMA_MODE_IN)
gpio = sma_nr > 2 ? &bp->sma_map2->gpio1 : &bp->sma_map1->gpio1;
else
gpio = sma_nr > 2 ? &bp->sma_map1->gpio2 : &bp->sma_map2->gpio2;
shift = sma_nr & 1 ? 0 : 16;

return (ioread32(gpio) >> shift) & 0xffff;
}

static ssize_t
ptp_ocp_sma_show(struct ptp_ocp *bp, int sma_nr, char *buf,
int default_in_val, int default_out_val)
Expand All @@ -2167,9 +2241,8 @@ ptp_ocp_sma_show(struct ptp_ocp *bp, int sma_nr, char *buf,
const struct ocp_selector * const *tbl;
u32 val;

tbl = ocp_sma_tbl[bp->sma_tbl];

val = ptp_ocp_sma_get(bp, sma_nr, sma->mode) & SMA_SELECT_MASK;
tbl = bp->sma_op->tbl;
val = ptp_ocp_sma_get(bp, sma_nr) & SMA_SELECT_MASK;

if (sma->mode == SMA_MODE_IN) {
if (sma->disabled)
Expand Down Expand Up @@ -2212,54 +2285,6 @@ sma4_show(struct device *dev, struct device_attribute *attr, char *buf)
return ptp_ocp_sma_show(bp, 4, buf, -1, 1);
}

static void
ptp_ocp_sma_store_output(struct ptp_ocp *bp, int sma_nr, u32 val)
{
u32 reg, mask, shift;
unsigned long flags;
u32 __iomem *gpio;

gpio = sma_nr > 2 ? &bp->sma_map1->gpio2 : &bp->sma_map2->gpio2;
shift = sma_nr & 1 ? 0 : 16;

mask = 0xffff << (16 - shift);

spin_lock_irqsave(&bp->lock, flags);

reg = ioread32(gpio);
reg = (reg & mask) | (val << shift);

__handle_signal_outputs(bp, reg);

iowrite32(reg, gpio);

spin_unlock_irqrestore(&bp->lock, flags);
}

static void
ptp_ocp_sma_store_inputs(struct ptp_ocp *bp, int sma_nr, u32 val)
{
u32 reg, mask, shift;
unsigned long flags;
u32 __iomem *gpio;

gpio = sma_nr > 2 ? &bp->sma_map2->gpio1 : &bp->sma_map1->gpio1;
shift = sma_nr & 1 ? 0 : 16;

mask = 0xffff << (16 - shift);

spin_lock_irqsave(&bp->lock, flags);

reg = ioread32(gpio);
reg = (reg & mask) | (val << shift);

__handle_signal_inputs(bp, reg);

iowrite32(reg, gpio);

spin_unlock_irqrestore(&bp->lock, flags);
}

static int
ptp_ocp_sma_store(struct ptp_ocp *bp, const char *buf, int sma_nr)
{
Expand All @@ -2268,7 +2293,7 @@ ptp_ocp_sma_store(struct ptp_ocp *bp, const char *buf, int sma_nr)
int val;

mode = sma->mode;
val = sma_parse_inputs(ocp_sma_tbl[bp->sma_tbl], buf, &mode);
val = sma_parse_inputs(bp->sma_op->tbl, buf, &mode);
if (val < 0)
return val;

Expand All @@ -2285,9 +2310,9 @@ ptp_ocp_sma_store(struct ptp_ocp *bp, const char *buf, int sma_nr)

if (mode != sma->mode) {
if (mode == SMA_MODE_IN)
ptp_ocp_sma_store_output(bp, sma_nr, 0);
ptp_ocp_sma_set_output(bp, sma_nr, 0);
else
ptp_ocp_sma_store_inputs(bp, sma_nr, 0);
ptp_ocp_sma_set_inputs(bp, sma_nr, 0);
sma->mode = mode;
}

Expand All @@ -2298,11 +2323,11 @@ ptp_ocp_sma_store(struct ptp_ocp *bp, const char *buf, int sma_nr)
val = 0;

if (mode == SMA_MODE_IN)
ptp_ocp_sma_store_inputs(bp, sma_nr, val);
val = ptp_ocp_sma_set_inputs(bp, sma_nr, val);
else
ptp_ocp_sma_store_output(bp, sma_nr, val);
val = ptp_ocp_sma_set_output(bp, sma_nr, val);

return 0;
return val;
}

static ssize_t
Expand Down Expand Up @@ -2359,7 +2384,7 @@ available_sma_inputs_show(struct device *dev,
{
struct ptp_ocp *bp = dev_get_drvdata(dev);

return ptp_ocp_select_table_show(ocp_sma_tbl[bp->sma_tbl][0], buf);
return ptp_ocp_select_table_show(bp->sma_op->tbl[0], buf);
}
static DEVICE_ATTR_RO(available_sma_inputs);

Expand All @@ -2369,7 +2394,7 @@ available_sma_outputs_show(struct device *dev,
{
struct ptp_ocp *bp = dev_get_drvdata(dev);

return ptp_ocp_select_table_show(ocp_sma_tbl[bp->sma_tbl][1], buf);
return ptp_ocp_select_table_show(bp->sma_op->tbl[1], buf);
}
static DEVICE_ATTR_RO(available_sma_outputs);

Expand Down

0 comments on commit 9bcda14

Please sign in to comment.